Simplications go on.

[apps/madmutt.git] / mutt_curses.h

diff --git a/mutt_curses.h b/mutt_curses.h
index 2c3a314..3bd9f96 100644 (file)
--- a/mutt_curses.h
+++ b/mutt_curses.h
@@ -7,6 +7,8 @@
  * It's licensed under the GNU General Public License,
  * please see the file GPL in the top level source directory.
  */
+#ifndef _MUTT_CURSES_H
+#define _MUTT_CURSES_H
 
 #ifdef USE_SLANG_CURSES
 
@@ -30,13 +32,17 @@
 
 #ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/ncurses.h>
-#elif HAVE_NCURSES_NCURSES_H
+#else
+#ifdef HAVE_NCURSES_NCURSES_H
 #include <ncurses/ncurses.h>
-#elif HAVE_NCURSES_H
+#else
+#ifdef HAVE_NCURSES_H
 #include <ncurses.h>
 #else
 #include <curses.h>
 #endif
+#endif
+#endif
 
 #define M_ENTER_C '\n'
 #define M_ENTER_S "\n"
@@ -50,7 +56,7 @@
 #undef lines
 #endif /* lines */
 
-#define CLEARLINE_WIN(x) move(x,SidebarWidth), clrtoeol()
+#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)
@@ -129,6 +135,15 @@ typedef struct color_line {
   struct color_line *next;
 } COLOR_LINE;
 
+typedef struct {
+  const char* msg;
+  long pos;
+  long size;
+  char sizestr[SHORT_STRING];
+} progress_t;
+
+void mutt_progress_bar (progress_t* progress, long pos);
+
 extern int *ColorQuote;
 extern int ColorQuoteUsed;
 extern int ColorDefs[];
@@ -167,3 +182,5 @@ extern int wclear ();
 extern int waddstr ();
 extern int wclrtoeol ();
 #endif
+
+#endif /* !_MUTT_CURSES_H */