X-Git-Url: https://plomlompom.com/repos/test.html?a=blobdiff_plain;f=windows.c;h=98c8cf8b46da0bbdd73c4b9659a4c27dbfe48c3a;hb=b20abc6c11c56207cc32fc74765650ce7e4753c8;hp=5d924e9327001d4127904b8cf9eac6dafa8cfafb;hpb=ac4305d47335de070f5f940220d0e9d6be32fe49;p=plomrogue
diff --git a/windows.c b/windows.c
index 5d924e9..98c8cf8 100644
--- a/windows.c
+++ b/windows.c
@@ -1,249 +1,300 @@
#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_win (struct WinMeta *, struct Win *);
+static void update_wins (struct WinMeta *, struct Win *);
+static void destroy_win (struct Win *);
+static void draw_wins_borders (struct Win *, struct Win *, struct Corners *, uint16_t);
+static void draw_win_borders (struct Win *, char);
+static void draw_wins (struct Win *);
+
+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.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) {
+ struct WinMeta wmeta;
+ wmeta.screen = screen;
+ wmeta.pad.size.y = getmaxy(screen);
+ wmeta.pad.size.x = getmaxx(screen);
+ wmeta.chain_start = 0;
+ wmeta.chain_end = 0;
+ wmeta.pad_offset = 0;
+ wmeta.pad.curses_win = newpad(wmeta.pad.size.y, 1);
+ wmeta.active = 0;
+ return wmeta; }
+
+extern struct Win init_win (struct WinMeta * wmeta, 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.title = title;
- win.width = 20;
- win.height = win_meta->height - 1;
- return win; }
-
-void append_window (struct WinMeta * win_meta, struct Win * win) {
+ struct Win w;
+ w.prev = 0;
+ w.next = 0;
+ w.frame.curses_win = 0;
+ w.title = title;
+ w.frame.size.x = 20;
+ w.frame.size.y = wmeta->pad.size.y - 1;
+ w.data = data;
+ w.draw = func;
+ return w; }
+
+extern void append_win (struct WinMeta * wmeta, struct Win * w) {
// 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;
- win_meta->chain_end->next = win; }
+ if (0 != wmeta->chain_start) {
+ w->prev = wmeta->chain_end;
+ wmeta->chain_end->next = w; }
else {
- win_meta->active = win;
- win_meta->chain_start = 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.
- 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;
+ wmeta->active = w;
+ wmeta->chain_start = w; }
+ wmeta->chain_end = w;
+ update_wins(wmeta, w); }
+
+static void refit_pad (struct WinMeta * wmeta) {
+// Fit pad width to minimum width demanded by current windows' geometries.
+ uint16_t lastwincol = 0;
+ struct Win * w_p = wmeta->chain_start;
+ while (w_p != 0) {
+ if (w_p->start.x + w_p->frame.size.x > lastwincol + 1)
+ lastwincol = w_p->start.x + w_p->frame.size.x - 1;
+ w_p = w_p->next; }
+ if (getmaxx(wmeta->pad.curses_win) != lastwincol)
+ wresize(wmeta->pad.curses_win, getmaxy(wmeta->pad.curses_win), lastwincol + 2); }
+
+extern void suspend_win (struct WinMeta * wmeta, struct Win * w) {
+// Destroy win, suspend from chain. Update geometry of following rows and pad, as well as activity selection.
+ destroy_win(w);
+ if (wmeta->chain_start != w) // Give win's position in the chain to element next to it in the chain.
+ w->prev->next = w->next;
else
- win_meta->chain_start = win->next;
- 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); }
+ wmeta->chain_start = w->next;
+ char pad_refitted = 0;
+ if (wmeta->chain_end != w) { // Let chain element next to win know its new predecessor.
+ w->next->prev = w->prev;
+ if (wmeta->active == w) // If win was active, shift active window pointer to
+ wmeta->active = w->next; // the next chain element, if that is a window ...
+ update_wins(wmeta, w->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; }
+ wmeta->chain_end = w->prev;
+ if (wmeta->active == w) // ... or else to the previous element.
+ wmeta->active = w->prev; }
+ w->prev = 0;
+ w->next = 0;
+ if (0 == pad_refitted) // Refit pad if necessary.
+ refit_pad(wmeta); }
-struct yx place_window (struct WinMeta * win_meta, struct Win * win) {
+static void place_win (struct WinMeta * wmeta, struct Win * w) {
// 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;
- if (0 != win->prev) {
- if (win->prev->height == win_meta->height - 1) // if prev window fills entire column,
- start.x = getbegx(win->prev->curses_win) + win->prev->width + 1; // place win in new column next to it
+ w->start.x = 0; // if window is first in chain, place it on top-left corner
+ w->start.y = 1;
+ if (0 != w->prev) {
+ struct Win * w_top = w->prev;
+ while (w_top->start.y != 1)
+ w_top = w_top->prev; // else, default to placing window in new top
+ w->start.x = w_top->start.x + w_top->frame.size.x + 1; // column to the right of the last one
+ uint16_t w_prev_maxy = w->prev->start.y + getmaxy(w->prev->frame.curses_win);
+ if (w->frame.size.x <= w->prev->frame.size.x && w->frame.size.y < wmeta->pad.size.y - w_prev_maxy) {
+ w->start.x = w->prev->start.x; // place window below previous window if it fits
+ w->start.y = w_prev_maxy + 1; } // vertically and is not wider than its predecessor
else {
- struct Win * first_ceiling = win->prev; // first_ceiling determines column with;
- while (getbegy(first_ceiling->curses_win) != 1) // default: place window in new column
- first_ceiling = first_ceiling->prev; // next to it
- start.x = getbegx(first_ceiling->curses_win) + 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 (getbegx(win_p->curses_win) == getbegx(first_ceiling->curses_win))
- 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 = getbegx(win->prev->curses_win) + win->prev->width + 1;
- if (win->width <= getbegx(first_ceiling->curses_win) + first_ceiling->width - lastcol_start
- && win->height <= lastrow_startwin->height) {
- start.x = lastcol_start;
- start.y = getbegy(lastrow_startwin->curses_win); }
- else if (win->height < win_meta->height - (getbegy(lastrow_startwin->curses_win) + lastrow_startwin->height)
- && win->width <= first_ceiling->width) {
- start.x = getbegx(first_ceiling->curses_win);
- start.y = getbegy(lastrow_startwin->curses_win) + lastrow_startwin->height + 1; } } } }
- return start; }
-
-void update_windows (struct WinMeta * win_meta, struct Win * win) {
+ struct Win * w_up = w->prev;
+ struct Win * w_upup = w_up;
+ uint16_t widthdiff;
+ while (w_up != w_top) {
+ w_upup = w_up->prev;
+ while (1) {
+ if (w_up->start.y != w_upup->start.y)
+ break;
+ w_upup = w_upup->prev; }
+ w_prev_maxy = w_upup->start.y + getmaxy(w_upup->frame.curses_win);
+ widthdiff = (w_upup->start.x + w_upup->frame.size.x) - (w_up->start.x + w_up->frame.size.x);
+ if (w->frame.size.y < wmeta->pad.size.y - w_prev_maxy && w->frame.size.x < widthdiff) {
+ w->start.x = w_up->start.x + w_up->frame.size.x + 1 ; // else try to open new sub column under
+ w->start.y = w_prev_maxy + 1; // last window below which enough space remains
+ break; }
+ w_up = w_upup; } } } }
+
+static void update_wins (struct WinMeta * wmeta, struct Win * w) {
// Update geometry of win and its next of kin. Destroy (if visible), (re-)build window. If need, resize pad.
- if (0 != win->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) + win_p->width > lastwincol + 1)
- lastwincol = getbegx(win_p->curses_win) + 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_win = 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) {
+ if (0 != w->frame.curses_win)
+ destroy_win (w);
+ place_win(wmeta, w);
+ refit_pad(wmeta);
+ w->frame.curses_win=subpad(wmeta->pad.curses_win, w->frame.size.y, w->frame.size.x, w->start.y, w->start.x);
+ if (0 != w->next)
+ update_wins (wmeta, w->next); }
+
+static void destroy_win (struct Win * w) {
// Delete window.
- delwin(win->curses_win);
- win->curses_win = 0; }
+ delwin(w->frame.curses_win);
+ w->frame.curses_win = 0; }
-void draw_window_borders (struct Win * win, char active) {
+static void draw_win_borders (struct Win * w, 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_win); y <= getbegy(win->curses_win) + win->height; y++) {
- mvwaddch(wgetparent(win->curses_win), y, getbegx(win->curses_win) - 1, '|');
- mvwaddch(wgetparent(win->curses_win), y, getbegx(win->curses_win) + win->width, '|'); }
- for (x = getbegx(win->curses_win); x <= getbegx(win->curses_win) + win->width; x++) {
- mvwaddch(wgetparent(win->curses_win), getbegy(win->curses_win) - 1, x, '-');
- mvwaddch(wgetparent(win->curses_win), getbegy(win->curses_win) + 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 = w->start.y; y <= w->start.y + w->frame.size.y; y++) {
+ mvwaddch(wgetparent(w->frame.curses_win), y, w->start.x - 1, '|');
+ mvwaddch(wgetparent(w->frame.curses_win), y, w->start.x + w->frame.size.x, '|'); }
+ for (x = w->start.x; x <= w->start.x + w->frame.size.x; x++) {
+ mvwaddch(wgetparent(w->frame.curses_win), w->start.y - 1, x, '-');
+ mvwaddch(wgetparent(w->frame.curses_win), w->start.y + w->frame.size.y, x, '-'); }
+ char min_title_length_visible = 3; // 1 char minimal, plus 2 chars for decoration left/right of title
+ if (w->frame.size.x >= min_title_length_visible) {
+ uint16_t title_offset = 0;
+ if (w->frame.size.x > strlen(w->title) + 2)
+ title_offset = (w->frame.size.x - (strlen(w->title) + 2)) / 2; // + 2 is for decoration
+ uint16_t length_visible = strnlen(w->title, w->frame.size.x - 2);
char title[length_visible + 3];
char decoration = ' ';
if (1 == active)
decoration = '$';
- memcpy(title + 1, win->title, length_visible);
+ memcpy(title + 1, w->title, length_visible);
title[0] = title[length_visible + 1] = decoration;
title[length_visible + 2] = '\0';
- mvwaddstr(wgetparent(win->curses_win), getbegy(win->curses_win) - 1, getbegx(win->curses_win) + title_offset, title); } }
+ mvwaddstr(wgetparent(w->frame.curses_win), w->start.y - 1, w->start.x + title_offset, title); } }
-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.
+static void draw_wins_borders (struct Win * w, struct Win * w_active, struct Corners * corners, uint16_t i) {
+// Call draw_win_borders() for all windows in chain from win on. Save current window's border corners.
char active = 0;
- if (win == win_active)
+ if (w == w_active)
active = 1;
- draw_window_borders(win, active);
- corners[ccount].tl.y = getbegy(win->curses_win) - 1;
- corners[ccount].tl.x = getbegx(win->curses_win) - 1;
- corners[ccount].tr.y = getbegy(win->curses_win) - 1;
- corners[ccount].tr.x = getbegx(win->curses_win) + win->width;
- corners[ccount].bl.y = getbegy(win->curses_win) + win->height;
- corners[ccount].bl.x = getbegx(win->curses_win) - 1;
- corners[ccount].br.y = getbegy(win->curses_win) + win->height;
- corners[ccount].br.x = getbegx(win->curses_win) + 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_win_borders(w, active);
+ corners[i].tl.y = w->start.y - 1;
+ corners[i].tl.x = w->start.x - 1;
+ corners[i].tr.y = w->start.y - 1;
+ corners[i].tr.x = w->start.x + w->frame.size.x;
+ corners[i].bl.y = w->start.y + w->frame.size.y;
+ corners[i].bl.x = w->start.x - 1;
+ corners[i].br.y = w->start.y + w->frame.size.y;
+ corners[i].br.x = w->start.x + w->frame.size.x;
+ if (0 != w->next) {
+ draw_wins_borders (w->next, w_active, corners, i + 1); } }
+
+static void draw_wins (struct Win * w) {
// Draw contents of all windows in window chain from win on.
- draw_window(win);
- if (0 != win->next) {
- draw_windows (win->next); } }
+ w->draw(w);
+ if (0 != w->next) {
+ draw_wins (w->next); } }
-void draw_all_windows (struct WinMeta * win_meta) {
-// Draw all windows and their borders.
+extern void draw_scroll_hint (struct Frame * frame, uint16_t pos, uint32_t dist, char dir) {
+// Draw scroll hint into frame at pos (row or col dependend on dir), mark distance of dist cells into dir.
+ char more[] = "more";
+ char unit_cols[] = "columns";
+ char unit_rows[] = "lines";
+ uint16_t dsc_space = frame->size.x;
+ char * unit = unit_rows;
+ if ('<' == dir || '>' == dir) {
+ dsc_space = frame->size.y;
+ unit = unit_cols; }
+ char * scrolldsc = malloc((4 * sizeof(char)) + strlen(more) + strlen(unit) + 10); // 10 = uint32 max strlen
+ sprintf(scrolldsc, " %d %s %s ", dist, more, unit);
+ char offset = 1, q;
+ if (dsc_space > strlen(scrolldsc) + 1)
+ offset = (dsc_space - strlen(scrolldsc)) / 2;
+ chtype symbol;
+ for (q = 0; q < dsc_space; q++) {
+ if (q >= offset && q < strlen(scrolldsc) + offset)
+ symbol = scrolldsc[q - offset] | A_REVERSE;
+ else
+ symbol = dir | A_REVERSE;
+ if ('<' == dir || '>' == dir)
+ mvwaddch(frame->curses_win, q, pos, symbol);
+ else
+ mvwaddch(frame->curses_win, pos, q, symbol); }
+ free(scrolldsc); }
+
+extern void draw_all_wins (struct WinMeta * wmeta) {
+// 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;
- struct Win * win_p = win_meta->chain_start;
+ wnoutrefresh(wmeta->screen);
+ werase(wmeta->pad.curses_win);
+ if (wmeta->chain_start) {
+ uint16_t n_wins = 1, i;
+ struct Win * win_p = wmeta->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;
+ draw_wins (wmeta->chain_start);
+ draw_wins_borders (wmeta->chain_start, wmeta->active, all_corners, 0);
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(wmeta->pad.curses_win, all_corners[i].tl.y, all_corners[i].tl.x, '+');
+ mvwaddch(wmeta->pad.curses_win, all_corners[i].tr.y, all_corners[i].tr.x, '+');
+ mvwaddch(wmeta->pad.curses_win, all_corners[i].bl.y, all_corners[i].bl.x, '+');
+ mvwaddch(wmeta->pad.curses_win, all_corners[i].br.y, all_corners[i].br.x, '+'); }
+ free(all_corners);
+ if (wmeta->pad_offset > 0)
+ draw_scroll_hint(&wmeta->pad, wmeta->pad_offset, wmeta->pad_offset + 1, '<');
+ if (wmeta->pad_offset + wmeta->pad.size.x < getmaxx(wmeta->pad.curses_win) - 1)
+ draw_scroll_hint(&wmeta->pad, wmeta->pad_offset + wmeta->pad.size.x - 1,
+ getmaxx(wmeta->pad.curses_win) - (wmeta->pad_offset + wmeta->pad.size.x), '>');
+ pnoutrefresh(wmeta->pad.curses_win, 0, wmeta->pad_offset, 0, 0, wmeta->pad.size.y, wmeta->pad.size.x-1); }
doupdate(); }
-void resize_window (struct WinMeta * win_meta, char change) {
+extern void resize_active_win (struct WinMeta * wmeta, 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); }
-
-void cycle_active_window (struct WinMeta * win_meta, char dir) {
+ if (0 != wmeta->active && width > 0 && height > 0 && height < wmeta->pad.size.y) {
+ wmeta->active->frame.size.y = height;
+ wmeta->active->frame.size.x = width;
+ update_wins(wmeta, wmeta->chain_start); } }
+
+extern void cycle_active_win (struct WinMeta * wmeta, 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 != wmeta->active) {
+ if ('n' == dir) {
+ if (wmeta->active->next != 0)
+ wmeta->active = wmeta->active->next;
+ else
+ wmeta->active = wmeta->chain_start; }
+ else {
+ if (wmeta->active->prev != 0)
+ wmeta->active = wmeta->active->prev;
+ else
+ wmeta->active = wmeta->chain_end; } } }
-void shift_window (struct WinMeta * win_meta, char dir) {
+extern void shift_active_win (struct WinMeta * wmeta, 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;
- struct Win * win_shift = win_meta->active;
+ if (0 != wmeta->active && wmeta->chain_start != wmeta->chain_end && (dir == 'f' || dir == 'b')) {
+ struct Win * w_shift = wmeta->active, * w_p, * w_p_next;
char wrap = 0;
- if ((dir == 'f' && win_shift == win_meta->chain_end)
- || (dir == 'b' && win_shift == win_meta->chain_start))
+ if ((dir == 'f' && w_shift == wmeta->chain_end) || (dir == 'b' && w_shift == wmeta->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);
+ uint16_t i, i_max;
+ for (i_max = 1, w_p = wmeta->chain_start; w_p != wmeta->chain_end; i_max++)
+ w_p = w_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; }
+ for (i = 0, w_p = wmeta->chain_start; i < i_max; i++) {
+ w_p_next = w_p->next;
+ suspend_win(wmeta, w_p);
+ wins[i] = w_p;
+ w_p = w_p_next; }
if (wrap)
if (dir == 'f') {
- append_window(win_meta, win_shift);
+ append_win(wmeta, w_shift);
for (i = 0; i < i_max - 1; i++)
- append_window(win_meta, wins[i]); }
+ append_win(wmeta, wins[i]); }
else {
for (i = 1; i < i_max; i++)
- append_window(win_meta, wins[i]);
- append_window(win_meta, win_shift); }
+ append_win(wmeta, wins[i]);
+ append_win(wmeta, w_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]);
+ if ((dir == 'f' && w_shift == wins[i]) || (dir == 'b' && w_shift == wins[i+1])) {
+ append_win(wmeta, wins[i+1]);
+ append_win(wmeta, wins[i]);
i++; }
else
- append_window(win_meta, wins[i]);
+ append_win(wmeta, wins[i]);
free(wins);
- win_meta->active = win_shift; } }
+ wmeta->active = w_shift; } }
+
+extern void reset_pad_offset(struct WinMeta * wmeta, uint16_t new_offset) {
+// Apply new_offset to windows pad, if it proves to be sane.
+ if (new_offset >= 0 && new_offset + wmeta->pad.size.x < getmaxx(wmeta->pad.curses_win))
+ wmeta->pad_offset = new_offset; }