dwm: comparison dwm.c

equal deleted inserted replaced

-:084b17f96d9b
+:589074fac88d
 	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;
 };
 	const char *prop;
 	const char *tag;
 	Bool isfloating;
 } Rule;
-typedef struct {
-	const char name[MAXTAGLEN];
-	unsigned int view;
-} Tag;
 struct View {
+	unsigned int id;
 	int x, y, w, h, wax, way, wah, waw;
 	double mwfact;
 	Layout *layout;
 	Window barwin;
 };
 void configurerequest(XEvent *e);
 void destroynotify(XEvent *e);
 void detach(Client *c);
 void detachstack(Client *c);
 void drawbar(View *v);
-void drawsquare(View *v, Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]);
+void drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]);
-void drawtext(View *v, const char *text, unsigned long col[ColLast], Bool invert);
+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);
 void floating(View *v); /* default floating layout */
 void focusnext(const char *arg);
 void focusprev(const char *arg);
 Client *getclient(Window w);
 unsigned long getcolor(const char *colstr);
 View *getviewbar(Window barwin);
-View *getview(Client *c);
 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 selectview(const char *arg);
 /* variables */
 char stext[256], buf[256];
 int nviews = 1;
-View *selview;
 int screen;
 int (*xerrorxlib)(Display *, XErrorEvent *);
 unsigned int bh, bpos;
 unsigned int blw = 0;
 unsigned int numlockmask = 0;
 Client *stack = NULL;
 Cursor cursor[CurLast];
 Display *dpy;
 DC dc = {0};
 View *views;
+View *selview;
 Window root;
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 	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;
 	}
 	if(ch.res_class)
 		XFree(ch.res_class);
 	if(ch.res_name)
 		XFree(ch.res_name);
-	if(!matched)
+	if(!matched) {
 		memcpy(c->tags, seltags, sizeof initags);
+		c->view = selview;
+	}
 }
 void
 void
 ban(Client *c) {
 	if(c->isbanned)
 		return;
-	XMoveWindow(dpy, c->win, c->x + 3 * getview(c)->w, c->y);
+	XMoveWindow(dpy, c->win, c->x + 3 * c->view->w, c->y);
 	c->isbanned = True;
 }
 void
 buttonpress(XEvent *e) {
 	unsigned int i, x;
 	Client *c;
 	XButtonPressedEvent *ev = &e->xbutton;
-	View *v = selview;
+	if(ev->window == selview->barwin) {
-	if(ev->window == v->barwin) {
 		x = 0;
 		for(i = 0; i < LENGTH(tags); i++) {
 			x += textw(tags[i]);
 			if(ev->x < x) {
 				if(ev->button == Button1) {
 	else if((c = getclient(ev->window))) {
 		focus(c);
 		if(CLEANMASK(ev->state) != MODKEY)
 			return;
 		if(ev->button == Button1) {
-			restack(getview(c));
+			restack(c->view);
 			movemouse(c);
 		}
 		else if(ev->button == Button2) {
-			if((floating != v->layout->arrange) && c->isfloating)
+			if((floating != c->view->layout->arrange) && c->isfloating)
 				togglefloating(NULL);
 			else
 				zoom(NULL);
 		}
 		else if(ev->button == Button3 && !c->isfixed) {
-			restack(getview(c));
+			restack(c->view);
 			resizemouse(c);
 		}
 	}
 }
 		v->w = ev->width;
 		v->h = ev->height;
 		XFreePixmap(dpy, dc.drawable);
 		dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(root, screen), bh, DefaultDepth(dpy, screen));
 		XResizeWindow(dpy, v->barwin, v->w, bh);
-		updatebarpos(v);
+		updatebarpos(selview);
 		arrange();
 	}
 }
 void
 	Client *c;
 	XConfigureRequestEvent *ev = &e->xconfigurerequest;
 	XWindowChanges wc;
 	if((c = getclient(ev->window))) {
-		View *v = getview(c);
+		View *v = c->view;
 		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;
 drawbar(View *v) {
 	int i, x;
 	Client *c;
 	dc.x = 0;
-	for(c = stack; c && (!isvisible(c) || getview(c) != v); c = c->snext);
+	for(c = stack; c && (!isvisible(c) || c->view != 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]) {
-			drawtext(v, tags[i], dc.sel, isurgent(i));
+			drawtext(tags[i], dc.sel, isurgent(i));
-			drawsquare(v, c && c->tags[i], isoccupied(i), isurgent(i), dc.sel);
+			drawsquare(c && c->tags[i], isoccupied(i), isurgent(i), dc.sel);
 		}
 		else {
-			drawtext(v, tags[i], dc.norm, isurgent(i));
+			drawtext(tags[i], dc.norm, isurgent(i));
-			drawsquare(v, c && c->tags[i], isoccupied(i), isurgent(i), dc.norm);
+			drawsquare(c && c->tags[i], isoccupied(i), isurgent(i), dc.norm);
 		}
 		dc.x += dc.w;
 	}
 	dc.w = blw;
-	drawtext(v, v->layout->symbol, dc.norm, False);
+	drawtext(v->layout->symbol, dc.norm, False);
 	x = dc.x + dc.w;
 	if(v == selview) {
 		dc.w = textw(stext);
 		dc.x = v->w - dc.w;
 		if(dc.x < x) {
 			dc.x = x;
 			dc.w = v->w - x;
 		}
-		drawtext(v, stext, dc.norm, False);
+		drawtext(stext, dc.norm, False);
 	}
 	else
 		dc.x = v->w;
 	if((dc.w = dc.x - x) > bh) {
 		dc.x = x;
 		if(c) {
-			drawtext(v, c->name, dc.sel, False);
+			drawtext(c->name, dc.sel, False);
-			drawsquare(v, False, c->isfloating, False, dc.sel);
+			drawsquare(False, c->isfloating, False, dc.sel);
 		}
 		else
-			drawtext(v, NULL, dc.norm, False);
+			drawtext(NULL, dc.norm, False);
 	}
 	XCopyArea(dpy, dc.drawable, v->barwin, dc.gc, 0, 0, v->w, bh, 0, 0);
 	XSync(dpy, False);
 }
 void
-drawsquare(View *v, Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
+drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
 	int x;
 	XGCValues gcv;
 	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 	gcv.foreground = col[invert ? ColBG : ColFG];
 		XDrawRectangles(dpy, dc.drawable, dc.gc, &r, 1);
 	}
 }
 void
-drawtext(View *v, const char *text, unsigned long col[ColLast], Bool invert) {
+drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
 	int x, y, w, h;
 	unsigned int len, olen;
 	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 	XSetForeground(dpy, dc.gc, col[invert ? ColFG : ColBG]);
 void
 expose(XEvent *e) {
 	View *v;
 	XExposeEvent *ev = &e->xexpose;
-	if(ev->count == 0 && (v = getviewbar(ev->window)))
+	if(ev->count == 0 && ((v = getviewbar(ev->window))))
 		drawbar(v);
 }
 void
 floating(View *v) { /* default floating layout */
 void
 focus(Client *c) {
 	View *v = selview;
 	if(c)
-		selview = getview(c);
+		selview = c->view;
 	else
 		selview = viewat();
 	if(selview != v)
 		drawbar(v);
 	if(!c || (c && !isvisible(c)))
-		for(c = stack; c && (!isvisible(c) || getview(c) != selview); c = c->snext);
+		for(c = stack; c && (!isvisible(c) || c->view != 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 = getview(c);
+		selview = c->view;
 	}
 	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(getview(c));
+		restack(c->view);
 	}
 }
 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(getview(c));
+		restack(c->view);
 	}
 }
 Client *
 getclient(Window w) {
 	for(i = 0; i < nviews; i++)
 		if(views[i].barwin == barwin)
 			return &views[i];
 	return NULL;
-}
-View *
-getview(Client *c) {
-	unsigned int i;
-	for(i = 0; i < LENGTH(tags); i++)
-		if(c->tags[i])
-			return &views[c->tags[i] - 1];
-	return &views[0]; /* fallback */
 }
 long
 getstate(Window w) {
 	int format, status;
 	c->tags = emallocz(sizeof initags);
 	c->win = w;
 	applyrules(c);
-	v = getview(c);
+	v = c->view;
 	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 = getview(c);
+	v = c->view;
 	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 || getview(c) != v || !isvisible(c)); c = c->next);
