X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=ui.c;h=1af0ee339be5d1457c15a6b6f4ee92c681eec8fc;hb=69dd06bfd7bb894e0683361aa3fb9ce35ade3590;hp=a6e1492871abf15e1f805b529b2a4c124c0ee897;hpb=8c3f50479d2b84db00ed9b8305ca92a5b56ba32e;p=pkg%2Fabook.git

diff --git a/ui.c b/ui.c
index a6e1492..1af0ee3 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
  */
@@ -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
  */
@@ -405,6 +410,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();
@@ -425,9 +433,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();
@@ -465,7 +473,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 +514,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 +523,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();
 	}