diff options
| author | Peter Harris <pharris@opentext.com> | 2013-05-31 15:27:46 -0400 |
|---|---|---|
| committer | Peter Harris <pharris@opentext.com> | 2013-05-31 15:31:13 -0400 |
| commit | 17a8c9f981b6142a96bb3ad7c6dd40bd0da721c7 (patch) | |
| tree | c1907cfde4705482c7d2eccbe213f562c3fd1dd8 | |
| parent | 9fabd09def9622fc009b5557aeff3ff75719ad4b (diff) | |
Disable ColormapNotify test if implicit colormaps
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@opentext.com>
| -rw-r--r-- | xts5/Xlib10/XInstallColormap.m | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/xts5/Xlib10/XInstallColormap.m b/xts5/Xlib10/XInstallColormap.m index cabe836d..10d41179 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); |