+	for(; c && (c->isfloating || c->view != 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(getview(c));
+			drawbar(c->view);
 			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 = getview(c);
+	v = c->view;
 	if(sizehints) {
 		/* set minimum possible */
 		if (w < 1)
 			w = 1;
 		if (h < 1)
 	View *v;
 	XEvent ev;
 	ocx = c->x;
 	ocy = c->y;
-	v = getview(c);
+	v = c->view;
 	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(;;) {
 		v->layout = &layouts[i];
 	}
 	if(sel)
 		arrange();
 	else
-		drawbar(v);
+		drawbar(selview);
 }
 void
 setmwfact(const char *arg) {
 	double delta;
 	View *v = selview;
 	if(!domwfact)
 		return;
 	/* arg handling, manipulate mwfact */
 		info = XineramaQueryScreens(dpy, &nviews);
 #if defined(AIM_XINERAMA)
 isxinerama = True;
 nviews = 2; /* aim Xinerama */
 #endif
-	selview = views = emallocz(nviews * sizeof(View));
+	views = emallocz(nviews * sizeof(View));
 	screen = DefaultScreen(dpy);
 	root = RootWindow(dpy, screen);
 	/* init appearance */
 		drawbar(v);
 	}
 	if(info)
 		XFree(info);
+	selview = viewat();
 	/* grab keys */
 	grabkeys();
-	selview = &views[0];
 }
 void
 spawn(const char *arg) {
 	static char *shell = NULL;
 zoom(const char *arg) {
 	Client *c = sel;
 	if(!sel || !dozoom || sel->isfloating)
 		return;
-	if(c == nexttiled(clients, getview(c)))
+	if(c == nexttiled(clients, c->view))
-		if(!(c = nexttiled(c->next, getview(c))))
+		if(!(c = nexttiled(c->next, c->view)))
 			return;
 	detach(c);
 	attach(c);
 	focus(c);
 	arrange();

changeset 1107	589074fac88d
parent 1106	084b17f96d9b
child 1108	aab1c3addbaf