realized that client focussing through the bar is pretty useless, better is sloppy...

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 88e1b10..8a1c2a9 100644 (file)
--- a/event.c
+++ b/event.c
@@ -109,37 +109,38 @@ buttonpress(XEvent *e)
                                x += textw(tags[a.i]);
                                if(ev->x < x) {
                                        view(&a);
                                x += textw(tags[a.i]);
                                if(ev->x < x) {
                                        view(&a);

-                                       break;
+                                       return;

                                }
                        }
                                }
                        }

+                       if(ev->button == Button1)
+                               viewprev(&a);
+                       else if(ev->button == Button3)
+                               viewnext(&a);

                        break;
                case Button4:
                        break;
                case Button4:

-                       viewnext(&a);
+                       viewprev(&a);

                        break;
                case Button5:
                        break;
                case Button5:

-                       viewprev(&a);
+                       viewnext(&a);

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

+               higher(c);

                focus(c);
                switch(ev->button) {
                default:
                        break;
                case Button1:
                focus(c);
                switch(ev->button) {
                default:
                        break;
                case Button1:

-                       if(!c->ismax && (arrange == dofloat || c->isfloat)) {
-                               higher(c);
+                       if(!c->ismax && (arrange == dofloat || c->isfloat))

                                movemouse(c);
                                movemouse(c);

-                       }

                        break;
                case Button2:
                        break;
                case Button2:

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

                        break;
                case Button3:
                        break;
                case Button3:

-                       if(!c->ismax && (arrange == dofloat || c->isfloat)) {
-                               higher(c);
+                       if(!c->ismax && (arrange == dofloat || c->isfloat))

                                resizemouse(c);
                                resizemouse(c);

-                       }

                        break;
                }
        }
                        break;
                }
        }


@@ -156,22 +157,17 @@ configurerequest(XEvent *e)
 
        if((c = getclient(ev->window))) {
                gravitate(c, True);
 
        if((c = getclient(ev->window))) {
                gravitate(c, True);

-               if(c->isfloat) {
-                       if(ev->value_mask & CWX)
-                               c->x = ev->x;
-                       if(ev->value_mask & CWY)
-                               c->y = ev->y;
-                       if(ev->value_mask & CWWidth)
-                               c->w = ev->width;
-                       if(ev->value_mask & CWHeight)
-                               c->h = ev->height;
-               }
+               if(ev->value_mask & CWX)
+                       c->x = ev->x;
+               if(ev->value_mask & CWY)
+                       c->y = ev->y;
+               if(ev->value_mask & CWWidth)
+                       c->w = ev->width;
+               if(ev->value_mask & CWHeight)
+                       c->h = ev->height;

                if(ev->value_mask & CWBorderWidth)
                        c->border = ev->border_width;
                gravitate(c, False);
                if(ev->value_mask & CWBorderWidth)
                        c->border = ev->border_width;
                gravitate(c, False);

-
-               resize(c, True, TopLeft);
-

                wc.x = c->x;
                wc.y = c->y;
                wc.width = c->w;
                wc.x = c->x;
                wc.y = c->y;
                wc.width = c->w;


@@ -193,6 +189,11 @@ configurerequest(XEvent *e)
                        /* Send synthetic ConfigureNotify */
                        XSendEvent(dpy, c->win, True, NoEventMask, &synev);
                }
                        /* Send synthetic ConfigureNotify */
                        XSendEvent(dpy, c->win, True, NoEventMask, &synev);
                }

+               XSync(dpy, False);
+               if(c->isfloat)
+                       resize(c, False, TopLeft);
+               else
+                       arrange(NULL);

        }
        else {
                wc.x = ev->x;
        }
        else {
                wc.x = ev->x;


@@ -203,8 +204,8 @@ configurerequest(XEvent *e)
                wc.sibling = ev->above;
                wc.stack_mode = ev->detail;
                XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
                wc.sibling = ev->above;
                wc.stack_mode = ev->detail;
                XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);

+               XSync(dpy, False);

        }
        }

-       XSync(dpy, False);

 }
 
 static void
 }
 
 static void


@@ -223,13 +224,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


@@ -269,8 +273,10 @@ 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
 }
 
 static void


@@ -359,20 +365,12 @@ grabkeys()
 
        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,
                                GrabModeAsync, GrabModeAsync);
                XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK, root, True,
                                GrabModeAsync, GrabModeAsync);

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

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