X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=filebrowser%2Fdraw.c;h=048fa858ebb31da66446cf1be0091916256f6e0c;hb=9141d53c4e3fe5f14a4940e2afb76f530f5a7a60;hp=a5b85f52c941cf64e8f497d4567eab44e6f28aa0;hpb=18c9024957df2892adb21cd851cb7a27b9502d54;p=xboard.git

diff --git a/filebrowser/draw.c b/filebrowser/draw.c
index a5b85f5..048fa85 100644
--- a/filebrowser/draw.c
+++ b/filebrowser/draw.c
@@ -25,8 +25,8 @@
  */
 
 #include <stdio.h>
-#include "selfile.h"
 #include "xstat.h"
+#include "selfile.h"
 #include <X11/StringDefs.h>
 #include <X11/Xaw/Scrollbar.h>
 #include <X11/Xaw/Cardinals.h>
@@ -500,7 +500,7 @@ SFscrollTimer(p, id)
 	int	save;
 	int     n;
 
-        n = (int) p;
+        n = (int)(intptr_t) p;
 
 	dir = &(SFdirs[SFdirPtr + n]);
 	save = dir->vOrigin;
@@ -530,7 +530,7 @@ SFscrollTimer(p, id)
 
 	if (SFbuttonPressed) {
 		SFscrollTimerId = XtAppAddTimeOut(SFapp,
-			SFscrollTimerInterval(), SFscrollTimer, (XtPointer) n);
+			SFscrollTimerInterval(), SFscrollTimer, (XtPointer)(intptr_t) n);
 	}
 }
 
@@ -571,7 +571,7 @@ SFnewInvertEntry(n, event)
 				SFscrollTimerAdded = 1;
 				SFscrollTimerId = XtAppAddTimeOut(SFapp,
 					SFscrollTimerInterval(), SFscrollTimer,
-					(XtPointer) n);
+					(XtPointer)(intptr_t) n);
 			}
 		}
 
@@ -639,20 +639,6 @@ SFmotionList(w, n, event)
 
 /* ARGSUSED */
 void
-SFvFloatSliderMovedCallback(w, n, fnew)
-	Widget	w;
-	int	n;
-	float	*fnew;
-{
-	int	new;
-
-	new = (*fnew) * SFdirs[SFdirPtr + n].nEntries;
-
-	SFvSliderMovedCallback(w, n, new);
-}
-
-/* ARGSUSED */
-void
 SFvSliderMovedCallback(w, n, new)
 	Widget	w;
 	int	n;
@@ -664,7 +650,10 @@ SFvSliderMovedCallback(w, n, new)
 
 	dir = &(SFdirs[SFdirPtr + n]);
 
+
 	old = dir->vOrigin;
+	if(new == -1) new = old + 1; else if(new == -2) new = old - 1; // [HGM] indicates scroll direction on mousewheel event
+	if(new < 0 || new > dir->nEntries - SFlistSize) return;
 	dir->vOrigin = new;
 
 	if (old == new) {
@@ -739,6 +728,21 @@ SFvSliderMovedCallback(w, n, new)
 
 /* ARGSUSED */
 void
+SFvFloatSliderMovedCallback(w, n, fnew)
+	Widget	w;
+	int	n;
+	float	*fnew;
+{
+	int	new;
+
+	new = (*fnew) * SFdirs[SFdirPtr + n].nEntries;
+
+	SFvSliderMovedCallback(w, n, new);
+}
+
+
+/* ARGSUSED */
+void
 SFvAreaSelectedCallback(w, n, pnew)
 	Widget	w;
 	int	n;