X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=windows.c;h=af6647978a0aa98b2411c6d16e089ef9bcfa99bd;hb=a068b574ce8ac851be5ca1aefbaa487ef6c8e60e;hp=29b4446ce61245d0d9a4208818c7a276cf447917;hpb=6fdd2756fe0594105fc28743ef781a754259388d;p=plomrogue

diff --git a/windows.c b/windows.c
index 29b4446..af66479 100644
--- a/windows.c
+++ b/windows.c
@@ -6,9 +6,13 @@
 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.screen = screen;
+  win_meta.height = getmaxy(screen);
+  win_meta.width = getmaxx(screen);
   win_meta.chain_start = 0;
   win_meta.chain_end = 0;
+  win_meta.pad_offset = 0;
+  win_meta.pad = newpad(win_meta.height, 1);
   return win_meta; }
 
 struct Win init_window (struct WinMeta * win_meta, char * title) {
@@ -16,10 +20,10 @@ struct Win init_window (struct WinMeta * win_meta, char * title) {
   struct Win win;
   win.prev = 0;
   win.next = 0;
-  win.curses_win = 0;
+  win.curses = 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) {
@@ -31,148 +35,166 @@ void append_window (struct WinMeta * win_meta, struct Win * win) {
     win_meta->active = win;
     win_meta->chain_start = win; }
   win_meta->chain_end = win;
-  update_windows(win_meta, win);
-  draw_all_windows(win_meta); }
+  update_windows(win_meta, win); }
 
 void suspend_window (struct WinMeta * win_meta, struct Win * win) {
 // Destroy win, suspend from window chain. Update geometry of following rows, as well as activity selection.
   destroy_window(win);
-  if (win_meta->chain_start != win) // Give win's position in the chain to element next to it in the chain.
+  if (win_meta->chain_start != win)    // Give win's position in the chain to element next to it in the chain.
     win->prev->next = win->next;
   else
     win_meta->chain_start = win->next;
-  if (win_meta->chain_end != win) { // Let chain element next to win know its new predecessor.
+  if (win_meta->chain_end != win) {                 // Let chain element next to win know its new predecessor.
     win->next->prev = win->prev;
-    if (win_meta->active == win)    // If win was active, shift active window pointer to ...
-      win_meta->active = win->next;                     // ... the next chain element, if that is a window ...
+    if (win_meta->active == win)                          // If win was active, shift active window pointer to
+      win_meta->active = win->next;                       // the next chain element, if that is a window ...
     update_windows(win_meta, win->next); }
   else {
     win_meta->chain_end = win->prev;
-    if (win_meta->active == win)                                   // ... or else to the previous element.
+    if (win_meta->active == win)                                       // ... or else to the previous element.
       win_meta->active = win->prev; }
   win->prev = 0;
-  win->next = 0;
-  if (0 != win_meta->chain_start)
-    draw_all_windows(win_meta); }
+  win->next = 0; }
 
-void place_window (struct WinMeta * win_meta, struct Win * win) {
+struct yx 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;
+  struct yx start;
+  start.x = 0;                                     // if window is first in chain, place it on top-left corner
+  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
+    struct Win * win_top = win->prev;
+    while (getbegy(win_top->curses) != 1)
+      win_top = win_top->prev;                                   // else, default to placing window in new top
+    start.x = getbegx(win_top->curses) + win_top->width + 1;     // column to the right of the last one
+    int winprev_maxy = getbegy(win->prev->curses) + getmaxy(win->prev->curses);
+    if (win->width <= win->prev->width && win->height < win_meta->height - winprev_maxy) {
+      start.x = getbegx(win->prev->curses);                // place window below previous window if it fits
+      start.y = winprev_maxy + 1; }                        // vertically and is not wider than its predecessor
     else {
-      struct Win * first_ceiling = win->prev;                        // first_ceiling determines column with;
-      while (first_ceiling->start_y != 0)                            // default: place window in new column
-        first_ceiling = first_ceiling->prev;                         // next to it
-      win->start_x = first_ceiling->start_x + first_ceiling->width;
-      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
-        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)
-                 && win->width <= first_ceiling->width) {
-          win->start_x = first_ceiling->start_x;
-          win->start_y = lastrow_startwin->start_y + lastrow_startwin->height; } } } } }
+      struct Win * win_up = win->prev;
+      struct Win * win_upup = win_up;
+      int widthdiff;
+      while (win_up != win_top) {
+        win_upup = win_up->prev;
+        while (1) {
+          if (getbegy(win_up->curses) != getbegy(win_upup->curses))
+            break;
+          win_upup = win_upup->prev; }
+        winprev_maxy = getbegy(win_upup->curses) + getmaxy(win_upup->curses);
+        widthdiff = (getbegx(win_upup->curses) + win_upup->width) - (getbegx(win_up->curses) + win_up->width);
+        if (win->height < win_meta->height - winprev_maxy && win->width < widthdiff) {
+          start.x = getbegx(win_up->curses) + win_up->width + 1; // else try to open new sub column under last
+          start.y = winprev_maxy + 1;                            // window below which enough space remains
+          break; }
+        win_up = win_upup; } } }
+  return start; }
 
 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)
+// Update geometry of win and its next of kin. Destroy (if visible), (re-)build window. If need, resize pad.
+  if (0 != win->curses)
     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);
