aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Tidy window paging functions

Browse Source
This commit is contained in:
James Booth 2016-09-29 21:49:11 +01:00
parent b65785d6b1
commit b389edacd0
1 changed files with 89 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

154
src/ui/window.c
View File

@ -467,22 +467,22 @@ win_free(ProfWin* window)
void void
win_page_up(ProfWin *window) win_page_up(ProfWin *window)
{ {
int rows = getmaxy(stdscr);
int y = getcury(window->layout->win);
int page_space = rows - 4;
int *page_start = &(window->layout->display_start); int *page_start = &(window->layout->display_start);
int page_rows = getmaxy(stdscr) - 4;
*page_start -= page_space; *page_start -= page_rows;
// went past beginning, show first page // went past beginning, show first page
if (*page_start < 0) if (*page_start < 0) {
*page_start = 0; *page_start = 0;
}
window->layout->scroll = FALSE; window->layout->scroll = FALSE;
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) { int curr_row = getcury(window->layout->win);
if (curr_row - *page_start == page_rows) {
window->layout->scroll = TRUE; window->layout->scroll = TRUE;
} }
} }
@ -492,30 +492,30 @@ win_page_down(ProfWin *window)
{ {
window->layout->scroll = TRUE; window->layout->scroll = TRUE;
int win_rows = getmaxy(stdscr) - 4; int *page_start = &(window->layout->display_start);
int win_curr_row = getcury(window->layout->win); int page_rows = getmaxy(stdscr) - 4;
int curr_y_pos = window->layout->display_start; int curr_row = getcury(window->layout->win);
if (win_curr_row - curr_y_pos < win_rows) {
if (curr_row - *page_start < page_rows) {
return; return;
} }
int *page_start = &(window->layout->display_start); *page_start += page_rows;
*page_start += win_rows;
// only got half a screen, show full screen // only got half a screen, show full screen
if ((win_curr_row - (*page_start)) < win_rows) if (curr_row - *page_start < page_rows) {
*page_start = win_curr_row - win_rows; *page_start = curr_row - page_rows;
// went past end, show full screen // went past end, show full screen
else if (*page_start >= win_curr_row) } else if (*page_start >= curr_row) {
*page_start = win_curr_row - win_rows - 1; *page_start = curr_row - page_rows - 1;
}
window->layout->scroll = FALSE; window->layout->scroll = FALSE;
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 ((win_curr_row) - *page_start == win_rows) { if (curr_row - *page_start == page_rows) {
window->layout->scroll = TRUE; window->layout->scroll = TRUE;
} }
} }
@ -523,22 +523,22 @@ win_page_down(ProfWin *window)
void void
win_line_up(ProfWin *window) win_line_up(ProfWin *window)
{ {
int rows = getmaxy(stdscr);
int y = getcury(window->layout->win);
int page_space = rows - 4;
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;
// went past beginning, show first page // went past beginning, show first page
if (*page_start < 0) if (*page_start < 0) {
*page_start = 0; *page_start = 0;
}
window->layout->scroll = FALSE; window->layout->scroll = FALSE;
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) { int curr_row = getcury(window->layout->win);
if (curr_row - *page_start == page_rows) {
window->layout->scroll = TRUE; window->layout->scroll = TRUE;
} }
} }
@ -548,30 +548,30 @@ win_line_down(ProfWin *window)
{ {
window->layout->scroll = TRUE; window->layout->scroll = TRUE;
int win_rows = getmaxy(stdscr) - 4; int *page_start = &(window->layout->display_start);
int win_curr_row = getcury(window->layout->win); int page_rows = getmaxy(stdscr) - 4;
int curr_y_pos = window->layout->display_start; int curr_row = getcury(window->layout->win);
if (win_curr_row - curr_y_pos < win_rows) {
if (curr_row - *page_start < page_rows) {
return; return;
} }
int *page_start = &(window->layout->display_start);
*page_start += 1; *page_start += 1;
// only got half a screen, show full screen // only got half a screen, show full screen
if ((win_curr_row - (*page_start)) < win_rows) if (curr_row - *page_start < page_rows) {
*page_start = win_curr_row - win_rows; *page_start = curr_row - page_rows;
// went past end, show full screen // went past end, show full screen
else if (*page_start >= win_curr_row) } else if (*page_start >= curr_row) {
*page_start = win_curr_row - win_rows - 1; *page_start = curr_row - page_rows - 1;
}
window->layout->scroll = FALSE; window->layout->scroll = FALSE;
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 ((win_curr_row) - *page_start == win_rows) { if (curr_row - *page_start == page_rows) {
window->layout->scroll = TRUE; window->layout->scroll = TRUE;
} }
} }
@ -579,52 +579,76 @@ win_line_down(ProfWin *window)
void void
win_sub_page_down(ProfWin *window) win_sub_page_down(ProfWin *window)
{ {
if (window->layout->type != LAYOUT_SPLIT) {
return;
}
if (window->layout->type == LAYOUT_SPLIT) { ProfLayoutSplit *layout = (ProfLayoutSplit*)window->layout;
int rows = getmaxy(stdscr);
int page_space = rows - 4;
ProfLayoutSplit *split_layout = (ProfLayoutSplit*)window->layout;
int sub_y = getcury(split_layout->subwin);
int *sub_y_pos = &(split_layout->display_start);
*sub_y_pos += page_space; int *page_start = &(layout->display_start);
int page_rows = getmaxy(stdscr) - 4;
*page_start += page_rows;
int curr_row = getcury(layout->subwin);
// only got half a screen, show full screen // only got half a screen, show full screen
if ((sub_y- (*sub_y_pos)) < page_space) if (curr_row - *page_start < page_rows) {
*sub_y_pos = sub_y - page_space; *page_start = curr_row - page_rows;
// went past end, show full screen // went past end, show full screen
else if (*sub_y_pos >= sub_y) } else if (*page_start >= curr_row) {
*sub_y_pos = sub_y - page_space - 1; *page_start = curr_row - page_rows - 1;
}
win_update_virtual(window); win_update_virtual(window);
}
} }
void void
win_sub_page_up(ProfWin *window) win_sub_page_up(ProfWin *window)
{ {
if (window->layout->type == LAYOUT_SPLIT) { if (window->layout->type != LAYOUT_SPLIT) {
int rows = getmaxy(stdscr); return;
int page_space = rows - 4; }
ProfLayoutSplit *split_layout = (ProfLayoutSplit*)window->layout;
int *sub_y_pos = &(split_layout->display_start);
*sub_y_pos -= page_space; ProfLayoutSplit *split_layout = (ProfLayoutSplit*)window->layout;
int *page_start = &(split_layout->display_start);
int page_rows = getmaxy(stdscr) - 4;
*page_start -= page_rows;
// went past beginning, show first page // went past beginning, show first page
if (*sub_y_pos < 0) if (*page_start < 0) {
*sub_y_pos = 0; *page_start = 0;
}
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 void
win_clear(ProfWin *window) win_clear(ProfWin *window)
{ {
int y = getcury(window->layout->win); window->layout->display_start = getcury(window->layout->win);
window->layout->display_start = y;
window->layout->scroll = TRUE; window->layout->scroll = TRUE;
win_update_virtual(window); win_update_virtual(window);
} }
@ -725,24 +749,6 @@ win_refresh_with_subwin(ProfWin *window)
} }
} }
void
win_move_to_end(ProfWin *window)
{
window->layout->scroll = TRUE;
int win_rows = getmaxy(stdscr) - 4;
int win_curr_row = getcury(window->layout->win);
int curr_y_pos = window->layout->display_start;
if (win_curr_row - curr_y_pos < win_rows) {
return;
}
window->layout->display_start = win_curr_row - win_rows;
if (window->layout->display_start < 0) {
window->layout->display_start = 0;
}
}
void void
win_show_occupant(ProfWin *window, Occupant *occupant) win_show_occupant(ProfWin *window, Occupant *occupant)
{ {