refactor: mutt_window_mvaddstr()

Encapsulate a curses function to reduce dependencies.

diff --git a/mutt_curses.h b/mutt_curses.h
index 7dcbf1024ec258114bead47915a038b47e80c72f..a0556703bd1b9c1b01753a41f1e42dbda1274b96 100644 (file)
--- a/mutt_curses.h
+++ b/mutt_curses.h
@@ -47,15 +47,6 @@
 #define bool _Bool
 #endif
 
-/* The prototypes for these four functions use "(char*)",
- * whereas the ncurses versions use "(const char*)" */
-#undef mvaddnstr
-#undef mvaddstr
-
-/* We redefine the helper macros to hide the compiler warnings */
-#define mvaddnstr(y, x, str, n) mvwaddnstr(stdscr, (y), (x), ((char *) str), (n))
-#define mvaddstr(y, x, str)     mvwaddstr(stdscr, (y), (x), ((char *) str))
-
 #define KEY_DC SL_KEY_DELETE
 #define KEY_IC SL_KEY_IC
 

diff --git a/mutt_window.c b/mutt_window.c
index 51c484172c94178e428f373178a7a89d7d86c6f5..e0e4c3c20ef8240bc8f6d3b31ebd44d3757253ae 100644 (file)
--- a/mutt_window.c
+++ b/mutt_window.c
@@ -211,7 +211,11 @@ int mutt_window_move(struct MuttWindow *win, int row, int col)
  */
 int mutt_window_mvaddstr(struct MuttWindow *win, int row, int col, const char *str)
 {
+#ifdef USE_SLANG_CURSES
+  return mvaddstr(win->row_offset + row, win->col_offset + col, (char *) str);
+#else
   return mvaddstr(win->row_offset + row, win->col_offset + col, str);
+#endif
 }
 
 /**