X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=windows.c;h=92e33234704b89ade844bba1924e76110edd36af;hb=d687309e59900a84f486cbbf928fe663261755ec;hp=cc9f0f2b9c20a0cc944b74d8a4cd54c3820d5187;hpb=ed160c85898e726c7daf6b329f5e807e760ba3ed;p=plomrogue diff --git a/windows.c b/windows.c index cc9f0f2..92e3323 100644 --- a/windows.c +++ b/windows.c @@ -1,39 +1,51 @@ #include +#include #include #include #include "windows.h" -struct WinMeta init_win_meta (WINDOW * screen) { +struct Corners { + struct yx_uint16 tl; + struct yx_uint16 tr; + struct yx_uint16 bl; + struct yx_uint16 br; }; + +static void refit_pad (struct WinMeta *); +static void place_window (struct WinMeta *, struct Win *); +static void update_windows (struct WinMeta *, struct Win *); +static void destroy_window (struct Win *); +static void draw_windows_borders (struct Win *, struct Win *, struct Corners *, uint16_t); +static void draw_window_borders (struct Win *, char); +static void draw_windows (struct Win *); +static void draw_vertical_scroll_hint (struct WinMeta *, uint16_t, uint32_t, char); + +extern 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 = getmaxy(screen); - win_meta.width = getmaxx(screen); + win_meta.pad.size.y = getmaxy(screen); + win_meta.pad.size.x = 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.pad.curses_win = newpad(win_meta.pad.size.y, 1); + win_meta.active = 0; return win_meta; } -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) { +extern 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 = 0; + win.frame.curses_win = 0; win.title = title; - win.width = 20; - win.height = win_meta->height - 1; + win.frame.size.x = 20; + win.frame.size.y = win_meta->pad.size.y - 1; + win.data = data; + win.draw = func; return win; } -void append_window (struct WinMeta * win_meta, struct Win * win) { +extern void append_window (struct WinMeta * win_meta, struct Win * win) { // Append win to window chain. Set active, if first window. Update geometry of windows from new window on. if (0 != win_meta->chain_start) { win->prev = win_meta->chain_end; @@ -44,97 +56,103 @@ void append_window (struct WinMeta * win_meta, struct Win * win) { win_meta->chain_end = win; 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. +static void refit_pad (struct WinMeta * win_meta) { +// Fit pad width to minimum width demanded by current windows' geometries. + uint16_t lastwincol = 0; + struct Win * win_p = win_meta->chain_start; + while (win_p != 0) { + if (win_p->start.x + win_p->frame.size.x > lastwincol + 1) + lastwincol = win_p->start.x + win_p->frame.size.x - 1; + win_p = win_p->next; } + if (getmaxx(win_meta->pad.curses_win) != lastwincol) + wresize(win_meta->pad.curses_win, getmaxy(win_meta->pad.curses_win), lastwincol + 2); } + +extern void suspend_window (struct WinMeta * win_meta, struct Win * win) { +// Destroy win, suspend from chain. Update geometry of following rows and pad, 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. win->prev->next = win->next; else win_meta->chain_start = win->next; + char pad_refitted = 0; 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 ... - update_windows(win_meta, win->next); } + update_windows(win_meta, win->next); + pad_refitted = 1; } else { win_meta->chain_end = win->prev; if (win_meta->active == win) // ... or else to the previous element. win_meta->active = win->prev; } win->prev = 0; - win->next = 0; } + win->next = 0; + if (0 == pad_refitted) // Refit pad if necessary. + refit_pad(win_meta); } -struct yx place_window (struct WinMeta * win_meta, struct Win * win) { +static void place_window (struct WinMeta * win_meta, struct Win * win) { // Based on position and sizes of previous window, find fitting place for current window. - struct yx start; - start.x = 0; // if window is first in chain, place it on top-left corner - start.y = 1; + win->start.x = 0; // if window is first in chain, place it on top-left corner + win->start.y = 1; if (0 != win->prev) { struct Win * win_top = win->prev; - while (getbegy(win_top->curses) != 1) + while (win_top->start.y != 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 + win->start.x = win_top->start.x + win_top->frame.size.x + 1; // column to the right of the last one + uint16_t winprev_maxy = win->prev->start.y + getmaxy(win->prev->frame.curses_win); + if ( win->frame.size.x <= win->prev->frame.size.x + && win->frame.size.y < win_meta->pad.size.y - winprev_maxy) { + win->start.x = win->prev->start.x; // place window below previous window if it fits + win->start.y = winprev_maxy + 1; } // vertically and is not wider than its predecessor else { struct Win * win_up = win->prev; struct Win * win_upup = win_up; - int widthdiff; + uint16_t widthdiff; while (win_up != win_top) { win_upup = win_up->prev; while (1) { - if (getbegy(win_up->curses) != getbegy(win_upup->curses)) + if (win_up->start.y != win_upup->start.y) 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 + winprev_maxy = win_upup->start.y + getmaxy(win_upup->frame.curses_win); + widthdiff = (win_upup->start.x + win_upup->frame.size.x) - (win_up->start.x + win_up->frame.size.x); + if (win->frame.size.y < win_meta->pad.size.y - winprev_maxy && win->frame.size.x < widthdiff) { + win->start.x = win_up->start.x + win_up->frame.size.x + 1 ; // else try to open new sub column under + win->start.y = winprev_maxy + 1; // last window below which enough space remains break; } - win_up = win_upup; } } } - return start; } + win_up = win_upup; } } } } -void update_windows (struct WinMeta * win_meta, struct Win * win) { +static 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) + if (0 != win->frame.curses_win) destroy_window (win); - 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); + place_window(win_meta, win); + refit_pad(win_meta); + win->frame.curses_win = subpad(win_meta->pad.curses_win, win->frame.size.y, win->frame.size.x, win->start.y, + win->start.x); if (0 != win->next) update_windows (win_meta, win->next); } -void destroy_window (struct Win * win) { +static void destroy_window (struct Win * win) { // Delete window. - delwin(win->curses); - win->curses = 0; } + delwin(win->frame.curses_win); + win->frame.curses_win = 0; } -void draw_window_borders (struct Win * win, char active) { +static 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, '-'); } + uint16_t y, x; + for (y = win->start.y; y <= win->start.y + win->frame.size.y; y++) { + mvwaddch(wgetparent(win->frame.curses_win), y, win->start.x - 1, '|'); + mvwaddch(wgetparent(win->frame.curses_win), y, win->start.x + win->frame.size.x, '|'); } + for (x = win->start.x; x <= win->start.x + win->frame.size.x; x++) { + mvwaddch(wgetparent(win->frame.curses_win), win->start.y - 1, x, '-'); + mvwaddch(wgetparent(win->frame.curses_win), win->start.y + win->frame.size.y, 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); + if (win->frame.size.x >= min_title_length_visible) { + uint16_t title_offset = 0; + if (win->frame.size.x > strlen(win->title) + 2) + title_offset = (win->frame.size.x - (strlen(win->title) + 2)) / 2; // + 2 is for decoration + uint16_t length_visible = strnlen(win->title, win->frame.size.x - 2); char title[length_visible + 3]; char decoration = ' '; if (1 == active) @@ -142,38 +160,55 @@ 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 (wgetparent(win->curses), getbegy(win->curses)-1, getbegx(win->curses)+title_offset, title); } } + mvwaddstr(wgetparent(win->frame.curses_win), win->start.y - 1, win->start.x + title_offset, title); } } -void draw_windows_borders (struct Win * win, struct Win * win_active, struct Corners * corners, int ccount) { +static 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 = 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; + 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->frame.size.x; + corners[ccount].bl.y = win->start.y + win->frame.size.y; + corners[ccount].bl.x = win->start.x - 1; + corners[ccount].br.y = win->start.y + win->frame.size.y; + corners[ccount].br.x = win->start.x + win->frame.size.x; if (0 != win->next) { draw_windows_borders (win->next, win_active, corners, ccount + 1); } } -void draw_windows (struct Win * win) { +static 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. +static void draw_vertical_scroll_hint (struct WinMeta * win_meta, uint16_t x, uint32_t more_cols, char dir) { +// Draw scroll hint line in win at col x of pad display, announce more_cols more columns in direction dir. + uint16_t y, offset; + char phrase[] = "more columns"; + char * scrolldesc = malloc((3 * sizeof(char)) + strlen(phrase) + 10); // 10 = max chars for uint32_t string + sprintf(scrolldesc, " %d %s ", more_cols, phrase); + offset = 1; + if (win_meta->pad.size.y > (strlen(scrolldesc) + 1)) + offset = (win_meta->pad.size.y - strlen(scrolldesc)) / 2; + for (y = 0; y < win_meta->pad.size.y; y++) + if (y >= offset && y < strlen(scrolldesc) + offset) + mvwaddch(win_meta->pad.curses_win, y, x, scrolldesc[y - offset] | A_REVERSE); + else + mvwaddch(win_meta->pad.curses_win, y, x, dir | A_REVERSE); + free(scrolldesc); } + +extern void draw_all_windows (struct WinMeta * win_meta) { +// Draw pad with all windows and their borders, plus scrolling hints. erase(); wnoutrefresh(win_meta->screen); - werase(win_meta->pad); + werase(win_meta->pad.curses_win); 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; @@ -181,29 +216,34 @@ 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, '+'); - 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); } + mvwaddch(win_meta->pad.curses_win, all_corners[i].tl.y, all_corners[i].tl.x, '+'); + mvwaddch(win_meta->pad.curses_win, all_corners[i].tr.y, all_corners[i].tr.x, '+'); + mvwaddch(win_meta->pad.curses_win, all_corners[i].bl.y, all_corners[i].bl.x, '+'); + mvwaddch(win_meta->pad.curses_win, all_corners[i].br.y, all_corners[i].br.x, '+'); } + free(all_corners); + uint16_t y; + if (win_meta->pad_offset > 0) + draw_vertical_scroll_hint(win_meta, win_meta->pad_offset, win_meta->pad_offset + 1, '<'); + if (win_meta->pad_offset + win_meta->pad.size.x < getmaxx(win_meta->pad.curses_win) - 1) + for (y = 0; y < win_meta->pad.size.y; y++) + draw_vertical_scroll_hint(win_meta, win_meta->pad_offset + win_meta->pad.size.x - 1, + getmaxx(win_meta->pad.curses_win) - (win_meta->pad_offset + + win_meta->pad.size.x), + '>'); + pnoutrefresh(win_meta->pad.curses_win, 0, win_meta->pad_offset, 0, 0, win_meta->pad.size.y, + win_meta->pad.size.x - 1); } doupdate(); } -void resize_window (struct WinMeta * win_meta, char change) { +extern 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->pad.size.y) { + win_meta->active->frame.size.y = height; + win_meta->active->frame.size.x = width; + update_windows(win_meta, win_meta->chain_start); } } -void cycle_active_window (struct WinMeta * win_meta, char dir) { +extern void cycle_active_window (struct WinMeta * win_meta, char dir) { // Cycle active window selection forwards (dir = 'n') or backwards. if (0 != win_meta->active) { if ('n' == dir) { @@ -217,16 +257,15 @@ void cycle_active_window (struct WinMeta * win_meta, char dir) { else win_meta->active = win_meta->chain_end; } } } -void shift_window (struct WinMeta * win_meta, char dir) { +extern 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 (0 != win_meta->active && win_meta->chain_start != win_meta->chain_end && (dir == 'f' || dir == 'b')) { - int i, i_max; - struct Win * win_shift = win_meta->active; + struct Win * win_shift = win_meta->active, * win_p, * win_p_next; 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; + uint16_t i, i_max; 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 *)); @@ -254,3 +293,8 @@ void shift_window (struct WinMeta * win_meta, char dir) { append_window(win_meta, wins[i]); free(wins); win_meta->active = win_shift; } } + +extern void reset_pad_offset(struct WinMeta * win_meta, uint16_t new_offset) { +// Apply new_offset to windows pad, if it proves to be sane. + if (new_offset >= 0 && new_offset + win_meta->pad.size.x < getmaxx(win_meta->pad.curses_win)) + win_meta->pad_offset = new_offset; }