X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/c9170189bf0d0234f8d97fd7b717f859b7242674..825d6cb93a37f8c67a7c8b1a027e5eebc3f4dda7:/dwm.c?ds=inline
diff --git a/dwm.c b/dwm.c
index 2985cea..0c9acbe 100644
--- a/dwm.c
+++ b/dwm.c
@@ -1,6 +1,3 @@
-/**
- * - allow for vstack
- */
/* See LICENSE file for copyright and license details.
*
* dynamic window manager is designed like any other X client as well. It is
@@ -36,28 +33,35 @@
#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>
#include <X11/Xlib.h>
#include <X11/Xproto.h>
#include <X11/Xutil.h>
+#ifdef XINERAMA
+#include <X11/extensions/Xinerama.h>
+#endif
/* 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)
+#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 TAGMASK ((int)((1LL << LENGTH(tags)) - 1))
/* enums */
-enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
-enum { ColBorder, ColFG, ColBG, ColLast }; /* color */
-enum { NetSupported, NetWMName, NetLast }; /* EWMH atoms */
+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 */
+typedef unsigned int uint;
+typedef unsigned long ulong;
typedef struct Client Client;
struct Client {
char name[256];
@@ -65,9 +69,9 @@ struct Client {
int basew, baseh, incw, inch, maxw, maxh, minw, minh;
int minax, maxax, minay, maxay;
long flags;
- unsigned int border, oldborder;
+ uint bw, oldbw;
Bool isbanned, isfixed, isfloating, isurgent;
- Bool *tags;
+ uint tags;
Client *next;
Client *prev;
Client *snext;
@@ -76,8 +80,8 @@ struct Client {
typedef struct {
int x, y, w, h;
- unsigned long norm[ColLast];
- unsigned long sel[ColLast];
+ ulong norm[ColLast];
+ ulong sel[ColLast];
Drawable drawable;
GC gc;
struct {
@@ -90,21 +94,23 @@ typedef struct {
} DC; /* draw context */
typedef struct {
- unsigned long mod;
+ ulong mod;
KeySym keysym;
- void (*func)(const char *arg);
- const char *arg;
+ void (*func)(const void *arg);
+ const void *arg;
} Key;
typedef struct {
const char *symbol;
void (*arrange)(void);
- Bool isfloating;
+ void (*updategeom)(void);
} Layout;
typedef struct {
- const char *prop;
- const char *tag;
+ const char *class;
+ const char *instance;
+ const char *title;
+ uint tags;
Bool isfloating;
} Rule;
@@ -124,77 +130,79 @@ void destroynotify(XEvent *e);
void detach(Client *c);
void detachstack(Client *c);
void drawbar(void);
-void drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]);
-void drawtext(const char *text, unsigned long col[ColLast], Bool invert);
-void *emallocz(unsigned int size);
+void drawsquare(Bool filled, Bool empty, Bool invert, ulong col[ColLast]);
+void drawtext(const char *text, ulong col[ColLast], Bool invert);
+void *emallocz(uint size);
void enternotify(XEvent *e);
void eprint(const char *errstr, ...);
void expose(XEvent *e);
-void floating(void); /* default floating layout */
void focus(Client *c);
void focusin(XEvent *e);
-void focusnext(const char *arg);
-void focusprev(const char *arg);
+void focusnext(const void *arg);
+void focusprev(const void *arg);
Client *getclient(Window w);
-unsigned long getcolor(const char *colstr);
+ulong getcolor(const char *colstr);
long getstate(Window w);
-Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
+Bool gettextprop(Window w, Atom atom, char *text, uint size);
void grabbuttons(Client *c, Bool focused);
void grabkeys(void);
-unsigned int idxoftag(const char *t);
void initfont(const char *fontstr);
-Bool isoccupied(unsigned int t);
+Bool isoccupied(uint t);
Bool isprotodel(Client *c);
-Bool isurgent(unsigned int t);
+Bool isurgent(uint t);
Bool isvisible(Client *c);
void keypress(XEvent *e);
-void killclient(const char *arg);
+void killclient(const void *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);
void propertynotify(XEvent *e);
-void quit(const char *arg);
-void reapply(const char *arg);
+void quit(const void *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 void *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 spawn(const void *arg);
+void tag(const void *arg);
+uint textnw(const char *text, uint len);
+uint textw(const char *text);
void tile(void);
-unsigned int tilemaster(void);
-void tilevstack(unsigned int n);
-void togglefloating(const char *arg);
-void toggletag(const char *arg);
-void toggleview(const char *arg);
+void tileresize(Client *c, int x, int y, int w, int h);
+void togglebar(const void *arg);
+void togglefloating(const void *arg);
+void togglelayout(const void *arg);
+void toggletag(const void *arg);
+void toggleview(const void *arg);
void unban(Client *c);
void unmanage(Client *c);
void unmapnotify(XEvent *e);
+void updatebar(void);
+void updategeom(void);
void updatesizehints(Client *c);
+void updatetilegeom(void);
void updatetitle(Client *c);
void updatewmhints(Client *c);
-void view(const char *arg);
-void viewprevtag(const char *arg); /* views previous selected tags */
+void view(const void *arg);
+void viewprevtag(const void *arg);
int xerror(Display *dpy, XErrorEvent *ee);
int xerrordummy(Display *dpy, XErrorEvent *ee);
int xerrorstart(Display *dpy, XErrorEvent *ee);
-void zoom(const char *arg);
+void zoom(const void *arg);
/* variables */
-char stext[256], buf[256];
+char stext[256];
int screen, sx, sy, sw, sh;
+int bx, by, bw, bh, blw, wx, wy, ww, wh;
+int mx, my, mw, mh, tx, ty, tw, th;
+uint seltags = 0;
int (*xerrorxlib)(Display *, XErrorEvent *);
-unsigned int bh, blw = 0;
-unsigned int numlockmask = 0;
+uint numlockmask = 0;
void (*handler[LASTEvent]) (XEvent *) = {
[ButtonPress] = buttonpress,
[ConfigureRequest] = configurerequest,
@@ -212,28 +220,28 @@ void (*handler[LASTEvent]) (XEvent *) = {
Atom wmatom[WMLast], netatom[NetLast];
Bool otherwm, readin;
Bool running = True;
-Bool *prevtags;
-Bool *seltags;
+uint tagset[] = {1, 1}; /* after start, first tag is selected */
Client *clients = NULL;
Client *sel = NULL;
Client *stack = NULL;
Cursor cursor[CurLast];
Display *dpy;
DC dc = {0};
-Layout *lt = NULL;
+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))
-static Bool tmp[LENGTH(tags)];
+
+/* check if all tags will fit into a uint bitarray. */
+static char tags_is_a_sign_that_your_IQ[sizeof(int) * 8 < LENGTH(tags) ? -1 : 1];
/* function implementations */
void
applyrules(Client *c) {
- unsigned int i;
- Bool matched = False;
+ uint i;
Rule *r;
XClassHint ch = { 0 };
@@ -241,23 +249,19 @@ 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))
+ && (!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;
- matched = True;
- }
+ c->tags |= r->tags & TAGMASK;
}
}
if(ch.res_class)
XFree(ch.res_class);
if(ch.res_name)
XFree(ch.res_name);
- if(!matched)
- memcpy(c->tags, seltags, TAGSZ);
+ if(!c->tags)
+ c->tags = tagset[seltags];
}
void
@@ -265,13 +269,17 @@ arrange(void) {
Client *c;
for(c = clients; c; c = c->next)
- if(isvisible(c))
+ if(isvisible(c)) {
unban(c);
+ if(!lt->arrange || c->isfloating)
+ resize(c, c->x, c->y, c->w, c->h, True);
+ }
else
ban(c);
focus(NULL);
- lt->arrange();
+ if(lt->arrange)
+ lt->arrange();
restack();
}
@@ -299,7 +307,7 @@ ban(Client *c) {
void
buttonpress(XEvent *e) {
- unsigned int i, x;
+ uint i, x, mask;
Client *c;
XButtonPressedEvent *ev = &e->xbutton;
@@ -308,21 +316,24 @@ buttonpress(XEvent *e) {
for(i = 0; i < LENGTH(tags); i++) {
x += textw(tags[i]);
if(ev->x < x) {
+ mask = 1 << i;
if(ev->button == Button1) {
if(ev->state & MODKEY)
- tag(tags[i]);
+ tag(&mask);
else
- view(tags[i]);
+ view(&mask);
}
else if(ev->button == Button3) {
if(ev->state & MODKEY)
- toggletag(tags[i]);
+ toggletag(&mask);
else
- toggleview(tags[i]);
+ toggleview(&mask);
}
return;
}
}
+ if((ev->x < x + blw) && ev->button == Button1)
+ togglelayout(NULL);
}
else if((c = getclient(ev->window))) {
focus(c);
@@ -332,12 +343,8 @@ buttonpress(XEvent *e) {
restack();
movemouse(c);
}
- else if(ev->button == Button2) {
- if((floating != lt->arrange) && c->isfloating)
- togglefloating(NULL);
- else
- zoom(NULL);
- }
+ else if(ev->button == Button2)
+ togglefloating(NULL);
else if(ev->button == Button3 && !c->isfixed) {
restack();
resizemouse(c);
@@ -395,7 +402,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);
@@ -408,9 +415,8 @@ 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);
+ updategeom();
+ updatebar();
arrange();
}
}
@@ -423,8 +429,8 @@ configurerequest(XEvent *e) {
if((c = getclient(ev->window))) {
if(ev->value_mask & CWBorderWidth)
- c->border = ev->border_width;
- if(c->isfixed || c->isfloating || lt->isfloating) {
+ c->bw = ev->border_width;
+ if(c->isfixed || c->isfloating || !lt->arrange) {
if(ev->value_mask & CWX)
c->x = sx + ev->x;
if(ev->value_mask & CWY)
@@ -483,7 +489,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;
}
@@ -496,24 +502,28 @@ drawbar(void) {
for(c = stack; c && !isvisible(c); c = c->snext);
for(i = 0; i < LENGTH(tags); i++) {
dc.w = textw(tags[i]);
- if(seltags[i]) {
+ if(tagset[seltags] & 1 << i) {
drawtext(tags[i], dc.sel, isurgent(i));
- drawsquare(c && c->tags[i], isoccupied(i), isurgent(i), dc.sel);
+ drawsquare(c && c->tags & 1 << i, isoccupied(i), isurgent(i), dc.sel);
}
else {
drawtext(tags[i], dc.norm, isurgent(i));
- drawsquare(c && c->tags[i], isoccupied(i), isurgent(i), dc.norm);
+ drawsquare(c && c->tags & 1 << i, isoccupied(i), isurgent(i), dc.norm);
}
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) {
@@ -525,12 +535,12 @@ 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);
}
void
-drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
+drawsquare(Bool filled, Bool empty, Bool invert, ulong col[ColLast]) {
int x;
XGCValues gcv;
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
@@ -551,27 +561,27 @@ drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
}
void
-drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
+drawtext(const char *text, ulong col[ColLast], Bool invert) {
int x, y, w, h;
- unsigned int len, olen;
+ uint len, olen;
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
+ char buf[256];
XSetForeground(dpy, dc.gc, col[invert ? ColFG : ColBG]);
XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
if(!text)
return;
- w = 0;
- olen = len = strlen(text);
- if(len >= sizeof buf)
- len = sizeof buf - 1;
+ olen = strlen(text);
+ len = MIN(olen, sizeof buf);
memcpy(buf, text, len);
- buf[len] = 0;
+ w = 0;
h = dc.font.ascent + dc.font.descent;
y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
x = dc.x + (h / 2);
/* shorten text if necessary */
- while(len && (w = textnw(buf, len)) > dc.w - h)
- buf[--len] = 0;
+ for(; len && (w = textnw(buf, len)) > dc.w - h; len--);
+ if(!len)
+ return;
if(len < olen) {
if(len > 1)
buf[len - 1] = '.';
@@ -580,8 +590,6 @@ drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
if(len > 3)
buf[len - 3] = '.';
}
- if(w > dc.w)
- return; /* too long */
XSetForeground(dpy, dc.gc, col[invert ? ColBG : ColFG]);
if(dc.font.set)
XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
@@ -590,7 +598,7 @@ drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
}
void *
-emallocz(unsigned int size) {
+emallocz(uint size) {
void *res = calloc(1, size);
if(!res)
@@ -629,15 +637,6 @@ expose(XEvent *e) {
drawbar();
}
-void
-floating(void) { /* default floating layout */
- Client *c;
-
- for(c = clients; c; c = c->next)
- if(isvisible(c))
- resize(c, c->x, c->y, c->w, c->h, True);
-}
-
void
focus(Client *c) {
if(!c || (c && !isvisible(c)))
@@ -670,7 +669,7 @@ focusin(XEvent *e) { /* there are some broken focus acquiring clients */
}
void
-focusnext(const char *arg) {
+focusnext(const void *arg) {
Client *c;
if(!sel)
@@ -685,7 +684,7 @@ focusnext(const char *arg) {
}
void
-focusprev(const char *arg) {
+focusprev(const void *arg) {
Client *c;
if(!sel)
@@ -709,7 +708,7 @@ getclient(Window w) {
return c;
}
-unsigned long
+ulong
getcolor(const char *colstr) {
Colormap cmap = DefaultColormap(dpy, screen);
XColor color;
@@ -724,7 +723,7 @@ getstate(Window w) {
int format, status;
long result = -1;
unsigned char *p = NULL;
- unsigned long n, extra;
+ ulong n, extra;
Atom real;
status = XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState],
@@ -738,7 +737,7 @@ getstate(Window w) {
}
Bool
-gettextprop(Window w, Atom atom, char *text, unsigned int size) {
+gettextprop(Window w, Atom atom, char *text, uint size) {
char **list = NULL;
int n;
XTextProperty name;
@@ -765,44 +764,25 @@ 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;
+ uint buttons[] = { Button1, Button2, Button3 };
+ uint 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
-grabkeys(void) {
- unsigned int i, j;
+grabkeys(void) {
+ uint i, j;
KeyCode code;
XModifierKeymap *modmap;
@@ -829,14 +809,6 @@ grabkeys(void) {
}
}
-unsigned int
-idxoftag(const char *t) {
- unsigned int i;
-
- for(i = 0; (i < LENGTH(tags)) && (tags[i] != t); i++);
- return (i < LENGTH(tags)) ? i : 0;
-}
-
void
initfont(const char *fontstr) {
char *def, **missing;
@@ -859,10 +831,8 @@ initfont(const char *fontstr) {
font_extents = XExtentsOfFontSet(dc.font.set);
n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) {
- if(dc.font.ascent < (*xfonts)->ascent)
- dc.font.ascent = (*xfonts)->ascent;
- if(dc.font.descent < (*xfonts)->descent)
- dc.font.descent = (*xfonts)->descent;
+ dc.font.ascent = MAX(dc.font.ascent, (*xfonts)->ascent);
+ dc.font.descent = MAX(dc.font.descent,(*xfonts)->descent);
xfonts++;
}
}
@@ -880,11 +850,11 @@ initfont(const char *fontstr) {
}
Bool
-isoccupied(unsigned int t) {
+isoccupied(uint t) {
Client *c;
for(c = clients; c; c = c->next)
- if(c->tags[t])
+ if(c->tags & 1 << t)
return True;
return False;
}
@@ -905,28 +875,23 @@ isprotodel(Client *c) {
}
Bool
-isurgent(unsigned int t) {
+isurgent(uint t) {
Client *c;
for(c = clients; c; c = c->next)
- if(c->isurgent && c->tags[t])
+ if(c->isurgent && c->tags & 1 << t)
return True;
return False;
}
Bool
isvisible(Client *c) {
- unsigned int i;
-
- for(i = 0; i < LENGTH(tags); i++)
- if(c->tags[i] && seltags[i])
- return True;
- return False;
+ return c->tags & tagset[seltags];
}
void
keypress(XEvent *e) {
- unsigned int i;
+ uint i;
KeySym keysym;
XKeyEvent *ev;
@@ -942,7 +907,7 @@ keypress(XEvent *e) {
}
void
-killclient(const char *arg) {
+killclient(const void *arg) {
XEvent ev;
if(!sel)
@@ -968,7 +933,6 @@ manage(Window w, XWindowAttributes *wa) {
XWindowChanges wc;
c = emallocz(sizeof(Client));
- c->tags = emallocz(TAGSZ);
c->win = w;
/* geometry */
@@ -976,25 +940,23 @@ 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 < WX)
- c->x = WX;
- if(c->y < WY)
- c->y = WY;
- c->border = BORDERPX;
+ if(c->x + c->w + 2 * c->bw > sx + sw)
+ c->x = sx + sw - c->w - 2 * c->bw;
+ if(c->y + c->h + 2 * c->bw > sy + sh)
+ c->y = sy + sh - c->h - 2 * c->bw;
+ c->x = MAX(c->x, sx);
+ c->y = MAX(c->y, by == 0 ? bh : sy);
+ 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 */
@@ -1005,7 +967,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)
- memcpy(c->tags, t->tags, TAGSZ);
+ c->tags = t->tags;
else
applyrules(c);
if(!c->isfloating)
@@ -1041,26 +1003,17 @@ maprequest(XEvent *e) {
manage(ev->window, &wa);
}
-void
-monocle(void) {
- Client *c;
-
- for(c = clients; c; c = c->next)
- if(isvisible(c))
- resize(c, MOX, MOY, MOW, MOH, RESIZEHINTS);
-}
-
void
movemouse(Client *c) {
int x1, y1, ocx, ocy, di, nx, ny;
- unsigned int dui;
+ uint dui;
Window dummy;
XEvent ev;
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(;;) {
@@ -1078,17 +1031,20 @@ 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->border)) < SNAP)
- nx = WX + WW - c->w - 2 * c->border;
- 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;
- if(!c->isfloating && !lt->isfloating && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
- togglefloating(NULL);
- if((lt->isfloating) || c->isfloating)
+ 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;
}
@@ -1134,42 +1090,29 @@ propertynotify(XEvent *e) {
}
void
-quit(const char *arg) {
+quit(const void *arg) {
readin = running = False;
}
-void
-reapply(const char *arg) {
- static Bool zerotags[LENGTH(tags)] = { 0 };
- Client *c;
-
- for(c = clients; c; c = c->next) {
- memcpy(c->tags, zerotags, sizeof zerotags);
- applyrules(c);
- }
- arrange();
-}
-
void
resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
XWindowChanges wc;
if(sizehints) {
/* set minimum possible */
- if (w < 1)
- w = 1;
- if (h < 1)
- h = 1;
+ w = MAX(1, w);
+ h = MAX(1, h);
/* 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)
+ 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;
}
@@ -1183,31 +1126,31 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
w += c->basew;
h += c->baseh;
- if(c->minw > 0 && w < c->minw)
- w = c->minw;
- if(c->minh > 0 && h < c->minh)
- h = c->minh;
- if(c->maxw > 0 && w > c->maxw)
- w = c->maxw;
- if(c->maxh > 0 && h > c->maxh)
- h = c->maxh;
+ w = MAX(w, c->minw);
+ h = MAX(h, c->minh);
+
+ if (c->maxw)
+ w = MIN(w, c->maxw);
+
+ if (c->maxh)
+ h = MIN(h, c->maxh);
}
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);
@@ -1224,15 +1167,15 @@ 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->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;
@@ -1243,13 +1186,16 @@ resizemouse(Client *c) {
break;
case MotionNotify:
XSync(dpy, False);
- if((nw = ev.xmotion.x - ocx - 2 * c->border + 1) <= 0)
- nw = 1;
- if((nh = ev.xmotion.y - ocy - 2 * c->border + 1) <= 0)
- nh = 1;
- if(!c->isfloating && !lt->isfloating && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP))
- togglefloating(NULL);
- if((lt->isfloating) || c->isfloating)
+ nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
+ nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
+
+ 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->arrange || c->isfloating)
resize(c, c->x, c->y, nw, nh, True);
break;
}
@@ -1265,21 +1211,16 @@ 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;
- if(!sel->isfloating) {
- XConfigureWindow(dpy, sel->win, CWSibling|CWStackMode, &wc);
- wc.sibling = sel->win;
- }
- for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
- if(c == sel)
- continue;
- XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
- wc.sibling = c->win;
- }
+ for(c = stack; c; c = c->snext)
+ if(!c->isfloating && isvisible(c)) {
+ XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
+ wc.sibling = c->win;
+ }
}
XSync(dpy, False);
while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
@@ -1291,7 +1232,7 @@ run(void) {
char sbuf[sizeof stext];
fd_set rd;
int r, xfd;
- unsigned int len, offset;
+ uint len, offset;
XEvent ev;
/* main event loop, also reads status text from stdin */
@@ -1347,7 +1288,7 @@ run(void) {
void
scan(void) {
- unsigned int i, num;
+ uint i, num;
Window *wins, d1, d2;
XWindowAttributes wa;
@@ -1355,7 +1296,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);
@@ -1364,7 +1305,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);
}
}
@@ -1380,42 +1321,36 @@ setclientstate(Client *c, long state) {
PropModeReplace, (unsigned char *)data, 2);
}
+/* arg > 1.0 will set mfact absolutly */
void
-setlayout(const char *arg) {
- static Layout *revert = 0;
- unsigned int i;
+setmfact(const void *arg) {
+ double d = *((double*) arg);
- if(!arg)
+ if(!d || lt->arrange != tile)
return;
- for(i = 0; i < LENGTH(layouts); i++)
- if(!strcmp(arg, layouts[i].symbol))
- break;
- if(i == LENGTH(layouts))
+ d = d < 1.0 ? d + mfact : d - 1.0;
+ if(d < 0.1 || d > 0.9)
return;
- if(revert && &layouts[i] == lt)
- lt = revert;
- else {
- revert = lt;
- lt = &layouts[i];
- }
- if(sel)
- arrange();
- else
- drawbar();
+ mfact = d;
+ updatetilegeom();
+ arrange();
}
void
setup(void) {
- unsigned int i;
+ uint i, w;
XSetWindowAttributes wa;
/* init screen */
screen = DefaultScreen(dpy);
root = RootWindow(dpy, screen);
+ initfont(FONT);
sx = 0;
sy = 0;
sw = DisplayWidth(dpy, screen);
sh = DisplayHeight(dpy, screen);
+ bh = dc.font.height + 2;
+ updategeom();
/* init atoms */
wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
@@ -1438,35 +1373,26 @@ 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);
if(!dc.font.set)
XSetFont(dpy, dc.gc, dc.font.xfont->fid);
- /* init tags */
- seltags = emallocz(TAGSZ);
- 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);
+ blw = MAX(blw, 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);
+ 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]);
XMapRaised(dpy, barwin);
strcpy(stext, "dwm-"VERSION);
@@ -1488,13 +1414,11 @@ setup(void) {
}
void
-spawn(const char *arg) {
+spawn(const void *arg) {
static char *shell = NULL;
if(!shell && !(shell = getenv("SHELL")))
shell = "/bin/sh";
- if(!arg)
- return;
/* The double-fork construct avoids zombie processes and keeps the code
* clean from stupid signal handlers. */
if(fork() == 0) {
@@ -1502,8 +1426,8 @@ spawn(const char *arg) {
if(dpy)
close(ConnectionNumber(dpy));
setsid();
- execl(shell, shell, "-c", arg, (char *)NULL);
- fprintf(stderr, "dwm: execl '%s -c %s'", shell, arg);
+ execl(shell, shell, "-c", (char *)arg, (char *)NULL);
+ fprintf(stderr, "dwm: execl '%s -c %s'", shell, (char *)arg);
perror(" failed");
}
exit(0);
@@ -1512,19 +1436,15 @@ spawn(const char *arg) {
}
void
-tag(const char *arg) {
- unsigned int i;
-
- if(!sel)
- return;
- for(i = 0; i < LENGTH(tags); i++)
- sel->tags[i] = (NULL == arg);
- sel->tags[idxoftag(arg)] = True;
- arrange();
+tag(const void *arg) {
+ if(sel && *(int *)arg & TAGMASK) {
+ sel->tags = *(int *)arg & TAGMASK;
+ arrange();
+ }
}
-unsigned int
-textnw(const char *text, unsigned int len) {
+uint
+textnw(const char *text, uint len) {
XRectangle r;
if(dc.font.set) {
@@ -1534,68 +1454,68 @@ textnw(const char *text, unsigned int len) {
return XTextWidth(dc.font.xfont, text, len);
}
-unsigned int
+uint
textw(const char *text) {
return textnw(text, strlen(text)) + dc.font.height;
}
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);
-}
-
-unsigned int
-tilemaster(void) {
- unsigned int n;
- Client *c, *mc;
+tile(void) {
+ int x, y, h, w;
+ uint i, n;
+ Client *c;
- for(n = 0, mc = c = nexttiled(clients); c; c = nexttiled(c->next))
- n++;
+ for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next), n++);
if(n == 0)
- return 0;
+ return;
+
+ /* master */
+ c = nexttiled(clients);
+
if(n == 1)
- tileresize(mc, MOX, MOY, (MOW) - 2 * mc->border, (MOH) - 2 * mc->border);
+ tileresize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw);
else
- tileresize(mc, MX, MY, (MW) - 2 * mc->border, (MH) - 2 * mc->border);
- return n - 1;
-}
+ tileresize(c, mx, my, mw - 2 * c->bw, mh - 2 * c->bw);
-void
-tilevstack(unsigned int n) {
- int i, y, h;
- Client *c;
-
- if(n == 0)
+ if(--n == 0)
return;
- y = TY;
- h = (TH) / n;
+ /* tile stack */
+ x = (tx > c->x + c->w) ? c->x + c->w + 2 * c->bw : tw;
+ y = ty;
+ w = (tx > c->x + c->w) ? wx + ww - x : tw;
+ h = th / n;
if(h < bh)
- h = TH;
-
- for(i = 0, c = nexttiled(clients); c; c = nexttiled(c->next), i++)
- if(i > 0) {
- if(i > 1 && i == n) /* remainder */
- tileresize(c, TX, y, (TW) - 2 * c->border,
- ((TY) + (TH)) - y - 2 * c->border);
- else
- tileresize(c, TX, y, (TW) - 2 * c->border,
- h - 2 * c->border);
- if(h != TH)
- y = c->y + c->h + 2 * c->border;
- }
+ h = th;
+
+ for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
+ if(i + 1 == n) /* remainder */
+ tileresize(c, x, y, w - 2 * c->bw, (ty + th) - y - 2 * c->bw);
+ else
+ tileresize(c, x, y, w - 2 * c->bw, h - 2 * c->bw);
+ if(h != th)
+ y = c->y + c->h + 2 * c->bw;
+ }
}
void
-tile(void) {
- tilevstack(tilemaster());
+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
-togglefloating(const char *arg) {
+togglebar(const void *arg) {
+ showbar = !showbar;
+ updategeom();
+ updatebar();
+ arrange();
+}
+
+void
+togglefloating(const void *arg) {
if(!sel)
return;
sel->isfloating = !sel->isfloating;
@@ -1605,29 +1525,49 @@ togglefloating(const char *arg) {
}
void
-toggletag(const char *arg) {
- unsigned int i, j;
+togglelayout(const void *arg) {
+ uint i;
- if(!sel)
- return;
- i = idxoftag(arg);
- sel->tags[i] = !sel->tags[i];
- 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();
+ if(!arg) {
+ if(++lt == &layouts[LENGTH(layouts)])
+ lt = &layouts[0];
+ }
+ else {
+ for(i = 0; i < LENGTH(layouts); i++)
+ if(!strcmp((char *)arg, layouts[i].symbol))
+ break;
+ if(i == LENGTH(layouts))
+ return;
+ lt = &layouts[i];
+ }
+ if(sel)
+ arrange();
+ else
+ drawbar();
}
void
-toggleview(const char *arg) {
- unsigned int i, j;
+toggletag(const void *arg) {
+ int i, m = *(int *)arg;
+ for(i = 0; i < sizeof(int) * 8; i++)
+ fputc(m & 1 << i ? '1' : '0', stdout);
+ puts("");
+ for(i = 0; i < sizeof(int) * 8; i++)
+ fputc(TAGMASK & 1 << i ? '1' : '0', stdout);
+ puts("aaa");
+
+ if(sel && (sel->tags ^ ((*(int *)arg) & TAGMASK))) {
+ sel->tags ^= (*(int *)arg) & TAGMASK;
+ arrange();
+ }
+}
- i = idxoftag(arg);
- seltags[i] = !seltags[i];
- for(j = 0; j < LENGTH(tags) && !seltags[j]; j++);
- if(j == LENGTH(tags))
- seltags[i] = True; /* at least one tag must be viewed */
- arrange();
+void
+toggleview(const void *arg) {
+ if((tagset[seltags] ^ ((*(int *)arg) & TAGMASK))) {
+ tagset[seltags] ^= (*(int *)arg) & TAGMASK;
+ arrange();
+ }
}
void
@@ -1642,7 +1582,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);
@@ -1653,7 +1593,6 @@ unmanage(Client *c) {
focus(NULL);
XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
setclientstate(c, WithdrawnState);
- free(c->tags);
free(c);
XSync(dpy, False);
XSetErrorHandler(xerror);
@@ -1670,6 +1609,49 @@ unmapnotify(XEvent *e) {
unmanage(c);
}
+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) {
+ int i;
+#ifdef XINERAMA
+ XineramaScreenInfo *info = NULL;
+
+ /* window area geometry */
+ if(XineramaIsActive(dpy)) {
+ info = XineramaQueryScreens(dpy, &i);
+ wx = info[0].x_org;
+ wy = showbar && topbar ? info[0].y_org + bh : info[0].y_org;
+ ww = info[0].width;
+ wh = showbar ? info[0].height - bh : info[0].height;
+ XFree(info);
+ }
+ else
+#endif
+ {
+ wx = sx;
+ wy = showbar && topbar ? sy + bh : sy;
+ ww = sw;
+ wh = showbar ? sh - bh : sh;
+ }
+
+ /* bar geometry */
+ bx = wx;
+ by = showbar ? (topbar ? wy - bh : wy + wh) : -bh;
+ bw = ww;
+
+ /* update layout geometries */
+ for(i = 0; i < LENGTH(layouts); i++)
+ if(layouts[i].updategeom)
+ layouts[i].updategeom();
+}
+
void
updatesizehints(Client *c) {
long msize;
@@ -1722,6 +1704,21 @@ updatesizehints(Client *c) {
&& c->maxw == c->minw && c->maxh == c->minh);
}
+void
+updatetilegeom(void) {
+ /* master area geometry */
+ mx = wx;
+ my = wy;
+ mw = mfact * ww;
+ mh = wh;
+
+ /* tile area geometry */
+ tx = mx + mw;
+ ty = wy;
+ tw = ww - mw;
+ th = wh;
+}
+
void
updatetitle(Client *c) {
if(!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name))
@@ -1741,28 +1738,18 @@ updatewmhints(Client *c) {
}
}
-
void
-view(const char *arg) {
- unsigned int i;
-
- for(i = 0; i < LENGTH(tags); i++)
- tmp[i] = (NULL == arg);
- tmp[idxoftag(arg)] = True;
-
- if(memcmp(seltags, tmp, TAGSZ) != 0) {
- memcpy(prevtags, seltags, TAGSZ);
- memcpy(seltags, tmp, TAGSZ);
+view(const void *arg) {
+ if(*(int *)arg & TAGMASK) {
+ seltags ^= 1; /* toggle sel tagset */
+ tagset[seltags] = *(int *)arg & TAGMASK;
arrange();
}
}
void
-viewprevtag(const char *arg) {
-
- memcpy(tmp, seltags, TAGSZ);
- memcpy(seltags, prevtags, TAGSZ);
- memcpy(prevtags, tmp, TAGSZ);
+viewprevtag(const void *arg) {
+ seltags ^= 1; /* toggle sel tagset */
arrange();
}
@@ -1777,11 +1764,12 @@ xerror(Display *dpy, XErrorEvent *ee) {
|| (ee->request_code == X_PolyFillRectangle && ee->error_code == BadDrawable)
|| (ee->request_code == X_PolySegment && ee->error_code == BadDrawable)
|| (ee->request_code == X_ConfigureWindow && ee->error_code == BadMatch)
+ || (ee->request_code == X_GrabButton && ee->error_code == BadAccess)
|| (ee->request_code == X_GrabKey && ee->error_code == BadAccess)
|| (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 */
}
@@ -1799,13 +1787,13 @@ xerrorstart(Display *dpy, XErrorEvent *ee) {
}
void
-zoom(const char *arg) {
+zoom(const void *arg) {
Client *c = sel;
- if(!sel || lt->isfloating || sel->isfloating)
+ if(!lt->arrange || sel->isfloating)
return;
if(c == nexttiled(clients))
- if(!(c = nexttiled(c->next)))
+ if(!c || !(c = nexttiled(c->next)))
return;
detach(c);
attach(c);