X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=ui.c;h=4f162e179149d68595a518c823e7e2e43de244f1;hb=47ca9ac04785f2d48d28886cbc4e2802b19dd9cf;hp=8db6b79e1c666c2d02b781f383461ff6bcc88e1a;hpb=ef379a20d142cb95ba08c7887c8e3245269b3fdd;p=pkg%2Fabook.git

diff --git a/ui.c b/ui.c
index 8db6b79..4f162e1 100644
--- a/ui.c
+++ b/ui.c
@@ -22,15 +22,12 @@
 #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>
@@ -45,25 +42,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 +78,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 +108,7 @@ resize_abook()
 static void
 win_changed(int i)
 {
-	if( can_resize )
+	if(can_resize)
 		resize_abook();
 	else
 		should_resize = TRUE;
@@ -155,15 +151,15 @@ init_ui()
 		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;
 }
 
@@ -198,7 +194,7 @@ void
 refresh_screen()
 {
 #ifdef SIGWINCH
-	if( should_resize ) {
+	if(should_resize) {
 		resize_abook();
 		return;
 	}
@@ -265,11 +261,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:
@@ -282,7 +280,6 @@ statusline_ask_boolean(char *msg, int def)
 	return ret;
 }
 
-
 void
 refresh_statusline()
 {
@@ -294,7 +291,6 @@ refresh_statusline()
 	wrefresh(bottom);
 }
 
-
 char *
 ask_filename(char *prompt)
 {
@@ -343,10 +339,10 @@ display_help(int help)
 	erase();
 	headerline("help");
 
-	for( i = 0; tbl[i] != NULL; i++) {
+	for(i = 0; tbl[i] != NULL; i++) {
 		waddstr(helpw, tbl[i]);
-		if( ( !( (i+1) % (LINES-8) ) ) ||
-			(tbl[i+1] == NULL) ) {
+		if( (!((i + 1) % (LINES - 8))) ||
+			(tbl[i + 1] == NULL) ) {
 			refresh();
 			wrefresh(helpw);
 			refresh_statusline();
@@ -465,7 +461,6 @@ get_commands()
 	}
 }
 
-
 void
 ui_remove_items()
 {
@@ -498,7 +493,7 @@ ui_find(int next)
 	clear_statusline();
 
 	if(next) {
-		if( !*findstr )
+		if(!*findstr)
 			return;
 	} else {
 		char *s;
@@ -548,12 +543,12 @@ 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)?");
 
-	switch( tolower(getch()) ) {
+	switch(tolower(getch())) {
 		case 'a':
 			mode = ENUM_ALL;
 			break;
@@ -587,13 +582,13 @@ ui_open_datafile()
 
 	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))
 		save_database();
@@ -602,12 +597,12 @@ ui_open_datafile()
 
 	load_database(filename);
 
-	if( items == 0 ) {
+	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();