summaryrefslogtreecommitdiff
path: root/Xext/saver.c
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2007-12-24 13:13:19 -0500
committerAdam Jackson <ajax@redhat.com>2008-02-22 15:19:54 -0500
commitee21aba6be0078949204e315ddfffd99de60c2f1 (patch)
treed44a51d1ec696ddca109c943ca4cdd5bc11b1218 /Xext/saver.c
parenta4202b898f07dd733590ae5adb21e48775369781 (diff)
Fix Xinerama's consolidated visual handling.
Formerly the code claimed it could only handle up to 256 visuals, which was true. Also true, but not explicitly stated, was that it could only handle visuals with VID < 256. If you have enough screens, and subsystems that add lots of visuals, you can easily run off the end. (Made worse because we allocate visual IDs from the same pool as XIDs.) If your app then chooses a visual > 256, then the Xinerama code would throw BadMatch on CreateColormap and your app wouldn't start. With this change, PanoramiXVisualTable is gone. Other subsystems that were using it as a translation table between each screen's visuals now use a PanoramiXTranslateVisual() helper.
Diffstat (limited to 'Xext/saver.c')
-rw-r--r--Xext/saver.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/Xext/saver.c b/Xext/saver.c
index 9a6dd7757..feab972e2 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -1346,8 +1346,7 @@ ProcScreenSaverSetAttributes (ClientPtr client)
*((CARD32 *) &stuff[1] + cmap_offset) = cmap->info[i].id;
if (orig_visual != CopyFromParent)
- stuff->visualID =
- PanoramiXVisualTable[(orig_visual*MAXSCREENS) + i];
+ stuff->visualID = PanoramiXTranslateVisualID(i, orig_visual);
status = ScreenSaverSetAttributes(client);
}