X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=dwm.c;h=5e8179f17c2c7eb41eba3c8554c2e57aa1d19952;hp=f123400cc874a8f582fc1d0cdf000dafab9c1ec5;hb=4f13caaacb4064d560080e9063254e80f4cd6831;hpb=0f44b250c447cf79c42b0bd7533ffa2b8bacf04c

diff --git a/dwm.c b/dwm.c
index f123400..5e8179f 100644
--- a/dwm.c
+++ b/dwm.c
@@ -145,6 +145,7 @@ static void applyrules(Client *c);
 static Bool applysizehints(Client *c, int *x, int *y, int *w, int *h, Bool interact);
 static void arrange(Monitor *m);
 static void arrangemon(Monitor *m);
+static void attach_as_master(Client *c);
 static void attach(Client *c);
 static void attachstack(Client *c);
 static void buttonpress(XEvent *e);
@@ -305,7 +306,7 @@ applyrules(Client *c) {
 
 	for(i = 0; i < LENGTH(rules); i++) {
 		r = &rules[i];
-		if((!r->title || strstr(c->name, r->title))
+		if((!r->title || c->name == strstr(c->name, r->title))
 		&& (!r->class || strstr(class, r->class))
 		&& (!r->instance || strstr(instance, r->instance)))
 		{
@@ -410,13 +411,17 @@ arrangemon(Monitor *m) {
 }
 
 void
+attach_as_master(Client *c) {
+	c->next = c->mon->clients;
+	c->mon->clients = c;
+}
+void
 attach(Client *c) {
 	if (c->mon->sel) {
 		c->next = c->mon->sel->next;
 		c->mon->sel->next = c;
 	} else {
-		c->next = c->mon->clients;
-		c->mon->clients = c;
+		attach_as_master(c);
 	}
 }
 
@@ -547,6 +552,7 @@ clientmessage(XEvent *e) {
 			              || (cme->data.l[0] == 2 /* _NET_WM_STATE_TOGGLE */ && !c->isfullscreen)));
 	}
 	else if(cme->message_type == netatom[NetActiveWindow]) {
+		return;
 		if(!ISVISIBLE(c)) {
 			c->mon->seltags ^= 1;
 			c->mon->tagset[c->mon->seltags] = c->tags;
@@ -1237,7 +1243,7 @@ nextvisible(Client *c) {
 void
 pop(Client *c) {
 	detach(c);
-	attach(c);
+	attach_as_master(c);
 	focus(c);
 	arrange(c->mon);
 }
@@ -1629,6 +1635,17 @@ sigchld(int unused) {
 
 void
 spawn(const Arg *arg) {
+	int tag = 0, i;
+	if(arg->v == termcmd) {
+		for(i = 0; i < 32; ++i) {
+			if(selmon->tagset[selmon->seltags] & (1 << i)) {
+				tag = i;
+				break;
+			}
+		}
+		_SWM_WS[8] = swm_tags[tag][0];
+		_SWM_WS[9] = swm_tags[tag][1];
+	}
 	if(arg->v == dmenucmd)
 		dmenumon[0] = '0' + selmon->num;
 	if(fork() == 0) {