X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=ui.h;h=7e1b8a8cda6008d8882236bc2d2ad0e447f346a6;hb=38ff22ec1490994fa63f4d38a6b9e90b55909511;hp=fa20dd207744934de5d6f503db7d667a15d94eb0;hpb=3212da92838c056bcc1cafa57beaf26086e2ac96;p=pkg%2Fabook.git

diff --git a/ui.h b/ui.h
index fa20dd2..7e1b8a8 100644
--- a/ui.h
+++ b/ui.h
@@ -7,19 +7,21 @@ enum {
 	HELP_MAIN,
 	HELP_EDITOR
 };
-	
 
 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();
-void            statusline_msg(char *msg);
-char		*ask_filename(char *prompt, int flags);
+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		*statusline_getnstr(char *str, int n, int use_filesel);
+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();
@@ -32,10 +34,23 @@ void		ui_print_database();
 void		ui_open_datafile();
 
 
-#ifdef USE_ASCII_ONLY
-#	define UI_HLINE_CHAR		'-'
-#else
-#	define UI_HLINE_CHAR		ACS_HLINE
-#endif
+#include "options.h" /* needed for options_get_bool */
+
+#define UI_HLINE_CHAR		opt_get_bool(BOOL_USE_ASCII_ONLY) ? \
+					'-' : ACS_HLINE
+#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