removed a bunch of lines through making function signatures more consistent with...

[dwm.git] / event.c

diff --git a/event.c b/event.c
index c7a0b15..c59385d 100644 (file)
--- a/event.c
+++ b/event.c
@@ -21,8 +21,7 @@ KEYS
 #define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
 
 static void
-movemouse(Client *c)
-{
+movemouse(Client *c) {
        int x1, y1, ocx, ocy, di;
        unsigned int dui;
        Window dummy;
@@ -37,7 +36,8 @@ movemouse(Client *c)
        for(;;) {
                XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
                switch (ev.type) {
-               default: break;
+               default:
+                       break;
                case Expose:
                        handler[Expose](&ev);
                        break;
@@ -55,8 +55,7 @@ movemouse(Client *c)
 }
 
 static void
-resizemouse(Client *c)
-{
+resizemouse(Client *c) {
        int ocx, ocy;
        int nw, nh;
        Corner sticky;
@@ -71,7 +70,8 @@ resizemouse(Client *c)
        for(;;) {
                XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
                switch(ev.type) {
-               default: break;
+               default:
+                       break;
                case Expose:
                        handler[Expose](&ev);
                        break;
@@ -97,8 +97,7 @@ resizemouse(Client *c)
 }
 
 static void
-buttonpress(XEvent *e)
-{
+buttonpress(XEvent *e) {
        int x;
        Arg a;
        Client *c;
@@ -109,10 +108,18 @@ buttonpress(XEvent *e)
                for(a.i = 0; a.i < ntags; a.i++) {
                        x += textw(tags[a.i]);
                        if(ev->x < x) {
-                               if(ev->button == Button1)
-                                       view(&a);
-                               else if(ev->button == Button3)
-                                       toggleview(&a);
+                               if(ev->button == Button1) {
+                                       if(ev->state & MODKEY)
+                                               tag(&a);
+                                       else
+                                               view(&a);
+                               }
+                               else if(ev->button == Button3) {
+                                       if(ev->state & MODKEY)
+                                               toggletag(&a);
+                                       else
+                                               toggleview(&a);
+                               }
                                return;
                        }
                }
@@ -123,40 +130,51 @@ buttonpress(XEvent *e)
        }
        else if((c = getclient(ev->window))) {
                focus(c);
-               if(CLEANMASK(ev->state) != MODKEY)
+               if(maximized || CLEANMASK(ev->state) != MODKEY)
                        return;
-               switch(ev->button) {
-               default:
-                       break;
-               case Button1:
-                       if(!c->ismax && (arrange == dofloat || c->isfloat)) {
-                               restack(c);
-                               movemouse(c);
-                       }
-                       break;
-               case Button2:
+               if(ev->button == Button1 && (arrange == dofloat || c->isfloat)) {
+                       restack(c);
+                       movemouse(c);
+               }
+               else if(ev->button == Button2)
                        zoom(NULL);
-                       break;
-               case Button3:
-                       if(!c->ismax && (arrange == dofloat || c->isfloat)) {
-                               restack(c);
-                               resizemouse(c);
-                       }
-                       break;
+               else if(ev->button == Button3 && (arrange == dofloat || c->isfloat)) {
+                       restack(c);
+                       resizemouse(c);
                }
        }
 }
 
 static void
-configurerequest(XEvent *e)
-{
+synconfig(Client *c, int x, int y, int w, int h, unsigned int border) {
+       XEvent synev;
+
+       synev.type = ConfigureNotify;
+       synev.xconfigure.display = dpy;
+       synev.xconfigure.event = c->win;
+       synev.xconfigure.window = c->win;
+       synev.xconfigure.x = x;
+       synev.xconfigure.y = y;
+       synev.xconfigure.width = w;
+       synev.xconfigure.height = h;
+       synev.xconfigure.border_width = border;
+       synev.xconfigure.above = None;
+       XSendEvent(dpy, c->win, True, NoEventMask, &synev);
+}
+
+static void
+configurerequest(XEvent *e) {
        unsigned long newmask;
        Client *c;
        XConfigureRequestEvent *ev = &e->xconfigurerequest;
-       XEvent synev;
        XWindowChanges wc;
 
        if((c = getclient(ev->window))) {
+               if((c == sel) && !c->isfloat && (arrange != dofloat) && maximized) {
+                       synconfig(c, sx, sy + bh, sw - 2, sh - 2 - bh, ev->border_width);
+                       XSync(dpy, False);
+                       return;
+               }
                gravitate(c, True);
                if(ev->value_mask & CWX)
                        c->x = ev->x;
@@ -176,20 +194,8 @@ configurerequest(XEvent *e)
                newmask = ev->value_mask & (~(CWSibling | CWStackMode | CWBorderWidth));
                if(newmask)
                        XConfigureWindow(dpy, c->win, newmask, &wc);
-               else {
-                       synev.type = ConfigureNotify;
-                       synev.xconfigure.display = dpy;
-                       synev.xconfigure.event = c->win;
-                       synev.xconfigure.window = c->win;
-                       synev.xconfigure.x = c->x;
-                       synev.xconfigure.y = c->y;
-                       synev.xconfigure.width = c->w;
-                       synev.xconfigure.height = c->h;
-                       synev.xconfigure.border_width = c->border;
-                       synev.xconfigure.above = None;
-                       /* Send synthetic ConfigureNotify */
-                       XSendEvent(dpy, c->win, True, NoEventMask, &synev);
-               }
+               else
+                       synconfig(c, c->x, c->y, c->w, c->h, c->border);
                XSync(dpy, False);
                if(c->isfloat)
                        resize(c, False, TopLeft);
@@ -210,8 +216,7 @@ configurerequest(XEvent *e)
 }
 
 static void
-destroynotify(XEvent *e)
-{
+destroynotify(XEvent *e) {
        Client *c;
        XDestroyWindowEvent *ev = &e->xdestroywindow;
 
@@ -220,8 +225,7 @@ destroynotify(XEvent *e)
 }
 
 static void
-enternotify(XEvent *e)
-{
+enternotify(XEvent *e) {
        Client *c;
        XCrossingEvent *ev = &e->xcrossing;
 
@@ -238,8 +242,7 @@ enternotify(XEvent *e)
 }
 
 static void
-expose(XEvent *e)
-{
+expose(XEvent *e) {
        Client *c;
        XExposeEvent *ev = &e->xexpose;
 
@@ -252,8 +255,7 @@ expose(XEvent *e)
 }
 
 static void
-keypress(XEvent *e)
-{
+keypress(XEvent *e) {
        static unsigned int len = sizeof(key) / sizeof(key[0]);
        unsigned int i;
        KeySym keysym;
@@ -261,8 +263,8 @@ keypress(XEvent *e)
 
        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
        for(i = 0; i < len; i++) {
-               if(keysym == key[i].keysym &&
-                               CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
+               if(keysym == key[i].keysym
+                       && CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
                {
                        if(key[i].func)
                                key[i].func(&key[i].arg);
@@ -272,8 +274,7 @@ keypress(XEvent *e)
 }
 
 static void
-leavenotify(XEvent *e)
-{
+leavenotify(XEvent *e) {
        XCrossingEvent *ev = &e->xcrossing;
 
        if((ev->window == root) && !ev->same_screen) {
@@ -283,8 +284,7 @@ leavenotify(XEvent *e)
 }
 
 static void
-mappingnotify(XEvent *e)
-{
+mappingnotify(XEvent *e) {
        XMappingEvent *ev = &e->xmapping;
 
        XRefreshKeyboardMapping(ev);
@@ -293,8 +293,7 @@ mappingnotify(XEvent *e)
 }
 
 static void
-maprequest(XEvent *e)
-{
+maprequest(XEvent *e) {
        static XWindowAttributes wa;
        XMapRequestEvent *ev = &e->xmaprequest;
 
@@ -312,8 +311,7 @@ maprequest(XEvent *e)
 }
 
 static void
-propertynotify(XEvent *e)
-{
+propertynotify(XEvent *e) {
        Client *c;
        Window trans;
        XPropertyEvent *ev = &e->xproperty;
@@ -334,19 +332,18 @@ propertynotify(XEvent *e)
                                        arrange(NULL);
                                break;
                        case XA_WM_NORMAL_HINTS:
-                               setsize(c);
+                               updatesize(c);
                                break;
                }
                if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
-                       settitle(c);
+                       updatetitle(c);
                        drawtitle(c);
                }
        }
 }
 
 static void
-unmapnotify(XEvent *e)
-{
+unmapnotify(XEvent *e) {
        Client *c;
        XUnmapEvent *ev = &e->xunmap;
 
@@ -371,8 +368,7 @@ void (*handler[LASTEvent]) (XEvent *) = {
 };
 
 void
-grabkeys()
-{
+grabkeys() {
        static unsigned int len = sizeof(key) / sizeof(key[0]);
        unsigned int i;
        KeyCode code;
@@ -392,8 +388,7 @@ grabkeys()
 }
 
 void
-procevent()
-{
+procevent() {
        XEvent ev;
 
        while(XPending(dpy)) {
@@ -402,4 +397,3 @@ procevent()
                        (handler[ev.type])(&ev); /* call handler */
        }
 }
-