implemented ungrabkeys() which is called in cleanup()

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 05b42f0..4357eae 100644 (file)
--- a/event.c
+++ b/event.c
@@ -58,6 +58,7 @@ static void
 resizemouse(Client *c)
 {
        int ocx, ocy;
+       int nw, nh;
        Corner sticky;
        XEvent ev;
 
@@ -76,8 +77,10 @@ resizemouse(Client *c)
                        break;
                case MotionNotify:
                        XSync(dpy, False);
-                       c->w = abs(ocx - ev.xmotion.x);
-                       c->h = abs(ocy - ev.xmotion.y);
+                       if((nw = abs(ocx - ev.xmotion.x)))
+                               c->w = abs(ocx - ev.xmotion.x);
+                       if((nh = abs(ocy - ev.xmotion.y)))
+                               c->h = abs(ocy - ev.xmotion.y);
                        c->x = (ocx <= ev.xmotion.x) ? ocx : ocx - c->w;
                        c->y = (ocy <= ev.xmotion.y) ? ocy : ocy - c->h;
                        if(ocx <= ev.xmotion.x)
@@ -102,51 +105,37 @@ buttonpress(XEvent *e)
        XButtonPressedEvent *ev = &e->xbutton;
 
        if(barwin == ev->window) {
-               switch(ev->button) {
-               default:
-                       x = 0;
-                       for(a.i = 0; a.i < ntags; a.i++) {
-                               x += textw(tags[a.i]);
-                               if(ev->x < x) {
-                                       if(ev->button == Button3) {
-                                               tsel[a.i] = True;
-                                               arrange(NULL);
-                                               drawall();
-                                       }
-                                       else
-                                               view(&a);
-                                       return;
-                               }
+               x = 0;
+               for(a.i = 0; a.i < ntags; a.i++) {
+                       x += textw(tags[a.i]);
+                       if(ev->x < x) {
+                               if(ev->button == Button3)
+                                       toggleview(&a);
+                               else
+                                       view(&a);
+                               return;
                        }
-                       if(ev->button == Button1)
-                               viewprev(&a);
-                       else if(ev->button == Button3)
-                               viewnext(&a);
-                       break;
-               case Button4:
-                       viewprev(&a);
-                       break;
-               case Button5:
-                       viewnext(&a);
-                       break;
                }
        }
        else if((c = getclient(ev->window))) {
-               higher(c);
                focus(c);
                switch(ev->button) {
                default:
                        break;
                case Button1:
-                       if(!c->ismax && (arrange == dofloat || c->isfloat))
+                       if(!c->ismax && (arrange == dofloat || c->isfloat)) {
+                               restack(c);
                                movemouse(c);
+                       }
                        break;
                case Button2:
                        zoom(NULL);
                        break;
                case Button3:
-                       if(!c->ismax && (arrange == dofloat || c->isfloat))
+                       if(!c->ismax && (arrange == dofloat || c->isfloat)) {
+                               restack(c);
                                resizemouse(c);
+                       }
                        break;
                }
        }
@@ -381,3 +370,19 @@ grabkeys()
                                GrabModeAsync, GrabModeAsync);
        }
 }
+
+void
+ungrabkeys()
+{
+       static unsigned int len = sizeof(key) / sizeof(key[0]);
+       unsigned int i;
+       KeyCode code;
+
+       for(i = 0; i < len; i++) {
+               code = XKeysymToKeycode(dpy, key[i].keysym);
+               XUngrabKey(dpy, code, key[i].mod, root);
+               XUngrabKey(dpy, code, key[i].mod | LockMask, root);
+               XUngrabKey(dpy, code, key[i].mod | NUMLOCKMASK, root);
+               XUngrabKey(dpy, code, key[i].mod | NUMLOCKMASK | LockMask, root);
+       }
+}