split ml_core into MCore and MTransport modules.

[apps/madmutt.git] / lib-ui / curses.h

diff --git a/lib-ui/curses.h b/lib-ui/curses.h
index 33286c3..e0612fe 100644 (file)
--- a/lib-ui/curses.h
+++ b/lib-ui/curses.h
@@ -62,7 +62,7 @@
 #define CLEARLINE_WIN(x) move(x,(option(OPTMBOXPANE)?SidebarWidth:0)), clrtoeol()
 #define CLEARLINE(x) move(x,0), clrtoeol()
 #define CENTERLINE(x,y) move(y, (COLS-strlen(x))/2), addstr(x)
-#define BEEP() do { if (option (OPTBEEP)) beep(); } while (0)
+#define BEEP() do { if (MCore.beep) beep(); } while (0)
 
 #if ! (defined(USE_SLANG_CURSES) || defined(HAVE_CURS_SET))
 #define curs_set(x)
@@ -142,14 +142,16 @@ typedef struct {
   const char* msg;
   long pos;
   long size;
-  char sizestr[SHORT_STRING];
+  char sizestr[STRING];
 } progress_t;
 
 void mutt_progress_bar (progress_t* progress, long pos);
 void mutt_clear_error (void);
-void mutt_edit_file (const char *, const char *);
-void mutt_curses_error (const char *, ...);
-void mutt_curses_message (const char *, ...);
+void mutt_edit_file (const char *);
+void mutt_curses_error (const char *, ...)
+    __attribute__((format(printf, 1, 2)));
+void mutt_curses_message (const char *, ...)
+    __attribute__((format(printf, 1, 2)));
 void mutt_format_string (char *, ssize_t, int, int, int, char, const char *,
                          ssize_t, int);
 void mutt_format_s (char *, ssize_t, const char *, const char *);
@@ -161,6 +163,7 @@ void _mutt_perror (const char*, const char*,int);
 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);
@@ -182,7 +185,6 @@ 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_strwidth (const char *);
 int mutt_user_is_recipient (HEADER *);
 int mutt_yesorno (const char *, int);
 void mutt_set_header_color (CONTEXT *, HEADER *);
@@ -207,4 +209,6 @@ void _mutt_make_string (char *, ssize_t, const char *, CONTEXT *,
 
 #define MAYBE_REDRAW(x) if (option (OPTNEEDREDRAW)) { unset_option (OPTNEEDREDRAW); x = REDRAW_FULL; }
 
+#define SW              (option(OPTMBOXPANE)?SidebarWidth:0)
+
 #endif /* !_MUTT_CURSES_H */