X-Git-Url: https://git.deb.at/w?p=pkg%2Fabook.git;a=blobdiff_plain;f=ui.c;h=e8798858270654eeccb9daa5a6dbee2e0b1479e9;hp=874812d48430bb64a9a9fb99dee73710dc75791e;hb=b722eae92e8deb6bd080dea1f2f929a7dd9edddb;hpb=a07d2a804360c52a8630ae22d7a123de13bc0d91 diff --git a/ui.c b/ui.c index 874812d..e879885 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" @@ -24,6 +25,8 @@ #include "options.h" #include "filter.h" #include "xmalloc.h" +#include "color.h" +#include #ifdef HAVE_CONFIG_H # include "config.h" #endif @@ -37,7 +40,6 @@ * external variables */ -extern int items, curitem; extern char *datafile; extern bool alternative_datafile; @@ -50,6 +52,8 @@ static bool ui_initialized = FALSE; static bool should_resize = FALSE; static bool can_resize = FALSE; +static struct timeval last_click_time; +static int double_click_interval = 200; /* maximum time in milliseconds */ static WINDOW *top = NULL, *bottom = NULL; @@ -129,7 +133,92 @@ ui_init_curses() noecho(); nonl(); intrflush(stdscr, FALSE); + if(opt_get_bool(BOOL_USE_MOUSE)) { + mouseinterval(0); + timerclear(&last_click_time); + ui_enable_mouse(TRUE); + } keypad(stdscr, TRUE); + if(opt_get_bool(BOOL_USE_COLORS) && has_colors()) { + start_color(); + use_default_colors(); + ui_init_color_pairs_user(); + } +} + +void +ui_enable_mouse(bool enabled) +{ + mmask_t mask; + if(enabled) { + mask = BUTTON1_CLICKED | BUTTON4_PRESSED; +#if NCURSES_MOUSE_VERSION == 2 + mask |= BUTTON5_PRESSED; +#endif + } else { + mask = 0; + } + mousemask(mask, NULL); +} + +/** Check the time elapsed since last click and tell if it should be + * interpreted as a double click + */ +static bool +was_double_click() { + struct timeval click_time, click_diff, maxdiff; + maxdiff.tv_sec = double_click_interval / 1000; + maxdiff.tv_usec = (double_click_interval % 1000)*1000; + gettimeofday(&click_time, NULL); + + timersub(&click_time, &last_click_time, &click_diff); + last_click_time = click_time; + return !timercmp(&click_diff, &maxdiff, >); +} + +#define CHECK_COLOR_NAME(value, name, DEFNAME) \ + if(!strcmp((name), (value))){ \ + return DEFNAME; \ + } +short +opt_color_to_color(enum str_opts enum_name) +{ + char* name = opt_get_str(enum_name); + CHECK_COLOR_NAME(name, "default", COLOR_DEFAULT) + else CHECK_COLOR_NAME(name, "black", COLOR_BLACK) + else CHECK_COLOR_NAME(name, "red", COLOR_RED) + else CHECK_COLOR_NAME(name, "green", COLOR_GREEN) + else CHECK_COLOR_NAME(name, "yellow", COLOR_YELLOW) + else CHECK_COLOR_NAME(name, "blue", COLOR_BLUE) + else CHECK_COLOR_NAME(name, "magenta", COLOR_MAGENTA) + else CHECK_COLOR_NAME(name, "cyan", COLOR_CYAN) + else CHECK_COLOR_NAME(name, "white", COLOR_WHITE) + else return COLOR_DEFAULT; +} + +void +ui_init_color_pairs_user() +{ + init_pair(CP_HEADER, opt_color_to_color(STR_COLOR_HEADER_FG), + opt_color_to_color(STR_COLOR_HEADER_BG)); + init_pair(CP_FOOTER, opt_color_to_color(STR_COLOR_FOOTER_FG), + opt_color_to_color(STR_COLOR_FOOTER_BG)); + init_pair(CP_LIST_EVEN, opt_color_to_color(STR_COLOR_LIST_EVEN_FG), + opt_color_to_color(STR_COLOR_LIST_EVEN_BG)); + init_pair(CP_LIST_ODD, opt_color_to_color(STR_COLOR_LIST_ODD_FG), + opt_color_to_color(STR_COLOR_LIST_ODD_BG)); + init_pair(CP_LIST_HEADER, opt_color_to_color(STR_COLOR_LIST_HEADER_FG), + opt_color_to_color(STR_COLOR_LIST_HEADER_BG)); + init_pair(CP_LIST_HIGHLIGHT, opt_color_to_color(STR_COLOR_LIST_HIGHLIGHT_FG), + opt_color_to_color(STR_COLOR_LIST_HIGHLIGHT_BG)); + init_pair(CP_TAB_BORDER, opt_color_to_color(STR_COLOR_TAB_BORDER_FG), + opt_color_to_color(STR_COLOR_TAB_BORDER_BG)); + init_pair(CP_TAB_LABEL, opt_color_to_color(STR_COLOR_TAB_LABEL_FG), + opt_color_to_color(STR_COLOR_TAB_LABEL_BG)); + init_pair(CP_FIELD_NAME, opt_color_to_color(STR_COLOR_FIELD_NAME_FG), + opt_color_to_color(STR_COLOR_FIELD_NAME_BG)); + init_pair(CP_FIELD_VALUE, opt_color_to_color(STR_COLOR_FIELD_VALUE_FG), + opt_color_to_color(STR_COLOR_FIELD_VALUE_BG)); } int @@ -143,8 +232,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; } @@ -179,6 +268,8 @@ headerline(const char *str) { werase(top); + wattrset(top, COLOR_PAIR(CP_HEADER)); + mvwhline(top, 0, 0, ' ', COLS); mvwhline(top, 1, 0, UI_HLINE_CHAR, COLS); mvwprintw(top, 0, 0, "%s | %s", PACKAGE " " VERSION, str); @@ -231,8 +322,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 +407,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); @@ -279,6 +446,7 @@ refresh_statusline() { werase(bottom); + wattrset(bottom, COLOR_PAIR(CP_FOOTER)); mvwhline(bottom, 0, 0, UI_HLINE_CHAR, COLS); refresh(); @@ -286,7 +454,7 @@ refresh_statusline() } char * -ask_filename(char *prompt) +ask_filename(const char *prompt) { char *buf = NULL; @@ -356,7 +524,6 @@ display_help(int help) */ extern char *selected; -extern int curitem; void get_commands() @@ -373,11 +540,33 @@ get_commands() if(!opt_get_bool(BOOL_SHOW_CURSOR)) show_cursor(); can_resize = FALSE; /* it's not safe to resize anymore */ + if(ch == KEY_MOUSE) { + MEVENT event; + bool double_clicked = was_double_click(); + if(getmouse(&event) == OK) { + if(event.bstate & BUTTON1_CLICKED + || event.bstate & BUTTON1_DOUBLE_CLICKED) { + if(event.y == 0) { + return; + } + list_set_curitem(event.y + list_get_firstitem() - LIST_TOP); + if(double_clicked) { + edit_item(-1); + } else { + refresh_list(); + } + } else if(event.bstate & BUTTON4_PRESSED) { + scroll_list_up(); + } else if(event.bstate & BUTTON5_PRESSED) { + scroll_list_down(); + } + } + } switch(ch) { 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); @@ -388,7 +577,9 @@ get_commands() case KEY_DC: case 'd': case 'r': ui_remove_items(); break; + case 'M': ui_merge_items(); break; case 'D': duplicate_item(); break; + case 'U': ui_remove_duplicates(); break; case 12: refresh_screen(); break; case 'k': @@ -414,15 +605,16 @@ 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 'n': 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 +634,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; } @@ -461,13 +653,32 @@ ui_remove_items() if(list_is_empty()) return; - if(statusline_ask_boolean(_("Remove selected item(s)"), TRUE)) + if(statusline_ask_boolean(_("Remove selected item(s)"), FALSE)) remove_selected_items(); clear_statusline(); refresh_list(); } +void +ui_merge_items() +{ + if(statusline_ask_boolean(_("Merge selected items"), FALSE)) + merge_selected_items(); + + clear_statusline(); + refresh_list(); +} + +void ui_remove_duplicates() +{ + if(statusline_ask_boolean(_("Remove duplicates"), FALSE)) + remove_duplicates(); + + clear_statusline(); + refresh_list(); +} + void ui_clear_database() { @@ -492,27 +703,33 @@ ui_find(int next) } else { char *s; s = ui_readline("/", findstr, MAX_FIELD_LEN - 1, 0); - strncpy(findstr, s, MAX_FIELD_LEN); - free(s); refresh_screen(); + if(s == NULL) { + return; /* user cancelled (ctrl-G) */ + } else { + strncpy(findstr, s, MAX_FIELD_LEN); + free(s); + } } - 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()); + attrset(COLOR_PAIR(CP_HEADER)); mvaddstr(0, COLS-strlen(str), str); free(str); @@ -521,10 +738,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 +766,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 +778,7 @@ ui_print_database() mode = ENUM_SELECTED; break; default: - clear_statusline(); + refresh_screen(); return; } @@ -592,8 +815,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);