+  struct yx startyx = place_window(win_meta, win);
+  int lastwincol = 0;
+  struct Win * win_p = win_meta->chain_start;
+  while (win_p != 0) {
+    if (win_p != win && getbegx(win_p->curses) + win_p->width > lastwincol + 1)
+      lastwincol = getbegx(win_p->curses) + win_p->width - 1;
+    else if (win_p == win && startyx.x + win->width > lastwincol + 1)
+      lastwincol = startyx.x + win->width - 1;
+    win_p = win_p->next; }
+  if (getmaxx(win_meta->pad) != lastwincol) {
+    wresize(win_meta->pad, getmaxy(win_meta->pad), lastwincol + 2); }
+  win->curses = subpad(win_meta->pad, win->height, win->width, startyx.y, startyx.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); }
+// Delete window.
+  delwin(win->curses);
+  win->curses = 0; }
 
-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);
-  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 length_visible = strnlen(win->title, win->width - min_title_length_visible);
+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 = getbegy(win->curses); y <= getbegy(win->curses) + win->height; y++) {
+    mvwaddch(wgetparent(win->curses), y, getbegx(win->curses) - 1, '|');
+    mvwaddch(wgetparent(win->curses), y, getbegx(win->curses) + win->width, '|'); }
+  for (x = getbegx(win->curses); x <= getbegx(win->curses) + win->width; x++) {
+    mvwaddch(wgetparent(win->curses), getbegy(win->curses) - 1, x, '-');
+    mvwaddch(wgetparent(win->curses), getbegy(win->curses) + 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_offset = 0;
+    if (win->width > strlen(win->title) + 2)
+      title_offset = (win->width - (strlen(win->title) + 2)) / 2;                     // + 2 is for decoration
+    int length_visible = strnlen(win->title, win->width - 2);
     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); }
-  if (win->height > 1 && win->width > 1) ;
-    win->draw(win);
-  wrefresh(win->curses_win); }
+    mvwaddstr (wgetparent(win->curses), getbegy(win->curses)-1, getbegx(win->curses)+title_offset, title); } }
 
-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 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 = getbegy(win->curses) - 1;
+  corners[ccount].tl.x = getbegx(win->curses) - 1;
+  corners[ccount].tr.y = getbegy(win->curses) - 1;
+  corners[ccount].tr.x = getbegx(win->curses) + win->width;
+  corners[ccount].bl.y = getbegy(win->curses) + win->height;
+  corners[ccount].bl.x = getbegx(win->curses) - 1;
+  corners[ccount].br.y = getbegy(win->curses) + win->height;
+  corners[ccount].br.x = getbegx(win->curses) + 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.
+  win->draw(win);
+  if (0 != win->next) {
+    draw_windows (win->next); } }
+
+void draw_all_windows (struct WinMeta * win_meta) {
+// Draw all windows and their borders.
+  erase();
+  wnoutrefresh(win_meta->screen);
+  werase(win_meta->pad);
+  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 (win_meta->chain_start);
+    draw_windows_borders (win_meta->chain_start, win_meta->active, all_corners, 0);
+    int i;
+    for (i = 0; i < n_wins; i++) {
+      mvwaddch(win_meta->pad, all_corners[i].tl.y, all_corners[i].tl.x, '+');
+      mvwaddch(win_meta->pad, all_corners[i].tr.y, all_corners[i].tr.x, '+');
+      mvwaddch(win_meta->pad, all_corners[i].bl.y, all_corners[i].bl.x, '+');
+      mvwaddch(win_meta->pad, all_corners[i].br.y, all_corners[i].br.x, '+'); }
+    pnoutrefresh(win_meta->pad, 0, win_meta->pad_offset, 0, 0, win_meta->height, win_meta->width - 1);
+    free(all_corners); }
+  doupdate(); }
 
 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++;
-  update_windows(win_meta, win_meta->chain_start);
-  draw_all_windows(win_meta); }
+  update_windows(win_meta, win_meta->chain_start); }
 
 void cycle_active_window (struct WinMeta * win_meta, char dir) {
 // Cycle active window selection forwards (dir = 'n') or backwards.
@@ -185,8 +207,7 @@ void cycle_active_window (struct WinMeta * win_meta, char dir) {
     if (win_meta->active->prev != 0)
       win_meta->active = win_meta->active->prev;
     else
-      win_meta->active = win_meta->chain_end; }
-  draw_all_windows(win_meta); }
+      win_meta->active = win_meta->chain_end; } }
 
 void shift_window (struct WinMeta * win_meta, char dir) {
 // Move active window forward/backward in window chain. If jumping beyond start/end, move to other chain end.
@@ -198,7 +219,8 @@ void shift_window (struct WinMeta * win_meta, char dir) {
         || (dir == 'b' && win_shift == win_meta->chain_start))
       wrap = 1;
     struct Win * win_p, * win_p_next;
-    for (i_max = 1, win_p = win_meta->chain_start; win_p != win_meta->chain_end; i_max++, win_p = win_p->next);
+    for (i_max = 1, win_p = win_meta->chain_start; win_p != win_meta->chain_end; i_max++)
+      win_p = win_p->next;
     struct Win ** wins = malloc(i_max * sizeof(struct Win *));
     for (i = 0, win_p = win_meta->chain_start; i < i_max; i++) {
       win_p_next = win_p->next;
@@ -223,6 +245,4 @@ void shift_window (struct WinMeta * win_meta, char dir) {
         else
           append_window(win_meta, wins[i]);
     free(wins);
-    win_meta->active = win_shift;
-    update_windows(win_meta, win_meta->chain_start);
-    draw_all_windows(win_meta); } }
+    win_meta->active = win_shift; } }