xts5: Flatten Xlib5 directory more

19 files changed, 75 insertions, 75 deletions

diff --git a/xts5/Xlib5/.gitignore b/xts5/Xlib5/.gitignore
index 998d811b..60d55060 100644
--- a/xts5/Xlib5/.gitignore
+++ b/xts5/Xlib5/.gitignore
@@ -1,15 +1,15 @@
-XChangeProperty/XChangeProperty
-XConvertSelection/XConvertSelection
-XDeleteProperty/XDeleteProperty
-XGetAtomName/XGetAtomName
-XGetGeometry/XGetGeometry
-XGetSelectionOwner/XGetSelectionOwner
-XGetWindowAttributes/XGetWindowAttributes
-XGetWindowProperty/XGetWindowProperty
-XInternAtom/XInternAtom
-XListProperties/XListProperties
-XQueryPointer/XQueryPointer
-XQueryTree/XQueryTree
-XRotateWindowProperties/XRotateWindowProperties
-XSetSelectionOwner/XSetSelectionOwner
-XTranslateCoordinates/XTranslateCoordinates
+XChangeProperty
+XConvertSelection
+XDeleteProperty
+XGetAtomName
+XGetGeometry
+XGetSelectionOwner
+XGetWindowAttributes
+XGetWindowProperty
+XInternAtom
+XListProperties
+XQueryPointer
+XQueryTree
+XRotateWindowProperties
+XSetSelectionOwner
+XTranslateCoordinates
diff --git a/xts5/Xlib5/Makefile.am b/xts5/Xlib5/Makefile.am
index b1fc6cac..6a5c93fd 100644
--- a/xts5/Xlib5/Makefile.am
+++ b/xts5/Xlib5/Makefile.am
@@ -9,18 +9,18 @@ BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
 tprogs = \
-	XChangeProperty/XChangeProperty \
-	XConvertSelection/XConvertSelection \
-	XDeleteProperty/XDeleteProperty \
-	XGetAtomName/XGetAtomName \
-	XGetGeometry/XGetGeometry \
-	XGetSelectionOwner/XGetSelectionOwner \
-	XGetWindowAttributes/XGetWindowAttributes \
-	XGetWindowProperty/XGetWindowProperty \
-	XInternAtom/XInternAtom \
-	XListProperties/XListProperties \
-	XQueryPointer/XQueryPointer \
-	XQueryTree/XQueryTree \
-	XRotateWindowProperties/XRotateWindowProperties \
-	XSetSelectionOwner/XSetSelectionOwner \
-	XTranslateCoordinates/XTranslateCoordinates
+	XChangeProperty \
+	XConvertSelection \
+	XDeleteProperty \
+	XGetAtomName \
+	XGetGeometry \
+	XGetSelectionOwner \
+	XGetWindowAttributes \
+	XGetWindowProperty \
+	XInternAtom \
+	XListProperties \
+	XQueryPointer \
+	XQueryTree \
+	XRotateWindowProperties \
+	XSetSelectionOwner \
+	XTranslateCoordinates
diff --git a/xts5/Xlib5/XChangeProperty/XChangeProperty.m b/xts5/Xlib5/XChangeProperty.m
index 93cda24b..8a2b5708 100644
--- a/xts5/Xlib5/XChangeProperty/XChangeProperty.m
+++ b/xts5/Xlib5/XChangeProperty.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib5/XChangeProperty/XChangeProperty.m
+>># File: xts5/Xlib5/XChangeProperty.m
 >># 
 >># Description:
 >># 	Tests for XChangeProperty()
diff --git a/xts5/Xlib5/XConvertSelection/XConvertSelection.m b/xts5/Xlib5/XConvertSelection.m
index a7876377..fd452ade 100644
--- a/xts5/Xlib5/XConvertSelection/XConvertSelection.m
+++ b/xts5/Xlib5/XConvertSelection.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib5/XConvertSelection/XConvertSelection.m
+>># File: xts5/Xlib5/XConvertSelection.m
 >># 
 >># Description:
 >># 	Tests for XConvertSelection()
diff --git a/xts5/Xlib5/XDeleteProperty/XDeleteProperty.m b/xts5/Xlib5/XDeleteProperty.m
index a80d4580..cbe1e7c9 100644
--- a/xts5/Xlib5/XDeleteProperty/XDeleteProperty.m
+++ b/xts5/Xlib5/XDeleteProperty.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib5/XDeleteProperty/XDeleteProperty.m
+>># File: xts5/Xlib5/XDeleteProperty.m
 >># 
 >># Description:
 >># 	Tests for XDeleteProperty()
