* 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 LENGTH(x) (sizeof x / sizeof x[0])
#define MAXTAGLEN 16
#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
+#define TAGMASK ((int)((1LL << LENGTH(tags)) - 1))
+#define TEXTW(x) (textnw(x, strlen(x)) + dc.font.height)
/* enums */
-enum { BarTop, BarBot, BarOff, BarLast }; /* bar appearance */
enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
enum { ColBorder, ColFG, ColBG, ColLast }; /* color */
enum { NetSupported, NetWMName, NetLast }; /* EWMH atoms */
enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */
/* typedefs */
+typedef unsigned int uint;
+typedef unsigned long ulong;
typedef struct Client Client;
struct Client {
char name[256];
int x, y, w, h;
int basew, baseh, incw, inch, maxw, maxh, minw, minh;
int minax, maxax, minay, maxay;
- long flags;
- unsigned int bw, oldbw;
- Bool isbanned, isfixed, isfloating, isurgent;
- Bool *tags;
+ int bw, oldbw;
+ Bool isbanned, isfixed, isfloating, ismoved, isurgent;
+ uint tags;
Client *next;
Client *prev;
Client *snext;
typedef struct {
int x, y, w, h;
- unsigned long norm[ColLast];
- unsigned long sel[ColLast];
+ ulong norm[ColLast];
+ ulong sel[ColLast];
Drawable drawable;
GC gc;
struct {
} DC; /* draw context */
typedef struct {
- unsigned long mod;
+ uint mod;
KeySym keysym;
- void (*func)(const char *arg);
- const char *arg;
+ void (*func)(const void *arg);
+ const void *arg;
} Key;
typedef struct {
const char *symbol;
void (*arrange)(void);
- void (*updategeom)(void);
} Layout;
typedef struct {
const char *class;
const char *instance;
const char *title;
- const char *tag;
+ uint tags;
Bool isfloating;
} Rule;
void arrange(void);
void attach(Client *c);
void attachstack(Client *c);
-void ban(Client *c);
void buttonpress(XEvent *e);
void checkotherwm(void);
void cleanup(void);
void detach(Client *c);
void detachstack(Client *c);
void drawbar(void);
-void drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]);
-void drawtext(const char *text, unsigned long col[ColLast], Bool invert);
-void *emallocz(unsigned int size);
+void drawsquare(Bool filled, Bool empty, Bool invert, ulong col[ColLast]);
+void drawtext(const char *text, ulong col[ColLast], Bool invert);
void enternotify(XEvent *e);
void eprint(const char *errstr, ...);
void expose(XEvent *e);
void focus(Client *c);
void focusin(XEvent *e);
-void focusnext(const char *arg);
-void focusprev(const char *arg);
+void focusnext(const void *arg);
+void focusprev(const void *arg);
Client *getclient(Window w);
-unsigned long getcolor(const char *colstr);
+ulong getcolor(const char *colstr);
long getstate(Window w);
-Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
+Bool gettextprop(Window w, Atom atom, char *text, uint size);
void grabbuttons(Client *c, Bool focused);
void grabkeys(void);
-unsigned int idxoftag(const char *t);
void initfont(const char *fontstr);
-Bool isoccupied(unsigned int t);
+Bool isoccupied(uint t);
Bool isprotodel(Client *c);
-Bool isurgent(unsigned int t);
-Bool isvisible(Client *c);
+Bool isurgent(uint t);
void keypress(XEvent *e);
-void killclient(const char *arg);
+void killclient(const void *arg);
void manage(Window w, XWindowAttributes *wa);
void mappingnotify(XEvent *e);
void maprequest(XEvent *e);
void movemouse(Client *c);
-Client *nextunfloating(Client *c);
+Client *nexttiled(Client *c);
void propertynotify(XEvent *e);
-void quit(const char *arg);
+void quit(const void *arg);
void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
void resizemouse(Client *c);
void restack(void);
void run(void);
void scan(void);
void setclientstate(Client *c, long state);
+void setmfact(const void *arg);
void setup(void);
-void spawn(const char *arg);
-void tag(const char *arg);
-unsigned int textnw(const char *text, unsigned int len);
-unsigned int textw(const char *text);
-void togglebar(const char *arg);
-void togglefloating(const char *arg);
-void togglelayout(const char *arg);
-void toggletag(const char *arg);
-void toggleview(const char *arg);
-void unban(Client *c);
+void spawn(const void *arg);
+void tag(const void *arg);
+uint textnw(const char *text, uint len);
+void tile(void);
+void togglebar(const void *arg);
+void togglefloating(const void *arg);
+void togglelayout(const void *arg);
+void togglemax(const void *arg);
+void toggletag(const void *arg);
+void toggleview(const void *arg);
void unmanage(Client *c);
void unmapnotify(XEvent *e);
void updatebar(void);
void updatesizehints(Client *c);
void updatetitle(Client *c);
void updatewmhints(Client *c);
-void view(const char *arg);
-void viewprevtag(const char *arg);
+void view(const void *arg);
int xerror(Display *dpy, XErrorEvent *ee);
int xerrordummy(Display *dpy, XErrorEvent *ee);
int xerrorstart(Display *dpy, XErrorEvent *ee);
-void zoom(const char *arg);
+void zoom(const void *arg);
/* variables */
char stext[256];
int screen, sx, sy, sw, sh;
-int bx, by, bw, bh, blw, wx, wy, ww, wh;
-int seltags = 0;
+int by, bh, blw, wx, wy, ww, wh;
+uint seltags = 0;
int (*xerrorxlib)(Display *, XErrorEvent *);
-unsigned int numlockmask = 0;
+uint numlockmask = 0;
void (*handler[LASTEvent]) (XEvent *) = {
[ButtonPress] = buttonpress,
[ConfigureRequest] = configurerequest,
[UnmapNotify] = unmapnotify
};
Atom wmatom[WMLast], netatom[NetLast];
+Bool ismax = False;
Bool otherwm, readin;
Bool running = True;
-Bool *tagset[2];
+uint tagset[] = {1, 1}; /* after start, first tag is selected */
Client *clients = NULL;
Client *sel = NULL;
Client *stack = NULL;
/* configuration, allows nested code to access above variables */
#include "config.h"
-#define TAGSZ (LENGTH(tags) * sizeof(Bool))
-/* function implementations */
+/* compile-time check if all tags fit into an uint bit array. */
+struct NumTags { char limitexceeded[sizeof(uint) * 8 < LENGTH(tags) ? -1 : 1]; };
+/* function implementations */
void
applyrules(Client *c) {
- unsigned int i;
- Bool matched = False;
+ uint i;
Rule *r;
XClassHint ch = { 0 };
&& (!r->class || (ch.res_class && strstr(ch.res_class, r->class)))
&& (!r->instance || (ch.res_name && strstr(ch.res_name, r->instance)))) {
c->isfloating = r->isfloating;
- if(r->tag) {
- c->tags[idxoftag(r->tag)] = True;
- matched = True;
- }
+ c->tags |= r->tags & TAGMASK;
}
}
if(ch.res_class)
XFree(ch.res_class);
if(ch.res_name)
XFree(ch.res_name);
- if(!matched)
- memcpy(c->tags, tagset[seltags], TAGSZ);
+ if(!c->tags)
+ c->tags = tagset[seltags];
}
void
Client *c;
for(c = clients; c; c = c->next)
- if(isvisible(c)) {
- unban(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 = c->ismoved = True;
}
- else
- ban(c);
focus(NULL);
- if(lt->arrange)
+ if(lt->arrange && !ismax)
lt->arrange();
restack();
}
stack = c;
}
-void
-ban(Client *c) {
- if(c->isbanned)
- return;
- XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
- c->isbanned = True;
-}
-
void
buttonpress(XEvent *e) {
- unsigned int i, x;
+ uint i, x, mask;
Client *c;
XButtonPressedEvent *ev = &e->xbutton;
if(ev->window == barwin) {
x = 0;
for(i = 0; i < LENGTH(tags); i++) {
- x += textw(tags[i]);
+ x += TEXTW(tags[i]);
if(ev->x < x) {
+ mask = 1 << i;
if(ev->button == Button1) {
if(ev->state & MODKEY)
- tag(tags[i]);
+ tag(&mask);
else
- view(tags[i]);
+ view(&mask);
}
else if(ev->button == Button3) {
if(ev->state & MODKEY)
- toggletag(tags[i]);
+ toggletag(&mask);
else
- toggleview(tags[i]);
+ toggleview(&mask);
}
return;
}
}
- if((ev->x < x + blw) && ev->button == Button1)
- togglelayout(NULL);
+ if(ev->x < x + blw) {
+ if(ev->button == Button1)
+ togglelayout(NULL);
+ else if(ev->button == Button3)
+ togglemax(NULL);
+ }
}
else if((c = getclient(ev->window))) {
focus(c);
- if(CLEANMASK(ev->state) != MODKEY)
+ if(CLEANMASK(ev->state) != MODKEY || (ismax && !c->isfixed))
return;
- if(ev->button == Button1) {
- restack();
+ if(ev->button == Button1)
movemouse(c);
- }
- else if(ev->button == Button2) {
- if(lt->arrange && c->isfloating)
- togglefloating(NULL);
- }
- else if(ev->button == Button3 && !c->isfixed) {
- restack();
+ else if(ev->button == Button2)
+ togglefloating(NULL);
+ else if(ev->button == Button3 && !c->isfixed)
resizemouse(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);
- while(stack) {
- unban(stack);
+ view((uint[]){~0});
+ while(stack)
unmanage(stack);
- }
if(dc.font.set)
XFreeFontSet(dpy, dc.font.set);
else
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(isvisible(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 && !isvisible(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][i]) {
+ dc.w = TEXTW(tags[i]);
+ if(tagset[seltags] & 1 << i) {
drawtext(tags[i], dc.sel, isurgent(i));
- drawsquare(c && c->tags[i], isoccupied(i), isurgent(i), dc.sel);
+ drawsquare(c && c->tags & 1 << i, isoccupied(i), isurgent(i), dc.sel);
}
else {
drawtext(tags[i], dc.norm, isurgent(i));
- drawsquare(c && c->tags[i], isoccupied(i), isurgent(i), dc.norm);
+ drawsquare(c && c->tags & 1 << i, isoccupied(i), isurgent(i), dc.norm);
}
dc.x += dc.w;
}
if(blw > 0) {
dc.w = blw;
- drawtext(lt->symbol, dc.norm, False);
+ 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.w = TEXTW(stext);
+ 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
-drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
+drawsquare(Bool filled, Bool empty, Bool invert, ulong col[ColLast]) {
int x;
XGCValues gcv;
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
}
void
-drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
+drawtext(const char *text, ulong col[ColLast], Bool invert) {
int x, y, w, h;
- unsigned int len, olen;
+ uint len, olen;
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
char buf[256];
XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
}
-void *
-emallocz(unsigned int size) {
- void *res = calloc(1, size);
-
- if(!res)
- eprint("fatal: could not malloc() %u bytes\n", size);
- return res;
-}
-
void
enternotify(XEvent *e) {
Client *c;
void
focus(Client *c) {
- if(!c || (c && !isvisible(c)))
- for(c = stack; c && !isvisible(c); c = c->snext);
+ if(!c || (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]);
}
void
-focusnext(const char *arg) {
+focusnext(const void *arg) {
Client *c;
if(!sel)
return;
- for(c = sel->next; c && !isvisible(c); c = c->next);
+ for(c = sel->next; c && c->isbanned; c = c->next);
if(!c)
- for(c = clients; c && !isvisible(c); c = c->next);
+ for(c = clients; c && c->isbanned; c = c->next);
if(c) {
focus(c);
restack();
}
void
-focusprev(const char *arg) {
+focusprev(const void *arg) {
Client *c;
if(!sel)
return;
- for(c = sel->prev; c && !isvisible(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 && !isvisible(c); c = c->prev);
+ for(; c && c->isbanned; c = c->prev);
}
if(c) {
focus(c);
return c;
}
-unsigned long
+ulong
getcolor(const char *colstr) {
Colormap cmap = DefaultColormap(dpy, screen);
XColor color;
int format, status;
long result = -1;
unsigned char *p = NULL;
- unsigned long n, extra;
+ ulong n, extra;
Atom real;
status = XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState],
}
Bool
-gettextprop(Window w, Atom atom, char *text, unsigned int size) {
+gettextprop(Window w, Atom atom, char *text, uint size) {
char **list = NULL;
int n;
XTextProperty name;
void
grabbuttons(Client *c, Bool focused) {
int i, j;
- unsigned int buttons[] = { Button1, Button2, Button3 };
- unsigned int modifiers[] = { MODKEY, MODKEY|LockMask, MODKEY|numlockmask,
+ uint buttons[] = { Button1, Button2, Button3 };
+ uint modifiers[] = { MODKEY, MODKEY|LockMask, MODKEY|numlockmask,
MODKEY|numlockmask|LockMask} ;
XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
void
grabkeys(void) {
- unsigned int i, j;
+ uint i, j;
KeyCode code;
XModifierKeymap *modmap;
}
}
-unsigned int
-idxoftag(const char *t) {
- unsigned int i;
-
- for(i = 0; (i < LENGTH(tags)) && t && strcmp(tags[i], t); i++);
- return (i < LENGTH(tags)) ? i : 0;
-}
-
void
initfont(const char *fontstr) {
char *def, **missing;
}
Bool
-isoccupied(unsigned int t) {
+isoccupied(uint t) {
Client *c;
for(c = clients; c; c = c->next)
- if(c->tags[t])
+ if(c->tags & 1 << t)
return True;
return False;
}
}
Bool
-isurgent(unsigned int t) {
+isurgent(uint t) {
Client *c;
for(c = clients; c; c = c->next)
- if(c->isurgent && c->tags[t])
- return True;
- return False;
-}
-
-Bool
-isvisible(Client *c) {
- unsigned int i;
-
- for(i = 0; i < LENGTH(tags); i++)
- if(c->tags[i] && tagset[seltags][i])
+ if(c->isurgent && c->tags & 1 << t)
return True;
return False;
}
void
keypress(XEvent *e) {
- unsigned int i;
+ uint i;
KeySym keysym;
XKeyEvent *ev;
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
-killclient(const char *arg) {
+killclient(const void *arg) {
XEvent ev;
if(!sel)
Window trans;
XWindowChanges wc;
- c = emallocz(sizeof(Client));
- c->tags = emallocz(TAGSZ);
+ if(!(c = calloc(1, sizeof(Client))))
+ eprint("fatal: could not calloc() %u bytes\n", sizeof(Client));
c->win = w;
/* geometry */
if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
for(t = clients; t && t->win != trans; t = t->next);
if(t)
- memcpy(c->tags, t->tags, TAGSZ);
+ c->tags = t->tags;
else
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 */
- ban(c);
XMapWindow(dpy, c->win);
setclientstate(c, NormalState);
arrange();
void
movemouse(Client *c) {
int x1, y1, ocx, ocy, di, nx, ny;
- unsigned int dui;
+ uint dui;
Window dummy;
XEvent ev;
+ restack();
ocx = nx = c->x;
ocy = ny = c->y;
if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
}
Client *
-nextunfloating(Client *c) {
- for(; c && (c->isfloating || !isvisible(c)); c = c->next);
+nexttiled(Client *c) {
+ for(; c && (c->isfloating || c->isbanned); c = c->next);
return c;
}
}
void
-quit(const char *arg) {
+quit(const void *arg) {
readin = running = False;
}
x = sx;
if(y + h + 2 * c->bw < sy)
y = sy;
- if(c->x != x || c->y != y || c->w != w || c->h != h) {
+ if(h < bh)
+ h = bh;
+ if(w < bh)
+ w = bh;
+ 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;
int nw, nh;
XEvent ev;
+ restack();
ocx = c->x;
ocy = c->y;
if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
drawbar();
if(!sel)
return;
- if(sel->isfloating || !lt->arrange)
+ if(ismax || sel->isfloating || !lt->arrange)
XRaiseWindow(dpy, sel->win);
- if(lt->arrange) {
+ if(!ismax && lt->arrange) {
wc.stack_mode = Below;
wc.sibling = barwin;
for(c = stack; c; c = c->snext)
- if(!c->isfloating && isvisible(c)) {
+ if(!c->isfloating && !c->isbanned) {
XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
wc.sibling = c->win;
}
char sbuf[sizeof stext];
fd_set rd;
int r, xfd;
- unsigned int len, offset;
+ uint len, offset;
XEvent ev;
/* main event loop, also reads status text from stdin */
void
scan(void) {
- unsigned int i, num;
+ uint i, num;
Window *wins, d1, d2;
XWindowAttributes wa;
PropModeReplace, (unsigned char *)data, 2);
}
+/* arg > 1.0 will set mfact absolutly */
+void
+setmfact(const void *arg) {
+ double d = *((double*) arg);
+
+ if(!d || !lt->arrange)
+ return;
+ d = d < 1.0 ? d + mfact : d - 1.0;
+ if(d < 0.1 || d > 0.9)
+ return;
+ mfact = d;
+ arrange();
+}
+
void
setup(void) {
- unsigned int i, w;
+ uint i, w;
XSetWindowAttributes wa;
/* init screen */
if(!dc.font.set)
XSetFont(dpy, dc.gc, dc.font.xfont->fid);
- /* init tags */
- tagset[0] = emallocz(TAGSZ);
- tagset[1] = emallocz(TAGSZ);
- tagset[0][0] = tagset[1][0] = True;
-
/* init bar */
for(blw = i = 0; LENGTH(layouts) > 1 && i < LENGTH(layouts); i++) {
- w = textw(layouts[i].symbol);
+ w = TEXTW(layouts[i].symbol);
blw = MAX(blw, w);
}
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]);
}
void
-spawn(const char *arg) {
+spawn(const void *arg) {
static char *shell = NULL;
if(!shell && !(shell = getenv("SHELL")))
shell = "/bin/sh";
- if(!arg)
- return;
/* The double-fork construct avoids zombie processes and keeps the code
* clean from stupid signal handlers. */
if(fork() == 0) {
if(dpy)
close(ConnectionNumber(dpy));
setsid();
- execl(shell, shell, "-c", arg, (char *)NULL);
- fprintf(stderr, "dwm: execl '%s -c %s'", shell, arg);
+ execl(shell, shell, "-c", (char *)arg, (char *)NULL);
+ fprintf(stderr, "dwm: execl '%s -c %s'", shell, (char *)arg);
perror(" failed");
}
exit(0);
}
void
-tag(const char *arg) {
- unsigned int i;
-
- if(!sel)
- return;
- for(i = 0; i < LENGTH(tags); i++)
- sel->tags[i] = (arg == NULL);
- sel->tags[idxoftag(arg)] = True;
- arrange();
+tag(const void *arg) {
+ if(sel && *(int *)arg & TAGMASK) {
+ sel->tags = *(int *)arg & TAGMASK;
+ arrange();
+ }
}
-unsigned int
-textnw(const char *text, unsigned int len) {
+uint
+textnw(const char *text, uint len) {
XRectangle r;
if(dc.font.set) {
return XTextWidth(dc.font.xfont, text, len);
}
-unsigned int
-textw(const char *text) {
- return textnw(text, strlen(text)) + dc.font.height;
+void
+tile(void) {
+ int x, y, h, w, mw;
+ uint i, n;
+ Client *c;
+
+ for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next), n++);
+ if(n == 0)
+ return;
+
+ /* master */
+ c = nexttiled(clients);
+ mw = mfact * ww;
+ 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;
+ y = wy;
+ w = (wx + mw > c->x + c->w) ? wx + ww - x : ww - mw;
+ h = wh / n;
+ if(h < bh)
+ h = wh;
+
+ for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
+ resize(c, x, y, w - 2 * c->bw, /* remainder */ ((i + 1 == n)
+ ? (wy + wh) - y : h) - 2 * c->bw, resizehints);
+ if(h != wh)
+ y = c->y + c->h + 2 * c->bw;
+ }
}
void
-togglebar(const char *arg) {
+togglebar(const void *arg) {
showbar = !showbar;
updategeom();
updatebar();
}
void
-togglefloating(const char *arg) {
+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
-togglelayout(const char *arg) {
- unsigned int i;
+togglelayout(const void *arg) {
+ uint i;
if(!arg) {
if(++lt == &layouts[LENGTH(layouts)])
}
else {
for(i = 0; i < LENGTH(layouts); i++)
- if(!strcmp(arg, layouts[i].symbol))
+ if(!strcmp((char *)arg, layouts[i].symbol))
break;
if(i == LENGTH(layouts))
return;
}
void
-toggletag(const char *arg) {
- unsigned int i, j;
-
- if(!sel)
- return;
- i = idxoftag(arg);
- sel->tags[i] = !sel->tags[i];
- for(j = 0; j < LENGTH(tags) && !sel->tags[j]; j++);
- if(j == LENGTH(tags))
- sel->tags[i] = True; /* at least one tag must be enabled */
+togglemax(const void *arg) {
+ ismax = !ismax;
arrange();
}
void
-toggleview(const char *arg) {
- unsigned int i, j;
-
- i = idxoftag(arg);
- tagset[seltags][i] = !tagset[seltags][i];
- for(j = 0; j < LENGTH(tags) && !tagset[seltags][j]; j++);
- if(j == LENGTH(tags))
- tagset[seltags][i] = True; /* at least one tag must be viewed */
- arrange();
+toggletag(const void *arg) {
+ if(sel && (sel->tags ^ ((*(int *)arg) & TAGMASK))) {
+ sel->tags ^= (*(int *)arg) & TAGMASK;
+ arrange();
+ }
}
void
-unban(Client *c) {
- if(!c->isbanned)
- return;
- XMoveWindow(dpy, c->win, c->x, c->y);
- c->isbanned = False;
+toggleview(const void *arg) {
+ if((tagset[seltags] ^ ((*(int *)arg) & TAGMASK))) {
+ tagset[seltags] ^= (*(int *)arg) & TAGMASK;
+ arrange();
+ }
}
void
focus(NULL);
XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
setclientstate(c, WithdrawnState);
- free(c->tags);
free(c);
XSync(dpy, False);
XSetErrorHandler(xerror);
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
wh = showbar ? sh - bh : sh;
}
- /* bar geometry*/
- bx = wx;
- by = showbar ? (topbar ? 0 : wy + wh) : -bh;
- bw = ww;
-
- /* update layout geometries */
- for(i = 0; i < LENGTH(layouts); i++)
- if(layouts[i].updategeom)
- layouts[i].updategeom();
+ /* bar position */
+ by = showbar ? (topbar ? wy - bh : wy + wh) : -bh;
}
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 char *arg) {
- seltags ^= 1; /* toggle sel tagset */
- memset(tagset[seltags], (NULL == arg), TAGSZ);
- tagset[seltags][idxoftag(arg)] = True;
- arrange();
-}
-
-void
-viewprevtag(const char *arg) {
+view(const void *arg) {
seltags ^= 1; /* toggle sel tagset */
+ if(arg && (*(int *)arg & TAGMASK))
+ tagset[seltags] = *(int *)arg & TAGMASK;
arrange();
}
return -1;
}
+void
+zoom(const void *arg) {
+ Client *c = sel;
+
+ if(ismax || !lt->arrange || (sel && sel->isfloating))
+ return;
+ if(c == nexttiled(clients))
+ if(!c || !(c = nexttiled(c->next)))
+ return;
+ detach(c);
+ attach(c);
+ focus(c);
+ arrange();
+}
+
int
main(int argc, char *argv[]) {
if(argc == 2 && !strcmp("-v", argv[1]))