WINDOW *top = NULL, *bottom = NULL;
-
static void
init_windows()
{
}
char *
-ui_readline(char *prompt, char *s, int limit, int use_completion)
+ui_readline(char *prompt, char *s, int limit, bool use_completion)
{
int y, x;
+ char *ret;
mvwaddstr(bottom, 1, 0, prompt);
- //mvwaddstr(stdscr, LINES - 1, 0, prompt);
- /*
- * FIXME: stdscr shoulnd't be used ???
- */
-// getyx(stdscr, y, x);
getyx(bottom, y, x);
- return abook_readline(bottom, y, x, s, limit, use_completion);
+ ret = abook_readline(bottom, y, x, s, limit, use_completion);
+
+ if(ret)
+ strtrim(ret);
+
+ return ret;
}
int
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': print_stderr(selected_items() ?
+ case 'Q': quit_abook(QUIT_DONTSAVE); break;
+ case 'P': print_stderr(selected_items() ?
-1 : list_current_item());
return;
case '?':
case KEY_DC:
case 'd':
case 'r': ui_remove_items(); break;
+ case 'D': duplicate_item(); break;
case 12: refresh_screen(); break;
case 'k':
case 'o': ui_open_datafile(); break;
- case 's': sort_database(); break;
+ case 's': sort_by_field(NAME); break;
case 'S': sort_surname(); break;
+ case 'F': sort_by_field(-1); break;
case '/': ui_find(0); break;
case '\\': ui_find(1); break;
void
ui_find(int next)
{
- int item;
+ int item = -1;
static char findstr[MAX_FIELD_LEN];
int search_fields[] = {NAME, EMAIL, NICK, -1};
+ clear_statusline();
+
if(next) {
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, 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;
refresh_list();
}
-
}
ui_print_database()
{
FILE *handle;
- char *command = options_get_str("print_command");
+ char *command = opt_get_str(STR_PRINT_COMMAND);
int mode;
if( list_is_empty() )
return;
}
- if( options_get_int("autosave") )
+ if( opt_get_bool(BOOL_AUTOSAVE) )
save_database();
else if(statusline_ask_boolean("Save current database", FALSE))
save_database();