From e9b4f82fbf67ac6c91950ac3e906f0d8ab7176ac Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <calcurse@cryptocrack.de>
Date: Thu, 6 Oct 2011 14:14:47 +0200
Subject: src/day.c: Allow cancelling an edit

Once the user picked any property to edit, we didn't give him any chance
to cancel editing. Abort if the user presses the escape key or enters an
empty string.

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
---
 src/day.c | 45 +++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/day.c b/src/day.c
index 894d730..af59303 100644
--- a/src/day.c
+++ b/src/day.c
@@ -578,17 +578,21 @@ day_edit_time (int time, unsigned *new_hour, unsigned *new_minute)
   for (;;)
     {
       status_mesg (msg_time, "");
-      updatestring (win[STA].p, &timestr, 0, 1);
-      if (parse_time (timestr, new_hour, new_minute) == 1)
+      if (updatestring (win[STA].p, &timestr, 0, 1) == GETSTRING_VALID)
         {
-          mem_free (timestr);
-          return 1;
+          if (parse_time (timestr, new_hour, new_minute) == 1)
+            {
+              mem_free (timestr);
+              return 1;
+            }
+          else
+            {
+              status_mesg (fmt_msg, enter_str);
+              (void)wgetch (win[STA].p);
+            }
         }
       else
-        {
-          status_mesg (fmt_msg, enter_str);
-          (void)wgetch (win[STA].p);
-        }
+        return 0;
     }
 }
 
@@ -643,7 +647,7 @@ static void
 update_rept (struct rpt **rpt, const long start, struct conf *conf)
 {
   const int SINGLECHAR = 2;
-  int ch, cancel, newfreq, date_entered;
+  int ch, newfreq, date_entered;
   long newuntil;
   char outstr[BUFSIZ];
   char *typstr, *freqstr, *timstr;
@@ -662,16 +666,15 @@ update_rept (struct rpt **rpt, const long start, struct conf *conf)
       status_mesg (msg_rpt_type, msg_rpt_ans);
       typstr = mem_calloc (SINGLECHAR, sizeof (char));
       (void)snprintf (typstr, SINGLECHAR, "%c", recur_def2char ((*rpt)->type));
-      cancel = updatestring (win[STA].p, &typstr, 0, 1);
-      if (cancel)
+      if (updatestring (win[STA].p, &typstr, 0, 1) == GETSTRING_VALID)
         {
+          ch = toupper (*typstr);
           mem_free (typstr);
-          return;
         }
       else
         {
-          ch = toupper (*typstr);
           mem_free (typstr);
+          return;
         }
     }
   while ((ch != 'D') && (ch != 'W') && (ch != 'M') && (ch != 'Y'));
@@ -681,13 +684,7 @@ update_rept (struct rpt **rpt, const long start, struct conf *conf)
       status_mesg (_("Enter the new repetition frequence:"), "");
       freqstr = mem_malloc (BUFSIZ);
       (void)snprintf (freqstr, BUFSIZ, "%d", (*rpt)->freq);
-      cancel = updatestring (win[STA].p, &freqstr, 0, 1);
-      if (cancel)
-        {
-          mem_free (freqstr);
-          return;
-        }
-      else
+      if (updatestring (win[STA].p, &freqstr, 0, 1) == GETSTRING_VALID)
         {
           newfreq = atoi (freqstr);
           mem_free (freqstr);
@@ -697,6 +694,11 @@ update_rept (struct rpt **rpt, const long start, struct conf *conf)
               (void)wgetch (win[STA].p);
             }
         }
+      else
+        {
+          mem_free (freqstr);
+          return;
+        }
     }
   while (newfreq == 0);
 
@@ -707,8 +709,7 @@ update_rept (struct rpt **rpt, const long start, struct conf *conf)
       status_mesg (_(outstr), "");
       timstr =
           date_sec2date_str ((*rpt)->until, DATEFMT (conf->input_datefmt));
-      cancel = updatestring (win[STA].p, &timstr, 0, 1);
-      if (cancel)
+      if (updatestring (win[STA].p, &timstr, 0, 1) != GETSTRING_VALID)
         {
           mem_free (timstr);
           return;
-- 
cgit v1.2.3