From 4c61bf84b11e26e6f22648668c95ea760a379163 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 11 Jun 2010 12:14:52 +0000 Subject: xserver git update 11/6/2010 --- xorg-server/hw/xnest/Color.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'xorg-server/hw/xnest/Color.c') diff --git a/xorg-server/hw/xnest/Color.c b/xorg-server/hw/xnest/Color.c index 985b5ad95..bb215fc45 100644 --- a/xorg-server/hw/xnest/Color.c +++ b/xorg-server/hw/xnest/Color.c @@ -34,8 +34,8 @@ is" without express or implied warranty. #include "XNWindow.h" #include "Args.h" -static int cmapScrPrivateKeyIndex; -static DevPrivateKey cmapScrPrivateKey = &cmapScrPrivateKeyIndex; +static DevPrivateKeyRec cmapScrPrivateKeyRec; +#define cmapScrPrivateKey (&cmapScrPrivateKeyRec) #define GetInstalledColormap(s) ((ColormapPtr) dixLookupPrivate(&(s)->devPrivates, cmapScrPrivateKey)) #define SetInstalledColormap(s,c) (dixSetPrivate(&(s)->devPrivates, cmapScrPrivateKey, c)) @@ -214,8 +214,7 @@ xnestSetInstalledColormapWindows(ScreenPtr pScreen) free(icws.cmapIDs); if (!xnestSameInstalledColormapWindows(icws.windows, icws.numWindows)) { - if (xnestOldInstalledColormapWindows) - free(xnestOldInstalledColormapWindows); + free(xnestOldInstalledColormapWindows); #ifdef _XSERVER64 { @@ -264,14 +263,13 @@ xnestSetInstalledColormapWindows(ScreenPtr pScreen) #endif /* DUMB_WINDOW_MANAGERS */ } else - if (icws.windows) free(icws.windows); + free(icws.windows); } void xnestSetScreenSaverColormapWindow(ScreenPtr pScreen) { - if (xnestOldInstalledColormapWindows) - free(xnestOldInstalledColormapWindows); + free(xnestOldInstalledColormapWindows); #ifdef _XSERVER64 { @@ -469,6 +467,9 @@ xnestCreateDefaultColormap(ScreenPtr pScreen) unsigned short zero = 0, ones = 0xFFFF; Pixel wp, bp; + if (!dixRegisterPrivateKey(&cmapScrPrivateKeyRec, PRIVATE_SCREEN, 0)) + return FALSE; + for (pVisual = pScreen->visuals; pVisual->vid != pScreen->rootVisual; pVisual++); -- cgit v1.2.3