X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/f7c097e8029c7d0dc00db52fc04a2b8192fc2bc9..2c2063bc751d2b0db815c26734f186e64f0b9c12:/dwm.c diff --git a/dwm.c b/dwm.c index 018f929..0e72c47 100644 --- a/dwm.c +++ b/dwm.c @@ -33,16 +33,12 @@ #include #include #include -#include #include #include #include #include #include #include -#ifdef XINERAMA -#include -#endif /* macros */ #define BUTTONMASK (ButtonPressMask|ButtonReleaseMask) @@ -50,10 +46,16 @@ #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 */ @@ -67,7 +69,7 @@ struct Client { int basew, baseh, incw, inch, maxw, maxh, minw, minh; int minax, maxax, minay, maxay; long flags; - unsigned int border, oldborder; + unsigned int bw, oldbw; Bool isbanned, isfixed, isfloating, isurgent; Bool *tags; Client *next; @@ -91,6 +93,11 @@ typedef struct { } font; } DC; /* draw context */ +typedef struct { + const char *symbol; + void (*apply)(void); +} Geom; + typedef struct { unsigned long mod; KeySym keysym; @@ -101,10 +108,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; @@ -121,6 +131,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); @@ -153,6 +164,7 @@ void killclient(const char *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); @@ -164,15 +176,19 @@ 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 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); @@ -189,15 +205,12 @@ 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, xscreens; +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; unsigned int numlockmask = 0; void (*handler[LASTEvent]) (XEvent *) = { [ButtonPress] = buttonpress, @@ -214,8 +227,6 @@ 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; @@ -226,11 +237,9 @@ Client *stack = NULL; Cursor cursor[CurLast]; Display *dpy; DC dc = {0}; -Layout *lt; +Geom *geom = NULL; +Layout *lt = NULL; Window root, barwin; -#ifdef XINERAMA -XineramaScreenInfo *info = NULL; -#endif /* configuration, allows nested code to access above variables */ #include "config.h" @@ -250,9 +259,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)) + || (ch.res_class && r->class && strstr(ch.res_class, r->class)) + || (ch.res_name && r->instance && strstr(ch.res_name, r->instance))) { c->isfloating = r->isfloating; if(r->tag) { @@ -302,7 +311,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; } @@ -313,10 +322,10 @@ buttonpress(XEvent *e) { XButtonPressedEvent *ev = &e->xbutton; if(ev->window == barwin) { - x = 0; + 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]); @@ -332,8 +341,6 @@ buttonpress(XEvent *e) { return; } } - if((ev->x < x + blw) && ev->button == Button1) - setlayout(NULL); } else if((c = getclient(ev->window))) { focus(c); @@ -374,7 +381,6 @@ checkotherwm(void) { void cleanup(void) { - close(STDIN_FILENO); while(stack) { unban(stack); @@ -384,7 +390,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); @@ -392,10 +397,6 @@ cleanup(void) { XFreeCursor(dpy, cursor[CurResize]); XFreeCursor(dpy, cursor[CurMove]); XDestroyWindow(dpy, barwin); -#if XINERAMA - if(info) - XFree(info); -#endif XSync(dpy, False); XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime); } @@ -412,7 +413,7 @@ configure(Client *c) { ce.y = c->y; ce.width = c->w; ce.height = c->h; - ce.border_width = c->border; + ce.border_width = c->bw; ce.above = None; ce.override_redirect = False; XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce); @@ -423,14 +424,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(NULL); } } @@ -440,11 +436,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) @@ -479,14 +474,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 @@ -523,6 +517,9 @@ drawbar(void) { Client *c; dc.x = 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]); @@ -540,10 +537,10 @@ drawbar(void) { drawtext(lt->symbol, dc.norm, False); x = dc.x + dc.w; 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) { @@ -555,7 +552,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); } @@ -663,7 +660,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); @@ -864,7 +860,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; } @@ -1002,31 +998,30 @@ manage(Window w, XWindowAttributes *wa) { c->tags = emallocz(TAGSZ); c->win = w; - applyrules(c); - - 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; + if(c->x < wx) + c->x = wx; + if(c->y < wy) + 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 */ @@ -1038,6 +1033,8 @@ manage(Window w, XWindowAttributes *wa) { for(t = clients; t && t->win != trans; t = t->next); if(t) memcpy(c->tags, t->tags, TAGSZ); + else + applyrules(c); if(!c->isfloating) c->isfloating = (rettrans == Success) || c->isfixed; attach(c); @@ -1071,6 +1068,15 @@ 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 - 2 * c->bw, moh - 2 * c->bw, RESIZEHINTS); +} + void movemouse(Client *c) { int x1, y1, ocx, ocy, di, nx, ny; @@ -1099,17 +1105,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; } @@ -1216,19 +1222,19 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) { if(w <= 0 || h <= 0) return; if(x > sx + sw) - x = sw - w - 2 * c->border; + x = sw - w - 2 * c->bw; if(y > sy + sh) - y = sh - h - 2 * c->border; - if(x + w + 2 * c->border < sx) + y = sh - h - 2 * c->bw; + if(x + w + 2 * c->bw < sx) x = sx; - if(y + h + 2 * c->border < sy) + if(y + h + 2 * c->bw < sy) y = sy; if(c->x != x || c->y != y || c->w != w || c->h != h) { c->x = wc.x = x; c->y = wc.y = y; c->w = wc.width = w; c->h = wc.height = h; - wc.border_width = c->border; + wc.border_width = c->bw; XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc); configure(c); @@ -1247,13 +1253,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; @@ -1264,13 +1270,13 @@ resizemouse(Client *c) { break; case MotionNotify: XSync(dpy, False); - if((nw = ev.xmotion.x - ocx - 2 * c->border + 1) <= 0) + if((nw = ev.xmotion.x - ocx - 2 * c->bw + 1) <= 0) nw = 1; - if((nh = ev.xmotion.y - ocy - 2 * c->border + 1) <= 0) + if((nh = ev.xmotion.y - ocy - 2 * c->bw + 1) <= 0) nh = 1; - if(!c->isfloating && (lt->arrange != floating) && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP)) + 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; } @@ -1286,9 +1292,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) { @@ -1401,21 +1407,37 @@ setclientstate(Client *c, long state) { PropModeReplace, (unsigned char *)data, 2); } +void +setgeom(const char *arg) { + unsigned int i; + + for(i = 0; arg && i < LENGTH(geoms); i++) + if(!strcmp(geoms[i].symbol, arg)) + break; + if(i == LENGTH(geoms)) + return; + geom = &geoms[i]; + geom->apply(); + updatebarpos(); + arrange(); +} + void setlayout(const char *arg) { + static Layout *revert = 0; unsigned int i; - if(!arg) { - lt++; - if(lt == &layouts[LENGTH(layouts)]) - lt = &layouts[0]; - } + if(!arg) + return; + for(i = 0; i < LENGTH(layouts); i++) + if(!strcmp(arg, layouts[i].symbol)) + break; + if(i == LENGTH(layouts)) + return; + if(revert && &layouts[i] == lt) + lt = revert; else { - for(i = 0; i < LENGTH(layouts); i++) - if(arg == layouts[i].symbol) - break; - if(i == LENGTH(layouts)) - return; + revert = lt; lt = &layouts[i]; } if(sel) @@ -1424,40 +1446,24 @@ setlayout(const char *arg) { drawbar(); } -void -setmwfact(const char *arg) { - double delta; - - if(!domwfact) - 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; - } - arrange(); -} - void setup(void) { - unsigned int i; + unsigned int i, w; XSetWindowAttributes wa; /* 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); + bh = dc.font.height + 2; + geom = &geoms[0]; + geom->apply(); /* init atoms */ wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False); @@ -1472,11 +1478,6 @@ setup(void) { cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing); cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur); -#ifdef XINERAMA - if(XineramaIsActive(dpy)) - info = XineramaQueryScreens(dpy, &xscreens); -#endif - /* init appearance */ dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR); dc.norm[ColBG] = getcolor(NORMBGCOLOR); @@ -1485,7 +1486,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); @@ -1498,27 +1499,28 @@ setup(void) { seltags[0] = prevtags[0] = True; /* 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; + w = textw(layouts[i].symbol); + if(w > blw) + blw = w; + } + for(bgw = i = 0; i < LENGTH(geoms); i++) { + w = textw(geoms[i].symbol); + if(w > bgw) + 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(); @@ -1591,57 +1593,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 @@ -1661,8 +1682,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)) @@ -1694,7 +1713,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); @@ -1724,28 +1743,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 @@ -1811,7 +1813,10 @@ updatewmhints(Client *c) { XWMHints *wmh; 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); } } @@ -1877,7 +1882,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)))