From 65e32e70db2d72e0a2f1f0ff803f2cdb2e64a486 Mon Sep 17 00:00:00 2001 From: Fuwn Date: Thu, 3 Feb 2022 10:54:07 +0000 Subject: fix(ui): larger width TODO: Line-wrap --- viv/ui.c | 7 ++++--- viv/viv.c | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/viv/ui.c b/viv/ui.c index 96e4d5b..b27fc43 100644 --- a/viv/ui.c +++ b/viv/ui.c @@ -14,7 +14,7 @@ void UI_initialise(char *content[], int content_length) { ITEM **window_items; MENU *menu; int character; - int max_y; + int max_x, max_y; initscr(); start_color(); @@ -26,6 +26,7 @@ void UI_initialise(char *content[], int content_length) { window_items = (ITEM **)calloc(content_length, sizeof(ITEM *)); max_y = getmaxy(stdscr); + max_x = getmaxx(stdscr); for (int i = 0; i < content_length; ++i) { window_items[i] = new_item(content[i], content[i]); @@ -33,11 +34,11 @@ void UI_initialise(char *content[], int content_length) { menu = new_menu((ITEM **)window_items); - window = newwin(max_y, 60, 0, 0); + window = newwin(max_y, max_x, 0, 0); keypad(window, TRUE); set_menu_win(menu, window); - set_menu_sub(menu, derwin(window, max_y - 2, 60, 0, 0)); + set_menu_sub(menu, derwin(window, max_y - 2, max_x, 0, 0)); set_menu_format(menu, max_y - 2, 1); set_menu_mark(menu, ""); diff --git a/viv/viv.c b/viv/viv.c index bff3769..1edf45c 100644 --- a/viv/viv.c +++ b/viv/viv.c @@ -198,12 +198,12 @@ void VIV_split(const char *string, char separator, split_fn function, void *data for (stop = 0; string[stop]; ++stop) { if (string[stop] == separator) { - function(string + start, stop - start, data); + function(string + start, (int)(stop - start), data); start = stop + 1; } } - function(string + start, stop - start, data); + function(string + start, (int)(stop - start), data); } /* https://stackoverflow.com/a/58244503/14452787 */ -- cgit v1.2.3