X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/fe6b0c0fc17d70e1c0f002e397bd2d3ac152ede0..5fa559dbfc6238a911c210ae4124586c6886df23:/dwm.c?ds=sidebyside
diff --git a/dwm.c b/dwm.c
index 6b46911..c174994 100644
--- a/dwm.c
+++ b/dwm.c
@@ -69,7 +69,7 @@ struct Client {
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;
@@ -178,6 +178,7 @@ 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);
@@ -211,6 +212,7 @@ char stext[256], buf[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;
+double mfact;
unsigned int numlockmask = 0;
void (*handler[LASTEvent]) (XEvent *) = {
[ButtonPress] = buttonpress,
@@ -237,14 +239,14 @@ Client *stack = NULL;
Cursor cursor[CurLast];
Display *dpy;
DC dc = {0};
-Geom *geom = NULL;
-Layout *lt = NULL;
Window root, barwin;
/* configuration, allows nested code to access above variables */
#include "config.h"
#define TAGSZ (LENGTH(tags) * sizeof(Bool))
-static Bool tmp[LENGTH(tags)];
+Bool tmp[LENGTH(tags)];
+Layout *lt = layouts;
+Geom *geom = geoms;
/* function implementations */
@@ -259,10 +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->title)
- || (ch.res_class && r->class && strstr(ch.res_class, r->class))
- || (ch.res_name && r->instance && strstr(ch.res_name, r->instance)))
- {
+ if((!r->title || strstr(c->name, r->title))
+ && (!r->class || (ch.res_class && strstr(ch.res_class, r->class)))
+ && (!r->instance || (ch.res_name && strstr(ch.res_name, r->instance)))) {
c->isfloating = r->isfloating;
if(r->tag) {
c->tags[idxoftag(r->tag)] = True;
@@ -322,10 +323,14 @@ buttonpress(XEvent *e) {
XButtonPressedEvent *ev = &e->xbutton;
if(ev->window == barwin) {
+ 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 > bgw && ev->x < x) {
+ if(ev->x >= bgw && ev->x < x) {
if(ev->button == Button1) {
if(ev->state & MODKEY)
tag(tags[i]);
@@ -341,6 +346,8 @@ buttonpress(XEvent *e) {
return;
}
}
+ if((ev->x < x + blw) && ev->button == Button1)
+ setlayout(NULL);
}
else if((c = getclient(ev->window))) {
focus(c);
@@ -413,7 +420,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);
@@ -423,8 +430,11 @@ void
configurenotify(XEvent *e) {
XConfigureEvent *ev = &e->xconfigure;
- if(ev->window == root && (ev->width != sw || ev->height != sh))
- setgeom(NULL);
+ if(ev->window == root && (ev->width != sw || ev->height != sh)) {
+ sw = ev->width;
+ sh = ev->height;
+ setgeom(geom->symbol);
+ }
}
void
@@ -435,7 +445,7 @@ configurerequest(XEvent *e) {
if((c = getclient(ev->window))) {
if(ev->value_mask & CWBorderWidth)
- c->border = ev->border_width;
+ c->bw = ev->border_width;
if(c->isfixed || c->isfloating || lt->isfloating) {
if(ev->value_mask & CWX)
c->x = sx + ev->x;
@@ -514,9 +524,11 @@ drawbar(void) {
Client *c;
dc.x = 0;
- dc.w = bgw;
- drawtext(geom->symbol, dc.norm, False);
- dc.x += bgw;
+ 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]);
@@ -530,9 +542,13 @@ 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;
if(dc.x < x) {
@@ -789,39 +805,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
@@ -857,7 +854,7 @@ unsigned int
idxoftag(const char *t) {
unsigned int i;
- for(i = 0; (i < LENGTH(tags)) && strcmp(tags[i], t); i++);
+ for(i = 0; (i < LENGTH(tags)) && t && strcmp(tags[i], t); i++);
return (i < LENGTH(tags)) ? i : 0;
}
@@ -1000,25 +997,25 @@ manage(Window w, XWindowAttributes *wa) {
c->y = wa->y;
c->w = wa->width;
c->h = wa->height;
- c->oldborder = wa->border_width;
+ 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 > wx + ww)
- c->x = wx + ww - c->w - 2 * c->border;
- if(c->y + c->h + 2 * c->border > wy + wh)
- c->y = wy + wh - c->h - 2 * c->border;
+ 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->border = BORDERPX;
+ 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 */
@@ -1070,8 +1067,8 @@ monocle(void) {
Client *c;
for(c = clients; c; c = c->next)
- if(isvisible(c))
- resize(c, mox, moy, mow, moh, RESIZEHINTS);
+ if((lt->isfloating || !c->isfloating) && isvisible(c))
+ resize(c, mox, moy, mow - 2 * c->bw, moh - 2 * c->bw, RESIZEHINTS);
}
void
@@ -1104,12 +1101,12 @@ movemouse(Client *c) {
ny = ocy + (ev.xmotion.y - y1);
if(abs(wx - nx) < SNAP)
nx = wx;
- else if(abs((wx + ww) - (nx + c->w + 2 * c->border)) < SNAP)
- nx = wx + ww - c->w - 2 * c->border;
+ 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->border)) < SNAP)
- ny = wy + wh - c->h - 2 * c->border;
+ 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)
@@ -1180,9 +1177,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 */
@@ -1190,10 +1187,12 @@ 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 (w * c->maxay > h * c->maxax)
+ 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)
+ else if(w * c->minay < h * c->minax)
h = w * c->minay / c->minax;
}
@@ -1219,19 +1218,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);
@@ -1250,13 +1249,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;
@@ -1267,9 +1266,9 @@ 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->isfloating && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP))
togglefloating(NULL);
@@ -1408,12 +1407,18 @@ void
setgeom(const char *arg) {
unsigned int i;
- for(i = 0; arg && i < LENGTH(geoms); i++)
- if(!strcmp(geoms[i].symbol, arg))
- break;
- if(i == LENGTH(geoms))
- return;
- geom = &geoms[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();
@@ -1421,20 +1426,18 @@ setgeom(const char *arg) {
void
setlayout(const char *arg) {
- static Layout *revert = 0;
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;
- if(revert && &layouts[i] == lt)
- lt = revert;
+ if(!arg) {
+ if(++lt == &layouts[LENGTH(layouts)])
+ lt = &layouts[0];
+ }
else {
- revert = lt;
+ for(i = 0; i < LENGTH(layouts); i++)
+ if(!strcmp(arg, layouts[i].symbol))
+ break;
+ if(i == LENGTH(layouts))
+ return;
lt = &layouts[i];
}
if(sel)
@@ -1443,9 +1446,28 @@ setlayout(const char *arg) {
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 */
@@ -1459,7 +1481,7 @@ setup(void) {
sw = DisplayWidth(dpy, screen);
sh = DisplayHeight(dpy, screen);
bh = dc.font.height + 2;
- geom = &geoms[0];
+ mfact = MFACT;
geom->apply();
/* init atoms */
@@ -1495,19 +1517,16 @@ setup(void) {
prevtags = emallocz(TAGSZ);
seltags[0] = prevtags[0] = True;
- /* init layouts */
- 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; i < LENGTH(geoms); i++) {
- i = textw(geoms[i].symbol);
- if(i > bgw)
- bgw = i;
+ 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;
@@ -1608,11 +1627,11 @@ tileh(void) {
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->border, th - 2 * c->border);
+ tileresize(c, x, ty, (tx + tw) - x - 2 * c->bw, th - 2 * c->bw);
else
- tileresize(c, x, ty, w - 2 * c->border, th - 2 * c->border);
+ tileresize(c, x, ty, w - 2 * c->bw, th - 2 * c->bw);
if(w != tw)
- x = c->x + c->w + 2 * c->border;
+ x = c->x + c->w + 2 * c->bw;
}
}
@@ -1621,9 +1640,9 @@ tilemaster(unsigned int n) {
Client *c = nexttiled(clients);
if(n == 1)
- tileresize(c, mox, moy, mow - 2 * c->border, moh - 2 * c->border);
+ tileresize(c, mox, moy, mow - 2 * c->bw, moh - 2 * c->bw);
else
- tileresize(c, mx, my, mw - 2 * c->border, mh - 2 * c->border);
+ tileresize(c, mx, my, mw - 2 * c->bw, mh - 2 * c->bw);
return c;
}
@@ -1654,11 +1673,11 @@ tilev(void) {
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->border, (ty + th) - y - 2 * c->border);
+ tileresize(c, tx, y, tw - 2 * c->bw, (ty + th) - y - 2 * c->bw);
else
- tileresize(c, tx, y, tw - 2 * c->border, h - 2 * c->border);
+ tileresize(c, tx, y, tw - 2 * c->bw, h - 2 * c->bw);
if(h != th)
- y = c->y + c->h + 2 * c->border;
+ y = c->y + c->h + 2 * c->bw;
}
}
@@ -1710,7 +1729,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);
@@ -1910,3 +1929,4 @@ main(int argc, char *argv[]) {
XCloseDisplay(dpy);
return 0;
}
+