X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=commands.c;h=239c7eac3ca7c0dfa3184d15cc1bd4853547d63d;hp=cde830db53ae209d8e32d810cc154f0749edf1f1;hb=d2227f502071cc594dbc77ccb0b3f4d0e7b36ae0;hpb=125a7c903f7928f682cbea847f4436c9dd5b1b4d

diff --git a/commands.c b/commands.c
index cde830d..239c7ea 100644
--- a/commands.c
+++ b/commands.c
@@ -17,8 +17,7 @@
 #include <lib-sys/unix.h>
 
 #include <lib-lua/lib-lua.h>
-#include <lib-ui/curses.h>
-#include <lib-ui/enter.h>
+#include <lib-ui/lib-ui.h>
 #include <lib-ui/menu.h>
 #include <lib-mx/mx.h>
 
@@ -64,7 +63,6 @@ int mutt_display_message (HEADER * cur)
   if (DisplayFilter && *DisplayFilter) {
     fpfilterout = fpout;
     fpout = NULL;
-    /* mutt_endwin (NULL); */
     filterpid = mutt_create_filter_fd (DisplayFilter, &fpout, NULL, NULL,
                                        -1, fileno (fpfilterout), -1);
     if (filterpid < 0) {
@@ -209,9 +207,10 @@ void ci_bounce_message (HEADER * h, int *redraw)
             buf);
 
 #define extra_space (15 + 7 + 2)
-  if (m_strwidth(prompt) > COLS - extra_space) {
-    mutt_format_string(prompt, sizeof(prompt), 0, COLS - extra_space, 0, 0,
-                       prompt, sizeof(prompt), 0);
+  if (m_strwidth(prompt) > getmaxx(main_w) - extra_space) {
+    mutt_format_string(prompt, sizeof(prompt), 0,
+                       getmaxx(main_w) - extra_space, 0, 0, prompt,
+                       sizeof(prompt), 0);
     m_strcat(prompt, sizeof(prompt), "...?");
   } else {
     m_strcat(prompt, sizeof(prompt), "?");
@@ -220,13 +219,10 @@ void ci_bounce_message (HEADER * h, int *redraw)
 
   if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
     address_list_wipe(&adr);
-    CLEARLINE (LINES - 1);
     mutt_message (h ? _("Message not bounced.") : _("Messages not bounced."));
     return;
   }
 
-  CLEARLINE (LINES - 1);
-
   rc = mutt_bounce_message (NULL, h, adr);
   address_list_wipe(&adr);
   /* If no error, or background, display message. */
@@ -271,14 +267,7 @@ static int _mutt_pipe_message(HEADER * h, char *cmd, int decode, int print,
   pid_t thepid;
   FILE *fpout;
 
-/*   mutt_endwin (NULL); 
-
-     is this really needed here ? 
-     it makes the screen flicker on pgp and s/mime messages,
-     before asking for a passphrase...
-                                     Oliver Ehli */
   if (h) {
-
     mutt_message_hook (Context, h, M_MESSAGEHOOK);
 
     if (decode) {
@@ -295,9 +284,7 @@ static int _mutt_pipe_message(HEADER * h, char *cmd, int decode, int print,
     pipe_msg (h, fpout, decode, print);
     m_fclose(&fpout);
     rc = mutt_wait_filter (thepid);
-  }
-  else {                        /* handle tagged messages */
-
+  } else {                        /* handle tagged messages */
     if (decode) {
       for (i = 0; i < Context->vcount; i++)
         if (Context->hdrs[Context->v2r[i]]->tagged) {
@@ -327,8 +314,7 @@ static int _mutt_pipe_message(HEADER * h, char *cmd, int decode, int print,
             rc = 1;
         }
       }
-    }
-    else {
+    } else {
       mutt_endwin (NULL);
       if ((thepid = mutt_create_filter (cmd, &fpout, NULL, NULL)) < 0) {
         mutt_perror (_("Can't create filter process"));
@@ -464,7 +450,6 @@ void mutt_shell_escape (void)
     if (!buf[0])
       m_strcpy(buf, sizeof(buf), mod_core.shell);
     if (buf[0]) {
-      CLEARLINE (LINES - 1);
       mutt_endwin (NULL);
       fflush (stdout);
       if (mutt_system (buf) != 0 || option (OPTWAITKEY))
@@ -714,11 +699,6 @@ int mutt_save_message (HEADER * h, int delete,
   return -1;
 }
 
-void mutt_version (void)
-{
-  mutt_message (mutt_make_version());
-}
-
 void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
 {
   char buf[LONG_STRING];