X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/7ac4f8a4afd9766d485b03bff4c6cc02cbe3696c..3afca3e6a1457e93c9f7803dfcbc31f86b413095:/dwm.c
diff --git a/dwm.c b/dwm.c
index db3eaaf..364d65b 100644
--- a/dwm.c
+++ b/dwm.c
@@ -41,18 +41,19 @@
#include <X11/Xutil.h>
/* macros */
-#define MAX(a, b) ((a) > (b) ? (a) : (b))
-#define MIN(a, b) ((a) < (b) ? (a) : (b))
-#define BUTTONMASK (ButtonPressMask|ButtonReleaseMask)
-#define CLEANMASK(mask) (mask & ~(numlockmask|LockMask))
-#define LENGTH(x) (sizeof x / sizeof x[0])
-#define MAXTAGLEN 16
-#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#define BUTTONMASK (ButtonPressMask|ButtonReleaseMask)
+#define CLEANMASK(mask) (mask & ~(numlockmask|LockMask))
+#define LENGTH(x) (sizeof x / sizeof x[0])
+#define MAXTAGLEN 16
+#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
/* enums */
-enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
-enum { ColBorder, ColFG, ColBG, ColLast }; /* color */
-enum { NetSupported, NetWMName, NetLast }; /* EWMH atoms */
+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 */
@@ -60,7 +61,6 @@ typedef struct Client Client;
struct Client {
char name[256];
int x, y, w, h;
- int fx, fy, fw, fh;
int basew, baseh, incw, inch, maxw, maxh, minw, minh;
int minax, maxax, minay, maxay;
long flags;
@@ -98,7 +98,7 @@ typedef struct {
typedef struct {
const char *symbol;
void (*arrange)(void);
- Bool isfloating;
+ void (*updategeom)(void);
} Layout;
typedef struct {
@@ -121,7 +121,6 @@ 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);
@@ -147,38 +146,30 @@ void initfont(const char *fontstr);
Bool isoccupied(unsigned int t);
Bool isprotodel(Client *c);
Bool isurgent(unsigned int t);
-Bool isvisible(Client *c, Bool *cmp);
+Bool isvisible(Client *c);
void keypress(XEvent *e);
void killclient(const char *arg);
void manage(Window w, XWindowAttributes *wa);
void mappingnotify(XEvent *e);
void maprequest(XEvent *e);
-void monocle(void);
void movemouse(Client *c);
-Client *nexttiled(Client *c);
+Client *nextunfloating(Client *c);
void propertynotify(XEvent *e);
void quit(const char *arg);
-void reapply(const char *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 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 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 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);
@@ -190,7 +181,7 @@ void updatesizehints(Client *c);
void updatetitle(Client *c);
void updatewmhints(Client *c);
void view(const char *arg);
-void viewprevtag(const char *arg); /* views previous selected tags */
+void viewprevtag(const char *arg);
int xerror(Display *dpy, XErrorEvent *ee);
int xerrordummy(Display *dpy, XErrorEvent *ee);
int xerrorstart(Display *dpy, XErrorEvent *ee);
@@ -199,10 +190,9 @@ void zoom(const char *arg);
/* variables */
char stext[256];
int screen, sx, sy, sw, sh;
-int (*xerrorxlib)(Display *, XErrorEvent *);
-int bx, by, bw, bh, blw, mx, my, mw, mh, tx, ty, tw, th, wx, wy, ww, wh;
+int bx, by, bw, bh, blw, wx, wy, ww, wh;
int seltags = 0;
-double mfact;
+int (*xerrorxlib)(Display *, XErrorEvent *);
unsigned int numlockmask = 0;
void (*handler[LASTEvent]) (XEvent *) = {
[ButtonPress] = buttonpress,
@@ -272,10 +262,10 @@ arrange(void) {
Client *c;
for(c = clients; c; c = c->next)
- if(isvisible(c, NULL)) {
+ if(isvisible(c)) {
unban(c);
- if(lt->isfloating || c->isfloating)
- resize(c, c->fx, c->fy, c->fw, c->fh, True);
+ if(!lt->arrange || c->isfloating)
+ resize(c, c->x, c->y, c->w, c->h, True);
}
else
ban(c);
@@ -335,7 +325,7 @@ buttonpress(XEvent *e) {
}
}
if((ev->x < x + blw) && ev->button == Button1)
- setlayout(NULL);
+ togglelayout(NULL);
}
else if((c = getclient(ev->window))) {
focus(c);
@@ -346,10 +336,8 @@ buttonpress(XEvent *e) {
movemouse(c);
}
else if(ev->button == Button2) {
- if(!lt->isfloating && c->isfloating)
+ if(lt->arrange && c->isfloating)
togglefloating(NULL);
- else
- zoom(NULL);
}
else if(ev->button == Button3 && !c->isfixed) {
restack();
@@ -436,7 +424,7 @@ configurerequest(XEvent *e) {
if((c = getclient(ev->window))) {
if(ev->value_mask & CWBorderWidth)
c->bw = ev->border_width;
- if(c->isfixed || c->isfloating || lt->isfloating) {
+ if(c->isfixed || c->isfloating || !lt->arrange) {
if(ev->value_mask & CWX)
c->x = sx + ev->x;
if(ev->value_mask & CWY)
@@ -452,7 +440,7 @@ configurerequest(XEvent *e) {
if((ev->value_mask & (CWX|CWY))
&& !(ev->value_mask & (CWWidth|CWHeight)))
configure(c);
- if(isvisible(c, NULL))
+ if(isvisible(c))
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
}
else
@@ -471,15 +459,6 @@ 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;
@@ -504,7 +483,7 @@ void
detachstack(Client *c) {
Client **tc;
- for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
+ for(tc = &stack; *tc && *tc != c; tc = &(*tc)->snext);
*tc = c->snext;
}
@@ -514,7 +493,7 @@ drawbar(void) {
Client *c;
dc.x = 0;
- for(c = stack; c && !isvisible(c, NULL); c = c->snext);
+ for(c = stack; c && !isvisible(c); c = c->snext);
for(i = 0; i < LENGTH(tags); i++) {
dc.w = textw(tags[i]);
if(tagset[seltags][i]) {
@@ -595,7 +574,7 @@ drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
x = dc.x + (h / 2);
/* shorten text if necessary */
for(; len && (w = textnw(buf, len)) > dc.w - h; len--);
- if (!len)
+ if(!len)
return;
if(len < olen) {
if(len > 1)
@@ -654,8 +633,8 @@ expose(XEvent *e) {
void
focus(Client *c) {
- if(!c || (c && !isvisible(c, NULL)))
- for(c = stack; c && !isvisible(c, NULL); c = c->snext);
+ if(!c || (c && !isvisible(c)))
+ for(c = stack; c && !isvisible(c); c = c->snext);
if(sel && sel != c) {
grabbuttons(sel, False);
XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
@@ -689,9 +668,9 @@ focusnext(const char *arg) {
if(!sel)
return;
- for(c = sel->next; c && !isvisible(c, arg ? sel->tags : NULL); c = c->next);
+ for(c = sel->next; c && !isvisible(c); c = c->next);
if(!c)
- for(c = clients; c && !isvisible(c, arg ? sel->tags : NULL); c = c->next);
+ for(c = clients; c && !isvisible(c); c = c->next);
if(c) {
focus(c);
restack();
@@ -704,10 +683,10 @@ focusprev(const char *arg) {
if(!sel)
return;
- for(c = sel->prev; c && !isvisible(c, arg ? sel->tags : NULL); c = c->prev);
+ 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, arg ? sel->tags : NULL); c = c->prev);
+ for(; c && !isvisible(c); c = c->prev);
}
if(c) {
focus(c);
@@ -782,21 +761,21 @@ 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} ;
+ MODKEY|numlockmask|LockMask} ;
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);
+ BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
else
XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
- BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
+ BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
}
void
-grabkeys(void) {
+grabkeys(void) {
unsigned int i, j;
KeyCode code;
XModifierKeymap *modmap;
@@ -908,13 +887,11 @@ isurgent(unsigned int t) {
}
Bool
-isvisible(Client *c, Bool *cmp) {
+isvisible(Client *c) {
unsigned int i;
- if(!cmp)
- cmp = tagset[seltags];
for(i = 0; i < LENGTH(tags); i++)
- if(c->tags[i] && cmp[i])
+ if(c->tags[i] && tagset[seltags][i])
return True;
return False;
}
@@ -969,8 +946,8 @@ manage(Window w, XWindowAttributes *wa) {
/* geometry */
c->x = wa->x;
c->y = wa->y;
- c->w = c->fw = wa->width;
- c->h = c->fh = wa->height;
+ c->w = wa->width;
+ c->h = wa->height;
c->oldbw = wa->border_width;
if(c->w == sw && c->h == sh) {
c->x = sx;
@@ -984,10 +961,8 @@ manage(Window w, XWindowAttributes *wa) {
c->y = wy + wh - c->h - 2 * c->bw;
c->x = MAX(c->x, wx);
c->y = MAX(c->y, wy);
- c->bw = BORDERPX;
+ c->bw = borderpx;
}
- c->fx = c->x;
- c->fy = c->y;
wc.border_width = c->bw;
XConfigureWindow(dpy, w, CWBorderWidth, &wc);
@@ -1036,15 +1011,6 @@ maprequest(XEvent *e) {
manage(ev->window, &wa);
}
-void
-monocle(void) {
- Client *c;
-
- for(c = clients; c; c = c->next)
- if((lt->isfloating || !c->isfloating) && isvisible(c, NULL))
- resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw, RESIZEHINTS);
-}
-
void
movemouse(Client *c) {
int x1, y1, ocx, ocy, di, nx, ny;
@@ -1055,7 +1021,7 @@ movemouse(Client *c) {
ocx = nx = c->x;
ocy = ny = c->y;
if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
- None, cursor[CurMove], CurrentTime) != GrabSuccess)
+ None, cursor[CurMove], CurrentTime) != GrabSuccess)
return;
XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
for(;;) {
@@ -1073,29 +1039,26 @@ movemouse(Client *c) {
XSync(dpy, False);
nx = ocx + (ev.xmotion.x - x1);
ny = ocy + (ev.xmotion.y - y1);
- if(abs(wx - nx) < SNAP)
+ if(abs(wx - nx) < snap)
nx = wx;
- else if(abs((wx + ww) - (nx + c->w + 2 * c->bw)) < SNAP)
+ 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)
+ if(abs(wy - ny) < snap)
ny = wy;
- else if(abs((wy + wh) - (ny + c->h + 2 * c->bw)) < SNAP)
+ 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))
+ if(!c->isfloating && lt->arrange && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
togglefloating(NULL);
- if(lt->isfloating || c->isfloating) {
- c->fx = nx;
- c->fy = ny;
+ if(!lt->arrange || c->isfloating)
resize(c, nx, ny, c->w, c->h, False);
- }
break;
}
}
}
Client *
-nexttiled(Client *c) {
- for(; c && (c->isfloating || !isvisible(c, NULL)); c = c->next);
+nextunfloating(Client *c) {
+ for(; c && (c->isfloating || !isvisible(c)); c = c->next);
return c;
}
@@ -1136,17 +1099,6 @@ quit(const char *arg) {
readin = running = False;
}
-void
-reapply(const char *arg) {
- Client *c;
-
- for(c = clients; c; c = c->next) {
- memset(c->tags, 0, TAGSZ);
- applyrules(c);
- }
- arrange();
-}
-
void
resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
XWindowChanges wc;
@@ -1162,8 +1114,7 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
/* 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)
- {
+ && 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)
@@ -1221,7 +1172,7 @@ resizemouse(Client *c) {
ocx = c->x;
ocy = c->y;
if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
- None, cursor[CurResize], CurrentTime) != GrabSuccess)
+ None, cursor[CurResize], CurrentTime) != GrabSuccess)
return;
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
for(;;) {
@@ -1242,16 +1193,11 @@ resizemouse(Client *c) {
XSync(dpy, False);
nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
- if(!c->isfloating && !lt->isfloating && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP)) {
- c->fx = c->x;
- c->fy = c->y;
+ if(!c->isfloating && lt->arrange && (abs(nw - c->w) > snap || abs(nh - c->h) > snap)) {
togglefloating(NULL);
}
- if((lt->isfloating) || c->isfloating) {
+ if(!lt->arrange || c->isfloating)
resize(c, c->x, c->y, nw, nh, True);
- c->fw = nw;
- c->fh = nh;
- }
break;
}
}
@@ -1266,13 +1212,13 @@ restack(void) {
drawbar();
if(!sel)
return;
- if(sel->isfloating || lt->isfloating)
+ if(sel->isfloating || !lt->arrange)
XRaiseWindow(dpy, sel->win);
- if(!lt->isfloating) {
+ if(lt->arrange) {
wc.stack_mode = Below;
wc.sibling = barwin;
for(c = stack; c; c = c->snext)
- if(!c->isfloating && isvisible(c, NULL)) {
+ if(!c->isfloating && isvisible(c)) {
XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
wc.sibling = c->win;
}
@@ -1351,7 +1297,7 @@ scan(void) {
if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
for(i = 0; i < num; i++) {
if(!XGetWindowAttributes(dpy, wins[i], &wa)
- || wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
+ || wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
continue;
if(wa.map_state == IsViewable || getstate(wins[i]) == IconicState)
manage(wins[i], &wa);
@@ -1360,7 +1306,7 @@ scan(void) {
if(!XGetWindowAttributes(dpy, wins[i], &wa))
continue;
if(XGetTransientForHint(dpy, wins[i], &d1)
- && (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
+ && (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
manage(wins[i], &wa);
}
}
@@ -1376,48 +1322,6 @@ setclientstate(Client *c, long state) {
PropModeReplace, (unsigned char *)data, 2);
}
-void
-setlayout(const char *arg) {
- unsigned int 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;
- }
- updategeom();
- arrange();
-}
-
void
setup(void) {
unsigned int i, w;
@@ -1432,8 +1336,6 @@ setup(void) {
sw = DisplayWidth(dpy, screen);
sh = DisplayHeight(dpy, screen);
bh = dc.font.height + 2;
-
- /* update geometry */
updategeom();
/* init atoms */
@@ -1480,8 +1382,8 @@ setup(void) {
wa.event_mask = ButtonPressMask|ExposureMask;
barwin = XCreateWindow(dpy, root, bx, by, bw, bh, 0, DefaultDepth(dpy, screen),
- CopyFromParent, DefaultVisual(dpy, screen),
- CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
+ CopyFromParent, DefaultVisual(dpy, screen),
+ CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
XDefineCursor(dpy, barwin, cursor[CurNormal]);
XMapRaised(dpy, barwin);
strcpy(stext, "dwm-"VERSION);
@@ -1533,7 +1435,7 @@ tag(const char *arg) {
if(!sel)
return;
for(i = 0; i < LENGTH(tags); i++)
- sel->tags[i] = (NULL == arg);
+ sel->tags[i] = (arg == NULL);
sel->tags[idxoftag(arg)] = True;
arrange();
}
@@ -1555,76 +1457,11 @@ textw(const char *text) {
}
void
-tileh(void) {
- int x, w;
- unsigned int i, n = counttiled();
- Client *c;
-
- if(n == 0)
- return;
- c = tilemaster(n);
- if(--n == 0)
- return;
-
- x = tx;
- w = tw / n;
- if(w < bh)
- w = tw;
-
- 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, wx, wy, ww - 2 * c->bw, wh - 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;
- }
+togglebar(const char *arg) {
+ showbar = !showbar;
+ updategeom();
+ updatebar();
+ arrange();
}
void
@@ -1637,6 +1474,28 @@ togglefloating(const char *arg) {
arrange();
}
+void
+togglelayout(const char *arg) {
+ unsigned int 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
toggletag(const char *arg) {
unsigned int i, j;
@@ -1705,7 +1564,6 @@ unmapnotify(XEvent *e) {
void
updatebar(void) {
-
if(dc.drawable != 0)
XFreePixmap(dpy, dc.drawable);
dc.drawable = XCreatePixmap(dpy, root, bw, bh, DefaultDepth(dpy, screen));
@@ -1714,30 +1572,27 @@ updatebar(void) {
void
updategeom(void) {
+ unsigned int i;
- /* bar geometry */
+#ifdef CUSTOMGEOM /* define your own if you are Xinerama user */
+ CUSTOMGEOM
+#else
+ /* bar geometry*/
bx = 0;
- by = 0;
+ by = showbar ? (topbar ? 0 : sh - bh) : -bh;
bw = sw;
/* window area geometry */
wx = sx;
- wy = sy;
+ wy = showbar && topbar ? sy + bh : sy;
ww = sw;
- wh = sh - bh;
-
- /* master area geometry */
- mfact = MFACT;
- mx = wx;
- my = wy;
- mw = mfact * ww;
- mh = wh;
+ wh = showbar ? sh - bh : sh;
+#endif
- /* tile area geometry */
- tx = mx + mw;
- ty = wy;
- tw = ww - mw;
- th = wh;
+ /* update layout geometries */
+ for(i = 0; i < LENGTH(layouts); i++)
+ if(layouts[i].updategeom)
+ layouts[i].updategeom();
}
void
@@ -1813,7 +1668,7 @@ updatewmhints(Client *c) {
void
view(const char *arg) {
- seltags ^= 1;
+ seltags ^= 1; /* toggle sel tagset */
memset(tagset[seltags], (NULL == arg), TAGSZ);
tagset[seltags][idxoftag(arg)] = True;
arrange();
@@ -1841,7 +1696,7 @@ xerror(Display *dpy, XErrorEvent *ee) {
|| (ee->request_code == X_CopyArea && ee->error_code == BadDrawable))
return 0;
fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",
- ee->request_code, ee->error_code);
+ ee->request_code, ee->error_code);
return xerrorxlib(dpy, ee); /* may call exit */
}
@@ -1858,21 +1713,6 @@ xerrorstart(Display *dpy, XErrorEvent *ee) {
return -1;
}
-void
-zoom(const char *arg) {
- Client *c = sel;
-
- if(c == nexttiled(clients))
- if(!c || !(c = nexttiled(c->next)))
- return;
- if(!lt->isfloating && !sel->isfloating) {
- detach(c);
- attach(c);
- focus(c);
- }
- arrange();
-}
-
int
main(int argc, char *argv[]) {
if(argc == 2 && !strcmp("-v", argv[1]))