X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=852f7ac946dc1e39bee8489f03d37675d19e6620;hb=146ff227fe0d231bcfc59268364461ab8850c5fe;hp=91b0149e0fb36951558b866c1139915d961a7c0b;hpb=c982bb1389c37262cbcc6ffcc343ec78528c4a81;p=dwm.git

diff --git a/dwm.c b/dwm.c
index 91b0149..852f7ac 100644
--- a/dwm.c
+++ b/dwm.c
@@ -261,9 +261,9 @@ applyrules(Client *c) {
 	XGetClassHint(dpy, c->win, &ch);
 	for(i = 0; i < LENGTH(rules); i++) {
 		r = &rules[i];
-		if((r->title && strstr(c->name, r->title))
-		|| (ch.res_class && r->class && strstr(ch.res_class, r->class))
-		|| (ch.res_name && r->instance && strstr(ch.res_name, r->instance)))
+		if((!r->title || strstr(c->name, r->title))
+		&& (!r->class || (ch.res_class && strstr(ch.res_class, r->class)))
+		&& (!r->instance || (ch.res_name && strstr(ch.res_name, r->instance)))) {
 		{
 			c->isfloating = r->isfloating;
 			if(r->tag) {
@@ -1068,7 +1068,7 @@ monocle(void) {
 	Client *c;
 
 	for(c = clients; c; c = c->next)
-		if(isvisible(c))
+		if((lt->isfloating || !c->isfloating) &&  isvisible(c))
 			resize(c, mox, moy, mow - 2 * c->bw, moh - 2 * c->bw, RESIZEHINTS);
 }
 
@@ -1191,9 +1191,9 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 		if(c->minax != c->maxax && c->minay != c->maxay 
 		&& c->minax > 0 && c->maxax > 0 && c->minay > 0 && c->maxay > 0)
 		{
-			if (w * c->maxay > h * c->maxax)
+			if(w * c->maxay > h * c->maxax)
 				w = h * c->maxax / c->maxay;
-			else if (w * c->minay < h * c->minax)
+			else if(w * c->minay < h * c->minax)
 				h = w * c->minay / c->minax;
 		}