X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=ui.c;h=7c71eb977a38af73aaf926f92fec68255b198aa7;hb=4909ba20244f55ee7326a40d751cf6737c2bc2b6;hp=808ead07e15dcdc211fe35964d611222de018ab9;hpb=2c5d21ffb7ca5a922817b6eeef4381d386829fc9;p=pkg%2Fabook.git

diff --git a/ui.c b/ui.c
index 808ead0..7c71eb9 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"
@@ -37,7 +38,8 @@
  * external variables
  */
 
-extern int items, curitem;
+extern int curitem;
+extern int items;
 extern char *datafile;
 
 extern bool alternative_datafile;
@@ -143,8 +145,8 @@ init_ui()
 	if( LINES < MIN_LINES || COLS < MIN_COLS ) {
 		clear(); refresh(); endwin();
 		fprintf(stderr, _("Your terminal size is %dx%d\n"), COLS, LINES);
-		fprintf(stderr, _("Terminal is too small. Minium terminal size "
-				"for abook is "
+		fprintf(stderr, _("Terminal is too small. Minimum terminal "
+				"size for abook is "
 				"%dx%d\n"), MIN_COLS, MIN_LINES);
 		return 1;
 	}
@@ -231,6 +233,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);
+				pos += strwidth(tmp);
+				free(tmp);
+			}
+			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 = strdup_printf("%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 +318,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;
 }
@@ -416,9 +492,9 @@ get_commands()
 
 			case 'o': ui_open_datafile();	break;
 
-			case 's': sort_by_field(NAME);	break;
+			case 's': sort_by_field("name");break;
 			case 'S': sort_surname();	break;
-			case 'F': sort_by_field(-1);	break;
+			case 'F': sort_by_field(NULL);	break;
 
 			case '/': ui_find(0);		break;
 			case '\\': ui_find(1);		break;
@@ -509,11 +585,10 @@ ui_find(int next)
 	}
 }
 
-
 void
 ui_print_number_of_items()
 {
-	char *str = mkstr("     " "|%3d/%3d", selected_items(), items);
+	char *str = strdup_printf("     " "|%3d/%3d", selected_items(), items);
 
 	mvaddstr(0, COLS-strlen(str), str);
 
@@ -523,10 +598,18 @@ ui_print_number_of_items()
 void
 ui_read_database()
 {
-	if(items > 0)
-		if(!statusline_ask_boolean(_("Your current data will be lost - "
-				"Press 'y' to continue"), FALSE))
+	char *msg;
+
+	if(items > 0) {
+		msg = strdup_printf(_("Your current data will be lost - "
+				"Press '%c' to continue"),
+				*(S_("keybinding for yes|y")));
+		if(!statusline_ask_boolean(msg, FALSE)) {
+			free(msg);
 			return;
+		}
+		free(msg);
+	}
 
 	load_database(datafile);
 	refresh_list();
@@ -543,13 +626,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 +638,7 @@ ui_print_database()
 			mode = ENUM_SELECTED;
 			break;
 		default:
-			clear_statusline();
+			refresh_screen();
 			return;
 	}