aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-02-02 15:08:15 -05:00
Code

Rename pad paged -> scroll

Browse Source
This commit is contained in:
James Booth 2016-09-27 22:26:21 +01:00
parent e7d6a61426
commit 0aef5e8b73
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui/core.c
View File

@ -127,7 +127,7 @@ void
ui_update(void) ui_update(void)
{ {
ProfWin *current = wins_get_current(); ProfWin *current = wins_get_current();
if (current->layout->paged == 0) { if (current->layout->scroll == TRUE) {
win_move_to_end(current); win_move_to_end(current);
} }

2
src/ui/win_types.h
View File

@ -110,7 +110,7 @@ typedef struct prof_layout_t {
WINDOW *win; WINDOW *win;
ProfBuff buffer; ProfBuff buffer;
int display_start; int display_start;
int paged; gboolean scroll;
} ProfLayout; } ProfLayout;
typedef struct prof_layout_simple_t { typedef struct prof_layout_simple_t {

30
src/ui/window.c
View File

@ -92,7 +92,7 @@ _win_create_simple_layout(void)
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.display_start = 0; layout->base.display_start = 0;
layout->base.paged = 0; layout->base.scroll = TRUE;
scrollok(layout->base.win, TRUE); scrollok(layout->base.win, TRUE);
return &layout->base; return &layout->base;
@ -109,7 +109,7 @@ _win_create_split_layout(void)
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.display_start = 0; layout->base.display_start = 0;
layout->base.paged = 0; layout->base.scroll = TRUE;
scrollok(layout->base.win, TRUE); scrollok(layout->base.win, TRUE);
layout->subwin = NULL; layout->subwin = NULL;
layout->sub_y_pos = 0; layout->sub_y_pos = 0;
@ -176,7 +176,7 @@ win_create_muc(const char *const roomjid)
layout->memcheck = LAYOUT_SPLIT_MEMCHECK; layout->memcheck = LAYOUT_SPLIT_MEMCHECK;
layout->base.buffer = buffer_create(); layout->base.buffer = buffer_create();
layout->base.display_start = 0; layout->base.display_start = 0;
layout->base.paged = 0; layout->base.scroll = TRUE;
scrollok(layout->base.win, TRUE); scrollok(layout->base.win, TRUE);
new_win->window.layout = (ProfLayout*)layout; new_win->window.layout = (ProfLayout*)layout;
@ -478,19 +478,19 @@ win_page_up(ProfWin *window)
if (*page_start < 0) if (*page_start < 0)
*page_start = 0; *page_start = 0;
window->layout->paged = 1; 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) { if ((y) - *page_start == page_space) {
window->layout->paged = 0; window->layout->scroll = TRUE;
} }
} }
void void
win_page_down(ProfWin *window) win_page_down(ProfWin *window)
{ {
window->layout->paged = 0; window->layout->scroll = TRUE;
int win_rows = getmaxy(stdscr) - 4; int win_rows = getmaxy(stdscr) - 4;
int win_curr_row = getcury(window->layout->win); int win_curr_row = getcury(window->layout->win);
@ -511,12 +511,12 @@ win_page_down(ProfWin *window)
else if (*page_start >= win_curr_row) else if (*page_start >= win_curr_row)
*page_start = win_curr_row - win_rows - 1; *page_start = win_curr_row - win_rows - 1;
window->layout->paged = 1; 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 ((win_curr_row) - *page_start == win_rows) {
window->layout->paged = 0; window->layout->scroll = TRUE;
} }
} }
@ -534,19 +534,19 @@ win_line_up(ProfWin *window)
if (*page_start < 0) if (*page_start < 0)
*page_start = 0; *page_start = 0;
window->layout->paged = 1; 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) { if ((y) - *page_start == page_space) {
window->layout->paged = 0; window->layout->scroll = TRUE;
} }
} }
void void
win_line_down(ProfWin *window) win_line_down(ProfWin *window)
{ {
window->layout->paged = 0; window->layout->scroll = TRUE;
int win_rows = getmaxy(stdscr) - 4; int win_rows = getmaxy(stdscr) - 4;
int win_curr_row = getcury(window->layout->win); int win_curr_row = getcury(window->layout->win);
@ -567,12 +567,12 @@ win_line_down(ProfWin *window)
else if (*page_start >= win_curr_row) else if (*page_start >= win_curr_row)
*page_start = win_curr_row - win_rows - 1; *page_start = win_curr_row - win_rows - 1;
window->layout->paged = 1; 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 ((win_curr_row) - *page_start == win_rows) {
window->layout->paged = 0; window->layout->scroll = TRUE;
} }
} }
@ -625,7 +625,7 @@ win_clear(ProfWin *window)
{ {
int y = getcury(window->layout->win); int y = getcury(window->layout->win);
window->layout->display_start = y; window->layout->display_start = y;
window->layout->paged = 0; window->layout->scroll = TRUE;
win_update_virtual(window); win_update_virtual(window);
} }
@ -728,7 +728,7 @@ win_refresh_with_subwin(ProfWin *window)
void void
win_move_to_end(ProfWin *window) win_move_to_end(ProfWin *window)
{ {
window->layout->paged = 0; window->layout->scroll = TRUE;
int win_rows = getmaxy(stdscr) - 4; int win_rows = getmaxy(stdscr) - 4;
int win_curr_row = getcury(window->layout->win); int win_curr_row = getcury(window->layout->win);