X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=windows.c;h=cf64b4e11fb0da2db2271929fde9b3de51f2466c;hb=20473b02ae7964d25bbe0e2aaf56b64ce5c67ddc;hp=3051c20f6b7baf71d2b59a0be054cef041c21f57;hpb=d21bba24b8b8b6ff574eed2ef8adbb213e9a9e65;p=plomrogue
diff --git a/windows.c b/windows.c
index 3051c20..cf64b4e 100644
--- a/windows.c
+++ b/windows.c
@@ -1,4 +1,5 @@
#include
+#include
#include
#include
#include "windows.h"
@@ -7,23 +8,33 @@ struct WinMeta init_win_meta (WINDOW * screen) {
// Create and populate WinMeta struct with sane default values.
struct WinMeta win_meta;
win_meta.screen = screen;
- win_meta.height = screen->_maxy + 1;
- win_meta.width = screen->_maxx + 1;
+ 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);
+ win_meta.active = 0;
return win_meta; }
-struct Win init_window (struct WinMeta * win_meta, char * title) {
+void scroll_pad (struct WinMeta * win_meta, char dir) {
+// Scroll pad left (if possible) or right.
+ if ('+' == dir)
+ win_meta->pad_offset++;
+ else if ('-' == dir && win_meta->pad_offset > 0)
+ win_meta->pad_offset--; }
+
+struct Win init_window (struct WinMeta * win_meta, char * title, void * data, void * func) {
// Create and populate Win struct with sane default values.
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 - 1;
+ win.data = data;
+ win.draw = func;
return win; }
void append_window (struct WinMeta * win_meta, struct Win * win) {
@@ -40,18 +51,18 @@ void append_window (struct WinMeta * win_meta, struct Win * 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; }
@@ -62,69 +73,72 @@ struct yx place_window (struct WinMeta * win_meta, struct Win * win) {
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 - 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
+ 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
+ uint16_t 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->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; } } } }
+ struct Win * win_up = win->prev;
+ struct Win * win_upup = win_up;
+ uint16_t 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. Destroy (if visible), (re-)build window. If need, resize pad.
- if (0 != win->curses_win)
+ if (0 != win->curses)
destroy_window (win);
struct yx startyx = place_window(win_meta, win);
- int lastwincol = 0;
+ uint16_t lastwincol = 0;
struct Win * win_p = win_meta->chain_start;
while (win_p != 0) {
- if (win_p != win && win_p->curses_win->_begx + win_p->width > lastwincol + 1)
- lastwincol = win_p->curses_win->_begx + win_p->width - 1;
+ 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 (win_meta->pad->_maxx != lastwincol + 1) {
- wresize(win_meta->pad, win_meta->pad->_maxy + 1, lastwincol + 2); }
- win->curses_win = subpad(win_meta->pad, win->height, win->width, startyx.y, startyx.x);
+ 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) {
// Delete window.
- delwin(win->curses_win);
- win->curses_win = 0; }
+ delwin(win->curses);
+ win->curses = 0; }
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++) {
- mvwaddch(win->curses_win->_parent, y, win->curses_win->_begx - 1, '|');
- mvwaddch(win->curses_win->_parent, y, win->curses_win->_begx + win->width, '|'); }
- for (x = win->curses_win->_begx; x <= win->curses_win->_begx + win->width; x++) {
- mvwaddch(win->curses_win->_parent, win->curses_win->_begy - 1, x, '-');
- mvwaddch(win->curses_win->_parent, 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); // + 2 is for decoration
- int length_visible = strnlen(win->title, win->width - min_title_length_visible);
+ uint16_t 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) {
+ uint16_t title_offset = 0;
+ if (win->width > strlen(win->title) + 2)
+ title_offset = (win->width - (strlen(win->title) + 2)) / 2; // + 2 is for decoration
+ uint16_t length_visible = strnlen(win->title, win->width - 2);
char title[length_visible + 3];
char decoration = ' ';
if (1 == active)
@@ -132,33 +146,28 @@ void draw_window_borders (struct Win * win, char active) {
memcpy(title + 1, win->title, length_visible);
title[0] = title[length_visible + 1] = decoration;
title[length_visible + 2] = '\0';
- mvwaddstr(win->curses_win->_parent, win->curses_win->_begy - 1, win->curses_win->_begx + title_offset, title); } }
+ mvwaddstr (wgetparent(win->curses), getbegy(win->curses)-1, getbegx(win->curses)+title_offset, title); } }
-void draw_windows_borders (struct Win * win, struct Win * win_active, struct Corners * corners, int ccount) {
+void draw_windows_borders (struct Win * win, struct Win * win_active, struct Corners * corners, uint16_t 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;
+ 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_window(struct Win * win) {
-// Draw window content if visible.
- if (win->height > 1 && win->width > 1) ;
- win->draw(win); }
-
void draw_windows (struct Win * win) {
// Draw contents of all windows in window chain from win on.
- draw_window(win);
+ win->draw(win);
if (0 != win->next) {
draw_windows (win->next); } }
@@ -168,7 +177,7 @@ void draw_all_windows (struct WinMeta * win_meta) {
wnoutrefresh(win_meta->screen);
werase(win_meta->pad);
if (win_meta->chain_start) {
- int n_wins = 1;
+ uint16_t n_wins = 1;
struct Win * win_p = win_meta->chain_start;
while (0 != win_p->next) {
win_p = win_p->next;
@@ -176,7 +185,7 @@ void draw_all_windows (struct WinMeta * win_meta) {
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;
+ uint16_t 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, '+');
@@ -186,42 +195,39 @@ void draw_all_windows (struct WinMeta * win_meta) {
free(all_corners); }
doupdate(); }
-void resize_window (struct WinMeta * win_meta, char change) {
+void resize_active_window (struct WinMeta * win_meta, uint16_t height, uint16_t width) {
// Grow or shrink currently active window. Correct its geometry and that of its followers.
- if (change == '-' && win_meta->active->height > 1)
- win_meta->active->height--;
- else if (change == '+' && win_meta->active->height < win_meta->height - 1)
- win_meta->active->height++;
- 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); }
+ if (0 != win_meta->active && width > 0 && height > 0 && height < win_meta->height) {
+ win_meta->active->height = height;
+ win_meta->active->width = width;
+ 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.
- if ('n' == dir) {
- if (win_meta->active->next != 0)
- win_meta->active = win_meta->active->next;
- else
- win_meta->active = win_meta->chain_start; }
- else {
- if (win_meta->active->prev != 0)
- win_meta->active = win_meta->active->prev;
- else
- win_meta->active = win_meta->chain_end; } }
+ if (0 != win_meta->active) {
+ if ('n' == dir) {
+ if (win_meta->active->next != 0)
+ win_meta->active = win_meta->active->next;
+ else
+ win_meta->active = win_meta->chain_start; }
+ else {
+ if (win_meta->active->prev != 0)
+ win_meta->active = win_meta->active->prev;
+ else
+ win_meta->active = win_meta->chain_end; } } }
-void shift_window (struct WinMeta * win_meta, char dir) {
+void shift_active_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->chain_start != win_meta->chain_end && (dir == 'f' || dir == 'b')) {
- int i, i_max;
+ if (0 != win_meta->active && win_meta->chain_start != win_meta->chain_end && (dir == 'f' || dir == 'b')) {
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;
+ uint16_t i, i_max;
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;