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

Allow paging empty page space

Browse Source
This commit is contained in:
James Booth 2016-10-02 22:10:02 +01:00
parent b389edacd0
commit 0e129a3d13
3 changed files with 52 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui/core.c
View File

@ -128,7 +128,7 @@ ui_update(void)
{ {
ProfWin *current = wins_get_current(); ProfWin *current = wins_get_current();
if (current->layout->scroll == TRUE) { if (current->layout->scroll == TRUE) {
win_move_to_end(current); win_scroll(current);
} }
win_update_virtual(current); win_update_virtual(current);

128
src/ui/window.c
View File

@ -464,11 +464,26 @@ win_free(ProfWin* window)
free(window); free(window);
} }
static gboolean
_scrollable(ProfWin *window)
{
int win_rows = getmaxy(stdscr);
int page_start = window->layout->display_start;
int curr_row = getcury(window->layout->win);
if (curr_row - page_start < win_rows) {
return TRUE;
} else {
return FALSE;
}
}
void void
win_page_up(ProfWin *window) win_page_up(ProfWin *window)
{ {
int *page_start = &(window->layout->display_start); int *page_start = &(window->layout->display_start);
int page_rows = getmaxy(stdscr) - 4; int page_rows = getmaxy(stdscr) - 3;
*page_start -= page_rows; *page_start -= page_rows;
@ -477,54 +492,32 @@ win_page_up(ProfWin *window)
*page_start = 0; *page_start = 0;
} }
window->layout->scroll = FALSE; window->layout->scroll = _scrollable(window);
win_update_virtual(window); win_update_virtual(window);
// switch off page if last line and space line visible
int curr_row = getcury(window->layout->win);
if (curr_row - *page_start == page_rows) {
window->layout->scroll = TRUE;
}
} }
void void
win_page_down(ProfWin *window) win_page_down(ProfWin *window)
{ {
window->layout->scroll = TRUE;
int *page_start = &(window->layout->display_start); int *page_start = &(window->layout->display_start);
int page_rows = getmaxy(stdscr) - 4; int page_rows = getmaxy(stdscr) - 3;
int curr_row = getcury(window->layout->win); int curr_row = getcury(window->layout->win);
if (curr_row - *page_start < page_rows) {
return;
}
*page_start += page_rows; *page_start += page_rows;
// only got half a screen, show full screen // went past end, show last line
if (curr_row - *page_start < page_rows) { if (*page_start > curr_row) {
*page_start = curr_row - page_rows; *page_start = curr_row - 1;
// went past end, show full screen
} else if (*page_start >= curr_row) {
*page_start = curr_row - page_rows - 1;
} }
window->layout->scroll = FALSE; window->layout->scroll = _scrollable(window);
win_update_virtual(window); win_update_virtual(window);
// switch off page if last line and space line visible
if (curr_row - *page_start == page_rows) {
window->layout->scroll = TRUE;
}
} }
void void
win_line_up(ProfWin *window) win_line_up(ProfWin *window)
{ {
int *page_start = &(window->layout->display_start); int *page_start = &(window->layout->display_start);
int page_rows = getmaxy(stdscr) - 4;
*page_start -= 1; *page_start -= 1;
@ -533,14 +526,8 @@ win_line_up(ProfWin *window)
*page_start = 0; *page_start = 0;
} }
window->layout->scroll = FALSE; window->layout->scroll = _scrollable(window);
win_update_virtual(window); win_update_virtual(window);
// switch off page if last line and space line visible
int curr_row = getcury(window->layout->win);
if (curr_row - *page_start == page_rows) {
window->layout->scroll = TRUE;
}
} }
void void
@ -549,31 +536,41 @@ win_line_down(ProfWin *window)
window->layout->scroll = TRUE; window->layout->scroll = TRUE;
int *page_start = &(window->layout->display_start); int *page_start = &(window->layout->display_start);
int page_rows = getmaxy(stdscr) - 4; // int page_rows = getmaxy(stdscr) - 4;
int curr_row = getcury(window->layout->win); int curr_row = getcury(window->layout->win);
if (curr_row - *page_start < page_rows) {
return;
}
*page_start += 1; *page_start += 1;
// only got half a screen, show full screen // went past end, show last line
if (curr_row - *page_start < page_rows) { if (*page_start > curr_row -1) {
*page_start = curr_row - page_rows; *page_start = curr_row - 1;
// went past end, show full screen
} else if (*page_start >= curr_row) {
*page_start = curr_row - page_rows - 1;
} }
window->layout->scroll = FALSE; window->layout->scroll = _scrollable(window);
win_update_virtual(window); win_update_virtual(window);
}
// switch off page if last line and space line visible void
if (curr_row - *page_start == page_rows) { win_scroll(ProfWin *window)
{
// int page_rows = getmaxy(stdscr) - 4;
// int curr_row = getcury(window->layout->win);
// int *page_start = &(window->layout->display_start);
//
// if (curr_row > *page_start + page_rows) {
// *page_start = curr_row - page_rows;
// if (*page_start < 0) {
// *page_start = 0;
// }
// }
}
void
win_clear(ProfWin *window)
{
window->layout->display_start = getcury(window->layout->win);
window->layout->scroll = TRUE; window->layout->scroll = TRUE;
} win_update_virtual(window);
} }
void void
@ -626,33 +623,6 @@ win_sub_page_up(ProfWin *window)
win_update_virtual(window); win_update_virtual(window);
} }
void
win_move_to_end(ProfWin *window)
{
window->layout->scroll = TRUE;
int page_rows = getmaxy(stdscr) - 4;
int curr_row = getcury(window->layout->win);
int *page_start = &(window->layout->display_start);
if (curr_row - *page_start < page_rows) {
return;
}
*page_start = curr_row - page_rows;
if (*page_start < 0) {
*page_start = 0;
}
}
void
win_clear(ProfWin *window)
{
window->layout->display_start = getcury(window->layout->win);
window->layout->scroll = TRUE;
win_update_virtual(window);
}
void void
win_resize(ProfWin *window) win_resize(ProfWin *window)
{ {

2
src/ui/window.h
View File

@ -54,7 +54,7 @@
#define PAD_SIZE 1000 #define PAD_SIZE 1000
void win_move_to_end(ProfWin *window); void win_scroll(ProfWin *window);
void win_show_status_string(ProfWin *window, const char *const from, void win_show_status_string(ProfWin *window, const char *const from,
const char *const show, const char *const status, const char *const show, const char *const status,
GDateTime *last_activity, const char *const pre, GDateTime *last_activity, const char *const pre,