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

diff --git a/filebrowser/draw.c b/filebrowser/draw.c
index a5b85f5..4f8abaa 100644
--- a/filebrowser/draw.c
+++ b/filebrowser/draw.c
@@ -25,8 +25,9 @@
  */
 
 #include <stdio.h>
-#include "selfile.h"
 #include "xstat.h"
+#include "selfile.h"
+#include "config.h"
 #include <X11/StringDefs.h>
 #include <X11/Xaw/Scrollbar.h>
 #include <X11/Xaw/Cardinals.h>
@@ -53,7 +54,11 @@ static XtResource textResources[] = {
 		XtOffset(textPtr, fontname), XtRString, SF_DEFAULT_FONT},
 };
 
+#if ENABLE_NLS
+extern XFontSet fontSet; //XXX should really be in a .h file
+#else
 static XFontStruct *SFfont;
+#endif
 
 static int SFcurrentListY;
 
@@ -62,6 +67,12 @@ static XtIntervalId SFscrollTimerId;
 void
 SFinitFont()
 {
+#if ENABLE_NLS
+	XFontSetExtents *fse = XExtentsOfFontSet(fontSet);
+	SFcharWidth = fse->max_logical_extent.width;
+	SFcharAscent = -fse->max_logical_extent.y;
+	SFcharHeight = fse->max_logical_extent.height;
+#else
 	TextData	*data;
 
 	data = XtNew(TextData);
@@ -85,6 +96,7 @@ SFinitFont()
 	SFcharWidth = (SFfont->max_bounds.width + SFfont->min_bounds.width) / 2;
 	SFcharAscent = SFfont->max_bounds.ascent;
 	SFcharHeight = SFcharAscent + SFfont->max_bounds.descent;
+#endif
 	return;
 }
 
@@ -125,7 +137,9 @@ SFcreateGC()
 
 	gcValues.foreground = SFfore;
 	gcValues.background = SFback;
+#if !ENABLE_NLS
 	gcValues.font = SFfont->fid;
+#endif
 
 	SFtextGC = XCreateGC(
 		SFdisplay,
@@ -133,7 +147,9 @@ SFcreateGC()
 		(unsigned long)
 			GCForeground		|
 			GCBackground		|
+#if !ENABLE_NLS
 			GCFont			|
+#endif
 			0,
 		&gcValues
 	);
@@ -355,6 +371,18 @@ SFdrawStrings(w, dir, from, to)
 				continue;
 			}
 		}
+#if ENABLE_NLS
+		XmbDrawImageString(
+			SFdisplay,
+			w,
+			fontSet,
+			SFtextGC,
+			x,
+			SFtextYoffset + i * SFentryHeight,
+			entry->shown,
+			strlen(entry->shown)
+		);
+#else
 		XDrawImageString(
 			SFdisplay,
 			w,
@@ -364,6 +392,7 @@ SFdrawStrings(w, dir, from, to)
 			entry->shown,
 			strlen(entry->shown)
 		);
+#endif
 		if (dir->vOrigin + i == dir->beginSelection) {
 			XDrawLine(
 				SFdisplay,
@@ -419,6 +448,18 @@ SFdrawList(n, doScroll)
 	if (SFdirPtr + (3-NR) + n < SFdirEnd) {
 		dir = &(SFdirs[SFdirPtr + n + (3-NR)]);
 		w = XtWindow(selFileLists[n]);
+#if ENABLE_NLS
+		XmbDrawImageString(
+			SFdisplay,
+			w,
+			fontSet,
+			SFtextGC,
+			SFtextX - dir->hOrigin * SFcharWidth,
+			SFlineToTextV + SFaboveAndBelowText + SFcharAscent,
+			dir->dir,
+			strlen(dir->dir)
+		);
+#else
 		XDrawImageString(
 			SFdisplay,
 			w,
@@ -428,6 +469,7 @@ SFdrawList(n, doScroll)
 			dir->dir,
 			strlen(dir->dir)
 		);
+#endif
 		SFdrawStrings(w, dir, 0, SFlistSize - 1);
 	}
 	return;
@@ -500,7 +542,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 +572,7 @@ SFscrollTimer(p, id)
 
 	if (SFbuttonPressed) {
 		SFscrollTimerId = XtAppAddTimeOut(SFapp,
-			SFscrollTimerInterval(), SFscrollTimer, (XtPointer) n);
+			SFscrollTimerInterval(), SFscrollTimer, (XtPointer)(intptr_t) n);
 	}
 }
 
@@ -571,7 +613,7 @@ SFnewInvertEntry(n, event)
 				SFscrollTimerAdded = 1;
 				SFscrollTimerId = XtAppAddTimeOut(SFapp,
 					SFscrollTimerInterval(), SFscrollTimer,
-					(XtPointer) n);
+					(XtPointer)(intptr_t) n);
 			}
 		}
 
@@ -639,20 +681,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 +692,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 +770,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;