applied Sanders resize patch, fixed lower bug

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 59c9bb9..9d69373 100644 (file)
--- a/event.c
+++ b/event.c
@@ -2,141 +2,84 @@
  * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
  * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */

+#include "dwm.h"

 
 

-#include <fcntl.h>
-#include <stdio.h>

 #include <stdlib.h>
 #include <stdlib.h>

-#include <string.h>
-#include <unistd.h>

 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 

-#include "dwm.h"
-

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

-/********** CUSTOMIZE **********/
-
+/* CUSTOMIZE */
+const char *browse[] = { "firefox", NULL };
+const char *gimp[] = { "gimp", NULL };

 const char *term[] = { 
 const char *term[] = { 

-       "urxvtc", "-tr", "+sb", "-bg", "black", "-fg", "white", "-fn",
-       "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*",NULL
+       "urxvtc", "-tr", "+sb", "-bg", "black", "-fg", "white", "-cr", "white",
+       "-fn", "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*", NULL

 };
 };

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

 const char *xlock[] = { "xlock", NULL };
 
 Key key[] = {
        /* modifier                             key                     function        arguments */
 const char *xlock[] = { "xlock", NULL };
 
 Key key[] = {
        /* modifier                             key                     function        arguments */

-       { Mod1Mask,                             XK_Return,      zoom,           { 0 } },
-       { Mod1Mask,                             XK_k,           focusprev,              { 0 } },
-       { Mod1Mask,                             XK_j,           focusnext,              { 0 } }, 
-       { Mod1Mask,                             XK_m,           maximize,               { 0 } }, 
+       { 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_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_space,       dotile,         { 0 } }, 

-       { Mod1Mask|ShiftMask,   XK_space,       dofloat,        { 0 } }, 
+       { Mod1Mask,                             XK_Return,      zoom,           { 0 } },
+       { ControlMask|ShiftMask,XK_0,           heretag,        { .i = Tscratch } }, 
+       { ControlMask|ShiftMask,XK_1,           heretag,        { .i = Tdev } }, 
+       { ControlMask|ShiftMask,XK_2,           heretag,        { .i = Twww } }, 
+       { ControlMask|ShiftMask,XK_3,           heretag,        { .i = Twork } }, 

        { 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_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_q,           quit,           { 0 } },

-       { Mod1Mask|ShiftMask,   XK_Return,      spawn,          { .argv = term } },
+       { Mod1Mask|ShiftMask,   XK_space,       dofloat,        { 0 } }, 

        { Mod1Mask|ShiftMask,   XK_w,           spawn,          { .argv = browse } },
        { Mod1Mask|ShiftMask,   XK_w,           spawn,          { .argv = browse } },

-       { Mod1Mask|ShiftMask,   XK_l,           spawn,          { .argv = xlock } },
-       { ControlMask,                  XK_0,           appendtag,      { .i = Tscratch } }, 
-       { ControlMask,                  XK_1,           appendtag,      { .i = Tdev } }, 
-       { ControlMask,                  XK_2,           appendtag,      { .i = Twww } }, 
-       { ControlMask,                  XK_3,           appendtag,      { .i = Twork } }, 
-};
-
-/********** CUSTOMIZE **********/
-
-/* local functions */
-static void buttonpress(XEvent *e);
-static void configurerequest(XEvent *e);
-static void destroynotify(XEvent *e);
-static void enternotify(XEvent *e);
-static void leavenotify(XEvent *e);
-static void expose(XEvent *e);
-static void keypress(XEvent *e);
-static void maprequest(XEvent *e);
-static void propertynotify(XEvent *e);
-static void unmapnotify(XEvent *e);
-
-void (*handler[LASTEvent]) (XEvent *) = {
-       [ButtonPress] = buttonpress,
-       [ConfigureRequest] = configurerequest,
-       [DestroyNotify] = destroynotify,
-       [EnterNotify] = enternotify,
-       [LeaveNotify] = leavenotify,
-       [Expose] = expose,
-       [KeyPress] = keypress,
-       [MapRequest] = maprequest,
-       [PropertyNotify] = propertynotify,
-       [UnmapNotify] = unmapnotify
+       { Mod1Mask|ShiftMask,   XK_Return,      spawn,          { .argv = term } },

 };
 
 };
 

-void
-grabkeys()
-{
-       static unsigned int len = key ? sizeof(key) / sizeof(key[0]) : 0;
-       unsigned int i;
-       KeyCode code;
-
-       for(i = 0; i < len; i++) {
-               code = XKeysymToKeycode(dpy, key[i].keysym);
-               XUngrabKey(dpy, code, key[i].mod, root);
-               XGrabKey(dpy, code, key[i].mod, root, True,
-                               GrabModeAsync, GrabModeAsync);
-       }
-}
+/* static */

 
 static void
 
 static void

