removed mode label stuff

[dwm.git] / event.c

diff --git a/event.c b/event.c
index c9ad387..a9d2fbb 100644 (file)
--- a/event.c
+++ b/event.c
@@ -131,8 +131,20 @@ buttonpress(XEvent *e) {
                                return;
                        }
                }
                                return;
                        }
                }

-               if((ev->x < x + bmw) && (ev->button == Button1))
-                       togglemode(NULL);
+               if(ev->x < x + bmw)
+                       switch(ev->button) {
+                       case Button1:
+                               togglemode(NULL);
+                               break;
+                       case Button4:
+                               a.i = 1;
+                               incnmaster(&a);
+                               break;
+                       case Button5:
+                               a.i = -1;
+                               incnmaster(&a);
+                               break;
+                       }

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


@@ -184,7 +196,7 @@ configurerequest(XEvent *e) {
                if(c->isfloat) {
                        resize(c, False, TopLeft);
                        if(!isvisible(c))
                if(c->isfloat) {
                        resize(c, False, TopLeft);
                        if(!isvisible(c))

-                               ban(c);
+                               XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);

                }
                else
                        arrange();
                }
                else
                        arrange();


@@ -218,7 +230,7 @@ enternotify(XEvent *e) {
 
        if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
                return;
 
        if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
                return;

-       if(((c = getclient(ev->window)) || (c = getctitle(ev->window))) && isvisible(c))
+       if((c = getclient(ev->window)) && isvisible(c))

                focus(c);
        else if(ev->window == root) {
                issel = True;
                focus(c);
        else if(ev->window == root) {
                issel = True;


@@ -235,8 +247,6 @@ expose(XEvent *e) {
        if(ev->count == 0) {
                if(barwin == ev->window)
                        drawstatus();
        if(ev->count == 0) {
                if(barwin == ev->window)
                        drawstatus();

-               else if((c = getctitle(ev->window)))
-                       drawclient(c);

        }
 }
 
        }
 }
 


@@ -319,7 +329,6 @@ propertynotify(XEvent *e) {
                }
                if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
                        updatetitle(c);
                }
                if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
                        updatetitle(c);

-                       resizetitle(c);

                        drawclient(c);
                }
        }
                        drawclient(c);
                }
        }