X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-ui%2Fcurses.h;h=e0612fef2709c2e842eeda568c7d45d25ee345ff;hp=0e7b670acd51476661878f4d1d6eb4cecc2f759b;hb=892df7e70376da43374d834b8a825ea2d59efd06;hpb=c8b8b9539aaf11b48c4c1e5baba434db09722111

diff --git a/lib-ui/curses.h b/lib-ui/curses.h
index 0e7b670..e0612fe 100644
--- 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 *);
@@ -183,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 *);
@@ -208,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 */