Rocco Rutte:

- merge in latest mutt changes

git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@312 e385b8ad-14ed-0310-8656-cc95a2468c6d

diff --git a/ChangeLog.mutt b/ChangeLog.mutt
index 2ff6980..33c3b43 100644 (file)
--- a/ChangeLog.mutt
+++ b/ChangeLog.mutt
@@ -1,3 +1,13 @@
+2005-06-12 18:28:29  Tamotsu Takahashi  <ttakah@lapis.plala.or.jp>  (roessler)
+
+       * menu.c: Fix background colors for $arrow_cursor.
+
+2005-06-12 18:24:31  Thomas Roessler  <roessler@does-not-exist.org>  (roessler)
+
+       * curs_main.c, init.h, menu.c, mutt.h: Add $braille_friendly.
+       Behavior originally suggested by Sébastien Hinderer
+       <Sebastien.Hinderer@libertysurf.fr>.
+
 2005-04-10 09:37:51  Johan Svedberg  <johan@svedberg.pp.se>  (roessler)
 
        * po/sv.po: update
@@ -409,7 +419,7 @@
 2005-01-29 19:15:07  Thomas Glanzmann  <sithglan@stud.uni-erlangen.de>  (roessler)
                                  
      * hcache.c: - make hcache.c conform to mutt codingstyle
-     - use $Id: ChangeLog,v 3.421 2005/04/10 09:38:17 roessler Exp $ CVS keyword instead of %K% BitKeeper keyword
+     - use $Id: ChangeLog,v 3.423 2005/06/12 18:29:03 roessler Exp $ CVS keyword instead of %K% BitKeeper keyword
                                  
 2005-01-29 19:15:07  Thomas Glanzmann  <sithglan@stud.uni-erlangen.de>  (roessler)
 

diff --git a/curs_main.c b/curs_main.c
index 757b006..ef26f81 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -592,6 +592,8 @@ int mutt_index_menu (void)
 
       if (option (OPTARROWCURSOR))
         move (menu->current - menu->top + menu->offset, 2);
+       else if (option (OPTBRAILLEFRIENDLY))
+         move (menu->current - menu->top + menu->offset, 0);
       else
         move (menu->current - menu->top + menu->offset, COLS - 1);
       mutt_refresh ();

diff --git a/init.h b/init.h
index a12d82d..4a11f7e 100644 (file)
--- a/init.h
+++ b/init.h
@@ -321,6 +321,15 @@ struct option_t MuttVars[] = {
    ** \fTDelivered-To:\fP header fields when bouncing messages.
    ** Postfix users may wish to \fIunset\fP this variable.
    */
+  { "braille_friendly", DT_BOOL, R_NONE, OPTBRAILLEFRIENDLY, 0 },
+  /*
+   ** .pp
+   ** When this variable is set, mutt will place the cursor at the beginning
+   ** of the current line in menus, even when the arrow_cursor variable
+   ** is unset, making it easier for blind persons using Braille displays to 
+   ** follow these menus.  The option is disabled by default because many 
+   ** visual terminals don't permit making the cursor invisible.
+   */
 #ifdef USE_NNTP
   {"catchup_newsgroup", DT_QUAD, R_NONE, OPT_CATCHUP, M_ASKYES},
   /*

diff --git a/menu.c b/menu.c
index e86c4f0..25d7468 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -220,8 +220,11 @@ void menu_redraw_index (MUTTMENU * menu)
           attrset (menu->color (i));
           addch (' ');
         }
-        else
-          move (i - menu->top + menu->offset, SidebarWidth + 3);
+        else {
+          attrset (menu->color (i));
+          move (i - menu->top + menu->offset, SidebarWidth);
+          addstr ("   ");
+        }
 
         print_enriched_string (menu->color (i), (unsigned char *) buf, 1);
         SETCOLOR (MT_COLOR_NORMAL);
@@ -828,13 +831,16 @@ int mutt_menuLoop (MUTTMENU * menu)
 
     menu->oldcurrent = menu->current;
 
-
-    /* move the cursor out of the way */
-    move (menu->current - menu->top + menu->offset,
-          (option (OPTARROWCURSOR) ? 2 : COLS - 1));
+    if (option (OPTARROWCURSOR))
+      move (menu->current - menu->top + menu->offset, 2);
+    else if (option (OPTBRAILLEFRIENDLY))
+      move (menu->current - menu->top + menu->offset, 0);
+    else
+      move (menu->current - menu->top + menu->offset, COLS - 1);
 
     mutt_refresh ();
 
+
     /* try to catch dialog keys before ops */
     if (menu->dialog && menu_dialog_dokey (menu, &i) == 0)
       return i;

diff --git a/mutt.h b/mutt.h
index d7e80b4..d08b5da 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -342,6 +342,7 @@ enum {
   OPTBEEP,
   OPTBEEPNEW,
   OPTBOUNCEDELIVERED,
+  OPTBRAILLEFRIENDLY,
   OPTCHECKNEW,
   OPTCOLLAPSEUNREAD,
   OPTCONFIRMAPPEND,