Re: mutt/2019: menu_context itches

[Thomas Roessler <roessler@xxxxxxxxxxxxxxxxxx>]

On 2005-11-17 18:20:23 +0100, Thomas Roessler wrote:

> I seem to be unable to reproduce the problems that we've seen with
> the attached patch against current CVS, but I might still overlook
> some corner case.

A patch without another bug would truly be too nice, right?

Try ths one instead.
-- 
Thomas Roessler · Personal soap box at <http://log.does-not-exist.org/>.



diff -u -r3.23 menu.c
--- menu.c      1 Nov 2005 08:42:00 -0000       3.23
+++ menu.c      17 Nov 2005 17:22:29 -0000
@@ -379,36 +379,27 @@
 
   if (!option (OPTMENUMOVEOFF) && menu->max <= menu->pagelen) /* less entries 
than lines */
   {
-    if (menu->top != 0) {
+    if (menu->top != 0) 
+    {
       menu->top = 0;
       set_option (OPTNEEDREDRAW);
     }
   }
   else 
   {
-    /* 
-     * If c = menu->pagelen / 2 and menu->pagelen is even, then (obviously):
-     * 
-     *   menu->top + menu->pagelen - c == menu->top + c
-     *
-     * In that case, having an "else if" below leads to what has become known 
as the
-     * indicator break dance effect.  Instead of special-casing, we just 
forget the 
-     * "else".
-     */
-    
-    if (menu->current < menu->top + c) /* indicator above top threshold */
+    if (option (OPTMENUSCROLL) || (menu->pagelen <= 0) || (c && c <= 
MenuContext))
     {
-      if (option (OPTMENUSCROLL) || (menu->pagelen <= 0))
+      if (menu->current < menu->top + c)
        menu->top = menu->current - c;
-      else
-       menu->top -= (menu->pagelen - c) * ((menu->top + menu->pagelen - 1 - 
menu->current) / (menu->pagelen - c)) - c;
+      if (menu->current >= menu->top + menu->pagelen - c)
+       menu->top = menu->current - menu->pagelen + c + 1;
     }
-    if (menu->current >= menu->top + menu->pagelen - c) /* indicator below 
bottom threshold */
+    else
     {
-      if (option (OPTMENUSCROLL) || (menu->pagelen <= 0))
-       menu->top = menu->current - menu->pagelen + c + 1;
-      else
-       menu->top += (menu->pagelen - c) * ((menu->current - menu->top) / 
(menu->pagelen - c)) - c;
+      if (menu->current < menu->top + c)
+       menu->top -= (menu->pagelen - c) * ((menu->top + menu->pagelen - 1 - 
menu->current) / (menu->pagelen - c)) - c;
+      else if (menu->current >= menu->top + menu->pagelen - c)
+       menu->top += (menu->pagelen - c) * ((menu->current - menu->top) / 
(menu->pagelen - c)) - c;     
     }
   }