<<< Date Index >>>     <<< Thread Index >>>

Re: mutt/2019: menu_context itches (Re: your mail)



* Tue Aug  9 2005 Brendan Cully <brendan@xxxxxxxxxx>
> I think $menu_context makes sense and is a nice parallel to
> $pager_context. Why were we renaming this one again?

We found it not so parallel.
http://marc.theaimsgroup.com/?l=mutt-dev&m=111220557314589&w=2
But I'm not against keeping $menu_context.


> So I'd propose:
> keep $menu_context
> and in place of $menu_move: $menu_fill_screen? or just $fill_menu?
> (with the sense inverted, obviously). I actually prefer the latter. Or
> maybe $menu_fill to make Rado happy.

$menu_fill sounds good.

So, the conclusion is...?
$menu_context -> $menu_context
(not in 1.5.9)-> $menu_overlap
$menu_move_off-> $menu_fill


> I'd also like to see two separate patches:
> 1) do the rename/sense inversion
> 2) fix the behavioural idiosyncracies
> 
> It makes it easier to review the behavioural changes in case anything
> goes wrong.

I attach #2 of your suggestion; only the bug-fix.
Please review it. Thanks in advance.
(And sorry, I haven't tested this patch.)

-- 
tamo
==== Variables ====================
c:               $menu_context
menu->max-1:     number of all items
menu->pagelen-1: screen height
===================================

==== Room for optimization ========
Variable "neg" and macro "DIRECTION"
look very tricky! Please correct them!
Maybe DIRECTION should be another
variable.
===================================


--- menu.c      12 Jun 2005 18:28:29 -0000
+++ menu.c      9 Aug 2005 04:26:58 -0000
@@ -384,19 +384,19 @@ void menu_redraw_prompt (MUTTMENU *menu)
       set_option (OPTNEEDREDRAW);
     }
   }
-  else if (menu->current >= menu->top + menu->pagelen - c) /* indicator below 
bottom threshold */
+  else if (menu->current > menu->top + (menu->pagelen - 1) - c) /* indicator 
below bottom threshold */
   {
     if (option (OPTMENUSCROLL) || (menu->pagelen <= 0))
-      menu->top = menu->current - menu->pagelen + c + 1;
+      menu->top = menu->current - (menu->pagelen - 1) + c;
     else
-      menu->top += (menu->pagelen - c) * ((menu->current - menu->top) / 
(menu->pagelen - c)) - c;
+      menu->top = menu->current - c;
   }
   else if (menu->current < menu->top + c) /* indicator above top threshold */
   {
     if (option (OPTMENUSCROLL) || (menu->pagelen <= 0))
       menu->top = menu->current - c;
     else
-      menu->top -= (menu->pagelen - c) * ((menu->top + menu->pagelen - 1 - 
menu->current) / (menu->pagelen - c)) - c;
+      menu->top = menu->current - (menu->pagelen - 1) + c;
   }
 
   if (!option (OPTMENUMOVEOFF)) /* make entries stick to bottom */
@@ -468,48 +468,75 @@ void menu_prev_line (MUTTMENU *menu)
     mutt_error _("You cannot scroll up farther.");
 }
 
