diff options
| author | Keith Packard <keithp@keithp.com> | 2010-04-30 12:27:51 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-04-30 12:27:51 -0700 |
| commit | 0e91e19f783d21198fc2e210203e0f10040a9cd0 (patch) | |
| tree | 4c875b7322c29a2ff8fb69bd831a7e8d456c93da /mi | |
| parent | 81a081c1f0cb55df94cb10495aa7ad71cd5a9afb (diff) | |
| parent | edbc56c088462844f6445f5e6d7cbcfc58a207dc (diff) | |
Merge remote branch 'vignatti/for-keith'
Diffstat (limited to 'mi')
| -rw-r--r-- | mi/micmap.c | 15 | ||||
| -rw-r--r-- | mi/micmap.h | 8 |
2 files changed, 14 insertions, 9 deletions
diff --git a/mi/micmap.c b/mi/micmap.c index e832be7fa..cc829fc10 100644 --- a/mi/micmap.c +++ b/mi/micmap.c @@ -40,13 +40,14 @@ #include "globals.h" #include "micmap.h" -ColormapPtr miInstalledMaps[MAXSCREENS]; +static int micmapScrPrivateKeyIndex; +DevPrivateKey micmapScrPrivateKey = &micmapScrPrivateKeyIndex; int miListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps) { - if (miInstalledMaps[pScreen->myNum]) { - *pmaps = miInstalledMaps[pScreen->myNum]->mid; + if (GetInstalledmiColormap(pScreen)) { + *pmaps = GetInstalledmiColormap(pScreen)->mid; return (1); } return 0; @@ -55,8 +56,7 @@ miListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps) void miInstallColormap(ColormapPtr pmap) { - int index = pmap->pScreen->myNum; - ColormapPtr oldpmap = miInstalledMaps[index]; + ColormapPtr oldpmap = GetInstalledmiColormap(pmap->pScreen); if(pmap != oldpmap) { @@ -65,7 +65,7 @@ miInstallColormap(ColormapPtr pmap) if(oldpmap != (ColormapPtr)None) WalkTree(pmap->pScreen, TellLostMap, (char *)&oldpmap->mid); /* Install pmap */ - miInstalledMaps[index] = pmap; + SetInstalledmiColormap(pmap->pScreen, pmap); WalkTree(pmap->pScreen, TellGainedMap, (char *)&pmap->mid); } @@ -74,8 +74,7 @@ miInstallColormap(ColormapPtr pmap) void miUninstallColormap(ColormapPtr pmap) { - int index = pmap->pScreen->myNum; - ColormapPtr curpmap = miInstalledMaps[index]; + ColormapPtr curpmap = GetInstalledmiColormap(pmap->pScreen); if(pmap == curpmap) { diff --git a/mi/micmap.h b/mi/micmap.h index 5c8448a95..8ad94b9dd 100644 --- a/mi/micmap.h +++ b/mi/micmap.h @@ -4,7 +4,13 @@ #ifndef _MICMAP_H_ #define _MICMAP_H_ -extern _X_EXPORT ColormapPtr miInstalledMaps[MAXSCREENS]; +#define GetInstalledmiColormap(s) \ + ((ColormapPtr) dixLookupPrivate(&(s)->devPrivates, micmapScrPrivateKey)) +#define SetInstalledmiColormap(s,c) \ + (dixSetPrivate(&(s)->devPrivates, micmapScrPrivateKey, c)) + +extern _X_EXPORT DevPrivateKey micmapScrPrivateKey; + typedef Bool (* miInitVisualsProcPtr)(VisualPtr *, DepthPtr *, int *, int *, int *, VisualID *, unsigned long, int, |