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
#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);
if( can_resize )
resize_abook();
else
- should_resize = TRUE;
+ should_resize = TRUE;
}
#endif /* SIGWINCH */
statusline_msg(char *msg)
{
int c;
-
+
clear_statusline();
statusline_addstr(msg);
c = getch();
free(msg2);
- switch( tolower(getch()) ) {
+ switch(tolower(getch())) {
case 'n':
+ case 'N':
ret = FALSE;
break;
case 'y':
+ case 'Y':
ret = TRUE;
break;
default:
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) ) {
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() ?
if(statusline_ask_boolean("Remove selected item(s)", TRUE))
remove_selected_items();
- clear_statusline();
+ clear_statusline();
refresh_list();
}
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;
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;
return;
fexport("text", handle, mode);
-
+
pclose(handle);
}
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();
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 {