X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=ui.c;h=901322b50712c6f4295d71e11336d1713845c096;hb=0b958afb787e4e151916721292d20c80d77aa5fe;hp=8db6b79e1c666c2d02b781f383461ff6bcc88e1a;hpb=ef379a20d142cb95ba08c7887c8e3245269b3fdd;p=pkg%2Fabook.git

diff --git a/ui.c b/ui.c
index 8db6b79..901322b 100644
--- a/ui.c
+++ b/ui.c
@@ -18,20 +18,15 @@
 #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 "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
@@ -45,25 +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;
+static bool should_resize = FALSE;
+static bool can_resize = FALSE;
 
-WINDOW *top = NULL, *bottom = NULL;
+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,7 +76,7 @@ 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);
@@ -112,7 +106,7 @@ resize_abook()
 static void
 win_changed(int i)
 {
-	if( can_resize )
+	if(can_resize)
 		resize_abook();
 	else
 		should_resize = TRUE;
@@ -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,7 +208,7 @@ refresh_screen()
 
 
 int
-statusline_msg(char *msg)
+statusline_msg(const char *msg)
 {
 	int c;
 
@@ -230,7 +224,7 @@ statusline_msg(char *msg)
 }
 
 void
-statusline_addstr(char *str)
+statusline_addstr(const char *str)
 {
 	mvwaddstr(bottom, 1, 0, str);
 	refresh();
@@ -238,7 +232,7 @@ statusline_addstr(char *str)
 }
 
 char *
-ui_readline(char *prompt, char *s, int limit, bool use_completion)
+ui_readline(char *prompt, char *s, size_t limit, bool use_completion)
 {
 	int y, x;
 	char *ret;
@@ -247,10 +241,13 @@ ui_readline(char *prompt, char *s, int limit, bool use_completion)
 
 	getyx(bottom, y, x);
 
-	ret = abook_readline(bottom, y, x, s, limit, use_completion);
+	ret = abook_readline(bottom, y, x, s, use_completion);
 
-	if(ret)
+	if(ret) {
 		strtrim(ret);
+		if(strlen(ret) > limit && limit > 0)
+			ret[limit] = '\0';
+	}
 
 	return ret;
 }
@@ -259,30 +256,27 @@ int
 statusline_ask_boolean(char *msg, int def)
 {
 	int ret;
-	char *msg2 = strconcat(msg,  def ? " (Y/n)?" : " (y/N)?", NULL);
+	char *msg2 = strconcat(msg,  def ? _(" (Y/n)?") : _(" (y/N)?"), NULL);
+	char ch;
 
 	statusline_addstr(msg2);
 
 	free(msg2);
 
-	switch( tolower(getch()) ) {
-		case 'n':
-			ret = FALSE;
-			break;
-		case 'y':
-			ret = TRUE;
-			break;
-		default:
-			ret = def;
-			break;
-	}
+	ch = tolower(getch());
+
+	if(ch == *(S_("keybinding for no|n")))
+		ret = FALSE;
+	else if(ch == *(S_("keybinding for yes|y")))
+		ret = TRUE;
+	else
+		ret = def;
 
 	clear_statusline();
 
 	return ret;
 }
 
-
 void
 refresh_statusline()
 {
@@ -294,7 +288,6 @@ refresh_statusline()
 	wrefresh(bottom);
 }
 
-
 char *
 ask_filename(char *prompt)
 {
@@ -341,16 +334,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);
@@ -458,21 +451,20 @@ get_commands()
 
 			case 'p': ui_print_database(); break;
 
-			case 'u': launch_wwwbrowser(list_current_item());
+			case 'v': launch_wwwbrowser(list_current_item());
 				  refresh_screen();
 				  break;
 		}
 	}
 }
 
-
 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();
@@ -482,7 +474,7 @@ ui_remove_items()
 void
 ui_clear_database()
 {
-	if(statusline_ask_boolean("Clear WHOLE database", FALSE)) {
+	if(statusline_ask_boolean(_("Clear WHOLE database"), FALSE)) {
 		close_database();
 		refresh_list();
 	}
@@ -498,18 +490,19 @@ ui_find(int next)
 	clear_statusline();
 
 	if(next) {
-		if( !*findstr )
+		if(!*findstr)
 			return;
 	} else {
 		char *s;
 		s = ui_readline("/", findstr, MAX_FIELD_LEN - 1, 0);
 		strncpy(findstr, s, MAX_FIELD_LEN);
+		free(s);
 		refresh_screen();
 	}
 
 	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");
+		statusline_addstr(_("Search hit bottom, continuing at top"));
 
 	if(item >= 0) {
 		curitem = item;
@@ -532,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);
@@ -548,18 +541,18 @@ ui_print_database()
 	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;
@@ -585,29 +578,29 @@ ui_open_datafile()
 {
 	char *filename;
 
-	filename = ask_filename("File to open: ");
+	filename = ask_filename(_("File to open: "));
 
-	if( !filename || ! *filename) {
+	if(!filename || ! *filename) {
 		free(filename);
 		refresh_screen();
 		return;
 	}
 
-	if( opt_get_bool(BOOL_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, the specified file appears not to be a valid abook addressbook"));
 		load_database(datafile);
 	} else {
 		free(datafile);
-		datafile = strdup(filename);
+		datafile = xstrdup(filename);
 	}
 
 	refresh_screen();