* Each child of the root window is called a client, except windows which have
* set the override_redirect flag. Clients are organized in a global
* doubly-linked client list, the focus history is remembered through a global
- * stack list. Each client contains an array of Bools of the same size as the
- * global tags array to indicate the tags of a client.
+ * stack list. Each client contains a bit array to indicate the tags of a
+ * client.
*
* Keys and tagging rules are organized as arrays and defined in config.h.
*
#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
#define TAGMASK ((int)((1LL << LENGTH(tags)) - 1))
#define TEXTW(x) (textnw(x, strlen(x)) + dc.font.height)
-#define VISIBLE(x) ((x)->tags & tagset[seltags])
/* enums */
enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
int x, y, w, h;
int basew, baseh, incw, inch, maxw, maxh, minw, minh;
int minax, maxax, minay, maxay;
- long flags;
int bw, oldbw;
- Bool isbanned, isfixed, isfloating, ismax, isurgent;
+ Bool isbanned, isfixed, isfloating, ismoved, isurgent;
uint tags;
Client *next;
Client *prev;
void updatetitle(Client *c);
void updatewmhints(Client *c);
void view(const void *arg);
-void viewprevtag(const void *arg);
int xerror(Display *dpy, XErrorEvent *ee);
int xerrordummy(Display *dpy, XErrorEvent *ee);
int xerrorstart(Display *dpy, XErrorEvent *ee);
/* variables */
char stext[256];
int screen, sx, sy, sw, sh;
-int bx, by, bw, bh, blw, wx, wy, ww, wh;
+int by, bh, blw, wx, wy, ww, wh;
uint seltags = 0;
int (*xerrorxlib)(Display *, XErrorEvent *);
uint numlockmask = 0;
[UnmapNotify] = unmapnotify
};
Atom wmatom[WMLast], netatom[NetLast];
-Bool domax = False;
+Bool ismax = False;
Bool otherwm, readin;
Bool running = True;
uint tagset[] = {1, 1}; /* after start, first tag is selected */
Client *c;
for(c = clients; c; c = c->next)
- if(VISIBLE(c)) {
- if(!lt->arrange || c->isfloating)
+ if(c->tags & tagset[seltags]) { /* is visible */
+ if(ismax && !c->isfixed) {
+ XMoveResizeWindow(dpy, c->win, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw);
+ c->ismoved = True;
+ }
+ else if(!lt->arrange || c->isfloating)
resize(c, c->x, c->y, c->w, c->h, True);
+ c->isbanned = False;
}
else if(!c->isbanned) {
XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
- c->isbanned = True;
+ c->isbanned = c->ismoved = True;
}
focus(NULL);
- if(lt->arrange && !domax)
+ if(lt->arrange && !ismax)
lt->arrange();
restack();
}
}
else if((c = getclient(ev->window))) {
focus(c);
- if(CLEANMASK(ev->state) != MODKEY || domax)
+ if(CLEANMASK(ev->state) != MODKEY || (ismax && !c->isfixed))
return;
if(ev->button == Button1)
movemouse(c);
XSync(dpy, False);
if(otherwm)
eprint("dwm: another window manager is already running\n");
- XSync(dpy, False);
XSetErrorHandler(NULL);
xerrorxlib = XSetErrorHandler(xerror);
XSync(dpy, False);
void
cleanup(void) {
close(STDIN_FILENO);
- view(NULL);
+ view((uint[]){~0});
while(stack)
unmanage(stack);
if(dc.font.set)
if((c = getclient(ev->window))) {
if(ev->value_mask & CWBorderWidth)
c->bw = ev->border_width;
- if(c->isfixed || c->isfloating || !lt->arrange) {
+ if(ismax && !c->isbanned && !c->isfixed)
+ XMoveResizeWindow(dpy, c->win, wx, wy, ww - 2 * c->bw, wh + 2 * c->bw);
+ else if(c->isfloating || !lt->arrange) {
if(ev->value_mask & CWX)
c->x = sx + ev->x;
if(ev->value_mask & CWY)
if((ev->value_mask & (CWX|CWY))
&& !(ev->value_mask & (CWWidth|CWHeight)))
configure(c);
- if(VISIBLE(c))
+ if(!c->isbanned)
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
}
else
Client *c;
dc.x = 0;
- for(c = stack; c && !VISIBLE(c); c = c->snext);
+ for(c = stack; c && c->isbanned; c = c->snext);
for(i = 0; i < LENGTH(tags); i++) {
dc.w = TEXTW(tags[i]);
if(tagset[seltags] & 1 << i) {
}
if(blw > 0) {
dc.w = blw;
- drawtext(lt->symbol, dc.norm, domax);
+ drawtext(lt->symbol, dc.norm, ismax);
x = dc.x + dc.w;
}
else
x = dc.x;
dc.w = TEXTW(stext);
- dc.x = bw - dc.w;
+ dc.x = ww - dc.w;
if(dc.x < x) {
dc.x = x;
- dc.w = bw - x;
+ dc.w = ww - x;
}
drawtext(stext, dc.norm, False);
if((dc.w = dc.x - x) > bh) {
dc.x = x;
if(c) {
drawtext(c->name, dc.sel, False);
- drawsquare(False, c->isfloating, False, dc.sel);
+ drawsquare(c->isfixed, c->isfloating, False, dc.sel);
}
else
drawtext(NULL, dc.norm, False);
}
- XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
+ XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, ww, bh, 0, 0);
XSync(dpy, False);
}
void
drawtext(const char *text, ulong col[ColLast], Bool invert) {
- int x, y, w, h;
- uint len, olen;
+ int i, x, y, h, len, olen;
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
char buf[256];
olen = strlen(text);
len = MIN(olen, sizeof buf);
memcpy(buf, text, len);
- w = 0;
h = dc.font.ascent + dc.font.descent;
y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
x = dc.x + (h / 2);
/* shorten text if necessary */
- for(; len && (w = textnw(buf, len)) > dc.w - h; len--);
+ for(; len && (i = textnw(buf, len)) > dc.w - h; len--);
if(!len)
return;
- if(len < olen) {
- if(len > 1)
- buf[len - 1] = '.';
- if(len > 2)
- buf[len - 2] = '.';
- if(len > 3)
- buf[len - 3] = '.';
- }
+ if(len < olen)
+ for(i = len; i >= MAX(0, len - 3); buf[i--] = '.');
XSetForeground(dpy, dc.gc, col[invert ? ColBG : ColFG]);
if(dc.font.set)
XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
void
focus(Client *c) {
- if(!c || (c && !VISIBLE(c)))
- for(c = stack; c && !VISIBLE(c); c = c->snext);
+ if(!c || c->isbanned)
+ for(c = stack; c && c->isbanned; c = c->snext);
if(sel && sel != c) {
grabbuttons(sel, False);
XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
detachstack(c);
attachstack(c);
grabbuttons(c, True);
- }
- sel = c;
- if(c) {
- if(domax) {
- XMoveResizeWindow(dpy, c->win, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw);
- c->ismax = True;
- }
XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
}
else
XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+ sel = c;
drawbar();
}
if(!sel)
return;
- for(c = sel->next; c && !VISIBLE(c); c = c->next);
+ for(c = sel->next; c && c->isbanned; c = c->next);
if(!c)
- for(c = clients; c && !VISIBLE(c); c = c->next);
+ for(c = clients; c && c->isbanned; c = c->next);
if(c) {
focus(c);
restack();
if(!sel)
return;
- for(c = sel->prev; c && !VISIBLE(c); c = c->prev);
+ for(c = sel->prev; c && c->isbanned; c = c->prev);
if(!c) {
for(c = clients; c && c->next; c = c->next);
- for(; c && !VISIBLE(c); c = c->prev);
+ for(; c && c->isbanned; c = c->prev);
}
if(c) {
focus(c);
keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
for(i = 0; i < LENGTH(keys); i++)
if(keysym == keys[i].keysym
- && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state))
- {
- if(keys[i].func)
- keys[i].func(keys[i].arg);
- }
+ && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
+ && keys[i].func)
+ keys[i].func(keys[i].arg);
}
void
applyrules(c);
if(!c->isfloating)
c->isfloating = (rettrans == Success) || c->isfixed;
+ if(c->isfloating)
+ XRaiseWindow(dpy, c->win);
attach(c);
attachstack(c);
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); /* some windows require this */
Client *
nexttiled(Client *c) {
- for(; c && (c->isfloating || !VISIBLE(c)); c = c->next);
+ for(; c && (c->isfloating || c->isbanned); c = c->next);
return c;
}
h = bh;
if(w < bh)
w = bh;
- if(c->x != x || c->y != y || c->w != w || c->h != h || c->isbanned || c->ismax) {
- c->isbanned = c->ismax = False;
+ if(c->x != x || c->y != y || c->w != w || c->h != h || c->ismoved) {
+ c->ismoved = False;
c->x = wc.x = x;
c->y = wc.y = y;
c->w = wc.width = w;
drawbar();
if(!sel)
return;
- if(domax || sel->isfloating || !lt->arrange)
+ if(ismax || sel->isfloating || !lt->arrange)
XRaiseWindow(dpy, sel->win);
- if(!domax && lt->arrange) {
+ if(!ismax && lt->arrange) {
wc.stack_mode = Below;
wc.sibling = barwin;
for(c = stack; c; c = c->snext)
- if(!c->isfloating && VISIBLE(c)) {
+ if(!c->isfloating && !c->isbanned) {
XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
wc.sibling = c->win;
}
setmfact(const void *arg) {
double d = *((double*) arg);
- if(!d || lt->arrange != tile)
+ if(!d || !lt->arrange)
return;
d = d < 1.0 ? d + mfact : d - 1.0;
if(d < 0.1 || d > 0.9)
wa.background_pixmap = ParentRelative;
wa.event_mask = ButtonPressMask|ExposureMask;
- barwin = XCreateWindow(dpy, root, bx, by, bw, bh, 0, DefaultDepth(dpy, screen),
+ barwin = XCreateWindow(dpy, root, wx, by, ww, bh, 0, DefaultDepth(dpy, screen),
CopyFromParent, DefaultVisual(dpy, screen),
CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
XDefineCursor(dpy, barwin, cursor[CurNormal]);
/* master */
c = nexttiled(clients);
mw = mfact * ww;
- resize(c, wx, wy, ((n == 1) ? ww : mw) - 2 * c->bw, wh - 2 * c->bw, resizehints);
+ resize(c, wx, wy, (n == 1 ? ww : mw) - 2 * c->bw, wh - 2 * c->bw, resizehints);
if(--n == 0)
return;
/* tile stack */
- x = (wx + mw > c->x + c->w) ? c->x + c->w + 2 * c->bw : ww - mw;
+ x = (wx + mw > c->x + c->w) ? c->x + c->w + 2 * c->bw : wx + mw;
y = wy;
w = (wx + mw > c->x + c->w) ? wx + ww - x : ww - mw;
h = wh / n;
togglefloating(const void *arg) {
if(!sel)
return;
- sel->isfloating = !sel->isfloating;
+ sel->isfloating = !sel->isfloating || sel->isfixed;
if(sel->isfloating)
resize(sel, sel->x, sel->y, sel->w, sel->h, True);
arrange();
void
togglemax(const void *arg) {
- domax = !domax;
+ ismax = !ismax;
arrange();
}
updatebar(void) {
if(dc.drawable != 0)
XFreePixmap(dpy, dc.drawable);
- dc.drawable = XCreatePixmap(dpy, root, bw, bh, DefaultDepth(dpy, screen));
- XMoveResizeWindow(dpy, barwin, bx, by, bw, bh);
+ dc.drawable = XCreatePixmap(dpy, root, ww, bh, DefaultDepth(dpy, screen));
+ XMoveResizeWindow(dpy, barwin, wx, by, ww, bh);
}
void
updategeom(void) {
- int i;
#ifdef XINERAMA
+ int i;
XineramaScreenInfo *info = NULL;
/* window area geometry */
wh = showbar ? sh - bh : sh;
}
- /* bar geometry */
- bx = wx;
+ /* bar position */
by = showbar ? (topbar ? wy - bh : wy + wh) : -bh;
- bw = ww;
}
void
long msize;
XSizeHints size;
- if(!XGetWMNormalHints(dpy, c->win, &size, &msize) || !size.flags)
- size.flags = PSize;
- c->flags = size.flags;
- if(c->flags & PBaseSize) {
+ XGetWMNormalHints(dpy, c->win, &size, &msize);
+ if(size.flags & PBaseSize) {
c->basew = size.base_width;
c->baseh = size.base_height;
}
- else if(c->flags & PMinSize) {
+ else if(size.flags & PMinSize) {
c->basew = size.min_width;
c->baseh = size.min_height;
}
else
c->basew = c->baseh = 0;
- if(c->flags & PResizeInc) {
+ if(size.flags & PResizeInc) {
c->incw = size.width_inc;
c->inch = size.height_inc;
}
else
c->incw = c->inch = 0;
- if(c->flags & PMaxSize) {
+ if(size.flags & PMaxSize) {
c->maxw = size.max_width;
c->maxh = size.max_height;
}
else
c->maxw = c->maxh = 0;
- if(c->flags & PMinSize) {
+ if(size.flags & PMinSize) {
c->minw = size.min_width;
c->minh = size.min_height;
}
- else if(c->flags & PBaseSize) {
+ else if(size.flags & PBaseSize) {
c->minw = size.base_width;
c->minh = size.base_height;
}
else
c->minw = c->minh = 0;
- if(c->flags & PAspect) {
+ if(size.flags & PAspect) {
c->minax = size.min_aspect.x;
c->maxax = size.max_aspect.x;
c->minay = size.min_aspect.y;
void
view(const void *arg) {
- if(*(int *)arg & TAGMASK) {
- seltags ^= 1; /* toggle sel tagset */
- tagset[seltags] = *(int *)arg & TAGMASK;
- arrange();
- }
-}
-
-void
-viewprevtag(const void *arg) {
seltags ^= 1; /* toggle sel tagset */
+ if(arg && (*(int *)arg & TAGMASK))
+ tagset[seltags] = *(int *)arg & TAGMASK;
arrange();
}
zoom(const void *arg) {
Client *c = sel;
- if(!lt->arrange || sel->isfloating)
+ if(ismax || !lt->arrange || (sel && sel->isfloating))
return;
if(c == nexttiled(clients))
if(!c || !(c = nexttiled(c->next)))
Got questions, comments, patches, etc.? Contact Jason Woofenden