X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;f=windows.c;h=d3a895c4d0091f82932a80363418315bc5638897;hb=de3f09afccf9f14f00785a164f2d21b8c4f12f74;hp=6a649a325b187894c8ddc46b6eb34b51f680f68f;hpb=e1ae0a05e12a8a0aec170d9d3b795ca0dc74e6ed;p=plomrogue
diff --git a/windows.c b/windows.c
index 6a649a3..d3a895c 100644
--- a/windows.c
+++ b/windows.c
@@ -1,4 +1,5 @@
#include
+#include
#include
#include
#include "windows.h"
@@ -17,8 +18,8 @@ struct WinMeta init_win_meta (WINDOW * screen) {
return win_meta; }
void scroll_pad (struct WinMeta * win_meta, char dir) {
-// Scroll pad left (if possible) or right.
- if ('+' == dir)
+// Scroll pad left or right (if possible).
+ if ('+' == dir && win_meta->pad_offset + win_meta->width < getmaxx(win_meta->pad) - 1)
win_meta->pad_offset++;
else if ('-' == dir && win_meta->pad_offset > 0)
win_meta->pad_offset--; }
@@ -48,23 +49,34 @@ void append_window (struct WinMeta * win_meta, struct Win * 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.
+// 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.
+ uint16_t lastwincol = 0;
+ struct Win * win_p = win_meta->chain_start;
+ while (win_p != 0) {
+ if (getbegx(win_p->curses) + win_p->width > lastwincol + 1)
+ lastwincol = getbegx(win_p->curses) + win_p->width - 1;
+ win_p = win_p->next; }
+ if (getmaxx(win_meta->pad) != lastwincol)
+ wresize(win_meta->pad, getmaxy(win_meta->pad), lastwincol + 2); } }
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.
@@ -76,14 +88,14 @@ struct yx place_window (struct WinMeta * win_meta, struct Win * win) {
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);
+ 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 * 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) {
@@ -104,7 +116,7 @@ void update_windows (struct WinMeta * win_meta, struct Win * 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 && getbegx(win_p->curses) + win_p->width > lastwincol + 1)
@@ -112,8 +124,8 @@ void update_windows (struct WinMeta * win_meta, struct Win * win) {
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); }
+ 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); }
@@ -125,7 +137,7 @@ void destroy_window (struct Win * win) {
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;
+ 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, '|'); }
@@ -134,10 +146,10 @@ void draw_window_borders (struct Win * win, char active) {
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;
+ 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
- int length_visible = strnlen(win->title, win->width - 2);
+ uint16_t length_visible = strnlen(win->title, win->width - 2);
char title[length_visible + 3];
char decoration = ' ';
if (1 == active)
@@ -147,7 +159,7 @@ void draw_window_borders (struct Win * win, char active) {
title[length_visible + 2] = '\0';
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)
@@ -170,13 +182,30 @@ void draw_windows (struct Win * win) {
if (0 != win->next) {
draw_windows (win->next); } }
+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;
+ offset = 0;
+ 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->height > (strlen(scrolldesc) + 1))
+ offset = (win_meta->height - strlen(scrolldesc)) / 2;
+ for (y = 0; y < win_meta->height; y++)
+ if (y >= offset && y < strlen(scrolldesc) + offset)
+ mvwaddch(win_meta->pad, y, x, scrolldesc[y - offset] | A_REVERSE);
+ else
+ mvwaddch(win_meta->pad, y, x, dir | A_REVERSE);
+ free(scrolldesc); }
+
void draw_all_windows (struct WinMeta * win_meta) {
-// Draw all windows and their borders.
+// Draw pad with all windows and their borders, plus scrolling hints.
erase();
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;
@@ -184,17 +213,24 @@ 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); }
+ 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->width < getmaxx(win_meta->pad) - 1)
+ for (y = 0; y < win_meta->height; y++)
+ draw_vertical_scroll_hint(win_meta, win_meta->pad_offset + win_meta->width - 1,
+ getmaxx(win_meta->pad) - (win_meta->pad_offset + win_meta->width), '>');
+ pnoutrefresh(win_meta->pad, 0, win_meta->pad_offset, 0, 0, win_meta->height, win_meta->width - 1); }
doupdate(); }
-void resize_active_window (struct WinMeta * win_meta, int height, int width) {
+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 (0 != win_meta->active && width > 0 && height > 0 && height < win_meta->height) {
win_meta->active->height = height;
@@ -218,12 +254,12 @@ void cycle_active_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 (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;
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;