X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;ds=sidebyside;f=ui.c;h=3098b553435a4dd7ab1e14001b763a152080d1fb;hb=a4028acb18fd04cbf03ddbd976115aeb04ddd867;hp=aa49d48d5e23b6f92d002a91dc7ee267315dd09e;hpb=d041671666ce466d37068a937cab7245a5952687;p=pkg%2Fabook.git

diff --git a/ui.c b/ui.c
index aa49d48..3098b55 100644
--- a/ui.c
+++ b/ui.c
@@ -45,7 +45,7 @@
 extern int items, curitem;
 extern char *datafile;
 
-extern int alternative_datafile;
+extern bool alternative_datafile;
 
 /*
  * internal variables
@@ -82,13 +82,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);
@@ -115,7 +115,7 @@ win_changed(int i)
 	if( can_resize )
 		resize_abook();
 	else
-		should_resize = TRUE;	
+		should_resize = TRUE;
 }
 #endif /* SIGWINCH */
 
@@ -217,7 +217,7 @@ int
 statusline_msg(char *msg)
 {
 	int c;
-	
+
 	clear_statusline();
 	statusline_addstr(msg);
 	c = getch();
@@ -265,11 +265,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:
@@ -343,7 +345,7 @@ 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) ) {
@@ -375,13 +377,15 @@ 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': quit_abook(QUIT_DONTSAVE);	break;
 			case 'P': print_stderr(selected_items() ?
@@ -473,7 +477,7 @@ ui_remove_items()
 	if(statusline_ask_boolean("Remove selected item(s)", TRUE))
 		remove_selected_items();
 
-	clear_statusline();	
+	clear_statusline();
 	refresh_list();
 }
 
@@ -496,20 +500,18 @@ ui_find(int next)
 	clear_statusline();
 
 	if(next) {
-		if( !*findstr )
+		if(!*findstr)
 			return;
 	} else {
 		char *s;
-		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, search_fields)) < 0)
-		if((item = find_item(findstr, 0, search_fields)) >= 0)
-			statusline_addstr(
-				"Search hit bottom, continuing at top");
+	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;
@@ -548,12 +550,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;
@@ -575,7 +577,7 @@ ui_print_database()
 		return;
 
 	fexport("text", handle, mode);
-	
+
 	pclose(handle);
 }
 
@@ -587,13 +589,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,7 +604,7 @@ 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 {