#include "misc.h"
#include "options.h"
#include "filter.h"
-#include "estr.h"
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
# include <sys/ioctl.h>
#endif
+#include "abook_rl.h"
+
/*
* external variables
*/
extern int items, curitem;
extern char *datafile;
-extern int alternative_datafile;
+extern bool alternative_datafile;
/*
* internal variables
*/
-int ui_initialized = FALSE;
-
-int should_resize = FALSE;
-int can_resize = FALSE;
+static bool ui_initialized = FALSE;
-WINDOW *top = NULL, *bottom = NULL;
+static bool should_resize = FALSE;
+static bool can_resize = FALSE;
+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();
wrefresh(bottom);
}
-/*
- * function statusline_getnstr
- *
- * parameters:
- * (char *str)
- * if n >= 0 str is a pointer which points a place where to store
- * 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.
- * Value 0 is not allowed for n.
- * (int use_filesel)
- * if this value is nonzero the fileselector is enabled
- *
- * returns (char *)
- * If n < 0 a pointer to a newly allocated string is returned.
- * If n > 0 a nonzero value is returned if user has typed a valid
- * string. If not NULL value is returned. Never really use the
- * _pointer_ if n > 0.
- *
- */
-
char *
-statusline_getnstr(char *str, int n, int use_filesel)
+ui_readline(char *prompt, char *s, int limit, bool use_completion)
{
- char *buf;
int y, x;
+ char *ret;
- getyx(bottom, y, x);
- wmove(bottom, 1, x);
+ mvwaddstr(bottom, 1, 0, prompt);
- 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
- strncpy(str, buf, n);
+ getyx(bottom, y, x);
- str[n-1] = 0;
+ ret = abook_readline(bottom, y, x, s, limit, use_completion);
- free(buf);
+ if(ret)
+ strtrim(ret);
- return buf;
+ return ret;
}
int
free(msg2);
- switch( tolower(getch()) ) {
+ switch(tolower(getch())) {
case 'n':
+ case 'N':
ret = FALSE;
break;
case 'y':
+ case 'Y':
ret = TRUE;
break;
default:
werase(bottom);
mvwhline(bottom, 0, 0, UI_HLINE_CHAR, COLS);
- mvwhline(bottom, 2, 0, UI_HLINE_CHAR, COLS);
refresh();
wrefresh(bottom);
char *
-ask_filename(char *prompt, int flags)
+ask_filename(char *prompt)
{
char *buf = NULL;
clear_statusline();
- statusline_addstr(prompt);
- buf = statusline_getnstr(NULL, -1, flags);
-
- clear_statusline();
+ buf = ui_readline(prompt, NULL, -1, 1);
return buf;
}
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': 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;
if(statusline_ask_boolean("Remove selected item(s)", TRUE))
remove_selected_items();
- clear_statusline();
+ clear_statusline();
refresh_list();
}
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 )
+ if(!*findstr)
return;
} else {
- clear_statusline();
- statusline_addstr("/");
- statusline_getnstr(findstr, MAX_FIELD_LEN - 1, 0);
- clear_statusline();
+ char *s;
+ 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() )
+ 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);
}
{
char *filename;
- filename = ask_filename("File to open: ", 1);
+ filename = ask_filename("File to open: ");
- if( !filename ) {
+ if(!filename || ! *filename) {
+ free(filename);
refresh_screen();
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();
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 {