-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
+/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
+ * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
+ * See LICENSE file for license details. */
#include "dwm.h"
+#include <stdio.h>
#include <stdlib.h>
#include <X11/keysym.h>
#include <X11/Xatom.h>
typedef struct {
unsigned long mod;
KeySym keysym;
- void (*func)(Arg *arg);
- Arg arg;
+ void (*func)(const char *arg);
+ const char *arg;
} Key;
KEYS
#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
+#define MOUSEMASK (BUTTONMASK | PointerMotionMask)
+
+static Client *
+getclient(Window w) {
+ Client *c;
+
+ for(c = clients; c && c->win != w; c = c->next);
+ return c;
+}
static void
movemouse(Client *c) {
- int x1, y1, ocx, ocy, di;
+ int x1, y1, ocx, ocy, di, nx, ny;
unsigned int dui;
Window dummy;
XEvent ev;
- ocx = c->x;
- ocy = c->y;
+ ocx = nx = c->x;
+ ocy = ny = c->y;
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 | SubstructureRedirectMask, &ev);
switch (ev.type) {
case ButtonRelease:
- resize(c, True, TopLeft);
XUngrabPointer(dpy, CurrentTime);
return;
+ case ConfigureRequest:
case Expose:
- handler[Expose](&ev);
+ case MapRequest:
+ handler[ev.type](&ev);
break;
case MotionNotify:
XSync(dpy, False);
- c->x = ocx + (ev.xmotion.x - x1);
- c->y = ocy + (ev.xmotion.y - y1);
- resize(c, False, TopLeft);
+ nx = ocx + (ev.xmotion.x - x1);
+ ny = ocy + (ev.xmotion.y - y1);
+ if(abs(wax + nx) < SNAP)
+ nx = wax;
+ else if(abs((wax + waw) - (nx + c->w + 2 * c->border)) < SNAP)
+ nx = wax + waw - c->w - 2 * c->border;
+ if(abs(way - ny) < SNAP)
+ ny = way;
+ else if(abs((way + wah) - (ny + c->h + 2 * c->border)) < SNAP)
+ ny = way + wah - c->h - 2 * c->border;
+ resize(c, nx, ny, c->w, c->h, False);
break;
}
}
resizemouse(Client *c) {
int ocx, ocy;
int nw, nh;
- Corner sticky;
XEvent ev;
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);
+ XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->border - 1, c->h + c->border - 1);
for(;;) {
- XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
+ XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask , &ev);
switch(ev.type) {
case ButtonRelease:
- resize(c, True, TopLeft);
+ XWarpPointer(dpy, None, c->win, 0, 0, 0, 0,
+ c->w + c->border - 1, c->h + c->border - 1);
XUngrabPointer(dpy, CurrentTime);
+ while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
return;
+ case ConfigureRequest:
case Expose:
- handler[Expose](&ev);
+ case MapRequest:
+ handler[ev.type](&ev);
break;
case MotionNotify:
XSync(dpy, False);
- 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)
- sticky = (ocy <= ev.xmotion.y) ? TopLeft : BotLeft;
- else
- sticky = (ocy <= ev.xmotion.y) ? TopRight : BotRight;
- resize(c, True, sticky);
+ if((nw = ev.xmotion.x - ocx - 2 * c->border + 1) <= 0)
+ nw = 1;
+ if((nh = ev.xmotion.y - ocy - 2 * c->border + 1) <= 0)
+ nh = 1;
+ resize(c, c->x, c->y, nw, nh, True);
break;
}
}
static void
buttonpress(XEvent *e) {
- int x;
- Arg a;
+ static char buf[32];
+ unsigned int i, x;
Client *c;
XButtonPressedEvent *ev = &e->xbutton;
+ buf[0] = 0;
if(barwin == ev->window) {
x = 0;
- for(a.i = 0; a.i < ntags; a.i++) {
- x += textw(tags[a.i]);
+ for(i = 0; i < ntags; i++) {
+ x += textw(tags[i]);
if(ev->x < x) {
+ snprintf(buf, sizeof buf, "%d", i);
if(ev->button == Button1) {
if(ev->state & MODKEY)
- tag(&a);
+ tag(buf);
else
- view(&a);
+ view(buf);
}
else if(ev->button == Button3) {
if(ev->state & MODKEY)
- toggletag(&a);
+ toggletag(buf);
else
- toggleview(&a);
+ toggleview(buf);
}
return;
}
}
- if(ev->x < x + bmw) {
- if(ev->button == Button1)
- togglemode(NULL);
- }
+ if(ev->x < x + blw)
+ switch(ev->button) {
+ case Button1:
+ setlayout(NULL);
+ break;
+ }
}
else if((c = getclient(ev->window))) {
focus(c);
if(CLEANMASK(ev->state) != MODKEY)
return;
- if(ev->button == Button1 && (arrange == dofloat || c->isfloat)) {
+ if(ev->button == Button1 && (lt->arrange == floating || c->isfloating)) {
restack();
movemouse(c);
}
else if(ev->button == Button2)
zoom(NULL);
- else if(ev->button == Button3 && (arrange == dofloat || c->isfloat)) {
+ else if(ev->button == Button3
+ && (lt->arrange == floating || c->isfloating) && !c->isfixed)
+ {
restack();
resizemouse(c);
}
static void
configurerequest(XEvent *e) {
- unsigned long newmask;
Client *c;
XConfigureRequestEvent *ev = &e->xconfigurerequest;
XWindowChanges wc;
if((c = getclient(ev->window))) {
c->ismax = False;
- gravitate(c, True);
- if(ev->value_mask & CWX)
- c->x = ev->x;
- if(ev->value_mask & CWY)
- c->y = ev->y;
- if(ev->value_mask & CWWidth)
- c->w = ev->width;
- if(ev->value_mask & CWHeight)
- 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;
- wc.height = c->h;
- newmask = ev->value_mask & (~(CWSibling | CWStackMode | CWBorderWidth));
- if(newmask)
- XConfigureWindow(dpy, c->win, newmask, &wc);
- else
+ if(c->isfixed || c->isfloating || (lt->arrange == floating)) {
+ if(ev->value_mask & CWX)
+ c->x = ev->x;
+ if(ev->value_mask & CWY)
+ c->y = ev->y;
+ if(ev->value_mask & CWWidth)
+ c->w = ev->width;
+ if(ev->value_mask & CWHeight)
+ c->h = ev->height;
+ if((ev->value_mask & (CWX | CWY))
+ && !(ev->value_mask & (CWWidth | CWHeight)))
+ configure(c);
+ if(isvisible(c))
+ XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
+ }
+ else {
+ if(ev->value_mask & CWBorderWidth)
+ c->border = ev->border_width;
configure(c);
- XSync(dpy, False);
- if(c->isfloat)
- resize(c, False, TopLeft);
- else
- arrange(NULL);
+ c->border = BORDERPX;
+ }
}
else {
wc.x = ev->x;
wc.sibling = ev->above;
wc.stack_mode = ev->detail;
XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
- XSync(dpy, False);
}
+ XSync(dpy, False);
}
static void
if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
return;
-
- if(((c = getclient(ev->window)) || (c = getctitle(ev->window))) && isvisible(c))
+ if((c = getclient(ev->window)) && isvisible(c))
focus(c);
else if(ev->window == root) {
- issel = True;
- XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
- drawall();
+ selscreen = True;
+ for(c = stack; c && !isvisible(c); c = c->snext);
+ focus(c);
}
}
static void
expose(XEvent *e) {
- Client *c;
XExposeEvent *ev = &e->xexpose;
if(ev->count == 0) {
if(barwin == ev->window)
drawstatus();
- else if((c = getctitle(ev->window)))
- drawtitle(c);
}
}
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;
keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
- for(i = 0; i < len; i++) {
+ for(i = 0; i < len; i++)
if(keysym == key[i].keysym
- && CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
+ && CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
{
if(key[i].func)
- key[i].func(&key[i].arg);
- return;
+ key[i].func(key[i].arg);
}
- }
}
static void
XCrossingEvent *ev = &e->xcrossing;
if((ev->window == root) && !ev->same_screen) {
- issel = False;
- drawall();
+ selscreen = False;
+ focus(NULL);
}
}
if(!XGetWindowAttributes(dpy, ev->window, &wa))
return;
-
- if(wa.override_redirect) {
- XSelectInput(dpy, ev->window,
- (StructureNotifyMask | PropertyChangeMask));
+ if(wa.override_redirect)
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);
- return;
- }
switch (ev->atom) {
default: break;
case XA_WM_TRANSIENT_FOR:
XGetTransientForHint(dpy, c->win, &trans);
- if(!c->isfloat && (c->isfloat = (trans != 0)))
- arrange(NULL);
+ if(!c->isfloating && (c->isfloating = (getclient(trans) != NULL)))
+ lt->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);
+ if(c == sel)
+ drawstatus();
}
}
}
void
grabkeys(void) {
- static unsigned int len = sizeof(key) / sizeof(key[0]);
+ static unsigned int len = sizeof key / sizeof key[0];
unsigned int i;
KeyCode code;
GrabModeAsync, GrabModeAsync);
}
}
-
-void
-procevent(void) {
- XEvent ev;
-
- while(XPending(dpy)) {
- XNextEvent(dpy, &ev);
- if(handler[ev.type])
- (handler[ev.type])(&ev); /* call handler */
- }
-}