prepared 0.3

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 9d69373..6f99ea2 100644 (file)
--- a/event.c
+++ b/event.c
@@ -12,13 +12,7 @@
 #define MouseMask       (ButtonMask | PointerMotionMask)
 
 /* CUSTOMIZE */
 #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 */
 
 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_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_q,           quit,           { 0 } },
        { Mod1Mask|ShiftMask,   XK_space,       dofloat,        { 0 } }, 

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

        { Mod1Mask|ShiftMask,   XK_Return,      spawn,          { .argv = term } },
 };
 
        { Mod1Mask|ShiftMask,   XK_Return,      spawn,          { .argv = term } },
 };
 


@@ -114,17 +105,10 @@ 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;

-                       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;
-                       }
+                       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:
                        resize(c, True, sticky);
                        break;
                case ButtonRelease: