prepared 4.4.1 bugfix and minor feature enhancement release

[dwm.git] / event.c

diff --git a/event.c b/event.c
index b8a16a7..9e83178 100644 (file)
--- a/event.c
+++ b/event.c
@@ -1,6 +1,5 @@
 /* See LICENSE file for copyright and license details. */
 #include "dwm.h"
 /* 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 <stdlib.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>


@@ -15,8 +14,6 @@ typedef struct {
        const char *arg;
 } Key;
 
        const char *arg;
 } Key;
 

-KEYS
-

 #define CLEANMASK(mask)                (mask & ~(numlockmask | LockMask))
 #define MOUSEMASK              (BUTTONMASK | PointerMotionMask)
 
 #define CLEANMASK(mask)                (mask & ~(numlockmask | LockMask))
 #define MOUSEMASK              (BUTTONMASK | PointerMotionMask)
 


@@ -112,29 +109,26 @@ resizemouse(Client *c) {
 
 static void
 buttonpress(XEvent *e) {
 
 static void
 buttonpress(XEvent *e) {

-       static char buf[32];

        unsigned int i, x;
        Client *c;
        XButtonPressedEvent *ev = &e->xbutton;
 
        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) {
        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)
                                if(ev->button == Button1) {
                                        if(ev->state & MODKEY)

-                                               tag(buf);
+                                               tag(tags[i]);

                                        else
                                        else

-                                               view(buf);
+                                               view(tags[i]);

                                }
                                else if(ev->button == Button3) {
                                        if(ev->state & MODKEY)
                                }
                                else if(ev->button == Button3) {
                                        if(ev->state & MODKEY)

-                                               toggletag(buf);
+                                               toggletag(tags[i]);

                                        else
                                        else

-                                               toggleview(buf);
+                                               toggleview(tags[i]);

                                }
                                return;
                        }
                                }
                                return;
                        }


@@ -227,7 +221,7 @@ destroynotify(XEvent *e) {
        XDestroyWindowEvent *ev = &e->xdestroywindow;
 
        if((c = getclient(ev->window)))
        XDestroyWindowEvent *ev = &e->xdestroywindow;
 
        if((c = getclient(ev->window)))

-               unmanage(c, WithdrawnState);
+               unmanage(c);

 }
 
 static void
 }
 
 static void


@@ -257,18 +251,19 @@ expose(XEvent *e) {
 
 static void
 keypress(XEvent *e) {
 
 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++)
        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);

                }
 }
 
                }
 }
 


@@ -337,10 +332,8 @@ unmapnotify(XEvent *e) {
        Client *c;
        XUnmapEvent *ev = &e->xunmap;
 
        Client *c;
        XUnmapEvent *ev = &e->xunmap;
 

-       if((c = getclient(ev->window)) && (ev->event == root)) {
-               if(ev->send_event || c->unmapped-- == 0)
-                       unmanage(c, WithdrawnState);
-       }
+       if((c = getclient(ev->window)))
+               unmanage(c);

 }
 
 /* extern */
 }
 
 /* extern */


@@ -362,20 +355,21 @@ void (*handler[LASTEvent]) (XEvent *) = {
 
 void
 grabkeys(void) {
 
 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++) {
        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);
                                GrabModeAsync, GrabModeAsync);

-               XGrabKey(dpy, code, key[i].mod | LockMask, root, True,
+               XGrabKey(dpy, code, keys[i].mod | LockMask, root, True,

                                GrabModeAsync, GrabModeAsync);
                                GrabModeAsync, GrabModeAsync);

-               XGrabKey(dpy, code, key[i].mod | numlockmask, root, True,
+               XGrabKey(dpy, code, keys[i].mod | numlockmask, root, True,

                                GrabModeAsync, GrabModeAsync);
                                GrabModeAsync, GrabModeAsync);

-               XGrabKey(dpy, code, key[i].mod | numlockmask | LockMask, root, True,
+               XGrabKey(dpy, code, keys[i].mod | numlockmask | LockMask, root, True,

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