X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=ui.c;h=ad781e5b210caab637c4023f9a28376b14bc2266;hb=ceba9214d8bebe32d0c34c7a82916bcb9d798d69;hp=86259789b1b80019a473f70192b1781c56dc8d6a;hpb=05b0f3753902043fa8476a59c9251ab176675945;p=pkg%2Fabook.git

diff --git a/ui.c b/ui.c
index 8625978..ad781e5 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
  */
@@ -68,7 +63,7 @@ static void
 init_windows()
 {
 	top = newwin(LIST_TOP - 1, COLS, 0, 0);
-	
+
 	bottom = newwin(LINES - LIST_BOTTOM, COLS, LIST_BOTTOM, 0);
 }
 
@@ -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);
@@ -181,15 +184,15 @@ void
 headerline(char *str)
 {
 	werase(top);
-	
+
 	mvwhline(top, 1, 0, UI_HLINE_CHAR, COLS);
-	
+
 	mvwprintw(top, 0, 0, "%s | %s", PACKAGE " " VERSION, str);
 
 	refresh();
 	wrefresh(top);
 }
-		
+
 
 void
 refresh_screen()
@@ -201,7 +204,7 @@ refresh_screen()
 	}
 #endif
 	clear();
-	
+
 	refresh_statusline();
 	headerline(MAIN_HELPLINE);
 	list_headerline();
@@ -210,16 +213,20 @@ refresh_screen()
 }
 
 
-void
+int
 statusline_msg(char *msg)
 {
+	int c;
+	
 	clear_statusline();
 	statusline_addstr(msg);
-	getch();
+	c = getch();
 #ifdef DEBUG
 	fprintf(stderr, "statusline_msg(\"%s\")\n", msg);
 #endif
 	clear_statusline();
+
+	return c;
 }
 
 void
@@ -236,7 +243,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.
@@ -260,13 +267,13 @@ statusline_getnstr(char *str, int n, int use_filesel)
 
 	getyx(bottom, y, x);
 	wmove(bottom, 1, x);
-	
+
 	buf = wenter_string(bottom, n,
 			(use_filesel ? ESTR_USE_FILESEL:0) | ESTR_DONT_WRAP);
 
 	if(n < 0)
 		return buf;
-	
+
 	if(buf == NULL)
 		str[0] = 0;
 	else
@@ -284,7 +291,7 @@ statusline_ask_boolean(char *msg, int def)
 {
 	int ret;
 	char *msg2 = strconcat(msg,  def ? " (Y/n)?" : " (y/N)?", NULL);
-			
+
 	statusline_addstr(msg2);
 
 	free(msg2);
@@ -318,7 +325,7 @@ refresh_statusline()
 	refresh();
 	wrefresh(bottom);
 }
-	
+
 
 char *
 ask_filename(char *prompt, int flags)
@@ -326,7 +333,7 @@ ask_filename(char *prompt, int flags)
 	char *buf = NULL;
 
 	clear_statusline();
-	
+
 	statusline_addstr(prompt);
 	buf = statusline_getnstr(NULL, -1, flags);
 
@@ -344,12 +351,10 @@ clear_statusline()
 	refresh();
 }
 
-
 /*
- * help - need to rewrite
+ * help
  */
 
-
 #include "help.h"
 
 void
@@ -372,7 +377,7 @@ display_help(int help)
 	helpw = newwin(LINES - 5, COLS - 6, 2, 3);
 	erase();
 	headerline("help");
-	
+
 	for( i = 0; tbl[i] != NULL; i++) {
 		waddstr(helpw, tbl[i]);
 		if( ( !( (i+1) % (LINES-8) ) ) ||
@@ -380,7 +385,9 @@ display_help(int help)
 			refresh();
 			wrefresh(helpw);
 			refresh_statusline();
-			statusline_msg("Press any key to continue...");
+			if(statusline_msg("Press any key to continue...")
+					== 'q')
+				break;
 			wclear(helpw);
 		}
 	}
@@ -389,12 +396,11 @@ display_help(int help)
 	delwin(helpw);
 }
 
-
 /*
  * end of help
  */
 
-char *selected;
+extern char *selected;
 extern int curitem;
 
 void
@@ -412,6 +418,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 +441,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,11 +481,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 +522,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 +531,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();
 	}
@@ -621,4 +637,6 @@ ui_open_datafile()
 
 	refresh_screen();
 	free(filename);
+
+	alternative_datafile = TRUE;
 }