Fix another horizontal calculation bug. Both this and the previous from

[spectrwm.git] / scrotwm.c

diff --git a/scrotwm.c b/scrotwm.c
index 835c1d4..2252d2f 100644 (file)
--- a/scrotwm.c
+++ b/scrotwm.c
@@ -1410,8 +1410,9 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip)
        XWindowChanges          wc;
        struct swm_geometry     win_g, r_g = *g;
        struct ws_win           *win, *winfocus;
-       int                     i, j, s, w_inc, h_inc, w_base, h_base, stacks; 
-       int                     hrh, extra, h_slice, last_h = 0;
+       int                     i, j, s, stacks; 
+       int                     w_inc = 1, h_inc, w_base = 1, h_base;
+       int                     hrh, extra = 0, h_slice, last_h = 0;
        int                     split, colno, winno, mwin, msize, mscale;
        int                     remain, missing, v_slice;;
        unsigned int            mask;
@@ -1426,7 +1427,13 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip)
                ws->focus = TAILQ_FIRST(&ws->winlist);
        winfocus = cur_focus ? cur_focus : ws->focus;
 
-       win = TAILQ_FIRST(&ws->winlist);
+       TAILQ_FOREACH(win, &ws->winlist, entry)
+               if (win->transient == 0 && win->floating == 0)
+                       break;
+
+       if (win == NULL)
+               goto notiles;
+
        if (rot) {
                w_inc = win->sh.width_inc;
                w_base = win->sh.base_width;
@@ -1460,14 +1467,8 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip)
                        /* adjust for window's requested size increment */
                        remain = (win_g.w - w_base) % w_inc;
                        missing = w_inc - remain;
-
-                       if (missing <= extra || j == 0) {
-                               extra -= missing;
-                               win_g.w += missing;
-                       } else {
-                               win_g.w -= remain;
-                               extra += remain;
-                       }
+                       win_g.w -= remain;
+                       extra += remain;
                }
 
                msize = win_g.w;
@@ -1558,6 +1559,7 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip)
                j++;
        }
 
+ notiles:
        /* now, stack all the floaters and transients */
        TAILQ_FOREACH(win, &ws->winlist, entry) {
                if (win->transient == 0 && win->floating == 0)