X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/6a39a496d06f5631a1617fe68729cbde4c24318c..f15f45a9f80d5dcd1098b8e9aef4fee7bd53aba4:/event.c
diff --git a/event.c b/event.c
index a266ffa..9974192 100644
--- a/event.c
+++ b/event.c
@@ -18,7 +18,7 @@ typedef struct {
KEYS
-#define CLEANMASK(mask) (mask & ~(NUMLOCKMASK | LockMask))
+#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
static void
movemouse(Client *c)
@@ -58,6 +58,7 @@ static void
resizemouse(Client *c)
{
int ocx, ocy;
+ int nw, nh;
Corner sticky;
XEvent ev;
@@ -76,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)
@@ -102,59 +105,79 @@ buttonpress(XEvent *e)
XButtonPressedEvent *ev = &e->xbutton;
if(barwin == ev->window) {
- switch(ev->button) {
- default:
- x = 0;
- for(a.i = 0; a.i < ntags; a.i++) {
- x += textw(tags[a.i]);
- if(ev->x < x) {
- view(&a);
- break;
+ x = 0;
+ for(a.i = 0; a.i < ntags; a.i++) {
+ x += textw(tags[a.i]);
+ if(ev->x < x) {
+ if(ev->button == Button1) {
+ if(ev->state & MODKEY)
+ tag(&a);
+ else
+ view(&a);
}
+ else if(ev->button == Button3) {
+ if(ev->state & MODKEY)
+ toggletag(&a);
+ else
+ toggleview(&a);
+ }
+ return;
}
- break;
- case Button4:
- viewnext(&a);
- break;
- case Button5:
- viewprev(&a);
- break;
+ }
+ if(ev->x < x + bmw) {
+ if(ev->button == Button1)
+ togglemode(NULL);
}
}
else if((c = getclient(ev->window))) {
focus(c);
- switch(ev->button) {
- default:
- break;
- case Button1:
- if(!c->ismax && (arrange == dofloat || c->isfloat)) {
- higher(c);
- movemouse(c);
- }
- break;
- case Button2:
- lower(c);
- break;
- case Button3:
- if(!c->ismax && (arrange == dofloat || c->isfloat)) {
- higher(c);
- resizemouse(c);
- }
- break;
+ if(maximized || CLEANMASK(ev->state) != MODKEY)
+ return;
+ if(ev->button == Button1 && (arrange == dofloat || c->isfloat)) {
+ restack(c);
+ movemouse(c);
+ }
+ else if(ev->button == Button2)
+ zoom(NULL);
+ else if(ev->button == Button3 && (arrange == dofloat || c->isfloat)) {
+ restack(c);
+ resizemouse(c);
}
}
}
+static void
+synconfig(Client *c, int x, int y, int w, int h, unsigned int border)
+{
+ XEvent synev;
+
+ synev.type = ConfigureNotify;
+ synev.xconfigure.display = dpy;
+ synev.xconfigure.event = c->win;
+ synev.xconfigure.window = c->win;
+ synev.xconfigure.x = x;
+ synev.xconfigure.y = y;
+ synev.xconfigure.width = w;
+ synev.xconfigure.height = h;
+ synev.xconfigure.border_width = border;
+ synev.xconfigure.above = None;
+ XSendEvent(dpy, c->win, True, NoEventMask, &synev);
+}
+
static void
configurerequest(XEvent *e)
{
+ unsigned long newmask;
Client *c;
XConfigureRequestEvent *ev = &e->xconfigurerequest;
- XEvent synev;
XWindowChanges wc;
- unsigned long newmask;
if((c = getclient(ev->window))) {
+ if((c == sel) && !c->isfloat && (arrange != dofloat) && maximized) {
+ synconfig(c, sx, sy + bh, sw - 2, sh - 2 - bh, ev->border_width);
+ XSync(dpy, False);
+ return;
+ }
gravitate(c, True);
if(ev->value_mask & CWX)
c->x = ev->x;
@@ -174,23 +197,13 @@ configurerequest(XEvent *e)
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);
- }
+ else
+ synconfig(c, c->x, c->y, c->w, c->h, c->border);
XSync(dpy, False);
- arrange(NULL);
- drawall();
+ if(c->isfloat)
+ resize(c, False, TopLeft);
+ else
+ arrange(NULL);
}
else {
wc.x = ev->x;
@@ -221,13 +234,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)) || (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
@@ -253,13 +269,15 @@ keypress(XEvent *e)
XKeyEvent *ev = &e->xkey;
keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
- for(i = 0; i < len; i++)
+ for(i = 0; i < len; i++) {
if(keysym == key[i].keysym &&
- CLEANMASK(key[i].mod) == CLEANMASK(ev->state)) {
+ CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
+ {
if(key[i].func)
key[i].func(&key[i].arg);
return;
}
+ }
}
static void
@@ -267,8 +285,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
@@ -343,6 +373,7 @@ void (*handler[LASTEvent]) (XEvent *) = {
[LeaveNotify] = leavenotify,
[Expose] = expose,
[KeyPress] = keypress,
+ [MappingNotify] = mappingnotify,
[MapRequest] = maprequest,
[PropertyNotify] = propertynotify,
[UnmapNotify] = unmapnotify
@@ -355,23 +386,29 @@ grabkeys()
unsigned int i;
KeyCode code;
+ XUngrabKey(dpy, AnyKey, AnyModifier, root);
for(i = 0; i < len; i++) {
code = XKeysymToKeycode(dpy, key[i].keysym);
- /* normal */
- XUngrabKey(dpy, code, key[i].mod, root);
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,
+ 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,
+ XGrabKey(dpy, code, key[i].mod | numlockmask | LockMask, root, True,
GrabModeAsync, GrabModeAsync);
}
}
+
+void
+procevent()
+{
+ XEvent ev;
+
+ while(XPending(dpy)) {
+ XNextEvent(dpy, &ev);
+ if(handler[ev.type])
+ (handler[ev.type])(&ev); /* call handler */
+ }
+}
+