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

diff --git a/ui.c b/ui.c
index cd16862..b58ec59 100644
--- a/ui.c
+++ b/ui.c
@@ -18,25 +18,21 @@
 #include "ui.h"
 #include "edit.h"
 #include "database.h"
+#include "gettext.h"
 #include "list.h"
 #include "misc.h"
 #include "options.h"
 #include "filter.h"
-#include "estr.h"
+#include "xmalloc.h"
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
 #endif
-#ifdef HAVE_TERMIOS_H
-#	include <termios.h>
-#else
-#	ifdef HAVE_LINUX_TERMIOS_H
-#		include <linux/termios.h>
-#	endif
-#endif
 #ifdef HAVE_SYS_IOCTL_H
 #	include <sys/ioctl.h>
 #endif
 
+#include "abook_rl.h"
+
 /*
  * external variables
  */
@@ -44,26 +40,24 @@
 extern int items, curitem;
 extern char *datafile;
 
-extern int alternative_datafile;
+extern bool alternative_datafile;
 
 /*
  * internal variables
  */
 
-bool ui_initialized = FALSE;
+static bool ui_initialized = FALSE;
 
-bool should_resize = FALSE;
-bool can_resize = FALSE;
-
-WINDOW *top = NULL, *bottom = NULL;
+static bool should_resize = FALSE;
+static bool can_resize = FALSE;
 
+static WINDOW *top = NULL, *bottom = NULL;
 
 
 static void
 init_windows()
 {
 	top = newwin(LIST_TOP - 1, COLS, 0, 0);
-
 	bottom = newwin(LINES - LIST_BOTTOM, COLS, LIST_BOTTOM, 0);
 }
 
@@ -82,13 +76,13 @@ resize_abook()
 #ifdef TIOCGWINSZ
 	struct winsize winsz;
 
-	ioctl (0, TIOCGWINSZ, &winsz);
+	ioctl(0, TIOCGWINSZ, &winsz);
 #ifdef DEBUG
 	if(winsz.ws_col >= MIN_COLS && winsz.ws_row >= MIN_LINES) {
 		fprintf(stderr, "Warning: COLS=%d, LINES=%d\n", winsz.ws_col, winsz.ws_row);
 	}
 #endif
-		
+
 	if(winsz.ws_col >= MIN_COLS && winsz.ws_row >= MIN_LINES) {
 #ifdef HAVE_RESIZETERM
 		resizeterm(winsz.ws_row, winsz.ws_col);
@@ -112,10 +106,10 @@ resize_abook()
 static void
 win_changed(int i)
 {
-	if( can_resize )
+	if(can_resize)
 		resize_abook();
 	else
-		should_resize = TRUE;	
+		should_resize = TRUE;
 }
 #endif /* SIGWINCH */
 
@@ -148,22 +142,22 @@ init_ui()
 #endif
 	if( LINES < MIN_LINES || COLS < MIN_COLS ) {
 		clear(); refresh(); endwin();
-		fprintf(stderr, "Your terminal size is %dx%d\n", COLS, LINES);
-		fprintf(stderr, "Terminal is too small. Minium terminal size "
+		fprintf(stderr, _("Your terminal size is %dx%d\n"), COLS, LINES);
+		fprintf(stderr, _("Terminal is too small. Minium terminal size "
 				"for abook is "
-				"%dx%d\n", MIN_COLS, MIN_LINES);
+				"%dx%d\n"), MIN_COLS, MIN_LINES);
 		return 1;
 	}
 
-#ifdef SIGWINCH
-	signal(SIGWINCH, win_changed);
-#endif
-
 	init_list();
 	init_windows();
 
 	ui_initialized = TRUE;
 
+#ifdef SIGWINCH
+	signal(SIGWINCH, win_changed);
+#endif
+
 	return 0;
 }
 
@@ -181,7 +175,7 @@ close_ui()
 
 
 void
