made tag/view/toggle{tag,view} work on pointer to tags-array, there was the need...

[dwm.git] / event.c

diff --git a/event.c b/event.c
index ad4e271..4e240e2 100644 (file)
--- a/event.c
+++ b/event.c
@@ -1,9 +1,9 @@
 /* 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>

+#include <X11/Xutil.h>

 
 /* static */
 
 
 /* static */
 


@@ -14,9 +14,7 @@ typedef struct {
        const char *arg;
 } Key;
 
        const char *arg;
 } Key;
 

-KEYS
-
-#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
+#define CLEANMASK(mask)                (mask & ~(numlockmask | LockMask))

 #define MOUSEMASK              (BUTTONMASK | PointerMotionMask)
 
 static Client *
 #define MOUSEMASK              (BUTTONMASK | PointerMotionMask)
 
 static Client *


@@ -111,52 +109,45 @@ 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;
                        }
                }

-               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;
        }
        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
                        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);
                {
                        restack();
                        resizemouse(c);


@@ -174,7 +165,7 @@ configurerequest(XEvent *e) {
                c->ismax = False;
                if(ev->value_mask & CWBorderWidth)
                        c->border = ev->border_width;
                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)
                        if(ev->value_mask & CWX)
                                c->x = ev->x;
                        if(ev->value_mask & CWY)


@@ -220,7 +211,7 @@ configurenotify(XEvent *e) {
                dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
                XResizeWindow(dpy, barwin, sw, bh);
                updatebarpos();
                dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
                XResizeWindow(dpy, barwin, sw, bh);
                updatebarpos();

-               lt->arrange();
+               arrange();

        }
 }
 
        }
 }
 


@@ -230,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);
+               unmanage(c, WithdrawnState);

 }
 
 static void
 }
 
 static void


@@ -260,7 +251,8 @@ 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 key / sizeof key[0];

        unsigned int i;
        KeySym keysym;
        XKeyEvent *ev = &e->xkey;
        unsigned int i;
        KeySym keysym;
        XKeyEvent *ev = &e->xkey;


@@ -321,7 +313,7 @@ propertynotify(XEvent *e) {
                        case XA_WM_TRANSIENT_FOR:
                                XGetTransientForHint(dpy, c->win, &trans);
                                if(!c->isfloating && (c->isfloating = (getclient(trans) != NULL)))
                        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);
                                break;
                        case XA_WM_NORMAL_HINTS:
                                updatesizehints(c);


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

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

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


@@ -363,7 +357,8 @@ void (*handler[LASTEvent]) (XEvent *) = {
 
 void
 grabkeys(void) {
 
 void
 grabkeys(void) {

-       static unsigned int len = sizeof key / sizeof key[0];
+       KEYS
+       unsigned int len = sizeof key / sizeof key[0];

        unsigned int i;
        KeyCode code;
 
        unsigned int i;
        KeyCode code;