applied Sanders patches

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 0fce36b..17be71d 100644 (file)
--- a/event.c
+++ b/event.c
@@ -8,60 +8,69 @@
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 

-#define ButtonMask      (ButtonPressMask | ButtonReleaseMask)
-#define MouseMask       (ButtonMask | PointerMotionMask)
-

 /* CUSTOMIZE */
 /* CUSTOMIZE */

+
+typedef struct {
+       unsigned long mod;
+       KeySym keysym;
+       void (*func)(Arg *arg);
+       Arg arg;
+} Key;
+

 const char *browse[] = { "firefox", NULL };
 const char *gimp[] = { "gimp", NULL };
 const char *browse[] = { "firefox", NULL };
 const char *gimp[] = { "gimp", NULL };

-const char *term[] = { 
-       "urxvtc", "-tr", "+sb", "-bg", "black", "-fg", "white", "-cr", "white",
+const char *term[] = { /*"xterm", NULL };*/
+       "urxvt", "-tr", "+sb", "-bg", "black", "-fg", "white", "-cr", "white",

        "-fn", "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*", NULL
 };
 const char *xlock[] = { "xlock", NULL };
 
        "-fn", "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*", NULL
 };
 const char *xlock[] = { "xlock", NULL };
 

-Key key[] = {
-       /* modifier                             key                     function        arguments */
-       { ControlMask,                  XK_0,           appendtag,      { .i = Tscratch } }, 
-       { ControlMask,                  XK_1,           appendtag,      { .i = Tdev } }, 
-       { ControlMask,                  XK_2,           appendtag,      { .i = Twww } }, 
-       { ControlMask,                  XK_3,           appendtag,      { .i = Twork } }, 
-       { Mod1Mask,                             XK_0,           view,           { .i = Tscratch } }, 
-       { Mod1Mask,                             XK_1,           view,           { .i = Tdev } }, 
-       { Mod1Mask,                             XK_2,           view,           { .i = Twww } }, 
-       { Mod1Mask,                             XK_3,           view,           { .i = Twork } }, 
-       { Mod1Mask,                             XK_j,           focusnext,              { 0 } }, 
-       { Mod1Mask,                             XK_k,           focusprev,              { 0 } },
-       { Mod1Mask,                             XK_m,           maximize,               { 0 } }, 
-       { Mod1Mask,                             XK_space,       dotile,         { 0 } }, 
-       { Mod1Mask,                             XK_Return,      zoom,           { 0 } },
-       { Mod1Mask|ShiftMask,   XK_0,           replacetag,             { .i = Tscratch } }, 
-       { Mod1Mask|ShiftMask,   XK_1,           replacetag,             { .i = Tdev } }, 
-       { Mod1Mask|ShiftMask,   XK_2,           replacetag,             { .i = Twww } }, 
-       { Mod1Mask|ShiftMask,   XK_3,           replacetag,             { .i = Twork } }, 
-       { Mod1Mask|ShiftMask,   XK_c,           killclient,             { 0 } }, 
-       { Mod1Mask|ShiftMask,   XK_g,           spawn,          { .argv = gimp } },
-       { Mod1Mask|ShiftMask,   XK_l,           spawn,          { .argv = xlock } },
-       { Mod1Mask|ShiftMask,   XK_q,           quit,           { 0 } },
-       { Mod1Mask|ShiftMask,   XK_space,       dofloat,        { 0 } }, 
-       { Mod1Mask|ShiftMask,   XK_w,           spawn,          { .argv = browse } },
-       { Mod1Mask|ShiftMask,   XK_Return,      spawn,          { .argv = term } },
+static Key key[] = {
+       /* modifier             key             function        arguments */
+       { MODKEY,               XK_0,           view,           { .i = Tfnord } }, 
+       { MODKEY,               XK_1,           view,           { .i = Tdev } }, 
+       { MODKEY,               XK_2,           view,           { .i = Tnet } }, 
+       { MODKEY,               XK_3,           view,           { .i = Twork } }, 
+       { MODKEY,               XK_4,           view,           { .i = Tmisc} }, 
+       { MODKEY,               XK_j,           focusnext,      { 0 } }, 
+       { MODKEY,               XK_k,           focusprev,      { 0 } },
+       { MODKEY,               XK_m,           togglemax,      { 0 } }, 
+       { MODKEY,               XK_space,       togglemode,     { 0 } }, 
+       { MODKEY,               XK_Return,      zoom,           { 0 } },
+       { MODKEY|ControlMask,   XK_0,           appendtag,      { .i = Tfnord } }, 
+       { MODKEY|ControlMask,   XK_1,           appendtag,      { .i = Tdev } }, 
+       { MODKEY|ControlMask,   XK_2,           appendtag,      { .i = Tnet } }, 
+       { MODKEY|ControlMask,   XK_3,           appendtag,      { .i = Twork } }, 
+       { MODKEY|ControlMask,   XK_4,           appendtag,      { .i = Tmisc } }, 
+       { MODKEY|ShiftMask,     XK_0,           replacetag,     { .i = Tfnord } }, 
+       { MODKEY|ShiftMask,     XK_1,           replacetag,     { .i = Tdev } }, 
+       { MODKEY|ShiftMask,     XK_2,           replacetag,     { .i = Tnet } }, 
+       { MODKEY|ShiftMask,     XK_3,           replacetag,     { .i = Twork } }, 
+       { MODKEY|ShiftMask,     XK_4,           replacetag,     { .i = Tmisc } }, 
+       { MODKEY|ShiftMask,     XK_c,           killclient,     { 0 } }, 
+       { MODKEY|ShiftMask,     XK_q,           quit,           { 0 } },
+       { MODKEY|ShiftMask,     XK_Return,      spawn,          { .argv = term } },
+       { MODKEY|ShiftMask,     XK_g,           spawn,          { .argv = gimp } },
+       { MODKEY|ShiftMask,     XK_l,           spawn,          { .argv = xlock } },
+       { MODKEY|ShiftMask,     XK_w,           spawn,          { .argv = browse } },

 };
 
 };
 

