dwm: comparison dwm.c

equal deleted inserted replaced

-:55e2f7e96b71
+:227f2d07c63f
 	int minax, maxax, minay, maxay;
 	long flags;
 	unsigned int border, oldborder;
 	Bool isbanned, isfixed, isfloating, isurgent;
 	Bool *tags;
-	View *view;
 	Client *next;
 	Client *prev;
 	Client *snext;
 	Window win;
 };
 	Layout *layout;
 	Window barwin;
 };
 /* function declarations */
-void addtag(Client *c, const char *t);
 void applyrules(Client *c);
 void arrange(void);
 void attach(Client *c);
 void attachstack(Client *c);
 void ban(Client *c);
 void checkotherwm(void);
 void cleanup(void);
 void configure(Client *c);
 void configurenotify(XEvent *e);
 void configurerequest(XEvent *e);
+Bool conflicts(Client *c, unsigned int tidx);
 void destroynotify(XEvent *e);
 void detach(Client *c);
 void detachstack(Client *c);
 void drawbar(View *v);
 void drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]);
 void drawtext(const char *text, unsigned long col[ColLast], Bool invert);
 void *emallocz(unsigned int size);
 void enternotify(XEvent *e);
 void eprint(const char *errstr, ...);
 void expose(XEvent *e);
+unsigned int firstag(View *v);
 void floating(View *v); /* default floating layout */
 void focus(Client *c);
 void focusin(XEvent *e);
 void focusnext(const char *arg);
 void focusprev(const char *arg);
 Client *getclient(Window w);
 unsigned long getcolor(const char *colstr);
+View *getview(Client *c);
 View *getviewbar(Window barwin);
 long getstate(Window w);
 Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
 void grabbuttons(Client *c, Bool focused);
 void grabkeys(void);
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 #define TAGSZ (LENGTH(tags) * sizeof(Bool))
 /* function implementations */
