X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=event.c;h=d0f446f7837466071f8e8b8432fee56ff60eb650;hb=b6614261ea48c9711cefd79601e09fa764ee3075;hp=83301bc2ff19e047a7f24a73ca4badc4421f4e52;hpb=6b25d06d7d159bf89d740847fedc876ab0137b6b;p=dwm.git diff --git a/event.c b/event.c index 83301bc..d0f446f 100644 --- a/event.c +++ b/event.c @@ -1,5 +1,4 @@ -/* - * (C)opyright MMVI Anselm R. Garbe +/* (C)opyright MMVI Anselm R. Garbe * 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) { @@ -52,14 +35,12 @@ movemouse(Client *c) { 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; @@ -67,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(c->x) < sx + SNAP) + c->x = sx; + if(abs(c->y) < sy + bh + SNAP) + c->y = sy + bh; + if(abs(c->x + c->w) > sx + sw - SNAP) + c->x = sw - c->w - 2 * BORDERPX; + if(abs(c->y + c->h) > sy + sh - SNAP) + c->y = sh - 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; } } } @@ -91,19 +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; @@ -121,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; } } } @@ -160,10 +131,8 @@ 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); @@ -175,7 +144,8 @@ buttonpress(XEvent *e) { } 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) && + !c->isfixed) { restack(); resizemouse(c); } @@ -190,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; @@ -215,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; @@ -251,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) { @@ -319,13 +287,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); } @@ -338,7 +304,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); @@ -349,7 +314,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); @@ -357,6 +322,7 @@ propertynotify(XEvent *e) { } if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) { updatetitle(c); + resizetitle(c); drawtitle(c); } }