X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/b2cb925d999f0b745f8be23316258c4f575cb343..1ef2307ec402d08f89e056f2034c345196d61351:/event.c
diff --git a/event.c b/event.c
index 86c4819..4e11552 100644
--- a/event.c
+++ b/event.c
@@ -1,5 +1,4 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
* See LICENSE file for license details.
*/
#include "dwm.h"
@@ -19,23 +18,7 @@ typedef struct {
KEYS
#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
-
-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);
-}
+#define MOUSEMASK (BUTTONMASK | PointerMotionMask)
static void
movemouse(Client *c) {
@@ -49,16 +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 | StructureNotifyMask, &ev);
+ XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
switch (ev.type) {
- default:
- break;
- case ConfigureRequest:
- synconfig(c, c->x, c->y, c->w, c->h, ev.xconfigure.border_width);
- XSync(dpy, False);
- break;
+ case ButtonRelease:
+ resize(c, True, TopLeft);
+ XUngrabPointer(dpy, CurrentTime);
+ return;
case Expose:
handler[Expose](&ev);
break;
@@ -66,16 +48,16 @@ movemouse(Client *c) {
XSync(dpy, False);
c->x = ocx + (ev.xmotion.x - x1);
c->y = ocy + (ev.xmotion.y - y1);
+ if(abs(wax + c->x) < SNAP)
+ c->x = wax;
+ else if(abs((wax + waw) - (c->x + c->w)) < SNAP)
+ c->x = wax + waw - c->w - 2 * BORDERPX;
+ if(abs(way - c->y) < SNAP)
+ c->y = way;
+ else if(abs((way + wah) - (c->y + c->h)) < SNAP)
+ c->y = way + wah - c->h - 2 * BORDERPX;
resize(c, False, TopLeft);
break;
- case ButtonRelease:
- XUngrabPointer(dpy, CurrentTime);
- return;
- case DestroyNotify:
- case UnmapNotify:
- XUngrabPointer(dpy, CurrentTime);
- handler[ev.type](&ev);
- return;
}
}
}
@@ -90,18 +72,17 @@ resizemouse(Client *c) {
ocx = c->x;
ocy = c->y;
if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
- None, cursor[CurResize], CurrentTime) != GrabSuccess)
+ 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 | StructureNotifyMask, &ev);
+ XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
switch(ev.type) {
- default:
- break;
- case ConfigureRequest:
- synconfig(c, c->x, c->y, c->w, c->h, ev.xconfigure.border_width);
- XSync(dpy, False);
- break;
+ case ButtonRelease:
+ resize(c, True, TopLeft);
+ XUngrabPointer(dpy, CurrentTime);
+ return;
case Expose:
handler[Expose](&ev);
break;
@@ -119,14 +100,6 @@ resizemouse(Client *c) {
sticky = (ocy <= ev.xmotion.y) ? TopRight : BotRight;
resize(c, True, sticky);
break;
- case ButtonRelease:
- XUngrabPointer(dpy, CurrentTime);
- return;
- case DestroyNotify:
- case UnmapNotify:
- XUngrabPointer(dpy, CurrentTime);
- handler[ev.type](&ev);
- return;
}
}
}
@@ -158,23 +131,22 @@ buttonpress(XEvent *e) {
return;
}
}
- if(ev->x < x + bmw) {
- if(ev->button == Button1)
- togglemode(NULL);
- }
+ if((ev->x < x + bmw) && (ev->button == Button1))
+ togglemode(NULL);
}
else if((c = getclient(ev->window))) {
focus(c);
if(CLEANMASK(ev->state) != MODKEY)
return;
if(ev->button == Button1 && (arrange == dofloat || c->isfloat)) {
- restack(c);
+ restack();
movemouse(c);
}
else if(ev->button == Button2)
zoom(NULL);
- else if(ev->button == Button3 && (arrange == dofloat || c->isfloat)) {
- restack(c);
+ else if(ev->button == Button3 && (arrange == dofloat || c->isfloat) &&
+ !c->isfixed) {
+ restack();
resizemouse(c);
}
}
@@ -188,11 +160,7 @@ configurerequest(XEvent *e) {
XWindowChanges wc;
if((c = getclient(ev->window))) {
- if((c == sel) && !c->isfloat && (arrange != dofloat)) {
- synconfig(c, sx, sy + bh, sw - 2, sh - 2 - bh, ev->border_width);
- XSync(dpy, False);
- return;
- }
+ c->ismax = False;
gravitate(c, True);
if(ev->value_mask & CWX)
c->x = ev->x;
@@ -213,12 +181,15 @@ configurerequest(XEvent *e) {
if(newmask)
XConfigureWindow(dpy, c->win, newmask, &wc);
else
- synconfig(c, c->x, c->y, c->w, c->h, c->border);
+ configure(c);
XSync(dpy, False);
- if(c->isfloat)
+ if(c->isfloat) {
resize(c, False, TopLeft);
+ if(!isvisible(c))
+ ban(c);
+ }
else
- arrange(NULL);
+ arrange();
}
else {
wc.x = ev->x;
@@ -249,7 +220,6 @@ enternotify(XEvent *e) {
if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
return;
-
if(((c = getclient(ev->window)) || (c = getctitle(ev->window))) && isvisible(c))
focus(c);
else if(ev->window == root) {
@@ -274,7 +244,7 @@ expose(XEvent *e) {
static void
keypress(XEvent *e) {
- static unsigned int len = sizeof(key) / sizeof(key[0]);
+ static unsigned int len = sizeof key / sizeof key[0];
unsigned int i;
KeySym keysym;
XKeyEvent *ev = &e->xkey;
@@ -286,7 +256,6 @@ keypress(XEvent *e) {
{
if(key[i].func)
key[i].func(&key[i].arg);
- return;
}
}
}
@@ -317,13 +286,11 @@ maprequest(XEvent *e) {
if(!XGetWindowAttributes(dpy, ev->window, &wa))
return;
-
if(wa.override_redirect) {
XSelectInput(dpy, ev->window,
(StructureNotifyMask | PropertyChangeMask));
return;
}
-
if(!getclient(ev->window))
manage(ev->window, &wa);
}
@@ -336,7 +303,6 @@ propertynotify(XEvent *e) {
if(ev->state == PropertyDelete)
return; /* ignore */
-
if((c = getclient(ev->window))) {
if(ev->atom == wmatom[WMProtocols]) {
c->proto = getproto(c->win);
@@ -347,7 +313,7 @@ propertynotify(XEvent *e) {
case XA_WM_TRANSIENT_FOR:
XGetTransientForHint(dpy, c->win, &trans);
if(!c->isfloat && (c->isfloat = (trans != 0)))
- arrange(NULL);
+ arrange();
break;
case XA_WM_NORMAL_HINTS:
updatesize(c);
@@ -355,6 +321,7 @@ propertynotify(XEvent *e) {
}
if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
updatetitle(c);
+ resizetitle(c);
drawtitle(c);
}
}
@@ -386,8 +353,8 @@ void (*handler[LASTEvent]) (XEvent *) = {
};
void
-grabkeys() {
- static unsigned int len = sizeof(key) / sizeof(key[0]);
+grabkeys(void) {
+ static unsigned int len = sizeof key / sizeof key[0];
unsigned int i;
KeyCode code;
@@ -406,7 +373,7 @@ grabkeys() {
}
void
-procevent() {
+procevent(void) {
XEvent ev;
while(XPending(dpy)) {