-void
-addtag(Client *c, const char *t) {
-	unsigned int i, tidx = idxoftag(t);
-	for(i = 0; i < LENGTH(tags); i++)
-		if(c->tags[i] && vtags[i] != vtags[tidx])
-			return; /* conflict */
-	c->tags[tidx] = True;
-	c->view = &views[vtags[tidx]];
-}
 void
 applyrules(Client *c) {
-	unsigned int i;
+	unsigned int i, idx;
 	Bool matched = False;
 	Rule *r;
 	XClassHint ch = { 0 };
 	/* rule matching */
 		if(strstr(c->name, r->prop)
 		|| (ch.res_class && strstr(ch.res_class, r->prop))
 		|| (ch.res_name && strstr(ch.res_name, r->prop)))
 		{
 			c->isfloating = r->isfloating;
-			if(r->tag) {
+			if(r->tag && !conflicts(c, (idx = idxoftag(r->tag)))) {
-				addtag(c, r->tag);
+				c->tags[idx] = True;
 				matched = True;
 			}
 		}
 	}
 	if(ch.res_class)
 		XFree(ch.res_class);
 	if(ch.res_name)
 		XFree(ch.res_name);
 	if(!matched) {
-		memcpy(c->tags, seltags, TAGSZ);
+		for(i = 0; i < LENGTH(tags); i++)
-		c->view = selview;
+			if(seltags[i] && vtags[i] == selview->id)
+				c->tags[i] = True;
 	}
 }
 void
 arrange(void) {
 void
 ban(Client *c) {
 	if(c->isbanned)
 		return;
-	XMoveWindow(dpy, c->win, c->x + 3 * c->view->w, c->y);
+	XMoveWindow(dpy, c->win, c->x + 3 * getview(c)->w, c->y);
 	c->isbanned = True;
 }
 void
 buttonpress(XEvent *e) {
 	else if((c = getclient(ev->window))) {
 		focus(c);
 		if(CLEANMASK(ev->state) != MODKEY)
 			return;
 		if(ev->button == Button1) {
-			restack(c->view);
+			restack(getview(c));
 			movemouse(c);
 		}
 		else if(ev->button == Button2) {
-			if((floating != c->view->layout->arrange) && c->isfloating)
+			if((floating != getview(c)->layout->arrange) && c->isfloating)
 				togglefloating(NULL);
 			else
 				zoom(NULL);
 		}
 		else if(ev->button == Button3 && !c->isfixed) {
-			restack(c->view);
+			restack(getview(c));
 			resizemouse(c);
 		}
 	}
 }
 	Client *c;
 	XConfigureRequestEvent *ev = &e->xconfigurerequest;
 	XWindowChanges wc;
 	if((c = getclient(ev->window))) {
-		View *v = c->view;
+		View *v = getview(c);
 		if(ev->value_mask & CWBorderWidth)
 			c->border = ev->border_width;
 		if(c->isfixed || c->isfloating || (floating == v->layout->arrange)) {
 			if(ev->value_mask & CWX)
 				c->x = v->x + ev->x;
 		XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
 	}
 	XSync(dpy, False);
 }
+Bool
+conflicts(Client *c, unsigned int tidx) {
+	unsigned int i;
+	for(i = 0; i < LENGTH(tags); i++)
+		if(c->tags[i] && vtags[i] != vtags[tidx])
+			return True; /* conflict */
+	return False;
+}
 void
 destroynotify(XEvent *e) {
 	Client *c;
 	XDestroyWindowEvent *ev = &e->xdestroywindow;
 drawbar(View *v) {
 	int i, x;
 	Client *c;
 	dc.x = 0;
-	for(c = stack; c && (!isvisible(c) || c->view != v); c = c->snext);
+	for(c = stack; c && (!isvisible(c) || getview(c) != v); c = c->snext);
 	for(i = 0; i < LENGTH(tags); i++) {
 		if(&views[vtags[i]] != v)
 			continue;
 		dc.w = textw(tags[i]);
 		if(seltags[i]) {
 	if(ev->count == 0 && ((v = getviewbar(ev->window))))
 		drawbar(v);
 }
+unsigned int
+firstag(View *v) {
+	unsigned int i;
+	for(i = 0; i < LENGTH(tags); i++)
+		if(vtags[i] == v->id)
+			return i;
+	return 0; /* safe fallback */
+}
 void
 floating(View *v) { /* default floating layout */
 	Client *c;
 	domwfact = dozoom = False;
 void
 focus(Client *c) {
 	View *v = selview;
 	if(c)
-		selview = c->view;
+		selview = getview(c);
-	else
-		selview = viewat();
 	if(selview != v)
 		drawbar(v);
 	if(!c || (c && !isvisible(c)))
-		for(c = stack; c && (!isvisible(c) || c->view != selview); c = c->snext);
+		/* TODO: isvisible might take getview(c) as constraint? */
+		for(c = stack; c && (!isvisible(c) || getview(c) != selview); c = c->snext);
 	if(sel && sel != c) {
 		grabbuttons(sel, False);
 		XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
 	}
 	if(c) {
 	}
 	sel = c;
 	if(c) {
 		XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
 		XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
-		selview = c->view;
+		selview = getview(c);
 	}
 	else
 		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
 	drawbar(selview);
 }
 	for(c = sel->next; c && !isvisible(c); c = c->next);
 	if(!c)
 		for(c = clients; c && !isvisible(c); c = c->next);
 	if(c) {
 		focus(c);
-		restack(c->view);
+		restack(getview(c));
 	}
 }
 void
 focusprev(const char *arg) {
 		for(c = clients; c && c->next; c = c->next);
 		for(; c && !isvisible(c); c = c->prev);
 	}
 	if(c) {
 		focus(c);
-		restack(c->view);
+		restack(getview(c));
 	}
 }
 Client *
 getclient(Window w) {
 	XColor color;
 	if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
 		eprint("error, cannot allocate color '%s'\n", colstr);
 	return color.pixel;
+}
+View *
+getview(Client *c) {
+	unsigned int i;
+	for(i = 0; i < LENGTH(tags); i++)
+		if(c->tags[i])
+			return &views[vtags[i]];
+	return NULL;
 }
 View *
 getviewbar(Window barwin) {
 	unsigned int i;
 unsigned int
 idxoftag(const char *t) {
 	unsigned int i;
 	for(i = 0; (i < LENGTH(tags)) && (tags[i] != t); i++);
-	return (i < LENGTH(tags)) ? i : 0;
+	return (i < LENGTH(tags)) ? i : firstag(selview);
 }
 void
 initfont(const char *fontstr) {
 	char *def, **missing;
 	c->tags = emallocz(TAGSZ);
 	c->win = w;
 	applyrules(c);
-	v = c->view;
+	v = getview(c);
 	c->x = wa->x + v->x;
 	c->y = wa->y + v->y;
 	c->w = wa->width;
 	c->h = wa->height;
 	Window dummy;
 	XEvent ev;
 	ocx = nx = c->x;
 	ocy = ny = c->y;
-	v = c->view;
+	v = getview(c);
 	if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
 			None, cursor[CurMove], CurrentTime) != GrabSuccess)
 		return;
 	XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
 	for(;;) {
 	}
 }
 Client *
 nexttiled(Client *c, View *v) {
-	for(; c && (c->isfloating || c->view != v || !isvisible(c)); c = c->next);
+	for(; c && (c->isfloating || getview(c) != v || !isvisible(c)); c = c->next);
 	return c;
 }
 void
 propertynotify(XEvent *e) {
 		case XA_WM_NORMAL_HINTS:
 			updatesizehints(c);
 			break;
 		case XA_WM_HINTS:
 			updatewmhints(c);
-			drawbar(c->view);
+			drawbar(getview(c));
 			break;
 		}
 		if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
 			updatetitle(c);
 			if(c == sel)
 void
 resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 	View *v;
 	XWindowChanges wc;
-	v = c->view;
+	v = getview(c);
 	if(sizehints) {
 		/* set minimum possible */
 		if (w < 1)
 			w = 1;
 		if (h < 1)
 	View *v;
 	XEvent ev;
 	ocx = c->x;
 	ocy = c->y;
-	v = c->view;
+	v = getview(c);
 	if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
 			None, cursor[CurResize], CurrentTime) != GrabSuccess)
 		return;
 	XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->border - 1, c->h + c->border - 1);
 	for(;;) {
 			vtags[i] = 0;
 	for(i = 0; i < nviews; i++) {
 		/* init geometry */
 		v = &views[i];
+		v->id = i;
-		/* select first tag in each view */
-		for(j = 0; j < LENGTH(tags); j++)
+		/* select first tag of view */
-			if(vtags[j] == i) {
+		j = firstag(v);
-				seltags[j] = prevtags[j] = True;
+		seltags[j] = prevtags[j] = True;
-				break;
-			}
 		if(info) {
 #if defined(AIM_XINERAMA)
 v->w = DisplayWidth(dpy, screen) / 2;
 	unsigned int i;
 	if(!sel)
 		return;
 	for(i = 0; i < LENGTH(tags); i++)
-		sel->tags[i] = (NULL == arg);
+		sel->tags[i] = (NULL == arg) && (vtags[i] == getview(sel)->id);
-	sel->tags[idxoftag(arg)] = True;
+	i = idxoftag(arg);
+	if(!conflicts(sel, i))
+		sel->tags[idxoftag(arg)] = True;
 	arrange();
 }
 unsigned int
 textnw(const char *text, unsigned int len) {
 	unsigned int i, j;
 	if(!sel)
 		return;
 	i = idxoftag(arg);
+	if(conflicts(sel, i))
+		return;
 	sel->tags[i] = !sel->tags[i];
 	for(j = 0; j < LENGTH(tags) && !sel->tags[j]; j++);
 	if(j == LENGTH(tags))
 		sel->tags[i] = True; /* at least one tag must be enabled */
 	arrange();
 	}
 }
 void
 view(const char *arg) {
-	unsigned int i;
+	unsigned int i, j;
 	Bool tmp[LENGTH(tags)];
-	for(i = 0; i < LENGTH(tags); i++)
+	memcpy(tmp, seltags, TAGSZ);
-		tmp[i] = (NULL == arg);
+	if(arg == NULL) {
-	tmp[idxoftag(arg)] = True;
+		for(i = 0; i < LENGTH(tags); i++)
+			tmp[i] = (vtags[i] == selview->id);
+	}
+	else {
+		i = idxoftag(arg);
+		for(j = 0; j < LENGTH(tags); j++)
+			if(selview->id == vtags[i]) {
+				/* view tag of selview */
+				if(selview->id == vtags[j])
+					tmp[j] = False;
+			}
+			else {
+				/* only touch the view the focus should go */
+				if(vtags[j] == vtags[i])
+					tmp[j] = False;
+			}
+		selview = &views[vtags[i]];
+		tmp[i] = True;
+	}
 	if(memcmp(seltags, tmp, TAGSZ) != 0) {
 		memcpy(prevtags, seltags, TAGSZ);
 		memcpy(seltags, tmp, TAGSZ);
 		arrange();
 	}
 zoom(const char *arg) {
 	Client *c = sel;
 	if(!sel || !dozoom || sel->isfloating)
 		return;
-	if(c == nexttiled(clients, c->view))
+	if(c == nexttiled(clients, getview(c)))
-		if(!(c = nexttiled(c->next, c->view)))
+		if(!(c = nexttiled(c->next, getview(c))))
 			return;
 	detach(c);
 	attach(c);
 	focus(c);
 	arrange();

changeset 1110	227f2d07c63f
parent 1109	55e2f7e96b71
child 1112	27d2e0f4ff82