Updated JH's e-mail address

[pkg/abook.git] / ui.c

diff --git a/ui.c b/ui.c
index 25c6ba1146448eb5b6e84177caeb36adb108ba1b..d27fa7360f6af4a0487c8cdde7722e5279d62701 100644 (file)
--- a/ui.c
+++ b/ui.c
@@ -2,7 +2,7 @@
 /*
  * $Id$
  *
- * by JH <jheinonen@bigfoot.com>
+ * by JH <jheinonen@users.sourceforge.net>
  *
  * Copyright (C) Jaakko Heinonen
  */
@@ -37,13 +37,6 @@
 #      include <sys/ioctl.h>
 #endif
 
-#ifdef USE_ASCII_ONLY
-#      define UI_HLINE_CHAR            '-'
-#else
-#      define UI_HLINE_CHAR            ACS_HLINE
-#endif
-
-
 /*
  * external variables
  */
@@ -131,14 +124,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);
@@ -344,12 +345,10 @@ clear_statusline()
        refresh();
 }
 
-
 /*
- * help - need to rewrite
+ * help
  */
 
-
 #include "help.h"
 
 void
@@ -389,7 +388,6 @@ display_help(int help)
        delwin(helpw);
 }
 
-
 /*
  * end of help
  */
@@ -472,11 +470,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,7 +511,8 @@ 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 )
@@ -516,11 +520,12 @@ ui_find(int next)
        } else {
                clear_statusline();
                statusline_addstr("/");
-               statusline_getnstr(findstr, 67, 0);
+               statusline_getnstr(findstr, MAX_FIELD_LEN - 1, 0);
                clear_statusline();
        }
 
-       if( (item = find_item(findstr, next ? curitem+1 : curitem)) >= 0 ) {
+       if( (item = find_item(findstr, curitem + !!next,
+                                       search_fields )) >= 0 ) {
                curitem = item;
                refresh_list();
        }
@@ -556,14 +561,35 @@ ui_print_database()
 {
        FILE *handle;
        char *command = options_get_str("print_command");
+       int mode;
 
-       if(!statusline_ask_boolean("Print addressbook", FALSE))
+       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;
+       }
+
+       clear_statusline();
+
        if( ! *command || (handle = popen(command, "w")) == NULL)
                return;
 
-       fexport("text", handle);
+       fexport("text", handle, mode);
        
        pclose(handle);
 }