[hackers] [dwm] several changes towards 5.3, XINERAMA is disabled by default, introduced usegrab Bool for grabbing the server during mouse-based resizals/movements (disabled by default), continued debugging tile() with resizehints == True and a lot of terminals supporting resizehints, still no optimal solution, I need to think about it, considering recursive algorithm for the space optimization || Anselm R Garbe

changeset: 1361:41678fc29f2a
tag: tip
user: Anselm R Garbe <garbeam_AT_gmail.com>
date: Sun Oct 19 12:59:18 2008 +0100
files: config.def.h config.mk dwm.c
description:
several changes towards 5.3, XINERAMA is disabled by default, introduced usegrab Bool for grabbing the server during mouse-based resizals/movements (disabled by default), continued debugging tile() with resizehints == True and a lot of terminals supporting resizehints, still no optimal solution, I need to think about it, considering recursive algorithm for the space optimization

diff -r dc076b2d28d7 -r 41678fc29f2a config.def.h
--- a/config.def.h Wed Oct 15 18:08:24 2008 +0200
+++ b/config.def.h Sun Oct 19 12:59:18 2008 +0100
@@ -13,6 +13,8 @@
 static Bool showbar = True; /* False means no bar */
 static Bool topbar = True; /* False means bottom bar */
 static Bool readin = True; /* False means do not read stdin */
+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 dc076b2d28d7 -r 41678fc29f2a config.mk
--- a/config.mk Wed Oct 15 18:08:24 2008 +0200
+++ b/config.mk Sun Oct 19 12:59:18 2008 +0100
@@ -1,5 +1,5 @@
 # dwm version
-VERSION = 5.2
+VERSION = 5.3
 
 # Customize below to fit your system
 
@@ -10,9 +10,9 @@
 X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
 
-# Xinerama, comment if you don't want it
-XINERAMALIBS = -L${X11LIB} -lXinerama
-XINERAMAFLAGS = -DXINERAMA
+# Xinerama, un-comment if you want it
+#XINERAMALIBS = -L${X11LIB} -lXinerama
+#XINERAMAFLAGS = -DXINERAMA
 
 # includes and libs
 INCS = -I. -I/usr/include -I${X11INC}
diff -r dc076b2d28d7 -r 41678fc29f2a dwm.c
--- a/dwm.c Wed Oct 15 18:08:24 2008 +0200
+++ b/dwm.c Sun Oct 19 12:59:18 2008 +0100
@@ -53,8 +53,8 @@
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
 #define MAXTAGLEN 16
 #define MOUSEMASK (BUTTONMASK|PointerMotionMask)
-#define WIDTH(x) ((x)->w + 2*(x)->bw)
-#define HEIGHT(x) ((x)->h + 2*(x)->bw)
+#define WIDTH(x) ((x)->w + 2 * (x)->bw)
+#define HEIGHT(x) ((x)->h + 2 * (x)->bw)
 #define TAGMASK ((int)((1LL << LENGTH(tags)) - 1))
 #define TEXTW(x) (textnw(x, strlen(x)) + dc.font.height)
 
@@ -932,7 +932,7 @@
         Client *c;
 
         for(c = nexttiled(clients); c; c = nexttiled(c->next))
- resize(c, wx, wy, ww - 2*c->bw, wh - 2*c->bw, resizehints);
+ resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw, resizehints);
 }
 
 void
@@ -952,6 +952,8 @@
         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) {
@@ -961,7 +963,6 @@
                         handler[ev.type](&ev);
                         break;
                 case MotionNotify:
- XSync(dpy, False);
                         nx = ocx + (ev.xmotion.x - x);
                         ny = ocy + (ev.xmotion.y - y);
                         if(snap && nx >= wx && nx <= wx + ww
@@ -983,6 +984,8 @@
                 }
         }
         while(ev.type != ButtonRelease);
+ if(usegrab)
+ XUngrabServer(dpy);
         XUngrabPointer(dpy, CurrentTime);
 }
 
@@ -1121,6 +1124,8 @@
         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) {
@@ -1130,7 +1135,6 @@
                         handler[ev.type](&ev);
                         break;
                 case MotionNotify:
- XSync(dpy, False);
                         nw = MAX(ev.xmotion.x - ocx - 2*c->bw + 1, 1);
                         nh = MAX(ev.xmotion.y - ocy - 2*c->bw + 1, 1);
 
@@ -1146,6 +1150,8 @@
                 }
         }
         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));
@@ -1435,7 +1441,7 @@
         /* master */
         c = nexttiled(clients);
         mw = mfact * ww;
- resize(c, wx, wy, (n == 1 ? ww : mw) - 2*c->bw, wh - 2*c->bw, resizehints);
+ resize(c, wx, wy, (n == 1 ? ww : mw) - 2 * c->bw, wh - 2 * c->bw, resizehints);
 
         if(--n == 0)
                 return;
@@ -1449,8 +1455,14 @@
                 h = wh;
 
         for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
- resize(c, x, y, w - 2*c->bw, /* remainder */ ((i + 1 == n)
- ? wy + wh - y : h) - 2*c->bw, resizehints);
+ if(i + 1 == n) { /* remainder */
+ if(wy + wh - y < bh)
+ resize(c, x, y, w - 2 * c->bw, wy + wh - y - 2 * c->bw, False);
+ else
+ resize(c, x, y, w - 2 * c->bw, wy + wh - y - 2 * c->bw, resizehints);
+ }
+ else
+ resize(c, x, y, w - 2 * c->bw, h - 2 * c->bw, resizehints);
                 if(h != wh)
                         y = c->y + HEIGHT(c);
         }
Received on Sun Oct 19 2008 - 11:59:23 UTC