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

Merge branch 'maint'

Browse Source
This commit is contained in:
Lukas Fleischer 2012-11-29 11:34:00 +01:00
commit a91fd72641
3 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calcurse.h
View File

@ -908,6 +908,8 @@ void recur_apoint_paste_item(struct recur_apoint *, long);
/* sigs.c */ /* sigs.c */
void sigs_init(void); void sigs_init(void);
unsigned sigs_set_hdlr(int, void (*)(int)); unsigned sigs_set_hdlr(int, void (*)(int));
void sigs_ignore(void);
void sigs_unignore(void);
/* todo.c */ /* todo.c */
extern llist_t todolist; extern llist_t todolist;

14
src/sigs.c
View File

@ -108,3 +108,17 @@ void sigs_init()
|| !sigs_set_hdlr(SIGINT, SIG_IGN)) || !sigs_set_hdlr(SIGINT, SIG_IGN))
exit_calcurse(1); exit_calcurse(1);
} }
/* Ignore SIGWINCH and SIGTERM signals. */
void sigs_ignore(void)
{
sigs_set_hdlr(SIGWINCH, SIG_IGN);
sigs_set_hdlr(SIGTERM, SIG_IGN);
}
/* No longer ignore SIGWINCH and SIGTERM signals. */
void sigs_unignore(void)
{
sigs_set_hdlr(SIGWINCH, generic_hdlr);
sigs_set_hdlr(SIGTERM, generic_hdlr);
}

4
src/wins.c
View File

@ -535,16 +535,20 @@ void wins_prepare_external(void)
clear(); clear();
wins_refresh(); wins_refresh();
endwin(); endwin();
sigs_ignore();
} }
/* Restore windows when returning from an external command. */ /* Restore windows when returning from an external command. */
void wins_unprepare_external(void) void wins_unprepare_external(void)
{ {
sigs_unignore();
reset_prog_mode(); reset_prog_mode();
clearok(curscr, TRUE); clearok(curscr, TRUE);
curs_set(0); curs_set(0);
ui_mode = UI_CURSES; ui_mode = UI_CURSES;
wins_refresh(); wins_refresh();
wins_reinit();
wins_update(FLAG_ALL);
if (notify_bar()) if (notify_bar())
notify_start_main_thread(); notify_start_main_thread();
} }