dwm: comparison dwm.c

equal deleted inserted replaced

-:94af6c83cad2
+:167446962e09
 	void (*arrange)(View *);
 } Layout;
 typedef struct {
 	const char *prop;
-	const char *tags;
+	const char *tag;
 	Bool isfloating;
 } Rule;
-typedef struct {
-	regex_t *propregex;
-	regex_t *tagregex;
-} Regs;
 struct View {
 	int id;
 	int x, y, w, h, wax, way, wah, waw;
 	double mwfact;
 void attachstack(Client *c);
 void ban(Client *c);
 void buttonpress(XEvent *e);
 void checkotherwm(void);
 void cleanup(void);
-void compileregs(void);
 void configure(Client *c);
 void configurenotify(XEvent *e);
 void configurerequest(XEvent *e);
 void destroynotify(XEvent *e);
 void detach(Client *c);
 int xerrorstart(Display *dpy, XErrorEvent *ee);
 void zoom(const char *arg);
 void selectview(const char *arg);
 /* variables */
-char stext[256];
+char stext[256], buf[256];
 int nviews = 1;
 View *selview;
 int screen;
 int *seltags;
 int *prevtags;
 Client *sel = NULL;
 Client *stack = NULL;
 Cursor cursor[CurLast];
 Display *dpy;
 DC dc = {0};
-Regs *regs = NULL;
 View *views;
 Window root;
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 /* function implementations */
 void
 applyrules(Client *c) {
-	static char buf[512];
+	unsigned int i;
-	unsigned int i, j;
-	regmatch_t tmp;
 	Bool matched_tag = False;
+	Rule *r;
 	XClassHint ch = { 0 };
 	/* rule matching */
 	XGetClassHint(dpy, c->win, &ch);
 	snprintf(buf, sizeof buf, "%s:%s:%s",
 			ch.res_class ? ch.res_class : "",
 			ch.res_name ? ch.res_name : "", c->name);
-	for(i = 0; i < LENGTH(rules); i++)
+	for(i = 0; i < LENGTH(rules); i++) {
-		if(regs[i].propregex && !regexec(regs[i].propregex, buf, 1, &tmp, 0)) {
+		r = &rules[i];
-			c->isfloating = rules[i].isfloating;
+		if(strstr(c->name, r->prop)
-			for(j = 0; regs[i].tagregex && j < LENGTH(tags); j++) {
+		|| (ch.res_class && strstr(ch.res_class, r->prop))
-				if(!regexec(regs[i].tagregex, tags[j], 1, &tmp, 0)) {
+		|| (ch.res_name && strstr(ch.res_name, r->prop)))
-					matched_tag = True;
+		{
-					c->tags[j] = selview->id;
+			c->isfloating = r->isfloating;
-				}
+			if(r->tag) {
+				matched_tag = True;
+				c->tags[idxoftag(r->tag)] = selview->id;
 			}
 		}
+	}
 	if(ch.res_class)
 		XFree(ch.res_class);
 	if(ch.res_name)
 		XFree(ch.res_name);
 	if(!matched_tag)
 	XFreeCursor(dpy, cursor[CurMove]);
 	for(i = 0; i < nviews; i++)
 		XDestroyWindow(dpy, views[i].barwin);
 	XSync(dpy, False);
 	XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
-}
-void
-compileregs(void) {
-	unsigned int i;
-	regex_t *reg;
-	if(regs)
-		return;
-	regs = emallocz(LENGTH(rules) * sizeof(Regs));
-	for(i = 0; i < LENGTH(rules); i++) {
-		if(rules[i].prop) {
-			reg = emallocz(sizeof(regex_t));
-			if(regcomp(reg, rules[i].prop, REG_EXTENDED))
-				free(reg);
-			else
-				regs[i].propregex = reg;
-		}
-		if(rules[i].tags) {
-			reg = emallocz(sizeof(regex_t));
-			if(regcomp(reg, rules[i].tags, REG_EXTENDED))
-				free(reg);
-			else
-				regs[i].tagregex = reg;
-		}
-	}
 }
 void
 configure(Client *c) {
 	XConfigureEvent ce;
 }
 void
 drawtext(View *v, const char *text, unsigned long col[ColLast], Bool invert) {
 	int x, y, w, h;
-	static char buf[256];
 	unsigned int len, olen;
 	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 	XSetForeground(dpy, dc.gc, col[invert ? ColFG : ColBG]);
 	XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
 		return;
 	if(wa.override_redirect)
 		return;
 	if(!getclient(ev->window))
 		manage(ev->window, &wa);
-}
-View *
-viewat() {
-	int i, x, y;
-	Window win;
-	unsigned int mask;
-	XQueryPointer(dpy, root, &win, &win, &x, &y, &i, &i, &mask);
-	for(i = 0; i < nviews; i++) {
-		if((x >= views[i].x && x < views[i].x + views[i].w)
-		&& (y >= views[i].y && y < views[i].y + views[i].h))
-			return &views[i];
-	}
-	return NULL;
 }
 void
 movemouse(Client *c) {
 	int x1, y1, ocx, ocy, di, nx, ny;
 }
 void
 run(void) {
 	char *p;
-	char buf[sizeof stext];
+	char sbuf[sizeof stext];
 	fd_set rd;
 	int r, xfd;
 	unsigned int len, offset;
 	XEvent ev;
 	XSync(dpy, False);
 	xfd = ConnectionNumber(dpy);
 	readin = True;
 	offset = 0;
 	len = sizeof stext - 1;
-	buf[len] = stext[len] = '\0'; /* 0-terminator is never touched */
+	sbuf[len] = stext[len] = '\0'; /* 0-terminator is never touched */
 	while(running) {
 		FD_ZERO(&rd);
 		if(readin)
 			FD_SET(STDIN_FILENO, &rd);
 		FD_SET(xfd, &rd);
 			if(errno == EINTR)
 				continue;
 			eprint("select failed\n");
 		}
 		if(FD_ISSET(STDIN_FILENO, &rd)) {
-			switch((r = read(STDIN_FILENO, buf + offset, len - offset))) {
+			switch((r = read(STDIN_FILENO, sbuf + offset, len - offset))) {
 			case -1:
 				strncpy(stext, strerror(errno), len);
 				readin = False;
 				break;
 			case 0:
 				strncpy(stext, "EOF", 4);
 				readin = False;
 				break;
 			default:
-				for(p = buf + offset; r > 0; p++, r--, offset++)
+				for(p = sbuf + offset; r > 0; p++, r--, offset++)
 					if(*p == '\n' || *p == '\0') {
 						*p = '\0';
-						strncpy(stext, buf, len);
+						strncpy(stext, sbuf, len);
-						p += r - 1; /* p is buf + offset + r - 1 */
+						p += r - 1; /* p is sbuf + offset + r - 1 */
 						for(r = 0; *(p - r) && *(p - r) != '\n'; r++);
 						offset = r;
 						if(r)
-							memmove(buf, p - r + 1, r);
+							memmove(sbuf, p - r + 1, r);
 						break;
 					}
 				break;
 			}
 			drawbar(selview);
 	if(info)
 		XFree(info);
 	/* grab keys */
 	grabkeys();
-	/* init tags */
-	compileregs();
 	selview = &views[0];
 }
 void
 		c->isurgent = (wmh->flags & XUrgencyHint) ? True : False;
 		XFree(wmh);
 	}
 }
+void
+view(const char *arg) {
+	unsigned int i;
+	int tmp[LENGTH(tags)];
+	for(i = 0; i < LENGTH(tags); i++)
+		tmp[i] = (NULL == arg) ? selview->id : 0;
+	tmp[idxoftag(arg)] = selview->id;
+	if(memcmp(seltags, tmp, sizeof initags) != 0) {
+		memcpy(prevtags, seltags, sizeof initags);
+		memcpy(seltags, tmp, sizeof initags);
+		arrange();
+	}
+}
+View *
+viewat() {
+	int i, x, y;
+	Window win;
+	unsigned int mask;
+	XQueryPointer(dpy, root, &win, &win, &x, &y, &i, &i, &mask);
+	for(i = 0; i < nviews; i++) {
+		if((x >= views[i].x && x < views[i].x + views[i].w)
+		&& (y >= views[i].y && y < views[i].y + views[i].h))
+			return &views[i];
+	}
+	return NULL;
+}
+void
+viewprevtag(const char *arg) {
+	static Bool tmp[LENGTH(tags)];
+	memcpy(tmp, seltags, sizeof initags);
+	memcpy(seltags, prevtags, sizeof initags);
+	memcpy(prevtags, tmp, sizeof initags);
+	arrange();
+}
 /* There's no way to check accesses to destroyed windows, thus those cases are
 * ignored (especially on UnmapNotify's).  Other types of errors call Xlibs
 * default error handler, which may call exit.  */
 int
 xerror(Display *dpy, XErrorEvent *ee) {
 	otherwm = True;
 	return -1;
 }
 void
-view(const char *arg) {
-	unsigned int i;
-	int tmp[LENGTH(tags)];
-	for(i = 0; i < LENGTH(tags); i++)
-		tmp[i] = (NULL == arg) ? selview->id : 0;
-	tmp[idxoftag(arg)] = selview->id;
-	if(memcmp(seltags, tmp, sizeof initags) != 0) {
-		memcpy(prevtags, seltags, sizeof initags);
-		memcpy(seltags, tmp, sizeof initags);
-		arrange();
-	}
-}
-void
-viewprevtag(const char *arg) {
-	static Bool tmp[LENGTH(tags)];
-	memcpy(tmp, seltags, sizeof initags);
-	memcpy(seltags, prevtags, sizeof initags);
-	memcpy(prevtags, tmp, sizeof initags);
-	arrange();
-}
-void
 zoom(const char *arg) {
 	Client *c = sel;
 	if(!sel || !dozoom || sel->isfloating)
 		return;
 	attach(c);
 	focus(c);
 	arrange();
 }
-void
-selectview(const char *arg) {
-	int i;
-	View *v;
-	if(!arg)
-		return;
-	if(arg)
-		i = atoi(arg);
-	v = &views[i % nviews];
-	XWarpPointer(dpy, None, root, 0, 0, 0, 0, v->wax+v->waw/2, v->way+v->wah/2);
-	focus(NULL);
-}
 int
 main(int argc, char *argv[]) {
 	if(argc == 2 && !strcmp("-v", argv[1]))
 		eprint("dwm-"VERSION", © 2006-2008 dwm engineers, see LICENSE for details\n");
 	else if(argc != 1)

changeset 1104	167446962e09
parent 1103	94af6c83cad2
child 1106	084b17f96d9b