fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid redundant redraws on resize

Browse Source 
Use a global flag to record whether the terminal was resized instead of
redrawing everything each time a KEY_RESIZE is read.

Add some additional checks to help_write_pad() as invalid actions may be
passed now due to using signals instead of virtual key presses.

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer
2011-06-28 11:05:05 +02:00
parent 6636232bc7
commit fec37db06b
7 changed files with 105 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/help.c
View File

@@ -107,7 +107,7 @@ help_write_pad (struct window *win, char *title, char *text, enum key action)
erase_window_part (win->p, rownum, colnum, BUFSIZ, win->w);
custom_apply_attr (win->p, ATTR_HIGHEST);
mvwprintw (win->p, rownum, colnum, "%s", title);
if ((int) action != KEY_RESIZE) {
if ((int) action != KEY_RESIZE && action < NBKEYS) {
switch (action)
{
case KEY_END_OF_WEEK:
@@ -131,8 +131,12 @@ help_write_pad (struct window *win, char *title, char *text, enum key action)
break;
default:
bindings = keys_action_allkeys (action);
colnum = win->w - strlen (bindings_title) - strlen (bindings);
mvwprintw (win->p, rownum, colnum, bindings_title, bindings);
if (bindings)
{
colnum = win->w - strlen (bindings_title) - strlen (bindings);
mvwprintw (win->p, rownum, colnum, bindings_title, bindings);
}
}
}
colnum = 0;
@@ -744,34 +748,35 @@ help_screen (void)
erase_window_part (hwin.win.p, 1, hwin.pad.y, col - 2,
hwin.win.h - 2);
if ((int) ch == KEY_RESIZE) {
wins_get_config ();
help_wins_reset (&hwin);
hwin.first_visible_line = 0;
hwin.total_lines = help_write_pad (&hwin.pad, hscr[oldpage].title,
hscr[oldpage].text, ch);
need_resize = 1;
switch (ch) {
case KEY_GENERIC_SCROLL_DOWN:
wins_scrollwin_down (&hwin, 1);
break;
case KEY_GENERIC_SCROLL_UP:
wins_scrollwin_up (&hwin, 1);
break;
default:
page = wanted_page (ch);
if (page != NOPAGE) {
hwin.first_visible_line = 0;
hwin.total_lines = help_write_pad (&hwin.pad, hscr[page].title,
hscr[page].text, ch);
oldpage = page;
}
}
else {
switch (ch) {
case KEY_GENERIC_SCROLL_DOWN:
wins_scrollwin_down (&hwin, 1);
break;
case KEY_GENERIC_SCROLL_UP:
wins_scrollwin_up (&hwin, 1);
break;
default:
page = wanted_page (ch);
if (page != NOPAGE) {
hwin.first_visible_line = 0;
hwin.total_lines = help_write_pad (&hwin.pad, hscr[page].title,
hscr[page].text, ch);
oldpage = page;
}
if (resize)
{
resize = 0;
wins_get_config ();
help_wins_reset (&hwin);
hwin.first_visible_line = 0;
hwin.total_lines = help_write_pad (&hwin.pad, hscr[oldpage].title,
hscr[oldpage].text, ch);
need_resize = 1;
}
}
wins_scrollwin_display (&hwin);
ch = keys_getch (win[STA].p);