Purge XT_DISPLAY config variable, use DISPLAY environment var instead.

Let's use DISPLAY like every other sane X application does, not through a
variable set at configure time.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>

22 files changed, 69 insertions, 83 deletions

diff --git a/xts5/Makefile.am b/xts5/Makefile.am
index 581f4d4a..24995f57 100644
--- a/xts5/Makefile.am
+++ b/xts5/Makefile.am
@@ -17,8 +17,7 @@ TCC = $(top_builddir)/src/tet3/tcc/tcc$(EXEEXT)
 run_tcc = TET_ROOT='$(TET_ROOT)' $(TCC) -e -a $(abs_builddir) \
 	-x tetexec.cfg xts5
 scenario =
-XTS_CONFIG = TET_ROOT='$(TET_ROOT)' DISPLAY='$(XT_DISPLAY)' \
-	XSET='$(XSET)' XDPYINFO='$(XDPYINFO)' \
+XTS_CONFIG = TET_ROOT='$(TET_ROOT)' XSET='$(XSET)' XDPYINFO='$(XDPYINFO)' \
 	$(PERL) -p $(srcdir)/bin/xts-config
 # We make this depend on Makefile so that it's regenerated after the
 # Makefile is created or updated by config.status
diff --git a/xts5/Xlib12/XDisplayName/XDisplayName.m b/xts5/Xlib12/XDisplayName/XDisplayName.m
index 65e9c801..88e4400b 100644
--- a/xts5/Xlib12/XDisplayName/XDisplayName.m
+++ b/xts5/Xlib12/XDisplayName/XDisplayName.m
@@ -135,8 +135,7 @@ as an argument.
 >>STRATEGY
 Fork a child process using tet_fork.
 In child :
-  Exec the file \"./Test1\" with the environment variable DISPLAY set to 
-    the value of XT_DISPLAY config variable.
+  Exec the file \"./Test1\" with the environment variable DISPLAY.
   In Test1:
     Call xname with string set to TestString:0.0
     Verify that the call returned a pointer to TestString:0.0
@@ -163,8 +162,8 @@ char	*dstr;
 char	*mstr = "DISPLAY=%s";
 int	pass = 0, fail = 0;
 
-	if((dstr = tet_getvar("XT_DISPLAY")) == (char *) NULL) {
-		delete("XT_DISPLAY configuration variable is not defined.");
+	if((dstr = getenv("DISPLAY")) == (char *) NULL) {
+		delete("DISPLAY configuration variable is not defined.");
 		return;
 	}		
 
diff --git a/xts5/Xlib12/XSetIOErrorHandler.m b/xts5/Xlib12/XSetIOErrorHandler.m
index 4f653e6c..18615669 100644
--- a/xts5/Xlib12/XSetIOErrorHandler.m
+++ b/xts5/Xlib12/XSetIOErrorHandler.m
@@ -431,7 +431,7 @@ char	*server;
 	}
 
 	if ((server = config.display) == (char *) NULL) {
-		delete("XT_DISPLAY not set");
+		delete("DISPLAY not set");
 		return;
 	}
 	else
diff --git a/xts5/Xlib3/XDisplayString/XDisplayString.m b/xts5/Xlib3/XDisplayString/XDisplayString.m
index a190f268..ded5e340 100644
--- a/xts5/Xlib3/XDisplayString/XDisplayString.m
+++ b/xts5/Xlib3/XDisplayString/XDisplayString.m
@@ -172,7 +172,7 @@ was called.
 >>STRATEGY
 Fork a child process using tet_fork.
 In child :
-  Exec the file \"./Test1\" with the environment variable DISPLAY set to the value of XT_DISPLAY config variable.
+  Exec the file \"./Test1\" with the environment variable DISPLAY set.
   Open the display "" using XOpenDisplay.
   Obtain the value of the display string using xname.
   Obtain the value of the DISPLAY environment variable.
@@ -196,8 +196,8 @@ char	*dstr;
 char	*mstr = "DISPLAY=%s";
 int	pass = 0, fail = 0;
 
