X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/6d22782e8f991a99f9adef56b2b729e5ab5454d2..6de149eb22c889174d34f6f8d12466388f29aabf:/event.c
diff --git a/event.c b/event.c
index e5ea712..9f120d7 100644
--- a/event.c
+++ b/event.c
@@ -21,8 +21,24 @@ KEYS
#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
static void
-movemouse(Client *c)
-{
+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
+movemouse(Client *c) {
int x1, y1, ocx, ocy, di;
unsigned int dui;
Window dummy;
@@ -33,11 +49,17 @@ 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);
+ XMaskEvent(dpy, MOUSEMASK | ExposureMask | StructureNotifyMask, &ev);
switch (ev.type) {
- default: break;
+ default:
+ break;
+ case ConfigureRequest:
+ synconfig(c, c->x, c->y, c->w, c->h, ev.xconfigure.border_width);
+ XSync(dpy, False);
+ break;
case Expose:
handler[Expose](&ev);
break;
@@ -50,13 +72,17 @@ movemouse(Client *c)
case ButtonRelease:
XUngrabPointer(dpy, CurrentTime);
return;
+ case DestroyNotify:
+ case UnmapNotify:
+ XUngrabPointer(dpy, CurrentTime);
+ handler[ev.type](&ev);
+ return;
}
}
}
static void
-resizemouse(Client *c)
-{
+resizemouse(Client *c) {
int ocx, ocy;
int nw, nh;
Corner sticky;
@@ -67,20 +93,26 @@ 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);
+ XMaskEvent(dpy, MOUSEMASK | ExposureMask | StructureNotifyMask, &ev);
switch(ev.type) {
- default: break;
+ default:
+ break;
+ case ConfigureRequest:
+ synconfig(c, c->x, c->y, c->w, c->h, ev.xconfigure.border_width);
+ XSync(dpy, False);
+ break;
case Expose:
handler[Expose](&ev);
break;
case MotionNotify:
XSync(dpy, False);
if((nw = abs(ocx - ev.xmotion.x)))
- c->w = abs(ocx - ev.xmotion.x);
+ c->w = nw;
if((nh = abs(ocy - ev.xmotion.y)))
- c->h = 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)
@@ -92,13 +124,17 @@ resizemouse(Client *c)
case ButtonRelease:
XUngrabPointer(dpy, CurrentTime);
return;
+ case DestroyNotify:
+ case UnmapNotify:
+ XUngrabPointer(dpy, CurrentTime);
+ handler[ev.type](&ev);
+ return;
}
}
}
static void
-buttonpress(XEvent *e)
-{
+buttonpress(XEvent *e) {
int x;
Arg a;
Client *c;
@@ -131,15 +167,15 @@ buttonpress(XEvent *e)
}
else if((c = getclient(ev->window))) {
focus(c);
- if(c->ismax || CLEANMASK(ev->state) != MODKEY)
+ if(CLEANMASK(ev->state) != MODKEY)
return;
- if((ev->button == Button1) && ((arrange == dofloat) || c->isfloat)) {
+ 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)) {
+ else if(ev->button == Button3 && (arrange == dofloat || c->isfloat)) {
restack(c);
resizemouse(c);
}
@@ -147,33 +183,14 @@ buttonpress(XEvent *e)
}
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)
-{
+configurerequest(XEvent *e) {
unsigned long newmask;
Client *c;
XConfigureRequestEvent *ev = &e->xconfigurerequest;
XWindowChanges wc;
if((c = getclient(ev->window))) {
- if(!c->isfloat && (arrange != dofloat) && c->ismax) {
+ if((c == sel) && !c->isfloat && (arrange != dofloat)) {
synconfig(c, sx, sy + bh, sw - 2, sh - 2 - bh, ev->border_width);
XSync(dpy, False);
return;
@@ -219,8 +236,7 @@ configurerequest(XEvent *e)
}
static void
-destroynotify(XEvent *e)
-{
+destroynotify(XEvent *e) {
Client *c;
XDestroyWindowEvent *ev = &e->xdestroywindow;
@@ -229,15 +245,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;
@@ -247,8 +262,7 @@ enternotify(XEvent *e)
}
static void
-expose(XEvent *e)
-{
+expose(XEvent *e) {
Client *c;
XExposeEvent *ev = &e->xexpose;
@@ -261,8 +275,7 @@ 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;
@@ -270,8 +283,8 @@ keypress(XEvent *e)
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))
+ if(keysym == key[i].keysym
+ && CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
{
if(key[i].func)
key[i].func(&key[i].arg);
@@ -281,8 +294,7 @@ keypress(XEvent *e)
}
static void
-leavenotify(XEvent *e)
-{
+leavenotify(XEvent *e) {
XCrossingEvent *ev = &e->xcrossing;
if((ev->window == root) && !ev->same_screen) {
@@ -292,8 +304,7 @@ leavenotify(XEvent *e)
}
static void
-mappingnotify(XEvent *e)
-{
+mappingnotify(XEvent *e) {
XMappingEvent *ev = &e->xmapping;
XRefreshKeyboardMapping(ev);
@@ -302,8 +313,7 @@ mappingnotify(XEvent *e)
}
static void
-maprequest(XEvent *e)
-{
+maprequest(XEvent *e) {
static XWindowAttributes wa;
XMapRequestEvent *ev = &e->xmaprequest;
@@ -321,8 +331,7 @@ maprequest(XEvent *e)
}
static void
-propertynotify(XEvent *e)
-{
+propertynotify(XEvent *e) {
Client *c;
Window trans;
XPropertyEvent *ev = &e->xproperty;
@@ -343,19 +352,18 @@ 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);
drawtitle(c);
}
}
}
static void
-unmapnotify(XEvent *e)
-{
+unmapnotify(XEvent *e) {
Client *c;
XUnmapEvent *ev = &e->xunmap;
@@ -380,8 +388,7 @@ void (*handler[LASTEvent]) (XEvent *) = {
};
void
-grabkeys()
-{
+grabkeys() {
static unsigned int len = sizeof(key) / sizeof(key[0]);
unsigned int i;
KeyCode code;
@@ -401,8 +408,7 @@ grabkeys()
}
void
-procevent()
-{
+procevent() {
XEvent ev;
while(XPending(dpy)) {
@@ -411,4 +417,3 @@ procevent()
(handler[ev.type])(&ev); /* call handler */
}
}
-