JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
make tabs out of extra slave windows
[dwm.git] / dwm.c
diff --git a/dwm.c b/dwm.c
index d5eec04..362e902 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -61,7 +61,7 @@ enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
 enum { SchemeNorm, SchemeSel, SchemeLast }; /* color schemes */
 enum { NetSupported, NetWMName, NetWMState,
        NetWMFullscreen, NetWMWindowOpacity, NetActiveWindow, NetWMWindowType,
-       NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
+       NetWMWindowTypeDialog, NetClientList, NetSupportingWMCheck, NetLast }; /* EWMH atoms */
 enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */
 enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
        ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
@@ -90,6 +90,7 @@ struct Client {
        int oldx, oldy, oldw, oldh;
        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
        int bw, oldbw;
+       int opacity;
        unsigned int tags;
        Bool isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen, screen_hog;
        Client *next;
@@ -191,8 +192,8 @@ static void pop(Client *);
 static void propertynotify(XEvent *e);
 static void quit(const Arg *arg);
 static Monitor *recttomon(int x, int y, int w, int h);
-static void resize(Client *c, int x, int y, int w, int h, Bool interact);
-static void resizeclient(Client *c, int x, int y, int w, int h);
+static void resize(Client *c, int x, int y, int w, int h, Bool interact, Client *base);
+static void resizeclient(Client *c, int x, int y, int w, int h, Client *base);
 static void resizemouse(const Arg *arg);
 static void restack(Monitor *m);
 static void run(void);
@@ -272,22 +273,59 @@ static Monitor *mons, *selmon;
 static Window root;
 
 // unfocused windows get transparent (feature)
-static const unsigned long unfocused_opacity[] = { 0xbfffffff };
-static const unsigned long invisible_opacity[] = { 0x00000000 };
+static const unsigned long opacities[] = { 0, 0xbfffffff, 0x00000000 }; // first unused
 static void window_set_opaque(Client *c);
 static void window_set_translucent(Client *c);
 static void window_set_invisible(Client *c);
+static void window_set_opacity(Client *c, int opacity_index);
+static void update_window_opacities(Monitor *m);
+void
+window_set_opacity(Client *c, int opacity_index) {
+       if (c->opacity == opacity_index) {
+               return;
+       }
+       c->opacity = opacity_index;
+       if (opacity_index == 0) {
+               XDeleteProperty(dpy, c->win, netatom[NetWMWindowOpacity]);
+       } else {
+               XChangeProperty(dpy, c->win, netatom[NetWMWindowOpacity], XA_CARDINAL, 32, PropModeReplace, (unsigned char *)(&opacities[opacity_index]), 1);
+       }
+}
 void
 window_set_opaque(Client *c) {
-       XDeleteProperty(dpy, c->win, netatom[NetWMWindowOpacity]);
+       window_set_opacity(c, 0);
 }
 void
 window_set_translucent(Client *c) {
-       XChangeProperty(dpy, c->win, netatom[NetWMWindowOpacity], XA_CARDINAL, 32, PropModeReplace, (unsigned char *)unfocused_opacity, 1);
+       window_set_opacity(c, 1);
 }
 void
 window_set_invisible(Client *c) {
-       XChangeProperty(dpy, c->win, netatom[NetWMWindowOpacity], XA_CARDINAL, 32, PropModeReplace, (unsigned char *)invisible_opacity, 1);
+       window_set_opacity(c, 2);
+}
+void
+update_window_opacities(Monitor *m) {
+       Client *master, *slave, *c;
+       Bool selection_floating = False;
+       slave = master = nexttiled(m->clients);
+       if (master) slave = nexttiled(master->next);
+       if (m->sel && m->sel != master) {
+               if (nexttiled(m->sel) == m->sel) // if selection is tiled
+                       slave = m->sel;
+               else
+                       selection_floating = True;
+       }
+       for (c = m->clients; c; c = c->next) {
+               if (ISVISIBLE(c)) {
+                       if (c->isfloating || c == m->sel || (c == master && selection_floating)) {
+                               window_set_opaque(c);
+                       } else if (c == master || c == slave) {
+                               window_set_translucent(c);
+                       } else {
+                               window_set_opaque(c);
+                       }
+               }
+       }
 }
 
 
@@ -849,6 +887,8 @@ focus(Client *c) {
                XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
        }
        selmon->sel = c;
+       jason_layout(selmon);
+       update_window_opacities(selmon);
        drawbars();
        if(c && (!root || (c->win!=root)) )
                window_set_opaque(c);
@@ -1069,6 +1109,7 @@ manage(Window w, XWindowAttributes *wa) {
 
        if(!(c = calloc(1, sizeof(Client))))
                die("fatal: could not malloc() %u bytes\n", sizeof(Client));
+       c->opacity = -1; // who knows
        c->win = w;
        updatetitle(c);
        if(XGetTransientForHint(dpy, w, &trans) && (t = wintoclient(trans))) {
@@ -1156,7 +1197,7 @@ monocle(Monitor *m) {
        if(n > 0) /* override layout symbol */
                snprintf(m->ltsymbol, sizeof m->ltsymbol, "[%d]", n);
        for(c = nexttiled(m->clients); c; c = nexttiled(c->next))
-               resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, False);
+               resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, False, 0);
 }
 
 void
@@ -1225,7 +1266,7 @@ movemouse(const Arg *arg) {
                                        togglefloating(NULL);
                        }
                        if(!selmon->lt[selmon->sellt]->arrange || c->isfloating)
-                               resize(c, nx, ny, c->w, c->h, True);
+                               resize(c, nx, ny, c->w, c->h, True, 0);
                        break;
                }
        } while(ev.type != ButtonRelease);
