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

Avoid a segfault when resizing the help window.

Browse Source
This commit is contained in:
Lukas Fleischer 2011-01-13 23:21:40 +00:00
parent 56b9cbcb84
commit 2d938cdcda
2 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2011-01-14 Lukas Fleischer <calcurse@cryptocrack.de>
* src/help.c: Avoid a segfault when resizing the help window
(resizing still needs to be fixed properly).
2011-01-11 Lukas Fleischer <calcurse@cryptocrack.de>
* AUTHORS

56
src/help.c
View File

@ -1,4 +1,4 @@
/* $calcurse: help.c,v 1.45 2011/01/11 22:31:40 fleischer Exp $ */
/* $calcurse: help.c,v 1.46 2011/01/13 23:21:40 fleischer Exp $ */
/*
* Calcurse - text-based organizer
@ -109,32 +109,34 @@ 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);
switch (action)
{
case KEY_END_OF_WEEK:
case KEY_START_OF_WEEK:
case KEY_MOVE_UP:
case KEY_MOVE_DOWN:
case KEY_MOVE_RIGHT:
case KEY_MOVE_LEFT:
case KEY_GENERIC_HELP:
case KEY_GENERIC_REDRAW:
case KEY_GENERIC_ADD_APPT:
case KEY_GENERIC_ADD_TODO:
case KEY_GENERIC_NEXT_DAY:
case KEY_GENERIC_PREV_DAY:
case KEY_GENERIC_NEXT_WEEK:
case KEY_GENERIC_PREV_WEEK:
case KEY_GENERIC_GOTO_TODAY:
case KEY_GENERIC_CREDITS:
case KEY_GENERIC_CUT:
case KEY_GENERIC_PASTE:
break;
default:
bindings = keys_action_allkeys (action);
colnum = win->w - strlen (bindings_title) - strlen (bindings);
mvwprintw (win->p, rownum, colnum, bindings_title, bindings);
}
if ((int) action != KEY_RESIZE) {
switch (action)
{
case KEY_END_OF_WEEK:
case KEY_START_OF_WEEK:
case KEY_MOVE_UP:
case KEY_MOVE_DOWN:
case KEY_MOVE_RIGHT:
case KEY_MOVE_LEFT:
case KEY_GENERIC_HELP:
case KEY_GENERIC_REDRAW:
case KEY_GENERIC_ADD_APPT:
case KEY_GENERIC_ADD_TODO:
case KEY_GENERIC_NEXT_DAY:
case KEY_GENERIC_PREV_DAY:
case KEY_GENERIC_NEXT_WEEK:
case KEY_GENERIC_PREV_WEEK:
case KEY_GENERIC_GOTO_TODAY:
case KEY_GENERIC_CREDITS:
case KEY_GENERIC_CUT:
case KEY_GENERIC_PASTE:
break;
default:
bindings = keys_action_allkeys (action);
colnum = win->w - strlen (bindings_title) - strlen (bindings);
mvwprintw (win->p, rownum, colnum, bindings_title, bindings);
}
}
colnum = 0;
rownum += get_help_lines (title);
custom_remove_attr (win->p, ATTR_HIGHEST);