X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=05fbf58479a373583f26c6c2eeeb955b64e88c1e;hb=32f36ab2d58b7bcbadc0b1c9c88654cdf906c71d;hp=862ec240402dd2541cc180cc8e35d80023393547;hpb=5473e763f6ed7f2f248bc980c0b210edbcc1393c;p=dwm.git diff --git a/dwm.c b/dwm.c index 862ec24..05fbf58 100644 --- a/dwm.c +++ b/dwm.c @@ -16,10 +16,8 @@ * Each child of the root window is called a client, except windows which have * 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. + * stack list. Each client contains a bit array to indicate the tags of a + * client. * * Keys and tagging rules are organized as arrays and defined in config.h. * @@ -35,38 +33,45 @@ #include #include #include -#include #include #include #include #include #include #include +#ifdef XINERAMA +#include +#endif /* macros */ -#define BUTTONMASK (ButtonPressMask | ButtonReleaseMask) -#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask)) -#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)) +#define TEXTW(x) (textnw(x, strlen(x)) + dc.font.height) /* 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 { 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]; 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; + int bw, oldbw; + Bool isbanned, isfixed, isfloating, ismoved, isurgent; + uint tags; Client *next; Client *prev; Client *snext; @@ -75,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 { @@ -89,10 +94,10 @@ typedef struct { } DC; /* draw context */ typedef struct { - unsigned long mod; + uint mod; KeySym keysym; - void (*func)(const char *arg); - const char *arg; + void (*func)(const void *arg); + const void *arg; } Key; typedef struct { @@ -101,26 +106,21 @@ typedef struct { } Layout; typedef struct { - const char *prop; - const char *tags; + const char *class; + const char *instance; + const char *title; + uint tags; Bool isfloating; } Rule; -typedef struct { - regex_t *propregex; - regex_t *tagregex; -} Regs; - /* function declarations */ void applyrules(Client *c); void arrange(void); void attach(Client *c); void attachstack(Client *c); -void ban(Client *c); void buttonpress(XEvent *e); void checkotherwm(void); void cleanup(void); -void compileregs(void); void configure(Client *c); void configurenotify(XEvent *e); void configurerequest(XEvent *e); @@ -128,88 +128,80 @@ void destroynotify(XEvent *e); void detach(Client *c); void detachstack(Client *c); void drawbar(void); -void drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]); -void drawtext(const char *text, unsigned long col[ColLast]); -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 enternotify(XEvent *e); void eprint(const char *errstr, ...); void expose(XEvent *e); -void floating(void); /* default floating layout */ void focus(Client *c); -void focusnext(const char *arg); -void focusprev(const char *arg); +void focusin(XEvent *e); +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); -unsigned int idxoftag(const char *tag); +void grabkeys(void); void initfont(const char *fontstr); -Bool isarrange(void (*func)()); -Bool isoccupied(unsigned int t); +Bool isoccupied(uint t); Bool isprotodel(Client *c); -Bool isvisible(Client *c); +Bool isurgent(uint t); void keypress(XEvent *e); -void killclient(const char *arg); -void leavenotify(XEvent *e); +void killclient(const void *arg); void manage(Window w, XWindowAttributes *wa); void mappingnotify(XEvent *e); void maprequest(XEvent *e); void movemouse(Client *c); Client *nexttiled(Client *c); void propertynotify(XEvent *e); -void quit(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 setmwfact(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); void tile(void); -void togglebar(const char *arg); -void togglefloating(const char *arg); -void togglemax(const char *arg); -void toggletag(const char *arg); -void toggleview(const char *arg); -void unban(Client *c); +void togglebar(const void *arg); +void togglefloating(const void *arg); +void togglelayout(const void *arg); +void togglemax(const void *arg); +void toggletag(const void *arg); +void toggleview(const void *arg); 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 view(const char *arg); -void viewprevtag(const char *arg); /* views previous selected tags */ +void updatewmhints(Client *c); +void view(const void *arg); int xerror(Display *dpy, XErrorEvent *ee); -int xerrordummy(Display *dsply, XErrorEvent *ee); -int xerrorstart(Display *dsply, XErrorEvent *ee); -void zoom(const char *arg); +int xerrordummy(Display *dpy, XErrorEvent *ee); +int xerrorstart(Display *dpy, XErrorEvent *ee); +void zoom(const void *arg); /* variables */ char stext[256]; -double mwfact; -int screen, sx, sy, sw, sh, wax, way, waw, wah; +int screen, sx, sy, sw, sh; +int by, bh, blw, wx, wy, ww, wh; +uint seltags = 0; 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; +uint numlockmask = 0; void (*handler[LASTEvent]) (XEvent *) = { [ButtonPress] = buttonpress, [ConfigureRequest] = configurerequest, [ConfigureNotify] = configurenotify, [DestroyNotify] = destroynotify, [EnterNotify] = enternotify, - [LeaveNotify] = leavenotify, [Expose] = expose, + [FocusIn] = focusin, [KeyPress] = keypress, [MappingNotify] = mappingnotify, [MapRequest] = maprequest, @@ -217,55 +209,50 @@ void (*handler[LASTEvent]) (XEvent *) = { [UnmapNotify] = unmapnotify }; Atom wmatom[WMLast], netatom[NetLast]; +Bool ismax = False; Bool otherwm, readin; Bool running = True; -Bool selscreen = True; +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}; -Window barwin, root; -Regs *regs = NULL; +Layout layouts[]; +Layout *lt = layouts; +Window root, barwin; /* configuration, allows nested code to access above variables */ #include "config.h" -#define NTAGS (sizeof tags / sizeof tags[0]) -Bool seltags[NTAGS] = {[0] = True}; -Bool prevtags[NTAGS] = {[0] = True}; +/* compile-time check if all tags fit into an uint bit array. */ +struct NumTags { char limitexceeded[sizeof(uint) * 8 < LENGTH(tags) ? -1 : 1]; }; /* function implementations */ void applyrules(Client *c) { - static char buf[512]; - unsigned int i, j; - regmatch_t tmp; - Bool matched = False; + uint i; + Rule *r; XClassHint ch = { 0 }; /* rule matching */ XGetClassHint(dpy, c->win, &ch); - 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++) - 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++) { - if(!regexec(regs[i].tagregex, tags[j], 1, &tmp, 0)) { - matched = True; - c->tags[j] = True; - } - } + for(i = 0; i < LENGTH(rules); i++) { + r = &rules[i]; + 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; + 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, sizeof seltags); + if(!c->tags) + c->tags = tagset[seltags]; } void @@ -273,12 +260,23 @@ arrange(void) { Client *c; for(c = clients; c; c = c->next) - if(isvisible(c)) - unban(c); - else - ban(c); - layouts[ltidx].arrange(); + if(c->tags & tagset[seltags]) { /* is visible */ + if(ismax && !c->isfixed) { + XMoveResizeWindow(dpy, c->win, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw); + c->ismoved = True; + } + else if(!lt->arrange || c->isfloating) + resize(c, c->x, c->y, c->w, c->h, True); + c->isbanned = False; + } + else if(!c->isbanned) { + XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y); + c->isbanned = c->ismoved = True; + } + focus(NULL); + if(lt->arrange && !ismax) + lt->arrange(); restack(); } @@ -297,66 +295,49 @@ attachstack(Client *c) { } void -ban(Client *c) { - if(c->isbanned) - return; - XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y); - c->isbanned = True; -} - -void buttonpress(XEvent *e) { - unsigned int i, x; + uint i, x, mask; Client *c; XButtonPressedEvent *ev = &e->xbutton; - if(barwin == ev->window) { + if(ev->window == barwin) { x = 0; - for(i = 0; i < NTAGS; i++) { - x += textw(tags[i]); + 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) - setlayout(NULL); + if(ev->x < x + blw) { + if(ev->button == Button1) + togglelayout(NULL); + else if(ev->button == Button3) + togglemax(NULL); + } } else if((c = getclient(ev->window))) { focus(c); - if(CLEANMASK(ev->state) != MODKEY) + if(CLEANMASK(ev->state) != MODKEY || (ismax && !c->isfixed)) return; - if(ev->button == Button1) { - if(isarrange(floating) || c->isfloating) - restack(); - else - togglefloating(NULL); + if(ev->button == Button1) movemouse(c); - } - else if(ev->button == Button2) { - if((ISTILE) && !c->isfixed && c->isfloating) - togglefloating(NULL); - else - zoom(NULL); - } - else if(ev->button == Button3 && !c->isfixed) { - if(isarrange(floating) || c->isfloating) - restack(); - else - togglefloating(NULL); + else if(ev->button == Button2) + togglefloating(NULL); + else if(ev->button == Button3 && !c->isfixed) resizemouse(c); - } } } @@ -366,11 +347,10 @@ checkotherwm(void) { XSetErrorHandler(xerrorstart); /* this causes an error if some other window manager is running */ - XSelectInput(dpy, root, SubstructureRedirectMask); + XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask); XSync(dpy, False); if(otherwm) eprint("dwm: another window manager is already running\n"); - XSync(dpy, False); XSetErrorHandler(NULL); xerrorxlib = XSetErrorHandler(xerror); XSync(dpy, False); @@ -379,10 +359,9 @@ checkotherwm(void) { void cleanup(void) { close(STDIN_FILENO); - while(stack) { - unban(stack); + view((uint[]){~0}); + while(stack) unmanage(stack); - } if(dc.font.set) XFreeFontSet(dpy, dc.font.set); else @@ -390,39 +369,12 @@ cleanup(void) { XUngrabKey(dpy, AnyKey, AnyModifier, root); XFreePixmap(dpy, dc.drawable); XFreeGC(dpy, dc.gc); - XDestroyWindow(dpy, barwin); XFreeCursor(dpy, cursor[CurNormal]); XFreeCursor(dpy, cursor[CurResize]); XFreeCursor(dpy, cursor[CurMove]); - XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime); + XDestroyWindow(dpy, barwin); XSync(dpy, False); -} - -void -compileregs(void) { - unsigned int i; - regex_t *reg; - - if(regs) - return; - nrules = sizeof rules / sizeof rules[0]; - regs = emallocz(nrules * sizeof(Regs)); - for(i = 0; i < nrules; i++) { - if(rules[i].prop) { - reg = emallocz(sizeof(regex_t)); - if(regcomp(reg, rules[i].prop, REG_EXTENDED)) - free(reg); - else - regs[i].propregex = reg; - } - if(rules[i].tags) { - reg = emallocz(sizeof(regex_t)); - if(regcomp(reg, rules[i].tags, REG_EXTENDED)) - free(reg); - else - regs[i].tagregex = reg; - } - } + XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime); } void @@ -437,7 +389,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); @@ -450,10 +402,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, sw, bh, DefaultDepth(dpy, screen)); - XResizeWindow(dpy, barwin, sw, bh); - updatebarpos(); + updategeom(); + updatebar(); arrange(); } } @@ -465,26 +415,27 @@ configurerequest(XEvent *e) { XWindowChanges wc; if((c = getclient(ev->window))) { - c->ismax = False; if(ev->value_mask & CWBorderWidth) - c->border = ev->border_width; - if(c->isfixed || c->isfloating || isarrange(floating)) { + c->bw = ev->border_width; + if(ismax && !c->isbanned && !c->isfixed) + XMoveResizeWindow(dpy, c->win, wx, wy, ww - 2 * c->bw, wh + 2 * c->bw); + else if(c->isfloating || !lt->arrange) { if(ev->value_mask & CWX) - c->x = ev->x; + c->x = sx + ev->x; if(ev->value_mask & CWY) - c->y = ev->y; + c->y = sy + ev->y; if(ev->value_mask & CWWidth) c->w = ev->width; if(ev->value_mask & CWHeight) c->h = ev->height; - if((c->x + c->w) > sw && c->isfloating) - c->x = sw / 2 - c->w / 2; /* center in x direction */ - if((c->y + c->h) > sh && c->isfloating) - c->y = sh / 2 - c->h / 2; /* center in y direction */ - if((ev->value_mask & (CWX | CWY)) - && !(ev->value_mask & (CWWidth | CWHeight))) + if((c->x - sx + c->w) > sw && c->isfloating) + c->x = sx + (sw / 2 - c->w / 2); /* center in x direction */ + if((c->y - sy + c->h) > sh && c->isfloating) + c->y = sy + (sh / 2 - c->h / 2); /* center in y direction */ + if((ev->value_mask & (CWX|CWY)) + && !(ev->value_mask & (CWWidth|CWHeight))) configure(c); - if(isvisible(c)) + if(!c->isbanned) XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); } else @@ -527,57 +478,63 @@ 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; } void drawbar(void) { int i, x; + Client *c; - dc.x = dc.y = 0; - for(i = 0; i < NTAGS; i++) { - dc.w = textw(tags[i]); - if(seltags[i]) { - drawtext(tags[i], dc.sel); - drawsquare(sel && sel->tags[i], isoccupied(i), dc.sel); + dc.x = 0; + for(c = stack; c && c->isbanned; c = c->snext); + for(i = 0; i < LENGTH(tags); i++) { + dc.w = TEXTW(tags[i]); + if(tagset[seltags] & 1 << i) { + drawtext(tags[i], dc.sel, isurgent(i)); + drawsquare(c && c->tags & 1 << i, isoccupied(i), isurgent(i), dc.sel); } else { - drawtext(tags[i], dc.norm); - drawsquare(sel && sel->tags[i], isoccupied(i), dc.norm); + drawtext(tags[i], dc.norm, isurgent(i)); + drawsquare(c && c->tags & 1 << i, isoccupied(i), isurgent(i), dc.norm); } dc.x += dc.w; } - dc.w = blw; - drawtext(layouts[ltidx].symbol, dc.norm); - x = dc.x + dc.w; - dc.w = textw(stext); - dc.x = sw - dc.w; + if(blw > 0) { + dc.w = blw; + drawtext(lt->symbol, dc.norm, ismax); + x = dc.x + dc.w; + } + else + x = dc.x; + dc.w = TEXTW(stext); + dc.x = ww - dc.w; if(dc.x < x) { dc.x = x; - dc.w = sw - x; + dc.w = ww - x; } - drawtext(stext, dc.norm); + drawtext(stext, dc.norm, False); if((dc.w = dc.x - x) > bh) { dc.x = x; - if(sel) { - drawtext(sel->name, dc.sel); - drawsquare(sel->ismax, sel->isfloating, dc.sel); + if(c) { + drawtext(c->name, dc.sel, False); + drawsquare(c->isfixed, c->isfloating, False, dc.sel); } else - drawtext(NULL, dc.norm); + drawtext(NULL, dc.norm, False); } - XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, sw, bh, 0, 0); + XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, ww, bh, 0, 0); XSync(dpy, False); } void -drawsquare(Bool filled, Bool empty, 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 }; - gcv.foreground = col[ColFG]; + gcv.foreground = col[invert ? ColBG : ColFG]; XChangeGC(dpy, dc.gc, GCForeground, &gcv); x = (dc.font.ascent + dc.font.descent + 2) / 4; r.x = dc.x + 1; @@ -593,67 +550,45 @@ drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]) { } void -drawtext(const char *text, unsigned long col[ColLast]) { - int x, y, w, h; - static char buf[256]; - unsigned int len, olen; +drawtext(const char *text, ulong col[ColLast], Bool invert) { + int i, x, y, h, len, olen; XRectangle r = { dc.x, dc.y, dc.w, dc.h }; + char buf[256]; - XSetForeground(dpy, dc.gc, col[ColBG]); + 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; 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; - if(len < olen) { - if(len > 1) - buf[len - 1] = '.'; - if(len > 2) - buf[len - 2] = '.'; - if(len > 3) - buf[len - 3] = '.'; - } - if(w > dc.w) - return; /* too long */ - XSetForeground(dpy, dc.gc, col[ColFG]); + for(; len && (i = textnw(buf, len)) > dc.w - h; len--); + if(!len) + return; + if(len < olen) + for(i = len; i >= MAX(0, len - 3); buf[i--] = '.'); + 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); else XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len); } -void * -emallocz(unsigned int size) { - void *res = calloc(1, size); - - if(!res) - eprint("fatal: could not malloc() %u bytes\n", size); - return res; -} - void enternotify(XEvent *e) { Client *c; XCrossingEvent *ev = &e->xcrossing; - if(ev->mode != NotifyNormal || ev->detail == NotifyInferior) + if((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && ev->window != root) return; if((c = getclient(ev->window))) focus(c); - else if(ev->window == root) { - selscreen = True; + else focus(NULL); - } } void @@ -670,25 +605,14 @@ void expose(XEvent *e) { XExposeEvent *ev = &e->xexpose; - if(ev->count == 0) { - if(barwin == ev->window) - 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); + if(ev->count == 0 && (ev->window == barwin)) + drawbar(); } void focus(Client *c) { - if((!c && selscreen) || (c && !isvisible(c))) - for(c = stack; c && !isvisible(c); c = c->snext); + if(!c || c->isbanned) + for(c = stack; c && c->isbanned; c = c->snext); if(sel && sel != c) { grabbuttons(sel, False); XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]); @@ -697,28 +621,32 @@ focus(Client *c) { detachstack(c); attachstack(c); grabbuttons(c, True); - } - sel = c; - drawbar(); - if(!selscreen) - return; - if(c) { XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]); XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime); } else XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); + sel = c; + drawbar(); +} + +void +focusin(XEvent *e) { /* there are some broken focus acquiring clients */ + XFocusChangeEvent *ev = &e->xfocus; + + if(sel && ev->window != sel->win) + XSetInputFocus(dpy, sel->win, RevertToPointerRoot, CurrentTime); } void -focusnext(const char *arg) { +focusnext(const void *arg) { Client *c; if(!sel) return; - for(c = sel->next; c && !isvisible(c); c = c->next); + for(c = sel->next; c && c->isbanned; c = c->next); if(!c) - for(c = clients; c && !isvisible(c); c = c->next); + for(c = clients; c && c->isbanned; c = c->next); if(c) { focus(c); restack(); @@ -726,15 +654,15 @@ focusnext(const char *arg) { } void -focusprev(const char *arg) { +focusprev(const void *arg) { Client *c; if(!sel) return; - for(c = sel->prev; c && !isvisible(c); c = c->prev); + for(c = sel->prev; c && c->isbanned; c = c->prev); if(!c) { for(c = clients; c && c->next; c = c->next); - for(; c && !isvisible(c); c = c->prev); + for(; c && c->isbanned; c = c->prev); } if(c) { focus(c); @@ -750,7 +678,7 @@ getclient(Window w) { return c; } -unsigned long +ulong getcolor(const char *colstr) { Colormap cmap = DefaultColormap(dpy, screen); XColor color; @@ -765,7 +693,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], @@ -779,7 +707,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; @@ -794,8 +722,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); } @@ -807,47 +734,49 @@ 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); } -unsigned int -idxoftag(const char *tag) { - unsigned int i; +void +grabkeys(void) { + uint i, j; + KeyCode code; + XModifierKeymap *modmap; - for(i = 0; (i < NTAGS) && (tags[i] != tag); i++); - return (i < NTAGS) ? i : 0; + /* init modifier map */ + modmap = XGetModifierMapping(dpy); + for(i = 0; i < 8; i++) + for(j = 0; j < modmap->max_keypermod; j++) { + if(modmap->modifiermap[i * modmap->max_keypermod + j] == XKeysymToKeycode(dpy, XK_Num_Lock)) + numlockmask = (1 << i); + } + XFreeModifiermap(modmap); + + 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); + } } void @@ -872,10 +801,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++; } } @@ -893,17 +820,11 @@ initfont(const char *fontstr) { } Bool -isarrange(void (*func)()) -{ - return func == layouts[ltidx].arrange; -} - -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; } @@ -924,52 +845,32 @@ isprotodel(Client *c) { } Bool -isvisible(Client *c) { - unsigned int i; +isurgent(uint t) { + Client *c; - for(i = 0; i < NTAGS; i++) - if(c->tags[i] && seltags[i]) + for(c = clients; c; c = c->next) + if(c->isurgent && c->tags & 1 << t) return True; return False; } void keypress(XEvent *e) { - KEYS - unsigned int len = sizeof keys / sizeof keys[0]; - unsigned int i; - KeyCode code; + uint i; 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)) - { - if(keys[i].func) - keys[i].func(keys[i].arg); - } + && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state) + && keys[i].func) + keys[i].func(keys[i].arg); } void -killclient(const char *arg) { +killclient(const void *arg) { XEvent ev; if(!sel) @@ -988,66 +889,58 @@ killclient(const char *arg) { } void -leavenotify(XEvent *e) { - XCrossingEvent *ev = &e->xcrossing; - - if((ev->window == root) && !ev->same_screen) { - selscreen = False; - focus(NULL); - } -} - -void manage(Window w, XWindowAttributes *wa) { Client *c, *t = NULL; - Window trans; Status rettrans; + Window trans; XWindowChanges wc; - c = emallocz(sizeof(Client)); - c->tags = emallocz(sizeof seltags); + if(!(c = calloc(1, sizeof(Client)))) + eprint("fatal: could not calloc() %u bytes\n", sizeof(Client)); c->win = w; + + /* geometry */ c->x = wa->x; 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 > wax + waw) - c->x = wax + waw - c->w - 2 * c->border; - if(c->y + c->h + 2 * c->border > way + wah) - c->y = way + wah - c->h - 2 * c->border; - if(c->x < wax) - c->x = wax; - if(c->y < way) - c->y = way; - 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 */ updatesizehints(c); - XSelectInput(dpy, w, - StructureNotifyMask | PropertyChangeMask | EnterWindowMask); + XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask); grabbuttons(c, False); updatetitle(c); if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success)) for(t = clients; t && t->win != trans; t = t->next); if(t) - memcpy(c->tags, t->tags, sizeof seltags); - applyrules(c); + c->tags = t->tags; + else + applyrules(c); if(!c->isfloating) c->isfloating = (rettrans == Success) || c->isfixed; + if(c->isfloating) + XRaiseWindow(dpy, c->win); attach(c); attachstack(c); XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); /* some windows require this */ - ban(c); XMapWindow(dpy, c->win); setclientstate(c, NormalState); arrange(); @@ -1059,7 +952,7 @@ mappingnotify(XEvent *e) { XRefreshKeyboardMapping(ev); if(ev->request == MappingKeyboard) - keypress(NULL); + grabkeys(); } void @@ -1078,19 +971,19 @@ maprequest(XEvent *e) { void movemouse(Client *c) { int x1, y1, ocx, ocy, di, nx, ny; - unsigned int dui; + uint dui; Window dummy; XEvent ev; + restack(); 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; - c->ismax = False; XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui); for(;;) { - XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &ev); + XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev); switch (ev.type) { case ButtonRelease: XUngrabPointer(dpy, CurrentTime); @@ -1104,15 +997,21 @@ movemouse(Client *c) { XSync(dpy, False); nx = ocx + (ev.xmotion.x - x1); ny = ocy + (ev.xmotion.y - y1); - if(abs(wax + nx) < SNAP) - nx = wax; - else if(abs((wax + waw) - (nx + c->w + 2 * c->border)) < SNAP) - nx = wax + waw - c->w - 2 * c->border; - if(abs(way - ny) < SNAP) - ny = way; - else if(abs((way + wah) - (ny + c->h + 2 * c->border)) < SNAP) - ny = way + wah - c->h - 2 * c->border; - 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; } } @@ -1120,7 +1019,7 @@ movemouse(Client *c) { Client * nexttiled(Client *c) { - for(; c && (c->isfloating || !isvisible(c)); c = c->next); + for(; c && (c->isfloating || c->isbanned); c = c->next); return c; } @@ -1134,15 +1033,19 @@ propertynotify(XEvent *e) { return; /* ignore */ if((c = getclient(ev->window))) { switch (ev->atom) { - default: break; - case XA_WM_TRANSIENT_FOR: - XGetTransientForHint(dpy, c->win, &trans); - if(!c->isfloating && (c->isfloating = (NULL != getclient(trans)))) - arrange(); - break; - case XA_WM_NORMAL_HINTS: - updatesizehints(c); - break; + default: break; + case XA_WM_TRANSIENT_FOR: + XGetTransientForHint(dpy, c->win, &trans); + if(!c->isfloating && (c->isfloating = (getclient(trans) != NULL))) + arrange(); + break; + case XA_WM_NORMAL_HINTS: + updatesizehints(c); + break; + case XA_WM_HINTS: + updatewmhints(c); + drawbar(); + break; } if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) { updatetitle(c); @@ -1153,7 +1056,7 @@ propertynotify(XEvent *e) { } void -quit(const char *arg) { +quit(const void *arg) { readin = running = False; } @@ -1163,20 +1066,19 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) { 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; } @@ -1190,33 +1092,38 @@ 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; - /* offscreen appearance fixes */ - if(x > sw) - x = sw - w - 2 * c->border; - if(y > sh) - y = sh - h - 2 * c->border; - if(x + w + 2 * c->border < sx) + if(x > sx + sw) + x = sw - w - 2 * c->bw; + if(y > sy + sh) + 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) { + if(h < bh) + h = bh; + if(w < bh) + w = bh; + if(c->x != x || c->y != y || c->w != w || c->h != h || c->ismoved) { + c->ismoved = False; 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; - XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc); + wc.border_width = c->bw; + XConfigureWindow(dpy, c->win, + CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc); configure(c); XSync(dpy, False); } @@ -1228,19 +1135,19 @@ resizemouse(Client *c) { int nw, nh; XEvent ev; + restack(); 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; - c->ismax = False; - 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); + 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; @@ -1251,11 +1158,17 @@ 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; - resize(c, c->x, c->y, nw, nh, True); + 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; } } @@ -1270,21 +1183,16 @@ restack(void) { drawbar(); if(!sel) return; - if(sel->isfloating || isarrange(floating)) + if(ismax || sel->isfloating || !lt->arrange) XRaiseWindow(dpy, sel->win); - if(!isarrange(floating)) { + if(!ismax && 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 && !c->isbanned) { + XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc); + wc.sibling = c->win; + } } XSync(dpy, False); while(XCheckMaskEvent(dpy, EnterWindowMask, &ev)); @@ -1293,14 +1201,19 @@ restack(void) { void run(void) { char *p; - int r, xfd; + char sbuf[sizeof stext]; fd_set rd; + int r, xfd; + uint 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; + sbuf[len] = stext[len] = '\0'; /* 0-terminator is never touched */ while(running) { FD_ZERO(&rd); if(readin) @@ -1312,10 +1225,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, sbuf + 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: @@ -1323,10 +1235,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 = sbuf + offset; r > 0; p++, r--, offset++) + if(*p == '\n' || *p == '\0') { + *p = '\0'; + strncpy(stext, sbuf, len); + p += r - 1; /* p is sbuf + offset + r - 1 */ + for(r = 0; *(p - r) && *(p - r) != '\n'; r++); + offset = r; + if(r) + memmove(sbuf, p - r + 1, r); + break; + } + break; } drawbar(); } @@ -1340,7 +1260,7 @@ run(void) { void scan(void) { - unsigned int i, num; + uint i, num; Window *wins, d1, d2; XWindowAttributes wa; @@ -1373,58 +1293,36 @@ setclientstate(Client *c, long state) { PropModeReplace, (unsigned char *)data, 2); } +/* arg > 1.0 will set mfact absolutly */ void -setlayout(const char *arg) { - unsigned int i; +setmfact(const void *arg) { + double d = *((double*) arg); - if(!arg) { - if(++ltidx == nlayouts) - ltidx = 0;; - } - else { - for(i = 0; i < nlayouts; i++) - if(!strcmp(arg, layouts[i].symbol)) - break; - if(i == nlayouts) - return; - ltidx = i; - } - if(sel) - arrange(); - else - drawbar(); -} - -void -setmwfact(const char *arg) { - double delta; - - if(!(ISTILE)) + if(!d || !lt->arrange) return; - /* arg handling, manipulate mwfact */ - if(arg == NULL) - mwfact = MWFACT; - else if(1 == sscanf(arg, "%lf", &delta)) { - if(arg[0] == '+' || arg[0] == '-') - mwfact += delta; - else - mwfact = delta; - if(mwfact < 0.1) - mwfact = 0.1; - else if(mwfact > 0.9) - mwfact = 0.9; - } + d = d < 1.0 ? d + mfact : d - 1.0; + if(d < 0.1 || d > 0.9) + return; + mfact = d; arrange(); } void setup(void) { - int d; - unsigned int i, j, mask; - Window w; - XModifierKeymap *modmap; + 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); wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False); @@ -1432,42 +1330,12 @@ setup(void) { wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False); netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", 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); + wa.cursor = cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr); cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing); cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur); - /* init geometry */ - sx = sy = 0; - sw = DisplayWidth(dpy, screen); - sh = DisplayHeight(dpy, screen); - - /* init modifier map */ - modmap = XGetModifierMapping(dpy); - for(i = 0; i < 8; i++) - for(j = 0; j < modmap->max_keypermod; j++) { - if(modmap->modifiermap[i * modmap->max_keypermod + j] - == XKeysymToKeycode(dpy, XK_Num_Lock)) - numlockmask = (1 << i); - } - XFreeModifiermap(modmap); - - /* select for events */ - wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask - | EnterWindowMask | LeaveWindowMask | StructureNotifyMask; - wa.cursor = cursor[CurNormal]; - XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa); - XSelectInput(dpy, root, wa.event_mask); - - /* grab keys */ - keypress(NULL); - - /* init tags */ - compileregs(); - /* init appearance */ dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR); dc.norm[ColBG] = getcolor(NORMBGCOLOR); @@ -1476,47 +1344,52 @@ setup(void) { dc.sel[ColBG] = getcolor(SELBGCOLOR); dc.sel[ColFG] = getcolor(SELFGCOLOR); initfont(FONT); - dc.h = bh = dc.font.height + 2; - - /* init layouts */ - mwfact = MWFACT; - nlayouts = sizeof layouts / sizeof layouts[0]; - for(blw = i = 0; i < nlayouts; i++) { - j = textw(layouts[i].symbol); - if(j > blw) - blw = j; - } + 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 bar */ - bpos = BARPOS; + 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, sx, sy, sw, bh, 0, - DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen), - CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); + wa.event_mask = ButtonPressMask|ExposureMask; + + barwin = XCreateWindow(dpy, root, wx, by, ww, bh, 0, DefaultDepth(dpy, screen), + CopyFromParent, DefaultVisual(dpy, screen), + CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa); XDefineCursor(dpy, barwin, cursor[CurNormal]); - updatebarpos(); XMapRaised(dpy, barwin); strcpy(stext, "dwm-"VERSION); - dc.drawable = XCreatePixmap(dpy, root, sw, 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); + drawbar(); - /* multihead support */ - selscreen = XQueryPointer(dpy, root, &w, &w, &d, &d, &d, &d, &mask); + /* EWMH support per view */ + XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32, + PropModeReplace, (unsigned char *) netatom, NetLast); + + /* select for events */ + wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask + |EnterWindowMask|LeaveWindowMask|StructureNotifyMask; + XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa); + XSelectInput(dpy, root, wa.event_mask); + + + /* grab keys */ + grabkeys(); } 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) { @@ -1524,8 +1397,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); @@ -1534,19 +1407,15 @@ spawn(const char *arg) { } void -tag(const char *arg) { - unsigned int i; - - if(!sel) - return; - for(i = 0; i < NTAGS; 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) { @@ -1556,141 +1425,107 @@ textnw(const char *text, unsigned int len) { return XTextWidth(dc.font.xfont, text, len); } -unsigned int -textw(const char *text) { - return textnw(text, strlen(text)) + dc.font.height; -} - void tile(void) { - unsigned int i, n, nx, ny, nw, nh, mw, th; - Client *c, *mc; - - for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next)) - n++; - - /* window geoms */ - mw = (n == 1) ? waw : mwfact * waw; - th = (n > 1) ? wah / (n - 1) : 0; - if(n > 1 && th < bh) - th = wah; - - nx = wax; - ny = way; - nw = 0; /* gcc stupidity requires this */ - for(i = 0, c = mc = nexttiled(clients); c; c = nexttiled(c->next), i++) { - c->ismax = False; - if(i == 0) { /* master */ - nw = mw - 2 * c->border; - nh = wah - 2 * c->border; - } - else { /* tile window */ - if(i == 1) { - ny = way; - nx += mc->w + 2 * mc->border; - nw = waw - nx - 2 * c->border; - } - if(i + 1 == n) /* remainder */ - nh = (way + wah) - ny - 2 * c->border; - else - nh = th - 2 * c->border; - } - resize(c, nx, ny, nw, nh, True); - if((c->h < bh) || (c->h > nh) || (c->w < bh) || (c->w > nw)) - /* client doesn't accept geometry, so enforce it */ - resize(c, nx, ny, nw, nh, False); - if(n > 1 && th != wah) - ny = c->y + c->h + 2 * c->border; + int x, y, h, w, mw; + uint i, n; + Client *c; + + for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next), n++); + if(n == 0) + return; + + /* master */ + c = nexttiled(clients); + mw = mfact * ww; + resize(c, wx, wy, (n == 1 ? ww : mw) - 2 * c->bw, wh - 2 * c->bw, resizehints); + + if(--n == 0) + return; + + /* tile stack */ + x = (wx + mw > c->x + c->w) ? c->x + c->w + 2 * c->bw : wx + mw; + y = wy; + w = (wx + mw > c->x + c->w) ? wx + ww - x : ww - mw; + h = wh / n; + if(h < bh) + h = wh; + + for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) { + resize(c, x, y, w - 2 * c->bw, /* remainder */ ((i + 1 == n) + ? (wy + wh) - y : h) - 2 * c->bw, resizehints); + if(h != wh) + y = c->y + c->h + 2 * c->bw; } } void -togglebar(const char *arg) { - if(bpos == BarOff) - bpos = (BARPOS == BarOff) ? BarTop : BARPOS; - else - bpos = BarOff; - updatebarpos(); +togglebar(const void *arg) { + showbar = !showbar; + updategeom(); + updatebar(); arrange(); } void -togglefloating(const char *arg) { +togglefloating(const void *arg) { if(!sel) return; - sel->isfloating = !sel->isfloating; + sel->isfloating = !sel->isfloating || sel->isfixed; if(sel->isfloating) resize(sel, sel->x, sel->y, sel->w, sel->h, True); arrange(); } void -togglemax(const char *arg) { - XEvent ev; +togglelayout(const void *arg) { + uint i; - if(!sel || sel->isfixed) - return; - if((sel->ismax = !sel->ismax)) { - if(isarrange(floating) || sel->isfloating) - sel->wasfloating = True; - else { - togglefloating(NULL); - sel->wasfloating = False; - } - sel->rx = sel->x; - sel->ry = sel->y; - sel->rw = sel->w; - sel->rh = sel->h; - resize(sel, wax, way, waw - 2 * sel->border, wah - 2 * sel->border, True); + if(!arg) { + if(++lt == &layouts[LENGTH(layouts)]) + lt = &layouts[0]; } else { - resize(sel, sel->rx, sel->ry, sel->rw, sel->rh, True); - if(!sel->wasfloating) - togglefloating(NULL); + for(i = 0; i < LENGTH(layouts); i++) + if(!strcmp((char *)arg, layouts[i].symbol)) + break; + if(i == LENGTH(layouts)) + return; + lt = &layouts[i]; } - drawbar(); - while(XCheckMaskEvent(dpy, EnterWindowMask, &ev)); + if(sel) + arrange(); + else + drawbar(); } void -toggletag(const char *arg) { - unsigned int i, j; - - if(!sel) - 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; /* at least one tag must be enabled */ +togglemax(const void *arg) { + ismax = !ismax; arrange(); } void -toggleview(const char *arg) { - unsigned int i, j; - - i = idxoftag(arg); - seltags[i] = !seltags[i]; - for(j = 0; j < NTAGS && !seltags[j]; j++); - if(j == NTAGS) - seltags[i] = True; /* at least one tag must be viewed */ - arrange(); +toggletag(const void *arg) { + if(sel && (sel->tags ^ ((*(int *)arg) & TAGMASK))) { + sel->tags ^= (*(int *)arg) & TAGMASK; + arrange(); + } } void -unban(Client *c) { - if(!c->isbanned) - return; - XMoveWindow(dpy, c->win, c->x, c->y); - c->isbanned = False; +toggleview(const void *arg) { + if((tagset[seltags] ^ ((*(int *)arg) & TAGMASK))) { + tagset[seltags] ^= (*(int *)arg) & TAGMASK; + arrange(); + } } 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); @@ -1701,7 +1536,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); @@ -1719,29 +1553,39 @@ unmapnotify(XEvent *e) { } void -updatebarpos(void) { - XEvent ev; +updatebar(void) { + if(dc.drawable != 0) + XFreePixmap(dpy, dc.drawable); + dc.drawable = XCreatePixmap(dpy, root, ww, bh, DefaultDepth(dpy, screen)); + XMoveResizeWindow(dpy, barwin, wx, by, ww, bh); +} - wax = sx; - way = sy; - wah = sh; - waw = sw; - switch(bpos) { - default: - wah -= bh; - way += bh; - XMoveWindow(dpy, barwin, sx, sy); - break; - case BarBot: - wah -= bh; - XMoveWindow(dpy, barwin, sx, sy + wah); - break; - case BarOff: - XMoveWindow(dpy, barwin, sx, sy - bh); - break; +void +updategeom(void) { +#ifdef XINERAMA + int i; + 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); } - XSync(dpy, False); - while(XCheckMaskEvent(dpy, EnterWindowMask, &ev)); + else +#endif + { + wx = sx; + wy = showbar && topbar ? sy + bh : sy; + ww = sw; + wh = showbar ? sh - bh : sh; + } + + /* bar position */ + by = showbar ? (topbar ? wy - bh : wy + wh) : -bh; } void @@ -1749,42 +1593,40 @@ updatesizehints(Client *c) { long msize; XSizeHints size; - if(!XGetWMNormalHints(dpy, c->win, &size, &msize) || !size.flags) - size.flags = PSize; - c->flags = size.flags; - if(c->flags & PBaseSize) { + XGetWMNormalHints(dpy, c->win, &size, &msize); + if(size.flags & PBaseSize) { c->basew = size.base_width; c->baseh = size.base_height; } - else if(c->flags & PMinSize) { + else if(size.flags & PMinSize) { c->basew = size.min_width; c->baseh = size.min_height; } else c->basew = c->baseh = 0; - if(c->flags & PResizeInc) { + if(size.flags & PResizeInc) { c->incw = size.width_inc; c->inch = size.height_inc; } else c->incw = c->inch = 0; - if(c->flags & PMaxSize) { + if(size.flags & PMaxSize) { c->maxw = size.max_width; c->maxh = size.max_height; } else c->maxw = c->maxh = 0; - if(c->flags & PMinSize) { + if(size.flags & PMinSize) { c->minw = size.min_width; c->minh = size.min_height; } - else if(c->flags & PBaseSize) { + else if(size.flags & PBaseSize) { c->minw = size.base_width; c->minh = size.base_height; } else c->minw = c->minh = 0; - if(c->flags & PAspect) { + if(size.flags & PAspect) { c->minax = size.min_aspect.x; c->maxax = size.max_aspect.x; c->minay = size.min_aspect.y; @@ -1802,6 +1644,27 @@ updatetitle(Client *c) { gettextprop(c->win, wmatom[WMName], c->name, sizeof c->name); } +void +updatewmhints(Client *c) { + XWMHints *wmh; + + if((wmh = XGetWMHints(dpy, c->win))) { + if(c == sel) + sel->isurgent = False; + else + c->isurgent = (wmh->flags & XUrgencyHint) ? True : False; + XFree(wmh); + } +} + +void +view(const void *arg) { + seltags ^= 1; /* toggle sel tagset */ + if(arg && (*(int *)arg & TAGMASK)) + tagset[seltags] = *(int *)arg & TAGMASK; + arrange(); +} + /* There's no way to check accesses to destroyed windows, thus those cases are * ignored (especially on UnmapNotify's). Other types of errors call Xlibs * default error handler, which may call exit. */ @@ -1813,56 +1676,36 @@ 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 */ } int -xerrordummy(Display *dsply, XErrorEvent *ee) { +xerrordummy(Display *dpy, XErrorEvent *ee) { return 0; } /* Startup Error handler to check if another window manager * is already running. */ int -xerrorstart(Display *dsply, XErrorEvent *ee) { +xerrorstart(Display *dpy, XErrorEvent *ee) { otherwm = True; return -1; } void -view(const char *arg) { - unsigned int i; - - memcpy(prevtags, seltags, sizeof seltags); - for(i = 0; i < NTAGS; i++) - seltags[i] = arg == NULL; - seltags[idxoftag(arg)] = True; - arrange(); -} - -void -viewprevtag(const char *arg) { - static Bool tmptags[sizeof tags / sizeof tags[0]]; - - memcpy(tmptags, seltags, sizeof seltags); - memcpy(seltags, prevtags, sizeof seltags); - memcpy(prevtags, tmptags, sizeof seltags); - arrange(); -} - -void -zoom(const char *arg) { - Client *c; +zoom(const void *arg) { + Client *c = sel; - if(!sel || !(ISTILE) || sel->isfloating) + if(ismax || !lt->arrange || (sel && sel->isfloating)) return; - if((c = sel) == nexttiled(clients)) - if(!(c = nexttiled(c->next))) + if(c == nexttiled(clients)) + if(!c || !(c = nexttiled(c->next))) return; detach(c); attach(c); @@ -1873,19 +1716,16 @@ 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-2008 dwm engineers, see LICENSE for details\n"); else if(argc != 1) eprint("usage: dwm [-v]\n"); setlocale(LC_CTYPE, ""); if(!(dpy = XOpenDisplay(0))) eprint("dwm: cannot open display\n"); - screen = DefaultScreen(dpy); - root = RootWindow(dpy, screen); checkotherwm(); setup(); - drawbar(); scan(); run(); cleanup();