Update to x11perf 1.7.0

1 files changed, 118 insertions, 90 deletions

diff --git a/app/x11perf/do_tests.c b/app/x11perf/do_tests.c
index e6ff767d9..98c1ba601 100644
--- a/app/x11perf/do_tests.c
+++ b/app/x11perf/do_tests.c
@@ -3,13 +3,13 @@ Copyright 1988, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -45,7 +45,7 @@ Test test[] = {
   {"-rect100",  "100x100 rectangle", NULL,
 		InitRectangles, DoRectangles, NullProc, EndRectangles,
 		V1_2FEATURE, ROP, 0,
-		{36, 100, NULL, NULL, FillSolid}},
+		{25, 100, NULL, NULL, FillSolid}},
   {"-rect500",  "500x500 rectangle", NULL,
 		InitRectangles, DoRectangles, NullProc, EndRectangles,
 		V1_2FEATURE, ROP, 0,
@@ -64,7 +64,7 @@ Test test[] = {
 		"100x100 stippled rectangle (8x8 stipple)",
 		InitRectangles, DoRectangles, NullProc, EndRectangles,
 		V1_2FEATURE, ROP, 0,
-		{36, 100, NULL, NULL, FillStippled}},
+		{25, 100, NULL, NULL, FillStippled}},
   {"-srect500", "500x500 stippled rectangle",
 		"500x500 stippled rectangle (8x8 stipple)",
 		InitRectangles, DoRectangles, NullProc, EndRectangles,
@@ -84,7 +84,7 @@ Test test[] = {
 		"100x100 opaque stippled rectangle (8x8 stipple)",
 		InitRectangles, DoRectangles, NullProc, EndRectangles,
 		V1_2FEATURE, ROP, 0,
-		{36, 100, NULL, NULL, FillOpaqueStippled}},
+		{25, 100, NULL, NULL, FillOpaqueStippled}},
   {"-osrect500", "500x500 opaque stippled rectangle",
 		"500x500 opaque stippled rectangle (8x8 stipple)",
 		InitRectangles, DoRectangles, NullProc, EndRectangles,
@@ -104,7 +104,7 @@ Test test[] = {
 		"100x100 tiled rectangle (4x4 tile)",
 		InitRectangles, DoRectangles, NullProc, EndRectangles,
 		V1_2FEATURE, ROP, 0,
-		{36, 100, NULL, NULL, FillTiled}},
+		{25, 100, NULL, NULL, FillTiled}},
   {"-tilerect500", "500x500 4x4 tiled rectangle",
 		"500x500 tiled rectangle (4x4 tile)",
 		InitRectangles, DoRectangles, NullProc, EndRectangles,
@@ -121,7 +121,7 @@ Test test[] = {
   {"-oddsrect100", "100x100 stippled rectangle (17x15 stipple)", NULL,
 		InitRectangles, DoRectangles, NullProc, EndRectangles,
 		V1_4FEATURE, ROP, 0,
-		{36, 100, "OddTile", NULL, FillStippled}},
+		{25, 100, "OddTile", NULL, FillStippled}},
   {"-oddsrect500", "500x500 stippled rectangle (17x15 stipple)", NULL,
 		InitRectangles, DoRectangles, NullProc, EndRectangles,
 		V1_4FEATURE, ROP, 0,
@@ -137,7 +137,7 @@ Test test[] = {
   {"-oddosrect100", "100x100 opaque stippled rectangle (17x15 stipple)", NULL,
 		InitRectangles, DoRectangles, NullProc, EndRectangles,
 		V1_4FEATURE, ROP, 0,
-		{36, 100, "OddTile", NULL, FillOpaqueStippled}},
+		{25, 100, "OddTile", NULL, FillOpaqueStippled}},
   {"-oddosrect500", "500x500 opaque stippled rectangle (17x15 stipple)", NULL,
 		InitRectangles, DoRectangles, NullProc, EndRectangles,
 		V1_4FEATURE, ROP, 0,
@@ -153,7 +153,7 @@ Test test[] = {
   {"-oddtilerect100", "100x100 tiled rectangle (17x15 tile)", NULL,
 		InitRectangles, DoRectangles, NullProc, EndRectangles,
 		V1_4FEATURE, ROP, 0,
-		{36, 100, "OddTile", NULL, FillTiled}},
+		{25, 100, "OddTile", NULL, FillTiled}},
   {"-oddtilerect500", "500x500 tiled rectangle (17x15 tile)", NULL,
 		InitRectangles, DoRectangles, NullProc, EndRectangles,
 		V1_4FEATURE, ROP, 0,
@@ -172,7 +172,7 @@ Test test[] = {
 		"100x100 stippled rectangle (161x145 stipple)",
 		InitRectangles, DoRectangles, NullProc, EndRectangles,
 		V1_3FEATURE, ROP, 0,
-		{36, 100, "mensetmanus", NULL, FillStippled}},
+		{25, 100, "mensetmanus", NULL, FillStippled}},
   {"-bigsrect500", "500x500 161x145 stippled rectangle",
 		"500x500 stippled rectangle (161x145 stipple)",
 		InitRectangles, DoRectangles, NullProc, EndRectangles,
@@ -192,7 +192,7 @@ Test test[] = {
 		"100x100 opaque stippled rectangle (161x145 stipple)",
 		InitRectangles, DoRectangles, NullProc, EndRectangles,
 		V1_3FEATURE, ROP, 0,
-		{36, 100, "mensetmanus", NULL, FillOpaqueStippled}},
+		{25, 100, "mensetmanus", NULL, FillOpaqueStippled}},
   {"-bigosrect500", "500x500 161x145 opaque stippled rectangle",
 		"500x500 opaque stippled rectangle (161x145 stipple)",
 		InitRectangles, DoRectangles, NullProc, EndRectangles,
@@ -212,7 +212,7 @@ Test test[] = {
 		"100x100 tiled rectangle (161x145 tile)",
 		InitRectangles, DoRectangles, NullProc, EndRectangles,
 		V1_2FEATURE, ROP, 0,
-		{36, 100, "mensetmanus", NULL, FillTiled}},
+		{25, 100, "mensetmanus", NULL, FillTiled}},
   {"-bigtilerect500", "500x500 161x145 tiled rectangle",
 		"500x500 tiled rectangle (161x145 tile)",
 		InitRectangles, DoRectangles, NullProc, EndRectangles,
@@ -232,7 +232,7 @@ Test test[] = {
 		"100x100 tiled rectangle (216x208 tile)",
 		InitRectangles, DoRectangles, NullProc, EndRectangles,
 		V1_3FEATURE, ROP, 0,
-		{36, 100, "escherknot", NULL, FillTiled}},
+		{25, 100, "escherknot", NULL, FillTiled}},
   {"-eschertilerect500", "500x500 216x208 tiled rectangle",
 		"500x500 tiled rectangle (216x208 tile)",
 		InitRectangles, DoRectangles, NullProc, EndRectangles,
@@ -289,7 +289,7 @@ Test test[] = {
   {"-hseg500",  "500-pixel horizontal line segment", NULL,
 		InitHorizSegments, DoSegments, NullProc, EndSegments,
 		V1_3FEATURE, ROP, 0,
-		{POLY, 500}},
+		{300, 500}},
   {"-vseg10",   "10-pixel vertical line segment", NULL,
 		InitVertSegments, DoSegments, NullProc, EndSegments,
 		V1_3FEATURE, ROP, 0,
@@ -301,31 +301,31 @@ Test test[] = {
   {"-vseg500",  "500-pixel vertical line segment", NULL,
 		InitVertSegments, DoSegments, NullProc, EndSegments,
 		V1_3FEATURE, ROP, 0,
-		{POLY, 500}},
+		{300, 500}},
   {"-whseg10",  "10x1 wide horizontal line segment", NULL,
 		InitWideHorizSegments, DoSegments, NullProc, EndSegments,
 		V1_3FEATURE, ROP, 0,
-		{200, 10}},
+		{POLY, 10}},
   {"-whseg100", "100x10 wide horizontal line segment", NULL,
 		InitWideHorizSegments, DoSegments, NullProc, EndSegments,
 		V1_3FEATURE, ROP, 0,
-		{100, 100}},
+		{270, 100}},
   {"-whseg500", "500x50 wide horizontal line segment", NULL,
 		InitWideHorizSegments, DoSegments, NullProc, EndSegments,
 		V1_3FEATURE, ROP, 0,
-		{50, 500}},
+		{10, 500}},
   {"-wvseg10",  "10x1 wide vertical line segment", NULL,
 		InitWideVertSegments, DoSegments, NullProc, EndSegments,
 		V1_3FEATURE, ROP, 0,
-		{200, 10}},
+		{POLY, 10}},
   {"-wvseg100", "100x10 wide vertical line segment", NULL,
 		InitWideVertSegments, DoSegments, NullProc, EndSegments,
 		V1_3FEATURE, ROP, 0,
-		{100, 100}},
+		{270, 100}},
   {"-wvseg500", "500x50 wide vertical line segment", NULL,
 		InitWideVertSegments, DoSegments, NullProc, EndSegments,
 		V1_3FEATURE, ROP, 0,
-		{50, 500}},
+		{10, 500}},
   {"-line1",   "1-pixel line", NULL,
 		InitLines, DoLines, NullProc, EndLines,
 		V1_2FEATURE, ROP, 0,
@@ -381,7 +381,7 @@ Test test[] = {
   {"-orect100", "100x100 rectangle outline", NULL,
 		InitRectangles, DoOutlineRectangles, NullProc, EndRectangles,
 		V1_3FEATURE, ROP, 0,
-		{36, 100, NULL, "0", FillSolid}},
+		{25, 100, NULL, "0", FillSolid}},
   {"-orect500",	"500x500 rectangle outline", NULL,
 		InitRectangles, DoOutlineRectangles, NullProc, EndRectangles,
 		V1_3FEATURE, ROP, 0,
@@ -393,7 +393,7 @@ Test test[] = {
   {"-worect100", "100x100 wide rectangle outline", NULL,
 		InitRectangles, DoOutlineRectangles, NullProc, EndRectangles,
 		V1_3FEATURE, ROP, 0,
-		{36, 100, NULL, "10", FillSolid}},
+		{25, 100, NULL, "10", FillSolid}},
   {"-worect500", "500x500 wide rectangle outline", NULL,
 		InitRectangles, DoOutlineRectangles, NullProc, EndRectangles,
 		V1_3FEATURE, ROP, 0,
@@ -783,7 +783,7 @@ Test test[] = {
 		"Fill 100x100 tiled trapezoid (216x208 tile)",
 		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
 		V1_3FEATURE, ROP, 0,
-		{36, 100, "escherknot", NULL, FillTiled}},
+		{25, 100, "escherknot", NULL, FillTiled}},
   {"-eschertiletrap300", "Fill 300x300 tiled trapezoid (216x208 tile)", NULL,
 		InitTrapezoids, DoTrapezoids, NullProc, EndTrapezoids,
 		V1_4FEATURE, ROP, 0,
@@ -816,7 +816,7 @@ Test test[] = {
   {"-aa4trap100", "Fill 100x100 aa trap with 4 bit alpha", NULL,
 		InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps,
 		V1_5FEATURE, NONROP, 0,
-		{POLY, 100, "4" }},
+		{25, 100, "4" }},
   {"-aa4trap300", "Fill 300x300 aa trap with 4 bit alpha", NULL,
 		InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps,
 		V1_5FEATURE, NONROP, 0,
@@ -832,11 +832,11 @@ Test test[] = {
   {"-aa1trap100", "Fill 100x100 aa trap with 1 bit alpha", NULL,
 		InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps,
 		V1_5FEATURE, NONROP, 0,
-		{POLY, 100, "1" }},
+		{25, 100, "1" }},
   {"-aa1trap300", "Fill 300x300 aa trap with 1 bit alpha", NULL,
 		InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps,
 		V1_5FEATURE, NONROP, 0,
-		{POLY, 300, "1" }},
+		{2, 300, "1" }},
 
   {"-aatrap2x1", "Fill 2x1 aa trap", NULL,
 		InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps,
@@ -849,11 +849,11 @@ Test test[] = {
   {"-aatrap2x100", "Fill 2x100 aa trap", NULL,
 		InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps,
 		V1_5FEATURE, NONROP, 0,
-		{POLY, 100, "8,2" }},
+		{25, 100, "8,2" }},
   {"-aatrap2x300", "Fill 2x300 aa trap", NULL,
 		InitFixedTraps, DoFixedTraps, NullProc, EndFixedTraps,
 		V1_5FEATURE, NONROP, 0,
-		{POLY, 300, "8,2" }},
+		{2, 300, "8,2" }},
 
   {"-aatrapezoid1", "Fill 1x1 aa trapezoid", NULL,
 		InitFixedTrapezoids, DoFixedTrapezoids, NullProc, EndFixedTrapezoids,
@@ -866,11 +866,11 @@ Test test[] = {
   {"-aatrapezoid100", "Fill 100x100 aa trapezoid", NULL,
 		InitFixedTrapezoids, DoFixedTrapezoids, NullProc, EndFixedTrapezoids,
 		V1_5FEATURE, NONROP, 0,
-		{POLY, 100 }},
+		{25, 100 }},
   {"-aatrapezoid300", "Fill 300x300 aa trapezoid", NULL,
 		InitFixedTrapezoids, DoFixedTrapezoids, NullProc, EndFixedTrapezoids,
 		V1_5FEATURE, NONROP, 0,
-		{POLY, 300 }},
+		{2, 300 }},
   {"-addaatrapezoid1", "Fill 1x1 aa pre-added trapezoid", NULL,
 		InitFixedTrapezoids, DoFixedTrapezoids, NullProc, EndFixedTrapezoids,
 		V1_5FEATURE, NONROP, 0,
@@ -882,11 +882,11 @@ Test test[] = {
   {"-addaatrapezoid100", "Fill 100x100 aa pre-added trapezoid", NULL,
 		InitFixedTrapezoids, DoFixedTrapezoids, NullProc, EndFixedTrapezoids,
 		V1_5FEATURE, NONROP, 0,
-		{POLY, 100, "add" }},
+		{25, 100, "add" }},
   {"-addaatrapezoid300", "Fill 300x300 aa pre-added trapezoid", NULL,
 		InitFixedTrapezoids, DoFixedTrapezoids, NullProc, EndFixedTrapezoids,
 		V1_5FEATURE, NONROP, 0,
-		{POLY, 300, "add" }},
+		{2, 300, "add" }},
 #endif
   {"-complex10", "Fill 10-pixel/side complex polygon", NULL,
 		InitComplexPoly, DoComplexPoly, NullProc, EndComplexPoly,
@@ -924,6 +924,10 @@ Test test[] = {
 		InitText, DoText, ClearTextWin, EndText,
 		V1_2FEATURE, ROP, 0,
 		{80, False, "6x13", NULL}},
+  {"-tileftext","Char in 80-char line tiled (6x13)", NULL,
+		InitText, DoText, ClearTextWin, EndText,
+		V1_7FEATURE, ROP, 0,
+		{80, False, "6x13", NULL, FillTiled}},
   {"-f8text",    "Char in 70-char line (8x13)", NULL,
 		InitText, DoText, ClearTextWin, EndText,
 		V1_3FEATURE, ROP, 0,
@@ -941,30 +945,30 @@ Test test[] = {
   {"-f24text16",  "Char16 in 23-char line (k24)", NULL,
 		InitText16, DoText16, ClearTextWin, EndText16,
 		V1_3FEATURE, ROP, 0,
-		{23, False, 
+		{23, False,
 	      "-jis-fixed-medium-r-normal--24-230-75-75-c-240-jisx0208.1983-*",
 		NULL}},
   {"-tr10text", "Char in 80-char line (TR 10)", NULL,
 		InitText, DoText, ClearTextWin, EndText,
 		V1_2FEATURE, ROP, 0,
-		{80, False, 
-		"-adobe-times-medium-r-normal--10-100-75-75-p-54-iso8859-1", 
+		{80, False,
+		"-adobe-times-medium-r-normal--10-100-75-75-p-54-iso8859-1",
 		NULL}},
   {"-tr24text", "Char in 30-char line (TR 24)", NULL,
 		InitText, DoText, ClearTextWin, EndText,
 		V1_2FEATURE, ROP, 0,
-		{30, False, 
+		{30, False,
 		"-adobe-times-medium-r-normal--24-240-75-75-p-124-iso8859-1",
  		NULL}},
   {"-polytext", "Char in 20/40/20 line (6x13, TR 10)", NULL,
 		InitText, DoPolyText, ClearTextWin, EndText,
 		V1_2FEATURE, ROP, 0,
-		{80, True, "6x13", 
+		{80, True, "6x13",
 		"-adobe-times-medium-r-normal--10-100-75-75-p-54-iso8859-1"}},
   {"-polytext16", "Char16 in 7/14/7 line (k14, k24)", NULL,
 		InitText16, DoPolyText16, ClearTextWin, EndText16,
 		V1_3FEATURE, ROP, 0,
-		{28, True, 
+		{28, True,
 	     "-misc-fixed-medium-r-normal--14-130-75-75-c-140-jisx0208.1983-*",
              "-jis-fixed-medium-r-normal--24-230-75-75-c-240-jisx0208.1983-*"}},
   {"-fitext",   "Char in 80-char image line (6x13)", NULL,
@@ -988,94 +992,94 @@ Test test[] = {
   {"-f24itext16", "Char16 in 23-char image line (k24)", NULL,
 		InitText16, DoImageText16, ClearTextWin, EndText16,
 		V1_3FEATURE, PLANEMASK, 0,
-		{23, False, 
+		{23, False,
 	      "-jis-fixed-medium-r-normal--24-230-75-75-c-240-jisx0208.1983-*",
 		NULL}},
   {"-tr10itext", "Char in 80-char image line (TR 10)", NULL,
 		InitText, DoImageText, ClearTextWin, EndText,
 		V1_2FEATURE, PLANEMASK, 0,
-		{80, False, 
-		"-adobe-times-medium-r-normal--10-100-75-75-p-54-iso8859-1", 
+		{80, False,
+		"-adobe-times-medium-r-normal--10-100-75-75-p-54-iso8859-1",
 		NULL}},
   {"-tr24itext", "Char in 30-char image line (TR 24)", NULL,
 		InitText, DoImageText, ClearTextWin, EndText,
 		V1_2FEATURE, PLANEMASK, 0,
-		{30, False, 
+		{30, False,
 		"-adobe-times-medium-r-normal--24-240-75-75-p-124-iso8859-1",
  		NULL}},
 #ifdef XFT
-  {"-aa10text", "Char in 80-char aa line (Charter 10)", NULL,
+  {"-aa10text", "Char in 80-char aa line (DejaVu Sans 10)", NULL,
 	        InitAAText, DoAAText, ClearTextWin, EndAAText,
 		V1_5FEATURE, NONROP, 0,
-		{80, 10, "charter:antialias=true:rgba=0:pixelsize=10", NULL}},
-  {"-aa24text", "Char in 30-char aa line (Charter 24)", NULL,
+		{80, 10, "DejaVu Sans:antialias=true:rgba=0:pixelsize=10", NULL}},
+  {"-aa24text", "Char in 30-char aa line (DejaVu Sans 24)", NULL,
 	        InitAAText, DoAAText, ClearTextWin, EndAAText,
 		V1_5FEATURE, NONROP, 0,
-		{30, 24, "charter:antialias=true:rgba=0:pixelsize=24", NULL}},
+		{30, 24, "DejaVu Sans:antialias=true:rgba=0:pixelsize=24", NULL}},
   {"-aaftext", "Char in 80-char aa line (Courier 12)", NULL,
 	        InitAAText, DoAAText, ClearTextWin, EndAAText,
 		V1_5FEATURE, NONROP, 0,
-		{80, 12, "courier:antialias=true:rgba=0:pixelsize=12", NULL}},
-  {"-a10text", "Char in 80-char a line (Charter 10)", NULL,
+		{80, 12, "Courier:antialias=true:rgba=0:pixelsize=12", NULL}},
+  {"-a10text", "Char in 80-char a line (DejaVu Sans 10)", NULL,
 	        InitAAText, DoAAText, ClearTextWin, EndAAText,
 		V1_5FEATURE, NONROP, 0,
-		{80, 10, "charter:antialias=false:rgba=0:pixelsize=10", NULL}},
-  {"-a24text", "Char in 30-char a line (Charter 24)", NULL,
+		{80, 10, "DejaVu Sans:antialias=false:rgba=0:pixelsize=10", NULL}},
+  {"-a24text", "Char in 30-char a line (DejaVu Sans 24)", NULL,
 	        InitAAText, DoAAText, ClearTextWin, EndAAText,
 		V1_5FEATURE, NONROP, 0,
-		{30, 24, "charter:antialias=false:rgba=0:pixelsize=24", NULL}},
+		{30, 24, "DejaVu Sans:antialias=false:rgba=0:pixelsize=24", NULL}},
   {"-aftext", "Char in 80-char a line (Courier 12)", NULL,
 	        InitAAText, DoAAText, ClearTextWin, EndAAText,
 		V1_5FEATURE, NONROP, 0,
-		{80, 12, "courier:antialias=false:rgba=0:pixelsize=12", NULL}},
-  {"-rgb10text", "Char in 80-char rgb line (Charter 10)", NULL,
+		{80, 12, "Courier:antialias=false:rgba=0:pixelsize=12", NULL}},
+  {"-rgb10text", "Char in 80-char rgb line (DejaVu Sans 10)", NULL,
 	        InitAAText, DoAAText, ClearTextWin, EndAAText,
 		V1_5FEATURE, NONROP, 0,
-		{80, 10, "charter:antialias=true:rgba=rgb:pixelsize=10", NULL}},
-  {"-rgb24text", "Char in 30-char rgb line (Charter 24)", NULL,
+		{80, 10, "DejaVu Sans:antialias=true:rgba=rgb:pixelsize=10", NULL}},
+  {"-rgb24text", "Char in 30-char rgb line (DejaVu Sans 24)", NULL,
 	        InitAAText, DoAAText, ClearTextWin, EndAAText,
 		V1_5FEATURE, NONROP, 0,
-		{30, 24, "charter:antialias=true:rgba=rgb:pixelsize=24", NULL}},
+		{30, 24, "DejaVu Sans:antialias=true:rgba=rgb:pixelsize=24", NULL}},
   {"-rgbftext", "Char in 80-char rgb line (Courier 12)", NULL,
 	        InitAAText, DoAAText, ClearTextWin, EndAAText,
 		V1_5FEATURE, NONROP, 0,
-		{80, 12, "courier:antialias=true:rgba=rgb:pixelsize=12", NULL}},
-  {"-caa10text", "Char in 80-char aa core line (Charter 10)", NULL,
+		{80, 12, "Courier:antialias=true:rgba=rgb:pixelsize=12", NULL}},
+  {"-caa10text", "Char in 80-char aa core line (DejaVu Sans 10)", NULL,
 	        InitAAText, DoAAText, ClearTextWin, EndAAText,
 		V1_5FEATURE, NONROP, 0,
-		{80, 10, "charter:antialias=true:render=false:rgba=0:pixelsize=10", NULL}},
-  {"-caa24text", "Char in 30-char aa core line (Charter 24)", NULL,
+		{80, 10, "DejaVu Sans:antialias=true:rgba=0:pixelsize=10", "render=false"}},
+  {"-caa24text", "Char in 30-char aa core line (DejaVu Sans 24)", NULL,
 	        InitAAText, DoAAText, ClearTextWin, EndAAText,
 		V1_5FEATURE, NONROP, 0,
-		{30, 24, "charter:antialias=true:render=false:rgba=0:pixelsize=24", NULL}},
+		{30, 24, "DejaVu Sans:antialias=true:rgba=0:pixelsize=24", "render=false"}},
   {"-caaftext", "Char in 80-char aa core line (Courier 12)", NULL,
 	        InitAAText, DoAAText, ClearTextWin, EndAAText,
 		V1_5FEATURE, NONROP, 0,
-		{80, 12, "courier:antialias=true:render=false:rgba=0:pixelsize=12", NULL}},
-  {"-ca10text", "Char in 80-char a core line (Charter 10)", NULL,
+		{80, 12, "Courier:antialias=true:rgba=0:pixelsize=12", "render=false"}},
+  {"-ca10text", "Char in 80-char a core line (DejaVu Sans 10)", NULL,
 	        InitAAText, DoAAText, ClearTextWin, EndAAText,
 		V1_5FEATURE, NONROP, 0,
-		{80, 10, "charter:antialias=false:render=false:rgba=0:pixelsize=10", NULL}},
-  {"-ca24text", "Char in 30-char a core line (Charter 24)", NULL,
+		{80, 10, "DejaVu Sans:antialias=false:rgba=0:pixelsize=10", "render=false"}},
+  {"-ca24text", "Char in 30-char a core line (DejaVu Sans 24)", NULL,
 	        InitAAText, DoAAText, ClearTextWin, EndAAText,
 		V1_5FEATURE, NONROP, 0,
-		{30, 24, "charter:antialias=false:render=false:rgba=0:pixelsize=24", NULL}},
+		{30, 24, "DejaVu Sans:antialias=false:rgba=0:pixelsize=24", "render=false"}},
   {"-caftext", "Char in 80-char a core line (Courier 12)", NULL,
 	        InitAAText, DoAAText, ClearTextWin, EndAAText,
 		V1_5FEATURE, NONROP, 0,
-		{80, 12, "courier:antialias=false:render=false:rgba=0:pixelsize=12", NULL}},
-  {"-crgb10text", "Char in 80-char rgb core line (Charter 10)", NULL,
+		{80, 12, "Courier:antialias=false:rgba=0:pixelsize=12", "render=false"}},
+  {"-crgb10text", "Char in 80-char rgb core line (DejaVu Sans 10)", NULL,
 	        InitAAText, DoAAText, ClearTextWin, EndAAText,
 		V1_5FEATURE, NONROP, 0,
-		{80, 10, "charter:antialias=true:render=false:rgba=rgb:pixelsize=10", NULL}},
-  {"-crgb24text", "Char in 30-char rgb core line (Charter 24)", NULL,
+		{80, 10, "DejaVu Sans:antialias=true:rgba=rgb:pixelsize=10", "render=false"}},
+  {"-crgb24text", "Char in 30-char rgb core line (DejaVu Sans 24)", NULL,
 	        InitAAText, DoAAText, ClearTextWin, EndAAText,
 		V1_5FEATURE, NONROP, 0,
-		{30, 24, "charter:antialias=true:render=false:rgba=rgb:pixelsize=24", NULL}},
+		{30, 24, "DejaVu Sans:antialias=true:rgba=rgb:pixelsize=24", "render=false"}},
   {"-crgbftext", "Char in 80-char rgb core line (Courier 12)", NULL,
 	        InitAAText, DoAAText, ClearTextWin, EndAAText,
 		V1_5FEATURE, NONROP, 0,
-		{80, 12, "courier:antialias=true:render=false:rgba=rgb:pixelsize=12", NULL}},
+		{80, 12, "Courier:antialias=true:rgba=rgb:pixelsize=12", "render=false"}},
 #endif
   {"-scroll10", "Scroll 10x10 pixels", NULL,
 		InitScroll, DoScroll, MidScroll, EndScroll,
@@ -1106,7 +1110,7 @@ Test test[] = {
 		V1_2FEATURE, ROP, 0,
 		{4, 10}},
   {"-copypixwin100", "Copy 100x100 from pixmap to window", NULL,
-		InitCopyPix, DoCopyPixWin, MidCopyPix, EndCopyPix, 
+		InitCopyPix, DoCopyPixWin, MidCopyPix, EndCopyPix,
 		V1_2FEATURE, ROP, 0,
 		{4, 100}},
   {"-copypixwin500", "Copy 500x500 from pixmap to window", NULL,
@@ -1118,7 +1122,7 @@ Test test[] = {
 		V1_2FEATURE, ROP, 0,
 		{4, 10}},
   {"-copywinpix100", "Copy 100x100 from window to pixmap", NULL,
-		InitCopyPix, DoCopyWinPix, MidScroll, EndCopyPix, 
+		InitCopyPix, DoCopyWinPix, MidScroll, EndCopyPix,
 		V1_2FEATURE, ROP, 0,
 		{4, 100}},
   {"-copywinpix500", "Copy 500x500 from window to pixmap", NULL,
@@ -1130,7 +1134,7 @@ Test test[] = {
 		V1_2FEATURE, ROP, 0,
 		{4, 10}},
   {"-copypixpix100", "Copy 100x100 from pixmap to pixmap", NULL,
-		InitCopyPix, DoCopyPixPix, NullProc, EndCopyPix, 
+		InitCopyPix, DoCopyPixPix, NullProc, EndCopyPix,
 		V1_2FEATURE, ROP, 0,
 		{4, 100}},
   {"-copypixpix500", "Copy 500x500 from pixmap to pixmap", NULL,
@@ -1185,6 +1189,18 @@ Test test[] = {
 		InitPutImage, DoPutImage, MidCopyPix, EndGetImage,
 		V1_4FEATURE, ROP, 0,
 		{4, 500, "XY"}},
+  {"-putimagexybitmap10", "PutImage XYBitmap 10x10 square", NULL,
+		InitPutImage, DoPutImage, MidCopyPix, EndGetImage,
+		V1_7FEATURE, ROP, 0,
+		{4, 10, "XYBitmap"}},
+  {"-putimagexybitmap100", "PutImage XYBitmap 100x100 square", NULL,
+		InitPutImage, DoPutImage, MidCopyPix, EndGetImage,
+		V1_7FEATURE, ROP, 0,
+		{4, 100, "XYBitmap"}},
+  {"-putimagexybitmap500", "PutImage XYBitmap 500x500 square", NULL,
+		InitPutImage, DoPutImage, MidCopyPix, EndGetImage,
+		V1_7FEATURE, ROP, 0,
+		{4, 500, "XYBitmap"}},
 #ifdef MITSHM
   {"-shmput10", "ShmPutImage 10x10 square", NULL,
 		InitShmPutImage, DoShmPutImage, MidCopyPix, EndShmPutImage,
@@ -1210,6 +1226,18 @@ Test test[] = {
 		InitShmPutImage, DoShmPutImage, MidCopyPix, EndShmPutImage,
 		V1_4FEATURE, ROP, 0,
 		{4, 500, "XY"}},
+  {"-shmputxybitmap10", "ShmPutImage XYBitmap 10x10 square", NULL,
+		InitShmPutImage, DoShmPutImage, MidCopyPix, EndShmPutImage,
+		V1_7FEATURE, ROP, 0,
+		{4, 10, "XYBitmap"}},
+  {"-shmputxybitmap100", "ShmPutImage XYBitmap 100x100 square", NULL,
+		InitShmPutImage, DoShmPutImage, MidCopyPix, EndShmPutImage,
+		V1_7FEATURE, ROP, 0,
+		{4, 100, "XYBitmap"}},
+  {"-shmputxybitmap500", "ShmPutImage XYBitmap 500x500 square", NULL,
+		InitShmPutImage, DoShmPutImage, MidCopyPix, EndShmPutImage,
+		V1_7FEATURE, ROP, 0,
+		{4, 500, "XYBitmap"}},
   {"-shmget10", "ShmGetImage 10x10 square", NULL,
 		InitShmGetImage, DoShmGetImage, NullProc, EndShmGetImage,
 		V1_2FEATURE, ROP, 0,
@@ -1261,51 +1289,51 @@ Test test[] = {
 		{4, 500, "XY"}},
   {"-compwinwin10", "Composite 10x10 from window to window", NULL,
 		InitCompositeWin, DoCompositeWinWin, MidScroll, EndCompositeWin,
-		VERSION1_6, COMP, 0,
+		V1_6FEATURE, COMP, 0,
 		{4, 10}},
   {"-compwinwin100", "Composite 100x100 from window to window", NULL,
 		InitCompositeWin, DoCompositeWinWin, MidScroll, EndCompositeWin,
-		VERSION1_6, COMP, 0,
+		V1_6FEATURE, COMP, 0,
 		{4, 100}},
   {"-compwinwin500", "Composite 500x500 from window to window", NULL,
 		InitCompositeWin, DoCompositeWinWin, MidScroll, EndCompositeWin,
-		VERSION1_6, COMP, 0,
+		V1_6FEATURE, COMP, 0,
 		{4, 500}},
   {"-comppixwin10", "Composite 10x10 from pixmap to window", NULL,
 		InitCompositePix, DoCompositePixWin, MidScroll, EndCompositeWin,
-		VERSION1_6, COMP, 0,
+		V1_6FEATURE, COMP, 0,
 		{4, 10}},
   {"-comppixwin100", "Composite 100x100 from pixmap to window", NULL,
 		InitCompositePix, DoCompositePixWin, MidScroll, EndCompositeWin,
-		VERSION1_6, COMP, 0,
+		V1_6FEATURE, COMP, 0,
 		{4, 100}},
   {"-comppixwin500", "Composite 500x500 from pixmap to window", NULL,
 		InitCompositePix, DoCompositePixWin, MidScroll, EndCompositeWin,
-		VERSION1_6, COMP, 0,
+		V1_6FEATURE, COMP, 0,
 		{4, 500}},
   {"-magpixwin10", "Scale 5x5 from pixmap to 10x10 window", NULL,
 		InitCompositePix, DoCompositePixWin, MidScroll, EndCompositeWin,
-		VERSION1_6, COMP, 0,
+		V1_6FEATURE, COMP, 0,
 		{4, 10, NULL, NULL, 0x20000}},
   {"-magpixwin100", "Scale 50x50 from pixmap to 100x100 window", NULL,
 		InitCompositePix, DoCompositePixWin, MidScroll, EndCompositeWin,
-		VERSION1_6, COMP, 0,
+		V1_6FEATURE, COMP, 0,
 		{4, 100, NULL, NULL, 0x20000}},
   {"-magpixwin500", "Scale 250x250 from pixmap to 500x500 window", NULL,
 		InitCompositePix, DoCompositePixWin, MidScroll, EndCompositeWin,
-		VERSION1_6, COMP, 0,
+		V1_6FEATURE, COMP, 0,
 		{4, 500, NULL, NULL, 0x20000}},
   {"-minpixwin10", "Scale 10x10 from pixmap to 5x5 window", NULL,
 		InitCompositePix, DoCompositePixWin, MidScroll, EndCompositeWin,
-		VERSION1_6, COMP, 0,
+		V1_6FEATURE, COMP, 0,
 		{4, 5, NULL, NULL, 0x8000}},
   {"-minpixwin100", "Scale 100x100 from pixmap to 50x50 window", NULL,
 		InitCompositePix, DoCompositePixWin, MidScroll, EndCompositeWin,
-		VERSION1_6, COMP, 0,
+		V1_6FEATURE, COMP, 0,
 		{4, 50, NULL, NULL, 0x8000}},
   {"-minpixwin500", "Scale 500x500 from pixmap to 250x250 window", NULL,
 		InitCompositePix, DoCompositePixWin, MidScroll, EndCompositeWin,
-		VERSION1_6, COMP, 0,
+		V1_6FEATURE, COMP, 0,
 		{4, 250, NULL, NULL, 0x8000}},
   {"-noop",     "X protocol NoOperation", NULL,
 		NullInitProc, DoNoOp, NullProc, NullProc,