#include "dwm.h"
-static void (*arrange)(Arg *) = tiling;
-
-static Rule rule[] = {
- { "Firefox-bin", "Gecko", { [Twww] = "www" } },
-};
-
-static Client *
-next(Client *c)
-{
- for(; c && !c->tags[tsel]; c = c->next);
- return c;
-}
-
-void
-zoom(Arg *arg)
-{
- Client **l, *old;
-
- if(!(old = sel))
- return;
-
- for(l = &clients; *l && *l != sel; l = &(*l)->next);
- *l = sel->next;
-
- old->next = clients; /* pop */
- clients = old;
- sel = old;
- arrange(NULL);
- focus(sel);
-}
-
-void
-max(Arg *arg)
-{
- if(!sel)
- return;
- sel->x = sx;
- sel->y = sy;
- sel->w = sw - 2 * sel->border;
- sel->h = sh - 2 * sel->border;
- craise(sel);
- resize(sel, False);
- discard_events(EnterWindowMask);
-}
-
-void
-view(Arg *arg)
-{
- tsel = arg->i;
- arrange(NULL);
-}
-
void
-tag(Arg *arg)
-{
- int i, n;
- if(!sel)
- return;
-
- if(arg->i == tsel) {
- for(n = i = 0; i < TLast; i++)
- if(sel->tags[i])
- n++;
- if(n < 2)
- return;
- }
-
- if(sel->tags[arg->i])
- sel->tags[arg->i] = NULL; /* toggle tag */
- else
- sel->tags[arg->i] = tags[arg->i];
- arrange(NULL);
-}
-
-static void
-ban_client(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
-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);
- }
- }
- discard_events(EnterWindowMask);
-}
-
-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])
- n++;
-
- h = (n > 1) ? sh / (n - 1) : sh;
-
- for(i = 0, c = clients; c; c = c->next) {
- if(c->tags[tsel]) {
- if(n == 1) {
- c->x = sx;
- c->y = sy;
- c->w = sw - 2 * c->border;
- c->h = sh - 2 * c->border;
- }
- else if(i == 0) {
- c->x = sx;
- c->y = sy;
- c->w = mw - 2 * c->border;
- c->h = sh - 2 * c->border;
- }
- else {
- c->x = sx + mw;
- c->y = sy + (i - 1) * h;
- c->w = w - 2 * c->border;
- c->h = h - 2 * c->border;
- }
- resize(c, False);
- i++;
- }
- else
- ban_client(c);
- }
- if(sel && !sel->tags[tsel]) {
- if((sel = next(clients))) {
- craise(sel);
- focus(sel);
- }
- }
- discard_events(EnterWindowMask);
-}
-
-void
-prevc(Arg *arg)
-{
- Client *c;
-
- if(!sel)
- return;
-
- if((c = sel->revert && sel->revert->tags[tsel] ? sel->revert : NULL)) {
- craise(c);
- focus(c);
- }
-}
-
-void
-nextc(Arg *arg)
-{
- Client *c;
-
- if(!sel)
- return;
-
- if(!(c = next(sel->next)))
- c = next(clients);
- if(c) {
- craise(c);
- c->revert = sel;
- focus(c);
- }
-}
-
-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);
-}
-
static void
-resize_title(Client *c)
+resizetitle(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;
+ c->tw += textw(c->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;
}
void
-update_name(Client *c)
+settitle(Client *c)
{
XTextProperty name;
int n;
}
}
XFree(name.value);
- resize_title(c);
+ resizetitle(c);
}
void
-update_size(Client *c)
+setsize(Client *c)
{
XSizeHints size;
long msize;
}
void
-craise(Client *c)
+higher(Client *c)
{
XRaiseWindow(dpy, c->win);
XRaiseWindow(dpy, c->title);
focus(Client *c)
{
Client *old = sel;
+ XEvent ev;
+ XFlush(dpy);
sel = c;
if(old && old != c)
- draw_client(old);
- draw_client(c);
+ drawtitle(old);
+ drawtitle(c);
XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
XFlush(dpy);
- discard_events(EnterWindowMask);
-}
-
-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];
- return;
- }
-
- if(XGetClassHint(dpy, c->win, &ch)) {
- if(ch.res_class && ch.res_name) {
- fprintf(stderr, "%s:%s\n", 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)))
- {
- fprintf(stderr, "->>>%s:%s\n", ch.res_class, ch.res_name);
- for(j = 0; j < TLast; j++)
- c->tags[j] = rule[i].tags[j];
- 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];
+ while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
}
void
{
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 = th;
+ c->th = bh;
c->border = 1;
- c->proto = win_proto(c->win);
- update_size(c);
+ c->proto = getproto(c->win);
+ setsize(c);
XSelectInput(dpy, c->win,
StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
- XGetTransientForHint(dpy, c->win, &c->trans);
+ XGetTransientForHint(dpy, c->win, &trans);
twa.override_redirect = 1;
twa.background_pixmap = ParentRelative;
twa.event_mask = ExposureMask;
DefaultVisual(dpy, screen),
CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
- update_name(c);
- init_tags(c);
+ settitle(c);
+ settags(c);
for(l = &clients; *l; l = &(*l)->next);
c->next = *l; /* *l == nil */
*l = c;
- XSetWindowBorderWidth(dpy, c->win, 1);
- XMapRaised(dpy, c->win);
- XMapRaised(dpy, c->title);
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->dofloat)
+ c->dofloat = trans
+ || ((c->maxw == c->minw) && (c->maxh == c->minh));
+
arrange(NULL);
- if(c->tags[tsel])
+ /* mapping the window now prevents flicker */
+ if(c->tags[tsel]) {
+ XMapRaised(dpy, c->win);
+ XMapRaised(dpy, c->title);
focus(c);
- else
- ban_client(c);
+ }
+ else {
+ ban(c);
+ XMapRaised(dpy, c->win);
+ XMapRaised(dpy, c->title);
+ }
}
void
if(c->inch)
c->h -= (c->h - c->baseh) % c->inch;
}
+ if(c->x > sw) /* might happen on restart */
+ c->x = sw - c->w;
+ if(c->y > sh)
+ c->ty = c->y = sh - c->h;
if(c->minw && c->w < c->minw)
c->w = c->minw;
if(c->minh && c->h < c->minh)
c->w = c->maxw;
if(c->maxh && c->h > c->maxh)
c->h = c->maxh;
- resize_title(c);
+ resizetitle(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;
}
static int
-dummy_error_handler(Display *dsply, XErrorEvent *err)
+xerrordummy(Display *dsply, XErrorEvent *ee)
{
return 0;
}
Client **l;
XGrabServer(dpy);
- XSetErrorHandler(dummy_error_handler);
+ XSetErrorHandler(xerrordummy);
XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
XDestroyWindow(dpy, c->title);
free(c);
XFlush(dpy);
- XSetErrorHandler(error_handler);
+ XSetErrorHandler(xerror);
XUngrabServer(dpy);
arrange(NULL);
if(sel)
}
Client *
-gettitle(Window w)
+getctitle(Window w)
{
Client *c;
for(c = clients; c; c = c->next)
}
void
-draw_client(Client *c)
+zoom(Arg *arg)
{
- int i;
- if(c == sel) {
- XUnmapWindow(dpy, c->title);
- XSetWindowBorder(dpy, c->win, dc.fg);
+ Client **l, *c;
+
+ if(!sel)
return;
+
+ if(sel == getnext(clients) && sel->next) {
+ if((c = getnext(sel->next)))
+ sel = c;
}
- XSetWindowBorder(dpy, c->win, dc.bg);
- XMapWindow(dpy, c->title);
+ for(l = &clients; *l && *l != sel; l = &(*l)->next);
+ *l = sel->next;
- dc.x = dc.y = 0;
- dc.h = c->th;
+ sel->next = clients; /* pop */
+ clients = sel;
+ arrange(NULL);
+ focus(sel);
+}
- 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;
- draw(True, c->tags[i]);
- }
+void
+maximize(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;
+ higher(sel);
+ resize(sel, False);
+}
+
+void
+focusprev(Arg *arg)
+{
+ Client *c;
+
+ if(!sel)
+ return;
+
+ if((c = sel->revert && sel->revert->tags[tsel] ? sel->revert : NULL)) {
+ higher(c);
+ focus(c);
}
- dc.x += dc.w;
- dc.w = textw(c->name) + dc.font.height;
- draw(True, c->name);
- XCopyArea(dpy, dc.drawable, c->title, dc.gc,
- 0, 0, c->tw, c->th, 0, 0);
- XFlush(dpy);
+}
+
+void
+focusnext(Arg *arg)
+{
+ Client *c;
+
+ if(!sel)
+ return;
+
+ if(!(c = getnext(sel->next)))
+ c = getnext(clients);
+ if(c) {
+ higher(c);
+ c->revert = sel;
+ focus(c);
+ }
+}
+
+void
+killclient(Arg *arg)
+{
+ if(!sel)
+ return;
+ if(sel->proto & WM_PROTOCOL_DELWIN)
+ sendevent(sel->win, wm_atom[WMProtocols], wm_atom[WMDelete]);
+ else
+ XKillClient(dpy, sel->win);
}
Got questions, comments, patches, etc.? Contact Jason Woofenden