diff --git a/xts5/Xlib5/XGetAtomName/XGetAtomName.m b/xts5/Xlib5/XGetAtomName.m
index 567d17a8..237674f2 100644
--- a/xts5/Xlib5/XGetAtomName/XGetAtomName.m
+++ b/xts5/Xlib5/XGetAtomName.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib5/XGetAtomName/XGetAtomName.m
+>># File: xts5/Xlib5/XGetAtomName.m
 >># 
 >># Description:
 >># 	Tests for XGetAtomName()
diff --git a/xts5/Xlib5/XGetGeometry/XGetGeometry.m b/xts5/Xlib5/XGetGeometry.m
index bb508027..5082beda 100644
--- a/xts5/Xlib5/XGetGeometry/XGetGeometry.m
+++ b/xts5/Xlib5/XGetGeometry.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib5/XGetGeometry/XGetGeometry.m
+>># File: xts5/Xlib5/XGetGeometry.m
 >># 
 >># Description:
 >># 	Tests for XGetGeometry()
diff --git a/xts5/Xlib5/XGetSelectionOwner/XGetSelectionOwner.m b/xts5/Xlib5/XGetSelectionOwner.m
index 0ee40dbe..3ef752b0 100644
--- a/xts5/Xlib5/XGetSelectionOwner/XGetSelectionOwner.m
+++ b/xts5/Xlib5/XGetSelectionOwner.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib5/XGetSelectionOwner/XGetSelectionOwner.m
+>># File: xts5/Xlib5/XGetSelectionOwner.m
 >># 
 >># Description:
 >># 	Tests for XGetSelectionOwner()
diff --git a/xts5/Xlib5/XGetWindowAttributes/XGetWindowAttributes.m b/xts5/Xlib5/XGetWindowAttributes.m
index 9ab1ffcd..6b3efe94 100644
--- a/xts5/Xlib5/XGetWindowAttributes/XGetWindowAttributes.m
+++ b/xts5/Xlib5/XGetWindowAttributes.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib5/XGetWindowAttributes/XGetWindowAttributes.m
+>># File: xts5/Xlib5/XGetWindowAttributes.m
 >># 
 >># Description:
 >># 	Tests for XGetWindowAttributes()
diff --git a/xts5/Xlib5/XGetWindowProperty/XGetWindowProperty.m b/xts5/Xlib5/XGetWindowProperty.m
index 4ad21daf..895adb5a 100644
--- a/xts5/Xlib5/XGetWindowProperty/XGetWindowProperty.m
+++ b/xts5/Xlib5/XGetWindowProperty.m
@@ -24,7 +24,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib5/XGetWindowProperty/XGetWindowProperty.m
+>># File: xts5/Xlib5/XGetWindowProperty.m
 >># 
 >># Description:
 >># 	Tests for XGetWindowProperty()
diff --git a/xts5/Xlib5/XInternAtom/XInternAtom.m b/xts5/Xlib5/XInternAtom.m
index 72a778e5..241c6417 100644
--- a/xts5/Xlib5/XInternAtom/XInternAtom.m
+++ b/xts5/Xlib5/XInternAtom.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib5/XInternAtom/XInternAtom.m
+>># File: xts5/Xlib5/XInternAtom.m
 >># 
 >># Description:
 >># 	Tests for XInternAtom()
diff --git a/xts5/Xlib5/XListProperties/XListProperties.m b/xts5/Xlib5/XListProperties.m
index 5181176b..6cd0293d 100644
--- a/xts5/Xlib5/XListProperties/XListProperties.m
+++ b/xts5/Xlib5/XListProperties.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib5/XListProperties/XListProperties.m
+>># File: xts5/Xlib5/XListProperties.m
 >># 
 >># Description:
 >># 	Tests for XListProperties()
diff --git a/xts5/Xlib5/XQueryPointer/XQueryPointer.m b/xts5/Xlib5/XQueryPointer.m
index 0bad14df..0eb0c641 100644
--- a/xts5/Xlib5/XQueryPointer/XQueryPointer.m
+++ b/xts5/Xlib5/XQueryPointer.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib5/XQueryPointer/XQueryPointer.m
+>># File: xts5/Xlib5/XQueryPointer.m
 >># 
 >># Description:
 >># 	Tests for XQueryPointer()