-keypress(XEvent *e)
-{
-       XKeyEvent *ev = &e->xkey;
-       static unsigned int len = key ? sizeof(key) / sizeof(key[0]) : 0;
-       unsigned int i;
-       KeySym keysym;
-
-       keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
-       for(i = 0; i < len; i++)
-               if((keysym == key[i].keysym) && (key[i].mod == ev->state)) {
-                       if(key[i].func)
-                               key[i].func(&key[i].arg);
-                       return;
-               }
-}
-
-static void
-resizemouse(Client *c)
+movemouse(Client *c)

 {
        XEvent ev;
 {
        XEvent ev;

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

 
 

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

        if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync,
        if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync,

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

                return;
                return;

-       XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h);
+       XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);

        for(;;) {
                XMaskEvent(dpy, MouseMask | ExposureMask, &ev);
        for(;;) {
                XMaskEvent(dpy, MouseMask | ExposureMask, &ev);

-               switch(ev.type) {
+               switch (ev.type) {

                default: break;
                case Expose:
                        handler[Expose](&ev);
                        break;
                case MotionNotify:
                default: break;
                case Expose:
                        handler[Expose](&ev);
                        break;
                case MotionNotify:

-                       XFlush(dpy);
-                       c->w = abs(ocx - ev.xmotion.x);
-                       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);
+                       XSync(dpy, False);
+                       *c->x = ocx + (ev.xmotion.x - x1);
+                       *c->y = ocy + (ev.xmotion.y - y1);
+                       resize(c, False, TopLeft);

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


@@ -146,31 +89,43 @@ resizemouse(Client *c)
 }
 
 static void
 }
 
 static void

-movemouse(Client *c)
+resizemouse(Client *c)

 {
        XEvent ev;
 {
        XEvent ev;

-       int x1, y1, ocx, ocy, di;
-       unsigned int dui;
-       Window dummy;
+       int ocx, ocy;
+       Corner sticky;

 
 

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

        if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync,
        if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync,

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

                return;
                return;

-       XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
+       XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, *c->w, *c->h);

        for(;;) {
                XMaskEvent(dpy, MouseMask | ExposureMask, &ev);
        for(;;) {
                XMaskEvent(dpy, MouseMask | ExposureMask, &ev);

-               switch (ev.type) {
+               switch(ev.type) {

                default: break;
                case Expose:
                        handler[Expose](&ev);
                        break;
                case MotionNotify:
                default: break;
                case Expose:
                        handler[Expose](&ev);
                        break;
                case MotionNotify:

-                       XFlush(dpy);
-                       c->x = ocx + (ev.xmotion.x - x1);
-                       c->y = ocy + (ev.xmotion.y - y1);
-                       resize(c, False);
+                       XSync(dpy, False);
+                       *c->w = abs(ocx - ev.xmotion.x);
+                       *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;
+                       if(ocx <= ev.xmotion.x) {
+                               if(ocy <= ev.xmotion.y)
+                                       sticky = TopLeft;
+                               else
+                                       sticky = BottomLeft;
+                       } else {
+                               if(ocy <= ev.xmotion.y)
+                                       sticky = TopRight;
+                               else
+                                       sticky = BottomRight;
+                       }
+                       resize(c, True, sticky);

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


@@ -188,30 +143,49 @@ buttonpress(XEvent *e)
        Client *c;
 
        if(barwin == ev->window) {
        Client *c;
 
        if(barwin == ev->window) {

-               x = (arrange == dofloat) ? textw("~") : 0;
-               for(a.i = 0; a.i < TLast; a.i++) {
-                       x += textw(tags[a.i]);
-                       if(ev->x < x) {
-                               view(&a);
-                               break;
+               switch(ev->button) {
+               default:
+                       x = 0;
+                       for(a.i = 0; a.i < TLast; a.i++) {
+                               x += textw(tags[a.i]);
+                               if(ev->x < x) {
+                                       view(&a);
+                                       break;
+                               }

                        }
                        }

+                       break;
+               case Button4:
+                       a.i = (tsel + 1 < TLast) ? tsel + 1 : 0;
+                       view(&a);
+                       break;
+               case Button5:
+                       a.i = (tsel - 1 >= 0) ? tsel - 1 : TLast - 1;
+                       view(&a);
+                       break;

                }
        }
        else if((c = getclient(ev->window))) {
                }
        }
        else if((c = getclient(ev->window))) {

-               if(arrange == dotile && !c->dofloat)
-                       return;
-               higher(c);

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

-                       movemouse(c);
+                       if(arrange == dotile && !c->isfloat) {
+                               if((ev->state & ControlMask) && (ev->button == Button1))
+                                       zoom(NULL);
+                       }
+                       else {
+                               higher(c);
+                               movemouse(c);
+                       }

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

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

                        break;
                }
        }
                        break;
                }
        }


@@ -228,17 +202,17 @@ configurerequest(XEvent *e)
        if((c = getclient(ev->window))) {
                gravitate(c, True);
                if(ev->value_mask & CWX)
        if((c = getclient(ev->window))) {
                gravitate(c, True);
                if(ev->value_mask & CWX)

-                       c->x = ev->x;
+                       *c->x = ev->x;

                if(ev->value_mask & CWY)
                if(ev->value_mask & CWY)

-                       c->y = ev->y;
+                       *c->y = ev->y;

                if(ev->value_mask & CWWidth)
                if(ev->value_mask & CWWidth)

-                       c->w = ev->width;
+                       *c->w = ev->width;

                if(ev->value_mask & CWHeight)
                if(ev->value_mask & CWHeight)

-                       c->h = ev->height;
+                       *c->h = ev->height;

                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;


@@ -251,7 +225,7 @@ configurerequest(XEvent *e)
        ev->value_mask &= ~CWStackMode;
        ev->value_mask |= CWBorderWidth;
        XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
        ev->value_mask &= ~CWStackMode;
        ev->value_mask |= CWBorderWidth;
        XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);

-       XFlush(dpy);
+       XSync(dpy, False);

 }
 
 static void
 }
 
 static void


@@ -279,15 +253,6 @@ enternotify(XEvent *e)
                issel = True;
 }
 
                issel = True;
 }
 

-static void
-leavenotify(XEvent *e)
-{
-       XCrossingEvent *ev = &e->xcrossing;
-
-       if((ev->window == root) && !ev->same_screen)
-               issel = True;
-}
-

 static void
 expose(XEvent *e)
 {
 static void
 expose(XEvent *e)
 {


@@ -302,6 +267,32 @@ expose(XEvent *e)
        }
 }
 
        }
 }
 

