X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/88c8ead3e8a22d311964c2a3ea0e384044f546c9..c982bb1389c37262cbcc6ffcc343ec78528c4a81:/dwm.c?ds=inline
diff --git a/dwm.c b/dwm.c
index 2efc50b..91b0149 100644
--- a/dwm.c
+++ b/dwm.c
@@ -33,7 +33,6 @@
#include <sys/select.h>
#include <sys/types.h>
#include <sys/wait.h>
-#include <regex.h>
#include <X11/cursorfont.h>
#include <X11/keysym.h>
#include <X11/Xatom.h>
@@ -47,6 +46,14 @@
#define LENGTH(x) (sizeof x / sizeof x[0])
#define MAXTAGLEN 16
#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
+#define DEFGEOM(GEONAME,BX,BY,BW,WX,WY,WW,WH,MX,MY,MW,MH,TX,TY,TW,TH,MOX,MOY,MOW,MOH) \
+void GEONAME(void) { \
+ bx = (BX); by = (BY); bw = (BW); \
+ wx = (WX); wy = (WY); ww = (WW); wh = (WH); \
+ mx = (MX); my = (MY); mw = (MW); mh = (MH); \
+ tx = (TX); ty = (TY); tw = (TW); th = (TH); \
+ mox = (MOX); moy = (MOY); mow = (MOW); moh = (MOH); \
+}
/* enums */
enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
@@ -59,11 +66,10 @@ typedef struct Client Client;
struct Client {
char name[256];
int x, y, w, h;
- int rx, ry, rw, rh;
int basew, baseh, incw, inch, maxw, maxh, minw, minh;
int minax, maxax, minay, maxay;
long flags;
- unsigned int border, oldborder;
+ unsigned int bw, oldbw;
Bool isbanned, isfixed, isfloating, isurgent;
Bool *tags;
Client *next;
@@ -87,6 +93,11 @@ typedef struct {
} font;
} DC; /* draw context */
+typedef struct {
+ const char *symbol;
+ void (*apply)(void);
+} Geom;
+
typedef struct {
unsigned long mod;
KeySym keysym;
@@ -97,10 +108,13 @@ typedef struct {
typedef struct {
const char *symbol;
void (*arrange)(void);
-} Layout;
+ Bool isfloating;
+} Layout;
typedef struct {
- const char *prop;
+ const char *class;
+ const char *instance;
+ const char *title;
const char *tag;
Bool isfloating;
} Rule;
@@ -117,6 +131,7 @@ void cleanup(void);
void configure(Client *c);
void configurenotify(XEvent *e);
void configurerequest(XEvent *e);
+unsigned int counttiled(void);
void destroynotify(XEvent *e);
void detach(Client *c);
void detachstack(Client *c);
@@ -161,19 +176,27 @@ void restack(void);
void run(void);
void scan(void);
void setclientstate(Client *c, long state);
+void setgeom(const char *arg);
void setlayout(const char *arg);
+void setmfact(const char *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 tile(void);
+void tileh(void);
+void tilehstack(unsigned int n);
+Client *tilemaster(unsigned int n);
+void tileresize(Client *c, int x, int y, int w, int h);
+void tilev(void);
+void tilevstack(unsigned int n);
void togglefloating(const char *arg);
void toggletag(const char *arg);
void toggleview(const char *arg);
void unban(Client *c);
void unmanage(Client *c);
void unmapnotify(XEvent *e);
+void updatebarpos(void);
void updatesizehints(Client *c);
void updatetitle(Client *c);
void updatewmhints(Client *c);
@@ -188,7 +211,8 @@ void zoom(const char *arg);
char stext[256], buf[256];
int screen, sx, sy, sw, sh;
int (*xerrorxlib)(Display *, XErrorEvent *);
-unsigned int bh, blw = 0;
+int bx, by, bw, bh, blw, bgw, mx, my, mw, mh, mox, moy, mow, moh, tx, ty, tw, th, wx, wy, ww, wh;
+double mfact;
unsigned int numlockmask = 0;
void (*handler[LASTEvent]) (XEvent *) = {
[ButtonPress] = buttonpress,
@@ -205,7 +229,6 @@ void (*handler[LASTEvent]) (XEvent *) = {
[UnmapNotify] = unmapnotify
};
Atom wmatom[WMLast], netatom[NetLast];
-Bool dozoom = True;
Bool otherwm, readin;
Bool running = True;
Bool *prevtags;
@@ -216,6 +239,7 @@ Client *stack = NULL;
Cursor cursor[CurLast];
Display *dpy;
DC dc = {0};
+Geom *geom = NULL;
Layout *lt = NULL;
Window root, barwin;
@@ -237,9 +261,9 @@ applyrules(Client *c) {
XGetClassHint(dpy, c->win, &ch);
for(i = 0; i < LENGTH(rules); i++) {
r = &rules[i];
- if(strstr(c->name, r->prop)
- || (ch.res_class && strstr(ch.res_class, r->prop))
- || (ch.res_name && strstr(ch.res_name, r->prop)))
+ if((r->title && strstr(c->name, r->title))
+ || (ch.res_class && r->class && strstr(ch.res_class, r->class))
+ || (ch.res_name && r->instance && strstr(ch.res_name, r->instance)))
{
c->isfloating = r->isfloating;
if(r->tag) {
@@ -289,7 +313,7 @@ void
ban(Client *c) {
if(c->isbanned)
return;
- XMoveWindow(dpy, c->win, c->x + 3 * sw, c->y);
+ XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
c->isbanned = True;
}
@@ -300,10 +324,14 @@ buttonpress(XEvent *e) {
XButtonPressedEvent *ev = &e->xbutton;
if(ev->window == barwin) {
- x = 0;
+ if((ev->x < bgw) && ev->button == Button1) {
+ setgeom(NULL);
+ return;
+ }
+ x = bgw;
for(i = 0; i < LENGTH(tags); i++) {
x += textw(tags[i]);
- if(ev->x < x) {
+ if(ev->x >= bgw && ev->x < x) {
if(ev->button == Button1) {
if(ev->state & MODKEY)
tag(tags[i]);
@@ -319,6 +347,8 @@ buttonpress(XEvent *e) {
return;
}
}
+ if((ev->x < x + blw) && ev->button == Button1)
+ setlayout(NULL);
}
else if((c = getclient(ev->window))) {
focus(c);
@@ -391,7 +421,7 @@ configure(Client *c) {
ce.y = c->y;
ce.width = c->w;
ce.height = c->h;
- ce.border_width = c->border;
+ ce.border_width = c->bw;
ce.above = None;
ce.override_redirect = False;
XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce);
@@ -404,10 +434,7 @@ configurenotify(XEvent *e) {
if(ev->window == root && (ev->width != sw || ev->height != sh)) {
sw = ev->width;
sh = ev->height;
- XFreePixmap(dpy, dc.drawable);
- dc.drawable = XCreatePixmap(dpy, root, BW, bh, DefaultDepth(dpy, screen));
- XMoveResizeWindow(dpy, barwin, BX, BY, BW, bh);
- arrange();
+ setgeom(geom->symbol);
}
}
@@ -419,8 +446,8 @@ configurerequest(XEvent *e) {
if((c = getclient(ev->window))) {
if(ev->value_mask & CWBorderWidth)
- c->border = ev->border_width;
- if(c->isfixed || c->isfloating || (floating == lt->arrange)) {
+ c->bw = ev->border_width;
+ if(c->isfixed || c->isfloating || lt->isfloating) {
if(ev->value_mask & CWX)
c->x = sx + ev->x;
if(ev->value_mask & CWY)
@@ -455,6 +482,15 @@ configurerequest(XEvent *e) {
XSync(dpy, False);
}
+unsigned int
+counttiled(void) {
+ unsigned int n;
+ Client *c;
+
+ for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next), n++);
+ return n;
+}
+
void
destroynotify(XEvent *e) {
Client *c;
@@ -489,6 +525,11 @@ drawbar(void) {
Client *c;
dc.x = 0;
+ if(bgw > 0) {
+ dc.w = bgw;
+ drawtext(geom->symbol, dc.norm, False);
+ dc.x += bgw;
+ }
for(c = stack; c && !isvisible(c); c = c->snext);
for(i = 0; i < LENGTH(tags); i++) {
dc.w = textw(tags[i]);
@@ -502,14 +543,18 @@ drawbar(void) {
}
dc.x += dc.w;
}
- dc.w = blw;
- drawtext(lt->symbol, dc.norm, False);
- x = dc.x + dc.w;
+ if(blw > 0) {
+ dc.w = blw;
+ drawtext(lt->symbol, dc.norm, False);
+ x = dc.x + dc.w;
+ }
+ else
+ x = dc.x;
dc.w = textw(stext);
- dc.x = BW - dc.w;
+ dc.x = bw - dc.w;
if(dc.x < x) {
dc.x = x;
- dc.w = BW - x;
+ dc.w = bw - x;
}
drawtext(stext, dc.norm, False);
if((dc.w = dc.x - x) > bh) {
@@ -521,7 +566,7 @@ drawbar(void) {
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, bw, bh, 0, 0);
XSync(dpy, False);
}
@@ -629,7 +674,6 @@ void
floating(void) { /* default floating layout */
Client *c;
- dozoom = False;
for(c = clients; c; c = c->next)
if(isvisible(c))
resize(c, c->x, c->y, c->w, c->h, True);
@@ -642,22 +686,11 @@ focus(Client *c) {
if(sel && sel != c) {
grabbuttons(sel, False);
XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
- if(lt->arrange == monocle)
- resize(sel, sel->rx, sel->ry, sel->rw, sel->rh, True);
}
if(c) {
detachstack(c);
attachstack(c);
grabbuttons(c, True);
- if(lt->arrange == monocle) {
- if(sel != c) {
- c->rx = c->x;
- c->ry = c->y;
- c->rw = c->w;
- c->rh = c->h;
- }
- resize(c, MOX, MOY, MOW, MOH, RESIZEHINTS);
- }
}
sel = c;
if(c) {
@@ -773,39 +806,20 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) {
void
grabbuttons(Client *c, Bool focused) {
- XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+ int i, j;
+ unsigned int buttons[] = { Button1, Button2, Button3 };
+ unsigned int modifiers[] = { MODKEY, MODKEY|LockMask, MODKEY|numlockmask,
+ MODKEY|numlockmask|LockMask} ;
- 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);
- }
+ XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+ if(focused)
+ for(i = 0; i < LENGTH(buttons); i++)
+ for(j = 0; j < LENGTH(modifiers); j++)
+ XGrabButton(dpy, buttons[i], modifiers[j], c->win, False,
+ BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
else
- XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK,
- GrabModeAsync, GrabModeSync, None, None);
+ XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
+ BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
}
void
@@ -841,7 +855,7 @@ unsigned int
idxoftag(const char *t) {
unsigned int i;
- for(i = 0; (i < LENGTH(tags)) && (tags[i] != t); i++);
+ for(i = 0; (i < LENGTH(tags)) && t && strcmp(tags[i], t); i++);
return (i < LENGTH(tags)) ? i : 0;
}
@@ -979,29 +993,30 @@ manage(Window w, XWindowAttributes *wa) {
c->tags = emallocz(TAGSZ);
c->win = w;
- c->x = c->rx = wa->x + sx;
- c->y = c->ry = wa->y + sy;
- c->w = c->rw = wa->width;
- c->h = c->rh = wa->height;
- c->oldborder = wa->border_width;
-
+ /* geometry */
+ c->x = wa->x;
+ c->y = wa->y;
+ c->w = wa->width;
+ c->h = wa->height;
+ c->oldbw = wa->border_width;
if(c->w == sw && c->h == sh) {
c->x = sx;
c->y = sy;
- c->border = wa->border_width;
+ c->bw = wa->border_width;
}
else {
- if(c->x + c->w + 2 * c->border > sx + sw)
- c->x = sx + sw - c->w - 2 * c->border;
- if(c->y + c->h + 2 * c->border > sy + sh)
- c->y = sy + sh - c->h - 2 * c->border;
- if(c->x < sx)
- c->x = sx;
- if(c->y < sy)
- c->y = sy;
- c->border = BORDERPX;
+ if(c->x + c->w + 2 * c->bw > wx + ww)
+ c->x = wx + ww - c->w - 2 * c->bw;
+ if(c->y + c->h + 2 * c->bw > wy + wh)
+ c->y = wy + wh - c->h - 2 * c->bw;
+ if(c->x < wx)
+ c->x = wx;
+ if(c->y < wy)
+ c->y = wy;
+ c->bw = BORDERPX;
}
- wc.border_width = c->border;
+
+ wc.border_width = c->bw;
XConfigureWindow(dpy, w, CWBorderWidth, &wc);
XSetWindowBorder(dpy, w, dc.norm[ColBorder]);
configure(c); /* propagates border_width, if size doesn't change */
@@ -1050,7 +1065,11 @@ maprequest(XEvent *e) {
void
monocle(void) {
- dozoom = False;
+ Client *c;
+
+ for(c = clients; c; c = c->next)
+ if(isvisible(c))
+ resize(c, mox, moy, mow - 2 * c->bw, moh - 2 * c->bw, RESIZEHINTS);
}
void
@@ -1081,17 +1100,17 @@ movemouse(Client *c) {
XSync(dpy, False);
nx = ocx + (ev.xmotion.x - x1);
ny = ocy + (ev.xmotion.y - y1);
- if(abs(sx - nx) < SNAP)
- nx = sx;
- else if(abs((sx + sw) - (nx + c->w + 2 * c->border)) < SNAP)
- nx = sx + sw - c->w - 2 * c->border;
- if(abs(sy - ny) < SNAP)
- ny = sy;
- else if(abs((sy + sh) - (ny + c->h + 2 * c->border)) < SNAP)
- ny = sy + sh - c->h - 2 * c->border;
- if(!c->isfloating && (lt->arrange != floating) && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
+ if(abs(wx - nx) < SNAP)
+ nx = wx;
+ else if(abs((wx + ww) - (nx + c->w + 2 * c->bw)) < SNAP)
+ nx = wx + ww - c->w - 2 * c->bw;
+ if(abs(wy - ny) < SNAP)
+ ny = wy;
+ else if(abs((wy + wh) - (ny + c->h + 2 * c->bw)) < SNAP)
+ ny = wy + wh - c->h - 2 * c->bw;
+ if(!c->isfloating && !lt->isfloating && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
togglefloating(NULL);
- if((lt->arrange == floating) || c->isfloating)
+ if((lt->isfloating) || c->isfloating)
resize(c, nx, ny, c->w, c->h, False);
break;
}
@@ -1159,9 +1178,9 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
if(sizehints) {
/* set minimum possible */
- if (w < 1)
+ if(w < 1)
w = 1;
- if (h < 1)
+ if(h < 1)
h = 1;
/* temporarily remove base dimensions */
@@ -1169,7 +1188,9 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
h -= c->baseh;
/* adjust for aspect limits */
- if (c->minay > 0 && c->maxay > 0 && c->minax > 0 && c->maxax > 0) {
+ 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)
@@ -1198,19 +1219,19 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
if(w <= 0 || h <= 0)
return;
if(x > sx + sw)
- x = sw - w - 2 * c->border;
+ x = sw - w - 2 * c->bw;
if(y > sy + sh)
- y = sh - h - 2 * c->border;
- if(x + w + 2 * c->border < sx)
+ y = sh - h - 2 * c->bw;
+ if(x + w + 2 * c->bw < sx)
x = sx;
- if(y + h + 2 * c->border < sy)
+ if(y + h + 2 * c->bw < 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;
+ wc.border_width = c->bw;
XConfigureWindow(dpy, c->win,
CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
configure(c);
@@ -1229,13 +1250,13 @@ resizemouse(Client *c) {
if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
None, cursor[CurResize], CurrentTime) != GrabSuccess)
return;
- XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->border - 1, c->h + c->border - 1);
+ XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
for(;;) {
XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask , &ev);
switch(ev.type) {
case ButtonRelease:
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0,
- c->w + c->border - 1, c->h + c->border - 1);
+ c->w + c->bw - 1, c->h + c->bw - 1);
XUngrabPointer(dpy, CurrentTime);
while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
return;
@@ -1246,13 +1267,13 @@ resizemouse(Client *c) {
break;
case MotionNotify:
XSync(dpy, False);
- if((nw = ev.xmotion.x - ocx - 2 * c->border + 1) <= 0)
+ if((nw = ev.xmotion.x - ocx - 2 * c->bw + 1) <= 0)
nw = 1;
- if((nh = ev.xmotion.y - ocy - 2 * c->border + 1) <= 0)
+ if((nh = ev.xmotion.y - ocy - 2 * c->bw + 1) <= 0)
nh = 1;
- if(!c->isfloating && (lt->arrange != floating) && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP))
+ if(!c->isfloating && !lt->isfloating && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP))
togglefloating(NULL);
- if((lt->arrange == floating) || c->isfloating)
+ if((lt->isfloating) || c->isfloating)
resize(c, c->x, c->y, nw, nh, True);
break;
}
@@ -1268,9 +1289,9 @@ restack(void) {
drawbar();
if(!sel)
return;
- if(sel->isfloating || (lt->arrange == floating))
+ if(sel->isfloating || lt->isfloating)
XRaiseWindow(dpy, sel->win);
- if(lt->arrange != floating) {
+ if(!lt->isfloating) {
wc.stack_mode = Below;
wc.sibling = barwin;
if(!sel->isfloating) {
@@ -1383,36 +1404,87 @@ setclientstate(Client *c, long state) {
PropModeReplace, (unsigned char *)data, 2);
}
+void
+setgeom(const char *arg) {
+ unsigned int i;
+
+ if(!arg) {
+ if(++geom == &geoms[LENGTH(geoms)])
+ geom = &geoms[0];
+ }
+ else {
+ for(i = 0; i < LENGTH(geoms); i++)
+ if(!strcmp(geoms[i].symbol, arg))
+ break;
+ if(i == LENGTH(geoms))
+ return;
+ geom = &geoms[i];
+ }
+ geom->apply();
+ updatebarpos();
+ arrange();
+}
+
void
setlayout(const char *arg) {
unsigned int i;
- if(!arg)
- return;
- for(i = 0; i < LENGTH(layouts); i++)
- if(!strcmp(arg, layouts[i].symbol))
- break;
- if(i == LENGTH(layouts))
- return;
- lt = &layouts[i];
+ if(!arg) {
+ if(++lt == &layouts[LENGTH(layouts)])
+ lt = &layouts[0];
+ }
+ else {
+ for(i = 0; i < LENGTH(layouts); i++)
+ if(!strcmp(arg, layouts[i].symbol))
+ break;
+ if(i == LENGTH(layouts))
+ return;
+ lt = &layouts[i];
+ }
if(sel)
arrange();
else
drawbar();
}
+void
+setmfact(const char *arg) {
+ double d;
+
+ if(lt->isfloating)
+ return;
+ if(!arg)
+ mfact = MFACT;
+ else {
+ d = strtod(arg, NULL);
+ if(arg[0] == '-' || arg[0] == '+')
+ d += mfact;
+ if(d < 0.1 || d > 0.9)
+ return;
+ mfact = d;
+ }
+ setgeom(geom->symbol);
+}
+
void
setup(void) {
- unsigned int i;
+ unsigned int i, w;
XSetWindowAttributes wa;
/* init screen */
screen = DefaultScreen(dpy);
root = RootWindow(dpy, screen);
+ initfont(FONT);
+
+ /* apply default geometry */
sx = 0;
sy = 0;
sw = DisplayWidth(dpy, screen);
sh = DisplayHeight(dpy, screen);
+ bh = dc.font.height + 2;
+ mfact = MFACT;
+ geom = &geoms[0];
+ geom->apply();
/* init atoms */
wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
@@ -1435,7 +1507,7 @@ setup(void) {
dc.sel[ColBG] = getcolor(SELBGCOLOR);
dc.sel[ColFG] = getcolor(SELFGCOLOR);
initfont(FONT);
- dc.h = bh = dc.font.height + 2;
+ dc.h = bh;
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);
@@ -1451,17 +1523,22 @@ setup(void) {
lt = &layouts[0];
/* init bar */
- for(blw = i = 0; i < LENGTH(layouts); i++) {
- i = textw(layouts[i].symbol);
- if(i > blw)
- blw = i;
+ for(blw = i = 0; LENGTH(layouts) > 1 && i < LENGTH(layouts); i++) {
+ w = textw(layouts[i].symbol);
+ if(w > blw)
+ blw = w;
+ }
+ for(bgw = i = 0; LENGTH(geoms) > 1 && i < LENGTH(geoms); i++) {
+ w = textw(geoms[i].symbol);
+ if(w > bgw)
+ bgw = w;
}
wa.override_redirect = 1;
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, bx, by, bw, bh, 0, DefaultDepth(dpy, screen),
CopyFromParent, DefaultVisual(dpy, screen),
CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
XDefineCursor(dpy, barwin, cursor[CurNormal]);
@@ -1537,46 +1614,75 @@ textw(const char *text) {
}
void
-tile(void) {
- unsigned int i, n, nx, ny, nw, nh, mw, th;
- Client *c, *mc;
+tileh(void) {
+ int x, w;
+ unsigned int i, n = counttiled();
+ Client *c;
- dozoom = True;
- nx = MX;
- ny = MY;
- nw = 0;
- for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
- n++;
+ if(n == 0)
+ return;
+ c = tilemaster(n);
+ if(--n == 0)
+ return;
- /* window geoms */
- mw = (n == 1) ? MOW : MW;
- th = (n > 1) ? TH / (n - 1) : 0;
- if(n > 1 && th < bh)
- th = TH;
+ x = tx;
+ w = tw / n;
+ if(w < bh)
+ w = tw;
- for(i = 0, c = mc = nexttiled(clients); c; c = nexttiled(c->next)) {
- if(i == 0) { /* master */
- nw = mw - 2 * c->border;
- nh = MH - 2 * c->border;
- }
- else { /* tile window */
- if(i == 1) {
- ny = TY;
- nx = TX;
- nw = TW - 2 * c->border;
- }
- if(i + 1 == n) /* remainder */
- nh = (TY + TH) - ny - 2 * c->border;
- else
- nh = th - 2 * c->border;
- }
- resize(c, nx, ny, nw, nh, RESIZEHINTS);
- if((RESIZEHINTS) && ((c->h < bh) || (c->h > nh) || (c->w < bh) || (c->w > nw)))
- /* client doesn't accept size constraints */
- resize(c, nx, ny, nw, nh, False);
- if(n > 1 && th != TH)
- ny = c->y + c->h + 2 * c->border;
- i++;
+ for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
+ if(i + 1 == n) /* remainder */
+ tileresize(c, x, ty, (tx + tw) - x - 2 * c->bw, th - 2 * c->bw);
+ else
+ tileresize(c, x, ty, w - 2 * c->bw, th - 2 * c->bw);
+ if(w != tw)
+ x = c->x + c->w + 2 * c->bw;
+ }
+}
+
+Client *
+tilemaster(unsigned int n) {
+ Client *c = nexttiled(clients);
+
+ if(n == 1)
+ tileresize(c, mox, moy, mow - 2 * c->bw, moh - 2 * c->bw);
+ else
+ tileresize(c, mx, my, mw - 2 * c->bw, mh - 2 * c->bw);
+ return c;
+}
+
+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
+tilev(void) {
+ int y, h;
+ unsigned int i, n = counttiled();
+ Client *c;
+
+ if(n == 0)
+ return;
+ c = tilemaster(n);
+ if(--n == 0)
+ return;
+
+ y = ty;
+ h = th / n;
+ if(h < bh)
+ h = th;
+
+ for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
+ if(i + 1 == n) /* remainder */
+ tileresize(c, tx, y, tw - 2 * c->bw, (ty + th) - y - 2 * c->bw);
+ else
+ tileresize(c, tx, y, tw - 2 * c->bw, h - 2 * c->bw);
+ if(h != th)
+ y = c->y + c->h + 2 * c->bw;
}
}
@@ -1628,7 +1734,7 @@ void
unmanage(Client *c) {
XWindowChanges wc;
- wc.border_width = c->oldborder;
+ wc.border_width = c->oldbw;
/* The server grab construct avoids race conditions. */
XGrabServer(dpy);
XSetErrorHandler(xerrordummy);
@@ -1656,6 +1762,15 @@ unmapnotify(XEvent *e) {
unmanage(c);
}
+void
+updatebarpos(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);
+}
+
void
updatesizehints(Client *c) {
long msize;
@@ -1788,7 +1903,7 @@ void
zoom(const char *arg) {
Client *c = sel;
- if(!sel || !dozoom || sel->isfloating)
+ if(!sel || lt->isfloating || sel->isfloating)
return;
if(c == nexttiled(clients))
if(!(c = nexttiled(c->next)))