@@ -1312,21 +1353,28 @@ recttomon(int x, int y, int w, int h) {
 }
 
 void
-resize(Client *c, int x, int y, int w, int h, Bool interact) {
+resize(Client *c, int x, int y, int w, int h, Bool interact, Client *base) {
        if(applysizehints(c, &x, &y, &w, &h, interact))
-               resizeclient(c, x, y, w, h);
+               resizeclient(c, x, y, w, h, base);
 }
 
 void
-resizeclient(Client *c, int x, int y, int w, int h) {
+resizeclient(Client *c, int x, int y, int w, int h, Client *base) {
        XWindowChanges wc;
+       unsigned long mask = CWX|CWY|CWWidth|CWHeight|CWBorderWidth;
 
        c->oldx = c->x; c->x = wc.x = x;
        c->oldy = c->y; c->y = wc.y = y;
        c->oldw = c->w; c->w = wc.width = w;
        c->oldh = c->h; c->h = wc.height = h;
+       base = 0;
+       if (base) {
+               wc.stack_mode = Above;
+               wc.sibling = base->win;
+               mask |= CWStackMode|CWSibling;
+       }
        wc.border_width = c->bw;
-       XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
+       XConfigureWindow(dpy, c->win, mask, &wc);
        configure(c);
        XSync(dpy, False);
 }
@@ -1373,7 +1421,7 @@ resizemouse(const Arg *arg) {
                                        togglefloating(NULL);
                        }
                        if(!selmon->lt[selmon->sellt]->arrange || c->isfloating)
-                               resize(c, c->x, c->y, nw, nh, True);
+                               resize(c, c->x, c->y, nw, nh, True, 0);
                        break;
                }
        } while(ev.type != ButtonRelease);
