[hackers] [dwm] applied Gottox' patches, and also removed usegrab || Anselm R Garbe

changeset: 1392:ee12ffbf93df
tag: tip
user: Anselm R Garbe <garbeam_AT_gmail.com>
date: Tue Mar 17 19:53:00 2009 +0000
files: config.def.h dwm.c
description:
applied Gottox' patches, and also removed usegrab

diff -r 1409113e7808 -r ee12ffbf93df config.def.h
--- a/config.def.h Tue Mar 03 11:22:16 2009 +0000
+++ b/config.def.h Tue Mar 17 19:53:00 2009 +0000
@@ -12,8 +12,6 @@
 static unsigned int snap = 32; /* snap pixel */
 static Bool showbar = True; /* False means no bar */
 static Bool topbar = True; /* False means bottom bar */
-static Bool usegrab = False; /* True means grabbing the X server
- during mouse-based resizals */
 
 /* tagging */
 static const char tags[][MAXTAGLEN] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
diff -r 1409113e7808 -r ee12ffbf93df dwm.c
--- a/dwm.c Tue Mar 03 11:22:16 2009 +0000
+++ b/dwm.c Tue Mar 17 19:53:00 2009 +0000
@@ -129,7 +129,7 @@
 
 /* function declarations */
 static void applyrules(Client *c);
-static void applysizehints(Client *c, int *w, int *h);
+static Bool applysizehints(Client *c, int *x, int *y, int *w, int *h);
 static void arrange(void);
 static void attach(Client *c);
 static void attachstack(Client *c);
@@ -252,6 +252,7 @@
         XClassHint ch = { 0 };
 
         /* rule matching */
+ c->isfloating = c->tags = 0;
         if(XGetClassHint(dpy, c->win, &ch)) {
                 for(i = 0; i < LENGTH(rules); i++) {
                         r = &rules[i];
@@ -259,7 +260,7 @@
                         && (!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;
- c->tags |= r->tags & TAGMASK ? r->tags & TAGMASK : tagset[seltags];
+ c->tags |= r->tags;
                         }
                 }
                 if(ch.res_class)
@@ -267,60 +268,72 @@
                 if(ch.res_name)
                         XFree(ch.res_name);
         }
- if(!c->tags)
- c->tags = tagset[seltags];
+ c->tags = c->tags & TAGMASK ? c->tags & TAGMASK : tagset[seltags];
 }
 
-void
-applysizehints(Client *c, int *w, int *h) {
+Bool
+applysizehints(Client *c, int *x, int *y, int *w, int *h) {
         Bool baseismin;
-
- if(!resizehints && !c->isfloating)
- return;
-
- /* see last two sentences in ICCCM 4.1.2.3 */
- baseismin = c->basew == c->minw && c->baseh == c->minh;
 
         /* set minimum possible */
         *w = MAX(1, *w);
         *h = MAX(1, *h);
 
- if(!baseismin) { /* temporarily remove base dimensions */
- *w -= c->basew;
- *h -= c->baseh;
+ if(*x > sx + sw)
+ *x = sw - WIDTH(c);
+ if(*y > sy + sh)
+ *y = sh - HEIGHT(c);
+ if(*x + *w + 2 * c->bw < sx)
+ *x = sx;
+ if(*y + *h + 2 * c->bw < sy)
+ *y = sy;
+ if(*h < bh)
+ *h = bh;
+ if(*w < bh)
+ *w = bh;
+
+ if(resizehints || c->isfloating) {
+ /* see last two sentences in ICCCM 4.1.2.3 */
+ baseismin = c->basew == c->minw && c->baseh == c->minh;
+
+ if(!baseismin) { /* temporarily remove base dimensions */
+ *w -= c->basew;
+ *h -= c->baseh;
+ }
+
+ /* adjust for aspect limits */
+ if(c->mina > 0 && c->maxa > 0) {
+ if(c->maxa < (float)*w / *h)
+ *w = *h * c->maxa;
+ else if(c->mina < (float)*h / *w)
+ *h = *w * c->mina;
+ }
+
+ if(baseismin) { /* increment calculation requires this */
+ *w -= c->basew;
+ *h -= c->baseh;
+ }
+
+ /* adjust for increment value */
+ if(c->incw)
+ *w -= *w % c->incw;
+ if(c->inch)
+ *h -= *h % c->inch;
+
+ /* restore base dimensions */
+ *w += c->basew;
+ *h += c->baseh;
+
+ *w = MAX(*w, c->minw);
+ *h = MAX(*h, c->minh);
+
+ if(c->maxw)
+ *w = MIN(*w, c->maxw);
+
+ if(c->maxh)
+ *h = MIN(*h, c->maxh);
         }
-
- /* adjust for aspect limits */
- if(c->mina > 0 && c->maxa > 0) {
- if(c->maxa < (float)*w / *h)
- *w = *h * c->maxa;
- else if(c->mina < (float)*h / *w)
- *h = *w * c->mina;
- }
-
- if(baseismin) { /* increment calculation requires this */
- *w -= c->basew;
- *h -= c->baseh;
- }
-
- /* adjust for increment value */
- if(c->incw)
- *w -= *w % c->incw;
- if(c->inch)
- *h -= *h % c->inch;
-
- /* restore base dimensions */
- *w += c->basew;
- *h += c->baseh;
-
- *w = MAX(*w, c->minw);
- *h = MAX(*h, c->minh);
-
- if(c->maxw)
- *w = MIN(*w, c->maxw);
-
- if(c->maxh)
- *h = MIN(*h, c->maxh);
+ return *x != c->x || *y != c->y || *w != c->w || *h != c->h;
 }
 
 void
@@ -1005,8 +1018,6 @@
         None, cursor[CurMove], CurrentTime) != GrabSuccess)
                 return;
         XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui);
- if(usegrab)
- XGrabServer(dpy);
         do {
                 XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
                 switch (ev.type) {
@@ -1037,8 +1048,6 @@
                 }
         }
         while(ev.type != ButtonRelease);
- if(usegrab)
- XUngrabServer(dpy);
         XUngrabPointer(dpy, CurrentTime);
 }
 
@@ -1091,22 +1100,7 @@
 resize(Client *c, int x, int y, int w, int h) {
         XWindowChanges wc;
 
- applysizehints(c, &w, &h);
- if(w <= 0 || h <= 0)
- return;
- if(x > sx + sw)
- x = sw - WIDTH(c);
- if(y > sy + sh)
- y = sh - HEIGHT(c);
- if(x + w + 2 * c->bw < sx)
- x = sx;
- if(y + h + 2 * c->bw < sy)
- y = sy;
- if(h < bh)
- h = bh;
- if(w < bh)
- w = bh;
- if(c->x != x || c->y != y || c->w != w || c->h != h) {
+ if(applysizehints(c, &x, &y, &w, &h)) {
                 c->x = wc.x = x;
                 c->y = wc.y = y;
                 c->w = wc.width = w;
@@ -1135,8 +1129,6 @@
         None, cursor[CurResize], CurrentTime) != GrabSuccess)
                 return;
         XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
- if(usegrab)
- XGrabServer(dpy);
         do {
                 XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
                 switch(ev.type) {
@@ -1161,8 +1153,6 @@
                 }
         }
         while(ev.type != ButtonRelease);
- if(usegrab)
- XUngrabServer(dpy);
         XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
         XUngrabPointer(dpy, CurrentTime);
         while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
Received on Tue Mar 17 2009 - 19:53:05 UTC