-void menu_next_page (MUTTMENU *menu)
-{
+/* 
+ * pageup:   jumplen == -pagelen
+ * pagedown: jumplen == pagelen
+ * halfup:   jumplen == -pagelen/2
+ * halfdown: jumplen == pagelen/2
+ */
+#define DIRECTION ((neg * 2) + 1)
+void menu_length_jump (MUTTMENU *menu, int jumplen)
+{
+  int tmp, neg = (jumplen >= 0) ? 0 : -1;
+  int c = MIN (MenuContext, menu->pagelen / 2);
+
   if (menu->max)
   {
-    if (menu->top + menu->pagelen < menu->max)
-    {
-      menu->top += menu->pagelen;
-      if (menu->current < menu->top)
-       menu->current = menu->top;
+    /* possible to scroll? */
+    if (DIRECTION * menu->top <
+       (tmp = (neg ? 0 : (menu->max /*-1*/) - (menu->pagelen /*-1*/))))
+    {
+      menu->top += jumplen;
+
+      /* jumped too long? */
+      if ((neg || !option (OPTMENUMOVEOFF)) &&
+         DIRECTION * menu->top > tmp)
+       menu->top = tmp;
+
+      /* need to move the cursor? */
+      if ((DIRECTION *
+          (tmp = (menu->current -
+                  (menu->top + (neg ? (menu->pagelen - 1) - c : c))
+         ))) < 0)
+       menu->current -= tmp;
+
       menu->redraw = REDRAW_INDEX;
     }
-    else if (menu->current != menu->max - 1 && !menu->dialog)
+    else if (menu->current != (neg ? 0 : menu->max - 1) && !menu->dialog)
     {
-      menu->current = menu->max - 1;
+      menu->current += jumplen;
       menu->redraw = REDRAW_MOTION;
     }
     else
-      mutt_error _("You are on the last page.");
+      mutt_error (neg ? _("You are on the first page.")
+                     : _("You are on the last page."));
+
+    menu->current = MIN (menu->current, menu->max - 1);
+    menu->current = MAX (menu->current, 0);
   }
   else
     mutt_error _("No entries.");
 }
+#undef DIRECTION
+
+void menu_next_page (MUTTMENU *menu)
+{
+  menu_length_jump (menu, MAX (menu->pagelen /* - MenuOverlap */, 0));
+}
 
 void menu_prev_page (MUTTMENU *menu)
 {
-  int c = MIN (MenuContext, menu->pagelen / 2);
+  menu_length_jump (menu, 0 - MAX (menu->pagelen /* - MenuOverlap */, 0));
+}
 
-  if (menu->top > c)
-  {
-    if ((menu->top -= menu->pagelen) < 0)
-      menu->top = 0;
-    if (menu->current >= menu->top + menu->pagelen)
-      menu->current = menu->top + menu->pagelen - 1;
-    menu->redraw = REDRAW_INDEX;
-  }
-  else if (menu->current && !menu->dialog)
-  {
-    menu->current = 0;
-    menu->redraw = REDRAW_MOTION;
-  }
-  else
-    mutt_error _("You are on the first page.");
+void menu_half_down (MUTTMENU *menu)
+{
+  menu_length_jump (menu, menu->pagelen / 2);
+}
+
+void menu_half_up (MUTTMENU *menu)
+{
+  menu_length_jump (menu, 0 - menu->pagelen / 2);
 }
 
 void menu_top_page (MUTTMENU *menu)
@@ -572,48 +599,6 @@ void menu_last_entry (MUTTMENU *menu)
     mutt_error _("No entries.");
 }
 
-void menu_half_up (MUTTMENU *menu)
-{
-  if (menu->top > 0)
-  {
-    if ((menu->top -= menu->pagelen / 2) < 0)
-      menu->top = 0;
-    if (menu->current >= menu->top + menu->pagelen)
-      menu->current = menu->top + menu->pagelen - 1;
-    menu->redraw = REDRAW_INDEX;
-  }
-  else if (menu->current && !menu->dialog)
-  {
-    menu->current = 0;
-    menu->redraw = REDRAW_MOTION;
-  }
-  else
-    mutt_error _("First entry is shown.");
-}
-
-void menu_half_down (MUTTMENU *menu)
-{
-  if (menu->max)
-  {
-    if (menu->top + menu->pagelen < menu->max)
-    {
-      menu->top += menu->pagelen / 2;
-      if (menu->current < menu->top)
-       menu->current = menu->top;
-      menu->redraw = REDRAW_INDEX;
-    }
-    else if (menu->current != menu->max - 1 && !menu->dialog)
-    {
-      menu->current = menu->max - 1;
-      menu->redraw = REDRAW_INDEX;
-    }
-    else
-      mutt_error _("Last entry is shown.");
-  }
-  else
-    mutt_error _("No entries.");
-}
-
 void menu_current_top (MUTTMENU *menu)
 {
   if (menu->max)