-	if((dstr = tet_getvar("XT_DISPLAY")) == (char *) NULL) {
-		delete("XT_DISPLAY configuration variable is not defined.");
+	if((dstr = getenv("DISPLAY")) == (char *) NULL) {
+		delete("DISPLAY configuration variable is not defined.");
 		return;
 	}		
 
diff --git a/xts5/Xlib3/XOpenDisplay/XOpenDisplay.m b/xts5/Xlib3/XOpenDisplay/XOpenDisplay.m
index 336d1c83..09b783d3 100644
--- a/xts5/Xlib3/XOpenDisplay/XOpenDisplay.m
+++ b/xts5/Xlib3/XOpenDisplay/XOpenDisplay.m
@@ -164,7 +164,7 @@ with default screen
 .A screen_number .
 >>STRATEGY
 If the system is POSIX compliant and supports DECnet transport:
-  Obtain the display and screen numbers by parsing the XT_DISPLAY config variable.
+  Obtain the display and screen numbers by parsing the DISPLAY config variable.
   Open a connection using xname.
   Verify that the call did not return NULL.
   Issue a NoOperation request using XNoOp.
@@ -193,12 +193,12 @@ char	ssno[9], sdno[9];
 		;
 
 	if(*cptr == '\0') {
-		delete("XT_DISPLAY does not specify a display.");
+		delete("DISPLAY does not specify a display.");
 		return;
 	} else {
 		CHECK;
 		if(*++cptr != ':') {
-			delete("XT_DISPLAY does not contain a valid display name.");
+			delete("DISPLAY does not contain a valid display name.");
 			return;
 		} else
 			CHECK;
@@ -206,7 +206,7 @@ char	ssno[9], sdno[9];
 		for(sptr = ++cptr; *sptr && isascii(*sptr) && isdigit(*sptr); sptr++)
 			;
 		if( (sptr == cptr) || (*sptr != '\0' && *sptr != '.') ) {
-			delete("Bad display number in XT_DISPLAY.");
+			delete("Bad display number in DISPLAY.");
 			return;
 		} else
 			CHECK;
@@ -223,7 +223,7 @@ char	ssno[9], sdno[9];
 			for(cptr = ++sptr; *sptr && isascii(*sptr) && isdigit(*sptr); sptr++)
 				;
 			if(*sptr) {
-				delete("Bad screen number in XT_DISPLAY.");
+				delete("Bad screen number in DISPLAY.");
 				return;
 			} else
 				CHECK;
@@ -239,7 +239,7 @@ char	ssno[9], sdno[9];
 
 		} else {
 			CHECK; CHECK;
-			sno = 0; /* No screen number in XT_DISPLAY, assume zero. */
+			sno = 0; /* No screen number in DISPLAY, assume zero. */
 		}
 	}
 
@@ -285,7 +285,7 @@ with default screen
 .A 0 .
 >>STRATEGY
 If the system is POSIX compliant and supports DECnet transport:
-  Obtain the display numbers by parsing the XT_DISPLAY config variable.
+  Obtain the display numbers by parsing the DISPLAY config variable.
   Open a connection of the form host::number using xname.
   Verify that the call did not return NULL.
   Obtain the screen number using XDefaultScreen.
