still something wrong with reorder()

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 86fb43b..c7a0b15 100644 (file)
--- a/event.c
+++ b/event.c
@@ -105,9 +105,7 @@ buttonpress(XEvent *e)
        XButtonPressedEvent *ev = &e->xbutton;
 
        if(barwin == ev->window) {
        XButtonPressedEvent *ev = &e->xbutton;
 
        if(barwin == ev->window) {

-               if(ev->x < modew)
-                       return;
-               x = modew;
+               x = 0;

                for(a.i = 0; a.i < ntags; a.i++) {
                        x += textw(tags[a.i]);
                        if(ev->x < x) {
                for(a.i = 0; a.i < ntags; a.i++) {
                        x += textw(tags[a.i]);
                        if(ev->x < x) {


@@ -118,10 +116,14 @@ buttonpress(XEvent *e)
                                return;
                        }
                }
                                return;
                        }
                }

+               if(ev->x < x + bmw) {
+                       if(ev->button == Button1)
+                               togglemode(NULL);
+               }

        }
        else if((c = getclient(ev->window))) {
                focus(c);
        }
        else if((c = getclient(ev->window))) {
                focus(c);

-               if(CLEANMASK(ev->state) == 0)
+               if(CLEANMASK(ev->state) != MODKEY)

                        return;
                switch(ev->button) {
                default:
                        return;
                switch(ev->button) {
                default: