simplification

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 4a8c2a9..5095b62 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -53,7 +53,6 @@
 #define MOUSEMASK       (BUTTONMASK|PointerMotionMask)
 
 /* enums */
-enum { BarTop, BarBot, BarOff, BarLast };               /* bar appearance */
 enum { CurNormal, CurResize, CurMove, CurLast };        /* cursor */
 enum { ColBorder, ColFG, ColBG, ColLast };              /* color */
 enum { NetSupported, NetWMName, NetLast };              /* EWMH atoms */
@@ -165,11 +164,14 @@ void restack(void);
 void run(void);
 void scan(void);
 void setclientstate(Client *c, long state);
+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 tileresize(Client *c, int x, int y, int w, int h);
 void togglebar(const char *arg);
 void togglefloating(const char *arg);
 void togglelayout(const char *arg);
@@ -181,6 +183,7 @@ void unmapnotify(XEvent *e);
 void updatebar(void);
 void updategeom(void);
 void updatesizehints(Client *c);
+void updatetilegeom(void);
 void updatetitle(Client *c);
 void updatewmhints(Client *c);
 void view(const char *arg);
@@ -194,6 +197,7 @@ void zoom(const char *arg);
 char stext[256];
 int screen, sx, sy, sw, sh;
 int bx, by, bw, bh, blw, wx, wy, ww, wh;
+int mx, my, mw, mh, tx, ty, tw, th;
 int seltags = 0;
 int (*xerrorxlib)(Display *, XErrorEvent *);
 unsigned int numlockmask = 0;
@@ -338,10 +342,8 @@ buttonpress(XEvent *e) {
                        restack();
                        movemouse(c);
                }
-               else if(ev->button == Button2) {
-                       if(lt->arrange && c->isfloating)
-                               togglefloating(NULL);
-               }
+               else if(ev->button == Button2)
+                       togglefloating(NULL);
                else if(ev->button == Button3 && !c->isfixed) {
                        restack();
                        resizemouse(c);
@@ -958,12 +960,12 @@ manage(Window w, XWindowAttributes *wa) {
                c->bw = wa->border_width;
        }
        else {
-               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);
+               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;
        }
 
@@ -1333,6 +1335,24 @@ setclientstate(Client *c, long state) {
 }
 
 void
+setmfact(const char *arg) {
+       double d;
+
+       if(!arg || lt->arrange != tile)
+               return;
+       else {
+               d = strtod(arg, NULL);
+               if(arg[0] == '-' || arg[0] == '+')
+                       d += mfact;
+               if(d < 0.1 || d > 0.9)
+                       return;
+               mfact = d;
+       }
+       updatetilegeom();
+       arrange();
+}
+
+void
 setup(void) {
        unsigned int i, w;
        XSetWindowAttributes wa;
@@ -1467,6 +1487,53 @@ textw(const char *text) {
 }
 
 void
+tile(void) {
+       int x, y, h, w;
+       unsigned int i, n;
+       Client *c;
+
+       for(n = 0, c = nextunfloating(clients); c; c = nextunfloating(c->next), n++);
+       if(n == 0)
+               return;
+
+       /* master */
+       c = nextunfloating(clients);
+
+       if(n == 1)
+               tileresize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw);
+       else
+               tileresize(c, mx, my, mw - 2 * c->bw, mh - 2 * c->bw);
+
+       if(--n == 0)
+               return;
+
+       /* tile stack */
+       x = (tx > c->x + c->w) ? c->x + c->w + 2 * c->bw : tw;
+       y = ty;
+       w = (tx > c->x + c->w) ? wx + ww - x : tw;
+       h = th / n;
+       if(h < bh)
+               h = th;
+
+       for(i = 0, c = nextunfloating(c->next); c; c = nextunfloating(c->next), i++) {
+               if(i + 1 == n) /* remainder */
+                       tileresize(c, x, y, w - 2 * c->bw, (ty + th) - y - 2 * c->bw);
+               else
+                       tileresize(c, x, y, w - 2 * c->bw, h - 2 * c->bw);
+               if(h != th)
+                       y = c->y + c->h + 2 * c->bw;
+       }
+}
+
+void
+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
 togglebar(const char *arg) {
        showbar = !showbar;
        updategeom();
@@ -1590,7 +1657,7 @@ updategeom(void) {
        if(XineramaIsActive(dpy)) {
                info = XineramaQueryScreens(dpy, &i);
                wx = info[0].x_org;
-               wy = showbar && topbar ? info[0].y_org + info[0].height + bh : info[0].y_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);
@@ -1668,6 +1735,21 @@ updatesizehints(Client *c) {
 }
 
 void
+updatetilegeom(void) {
+       /* master area geometry */
+       mx = wx;
+       my = wy;
+       mw = mfact * ww;
+       mh = wh;
+
+       /* tile area geometry */
+       tx = mx + mw;
+       ty = wy;
+       tw = ww - mw;
+       th = wh;
+}
+
+void
 updatetitle(Client *c) {
        if(!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name))
                gettextprop(c->win, wmatom[WMName], c->name, sizeof c->name);
@@ -1733,6 +1815,21 @@ xerrorstart(Display *dpy, XErrorEvent *ee) {
        return -1;
 }
 
+void
+zoom(const char *arg) {
+       Client *c = sel;
+
+       if(c == nextunfloating(clients))
+               if(!c || !(c = nextunfloating(c->next)))
+                       return;
+       if(lt->arrange == tile && !sel->isfloating) {
+               detach(c);
+               attach(c);
+               focus(c);
+       }
+       arrange();
+}
+
 int
 main(int argc, char *argv[]) {
        if(argc == 2 && !strcmp("-v", argv[1]))