X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-ui%2Fcurs_lib.c;h=72560b6ac65bfe777ca78e517a13b1a14de52368;hp=71be0119aa3b7bc5e5df2797458f3baf3c5e42a4;hb=198a7600d7538ba6f9e260037ee90d0c7f7e5bf2;hpb=d4b790a79307b4f53c49f4c25223977a8baa6aa1

diff --git a/lib-ui/curs_lib.c b/lib-ui/curs_lib.c
index 71be011..72560b6 100644
--- a/lib-ui/curs_lib.c
+++ b/lib-ui/curs_lib.c
@@ -14,6 +14,11 @@
 #include <lib-lib/lib-lib.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 <lib-lua/lib-lua.h>
@@ -38,29 +43,23 @@ 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 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;
+    /* don't refresh in the middle of macros unless necessary */
+    if (UngetCount && !option (OPTFORCEREFRESH))
+        return;
 
-  /* else */
-  refresh ();
+    /* else */
+    refresh ();
 }
 
-/* Make sure that the next refresh does a full refresh.  This could be
-   optmized by not doing it at all if DISPLAY is set as this might
-   indicate that a GUI based pinentry was used.  Having an option to
-   customize this is of course the Mutt way.  */
 void mutt_need_hard_redraw (void)
 {
-  if (!getenv ("DISPLAY")) {
     keypad (stdscr, TRUE);
     clearok (stdscr, TRUE);
     set_option (OPTNEEDREDRAW);
-  }
 }
 
 event_t mutt_getch (void)
@@ -83,15 +82,6 @@ event_t mutt_getch (void)
   if (ch == ERR)
     return err;
 
-  if ((ch & 0x80) && option (OPTMETAKEY)) {
-    /* send ALT-x as ESC-x */
-    ch &= ~0x80;
-    mutt_ungetch (ch, 0);
-    ret.ch = '\033';
-    ret.op = 0;
-    return ret;
-  }
-
   ret.ch = ch;
   ret.op = 0;
   return (ch == ctrl ('G') ? err : ret);
@@ -142,7 +132,7 @@ void mutt_edit_file(const char *data)
   char cmd[LONG_STRING];
 
   mutt_endwin (NULL);
-  m_quotefile_fmt(cmd, sizeof (cmd), MCore.editor, data);
+  m_quotefile_fmt(cmd, sizeof (cmd), mod_core.editor, data);
   if (mutt_system (cmd) == -1)
     mutt_error (_("Error running \"%s\"!"), cmd);
   keypad (stdscr, TRUE);
@@ -152,8 +142,8 @@ void mutt_edit_file(const char *data)
 int mutt_yesorno (const char *msg, int def)
 {
   event_t ch;
-  char *yes = _("yes");
-  char *no = _("no");
+  const char *yes = _("yes");
+  const char *no = _("no");
   char *answer_string;
   ssize_t answer_string_len;
   char *expr;
@@ -398,8 +388,8 @@ int _mutt_enter_fname (const char *prompt, char *buf, ssize_t blen,
   else if (ch.ch == '?') {
     mutt_refresh ();
     buf[0] = 0;
-    _mutt_select_file (buf, blen, M_SEL_FOLDER | (multiple ? M_SEL_MULTI : 0),
-                       files, numfiles);
+    mutt_select_file (buf, blen, M_SEL_FOLDER | (multiple ? M_SEL_MULTI : 0),
+                      files, numfiles);
     *redraw = REDRAW_FULL;
   }
   else {
@@ -438,7 +428,6 @@ void mutt_flushinp (void)
   flushinp ();
 }
 
-#if (defined(USE_SLANG_CURSES) || defined(HAVE_CURS_SET))
 /* The argument can take 3 values:
  * -1: restore the value of the last call
  *  0: make the cursor invisible
@@ -458,9 +447,8 @@ void mutt_curs_set (int cursor)
       curs_set (2);             /* cvvis */
   }
 }
-#endif
 
-int mutt_multi_choice (char *prompt, char *letters)
+int mutt_multi_choice (const char *prompt, const char *letters)
 {
   event_t ch;
   int choice;
@@ -668,3 +656,36 @@ void mutt_paddstr (int n, const char *s)
     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);
+}