Make the sidebar live in a proper independent window.

[apps/madmutt.git] / lib-ui / curs_lib.c

diff --git a/lib-ui/curs_lib.c b/lib-ui/curs_lib.c
index 72560b6..babbc72 100644 (file)
--- a/lib-ui/curs_lib.c
+++ b/lib-ui/curs_lib.c
@@ -11,21 +11,15 @@
  * please see the file GPL in the top level source directory.
  */
 
-#include <lib-lib/lib-lib.h>
+#include <lib-ui/lib-ui.h>
 
-#include <termios.h>
-#ifdef HAVE_SYS_IOCTL_H
-#  include <sys/ioctl.h>
-#elif defined(HAVE_IOCTL_H)
-#  include <ioctl.h>
-#endif
 #include <langinfo.h>
+#include <termios.h>
 
 #include <lib-lua/lib-lua.h>
 #include <lib-sys/unix.h>
 #include <lib-sys/mutt_signal.h>
 
-#include "curses.h"
 #include "menu.h"
 #include "enter.h"
 
@@ -41,27 +35,6 @@ ssize_t UngetCount = 0;
 static ssize_t UngetBufLen = 0;
 static event_t *KeyEvent;
 
-void mutt_refresh (void)
-{
-    /* don't refresh when we are waiting for a child. */
-    if (option (OPTKEEPQUIET))
-        return;
-
-    /* don't refresh in the middle of macros unless necessary */
-    if (UngetCount && !option (OPTFORCEREFRESH))
-        return;
-
-    /* else */
-    refresh ();
-}
-
-void mutt_need_hard_redraw (void)
-{
-    keypad (stdscr, TRUE);
-    clearok (stdscr, TRUE);
-    set_option (OPTNEEDREDRAW);
-}
-
 event_t mutt_getch (void)
 {
   int ch;
@@ -73,7 +46,7 @@ event_t mutt_getch (void)
   SigInt = 0;
 
   mutt_allow_interrupt (1);
-  ch = getch ();
+  ch = wgetch (stdscr);
   mutt_allow_interrupt (0);
 
   if (SigInt)
@@ -97,7 +70,7 @@ int _mutt_get_field ( const char *field, char *buf, ssize_t buflen,
 
   do {
     CLEARLINE (LINES - 1);
-    addstr (field);
+    waddstr (stdscr, field);
     mutt_refresh ();
     getyx (stdscr, y, x);
     ret = _mutt_enter_string(buf, buflen, y, x, complete, multiple, files,
@@ -172,7 +145,7 @@ int mutt_yesorno (const char *msg, int def)
   snprintf (answer_string, COLS + 1, " ([%s]/%s): ", def == M_YES ? yes : no,
             def == M_YES ? no : yes);
   answer_string_len = m_strlen(answer_string);
-  printw ("%.*s%s", COLS - answer_string_len, msg, answer_string);
+  wprintw (stdscr, "%.*s%s", COLS - answer_string_len, msg, answer_string);
   p_delete(&answer_string);
 
   for (;;) {
@@ -207,7 +180,7 @@ int mutt_yesorno (const char *msg, int def)
     regfree (&reno);
 
   if (def != -1) {
-    addstr ((char *) (def == M_YES ? yes : no));
+    waddstr (stdscr, (char *) (def == M_YES ? yes : no));
     mutt_refresh ();
   }
   return (def);
@@ -219,7 +192,7 @@ void mutt_query_exit (void)
   mutt_flushinp ();
   curs_set (1);
   if (Timeout)
-    timeout (-1);               /* restore blocking operation */
+    wtimeout (stdscr, -1);               /* restore blocking operation */
   if (mutt_yesorno (_("Exit Madmutt?"), M_YES) == M_YES) {
     mutt_endwin (NULL);
     exit (1);
@@ -245,8 +218,8 @@ void mutt_curses_error (const char *fmt, ...)
   if (!option (OPTKEEPQUIET)) {
     BEEP ();
     SETCOLOR (MT_COLOR_ERROR);
-    mvaddstr (LINES - 1, 0, Errorbuf);
-    clrtoeol ();
+    mvwaddstr (stdscr, LINES - 1, 0, Errorbuf);
+    wclrtoeol (stdscr);
     SETCOLOR (MT_COLOR_NORMAL);
     mutt_refresh ();
   }
@@ -297,8 +270,8 @@ void mutt_curses_message (const char *fmt, ...)
 
   if (!option (OPTKEEPQUIET)) {
     SETCOLOR (MT_COLOR_MESSAGE);
-    mvaddstr (LINES - 1, 0, Errorbuf);
-    clrtoeol ();
+    mvwaddstr (stdscr, LINES - 1, 0, Errorbuf);
+    wclrtoeol (stdscr);
     SETCOLOR (MT_COLOR_NORMAL);
     mutt_refresh ();
   }
@@ -313,24 +286,18 @@ void mutt_show_error (void)
 
   SETCOLOR (option (OPTMSGERR) ? MT_COLOR_ERROR : MT_COLOR_MESSAGE);
   CLEARLINE (LINES - 1);
-  addstr (Errorbuf);
+  waddstr (stdscr, Errorbuf);
   SETCOLOR (MT_COLOR_NORMAL);
 }
 
-void mutt_endwin (const char *msg)
+void curses_initialize(void)
 {
-  if (!option (OPTNOCURSES)) {
-    CLEARLINE (LINES - 1);
-
-    attrset (A_NORMAL);
-    mutt_refresh ();
-    endwin ();
-  }
-
-  if (msg && *msg) {
-    puts (msg);
-    fflush (stdout);
-  }
+    ci_start_color();
+    keypad(stdscr, TRUE);
+    cbreak();
+    noecho();
+    typeahead (-1);               /* simulate smooth scrolling */
+    meta(stdscr, TRUE);
 }
 
 void _mutt_perror (const char *s, const char* filename, int line)
@@ -339,6 +306,27 @@ void _mutt_perror (const char *s, const char* filename, int line)
   mutt_error ("%s: %s (errno = %d) from %s:%i", s, p ? p : _("unknown error"), errno, filename, line);
 }
 
+/*
+ * prompts the user to enter a keystroke, and displays the octal value back
+ * to the user.
+ */
+void mutt_what_key (void)
+{
+  int ch;
+
+  mvwprintw (stdscr, LINES - 1, 0, _("Enter keys (^G to abort): "));
+  do {
+    ch = wgetch (stdscr);
+    if (ch != ERR && ch != ctrl ('G')) {
+      mutt_message (_("Char = %s, Octal = %o, Decimal = %d"),
+                    km_keyname (ch), ch, ch);
+    }
+  }
+  while (ch != ERR && ch != ctrl ('G'));
+
+  mutt_flushinp ();
+}
+
 int mutt_any_key_to_continue (const char *s)
 {
   struct termios t;
@@ -373,11 +361,11 @@ int _mutt_enter_fname (const char *prompt, char *buf, ssize_t blen,
 {
   event_t ch;
 
-  mvaddstr (LINES - 1, 0, (char *) prompt);
-  addstr (_(" ('?' for list): "));
+  mvwaddstr (stdscr, LINES - 1, 0, (char *) prompt);
+  waddstr (stdscr, _(" ('?' for list): "));
   if (buf[0])
-    addstr (buf);
-  clrtoeol ();
+    waddstr (stdscr, buf);
+  wclrtoeol (stdscr);
   mutt_refresh ();
 
   ch = mutt_getch ();
@@ -454,8 +442,8 @@ int mutt_multi_choice (const char *prompt, const char *letters)
   int choice;
   char *p;
 
-  mvaddstr (LINES - 1, 0, prompt);
-  clrtoeol ();
+  mvwaddstr (stdscr, LINES - 1, 0, prompt);
+  wclrtoeol (stdscr);
   for (;;) {
     mutt_refresh ();
     ch = mutt_getch ();
@@ -497,7 +485,7 @@ int mutt_addwch (wchar_t wc)
       (n2 = wcrtomb(buf + n1, 0, &mbstate)) == -1)
     return -1;                  /* ERR */
   else
-    return addstr (buf);
+    return waddstr (stdscr, buf);
 }
 
 ssize_t mutt_pretty_size(char *s, ssize_t len, ssize_t n)
@@ -625,7 +613,7 @@ void mutt_format_s_tree (char *dest, ssize_t destlen,
 
 /*
  * mutt_paddstr (n, s) is almost equivalent to
- * mutt_format_string (bigbuf, big, n, n, 0, ' ', s, big, 0), addstr (bigbuf)
+ * mutt_format_string (bigbuf, big, n, n, 0, ' ', s, big, 0), waddstr (stdscr, bigbuf)
  */
 
 void mutt_paddstr (int n, const char *s)
@@ -648,44 +636,10 @@ void mutt_paddstr (int n, const char *s)
     if (w >= 0) {
       if (w > n)
         break;
-      addnstr ((char *) s, k);
+      waddnstr (stdscr, (char *) s, k);
       n -= w;
     }
   }
   while (n-- > 0)
-    addch (' ');
-}
-
-/* this routine should be called after receiving SIGWINCH */
-void mutt_resize_screen (void)
-{
-  char *cp;
-  int fd;
-  struct winsize w;
-
-  int rows, cols;
-
-  rows = -1;
-  cols = -1;
-  if ((fd = open ("/dev/tty", O_RDONLY)) != -1) {
-    if (ioctl (fd, TIOCGWINSZ, &w) != -1) {
-      rows = w.ws_row;
-      cols = w.ws_col;
-    }
-    close (fd);
-  }
-  if (rows <= 0) {
-    if ((cp = getenv ("LINES")) != NULL) {
-      rows = atoi (cp);
-    }
-    else
-      rows = 24;
-  }
-  if (cols <= 0) {
-    if ((cp = getenv ("COLUMNS")) != NULL)
-      cols = atoi (cp);
-    else
-      cols = 80;
-  }
-  resizeterm (rows, cols);
+    waddch (stdscr, ' ');
 }