small fix of initial numlockmask value

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 72595b2..2deef14 100644 (file)
--- a/event.c
+++ b/event.c
@@ -1,4 +1,4 @@
-/* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>

  * See LICENSE file for license details.
  */
 #include "dwm.h"
  * See LICENSE file for license details.
  */
 #include "dwm.h"


@@ -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);


@@ -236,7 +248,7 @@ expose(XEvent *e) {
                if(barwin == ev->window)
                        drawstatus();
                else if((c = getctitle(ev->window)))
                if(barwin == ev->window)
                        drawstatus();
                else if((c = getctitle(ev->window)))

-                       drawtitle(c);
+                       drawclient(c);

        }
 }
 
        }
 }
 


@@ -314,13 +326,13 @@ propertynotify(XEvent *e) {
                                        arrange();
                                break;
                        case XA_WM_NORMAL_HINTS:
                                        arrange();
                                break;
                        case XA_WM_NORMAL_HINTS:

-                               updatesize(c);
+                               updatesizehints(c);

                                break;
                }
                if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
                        updatetitle(c);
                        resizetitle(c);
                                break;
                }
                if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
                        updatetitle(c);
                        resizetitle(c);

-                       drawtitle(c);
+                       drawclient(c);

                }
        }
 }
                }
        }
 }