alternate dwm.png

[dwm.git] / event.c

diff --git a/event.c b/event.c
index db95dfd..6f99ea2 100644 (file)
--- a/event.c
+++ b/event.c
@@ -12,13 +12,7 @@
 #define MouseMask       (ButtonMask | PointerMotionMask)
 
 /* CUSTOMIZE */
-const char *browse[] = { "firefox", NULL };
-const char *gimp[] = { "gimp", NULL };
-const char *term[] = { 
-       "urxvtc", "-tr", "+sb", "-bg", "black", "-fg", "white", "-cr", "white",
-       "-fn", "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*", NULL
-};
-const char *xlock[] = { "xlock", NULL };
+const char *term[] = { "xterm", NULL };
 
 Key key[] = {
        /* modifier                             key                     function        arguments */
@@ -44,11 +38,8 @@ Key key[] = {
        { 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 } },
 };
 
@@ -79,7 +70,7 @@ movemouse(Client *c)
                        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);
@@ -93,6 +84,7 @@ resizemouse(Client *c)
 {
        XEvent ev;
        int ocx, ocy;
+       Corner sticky;
 
        ocx = *c->x;
        ocy = *c->y;
@@ -113,7 +105,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;
-                       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);
@@ -153,24 +149,27 @@ buttonpress(XEvent *e)
                }
        }
        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);
                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:
-                       resizemouse(c);
+                       if(arrange == dofloat || c->isfloat) {
+                               higher(c);
+                               resizemouse(c);
+                       }
                        break;
                }
        }
@@ -197,7 +196,7 @@ configurerequest(XEvent *e)
                if(ev->value_mask & CWBorderWidth)
                        c->border = 1;
                gravitate(c, False);
-               resize(c, True);
+               resize(c, True, TopLeft);
        }
 
        wc.x = ev->x;