Read default order of windows from file config/toggle_win_order.

[plomrogue] / src / windows.c

diff --git a/src/windows.c b/src/windows.c
index 41eaae9b5982c6ccb2fcd969217b0fec81a06465..6257d4bf39b75107f3129d443d3bcc0dde84f657 100644 (file)
--- a/src/windows.c
+++ b/src/windows.c
@@ -81,8 +81,8 @@ static uint8_t refit_pad(struct WinMeta * wmeta)
     /* Only resize the pad if the rightmost window column has changed. */
     if (getmaxx(wmeta->padframe.curses_win) != lastwincol)
     {
-        if (lastwincol + 2 > UINT16_MAX) /* Abort if pad would grow beyond */
-        {                                /* yx_uint16 confines. */
+        if (lastwincol + 2 > UINT16_MAX)
+        {
             return 2;
         }
         return (ERR == wresize(wmeta->padframe.curses_win,
@@ -365,23 +365,23 @@ static void shift_win_backward(struct WinMeta * wmeta)
 extern uint8_t init_win_meta(WINDOW * screen, struct WinMeta * wmeta)
 {
     wmeta->_screen             = screen;
-    wmeta->padframe.size.y     = getmaxy(screen);
-    wmeta->padframe.size.x     = getmaxx(screen);
-    if (   wmeta->padframe.size.y > UINT16_MAX
-        || wmeta->padframe.size.x > UINT16_MAX)
+    uint32_t maxy_test         = getmaxy(screen);
+    uint32_t maxx_test         = getmaxx(screen);
+    if (maxy_test > UINT16_MAX || maxx_test > UINT16_MAX)
     {
         return 2;
     }
+    wmeta->padframe.size.y     = maxy_test;
+    wmeta->padframe.size.x     = maxx_test;
     wmeta->_chain_start        = 0;
     wmeta->_chain_end          = 0;
     wmeta->pad_offset          = 0;
-    WINDOW * test;
-    test = newpad(wmeta->padframe.size.y, 1);
-    if (NULL == test)
+    WINDOW * pad_test          = newpad(wmeta->padframe.size.y, 1);
+    if (NULL == pad_test)
     {
         return 1;
     }
-    wmeta->padframe.curses_win = test;
+    wmeta->padframe.curses_win = pad_test;
     wmeta->active              = 0;
     return 0;
 }
@@ -506,11 +506,11 @@ extern uint8_t resize_active_win(struct WinMeta * wmeta, struct yx_uint16 size)
         && size.y < wmeta->padframe.size.y)
     {
         wmeta->active->frame.size = size;
-        return update_wins(wmeta, wmeta->_chain_start); /* Following windows' */
-    }                                                   /* positioning may be */
-    return 0;                                           /* affected.          */
-}                                                       /* TODO: Why start at */
-                                                        /* chain_start then?  */
+        return update_wins(wmeta, wmeta->active); /* Positioning of following */
+    }                                             /* windows may be affected. */
+    return 0;
+}
+
 
 
 extern void cycle_active_win(struct WinMeta * wmeta, char dir)
@@ -547,8 +547,7 @@ extern void cycle_active_win(struct WinMeta * wmeta, char dir)
 extern uint8_t shift_active_win(struct WinMeta * wmeta, char dir)
 {
     if (   0 == wmeta->active                        /* No shifting with < 2  */
-        || wmeta->_chain_start == wmeta->_chain_end  /* windows visible or    */
-        || (dir != 'f' && dir != 'b'))               /* wrong direction char. */
+        || wmeta->_chain_start == wmeta->_chain_end) /* windows visible.      */
     {
         return 0;
     }