From: cohrs <cohrs>
Date: Sun, 3 Oct 2004 21:59:18 +0000 (+0000)
Subject: missing scrollbar in X11_display_file [from Steve VanDevender]
X-Git-Tag: MOVE2GIT~1419
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4c9d16195370ca329140be7e9e3ab89e06f4abcf;p=nethack

missing scrollbar in X11_display_file [from Steve VanDevender]
It appears that the Athena text widget in recent XFree86 distributions
does not properly honor the XawtextScrollWhenNeeded flag, so the text
widget created by X11_display_file() does not have a vertical scroll bar
when the text does not entirely fit in the window.  I have seen this bug
in XFree86 versions from 4.0.2 through 4.3.0.  Using XawtextScrollAlways
for the vertical scrollbar ensures it will always appear.
---

diff --git a/doc/fixes34.4 b/doc/fixes34.4
index 13bbef38d..c801cd4b2 100644
--- a/doc/fixes34.4
+++ b/doc/fixes34.4
@@ -62,6 +62,7 @@ unix: remove use of parentheses in nethack man page usage that confused a
 	man page conversion tool
 winCE: disable processing of double-click messages if the first click
 	causes map to scroll
+X11: ensure vertical scrollbar shows up in text display windows
 
 
 General New Features
diff --git a/win/X11/winX.c b/win/X11/winX.c
index 2d2c68c90..bfcbed426 100644
--- a/win/X11/winX.c
+++ b/win/X11/winX.c
@@ -1489,7 +1489,7 @@ X11_display_file(str, complain)
     XtSetArg(args[num_args], XtNscrollHorizontal,
 				XawtextScrollWhenNeeded);	num_args++;
     XtSetArg(args[num_args], XtNscrollVertical,
-				XawtextScrollWhenNeeded);	num_args++;
+				XawtextScrollAlways);		num_args++;
     XtSetArg(args[num_args], XtNtype, XawAsciiString);		num_args++;
     XtSetArg(args[num_args], XtNstring, textlines);		num_args++;
     XtSetArg(args[num_args], XtNdisplayCaret, False);		num_args++;