X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=ui.c;h=3d7e01a8f7469ae640e014509808b1802a371167;hb=24be624311cedd42ed09acfc605cdf51546bb5ab;hp=cd168621e17ea94bdae05312d7994cfb52c61627;hpb=42b63bdef9bec780253f214fa2c7d0b5ce484725;p=pkg%2Fabook.git

diff --git a/ui.c b/ui.c
index cd16862..3d7e01a 100644
--- a/ui.c
+++ b/ui.c
@@ -22,7 +22,6 @@
 #include "misc.h"
 #include "options.h"
 #include "filter.h"
-#include "estr.h"
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
@@ -37,6 +36,8 @@
 #	include <sys/ioctl.h>
 #endif
 
+#include "abook_rl.h"
+
 /*
  * external variables
  */
@@ -58,7 +59,6 @@ bool can_resize = FALSE;
 WINDOW *top = NULL, *bottom = NULL;
 
 
-
 static void
 init_windows()
 {
@@ -237,53 +237,22 @@ statusline_addstr(char *str)
 	wrefresh(bottom);
 }
 
-/*
- * function statusline_getnstr
- *
- * parameters:
- *  (char *str)
- *   if n >= 0 str is a pointer which points a place where to store
- *   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.
- *   Value 0 is not allowed for n.
- *  (int use_filesel)
- *   if this value is nonzero the fileselector is enabled
- *
- *  returns (char *)
- *   If n < 0 a pointer to a newly allocated string is returned.
- *   If n > 0 a nonzero value is returned if user has typed a valid
- *   string. If not NULL value is returned. Never really use the
- *   _pointer_ if n > 0.
- *
- */
-
 char *
-statusline_getnstr(char *str, int n, int use_filesel)
+ui_readline(char *prompt, char *s, int limit, bool use_completion)
 {
-	char *buf;
 	int y, x;
+	char *ret;
 
-	getyx(bottom, y, x);
-	wmove(bottom, 1, x);
-
-	buf = wenter_string(bottom, n,
-			(use_filesel ? ESTR_USE_FILESEL:0) | ESTR_DONT_WRAP);
+	mvwaddstr(bottom, 1, 0, prompt);
 
-	if(n < 0)
-		return buf;
-
-	if(buf == NULL)
-		str[0] = 0;
-	else
-		strncpy(str, buf, n);
+	getyx(bottom, y, x);
 
-	str[n-1] = 0;
+	ret = abook_readline(bottom, y, x, s, limit, use_completion);
 
-	free(buf);
+	if(ret)
+		strtrim(ret);
 
-	return buf;
+	return ret;
 }
 
 int
@@ -320,7 +289,6 @@ refresh_statusline()
 	werase(bottom);
 
 	mvwhline(bottom, 0, 0, UI_HLINE_CHAR, COLS);
-	mvwhline(bottom, 2, 0, UI_HLINE_CHAR, COLS);
 
 	refresh();
 	wrefresh(bottom);
@@ -328,16 +296,13 @@ refresh_statusline()
 
 
 char *
-ask_filename(char *prompt, int flags)
+ask_filename(char *prompt)
 {
 	char *buf = NULL;
 
 	clear_statusline();
 
-	statusline_addstr(prompt);
-	buf = statusline_getnstr(NULL, -1, flags);
-
-	clear_statusline();
+	buf = ui_readline(prompt, NULL, -1, 1);
 
 	return buf;
 }
@@ -418,7 +383,8 @@ get_commands()
 		can_resize = FALSE; /* it's not safe to resize anymore */
 		switch( ch ) {
 			case 'q': return;
-			case 'Q': print_stderr(selected_items() ?
+			case 'Q': quit_abook(QUIT_DONTSAVE);	break;
+			case 'P': print_stderr(selected_items() ?
 						  -1 : list_current_item());
 				  return;
 			case '?':
@@ -430,6 +396,7 @@ get_commands()
 			case KEY_DC:
 			case 'd':
 			case 'r': ui_remove_items();	break;
+			case 'D': duplicate_item();	break;
 			case 12: refresh_screen();	break;
 
 			case 'k':
@@ -455,8 +422,9 @@ get_commands()
 
 			case 'o': ui_open_datafile();	break;
 
-			case 's': sort_database();	break;
+			case 's': sort_by_field(NAME);	break;
 			case 'S': sort_surname();	break;
+			case 'F': sort_by_field(-1);	break;
 
 			case '/': ui_find(0);		break;
 			case '\\': ui_find(1);		break;
@@ -529,10 +497,11 @@ ui_find(int next)
 		if( !*findstr )
 			return;
 	} else {
+		char *s;
 		clear_statusline();
-		statusline_addstr("/");
-		statusline_getnstr(findstr, MAX_FIELD_LEN - 1, 0);
-		clear_statusline();
+		s = ui_readline("/", findstr, MAX_FIELD_LEN - 1, 0);
+		strncpy(findstr, s, MAX_FIELD_LEN);
+		refresh_screen();
 	}
 
 	if( (item = find_item(findstr, curitem + !!next,
@@ -571,7 +540,7 @@ void
 ui_print_database()
 {
 	FILE *handle;
-	char *command = options_get_str("print_command");
+	char *command = opt_get_str(STR_PRINT_COMMAND);
 	int mode;
 
 	if( list_is_empty() )
@@ -611,14 +580,15 @@ ui_open_datafile()
 {
 	char *filename;
 
-	filename = ask_filename("File to open: ", 1);
+	filename = ask_filename("File to open: ");
 
-	if( !filename ) {
+	if( !filename || ! *filename) {
+		free(filename);
 		refresh_screen();
 		return;
 	}
 
-	if( options_get_int("autosave") )
+	if( opt_get_bool(BOOL_AUTOSAVE) )
 		save_database();
 	else if(statusline_ask_boolean("Save current database", FALSE))
 		save_database();