X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=ui.c;h=0bfe4e3f6e03e3f795f6d3d9057edd69950ef363;hb=98120c2f74691bfe11b47883f27c431d4b9b1de8;hp=874812d48430bb64a9a9fb99dee73710dc75791e;hpb=a07d2a804360c52a8630ae22d7a123de13bc0d91;p=pkg%2Fabook.git diff --git a/ui.c b/ui.c index 874812d..0bfe4e3 100644 --- a/ui.c +++ b/ui.c @@ -15,6 +15,7 @@ #include #include #include "abook.h" +#include #include "ui.h" #include "edit.h" #include "database.h" @@ -37,7 +38,6 @@ * external variables */ -extern int items, curitem; extern char *datafile; extern bool alternative_datafile; @@ -143,8 +143,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 +231,81 @@ statusline_addstr(const char *str) wrefresh(bottom); } +/* Same as statusline_addstr(), but hilight "" 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) +ui_readline(const char *prompt, char *s, size_t limit, bool use_completion) { int y, x; char *ret; @@ -243,14 +316,17 @@ ui_readline(char *prompt, char *s, size_t limit, bool 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; } int -statusline_ask_boolean(char *msg, int def) +statusline_ask_boolean(const char *msg, int def) { int ret; char *msg2 = strconcat(msg, def ? _(" (Y/n)?") : _(" (y/N)?"), NULL); @@ -286,7 +362,7 @@ refresh_statusline() } char * -ask_filename(char *prompt) +ask_filename(const char *prompt) { char *buf = NULL; @@ -356,7 +432,6 @@ display_help(int help) */ extern char *selected; -extern int curitem; void get_commands() @@ -377,7 +452,7 @@ get_commands() case 'q': return; case 'Q': quit_abook(QUIT_DONTSAVE); break; case 'P': print_stderr(selected_items() ? - -1 : list_current_item()); + -1 : list_get_curitem()); return; case '?': display_help(HELP_MAIN); @@ -414,15 +489,15 @@ 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; - case ' ': if(curitem >= 0) { - selected[curitem] = !selected[curitem]; + case ' ': if(list_get_curitem() >= 0) { + list_invert_curitem_selection(); ui_print_number_of_items(); refresh_list(); } @@ -442,13 +517,13 @@ get_commands() break; case 'm': launch_mutt(selected_items() ? - -1 : list_current_item()); + -1 : list_get_curitem()); refresh_screen(); break; case 'p': ui_print_database(); break; - case 'v': launch_wwwbrowser(list_current_item()); + case 'v': launch_wwwbrowser(list_get_curitem()); refresh_screen(); break; } @@ -497,21 +572,22 @@ ui_find(int next) refresh_screen(); } - if( (item = find_item(findstr, curitem + !!next, search_fields)) < 0 && + if( (item = find_item(findstr, list_get_curitem() + !!next, + search_fields)) < 0 && (item = find_item(findstr, 0, search_fields)) >= 0) statusline_addstr(_("Search hit bottom, continuing at top")); if(item >= 0) { - curitem = item; + list_set_curitem(item); refresh_list(); } } - void ui_print_number_of_items() { - char *str = mkstr(" " "|%3d/%3d", selected_items(), items); + char *str = strdup_printf(" " "|%3d/%3d", + selected_items(), db_n_items()); mvaddstr(0, COLS-strlen(str), str); @@ -521,10 +597,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(!list_is_empty()) { + 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(); @@ -541,13 +625,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 ll, print elected, or 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; @@ -555,7 +637,7 @@ ui_print_database() mode = ENUM_SELECTED; break; default: - clear_statusline(); + refresh_screen(); return; } @@ -592,8 +674,8 @@ ui_open_datafile() load_database(filename); - if(items == 0) { - statusline_msg(_("Sorry, that specified file appears not to be a valid abook addressbook")); + if(list_is_empty()) { + statusline_msg(_("Sorry, the specified file appears not to be a valid abook addressbook")); load_database(datafile); } else { free(datafile);