@@ -1401,10 +1449,11 @@ restack(Monitor *m) {
        if(m->lt[m->sellt]->arrange) {
                wc.stack_mode = Below;
                wc.sibling = m->barwin;
-               for(c = m->stack; c; c = c->snext)
+               for(c = m->clients; c; c = c->next)
                        if(!c->isfloating && ISVISIBLE(c)) {
                                XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
                                wc.sibling = c->win;
+                               wc.stack_mode = Above;
                        }
        }
        XSync(dpy, False);
@@ -1515,7 +1564,7 @@ setfullscreen(Client *c, Bool fullscreen) {
                c->oldbw = c->bw;
                c->bw = 0;
                c->isfloating = True;
-               resizeclient(c, c->mon->mx, c->mon->my, c->mon->mw, c->mon->mh);
+               resizeclient(c, c->mon->mx, c->mon->my, c->mon->mw, c->mon->mh, 0);
                XRaiseWindow(dpy, c->win);
        }
        else {
@@ -1528,7 +1577,7 @@ setfullscreen(Client *c, Bool fullscreen) {
                c->y = c->oldy;
                c->w = c->oldw;
                c->h = c->oldh;
-               resizeclient(c, c->x, c->y, c->w, c->h);
+               resizeclient(c, c->x, c->y, c->w, c->h, 0);
                arrange(c->mon);
        }
 }
@@ -1591,6 +1640,7 @@ setup(void) {
        netatom[NetWMWindowType] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE", False);
        netatom[NetWMWindowTypeDialog] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_DIALOG", False);
        netatom[NetClientList] = XInternAtom(dpy, "_NET_CLIENT_LIST", False);
+       netatom[NetSupportingWMCheck] = XInternAtom(dpy, "_NET_SUPPORTING_WM_CHECK", False);
        /* init cursors */
        cursor[CurNormal] = drw_cur_create(drw, XC_left_ptr);
        cursor[CurResize] = drw_cur_create(drw, XC_sizing);
@@ -1626,7 +1676,7 @@ showhide(Client *c) {
        if(ISVISIBLE(c)) { /* show clients top down */
                XMoveWindow(dpy, c->win, c->x, c->y);
                if((!c->mon->lt[c->mon->sellt]->arrange || c->isfloating) && !c->isfullscreen)
-                       resize(c, c->x, c->y, c->w, c->h, False);
+                       resize(c, c->x, c->y, c->w, c->h, False, 0);
                showhide(c->snext);
        }
        else { /* hide clients bottom up */
@@ -1652,8 +1702,8 @@ spawn(const Arg *arg) {
                                break;
                        }
                }
-               _SWM_WS[8] = swm_tags[tag][0];
-               _SWM_WS[9] = swm_tags[tag][1];
+               WORKSPACE_NUMBER[17] = workspace_numbers_str[tag][0];
+               WORKSPACE_NUMBER[18] = workspace_numbers_str[tag][1];
        }
        if(arg->v == dmenucmd)
                dmenumon[0] = '0' + selmon->num;
@@ -1705,34 +1755,49 @@ tile(Monitor *m) {
        for(i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
                if(i < m->nmaster) {
                        h = (m->wh - my) / (MIN(n, m->nmaster) - i);
-                       resize(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), False);
+                       resize(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), False, 0);
                        my += HEIGHT(c);
                }
                else {
                        h = (m->wh - ty) / (n - i);
-                       resize(c, m->wx + mw, m->wy + ty, m->ww - mw - (2*c->bw), h - (2*c->bw), False);
+                       resize(c, m->wx + mw, m->wy + ty, m->ww - mw - (2*c->bw), h - (2*c->bw), False, 0);
                        ty += HEIGHT(c);
                }
 }
 
+#define TAB_HEIGHT 19
+#define TAB_PAD     7
+
 void
 jason_layout(Monitor *m) {
-       unsigned int i, n, mw;
-       Client *c, *vis_slave;
+       unsigned int i, tiled_count, mw, right_width, tab_counts[2] = {0,0}, cur_tab = 0, *tab_count;
+       int tab_top;
+       Client *c, *vis_slave = 0, *base = 0;
 
-       for(n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
-       if(n == 0) {
+       tab_count = &(tab_counts[0]);
+
+       for(tiled_count = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), tiled_count++) {
+               if (tiled_count == 0) { // master
+                       if (c == m->sel) {
+                               if (c->next) {
+                                       vis_slave = nexttiled(c->next);
+                               }
+                       } else {
+                               vis_slave = m->sel;
+                       }
+               } else {
+                       if (c == vis_slave) {
+                               tab_count = &(tab_counts[1]);
+                       } else {
+                               (*tab_count) += 1;
+                       }
+               }
+       }
+       if(tiled_count == 0) {
                return;
        }
 
-       c = nexttiled(m->clients);
-       if (c == m->sel) {
-               // if master is selected, show first slave
-               vis_slave = nexttiled(c->next);
-       } else {
-               vis_slave = m->sel;
-       }
-       if(n > 1 || (n == 1 && !c->screen_hog)) {
+       if(tiled_count > 1 || (tiled_count == 1 && !nexttiled(m->clients)->screen_hog)) {
                mw = m->ww * m->mfact;
        } else {
                // one of these:
@@ -1741,18 +1806,26 @@ jason_layout(Monitor *m) {
                // * miltiple tiled windows
                mw = m->ww;
        }
+       right_width = m->ww - mw;
+       tab_count = &(tab_counts[0]);
+       tab_top = m->wy - (m->wh - (2 * (TAB_HEIGHT + TAB_PAD))) + TAB_HEIGHT;
        for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) {
                if (i == 0) {
-                       resize(c, m->wx, m->wy, mw, m->wh, False);
+                       resize(c, m->wx, m->wy, mw, m->wh, False, 0);
                } else {
                        if (c == vis_slave) {
-                               resize(c, m->wx + mw, m->wy, m->ww - mw, m->wh, False);
+                               resize(c, m->wx + mw, m->wy + TAB_HEIGHT + TAB_PAD, right_width, m->wh - 2 * (TAB_HEIGHT + TAB_PAD), False, base);
+                               tab_count = &(tab_counts[1]);
+                               tab_top = m->wy + m->wh - TAB_HEIGHT;
+                               cur_tab = 0;
                        } else {
                                // this function does not get called when focus changes
                                // resize(c, m->wx + m->ww, m->wy, m->ww - mw, m->wh, False);
-                               resize(c, m->wx + mw, m->wy, m->ww - mw, m->wh, False);
+                               resize(c, m->wx + mw + right_width * cur_tab / (*tab_count), tab_top, right_width, m->wh - 2 * (TAB_HEIGHT + TAB_PAD), False, base);
+                               cur_tab += 1;
                        }
                }
+               base = c;
        }
 }
 
@@ -1773,7 +1846,7 @@ togglefloating(const Arg *arg) {
        selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed;
        if(selmon->sel->isfloating)
                resize(selmon->sel, selmon->sel->x, selmon->sel->y,
-                      selmon->sel->w, selmon->sel->h, False);
+                      selmon->sel->w, selmon->sel->h, False, 0);
        arrange(selmon);
 }
 
@@ -1804,32 +1877,8 @@ toggleview(const Arg *arg) {
 
 void
 unfocus(Client *c, Bool setfocus) {
-       Client *w;
        if(!c)
                return;
-       if(!root || c->win!=root) {
-               w = nexttiled(c->mon->clients);
-               if (!w) {
-                       // no tiled windows
-                       window_set_translucent(c);
-               } else if (w == c) {
-                       // master
-                       window_set_translucent(c);
-               } else {
-                       w = nexttiled(w->next);
-                       if (!w) {
-                               // c must not be tiled
-                               window_set_translucent(c);
-                       } else {
-                               if (w == c) { // first slave
-                                       window_set_translucent(c);
-                               } else {
-                                       window_set_invisible(c);
-                                       window_set_translucent(w);
-                               }
-                       }
-               }
-       }
        grabbuttons(c, False);
        XSetWindowBorder(dpy, c->win, scheme[SchemeNorm].border->rgb);
        if(setfocus) {
@@ -1890,6 +1939,12 @@ updatebars(void) {
                m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen),
                                          CopyFromParent, DefaultVisual(dpy, screen),
                                          CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
+               XChangeProperty(dpy, root, netatom[NetSupportingWMCheck], XA_WINDOW, 32,
+                               PropModeReplace, (unsigned char *) &(m->barwin), 1);
+               XChangeProperty(dpy, m->barwin, netatom[NetSupportingWMCheck], XA_WINDOW, 32,
+                               PropModeReplace, (unsigned char *) &(m->barwin), 1);
+               XChangeProperty(dpy, m->barwin, netatom[NetWMName], XA_STRING, 8,
+                               PropModeReplace, (unsigned char *) "dwm", 3);
                XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor);
                XMapRaised(dpy, m->barwin);
        }