X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=ui.c;h=4103eba78dcaaecdb55d18cc71e6dcddea770a8f;hb=548845673bdbe52a3cb2d7c6c2818d3202fffcba;hp=86259789b1b80019a473f70192b1781c56dc8d6a;hpb=05b0f3753902043fa8476a59c9251ab176675945;p=pkg%2Fabook.git diff --git a/ui.c b/ui.c index 8625978..4103eba 100644 --- a/ui.c +++ b/ui.c @@ -2,7 +2,7 @@ /* * $Id$ * - * by JH + * by JH * * Copyright (C) Jaakko Heinonen */ @@ -22,7 +22,6 @@ #include "misc.h" #include "options.h" #include "filter.h" -#include "estr.h" #ifdef HAVE_CONFIG_H # include "config.h" #endif @@ -37,12 +36,7 @@ # include #endif -#ifdef USE_ASCII_ONLY -# define UI_HLINE_CHAR '-' -#else -# define UI_HLINE_CHAR ACS_HLINE -#endif - +#include "abook_rl.h" /* * external variables @@ -51,14 +45,16 @@ extern int items, curitem; extern char *datafile; +extern int alternative_datafile; + /* * internal variables */ -int ui_initialized = FALSE; +bool ui_initialized = FALSE; -int should_resize = FALSE; -int can_resize = FALSE; +bool should_resize = FALSE; +bool can_resize = FALSE; WINDOW *top = NULL, *bottom = NULL; @@ -68,7 +64,7 @@ static void init_windows() { top = newwin(LIST_TOP - 1, COLS, 0, 0); - + bottom = newwin(LINES - LIST_BOTTOM, COLS, LIST_BOTTOM, 0); } @@ -131,14 +127,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); @@ -181,15 +185,15 @@ 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() @@ -201,7 +205,7 @@ refresh_screen() } #endif clear(); - + refresh_statusline(); headerline(MAIN_HELPLINE); list_headerline(); @@ -210,16 +214,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 @@ -230,53 +238,21 @@ 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, int use_completion) { - char *buf; int y, x; - 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); + mvwaddstr(bottom, 1, 0, prompt); + //mvwaddstr(stdscr, LINES - 1, 0, prompt); - str[n-1] = 0; - - free(buf); + /* + * FIXME: stdscr shoulnd't be used ??? + */ +// getyx(stdscr, y, x); + getyx(bottom, y, x); - return buf; + return abook_readline(bottom, y, x, s, limit, use_completion); } int @@ -284,7 +260,7 @@ statusline_ask_boolean(char *msg, int def) { int ret; char *msg2 = strconcat(msg, def ? " (Y/n)?" : " (y/N)?", NULL); - + statusline_addstr(msg2); free(msg2); @@ -313,24 +289,20 @@ 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; } @@ -344,12 +316,10 @@ clear_statusline() refresh(); } - /* - * help - need to rewrite + * help */ - #include "help.h" void @@ -372,7 +342,7 @@ display_help(int help) helpw = newwin(LINES - 5, COLS - 6, 2, 3); erase(); headerline("help"); - + for( i = 0; tbl[i] != NULL; i++) { waddstr(helpw, tbl[i]); if( ( !( (i+1) % (LINES-8) ) ) || @@ -380,7 +350,9 @@ display_help(int help) refresh(); wrefresh(helpw); refresh_statusline(); - statusline_msg("Press any key to continue..."); + if(statusline_msg("Press any key to continue...") + == 'q') + break; wclear(helpw); } } @@ -389,12 +361,11 @@ display_help(int help) delwin(helpw); } - /* * end of help */ -char *selected; +extern char *selected; extern int curitem; void @@ -412,6 +383,9 @@ get_commands() can_resize = FALSE; /* it's not safe to resize anymore */ switch( ch ) { case 'q': return; + case 'Q': print_stderr(selected_items() ? + -1 : list_current_item()); + return; case '?': display_help(HELP_MAIN); refresh_screen(); @@ -432,9 +406,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(); @@ -472,11 +446,16 @@ 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; } } } @@ -508,19 +487,22 @@ void ui_find(int next) { int item; - static char findstr[81]; + static char findstr[MAX_FIELD_LEN]; + int search_fields[] = {NAME, EMAIL, NICK, -1}; if(next) { if( !*findstr ) return; } else { + char *s; clear_statusline(); - statusline_addstr("/"); - statusline_getnstr(findstr, 67, 0); - clear_statusline(); + 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 ) { curitem = item; refresh_list(); } @@ -595,9 +577,10 @@ 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; } @@ -621,4 +604,6 @@ ui_open_datafile() refresh_screen(); free(filename); + + alternative_datafile = TRUE; }