X-Git-Url: https://git.deb.at/?a=blobdiff_plain;ds=sidebyside;f=ui.c;h=40dc1e138f5a1344e67764df48676fce631e37f5;hb=11160342b984a0dca6e051c8b7618c896cdb0173;hp=3286d21b4402a7b52a1b0482ee5c7b44b337bd78;hpb=3212da92838c056bcc1cafa57beaf26086e2ac96;p=pkg%2Fabook.git diff --git a/ui.c b/ui.c index 3286d21..40dc1e1 100644 --- a/ui.c +++ b/ui.c @@ -2,7 +2,7 @@ /* * $Id$ * - * by JH + * by JH * * Copyright (C) Jaakko Heinonen */ @@ -13,6 +13,7 @@ #include #include #include +#include #include "abook.h" #include "ui.h" #include "edit.h" @@ -21,27 +22,15 @@ #include "misc.h" #include "options.h" #include "filter.h" -#include "estr.h" +#include "xmalloc.h" #ifdef HAVE_CONFIG_H # include "config.h" #endif -#ifdef HAVE_TERMIOS_H -# include -#else -# ifdef HAVE_LINUX_TERMIOS_H -# include -# endif -#endif #ifdef HAVE_SYS_IOCTL_H # include #endif -#ifdef USE_ASCII_ONLY -# define UI_HLINE_CHAR '-' -#else -# define UI_HLINE_CHAR ACS_HLINE -#endif - +#include "abook_rl.h" /* * external variables @@ -50,24 +39,24 @@ extern int items, curitem; extern char *datafile; +extern bool alternative_datafile; + /* * internal variables */ -int ui_initialized = FALSE; - -int should_resize = FALSE; -int can_resize = FALSE; +static bool ui_initialized = FALSE; -WINDOW *top = NULL, *bottom = NULL; +static bool should_resize = FALSE; +static bool can_resize = FALSE; +static WINDOW *top = NULL, *bottom = NULL; static void init_windows() { top = newwin(LIST_TOP - 1, COLS, 0, 0); - bottom = newwin(LINES - LIST_BOTTOM, COLS, LIST_BOTTOM, 0); } @@ -86,13 +75,13 @@ resize_abook() #ifdef TIOCGWINSZ struct winsize winsz; - ioctl (0, TIOCGWINSZ, &winsz); + ioctl(0, TIOCGWINSZ, &winsz); #ifdef DEBUG if(winsz.ws_col >= MIN_COLS && winsz.ws_row >= MIN_LINES) { fprintf(stderr, "Warning: COLS=%d, LINES=%d\n", winsz.ws_col, winsz.ws_row); } #endif - + if(winsz.ws_col >= MIN_COLS && winsz.ws_row >= MIN_LINES) { #ifdef HAVE_RESIZETERM resizeterm(winsz.ws_row, winsz.ws_col); @@ -116,10 +105,10 @@ resize_abook() static void win_changed(int i) { - if( can_resize ) + if(can_resize) resize_abook(); else - should_resize = TRUE; + should_resize = TRUE; } #endif /* SIGWINCH */ @@ -130,14 +119,22 @@ is_ui_initialized() return ui_initialized; } - -int -init_ui() +void +ui_init_curses() { - initscr(); cbreak(); noecho(); + if(!is_ui_initialized()) + initscr(); + cbreak(); + noecho(); nonl(); intrflush(stdscr, FALSE); keypad(stdscr, TRUE); +} + +int +init_ui() +{ + ui_init_curses(); #ifdef DEBUG fprintf(stderr, "init_abook():\n"); fprintf(stderr, " COLS = %d, LINES = %d\n", COLS, LINES); @@ -151,15 +148,15 @@ init_ui() return 1; } -#ifdef SIGWINCH - signal(SIGWINCH, win_changed); -#endif - init_list(); init_windows(); ui_initialized = TRUE; +#ifdef SIGWINCH + signal(SIGWINCH, win_changed); +#endif + return 0; } @@ -180,27 +177,27 @@ void headerline(char *str) { werase(top); - + mvwhline(top, 1, 0, UI_HLINE_CHAR, COLS); - + mvwprintw(top, 0, 0, "%s | %s", PACKAGE " " VERSION, str); refresh(); wrefresh(top); } - + void refresh_screen() { #ifdef SIGWINCH - if( should_resize ) { + if(should_resize) { resize_abook(); return; } #endif clear(); - + refresh_statusline(); headerline(MAIN_HELPLINE); list_headerline(); @@ -209,16 +206,20 @@ refresh_screen() } -void +int statusline_msg(char *msg) { + int c; + clear_statusline(); statusline_addstr(msg); - getch(); + c = getch(); #ifdef DEBUG fprintf(stderr, "statusline_msg(\"%s\")\n", msg); #endif clear_statusline(); + + return c; } void @@ -229,53 +230,51 @@ statusline_addstr(char *str) wrefresh(bottom); } -/* - * function statusline_getnstr - * - * parameters: - * (char *str) - * if n >= 0 str is a pointer which points a place where to store - * the string, else str is ingnored - * (int n) - * the maximum length of the string - * If n < 0 function will allocate needed space for the string. - * Value 0 is not allowed for n. - * (int use_filesel) - * if this value is nonzero the fileselector is enabled - * - * returns (char *) - * If n < 0 a pointer to a newly allocated string is returned. - * If n > 0 a nonzero value is returned if user has typed a valid - * string. If not NULL value is returned. Never really use the - * _pointer_ if n > 0. - * - */ - char * -statusline_getnstr(char *str, int n, int use_filesel) +ui_readline(char *prompt, char *s, int limit, bool use_completion) { - char *buf; int y, x; + char *ret; + + mvwaddstr(bottom, 1, 0, prompt); getyx(bottom, y, x); - wmove(bottom, 1, x); - - buf = wenter_string(bottom, n, - (use_filesel ? ESTR_USE_FILESEL:0) | ESTR_DONT_WRAP); - - if(n < 0) - return buf; - - if(buf == NULL) - str[0] = 0; - else - strncpy(str, buf, n); - str[n-1] = 0; + ret = abook_readline(bottom, y, x, s, limit, use_completion); - free(buf); + if(ret) + strtrim(ret); - return buf; + return ret; +} + +int +statusline_ask_boolean(char *msg, int def) +{ + int ret; + char *msg2 = strconcat(msg, def ? " (Y/n)?" : " (y/N)?", NULL); + + 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; + } + + clear_statusline(); + + return ret; } void @@ -284,24 +283,19 @@ refresh_statusline() werase(bottom); mvwhline(bottom, 0, 0, UI_HLINE_CHAR, COLS); - mvwhline(bottom, 2, 0, UI_HLINE_CHAR, COLS); refresh(); wrefresh(bottom); } - char * -ask_filename(char *prompt, int flags) +ask_filename(char *prompt) { char *buf = NULL; clear_statusline(); - - statusline_addstr(prompt); - buf = statusline_getnstr(NULL, -1, flags); - clear_statusline(); + buf = ui_readline(prompt, NULL, -1, 1); return buf; } @@ -315,12 +309,10 @@ clear_statusline() refresh(); } - /* - * help - need to rewrite + * help */ - #include "help.h" void @@ -343,15 +335,17 @@ display_help(int help) helpw = newwin(LINES - 5, COLS - 6, 2, 3); erase(); headerline("help"); - - for( i = 0; tbl[i] != NULL; i++) { + + for(i = 0; tbl[i] != NULL; i++) { waddstr(helpw, tbl[i]); - if( ( !( (i+1) % (LINES-8) ) ) || - (tbl[i+1] == NULL) ) { + if( (!((i + 1) % (LINES - 8))) || + (tbl[i + 1] == NULL) ) { refresh(); wrefresh(helpw); refresh_statusline(); - statusline_msg("Press any key to continue..."); + if(statusline_msg("Press any key to continue...") + == 'q') + break; wclear(helpw); } } @@ -360,12 +354,11 @@ display_help(int help) delwin(helpw); } - /* * end of help */ -char *selected; +extern char *selected; extern int curitem; void @@ -375,14 +368,20 @@ get_commands() for(;;) { can_resize = TRUE; /* it's safe to resize now */ - hide_cursor(); - if( should_resize ) + if(!opt_get_bool(BOOL_SHOW_CURSOR)) + hide_cursor(); + if(should_resize) refresh_screen(); ch = getch(); - show_cursor(); + if(!opt_get_bool(BOOL_SHOW_CURSOR)) + show_cursor(); can_resize = FALSE; /* it's not safe to resize anymore */ - switch( ch ) { + switch(ch) { case 'q': return; + case 'Q': quit_abook(QUIT_DONTSAVE); break; + case 'P': print_stderr(selected_items() ? + -1 : list_current_item()); + return; case '?': display_help(HELP_MAIN); refresh_screen(); @@ -392,6 +391,7 @@ get_commands() case KEY_DC: case 'd': case 'r': ui_remove_items(); break; + case 'D': duplicate_item(); break; case 12: refresh_screen(); break; case 'k': @@ -403,9 +403,9 @@ get_commands() case 'J': case KEY_NPAGE: page_down(); break; - case 'H': + case 'g': case KEY_HOME: goto_home(); break; - case 'E': + case 'G': case KEY_END: goto_end(); break; case 'w': save_database(); @@ -417,8 +417,9 @@ get_commands() case 'o': ui_open_datafile(); break; - case 's': sort_database(); break; + case 's': sort_by_field(NAME); break; case 'S': sort_surname(); break; + case 'F': sort_by_field(-1); break; case '/': ui_find(0); break; case '\\': ui_find(1); break; @@ -443,77 +444,69 @@ get_commands() case 'Z': move_curitem(MOVE_ITEM_DOWN); break; - case 'm': launch_mutt(); break; + case 'm': launch_mutt(selected_items() ? + -1 : list_current_item()); + refresh_screen(); + break; case 'p': ui_print_database(); break; - case 'u': launch_lynx(); break; + case 'u': launch_wwwbrowser(list_current_item()); + refresh_screen(); + break; } } } - void ui_remove_items() { - if( items < 1 || curitem < 0 ) + if(list_is_empty()) return; - statusline_addstr("Remove selected item(s) (Y/n)"); - switch( getch() ) { - case '\r': - case 'y': - case 'Y': break; - default: - clear_statusline(); - return; - } - - remove_selected_items(); + if(statusline_ask_boolean("Remove selected item(s)", TRUE)) + remove_selected_items(); - clear_statusline(); + clear_statusline(); refresh_list(); } void ui_clear_database() { - - statusline_addstr("Clear WHOLE database (y/N)"); - switch( getch() ) { - case 'y': - case 'Y': break; - default: - clear_statusline(); - return; + if(statusline_ask_boolean("Clear WHOLE database", FALSE)) { + close_database(); + refresh_list(); } - - close_database(); - - refresh_screen(); } void ui_find(int next) { - int item; - static char findstr[81]; + int item = -1; + static char findstr[MAX_FIELD_LEN]; + int search_fields[] = {NAME, EMAIL, NICK, -1}; + + clear_statusline(); if(next) { - if( !*findstr ) + if(!*findstr) return; } else { - clear_statusline(); - statusline_addstr("/"); - statusline_getnstr(findstr, 67, 0); - clear_statusline(); + char *s; + s = ui_readline("/", findstr, MAX_FIELD_LEN - 1, 0); + strncpy(findstr, s, MAX_FIELD_LEN); + refresh_screen(); } - if( (item = find_item(findstr, next ? curitem+1 : curitem)) >= 0 ) { + if( (item = find_item(findstr, 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; refresh_list(); } - } @@ -530,16 +523,10 @@ ui_print_number_of_items() void ui_read_database() { - if(items > 0) { - statusline_addstr("Your current data will be lost - Press 'y' to continue"); - switch( getch() ) { - case 'y': - case 'Y': break; - default: clear_statusline(); - return; - } - clear_statusline(); - } + if(items > 0) + if(!statusline_ask_boolean("Your current data will be lost - " + "Press 'y' to continue", FALSE)) + return; load_database(datafile); refresh_list(); @@ -550,22 +537,37 @@ void ui_print_database() { FILE *handle; - char *command = options_get_str("print_command"); + char *command = opt_get_str(STR_PRINT_COMMAND); + int mode; - statusline_addstr("Print addressbook? (y/N)"); - switch( getch() ) { - case 'y': - case 'Y': + if(list_is_empty()) + return; + + statusline_addstr("Print All/Selected/Cancel (a/s/C)?"); + + switch(tolower(getch())) { + case 'a': + mode = ENUM_ALL; + break; + case 's': + if( !selected_items() ) { + statusline_msg("No selected items"); + return; + } + mode = ENUM_SELECTED; break; - default: clear_statusline(); return; + default: + clear_statusline(); + return; } + clear_statusline(); if( ! *command || (handle = popen(command, "w")) == NULL) return; - fexport("text", handle); - + fexport("text", handle, mode); + pclose(handle); } @@ -575,37 +577,33 @@ ui_open_datafile() { char *filename; - filename = ask_filename("File to open: ", 1); + filename = ask_filename("File to open: "); - if( !filename ) { + if(!filename || ! *filename) { + free(filename); refresh_screen(); return; } - if( options_get_int("autosave") ) + if(opt_get_bool(BOOL_AUTOSAVE)) + save_database(); + else if(statusline_ask_boolean("Save current database", FALSE)) save_database(); - else { - statusline_addstr("Save current database (y/N)"); - switch( getch() ) { - case 'y': - case 'Y': - save_database(); - default: break; - } - } close_database(); load_database(filename); - if( items == 0 ) { + if(items == 0) { statusline_msg("Sorry, that specified file appears not to be a valid abook addressbook"); load_database(datafile); } else { free(datafile); - datafile = strdup(filename); + datafile = xstrdup(filename); } refresh_screen(); free(filename); + + alternative_datafile = TRUE; }