#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
*/
WINDOW *top = NULL, *bottom = NULL;
-
static void
init_windows()
{
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);
-
- buf = wenter_string(bottom, n,
- (use_filesel ? ESTR_USE_FILESEL:0) | ESTR_DONT_WRAP);
+ mvwaddstr(bottom, 1, 0, prompt);
- 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
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;
}
if( !*findstr )
return;
} else {
+ char *s;
clear_statusline();
- statusline_addstr("/");
- statusline_getnstr(findstr, MAX_FIELD_LEN - 1, 0);
- 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,
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() )
{
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();