X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;f=windows.c;h=7e1180925549ec4587e68f0ece6d231be9a8388a;hb=c29af0467dbd947c926d0052b729e48fa641d05e;hp=f879e6b07dbc67db5eed8db411da4ecd4258708c;hpb=a3c0f0cc2892e7efdaa4c85c844aa4b1ad1e077f;p=plomrogue
diff --git a/windows.c b/windows.c
index f879e6b..7e11809 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) {
@@ -31,8 +32,7 @@ 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.
@@ -51,132 +51,139 @@ void suspend_window (struct WinMeta * win_meta, struct Win * win) {
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) {
- win->start_x = win->prev->start_x + win->prev->width; // next best default: open new window column with it
- if (win->prev->height < win_meta->height) { // ... unless the previous window does not fill a whole column
- struct Win * last_ceiling;
- last_ceiling = win->prev;
- while (last_ceiling->start_y != 0 // determine last window serving as a
- && (last_ceiling->prev->start_y == last_ceiling->start_y // ceiling to other windows or filling
- || last_ceiling->prev->width > last_ceiling->width)) // the whole last column's width
- last_ceiling = last_ceiling->prev;
- if (win->prev == last_ceiling) {
- if (win->width <= win->prev->width
- && win->prev->start_y + win->prev->height + win->height <= win_meta->height) {
- win->start_x = win->prev->start_x; // if prev window is last ceiling, try to
- win->start_y = win->prev->start_y + win->prev->height; } } // fit window below it; else: use default
- else {
- int remaining_width = last_ceiling->width; // calculate free width remaining in last row of last
- struct Win * win_p = last_ceiling->next; // window column
- while (win != win_p) {
- remaining_width = remaining_width - win_p->width;
- win_p = win_p->next; }
- if (win->width <= remaining_width && win->height <= win->prev->height) { // if enough space left in
- win->start_y = win->prev->start_y; // last column, place window
- win->start_x = win->prev->start_x + win->prev->width; } // here
- else if (win->width <= last_ceiling->width
- && win->height + win->prev->height + win->prev->start_y <= win_meta->height ) {
- win->start_y = last_ceiling->next->start_y + last_ceiling->next->height; // else, try to put it
- win->start_x = last_ceiling->start_x; } // below
- else // else, put it next to max
- win->start_x = last_ceiling->width + last_ceiling->start_x; } } } } // width of the last last column
+ if (win->prev->height == win_meta->height - 1) // if prev window fills entire column,
+ start.x = win->prev->curses_win->_begx + win->prev->width + 1; // place win in new column next to it
+ else {
+ struct Win * first_ceiling = win->prev; // first_ceiling determines column with;
+ while (first_ceiling->curses_win->_begy != 1) // default: place window in new column
+ first_ceiling = first_ceiling->prev; // next to it
+ start.x = first_ceiling->curses_win->_begx + first_ceiling->width + 1;
+ if (first_ceiling->width >= win->width) { // only place wins 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->curses_win->_begx == first_ceiling->curses_win->_begx)
+ lastrow_startwin = win_p; // try to fit window at the end of the last row of windows
+ win_p = win_p ->next; } // inside column; if failure, try opening a new row below
+ int lastcol_start = win->prev->curses_win->_begx + win->prev->width + 1;
+ if (win->width <= first_ceiling->curses_win->_begx + first_ceiling->width - lastcol_start
+ && win->height <= lastrow_startwin->height) {
+ start.x = lastcol_start;
+ start.y = lastrow_startwin->curses_win->_begy; }
+ else if (win->height < win_meta->height - (lastrow_startwin->curses_win->_begy + lastrow_startwin->height)
+ && win->width <= first_ceiling->width) {
+ start.x = first_ceiling->curses_win->_begx;
+ start.y = lastrow_startwin->curses_win->_begy + lastrow_startwin->height + 1; } } } }
+ 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)
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);
+ win->curses_win = newwin(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);
+// Delete window.
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.
- 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->curses_win->_begy; y <= win->curses_win->_begy + win->height; y++) {
+ mvaddch(y, win->curses_win->_begx - 1, '|');
+ mvaddch(y, win->curses_win->_begx + win->width, '|'); }
+ for (x = win->curses_win->_begx; x <= win->curses_win->_begx + win->width; x++) {
+ mvaddch(win->curses_win->_begy - 1, x, '-');
+ mvaddch(win->curses_win->_begy + 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->curses_win->_begy - 1, win->curses_win->_begx + 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->curses_win->_begy - 1;
+ corners[ccount].tl.x = win->curses_win->_begx - 1;
+ corners[ccount].tr.y = win->curses_win->_begy - 1;
+ corners[ccount].tr.x = win->curses_win->_begx + win->width;
+ corners[ccount].bl.y = win->curses_win->_begy + win->height;
+ corners[ccount].bl.x = win->curses_win->_begx - 1;
+ corners[ccount].br.y = win->curses_win->_begy + win->height;
+ corners[ccount].br.x = win->curses_win->_begx + 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, '+');
+ mvaddch(all_corners[y].tr.y, all_corners[y].tr.x, '+');
+ mvaddch(all_corners[y].bl.y, all_corners[y].bl.x, '+');
+ mvaddch(all_corners[y].br.y, all_corners[y].br.x, '+'); }
+ 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++;
- 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.
@@ -189,53 +196,41 @@ 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.
- if (win_meta->active != win_meta->chain_start || win_meta->active != win_meta->chain_end) {
- if ('f' == dir) {
- if (win_meta->active == win_meta->chain_end) { // move forward beyond chain end
- win_meta->active->prev->next = 0;
- win_meta->chain_end = win_meta->active->prev;
- win_meta->active->prev = 0;
- win_meta->active->next = win_meta->chain_start;
- win_meta->chain_start->prev = win_meta->active;
- win_meta->chain_start = win_meta->active; }
- else { // move forward before chain end
- if (win_meta->chain_start != win_meta->active)
- win_meta->active->prev->next = win_meta->active->next;
- else
- win_meta->chain_start = win_meta->active->next;
- win_meta->active->next->prev = win_meta->active->prev;
- win_meta->active->prev = win_meta->active->next;
- win_meta->active->next = win_meta->active->next->next;
- win_meta->active->prev->next = win_meta->active;
- if (0 != win_meta->active->next)
- win_meta->active->next->prev = win_meta->active;
- else
- win_meta->chain_end = win_meta->active; } }
- else { // mirror of above, backwards
- if (win_meta->active == win_meta->chain_start) {
- win_meta->active->next->prev = 0;
- win_meta->chain_start = win_meta->active->next;
- win_meta->active->next = 0;
- win_meta->active->prev = win_meta->chain_end;
- win_meta->chain_end->next = win_meta->active;
- win_meta->chain_end = win_meta->active; }
+ if (win_meta->chain_start != win_meta->chain_end && (dir == 'f' || dir == 'b')) {
+ int i, i_max;
+ struct Win * win_shift = win_meta->active;
+ char wrap = 0;
+ if ((dir == 'f' && win_shift == win_meta->chain_end)
+ || (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);
+ 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;
+ suspend_window(win_meta, win_p);
+ wins[i] = win_p;
+ win_p = win_p_next; }
+ if (wrap)
+ if (dir == 'f') {
+ append_window(win_meta, win_shift);
+ for (i = 0; i < i_max - 1; i++)
+ append_window(win_meta, wins[i]); }
else {
- if (win_meta->chain_end != win_meta->active)
- win_meta->active->next->prev = win_meta->active->prev;
- else
- win_meta->chain_end = win_meta->active->prev;
- win_meta->active->prev->next = win_meta->active->next;
- win_meta->active->next = win_meta->active->prev;
- win_meta->active->prev = win_meta->active->prev->prev;
- win_meta->active->next->prev = win_meta->active;
- if (0 != win_meta->active->prev)
- win_meta->active->prev->next = win_meta->active;
+ for (i = 1; i < i_max; i++)
+ append_window(win_meta, wins[i]);
+ append_window(win_meta, win_shift); }
+ else
+ for (i = 0; i < i_max; i++)
+ if ((dir == 'f' && win_shift == wins[i]) || (dir == 'b' && win_shift == wins[i+1])) {
+ append_window(win_meta, wins[i+1]);
+ append_window(win_meta, wins[i]);
+ i++; }
else
- win_meta->chain_start = win_meta->active; } }
- update_windows(win_meta, win_meta->chain_start);
- draw_all_windows(win_meta); } }
+ append_window(win_meta, wins[i]);
+ free(wins);
+ win_meta->active = win_shift; } }