X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-ui%2Fcurses.h;h=cab58afe76c2b634d969f3aeb241e585796d1855;hp=9f7f272f34d94aedc1b6d0516e837984304cd954;hb=6920eb5798f2d9f25e5ea1af2ba86122cf408bd1;hpb=5dcac54e5db074dc4572f843666c7f7acaf2d109

diff --git a/lib-ui/curses.h b/lib-ui/curses.h
index 9f7f272..cab58af 100644
--- a/lib-ui/curses.h
+++ b/lib-ui/curses.h
@@ -19,15 +19,14 @@
 #undef lines
 #endif /* lines */
 
-#define CLEARLINE_WIN(x) wmove(stdscr, x,(option(OPTMBOXPANE)?SidebarWidth:0)), wclrtoeol(stdscr)
-#define CLEARLINE(x) wmove(stdscr, x,0), wclrtoeol(stdscr)
-#define CENTERLINE(x,y) wmove(stdscr, y, (COLS-strlen(x))/2), waddstr(stdscr, x)
+#define CLEARLINE(W, x) wmove(W, x,0), wclrtoeol(W)
 #define BEEP() do { if (mod_core.beep) beep(); } while (0)
 
-#define BKGDSET(x)  wbkgdset(stdscr, ColorDefs[x] | ' ')
+#define BKGDSET(W, x)   wbkgdset(W, ColorDefs[x] | ' ')
+#define SETCOLOR(W, X)  wattrset(W, ColorDefs[X])
+#define ADDCOLOR(W, X)  wattron(W, ColorDefs[X])
 
 void mutt_curs_set (int);
-#define PAGELEN (LINES-3)
 
 #define ctrl(c) ((c)-'@')
 
@@ -38,6 +37,7 @@ void mutt_curs_set (int);
 #endif
 
 event_t mutt_getch (void);
+#define waddwch(win, w)  waddnwstr(win, &(w), 1)
 
 void curses_initialize(void);
 void curses_install(void);
@@ -74,6 +74,17 @@ enum {
   MT_COLOR_MAX
 };
 
+/* flags for mutt_get_field() */
+#define  M_ALIAS       (1<<0)  /* do alias "completion" by calling up the alias-menu */
+#define  M_FILE        (1<<1)  /* do file completion */
+#define  M_EFILE       (1<<2)  /* do file completion, plus incoming folders */
+#define  M_CMD         (1<<3)  /* do completion on previous word */
+#define  M_PASS        (1<<4)  /* password mode (no echo) */
+#define  M_CLEAR       (1<<5)  /* clear input if printable character is pressed */
+#define  M_COMMAND     (1<<6)  /* do command completion */
+#define  M_PATTERN     (1<<7)  /* pattern mode - only used for history classes */
+#define  M_LASTFOLDER  (1<<8)  /* last-folder mode - hack hack hack */
+
 typedef struct color_line {
   regex_t rx;
   char *pattern;
@@ -104,18 +115,15 @@ void mutt_format_string (char *, ssize_t, int, int, int, char, const char *,
 void mutt_format_s (char *, ssize_t, const char *, const char *);
 void mutt_format_s_tree (char *, ssize_t, const char *, const char *);
 void mutt_free_color (int fg, int bg);
-void mutt_paddstr (int, const char *);
-#define mutt_perror(a) _mutt_perror (a, __FILE__, __LINE__)
-void _mutt_perror (const char*, const char*,int);
+void mutt_paddstr(WINDOW *, int, const char *);
+#define mutt_perror(s)  \
+  mutt_error("%s: %m (errno = %d) from %s:%i", s, errno, __FILE__, __LINE__)
 void mutt_query_exit (void);
 void mutt_query_menu (char *, ssize_t);
 void mutt_show_error (void);
 ssize_t mutt_pretty_size(char *s, ssize_t len, ssize_t n);
 
-int mutt_addwch (wchar_t);
-int mutt_alloc_color (int fg, int bg);
 int mutt_any_key_to_continue (const char *);
-void mutt_what_key (void);
 int mutt_complete (char *, ssize_t);
 #define mutt_enter_fname(A,B,C,D,E) _mutt_enter_fname(A,B,C,D,E,0,NULL,NULL)
 int _mutt_enter_fname (const char *, char *, ssize_t, int *, int, int,
@@ -130,8 +138,6 @@ int mutt_is_subscribed_list (address_t *);
 int mutt_multi_choice (const char *prompt, const char *letters);
 int mutt_parse_color (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 int mutt_parse_uncolor (BUFFER *, BUFFER *, unsigned long, BUFFER *);
-int mutt_parse_mono (BUFFER *, BUFFER *, unsigned long, BUFFER *);
-int mutt_parse_unmono (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 int mutt_query_complete (char *, ssize_t);
 int mutt_user_is_recipient (HEADER *);
 int mutt_yesorno (const char *, int);
@@ -150,13 +156,6 @@ void ci_start_color (void);
 void _mutt_make_string (char *, ssize_t, const char *, CONTEXT *,
                         HEADER *, format_flag);
 
-
-#define WSETCOLOR(w, X) wattrset(w, ColorDefs[X])
-#define SETCOLOR(X) wattrset(stdscr, ColorDefs[X])
-#define ADDCOLOR(X) wattron(stdscr, ColorDefs[X])
-
 #define MAYBE_REDRAW(x) if (option (OPTNEEDREDRAW)) { unset_option (OPTNEEDREDRAW); x = REDRAW_FULL; }
 
-#define SW              (option(OPTMBOXPANE)?SidebarWidth:0)
-
 #endif /* !_MUTT_CURSES_H */