about summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--client.c12
-rw-r--r--config.arg.h1
-rw-r--r--config.default.h1
-rw-r--r--dwm.h2
-rw-r--r--event.c6
-rw-r--r--main.c26
6 files changed, 29 insertions, 19 deletions
diff --git a/client.c b/client.c
index 14edf7c..24d38c3 100644
--- a/client.c
+++ b/client.c
@@ -228,27 +228,27 @@ manage(Window w, XWindowAttributes *wa)
 			GrabModeAsync, GrabModeSync, None, None);
 	XGrabButton(dpy, Button1, MODKEY | LockMask, c->win, False, BUTTONMASK,
 			GrabModeAsync, GrabModeSync, None, None);
-	XGrabButton(dpy, Button1, MODKEY | NUMLOCKMASK, c->win, False, BUTTONMASK,
+	XGrabButton(dpy, Button1, MODKEY | numlockmask, c->win, False, BUTTONMASK,
 			GrabModeAsync, GrabModeSync, None, None);
-	XGrabButton(dpy, Button1, MODKEY | NUMLOCKMASK | LockMask, c->win, False, BUTTONMASK,
+	XGrabButton(dpy, Button1, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
 			GrabModeAsync, GrabModeSync, None, None);
 
 	XGrabButton(dpy, Button2, MODKEY, c->win, False, BUTTONMASK,
 			GrabModeAsync, GrabModeSync, None, None);
 	XGrabButton(dpy, Button2, MODKEY | LockMask, c->win, False, BUTTONMASK,
 			GrabModeAsync, GrabModeSync, None, None);
-	XGrabButton(dpy, Button2, MODKEY | NUMLOCKMASK, c->win, False, BUTTONMASK,
+	XGrabButton(dpy, Button2, MODKEY | numlockmask, c->win, False, BUTTONMASK,
 			GrabModeAsync, GrabModeSync, None, None);
-	XGrabButton(dpy, Button2, MODKEY | NUMLOCKMASK | LockMask, c->win, False, BUTTONMASK,
+	XGrabButton(dpy, Button2, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
 			GrabModeAsync, GrabModeSync, None, None);
 
 	XGrabButton(dpy, Button3, MODKEY, c->win, False, BUTTONMASK,
 			GrabModeAsync, GrabModeSync, None, None);
 	XGrabButton(dpy, Button3, MODKEY | LockMask, c->win, False, BUTTONMASK,
 			GrabModeAsync, GrabModeSync, None, None);
-	XGrabButton(dpy, Button3, MODKEY | NUMLOCKMASK, c->win, False, BUTTONMASK,
+	XGrabButton(dpy, Button3, MODKEY | numlockmask, c->win, False, BUTTONMASK,
 			GrabModeAsync, GrabModeSync, None, None);
-	XGrabButton(dpy, Button3, MODKEY | NUMLOCKMASK | LockMask, c->win, False, BUTTONMASK,
+	XGrabButton(dpy, Button3, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
 			GrabModeAsync, GrabModeSync, None, None);
 
 	settags(c);
diff --git a/config.arg.h b/config.arg.h
index a2257cf..2e49f81 100644
--- a/config.arg.h
+++ b/config.arg.h
@@ -13,7 +13,6 @@ const char *tags[] = { "work", "net", "fnord", NULL };
 #define FGCOLOR			"#eeeeee"
 #define BORDERCOLOR		"#3f484d"
 #define MODKEY			Mod1Mask
-#define NUMLOCKMASK		Mod2Mask
 #define MASTERW			60 /* percent */
 
 #define KEYS \
diff --git a/config.default.h b/config.default.h
index a8a2c0e..44f0daf 100644
--- a/config.default.h
+++ b/config.default.h
@@ -13,7 +13,6 @@ const char *tags[] = { "0", "1", "2", "3", "4", NULL };
 #define FGCOLOR			"#eeeeee"
 #define BORDERCOLOR		"#9999CC"
 #define MODKEY			Mod1Mask
-#define NUMLOCKMASK		Mod2Mask
 #define MASTERW			60 /* percent */
 
 #define KEYS \
diff --git a/dwm.h b/dwm.h
index 10eaf30..bb941dc 100644
--- a/dwm.h
+++ b/dwm.h
@@ -70,7 +70,7 @@ struct Client {
 extern const char *tags[];
 extern char stext[1024];
 extern int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
-extern unsigned int ntags;
+extern unsigned int ntags, numlockmask;
 extern void (*handler[LASTEvent])(XEvent *);
 extern void (*arrange)(Arg *);
 extern Atom wmatom[WMLast], netatom[NetLast];
diff --git a/event.c b/event.c
index 187c65e..c8a87c1 100644
--- a/event.c
+++ b/event.c
@@ -18,7 +18,7 @@ typedef struct {
 
 KEYS
 
-#define CLEANMASK(mask) (mask & ~(NUMLOCKMASK | LockMask))
+#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
 
 static void
 movemouse(Client *c)
@@ -378,9 +378,9 @@ grabkeys()
 				GrabModeAsync, GrabModeAsync);
 		XGrabKey(dpy, code, key[i].mod | LockMask, root, True,
 				GrabModeAsync, GrabModeAsync);
-		XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK, root, True,
+		XGrabKey(dpy, code, key[i].mod | numlockmask, root, True,
 				GrabModeAsync, GrabModeAsync);
-		XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK | LockMask, root, True,
+		XGrabKey(dpy, code, key[i].mod | numlockmask | LockMask, root, True,
 				GrabModeAsync, GrabModeAsync);
 	}
 }
diff --git a/main.c b/main.c
index 2df9683..8699284 100644
--- a/main.c
+++ b/main.c
@@ -11,6 +11,7 @@
 #include <unistd.h>
 #include <sys/select.h>
 #include <X11/cursorfont.h>
+#include <X11/keysym.h>
 #include <X11/Xatom.h>
 #include <X11/Xproto.h>
 
@@ -85,7 +86,7 @@ xerrorstart(Display *dsply, XErrorEvent *ee)
 char stext[1024];
 Bool *seltag;
 int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
-unsigned int ntags;
+unsigned int ntags, numlockmask;
 Atom wmatom[WMLast], netatom[NetLast];
 Bool running = True;
 Bool issel = True;
@@ -162,12 +163,13 @@ xerror(Display *dpy, XErrorEvent *ee)
 int
 main(int argc, char *argv[])
 {
-	int i, xfd;
+	int i, j, xfd;
 	unsigned int mask;
 	fd_set rd;
 	Bool readin = True;
 	Window w;
 	XEvent ev;
+	XModifierKeymap *modmap;
 	XSetWindowAttributes wa;
 
 	if(argc == 2 && !strncmp("-v", argv[1], 3)) {
@@ -211,7 +213,16 @@ main(int argc, char *argv[])
 	cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
 	cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
 
-	wa.event_mask = SubstructureRedirectMask | EnterWindowMask | LeaveWindowMask;
+	modmap = XGetModifierMapping(dpy);
+	for (i = 0; i < 8; i++) {
+		for (j = 0; j < modmap->max_keypermod; j++) {
+			if(modmap->modifiermap[i * modmap->max_keypermod + j] == XKeysymToKeycode(dpy, XK_Num_Lock))
+				numlockmask = (1 << i);
+		}
+	}
+	XFree(modmap);
+
+	wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask | EnterWindowMask | LeaveWindowMask;
 	wa.cursor = cursor[CurNormal];
 	XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
 
@@ -233,13 +244,12 @@ main(int argc, char *argv[])
 	sh = DisplayHeight(dpy, screen);
 	mw = (sw * MASTERW) / 100;
 
-	wa.override_redirect = 1;
-	wa.background_pixmap = ParentRelative;
-	wa.event_mask = ButtonPressMask | ExposureMask;
-
 	bx = by = 0;
 	bw = sw;
 	dc.h = bh = dc.font.height + 4;
+	wa.override_redirect = 1;
+	wa.background_pixmap = ParentRelative;
+	wa.event_mask = ButtonPressMask | ExposureMask;
 	barwin = XCreateWindow(dpy, root, bx, by, bw, bh, 0, DefaultDepth(dpy, screen),
 			CopyFromParent, DefaultVisual(dpy, screen),
 			CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
@@ -258,6 +268,7 @@ main(int argc, char *argv[])
 
 	/* main event loop, also reads status text from stdin */
 	XSync(dpy, False);
+	goto XLoop;
 	while(running) {
 		FD_ZERO(&rd);
 		if(readin)
@@ -278,6 +289,7 @@ main(int argc, char *argv[])
 				drawstatus();
 			}
 			if(FD_ISSET(xfd, &rd)) {
+XLoop:
 				while(XPending(dpy)) {
 					XNextEvent(dpy, &ev);
 					if(handler[ev.type])
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2025-07-27 23:43:01 +0000
ss="n">next) if(c->weight < min->weight) min = c; return min; } static void reorder() { Client *c, *newclients, *tail; newclients = tail = NULL; while((c = minclient())) { detach(c); if(tail) { c->prev = tail; tail->next = c; tail = c; } else tail = newclients = c; } clients = newclients; } /* extern */ void (*arrange)(Arg *) = DEFMODE; void detach(Client *c) { if(c->prev) c->prev->next = c->next; if(c->next) c->next->prev = c->prev; if(c == clients) clients = c->next; c->next = c->prev = NULL; } void dofloat(Arg *arg) { Client *c; maximized = False; for(c = clients; c; c = c->next) { if(isvisible(c)) { resize(c, True, TopLeft); } else ban(c); } if(!sel || !isvisible(sel)) focus(getnext(clients)); restack(); } void dotile(Arg *arg) { int h, i, n, w; Client *c; maximized = False; w = sw - mw; for(n = 0, c = clients; c; c = c->next) if(isvisible(c) && !c->isfloat) n++; if(n > 1) h = (sh - bh) / (n - 1); else h = sh - bh; for(i = 0, c = clients; c; c = c->next) { if(isvisible(c)) { if(c->isfloat) { resize(c, True, TopLeft); continue; } if(n == 1) { c->x = sx; c->y = sy + bh; c->w = sw - 2; c->h = sh - 2 - bh; } else if(i == 0) { c->x = sx; c->y = sy + bh; c->w = mw - 2; c->h = sh - 2 - bh; } else if(h > bh) { c->x = sx + mw; c->y = sy + (i - 1) * h + bh; c->w = w - 2; if(i + 1 == n) c->h = sh - c->y - 2; else c->h = h - 2; } else { /* fallback if h < bh */ c->x = sx + mw; c->y = sy + bh; c->w = w - 2; c->h = sh - 2 - bh; } resize(c, False, TopLeft); i++; } else ban(c); } if(!sel || !isvisible(sel)) focus(getnext(clients)); restack(); } void focusnext(Arg *arg) { Client *c; if(!sel) return; if(!(c = getnext(sel->next))) c = getnext(clients); if(c) { focus(c); restack(); } } void focusprev(Arg *arg) { Client *c; if(!sel) return; if(!(c = getprev(sel->prev))) { for(c = clients; c && c->next; c = c->next); c = getprev(c); } if(c) { focus(c); restack(); } } Bool isvisible(Client *c) { unsigned int i; for(i = 0; i < ntags; i++) if(c->tags[i] && seltag[i]) return True; return False; } void restack() { static unsigned int nwins = 0; static Window *wins = NULL; unsigned int f, fi, m, mi, n; Client *c; XEvent ev; for(f = 0, m = 0, c = clients; c; c = c->next) if(isvisible(c)) { if(c->isfloat || arrange == dofloat) f++; else m++; } if(!(n = 2 * (f + m))) { drawstatus(); return; } if(nwins < n) { nwins = n; wins = erealloc(wins, nwins * sizeof(Window)); } fi = 0; mi = 2 * f; if(sel->isfloat || arrange == dofloat) { wins[fi++] = sel->twin; wins[fi++] = sel->win; } else { wins[mi++] = sel->twin; wins[mi++] = sel->win; } for(c = clients; c; c = c->next) if(isvisible(c) && c != sel) { if(c->isfloat || arrange == dofloat) { wins[fi++] = c->twin; wins[fi++] = c->win; } else { wins[mi++] = c->twin; wins[mi++] = c->win; } } XRestackWindows(dpy, wins, n); drawall(); XSync(dpy, False); while(XCheckMaskEvent(dpy, EnterWindowMask, &ev)); } void togglemode(Arg *arg) { arrange = (arrange == dofloat) ? dotile : dofloat; if(sel) arrange(NULL); else drawstatus(); } void toggleview(Arg *arg) { unsigned int i; seltag[arg->i] = !seltag[arg->i]; for(i = 0; i < ntags && !seltag[i]; i++); if(i == ntags) seltag[arg->i] = True; /* cannot toggle last view */ reorder(); arrange(NULL); } void view(Arg *arg) { unsigned int i; for(i = 0; i < ntags; i++) seltag[i] = False; seltag[arg->i] = True; reorder(); arrange(NULL); } void viewall(Arg *arg) { unsigned int i; for(i = 0; i < ntags; i++) seltag[i] = True; reorder(); arrange(NULL); } void zoom(Arg *arg) { Client *c = sel; if(!c || (arrange != dotile) || c->isfloat || maximized) return; if(c == getnext(clients)) if(!(c = getnext(c->next))) return; detach(c); c->next = clients; clients->prev = c; clients = c; focus(c); arrange(NULL); }
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2025-07-27 23:43:01 +0000