X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/7d4184dc5c5381d638efb9f26fd8bd6d8a6fe372..69408d384d55b69f66ea52f8767eb577a34d9ae2:/event.c
diff --git a/event.c b/event.c
index 8a1c2a9..a17034c 100644
--- a/event.c
+++ b/event.c
@@ -18,11 +18,10 @@ typedef struct {
KEYS
-#define CLEANMASK(mask) (mask & ~(NUMLOCKMASK | LockMask))
+#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
static void
-movemouse(Client *c)
-{
+movemouse(Client *c) {
int x1, y1, ocx, ocy, di;
unsigned int dui;
Window dummy;
@@ -33,11 +32,15 @@ movemouse(Client *c)
if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
None, cursor[CurMove], CurrentTime) != GrabSuccess)
return;
+ c->ismax = False;
XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
for(;;) {
XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
switch (ev.type) {
- default: break;
+ case ButtonRelease:
+ resize(c, True, TopLeft);
+ XUngrabPointer(dpy, CurrentTime);
+ return;
case Expose:
handler[Expose](&ev);
break;
@@ -47,17 +50,14 @@ movemouse(Client *c)
c->y = ocy + (ev.xmotion.y - y1);
resize(c, False, TopLeft);
break;
- case ButtonRelease:
- XUngrabPointer(dpy, CurrentTime);
- return;
}
}
}
static void
-resizemouse(Client *c)
-{
+resizemouse(Client *c) {
int ocx, ocy;
+ int nw, nh;
Corner sticky;
XEvent ev;
@@ -66,18 +66,24 @@ resizemouse(Client *c)
if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
None, cursor[CurResize], CurrentTime) != GrabSuccess)
return;
+ c->ismax = False;
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h);
for(;;) {
XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
switch(ev.type) {
- default: break;
+ case ButtonRelease:
+ resize(c, True, TopLeft);
+ XUngrabPointer(dpy, CurrentTime);
+ return;
case Expose:
handler[Expose](&ev);
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 = nw;
+ if((nh = abs(ocy - ev.xmotion.y)))
+ c->h = nh;
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)
@@ -86,76 +92,70 @@ resizemouse(Client *c)
sticky = (ocy <= ev.xmotion.y) ? TopRight : BotRight;
resize(c, True, sticky);
break;
- case ButtonRelease:
- XUngrabPointer(dpy, CurrentTime);
- return;
}
}
}
static void
-buttonpress(XEvent *e)
-{
+buttonpress(XEvent *e) {
int x;
Arg a;
Client *c;
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);
- return;
+ 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;
}
+ }
+ if(ev->x < x + bmw) {
if(ev->button == Button1)
- viewprev(&a);
+ togglemode(NULL);
else if(ev->button == Button3)
- viewnext(&a);
- break;
- case Button4:
- viewprev(&a);
- break;
- case Button5:
- viewnext(&a);
- break;
+ togglestackpos(NULL);
}
}
else if((c = getclient(ev->window))) {
- higher(c);
focus(c);
- switch(ev->button) {
- default:
- break;
- case Button1:
- if(!c->ismax && (arrange == dofloat || c->isfloat))
- movemouse(c);
- break;
- case Button2:
+ if(CLEANMASK(ev->state) != MODKEY)
+ return;
+ if(ev->button == Button1 && (arrange == dofloat || c->isfloat)) {
+ restack();
+ movemouse(c);
+ }
+ else if(ev->button == Button2)
zoom(NULL);
- break;
- case Button3:
- if(!c->ismax && (arrange == dofloat || c->isfloat))
- resizemouse(c);
- break;
+ else if(ev->button == Button3 && (arrange == dofloat || c->isfloat)) {
+ restack();
+ resizemouse(c);
}
}
}
static void
-configurerequest(XEvent *e)
-{
+configurerequest(XEvent *e) {
+ unsigned long newmask;
Client *c;
XConfigureRequestEvent *ev = &e->xconfigurerequest;
- XEvent synev;
XWindowChanges wc;
- unsigned long newmask;
if((c = getclient(ev->window))) {
+ c->ismax = False;
gravitate(c, True);
if(ev->value_mask & CWX)
c->x = ev->x;
@@ -175,23 +175,14 @@ 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
+ configure(c);
XSync(dpy, False);
- if(c->isfloat)
+ if(c->isfloat) {
resize(c, False, TopLeft);
+ if(!isvisible(c))
+ ban(c);
+ }
else
arrange(NULL);
}
@@ -209,8 +200,7 @@ configurerequest(XEvent *e)
}
static void
-destroynotify(XEvent *e)
-{
+destroynotify(XEvent *e) {
Client *c;
XDestroyWindowEvent *ev = &e->xdestroywindow;
@@ -219,15 +209,14 @@ destroynotify(XEvent *e)
}
static void
-enternotify(XEvent *e)
-{
+enternotify(XEvent *e) {
Client *c;
XCrossingEvent *ev = &e->xcrossing;
if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
return;
- if((c = getclient(ev->window)) || (c = getctitle(ev->window)))
+ if(((c = getclient(ev->window)) || (c = getctitle(ev->window))) && isvisible(c))
focus(c);
else if(ev->window == root) {
issel = True;
@@ -237,8 +226,7 @@ enternotify(XEvent *e)
}
static void
-expose(XEvent *e)
-{
+expose(XEvent *e) {
Client *c;
XExposeEvent *ev = &e->xexpose;
@@ -251,26 +239,26 @@ expose(XEvent *e)
}
static void
-keypress(XEvent *e)
-{
+keypress(XEvent *e) {
static unsigned int len = sizeof(key) / sizeof(key[0]);
unsigned int i;
KeySym keysym;
XKeyEvent *ev = &e->xkey;
keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
- for(i = 0; i < len; i++)
- if(keysym == key[i].keysym &&
- CLEANMASK(key[i].mod) == CLEANMASK(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
-leavenotify(XEvent *e)
-{
+leavenotify(XEvent *e) {
XCrossingEvent *ev = &e->xcrossing;
if((ev->window == root) && !ev->same_screen) {
@@ -280,8 +268,16 @@ leavenotify(XEvent *e)
}
static void
-maprequest(XEvent *e)
-{
+mappingnotify(XEvent *e) {
+ XMappingEvent *ev = &e->xmapping;
+
+ XRefreshKeyboardMapping(ev);
+ if(ev->request == MappingKeyboard)
+ grabkeys();
+}
+
+static void
+maprequest(XEvent *e) {
static XWindowAttributes wa;
XMapRequestEvent *ev = &e->xmaprequest;
@@ -299,8 +295,7 @@ maprequest(XEvent *e)
}
static void
-propertynotify(XEvent *e)
-{
+propertynotify(XEvent *e) {
Client *c;
Window trans;
XPropertyEvent *ev = &e->xproperty;
@@ -321,19 +316,19 @@ propertynotify(XEvent *e)
arrange(NULL);
break;
case XA_WM_NORMAL_HINTS:
- setsize(c);
+ updatesize(c);
break;
}
if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
- settitle(c);
+ updatetitle(c);
+ resizetitle(c);
drawtitle(c);
}
}
}
static void
-unmapnotify(XEvent *e)
-{
+unmapnotify(XEvent *e) {
Client *c;
XUnmapEvent *ev = &e->xunmap;
@@ -351,27 +346,39 @@ void (*handler[LASTEvent]) (XEvent *) = {
[LeaveNotify] = leavenotify,
[Expose] = expose,
[KeyPress] = keypress,
+ [MappingNotify] = mappingnotify,
[MapRequest] = maprequest,
[PropertyNotify] = propertynotify,
[UnmapNotify] = unmapnotify
};
void
-grabkeys()
-{
+grabkeys(void) {
static unsigned int len = sizeof(key) / sizeof(key[0]);
unsigned int i;
KeyCode code;
+ XUngrabKey(dpy, AnyKey, AnyModifier, root);
for(i = 0; i < len; i++) {
code = XKeysymToKeycode(dpy, key[i].keysym);
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,
+ XGrabKey(dpy, code, key[i].mod | numlockmask, root, True,
GrabModeAsync, GrabModeAsync);
- XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK | LockMask, root, True,
+ XGrabKey(dpy, code, key[i].mod | numlockmask | LockMask, root, True,
GrabModeAsync, GrabModeAsync);
}
}
+
+void
+procevent(void) {
+ XEvent ev;
+
+ while(XPending(dpy)) {
+ XNextEvent(dpy, &ev);
+ if(handler[ev.type])
+ (handler[ev.type])(&ev); /* call handler */
+ }
+}