X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/81683351f04773e434eccd5973e30b0ccdf1168b..57e6e3bb80b5fc4709de3f8b716a8b8065897c7a:/event.c?ds=sidebyside
diff --git a/event.c b/event.c
index 1aed904..125c6a2 100644
--- a/event.c
+++ b/event.c
@@ -3,7 +3,6 @@
* See LICENSE file for license details.
*/
#include "dwm.h"
-
#include <stdlib.h>
#include <X11/keysym.h>
#include <X11/Xatom.h>
@@ -19,7 +18,7 @@ typedef struct {
KEYS
-static unsigned int valid_mask = 255 & ~(NUMLOCKMASK | LockMask);
+#define CLEANMASK(mask) (mask & ~(NUMLOCKMASK | LockMask))
static void
movemouse(Client *c)
@@ -59,6 +58,7 @@ static void
resizemouse(Client *c)
{
int ocx, ocy;
+ int nw, nh;
Corner sticky;
XEvent ev;
@@ -77,8 +77,10 @@ resizemouse(Client *c)
break;
case MotionNotify:
XSync(dpy, False);
- c->w = abs(ocx - ev.xmotion.x);
- c->h = abs(ocy - ev.xmotion.y);
+ if((nw = abs(ocx - ev.xmotion.x)))
+ c->w = abs(ocx - ev.xmotion.x);
+ if((nh = abs(ocy - ev.xmotion.y)))
+ 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)
@@ -103,23 +105,16 @@ buttonpress(XEvent *e)
XButtonPressedEvent *ev = &e->xbutton;
if(barwin == ev->window) {
- switch(ev->button) {
- default:
- x = 0;
- for(a.i = 0; a.i < TLast; a.i++) {
- x += textw(tags[a.i]);
- if(ev->x < x) {
+ x = 0;
+ for(a.i = 0; a.i < ntags; a.i++) {
+ x += textw(tags[a.i]);
+ if(ev->x < x) {
+ if(ev->button == Button3)
+ toggleview(&a);
+ else
view(&a);
- break;
- }
+ return;
}
- break;
- case Button4:
- viewnext(&a);
- break;
- case Button5:
- viewprev(&a);
- break;
}
}
else if((c = getclient(ev->window))) {
@@ -129,16 +124,16 @@ buttonpress(XEvent *e)
break;
case Button1:
if(!c->ismax && (arrange == dofloat || c->isfloat)) {
- higher(c);
+ restack(c);
movemouse(c);
}
break;
case Button2:
- lower(c);
+ zoom(NULL);
break;
case Button3:
if(!c->ismax && (arrange == dofloat || c->isfloat)) {
- higher(c);
+ restack(c);
resizemouse(c);
}
break;
@@ -151,9 +146,10 @@ configurerequest(XEvent *e)
{
Client *c;
XConfigureRequestEvent *ev = &e->xconfigurerequest;
+ XEvent synev;
XWindowChanges wc;
+ unsigned long newmask;
- ev->value_mask &= ~CWSibling;
if((c = getclient(ev->window))) {
gravitate(c, True);
if(ev->value_mask & CWX)
@@ -165,22 +161,46 @@ configurerequest(XEvent *e)
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);
- 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
@@ -199,13 +219,16 @@ enternotify(XEvent *e)
Client *c;
XCrossingEvent *ev = &e->xcrossing;
- if(ev->detail == NotifyInferior)
+ if(ev->mode != NotifyNormal || 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)
+ else if(ev->window == root) {
issel = True;
+ XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+ drawall();
+ }
}
static void
@@ -229,15 +252,17 @@ keypress(XEvent *e)
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++)
- if((keysym == key[i].keysym) && ((key[i].mod & valid_mask) == ev->state)) {
+ for(i = 0; i < len; i++) {
+ if(keysym == key[i].keysym &&
+ CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
+ {
if(key[i].func)
key[i].func(&key[i].arg);
return;
}
+ }
}
static void
@@ -245,8 +270,20 @@ leavenotify(XEvent *e)
{
XCrossingEvent *ev = &e->xcrossing;
- if((ev->window == root) && !ev->same_screen)
- issel = True;
+ if((ev->window == root) && !ev->same_screen) {
+ issel = False;
+ drawall();
+ }
+}
+
+static void
+mappingnotify(XEvent *e)
+{
+ XMappingEvent *ev = &e->xmapping;
+
+ XRefreshKeyboardMapping(ev);
+ if(ev->request == MappingKeyboard)
+ grabkeys();
}
static void
@@ -321,6 +358,7 @@ void (*handler[LASTEvent]) (XEvent *) = {
[LeaveNotify] = leavenotify,
[Expose] = expose,
[KeyPress] = keypress,
+ [MappingNotify] = mappingnotify,
[MapRequest] = maprequest,
[PropertyNotify] = propertynotify,
[UnmapNotify] = unmapnotify
@@ -333,13 +371,13 @@ grabkeys()
unsigned int i;
KeyCode code;
+ XUngrabKey(dpy, AnyKey, AnyModifier, root);
for(i = 0; i < len; i++) {
code = XKeysymToKeycode(dpy, key[i].keysym);
- 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 | 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,