@@ -314,12 +314,12 @@ char	sdno[9];
 		;
 
 	if(*cptr == '\0') {
-		delete("XT_DISPLAY does not specify a display.");
+		delete("DISPLAY does not specify a display.");
 		return;
 	} else {
 		CHECK;
 		if(*++cptr != ':') {
-			delete("XT_DISPLAY does not contain a valid display name.");
+			delete("DISPLAY does not contain a valid display name.");
 			return;
 		} else
 			CHECK;
@@ -327,7 +327,7 @@ char	sdno[9];
 		for(sptr = ++cptr; *sptr && isascii(*sptr) && isdigit(*sptr); sptr++)
 			;
 		if( (sptr == cptr) || (*sptr != '\0' && *sptr != '.') ) {
-			delete("Bad display number in XT_DISPLAY.");
+			delete("Bad display number in DISPLAY.");
 			return;
 		} else
 			CHECK;
@@ -345,7 +345,7 @@ char	sdno[9];
 			for(cptr = ++sptr; *sptr && isascii(*sptr) && isdigit(*sptr); sptr++)
 				;
 			if(*sptr) {
-				delete("Bad screen number in XT_DISPLAY.");
+				delete("Bad screen number in DISPLAY.");
 				return;
 			} else
 				CHECK;
@@ -410,7 +410,7 @@ with default screen
 .A screen_number .
 >>STRATEGY
 If the system is POSIX compliant and supports TCP transport:
-  Obtain the display and screen numbers by parsing the XT_DISPLAY config variable.
+  Obtain the display and screen numbers by parsing the DISPLAY config variable.
   Open a connection using xname.
   Verify that the call did not return NULL.
   Issue a NoOperation request using XNoOp.
@@ -439,14 +439,14 @@ char	ssno[9], sdno[9];
 		;
 
 	if(*cptr == '\0') {
-		delete("XT_DISPLAY does not specify a display.");
+		delete("DISPLAY does not specify a display.");
 		return;
 	} else {
 		CHECK;
 		for(sptr = ++cptr; *sptr && isascii(*sptr) && isdigit(*sptr); sptr++)
 			;
 		if( (sptr == cptr) || (*sptr != '\0' && *sptr != '.') ) {
-			delete("Bad display number in XT_DISPLAY.");
+			delete("Bad display number in DISPLAY.");
 			return;
 		} else
 			CHECK;
@@ -464,7 +464,7 @@ char	ssno[9], sdno[9];
 			for(cptr = ++sptr; *sptr && isascii(*sptr) && isdigit(*sptr); sptr++)
 				;
 			if(*sptr) {
-				delete("Bad screen number in XT_DISPLAY.");
+				delete("Bad screen number in DISPLAY.");
 				return;
 			} else
 				CHECK;
@@ -480,7 +480,7 @@ char	ssno[9], sdno[9];
 
 		} else {
 			CHECK; CHECK;
-			sno = 0; /* No screen number in XT_DISPLAY, assume zero. */
+			sno = 0; /* No screen number in DISPLAY, assume zero. */
 		}
 	}
 
@@ -526,7 +526,7 @@ with default screen
 .A 0 .
 >>STRATEGY
 If the system is POSIX compliant and supports TCP transport:
-  Obtain the display numbers by parsing the XT_DISPLAY config variable.
+  Obtain the display numbers by parsing the DISPLAY config variable.
   Open a connection of the form host:number using xname.
   Verify that the call did not return NULL.
   Obtain the screen number using XDefaultScreen.
