#include <stdint.h> /* uint8_t, uint16_t, uint32_t, UINT16_MAX */
#include <stdio.h> /* sprintf() */
#include <string.h> /* memcpy(), strlen(), strnlen(), strchr(), memset() */
+#include "../common/err_try_fgets.h" /* err_try_fgets(), err_line() */
+#include "../common/readwrite.h" /* try_fputc(), try_write(), try_fgetc() */
#include "../common/rexit.h" /* exit_trouble(), exit_err() */
-#include "../common/readwrite.h" /* try_fputc(), try_write(), try_fgets(),
- * try_fgetc()
- */
#include "../common/try_malloc.h" /* try_malloc() */
#include "../common/yx_uint16.h" /* struct yx_uint16 */
#include "draw_wins.h" /* draw_winconf_geometry(), draw_winconf_keybindings(),
* draw_win_keybindings_winconf_geometry(),
* draw_win_keybindings_global()
*/
-#include "keybindings.h" /* free_keybindings(), write_keybidings_to_file(),
+#include "keybindings.h" /* write_keybidings_to_file(),
* read_keybindings_from_file()
*/
+#include "misc.h" /* array_append() */
#include "world.h" /* global world */
-/* Get position of id "c" in world.windb.order or return Win before/after (or
+/* Get position of id "c" in world.winDB.order or return Win before/after (or
* NULL if there is no window before/after).
*/
static uint8_t get_pos_in_order(char c);
/* Write "win"'s size back to .target_(height/width) as per .target_*_type. */
static void set_win_target_size(struct Win * win);
-/* Iterate over chars of world.windb.ids array / string. Restart after \0.*/
+/* Iterate over chars of world.winDB.ids array / string. Restart after \0.*/
static char get_next_win_id();
/* Make .v_screen just wide enough to contain all visible windows. */
static void append_win(struct Win * w);
static void suspend_win(struct Win * w);
-/* Copy Win content pointed to by "win" into appendend world.windb.wins area. */
-static void add_win_to_windb(struct Win * win);
-
static uint8_t get_pos_in_order(char c)
{
uint8_t i;
- for (i = 0; c != world.windb.order[i]; i++);
+ for (i = 0; c != world.winDB.order[i]; i++);
return i;
}
static struct Win * get_win_after(char c)
{
- return get_win_by_id(world.windb.order[get_pos_in_order(c) + 1]);
+ return get_win_by_id(world.winDB.order[get_pos_in_order(c) + 1]);
}
uint8_t i = get_pos_in_order(c);
if (i > 0)
{
- return get_win_by_id(world.windb.order[i - 1]);
+ return get_win_by_id(world.winDB.order[i - 1]);
}
return NULL;
}
static void init_win_size_from_winconf_and_v_screen_size(char id)
{
struct Win * w = get_win_by_id(id);
- w->frame_size.y = world.windb.v_screen_size.y - 1;
+ w->frame_size.y = world.winDB.v_screen_size.y - 1;
if ( 0 < w->target_height
- && w->target_height <= world.windb.v_screen_size.y - 1)
+ && w->target_height <= world.winDB.v_screen_size.y - 1)
{
w->frame_size.y = w->target_height;
}
else if ( 0 > w->target_height
- && world.windb.v_screen_size.y + (w->target_height - 1) > 0)
+ && world.winDB.v_screen_size.y + (w->target_height - 1) > 0)
{
- w->frame_size.y = world.windb.v_screen_size.y + (w->target_height - 1);
+ w->frame_size.y = world.winDB.v_screen_size.y + (w->target_height - 1);
}
- w->frame_size.x = world.windb.v_screen_size.x;
+ w->frame_size.x = world.winDB.v_screen_size.x;
if (0 < w->target_width)
{
w->frame_size.x = w->target_width;
}
else if ( 0 > w->target_width
- && world.windb.v_screen_size.x + w->target_width > 0)
+ && world.winDB.v_screen_size.x + w->target_width > 0)
{
- w->frame_size.x = world.windb.v_screen_size.x + w->target_width;
+ w->frame_size.x = world.winDB.v_screen_size.x + w->target_width;
}
}
}
else if (1 == wcp->target_height_type)
{
- wcp->target_height = wcp->frame_size.y - world.windb.v_screen_size.y +1;
+ wcp->target_height = wcp->frame_size.y - world.winDB.v_screen_size.y +1;
}
if (0 == wcp->target_width_type)
{
}
else if (1 == wcp->target_width_type)
{
- wcp->target_width = wcp->frame_size.x - world.windb.v_screen_size.x;
+ wcp->target_width = wcp->frame_size.x - world.winDB.v_screen_size.x;
}
}
static char get_next_win_id()
{
static uint8_t i = 0;
- char c = world.windb.ids[i];
+ char c = world.winDB.ids[i];
if (0 == c)
{
i = 0;
{
/* Determine rightmost window column. */
uint32_t lastwcol = 0;
- struct Win * wp = get_win_by_id(world.windb.order[0]);
+ struct Win * wp = get_win_by_id(world.winDB.order[0]);
while (wp != 0)
{
if ((uint32_t) wp->start.x + (uint32_t) wp->frame_size.x > lastwcol + 1)
/* Only resize .v_screen if the rightmost window column has changed. */
char * err_s = "refit_v_screen() grows virtual screen beyond legal sizes.";
char * err_m = "refit_v_screen() triggers memory alloc error in wresize().";
- if (getmaxx(world.windb.v_screen) + 1 != lastwcol)
+ if (getmaxx(world.winDB.v_screen) + 1 != lastwcol)
{
uint8_t t = (lastwcol + 2 > UINT16_MAX);
exit_err(t, err_s);
- t = wresize(world.windb.v_screen, getmaxy(world.windb.v_screen),
+ t = wresize(world.winDB.v_screen, getmaxy(world.winDB.v_screen),
lastwcol + 2);
exit_err(t, err_m);
}
/* Fit w's top left to bottom left of its ->prev if enough space. */
uint16_t w_prev_maxy = w_prev->start.y + w_prev->frame_size.y;
if ( w->frame_size.x <= w_prev->frame_size.x
- && w->frame_size.y < world.windb.v_screen_size.y - w_prev_maxy)
+ && w->frame_size.y < world.winDB.v_screen_size.y - w_prev_maxy)
{
w->start.x = w_prev->start.x;
w->start.y = w_prev_maxy + 1;
uint16_t w_thr_bottom = w_thr->start.y + w_thr->frame_size.y;
uint16_t free_width = (w_thr->start.x + w_thr->frame_size.x)
- (w_test->start.x + w_test->frame_size.x);
- if ( w->frame_size.y < world.windb.v_screen_size.y - w_thr_bottom
+ if ( w->frame_size.y < world.winDB.v_screen_size.y - w_thr_bottom
&& w->frame_size.x < free_width)
{
w->start.x = w_test->start.x + w_test->frame_size.x + 1;
}
if ('<' == dir || '>' == dir)
{
- mvwaddch(world.windb.v_screen, start.y+q, start.x+draw_offset, c);
+ mvwaddch(world.winDB.v_screen, start.y+q, start.x+draw_offset, c);
continue;
}
- mvwaddch(world.windb.v_screen, start.y + draw_offset, start.x + q, c);
+ mvwaddch(world.winDB.v_screen, start.y + draw_offset, start.x + q, c);
}
}
uint16_t y, x;
for (y = w->start.y; y <= w->start.y + w->frame_size.y; y++)
{
- mvwaddch(world.windb.v_screen, y, w->start.x - 1, '|');
- mvwaddch(world.windb.v_screen, y, w->start.x + w->frame_size.x, '|');
+ mvwaddch(world.winDB.v_screen, y, w->start.x - 1, '|');
+ mvwaddch(world.winDB.v_screen, y, w->start.x + w->frame_size.x, '|');
}
for (x = w->start.x; x <= w->start.x + w->frame_size.x; x++)
{
- mvwaddch(world.windb.v_screen, w->start.y - 1, x, '-');
- mvwaddch(world.windb.v_screen, w->start.y + w->frame_size.y, x, '-');
+ mvwaddch(world.winDB.v_screen, w->start.y - 1, x, '-');
+ mvwaddch(world.winDB.v_screen, w->start.y + w->frame_size.y, x, '-');
}
/* Draw as much as possible of the title into center of top border line. */
uint16_t length_visible = strnlen(w->title, w->frame_size.x - 2);
char title[length_visible + 3];
char decoration = ' ';
- if (w->id == world.windb.active)
+ if (w->id == world.winDB.active)
{
decoration = '$';
}
memcpy(title + 1, w->title, length_visible);
title[0] = title[length_visible + 1] = decoration;
title[length_visible + 2] = '\0';
- mvwaddstr(world.windb.v_screen, w->start.y-1, w->start.x+offset, title);
+ mvwaddstr(world.winDB.v_screen, w->start.y-1, w->start.x+offset, title);
}
}
static void draw_wins_bordercorners(struct Win * w)
{
- mvwaddch(world.windb.v_screen,
+ mvwaddch(world.winDB.v_screen,
w->start.y - 1, w->start.x - 1, '+');
- mvwaddch(world.windb.v_screen,
+ mvwaddch(world.winDB.v_screen,
w->start.y - 1, w->start.x + w->frame_size.x, '+');
- mvwaddch(world.windb.v_screen,
+ mvwaddch(world.winDB.v_screen,
w->start.y + w->frame_size.y, w->start.x - 1, '+');
- mvwaddch(world.windb.v_screen, w->start.y + w->frame_size.y,
+ mvwaddch(world.winDB.v_screen, w->start.y + w->frame_size.y,
w->start.x + w->frame_size.x, '+');
struct Win * next = get_win_after(w->id);
if (next)
for (x = offset_x; x < w->frame_size.x + offset_x && x < size_x; x++)
{
chtype ch = w->winmap[(y * w->winmap_size.x) + x];
- mvwaddch(world.windb.v_screen, w->start.y + (y - offset_y),
+ mvwaddch(world.winDB.v_screen, w->start.y + (y - offset_y),
w->start.x + (x - offset_x), ch);
}
}
- free(w->winmap);
- w->winmap = NULL;
+ free(w->winmap); /* NULL so draw_wins.c's try_resize_winmap() may always */
+ w->winmap = NULL;/* free() it before (re-)allocation, even the first time.*/
memset(&w->winmap_size, 0, sizeof(struct yx_uint16));
if (offset_y > 0)
{
static void append_win(struct Win * w)
{
char * f_name = "append_win()";
- uint8_t old_size = strlen(world.windb.order) + 1;
+ uint8_t old_size = strlen(world.winDB.order) + 1;
char * new_order = try_malloc(old_size + 1, f_name);
- memcpy(new_order, world.windb.order, old_size - 1);
+ memcpy(new_order, world.winDB.order, old_size - 1);
new_order[old_size - 1] = w->id;
new_order[old_size] = '\0';
- free(world.windb.order);
- world.windb.order = new_order;
- world.windb.active = w->id;
+ free(world.winDB.order);
+ world.winDB.order = new_order;
+ world.winDB.active = w->id;
update_wins(w);
}
static void suspend_win(struct Win * w)
{
char * f_name = "suspend_win()";
- uint8_t new_size = strlen(world.windb.order);
+ uint8_t new_size = strlen(world.winDB.order);
char * new_order = try_malloc(new_size, f_name);
uint8_t i = get_pos_in_order(w->id);
- char next_char = world.windb.order[i + 1];
- world.windb.order[i] = '\0';
- char * second_part = &world.windb.order[i + 1];
- sprintf(new_order, "%s%s", world.windb.order, second_part);
- free(world.windb.order);
- world.windb.order = new_order;
- world.windb.active = world.windb.order[i];
- if (!world.windb.order[i] && 0 < i)
+ char next_char = world.winDB.order[i + 1];
+ world.winDB.order[i] = '\0';
+ char * second_part = &world.winDB.order[i + 1];
+ sprintf(new_order, "%s%s", world.winDB.order, second_part);
+ free(world.winDB.order);
+ world.winDB.order = new_order;
+ world.winDB.active = world.winDB.order[i];
+ if (!world.winDB.order[i] && 0 < i)
{
- world.windb.active = world.windb.order[i - 1];
+ world.winDB.active = world.winDB.order[i - 1];
}
- if (world.windb.order[i])
+ if (world.winDB.order[i])
{
update_wins(get_win_by_id(next_char)); /* Already calls */
return; /* refit_v_screen(), so leave. */
-static void add_win_to_windb(struct Win * win)
-{
- char * f_name = "add_win_to_windb()";
- if (world.windb.ids)
- {
- uint8_t old_ids_size = strlen(world.windb.ids);
- char * new_ids = try_malloc(old_ids_size + 1 + 1, f_name);
- sprintf(new_ids, "%s%c", world.windb.ids, win->id);
- free(world.windb.ids);
- world.windb.ids = new_ids;
- uint16_t old_wins_size = old_ids_size * sizeof(struct Win);
- uint16_t new_wins_size = old_wins_size + sizeof(struct Win);
- struct Win * new_wins = try_malloc(new_wins_size, f_name);
- memcpy(new_wins, world.windb.wins, old_wins_size);
- new_wins[old_ids_size] = *win;
- free(world.windb.wins);
- world.windb.wins = new_wins;
- return;
- }
- world.windb.ids = try_malloc(2, f_name);
- sprintf(world.windb.ids, "%c", win->id);
- world.windb.wins = try_malloc(sizeof(struct Win), f_name);
- world.windb.wins[0] = *win;
-}
-
-
-
-extern uint16_t center_offset(uint16_t position, uint16_t mapsize,
- uint16_t frame_size)
+extern uint16_t center_offset(uint16_t position, uint32_t mapsize,
+ uint32_t frame_size)
{
uint16_t offset = 0;
if (mapsize > frame_size)
extern struct Win * get_win_by_id(char id)
{
uint8_t i = 0;
- while ('\0' != world.windb.ids[i])
+ while ('\0' != world.winDB.ids[i])
{
- if (id == world.windb.ids[i])
+ if (id == world.winDB.ids[i])
{
- return &world.windb.wins[i];
+ return &world.winDB.wins[i];
}
i++;
}
FILE * file)
{
char * f_name = "read_winconf_from_file()";
- int test = try_fgetc(file, f_name);
- if (EOF == test)
+ char * context = "Failed reading individual window's configuration from "
+ "interface config file. ";
+ char * err_id = "Illegal ID(s) selected.";
+ char * err_2 = "Double-initialized window.";
+ int test_for_end = try_fgetc(file, f_name);
+ if (EOF == test_for_end || '\n' == test_for_end)
{
return 0;
}
+ exit_trouble(EOF == ungetc(test_for_end, file), f_name, "ungetc()");
+ err_try_fgets(line, linemax, file, context, "ns");
+ err_line(NULL == strchr(world.winDB.legal_ids, line[0]), line, context,
+ err_id);
+ exit_err(world.winDB.ids && NULL!=strchr(world.winDB.ids, line[0]), err_2);
struct Win win;
memset(&win, 0, sizeof(struct Win));
- win.id = (char) test;
- try_fgetc(file, f_name);
- try_fgets(line, linemax + 1, file, f_name);
+ win.id = (char) line[0];
+ err_try_fgets(line, linemax, file, context, "0n");
win.title = try_malloc(strlen(line), f_name);
- memcpy(win.title, line, strlen(line) - 1); /* Eliminate newline char */
- win.title[strlen(line) - 1] = '\0'; /* char at end of string. */
- try_fgets(line, linemax + 1, file, f_name);
+ memcpy(win.title, line, strlen(line) - 1); /* Eliminate newline char */
+ win.title[strlen(line) - 1] = '\0'; /* char at end of string. */
+ err_try_fgets(line, linemax, file, context, "0ni");
win.target_height = atoi(line);
win.target_height_type = (0 >= win.target_height);
- try_fgets(line, linemax + 1, file, f_name);
+ err_try_fgets(line, linemax, file, context, "0ni");
win.target_width = atoi(line);
win.target_width_type = (0 >= win.target_width);
read_keybindings_from_file(line, linemax, file, &win.kb);
- add_win_to_windb(&win);
+ if (world.winDB.ids)
+ {
+ uint8_t old_ids_size = strlen(world.winDB.ids);
+ char * new_ids = try_malloc(old_ids_size + 1 + 1, f_name);
+ sprintf(new_ids, "%s%c", world.winDB.ids, win.id);
+ free(world.winDB.ids);
+ world.winDB.ids = new_ids;
+ array_append(old_ids_size, sizeof(struct Win), (void *) &win,
+ (void **) &world.winDB.wins);
+ return 1;
+ }
+ world.winDB.ids = try_malloc(2, f_name);
+ sprintf(world.winDB.ids, "%c", win.id);
+ world.winDB.wins = try_malloc(sizeof(struct Win), f_name);
+ world.winDB.wins[0] = win;
return 1;
}
-extern void write_winconf_of_id_to_file(FILE * file, char c, char * delim)
+extern void write_winconf_of_id_to_file(FILE * file, char c)
{
char * f_name = "write_winconf_of_id_to_file()";
struct Win * wc = get_win_by_id(c);
try_fwrite(line, sizeof(char), strlen(line), file, f_name);
sprintf(line, "%d\n", wc->target_width);
try_fwrite(line, sizeof(char), strlen(line), file, f_name);
- write_keybindings_to_file(file, &wc->kb, delim);
+ write_keybindings_to_file(file, &wc->kb);
}
extern void read_order_wins_visible_active(char * line, uint32_t linemax,
- FILE * file)
+ FILE * file, char ** tmp_order,
+ char * tmp_active)
{
char * f_name = "read_order_wins_visible_active()";
- char win_order[linemax + 1];
- try_fgets(win_order, linemax + 1, file, f_name);
- win_order[strlen(win_order) - 1] = '\0';
- world.windb.order = try_malloc(strlen(win_order) + 1, f_name);
- sprintf(world.windb.order, "%s", win_order);
- int char_or_eof = try_fgetc(file, f_name);
- char * err_eof = "fgetc() unexpectedly hitting EOF";
- exit_trouble(EOF == char_or_eof, f_name, err_eof);
- world.windb.active = (uint8_t) char_or_eof;
- exit_trouble(EOF == try_fgetc(file, f_name), f_name, err_eof);
- try_fgets(line, linemax + 1, file, f_name);
+ char * context = "Failed reading order and activation of visible windows "
+ "from interface config file. ";
+ char * err_id = "Illegal ID(s) selected.";
+ err_try_fgets(line, linemax, file, context, "01");
+ uint32_t i = 0;
+ for (; i < strlen(line) - 1; i++)
+ {
+ char * test = strchr(world.winDB.legal_ids, line[i]);
+ err_line(!test, line, context, err_id);
+ }
+ line[strlen(line) - 1] = '\0';
+ *tmp_order = try_malloc(strlen(line) + 1, f_name);
+ sprintf(*tmp_order, "%s", line);
+ if (*tmp_order[0])
+ {
+ err_try_fgets(line, linemax, file, context, "0nfs");
+ err_line(NULL == strchr(*tmp_order, line[0]), line, context, err_id);
+ *tmp_active = line[0];
+ }
+ else
+ {
+ err_try_fgets(line, linemax, file, context, "0ne");
+ *tmp_active = '\0';
+ }
+ err_try_fgets(line, linemax, file, context, "d");
}
-extern void write_order_wins_visible_active(FILE * file, char * delim)
+extern void write_order_wins_visible_active(FILE * file)
{
char * f_name = "write_order_wins_visible_active()";
- try_fwrite(world.windb.order, strlen(world.windb.order), 1, file, f_name);
+ try_fwrite(world.winDB.order, strlen(world.winDB.order), 1, file, f_name);
try_fputc('\n', file, f_name);
- try_fputc(world.windb.active, file, f_name);
+ try_fputc(world.winDB.active, file, f_name);
try_fputc('\n', file, f_name);
- try_fwrite(delim, strlen(delim), 1, file, f_name);
+ try_fwrite(world.delim, strlen(world.delim), 1, file, f_name);
}
char * f_name = "make_v_screen_and_init_win_sizes()";
char * err_s = "creating an illegaly large virtual screen";
char * err_m = "triggering a memory allocation error via newpad()";
- uint32_t maxy_test = getmaxy(world.windb.t_screen);
- uint32_t maxx_test = getmaxx(world.windb.t_screen);
+ uint32_t maxy_test = getmaxy(world.winDB.t_screen);
+ uint32_t maxx_test = getmaxx(world.winDB.t_screen);
exit_trouble(maxy_test>UINT16_MAX || maxx_test>UINT16_MAX, f_name, err_s);
- world.windb.v_screen_size.y = maxy_test;
- world.windb.v_screen_size.x = maxx_test;
- world.windb.v_screen = newpad(world.windb.v_screen_size.y, 1);
- exit_trouble(NULL == world.windb.v_screen, f_name, err_m);
+ world.winDB.v_screen_size.y = maxy_test;
+ world.winDB.v_screen_size.x = maxx_test;
+ world.winDB.v_screen = newpad(world.winDB.v_screen_size.y, 1);
+ exit_trouble(NULL == world.winDB.v_screen, f_name, err_m);
char id;
while (0 != (id = get_next_win_id()))
{
-extern void free_windb()
+extern void free_winDB()
{
char id;
while (0 != (id = get_next_win_id()))
{
struct Win * wc = get_win_by_id(id);
free(wc->title);
- free_keybindings(wc->kb.kbs);
+ free(wc->kb.kbs);
+ wc->kb.kbs = NULL;
}
- free(world.windb.ids);
- world.windb.ids = NULL;
- free(world.windb.wins);
- world.windb.wins = NULL;
- free(world.windb.order);
- world.windb.order = NULL;
+ free(world.winDB.ids); /* NULL this too since add_win_to_winDB() checks */
+ world.winDB.ids = NULL; /* for it to detect its first post-DB-purge round.*/
+ free(world.winDB.wins);
+ free(world.winDB.order);
}
{
endwin(); /* "[S]tandard way" to recalibrate ncurses post SIGWINCH, says */
refresh(); /* <http://invisible-island.net/ncurses/ncurses-intro.html>. */
- char tmp_order[strlen(world.windb.order) + 1];
- sprintf(tmp_order, "%s", world.windb.order);
+ char tmp_order[strlen(world.winDB.order) + 1];
+ sprintf(tmp_order, "%s", world.winDB.order);
uint8_t i;
- char tmp_active = world.windb.active;
+ char tmp_active = world.winDB.active;
for (i = 0; i < strlen(tmp_order); toggle_window(tmp_order[i]), i++);
- delwin(world.windb.v_screen);
+ delwin(world.winDB.v_screen);
make_v_screen_and_init_win_sizes();
for (i = 0; i < strlen(tmp_order); toggle_window(tmp_order[i]), i++);
- world.windb.active = tmp_active;
+ world.winDB.active = tmp_active;
}
{
/* Empty everything before filling it a-new. */
erase();
- wnoutrefresh(world.windb.t_screen);
- werase(world.windb.v_screen);
- if (world.windb.active)
+ wnoutrefresh(world.winDB.t_screen);
+ werase(world.winDB.v_screen);
+ if (world.winDB.active)
{
/* Draw borders, wins. Order matters: corners should overwrite lines. */
- draw_wins_borderlines(get_win_by_id(world.windb.order[0]));
- draw_wins_bordercorners(get_win_by_id(world.windb.order[0]));
- draw_wins(get_win_by_id(world.windb.order[0]));
+ draw_wins_borderlines(get_win_by_id(world.winDB.order[0]));
+ draw_wins_bordercorners(get_win_by_id(world.winDB.order[0]));
+ draw_wins(get_win_by_id(world.winDB.order[0]));
/* Draw .v_screen scroll hints. */
struct yx_uint16 start;
start.y = 0;
- start.x = world.windb.v_screen_offset;
+ start.x = world.winDB.v_screen_offset;
char * cols_string = "columns";
- if (world.windb.v_screen_offset > 0)
+ if (world.winDB.v_screen_offset > 0)
{
- scroll_hint(world.windb.v_screen_size, '<',
- world.windb.v_screen_offset + 1, cols_string, start);
+ scroll_hint(world.winDB.v_screen_size, '<',
+ world.winDB.v_screen_offset + 1, cols_string, start);
}
- uint16_t size_x = getmaxx(world.windb.v_screen);
- uint16_t right_edge = world.windb.v_screen_offset
- + world.windb.v_screen_size.x;
+ uint16_t size_x = getmaxx(world.winDB.v_screen);
+ uint16_t right_edge = world.winDB.v_screen_offset
+ + world.winDB.v_screen_size.x;
if (right_edge < size_x - 1)
{
- scroll_hint(world.windb.v_screen_size, '>',
+ scroll_hint(world.winDB.v_screen_size, '>',
size_x - right_edge, cols_string, start);
}
/* Put .v_screen segment to be shown on .t_screen to .t_screen buffer.*/
- pnoutrefresh(world.windb.v_screen, 0, world.windb.v_screen_offset, 0, 0,
- world.windb.v_screen_size.y,
- world.windb.v_screen_size.x - 1);
+ pnoutrefresh(world.winDB.v_screen, 0, world.winDB.v_screen_offset, 0, 0,
+ world.winDB.v_screen_size.y,
+ world.winDB.v_screen_size.x - 1);
}
/* Only at the end write accumulated changes to .t_screen. */
extern void toggle_window(char id)
{
struct Win * win = get_win_by_id(id);
- if (NULL == strchr(world.windb.order, id))
+ if (NULL == strchr(world.winDB.order, id))
{
append_win(win);
return;
extern void toggle_winconfig()
{
- if (!world.windb.active)
+ if (!world.winDB.active)
{
return;
}
- struct Win * w = get_win_by_id(world.windb.active);
+ struct Win * w = get_win_by_id(world.winDB.active);
if (0 == w->view)
{
w->view = 1;
extern void toggle_win_size_type(char axis)
{
- struct Win * w = get_win_by_id(world.windb.active);
+ struct Win * w = get_win_by_id(world.winDB.active);
if ('y' == axis)
{
w->target_height_type = (0 == w->target_height_type);
return;
}
w->target_width_type = ( 0 == w->target_width_type
- && w->frame_size.x <= world.windb.v_screen_size.x);
+ && w->frame_size.x <= world.winDB.v_screen_size.x);
set_win_target_size(w);
}
extern void resize_active_win(char change)
{
- if (world.windb.active)
+ if (world.winDB.active)
{
- struct Win * w = get_win_by_id(world.windb.active);
+ struct Win * w = get_win_by_id(world.winDB.active);
if (change == '-' && w->frame_size.y > 1)
{
w->frame_size.y--;
w->frame_size.x--;
}
else if ( change == '+'
- && w->frame_size.y < world.windb.v_screen_size.y - 1)
+ && w->frame_size.y < world.winDB.v_screen_size.y - 1)
{
w->frame_size.y++;
}
w->frame_size.x++;
}
if ( 1 == w->target_width_type
- && w->frame_size.x > world.windb.v_screen_size.x)
+ && w->frame_size.x > world.winDB.v_screen_size.x)
{
w->target_width_type = 0;
}
extern void shift_active_win(char dir)
{
- uint8_t len_order = strlen(world.windb.order);
+ uint8_t len_order = strlen(world.winDB.order);
if (1 < len_order)
{
char tmp[len_order + 1];
tmp[len_order] = '\0';
- uint8_t pos = get_pos_in_order(world.windb.active);
+ uint8_t pos = get_pos_in_order(world.winDB.active);
if ('f' == dir)
{
if (pos == len_order - 1)
{
- memcpy(tmp + 1, world.windb.order, len_order - 1);
- tmp[0] = world.windb.active;
- memcpy(world.windb.order, tmp, len_order + 1);
+ memcpy(tmp + 1, world.winDB.order, len_order - 1);
+ tmp[0] = world.winDB.active;
+ memcpy(world.winDB.order, tmp, len_order + 1);
}
else
{
- world.windb.order[pos] = world.windb.order[pos + 1];
- world.windb.order[pos + 1] = world.windb.active;
+ world.winDB.order[pos] = world.winDB.order[pos + 1];
+ world.winDB.order[pos + 1] = world.winDB.active;
}
}
else
{
if (pos == 0)
{
- memcpy(tmp, world.windb.order + 1, len_order - 1);
- tmp[len_order - 1] = world.windb.active;
- memcpy(world.windb.order, tmp, len_order + 1);
+ memcpy(tmp, world.winDB.order + 1, len_order - 1);
+ tmp[len_order - 1] = world.winDB.active;
+ memcpy(world.winDB.order, tmp, len_order + 1);
}
else
{
- world.windb.order[pos] = world.windb.order[pos - 1];
- world.windb.order[pos - 1] = world.windb.active;
+ world.winDB.order[pos] = world.winDB.order[pos - 1];
+ world.winDB.order[pos - 1] = world.winDB.active;
}
}
- update_wins(get_win_by_id(world.windb.order[0]));
+ update_wins(get_win_by_id(world.winDB.order[0]));
}
}
extern void scroll_v_screen(char dir)
{
if ( '+' == dir
- && world.windb.v_screen_offset + world.windb.v_screen_size.x + 1
- < getmaxx(world.windb.v_screen))
+ && world.winDB.v_screen_offset + world.winDB.v_screen_size.x + 1
+ < getmaxx(world.winDB.v_screen))
{
- world.windb.v_screen_offset++;
+ world.winDB.v_screen_offset++;
}
else if ( '-' == dir
- && world.windb.v_screen_offset > 0)
+ && world.winDB.v_screen_offset > 0)
{
- world.windb.v_screen_offset--;
+ world.winDB.v_screen_offset--;
}
}
extern void cycle_active_win(char dir)
{
- uint8_t len_order = strlen(world.windb.order);
+ uint8_t len_order = strlen(world.winDB.order);
if (1 < len_order)
{
- uint8_t pos = get_pos_in_order(world.windb.active);
+ uint8_t pos = get_pos_in_order(world.winDB.active);
if ('f' == dir)
{
- world.windb.active = world.windb.order[pos + 1];
- if ('\0' == world.windb.active)
+ world.winDB.active = world.winDB.order[pos + 1];
+ if ('\0' == world.winDB.active)
{
- world.windb.active = world.windb.order[0];
+ world.winDB.active = world.winDB.order[0];
}
return;
}
if (pos > 0)
{
- world.windb.active = world.windb.order[pos - 1];
+ world.winDB.active = world.winDB.order[pos - 1];
return;
}
- world.windb.active = world.windb.order[len_order - 1];
+ world.winDB.active = world.winDB.order[len_order - 1];
}
}
projects / plomrogue / blobdiff