Changeset 51:68b85f34a18c

Timestamp:

1998-08-27 12:37:10 (10 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

[patch-0.94.4i.gt.arrowcursor.1] Padding to the end of
line/right jusitifying does not work in menus when
$arrow_cursor is set, because the extra space needed for
the arrow is not taken into account.
(From Gero Treuner <gero@…>)

Files:

• addrbook.c (modified) (1 diff)
• browser.c (modified) (1 diff)
• curs_main.c (modified) (1 diff)
• lib.c (modified) (1 diff)
• mutt.h (modified) (1 diff)
• postpone.c (modified) (1 diff)
• recvattach.c (modified) (2 diffs)

addrbook.c

@@ -81 +81 @@
 void alias_entry (char *s, size_t slen, MUTTMENU *m, int num)
 {
-  mutt_FormatString (s, slen, NONULL (AliasFmt), alias_format_str, (unsigned long) ((ALIAS **) m->data)[num], 0);
+  mutt_FormatString (s, slen, NONULL (AliasFmt), alias_format_str, (unsigned long) ((ALIAS **) m->data)[num], M_FORMAT_ARROWCURSOR);
 }
 

browser.c

@@ -296 +296 @@
   folder.f = s;
   folder.new = new;
-  mutt_FormatString (buffer, sizeof (buffer), NONULL(FolderFormat), folder_format_str,
-                     (unsigned long) &folder, 0);
+  mutt_FormatString (buffer, sizeof (buffer), NONULL(FolderFormat),
+                     folder_format_str, (unsigned long) &folder,
+                     M_FORMAT_ARROWCURSOR);
 
   if (state->entrylen == state->entrymax)

curs_main.c

@@ -75 +75 @@
 void index_make_entry (char *s, size_t l, MUTTMENU *menu, int num)
 {
-  format_flag flag = M_FORMAT_MAKEPRINT;
+  format_flag flag = M_FORMAT_MAKEPRINT | M_FORMAT_ARROWCURSOR;
   int reverse = Sort & SORT_REVERSE, edgemsgno;
   HEADER *tmp, *h = Context->hdrs[Context->v2r[num]];

lib.c

@@ -886 +886 @@
   char prefix[SHORT_STRING], buf[LONG_STRING], *cp, *wptr = dest, ch;
   char ifstring[SHORT_STRING], elsestring[SHORT_STRING];
-  size_t wlen = 0, count, len;
+  size_t wlen, count, len;
 
   destlen--; /* save room for the terminal \0 */
+  wlen = (flags & M_FORMAT_ARROWCURSOR && option (OPTARROWCURSOR)) ? 3 : 0;
+    
   while (*src && wlen < destlen)
   {

mutt.h

@@ -100 +100 @@
   M_FORMAT_MAKEPRINT    = (1<<2), /* make sure that all chars are printable */
   M_FORMAT_OPTIONAL     = (1<<3),
-  M_FORMAT_STAT_FILE    = (1<<4)  /* used by mutt_attach_fmt */
+  M_FORMAT_STAT_FILE    = (1<<4), /* used by mutt_attach_fmt */
+  M_FORMAT_ARROWCURSOR  = (1<<5)  /* reserve space for arrow_cursor */
 } format_flag;
 

postpone.c

@@ -95 +95 @@
   CONTEXT *ctx = (CONTEXT *) menu->data;
 
-  mutt_make_string (s, slen, NONULL (HdrFmt), ctx, ctx->hdrs[entry]);
+  _mutt_make_string (s, slen, NONULL (HdrFmt), ctx, ctx->hdrs[entry],
+                     M_FORMAT_ARROWCURSOR);
 }
 

recvattach.c

@@ -171 +171 @@
         char s[SHORT_STRING];
         _mutt_make_string (s, sizeof (s), MsgFmt, NULL, aptr->content->hdr,
-            M_FORMAT_FORCESUBJ | M_FORMAT_MAKEPRINT);
+            M_FORMAT_FORCESUBJ | M_FORMAT_MAKEPRINT | M_FORMAT_ARROWCURSOR);
         if (*s)
         {
@@ -244 +244 @@
 void attach_entry (char *b, size_t blen, MUTTMENU *menu, int num)
 {
-  mutt_FormatString (b, blen, NONULL (AttachFormat), mutt_attach_fmt, (unsigned long) (((ATTACHPTR **)menu->data)[num]), 0);
+  mutt_FormatString (b, blen, NONULL (AttachFormat), mutt_attach_fmt, (unsigned long) (((ATTACHPTR **)menu->data)[num]), M_FORMAT_ARROWCURSOR);
 }