some int -> bool changes

[pkg/abook.git] / ui.c

diff --git a/ui.c b/ui.c
index d27fa7360f6af4a0487c8cdde7722e5279d62701..cd168621e17ea94bdae05312d7994cfb52c61627 100644 (file)
--- a/ui.c
+++ b/ui.c
@@ -44,14 +44,16 @@
 extern int items, curitem;
 extern char *datafile;
 
+extern int alternative_datafile;
+
 /*
  * internal variables
  */
 
-int ui_initialized = FALSE;
+bool ui_initialized = FALSE;
 
-int should_resize = FALSE;
-int can_resize = FALSE;
+bool should_resize = FALSE;
+bool can_resize = FALSE;
 
 WINDOW *top = NULL, *bottom = NULL;
 
@@ -61,7 +63,7 @@ static void
 init_windows()
 {
        top = newwin(LIST_TOP - 1, COLS, 0, 0);
-       
+
        bottom = newwin(LINES - LIST_BOTTOM, COLS, LIST_BOTTOM, 0);
 }
 
@@ -182,15 +184,15 @@ void
 headerline(char *str)
 {
        werase(top);
-       
+
        mvwhline(top, 1, 0, UI_HLINE_CHAR, COLS);
-       
+
        mvwprintw(top, 0, 0, "%s | %s", PACKAGE " " VERSION, str);
 
        refresh();
        wrefresh(top);
 }
-               
+
 
 void
 refresh_screen()
@@ -202,7 +204,7 @@ refresh_screen()
        }
 #endif
        clear();
-       
+
        refresh_statusline();
        headerline(MAIN_HELPLINE);
        list_headerline();
@@ -211,16 +213,20 @@ refresh_screen()
 }
 
 
-void
+int
 statusline_msg(char *msg)
 {
+       int c;
+       
        clear_statusline();
        statusline_addstr(msg);
-       getch();
+       c = getch();
 #ifdef DEBUG
        fprintf(stderr, "statusline_msg(\"%s\")\n", msg);
 #endif
        clear_statusline();
+
+       return c;
 }
 
 void
@@ -237,7 +243,7 @@ statusline_addstr(char *str)
  * parameters:
  *  (char *str)
  *   if n >= 0 str is a pointer which points a place where to store
- *   the string, else str is ingnored
+ *   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.
@@ -261,13 +267,13 @@ statusline_getnstr(char *str, int n, int use_filesel)
 
        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;
-       
+
        if(buf == NULL)
                str[0] = 0;
        else
@@ -285,7 +291,7 @@ statusline_ask_boolean(char *msg, int def)
 {
        int ret;
        char *msg2 = strconcat(msg,  def ? " (Y/n)?" : " (y/N)?", NULL);
-                       
+
        statusline_addstr(msg2);
 
        free(msg2);
@@ -319,7 +325,7 @@ refresh_statusline()
        refresh();
        wrefresh(bottom);
 }
-       
+
 
 char *
 ask_filename(char *prompt, int flags)
@@ -327,7 +333,7 @@ ask_filename(char *prompt, int flags)
        char *buf = NULL;
 
        clear_statusline();
-       
+
        statusline_addstr(prompt);
        buf = statusline_getnstr(NULL, -1, flags);
 
@@ -371,7 +377,7 @@ display_help(int help)
        helpw = newwin(LINES - 5, COLS - 6, 2, 3);
        erase();
        headerline("help");
-       
+
        for( i = 0; tbl[i] != NULL; i++) {
                waddstr(helpw, tbl[i]);
                if( ( !( (i+1) % (LINES-8) ) ) ||
@@ -379,7 +385,9 @@ display_help(int help)
                        refresh();
                        wrefresh(helpw);
                        refresh_statusline();
-                       statusline_msg("Press any key to continue...");
+                       if(statusline_msg("Press any key to continue...")
+                                       == 'q')
+                               break;
                        wclear(helpw);
                }
        }
@@ -392,7 +400,7 @@ display_help(int help)
  * end of help
  */
 
-char *selected;
+extern char *selected;
 extern int curitem;
 
 void
@@ -410,6 +418,9 @@ get_commands()
                can_resize = FALSE; /* it's not safe to resize anymore */
                switch( ch ) {
                        case 'q': return;
+                       case 'Q': print_stderr(selected_items() ?
+                                                 -1 : list_current_item());
+                                 return;
                        case '?':
                                  display_help(HELP_MAIN);
                                  refresh_screen();
@@ -430,9 +441,9 @@ get_commands()
                        case 'J':
                        case KEY_NPAGE: page_down();    break;
 
-                       case 'H':
+                       case 'g':
                        case KEY_HOME: goto_home();     break;
-                       case 'E':
+                       case 'G':
                        case KEY_END: goto_end();       break;
 
                        case 'w': save_database();
@@ -626,4 +637,6 @@ ui_open_datafile()
 
        refresh_screen();
        free(filename);
+
+       alternative_datafile = TRUE;
 }