Эх сурвалжийг харах

applied sanders try2 patch

arg@mig29 19 жил өмнө
parent
commit
0f395c1b11
4 өөрчлөгдсөн 6 нэмэгдсэн , 7 устгасан
  1. 3 3
      client.c
  2. 1 1
      dwm.h
  3. 1 1
      event.c
  4. 1 2
      view.c

+ 3 - 3
client.c

@@ -209,6 +209,8 @@ manage(Window w, XWindowAttributes *wa) {
 	c->h = wa->height;
 	c->th = bh;
 	updatesize(c);
+	c->isfixed = (c->maxw && c->minw && c->maxh && c->minh &&
+				c->maxw == c->minw && c->maxh == c->minh);
 	if(c->x + c->w + 2 * BORDERPX > sw)
 		c->x = sw - c->w - 2 * BORDERPX;
 	if(c->x < sx)
@@ -232,9 +234,7 @@ manage(Window w, XWindowAttributes *wa) {
 	updatetitle(c);
 	settags(c, getclient(trans));
 	if(!c->isfloat)
-		c->isfloat = trans
-			|| (c->maxw && c->minw && c->maxh && c->minh &&
-				c->maxw == c->minw && c->maxh == c->minh);
+		c->isfloat = trans || c->isfixed;
 	resizetitle(c);
 	if(clients)
 		clients->prev = c;

+ 1 - 1
dwm.h

@@ -83,7 +83,7 @@ struct Client {
 	int grav;
 	long flags; 
 	unsigned int border, weight;
-	Bool isfloat, ismax;
+	Bool isfloat, isfixed, ismax;
 	Bool *tags;
 	Client *next;
 	Client *prev;

+ 1 - 1
event.c

@@ -136,7 +136,7 @@ buttonpress(XEvent *e) {
 		}
 		else if(ev->button == Button2)
 			zoom(NULL);
-		else if(ev->button == Button3 && (arrange == dofloat || c->isfloat)) {
+		else if(ev->button == Button3 && (arrange == dofloat || c->isfloat) && !c->isfixed) {
 			restack();
 			resizemouse(c);
 		}

+ 1 - 2
view.c

@@ -45,8 +45,7 @@ static void
 togglemax(Client *c) {
 	XEvent ev;
 		
-	if (x->maxw && x->minw && x->maxh && x->minh &&
-			x->maxw == x->minw && x->maxh == x->minh)
+	if(c->isfixed)
 		return;
 
 	if((c->ismax = !c->ismax)) {