[gentoo-commits] proj/ufed:master commit in: /

["Sven Eden" <sven.eden@gmx.de>]

commit:     5f5e7e3b80f211c76d2f3872f063c288f34fa780
Author:     Sven Eden <yamakuzure <AT> gmx <DOT> net>
AuthorDate: Tue Sep 10 05:28:05 2013 +0000
Commit:     Sven Eden <sven.eden <AT> gmx <DOT> de>
CommitDate: Tue Sep 10 05:28:05 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/ufed.git;a=commit;h=5f5e7e3b

If read only mode is set, both Enter and ESC help show "Exit" and the key presses show a correct prompt.

---
 ufed-curses-checklist.c | 44 +++++++++++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/ufed-curses-checklist.c b/ufed-curses-checklist.c
index 1586263..5d7179e 100644
--- a/ufed-curses-checklist.c
+++ b/ufed-curses-checklist.c
@@ -18,21 +18,6 @@ static size_t  maxDescWidth    = 0;
 static char*   lineBuf         = NULL;
 static sFlag*  flags           = NULL;
 
-#define mkKey(x) x, sizeof(x)-1
-static const sKey keys[] = {
-	{ '?',      mkKey("?: Help"),            0 },
-	{ '\n',     mkKey("Enter: Save"),        0 },
-	{ '\033',   mkKey("Esc: Cancel"),        0 },
-	{ -1,       mkKey("Toggle"),             1 },
-	{ KEY_F(5), mkKey("F5: Local/Global"),   1 },
-	{ KEY_F(6), mkKey("F6: Installed"),      1 },
-	{ KEY_F(7), mkKey("F7: Masked/Forced"),  1 },
-	{ KEY_F(9), mkKey("F9: Pkg/Desc Order"), 1 },
-	{ '\0',     mkKey(""),                   0 }
-};
-#undef mkKey
-
-
 /* internal prototypes */
 static void free_flags(void);
 
@@ -432,11 +417,17 @@ static int callback(sFlag** curr, int key)
 			break;
 		case '\n':
 		case KEY_ENTER:
-			if(yesno("Save and exit? (Y/N) "))
+			if (ro_mode) {
+				if (yesno("Exit? (Y/N) "))
+					return 0;
+			} else if (yesno("Save and exit? (Y/N) "))
 				return 0;
 			break;
 		case '\033':
-			if(yesno("Cancel? (Y/N) "))
+			if (ro_mode) {
+				if (yesno("Exit? (Y/N) "))
+					return 0;
+			} else if (yesno("Cancel? (Y/N) "))
 				return 1;
 			break;
 		case ' ':
@@ -627,6 +618,25 @@ int main(void)
 
 	initcurses();
 
+	/* The keys to use differ whether ro_mode is true or false */
+#define mkKey(x) x, sizeof(x)-1
+	sKey keys[] = {
+		{ '?',      mkKey("?: Help"),            0 },
+		{ '\n',     mkKey(ro_mode ?
+							"Enter: Exit"
+						:	"Enter: Save"),      0 },
+		{ '\033',   mkKey(ro_mode ?
+							"Esc: Exit"
+						:	"Esc: Cancel"),      0 },
+		{ -1,       mkKey("Toggle"),             1 },
+		{ KEY_F(5), mkKey("F5: Local/Global"),   1 },
+		{ KEY_F(6), mkKey("F6: Installed"),      1 },
+		{ KEY_F(7), mkKey("F7: Masked/Forced"),  1 },
+		{ KEY_F(9), mkKey("F9: Pkg/Desc Order"), 1 },
+		{ '\0',     mkKey(""),                   0 }
+	};
+#undef mkKey
+
 	result = maineventloop(ro_mode ? subtitle_ro : subtitle_rw,
 				&callback, &drawflag, flags, keys, true);