X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=dwm.c;h=b902b3b53997efa3ad30ae65dcc2c523c9736237;hp=8ade8d709da4c778d3fc26e16ed2a9cdf733c0d0;hb=78b170ad113be58d6b22452a6e4fd080c5429be2;hpb=0bcbda6733cd666dac6bcae3fbee478df3da77ce

diff --git a/dwm.c b/dwm.c
index 8ade8d7..b902b3b 100644
--- a/dwm.c
+++ b/dwm.c
@@ -91,7 +91,7 @@ struct Client {
 	int basew, baseh, incw, inch, maxw, maxh, minw, minh;
 	int bw, oldbw;
 	unsigned int tags;
-	Bool isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen;
+	Bool isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen, screen_hog;
 	Client *next;
 	Client *snext;
 	Monitor *mon;
@@ -137,6 +137,7 @@ typedef struct {
 	const char *title;
 	unsigned int tags;
 	Bool isfloating;
+	Bool screen_hog;
 	int monitor;
 } Rule;
 
@@ -299,19 +300,20 @@ applyrules(Client *c) {
 	XClassHint ch = { NULL, NULL };
 
 	/* rule matching */
-	c->isfloating = c->tags = 0;
+	c->isfloating = c->tags = c->screen_hog = 0;
 	XGetClassHint(dpy, c->win, &ch);
 	class    = ch.res_class ? ch.res_class : broken;
 	instance = ch.res_name  ? ch.res_name  : broken;
 
 	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)))
 		{
 			c->isfloating = r->isfloating;
 			c->tags |= r->tags;
+			c->screen_hog = r->screen_hog;
 			for(m = mons; m && m->num != r->monitor; m = m->next);
 			if(m)
 				c->mon = m;
@@ -1635,6 +1637,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) {
@@ -1675,8 +1688,13 @@ tile(Monitor *m) {
 
 	if(n > m->nmaster)
 		mw = m->nmaster ? m->ww * m->mfact : 0;
-	else
-		mw = m->ww;
+	else {
+		c = nexttiled(m->clients);
+		if (c && !c->screen_hog)
+			mw = m->ww * m->mfact;
+		else
+			mw = m->ww;
+	}
 	for(i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
 		if(i < m->nmaster) {
 			h = (m->wh - my) / (MIN(n, m->nmaster) - i);