dwm: comparison dwm.c

equal deleted inserted replaced

-:cd9fd0986555
+:47496de04028
 #define BUTTONMASK      (ButtonPressMask|ButtonReleaseMask)
 #define CLEANMASK(mask) (mask & ~(numlockmask|LockMask))
 #define LENGTH(x)       (sizeof x / sizeof x[0])
 #define MAXTAGLEN       16
 #define MOUSEMASK       (BUTTONMASK|PointerMotionMask)
+#define TAGMASK         ((int)((1LL << LENGTH(tags)) - 1))
 /* enums */
 enum { CurNormal, CurResize, CurMove, CurLast };        /* cursor */
 enum { ColBorder, ColFG, ColBG, ColLast };              /* color */
 enum { NetSupported, NetWMName, NetLast };              /* EWMH atoms */
 	int basew, baseh, incw, inch, maxw, maxh, minw, minh;
 	int minax, maxax, minay, maxay;
 	long flags;
 	unsigned int bw, oldbw;
 	Bool isbanned, isfixed, isfloating, isurgent;
-	Bool *tags;
+	unsigned int tags;
 	Client *next;
 	Client *prev;
 	Client *snext;
 	Window win;
 };
 } DC; /* draw context */
 typedef struct {
 	unsigned long mod;
 	KeySym keysym;
-	void (*func)(const char *arg);
+	void (*func)(void *arg);
-	const char *arg;
+	void *arg;
 } Key;
 typedef struct {
 	const char *symbol;
 	void (*arrange)(void);
 typedef struct {
 	const char *class;
 	const char *instance;
 	const char *title;
-	const char *tag;
+	unsigned int tags;
 	Bool isfloating;
 } Rule;
 /* function declarations */
 void applyrules(Client *c);
 void enternotify(XEvent *e);
 void eprint(const char *errstr, ...);
 void expose(XEvent *e);
 void focus(Client *c);
 void focusin(XEvent *e);
-void focusnext(const char *arg);
+void focusnext(void *arg);
-void focusprev(const char *arg);
+void focusprev(void *arg);
 Client *getclient(Window w);
 unsigned long getcolor(const char *colstr);
 long getstate(Window w);
 Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
 void grabbuttons(Client *c, Bool focused);
 void grabkeys(void);
-unsigned int idxoftag(const char *t);
 void initfont(const char *fontstr);
 Bool isoccupied(unsigned int t);
 Bool isprotodel(Client *c);
 Bool isurgent(unsigned int t);
 Bool isvisible(Client *c);
 void keypress(XEvent *e);
-void killclient(const char *arg);
+void killclient(void *arg);
 void manage(Window w, XWindowAttributes *wa);
 void mappingnotify(XEvent *e);
 void maprequest(XEvent *e);
 void movemouse(Client *c);
 Client *nextunfloating(Client *c);
 void propertynotify(XEvent *e);
-void quit(const char *arg);
+void quit(void *arg);
 void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
 void resizemouse(Client *c);
 void restack(void);
 void run(void);
 void scan(void);
 void setclientstate(Client *c, long state);
-void setmfact(const char *arg);
+void setmfact(void *arg);
 void setup(void);
-void spawn(const char *arg);
+void spawn(void *arg);
-void tag(const char *arg);
+void tag(void *arg);
 unsigned int textnw(const char *text, unsigned int len);
 unsigned int textw(const char *text);
 void tile(void);
 void tileresize(Client *c, int x, int y, int w, int h);
-void togglebar(const char *arg);
+void togglebar(void *arg);
-void togglefloating(const char *arg);
+void togglefloating(void *arg);
-void togglelayout(const char *arg);
+void togglelayout(void *arg);
-void toggletag(const char *arg);
+void toggletag(void *arg);
-void toggleview(const char *arg);
+void toggleview(void *arg);
 void unban(Client *c);
 void unmanage(Client *c);
 void unmapnotify(XEvent *e);
 void updatebar(void);
 void updategeom(void);
 void updatesizehints(Client *c);
 void updatetilegeom(void);
 void updatetitle(Client *c);
 void updatewmhints(Client *c);
-void view(const char *arg);
+void view(void *arg);
-void viewprevtag(const char *arg);
+void viewprevtag(void *arg);
 int xerror(Display *dpy, XErrorEvent *ee);
 int xerrordummy(Display *dpy, XErrorEvent *ee);
 int xerrorstart(Display *dpy, XErrorEvent *ee);
-void zoom(const char *arg);
+void zoom(void *arg);
 /* variables */
 char stext[256];
 int screen, sx, sy, sw, sh;
 int bx, by, bw, bh, blw, wx, wy, ww, wh;
 int mx, my, mw, mh, tx, ty, tw, th;
-int seltags = 0;
+unsigned int seltags = 0;
 int (*xerrorxlib)(Display *, XErrorEvent *);
 unsigned int numlockmask = 0;
 void (*handler[LASTEvent]) (XEvent *) = {
 	[ButtonPress] = buttonpress,
 	[ConfigureRequest] = configurerequest,
 	[UnmapNotify] = unmapnotify
 };
 Atom wmatom[WMLast], netatom[NetLast];
 Bool otherwm, readin;
 Bool running = True;
-Bool *tagset[2];
+unsigned int tagset[] = {1, 1}; /* after start, first tag is selected */
 Client *clients = NULL;
 Client *sel = NULL;
 Client *stack = NULL;
 Cursor cursor[CurLast];
 Display *dpy;
 Layout *lt = layouts;
 Window root, barwin;
 /* configuration, allows nested code to access above variables */
 #include "config.h"
-#define TAGSZ (LENGTH(tags) * sizeof(Bool))
+/* check if all tags will fit into a unsigned int bitarray. */
+static char tags_is_a_sign_that_your_IQ[sizeof(int) * 8 < LENGTH(tags) ? -1 : 1];
 /* function implementations */
 void
 applyrules(Client *c) {
 	unsigned int i;
-	Bool matched = False;
 	Rule *r;
 	XClassHint ch = { 0 };
 	/* rule matching */
 	XGetClassHint(dpy, c->win, &ch);
 		r = &rules[i];
 		if((!r->title || strstr(c->name, r->title))
 		&& (!r->class || (ch.res_class && strstr(ch.res_class, r->class)))
 		&& (!r->instance || (ch.res_name && strstr(ch.res_name, r->instance)))) {
 			c->isfloating = r->isfloating;
-			if(r->tag) {
+			c->tags |= r->tags & TAGMASK;
-				c->tags[idxoftag(r->tag)] = True;
-				matched = True;
-			}
 		}
 	}
 	if(ch.res_class)
 		XFree(ch.res_class);
 	if(ch.res_name)
 		XFree(ch.res_name);
-	if(!matched)
+	if(!c->tags)
-		memcpy(c->tags, tagset[seltags], TAGSZ);
+		c->tags = tagset[seltags];
 }
 void
 arrange(void) {
 	Client *c;
 	c->isbanned = True;
 }
 void
 buttonpress(XEvent *e) {
-	unsigned int i, x;
+	unsigned int i, x, mask;
 	Client *c;
 	XButtonPressedEvent *ev = &e->xbutton;
 	if(ev->window == barwin) {
 		x = 0;
 		for(i = 0; i < LENGTH(tags); i++) {
 			x += textw(tags[i]);
 			if(ev->x < x) {
+				mask = 1 << i;
 				if(ev->button == Button1) {
 					if(ev->state & MODKEY)
-						tag(tags[i]);
+						tag(&mask);
 					else
-						view(tags[i]);
+						view(&mask);
 				}
 				else if(ev->button == Button3) {
 					if(ev->state & MODKEY)
-						toggletag(tags[i]);
+						toggletag(&mask);
 					else
-						toggleview(tags[i]);
+						toggleview(&mask);
 				}
 				return;
 			}
 		}
 		if((ev->x < x + blw) && ev->button == Button1)
 	dc.x = 0;
 	for(c = stack; c && !isvisible(c); c = c->snext);
 	for(i = 0; i < LENGTH(tags); i++) {
 		dc.w = textw(tags[i]);
-		if(tagset[seltags][i]) {
+		if(tagset[seltags] & 1 << i) {
 			drawtext(tags[i], dc.sel, isurgent(i));
-			drawsquare(c && c->tags[i], isoccupied(i), isurgent(i), dc.sel);
+			drawsquare(c && c->tags & 1 << i, isoccupied(i), isurgent(i), dc.sel);
 		}
 		else {
 			drawtext(tags[i], dc.norm, isurgent(i));
-			drawsquare(c && c->tags[i], isoccupied(i), isurgent(i), dc.norm);
+			drawsquare(c && c->tags & 1 << i, isoccupied(i), isurgent(i), dc.norm);
 		}
 		dc.x += dc.w;
 	}
 	if(blw > 0) {
 		dc.w = blw;
 	if(sel && ev->window != sel->win)
 		XSetInputFocus(dpy, sel->win, RevertToPointerRoot, CurrentTime);
 }
 void
-focusnext(const char *arg) {
+focusnext(void *arg) {
 	Client *c;
 	if(!sel)
 		return;
 	for(c = sel->next; c && !isvisible(c); c = c->next);
 		restack();
 	}
 }
 void
-focusprev(const char *arg) {
+focusprev(void *arg) {
 	Client *c;
 	if(!sel)
 		return;
 	for(c = sel->prev; c && !isvisible(c); c = c->prev);
 		XGrabKey(dpy, code, keys[i].mod|numlockmask|LockMask, root, True,
 				GrabModeAsync, GrabModeAsync);
 	}
 }
-unsigned int
-idxoftag(const char *t) {
-	unsigned int i;
-	for(i = 0; (i < LENGTH(tags)) && t && strcmp(tags[i], t); i++);
-	return (i < LENGTH(tags)) ? i : 0;
-}
 void
 initfont(const char *fontstr) {
 	char *def, **missing;
 	int i, n;
 Bool
 isoccupied(unsigned int t) {
 	Client *c;
 	for(c = clients; c; c = c->next)
-		if(c->tags[t])
+		if(c->tags & 1 << t)
 			return True;
 	return False;
 }
 Bool
 Bool
 isurgent(unsigned int t) {
 	Client *c;
 	for(c = clients; c; c = c->next)
-		if(c->isurgent && c->tags[t])
+		if(c->isurgent && c->tags & 1 << t)
 			return True;
 	return False;
 }
 Bool
 isvisible(Client *c) {
-	unsigned int i;
+	return c->tags & tagset[seltags];
-	for(i = 0; i < LENGTH(tags); i++)
-		if(c->tags[i] && tagset[seltags][i])
-			return True;
-	return False;
 }
 void
 keypress(XEvent *e) {
 	unsigned int i;
 				keys[i].func(keys[i].arg);
 		}
 }
 void
-killclient(const char *arg) {
+killclient(void *arg) {
 	XEvent ev;
 	if(!sel)
 		return;
 	if(isprotodel(sel)) {
 	Status rettrans;
 	Window trans;
 	XWindowChanges wc;
 	c = emallocz(sizeof(Client));
-	c->tags = emallocz(TAGSZ);
 	c->win = w;
 	/* geometry */
 	c->x = wa->x;
 	c->y = wa->y;
 	grabbuttons(c, False);
 	updatetitle(c);
 	if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
 		for(t = clients; t && t->win != trans; t = t->next);
 	if(t)
-		memcpy(c->tags, t->tags, TAGSZ);
+		c->tags = t->tags;
 	else
 		applyrules(c);
 	if(!c->isfloating)
 		c->isfloating = (rettrans == Success) || c->isfixed;
 	attach(c);
 		}
 	}
 }
 void
-quit(const char *arg) {
+quit(void *arg) {
 	readin = running = False;
 }
 void
 resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 	XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32,
 			PropModeReplace, (unsigned char *)data, 2);
 }
-void
+/* arg > 1.0 will set mfact absolutly */
-setmfact(const char *arg) {
+void
-	double d;
+setmfact(void *arg) {
+	double d = *((double*) arg);
-	if(!arg || lt->arrange != tile)
+	if(!d || lt->arrange != tile)
 		return;
-	else {
+	d = d < 1.0 ? d + mfact : d - 1.0;
-		d = strtod(arg, NULL);
+	if(d < 0.1 || d > 0.9)
-		if(arg[0] == '-' || arg[0] == '+')
+		return;
-			d += mfact;
+	mfact = d;
-		if(d < 0.1 || d > 0.9)
-			return;
-		mfact = d;
-	}
 	updatetilegeom();
 	arrange();
 }
 void
 	dc.gc = XCreateGC(dpy, root, 0, 0);
 	XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
 	if(!dc.font.set)
 		XSetFont(dpy, dc.gc, dc.font.xfont->fid);
-	/* init tags */
-	tagset[0] = emallocz(TAGSZ);
-	tagset[1] = emallocz(TAGSZ);
-	tagset[0][0] = tagset[1][0] = True;
 	/* init bar */
 	for(blw = i = 0; LENGTH(layouts) > 1 && i < LENGTH(layouts); i++) {
 		w = textw(layouts[i].symbol);
 		blw = MAX(blw, w);
 	}
 	/* grab keys */
 	grabkeys();
 }
 void
-spawn(const char *arg) {
+spawn(void *arg) {
 	static char *shell = NULL;
 	if(!shell && !(shell = getenv("SHELL")))
 		shell = "/bin/sh";
-	if(!arg)
-		return;
 	/* The double-fork construct avoids zombie processes and keeps the code
 	 * clean from stupid signal handlers. */
 	if(fork() == 0) {
 		if(fork() == 0) {
 			if(dpy)
 				close(ConnectionNumber(dpy));
 			setsid();
-			execl(shell, shell, "-c", arg, (char *)NULL);
+			execl(shell, shell, "-c", (char *)arg, (char *)NULL);
-			fprintf(stderr, "dwm: execl '%s -c %s'", shell, arg);
+			fprintf(stderr, "dwm: execl '%s -c %s'", shell, (char *)arg);
 			perror(" failed");
 		}
 		exit(0);
 	}
 	wait(0);
 }
 void
-tag(const char *arg) {
+tag(void *arg) {
-	unsigned int i;
+	if(sel && *(int *)arg & TAGMASK) {
+		sel->tags = *(int *)arg & TAGMASK;
-	if(!sel)
+		arrange();
-		return;
+	}
-	for(i = 0; i < LENGTH(tags); i++)
-		sel->tags[i] = (arg == NULL);
-	sel->tags[idxoftag(arg)] = True;
-	arrange();
 }
 unsigned int
 textnw(const char *text, unsigned int len) {
 	XRectangle r;
 		/* client doesn't accept size constraints */
 		resize(c, x, y, w, h, False);
 }
 void
-togglebar(const char *arg) {
+togglebar(void *arg) {
 	showbar = !showbar;
 	updategeom();
 	updatebar();
 	arrange();
 }
 void
-togglefloating(const char *arg) {
+togglefloating(void *arg) {
 	if(!sel)
 		return;
 	sel->isfloating = !sel->isfloating;
 	if(sel->isfloating)
 		resize(sel, sel->x, sel->y, sel->w, sel->h, True);
 	arrange();
 }
 void
-togglelayout(const char *arg) {
+togglelayout(void *arg) {
 	unsigned int i;
 	if(!arg) {
 		if(++lt == &layouts[LENGTH(layouts)])
 			lt = &layouts[0];
 	}
 	else {
 		for(i = 0; i < LENGTH(layouts); i++)
-			if(!strcmp(arg, layouts[i].symbol))
+			if(!strcmp((char *)arg, layouts[i].symbol))
 				break;
 		if(i == LENGTH(layouts))
 			return;
 		lt = &layouts[i];
 	}
 	else
 		drawbar();
 }
 void
-toggletag(const char *arg) {
+toggletag(void *arg) {
-	unsigned int i, j;
+	int i, m = *(int *)arg;
+	for(i = 0; i < sizeof(int) * 8; i++)
-	if(!sel)
+		fputc(m & 1 << i ? '1' : '0', stdout);
-		return;
+	puts("");
-	i = idxoftag(arg);
+	for(i = 0; i < sizeof(int) * 8; i++)
-	sel->tags[i] = !sel->tags[i];
+		fputc(TAGMASK & 1 << i ? '1' : '0', stdout);
-	for(j = 0; j < LENGTH(tags) && !sel->tags[j]; j++);
+	puts("aaa");
-	if(j == LENGTH(tags))
-		sel->tags[i] = True; /* at least one tag must be enabled */
+	if(sel && (sel->tags ^ ((*(int *)arg) & TAGMASK))) {
-	arrange();
+		sel->tags ^= (*(int *)arg) & TAGMASK;
-}
+		arrange();
+	}
-void
+}
-toggleview(const char *arg) {
-	unsigned int i, j;
+void
+toggleview(void *arg) {
-	i = idxoftag(arg);
+	if((tagset[seltags] ^ ((*(int *)arg) & TAGMASK))) {
-	tagset[seltags][i] = !tagset[seltags][i];
+		tagset[seltags] ^= (*(int *)arg) & TAGMASK;
-	for(j = 0; j < LENGTH(tags) && !tagset[seltags][j]; j++);
+		arrange();
-	if(j == LENGTH(tags))
+	}
-		tagset[seltags][i] = True; /* at least one tag must be viewed */
-	arrange();
 }
 void
 unban(Client *c) {
 	if(!c->isbanned)
 	detachstack(c);
 	if(sel == c)
 		focus(NULL);
 	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
 	setclientstate(c, WithdrawnState);
-	free(c->tags);
 	free(c);
 	XSync(dpy, False);
 	XSetErrorHandler(xerror);
 	XUngrabServer(dpy);
 	arrange();
 		XFree(wmh);
 	}
 }
 void
-view(const char *arg) {
+view(void *arg) {
-	seltags ^= 1; /* toggle sel tagset */
+	if(*(int *)arg & TAGMASK) {
-	memset(tagset[seltags], (NULL == arg), TAGSZ);
+		seltags ^= 1; /* toggle sel tagset */
-	tagset[seltags][idxoftag(arg)] = True;
+		tagset[seltags] = *(int *)arg & TAGMASK;
-	arrange();
+		arrange();
-}
+	}
+}
-void
-viewprevtag(const char *arg) {
+void
+viewprevtag(void *arg) {
 	seltags ^= 1; /* toggle sel tagset */
 	arrange();
 }
 /* There's no way to check accesses to destroyed windows, thus those cases are
 	otherwm = True;
 	return -1;
 }
 void
-zoom(const char *arg) {
+zoom(void *arg) {
 	Client *c = sel;
 	if(c == nextunfloating(clients))
 		if(!c || !(c = nextunfloating(c->next)))
 			return;

changeset 1224	47496de04028
parent 1223	cd9fd0986555
child 1225	6211d430f5da