-/*
- * (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"
/* static functions */
static void
-resizetitle(Client *c)
-{
- int i;
+detachstack(Client *c) {
+ Client **tc;
+ for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
+ *tc = c->snext;
+}
- c->tw = 0;
- for(i = 0; i < TLast; i++)
- if(c->tags[i])
- c->tw += textw(tags[i]);
- c->tw += textw(c->name);
- if(c->tw > c->w)
- c->tw = c->w + 2;
- c->tx = c->x + c->w - c->tw + 2;
- c->ty = c->y;
- if(c->tags[tsel])
- XMoveResizeWindow(dpy, c->title, c->tx, c->ty, c->tw, c->th);
- else
- XMoveResizeWindow(dpy, c->title, c->tx + 2 * sw, c->ty, c->tw, c->th);
+static void
+grabbuttons(Client *c, Bool focused) {
+ XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+ if(focused) {
+ XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK,
+ GrabModeAsync, GrabModeSync, None, None);
+ XGrabButton(dpy, Button1, MODKEY | LockMask, c->win, False, BUTTONMASK,
+ GrabModeAsync, GrabModeSync, None, None);
+ XGrabButton(dpy, Button1, MODKEY | numlockmask, c->win, False, BUTTONMASK,
+ GrabModeAsync, GrabModeSync, None, None);
+ XGrabButton(dpy, Button1, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
+ GrabModeAsync, GrabModeSync, None, None);
+
+ XGrabButton(dpy, Button2, MODKEY, c->win, False, BUTTONMASK,
+ GrabModeAsync, GrabModeSync, None, None);
+ XGrabButton(dpy, Button2, MODKEY | LockMask, c->win, False, BUTTONMASK,
+ GrabModeAsync, GrabModeSync, None, None);
+ XGrabButton(dpy, Button2, MODKEY | numlockmask, c->win, False, BUTTONMASK,
+ GrabModeAsync, GrabModeSync, None, None);
+ XGrabButton(dpy, Button2, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
+ GrabModeAsync, GrabModeSync, None, None);
+
+ XGrabButton(dpy, Button3, MODKEY, c->win, False, BUTTONMASK,
+ GrabModeAsync, GrabModeSync, None, None);
+ XGrabButton(dpy, Button3, MODKEY | LockMask, c->win, False, BUTTONMASK,
+ GrabModeAsync, GrabModeSync, None, None);
+ XGrabButton(dpy, Button3, MODKEY | numlockmask, c->win, False, BUTTONMASK,
+ GrabModeAsync, GrabModeSync, None, None);
+ XGrabButton(dpy, Button3, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
+ GrabModeAsync, GrabModeSync, None, None);
+ }
+ else
+ XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK,
+ GrabModeAsync, GrabModeSync, None, None);
}
static int
-xerrordummy(Display *dsply, XErrorEvent *ee)
-{
+xerrordummy(Display *dsply, XErrorEvent *ee) {
return 0;
}
/* extern functions */
void
-ban(Client *c)
-{
+ban(Client *c) {
XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
- XMoveWindow(dpy, c->title, c->tx + 2 * sw, c->ty);
-}
-
-void
-focus(Client *c)
-{
- Client *old = sel;
- XEvent ev;
-
- sel = c;
- if(old && old != c)
- drawtitle(old);
- drawtitle(c);
- XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
- XSync(dpy, False);
- while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+ XMoveWindow(dpy, c->twin, c->tx + 2 * sw, c->ty);
}
void
-focusnext(Arg *arg)
-{
- Client *c;
-
- if(!sel)
- return;
-
- if(sel->ismax)
- togglemax(NULL);
-
- if(!(c = getnext(sel->next)))
- c = getnext(clients);
- if(c) {
- higher(c);
- focus(c);
- }
+configure(Client *c) {
+ XEvent synev;
+
+ synev.type = ConfigureNotify;
+ synev.xconfigure.display = dpy;
+ synev.xconfigure.event = c->win;
+ synev.xconfigure.window = c->win;
+ synev.xconfigure.x = c->x;
+ synev.xconfigure.y = c->y;
+ synev.xconfigure.width = c->w;
+ synev.xconfigure.height = c->h;
+ synev.xconfigure.border_width = c->border;
+ synev.xconfigure.above = None;
+ XSendEvent(dpy, c->win, True, NoEventMask, &synev);
}
void
-focusprev(Arg *arg)
-{
- Client *c;
+focus(Client *c) {
+ Client *old;
- if(!sel)
+ if(!issel || (c && !isvisible(c)))
return;
-
- if(sel->ismax)
- togglemax(NULL);
-
- if(!(c = getprev(sel->prev))) {
- for(c = clients; c && c->next; c = c->next);
- c = getprev(c);
+ if(!sel)
+ sel = c;
+ else if(sel != c) {
+ old = sel;
+ sel = c;
+ if(old) {
+ grabbuttons(old, False);
+ drawtitle(old);
+ }
}
if(c) {
- higher(c);
- focus(c);
+ detachstack(c);
+ c->snext = stack;
+ stack = c;
+ grabbuttons(c, True);
+ drawtitle(c);
+ XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
}
+ else
+ XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
}
Client *
-getclient(Window w)
-{
+getclient(Window w) {
Client *c;
for(c = clients; c; c = c->next)
}
Client *
-getctitle(Window w)
-{
+getctitle(Window w) {
Client *c;
for(c = clients; c; c = c->next)
- if(c->title == w)
+ if(c->twin == w)
return c;
return NULL;
}
void
-gravitate(Client *c, Bool invert)
-{
+gravitate(Client *c, Bool invert) {
int dx = 0, dy = 0;
switch(c->grav) {
dy = -(c->h);
break;
}
-
switch (c->grav) {
default:
break;
dx = -(c->w + c->border);
break;
}
-
if(invert) {
dx = -dx;
dy = -dy;
}
void
-higher(Client *c)
-{
- XRaiseWindow(dpy, c->win);
- XRaiseWindow(dpy, c->title);
-}
-
-void
-killclient(Arg *arg)
-{
+killclient(Arg *arg) {
if(!sel)
return;
if(sel->proto & PROTODELWIN)
}
void
-lower(Client *c)
-{
- XLowerWindow(dpy, c->title);
- XLowerWindow(dpy, c->win);
-}
-
-void
-manage(Window w, XWindowAttributes *wa)
-{
+manage(Window w, XWindowAttributes *wa) {
Client *c;
Window trans;
XSetWindowAttributes twa;
c = emallocz(sizeof(Client));
+ c->tags = emallocz(ntags * sizeof(Bool));
c->win = w;
+ c->border = 0;
c->x = c->tx = wa->x;
c->y = c->ty = wa->y;
c->w = c->tw = wa->width;
c->h = wa->height;
c->th = bh;
-
- c->border = 0;
- setsize(c);
-
+ updatesize(c);
+ if(c->x + c->w + 2 * BORDERPX > sw)
+ c->x = sw - c->w - 2 * BORDERPX;
+ if(c->x < sx)
+ c->x = sx;
+ if(c->y + c->h + 2 * BORDERPX > sh)
+ c->y = sh - c->h - 2 * BORDERPX;
if(c->h != sh && c->y < bh)
- c->y = c->ty = bh;
-
+ c->y = bh;
c->proto = getproto(c->win);
XSelectInput(dpy, c->win,
StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
twa.override_redirect = 1;
twa.background_pixmap = ParentRelative;
twa.event_mask = ExposureMask | EnterWindowMask;
-
- c->title = XCreateWindow(dpy, root, c->tx, c->ty, c->tw, c->th,
+ c->twin = XCreateWindow(dpy, root, c->tx, c->ty, c->tw, c->th,
0, DefaultDepth(dpy, screen), CopyFromParent,
DefaultVisual(dpy, screen),
CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
-
+ grabbuttons(c, False);
+ updatetitle(c);
+ settags(c, getclient(trans));
+ if(!c->isfloat)
+ c->isfloat = trans || c->isfixed;
+ resizetitle(c);
if(clients)
clients->prev = c;
c->next = clients;
- clients = c;
-
- XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK,
- GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button2, MODKEY, c->win, False, BUTTONMASK,
- GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button3, MODKEY, c->win, False, BUTTONMASK,
- GrabModeAsync, GrabModeSync, None, None);
-
- settags(c);
- if(!c->isfloat)
- c->isfloat = trans
- || (c->maxw && c->minw &&
- c->maxw == c->minw && c->maxh == c->minh);
- settitle(c);
- arrange(NULL);
-
- /* mapping the window now prevents flicker */
- XMapRaised(dpy, c->win);
- XMapRaised(dpy, c->title);
- if(c->tags[tsel])
+ c->snext = stack;
+ stack = clients = c;
+ ban(c);
+ XMapWindow(dpy, c->win);
+ XMapWindow(dpy, c->twin);
+ if(isvisible(c))
focus(c);
+ arrange();
}
void
-resize(Client *c, Bool sizehints, Corner sticky)
-{
+resize(Client *c, Bool sizehints, Corner sticky) {
int bottom = c->y + c->h;
int right = c->x + c->w;
- /*XConfigureEvent e;*/
XWindowChanges wc;
if(sizehints) {
if(c->maxh && c->h > c->maxh)
c->h = c->maxh;
}
- if(c->x > right) /* might happen on restart */
- c->x = right - c->w;
- if(c->y > bottom)
- c->y = bottom - c->h;
if(sticky == TopRight || sticky == BotRight)
c->x = right - c->w;
if(sticky == BotLeft || sticky == BotRight)
c->y = bottom - c->h;
-
+ /* offscreen appearance fixes */
+ if(c->x + c->w < sx)
+ c->x = sx;
+ if(c->y + c->h < bh)
+ c->y = bh;
+ if(c->x > sw)
+ c->x = sw - c->w;
+ if(c->y > sh)
+ c->y = sh - c->h;
resizetitle(c);
wc.x = c->x;
wc.y = c->y;
if(c->w == sw && c->h == sh)
wc.border_width = 0;
else
- wc.border_width = 1;
- XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
+ wc.border_width = BORDERPX;
+ XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
+ configure(c);
XSync(dpy, False);
}
void
-setsize(Client *c)
-{
+resizetitle(Client *c) {
+ c->tw = textw(c->name);
+ if(c->tw > c->w)
+ c->tw = c->w + 2 * BORDERPX;
+ c->tx = c->x + c->w - c->tw + 2 * BORDERPX;
+ c->ty = c->y;
+ if(isvisible(c))
+ XMoveResizeWindow(dpy, c->twin, c->tx, c->ty, c->tw, c->th);
+ else
+ XMoveResizeWindow(dpy, c->twin, c->tx + 2 * sw, c->ty, c->tw, c->th);
+}
+
+void
+updatesize(Client *c) {
long msize;
XSizeHints size;
}
else
c->minw = c->minh = 0;
+ c->isfixed = (c->maxw && c->minw && c->maxh && c->minh &&
+ c->maxw == c->minw && c->maxh == c->minh);
if(c->flags & PWinGravity)
c->grav = size.win_gravity;
else
}
void
-settitle(Client *c)
-{
+updatetitle(Client *c) {
char **list = NULL;
int n;
XTextProperty name;
if(!name.nitems)
return;
if(name.encoding == XA_STRING)
- strncpy(c->name, (char *)name.value, sizeof(c->name));
+ strncpy(c->name, (char *)name.value, sizeof c->name);
else {
if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
&& n > 0 && *list)
{
- strncpy(c->name, *list, sizeof(c->name));
+ strncpy(c->name, *list, sizeof c->name);
XFreeStringList(list);
}
}
XFree(name.value);
- resizetitle(c);
}
void
-togglemax(Arg *arg)
-{
- int ox, oy, ow, oh;
- XEvent ev;
-
- if(!sel)
- return;
-
- if((sel->ismax = !sel->ismax)) {
- ox = sel->x;
- oy = sel->y;
- ow = sel->w;
- oh = sel->h;
- sel->x = sx;
- sel->y = sy + bh;
- sel->w = sw - 2;
- sel->h = sh - 2 - bh;
+unmanage(Client *c) {
+ Client *nc;
- higher(sel);
- resize(sel, False, TopLeft);
-
- sel->x = ox;
- sel->y = oy;
- sel->w = ow;
- sel->h = oh;
- }
- else
- resize(sel, False, TopLeft);
- while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
-}
-
-void
-unmanage(Client *c)
-{
+ /* The server grab construct avoids race conditions. */
XGrabServer(dpy);
XSetErrorHandler(xerrordummy);
-
- XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
- XDestroyWindow(dpy, c->title);
-
- if(c->prev)
- c->prev->next = c->next;
- if(c->next)
- c->next->prev = c->prev;
- if(c == clients)
- clients = c->next;
+ detach(c);
+ detachstack(c);
if(sel == c) {
- sel = getnext(c->next);
- if(!sel)
- sel = getprev(c->prev);
- if(!sel)
- sel = clients;
+ for(nc = stack; nc && !isvisible(nc); nc = nc->snext);
+ focus(nc);
}
+ XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+ XDestroyWindow(dpy, c->twin);
+ free(c->tags);
free(c);
-
XSync(dpy, False);
XSetErrorHandler(xerror);
XUngrabServer(dpy);
- arrange(NULL);
- if(sel)
- focus(sel);
-}
-
-void
-zoom(Arg *arg)
-{
- Client *c;
-
- if(!sel)
- return;
-
- if(sel == getnext(clients) && sel->next) {
- if((c = getnext(sel->next)))
- sel = c;
- }
-
- /* pop */
- if(sel->prev)
- sel->prev->next = sel->next;
- if(sel->next)
- sel->next->prev = sel->prev;
- sel->prev = NULL;
- if(clients)
- clients->prev = sel;
- sel->next = clients;
- clients = sel;
- arrange(NULL);
- focus(sel);
+ arrange();
}