fixed xterm font change (all other related apps should work fine with this fix as...

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 4008a73..a266ffa 100644 (file)
--- a/event.c
+++ b/event.c
@@ -3,7 +3,6 @@
  * 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>


@@ -19,7 +18,7 @@ typedef struct {
 
 KEYS
 
 
 KEYS
 

-static unsigned int valid_mask =  255 &  ~(NUMLOCKMASK | LockMask);
+#define CLEANMASK(mask) (mask & ~(NUMLOCKMASK | LockMask))

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


@@ -106,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);


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

+       XEvent synev;

        XWindowChanges wc;
        XWindowChanges wc;

+       unsigned long newmask;

 
        if((c = getclient(ev->window))) {
                gravitate(c, True);
 
        if((c = getclient(ev->window))) {
                gravitate(c, True);


@@ -164,18 +165,42 @@ 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);
+               arrange(NULL);
+               drawall();

        }
        else {
                wc.x = ev->x;
                wc.y = ev->y;
                wc.width = ev->width;
                wc.height = ev->height;
        }
        else {
                wc.x = ev->x;
                wc.y = ev->y;
                wc.width = ev->width;
                wc.height = ev->height;

-               wc.border_width = 1;
-               XConfigureWindow(dpy, ev->window,
-                               CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
+               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);
        }
 }
                XSync(dpy, False);
        }
 }


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


@@ -226,11 +251,11 @@ keypress(XEvent *e)
        unsigned int i;
        KeySym keysym;
        XKeyEvent *ev = &e->xkey;
        unsigned int i;
        KeySym keysym;
        XKeyEvent *ev = &e->xkey;

-       ev->state &= valid_mask;

 
        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 & valid_mask) == 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;


@@ -332,13 +357,20 @@ 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);

+               /* normal */

                XUngrabKey(dpy, code, key[i].mod, root);
                XUngrabKey(dpy, code, key[i].mod, root);

-               XUngrabKey(dpy, code, key[i].mod | NUMLOCKMASK, root);
-               XUngrabKey(dpy, code, key[i].mod | NUMLOCKMASK | LockMask, root);

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

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

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

+               /* capslock & numlock */
+               XUngrabKey(dpy, code, key[i].mod | NUMLOCKMASK | LockMask, root);

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