X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=ui.c;h=22c83621ba9b9dccf8b4b5671051e7a7d149c99c;hb=7cae3af85f57515c6b6cce8ac45a986223e30736;hp=a6e1492871abf15e1f805b529b2a4c124c0ee897;hpb=8c3f50479d2b84db00ed9b8305ca92a5b56ba32e;p=pkg%2Fabook.git

diff --git a/ui.c b/ui.c
index a6e1492..22c8362 100644
--- a/ui.c
+++ b/ui.c
@@ -124,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);
@@ -337,12 +345,10 @@ clear_statusline()
 	refresh();
 }
 
-
 /*
- * help - need to rewrite
+ * help
  */
 
-
 #include "help.h"
 
 void
@@ -382,7 +388,6 @@ display_help(int help)
 	delwin(helpw);
 }
 
-
 /*
  * end of help
  */
@@ -465,7 +470,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;
 
@@ -505,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 )
@@ -513,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();
 	}