Changeset 1716:e537695cd77b for compose.c

Timestamp:

2000-05-09 08:19:26 (9 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

Edmund Grimley Evans' UTF-8 patch.

Files:

• compose.c (modified) (10 diffs)

compose.c

@@ -27 +27 @@
 #include "sort.h"
 #include "charset.h"
+#include "iconv.h"
 
 #ifdef MIXMASTER
@@ -68 +69 @@
 
 #define HDR_XOFFSET 10
-#define TITLE_FMT "%10s"
+#define TITLE_FMT "%10s" /* Used for Prompts, which are ASCII */
 #define W (COLS - HDR_XOFFSET)
 
@@ -278 +279 @@
   buf[0] = 0;
   rfc822_write_address (buf, sizeof (buf), addr);
-  mvprintw (line, 0, TITLE_FMT "%-*.*s", Prompts[line - 1], W, W, buf);
+  mvprintw (line, 0, TITLE_FMT, Prompts[line - 1]);
+  mutt_paddstr (W, buf);
 }
 
@@ -287 +289 @@
   draw_envelope_addr (HDR_CC, msg->env->cc);
   draw_envelope_addr (HDR_BCC, msg->env->bcc);
-  mvprintw (HDR_SUBJECT, 0, TITLE_FMT "%-*.*s", Prompts[HDR_SUBJECT - 1], W, W,
-            NONULL(msg->env->subject));
+  mvprintw (HDR_SUBJECT, 0, TITLE_FMT, Prompts[HDR_SUBJECT - 1]);
+  mutt_paddstr (W, NONULL (msg->env->subject));
   draw_envelope_addr (HDR_REPLYTO, msg->env->reply_to);
-  mvprintw (HDR_FCC, 0, TITLE_FMT "%-*.*s", Prompts[HDR_FCC - 1], W, W, fcc);
+  mvprintw (HDR_FCC, 0, TITLE_FMT, Prompts[HDR_FCC - 1]);
+  mutt_paddstr (W, fcc);
 
 
@@ -332 +335 @@
   buf[0] = 0;
   rfc822_write_address (buf, sizeof (buf), *addr);
-  mvprintw (line, HDR_XOFFSET, "%-*.*s", W, W, buf);
+  move (line, HDR_XOFFSET);
+  mutt_paddstr (W, buf);
 
   return 0;
@@ -386 +390 @@
 {
   char buff[SHORT_STRING];
+  iconv_t cd;
 
   if (!mutt_is_text_type (b->type, b->subtype))
@@ -397 +402 @@
   if (mutt_get_field (_("Enter character set: "), buff, sizeof(buff), 0) == -1)
     return 0;
-    
-  if (mutt_is_utf8(buff))
-  {
-    if (!b->noconv)
-    {
-      mutt_error (_("UTF-8 encoding attachments has not yet been implemented."));
-      return 0;
-    }
-  }
-  else if (mutt_get_charset (buff) == NULL)
+
+  if ((cd = iconv_open (buff, "us-ascii")) == (iconv_t)-1)
   {
     mutt_error (_("Character set %s is unknown."), buff);
     return 0;
   }
+  else
+    iconv_close (cd);
   
   mutt_set_body_charset (b, buff);
@@ -489 +488 @@
           clrtoeol ();
           if (msg->env->subject)
-            printw ("%-*.*s", W, W, msg->env->subject);
+            mutt_paddstr (W, msg->env->subject);
         }
         break;
@@ -501 +500 @@
           strfcpy (fcc, buf, _POSIX_PATH_MAX);
           mutt_pretty_mailbox (fcc);
-          mvprintw (HDR_FCC, HDR_XOFFSET, "%-*.*s", W, W, fcc);
+          move (HDR_FCC, HDR_XOFFSET);
+          mutt_paddstr (W, fcc);
           fccSet = 1;
         }
@@ -766 +766 @@
           break;
         }
-        if (mutt_is_utf8 (mutt_get_parameter ("charset", CURRENT->parameter)))
-        {
-          mutt_error (_("We currently can't encode to utf-8."));
-          break;
-        }
         CURRENT->noconv = !CURRENT->noconv;
         if (CURRENT->noconv)