X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=flags.c;h=f83d2a38bbc41c4aac248b8824f996d15a6d19f7;hp=4fe7ce3469ed0f8d07ae92c4f6dd6c1bb0895f63;hb=3438f31945bb94bc4f4b9603ac47fcde03d5c073;hpb=98cf5779d8184a74541be1bc61d15c5f35efd310

diff --git a/flags.c b/flags.c
index 4fe7ce3..f83d2a3 100644
--- a/flags.c
+++ b/flags.c
@@ -9,13 +9,12 @@
 
 #include <lib-lib/lib-lib.h>
 
-#include <lib-ui/curses.h>
+#include <lib-ui/lib-ui.h>
 #include <lib-ui/menu.h>
-#include <lib-ui/sidebar.h>
+#include <lib-mx/mx.h>
 
 #include "mutt.h"
 #include "sort.h"
-#include "mx.h"
 
 #include <imap/imap_private.h>
 
@@ -318,66 +317,40 @@ int mutt_thread_set_flag (HEADER * hdr, int flag, int bf, int subthread)
   /* not reached */
 }
 
-int mutt_change_flag (HEADER * h, int bf)
+int mutt_change_flag(HEADER * h, int bf)
 {
-  int i, flag;
-  event_t event;
-
-  mvprintw (LINES - 1, 0, "%s? (D/N/O/r/*/!): ",
-            bf ? _("Set flag") : _("Clear flag"));
-  clrtoeol ();
-
-  event = mutt_getch ();
-  i = event.ch;
-  if (i == -1) {
-    CLEARLINE (LINES - 1);
-    return (-1);
-  }
-
-  CLEARLINE (LINES - 1);
-
-  switch (i) {
-  case 'd':
-  case 'D':
-    flag = M_DELETE;
-    break;
-
-  case 'N':
-  case 'n':
-    flag = M_NEW;
-    break;
-
-  case 'o':
-  case 'O':
-    if (h)
-      mutt_set_flag (Context, h, M_READ, !bf);
-    else
-      mutt_tag_set_flag (M_READ, !bf);
-    flag = M_OLD;
-    break;
-
-  case 'r':
-  case 'R':
-    flag = M_REPLIED;
-    break;
-
-  case '*':
-    flag = M_TAG;
-    break;
-
-  case '!':
-    flag = M_FLAG;
-    break;
-
-  default:
-    BEEP ();
-    return (-1);
-  }
+    char buf[STRING];
+    const char letters[] = "dDnNoOrR*!";
+    static char const actions[] = {
+        ['d'] = M_DELETE,       ['D'] = M_DELETE,
+        ['n'] = M_NEW,          ['N'] = M_NEW,
+        ['o'] = M_OLD,          ['O'] = M_OLD,
+        ['r'] = M_REPLIED,      ['R'] = M_REPLIED,
+        ['*'] = M_TAG,
+        ['!'] = M_FLAG,
+    };
+
+    int c;
+
+    snprintf(buf, sizeof(buf), "%s? (D/N/O/r/*/!): ",
+             bf ? _("Set flag") : _("Clear flag"));
+    c = mutt_multi_choice(buf, letters);
+    if (c <= 0)
+        return -1;
+    c = letters[c - 1];
+    if (actions[c] == M_OLD) {
+        if (h) {
+            mutt_set_flag(Context, h, M_READ, !bf);
+        } else {
+            mutt_tag_set_flag(M_READ, !bf);
+        }
+    }
 
-  if (h)
-    mutt_set_flag (Context, h, flag, bf);
-  else
-    mutt_tag_set_flag (flag, bf);
+    if (h) {
+        mutt_set_flag(Context, h, actions[c], bf);
+    } else {
+        mutt_tag_set_flag(actions[c], bf);
+    }
 
-  return 0;
+    return 0;
 }