dwm: comparison dwm.c

equal deleted inserted replaced

-:5170cc8c078e
+:0083ffeb95ee
 enum { ColBorder, ColFG, ColBG, ColLast };		/* color */
 enum { NetSupported, NetWMName, NetLast };		/* EWMH atoms */
 enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */
 /* typedefs */
+typedef struct Monitor Monitor;
 typedef struct Client Client;
 struct Client {
 	char name[256];
 	int x, y, w, h;
 	int basew, baseh, incw, inch, maxw, maxh, minw, minh;
 	Bool *tags;
 	Client *next;
 	Client *prev;
 	Client *snext;
 	Window win;
-	int monitor;
+	Monitor *monitor;
 };
 typedef struct {
 	int x, y, w, h;
 	unsigned long norm[ColLast];
 	KeySym keysym;
 	void (*func)(const char *arg);
 	const char *arg;
 } Key;
-typedef struct Monitor Monitor;
 typedef struct {
 	const char *symbol;
 	void (*arrange)(Monitor *);
 } Layout;
 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 *tag);
 void initfont(const char *fontstr);
-Bool isoccupied(unsigned int monitor, unsigned int t);
+Bool isoccupied(Monitor *monitor, unsigned int t);
 Bool isprotodel(Client *c);
-Bool isurgent(unsigned int monitor, unsigned int t);
+Bool isurgent(Monitor *monitor, unsigned int t);
-Bool isvisible(Client *c, int monitor);
+Bool isvisible(Client *c, Monitor *m);
 void keypress(XEvent *e);
 void killclient(const char *arg);
 void manage(Window w, XWindowAttributes *wa);
 void mappingnotify(XEvent *e);
 void maprequest(XEvent *e);
+Monitor *monitorat(void);
 void movemouse(Client *c);
-Client *nexttiled(Client *c, int monitor);
+Client *nexttiled(Client *c, Monitor *monitor);
 void propertynotify(XEvent *e);
 void quit(const char *arg);
 void reapply(const char *arg);
 void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
 void resizemouse(Client *c);
 void viewprevtag(const char *arg);	/* views previous selected tags */
 int xerror(Display *dpy, XErrorEvent *ee);
 int xerrordummy(Display *dsply, XErrorEvent *ee);
 int xerrorstart(Display *dsply, XErrorEvent *ee);
 void zoom(const char *arg);
-int monitorat(void);
 void movetomonitor(const char *arg);
 void selectmonitor(const char *arg);
 /* variables */
 char stext[256];
 int mcount = 1;
