X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=ui.c;h=d27fa7360f6af4a0487c8cdde7722e5279d62701;hb=4f7637954591ecfb575642709bd12a069ee90aab;hp=c706963f86e550e26adaf18edcecb7e08257742c;hpb=7c5cfcacf9b413a8b9c41dfd8a41f0c643fbee18;p=pkg%2Fabook.git

diff --git a/ui.c b/ui.c
index c706963..d27fa73 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
  */
@@ -506,7 +511,7 @@ 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) {
@@ -515,11 +520,11 @@ 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,
+	if( (item = find_item(findstr, curitem + !!next,
 					search_fields )) >= 0 ) {
 		curitem = item;
 		refresh_list();