X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fwindows.c;h=362e10a475a3063a463ab3ce4fdb1e7d26ef24c9;hb=322bd8d0b863f89bc6ce864a853b57b554a1cabf;hp=b2643bf31d3ba0d0b065a92ae6c9bd4dfb8492e3;hpb=566ddf894142085e3f0208a08fa36ccce6d6a6ea;p=plomrogue

diff --git a/src/windows.c b/src/windows.c
index b2643bf..362e10a 100644
--- a/src/windows.c
+++ b/src/windows.c
@@ -204,45 +204,47 @@ 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 decoration
+        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, '|');
     }
-    uint16_t length_visible = strnlen(w->title, w->frame.size.x - 2);
-    char title[length_visible + 3];
-    char decoration = ' ';
-    if (1 == active)
+    for (x = w->start.x; x <= w->start.x + w->frame.size.x; x++)
     {
-      decoration = '$';
+        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)
+    {
+        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);
-  }
 }
 
+
+
 static void draw_wins_borders(struct Win * w, struct Win * w_active,
                               struct Corners * corners, uint16_t i)
 {
@@ -436,11 +438,11 @@ extern void shift_active_win(struct WinMeta * wmeta, char dir)
 
         /* Suspend all visible windows. */
         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++)
@@ -573,7 +575,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. */