-headerline(char *str)
+headerline(const char *str)
 {
 	werase(top);
 
@@ -198,7 +192,7 @@ void
 refresh_screen()
 {
 #ifdef SIGWINCH
-	if( should_resize ) {
+	if(should_resize) {
 		resize_abook();
 		return;
 	}
@@ -206,7 +200,7 @@ refresh_screen()
 	clear();
 
 	refresh_statusline();
-	headerline(MAIN_HELPLINE);
+	headerline(gettext(MAIN_HELPLINE));
 	list_headerline();
 
 	refresh_list();
@@ -214,10 +208,10 @@ refresh_screen()
 
 
 int
-statusline_msg(char *msg)
+statusline_msg(const char *msg)
 {
 	int c;
-	
+
 	clear_statusline();
 	statusline_addstr(msg);
 	c = getch();
@@ -230,60 +224,29 @@ statusline_msg(char *msg)
 }
 
 void
-statusline_addstr(char *str)
+statusline_addstr(const char *str)
 {
 	mvwaddstr(bottom, 1, 0, str);
 	refresh();
 	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);
-
-	if(n < 0)
-		return buf;
+	mvwaddstr(bottom, 1, 0, prompt);
 
-	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
@@ -296,11 +259,13 @@ statusline_ask_boolean(char *msg, int def)
 
 	free(msg2);
 
-	switch( tolower(getch()) ) {
+	switch(tolower(getch())) {
 		case 'n':
+		case 'N':
 			ret = FALSE;
 			break;
 		case 'y':
+		case 'Y':
 			ret = TRUE;
 			break;
 		default:
@@ -313,31 +278,25 @@ statusline_ask_boolean(char *msg, int def)
 	return ret;
 }
 
-
 void
 refresh_statusline()
 {
 	werase(bottom);
 
 	mvwhline(bottom, 0, 0, UI_HLINE_CHAR, COLS);
-	mvwhline(bottom, 2, 0, UI_HLINE_CHAR, COLS);
 
 	refresh();
 	wrefresh(bottom);
 }
 
-
 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;
 }
@@ -376,16 +335,16 @@ display_help(int help)
 
 	helpw = newwin(LINES - 5, COLS - 6, 2, 3);
 	erase();
-	headerline("help");
+	headerline(_("help"));
 
-	for( i = 0; tbl[i] != NULL; i++) {
-		waddstr(helpw, tbl[i]);
-		if( ( !( (i+1) % (LINES-8) ) ) ||
-			(tbl[i+1] == NULL) ) {
+	for(i = 0; tbl[i] != NULL; i++) {
+		waddstr(helpw, gettext(tbl[i]));
+		if( (!((i + 1) % (LINES - 8))) ||
+			(tbl[i + 1] == NULL) ) {
 			refresh();
 			wrefresh(helpw);
 			refresh_statusline();
-			if(statusline_msg("Press any key to continue...")
+			if(statusline_msg(_("Press any key to continue..."))
 					== 'q')
 				break;
 			wclear(helpw);
@@ -410,15 +369,18 @@ get_commands()
 
 	for(;;) {
 		can_resize = TRUE; /* it's safe to resize now */
-		hide_cursor();
-		if( should_resize )
+		if(!opt_get_bool(BOOL_SHOW_CURSOR))
+			hide_cursor();
+		if(should_resize)
 			refresh_screen();
 		ch = getch();
-		show_cursor();
+		if(!opt_get_bool(BOOL_SHOW_CURSOR))
+			show_cursor();
 		can_resize = FALSE; /* it's not safe to resize anymore */
-		switch( ch ) {
+		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 +392,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 +418,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;
@@ -495,24 +459,23 @@ get_commands()
 	}
 }
 
-
 void
 ui_remove_items()
 {
 	if(list_is_empty())
 		return;
 
-	if(statusline_ask_boolean("Remove selected item(s)", TRUE))
+	if(statusline_ask_boolean(_("Remove selected item(s)"), TRUE))
 		remove_selected_items();
 
-	clear_statusline();	
+	clear_statusline();
 	refresh_list();
 }
 
 void
 ui_clear_database()
 {
-	if(statusline_ask_boolean("Clear WHOLE database", FALSE)) {
+	if(statusline_ask_boolean(_("Clear WHOLE database"), FALSE)) {
 		close_database();
 		refresh_list();
 	}
@@ -521,26 +484,30 @@ ui_clear_database()
 void
 ui_find(int next)
 {
-	int item;
+	int item = -1;
 	static char findstr[MAX_FIELD_LEN];
 	int search_fields[] = {NAME, EMAIL, NICK, -1};
 
+	clear_statusline();
+
 	if(next) {
-		if( !*findstr )
+		if(!*findstr)
 			return;
 	} else {
-		clear_statusline();
-		statusline_addstr("/");
-		statusline_getnstr(findstr, MAX_FIELD_LEN - 1, 0);
-		clear_statusline();
+		char *s;
+		s = ui_readline("/", findstr, MAX_FIELD_LEN - 1, 0);
+		strncpy(findstr, s, MAX_FIELD_LEN);
+		refresh_screen();
 	}
 
-	if( (item = find_item(findstr, curitem + !!next,
-					search_fields )) >= 0 ) {
+	if( (item = find_item(findstr, curitem + !!next, search_fields)) < 0 &&
+			(item = find_item(findstr, 0, search_fields)) >= 0)
+		statusline_addstr(_("Search hit bottom, continuing at top"));
+
+	if(item >= 0) {
 		curitem = item;
 		refresh_list();
 	}
-
 }
 
 
@@ -558,8 +525,8 @@ void
 ui_read_database()
 {
 	if(items > 0)
-		if(!statusline_ask_boolean("Your current data will be lost - "
-				"Press 'y' to continue", FALSE))
+		if(!statusline_ask_boolean(_("Your current data will be lost - "
+				"Press 'y' to continue"), FALSE))
 			return;
 
 	load_database(datafile);
@@ -571,21 +538,21 @@ 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() )
+	if(list_is_empty())
 		return;
 
-	statusline_addstr("Print All/Selected/Cancel (a/s/C)?");
+	statusline_addstr(_("Print All/Selected/Cancel (a/s/C)?"));
 
-	switch( tolower(getch()) ) {
+	switch(tolower(getch())) {
 		case 'a':
 			mode = ENUM_ALL;
 			break;
 		case 's':
 			if( !selected_items() ) {
-				statusline_msg("No selected items");
+				statusline_msg(_("No selected items"));
 				return;
 			}
 			mode = ENUM_SELECTED;
@@ -601,7 +568,7 @@ ui_print_database()
 		return;
 
 	fexport("text", handle, mode);
-	
+
 	pclose(handle);
 }
 
@@ -611,28 +578,29 @@ 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))
+	else if(statusline_ask_boolean(_("Save current database"), FALSE))
 		save_database();
 
 	close_database();
 
 	load_database(filename);
 
-	if( items == 0 ) {
-		statusline_msg("Sorry, that specified file appears not to be a valid abook addressbook");
+	if(items == 0) {
+		statusline_msg(_("Sorry, that specified file appears not to be a valid abook addressbook"));
 		load_database(datafile);
 	} else {
 		free(datafile);
-		datafile = strdup(filename);
+		datafile = xstrdup(filename);
 	}
 
 	refresh_screen();