-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
* See LICENSE file for license details.
*/
#include "dwm.h"
KEYS
#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
+#define MOUSEMASK (BUTTONMASK | PointerMotionMask)
static void
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;
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;
}
}
}
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, &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);
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)
sticky = (ocy <= ev.xmotion.y) ? TopRight : BotRight;
resize(c, True, sticky);
break;
- case ButtonRelease:
- XUngrabPointer(dpy, CurrentTime);
- return;
}
}
}
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(maximized || CLEANMASK(ev->state) != MODKEY)
+ 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);
}
}
}
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;
XWindowChanges wc;
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);
+ c->ismax = False;
if(ev->value_mask & CWX)
c->x = ev->x;
if(ev->value_mask & CWY)
c->h = ev->height;
if(ev->value_mask & CWBorderWidth)
c->border = ev->border_width;
- gravitate(c, False);
wc.x = c->x;
wc.y = c->y;
wc.width = c->w;
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;
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) {
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;
{
if(key[i].func)
key[i].func(&key[i].arg);
- return;
}
}
}
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);
}
if(ev->state == PropertyDelete)
return; /* ignore */
-
if((c = getclient(ev->window))) {
if(ev->atom == wmatom[WMProtocols]) {
c->proto = getproto(c->win);
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);
+ updatesizehints(c);
break;
}
if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
updatetitle(c);
+ resizetitle(c);
drawtitle(c);
}
}
};
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;
}
void
-procevent() {
+procevent(void) {
XEvent ev;
while(XPending(dpy)) {
Got questions, comments, patches, etc.? Contact Jason Woofenden