@@ -555,7 +555,7 @@ char	sdno[9];
 		;
 
 	if(*cptr == '\0') {
-		delete("XT_DISPLAY does not specify a display.");
+		delete("DISPLAY does not specify a display.");
 		return;
 	} else {
 		CHECK;
@@ -563,7 +563,7 @@ char	sdno[9];
 		for(sptr = ++cptr; *sptr && isascii(*sptr) && isdigit(*sptr); sptr++)
 			;
 		if( (sptr == cptr) || (*sptr != '\0' && *sptr != '.') ) {
-			delete("Bad display number in XT_DISPLAY.");
+			delete("Bad display number in DISPLAY.");
 			return;
 		} else
 			CHECK;
@@ -581,7 +581,7 @@ char	sdno[9];
 			for(cptr = ++sptr; *sptr && isascii(*sptr) && isdigit(*sptr); sptr++)
 				;
 			if(*sptr) {
-				delete("Bad screen number in XT_DISPLAY.");
+				delete("Bad screen number in DISPLAY.");
 				return;
 			} else
 				CHECK;
@@ -638,7 +638,7 @@ the value of the DISPLAY environment variable.
 >>STRATEGY
 Fork a child process using tet_fork.
 In child:
-  Exec the file \"./Test1\" with the environment variable DISPLAY set to the value of XT_DISPLAY config variable.
+  Exec the file \"./Test1\" with the environment variable DISPLAY set to the value of DISPLAY config variable.
   Open the display NULL using xname.
   Obtain the actual display string used using XDisplayString.
   Obtain the value of the DISPLAY environment variable using getvar.
@@ -693,7 +693,7 @@ then a call to xname opens the most efficient transport connection
 available to the specified display server and default screen on the client machine.
 >>STRATEGY
 If the system is POSIX compliant and supports DECnet and a local display server:
-  Obtain the display and screen numbers from XT_DISPLAY.
+  Obtain the display and screen numbers from DISPLAY.
   Open a connection of the form ::number.display.
   Verify that the call did not return NULL.
   Issue a NoOperation request using XNoOp.
@@ -733,12 +733,12 @@ char	ssno[9], sdno[9];
 		;
 
 	if(*cptr == '\0') {
-		delete("XT_DISPLAY does not specify a display.");
+		delete("DISPLAY does not specify a display.");
 		return;
 	} else {
 		CHECK;
 		if(*++cptr != ':') {
-			delete("XT_DISPLAY does not contain a valid display name.");
+			delete("_DISPLAY does not contain a valid display name.");
 			return;
 		} else
 			CHECK;
@@ -746,7 +746,7 @@ char	ssno[9], sdno[9];
 		for(sptr = ++cptr; *sptr && isascii(*sptr) && isdigit(*sptr); sptr++)
 			;
 		if( (sptr == cptr) || (*sptr != '\0' && *sptr != '.') ) {
-			delete("Bad display number in XT_DISPLAY.");
+			delete("Bad display number in DISPLAY.");
 			return;
 		} else
 			CHECK;
@@ -764,7 +764,7 @@ char	ssno[9], sdno[9];
 			for(cptr = ++sptr; *sptr && isascii(*sptr) && isdigit(*sptr); sptr++)
 				;
 			if(*sptr) {
-				delete("Bad screen number in XT_DISPLAY.");
+				delete("Bad screen number in DISPLAY.");
 				return;
 			} else
 				CHECK;
@@ -780,7 +780,7 @@ char	ssno[9], sdno[9];
 
 		} else {
 			CHECK; CHECK;
-			sno = 0; /* No screen number in XT_DISPLAY, assume zero. */
+			sno = 0; /* No screen number in DISPLAY, assume zero. */
 		}
 	}
 
@@ -845,7 +845,7 @@ then a call to xname opens the most efficient transport connection
 available to the specified display server and default screen on the client machine.
 >>STRATEGY
 If the system is POSIX compliant and supports TCP and a local display server:
-  Obtain the display and screen numbers from XT_DISPLAY.
+  Obtain the display and screen numbers from DISPLAY.
   Open a connection of the form :number.display.
   Verify that the call did not return NULL.
   Issue a NoOperation request using XNoOp.
@@ -885,7 +885,7 @@ char	ssno[9], sdno[9];
 		;
 
 	if(*cptr == '\0') {
-		delete("XT_DISPLAY does not specify a display.");
+		delete("DISPLAY does not specify a display.");
 		return;
 	} else {
 		CHECK;
@@ -893,7 +893,7 @@ char	ssno[9], sdno[9];
 		for(sptr = ++cptr; *sptr && isascii(*sptr) && isdigit(*sptr); sptr++)
 			;
 		if( (sptr == cptr) || (*sptr != '\0' && *sptr != '.') ) {
-			delete("Bad display number in XT_DISPLAY.");
+			delete("Bad display number in DISPLAY.");
 			return;
 		} else
 			CHECK;
@@ -911,7 +911,7 @@ char	ssno[9], sdno[9];
 			for(cptr = ++sptr; *sptr && isascii(*sptr) && isdigit(*sptr); sptr++)
 				;
 			if(*sptr) {
-				delete("Bad screen number in XT_DISPLAY.");
+				delete("Bad screen number in DISPLAY.");
 				return;
 			} else
 				CHECK;
@@ -927,7 +927,7 @@ char	ssno[9], sdno[9];
 
 		} else {
 			CHECK; CHECK;
-			sno = 0; /* No screen number in XT_DISPLAY, assume zero. */
+			sno = 0; /* No screen number in DISPLAY, assume zero. */
 		}
 	}
 
