X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/86c4797f2cd1e0d7fdbb4ebe83066762062e4217..71365a524f67235024de7db277c63f8ac4f46569:/dwm.c?ds=sidebyside
diff --git a/dwm.c b/dwm.c
index 760ba27..504b78b 100644
--- a/dwm.c
+++ b/dwm.c
@@ -41,26 +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 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); \
-}
+#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 */
@@ -68,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;
@@ -96,11 +88,6 @@ typedef struct {
} font;
} DC; /* draw context */
-typedef struct {
- const char *symbol;
- void (*apply)(void);
-} Geom;
-
typedef struct {
unsigned long mod;
KeySym keysym;
@@ -111,8 +98,8 @@ typedef struct {
typedef struct {
const char *symbol;
void (*arrange)(void);
- Bool isfloating;
-} Layout;
+ void (*updategeom)(void);
+} Layout;
typedef struct {
const char *class;
@@ -134,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);
@@ -166,44 +152,36 @@ 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 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 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);
void unmanage(Client *c);
void unmapnotify(XEvent *e);
-void updatebarpos(void);
+void updatebar(void);
+void updategeom(void);
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);
@@ -212,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, bgw, mx, my, mw, mh, mox, moy, mow, moh, 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,
@@ -241,13 +218,13 @@ Client *stack = NULL;
Cursor cursor[CurLast];
Display *dpy;
DC dc = {0};
+Layout layouts[];
+Layout *lt = layouts;
Window root, barwin;
/* configuration, allows nested code to access above variables */
#include "config.h"
#define TAGSZ (LENGTH(tags) * sizeof(Bool))
-Layout *lt = layouts;
-Geom *geom = geoms;
/* function implementations */
@@ -287,8 +264,8 @@ arrange(void) {
for(c = clients; c; c = c->next)
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);
@@ -328,14 +305,10 @@ buttonpress(XEvent *e) {
XButtonPressedEvent *ev = &e->xbutton;
if(ev->window == barwin) {
- if((ev->x < bgw) && ev->button == Button1) {
- setgeom(NULL);
- return;
- }
- x = bgw;
+ x = 0;
for(i = 0; i < LENGTH(tags); i++) {
x += textw(tags[i]);
- if(ev->x >= bgw && ev->x < x) {
+ if(ev->x < x) {
if(ev->button == Button1) {
if(ev->state & MODKEY)
tag(tags[i]);
@@ -352,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);
@@ -363,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();
@@ -438,7 +409,9 @@ configurenotify(XEvent *e) {
if(ev->window == root && (ev->width != sw || ev->height != sh)) {
sw = ev->width;
sh = ev->height;
- setgeom(geom->symbol);
+ updategeom();
+ updatebar();
+ arrange();
}
}
@@ -451,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)
@@ -486,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;
@@ -519,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;
}
@@ -529,11 +493,6 @@ 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]);
@@ -615,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)
@@ -802,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;
@@ -987,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;
@@ -1002,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);
@@ -1054,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))
- resize(c, mox, moy, mow - 2 * c->bw, moh - 2 * c->bw, RESIZEHINTS);
-}
-
void
movemouse(Client *c) {
int x1, y1, ocx, ocy, di, nx, ny;
@@ -1073,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(;;) {
@@ -1091,28 +1039,28 @@ movemouse(Client *c) {
XSync(dpy, False);
nx = ocx + (ev.xmotion.x - x1);
ny = ocy + (ev.xmotion.y - y1);
- 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->isfloating || c->isfloating) {
- c->fx = nx;
- c->fy = ny;
- resize(c, nx, ny, c->w, c->h, False);
+ if(snap && nx >= wx && nx <= wx + ww
+ && ny >= wy && ny <= wy + wh) {
+ 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->arrange && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
+ togglefloating(NULL);
}
+ if(!lt->arrange || c->isfloating)
+ resize(c, nx, ny, c->w, c->h, False);
break;
}
}
}
Client *
-nexttiled(Client *c) {
+nextunfloating(Client *c) {
for(; c && (c->isfloating || !isvisible(c)); c = c->next);
return c;
}
@@ -1154,17 +1102,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;
@@ -1180,8 +1117,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)
@@ -1239,7 +1175,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(;;) {
@@ -1260,16 +1196,15 @@ 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;
- togglefloating(NULL);
+
+ if(snap && nw >= wx && nw <= wx + ww
+ && nh >= wy && nh <= wy + wh) {
+ 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;
}
}
@@ -1284,9 +1219,9 @@ 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)
@@ -1369,7 +1304,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);
@@ -1378,7 +1313,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);
}
}
@@ -1394,68 +1329,6 @@ 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) {
- 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, w;
@@ -1465,15 +1338,12 @@ setup(void) {
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->apply();
+ updategeom();
/* init atoms */
wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
@@ -1513,18 +1383,14 @@ setup(void) {
w = textw(layouts[i].symbol);
blw = MAX(blw, w);
}
- for(bgw = i = 0; LENGTH(geoms) > 1 && i < LENGTH(geoms); i++) {
- w = textw(geoms[i].symbol);
- bgw = MAX(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),
- 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);
@@ -1576,7 +1442,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();
}
@@ -1598,76 +1464,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, 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;
- }
+togglebar(const char *arg) {
+ showbar = !showbar;
+ updategeom();
+ updatebar();
+ arrange();
}
void
@@ -1680,6 +1481,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;
@@ -1747,14 +1570,38 @@ unmapnotify(XEvent *e) {
}
void
-updatebarpos(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);
}
+void
+updategeom(void) {
+ unsigned int i;
+
+#ifdef CUSTOMGEOM /* define your own if you are Xinerama user */
+ CUSTOMGEOM
+#else
+ /* bar geometry*/
+ bx = 0;
+ by = showbar ? (topbar ? 0 : sh - bh) : -bh;
+ bw = sw;
+
+ /* window area geometry */
+ wx = sx;
+ wy = showbar && topbar ? sy + bh : sy;
+ ww = sw;
+ wh = showbar ? sh - bh : sh;
+#endif
+
+ /* update layout geometries */
+ for(i = 0; i < LENGTH(layouts); i++)
+ if(layouts[i].updategeom)
+ layouts[i].updategeom();
+}
+
void
updatesizehints(Client *c) {
long msize;
@@ -1828,7 +1675,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();
@@ -1856,7 +1703,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 */
}
@@ -1873,21 +1720,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]))
@@ -1908,4 +1740,3 @@ main(int argc, char *argv[]) {
XCloseDisplay(dpy);
return 0;
}
-