X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=dwm.c;h=8c512752098a96fe3b5128c518c9e431fc3d59cc;hp=68a9d1d8d4f0413e62f08b5ae68b47397c2027a0;hb=c05962512840e181356750fd2061f8430d7193ed;hpb=59aa02a0750ebc82dbcb30897bbf427391edffa0 diff --git a/dwm.c b/dwm.c index 68a9d1d..8c51275 100644 --- a/dwm.c +++ b/dwm.c @@ -33,42 +33,31 @@ #include #include #include -#include #include #include #include #include #include #include -/* - * TODO: Idea: - * I intend to not provide real Xinerama support, but instead having a Column - * tilecols[] array which is used by tile(), and a Column maxcols[] arrays which is used by - * maximise(). Those arrays should be initialized in config.h. For simplicity - * reasons mwfact should be replaced with a more advanced method which - * implements the same, but using the boundary between tilecols[0] and - * tilecols[1] instead. Besides this, get rid of BARPOS and use instead the - * following mechanism: - * - * #define BX 0 - * #define BY 0 - * #define BW sw - * bh is calculated automatically and should be used for the - */ -//#ifdef XINERAMA -#include -//#endif /* macros */ +#define MAX(a, b) ((a)>(b)?(a):(b)) +#define MIN(a, b) ((a)<(b)?(a):(b)) #define BUTTONMASK (ButtonPressMask|ButtonReleaseMask) #define CLEANMASK(mask) (mask & ~(numlockmask|LockMask)) #define LENGTH(x) (sizeof x / sizeof x[0]) #define MAXTAGLEN 16 #define MOUSEMASK (BUTTONMASK|PointerMotionMask) - +#define DEFGEOM(GEONAME,BX,BY,BW,WX,WY,WW,WH,MX,MY,MW,MH,TX,TY,TW,TH,MOX,MOY,MOW,MOH) \ +void GEONAME(void) { \ + bx = (BX); by = (BY); bw = (BW); \ + wx = (WX); wy = (WY); ww = (WW); wh = (WH); \ + mx = (MX); my = (MY); mw = (MW); mh = (MH); \ + tx = (TX); ty = (TY); tw = (TW); th = (TH); \ + mox = (MOX); moy = (MOY); mow = (MOW); moh = (MOH); \ +} /* 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 */ @@ -82,7 +71,7 @@ struct Client { int basew, baseh, incw, inch, maxw, maxh, minw, minh; int minax, maxax, minay, maxay; long flags; - unsigned int border, oldborder; + unsigned int bw, oldbw; Bool isbanned, isfixed, isfloating, isurgent; Bool *tags; Client *next; @@ -93,10 +82,6 @@ struct Client { typedef struct { int x, y, w, h; -} Column; - -typedef struct { - int x, y, w, h; unsigned long norm[ColLast]; unsigned long sel[ColLast]; Drawable drawable; @@ -111,6 +96,11 @@ typedef struct { } DC; /* draw context */ typedef struct { + const char *symbol; + void (*apply)(void); +} Geom; + +typedef struct { unsigned long mod; KeySym keysym; void (*func)(const char *arg); @@ -120,10 +110,13 @@ typedef struct { typedef struct { const char *symbol; void (*arrange)(void); -} Layout; + Bool isfloating; +} Layout; typedef struct { - const char *prop; + const char *class; + const char *instance; + const char *title; const char *tag; Bool isfloating; } Rule; @@ -140,6 +133,7 @@ void cleanup(void); void configure(Client *c); void configurenotify(XEvent *e); void configurerequest(XEvent *e); +unsigned int counttiled(void); void destroynotify(XEvent *e); void detach(Client *c); void detachstack(Client *c); @@ -172,7 +166,7 @@ void killclient(const char *arg); void manage(Window w, XWindowAttributes *wa); void mappingnotify(XEvent *e); void maprequest(XEvent *e); -void maximise(void); +void monocle(void); void movemouse(Client *c); Client *nexttiled(Client *c); void propertynotify(XEvent *e); @@ -184,15 +178,20 @@ void restack(void); void run(void); void scan(void); void setclientstate(Client *c, long state); +void setgeom(const char *arg); void setlayout(const char *arg); -void setmwfact(const char *arg); +void setmfact(const char *arg); void setup(void); void spawn(const char *arg); void tag(const char *arg); unsigned int textnw(const char *text, unsigned int len); unsigned int textw(const char *text); -void tile(void); -void togglebar(const char *arg); +void tileh(void); +void tilehstack(unsigned int n); +Client *tilemaster(unsigned int n); +void tileresize(Client *c, int x, int y, int w, int h); +void tilev(void); +void tilevstack(unsigned int n); void togglefloating(const char *arg); void toggletag(const char *arg); void toggleview(const char *arg); @@ -209,15 +208,14 @@ int xerror(Display *dpy, XErrorEvent *ee); int xerrordummy(Display *dpy, XErrorEvent *ee); int xerrorstart(Display *dpy, XErrorEvent *ee); void zoom(const char *arg); -void selectview(const char *arg); /* variables */ char stext[256], buf[256]; -double mwfact; -int screen, sx, sy, sw, sh, wax, way, waw, wah, ncols; +int screen, sx, sy, sw, sh; int (*xerrorxlib)(Display *, XErrorEvent *); -unsigned int bh, bpos; -unsigned int blw = 0; +int bx, by, bw, bh, blw, bgw, mx, my, mw, mh, mox, moy, mow, moh, tx, ty, tw, th, wx, wy, ww, wh; +int viewtags_set = 0; +double mfact; unsigned int numlockmask = 0; void (*handler[LASTEvent]) (XEvent *) = { [ButtonPress] = buttonpress, @@ -234,26 +232,23 @@ void (*handler[LASTEvent]) (XEvent *) = { [UnmapNotify] = unmapnotify }; Atom wmatom[WMLast], netatom[NetLast]; -Bool domwfact = True; -Bool dozoom = True; Bool otherwm, readin; Bool running = True; -Bool *prevtags; Bool *seltags; +Bool *viewtags[2]; Client *clients = NULL; Client *sel = NULL; Client *stack = NULL; -Column *cols = NULL; Cursor cursor[CurLast]; Display *dpy; DC dc = {0}; -Layout *lt; 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)]; +Layout *lt = layouts; +Geom *geom = geoms; /* function implementations */ @@ -268,10 +263,9 @@ 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; @@ -320,7 +314,7 @@ void ban(Client *c) { if(c->isbanned) return; - XMoveWindow(dpy, c->win, c->x + 3 * sw, c->y); + XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y); c->isbanned = True; } @@ -331,10 +325,14 @@ buttonpress(XEvent *e) { XButtonPressedEvent *ev = &e->xbutton; if(ev->window == barwin) { - x = 0; + if((ev->x < bgw) && ev->button == Button1) { + setgeom(NULL); + return; + } + x = bgw; for(i = 0; i < LENGTH(tags); i++) { x += textw(tags[i]); - if(ev->x < x) { + if(ev->x >= bgw && ev->x < x) { if(ev->button == Button1) { if(ev->state & MODKEY) tag(tags[i]); @@ -350,7 +348,7 @@ buttonpress(XEvent *e) { return; } } - if((ev->x < x + blw) && ev->button == Button1) + if((ev->x < x + blw) && ev->button == Button1) setlayout(NULL); } else if((c = getclient(ev->window))) { @@ -392,7 +390,6 @@ checkotherwm(void) { void cleanup(void) { - close(STDIN_FILENO); while(stack) { unban(stack); @@ -402,7 +399,6 @@ cleanup(void) { XFreeFontSet(dpy, dc.font.set); else XFreeFont(dpy, dc.font.xfont); - XUngrabKey(dpy, AnyKey, AnyModifier, root); XFreePixmap(dpy, dc.drawable); XFreeGC(dpy, dc.gc); @@ -426,7 +422,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); @@ -437,14 +433,9 @@ configurenotify(XEvent *e) { XConfigureEvent *ev = &e->xconfigure; if(ev->window == root && (ev->width != sw || ev->height != sh)) { - /* TODO -- use Xinerama dimensions here ? */ sw = ev->width; sh = ev->height; - XFreePixmap(dpy, dc.drawable); - dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(root, screen), bh, DefaultDepth(dpy, screen)); - XResizeWindow(dpy, barwin, sw, bh); - updatebarpos(); - arrange(); + setgeom(geom->symbol); } } @@ -454,11 +445,10 @@ configurerequest(XEvent *e) { XConfigureRequestEvent *ev = &e->xconfigurerequest; XWindowChanges wc; - /* TODO -- consider Xinerama if necessary when centering */ if((c = getclient(ev->window))) { if(ev->value_mask & CWBorderWidth) - c->border = ev->border_width; - if(c->isfixed || c->isfloating || (floating == lt->arrange)) { + c->bw = ev->border_width; + if(c->isfixed || c->isfloating || lt->isfloating) { if(ev->value_mask & CWX) c->x = sx + ev->x; if(ev->value_mask & CWY) @@ -493,14 +483,13 @@ configurerequest(XEvent *e) { XSync(dpy, False); } -Bool -conflicts(Client *c, unsigned int tidx) { - unsigned int i; +unsigned int +counttiled(void) { + unsigned int n; + Client *c; - for(i = 0; i < LENGTH(tags); i++) - if(c->tags[i]) - return True; /* conflict */ - return False; + for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next), n++); + return n; } void @@ -537,6 +526,11 @@ drawbar(void) { Client *c; dc.x = 0; + if(bgw > 0) { + dc.w = bgw; + drawtext(geom->symbol, dc.norm, False); + dc.x += bgw; + } for(c = stack; c && !isvisible(c); c = c->snext); for(i = 0; i < LENGTH(tags); i++) { dc.w = textw(tags[i]); @@ -550,14 +544,18 @@ drawbar(void) { } dc.x += dc.w; } - dc.w = blw; - drawtext(lt->symbol, dc.norm, False); - x = dc.x + dc.w; + if(blw > 0) { + dc.w = blw; + drawtext(lt->symbol, dc.norm, False); + x = dc.x + dc.w; + } + else + x = dc.x; dc.w = textw(stext); - dc.x = sw - dc.w; + dc.x = bw - dc.w; if(dc.x < x) { dc.x = x; - dc.w = sw - x; + dc.w = bw - x; } drawtext(stext, dc.norm, False); if((dc.w = dc.x - x) > bh) { @@ -569,7 +567,7 @@ drawbar(void) { else 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, bw, bh, 0, 0); XSync(dpy, False); } @@ -605,9 +603,8 @@ drawtext(const char *text, unsigned long col[ColLast], Bool invert) { 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 - 1); memcpy(buf, text, len); buf[len] = 0; h = dc.font.ascent + dc.font.descent; @@ -677,7 +674,6 @@ void floating(void) { /* default floating layout */ Client *c; - domwfact = dozoom = False; for(c = clients; c; c = c->next) if(isvisible(c)) resize(c, c->x, c->y, c->w, c->h, True); @@ -810,39 +806,20 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) { void grabbuttons(Client *c, Bool focused) { - XUngrabButton(dpy, AnyButton, AnyModifier, c->win); + int i, j; + unsigned int buttons[] = { Button1, Button2, Button3 }; + unsigned int modifiers[] = { MODKEY, MODKEY|LockMask, MODKEY|numlockmask, + MODKEY|numlockmask|LockMask} ; - if(focused) { - XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK, - GrabModeAsync, GrabModeSync, None, None); - XGrabButton(dpy, Button1, MODKEY|LockMask, c->win, False, BUTTONMASK, - GrabModeAsync, GrabModeSync, None, None); - XGrabButton(dpy, Button1, MODKEY|numlockmask, c->win, False, BUTTONMASK, - GrabModeAsync, GrabModeSync, None, None); - XGrabButton(dpy, Button1, MODKEY|numlockmask|LockMask, c->win, False, BUTTONMASK, - GrabModeAsync, GrabModeSync, None, None); - - XGrabButton(dpy, Button2, MODKEY, c->win, False, BUTTONMASK, - GrabModeAsync, GrabModeSync, None, None); - XGrabButton(dpy, Button2, MODKEY|LockMask, c->win, False, BUTTONMASK, - GrabModeAsync, GrabModeSync, None, None); - XGrabButton(dpy, Button2, MODKEY|numlockmask, c->win, False, BUTTONMASK, - GrabModeAsync, GrabModeSync, None, None); - XGrabButton(dpy, Button2, MODKEY|numlockmask|LockMask, c->win, False, BUTTONMASK, - GrabModeAsync, GrabModeSync, None, None); - - XGrabButton(dpy, Button3, MODKEY, c->win, False, BUTTONMASK, - GrabModeAsync, GrabModeSync, None, None); - XGrabButton(dpy, Button3, MODKEY|LockMask, c->win, False, BUTTONMASK, - GrabModeAsync, GrabModeSync, None, None); - XGrabButton(dpy, Button3, MODKEY|numlockmask, c->win, False, BUTTONMASK, - GrabModeAsync, GrabModeSync, None, None); - XGrabButton(dpy, Button3, MODKEY|numlockmask|LockMask, c->win, False, BUTTONMASK, - GrabModeAsync, GrabModeSync, None, None); - } + XUngrabButton(dpy, AnyButton, AnyModifier, c->win); + if(focused) + for(i = 0; i < LENGTH(buttons); i++) + for(j = 0; j < LENGTH(modifiers); j++) + XGrabButton(dpy, buttons[i], modifiers[j], c->win, False, + BUTTONMASK, GrabModeAsync, GrabModeSync, None, None); else - XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK, - GrabModeAsync, GrabModeSync, None, None); + XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, + BUTTONMASK, GrabModeAsync, GrabModeSync, None, None); } void @@ -878,7 +855,7 @@ unsigned int idxoftag(const char *t) { unsigned int i; - for(i = 0; (i < LENGTH(tags)) && (tags[i] != t); i++); + for(i = 0; (i < LENGTH(tags)) && t && strcmp(tags[i], t); i++); return (i < LENGTH(tags)) ? i : 0; } @@ -904,10 +881,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++; } } @@ -1016,29 +991,28 @@ manage(Window w, XWindowAttributes *wa) { c->tags = emallocz(TAGSZ); c->win = w; - c->x = wa->x + sx; - c->y = wa->y + sy; + /* 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 > wx + ww) + c->x = wx + ww - c->w - 2 * c->bw; + if(c->y + c->h + 2 * c->bw > wy + wh) + c->y = wy + wh - c->h - 2 * c->bw; + c->x = MAX(c->x, wx); + c->y = MAX(c->y, wy); + 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 */ @@ -1086,12 +1060,12 @@ maprequest(XEvent *e) { } void -maximise(void) { +monocle(void) { Client *c; - domwfact = dozoom = False; - for(c = nexttiled(clients); c; c = nexttiled(c->next)) - resize(c, wax, way, waw - 2 * c->border, wah - 2 * c->border, RESIZEHINTS); + for(c = clients; c; c = c->next) + if((lt->isfloating || !c->isfloating) && isvisible(c)) + resize(c, mox, moy, mow - 2 * c->bw, moh - 2 * c->bw, RESIZEHINTS); } void @@ -1122,17 +1096,17 @@ 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; - if(!c->isfloating && (lt->arrange != floating) && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP)) + if(abs(wx - nx) < SNAP) + nx = wx; + else if(abs((wx + ww) - (nx + c->w + 2 * c->bw)) < SNAP) + nx = wx + ww - c->w - 2 * c->bw; + if(abs(wy - ny) < SNAP) + ny = wy; + else if(abs((wy + wh) - (ny + c->h + 2 * c->bw)) < SNAP) + ny = wy + wh - c->h - 2 * c->bw; + if(!c->isfloating && !lt->isfloating && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP)) togglefloating(NULL); - if((lt->arrange == floating) || c->isfloating) + if((lt->isfloating) || c->isfloating) resize(c, nx, ny, c->w, c->h, False); break; } @@ -1184,11 +1158,10 @@ quit(const char *arg) { 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); + memset(c->tags, 0, TAGSZ); applyrules(c); } arrange(); @@ -1200,20 +1173,20 @@ 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; } @@ -1227,31 +1200,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); @@ -1270,13 +1243,13 @@ resizemouse(Client *c) { if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync, None, cursor[CurResize], CurrentTime) != GrabSuccess) return; - XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->border - 1, c->h + c->border - 1); + XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1); for(;;) { XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask , &ev); switch(ev.type) { case ButtonRelease: XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, - c->w + c->border - 1, c->h + c->border - 1); + c->w + c->bw - 1, c->h + c->bw - 1); XUngrabPointer(dpy, CurrentTime); while(XCheckMaskEvent(dpy, EnterWindowMask, &ev)); return; @@ -1287,13 +1260,11 @@ 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->arrange != floating) && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP)) + nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1); + nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1); + if(!c->isfloating && !lt->isfloating && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP)) togglefloating(NULL); - if((lt->arrange == floating) || c->isfloating) + if((lt->isfloating) || c->isfloating) resize(c, c->x, c->y, nw, nh, True); break; } @@ -1309,9 +1280,9 @@ restack(void) { drawbar(); if(!sel) return; - if(sel->isfloating || (lt->arrange == floating)) + if(sel->isfloating || lt->isfloating) XRaiseWindow(dpy, sel->win); - if(lt->arrange != floating) { + if(!lt->isfloating) { wc.stack_mode = Below; wc.sibling = barwin; if(!sel->isfloating) { @@ -1425,12 +1396,32 @@ setclientstate(Client *c, long state) { } void +setgeom(const char *arg) { + unsigned int i; + + if(!arg) { + if(++geom == &geoms[LENGTH(geoms)]) + geom = &geoms[0]; + } + else { + for(i = 0; i < LENGTH(geoms); i++) + if(!strcmp(geoms[i].symbol, arg)) + break; + if(i == LENGTH(geoms)) + return; + geom = &geoms[i]; + } + geom->apply(); + updatebarpos(); + arrange(); +} + +void setlayout(const char *arg) { unsigned int i; if(!arg) { - lt++; - if(lt == &layouts[LENGTH(layouts)]) + if(++lt == &layouts[LENGTH(layouts)]) lt = &layouts[0]; } else { @@ -1448,51 +1439,42 @@ setlayout(const char *arg) { } void -setmwfact(const char *arg) { - double delta; +setmfact(const char *arg) { + double d; - if(!domwfact) + if(lt->isfloating) return; - /* arg handling, manipulate mwfact */ - if(arg == NULL) - mwfact = MWFACT; - else if(sscanf(arg, "%lf", &delta) == 1) { - 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; + if(!arg) + mfact = MFACT; + else { + d = strtod(arg, NULL); + if(arg[0] == '-' || arg[0] == '+') + d += mfact; + if(d < 0.1 || d > 0.9) + return; + mfact = d; } - arrange(); + setgeom(geom->symbol); } void setup(void) { - int screens = 1; - unsigned int i; + unsigned int i, w; XSetWindowAttributes wa; -//#ifdef XINERAMA - XineramaScreenInfo *info; -//#endif /* init screen */ screen = DefaultScreen(dpy); root = RootWindow(dpy, screen); + initfont(FONT); + + /* apply default geometry */ sx = 0; sy = 0; sw = DisplayWidth(dpy, screen); sh = DisplayHeight(dpy, screen); - if(XineramaIsActive(dpy)) { - if((info = XineramaQueryScreens(dpy, &screens))) { - sx = info[0].x_org; - sy = info[0].y_org; - sw = info[0].width; - sh = info[0].height; - } - } + bh = dc.font.height + 2; + mfact = MFACT; + geom->apply(); /* init atoms */ wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False); @@ -1507,36 +1489,6 @@ setup(void) { cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing); cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur); - ncols = 2; -#if 0 - if(XineramaIsActive(dpy)) { - if((info = XineramaQueryScreens(dpy, &screens))) { - if(screens >= 1) { - sx = info[0].x_org; - sy = info[0].y_org; - sw = info[0].width; - sh = info[0].height; - } - else { - ncols = screens; - cols = emallocz(ncols * sizeof(Column)); - for(i = 0; i < ncols; i++) { - cols[i].x = info[i].x_org; - cols[i].y = info[i].y_org; - cols[i].w = info[i].width; - cols[i].h = info[i].height; - } - } - XFree(info); - } - } - else - { - cols = emallocz(ncols * sizeof(Column)); - cols[0].x = sx; - cols[0].y = sy; - } -#endif /* init appearance */ dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR); dc.norm[ColBG] = getcolor(NORMBGCOLOR); @@ -1545,7 +1497,7 @@ 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); @@ -1553,32 +1505,29 @@ setup(void) { XSetFont(dpy, dc.gc, dc.font.xfont->fid); /* init tags */ - seltags = emallocz(TAGSZ); - prevtags = emallocz(TAGSZ); - seltags[0] = prevtags[0] = True; + viewtags[0] = emallocz(TAGSZ); + viewtags[1] = emallocz(TAGSZ); + viewtags[0][0] = viewtags[1][0] = True; + seltags = viewtags[0]; - /* init layouts */ - mwfact = MWFACT; - lt = &layouts[0]; - - /* TODO: Xinerama hints ? */ /* 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); + } + for(bgw = i = 0; LENGTH(geoms) > 1 && i < LENGTH(geoms); i++) { + w = textw(geoms[i].symbol); + bgw = MAX(bgw, w); } - bpos = BARPOS; 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), + 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]); - updatebarpos(); XMapRaised(dpy, barwin); strcpy(stext, "dwm-"VERSION); drawbar(); @@ -1651,57 +1600,76 @@ textw(const char *text) { } void -tile(void) { - unsigned int i, n, nx, ny, nw, nh, mw, th; - Client *c, *mc; +tileh(void) { + int x, w; + unsigned int i, n = counttiled(); + Client *c; - domwfact = dozoom = True; - nx = wax; - ny = way; - nw = 0; - for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next)) - n++; + if(n == 0) + return; + c = tilemaster(n); + if(--n == 0) + return; - /* window geoms */ - mw = (n == 1) ? waw : mwfact * waw; - th = (n > 1) ? wah / (n - 1) : 0; - if(n > 1 && th < bh) - th = wah; + x = tx; + w = tw / n; + if(w < bh) + w = tw; - for(i = 0, c = mc = nexttiled(clients); c; c = nexttiled(c->next)) { - 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 - mw - 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, RESIZEHINTS); - if((RESIZEHINTS) && ((c->h < bh) || (c->h > nh) || (c->w < bh) || (c->w > nw))) - /* client doesn't accept size constraints */ - resize(c, nx, ny, nw, nh, False); - if(n > 1 && th != wah) - ny = c->y + c->h + 2 * c->border; - i++; + for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) { + if(i + 1 == n) /* remainder */ + tileresize(c, x, ty, (tx + tw) - x - 2 * c->bw, th - 2 * c->bw); + else + tileresize(c, x, ty, w - 2 * c->bw, th - 2 * c->bw); + if(w != tw) + x = c->x + c->w + 2 * c->bw; } } -void -togglebar(const char *arg) { - if(bpos == BarOff) - bpos = (BARPOS == BarOff) ? BarTop : BARPOS; +Client * +tilemaster(unsigned int n) { + Client *c = nexttiled(clients); + + if(n == 1) + tileresize(c, mox, moy, mow - 2 * c->bw, moh - 2 * c->bw); else - bpos = BarOff; - updatebarpos(); - arrange(); + tileresize(c, mx, my, mw - 2 * c->bw, mh - 2 * c->bw); + return c; +} + +void +tileresize(Client *c, int x, int y, int w, int h) { + resize(c, x, y, w, h, RESIZEHINTS); + if((RESIZEHINTS) && ((c->h < bh) || (c->h > h) || (c->w < bh) || (c->w > w))) + /* client doesn't accept size constraints */ + resize(c, x, y, w, h, False); +} + +void +tilev(void) { + int y, h; + unsigned int i, n = counttiled(); + Client *c; + + if(n == 0) + return; + c = tilemaster(n); + if(--n == 0) + return; + + y = ty; + h = th / n; + if(h < bh) + h = th; + + for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) { + if(i + 1 == n) /* remainder */ + tileresize(c, tx, y, tw - 2 * c->bw, (ty + th) - y - 2 * c->bw); + else + tileresize(c, tx, y, tw - 2 * c->bw, h - 2 * c->bw); + if(h != th) + y = c->y + c->h + 2 * c->bw; + } } void @@ -1721,8 +1689,6 @@ toggletag(const char *arg) { if(!sel) return; i = idxoftag(arg); - if(conflicts(sel, i)) - return; sel->tags[i] = !sel->tags[i]; for(j = 0; j < LENGTH(tags) && !sel->tags[j]; j++); if(j == LENGTH(tags)) @@ -1754,7 +1720,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); @@ -1784,28 +1750,11 @@ unmapnotify(XEvent *e) { void updatebarpos(void) { - XEvent ev; - 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; - } - XSync(dpy, False); - while(XCheckMaskEvent(dpy, EnterWindowMask, &ev)); + 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 @@ -1870,17 +1819,18 @@ void updatewmhints(Client *c) { XWMHints *wmh; - if(c == sel) - return; if((wmh = XGetWMHints(dpy, c->win))) { - c->isurgent = (wmh->flags & XUrgencyHint) ? True : False; + if(c == sel) + sel->isurgent = False; + else + c->isurgent = (wmh->flags & XUrgencyHint) ? True : False; XFree(wmh); } } - void view(const char *arg) { + Bool tmp[LENGTH(tags)]; unsigned int i; for(i = 0; i < LENGTH(tags); i++) @@ -1888,7 +1838,7 @@ view(const char *arg) { tmp[idxoftag(arg)] = True; if(memcmp(seltags, tmp, TAGSZ) != 0) { - memcpy(prevtags, seltags, TAGSZ); + seltags = viewtags[viewtags_set ^= 1]; /* toggle tagset */ memcpy(seltags, tmp, TAGSZ); arrange(); } @@ -1896,10 +1846,7 @@ view(const char *arg) { void viewprevtag(const char *arg) { - - memcpy(tmp, seltags, TAGSZ); - memcpy(seltags, prevtags, TAGSZ); - memcpy(prevtags, tmp, TAGSZ); + seltags = viewtags[viewtags_set ^= 1]; /* toggle tagset */ arrange(); } @@ -1939,7 +1886,7 @@ void zoom(const char *arg) { Client *c = sel; - if(!sel || !dozoom || sel->isfloating) + if(!sel || lt->isfloating || sel->isfloating) return; if(c == nexttiled(clients)) if(!(c = nexttiled(c->next))) @@ -1970,3 +1917,4 @@ main(int argc, char *argv[]) { XCloseDisplay(dpy); return 0; } +