diff --git a/xts5/Xlib3/XScreenCount.m b/xts5/Xlib3/XScreenCount.m
index 6a165f75..a9d612ab 100644
--- a/xts5/Xlib3/XScreenCount.m
+++ b/xts5/Xlib3/XScreenCount.m
@@ -106,7 +106,7 @@ Display	*display = Dsp;
 >>#
 >># COMMENT:	Could maybe assume numbering scheme for screen to be 0,1,2...
 >>#		then try to open each one using XOpenDisplay with a modified
->>#		XT_DISPLAY value.
+>>#		DISPLAY value.
 >>#
 >># Cal 24/7/91
 >># REPLY:	This is now done in the appropriate test for XOpenDisplay.
diff --git a/xts5/Xlib9/XLoadFont/XLoadFont.m b/xts5/Xlib9/XLoadFont/XLoadFont.m
index f93d4934..f73e325b 100644
--- a/xts5/Xlib9/XLoadFont/XLoadFont.m
+++ b/xts5/Xlib9/XLoadFont/XLoadFont.m
@@ -151,7 +151,7 @@ For each visual supported for the default screen:
   Draw string with single character.
   Pixmap verify.
 Note: this tests the GC's for the default screen. 
-To test for other screens, re-run the test suite with XT_DISPLAY set 
+To test for other screens, re-run the test suite with DISPLAY set 
 to number of required screen.
 >>CODE
 XVisualInfo	*vp;
diff --git a/xts5/Xlib9/XLoadQueryFont/XLoadQueryFont.m b/xts5/Xlib9/XLoadQueryFont/XLoadQueryFont.m
index a4a018a0..d51b890c 100644
--- a/xts5/Xlib9/XLoadQueryFont/XLoadQueryFont.m
+++ b/xts5/Xlib9/XLoadQueryFont/XLoadQueryFont.m
@@ -150,7 +150,7 @@ For each visual supported for the default screen:
   Draw string with single character.
   Pixmap verify.
 Note: this tests the GC's for the default screen. 
-To test for other screens, re-run the test suite with XT_DISPLAY set 
+To test for other screens, re-run the test suite with DISPLAY set 
 to number of required screen.
 >>CODE
 XVisualInfo	*vp;
diff --git a/xts5/Xt13/XtResolvePathname/XtResolvePathname.m b/xts5/Xt13/XtResolvePathname/XtResolvePathname.m
index 70b3f893..5f2ea6b3 100644
--- a/xts5/Xt13/XtResolvePathname/XtResolvePathname.m
+++ b/xts5/Xt13/XtResolvePathname/XtResolvePathname.m
@@ -355,14 +355,14 @@ char *contents = "ApTest.customization:CUSTOM";
 	/*
 	** open display
 	*/
-	cfgdisplay = tet_getvar("XT_DISPLAY");
+	cfgdisplay = getenv("DISPLAY");
 	if (cfgdisplay == 0) {
-		tet_infoline("ERROR: XT_DISPLAY not set in tet_exec.cfg");
+		tet_infoline("ERROR: DISPLAY not set");
 		tet_result(TET_UNRESOLVED);
 		exit(0);
 	}
 	if (strlen(cfgdisplay) == 0) {
-		tet_infoline("ERROR: XT_DISPLAY has empty value in tet_exec.cfg");
+		tet_infoline("ERROR: DISPLAY has empty value");
 		tet_result(TET_UNRESOLVED);
 		exit(0);
 	}
