X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=ui.c;h=1923138da1d45ac9d44637cd6a986bd128a54c76;hb=0f71d26e346631862bc00473662e674df3faa57f;hp=808ead07e15dcdc211fe35964d611222de018ab9;hpb=2c5d21ffb7ca5a922817b6eeef4381d386829fc9;p=pkg%2Fabook.git

diff --git a/ui.c b/ui.c
index 808ead0..1923138 100644
--- a/ui.c
+++ b/ui.c
@@ -15,6 +15,7 @@
 #include <signal.h>
 #include <ctype.h>
 #include "abook.h"
+#include <assert.h>
 #include "ui.h"
 #include "edit.h"
 #include "database.h"
@@ -231,6 +232,79 @@ statusline_addstr(const char *str)
 	wrefresh(bottom);
 }
 
+/* Same as statusline_addstr(), but hilight "<str>" sequences if the terminal
+ * supports it */
+static void
+statusline_addhlstr(const char *str)
+{
+#if defined(A_BOLD) && defined(A_NORMAL) && defined(A_DIM)
+	const char *p = str, *start = str;
+	char *tmp;
+	int pos = 0;
+
+	while(1) {
+		if(!*p || strchr("<>", *p)) {
+			if(p - start > 0) {
+				wattrset(bottom, (*p == '>') ? A_BOLD : A_NORMAL);
+				tmp = xstrndup(start, p - start);
+				mvwaddstr(bottom, 1, pos, tmp);
+				free(tmp);
+				pos += p - start;
+			}
+			if(*p) {
+				start = p + 1;
+
+				/* show tag markers */
+				wattrset(bottom, A_DIM);
+				mvwaddch(bottom, 1, pos++, *p);
+			}
+		}
+
+		if(!*p) {
+			wattrset(bottom, A_NORMAL);
+			break;
+		}
+
+		p++;
+	}
+#else
+	mvwaddstr(bottom, 1, 0, str);
+#endif
+
+	refresh();
+	wrefresh(bottom);
+}
+
+int
+statusline_askchoice(const char *msg, const char *choices, short dflt)
+{
+	char *s;
+	int ch;
+
+	assert((dflt < 0) || (dflt > strlen(choices)));
+
+	if(dflt) {
+		s = mkstr("%s [%c]", msg, choices[dflt - 1]);
+		statusline_addhlstr(s);
+		free(s);
+	} else
+		statusline_addhlstr(msg);
+
+	while(1)
+	{
+		ch = tolower(getch());
+
+		if(ch == 7) /* ctrl+G */
+			return 0;
+
+		if(dflt && (ch == '\r')) /* default choice */
+			return dflt;
+
+		if((s = strchr(choices, ch)))
+			return (s - choices + 1);
+	}
+}
+
 char *
 ui_readline(char *prompt, char *s, size_t limit, bool use_completion)
 {
@@ -243,10 +317,11 @@ ui_readline(char *prompt, char *s, size_t limit, bool use_completion)
 
 	ret = abook_readline(bottom, y, x, s, use_completion);
 
-	/* XXX: check that string doesn't exceed limit */
-
-	if(ret)
+	if(ret) {
 		strtrim(ret);
+		if(strlen(ret) > limit && limit > 0)
+			ret[limit] = '\0';
+	}
 
 	return ret;
 }
@@ -543,13 +618,11 @@ ui_print_database()
 	if(list_is_empty())
 		return;
 
-	statusline_addstr(_("Print All/Selected/Cancel (a/s/C)?"));
-
-	switch(tolower(getch())) {
-		case 'a':
+	switch(statusline_askchoice(_("Print <a>ll, print <s>elected, or <c>ancel?"), S_("keybindings:all/selected/cancel|asc"), 3)) {
+		case 1:
 			mode = ENUM_ALL;
 			break;
-		case 's':
+		case 2:
 			if( !selected_items() ) {
 				statusline_msg(_("No selected items"));
 				return;
@@ -557,7 +630,7 @@ ui_print_database()
 			mode = ENUM_SELECTED;
 			break;
 		default:
-			clear_statusline();
+			refresh_screen();
 			return;
 	}