+/* END CUSTOMIZE */
+

 /* static */
 
 static void
 movemouse(Client *c)
 {
 /* static */
 
 static void
 movemouse(Client *c)
 {

-       XEvent ev;

        int x1, y1, ocx, ocy, di;
        unsigned int dui;
        Window dummy;
        int x1, y1, ocx, ocy, di;
        unsigned int dui;
        Window dummy;

+       XEvent ev;

 
        ocx = c->x;
        ocy = c->y;
        if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync,
 
        ocx = c->x;
        ocy = c->y;
        if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync,

-                               None, cursor[CurMove], CurrentTime) != GrabSuccess)
+                       None, cursor[CurMove], CurrentTime) != GrabSuccess)

                return;
        XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
        for(;;) {
                return;
        XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
        for(;;) {


@@ -75,7 +84,7 @@ movemouse(Client *c)
                        XSync(dpy, False);
                        c->x = ocx + (ev.xmotion.x - x1);
                        c->y = ocy + (ev.xmotion.y - y1);
                        XSync(dpy, False);
                        c->x = ocx + (ev.xmotion.x - x1);
                        c->y = ocy + (ev.xmotion.y - y1);

-                       resize(c, False);
+                       resize(c, False, TopLeft);

                        break;
                case ButtonRelease:
                        XUngrabPointer(dpy, CurrentTime);
                        break;
                case ButtonRelease:
                        XUngrabPointer(dpy, CurrentTime);


@@ -87,8 +96,9 @@ movemouse(Client *c)
 static void
 resizemouse(Client *c)
 {
 static void
 resizemouse(Client *c)
 {

-       XEvent ev;

        int ocx, ocy;
        int ocx, ocy;

+       Corner sticky;
+       XEvent ev;

 
        ocx = c->x;
        ocy = c->y;
 
        ocx = c->x;
        ocy = c->y;


@@ -109,7 +119,11 @@ resizemouse(Client *c)
                        c->h = abs(ocy - ev.xmotion.y);
                        c->x = (ocx <= ev.xmotion.x) ? ocx : ocx - c->w;
                        c->y = (ocy <= ev.xmotion.y) ? ocy : ocy - c->h;
                        c->h = abs(ocy - ev.xmotion.y);
                        c->x = (ocx <= ev.xmotion.x) ? ocx : ocx - c->w;
                        c->y = (ocy <= ev.xmotion.y) ? ocy : ocy - c->h;

-                       resize(c, True);
+                       if(ocx <= ev.xmotion.x)
+                               sticky = (ocy <= ev.xmotion.y) ? TopLeft : BotLeft;
+                       else
+                               sticky = (ocy <= ev.xmotion.y) ? TopRight : BotRight;
+                       resize(c, True, sticky);

                        break;
                case ButtonRelease:
                        XUngrabPointer(dpy, CurrentTime);
                        break;
                case ButtonRelease:
                        XUngrabPointer(dpy, CurrentTime);


@@ -123,8 +137,8 @@ buttonpress(XEvent *e)
 {
        int x;
        Arg a;
 {
        int x;
        Arg a;

-       XButtonPressedEvent *ev = &e->xbutton;

        Client *c;
        Client *c;

+       XButtonPressedEvent *ev = &e->xbutton;

 
        if(barwin == ev->window) {
                switch(ev->button) {
 
        if(barwin == ev->window) {
                switch(ev->button) {


@@ -149,24 +163,24 @@ buttonpress(XEvent *e)
                }
        }
        else if((c = getclient(ev->window))) {
                }
        }
        else if((c = getclient(ev->window))) {

-               if(arrange == dotile && !c->isfloat) {
-                       if((ev->state & ControlMask) && (ev->button == Button1))
-                               zoom(NULL);
-                       return;
-               }
-               /* floating windows */
-               higher(c);
+               focus(c);

                switch(ev->button) {
                default:
                        break;
                case Button1:
                switch(ev->button) {
                default:
                        break;
                case Button1:

-                       movemouse(c);
+                       if(!c->ismax && (arrange == dofloat || c->isfloat)) {
+                               higher(c);
+                               movemouse(c);
+                       }

                        break;
                case Button2:
                        lower(c);
                        break;
                case Button3:
                        break;
                case Button2:
                        lower(c);
                        break;
                case Button3:

-                       resizemouse(c);
+                       if(!c->ismax && (arrange == dofloat || c->isfloat)) {
+                               higher(c);
+                               resizemouse(c);
+                       }

                        break;
                }
        }
                        break;
                }
        }


@@ -175,9 +189,9 @@ buttonpress(XEvent *e)
 static void
 configurerequest(XEvent *e)
 {
 static void
 configurerequest(XEvent *e)
 {

+       Client *c;

        XConfigureRequestEvent *ev = &e->xconfigurerequest;
        XWindowChanges wc;
        XConfigureRequestEvent *ev = &e->xconfigurerequest;
        XWindowChanges wc;

-       Client *c;

 
        ev->value_mask &= ~CWSibling;
        if((c = getclient(ev->window))) {
 
        ev->value_mask &= ~CWSibling;
        if((c = getclient(ev->window))) {


@@ -193,7 +207,7 @@ configurerequest(XEvent *e)
                if(ev->value_mask & CWBorderWidth)
                        c->border = 1;
                gravitate(c, False);
                if(ev->value_mask & CWBorderWidth)
                        c->border = 1;
                gravitate(c, False);

-               resize(c, True);
+               resize(c, True, TopLeft);

        }
 
        wc.x = ev->x;
        }
 
        wc.x = ev->x;


@@ -222,10 +236,10 @@ destroynotify(XEvent *e)
 static void
 enternotify(XEvent *e)
 {
 static void
 enternotify(XEvent *e)
 {

-       XCrossingEvent *ev = &e->xcrossing;

        Client *c;
        Client *c;

+       XCrossingEvent *ev = &e->xcrossing;

 
 

-       if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
+       if(ev->detail == NotifyInferior)

                return;
 
        if((c = getclient(ev->window)))
                return;
 
        if((c = getclient(ev->window)))


@@ -237,8 +251,8 @@ enternotify(XEvent *e)
 static void
 expose(XEvent *e)
 {
 static void
 expose(XEvent *e)
 {

-       XExposeEvent *ev = &e->xexpose;

        Client *c;
        Client *c;

+       XExposeEvent *ev = &e->xexpose;

 
        if(ev->count == 0) {
                if(barwin == ev->window)
 
        if(ev->count == 0) {
                if(barwin == ev->window)


@@ -251,10 +265,10 @@ expose(XEvent *e)
 static void
 keypress(XEvent *e)
 {
 static void
 keypress(XEvent *e)
 {

-       XKeyEvent *ev = &e->xkey;
-       static unsigned int len = key ? sizeof(key) / sizeof(key[0]) : 0;
+       static unsigned int len = sizeof(key) / sizeof(key[0]);

        unsigned int i;
        KeySym keysym;
        unsigned int i;
        KeySym keysym;

+       XKeyEvent *ev = &e->xkey;

 
        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
        for(i = 0; i < len; i++)
 
        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
        for(i = 0; i < len; i++)


@@ -277,8 +291,8 @@ leavenotify(XEvent *e)
 static void
 maprequest(XEvent *e)
 {
 static void
 maprequest(XEvent *e)
 {

-       XMapRequestEvent *ev = &e->xmaprequest;

        static XWindowAttributes wa;
        static XWindowAttributes wa;

+       XMapRequestEvent *ev = &e->xmaprequest;

 
        if(!XGetWindowAttributes(dpy, ev->window, &wa))
                return;
 
        if(!XGetWindowAttributes(dpy, ev->window, &wa))
                return;


@@ -296,9 +310,9 @@ maprequest(XEvent *e)
 static void
 propertynotify(XEvent *e)
 {
 static void
 propertynotify(XEvent *e)
 {

-       XPropertyEvent *ev = &e->xproperty;
-       Window trans;

        Client *c;
        Client *c;

+       Window trans;
+       XPropertyEvent *ev = &e->xproperty;

 
        if(ev->state == PropertyDelete)
                return; /* ignore */
 
        if(ev->state == PropertyDelete)
                return; /* ignore */


@@ -354,7 +368,7 @@ void (*handler[LASTEvent]) (XEvent *) = {
 void
 grabkeys()
 {
 void
 grabkeys()
 {

-       static unsigned int len = key ? sizeof(key) / sizeof(key[0]) : 0;
+       static unsigned int len = sizeof(key) / sizeof(key[0]);

        unsigned int i;
        KeyCode code;
 
        unsigned int i;
        KeyCode code;