1
1
mirror of https://github.com/profanity-im/profanity.git synced 2025-01-03 14:57:42 -05:00

Handle paging after clear command

This commit is contained in:
James Booth 2016-09-27 00:48:21 +01:00
parent ce181c76f1
commit ed74e000fe

View File

@ -490,26 +490,32 @@ win_page_up(ProfWin *window)
void void
win_page_down(ProfWin *window) win_page_down(ProfWin *window)
{ {
int rows = getmaxy(stdscr); window->layout->paged = 0;
int y = getcury(window->layout->win);
int page_space = rows - 4; int win_rows = getmaxy(stdscr) - 4;
int win_curr_row = getcury(window->layout->win);
int curr_y_pos = window->layout->y_pos;
if (win_curr_row - curr_y_pos < win_rows) {
return;
}
int *page_start = &(window->layout->y_pos); int *page_start = &(window->layout->y_pos);
*page_start += page_space; *page_start += win_rows;
// only got half a screen, show full screen // only got half a screen, show full screen
if ((y - (*page_start)) < page_space) if ((win_curr_row - (*page_start)) < win_rows)
*page_start = y - page_space; *page_start = win_curr_row - win_rows;
// went past end, show full screen // went past end, show full screen
else if (*page_start >= y) else if (*page_start >= win_curr_row)
*page_start = y - page_space - 1; *page_start = win_curr_row - win_rows - 1;
window->layout->paged = 1; window->layout->paged = 1;
win_update_virtual(window); win_update_virtual(window);
// switch off page if last line and space line visible // switch off page if last line and space line visible
if ((y) - *page_start == page_space) { if ((win_curr_row) - *page_start == win_rows) {
window->layout->paged = 0; window->layout->paged = 0;
} }
} }
@ -563,7 +569,7 @@ win_clear(ProfWin *window)
{ {
int y = getcury(window->layout->win); int y = getcury(window->layout->win);
window->layout->y_pos = y; window->layout->y_pos = y;
window->layout->paged = 1; window->layout->paged = 0;
win_update_virtual(window); win_update_virtual(window);
} }
@ -668,11 +674,14 @@ win_move_to_end(ProfWin *window)
{ {
window->layout->paged = 0; window->layout->paged = 0;
int rows = getmaxy(stdscr); int win_rows = getmaxy(stdscr) - 4;
int y = getcury(window->layout->win); int win_curr_row = getcury(window->layout->win);
int size = rows - 3; int curr_y_pos = window->layout->y_pos;
if (win_curr_row - curr_y_pos < win_rows) {
return;
}
window->layout->y_pos = y - (size - 1); window->layout->y_pos = win_curr_row - win_rows;
if (window->layout->y_pos < 0) { if (window->layout->y_pos < 0) {
window->layout->y_pos = 0; window->layout->y_pos = 0;
} }