-int selmonitor = 0;
+Monitor *selmonitor;
 int screen;
 int (*xerrorxlib)(Display *, XErrorEvent *);
 unsigned int bh, bpos;
 unsigned int blw = 0;
 unsigned int numlockmask = 0;
 			ch.res_name ? ch.res_name : "", c->name);
 	for(i = 0; i < LENGTH(rules); i++)
 		if(regs[i].propregex && !regexec(regs[i].propregex, buf, 1, &tmp, 0)) {
 			if (rules[i].monitor >= 0 && rules[i].monitor < mcount) {
 				matched_monitor = True;
-				c->monitor = rules[i].monitor;
+				c->monitor = &monitors[rules[i].monitor];
 			}
 			c->isfloating = rules[i].isfloating;
 			for(j = 0; regs[i].tagregex && j < LENGTH(tags); j++) {
 				if(!regexec(regs[i].tagregex, tags[j], 1, &tmp, 0)) {
 	if(ch.res_class)
 		XFree(ch.res_class);
 	if(ch.res_name)
 		XFree(ch.res_name);
 	if(!matched_tag)
-		memcpy(c->tags, monitors[monitorat()].seltags, sizeof initags);
+		memcpy(c->tags, monitorat()->seltags, sizeof initags);
 	if (!matched_monitor)
 		c->monitor = monitorat();
 }
 void
 		if(isvisible(c, c->monitor))
 			unban(c);
 		else
 			ban(c);
-	monitors[selmonitor].layout->arrange(&monitors[selmonitor]);
+	selmonitor->layout->arrange(selmonitor);
 	focus(NULL);
-	restack(&monitors[selmonitor]);
+	restack(selmonitor);
 }
 void
 attach(Client *c) {
 	if(clients)
 void
 ban(Client *c) {
 	if(c->isbanned)
 		return;
-	XMoveWindow(dpy, c->win, c->x + 3 * monitors[c->monitor].sw, c->y);
+	XMoveWindow(dpy, c->win, c->x + 3 * c->monitor->sw, c->y);
 	c->isbanned = True;
 }
 void
 buttonpress(XEvent *e) {
 	unsigned int i, x;
 	Client *c;
 	XButtonPressedEvent *ev = &e->xbutton;
-	Monitor *m = &monitors[monitorat()];
+	Monitor *m = monitorat();
 	if(ev->window == m->barwin) {
 		x = 0;
 		for(i = 0; i < LENGTH(tags); i++) {
 			x += textw(tags[i]);
 	else if((c = getclient(ev->window))) {
 		focus(c);
 		if(CLEANMASK(ev->state) != MODKEY)
 			return;
 		if(ev->button == Button1) {
-			restack(&monitors[c->monitor]);
+			restack(c->monitor);
 			movemouse(c);
 		}
 		else if(ev->button == Button2) {
 			if((floating != m->layout->arrange) && c->isfloating)
 				togglefloating(NULL);
 			else
 				zoom(NULL);
 		}
 		else if(ev->button == Button3 && !c->isfixed) {
-			restack(&monitors[c->monitor]);
+			restack(c->monitor);
 			resizemouse(c);
 		}
 	}
 }
 }
 void
 configurenotify(XEvent *e) {
 	XConfigureEvent *ev = &e->xconfigure;
-	Monitor *m = &monitors[selmonitor];
+	Monitor *m = selmonitor;
 	if(ev->window == root && (ev->width != m->sw || ev->height != m->sh)) {
 		/* TODO -- update Xinerama dimensions here */
 		m->sw = ev->width;
 		m->sh = ev->height;
 	Client *c;
 	XConfigureRequestEvent *ev = &e->xconfigurerequest;
 	XWindowChanges wc;
 	if((c = getclient(ev->window))) {
-		Monitor *m = &monitors[c->monitor];
+		Monitor *m = c->monitor;
 		if(ev->value_mask & CWBorderWidth)
 			c->border = ev->border_width;
 		if(c->isfixed || c->isfloating || (floating == m->layout->arrange)) {
 			if(ev->value_mask & CWX)
 				c->x = m->sx+ev->x;
 drawbar(Monitor *m) {
 	int j, x;
 	Client *c;
 	dc.x = 0;
-	for(c = stack; c && !isvisible(c, m->id); c = c->snext);
+	for(c = stack; c && !isvisible(c, m); c = c->snext);
 	for(j = 0; j < LENGTH(tags); j++) {
 		dc.w = textw(tags[j]);
 		if(m->seltags[j]) {
-			drawtext(m, tags[j], dc.sel, isurgent(m->id, j));
+			drawtext(m, tags[j], dc.sel, isurgent(m, j));
-			drawsquare(m, c && c->tags[j] && c->monitor == m->id,
+			drawsquare(m, c && c->tags[j] && c->monitor == m,
-					isoccupied(m->id, j), isurgent(m->id, j), dc.sel);
+					isoccupied(m, j), isurgent(m, j), dc.sel);
 		}
 		else {
-			drawtext(m, tags[j], dc.norm, isurgent(m->id, j));
+			drawtext(m, tags[j], dc.norm, isurgent(m, j));
-			drawsquare(m, c && c->tags[j] && c->monitor == m->id,
+			drawsquare(m, c && c->tags[j] && c->monitor == m,
-					isoccupied(m->id, j), isurgent(m->id, j), dc.norm);
+					isoccupied(m, j), isurgent(m, j), dc.norm);
 		}
 		dc.x += dc.w;
 	}
 	dc.w = blw;
 	drawtext(m, m->layout->symbol, dc.norm, False);
 	x = dc.x + dc.w;
-	if(m->id == selmonitor) {
+	if(m == selmonitor) {
 		dc.w = textw(stext);
 		dc.x = m->sw - dc.w;
 		if(dc.x < x) {
 			dc.x = x;
 			dc.w = m->sw - x;
 	}
 	if((c = getclient(ev->window)))
 		focus(c);
 	else {
 		selmonitor = monitorat();
-		fprintf(stderr, "updating selmonitor %d\n", selmonitor);
+		fprintf(stderr, "updating selmonitor %d\n", selmonitor - monitors);
 		focus(NULL);
 	}
 }
 void
 floating(Monitor *m) { /* default floating layout */
 	Client *c;
 	domwfact = dozoom = False;
 	for(c = clients; c; c = c->next)
-		if(isvisible(c, m->id))
+		if(isvisible(c, m))
 			resize(c, c->x, c->y, c->w, c->h, True);
 }
 void
 focus(Client *c) {
-	Monitor *m;
 	if(c)
 		selmonitor = c->monitor;
-	m = &monitors[selmonitor];
 	if(!c || (c && !isvisible(c, selmonitor)))
 		for(c = stack; c && !isvisible(c, c->monitor); c = c->snext);
 	if(sel && sel != c) {
 		grabbuttons(sel, False);
 		XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
 		XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
 		selmonitor = c->monitor;
 	}
 	else
 		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
-	drawbar(&monitors[selmonitor]);
+	drawbar(selmonitor);
 }
 void
 focusin(XEvent *e) { /* there are some broken focus acquiring clients */
 	XFocusChangeEvent *ev = &e->xfocus;
 	for(c = sel->next; c && !isvisible(c, selmonitor); c = c->next);
 	if(!c)
 		for(c = clients; c && !isvisible(c, selmonitor); c = c->next);
 	if(c) {
 		focus(c);
-		restack(&monitors[c->monitor]);
+		restack(c->monitor);
 	}
 }
 void
 focusprev(const char *arg) {
 		for(c = clients; c && c->next; c = c->next);
 		for(; c && !isvisible(c, selmonitor); c = c->prev);
 	}
 	if(c) {
 		focus(c);
-		restack(&monitors[c->monitor]);
+		restack(c->monitor);
 	}
 }
 Client *
 getclient(Window w) {
 	}
 	dc.font.height = dc.font.ascent + dc.font.descent;
 }
 Bool
-isoccupied(unsigned int monitor, unsigned int t) {
+isoccupied(Monitor *monitor, unsigned int t) {
 	Client *c;
 	for(c = clients; c; c = c->next)
 		if(c->tags[t] && c->monitor == monitor)
 			return True;
 	}
 	return ret;
 }
 Bool
-isurgent(unsigned int monitor, unsigned int t) {
+isurgent(Monitor *monitor, unsigned int t) {
 	Client *c;
 	for(c = clients; c; c = c->next)
 		if(c->monitor == monitor && c->isurgent && c->tags[t])
 			return True;
 	return False;
 }
 Bool
-isvisible(Client *c, int monitor) {
+isvisible(Client *c, Monitor *m) {
 	unsigned int i;
-	if(c->monitor != monitor)
+	if(c->monitor != m)
 		return False;
 	for(i = 0; i < LENGTH(tags); i++)
-		if(c->tags[i] && monitors[c->monitor].seltags[i])
+		if(c->tags[i] && c->monitor->seltags[i])
 			return True;
 	return False;
 }
 void
 	c->tags = emallocz(sizeof initags);
 	c->win = w;
 	applyrules(c);
-	m = &monitors[c->monitor];
+	m = selmonitor;
 	c->x = wa->x + m->sx;
 	c->y = wa->y + m->sy;
 	c->w = wa->width;
 	c->h = wa->height;
 		return;
 	if(!getclient(ev->window))
 		manage(ev->window, &wa);
 }
-int
+Monitor *
 monitorat() {
 	int i, x, y;
 	Window win;
 	unsigned int mask;
 	XQueryPointer(dpy, root, &win, &win, &x, &y, &i, &i, &mask);
 	for(i = 0; i < mcount; i++) {
 		if((x >= monitors[i].sx && x < monitors[i].sx + monitors[i].sw)
 		&& (y >= monitors[i].sy && y < monitors[i].sy + monitors[i].sh)) {
-			return i;
+			return &monitors[i];
 		}
 	}
-	return 0;
+	return NULL;
 }
 void
 movemouse(Client *c) {
 	int x1, y1, ocx, ocy, di, nx, ny;
 	Window dummy;
 	XEvent ev;
 	ocx = nx = c->x;
 	ocy = ny = c->y;
-	m = &monitors[c->monitor];
+	m = c->monitor;
 	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, int monitor) {
+nexttiled(Client *c, Monitor *monitor) {
 	for(; c && (c->isfloating || !isvisible(c, monitor)); c = c->next);
 	return c;
 }
 void
 		case XA_WM_NORMAL_HINTS:
 			updatesizehints(c);
 			break;
 		case XA_WM_HINTS:
 			updatewmhints(c);
-			drawbar(&monitors[c->monitor]);
+			drawbar(c->monitor);
 			break;
 		}
 		if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
 			updatetitle(c);
 			if(c == sel)
-				drawbar(&monitors[c->monitor]);
+				drawbar(c->monitor);
 		}
 	}
 }
 void
 void
 resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 	Monitor *m;
 	XWindowChanges wc;
-	m = &monitors[c->monitor];
+	m = c->monitor;
 	if(sizehints) {
 		/* set minimum possible */
 		if (w < 1)
 			w = 1;
 	Monitor *m;
 	XEvent ev;
 	ocx = c->x;
 	ocy = c->y;
-	m = &monitors[c->monitor];
+	m = c->monitor;
 	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(;;) {
 		wc.sibling = m->barwin;
 		if(!sel->isfloating) {
 			XConfigureWindow(dpy, sel->win, CWSibling | CWStackMode, &wc);
 			wc.sibling = sel->win;
 		}
-		for(c = nexttiled(clients, m->id); c; c = nexttiled(c->next, m->id)) {
+		for(c = nexttiled(clients, m); c; c = nexttiled(c->next, m)) {
 			if(c == sel)
 				continue;
 			XConfigureWindow(dpy, c->win, CWSibling | CWStackMode, &wc);
 			wc.sibling = c->win;
 		}
 							memmove(buf, p - r + 1, r);
 						break;
 					}
 				break;
 			}
-			drawbar(&monitors[selmonitor]);
+			drawbar(selmonitor);
 		}
 		while(XPending(dpy)) {
 			XNextEvent(dpy, &ev);
 			if(handler[ev.type])
 				(handler[ev.type])(&ev); /* call handler */
 }
 void
 setlayout(const char *arg) {
 	unsigned int i;
-	Monitor *m = &monitors[monitorat()];
+	Monitor *m = monitorat();
 	if(!arg) {
 		m->layout++;
 		if(m->layout == &layouts[LENGTH(layouts)])
 			m->layout = &layouts[0];
 void
 setmwfact(const char *arg) {
 	double delta;
-	Monitor *m = &monitors[monitorat()];
+	Monitor *m = monitorat();
 	if(!domwfact)
 		return;
 	/* arg handling, manipulate mwfact */
 	if(arg == NULL)
 	// init screens/monitors first
 	mcount = 1;
 	if((isxinerama = XineramaIsActive(dpy)))
 		info = XineramaQueryScreens(dpy, &mcount);
-	monitors = emallocz(mcount * sizeof(Monitor));
+	selmonitor = monitors = emallocz(mcount * sizeof(Monitor));
 	screen = DefaultScreen(dpy);
 	root = RootWindow(dpy, screen);
 	/* init appearance */
 	/* init tags */
 	compileregs();
 	selmonitor = monitorat();
-	fprintf(stderr, "selmonitor == %d\n", selmonitor);
+	fprintf(stderr, "selmonitor == %d\n", selmonitor - monitors);
 }
 void
 spawn(const char *arg) {
 	static char *shell = NULL;
 	domwfact = dozoom = True;
 	nx = ny = nw = 0; /* gcc stupidity requires this */
-	for(n = 0, c = nexttiled(clients, m->id); c; c = nexttiled(c->next, m->id))
+	for(n = 0, c = nexttiled(clients, m); c; c = nexttiled(c->next, m))
 		n++;
 	/* window geoms */
 	mw = (n == 1) ? m->waw : m->mwfact * m->waw;
 	th = (n > 1) ? m->wah / (n - 1) : 0;
 	if(n > 1 && th < bh)
 		th = m->wah;
-	for(i = 0, c = mc = nexttiled(clients, m->id); c; c = nexttiled(c->next, m->id)) {
+	for(i = 0, c = mc = nexttiled(clients, m); c; c = nexttiled(c->next, m)) {
 		if(i == 0) { /* master */
 			nx = m->wax;
 			ny = m->way;
 			nw = mw - 2 * c->border;
 			nh = m->wah - 2 * c->border;
 togglebar(const char *arg) {
 	if(bpos == BarOff)
 		bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
 	else
 		bpos = BarOff;
-	updatebarpos(&monitors[monitorat()]);
+	updatebarpos(monitorat());
 	arrange();
 }
 void
 togglefloating(const char *arg) {
 void
 toggleview(const char *arg) {
 	unsigned int i, j;
-	Monitor *m = &monitors[monitorat()];
+	Monitor *m = monitorat();
 	i = idxoftag(arg);
 	m->seltags[i] = !m->seltags[i];
 	for(j = 0; j < LENGTH(tags) && !m->seltags[j]; j++);
 	if(j == LENGTH(tags))
 void
 view(const char *arg) {
 	unsigned int i;
 	Bool tmp[LENGTH(tags)];
-	Monitor *m = &monitors[monitorat()];
+	Monitor *m = monitorat();
 	for(i = 0; i < LENGTH(tags); i++)
 		tmp[i] = (NULL == arg);
 	tmp[idxoftag(arg)] = True;
 	if(memcmp(m->seltags, tmp, sizeof initags) != 0) {
 void
 viewprevtag(const char *arg) {
 	static Bool tmp[LENGTH(tags)];
-	Monitor *m = &monitors[monitorat()];
+	Monitor *m = monitorat();
 	memcpy(tmp, m->seltags, sizeof initags);
 	memcpy(m->seltags, m->prevtags, sizeof initags);
 	memcpy(m->prevtags, tmp, sizeof initags);
 	arrange();
 	arrange();
 }
 void
 movetomonitor(const char *arg) {
-	if (sel) {
+	int i;
-		sel->monitor = arg ? atoi(arg) : (sel->monitor+1) % mcount;
+	if (sel)
-		memcpy(sel->tags, monitors[sel->monitor].seltags, sizeof initags);
+		return;
-		resize(sel, monitors[sel->monitor].wax, monitors[sel->monitor].way, sel->w, sel->h, True);
+	if(arg)
-		arrange();
+		i = atoi(arg);
-	}
+	else {
+		for(i = 0; &monitors[i] != sel->monitor && i < mcount; i++);
+		i++;
+	}
+	sel->monitor = &monitors[i % mcount];
+	memcpy(sel->tags, sel->monitor->seltags, sizeof initags);
+	resize(sel, sel->monitor->wax, sel->monitor->way, sel->w, sel->h, True);
+	arrange();
 }
 void
 selectmonitor(const char *arg) {
-	Monitor *m = &monitors[arg ? atoi(arg) : (monitorat()+1) % mcount];
+	int i;
+	Monitor *m;
+	if(arg)
+		i = atoi(arg);
+	else {
+		for(i = 0; &monitors[i] != sel->monitor && i < mcount; i++);
+		i++;
+	}
+	m = &monitors[i % mcount];
 	XWarpPointer(dpy, None, root, 0, 0, 0, 0, m->wax+m->waw/2, m->way+m->wah/2);
 	focus(NULL);
 }

changeset 1094	0083ffeb95ee
parent 1093	5170cc8c078e
child 1095	a977bbe06b06