small performance tweak ;)

[dwm.git] / event.c

diff --git a/event.c b/event.c
index b369ede..69a628e 100644 (file)
--- a/event.c
+++ b/event.c
@@ -2,70 +2,50 @@
  * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
  * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */

-
-#include <fcntl.h>
-#include <stdio.h>
+#include "dwm.h"

 #include <stdlib.h>
 #include <stdlib.h>

-#include <string.h>
-#include <unistd.h>

 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 

-#include "dwm.h"
+/* static */

 
 

-#define ButtonMask      (ButtonPressMask | ButtonReleaseMask)
-#define MouseMask       (ButtonMask | PointerMotionMask)
+typedef struct {
+       unsigned long mod;
+       KeySym keysym;
+       void (*func)(Arg *arg);
+       Arg arg;
+} Key;

 
 

-/* local functions */
-static void buttonpress(XEvent *e);
-static void configurerequest(XEvent *e);
-static void destroynotify(XEvent *e);
-static void enternotify(XEvent *e);
-static void leavenotify(XEvent *e);
-static void expose(XEvent *e);
-static void maprequest(XEvent *e);
-static void propertynotify(XEvent *e);
-static void unmapnotify(XEvent *e);
+KEYS

 
 

-void (*handler[LASTEvent]) (XEvent *) = {
-       [ButtonPress] = buttonpress,
-       [ConfigureRequest] = configurerequest,
-       [DestroyNotify] = destroynotify,
-       [EnterNotify] = enternotify,
-       [LeaveNotify] = leavenotify,
-       [Expose] = expose,
-       [KeyPress] = keypress,
-       [MapRequest] = maprequest,
-       [PropertyNotify] = propertynotify,
-       [UnmapNotify] = unmapnotify
-};
+#define CLEANMASK(mask) (mask & ~(NUMLOCKMASK | LockMask))

 
 static void
 
 static void

-mresize(Client *c)
+movemouse(Client *c)

 {
 {

+       int x1, y1, ocx, ocy, di;
+       unsigned int dui;
+       Window dummy;

        XEvent ev;
        XEvent ev;

-       int ocx, ocy;

 
        ocx = c->x;
        ocy = c->y;
 
        ocx = c->x;
        ocy = c->y;

-       if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync,
-                               None, cursor[CurResize], CurrentTime) != GrabSuccess)
+       if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
+                       None, cursor[CurMove], CurrentTime) != GrabSuccess)

                return;
                return;

-       XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h);
+       XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);

        for(;;) {
        for(;;) {

-               XMaskEvent(dpy, MouseMask | ExposureMask, &ev);
-               switch(ev.type) {
+               XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
+               switch (ev.type) {

                default: break;
                case Expose:
                        handler[Expose](&ev);
                        break;
                case MotionNotify:
                default: break;
                case Expose:
                        handler[Expose](&ev);
                        break;
                case MotionNotify:

-                       XFlush(dpy);
-                       c->w = abs(ocx - ev.xmotion.x);
-                       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;
-                       resize(c, True);
+                       XSync(dpy, False);
+                       c->x = ocx + (ev.xmotion.x - x1);
+                       c->y = ocy + (ev.xmotion.y - y1);
+                       resize(c, False, TopLeft);

                        break;
                case ButtonRelease:
                        XUngrabPointer(dpy, CurrentTime);
                        break;
                case ButtonRelease:
                        XUngrabPointer(dpy, CurrentTime);


@@ -75,31 +55,36 @@ mresize(Client *c)
 }
 
 static void
 }
 
 static void

-mmove(Client *c)
+resizemouse(Client *c)

 {
 {

+       int ocx, ocy;
+       Corner sticky;

        XEvent ev;
        XEvent ev;

-       int x1, y1, ocx, ocy, di;
-       unsigned int dui;
-       Window dummy;

 
        ocx = c->x;
        ocy = c->y;
 
        ocx = c->x;
        ocy = c->y;

-       if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync,
-                               None, cursor[CurMove], CurrentTime) != GrabSuccess)
+       if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
+                               None, cursor[CurResize], CurrentTime) != GrabSuccess)

                return;
                return;

