[PATCH xts 2/3] Disable ColormapNotify test if implicit colormaps

Peter Harris pharris at opentext.com
Fri May 31 13:20:20 PDT 2013


If the server supports more than one simultaneously installed colormap,
it probably does implicit installation too. If the server implicitly
installs the colormap when it is created, there will be no
ColormapNotify when InstallColormap is called. In that case, the event
count will be wrong, and the test will report FAIL even though it
shouldn't.

Signed-off-by: Peter Harris <pharris at opentext.com>
---
 xts5/Xlib10/XInstallColormap.m |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/xts5/Xlib10/XInstallColormap.m b/xts5/Xlib10/XInstallColormap.m
index cabe836..10d4117 100644
--- a/xts5/Xlib10/XInstallColormap.m
+++ b/xts5/Xlib10/XInstallColormap.m
@@ -207,6 +207,7 @@ Window	base;
 Window	w1, w2;
 Window	w3nocm;
 XEvent	ev;
+Screen *screen;
 XColormapEvent	good;
 XColormapEvent	*cmp;
 int 	got;
@@ -217,6 +218,13 @@ int 	got;
 	good.new = False;
 	good.state = ColormapInstalled;
 
+	screen = ScreenOfDisplay(display, DefaultScreen(display));
+	if (MaxCmapsOfScreen(screen) > 1) {
+		untested("Cannot reliably test ColormapNotify when the server has implicit colormaps");
+		report("  Server supports more than one installed colormap");
+		return;
+	}
+
 	for (resetvinf(VI_WIN); nextvinf(&vp); ) {
 
 		base = makewin(display, vp);
-- 
1.7.10.4



More information about the xorg-devel mailing list