diff --git a/xts5/bin/xts-config b/xts5/bin/xts-config
index 390fcf89..ea4bd6f3 100755
--- a/xts5/bin/xts-config
+++ b/xts5/bin/xts-config
@@ -24,7 +24,7 @@ BEGIN
 
 	open(INFO, "$xdpyinfo |") or die "$xdpyinfo failed, giving up.\n";
 	my @xdpyinfopats = (
-		[qr/^name of display:\s*(.*)/, qw(XT_DISPLAY)],
+		[qr/^name of display:\s*(.*)/, qw(DISPLAY)],
 		[qr/^version number:\s*(\d+)\.(\d+)/, qw(XT_PROTOCOL_VERSION XT_PROTOCOL_REVISION)],
 		[qr/^vendor string:\s*(.*)/, qw(XT_SERVER_VENDOR)],
 		[qr/^vendor release number:\s*(\d+)/, qw(XT_VENDOR_RELEASE)],
@@ -71,7 +71,7 @@ BEGIN
 
 	$::vars{"XT_VISUAL_CLASSES"} = join ' ', keys %visuals;
 
-	if($::vars{"XT_DISPLAY"} =~ /^:(\d+)\.(\d+)$/)
+	if($::vars{"DISPLAY"} =~ /^:(\d+)\.(\d+)$/)
 	{
 		$::vars{"XT_LOCAL"} = "Yes";
 		my $hostname = hostname();
diff --git a/xts5/src/bin/scripts/pt b/xts5/src/bin/scripts/pt
index f4366c3b..0e0f8db3 100755
--- a/xts5/src/bin/scripts/pt
+++ b/xts5/src/bin/scripts/pt
@@ -37,7 +37,7 @@ do
 		shift
 		;;
 	-d)
-		echo "XT_DISPLAY=$2" >> CONFIG
+		echo "DISPLAY=$2" >> CONFIG
 		shift
 		;;
 	-i)
@@ -70,13 +70,6 @@ do
 	shift
 done
 
-# If the display variable is not set on the command line then
-# this will cause the display in DISPLAY to be used.
-
-if [ "$DISPLAY" != "" ]; then
-	echo "XT_DISPLAY=$DISPLAY" >> CONFIG
-fi
-
 # config=${TET_CONFIG:-$TET_ROOT/xts5/tetexec.cfg}
 # Since :- is not universal, and I really want that functionality.
 if [ x"$TET_CONFIG" = x"" ]; then
diff --git a/xts5/src/lib/XInput.c b/xts5/src/lib/XInput.c
index 09285cd3..62e93bf3 100644
--- a/xts5/src/lib/XInput.c
+++ b/xts5/src/lib/XInput.c
@@ -166,10 +166,10 @@ Setup_Extension_DeviceInfo(dmask)
     /*
      * Get the display to use and open it.
      */
-    disp = tet_getvar("XT_DISPLAY");
+    disp = getenv("DISPLAY");
 
     if (disp == (char*)0) {
-	report("XT_DISPLAY is not set in tetexec.cfg.  Cannot continue");
+        report("DISPLAY is not set.  Cannot continue");
 	return(False);
     }
 
