From ef62104d63626b39db6e69bb38d9e088a93ff71c Mon Sep 17 00:00:00 2001 From: James Booth Date: Wed, 8 Oct 2014 00:34:26 +0100 Subject: Added larger occupants pad size --- src/ui/ui.h | 3 ++- src/ui/window.c | 8 ++++---- src/ui/windows.c | 6 +++--- 3 files changed, 9 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/ui/ui.h b/src/ui/ui.h index e0193854..0c61c296 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -52,7 +52,8 @@ #include "xmpp/xmpp.h" #define INP_WIN_MAX 1000 -#define OCCUPANT_WIN_SIZE 5 +#define OCCUPANT_WIN_RATIO 5 +#define OCCUPANT_WIN_WIDTH 100 void ui_init_module(void); void console_init_module(void); diff --git a/src/ui/window.c b/src/ui/window.c index 34c5e934..d9c2275e 100644 --- a/src/ui/window.c +++ b/src/ui/window.c @@ -61,10 +61,10 @@ win_create(const char * const title, int cols, win_type_t type) new_win->from = strdup(title); if (type == WIN_MUC) { - new_win->win = newpad(PAD_SIZE, (cols/OCCUPANT_WIN_SIZE) * (OCCUPANT_WIN_SIZE-1)); + new_win->win = newpad(PAD_SIZE, (cols/OCCUPANT_WIN_RATIO) * (OCCUPANT_WIN_RATIO-1)); wbkgd(new_win->win, COLOUR_TEXT); - new_win->subwin = newpad(PAD_SIZE, cols/OCCUPANT_WIN_SIZE); + new_win->subwin = newpad(PAD_SIZE, OCCUPANT_WIN_WIDTH); wbkgd(new_win->subwin, COLOUR_TEXT); } else { new_win->win = newpad(PAD_SIZE, (cols)); @@ -108,8 +108,8 @@ win_update_virtual(ProfWin *window) getmaxyx(stdscr, rows, cols); if (window->type == WIN_MUC) { - pnoutrefresh(window->win, window->y_pos, 0, 1, 0, rows-3, ((cols/OCCUPANT_WIN_SIZE) * (OCCUPANT_WIN_SIZE-1)) -1); - pnoutrefresh(window->subwin, window->sub_y_pos, 0, 1, (cols/OCCUPANT_WIN_SIZE) * (OCCUPANT_WIN_SIZE-1), rows-3, cols-1); + pnoutrefresh(window->win, window->y_pos, 0, 1, 0, rows-3, ((cols/OCCUPANT_WIN_RATIO) * (OCCUPANT_WIN_RATIO-1)) -1); + pnoutrefresh(window->subwin, window->sub_y_pos, 0, 1, (cols/OCCUPANT_WIN_RATIO) * (OCCUPANT_WIN_RATIO-1), rows-3, cols-1); } else { pnoutrefresh(window->win, window->y_pos, 0, 1, 0, rows-3, cols-1); } diff --git a/src/ui/windows.c b/src/ui/windows.c index 220b84f8..c3e72899 100644 --- a/src/ui/windows.c +++ b/src/ui/windows.c @@ -295,7 +295,7 @@ wins_resize_all(void) while (curr != NULL) { ProfWin *window = curr->data; if (window->type == WIN_MUC) { - wresize(window->win, PAD_SIZE, (cols/OCCUPANT_WIN_SIZE) * (OCCUPANT_WIN_SIZE-1)); + wresize(window->win, PAD_SIZE, (cols/OCCUPANT_WIN_RATIO) * (OCCUPANT_WIN_RATIO-1)); } else { wresize(window->win, PAD_SIZE, cols); } @@ -306,8 +306,8 @@ wins_resize_all(void) ProfWin *current_win = wins_get_current(); if (current_win->type == WIN_MUC) { - pnoutrefresh(current_win->win, current_win->y_pos, 0, 1, 0, rows-3, ((cols/OCCUPANT_WIN_SIZE) * (OCCUPANT_WIN_SIZE-1)) -1); - pnoutrefresh(current_win->subwin, current_win->sub_y_pos, 0, 1, (cols/OCCUPANT_WIN_SIZE) * (OCCUPANT_WIN_SIZE-1), rows-3, cols-1); + pnoutrefresh(current_win->win, current_win->y_pos, 0, 1, 0, rows-3, ((cols/OCCUPANT_WIN_RATIO) * (OCCUPANT_WIN_RATIO-1)) -1); + pnoutrefresh(current_win->subwin, current_win->sub_y_pos, 0, 1, (cols/OCCUPANT_WIN_RATIO) * (OCCUPANT_WIN_RATIO-1), rows-3, cols-1); } else { pnoutrefresh(current_win->win, current_win->y_pos, 0, 1, 0, rows-3, cols-1); } -- cgit 1.4.1-2-gfad0