nah grouped keybindings by context

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 153b49a..540aeb6 100644 (file)
--- a/event.c
+++ b/event.c
@@ -11,7 +11,7 @@
 typedef struct {
        unsigned long mod;
        KeySym keysym;
 typedef struct {
        unsigned long mod;
        KeySym keysym;

-       void (*func)(Arg *arg);
+       void (*func)(Arg arg);

        Arg arg;
 } Key;
 
        Arg arg;
 } Key;
 


@@ -20,6 +20,14 @@ KEYS
 #define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
 #define MOUSEMASK              (BUTTONMASK | PointerMotionMask)
 
 #define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
 #define MOUSEMASK              (BUTTONMASK | PointerMotionMask)
 

+static Client *
+getclient(Window w) {
+       Client *c;
+
+       for(c = clients; c && c->win != w; c = c->next);
+       return c;
+}
+

 static void
 movemouse(Client *c) {
        int x1, y1, ocx, ocy, di, nx, ny;
 static void
 movemouse(Client *c) {
        int x1, y1, ocx, ocy, di, nx, ny;


@@ -116,31 +124,32 @@ buttonpress(XEvent *e) {
                        if(ev->x < x) {
                                if(ev->button == Button1) {
                                        if(ev->state & MODKEY)
                        if(ev->x < x) {
                                if(ev->button == Button1) {
                                        if(ev->state & MODKEY)

-                                               tag(&a);
+                                               tag(a);

                                        else
                                        else

-                                               view(&a);
+                                               view(a);

                                }
                                else if(ev->button == Button3) {
                                        if(ev->state & MODKEY)
                                }
                                else if(ev->button == Button3) {
                                        if(ev->state & MODKEY)

-                                               toggletag(&a);
+                                               toggletag(a);

                                        else
                                        else

-                                               toggleview(&a);
+                                               toggleview(a);

                                }
                                return;
                        }
                }
                                }
                                return;
                        }
                }

-               if(ev->x < x + bmw)
+               if(ev->x < x + blw)

                        switch(ev->button) {
                        case Button1:
                        switch(ev->button) {
                        case Button1:

-                               togglemode(NULL);
+                               a.i = -1;
+                               setlayout(a);

                                break;
                        case Button4:
                                a.i = 1;
                                break;
                        case Button4:
                                a.i = 1;

-                               incnmaster(&a);
+                               incnmaster(a);

                                break;
                        case Button5:
                                a.i = -1;
                                break;
                        case Button5:
                                a.i = -1;

-                               incnmaster(&a);
+                               incnmaster(a);

                                break;
                        }
        }
                                break;
                        }
        }


@@ -148,14 +157,14 @@ buttonpress(XEvent *e) {
                focus(c);
                if(CLEANMASK(ev->state) != MODKEY)
                        return;
                focus(c);
                if(CLEANMASK(ev->state) != MODKEY)
                        return;

-               if(ev->button == Button1 && (arrange == dofloat || c->isfloat)) {
+               if(ev->button == Button1 && (lt->arrange == versatile || c->isversatile)) {

                        restack();
                        movemouse(c);
                }
                else if(ev->button == Button2)
                        restack();
                        movemouse(c);
                }
                else if(ev->button == Button2)

-                       zoom(NULL);
+                       zoom(a);

                else if(ev->button == Button3
                else if(ev->button == Button3

-               && (arrange == dofloat || c->isfloat) && !c->isfixed)
+               && (lt->arrange == versatile || c->isversatile) && !c->isfixed)

                {
                        restack();
                        resizemouse(c);
                {
                        restack();
                        resizemouse(c);


@@ -173,7 +182,7 @@ configurerequest(XEvent *e) {
                c->ismax = False;
                if(ev->value_mask & CWBorderWidth)
                        c->border = ev->border_width;
                c->ismax = False;
                if(ev->value_mask & CWBorderWidth)
                        c->border = ev->border_width;

-               if(c->isfixed || c->isfloat || (arrange == dofloat)) {
+               if(c->isfixed || c->isversatile || (lt->arrange == versatile)) {

                        if(ev->value_mask & CWX)
                                c->x = ev->x;
                        if(ev->value_mask & CWY)
                        if(ev->value_mask & CWX)
                                c->x = ev->x;
                        if(ev->value_mask & CWY)


@@ -184,16 +193,9 @@ configurerequest(XEvent *e) {
                                c->h = ev->height;
                        if((ev->value_mask & (CWX | CWY))
                        && !(ev->value_mask & (CWWidth | CWHeight)))
                                c->h = ev->height;
                        if((ev->value_mask & (CWX | CWY))
                        && !(ev->value_mask & (CWWidth | CWHeight)))

-                       {

                                configure(c);
                                configure(c);

-                               if(isvisible(c))
-                                       XMoveWindow(dpy, c->win, c->x, c->y);
-                       }
-                       else {
+                       if(isvisible(c))

                                XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
                                XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);

-                               if(!isvisible(c))
-                                       ban(c);
-                       }

                }
                else
                        configure(c);
                }
                else
                        configure(c);


@@ -259,7 +261,7 @@ keypress(XEvent *e) {
                && CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
                {
                        if(key[i].func)
                && CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
                {
                        if(key[i].func)

-                               key[i].func(&key[i].arg);
+                               key[i].func(key[i].arg);

                }
 }
 
                }
 }
 


@@ -308,8 +310,8 @@ propertynotify(XEvent *e) {
                        default: break;
                        case XA_WM_TRANSIENT_FOR:
                                XGetTransientForHint(dpy, c->win, &trans);
                        default: break;
                        case XA_WM_TRANSIENT_FOR:
                                XGetTransientForHint(dpy, c->win, &trans);

-                               if(!c->isfloat && (c->isfloat = (trans != 0)))
-                                       arrange();
+                               if(!c->isversatile && (c->isversatile = (getclient(trans) != NULL)))
+                                       lt->arrange();

                                break;
                        case XA_WM_NORMAL_HINTS:
                                updatesizehints(c);
                                break;
                        case XA_WM_NORMAL_HINTS:
                                updatesizehints(c);


@@ -367,14 +369,3 @@ grabkeys(void) {
                                GrabModeAsync, GrabModeAsync);
        }
 }
                                GrabModeAsync, GrabModeAsync);
        }
 }

-
-void
-procevent(void) {
-       XEvent ev;
-
-       while(XPending(dpy)) {
-               XNextEvent(dpy, &ev);
-               if(handler[ev.type])
-                       (handler[ev.type])(&ev); /* call handler */
-       }
-}