From 9b405778674d5325b225b32ab694d9216b099527 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 6 Aug 2000 18:00:00 +0200
Subject: Version 0.61 - When scrolling through a list it now moves a full page
 up or down when the   cursor reaches the top or bottom of the menu (thanks to
 Heino Goldenstein!). - Added missing '#include <sys/stat.h>' to recording.c.
 - The video directory can now be defined with the command line option -v. -
 There can now be more than one video directory (in case you have several  
 disks). - Fixed learning key codes for PC keyboard. - New command line option
 '-l' to set the log level. - Times in timers.conf are now always printed with
 4 digits (leading '0'). - Slow forward/back mode (thanks to Guido Fiala!). -
 The "Up" key in replay mode no longer restarts replay at the very beginning, 
  but rather resumes normal replay mode after a "pause", "forward" or
 "backward"   operation. Use the "Skip -60s" function repeatedly to go back to
 the beginning   of the recording. - Improved reaction on user input in
 fast/slow forward/back modes. - No more upper limit for the value of 'Pnr'. -
 Checking if the video card is really a DVB card. - New SVDRP command UPDT to
 update an existing timer (or add a new one if it   doesn't yet exist). - New
 version of the 'epg2timers' tool (with a modified channel list). - Bugfix in
 closing window in DEBUG_OSD mode.

---
 osd.c | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

(limited to 'osd.c')

diff --git a/osd.c b/osd.c
index ee9ba28..3c32373 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.4 2000/04/24 09:44:31 kls Exp $
+ * $Id: osd.c 1.5 2000/07/26 17:35:09 kls Exp $
  */
 
 #include "osd.h"
@@ -166,14 +166,20 @@ void cOsdMenu::CursorUp(void)
 {
   if (current > 0) {
      DisplayCurrent(false);
-     if (--current < first) {
+     if (current == first) {
         first -= MAXOSDITEMS;
         if (first < 0)
            first = 0;
+        if (current - MAXOSDITEMS > 0)
+           current -= MAXOSDITEMS;
+        else
+           current--;
         Display();
         }
-     else
+     else {
+        current--;
         DisplayCurrent(true);
+        }
      }
 }
 
@@ -182,14 +188,20 @@ void cOsdMenu::CursorDown(void)
   int count = Count();
   if (current < count - 1) {
      DisplayCurrent(false);
-     if (++current >= first + MAXOSDITEMS) {
+     if (current == first + MAXOSDITEMS - 1) {
         first += MAXOSDITEMS;
         if (first > count - MAXOSDITEMS)
            first = count - MAXOSDITEMS;
+        if (current + MAXOSDITEMS < count)
+           current += MAXOSDITEMS;
+        else
+           current++;
         Display();
         }
-     else
+     else {
+        current++;
         DisplayCurrent(true);
+        }
      }
 }
 
-- 
cgit v1.2.3