X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=event.c;h=2deef143a55f2543ff71f6416a0ae0461bf74a2d;hb=f679125206ae28b38f77e9620a67365d310ddff3;hp=72595b293d31403625229ae51b8cf49eb10d4585;hpb=629647dfee4251fc4856b70658dff35cf5634057;p=dwm.git diff --git a/event.c b/event.c index 72595b2..2deef14 100644 --- a/event.c +++ b/event.c @@ -1,4 +1,4 @@ -/* (C)opyright MMVI Anselm R. Garbe +/* (C)opyright MMVI-MMVII Anselm R. Garbe * See LICENSE file for license details. */ #include "dwm.h" @@ -131,8 +131,20 @@ buttonpress(XEvent *e) { 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); @@ -236,7 +248,7 @@ expose(XEvent *e) { 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: - updatesize(c); + updatesizehints(c); break; } if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) { updatetitle(c); resizetitle(c); - drawtitle(c); + drawclient(c); } } }