devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 8 Actions Packages Projects 1 Releases Wiki Activity

feat(ui): implement dynamic pad resizing (upstream 3e16ae1d)

Browse Source
This commit is contained in:
jabber.developer2
2026-03-31 19:32:18 +03:00
parent d7decd7f17
commit e55b1b3e9d
1 changed files with 54 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/ui/window.c
View File

@@ -66,6 +66,31 @@
#include "xmpp/xmpp.h" #include "xmpp/xmpp.h"
#include "xmpp/roster_list.h" #include "xmpp/roster_list.h"
static const int PAD_MIN_HEIGHT = 100;
static const int PAD_THRESHOLD = 3000;
static gboolean _in_redraw = FALSE;
static void
_win_ensure_pad_capacity(ProfWin* window, WINDOW* win, int lines_needed)
{
if (!win) {
return;
}
int cur_height = getmaxy(win);
int cur_width = getmaxx(win);
if (lines_needed >= cur_height - 1) {
// If we are getting too large, trigger a redraw to clean up old lines
// but only if we are not already in a redraw process.
if (window && cur_height >= PAD_THRESHOLD && !_in_redraw) {
win_redraw(window);
} else {
// resize to required lines + some buffer for next messages
int new_height = lines_needed + 100;
wresize(win, new_height, cur_width);
}
}
}
static const char* LOADING_MESSAGE = "Loading older messages…"; static const char* LOADING_MESSAGE = "Loading older messages…";
static const char* CONS_WIN_TITLE = "CProof. Type /help for help information."; static const char* CONS_WIN_TITLE = "CProof. Type /help for help information.";
static const char* XML_WIN_TITLE = "XML Console"; static const char* XML_WIN_TITLE = "XML Console";
@@ -114,7 +139,7 @@ _win_create_simple_layout(void)
ProfLayoutSimple* layout = malloc(sizeof(ProfLayoutSimple)); ProfLayoutSimple* layout = malloc(sizeof(ProfLayoutSimple));
layout->base.type = LAYOUT_SIMPLE; layout->base.type = LAYOUT_SIMPLE;
layout->base.win = newpad(PAD_SIZE, cols); layout->base.win = newpad(PAD_MIN_HEIGHT, cols);
wbkgd(layout->base.win, theme_attrs(THEME_TEXT)); wbkgd(layout->base.win, theme_attrs(THEME_TEXT));
layout->base.buffer = buffer_create(); layout->base.buffer = buffer_create();
layout->base.y_pos = 0; layout->base.y_pos = 0;
@@ -132,7 +157,7 @@ _win_create_split_layout(void)
ProfLayoutSplit* layout = malloc(sizeof(ProfLayoutSplit)); ProfLayoutSplit* layout = malloc(sizeof(ProfLayoutSplit));
layout->base.type = LAYOUT_SPLIT; layout->base.type = LAYOUT_SPLIT;
layout->base.win = newpad(PAD_SIZE, cols); layout->base.win = newpad(PAD_MIN_HEIGHT, cols);
wbkgd(layout->base.win, theme_attrs(THEME_TEXT)); wbkgd(layout->base.win, theme_attrs(THEME_TEXT));
layout->base.buffer = buffer_create(); layout->base.buffer = buffer_create();
layout->base.y_pos = 0; layout->base.y_pos = 0;
@@ -206,12 +231,12 @@ win_create_muc(const char* const roomjid)
if (prefs_get_boolean(PREF_OCCUPANTS)) { if (prefs_get_boolean(PREF_OCCUPANTS)) {
int subwin_cols = win_occpuants_cols(); int subwin_cols = win_occpuants_cols();
layout->base.win = newpad(PAD_SIZE, cols - subwin_cols); layout->base.win = newpad(PAD_MIN_HEIGHT, cols - subwin_cols);
wbkgd(layout->base.win, theme_attrs(THEME_TEXT)); wbkgd(layout->base.win, theme_attrs(THEME_TEXT));
layout->subwin = newpad(PAD_SIZE, subwin_cols); layout->subwin = newpad(PAD_MIN_HEIGHT, subwin_cols);
wbkgd(layout->subwin, theme_attrs(THEME_TEXT)); wbkgd(layout->subwin, theme_attrs(THEME_TEXT));
} else { } else {
layout->base.win = newpad(PAD_SIZE, (cols)); layout->base.win = newpad(PAD_MIN_HEIGHT, (cols));
wbkgd(layout->base.win, theme_attrs(THEME_TEXT)); wbkgd(layout->base.win, theme_attrs(THEME_TEXT));
layout->subwin = NULL; layout->subwin = NULL;
} }
@@ -560,11 +585,11 @@ win_hide_subwin(ProfWin* window)
layout->subwin = NULL; layout->subwin = NULL;
layout->sub_y_pos = 0; layout->sub_y_pos = 0;
int cols = getmaxx(stdscr); int cols = getmaxx(stdscr);
wresize(layout->base.win, PAD_SIZE, cols); wresize(layout->base.win, PAD_MIN_HEIGHT, cols);
win_redraw(window); win_redraw(window);
} else { } else {
int cols = getmaxx(stdscr); int cols = getmaxx(stdscr);
wresize(window->layout->win, PAD_SIZE, cols); wresize(window->layout->win, PAD_MIN_HEIGHT, cols);
win_redraw(window); win_redraw(window);
} }
} }
@@ -597,16 +622,16 @@ win_show_subwin(ProfWin* window)
subwin_cols = 1; subwin_cols = 1;
} }
layout->subwin = newpad(PAD_SIZE, subwin_cols); layout->subwin = newpad(PAD_MIN_HEIGHT, subwin_cols);
if (layout->subwin == NULL) { if (layout->subwin == NULL) {
// Failed to allocate subwindow; keep base window resized to full width // Failed to allocate subwindow; keep base window resized to full width
log_error("Failed to create subwindow pad (cols=%d)", subwin_cols); log_error("Failed to create subwindow pad (cols=%d)", subwin_cols);
wresize(layout->base.win, PAD_SIZE, cols); wresize(layout->base.win, PAD_MIN_HEIGHT, cols);
win_redraw(window); win_redraw(window);
return; return;
} }
wbkgd(layout->subwin, theme_attrs(THEME_TEXT)); wbkgd(layout->subwin, theme_attrs(THEME_TEXT));
wresize(layout->base.win, PAD_SIZE, cols - subwin_cols); wresize(layout->base.win, PAD_MIN_HEIGHT, cols - subwin_cols);
win_redraw(window); win_redraw(window);
} }
@@ -889,9 +914,9 @@ win_resize(ProfWin* window)
subwin_cols = win_occpuants_cols(); subwin_cols = win_occpuants_cols();
} }
wbkgd(layout->base.win, theme_attrs(THEME_TEXT)); wbkgd(layout->base.win, theme_attrs(THEME_TEXT));
wresize(layout->base.win, PAD_SIZE, cols - subwin_cols); wresize(layout->base.win, PAD_MIN_HEIGHT, cols - subwin_cols);
wbkgd(layout->subwin, theme_attrs(THEME_TEXT)); wbkgd(layout->subwin, theme_attrs(THEME_TEXT));
wresize(layout->subwin, PAD_SIZE, subwin_cols); wresize(layout->subwin, PAD_MIN_HEIGHT, subwin_cols);
if (window->type == WIN_CONSOLE) { if (window->type == WIN_CONSOLE) {
rosterwin_roster(); rosterwin_roster();
} else if (window->type == WIN_MUC) { } else if (window->type == WIN_MUC) {
@@ -901,11 +926,11 @@ win_resize(ProfWin* window)
} }
} else { } else {
wbkgd(layout->base.win, theme_attrs(THEME_TEXT)); wbkgd(layout->base.win, theme_attrs(THEME_TEXT));
wresize(layout->base.win, PAD_SIZE, cols); wresize(layout->base.win, PAD_MIN_HEIGHT, cols);
} }
} else { } else {
wbkgd(window->layout->win, theme_attrs(THEME_TEXT)); wbkgd(window->layout->win, theme_attrs(THEME_TEXT));
wresize(window->layout->win, PAD_SIZE, cols); wresize(window->layout->win, PAD_MIN_HEIGHT, cols);
} }
win_redraw(window); win_redraw(window);
@@ -1898,6 +1923,8 @@ _win_print_internal(ProfWin* window, const char* show_char, int pad_indent, GDat
} }
} }
_win_ensure_pad_capacity(window, window->layout->win, getcury(window->layout->win));
if (prefs_get_boolean(PREF_WRAP)) { if (prefs_get_boolean(PREF_WRAP)) {
_win_print_wrapped(window->layout->win, message + offset, indent, pad_indent); _win_print_wrapped(window->layout->win, message + offset, indent, pad_indent);
} else { } else {
@@ -2047,6 +2074,7 @@ _win_print_wrapped(WINDOW* win, const char* const message, size_t indent, int pa
void void
win_print_trackbar(ProfWin* window) win_print_trackbar(ProfWin* window)
{ {
_win_ensure_pad_capacity(window, window->layout->win, getcury(window->layout->win));
int cols = getmaxx(window->layout->win); int cols = getmaxx(window->layout->win);
wbkgdset(window->layout->win, theme_attrs(THEME_TRACKBAR)); wbkgdset(window->layout->win, theme_attrs(THEME_TRACKBAR));
@@ -2062,12 +2090,20 @@ win_print_trackbar(ProfWin* window)
void void
win_redraw(ProfWin* window) win_redraw(ProfWin* window)
{ {
int size = buffer_size(window->layout->buffer); unsigned int size = buffer_size(window->layout->buffer);
_in_redraw = TRUE;
// shrink pad back to minimum size and erase it
int cols = getmaxx(window->layout->win);
wresize(window->layout->win, PAD_MIN_HEIGHT, cols);
werase(window->layout->win); werase(window->layout->win);
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
ProfBuffEntry* e = buffer_get_entry(window->layout->buffer, i); ProfBuffEntry* e = buffer_get_entry(window->layout->buffer, i);
// check if we need more space before printing
_win_ensure_pad_capacity(window, window->layout->win, getcury(window->layout->win));
e->y_start_pos = getcury(window->layout->win); e->y_start_pos = getcury(window->layout->win);
if (e->display_from == NULL && e->message && e->message[0] == '-') { if (e->display_from == NULL && e->message && e->message[0] == '-') {
// just an indicator to print the trackbar/separator not the actual message // just an indicator to print the trackbar/separator not the actual message
@@ -2082,6 +2118,8 @@ win_redraw(ProfWin* window)
e->_lines = e->y_end_pos - e->y_start_pos; e->_lines = e->y_end_pos - e->y_start_pos;
window->layout->buffer->lines += e->_lines; window->layout->buffer->lines += e->_lines;
} }
_in_redraw = FALSE;
} }
void void
@@ -2216,6 +2254,7 @@ win_toggle_attention(ProfWin* window)
void void
win_sub_print(WINDOW* win, char* msg, gboolean newline, gboolean wrap, int indent) win_sub_print(WINDOW* win, char* msg, gboolean newline, gboolean wrap, int indent)
{ {
_win_ensure_pad_capacity(NULL, win, getcury(win));
int maxx = getmaxx(win); int maxx = getmaxx(win);
int curx = getcurx(win); int curx = getcurx(win);
int cury = getcury(win); int cury = getcury(win);