diff --git a/xts5/Xlib5/XQueryTree/XQueryTree.m b/xts5/Xlib5/XQueryTree.m
index 28fc5b37..b58adfb9 100644
--- a/xts5/Xlib5/XQueryTree/XQueryTree.m
+++ b/xts5/Xlib5/XQueryTree.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib5/XQueryTree/XQueryTree.m
+>># File: xts5/Xlib5/XQueryTree.m
 >># 
 >># Description:
 >># 	Tests for XQueryTree()
diff --git a/xts5/Xlib5/XRotateWindowProperties/XRotateWindowProperties.m b/xts5/Xlib5/XRotateWindowProperties.m
index ba035c7a..c0174a3d 100644
--- a/xts5/Xlib5/XRotateWindowProperties/XRotateWindowProperties.m
+++ b/xts5/Xlib5/XRotateWindowProperties.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib5/XRotateWindowProperties/XRotateWindowProperties.m
+>># File: xts5/Xlib5/XRotateWindowProperties.m
 >># 
 >># Description:
 >># 	Tests for XRotateWindowProperties()
diff --git a/xts5/Xlib5/XSetSelectionOwner/XSetSelectionOwner.m b/xts5/Xlib5/XSetSelectionOwner.m
index e28f7bbb..e68358c0 100644
--- a/xts5/Xlib5/XSetSelectionOwner/XSetSelectionOwner.m
+++ b/xts5/Xlib5/XSetSelectionOwner.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib5/XSetSelectionOwner/XSetSelectionOwner.m
+>># File: xts5/Xlib5/XSetSelectionOwner.m
 >># 
 >># Description:
 >># 	Tests for XSetSelectionOwner()
diff --git a/xts5/Xlib5/XTranslateCoordinates/XTranslateCoordinates.m b/xts5/Xlib5/XTranslateCoordinates.m
index 26ea73c2..dfbfc298 100644
--- a/xts5/Xlib5/XTranslateCoordinates/XTranslateCoordinates.m
+++ b/xts5/Xlib5/XTranslateCoordinates.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib5/XTranslateCoordinates/XTranslateCoordinates.m
+>># File: xts5/Xlib5/XTranslateCoordinates.m
 >># 
 >># Description:
 >># 	Tests for XTranslateCoordinates()
diff --git a/xts5/scenarios/Xlib5_scen b/xts5/scenarios/Xlib5_scen
index ba125ebf..e77425c9 100644
--- a/xts5/scenarios/Xlib5_scen
+++ b/xts5/scenarios/Xlib5_scen
@@ -55,32 +55,32 @@
 #
 
 	"VSW5TESTSUITE CASE XChangeProperty 13"
-	/Xlib5/XChangeProperty/XChangeProperty
+	/Xlib5/XChangeProperty
 	"VSW5TESTSUITE CASE XConvertSelection 5"
-	/Xlib5/XConvertSelection/XConvertSelection
+	/Xlib5/XConvertSelection
 	"VSW5TESTSUITE CASE XDeleteProperty 4"
-	/Xlib5/XDeleteProperty/XDeleteProperty
+	/Xlib5/XDeleteProperty
 	"VSW5TESTSUITE CASE XGetAtomName 2"
-	/Xlib5/XGetAtomName/XGetAtomName
+	/Xlib5/XGetAtomName
 	"VSW5TESTSUITE CASE XGetGeometry 4"
-	/Xlib5/XGetGeometry/XGetGeometry
+	/Xlib5/XGetGeometry
 	"VSW5TESTSUITE CASE XGetSelectionOwner 3"
-	/Xlib5/XGetSelectionOwner/XGetSelectionOwner
+	/Xlib5/XGetSelectionOwner
 	"VSW5TESTSUITE CASE XGetWindowAttributes 3"
-	/Xlib5/XGetWindowAttributes/XGetWindowAttributes
+	/Xlib5/XGetWindowAttributes
 	"VSW5TESTSUITE CASE XGetWindowProperty 10"
-	/Xlib5/XGetWindowProperty/XGetWindowProperty
+	/Xlib5/XGetWindowProperty
 	"VSW5TESTSUITE CASE XInternAtom 8"
-	/Xlib5/XInternAtom/XInternAtom
+	/Xlib5/XInternAtom
 	"VSW5TESTSUITE CASE XListProperties 3"
-	/Xlib5/XListProperties/XListProperties
+	/Xlib5/XListProperties
 	"VSW5TESTSUITE CASE XQueryPointer 6"
