applied sanders somepatches.patch

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 69a628e..1d2227d 100644 (file)
--- a/event.c
+++ b/event.c
@@ -18,7 +18,7 @@ typedef struct {
 
 KEYS
 
 
 KEYS
 

-#define CLEANMASK(mask) (mask & ~(NUMLOCKMASK | LockMask))
+#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))

 
 static void
 movemouse(Client *c)
 
 static void
 movemouse(Client *c)


@@ -58,6 +58,7 @@ static void
 resizemouse(Client *c)
 {
        int ocx, ocy;
 resizemouse(Client *c)
 {
        int ocx, ocy;

+       int nw, nh;

        Corner sticky;
        XEvent ev;
 
        Corner sticky;
        XEvent ev;
 


@@ -76,8 +77,10 @@ resizemouse(Client *c)
                        break;
                case MotionNotify:
                        XSync(dpy, False);
                        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)
                        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,42 +105,41 @@ buttonpress(XEvent *e)
        XButtonPressedEvent *ev = &e->xbutton;
 
        if(barwin == ev->window) {
        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) {
+               x = 0;
+               for(a.i = 0; a.i < ntags; a.i++) {
+                       x += textw(tags[a.i]);
+                       if(ev->x < x) {
+                               if(ev->button == Button1)

                                        view(&a);
                                        view(&a);

-                                       break;
-                               }
+                               else if(ev->button == Button3)
+                                       toggleview(&a);
+                               return;

                        }
                        }

-                       break;
-               case Button4:
-                       viewnext(&a);
-                       break;
-               case Button5:
-                       viewprev(&a);
-                       break;
+               }
+               if(ev->x < x + bmw) {
+                       if(ev->button == Button1)
+                               togglemode(NULL);

                }
        }
        else if((c = getclient(ev->window))) {
                focus(c);
                }
        }
        else if((c = getclient(ev->window))) {
                focus(c);

+               if(CLEANMASK(ev->state) == 0)
+                       return;

                switch(ev->button) {
                default:
                        break;
                case Button1:
                        if(!c->ismax && (arrange == dofloat || c->isfloat)) {
                switch(ev->button) {
                default:
                        break;
                case Button1:
                        if(!c->ismax && (arrange == dofloat || c->isfloat)) {

-                               higher(c);
+                               restack(c);

                                movemouse(c);
                        }
                        break;
                case Button2:
                                movemouse(c);
                        }
                        break;
                case Button2:

-                       lower(c);
+                       zoom(NULL);

                        break;
                case Button3:
                        if(!c->ismax && (arrange == dofloat || c->isfloat)) {
                        break;
                case Button3:
                        if(!c->ismax && (arrange == dofloat || c->isfloat)) {

-                               higher(c);
+                               restack(c);

                                resizemouse(c);
                        }
                        break;
                                resizemouse(c);
                        }
                        break;


@@ -148,11 +150,11 @@ buttonpress(XEvent *e)
 static void
 configurerequest(XEvent *e)
 {
 static void
 configurerequest(XEvent *e)
 {

+       unsigned long newmask;

        Client *c;
        XConfigureRequestEvent *ev = &e->xconfigurerequest;
        XEvent synev;
        XWindowChanges wc;
        Client *c;
        XConfigureRequestEvent *ev = &e->xconfigurerequest;
        XEvent synev;
        XWindowChanges wc;

-       unsigned long newmask;

 
        if((c = getclient(ev->window))) {
                gravitate(c, True);
 
        if((c = getclient(ev->window))) {
                gravitate(c, True);


@@ -223,13 +225,16 @@ enternotify(XEvent *e)
        Client *c;
        XCrossingEvent *ev = &e->xcrossing;
 
        Client *c;
        XCrossingEvent *ev = &e->xcrossing;
 

-       if(ev->detail == NotifyInferior)
+       if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)

                return;
 
        if((c = getclient(ev->window)) || (c = getctitle(ev->window)))
                focus(c);
                return;
 
        if((c = getclient(ev->window)) || (c = getctitle(ev->window)))
                focus(c);

-       else if(ev->window == root)
+       else if(ev->window == root) {

                issel = True;
                issel = True;

+               XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+               drawall();
+       }

 }
 
 static void
 }
 
 static void


@@ -255,13 +260,15 @@ keypress(XEvent *e)
        XKeyEvent *ev = &e->xkey;
 
        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
        XKeyEvent *ev = &e->xkey;
 
        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);

-       for(i = 0; i < len; i++)
+       for(i = 0; i < len; i++) {

                if(keysym == key[i].keysym &&
                if(keysym == key[i].keysym &&

-                               CLEANMASK(key[i].mod) == CLEANMASK(ev->state)) {
+                               CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
+               {

                        if(key[i].func)
                                key[i].func(&key[i].arg);
                        return;
                }
                        if(key[i].func)
                                key[i].func(&key[i].arg);
                        return;
                }

+       }

 }
 
 static void
 }
 
 static void


@@ -269,8 +276,20 @@ leavenotify(XEvent *e)
 {
        XCrossingEvent *ev = &e->xcrossing;
 
 {
        XCrossingEvent *ev = &e->xcrossing;
 

-       if((ev->window == root) && !ev->same_screen)
-               issel = True;
+       if((ev->window == root) && !ev->same_screen) {
+               issel = False;
+               drawall();
+       }
+}
+
+static void
+mappingnotify(XEvent *e)
+{
+       XMappingEvent *ev = &e->xmapping;
+
+       XRefreshKeyboardMapping(ev);
+       if(ev->request == MappingKeyboard)
+               grabkeys();

 }
 
 static void
 }
 
 static void


@@ -345,6 +364,7 @@ void (*handler[LASTEvent]) (XEvent *) = {
        [LeaveNotify] = leavenotify,
        [Expose] = expose,
        [KeyPress] = keypress,
        [LeaveNotify] = leavenotify,
        [Expose] = expose,
        [KeyPress] = keypress,

+       [MappingNotify] = mappingnotify,

        [MapRequest] = maprequest,
        [PropertyNotify] = propertynotify,
        [UnmapNotify] = unmapnotify
        [MapRequest] = maprequest,
        [PropertyNotify] = propertynotify,
        [UnmapNotify] = unmapnotify


@@ -357,23 +377,29 @@ grabkeys()
        unsigned int i;
        KeyCode code;
 
        unsigned int i;
        KeyCode code;
 

+       XUngrabKey(dpy, AnyKey, AnyModifier, root);

        for(i = 0; i < len; i++) {
                code = XKeysymToKeycode(dpy, key[i].keysym);
        for(i = 0; i < len; i++) {
                code = XKeysymToKeycode(dpy, key[i].keysym);

-               /* normal */
-               XUngrabKey(dpy, code, key[i].mod, root);

                XGrabKey(dpy, code, key[i].mod, root, True,
                                GrabModeAsync, GrabModeAsync);
                XGrabKey(dpy, code, key[i].mod, root, True,
                                GrabModeAsync, GrabModeAsync);

-               /* capslock */
-               XUngrabKey(dpy, code, key[i].mod | LockMask, root);

                XGrabKey(dpy, code, key[i].mod | LockMask, root, True,
                                GrabModeAsync, GrabModeAsync);
                XGrabKey(dpy, code, key[i].mod | LockMask, root, True,
                                GrabModeAsync, GrabModeAsync);

-               /* numlock */
-               XUngrabKey(dpy, code, key[i].mod | NUMLOCKMASK, root);
-               XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK, root, True,
+               XGrabKey(dpy, code, key[i].mod | numlockmask, root, True,

                                GrabModeAsync, GrabModeAsync);
                                GrabModeAsync, GrabModeAsync);

-               /* capslock & numlock */
-               XUngrabKey(dpy, code, key[i].mod | NUMLOCKMASK | LockMask, root);
-               XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK | LockMask, root, True,
+               XGrabKey(dpy, code, key[i].mod | numlockmask | LockMask, root, True,

                                GrabModeAsync, GrabModeAsync);
        }
 }
                                GrabModeAsync, GrabModeAsync);
        }
 }

+
+void
+procevent()
+{
+       XEvent ev;
+
+       while(XPending(dpy)) {
+               XNextEvent(dpy, &ev);
+               if(handler[ev.type])
+                       (handler[ev.type])(&ev); /* call handler */
+       }
+}
+