+static void
+keypress(XEvent *e)
+{
+       XKeyEvent *ev = &e->xkey;
+       static unsigned int len = key ? sizeof(key) / sizeof(key[0]) : 0;
+       unsigned int i;
+       KeySym keysym;
+
+       keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
+       for(i = 0; i < len; i++)
+               if((keysym == key[i].keysym) && (key[i].mod == ev->state)) {
+                       if(key[i].func)
+                               key[i].func(&key[i].arg);
+                       return;
+               }
+}
+
+static void
+leavenotify(XEvent *e)
+{
+       XCrossingEvent *ev = &e->xcrossing;
+
+       if((ev->window == root) && !ev->same_screen)
+               issel = True;
+}
+

 static void
 maprequest(XEvent *e)
 {
 static void
 maprequest(XEvent *e)
 {


@@ -332,7 +323,7 @@ propertynotify(XEvent *e)
                return; /* ignore */
 
        if((c = getclient(ev->window))) {
                return; /* ignore */
 
        if((c = getclient(ev->window))) {

-               if(ev->atom == wm_atom[WMProtocols]) {
+               if(ev->atom == wmatom[WMProtocols]) {

                        c->proto = getproto(c->win);
                        return;
                }
                        c->proto = getproto(c->win);
                        return;
                }


@@ -340,14 +331,14 @@ 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->dofloat && (c->dofloat = (trans != 0)))
+                               if(!c->isfloat && (c->isfloat = (trans != 0)))

                                        arrange(NULL);
                                break;
                        case XA_WM_NORMAL_HINTS:
                                setsize(c);
                                break;
                }
                                        arrange(NULL);
                                break;
                        case XA_WM_NORMAL_HINTS:
                                setsize(c);
                                break;
                }

-               if(ev->atom == XA_WM_NAME || ev->atom == net_atom[NetWMName]) {
+               if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {

                        settitle(c);
                        drawtitle(c);
                }
                        settitle(c);
                        drawtitle(c);
                }


@@ -363,3 +354,33 @@ unmapnotify(XEvent *e)
        if((c = getclient(ev->window)))
                unmanage(c);
 }
        if((c = getclient(ev->window)))
                unmanage(c);
 }

+
+/* extern */
+
+void (*handler[LASTEvent]) (XEvent *) = {
+       [ButtonPress] = buttonpress,
+       [ConfigureRequest] = configurerequest,
+       [DestroyNotify] = destroynotify,
+       [EnterNotify] = enternotify,
+       [LeaveNotify] = leavenotify,
+       [Expose] = expose,
+       [KeyPress] = keypress,
+       [MapRequest] = maprequest,
+       [PropertyNotify] = propertynotify,
+       [UnmapNotify] = unmapnotify
+};
+
+void
+grabkeys()
+{
+       static unsigned int len = key ? sizeof(key) / sizeof(key[0]) : 0;
+       unsigned int i;
+       KeyCode code;
+
+       for(i = 0; i < len; i++) {
+               code = XKeysymToKeycode(dpy, key[i].keysym);
+               XUngrabKey(dpy, code, key[i].mod, root);
+               XGrabKey(dpy, code, key[i].mod, root, True,
+                               GrabModeAsync, GrabModeAsync);
+       }
+}