removed NET_ACTIVE_WINDOW handling

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 17be71d..2e4f62e 100644 (file)
--- a/event.c
+++ b/event.c
@@ -3,12 +3,11 @@
  * See LICENSE file for license details.
  */
 #include "dwm.h"
  * See LICENSE file for license details.
  */
 #include "dwm.h"

-

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

-/* CUSTOMIZE */
+/* static */

 
 typedef struct {
        unsigned long mod;
 
 typedef struct {
        unsigned long mod;


@@ -17,47 +16,9 @@ typedef struct {
        Arg arg;
 } Key;
 
        Arg arg;
 } Key;
 

-const char *browse[] = { "firefox", NULL };
-const char *gimp[] = { "gimp", NULL };
-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 };
-
-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 } },
-};
+KEYS

 
 

-/* END CUSTOMIZE */
-
-/* static */
+#define CLEANMASK(mask) (mask & ~(NUMLOCKMASK | LockMask))

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


@@ -69,12 +30,12 @@ movemouse(Client *c)
 
        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)
                return;
        XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
        for(;;) {
                        None, cursor[CurMove], CurrentTime) != GrabSuccess)
                return;
        XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
        for(;;) {

-               XMaskEvent(dpy, MouseMask | ExposureMask, &ev);
+               XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);

                switch (ev.type) {
                default: break;
                case Expose:
                switch (ev.type) {
                default: break;
                case Expose:


@@ -102,12 +63,12 @@ resizemouse(Client *c)
 
        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)
                return;
        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h);
        for(;;) {
                                None, cursor[CurResize], CurrentTime) != GrabSuccess)
                return;
        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h);
        for(;;) {

-               XMaskEvent(dpy, MouseMask | ExposureMask, &ev);
+               XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);

                switch(ev.type) {
                default: break;
                case Expose:
                switch(ev.type) {
                default: break;
                case Expose:


@@ -144,7 +105,7 @@ buttonpress(XEvent *e)
                switch(ev->button) {
                default:
                        x = 0;
                switch(ev->button) {
                default:
                        x = 0;

-                       for(a.i = 0; a.i < TLast; a.i++) {
+                       for(a.i = 0; a.i < ntags; a.i++) {

                                x += textw(tags[a.i]);
                                if(ev->x < x) {
                                        view(&a);
                                x += textw(tags[a.i]);
                                if(ev->x < x) {
                                        view(&a);


@@ -153,12 +114,10 @@ buttonpress(XEvent *e)
                        }
                        break;
                case Button4:
                        }
                        break;
                case Button4:

-                       a.i = (tsel + 1 < TLast) ? tsel + 1 : 0;
-                       view(&a);
+                       viewnext(&a);

                        break;
                case Button5:
                        break;
                case Button5:

-                       a.i = (tsel - 1 >= 0) ? tsel - 1 : TLast - 1;
-                       view(&a);
+                       viewprev(&a);

                        break;
                }
        }
                        break;
                }
        }


@@ -191,9 +150,10 @@ configurerequest(XEvent *e)
 {
        Client *c;
        XConfigureRequestEvent *ev = &e->xconfigurerequest;
 {
        Client *c;
        XConfigureRequestEvent *ev = &e->xconfigurerequest;

+       XEvent synev;

        XWindowChanges wc;
        XWindowChanges wc;

+       unsigned long newmask;

 
 

-       ev->value_mask &= ~CWSibling;

        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)


@@ -205,22 +165,46 @@ configurerequest(XEvent *e)
                if(ev->value_mask & CWHeight)
                        c->h = ev->height;
                if(ev->value_mask & CWBorderWidth)
                if(ev->value_mask & CWHeight)
                        c->h = ev->height;
                if(ev->value_mask & CWBorderWidth)

-                       c->border = 1;
+                       c->border = ev->border_width;

                gravitate(c, False);
                gravitate(c, False);

-               resize(c, True, TopLeft);
+               wc.x = c->x;
+               wc.y = c->y;
+               wc.width = c->w;
+               wc.height = c->h;
+               newmask = ev->value_mask & (~(CWSibling | CWStackMode | CWBorderWidth));
+               if(newmask)
+                       XConfigureWindow(dpy, c->win, newmask, &wc);
+               else {
+                       synev.type = ConfigureNotify;
+                       synev.xconfigure.display = dpy;
+                       synev.xconfigure.event = c->win;
+                       synev.xconfigure.window = c->win;
+                       synev.xconfigure.x = c->x;
+                       synev.xconfigure.y = c->y;
+                       synev.xconfigure.width = c->w;
+                       synev.xconfigure.height = c->h;
+                       synev.xconfigure.border_width = c->border;
+                       synev.xconfigure.above = None;
+                       /* Send synthetic ConfigureNotify */
+                       XSendEvent(dpy, c->win, True, NoEventMask, &synev);
+               }
+               XSync(dpy, False);
+               if(c->isfloat)
+                       resize(c, False, TopLeft);
+               else
+                       arrange(NULL);
+       }
+       else {
+               wc.x = ev->x;
+               wc.y = ev->y;
+               wc.width = ev->width;
+               wc.height = ev->height;
+               wc.border_width = ev->border_width;
+               wc.sibling = ev->above;
+               wc.stack_mode = ev->detail;
+               XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
+               XSync(dpy, False);

        }
        }

-
-       wc.x = ev->x;
-       wc.y = ev->y;
-       wc.width = ev->width;
-       wc.height = ev->height;
-       wc.border_width = 1;
-       wc.sibling = None;
-       wc.stack_mode = Above;
-       ev->value_mask &= ~CWStackMode;
-       ev->value_mask |= CWBorderWidth;
-       XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
-       XSync(dpy, False);

 }
 
 static void
 }
 
 static void


@@ -242,7 +226,7 @@ enternotify(XEvent *e)
        if(ev->detail == NotifyInferior)
                return;
 
        if(ev->detail == NotifyInferior)
                return;
 

-       if((c = getclient(ev->window)))
+       if((c = getclient(ev->window)) || (c = getctitle(ev->window)))

                focus(c);
        else if(ev->window == root)
                issel = True;
                focus(c);
        else if(ev->window == root)
                issel = True;


@@ -272,7 +256,8 @@ keypress(XEvent *e)
 
        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++)

-               if((keysym == key[i].keysym) && (key[i].mod == ev->state)) {
+               if(keysym == key[i].keysym &&
+                               CLEANMASK(key[i].mod) == CLEANMASK(ev->state)) {

                        if(key[i].func)
                                key[i].func(&key[i].arg);
                        return;
                        if(key[i].func)
                                key[i].func(&key[i].arg);
                        return;


@@ -374,8 +359,13 @@ grabkeys()
 
        for(i = 0; i < len; i++) {
                code = XKeysymToKeycode(dpy, key[i].keysym);
 
        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);
                XGrabKey(dpy, code, key[i].mod, root, True,
                                GrabModeAsync, GrabModeAsync);

+               XGrabKey(dpy, code, key[i].mod | LockMask, root, True,
+                               GrabModeAsync, GrabModeAsync);
+               XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK, root, True,
+                               GrabModeAsync, GrabModeAsync);
+               XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK | LockMask, root, True,
+                               GrabModeAsync, GrabModeAsync);

        }
 }
        }
 }