*** empty log message ***

[pkg/abook.git] / ui.c

diff --git a/ui.c b/ui.c
index b58ec5965bca3739c75c37c05d5ac158598d8000..20ec8feed48ecade9f964364e8815fefeb4a7064 100644 (file)
--- 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"
@@ -143,8 +144,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,8 +232,81 @@ 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, int limit, bool use_completion)
+ui_readline(char *prompt, char *s, size_t limit, bool use_completion)
 {
        int y, x;
        char *ret;
@@ -241,10 +315,13 @@ ui_readline(char *prompt, char *s, int limit, bool use_completion)
 
        getyx(bottom, y, x);
 
-       ret = abook_readline(bottom, y, x, s, limit, use_completion);
+       ret = abook_readline(bottom, y, x, s, use_completion);
 
-       if(ret)
+       if(ret) {
                strtrim(ret);
+               if(strlen(ret) > limit && limit > 0)
+                       ret[limit] = '\0';
+       }
 
        return ret;
 }
@@ -253,25 +330,21 @@ int
 statusline_ask_boolean(char *msg, int def)
 {
        int ret;
-       char *msg2 = strconcat(msg,  def ? " (Y/n)?" : " (y/N)?", NULL);
+       char *msg2 = strconcat(msg,  def ? _(" (Y/n)?") : _(" (y/N)?"), NULL);
+       char ch;
 
        statusline_addstr(msg2);
 
        free(msg2);
 
-       switch(tolower(getch())) {
-               case 'n':
-               case 'N':
-                       ret = FALSE;
-                       break;
-               case 'y':
-               case 'Y':
-                       ret = TRUE;
-                       break;
-               default:
-                       ret = def;
-                       break;
-       }
+       ch = tolower(getch());
+
+       if(ch == *(S_("keybinding for no|n")))
+               ret = FALSE;
+       else if(ch == *(S_("keybinding for yes|y")))
+               ret = TRUE;
+       else
+               ret = def;
 
        clear_statusline();
 
@@ -452,7 +525,7 @@ get_commands()
 
                        case 'p': ui_print_database(); break;
 
-                       case 'u': launch_wwwbrowser(list_current_item());
+                       case 'v': launch_wwwbrowser(list_current_item());
                                  refresh_screen();
                                  break;
                }
@@ -497,6 +570,7 @@ ui_find(int next)
                char *s;
                s = ui_readline("/", findstr, MAX_FIELD_LEN - 1, 0);
                strncpy(findstr, s, MAX_FIELD_LEN);
+               free(s);
                refresh_screen();
        }
 
@@ -514,7 +588,7 @@ 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);
 
@@ -524,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();
@@ -544,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;
@@ -558,7 +638,7 @@ ui_print_database()
                        mode = ENUM_SELECTED;
                        break;
                default:
-                       clear_statusline();
+                       refresh_screen();
                        return;
        }
 
@@ -596,7 +676,7 @@ ui_open_datafile()
        load_database(filename);
 
        if(items == 0) {
-               statusline_msg(_("Sorry, that specified file appears not to be a valid abook addressbook"));
+               statusline_msg(_("Sorry, the specified file appears not to be a valid abook addressbook"));
                load_database(datafile);
        } else {
                free(datafile);