X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/decks/%7B%7Bdeck_id%7D%7D/cards/%7B%7Bcard_id%7D%7D/form?a=blobdiff_plain;f=src%2Fwindows.c;h=7e0ba723a3d3978850bac3ab99709de8c73ab064;hb=a69666dfbbc1c27f0b29f4a591a69630c470df87;hp=84f0a2ed849a58b9b8fd6542917f76d85172fab2;hpb=d010d4918c501e2684e769b0dbb0cf1fa62845a1;p=plomrogue

diff --git a/src/windows.c b/src/windows.c
index 84f0a2e..7e0ba72 100644
--- a/src/windows.c
+++ b/src/windows.c
@@ -204,43 +204,43 @@ static void draw_wins (struct Win * w)
 
 static void draw_win_borders(struct Win * w, char active)
 {
-  /* Draw vertical and horizontal border lines. */
-  uint16_t y, x;
-  for (y = w->start.y; y <= w->start.y + w->frame.size.y; y++)
-  {
-    mvwaddch(wgetparent(w->frame.curses_win), y, w->start.x - 1, '|');
-    mvwaddch(wgetparent(w->frame.curses_win),
-             y, w->start.x + w->frame.size.x, '|');
-  }
-  for (x = w->start.x; x <= w->start.x + w->frame.size.x; x++)
-  {
-    mvwaddch(wgetparent(w->frame.curses_win), w->start.y - 1, x, '-');
-    mvwaddch(wgetparent(w->frame.curses_win),
-             w->start.y + w->frame.size.y, x, '-');
-  }
-
-  /* Draw as much as possible of the title into center of top border line. */
-  char min_title_length_visible = 3; /* minimum 1 char + 2 padding/decoration */
-  if (w->frame.size.x >= min_title_length_visible)
-  {
-    uint16_t title_offset = 0;
-    if (w->frame.size.x > strlen(w->title) + 2)
+    /* Draw vertical and horizontal border lines. */
+    uint16_t y, x;
+    for (y = w->start.y; y <= w->start.y + w->frame.size.y; y++)
     {
-      title_offset = (w->frame.size.x - (strlen(w->title) + 2)) / 2; /* + 2 */
-    }                                          /* is for padding/decoration */
-    uint16_t length_visible = strnlen(w->title, w->frame.size.x - 2);
-    char title[length_visible + 3];
-    char decoration = ' ';
-    if (1 == active)
+        mvwaddch(wgetparent(w->frame.curses_win), y, w->start.x - 1, '|');
+        mvwaddch(wgetparent(w->frame.curses_win),
+                 y, w->start.x + w->frame.size.x, '|');
+    }
+    for (x = w->start.x; x <= w->start.x + w->frame.size.x; x++)
+    {
+        mvwaddch(wgetparent(w->frame.curses_win), w->start.y - 1, x, '-');
+        mvwaddch(wgetparent(w->frame.curses_win),
+                 w->start.y + w->frame.size.y, x, '-');
+    }
+
+    /* Draw as much as possible of the title into center of top border line. */
+    char min_title_length_visible = 3;  /* min. 1 char + 2 padding/decoration */
+    if (w->frame.size.x >= min_title_length_visible)
     {
-      decoration = '$';
+        uint16_t title_offset = 0;
+        if (w->frame.size.x > strlen(w->title) + 2)
+        {
+            title_offset = (w->frame.size.x - (strlen(w->title) + 2)) / 2;
+        }                                     /* +2 is for padding/decoration */
+        uint16_t length_visible = strnlen(w->title, w->frame.size.x - 2);
+        char title[length_visible + 3];
+        char decoration = ' ';
+        if (1 == active)
+        {
+            decoration = '$';
+        }
+        memcpy(title + 1, w->title, length_visible);
+        title[0] = title[length_visible + 1] = decoration;
+        title[length_visible + 2] = '\0';
+        mvwaddstr(wgetparent(w->frame.curses_win),
+                  w->start.y - 1, w->start.x + title_offset, title);
     }
-    memcpy(title + 1, w->title, length_visible);
-    title[0] = title[length_visible + 1] = decoration;
-    title[length_visible + 2] = '\0';
-    mvwaddstr(wgetparent(w->frame.curses_win),
-              w->start.y - 1, w->start.x + title_offset, title);
-  }
 }
 
 
@@ -436,16 +436,18 @@ extern void shift_active_win(struct WinMeta * wmeta, char dir)
             wrap = 1;
         }
 
-        /* Suspend all visible windows. */
+        /* Suspend all visible windows, remember their order in wins[]. */
         uint16_t i, i_max;
-        for (i_max = 1, w_p = wmeta->chain_start;
+        for (w_p  = wmeta->chain_start, i_max = 1;
              w_p != wmeta->chain_end;
-             i_max++)
+             w_p  = w_p->next)
         {
-            w_p = w_p->next;
+            i_max++;
         }
         struct Win ** wins = malloc(i_max * sizeof(struct Win *));
-        for (i = 0, w_p = wmeta->chain_start; i < i_max; i++)
+        for (i = 0, w_p = wmeta->chain_start;
+             i < i_max;
+             i++)
         {
             w_p_next = w_p->next;
             suspend_win(wmeta, w_p);
@@ -492,7 +494,7 @@ extern void shift_active_win(struct WinMeta * wmeta, char dir)
         }
         free(wins);
 
-        wmeta->active = w_shift;      /* TODO: Is this necessary? If so, why? */
+        wmeta->active = w_shift;  /* Otherwise lastly appended win is active. */
     }
 }
 
@@ -575,7 +577,7 @@ extern void draw_scroll_hint(struct Frame * frame, uint16_t pos, uint32_t dist,
         unit = unit_cols;
     }
     char * scrolldsc = malloc((4 * sizeof(char)) + strlen(more) + strlen(unit)
-                              + 10);  /* 10 = uint32 max strlen */
+                              + 10);                /* 10 = uint32 max strlen */
     sprintf(scrolldsc, " %d %s %s ", dist, more, unit);
 
     /* Decide on offset of the description text inside the scroll hint line. */