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

user canceling now taken into account

Browse Source
This commit is contained in:
Frederic Culot 2007-01-16 07:53:39 +00:00
parent 6bbf3e5f2e
commit 89811b56e2
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/day.c
View File

@ -1,8 +1,8 @@
/* $calcurse: day.c,v 1.16 2006/12/21 14:58:18 culot Exp $ */ /* $calcurse: day.c,v 1.17 2007/01/16 07:53:39 culot Exp $ */
/* /*
* Calcurse - text-based organizer * Calcurse - text-based organizer
* Copyright (c) 2004-2006 Frederic Culot * Copyright (c) 2004-2007 Frederic Culot
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -449,9 +449,12 @@ void day_edit_item(int year, int month, int day, int item_num, int colr)
re = recur_get_event(date, nb_item[RECUR_EVNT - 1]); re = recur_get_event(date, nb_item[RECUR_EVNT - 1]);
rpt = re->rpt; rpt = re->rpt;
status_mesg(msg_event_recur, choice_event_recur); status_mesg(msg_event_recur, choice_event_recur);
while (ch != STRT && ch != END) while (ch != STRT && ch != END && ch != ESCAPE)
ch = wgetch(swin); ch = wgetch(swin);
ch += 2; if (ch == ESCAPE)
return;
else
ch += 2;
break; break;
case EVNT: case EVNT:
ch = DESC; ch = DESC;
@ -460,13 +463,18 @@ void day_edit_item(int year, int month, int day, int item_num, int colr)
ra = recur_get_apoint(date, nb_item[RECUR_APPT - 1]); ra = recur_get_apoint(date, nb_item[RECUR_APPT - 1]);
rpt = ra->rpt; rpt = ra->rpt;
status_mesg(msg_recur, choice_recur); status_mesg(msg_recur, choice_recur);
while (ch != STRT && ch != END && ch != DESC && ch != REPT) while (ch != STRT && ch != END && ch != DESC &&
ch != REPT && ch != ESCAPE)
ch = wgetch(swin); ch = wgetch(swin);
if (ch == ESCAPE)
return;
break; break;
case APPT: case APPT:
status_mesg(msg_norecur, choice_norecur); status_mesg(msg_norecur, choice_norecur);
while (ch != STRT && ch != END && ch != DESC) while (ch != STRT && ch != END && ch != DESC && ch != ESCAPE)
ch = wgetch(swin); ch = wgetch(swin);
if (ch == ESCAPE)
return;
break; break;
} }