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 b8a16a7..4e240e2 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;
                        }


@@ -257,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;


@@ -362,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;