From: Christian Heller <c.heller@plomlompom.de>
Date: Tue, 30 Apr 2013 02:15:49 +0000 (+0200)
Subject: Completely rebuilt how window borders are realized. Are now drawn in top window,... 
X-Git-Tag: tce~1338
X-Git-Url: https://plomlompom.com/repos/edit?a=commitdiff_plain;h=3d455d7de0778ee27e234412c9b0ad253cf8a4ed;p=plomrogue

Completely rebuilt how window borders are realized. Are now drawn in top window, whereas individual "Win" windows are drawn in the spaces between the top windows' border drawings.
---

diff --git a/roguelike.c b/roguelike.c
index 052f7ff..d2e8303 100644
--- a/roguelike.c
+++ b/roguelike.c
@@ -31,22 +31,20 @@ void draw_with_linebreaks (struct Win * win, char * text, int start_y) {
 // Write text into window content space. Start on row start_y. Fill unused rows with whitespace.
   int x, y;
   char toggle;
-  int height_av = win->height - 1;
-  int width_av = win->width - 1;
   char fin = 0;
   int z = -1;
-  for (y = start_y; y < height_av; y++) {
+  for (y = start_y; y < win->height; y++) {
     if (0 == fin)
       toggle = 0;
-    for (x = 0; x < width_av; x++) {
+    for (x = 0; x < win->width; x++) {
        if (0 == toggle) {
          z++;
          if ('\n' == text[z]) {
-           mvwaddch(win->curses_win, y+1, x+win->border_left, ' ');
+           mvwaddch(win->curses_win, y, x, ' ');
            toggle = 1;
            continue; }
          else
-           mvwaddch(win->curses_win, y+1, x+win->border_left, text[z]);
+           mvwaddch(win->curses_win, y, x, text[z]);
          if ('\n' == text[z+1]) {
            z++;
            toggle = 1; }
@@ -54,18 +52,16 @@ void draw_with_linebreaks (struct Win * win, char * text, int start_y) {
             toggle = 1;
             fin = 1; } }
        else
-         mvwaddch(win->curses_win, y+1, x+win->border_left, ' '); } } }
+         mvwaddch(win->curses_win, y, x, ' '); } } }
 
 void draw_text_from_bottom (struct Win * win) {
 // Draw text in win->data from end/bottom to the top.
   char * text = (char *) win->data;
-  int width_av = win->width - 1;
-  int height_av = win->height - 1;
   char toggle = 0;
   int x, y, offset;
   int z = -1;
-  for (y = 0; 0 == toggle; y++)         // Determine number of lines text would have in a window of available
-    for (x = 0; x < width_av; x++) {    // width, but infinite height.
+  for (y = 0; 0 == toggle; y++)         // Determine number of lines text would have in a window of
+    for (x = 0; x < win->width; x++) {  // available width, but infinite height.
       z++;
       if ('\n' == text[z])              // Treat \n and \0 as control characters for incrementing y and
         break;                          // stopping the loop. Make sure they don't count as cell space
@@ -77,15 +73,15 @@ void draw_text_from_bottom (struct Win * win) {
         break; } }
   z = -1;
   int start_y = 0;
-  if (y < height_av) {             // Depending on what is bigger, determine start point in window or in text.
-    start_y = height_av - y;
+  if (y < win->height) {          // Depending on what is bigger, determine start point in window or in text.
+    start_y = win->height - y;
     for (y = 0; y < start_y; y++)
-      for (x = 0; x < width_av; x++)
-        mvwaddch(win->curses_win, y+1, x+win->border_left, ' '); }
-  else if (y > height_av) {
-    offset = y - height_av;
+      for (x = 0; x < win->width; x++)
+        mvwaddch(win->curses_win, y, x, ' '); }
+  else if (y > win->height) {
+    offset = y - win->height;
     for (y = 0; y < offset; y++)
-      for (x = 0; x < width_av; x++) {
+      for (x = 0; x < win->width; x++) {
         z++;
         if ('\n' == text[z])
           break;
@@ -97,24 +93,22 @@ void draw_text_from_bottom (struct Win * win) {
 
 void draw_map (struct Win * win) {
 // Draw map determined by win->data Map struct into window. Respect offset.
-  int height_av = win->height - 1;
-  int width_av = win->width - 1;
   struct Map map = * (struct Map *) win->data;
   char * cells = map.cells;
   int width_map_av = map.width - map.offset_x;
   int height_map_av = map.height - map.offset_y;
   int x, y, z;
-  for (y = 0; y < height_av; y++) {
+  for (y = 0; y < win->height; y++) {
     z = map.offset_x + (map.offset_y + y) * (map.width);
-    for (x = 0; x < width_av; x++) {
+    for (x = 0; x < win->width; x++) {
       if (y < height_map_av && x < width_map_av) {
         if (z == (map.width * map.player_y) + map.player_x)
-          mvwaddch(win->curses_win, y+1, x+win->border_left, '@');
+          mvwaddch(win->curses_win, y, x, '@');
         else
-          mvwaddch(win->curses_win, y+1, x+win->border_left, cells[z]);
+          mvwaddch(win->curses_win, y, x, cells[z]);
         z++; }
       else
-        mvwaddch(win->curses_win, y+1, x+win->border_left, ' '); } } }
+        mvwaddch(win->curses_win, y, x, ' '); } } }
 
 void draw_info (struct Win * win) {
 // Draw info window by appending win->data integer value to "Turn: " display.
@@ -220,21 +214,19 @@ void draw_keys_window (struct Win * win) {
   struct World * world = (struct World *) win->data;
   struct KeysWinData * keyswindata = (struct KeysWinData *) world->keyswindata;
   struct KeyBinding * keybindings = world->keybindings;
-  int height_av = win->height - 1;
-  int width_av = win->width - 1;
   int offset = 0;
-  if (keyswindata->max >= height_av) {
-    if (keyswindata->select > height_av / 2)
-      if (keyswindata->select < (keyswindata->max - (height_av / 2)))
-        offset = keyswindata->select - (height_av / 2);
+  if (keyswindata->max >= win->height) {
+    if (keyswindata->select > win->height / 2)
+      if (keyswindata->select < (keyswindata->max - (win->height / 2)))
+        offset = keyswindata->select - (win->height / 2);
       else
-        offset = keyswindata->max - height_av + 1; }
+        offset = keyswindata->max - win->height + 1; }
   int keydescwidth = 9; // max length assured by get_keyname()
   char * keydesc = malloc(keydescwidth + 1);
   attr_t attri;
   int y, x;
   char * keyname;
-  for (y = 0; 0 != keybindings[offset + y].name && y < height_av; y++) {
+  for (y = 0; 0 != keybindings[offset + y].name && y < win->height; y++) {
     attri = 0;
     if (y == keyswindata->select - offset) {
       attri = A_REVERSE;
@@ -243,18 +235,18 @@ void draw_keys_window (struct Win * win) {
     keyname = get_keyname(keybindings[y + offset].key);
     snprintf(keydesc, keydescwidth + 1, "%-9s", keyname);
     free(keyname);
-    for (x = 0; x < width_av; x++)
+    for (x = 0; x < win->width; x++)
       if (strlen(keydesc) > x)
-        mvwaddch(win->curses_win, y + 1, x + win->border_left, keydesc[x] | attri);
+        mvwaddch(win->curses_win, y, x, keydesc[x] | attri);
       else if (strlen(keydesc) < x && x < strlen(keybindings[y + offset].name) + strlen(keydesc) + 1)
-        mvwaddch(win->curses_win, y + 1, x + win->border_left, keybindings[y + offset].name[x - strlen(keydesc) - 1] | attri);
+        mvwaddch(win->curses_win, y, x, keybindings[y + offset].name[x - strlen(keydesc) - 1] | attri);
       else
-        mvwaddch(win->curses_win, y + 1, x + win->border_left, ' ' | attri); }
+        mvwaddch(win->curses_win, y, x, ' ' | attri); }
   free(keydesc);
-  if (y < height_av)
-    for (; y < height_av; y++)
-      for (x = 0; x < width_av; x++)
-        mvwaddch(win->curses_win, y + 1, x + win->border_left, ' '); }
+  if (y < win->height)
+    for (; y < win->height; y++)
+      for (x = 0; x < win->width; x++)
+        mvwaddch(win->curses_win, y, x, ' '); }
 
 void init_keybindings(struct World * world) {
 // Initialize keybindings from file "keybindings".
@@ -394,9 +386,8 @@ int main () {
       resize_window(&win_meta, '-');
     else if (key == get_action_key(world.keybindings, "save keys"))
       save_keybindings(&world);
-    else if (key == get_action_key(world.keybindings, "keys nav up") && world.keyswindata->select > 0) {
+    else if (key == get_action_key(world.keybindings, "keys nav up") && world.keyswindata->select > 0)
       world.keyswindata->select--;
-      draw_all_windows (&win_meta); }
     else if (key == get_action_key(world.keybindings, "keys nav down") && world.keyswindata->select < world.keyswindata->max)
       world.keyswindata->select++;
     else if (key == get_action_key(world.keybindings, "keys mod")) {
diff --git a/windows.c b/windows.c
index 2251c51..b003fd7 100644
--- a/windows.c
+++ b/windows.c
@@ -7,6 +7,7 @@ struct WinMeta init_win_meta (WINDOW * screen) {
 // Create and populate WinMeta struct with sane default values.
   struct WinMeta win_meta;
   win_meta.height = screen->_maxy + 1;
+  win_meta.width = screen->_maxx + 1;
   win_meta.chain_start = 0;
   win_meta.chain_end = 0;
   return win_meta; }
@@ -19,7 +20,7 @@ struct Win init_window (struct WinMeta * win_meta, char * title) {
   win.curses_win = 0;
   win.title = title;
   win.width = 20;
-  win.height = win_meta->height;
+  win.height = win_meta->height - 1;
   return win; }
 
 void append_window (struct WinMeta * win_meta, struct Win * win) {
@@ -55,116 +56,128 @@ void suspend_window (struct WinMeta * win_meta, struct Win * win) {
 void place_window (struct WinMeta * win_meta, struct Win * win) {
 // Based on position and sizes of previous window, find fitting place for current window.
   win->start_x = 0; // if window is first in chain, place it on top-left corner
-  win->start_y = 0;
+  win->start_y = 1;
   if (0 != win->prev) {
-    if (win->prev->height == win_meta->height)               // if prev window fills entire column, place win
-      win->start_x = win->prev->start_x + win->prev->width;  // in new column next to it
+    if (win->prev->height == win_meta->height - 1)              // if prev window fills entire column, place win
+      win->start_x = win->prev->start_x + win->prev->width + 1; // in new column next to it
     else {
       struct Win * first_ceiling = win->prev;                        // first_ceiling determines column with;
-      while (first_ceiling->start_y != 0)                            // default: place window in new column
+      while (first_ceiling->start_y != 1)                            // default: place window in new column
         first_ceiling = first_ceiling->prev;                         // next to it
-      win->start_x = first_ceiling->start_x + first_ceiling->width;
+      win->start_x = first_ceiling->start_x + first_ceiling->width + 1;
       if (first_ceiling->width >= win->width) {   // only place windows in prev column that fit into its width
         struct Win * win_p = first_ceiling;
         struct Win * lastrow_startwin = win_p;
         while (win_p != win) {
           if (win_p->start_x == first_ceiling->start_x)
-            lastrow_startwin = win_p;                              // try to fit window at the end of the last
-          win_p = win_p ->next; }                                  // row of windows inside the column; if
-        int lastcol_start = win->prev->start_x + win->prev->width; // that fails, try to open a new row below
+            lastrow_startwin = win_p;                                   // try to fit window at end of last
+          win_p = win_p ->next; }                                       // row of windows inside column; if
+        int lastcol_start = win->prev->start_x + win->prev->width + 1;  // failure, try opening new row below
         if (win->width <= first_ceiling->start_x + first_ceiling->width - lastcol_start
             && win->height <= lastrow_startwin->height) {
           win->start_x = lastcol_start;
           win->start_y = lastrow_startwin->start_y; }
-        else if (win->height <= win_meta->height - (lastrow_startwin->start_y + lastrow_startwin->height)
+        else if (win->height < win_meta->height - (lastrow_startwin->start_y + lastrow_startwin->height)
                  && win->width <= first_ceiling->width) {
           win->start_x = first_ceiling->start_x;
-          win->start_y = lastrow_startwin->start_y + lastrow_startwin->height; } } } } }
+          win->start_y = lastrow_startwin->start_y + lastrow_startwin->height + 1; } } } } }
 
 void update_windows (struct WinMeta * win_meta, struct Win * win) {
 // Update geometry of win and its next of kin. Before, destroy window, if visible. After, (re-)build it.
   if (0 != win->curses_win)
     destroy_window (win);
   place_window(win_meta, win);
-  if (win->start_y + win->height < win_meta->height) // dependent on window position,
-    win->border_down = 1;                            // append space for borders to be drawn
-  else
-    win->border_down = 0;
-  if (win->start_x > 0)
-    win->border_left = 1;
-  else
-    win->border_left = 0;
-  win->curses_win = newwin(win->height + win->border_down, win->width + win->border_left, win->start_y, win->start_x - win->border_left);
+  win->curses_win = newwin(win->height, win->width, win->start_y, win->start_x);
   if (0 != win->next)
     update_windows (win_meta, win->next); }
 
 void destroy_window (struct Win * win) {
 // Undraw and delete window.
-  undraw_window (win->curses_win);
   delwin(win->curses_win);
   win->curses_win = 0; }
 
-void draw_windows (struct WinMeta * win_meta, struct Win * win) {
-// Draw all windows from the current one on.
-  draw_window(win_meta, win);
-  if (0 != win->next)
-    draw_windows (win_meta, win->next); }
-
-void draw_all_windows (struct WinMeta * win_meta) {
-// Draw all windows from the chain start on.
-  if (win_meta->chain_start)
-    draw_windows (win_meta, win_meta->chain_start); }
-
-void draw_window(struct WinMeta * win_meta, struct Win * win) {
-// Draw win's content, including border and title (the latter dependent on space available for it).
-  char ls = '|';
-  char rs = '|';
-  char ts = '-';
-  char bs = '-';
-  char tl = '-';
-  char tr = '+';
-  char bl = '|';
-  char br = '|';
-  if (1 == win->border_down) {
-    bl = '+';
-    br = '+'; }
-  if (1 == win->border_left)
-    tl = '+';
-  wborder(win->curses_win, ls, rs, ts, bs, tl, tr, bl, br);
+void draw_window_borders (struct Win * win, char active) {
+// Draw borders of window win, including title. Decorate in a special way if window is marked as active.
+  int y, x;
+  for (y = win->start_y; y <= win->start_y + win->height; y++) {
+    mvaddch(y, win->start_x - 1, '|');
+    mvaddch(y, win->start_x + win->width, '|'); }
+  for (x = win->start_x; x <= win->start_x + win->width; x++) {
+    mvaddch(win->start_y - 1, x, '-');
+    mvaddch(win->start_y + win->height, x, '-'); }
   char min_title_length_visible = 3; // 1 char minimal, plus 2 chars for decoration left/right of title
   if (win->width > min_title_length_visible) {
     int title_length = strlen(win->title);
-    int title_offset = (((win->width) - (title_length + 2)) / 2) + win->border_left; // + 2 is for decoration
-    if (title_offset < win->border_left)
-      title_offset = win->border_left;
+    int title_offset = (((win->width) - (title_length + 2)) / 2); // + 2 is for decoration
     int length_visible = strnlen(win->title, win->width - min_title_length_visible);
     char title[length_visible + 3];
     char decoration = ' ';
-    if (win_meta->active == win)
+    if (1 == active)
       decoration = '$';
     memcpy(title + 1, win->title, length_visible);
     title[0] = title[length_visible + 1] = decoration;
     title[length_visible + 2] = '\0';
-    mvwaddstr(win->curses_win, 0, title_offset, title); }
+    mvaddstr(win->start_y - 1, win->start_x + title_offset, title); }
+  refresh(); }
+
+void draw_windows_borders (struct Win * win, struct Win * win_active, struct Corners * corners, int ccount) {
+// Craw draw_window_borders() for all windows in chain from win on. Save current window's border corners.
+  char active = 0;
+  if (win == win_active)
+    active = 1;
+   draw_window_borders(win, active);
+  corners[ccount].tl_y = win->start_y - 1;
+  corners[ccount].tl_x = win->start_x - 1;
+  corners[ccount].tr_y = win->start_y - 1;
+  corners[ccount].tr_x = win->start_x + win->width;
+  corners[ccount].bl_y = win->start_y + win->height;
+  corners[ccount].bl_x = win->start_x - 1;
+  corners[ccount].br_y = win->start_y + win->height;
+  corners[ccount].br_x = win->start_x + win->width;
+  if (0 != win->next) {
+    draw_windows_borders (win->next, win_active, corners, ccount + 1); } }
+
+void draw_windows (struct Win * win) {
+// Draw contents of all windows in window chain from win on.
+  draw_window(win);
+  if (0 != win->next) {
+    draw_windows (win->next); } }
+
+void draw_all_windows (struct WinMeta * win_meta) {
+// Draw all windows and their borders.
+  int y, x;
+  for (y = 0; y < win_meta->height; y++)
+    for (x = 0; x < win_meta->width; x++)
+    mvaddch(y, x, ' ');
+  if (win_meta->chain_start) {
+    int n_wins = 1;
+    struct Win * win_p = win_meta->chain_start;
+    while (0 != win_p->next) {
+      win_p = win_p->next;
+      n_wins++; }
+    struct Corners * all_corners = malloc(sizeof(struct Corners) * n_wins);
+    draw_windows_borders (win_meta->chain_start, win_meta->active, all_corners, 0);
+    draw_windows (win_meta->chain_start);
+    for (y = 0; y < n_wins; y++) {
+      mvaddch(all_corners[y].tl_y, all_corners[y].tl_x, 'o');
+      mvaddch(all_corners[y].tr_y, all_corners[y].tr_x, 'o');
+      mvaddch(all_corners[y].bl_y, all_corners[y].bl_x, 'o');
+      mvaddch(all_corners[y].br_y, all_corners[y].br_x, 'o'); }
+    free(all_corners); } }
+
+void draw_window(struct Win * win) {
+// Draw window content if visible.
   if (win->height > 1 && win->width > 1) ;
     win->draw(win);
   wrefresh(win->curses_win); }
 
-void undraw_window (WINDOW * win) {
-// Fill entire window with whitespace.
-  int y, x;
-  for (y = 0; y <= win->_maxy; y++)
-    for (x = 0; x <= win->_maxx; x++)
-      mvwaddch(win, y, x, ' ');
-  wrefresh(win); }
-
 void resize_window (struct WinMeta * win_meta, char change) {
 // Grow or shrink currently active window. Correct its geometry and that of its followers.
-  if      (change == '-' && win_meta->active->height > 2)
+  if      (change == '-' && win_meta->active->height > 1)
       win_meta->active->height--;
-  else if (change == '+' && win_meta->active->height < win_meta->height)
+  else if (change == '+' && win_meta->active->height < win_meta->height - 1)
     win_meta->active->height++;
-  else if (change == '_' && win_meta->active->width > 2)
+  else if (change == '_' && win_meta->active->width > 1)
       win_meta->active->width--;
   else if (change == '*')
     win_meta->active->width++;
diff --git a/windows.h b/windows.h
index c8b6841..059ce5f 100644
--- a/windows.h
+++ b/windows.h
@@ -2,7 +2,8 @@ struct WinMeta {
   struct Win * chain_start;
   struct Win * chain_end;
   struct Win * active;
-  int height; };
+  int height;
+  int width; };
 
 struct Win {
   struct Win * prev;
@@ -18,6 +19,16 @@ struct Win {
   void (* draw) (struct Win *);
   void * data; };
 
+struct Corners {
+  int tl_y;
+  int tl_x;
+  int tr_y;
+  int tr_x;
+  int bl_y;
+  int bl_x;
+  int br_y;
+  int br_x; };
+
 struct  WinMeta init_win_meta (WINDOW *);
 struct Win init_window (struct WinMeta *, char *);
 void append_window (struct WinMeta *, struct Win *);
@@ -25,10 +36,11 @@ void suspend_window (struct WinMeta *, struct Win *);
 void place_window (struct WinMeta *, struct Win *);
 void update_windows (struct WinMeta *, struct Win *);
 void destroy_window (struct Win *);
-void draw_windows (struct WinMeta *, struct Win *);
+void draw_window(struct Win *);
+void draw_windows (struct Win *);
+void draw_windows_borders (struct Win *, struct Win *, struct Corners *, int);
+void draw_window_borders (struct Win *, char);
 void draw_all_windows (struct WinMeta *);
-void draw_window(struct WinMeta *, struct Win *);
-void undraw_window (WINDOW *);
 void resize_window (struct WinMeta *, char);
 void cycle_active_window (struct WinMeta *, char);
 void shift_window (struct WinMeta *, char);