* 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 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 { 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 */
+enum { ClkLtSymbol = 64, ClkStatusText, ClkWinTitle,
+ ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
/* typedefs */
+typedef unsigned int uint;
+typedef unsigned long ulong;
+
+typedef union {
+ int i;
+ uint ui;
+ float f;
+ void *v;
+} Arg;
+
+typedef struct {
+ uint click;
+ uint mask;
+ uint button;
+ void (*func)(const Arg *arg);
+ const Arg arg;
+} Button;
+
typedef struct Client Client;
struct Client {
char name[256];
+ float mina, maxa;
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;
- unsigned int tags;
+ int bw, oldbw;
+ uint tags;
+ Bool isbanned, isfixed, isfloating, ismoved, isurgent;
Client *next;
- Client *prev;
Client *snext;
Window win;
};
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)(void *arg);
- void *arg;
+ void (*func)(const Arg *);
+ const Arg 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;
- unsigned int tags;
+ uint tags;
Bool isfloating;
} Rule;
/* function declarations */
-void applyrules(Client *c);
-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 configure(Client *c);
-void configurenotify(XEvent *e);
-void configurerequest(XEvent *e);
-void destroynotify(XEvent *e);
-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 enternotify(XEvent *e);
-void eprint(const char *errstr, ...);
-void expose(XEvent *e);
-void focus(Client *c);
-void focusin(XEvent *e);
-void focusnext(void *arg);
-void focusprev(void *arg);
-Client *getclient(Window w);
-unsigned long getcolor(const char *colstr);
-long getstate(Window w);
-Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
-void grabbuttons(Client *c, Bool focused);
-void grabkeys(void);
-void initfont(const char *fontstr);
-Bool isoccupied(unsigned int t);
-Bool isprotodel(Client *c);
-Bool isurgent(unsigned int t);
-Bool isvisible(Client *c);
-void keypress(XEvent *e);
-void killclient(void *arg);
-void manage(Window w, XWindowAttributes *wa);
-void mappingnotify(XEvent *e);
-void maprequest(XEvent *e);
-void movemouse(Client *c);
-Client *nextunfloating(Client *c);
-void propertynotify(XEvent *e);
-void quit(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(void *arg);
-void setup(void);
-void spawn(void *arg);
-void tag(void *arg);
-unsigned int textnw(const char *text, unsigned int len);
-unsigned int textw(const char *text);
-void tile(void);
-void tileresize(Client *c, int x, int y, int w, int h);
-void togglebar(void *arg);
-void togglefloating(void *arg);
-void togglelayout(void *arg);
-void toggletag(void *arg);
-void toggleview(void *arg);
-void unban(Client *c);
-void unmanage(Client *c);
-void unmapnotify(XEvent *e);
-void updatebar(void);
-void updategeom(void);
-void updatesizehints(Client *c);
-void updatetilegeom(void);
-void updatetitle(Client *c);
-void updatewmhints(Client *c);
-void view(void *arg);
-void viewprevtag(void *arg);
-int xerror(Display *dpy, XErrorEvent *ee);
-int xerrordummy(Display *dpy, XErrorEvent *ee);
-int xerrorstart(Display *dpy, XErrorEvent *ee);
-void zoom(void *arg);
+static void applyrules(Client *c);
+static void arrange(void);
+static void attach(Client *c);
+static void attachstack(Client *c);
+static void buttonpress(XEvent *e);
+static void checkotherwm(void);
+static void cleanup(void);
+static void configure(Client *c);
+static void configurenotify(XEvent *e);
+static void configurerequest(XEvent *e);
+static void destroynotify(XEvent *e);
+static void detach(Client *c);
+static void detachstack(Client *c);
+static void drawbar(void);
+static void drawsquare(Bool filled, Bool empty, Bool invert, ulong col[ColLast]);
+static void drawtext(const char *text, ulong col[ColLast], Bool invert);
+static void enternotify(XEvent *e);
+static void eprint(const char *errstr, ...);
+static void expose(XEvent *e);
+static void focus(Client *c);
+static void focusin(XEvent *e);
+static void focusstack(const Arg *arg);
+static Client *getclient(Window w);
+static ulong getcolor(const char *colstr);
+static long getstate(Window w);
+static Bool gettextprop(Window w, Atom atom, char *text, uint size);
+static void grabbuttons(Client *c, Bool focused);
+static void grabkeys(void);
+static void initfont(const char *fontstr);
+static Bool isoccupied(uint t);
+static Bool isprotodel(Client *c);
+static Bool isurgent(uint t);
+static void keypress(XEvent *e);
+static void killclient(const Arg *arg);
+static void manage(Window w, XWindowAttributes *wa);
+static void mappingnotify(XEvent *e);
+static void maprequest(XEvent *e);
+static void movemouse(const Arg *arg);
+static Client *nexttiled(Client *c);
+static void propertynotify(XEvent *e);
+static void quit(const Arg *arg);
+static void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
+static void resizemouse(const Arg *arg);
+static void restack(void);
+static void run(void);
+static void scan(void);
+static void setclientstate(Client *c, long state);
+static void setmfact(const Arg *arg);
+static void setup(void);
+static void spawn(const Arg *arg);
+static void tag(const Arg *arg);
+static int textnw(const char *text, uint len);
+static void tile(void);
+static void togglebar(const Arg *arg);
+static void togglefloating(const Arg *arg);
+static void togglelayout(const Arg *arg);
+static void togglemax(const Arg *arg);
+static void toggletag(const Arg *arg);
+static void toggleview(const Arg *arg);
+static void unmanage(Client *c);
+static void unmapnotify(XEvent *e);
+static void updatebar(void);
+static void updategeom(void);
+static void updatesizehints(Client *c);
+static void updatetitle(Client *c);
+static void updatewmhints(Client *c);
+static void view(const Arg *arg);
+static int xerror(Display *dpy, XErrorEvent *ee);
+static int xerrordummy(Display *dpy, XErrorEvent *ee);
+static int xerrorstart(Display *dpy, XErrorEvent *ee);
+static void zoom(const Arg *arg);
/* variables */
-char stext[256];
-int screen, sx, sy, sw, sh;
-int bx, by, bw, bh, blw, wx, wy, ww, wh;
-int mx, my, mw, mh, tx, ty, tw, th;
-unsigned int seltags = 0;
-int (*xerrorxlib)(Display *, XErrorEvent *);
-unsigned int numlockmask = 0;
-void (*handler[LASTEvent]) (XEvent *) = {
+static char stext[256];
+static int screen, sx, sy, sw, sh;
+static int by, bh, blw, wx, wy, ww, wh;
+static uint seltags = 0;
+static int (*xerrorxlib)(Display *, XErrorEvent *);
+static uint numlockmask = 0;
+static void (*handler[LASTEvent]) (XEvent *) = {
[ButtonPress] = buttonpress,
[ConfigureRequest] = configurerequest,
[ConfigureNotify] = configurenotify,
[PropertyNotify] = propertynotify,
[UnmapNotify] = unmapnotify
};
-Atom wmatom[WMLast], netatom[NetLast];
-Bool otherwm, readin;
-Bool running = True;
-unsigned int tagset[] = {1, 1}; /* after start, first tag is selected */
-Client *clients = NULL;
-Client *sel = NULL;
-Client *stack = NULL;
-Cursor cursor[CurLast];
-Display *dpy;
-DC dc = {0};
-Layout layouts[];
-Layout *lt = layouts;
-Window root, barwin;
-
+static Atom wmatom[WMLast], netatom[NetLast];
+static Bool ismax = False;
+static Bool otherwm, readin;
+static Bool running = True;
+static uint tagset[] = {1, 1}; /* after start, first tag is selected */
+static Client *clients = NULL;
+static Client *sel = NULL;
+static Client *stack = NULL;
+static Cursor cursor[CurLast];
+static Display *dpy;
+static DC dc = {0};
+static Layout *lt = NULL;
+static Window root, barwin;
/* configuration, allows nested code to access above variables */
#include "config.h"
-/* check if all tags will fit into a unsigned int bitarray. */
-static char tags_is_a_sign_that_your_IQ[sizeof(int) * 8 < LENGTH(tags) ? -1 : 1];
+/* 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;
+ uint i;
Rule *r;
XClassHint ch = { 0 };
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();
}
void
attach(Client *c) {
- if(clients)
- clients->prev = c;
c->next = clients;
clients = c;
}
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, mask;
+ uint i, x, click;
Client *c;
XButtonPressedEvent *ev = &e->xbutton;
+ click = ClkRootWin;
if(ev->window == barwin) {
- x = 0;
- for(i = 0; i < LENGTH(tags); i++) {
- x += textw(tags[i]);
- if(ev->x < x) {
- mask = 1 << i;
- if(ev->button == Button1) {
- if(ev->state & MODKEY)
- tag(&mask);
- else
- view(&mask);
- }
- else if(ev->button == Button3) {
- if(ev->state & MODKEY)
- toggletag(&mask);
- else
- toggleview(&mask);
- }
- return;
- }
- }
- if((ev->x < x + blw) && ev->button == Button1)
- togglelayout(NULL);
+ i = x = 0;
+ do
+ x += TEXTW(tags[i]);
+ while(ev->x >= x && ++i < LENGTH(tags));
+ if(i < LENGTH(tags))
+ click = i;
+ else if(ev->x < x + blw)
+ click = ClkLtSymbol;
+ else if(ev->x > wx + ww - TEXTW(stext))
+ click = ClkStatusText;
+ else
+ click = ClkWinTitle;
}
else if((c = getclient(ev->window))) {
focus(c);
- if(CLEANMASK(ev->state) != MODKEY)
- return;
- if(ev->button == Button1) {
- restack();
- movemouse(c);
- }
- else if(ev->button == Button2)
- togglefloating(NULL);
- else if(ev->button == Button3 && !c->isfixed) {
- restack();
- resizemouse(c);
- }
+ click = ClkClientWin;
}
+
+ for(i = 0; i < LENGTH(buttons); i++)
+ if(click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button
+ && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
+ buttons[i].func(&buttons[i].arg);
}
void
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) {
+ Arg a = {.i = ~0};
+ Layout foo = { "", NULL };
+
close(STDIN_FILENO);
- while(stack) {
- unban(stack);
+ view(&a);
+ lt = &foo;
+ 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
void
detach(Client *c) {
- if(c->prev)
- c->prev->next = c->next;
- if(c->next)
- c->next->prev = c->prev;
- if(c == clients)
+ Client *i;
+
+ if (c != clients) {
+ for(i = clients; i->next != c; i = i->next);
+ i->next = c->next;
+ }
+ else {
clients = c->next;
- c->next = c->prev = NULL;
+ }
+ c->next = NULL;
}
void
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]);
+ dc.w = TEXTW(tags[i]);
if(tagset[seltags] & 1 << i) {
drawtext(tags[i], dc.sel, isurgent(i));
drawsquare(c && c->tags & 1 << i, isoccupied(i), isurgent(i), dc.sel);
}
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) {
- int x, y, w, h;
- unsigned int len, olen;
+drawtext(const char *text, ulong col[ColLast], Bool invert) {
+ 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 && i > 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);
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->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) {
XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
}
else
XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+ sel = c;
drawbar();
}
}
void
-focusnext(void *arg) {
- Client *c;
+focusstack(const Arg *arg) {
+ Client *c = NULL, *i;
if(!sel)
return;
- for(c = sel->next; c && !isvisible(c); c = c->next);
- if(!c)
- for(c = clients; c && !isvisible(c); c = c->next);
- if(c) {
- focus(c);
- restack();
+ if (arg->i > 0) {
+ for(c = sel->next; c && c->isbanned; c = c->next);
+ if(!c)
+ for(c = clients; c && c->isbanned; c = c->next);
}
-}
-
-void
-focusprev(void *arg) {
- Client *c;
-
- if(!sel)
- return;
- for(c = sel->prev; c && !isvisible(c); c = c->prev);
- if(!c) {
- for(c = clients; c && c->next; c = c->next);
- for(; c && !isvisible(c); c = c->prev);
+ else {
+ for(i = clients; i != sel; i = i->next)
+ if (!i->isbanned)
+ c = i;
+ if(!c)
+ for(; i; i = i->next)
+ if (!i->isbanned)
+ c = i;
}
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,
- MODKEY|numlockmask|LockMask} ;
+ uint buttons[] = { Button1, Button2, Button3 };
+ uint modifiers[] = { MODKEY, MODKEY|LockMask, MODKEY|numlockmask, MODKEY|numlockmask|LockMask };
XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
if(focused)
void
grabkeys(void) {
- unsigned int i, j;
+ uint i, j;
KeyCode code;
XModifierKeymap *modmap;
}
Bool
-isoccupied(unsigned int t) {
+isoccupied(uint t) {
Client *c;
for(c = clients; c; c = c->next)
}
Bool
-isurgent(unsigned int t) {
+isurgent(uint t) {
Client *c;
for(c = clients; c; c = c->next)
return False;
}
-Bool
-isvisible(Client *c) {
- return c->tags & tagset[seltags];
-}
-
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(void *arg) {
+killclient(const Arg *arg) {
XEvent ev;
if(!sel)
Window trans;
XWindowChanges wc;
- c = emallocz(sizeof(Client));
+ if(!(c = calloc(1, sizeof(Client))))
+ eprint("fatal: could not calloc() %u bytes\n", sizeof(Client));
c->win = w;
/* geometry */
if(c->y + c->h + 2 * c->bw > sy + sh)
c->y = sy + sh - c->h - 2 * c->bw;
c->x = MAX(c->x, sx);
- c->y = MAX(c->y, by == 0 ? bh : sy);
+ /* only fix client y-offset, if the client center might cover the bar */
+ c->y = MAX(c->y, ((by == 0) && (c->x + (c->w / 2) >= wx) && (c->x + (c->w / 2) < wx + ww)) ? bh : sy);
c->bw = borderpx;
}
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) {
+movemouse(const Arg *arg) {
int x1, y1, ocx, ocy, di, nx, ny;
- unsigned int dui;
+ uint dui;
+ Client *c;
Window dummy;
XEvent ev;
+ if(!(c = sel))
+ return;
+ 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(void *arg) {
+quit(const Arg *arg) {
readin = running = False;
}
h -= c->baseh;
/* adjust for aspect limits */
- if(c->minax != c->maxax && c->minay != c->maxay
- && c->minax > 0 && c->maxax > 0 && c->minay > 0 && c->maxay > 0) {
- if(w * c->maxay > h * c->maxax)
- w = h * c->maxax / c->maxay;
- else if(w * c->minay < h * c->minax)
- h = w * c->minay / c->minax;
+ if(c->mina > 0 && c->maxa > 0) {
+ if(c->maxa < (float) w/h)
+ w = h * c->maxa;
+ else if(c->mina > (float) h/w)
+ h = w * c->mina;
}
/* adjust for increment value */
w = MAX(w, c->minw);
h = MAX(h, c->minh);
-
- if (c->maxw)
+
+ if(c->maxw)
w = MIN(w, c->maxw);
- if (c->maxh)
+ if(c->maxh)
h = MIN(h, c->maxh);
}
if(w <= 0 || h <= 0)
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;
}
void
-resizemouse(Client *c) {
+resizemouse(const Arg *arg) {
int ocx, ocy;
int nw, nh;
+ Client *c;
XEvent ev;
+ if(!(c = sel))
+ return;
+ 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;
/* arg > 1.0 will set mfact absolutly */
void
-setmfact(void *arg) {
- double d = *((double*) arg);
+setmfact(const Arg *arg) {
+ float f;
- if(!d || lt->arrange != tile)
+ if(!arg || !lt->arrange)
return;
- d = d < 1.0 ? d + mfact : d - 1.0;
- if(d < 0.1 || d > 0.9)
+ f = arg->f < 1.0 ? arg->f + mfact : arg->f - 1.0;
+ if(f < 0.1 || f > 0.9)
return;
- mfact = d;
- updatetilegeom();
+ mfact = f;
arrange();
}
void
setup(void) {
- unsigned int i, w;
+ uint i;
+ int w;
XSetWindowAttributes wa;
/* init screen */
screen = DefaultScreen(dpy);
root = RootWindow(dpy, screen);
- initfont(FONT);
+ initfont(font);
sx = 0;
sy = 0;
sw = DisplayWidth(dpy, screen);
sh = DisplayHeight(dpy, screen);
- bh = dc.font.height + 2;
+ bh = dc.h = dc.font.height + 2;
+ lt = layouts;
updategeom();
/* init atoms */
cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
/* init appearance */
- dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
- dc.norm[ColBG] = getcolor(NORMBGCOLOR);
- dc.norm[ColFG] = getcolor(NORMFGCOLOR);
- dc.sel[ColBorder] = getcolor(SELBORDERCOLOR);
- dc.sel[ColBG] = getcolor(SELBGCOLOR);
- dc.sel[ColFG] = getcolor(SELFGCOLOR);
- initfont(FONT);
- dc.h = bh;
+ dc.norm[ColBorder] = getcolor(normbordercolor);
+ dc.norm[ColBG] = getcolor(normbgcolor);
+ dc.norm[ColFG] = getcolor(normfgcolor);
+ dc.sel[ColBorder] = getcolor(selbordercolor);
+ dc.sel[ColBG] = getcolor(selbgcolor);
+ dc.sel[ColFG] = getcolor(selfgcolor);
dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(dpy, screen), bh, DefaultDepth(dpy, screen));
dc.gc = XCreateGC(dpy, root, 0, 0);
XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
/* 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]);
PropModeReplace, (unsigned char *) netatom, NetLast);
/* select for events */
- wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask
+ wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask|ButtonPressMask
|EnterWindowMask|LeaveWindowMask|StructureNotifyMask;
XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
XSelectInput(dpy, root, wa.event_mask);
}
void
-spawn(void *arg) {
- static char *shell = NULL;
-
- if(!shell && !(shell = getenv("SHELL")))
- shell = "/bin/sh";
+spawn(const Arg *arg) {
/* 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", (char *)arg, (char *)NULL);
- fprintf(stderr, "dwm: execl '%s -c %s'", shell, (char *)arg);
+ execvp(((char **)arg->v)[0], (char **)arg->v);
+ fprintf(stderr, "dwm: execvp %s", ((char **)arg->v)[0]);
perror(" failed");
}
exit(0);
}
void
-tag(void *arg) {
- if(sel && *(int *)arg & TAGMASK) {
- sel->tags = *(int *)arg & TAGMASK;
+tag(const Arg *arg) {
+ if(sel && arg->ui & TAGMASK) {
+ sel->tags = arg->ui & TAGMASK;
arrange();
}
}
-unsigned int
-textnw(const char *text, unsigned int len) {
+int
+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;
- unsigned int i, n;
+ int x, y, h, w, mw;
+ uint i, n;
Client *c;
- for(n = 0, c = nextunfloating(clients); c; c = nextunfloating(c->next), n++);
+ for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next), n++);
if(n == 0)
return;
/* master */
- c = nextunfloating(clients);
-
- if(n == 1)
- tileresize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw);
- else
- tileresize(c, mx, my, mw - 2 * c->bw, mh - 2 * c->bw);
+ 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 = (tx > c->x + c->w) ? c->x + c->w + 2 * c->bw : tw;
- y = ty;
- w = (tx > c->x + c->w) ? wx + ww - x : tw;
- h = th / n;
+ 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;
if(h < bh)
- h = th;
+ h = wh;
- for(i = 0, c = nextunfloating(c->next); c; c = nextunfloating(c->next), i++) {
- if(i + 1 == n) /* remainder */
- tileresize(c, x, y, w - 2 * c->bw, (ty + th) - y - 2 * c->bw);
- else
- tileresize(c, x, y, w - 2 * c->bw, h - 2 * c->bw);
- if(h != th)
+ 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
-tileresize(Client *c, int x, int y, int w, int h) {
- resize(c, x, y, w, h, resizehints);
- if(resizehints && ((c->h < bh) || (c->h > h) || (c->w < bh) || (c->w > w)))
- /* client doesn't accept size constraints */
- resize(c, x, y, w, h, False);
-}
-
-void
-togglebar(void *arg) {
+togglebar(const Arg *arg) {
showbar = !showbar;
updategeom();
updatebar();
}
void
-togglefloating(void *arg) {
+togglefloating(const Arg *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(void *arg) {
- unsigned int i;
-
- if(!arg) {
- if(++lt == &layouts[LENGTH(layouts)])
- lt = &layouts[0];
- }
- else {
- for(i = 0; i < LENGTH(layouts); i++)
- if(!strcmp((char *)arg, layouts[i].symbol))
- break;
- if(i == LENGTH(layouts))
- return;
- lt = &layouts[i];
- }
+togglelayout(const Arg *arg) {
+ if(arg && arg->v)
+ lt = (Layout *)arg->v;
+ else if(++lt == &layouts[LENGTH(layouts)])
+ lt = &layouts[0];
if(sel)
arrange();
else
}
void
-toggletag(void *arg) {
- int i, m = *(int *)arg;
- for(i = 0; i < sizeof(int) * 8; i++)
- fputc(m & 1 << i ? '1' : '0', stdout);
- puts("");
- for(i = 0; i < sizeof(int) * 8; i++)
- fputc(TAGMASK & 1 << i ? '1' : '0', stdout);
- puts("aaa");
-
- if(sel && (sel->tags ^ ((*(int *)arg) & TAGMASK))) {
- sel->tags ^= (*(int *)arg) & TAGMASK;
- arrange();
- }
+togglemax(const Arg *arg) {
+ ismax = !ismax;
+ arrange();
}
void
-toggleview(void *arg) {
- if((tagset[seltags] ^ ((*(int *)arg) & TAGMASK))) {
- tagset[seltags] ^= (*(int *)arg) & TAGMASK;
+toggletag(const Arg *arg) {
+ uint mask = sel->tags ^ (arg->ui & TAGMASK);
+
+ if(sel && mask) {
+ sel->tags = mask;
arrange();
}
}
void
-unban(Client *c) {
- if(!c->isbanned)
- return;
- XMoveWindow(dpy, c->win, c->x, c->y);
- c->isbanned = False;
+toggleview(const Arg *arg) {
+ uint mask = tagset[seltags] ^ (arg->ui & TAGMASK);
+
+ if(mask) {
+ tagset[seltags] = mask;
+ arrange();
+ }
}
void
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 */
if(XineramaIsActive(dpy)) {
info = XineramaQueryScreens(dpy, &i);
- wx = info[0].x_org;
- wy = showbar && topbar ? info[0].y_org + bh : info[0].y_org;
- ww = info[0].width;
- wh = showbar ? info[0].height - bh : info[0].height;
+ wx = info[xidx].x_org;
+ wy = showbar && topbar ? info[xidx].y_org + bh : info[xidx].y_org;
+ ww = info[xidx].width;
+ wh = showbar ? info[xidx].height - bh : info[xidx].height;
XFree(info);
}
else
wh = showbar ? sh - bh : sh;
}
- /* bar geometry */
- bx = wx;
+ /* bar position */
by = showbar ? (topbar ? wy - bh : wy + wh) : -bh;
- bw = ww;
-
- /* update layout geometries */
- for(i = 0; i < LENGTH(layouts); i++)
- if(layouts[i].updategeom)
- layouts[i].updategeom();
}
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) {
- c->minax = size.min_aspect.x;
- c->maxax = size.max_aspect.x;
- c->minay = size.min_aspect.y;
- c->maxay = size.max_aspect.y;
+ if(size.flags & PAspect) {
+ c->mina = (float)size.min_aspect.y / (float)size.min_aspect.x;
+ c->maxa = (float)size.max_aspect.x / (float)size.max_aspect.y;
}
else
- c->minax = c->maxax = c->minay = c->maxay = 0;
+ c->maxa = c->mina = 0.0;
c->isfixed = (c->maxw && c->minw && c->maxh && c->minh
&& c->maxw == c->minw && c->maxh == c->minh);
}
-void
-updatetilegeom(void) {
- /* master area geometry */
- mx = wx;
- my = wy;
- mw = mfact * ww;
- mh = wh;
-
- /* tile area geometry */
- tx = mx + mw;
- ty = wy;
- tw = ww - mw;
- th = wh;
-}
-
void
updatetitle(Client *c) {
if(!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name))
}
void
-view(void *arg) {
- if(*(int *)arg & TAGMASK) {
- seltags ^= 1; /* toggle sel tagset */
- tagset[seltags] = *(int *)arg & TAGMASK;
- arrange();
- }
-}
-
-void
-viewprevtag(void *arg) {
+view(const Arg *arg) {
seltags ^= 1; /* toggle sel tagset */
+ if(arg && (arg->ui & TAGMASK))
+ tagset[seltags] = arg->i & TAGMASK;
arrange();
}
}
void
-zoom(void *arg) {
+zoom(const Arg *arg) {
Client *c = sel;
- if(c == nextunfloating(clients))
- if(!c || !(c = nextunfloating(c->next)))
+ if(ismax || !lt->arrange || (sel && sel->isfloating))
+ return;
+ if(c == nexttiled(clients))
+ if(!c || !(c = nexttiled(c->next)))
return;
- if(lt->arrange == tile && !sel->isfloating) {
- detach(c);
- attach(c);
- focus(c);
- }
+ detach(c);
+ attach(c);
+ focus(c);
arrange();
}