new colorscheme (16-bit compliant)

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 12746f6..16201f3 100644 (file)
--- a/event.c
+++ b/event.c
@@ -1,11 +1,9 @@
-/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
- * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
- * See LICENSE file for license details. */
+/* See LICENSE file for copyright and license details. */
 #include "dwm.h"
-#include <stdio.h>
 #include <stdlib.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
+#include <X11/Xutil.h>
 
 /* static */
 
@@ -16,9 +14,7 @@ typedef struct {
        const char *arg;
 } Key;
 
-KEYS
-
-#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
+#define CLEANMASK(mask)                (mask & ~(numlockmask | LockMask))
 #define MOUSEMASK              (BUTTONMASK | PointerMotionMask)
 
 static Client *
@@ -113,52 +109,45 @@ resizemouse(Client *c) {
 
 static void
 buttonpress(XEvent *e) {
-       static char buf[32];
        unsigned int i, x;
        Client *c;
        XButtonPressedEvent *ev = &e->xbutton;
 
-       buf[0] = 0;
        if(barwin == ev->window) {
                x = 0;
                for(i = 0; i < ntags; i++) {
                        x += textw(tags[i]);
                        if(ev->x < x) {
-                               snprintf(buf, sizeof buf, "%d", i);
                                if(ev->button == Button1) {
                                        if(ev->state & MODKEY)
-                                               tag(buf);
+                                               tag(tags[i]);
                                        else
-                                               view(buf);
+                                               view(tags[i]);
                                }
                                else if(ev->button == Button3) {
                                        if(ev->state & MODKEY)
-                                               toggletag(buf);
+                                               toggletag(tags[i]);
                                        else
-                                               toggleview(buf);
+                                               toggleview(tags[i]);
                                }
                                return;
                        }
                }
-               if(ev->x < x + blw)
-                       switch(ev->button) {
-                       case Button1:
-                               setlayout(NULL);
-                               break;
-                       }
+               if((ev->x < x + blw) && ev->button == Button1)
+                       setlayout(NULL);
        }
        else if((c = getclient(ev->window))) {
                focus(c);
                if(CLEANMASK(ev->state) != MODKEY)
                        return;
-               if(ev->button == Button1 && (lt->arrange == floating || c->isfloating)) {
+               if(ev->button == Button1 && (isfloating() || c->isfloating)) {
                        restack();
                        movemouse(c);
                }
                else if(ev->button == Button2)
                        zoom(NULL);
                else if(ev->button == Button3
-               && (lt->arrange == floating || c->isfloating) && !c->isfixed)
+               && (isfloating() || c->isfloating) && !c->isfixed)
                {
                        restack();
                        resizemouse(c);
@@ -176,7 +165,7 @@ configurerequest(XEvent *e) {
                c->ismax = False;
                if(ev->value_mask & CWBorderWidth)
                        c->border = ev->border_width;
-               if(c->isfixed || c->isfloating || (lt->arrange == floating)) {
+               if(c->isfixed || c->isfloating || isfloating()) {
                        if(ev->value_mask & CWX)
                                c->x = ev->x;
                        if(ev->value_mask & CWY)
@@ -218,12 +207,11 @@ configurenotify(XEvent *e) {
        if (ev->window == root && (ev->width != sw || ev->height != sh)) {
                sw = ev->width;
                sh = ev->height;
-               wah = sh - bh;
-               waw = sw;
                XFreePixmap(dpy, dc.drawable);
                dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
                XResizeWindow(dpy, barwin, sw, bh);
-               lt->arrange();
+               updatebarpos();
+               arrange();
        }
 }
 
@@ -243,12 +231,11 @@ enternotify(XEvent *e) {
 
        if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
                return;
-       if((c = getclient(ev->window)) && isvisible(c))
+       if((c = getclient(ev->window)))
                focus(c);
        else if(ev->window == root) {
                selscreen = True;
-               for(c = stack; c && !isvisible(c); c = c->snext);
-               focus(c);
+               focus(NULL);
        }
 }
 
@@ -258,24 +245,25 @@ expose(XEvent *e) {
 
        if(ev->count == 0) {
                if(barwin == ev->window)
-                       drawstatus();
+                       drawbar();
        }
 }
 
 static void
 keypress(XEvent *e) {
-       static unsigned int len = sizeof key / sizeof key[0];
+       KEYS
+       unsigned int len = sizeof keys / sizeof keys[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(keysym == keys[i].keysym
+               && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state))
                {
-                       if(key[i].func)
-                               key[i].func(key[i].arg);
+                       if(keys[i].func)
+                               keys[i].func(keys[i].arg);
                }
 }
 
@@ -325,7 +313,7 @@ propertynotify(XEvent *e) {
                        case XA_WM_TRANSIENT_FOR:
                                XGetTransientForHint(dpy, c->win, &trans);
                                if(!c->isfloating && (c->isfloating = (getclient(trans) != NULL)))
-                                       lt->arrange();
+                                       arrange();
                                break;
                        case XA_WM_NORMAL_HINTS:
                                updatesizehints(c);
@@ -334,7 +322,7 @@ propertynotify(XEvent *e) {
                if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
                        updatetitle(c);
                        if(c == sel)
-                               drawstatus();
+                               drawbar();
                }
        }
 }
@@ -367,20 +355,21 @@ void (*handler[LASTEvent]) (XEvent *) = {
 
 void
 grabkeys(void) {
-       static unsigned int len = sizeof key / sizeof key[0];
+       KEYS
+       unsigned int len = sizeof keys / sizeof keys[0];
        unsigned int i;
        KeyCode code;
 
        XUngrabKey(dpy, AnyKey, AnyModifier, root);
        for(i = 0; i < len; i++) {
-               code = XKeysymToKeycode(dpy, key[i].keysym);
-               XGrabKey(dpy, code, key[i].mod, root, True,
+               code = XKeysymToKeycode(dpy, keys[i].keysym);
+               XGrabKey(dpy, code, keys[i].mod, root, True,
                                GrabModeAsync, GrabModeAsync);
-               XGrabKey(dpy, code, key[i].mod | LockMask, root, True,
+               XGrabKey(dpy, code, keys[i].mod | LockMask, root, True,
                                GrabModeAsync, GrabModeAsync);
-               XGrabKey(dpy, code, key[i].mod | numlockmask, root, True,
+               XGrabKey(dpy, code, keys[i].mod | numlockmask, root, True,
                                GrabModeAsync, GrabModeAsync);
-               XGrabKey(dpy, code, key[i].mod | numlockmask | LockMask, root, True,
+               XGrabKey(dpy, code, keys[i].mod | numlockmask | LockMask, root, True,
                                GrabModeAsync, GrabModeAsync);
        }
 }