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

Fix scroll/paging state and buffer handling #45

Manually merged
jabber.developer merged 6 commits from playground/fix/scroll-stuck into master 2026-01-07 10:56:04 +00:00
Conversation 4 Commits 6 Files Changed 3 +31 -5
3 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 221a95b7b4 - Show all commits

12
src/ui/window.c
View File

@@ -701,9 +701,11 @@ void
win_page_down(ProfWin* window, int scroll_size)
{
int total_rows = getcury(window->layout->win);
int total_rows_with_unreaded = total_rows + window->layout->unread_msg;
int* page_start = &(window->layout->y_pos);
int page_space = getmaxy(stdscr) - 4;
int page_start_initial = *page_start;
if (scroll_size == 0)
scroll_size = page_space;
win_scroll_state_t* scroll_state = &window->scroll_state;
@@ -712,7 +714,11 @@ win_page_down(ProfWin* window, int scroll_size)
*page_start += scroll_size;
jabber.developer marked this conversation as resolved Outdated
jabber.developer commented 2025-10-28 14:11:12 +00:00
Outdated
Review
Copy Link

At this point, it's really hard to track what this condition is doing. I suggest that we split it into variables with descriptive names so we can understand what's going on in the future

At this point, it's really hard to track what this condition is doing. I suggest that we split it into variables with descriptive names so we can understand what's going on in the future
// Scrolled down after reaching the bottom of the page
if (((*page_start > total_rows + window->layout->unread_msg - page_space) || ((*page_start == page_space + window->layout->unread_msg) && *page_start >= (total_rows + window->layout->unread_msg))) && window->type == WIN_CHAT) {
gboolean past_bottom = *page_start > total_rows_with_unreaded - page_space;
gboolean at_page_space_and_past_unread = (*page_start == page_space && *page_start >= total_rows_with_unreaded);
gboolean is_chat = window->type == WIN_CHAT;
if ((past_bottom || at_page_space_and_past_unread) && is_chat) {
int bf_size = buffer_size(window->layout->buffer);
if (bf_size > 0 && *scroll_state != WIN_SCROLL_REACHED_BOTTOM) {
// How many lines are left until end of the screen
@@ -746,7 +752,7 @@ win_page_down(ProfWin* window, int scroll_size)
window->layout->paged = 1;
jabber.developer marked this conversation as resolved Outdated
jabber.developer commented 2025-10-28 14:13:05 +00:00
Outdated
Review
Copy Link

Could you apply our standard formatting (should apply automatically on ctrl+shift+i in VSCode)? It will fix the CI

Could you apply our standard formatting (should apply automatically on `ctrl+shift+i` in VSCode)? It will fix the CI
// update only if position has changed
if ((page_start_initial != *page_start) || (window->layout->unread_msg)) {
if ((page_start_initial != *page_start) || window->layout->unread_msg) {
win_update_virtual(window);
}
@@ -1706,7 +1712,7 @@ _win_printf(ProfWin* window, const char* show_char, int pad_indent, GDateTime* t
{
/* Prevent printing and buffer update when user is viewing message history [SCROLLING]*/
if ((window->layout->paged) && wins_is_current(window)) {
if (window->layout->paged && wins_is_current(window)) {
window->layout->unread_msg++;
return;
}