-	/Xlib5/XQueryPointer/XQueryPointer
+	/Xlib5/XQueryPointer
 	"VSW5TESTSUITE CASE XQueryTree 3"
-	/Xlib5/XQueryTree/XQueryTree
+	/Xlib5/XQueryTree
 	"VSW5TESTSUITE CASE XRotateWindowProperties 6"
-	/Xlib5/XRotateWindowProperties/XRotateWindowProperties
+	/Xlib5/XRotateWindowProperties
 	"VSW5TESTSUITE CASE XSetSelectionOwner 9"
-	/Xlib5/XSetSelectionOwner/XSetSelectionOwner
+	/Xlib5/XSetSelectionOwner
 	"VSW5TESTSUITE CASE XTranslateCoordinates 5"
-	/Xlib5/XTranslateCoordinates/XTranslateCoordinates
+	/Xlib5/XTranslateCoordinates
diff --git a/xts5/tet_scen b/xts5/tet_scen
index dbb9b612..59392c2e 100644
--- a/xts5/tet_scen
+++ b/xts5/tet_scen
@@ -2431,63 +2431,63 @@ XVisualIDFromVisual
 
 XChangeProperty
 	"VSW5TESTSUITE CASE XChangeProperty 13"
-	/Xlib5/XChangeProperty/XChangeProperty
+	/Xlib5/XChangeProperty
 
 XConvertSelection
 	"VSW5TESTSUITE CASE XConvertSelection 5"
-	/Xlib5/XConvertSelection/XConvertSelection
+	/Xlib5/XConvertSelection
 
 XDeleteProperty
 	"VSW5TESTSUITE CASE XDeleteProperty 4"
-	/Xlib5/XDeleteProperty/XDeleteProperty
+	/Xlib5/XDeleteProperty
 
 XGetAtomName
 	"VSW5TESTSUITE CASE XGetAtomName 2"
-	/Xlib5/XGetAtomName/XGetAtomName
+	/Xlib5/XGetAtomName
 
 XGetGeometry
 	"VSW5TESTSUITE CASE XGetGeometry 4"
-	/Xlib5/XGetGeometry/XGetGeometry
+	/Xlib5/XGetGeometry
 
 XGetSelectionOwner
 	"VSW5TESTSUITE CASE XGetSelectionOwner 3"
-	/Xlib5/XGetSelectionOwner/XGetSelectionOwner
+	/Xlib5/XGetSelectionOwner
 
 XGetWindowAttributes
 	"VSW5TESTSUITE CASE XGetWindowAttributes 3"
-	/Xlib5/XGetWindowAttributes/XGetWindowAttributes
+	/Xlib5/XGetWindowAttributes
 
 XGetWindowProperty
 	"VSW5TESTSUITE CASE XGetWindowProperty 10"
-	/Xlib5/XGetWindowProperty/XGetWindowProperty
+	/Xlib5/XGetWindowProperty
 
 XInternAtom
 	"VSW5TESTSUITE CASE XInternAtom 8"
-	/Xlib5/XInternAtom/XInternAtom
+	/Xlib5/XInternAtom
 
 XListProperties
 	"VSW5TESTSUITE CASE XListProperties 3"
-	/Xlib5/XListProperties/XListProperties
+	/Xlib5/XListProperties
 
 XQueryPointer
 	"VSW5TESTSUITE CASE XQueryPointer 6"
-	/Xlib5/XQueryPointer/XQueryPointer
+	/Xlib5/XQueryPointer
 
 XQueryTree
 	"VSW5TESTSUITE CASE XQueryTree 3"
-	/Xlib5/XQueryTree/XQueryTree
+	/Xlib5/XQueryTree
 
 XRotateWindowProperties
 	"VSW5TESTSUITE CASE XRotateWindowProperties 6"
-	/Xlib5/XRotateWindowProperties/XRotateWindowProperties
+	/Xlib5/XRotateWindowProperties
 
 XSetSelectionOwner
 	"VSW5TESTSUITE CASE XSetSelectionOwner 9"
-	/Xlib5/XSetSelectionOwner/XSetSelectionOwner
+	/Xlib5/XSetSelectionOwner
 
 XTranslateCoordinates
 	"VSW5TESTSUITE CASE XTranslateCoordinates 5"
-	/Xlib5/XTranslateCoordinates/XTranslateCoordinates
+	/Xlib5/XTranslateCoordinates
 
 
 # Discrete tests for Xlib Chapter 6-Pixmap and Cursor Functions