some cleanups/fixes inspired by Jukka Salmi's feedback

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 58df281..95b94cc 100644 (file)
--- a/event.c
+++ b/event.c
@@ -23,7 +23,7 @@ typedef struct {
 const char *browse[] = { "firefox", NULL };
 const char *gimp[] = { "gimp", NULL };
 const char *term[] = { 
 const char *browse[] = { "firefox", NULL };
 const char *gimp[] = { "gimp", NULL };
 const char *term[] = { 

-       "urxvtc", "-tr", "+sb", "-bg", "black", "-fg", "white", "-cr", "white",
+       "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 };


@@ -170,7 +170,7 @@ buttonpress(XEvent *e)
                default:
                        break;
                case Button1:
                default:
                        break;
                case Button1:

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

                                higher(c);
                                movemouse(c);
                        }
                                higher(c);
                                movemouse(c);
                        }


@@ -179,7 +179,7 @@ buttonpress(XEvent *e)
                        lower(c);
                        break;
                case Button3:
                        lower(c);
                        break;
                case Button3:

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

                                higher(c);
                                resizemouse(c);
                        }
                                higher(c);
                                resizemouse(c);
                        }


@@ -267,7 +267,7 @@ expose(XEvent *e)
 static void
 keypress(XEvent *e)
 {
 static void
 keypress(XEvent *e)
 {

-       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;
        XKeyEvent *ev = &e->xkey;
        unsigned int i;
        KeySym keysym;
        XKeyEvent *ev = &e->xkey;


@@ -370,7 +370,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;