X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=ui.h;h=ebffcd8d9112f0c3fdfa696cc664889bb5dc11b7;hb=4909ba20244f55ee7326a40d751cf6737c2bc2b6;hp=da7cdfa05f0db211dbbec6e413a4189e0dfa6969;hpb=548845673bdbe52a3cb2d7c6c2818d3202fffcba;p=pkg%2Fabook.git

diff --git a/ui.h b/ui.h
index da7cdfa..ebffcd8 100644
--- a/ui.h
+++ b/ui.h
@@ -12,15 +12,16 @@ int		is_ui_initialized();
 void		ui_init_curses();
 int		init_ui();
 void		close_ui();
-void		headerline(char *str);
+void		headerline(const char *str);
 void            refresh_screen();
-int		statusline_msg(char *msg);
+int		statusline_msg(const char *msg);
+int 		statusline_askchoice(const char *msg, const char *choices, short dflt);
 char		*ask_filename(char *prompt);
 int		statusline_ask_boolean(char *msg, int def);
 void            clear_statusline();
 void		display_help(int help);
-void		statusline_addstr(char *str);
-char *		ui_readline(char *prompt, char *s, int limit, int use_completion);
+void		statusline_addstr(const char *str);
+char *		ui_readline(char *prompt, char *s, size_t limit, bool use_completion);
 void		refresh_statusline();
 void		get_commands();
 void		ui_remove_items();
@@ -33,9 +34,25 @@ void		ui_print_database();
 void		ui_open_datafile();
 
 
-#include "options.h" /* needed for options_get_int */
+#include "options.h" /* needed for options_get_bool */
 
-#define UI_HLINE_CHAR		options_get_int("use_ascii_only") ? \
+#define UI_HLINE_CHAR		opt_get_bool(BOOL_USE_ASCII_ONLY) ? \
 					'-' : ACS_HLINE
+#define UI_VLINE_CHAR		opt_get_bool(BOOL_USE_ASCII_ONLY) ? \
+					'|' : ACS_VLINE
+#define UI_TEE_CHAR		opt_get_bool(BOOL_USE_ASCII_ONLY) ? \
+					'-' : ACS_BTEE
+#define UI_LBOXLINE_CHAR	opt_get_bool(BOOL_USE_ASCII_ONLY) ? \
+					'/' : ACS_HLINE
+#define UI_RBOXLINE_CHAR	opt_get_bool(BOOL_USE_ASCII_ONLY) ? \
+					'\\' : ACS_HLINE
+#define UI_ULCORNER_CHAR	opt_get_bool(BOOL_USE_ASCII_ONLY) ? \
+					' ' : ACS_ULCORNER
+#define UI_URCORNER_CHAR	opt_get_bool(BOOL_USE_ASCII_ONLY) ? \
+					' ' : ACS_URCORNER
+#define UI_LLCORNER_CHAR	opt_get_bool(BOOL_USE_ASCII_ONLY) ? \
+					'+' : ACS_LLCORNER
+#define UI_LRCORNER_CHAR	opt_get_bool(BOOL_USE_ASCII_ONLY) ? \
+					'+' : ACS_LRCORNER
 
 #endif