-/*
- * (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>
+ * © 2006-2007 Jukka Salmi <jukka at salmi dot ch>
+ * © 2007 Premysl Hruby <dfenze at gmail dot com>
+ * © 2007 Szabolcs Nagy <nszabolcs at gmail dot com>
+ * See LICENSE file for license details. */
+#include "dwm.h"
#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
#include <X11/Xatom.h>
#include <X11/Xutil.h>
-#include "dwm.h"
-
-void (*arrange)(Arg *) = tiling;
-
-static Rule rule[] = {
- /* class instance tags floating */
- { "Firefox-bin", "Gecko", { [Twww] = "www" }, False },
-};
+/* static */
-static Client *
-next(Client *c)
-{
- for(; c && !c->tags[tsel]; c = c->next);
- return c;
+static void
+attachstack(Client *c) {
+ c->snext = stack;
+ stack = c;
}
-void
-zoom(Arg *arg)
-{
- Client **l;
-
- if(!sel)
- return;
+static void
+detachstack(Client *c) {
+ Client **tc;
- if(sel == next(clients))
- sel = next(sel->next);
+ for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
+ *tc = c->snext;
+}
- for(l = &clients; *l && *l != sel; l = &(*l)->next);
- *l = sel->next;
+static void
+grabbuttons(Client *c, Bool focused) {
+ XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
- sel->next = clients; /* pop */
- clients = sel;
- arrange(NULL);
- focus(sel);
+ 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);
}
-void
-max(Arg *arg)
-{
- if(!sel)
- return;
- sel->x = sx;
- sel->y = sy + bh;
- sel->w = sw - 2 * sel->border;
- sel->h = sh - 2 * sel->border - bh;
- craise(sel);
- resize(sel, False);
+static Bool
+isprotodel(Client *c) {
+ int i, n;
+ Atom *protocols;
+ Bool ret = False;
+
+ if(XGetWMProtocols(dpy, c->win, &protocols, &n)) {
+ for(i = 0; !ret && i < n; i++)
+ if(protocols[i] == wmatom[WMDelete])
+ ret = True;
+ XFree(protocols);
+ }
+ return ret;
}
-void
-view(Arg *arg)
-{
- Client *c;
-
- tsel = arg->i;
- arrange(NULL);
+static void
+setclientstate(Client *c, long state) {
+ long data[] = {state, None};
- for(c = clients; c; c = next(c->next))
- draw_client(c);
- draw_bar();
+ XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32,
+ PropModeReplace, (unsigned char *)data, 2);
}
-void
-tappend(Arg *arg)
-{
- if(!sel)
- return;
-
- sel->tags[arg->i] = tags[arg->i];
- arrange(NULL);
+static int
+xerrordummy(Display *dsply, XErrorEvent *ee) {
+ return 0;
}
-void
-ttrunc(Arg *arg)
-{
- int i;
- if(!sel)
- return;
+/* extern */
- for(i = 0; i < TLast; i++)
- sel->tags[i] = NULL;
- tappend(arg);
+void
+attach(Client *c) {
+ if(clients)
+ clients->prev = c;
+ c->next = clients;
+ clients = c;
}
-static void
-ban_client(Client *c)
-{
- XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
- XMoveWindow(dpy, c->title, c->tx + 2 * sw, c->ty);
+void
+configure(Client *c) {
+ XConfigureEvent ce;
+
+ ce.type = ConfigureNotify;
+ ce.display = dpy;
+ ce.event = c->win;
+ ce.window = c->win;
+ ce.x = c->x;
+ ce.y = c->y;
+ ce.width = c->w;
+ ce.height = c->h;
+ ce.border_width = c->border;
+ ce.above = None;
+ ce.override_redirect = False;
+ XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce);
}
void
-floating(Arg *arg)
-{
- Client *c;
-
- arrange = floating;
- for(c = clients; c; c = c->next) {
- if(c->tags[tsel])
- resize(c, True);
- else
- ban_client(c);
- }
- if(sel && !sel->tags[tsel]) {
- if((sel = next(clients))) {
- craise(sel);
- focus(sel);
- }
- }
+detach(Client *c) {
+ if(c->prev)
+ c->prev->next = c->next;
+ if(c->next)
+ c->next->prev = c->prev;
+ if(c == clients)
+ clients = c->next;
+ c->next = c->prev = NULL;
}
void
-tiling(Arg *arg)
-{
- Client *c;
- int n, i, w, h;
-
- w = sw - mw;
- arrange = tiling;
- for(n = 0, c = clients; c; c = c->next)
- if(c->tags[tsel] && !c->floating)
- n++;
-
- if(n > 1)
- h = (sh - bh) / (n - 1);
- else
- h = sh - bh;
-
- for(i = 0, c = clients; c; c = c->next) {
- if(c->tags[tsel]) {
- if(c->floating) {
- craise(c);
- resize(c, True);
- continue;
- }
- if(n == 1) {
- c->x = sx;
- c->y = sy + bh;
- c->w = sw - 2 * c->border;
- c->h = sh - 2 * c->border - bh;
- }
- else if(i == 0) {
- c->x = sx;
- c->y = sy + bh;
- c->w = mw - 2 * c->border;
- c->h = sh - 2 * c->border - bh;
- }
- else {
- c->x = sx + mw;
- c->y = sy + (i - 1) * h + bh;
- c->w = w - 2 * c->border;
- c->h = h - 2 * c->border;
- }
- resize(c, False);
- i++;
- }
- else
- ban_client(c);
+focus(Client *c) {
+ if((!c && selscreen)|| (c && !isvisible(c)))
+ for(c = stack; c && !isvisible(c); c = c->snext);
+ if(sel && sel != c) {
+ grabbuttons(sel, False);
+ XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
}
- if(!sel || (sel && !sel->tags[tsel])) {
- if((sel = next(clients))) {
- craise(sel);
- focus(sel);
- }
+ if(c) {
+ detachstack(c);
+ attachstack(c);
+ grabbuttons(c, True);
}
+ sel = c;
+ drawstatus();
+ if(!selscreen)
+ return;
+ if(c) {
+ XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
+ XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
+ }
+ else
+ XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
}
void
-prevc(Arg *arg)
-{
- Client *c;
+killclient(const char *arg) {
+ XEvent ev;
if(!sel)
return;
-
- if((c = sel->revert && sel->revert->tags[tsel] ? sel->revert : NULL)) {
- craise(c);
- focus(c);
+ if(isprotodel(sel)) {
+ ev.type = ClientMessage;
+ ev.xclient.window = sel->win;
+ ev.xclient.message_type = wmatom[WMProtocols];
+ ev.xclient.format = 32;
+ ev.xclient.data.l[0] = wmatom[WMDelete];
+ ev.xclient.data.l[1] = CurrentTime;
+ XSendEvent(dpy, sel->win, False, NoEventMask, &ev);
}
+ else
+ XKillClient(dpy, sel->win);
}
void
-nextc(Arg *arg)
-{
- Client *c;
-
- if(!sel)
- return;
+manage(Window w, XWindowAttributes *wa) {
+ Client *c, *t = NULL;
+ Window trans;
+ Status rettrans;
+ XWindowChanges wc;
- if(!(c = next(sel->next)))
- c = next(clients);
- if(c) {
- craise(c);
- c->revert = sel;
- focus(c);
+ c = emallocz(sizeof(Client));
+ c->tags = emallocz(ntags * sizeof(Bool));
+ c->win = w;
+ c->x = wa->x;
+ c->y = wa->y;
+ c->w = wa->width;
+ c->h = wa->height;
+ c->oldborder = wa->border_width;
+ if(c->w == sw && c->h == sh) {
+ c->x = sx;
+ c->y = sy;
+ c->border = wa->border_width;
+ }
+ else {
+ if(c->x + c->w + 2 * c->border > wax + waw)
+ c->x = wax + waw - c->w - 2 * c->border;
+ if(c->y + c->h + 2 * c->border > way + wah)
+ c->y = way + wah - c->h - 2 * c->border;
+ if(c->x < wax)
+ c->x = wax;
+ if(c->y < way)
+ c->y = way;
+ c->border = BORDERPX;
}
+ wc.border_width = c->border;
+ XConfigureWindow(dpy, w, CWBorderWidth, &wc);
+ XSetWindowBorder(dpy, w, dc.norm[ColBorder]);
+ configure(c); /* propagates border_width, if size doesn't change */
+ updatesizehints(c);
+ XSelectInput(dpy, w,
+ StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
+ grabbuttons(c, False);
+ updatetitle(c);
+ if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
+ for(t = clients; t && t->win != trans; t = t->next);
+ settags(c, t);
+ if(!c->isfloating)
+ c->isfloating = (rettrans == Success) || c->isfixed;
+ attach(c);
+ attachstack(c);
+ c->isbanned = True;
+ XMoveWindow(dpy, w, c->x + 2 * sw, c->y);
+ XMapWindow(dpy, w);
+ setclientstate(c, NormalState);
+ focus(c);
+ lt->arrange();
}
void
-ckill(Arg *arg)
-{
- if(!sel)
- return;
- if(sel->proto & WM_PROTOCOL_DELWIN)
- send_message(sel->win, wm_atom[WMProtocols], wm_atom[WMDelete]);
- else
- XKillClient(dpy, sel->win);
-}
+resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
+ float dx, dy, max, min, ratio;
+ XWindowChanges wc;
-static void
-resize_title(Client *c)
-{
- int i;
-
- c->tw = 0;
- for(i = 0; i < TLast; i++)
- if(c->tags[i])
- c->tw += textw(c->tags[i]) + dc.font.height;
- c->tw += textw(c->name) + dc.font.height;
- if(c->tw > c->w)
- c->tw = c->w + 2;
- c->tx = c->x + c->w - c->tw + 2;
- c->ty = c->y;
- XMoveResizeWindow(dpy, c->title, c->tx, c->ty, c->tw, c->th);
+ if(w <= 0 || h <= 0)
+ return;
+ if(sizehints) {
+ if(c->minay > 0 && c->maxay > 0 && (h - c->baseh) > 0) {
+ dx = (float)(w - c->basew);
+ dy = (float)(h - c->baseh);
+ min = (float)(c->minax) / (float)(c->minay);
+ max = (float)(c->maxax) / (float)(c->maxay);
+ ratio = dx / dy;
+ if(max > 0 && min > 0 && ratio > 0) {
+ if(ratio < min) {
+ dy = (dx * min + dy) / (min * min + 1);
+ dx = dy * min;
+ w = (int)dx + c->basew;
+ h = (int)dy + c->baseh;
+ }
+ else if(ratio > max) {
+ dy = (dx * min + dy) / (max * max + 1);
+ dx = dy * min;
+ w = (int)dx + c->basew;
+ h = (int)dy + c->baseh;
+ }
+ }
+ }
+ if(c->minw && w < c->minw)
+ w = c->minw;
+ if(c->minh && h < c->minh)
+ h = c->minh;
+ if(c->maxw && w > c->maxw)
+ w = c->maxw;
+ if(c->maxh && h > c->maxh)
+ h = c->maxh;
+ if(c->incw)
+ w -= (w - c->basew) % c->incw;
+ if(c->inch)
+ h -= (h - c->baseh) % c->inch;
+ }
+ if(w <= 0 || h <= 0)
+ return;
+ /* offscreen appearance fixes */
+ if(x > sw)
+ x = sw - w - 2 * c->border;
+ if(y > sh)
+ y = sh - h - 2 * c->border;
+ if(x + w + 2 * c->border < sx)
+ x = sx;
+ if(y + h + 2 * c->border < sy)
+ y = sy;
+ if(c->x != x || c->y != y || c->w != w || c->h != h) {
+ c->x = wc.x = x;
+ c->y = wc.y = y;
+ c->w = wc.width = w;
+ c->h = wc.height = h;
+ wc.border_width = c->border;
+ XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
+ configure(c);
+ XSync(dpy, False);
+ }
}
void
-update_name(Client *c)
-{
- XTextProperty name;
- int n;
- char **list = NULL;
-
- name.nitems = 0;
- c->name[0] = 0;
- XGetTextProperty(dpy, c->win, &name, net_atom[NetWMName]);
- if(!name.nitems)
- XGetWMName(dpy, c->win, &name);
- if(!name.nitems)
+togglefloating(const char *arg) {
+ if(!sel || lt->arrange == floating)
return;
- if(name.encoding == XA_STRING)
- 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));
- XFreeStringList(list);
- }
- }
- XFree(name.value);
- resize_title(c);
+ sel->isfloating = !sel->isfloating;
+ if(sel->isfloating)
+ resize(sel, sel->x, sel->y, sel->w, sel->h, True);
+ lt->arrange();
}
void
-update_size(Client *c)
-{
- XSizeHints size;
+updatesizehints(Client *c) {
long msize;
+ XSizeHints size;
+
if(!XGetWMNormalHints(dpy, c->win, &size, &msize) || !size.flags)
size.flags = PSize;
c->flags = size.flags;
c->basew = size.base_width;
c->baseh = size.base_height;
}
+ else if(c->flags & PMinSize) {
+ c->basew = size.min_width;
+ c->baseh = size.min_height;
+ }
else
c->basew = c->baseh = 0;
if(c->flags & PResizeInc) {
c->minw = size.min_width;
c->minh = size.min_height;
}
+ else if(c->flags & PBaseSize) {
+ c->minw = size.base_width;
+ c->minh = size.base_height;
+ }
else
c->minw = c->minh = 0;
- if(c->flags & PWinGravity)
- c->grav = size.win_gravity;
+ if(c->flags & PAspect) {
+ c->minax = size.min_aspect.x;
+ c->maxax = size.max_aspect.x;
+ c->minay = size.min_aspect.y;
+ c->maxay = size.max_aspect.y;
+ }
else
- c->grav = NorthWestGravity;
+ c->minax = c->maxax = c->minay = c->maxay = 0;
+ c->isfixed = (c->maxw && c->minw && c->maxh && c->minh
+ && c->maxw == c->minw && c->maxh == c->minh);
}
void
-craise(Client *c)
-{
- XRaiseWindow(dpy, c->win);
- XRaiseWindow(dpy, c->title);
-}
-
-void
-lower(Client *c)
-{
- XLowerWindow(dpy, c->title);
- XLowerWindow(dpy, c->win);
-}
-
-void
-focus(Client *c)
-{
- Client *old = sel;
- XEvent ev;
-
- XFlush(dpy);
- sel = c;
- if(old && old != c)
- draw_client(old);
- draw_client(c);
- XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
- XFlush(dpy);
- while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
-}
+updatetitle(Client *c) {
+ char **list = NULL;
+ int n;
+ XTextProperty name;
-static void
-init_tags(Client *c)
-{
- XClassHint ch;
- static unsigned int len = rule ? sizeof(rule) / sizeof(rule[0]) : 0;
- unsigned int i, j;
- Bool matched = False;
-
- if(!len) {
- c->tags[tsel] = tags[tsel];
+ name.nitems = 0;
+ c->name[0] = 0;
+ XGetTextProperty(dpy, c->win, &name, netatom[NetWMName]);
+ if(!name.nitems)
+ XGetWMName(dpy, c->win, &name);
+ if(!name.nitems)
return;
- }
-
- if(XGetClassHint(dpy, c->win, &ch)) {
- if(ch.res_class && ch.res_name) {
- for(i = 0; i < len; i++)
- if(!strncmp(rule[i].class, ch.res_class, sizeof(rule[i].class))
- && !strncmp(rule[i].instance, ch.res_name, sizeof(rule[i].instance)))
- {
- for(j = 0; j < TLast; j++)
- c->tags[j] = rule[i].tags[j];
- c->floating = rule[i].floating;
- matched = True;
- break;
- }
- }
- if(ch.res_class)
- XFree(ch.res_class);
- if(ch.res_name)
- XFree(ch.res_name);
- }
-
- if(!matched)
- c->tags[tsel] = tags[tsel];
-}
-
-void
-manage(Window w, XWindowAttributes *wa)
-{
- Client *c, **l;
- XSetWindowAttributes twa;
- Window trans;
-
- c = emallocz(sizeof(Client));
- c->win = w;
- c->tx = c->x = wa->x;
- c->ty = c->y = wa->y;
- if(c->y < bh)
- c->ty = c->y += bh;
- c->tw = c->w = wa->width;
- c->h = wa->height;
- c->th = bh;
- c->border = 1;
- c->proto = win_proto(c->win);
- update_size(c);
- XSelectInput(dpy, c->win,
- StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
- XGetTransientForHint(dpy, c->win, &trans);
- twa.override_redirect = 1;
- twa.background_pixmap = ParentRelative;
- twa.event_mask = ExposureMask;
-
- c->title = XCreateWindow(dpy, root, c->tx, c->ty, c->tw, c->th,
- 0, DefaultDepth(dpy, screen), CopyFromParent,
- DefaultVisual(dpy, screen),
- CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
-
- update_name(c);
- init_tags(c);
-
- for(l = &clients; *l; l = &(*l)->next);
- c->next = *l; /* *l == nil */
- *l = c;
-
- XGrabButton(dpy, Button1, Mod1Mask, c->win, False, ButtonPressMask,
- GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button2, Mod1Mask, c->win, False, ButtonPressMask,
- GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button3, Mod1Mask, c->win, False, ButtonPressMask,
- GrabModeAsync, GrabModeSync, None, None);
-
- if(!c->floating)
- c->floating = trans
- || ((c->maxw == c->minw) && (c->maxh == c->minh));
-
- arrange(NULL);
- /* mapping the window now prevents flicker */
- if(c->tags[tsel]) {
- XMapRaised(dpy, c->win);
- XMapRaised(dpy, c->title);
- focus(c);
- }
+ if(name.encoding == XA_STRING)
+ strncpy(c->name, (char *)name.value, sizeof c->name - 1);
else {
- ban_client(c);
- XMapRaised(dpy, c->win);
- XMapRaised(dpy, c->title);
- }
-}
-
-void
-gravitate(Client *c, Bool invert)
-{
- int dx = 0, dy = 0;
-
- switch(c->grav) {
- case StaticGravity:
- case NorthWestGravity:
- case NorthGravity:
- case NorthEastGravity:
- dy = c->border;
- break;
- case EastGravity:
- case CenterGravity:
- case WestGravity:
- dy = -(c->h / 2) + c->border;
- break;
- case SouthEastGravity:
- case SouthGravity:
- case SouthWestGravity:
- dy = -c->h;
- break;
- default:
- break;
- }
-
- switch (c->grav) {
- case StaticGravity:
- case NorthWestGravity:
- case WestGravity:
- case SouthWestGravity:
- dx = c->border;
- break;
- case NorthGravity:
- case CenterGravity:
- case SouthGravity:
- dx = -(c->w / 2) + c->border;
- break;
- case NorthEastGravity:
- case EastGravity:
- case SouthEastGravity:
- dx = -(c->w + c->border);
- break;
- default:
- break;
- }
-
- if(invert) {
- dx = -dx;
- dy = -dy;
- }
- c->x += dx;
- c->y += dy;
-}
-
-
-void
-resize(Client *c, Bool inc)
-{
- XConfigureEvent e;
-
- if(inc) {
- if(c->incw)
- c->w -= (c->w - c->basew) % c->incw;
- if(c->inch)
- c->h -= (c->h - c->baseh) % c->inch;
+ if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
+ && n > 0 && *list)
+ {
+ strncpy(c->name, *list, sizeof c->name - 1);
+ XFreeStringList(list);
+ }
}
- if(c->minw && c->w < c->minw)
- c->w = c->minw;
- if(c->minh && c->h < c->minh)
- c->h = c->minh;
- if(c->maxw && c->w > c->maxw)
- c->w = c->maxw;
- if(c->maxh && c->h > c->maxh)
- c->h = c->maxh;
- resize_title(c);
- XSetWindowBorderWidth(dpy, c->win, 1);
- XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
- e.type = ConfigureNotify;
- e.event = c->win;
- e.window = c->win;
- e.x = c->x;
- e.y = c->y;
- e.width = c->w;
- e.height = c->h;
- e.border_width = c->border;
- e.above = None;
- e.override_redirect = False;
- XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&e);
- XFlush(dpy);
-}
-
-static int
-dummy_error_handler(Display *dsply, XErrorEvent *err)
-{
- return 0;
+ c->name[sizeof c->name - 1] = '\0';
+ XFree(name.value);
}
void
-unmanage(Client *c)
-{
- Client **l;
+unmanage(Client *c) {
+ XWindowChanges wc;
+ wc.border_width = c->oldborder;
+ /* The server grab construct avoids race conditions. */
XGrabServer(dpy);
- XSetErrorHandler(dummy_error_handler);
-
- XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
- XDestroyWindow(dpy, c->title);
-
- for(l = &clients; *l && *l != c; l = &(*l)->next);
- *l = c->next;
- for(l = &clients; *l; l = &(*l)->next)
- if((*l)->revert == c)
- (*l)->revert = NULL;
+ XSetErrorHandler(xerrordummy);
+ XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */
+ detach(c);
+ detachstack(c);
if(sel == c)
- sel = sel->revert ? sel->revert : clients;
-
+ focus(NULL);
+ XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+ setclientstate(c, WithdrawnState);
+ free(c->tags);
free(c);
-
- XFlush(dpy);
- XSetErrorHandler(error_handler);
+ XSync(dpy, False);
+ XSetErrorHandler(xerror);
XUngrabServer(dpy);
- arrange(NULL);
- if(sel)
- focus(sel);
-}
-
-Client *
-gettitle(Window w)
-{
- Client *c;
- for(c = clients; c; c = c->next)
- if(c->title == w)
- return c;
- return NULL;
-}
-
-Client *
-getclient(Window w)
-{
- Client *c;
- for(c = clients; c; c = c->next)
- if(c->win == w)
- return c;
- return NULL;
-}
-
-void
-draw_client(Client *c)
-{
- int i;
- if(c == sel) {
- draw_bar();
- XUnmapWindow(dpy, c->title);
- XSetWindowBorder(dpy, c->win, dc.fg);
- return;
- }
-
- XSetWindowBorder(dpy, c->win, dc.bg);
- XMapWindow(dpy, c->title);
-
- dc.x = dc.y = 0;
-
- dc.w = 0;
- for(i = 0; i < TLast; i++) {
- if(c->tags[i]) {
- dc.x += dc.w;
- dc.w = textw(c->tags[i]) + dc.font.height;
- drawtext(c->tags[i], False, True);
- }
- }
- dc.x += dc.w;
- dc.w = textw(c->name) + dc.font.height;
- drawtext(c->name, False, True);
- XCopyArea(dpy, dc.drawable, c->title, dc.gc,
- 0, 0, c->tw, c->th, 0, 0);
- XFlush(dpy);
+ lt->arrange();
}
Got questions, comments, patches, etc.? Contact Jason Woofenden