new resize stuff (using XConfigureWindow instead of XSendEvent)

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 99216b3..4008a73 100644 (file)
--- a/event.c
+++ b/event.c
@@ -17,7 +17,6 @@ typedef struct {
        Arg arg;
 } Key;
 
-CMDS
 KEYS
 
 static unsigned int valid_mask =  255 &  ~(NUMLOCKMASK | LockMask);
@@ -116,12 +115,10 @@ buttonpress(XEvent *e)
                        }
                        break;
                case Button4:
-                       a.i = (tsel + 1 < TLast) ? tsel + 1 : 0;
-                       view(&a);
+                       viewnext(&a);
                        break;
                case Button5:
-                       a.i = (tsel - 1 >= 0) ? tsel - 1 : TLast - 1;
-                       view(&a);
+                       viewprev(&a);
                        break;
                }
        }
@@ -156,7 +153,6 @@ configurerequest(XEvent *e)
        XConfigureRequestEvent *ev = &e->xconfigurerequest;
        XWindowChanges wc;
 
-       ev->value_mask &= ~CWSibling;
        if((c = getclient(ev->window))) {
                gravitate(c, True);
                if(ev->value_mask & CWX)
@@ -172,18 +168,16 @@ configurerequest(XEvent *e)
                gravitate(c, False);
                resize(c, True, TopLeft);
        }
-
-       wc.x = ev->x;
-       wc.y = ev->y;
-       wc.width = ev->width;
-       wc.height = ev->height;
-       wc.border_width = 1;
-       wc.sibling = None;
-       wc.stack_mode = Above;
-       ev->value_mask &= ~CWStackMode;
-       ev->value_mask |= CWBorderWidth;
-       XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
-       XSync(dpy, False);
+       else {
+               wc.x = ev->x;
+               wc.y = ev->y;
+               wc.width = ev->width;
+               wc.height = ev->height;
+               wc.border_width = 1;
+               XConfigureWindow(dpy, ev->window,
+                               CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
+               XSync(dpy, False);
+       }
 }
 
 static void