Support for dynamic views.

[pkg/abook.git] / ui.c

diff --git a/ui.c b/ui.c
index 1923138da1d45ac9d44637cd6a986bd128a54c76..7c71eb977a38af73aaf926f92fec68255b198aa7 100644 (file)
--- a/ui.c
+++ b/ui.c
@@ -38,7 +38,8 @@
  * external variables
  */
 
-extern int items, curitem;
+extern int curitem;
+extern int items;
 extern char *datafile;
 
 extern bool alternative_datafile;
@@ -144,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;
        }
@@ -248,8 +249,8 @@ statusline_addhlstr(const char *str)
                                wattrset(bottom, (*p == '>') ? A_BOLD : A_NORMAL);
                                tmp = xstrndup(start, p - start);
                                mvwaddstr(bottom, 1, pos, tmp);
+                               pos += strwidth(tmp);
                                free(tmp);
-                               pos += p - start;
                        }
                        if(*p) {
                                start = p + 1;
@@ -281,10 +282,10 @@ statusline_askchoice(const char *msg, const char *choices, short dflt)
        char *s;
        int ch;
 
-       assert((dflt < 0) || (dflt > strlen(choices)));
+       assert((dflt >= 0) && (dflt <= strlen(choices)));
 
        if(dflt) {
-               s = mkstr("%s [%c]", msg, choices[dflt - 1]);
+               s = strdup_printf("%s [%c]", msg, choices[dflt - 1]);
                statusline_addhlstr(s);
                free(s);
        } else
@@ -491,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;
@@ -584,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);
 
@@ -598,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();