Using a new tags definition (const char [][MAXTAGLEN] - thanks go to Szabolcs!

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index e5929f6..bd7ffe3 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -44,8 +44,11 @@
 /* macros */
 #define BUTTONMASK             (ButtonPressMask | ButtonReleaseMask)
 #define CLEANMASK(mask)                (mask & ~(numlockmask | LockMask))
+#define LENGTH(x)              (sizeof x / sizeof x[0])
+#define MAXTAGLEN              16
 #define MOUSEMASK              (BUTTONMASK | PointerMotionMask)
 
+
 /* enums */
 enum { BarTop, BarBot, BarOff };                       /* bar position */
 enum { CurNormal, CurResize, CurMove, CurLast };       /* cursor */
@@ -141,6 +144,7 @@ unsigned long getcolor(const char *colstr);
 long getstate(Window w);
 Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
 void grabbuttons(Client *c, Bool focused);
+void grabkeys(void);
 unsigned int idxoftag(const char *tag);
 void initfont(const char *fontstr);
 Bool isoccupied(unsigned int t);
@@ -229,6 +233,8 @@ Regs *regs = NULL;
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 
+Bool prevtags[LENGTH(tags)] = {[0] = True};
+
 /* function implementations */
 void
 applyrules(Client *c) {
@@ -303,7 +309,7 @@ buttonpress(XEvent *e) {
        Client *c;
        XButtonPressedEvent *ev = &e->xbutton;
 
-       if(barwin == ev->window) {
+       if(ev->window == barwin) {
                x = 0;
                for(i = 0; i < LENGTH(tags); i++) {
                        x += textw(tags[i]);
@@ -331,7 +337,7 @@ buttonpress(XEvent *e) {
                if(CLEANMASK(ev->state) != MODKEY)
                        return;
                if(ev->button == Button1) {
-                       if((floating == layout->arrange) || c->isfloating)
+                       if((layout->arrange == floating) || c->isfloating)
                                restack();
                        else
                                togglefloating(NULL);
@@ -662,8 +668,8 @@ void
 expose(XEvent *e) {
        XExposeEvent *ev = &e->xexpose;
 
-       if(0 == ev->count) {
-               if(barwin == ev->window)
+       if(ev->count == 0) {
+               if(ev->window == barwin)
                        drawbar();
        }
 }
@@ -777,7 +783,7 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) {
        int n;
        XTextProperty name;
 
-       if(!text || 0 == size)
+       if(!text || size == 0)
                return False;
        text[0] = '\0';
        XGetTextProperty(dpy, w, &name, atom);
@@ -787,8 +793,7 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) {
                strncpy(text, (char *)name.value, size - 1);
        else {
                if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
-               && n > 0 && *list)
-               {
+               && n > 0 && *list) {
                        strncpy(text, *list, size - 1);
                        XFreeStringList(list);
                }
@@ -835,6 +840,25 @@ grabbuttons(Client *c, Bool focused) {
                                GrabModeAsync, GrabModeSync, None, None);
 }
 
+void
+grabkeys(void)  {
+       unsigned int i;
+       KeyCode code;
+
+       XUngrabKey(dpy, AnyKey, AnyModifier, root);
+       for(i = 0; i < LENGTH(keys); i++) {
+               code = XKeysymToKeycode(dpy, keys[i].keysym);
+               XGrabKey(dpy, code, keys[i].mod, root, True,
+                               GrabModeAsync, GrabModeAsync);
+               XGrabKey(dpy, code, keys[i].mod | LockMask, root, True,
+                               GrabModeAsync, GrabModeAsync);
+               XGrabKey(dpy, code, keys[i].mod | numlockmask, root, True,
+                               GrabModeAsync, GrabModeAsync);
+               XGrabKey(dpy, code, keys[i].mod | numlockmask | LockMask, root, True,
+                               GrabModeAsync, GrabModeAsync);
+       }
+}
+
 unsigned int
 idxoftag(const char *tag) {
        unsigned int i;
@@ -922,27 +946,10 @@ isvisible(Client *c) {
 
 void
 keypress(XEvent *e) {
-       KEYS
        unsigned int i;
-       KeyCode code;
        KeySym keysym;
        XKeyEvent *ev;
 
-       if(!e) { /* grabkeys */
-               XUngrabKey(dpy, AnyKey, AnyModifier, root);
-               for(i = 0; i < LENGTH(keys); i++) {
-                       code = XKeysymToKeycode(dpy, keys[i].keysym);
-                       XGrabKey(dpy, code, keys[i].mod, root, True,
-                                       GrabModeAsync, GrabModeAsync);
-                       XGrabKey(dpy, code, keys[i].mod | LockMask, root, True,
-                                       GrabModeAsync, GrabModeAsync);
-                       XGrabKey(dpy, code, keys[i].mod | numlockmask, root, True,
-                                       GrabModeAsync, GrabModeAsync);
-                       XGrabKey(dpy, code, keys[i].mod | numlockmask | LockMask, root, True,
-                                       GrabModeAsync, GrabModeAsync);
-               }
-               return;
-       }
        ev = &e->xkey;
        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
        for(i = 0; i < LENGTH(keys); i++)
@@ -1045,7 +1052,7 @@ mappingnotify(XEvent *e) {
 
        XRefreshKeyboardMapping(ev);
        if(ev->request == MappingKeyboard)
-               keypress(NULL);
+               grabkeys();
 }
 
 void
@@ -1123,7 +1130,7 @@ propertynotify(XEvent *e) {
                        default: break;
                        case XA_WM_TRANSIENT_FOR:
                                XGetTransientForHint(dpy, c->win, &trans);
-                               if(!c->isfloating && (c->isfloating = (NULL != getclient(trans))))
+                               if(!c->isfloating && (c->isfloating = (getclient(trans) != NULL)))
                                        arrange();
                                break;
                        case XA_WM_NORMAL_HINTS:
@@ -1257,9 +1264,9 @@ restack(void) {
        drawbar();
        if(!sel)
                return;
-       if(sel->isfloating || (floating == layout->arrange))
+       if(sel->isfloating || (layout->arrange == floating))
                XRaiseWindow(dpy, sel->win);
-       if(floating != layout->arrange) {
+       if(layout->arrange != floating) {
                wc.stack_mode = Below;
                wc.sibling = barwin;
                if(!sel->isfloating) {
@@ -1396,9 +1403,9 @@ setmwfact(const char *arg) {
        if(!domwfact)
                return;
        /* arg handling, manipulate mwfact */
-       if(NULL == arg)
+       if(arg == NULL)
                mwfact = MWFACT;
-       else if(1 == sscanf(arg, "%lf", &delta)) {
+       else if(sscanf(arg, "%lf", &delta) == 1) {
                if(arg[0] == '+' || arg[0] == '-')
                        mwfact += delta;
                else
@@ -1457,7 +1464,7 @@ setup(void) {
        XSelectInput(dpy, root, wa.event_mask);
 
        /* grab keys */
-       keypress(NULL);
+       grabkeys();
 
        /* init tags */
        compileregs();
@@ -1513,8 +1520,8 @@ spawn(const char *arg) {
                return;
        /* The double-fork construct avoids zombie processes and keeps the code
         * clean from stupid signal handlers. */
-       if(0 == fork()) {
-               if(0 == fork()) {
+       if(fork() == 0) {
+               if(fork() == 0) {
                        if(dpy)
                                close(ConnectionNumber(dpy));
                        setsid();
@@ -1575,7 +1582,7 @@ tile(void) {
        nw = 0; /* gcc stupidity requires this */
        for(i = 0, c = mc = nexttiled(clients); c; c = nexttiled(c->next), i++) {
                c->ismax = False;
-               if(0 == i) { /* master */
+               if(i == 0) { /* master */
                        nw = mw - 2 * c->border;
                        nh = wah - 2 * c->border;
                }
@@ -1626,7 +1633,7 @@ togglemax(const char *arg) {
        if(!sel || sel->isfixed)
                return;
        if((sel->ismax = !sel->ismax)) {
-               if((floating == layout->arrange) || sel->isfloating)
+               if((layout->arrange == floating) || sel->isfloating)
                        sel->wasfloating = True;
                else {
                        togglefloating(NULL);