Merge remote-tracking branch 'upstream/master' into upstream

[pkg/abook.git] / ui.h

diff --git a/ui.h b/ui.h
index e811431e0701acdf6b7b13b261fd0cd1f1352966..b94bffea4189973e3e5229fb6d8a51fe02c3c975 100644 (file)
--- a/ui.h
+++ b/ui.h
@@ -10,6 +10,8 @@ enum {
 
 int            is_ui_initialized();
 void           ui_init_curses();
+void           ui_init_color_pairs_user();
+void           ui_enable_mouse(bool enabled);
 int            init_ui();
 void           close_ui();
 void           headerline(const char *str);
@@ -27,6 +29,8 @@ char *                ui_readline(const char *prompt, char *s, size_t limit,
 void           refresh_statusline();
 void           get_commands();
 void           ui_remove_items();
+void           ui_merge_items();
+void           ui_remove_duplicates();
 void           ui_clear_database();
 void           ui_find(int next);
 void           ui_print_number_of_items();
@@ -35,11 +39,16 @@ char                *get_surname(char *s);
 void           ui_print_database();
 void           ui_open_datafile();
 
+#if NCURSES_MOUSE_VERSION != 2
+#define BUTTON5_PRESSED (0x80 | 0x8000000)
+#endif
 
 #include "options.h" /* needed for options_get_bool */
 
 #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) ? \