-       XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
+       XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h);

        for(;;) {
        for(;;) {

-               XMaskEvent(dpy, MouseMask | ExposureMask, &ev);
-               switch (ev.type) {
+               XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
+               switch(ev.type) {

                default: break;
                case Expose:
                        handler[Expose](&ev);
                        break;
                case MotionNotify:
                default: break;
                case Expose:
                        handler[Expose](&ev);
                        break;
                case MotionNotify:

-                       XFlush(dpy);
-                       c->x = ocx + (ev.xmotion.x - x1);
-                       c->y = ocy + (ev.xmotion.y - y1);
-                       resize(c, False);
+                       XSync(dpy, False);
+                       c->w = abs(ocx - ev.xmotion.x);
+                       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)
+                               sticky = (ocy <= ev.xmotion.y) ? TopLeft : BotLeft;
+                       else
+                               sticky = (ocy <= ev.xmotion.y) ? TopRight : BotRight;
+                       resize(c, True, sticky);

                        break;
                case ButtonRelease:
                        XUngrabPointer(dpy, CurrentTime);
                        break;
                case ButtonRelease:
                        XUngrabPointer(dpy, CurrentTime);


@@ -113,34 +98,48 @@ buttonpress(XEvent *e)
 {
        int x;
        Arg a;
 {
        int x;
        Arg a;

-       XButtonPressedEvent *ev = &e->xbutton;

        Client *c;
        Client *c;

+       XButtonPressedEvent *ev = &e->xbutton;

 
        if(barwin == ev->window) {
 
        if(barwin == ev->window) {

-               x = (arrange == floating) ? textw("~") : 0;
-               for(a.i = 0; a.i < TLast; a.i++) {
-                       x += textw(tags[a.i]);
-                       if(ev->x < x) {
-                               view(&a);
-                               break;
+               switch(ev->button) {
+               default:
+                       x = 0;
+                       for(a.i = 0; a.i < ntags; a.i++) {
+                               x += textw(tags[a.i]);
+                               if(ev->x < x) {
+                                       view(&a);
+                                       break;
+                               }

                        }
                        }

+                       break;
+               case Button4:
+                       viewnext(&a);
+                       break;
+               case Button5:
+                       viewprev(&a);
+                       break;

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

-               if(arrange == tiling && !c->floating)
-                       return;
-               craise(c);
+               focus(c);

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

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

                        break;
                case Button2:
                        lower(c);
                        break;
                case Button3:
                        break;
                case Button2:
                        lower(c);
                        break;
                case Button3:

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

                        break;
                }
        }
                        break;
                }
        }


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

+       Client *c;

        XConfigureRequestEvent *ev = &e->xconfigurerequest;
        XConfigureRequestEvent *ev = &e->xconfigurerequest;

+       XEvent synev;

        XWindowChanges wc;
        XWindowChanges wc;

-       Client *c;
+       unsigned long newmask;

 
 

-       ev->value_mask &= ~CWSibling;

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


@@ -165,22 +165,46 @@ configurerequest(XEvent *e)
                if(ev->value_mask & CWHeight)
                        c->h = ev->height;
                if(ev->value_mask & CWBorderWidth)
                if(ev->value_mask & CWHeight)
                        c->h = ev->height;
                if(ev->value_mask & CWBorderWidth)

-                       c->border = 1;
+                       c->border = ev->border_width;

                gravitate(c, False);
                gravitate(c, False);

-               resize(c, True);
+               wc.x = c->x;
+               wc.y = c->y;
+               wc.width = c->w;
+               wc.height = c->h;
+               newmask = ev->value_mask & (~(CWSibling | CWStackMode | CWBorderWidth));
+               if(newmask)
+                       XConfigureWindow(dpy, c->win, newmask, &wc);
+               else {
+                       synev.type = ConfigureNotify;
+                       synev.xconfigure.display = dpy;
+                       synev.xconfigure.event = c->win;
+                       synev.xconfigure.window = c->win;
+                       synev.xconfigure.x = c->x;
+                       synev.xconfigure.y = c->y;
+                       synev.xconfigure.width = c->w;
+                       synev.xconfigure.height = c->h;
+                       synev.xconfigure.border_width = c->border;
+                       synev.xconfigure.above = None;
+                       /* 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;
+               wc.y = ev->y;
+               wc.width = ev->width;
+               wc.height = ev->height;
+               wc.border_width = ev->border_width;
+               wc.sibling = ev->above;
+               wc.stack_mode = ev->detail;
+               XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
+               XSync(dpy, False);

        }
        }

-
-       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);
-       XFlush(dpy);

 }
 
 static void
 }
 
 static void


@@ -196,46 +220,64 @@ destroynotify(XEvent *e)
 static void
 enternotify(XEvent *e)
 {
 static void
 enternotify(XEvent *e)
 {

-       XCrossingEvent *ev = &e->xcrossing;

        Client *c;
        Client *c;

+       XCrossingEvent *ev = &e->xcrossing;

 
 

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

                return;
 
                return;
 

-       if((c = getclient(ev->window)))
+       if((c = getclient(ev->window)) || (c = getctitle(ev->window)))

                focus(c);
        else if(ev->window == root)
                issel = True;
 }
 
                focus(c);
        else if(ev->window == root)
                issel = True;
 }
 

-static void
-leavenotify(XEvent *e)
-{
-       XCrossingEvent *ev = &e->xcrossing;
-
-       if((ev->window == root) && !ev->same_screen)
-               issel = True;
-}
-

 static void
 expose(XEvent *e)
 {
 static void
 expose(XEvent *e)
 {

-       XExposeEvent *ev = &e->xexpose;

        Client *c;
        Client *c;

+       XExposeEvent *ev = &e->xexpose;

 
        if(ev->count == 0) {
                if(barwin == ev->window)
 
        if(ev->count == 0) {
                if(barwin == ev->window)

-                       draw_bar();
-               else if((c = gettitle(ev->window)))
-                       draw_client(c);
+                       drawstatus();
+               else if((c = getctitle(ev->window)))
+                       drawtitle(c);

        }
 }
 
        }
 }
 

+static void
+keypress(XEvent *e)
+{
+       static unsigned int len = sizeof(key) / sizeof(key[0]);
+       unsigned int i;
+       KeySym keysym;
+       XKeyEvent *ev = &e->xkey;
+
+       keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
+       for(i = 0; i < len; i++)
+               if(keysym == key[i].keysym &&
+                               CLEANMASK(key[i].mod) == CLEANMASK(ev->state)) {
+                       if(key[i].func)
+                               key[i].func(&key[i].arg);
+                       return;
+               }
+}
+
+static void
+leavenotify(XEvent *e)
+{
+       XCrossingEvent *ev = &e->xcrossing;
+
+       if((ev->window == root) && !ev->same_screen)
+               issel = True;
+}
+

 static void
 maprequest(XEvent *e)
 {
 static void
 maprequest(XEvent *e)
 {

-       XMapRequestEvent *ev = &e->xmaprequest;

        static XWindowAttributes wa;
        static XWindowAttributes wa;

+       XMapRequestEvent *ev = &e->xmaprequest;

 
        if(!XGetWindowAttributes(dpy, ev->window, &wa))
                return;
 
        if(!XGetWindowAttributes(dpy, ev->window, &wa))
                return;


@@ -253,32 +295,32 @@ maprequest(XEvent *e)
 static void
 propertynotify(XEvent *e)
 {
 static void
 propertynotify(XEvent *e)
 {

-       XPropertyEvent *ev = &e->xproperty;
-       Window trans;

        Client *c;
        Client *c;

+       Window trans;
+       XPropertyEvent *ev = &e->xproperty;

 
        if(ev->state == PropertyDelete)
                return; /* ignore */
 
        if((c = getclient(ev->window))) {
 
        if(ev->state == PropertyDelete)
                return; /* ignore */
 
        if((c = getclient(ev->window))) {

-               if(ev->atom == wm_atom[WMProtocols]) {
-                       c->proto = win_proto(c->win);
+               if(ev->atom == wmatom[WMProtocols]) {
+                       c->proto = getproto(c->win);

                        return;
                }
                switch (ev->atom) {
                        default: break;
                        case XA_WM_TRANSIENT_FOR:
                                XGetTransientForHint(dpy, c->win, &trans);
                        return;
                }
                switch (ev->atom) {
                        default: break;
                        case XA_WM_TRANSIENT_FOR:
                                XGetTransientForHint(dpy, c->win, &trans);

-                               if(!c->floating && (c->floating = (trans != 0)))
+                               if(!c->isfloat && (c->isfloat = (trans != 0)))

                                        arrange(NULL);
                                break;
                        case XA_WM_NORMAL_HINTS:
                                        arrange(NULL);
                                break;
                        case XA_WM_NORMAL_HINTS:

-                               update_size(c);
+                               setsize(c);

                                break;
                }
                                break;
                }

-               if(ev->atom == XA_WM_NAME || ev->atom == net_atom[NetWMName]) {
-                       update_name(c);
-                       draw_client(c);
+               if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
+                       settitle(c);
+                       drawtitle(c);

                }
        }
 }
                }
        }
 }


@@ -292,3 +334,46 @@ unmapnotify(XEvent *e)
        if((c = getclient(ev->window)))
                unmanage(c);
 }
        if((c = getclient(ev->window)))
                unmanage(c);
 }

+
+/* extern */
+
+void (*handler[LASTEvent]) (XEvent *) = {
+       [ButtonPress] = buttonpress,
+       [ConfigureRequest] = configurerequest,
+       [DestroyNotify] = destroynotify,
+       [EnterNotify] = enternotify,
+       [LeaveNotify] = leavenotify,
+       [Expose] = expose,
+       [KeyPress] = keypress,
+       [MapRequest] = maprequest,
+       [PropertyNotify] = propertynotify,
+       [UnmapNotify] = unmapnotify
+};
+
+void
+grabkeys()
+{
+       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);
+               /* normal */
+               XUngrabKey(dpy, code, key[i].mod, root);
+               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);
+               /* numlock */
+               XUngrabKey(dpy, code, key[i].mod | NUMLOCKMASK, root);
+               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);
+       }
+}