diff --git a/xts5/src/lib/config.c b/xts5/src/lib/config.c
index 0b444201..d4323ad9 100644
--- a/xts5/src/lib/config.c
+++ b/xts5/src/lib/config.c
@@ -209,7 +209,6 @@ struct	getparam parm[] = {
 	/* General configuration parameters */
 
 	{"XT_COVERAGE", T_INT, (char*)&config.coverage, 0},
-	{"XT_DISPLAY", T_STRING, (char*)&config.display, 0},
 	{"XT_ALT_SCREEN", T_INT, (char*)&config.alt_screen, 0},
 	{"XT_FONTPATH", T_STRING, (char*)&config.fontpath, 0},
 	{"XT_SPEEDFACTOR", T_INT, (char*)&config.speedfactor, 0},
diff --git a/xts5/src/lib/ex_startup.c b/xts5/src/lib/ex_startup.c
index bcaff37e..44e15d7b 100644
--- a/xts5/src/lib/ex_startup.c
+++ b/xts5/src/lib/ex_startup.c
@@ -176,10 +176,10 @@ extern	int 	io_err();
 	/*
 	 * Get the display to use and open it.
 	 */
-	disp = tet_getvar("XT_DISPLAY");
+	disp = getenv("DISPLAY");
 
 	if (disp == (char*)0) {
-		report("exec_startup:XT_DISPLAY not set");
+		report("exec_startup:DISPLAY not set");
 		UNRESOLVED;
 		exit(0);
 	}
diff --git a/xts5/src/lib/opendisp.c b/xts5/src/lib/opendisp.c
index 1146d4ed..6838f850 100644
--- a/xts5/src/lib/opendisp.c
+++ b/xts5/src/lib/opendisp.c
@@ -121,7 +121,7 @@ purpose.  It is provided "as is" without express or implied warranty.
 #include	"tet_api.h"
 
 /*
- * Open the display in XT_DISPLAY.
+ * Open the display in DISPLAY.
  */
 
 Display *
diff --git a/xts5/src/lib/startup.c b/xts5/src/lib/startup.c
index 4986f626..8370eb3e 100644
--- a/xts5/src/lib/startup.c
+++ b/xts5/src/lib/startup.c
@@ -224,11 +224,11 @@ extern	int 	io_err();
 	/*
 	 * Get the display to use and open it.
 	 */
-	disp = tet_getvar("XT_DISPLAY");
+	disp = getenv("DISPLAY");
 
 	if (disp == (char*)0) {
 /*
-		report("XT_DISPLAY was not set.  Can not continue.");
+		report("DISPLAY was not set.  Can not continue.");
 */
 		for (i = 0; i < ntests; i++)
 			tet_testlist[i].testfunc = aborttest;
diff --git a/xts5/src/libXR5/r5startup.c b/xts5/src/libXR5/r5startup.c
index b589b37d..301fa6ca 100644
--- a/xts5/src/libXR5/r5startup.c
+++ b/xts5/src/libXR5/r5startup.c
@@ -221,12 +221,12 @@ extern	int 	io_err();
 	/*
 	 * Get the display to use and open it.
 	 */
-	disp = tet_getvar("XT_DISPLAY");
+	disp = getenv("DISPLAY");
 
 	if (disp == (char*)0) 
 	{
 /*
-		report("XT_DISPLAY was not set.  Can not continue.");
+		report("DISPLAY was not set.  Can not continue.");
 */
 		for (i = 0; i < ntests; i++)
 			tet_testlist[i].testfunc = aborttest;
diff --git a/xts5/src/libXtTest/avs_init.c b/xts5/src/libXtTest/avs_init.c
index 1662746d..ee347387 100644
--- a/xts5/src/libXtTest/avs_init.c
+++ b/xts5/src/libXtTest/avs_init.c
@@ -119,14 +119,14 @@ int argcount;
 	/*
 	** open display
 	*/
-	cfgdisplay = tet_getvar("XT_DISPLAY");
+	cfgdisplay = getenv("DISPLAY");
 	if (cfgdisplay == 0) {
-		tet_infoline("ERROR: avs_xt_init: XT_DISPLAY not set in tet_exec.cfg");
+		tet_infoline("ERROR: avs_xt_init: DISPLAY not set");
 		tet_result(TET_UNRESOLVED);
 		exit(0);
 	}
 	if (strlen(cfgdisplay) == 0) {
-		tet_infoline("ERROR: avs_xt_init: XT_DISPLAY has empty value in tet_exec.cfg");
+		tet_infoline("ERROR: avs_xt_init: DISPLAY has empty value");
 		tet_result(TET_UNRESOLVED);
 		exit(0);
 	}
diff --git a/xts5/src/libXtTest/avs_xext.c b/xts5/src/libXtTest/avs_xext.c
index 01a9ac24..64fc90fb 100644
--- a/xts5/src/libXtTest/avs_xext.c
+++ b/xts5/src/libXtTest/avs_xext.c
@@ -103,14 +103,14 @@ Window avs_xext_init()
 	(void)XSetIOErrorHandler(x_handler);    /*X Handler for severe errors */
 	(void)XSetErrorHandler(x_unexperr);     /* Unexpected XError handler */
 
-	cfgdisplay = tet_getvar("XT_DISPLAY");
+	cfgdisplay = getenv("DISPLAY");
 	if (cfgdisplay == 0) {
-		tet_infoline("ERROR: avs_xt_init: XT_DISPLAY not set in tet_exec.cfg");
+		tet_infoline("ERROR: avs_xt_init: DISPLAY not set");
 		tet_result(TET_UNRESOLVED);
 		exit(0);
 	}
 	if (strlen(cfgdisplay) == 0) {
-		tet_infoline("ERROR: avs_xt_init: XT_DISPLAY has empty value in tet_exec.cfg");
+		tet_infoline("ERROR: avs_xt_init: DISPLAY has empty value");
 		tet_result(TET_UNRESOLVED);
 		exit(1);
 	}
diff --git a/xts5/src/libproto/ClientMng.c b/xts5/src/libproto/ClientMng.c
index 934f3e1c..aa9f63b3 100644
--- a/xts5/src/libproto/ClientMng.c
+++ b/xts5/src/libproto/ClientMng.c
@@ -349,7 +349,7 @@ int	cl; /* client number */
     if (display == NULL || *display == '\0') {
 	if ((display_name = getenv ("DISPLAY")) == NULL) {
 	/* Oops! No DISPLAY environment variable - error. */
-	    Log_Msg ("No XT_DISPLAY and no DISPLAY environment variable\n");
+	    Log_Msg ("No DISPLAY environment variable\n");
 	    Delete ();
 	}
     }
diff --git a/xts5/src/libproto/startup.c b/xts5/src/libproto/startup.c
index 9f1ef52b..e3722d79 100644
--- a/xts5/src/libproto/startup.c
+++ b/xts5/src/libproto/startup.c
@@ -205,10 +205,10 @@ extern	int	io_err(),	unexp_err();
 	/*
 	 * Get the display to use and open it.
 	 */
-	disp = tet_getvar("XT_DISPLAY");
+	disp = getenv("DISPLAY");
 
 	if (disp == (char*)0) {
-		cancelrest("XT_DISPLAY not set");
+		cancelrest("DISPLAY not set");
 		return;
 	}
 
diff --git a/xts5/tetexec.cfg.in b/xts5/tetexec.cfg.in
index 496018c8..76a73f20 100644
--- a/xts5/tetexec.cfg.in
+++ b/xts5/tetexec.cfg.in
@@ -167,10 +167,6 @@ TET_SAVE_FILES=Err*.err,*.sav
 # Please see Section 4.1.2 of the User's Guide for additional information.
 XT_COVERAGE=1
 
-# XT_DISPLAY - A string that identifies the display and screen to
-# run the tests for.
-XT_DISPLAY=
-
 # XT_ALT_SCREEN - If the display supports more than one screen then
 # this parameter should be set to one that is not under test.
 # Set to the string UNSUPPORTED if only one screen is available.
@@ -220,7 +216,7 @@ XT_EXTENSIONS=No
 ###########################################################
 
 # XT_VISUAL_CLASSES - A space separated list of the visual classes that
-# are supported for the screen given by XT_DISPLAY.  Each visual class
+# are supported for the screen given by DISPLAY.  Each visual class
 # is followed by a list of depths at which the class is supported
 # (enclosed by brackets and separated by commas with no spaces).
 # Visual classes and depths that are supported only by other screens
@@ -349,7 +345,7 @@ XT_TCP=Yes
 
 # XT_DISPLAYHOST - Set this to the hostname of the machine on which 
 # the display is physically attached. This will be used instead of
-# XT_DISPLAY (on a POSIX system) in the tests for XOpenDisplay which
+# DISPLAY (on a POSIX system) in the tests for XOpenDisplay which
 # specifically test the hostname component of the display name.
 # Note that this may not be the same as the machine on which the 
 # test suite clients execute (XTESTHOST).