X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=ui.c;h=1630a82f8545bff46712bf720ae1a0be56208c5d;hb=481433c4d30a6bd8d8f9cfb88e1d83af69a640a2;hp=7c60b0681c11f3b370435f06d241a896e62036e7;hpb=3990095c4ac65c7f6e10b2fa074f763d048a92eb;p=pkg%2Fabook.git

diff --git a/ui.c b/ui.c
index 7c60b06..1630a82 100644
--- 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
  */
@@ -51,6 +44,8 @@
 extern int items, curitem;
 extern char *datafile;
 
+extern int alternative_datafile;
+
 /*
  * internal variables
  */
@@ -131,14 +126,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);
@@ -236,7 +239,7 @@ statusline_addstr(char *str)
  * parameters:
  *  (char *str)
  *   if n >= 0 str is a pointer which points a place where to store
- *   the string, else str is ingnored
+ *   the string, else str is ignored
  *  (int n)
  *   the maximum length of the string
  *   If n < 0 function will allocate needed space for the string.
@@ -344,12 +347,10 @@ clear_statusline()
 	refresh();
 }
 
-
 /*
- * help - need to rewrite
+ * help
  */
 
-
 #include "help.h"
 
 void
@@ -389,12 +390,11 @@ display_help(int help)
 	delwin(helpw);
 }
 
-
 /*
  * end of help
  */
 
-char *selected;
+extern char *selected;
 extern int curitem;
 
 void
@@ -412,6 +412,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 +435,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,7 +475,8 @@ get_commands()
 			case 'Z': move_curitem(MOVE_ITEM_DOWN);
 				break;
 
-			case 'm': launch_mutt(list_current_item());
+			case 'm': launch_mutt(selected_items() ?
+						  -1 : list_current_item());
 				  refresh_screen();
 				  break;
 
@@ -512,7 +516,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 )
@@ -520,11 +525,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();
 	}
@@ -625,4 +631,6 @@ ui_open_datafile()
 
 	refresh_screen();
 	free(filename);
+
+	alternative_datafile = TRUE;
 }