X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/eeea4ef583a2ca3746e987bd2ecd570fd1869c2d..d0e0505301d356a63dc31ba6ed4a8509ef8f055f:/dwm.c?ds=sidebyside
diff --git a/dwm.c b/dwm.c
index 9e9e748..e87caab 100644
--- a/dwm.c
+++ b/dwm.c
@@ -17,9 +17,7 @@
* 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. For each client dwm
- * creates a small title window, which is resized whenever the (_NET_)WM_NAME
- * properties are updated or the client is moved/resized.
+ * global tags array to indicate the tags of a client.
*
* Keys and tagging rules are organized as arrays and defined in config.h.
*
@@ -46,17 +44,35 @@
/* macros */
#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 { BarTop, BarBot, BarOff }; /* bar position */
enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
enum { ColBorder, ColFG, ColBG, ColLast }; /* color */
-enum { NetSupported, NetWMName, NetLast }; /* EWMH atoms */
+enum { NetSupported, NetWMCheck, NetWMName, NetLast }; /* EWMH atoms */
enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */
/* typedefs */
typedef struct Client Client;
+struct Client {
+ char name[256];
+ int x, y, w, h;
+ int rx, ry, rw, rh; /* revert geometry */
+ int basew, baseh, incw, inch, maxw, maxh, minw, minh;
+ int minax, maxax, minay, maxay;
+ long flags;
+ unsigned int border, oldborder;
+ Bool isbanned, isfixed, ismax, isfloating, wasfloating;
+ Bool *tags;
+ Client *next;
+ Client *prev;
+ Client *snext;
+ Window win;
+};
typedef struct {
int x, y, w, h;
@@ -96,7 +112,7 @@ typedef struct {
regex_t *tagregex;
} Regs;
-/* forward declarations */
+/* function declarations */
void applyrules(Client *c);
void arrange(void);
void attach(Client *c);
@@ -128,9 +144,9 @@ 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);
unsigned int idxoftag(const char *tag);
void initfont(const char *fontstr);
-Bool isarrange(void (*func)());
Bool isoccupied(unsigned int t);
Bool isprotodel(Client *c);
Bool isvisible(Client *c);
@@ -170,6 +186,7 @@ void updatebarpos(void);
void updatesizehints(Client *c);
void updatetitle(Client *c);
void view(const char *arg);
+void viewprevtag(const char *arg); /* views previous selected tags */
int xerror(Display *dpy, XErrorEvent *ee);
int xerrordummy(Display *dsply, XErrorEvent *ee);
int xerrorstart(Display *dsply, XErrorEvent *ee);
@@ -182,9 +199,6 @@ int screen, sx, sy, sw, sh, wax, way, waw, wah;
int (*xerrorxlib)(Display *, XErrorEvent *);
unsigned int bh, bpos;
unsigned int blw = 0;
-unsigned int ltidx = 0; /* default */
-unsigned int nlayouts = 0;
-unsigned int nrules = 0;
unsigned int numlockmask = 0;
void (*handler[LASTEvent]) (XEvent *) = {
[ButtonPress] = buttonpress,
@@ -201,6 +215,8 @@ void (*handler[LASTEvent]) (XEvent *) = {
[UnmapNotify] = unmapnotify
};
Atom wmatom[WMLast], netatom[NetLast];
+Bool domwfact = True;
+Bool dozoom = True;
Bool otherwm, readin;
Bool running = True;
Bool selscreen = True;
@@ -210,33 +226,16 @@ Client *stack = NULL;
Cursor cursor[CurLast];
Display *dpy;
DC dc = {0};
+Layout *layout = NULL;
Window barwin, root;
Regs *regs = NULL;
/* configuration, allows nested code to access above variables */
#include "config.h"
-/* Statically define the number of tags. */
-unsigned int ntags = sizeof tags / sizeof tags[0];
-Bool seltags[sizeof tags / sizeof tags[0]] = {[0] = True};
+Bool prevtags[LENGTH(tags)];
-struct Client {
- char name[256];
- int x, y, w, h;
- int rx, ry, rw, rh; /* revert geometry */
- int basew, baseh, incw, inch, maxw, maxh, minw, minh;
- int minax, maxax, minay, maxay;
- long flags;
- unsigned int border, oldborder;
- Bool isbanned, isfixed, ismax, isfloating, wasfloating;
- Bool tags[sizeof tags / sizeof tags[0]];
- Client *next;
- Client *prev;
- Client *snext;
- Window win;
-};
-
-/* functions*/
+/* function implementations */
void
applyrules(Client *c) {
static char buf[512];
@@ -250,10 +249,10 @@ applyrules(Client *c) {
snprintf(buf, sizeof buf, "%s:%s:%s",
ch.res_class ? ch.res_class : "",
ch.res_name ? ch.res_name : "", c->name);
- for(i = 0; i < nrules; i++)
+ for(i = 0; i < LENGTH(rules); i++)
if(regs[i].propregex && !regexec(regs[i].propregex, buf, 1, &tmp, 0)) {
c->isfloating = rules[i].isfloating;
- for(j = 0; regs[i].tagregex && j < ntags; j++) {
+ for(j = 0; regs[i].tagregex && j < LENGTH(tags); j++) {
if(!regexec(regs[i].tagregex, tags[j], 1, &tmp, 0)) {
matched = True;
c->tags[j] = True;
@@ -265,8 +264,7 @@ applyrules(Client *c) {
if(ch.res_name)
XFree(ch.res_name);
if(!matched)
- for(i = 0; i < ntags; i++)
- c->tags[i] = seltags[i];
+ memcpy(c->tags, seltags, sizeof seltags);
}
void
@@ -278,7 +276,7 @@ arrange(void) {
unban(c);
else
ban(c);
- layouts[ltidx].arrange();
+ layout->arrange();
focus(NULL);
restack();
}
@@ -311,9 +309,9 @@ buttonpress(XEvent *e) {
Client *c;
XButtonPressedEvent *ev = &e->xbutton;
- if(barwin == ev->window) {
+ if(ev->window == barwin) {
x = 0;
- for(i = 0; i < ntags; i++) {
+ for(i = 0; i < LENGTH(tags); i++) {
x += textw(tags[i]);
if(ev->x < x) {
if(ev->button == Button1) {
@@ -339,20 +337,20 @@ buttonpress(XEvent *e) {
if(CLEANMASK(ev->state) != MODKEY)
return;
if(ev->button == Button1) {
- if(isarrange(floating) || c->isfloating)
+ if((layout->arrange == floating) || c->isfloating)
restack();
else
togglefloating(NULL);
movemouse(c);
}
else if(ev->button == Button2) {
- if(ISTILE && !c->isfixed && c->isfloating)
+ if((floating != layout->arrange) && c->isfloating)
togglefloating(NULL);
else
zoom(NULL);
}
else if(ev->button == Button3 && !c->isfixed) {
- if(isarrange(floating) || c->isfloating)
+ if((floating == layout->arrange) || c->isfloating)
restack();
else
togglefloating(NULL);
@@ -406,9 +404,8 @@ compileregs(void) {
if(regs)
return;
- nrules = sizeof rules / sizeof rules[0];
- regs = emallocz(nrules * sizeof(Regs));
- for(i = 0; i < nrules; i++) {
+ regs = emallocz(LENGTH(rules) * sizeof(Regs));
+ for(i = 0; i < LENGTH(rules); i++) {
if(rules[i].prop) {
reg = emallocz(sizeof(regex_t));
if(regcomp(reg, rules[i].prop, REG_EXTENDED))
@@ -469,7 +466,7 @@ configurerequest(XEvent *e) {
c->ismax = False;
if(ev->value_mask & CWBorderWidth)
c->border = ev->border_width;
- if(c->isfixed || c->isfloating || isarrange(floating)) {
+ if(c->isfixed || c->isfloating || (floating == layout->arrange)) {
if(ev->value_mask & CWX)
c->x = ev->x;
if(ev->value_mask & CWY)
@@ -537,7 +534,7 @@ drawbar(void) {
int i, x;
dc.x = dc.y = 0;
- for(i = 0; i < ntags; i++) {
+ for(i = 0; i < LENGTH(tags); i++) {
dc.w = textw(tags[i]);
if(seltags[i]) {
drawtext(tags[i], dc.sel);
@@ -550,7 +547,7 @@ drawbar(void) {
dc.x += dc.w;
}
dc.w = blw;
- drawtext(layouts[ltidx].symbol, dc.norm);
+ drawtext(layout->symbol, dc.norm);
x = dc.x + dc.w;
dc.w = textw(stext);
dc.x = sw - dc.w;
@@ -672,7 +669,7 @@ expose(XEvent *e) {
XExposeEvent *ev = &e->xexpose;
if(ev->count == 0) {
- if(barwin == ev->window)
+ if(ev->window == barwin)
drawbar();
}
}
@@ -681,6 +678,7 @@ void
floating(void) { /* default floating layout */
Client *c;
+ domwfact = dozoom = False;
for(c = clients; c; c = c->next)
if(isvisible(c))
resize(c, c->x, c->y, c->w, c->h, True);
@@ -795,8 +793,7 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) {
strncpy(text, (char *)name.value, size - 1);
else {
if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
- && n > 0 && *list)
- {
+ && n > 0 && *list) {
strncpy(text, *list, size - 1);
XFreeStringList(list);
}
@@ -843,14 +840,31 @@ grabbuttons(Client *c, Bool focused) {
GrabModeAsync, GrabModeSync, None, None);
}
+void
+grabkeys(void) {
+ unsigned int i;
+ KeyCode code;
+
+ XUngrabKey(dpy, AnyKey, AnyModifier, root);
+ for(i = 0; i < LENGTH(keys); i++) {
+ code = XKeysymToKeycode(dpy, keys[i].keysym);
+ XGrabKey(dpy, code, keys[i].mod, root, True,
+ GrabModeAsync, GrabModeAsync);
+ XGrabKey(dpy, code, keys[i].mod | LockMask, root, True,
+ GrabModeAsync, GrabModeAsync);
+ XGrabKey(dpy, code, keys[i].mod | numlockmask, root, True,
+ GrabModeAsync, GrabModeAsync);
+ XGrabKey(dpy, code, keys[i].mod | numlockmask | LockMask, root, True,
+ GrabModeAsync, GrabModeAsync);
+ }
+}
+
unsigned int
idxoftag(const char *tag) {
unsigned int i;
- for(i = 0; i < ntags; i++)
- if(tags[i] == tag)
- return i;
- return 0;
+ for(i = 0; (i < LENGTH(tags)) && (tags[i] != tag); i++);
+ return (i < LENGTH(tags)) ? i : 0;
}
void
@@ -895,12 +909,6 @@ initfont(const char *fontstr) {
dc.font.height = dc.font.ascent + dc.font.descent;
}
-Bool
-isarrange(void (*func)())
-{
- return func == layouts[ltidx].arrange;
-}
-
Bool
isoccupied(unsigned int t) {
Client *c;
@@ -930,7 +938,7 @@ Bool
isvisible(Client *c) {
unsigned int i;
- for(i = 0; i < ntags; i++)
+ for(i = 0; i < LENGTH(tags); i++)
if(c->tags[i] && seltags[i])
return True;
return False;
@@ -938,31 +946,13 @@ isvisible(Client *c) {
void
keypress(XEvent *e) {
- KEYS
- unsigned int len = sizeof keys / sizeof keys[0];
unsigned int i;
- KeyCode code;
KeySym keysym;
XKeyEvent *ev;
- if(!e) { /* grabkeys */
- XUngrabKey(dpy, AnyKey, AnyModifier, root);
- for(i = 0; i < len; i++) {
- code = XKeysymToKeycode(dpy, keys[i].keysym);
- XGrabKey(dpy, code, keys[i].mod, root, True,
- GrabModeAsync, GrabModeAsync);
- XGrabKey(dpy, code, keys[i].mod | LockMask, root, True,
- GrabModeAsync, GrabModeAsync);
- XGrabKey(dpy, code, keys[i].mod | numlockmask, root, True,
- GrabModeAsync, GrabModeAsync);
- XGrabKey(dpy, code, keys[i].mod | numlockmask | LockMask, root, True,
- GrabModeAsync, GrabModeAsync);
- }
- return;
- }
ev = &e->xkey;
keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
- for(i = 0; i < len; i++)
+ for(i = 0; i < LENGTH(keys); i++)
if(keysym == keys[i].keysym
&& CLEANMASK(keys[i].mod) == CLEANMASK(ev->state))
{
@@ -1002,13 +992,13 @@ leavenotify(XEvent *e) {
void
manage(Window w, XWindowAttributes *wa) {
- unsigned int i;
Client *c, *t = NULL;
Window trans;
Status rettrans;
XWindowChanges wc;
c = emallocz(sizeof(Client));
+ c->tags = emallocz(sizeof seltags);
c->win = w;
c->x = wa->x;
c->y = wa->y;
@@ -1043,8 +1033,7 @@ manage(Window w, XWindowAttributes *wa) {
if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
for(t = clients; t && t->win != trans; t = t->next);
if(t)
- for(i = 0; i < ntags; i++)
- c->tags[i] = t->tags[i];
+ memcpy(c->tags, t->tags, sizeof seltags);
applyrules(c);
if(!c->isfloating)
c->isfloating = (rettrans == Success) || c->isfixed;
@@ -1063,7 +1052,7 @@ mappingnotify(XEvent *e) {
XRefreshKeyboardMapping(ev);
if(ev->request == MappingKeyboard)
- keypress(NULL);
+ grabkeys();
}
void
@@ -1161,45 +1150,48 @@ quit(const char *arg) {
readin = running = False;
}
+
void
resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
- double dx, dy, max, min, ratio;
XWindowChanges wc;
if(sizehints) {
- if(c->minay > 0 && c->maxay > 0 && (h - c->baseh) > 0 && (w - c->basew) > 0) {
- dx = (double)(w - c->basew);
- dy = (double)(h - c->baseh);
- min = (double)(c->minax) / (double)(c->minay);
- max = (double)(c->maxax) / (double)(c->maxay);
- ratio = dx / dy;
- if(max > 0 && min > 0 && ratio > 0) {
- if(ratio < min) {
- dy = (dx * min + dy) / (min * min + 1);
- dx = dy * min;
- w = (int)dx + c->basew;
- h = (int)dy + c->baseh;
- }
- else if(ratio > max) {
- dy = (dx * min + dy) / (max * max + 1);
- dx = dy * min;
- w = (int)dx + c->basew;
- h = (int)dy + c->baseh;
- }
- }
+ /* set minimum possible */
+ if (w < 1)
+ w = 1;
+ if (h < 1)
+ h = 1;
+
+ /* temporarily remove base dimensions */
+ w -= c->basew;
+ 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)
+ w = h * c->maxax / c->maxay;
+ else if (w * c->minay < h * c->minax)
+ h = w * c->minay / c->minax;
}
- if(c->minw && w < c->minw)
+
+ /* adjust for increment value */
+ if(c->incw)
+ w -= w % c->incw;
+ if(c->inch)
+ h -= h % c->inch;
+
+ /* restore base dimensions */
+ w += c->basew;
+ h += c->baseh;
+
+ if(c->minw > 0 && w < c->minw)
w = c->minw;
- if(c->minh && h < c->minh)
+ if(c->minh > 0 && h < c->minh)
h = c->minh;
- if(c->maxw && w > c->maxw)
+ if(c->maxw > 0 && w > c->maxw)
w = c->maxw;
- if(c->maxh && h > c->maxh)
+ if(c->maxh > 0 && h > c->maxh)
h = c->maxh;
- if(c->incw)
- w -= (w - c->basew) % c->incw;
- if(c->inch)
- h -= (h - c->baseh) % c->inch;
}
if(w <= 0 || h <= 0)
return;
@@ -1272,9 +1264,9 @@ restack(void) {
drawbar();
if(!sel)
return;
- if(sel->isfloating || isarrange(floating))
+ if(sel->isfloating || (layout->arrange == floating))
XRaiseWindow(dpy, sel->win);
- if(!isarrange(floating)) {
+ if(layout->arrange != floating) {
wc.stack_mode = Below;
wc.sibling = barwin;
if(!sel->isfloating) {
@@ -1295,14 +1287,19 @@ restack(void) {
void
run(void) {
char *p;
- int r, xfd;
+ char buf[sizeof stext];
fd_set rd;
+ int r, xfd;
+ unsigned int len, offset;
XEvent ev;
/* main event loop, also reads status text from stdin */
XSync(dpy, False);
xfd = ConnectionNumber(dpy);
readin = True;
+ offset = 0;
+ len = sizeof stext - 1;
+ buf[len] = stext[len] = '\0'; /* 0-terminator is never touched */
while(running) {
FD_ZERO(&rd);
if(readin)
@@ -1314,10 +1311,9 @@ run(void) {
eprint("select failed\n");
}
if(FD_ISSET(STDIN_FILENO, &rd)) {
- switch(r = read(STDIN_FILENO, stext, sizeof stext - 1)) {
+ switch((r = read(STDIN_FILENO, buf + offset, len - offset))) {
case -1:
- strncpy(stext, strerror(errno), sizeof stext - 1);
- stext[sizeof stext - 1] = '\0';
+ strncpy(stext, strerror(errno), len);
readin = False;
break;
case 0:
@@ -1325,10 +1321,18 @@ run(void) {
readin = False;
break;
default:
- for(stext[r] = '\0', p = stext + strlen(stext) - 1; p >= stext && *p == '\n'; *p-- = '\0');
- for(; p >= stext && *p != '\n'; --p);
- if(p > stext)
- strncpy(stext, p + 1, sizeof stext);
+ for(p = buf + offset; r > 0; p++, r--, offset++)
+ if(*p == '\n' || *p == '\0') {
+ *p = '\0';
+ strncpy(stext, buf, len);
+ p += r - 1; /* p is buf + offset + r - 1 */
+ for(r = 0; *(p - r) && *(p - r) != '\n'; r++);
+ offset = r;
+ if(r)
+ memmove(buf, p - r + 1, r);
+ break;
+ }
+ break;
}
drawbar();
}
@@ -1380,16 +1384,16 @@ setlayout(const char *arg) {
unsigned int i;
if(!arg) {
- if(++ltidx == nlayouts)
- ltidx = 0;;
+ if(++layout == &layouts[LENGTH(layouts)])
+ layout = &layouts[0];
}
else {
- for(i = 0; i < nlayouts; i++)
+ for(i = 0; i < LENGTH(layouts); i++)
if(!strcmp(arg, layouts[i].symbol))
break;
- if(i == nlayouts)
+ if(i == LENGTH(layouts))
return;
- ltidx = i;
+ layout = &layouts[i];
}
if(sel)
arrange();
@@ -1401,12 +1405,12 @@ void
setmwfact(const char *arg) {
double delta;
- if(!ISTILE)
+ if(!domwfact)
return;
/* arg handling, manipulate mwfact */
if(arg == NULL)
mwfact = MWFACT;
- else if(1 == sscanf(arg, "%lf", &delta)) {
+ else if(sscanf(arg, "%lf", &delta) == 1) {
if(arg[0] == '+' || arg[0] == '-')
mwfact += delta;
else
@@ -1423,19 +1427,20 @@ void
setup(void) {
int d;
unsigned int i, j, mask;
+ Atom utf8string;
Window w;
XModifierKeymap *modmap;
XSetWindowAttributes wa;
/* init atoms */
+ utf8string = XInternAtom(dpy, "UTF8_STRING", False);
wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
wmatom[WMName] = XInternAtom(dpy, "WM_NAME", False);
wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
+ netatom[NetWMCheck] = XInternAtom(dpy, "_NET_SUPPORTING_WM_CHECK", False);
netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
- XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
- PropModeReplace, (unsigned char *) netatom, NetLast);
/* init cursors */
cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);
@@ -1465,9 +1470,10 @@ setup(void) {
XSelectInput(dpy, root, wa.event_mask);
/* grab keys */
- keypress(NULL);
+ grabkeys();
/* init tags */
+ memcpy(prevtags, seltags, sizeof seltags);
compileregs();
/* init appearance */
@@ -1482,8 +1488,8 @@ setup(void) {
/* init layouts */
mwfact = MWFACT;
- nlayouts = sizeof layouts / sizeof layouts[0];
- for(blw = i = 0; i < nlayouts; i++) {
+ layout = &layouts[0];
+ for(blw = i = 0; i < LENGTH(layouts); i++) {
j = textw(layouts[i].symbol);
if(j > blw)
blw = j;
@@ -1509,6 +1515,17 @@ setup(void) {
/* multihead support */
selscreen = XQueryPointer(dpy, root, &w, &w, &d, &d, &d, &d, &mask);
+
+ /* EWMH properties */
+ XChangeProperty(dpy, barwin, netatom[NetWMCheck], XA_WINDOW, 32,
+ PropModeReplace, (unsigned char *) &barwin, 1);
+ /* HACK: dwm identifies itself as compiz to workaround the XToolkit bug of Sun JDK */
+ XChangeProperty(dpy, barwin, netatom[NetWMName], utf8string, 8,
+ PropModeReplace, (unsigned char *) "compiz", 6);
+ XChangeProperty(dpy, root, netatom[NetWMCheck], XA_WINDOW, 32,
+ PropModeReplace, (unsigned char *) &barwin, 1);
+ XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
+ PropModeReplace, (unsigned char *) netatom, NetLast);
}
void
@@ -1541,11 +1558,9 @@ tag(const char *arg) {
if(!sel)
return;
- for(i = 0; i < ntags; i++)
- sel->tags[i] = arg == NULL;
- i = idxoftag(arg);
- if(i >= 0 && i < ntags)
- sel->tags[i] = True;
+ for(i = 0; i < LENGTH(tags); i++)
+ sel->tags[i] = (NULL == arg);
+ sel->tags[idxoftag(arg)] = True;
arrange();
}
@@ -1570,6 +1585,7 @@ tile(void) {
unsigned int i, n, nx, ny, nw, nh, mw, th;
Client *c, *mc;
+ domwfact = dozoom = True;
for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
n++;
@@ -1600,6 +1616,9 @@ tile(void) {
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 != wah)
ny = c->y + c->h + 2 * c->border;
}
@@ -1632,7 +1651,7 @@ togglemax(const char *arg) {
if(!sel || sel->isfixed)
return;
if((sel->ismax = !sel->ismax)) {
- if(isarrange(floating) || sel->isfloating)
+ if((layout->arrange == floating) || sel->isfloating)
sel->wasfloating = True;
else {
togglefloating(NULL);
@@ -1661,9 +1680,9 @@ toggletag(const char *arg) {
return;
i = idxoftag(arg);
sel->tags[i] = !sel->tags[i];
- for(j = 0; j < ntags && !sel->tags[j]; j++);
- if(j == ntags)
- sel->tags[i] = True;
+ for(j = 0; j < LENGTH(tags) && !sel->tags[j]; j++);
+ if(j == LENGTH(tags))
+ sel->tags[i] = True; /* at least one tag must be enabled */
arrange();
}
@@ -1673,8 +1692,8 @@ toggleview(const char *arg) {
i = idxoftag(arg);
seltags[i] = !seltags[i];
- for(j = 0; j < ntags && !seltags[j]; j++);
- if(j == ntags)
+ for(j = 0; j < LENGTH(tags) && !seltags[j]; j++);
+ if(j == LENGTH(tags))
seltags[i] = True; /* at least one tag must be viewed */
arrange();
}
@@ -1702,6 +1721,7 @@ unmanage(Client *c) {
focus(NULL);
XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
setclientstate(c, WithdrawnState);
+ free(c->tags);
free(c);
XSync(dpy, False);
XSetErrorHandler(xerror);
@@ -1838,11 +1858,20 @@ void
view(const char *arg) {
unsigned int i;
- for(i = 0; i < ntags; i++)
- seltags[i] = arg == NULL;
- i = idxoftag(arg);
- if(i >= 0 && i < ntags)
- seltags[i] = True;
+ memcpy(prevtags, seltags, sizeof seltags);
+ for(i = 0; i < LENGTH(tags); i++)
+ seltags[i] = (NULL == arg);
+ seltags[idxoftag(arg)] = True;
+ arrange();
+}
+
+void
+viewprevtag(const char *arg) {
+ static Bool tmp[LENGTH(tags)];
+
+ memcpy(tmp, seltags, sizeof seltags);
+ memcpy(seltags, prevtags, sizeof seltags);
+ memcpy(prevtags, tmp, sizeof seltags);
arrange();
}
@@ -1850,7 +1879,7 @@ void
zoom(const char *arg) {
Client *c;
- if(!sel || !ISTILE || sel->isfloating)
+ if(!sel || !dozoom || sel->isfloating)
return;
if((c = sel) == nexttiled(clients))
if(!(c = nexttiled(c->next)))
@@ -1864,7 +1893,8 @@ zoom(const char *arg) {
int
main(int argc, char *argv[]) {
if(argc == 2 && !strcmp("-v", argv[1]))
- eprint("dwm-"VERSION", © 2006-2007 A. R. Garbe, S. van Dijk, J. Salmi, P. Hruby, S. Nagy\n");
+ eprint("dwm-"VERSION", © 2006-2007 Anselm R. Garbe, Sander van Dijk, "
+ "Jukka Salmi, Premysl Hruby, Szabolcs Nagy\n");
else if(argc != 1)
eprint("usage: dwm [-v]\n");