svn merge ^/branches/released .

1 files changed, 14 insertions, 14 deletions

diff --git a/xorg-server/miext/rootless/rootlessScreen.c b/xorg-server/miext/rootless/rootlessScreen.c
index 6f9341d85..fd396e464 100644
--- a/xorg-server/miext/rootless/rootlessScreen.c
+++ b/xorg-server/miext/rootless/rootlessScreen.c
@@ -62,15 +62,10 @@ extern int RootlessMiValidateTree(WindowPtr pRoot, WindowPtr pChild,
 extern Bool RootlessCreateGC(GCPtr pGC);

 

 // Initialize globals

-static int rootlessGCPrivateKeyIndex;

-DevPrivateKey rootlessGCPrivateKey = &rootlessGCPrivateKeyIndex;

-static int rootlessScreenPrivateKeyIndex;

-DevPrivateKey rootlessScreenPrivateKey = &rootlessScreenPrivateKeyIndex;

-static int rootlessWindowPrivateKeyIndex;

-DevPrivateKey rootlessWindowPrivateKey = &rootlessWindowPrivateKeyIndex;

-static int rootlessWindowOldPixmapPrivateKeyIndex;

-DevPrivateKey rootlessWindowOldPixmapPrivateKey = &rootlessWindowOldPixmapPrivateKeyIndex;

-

+DevPrivateKeyRec rootlessGCPrivateKeyRec;

+DevPrivateKeyRec rootlessScreenPrivateKeyRec;

+DevPrivateKeyRec rootlessWindowPrivateKeyRec;

+DevPrivateKeyRec rootlessWindowOldPixmapPrivateKeyRec;

 

 /*

  * RootlessUpdateScreenPixmap

@@ -441,9 +436,9 @@ RootlessMarkOverlappedWindows(WindowPtr pWin, WindowPtr pFirst,
             pChild = pWin;

             while (1) {

                 if (pChild->viewable) {

-                    if (REGION_BROKEN (pScreen, &pChild->winSize))

+                    if (RegionBroken(&pChild->winSize))

                         SetWinSize (pChild);

-                    if (REGION_BROKEN (pScreen, &pChild->borderSize))

+                    if (RegionBroken(&pChild->borderSize))

                         SetBorderSize (pChild);

                     (* MarkWindow)(pChild);

                     if (pChild->firstChild) {

@@ -493,7 +488,7 @@ static void expose_1 (WindowPtr pWin) {
 void

 RootlessScreenExpose (ScreenPtr pScreen)

 {

-    expose_1 (WindowTable[pScreen->myNum]);

+    expose_1 (pScreen->root);

 }

 

 

@@ -637,8 +632,13 @@ RootlessAllocatePrivates(ScreenPtr pScreen)
 {

     RootlessScreenRec *s;

 

-    // no allocation needed for screen privates

-    if (!dixRequestPrivate(rootlessGCPrivateKey, sizeof(RootlessGCRec)))

+    if (!dixRegisterPrivateKey(&rootlessGCPrivateKeyRec, PRIVATE_GC, sizeof(RootlessGCRec)))

+        return FALSE;

+    if (!dixRegisterPrivateKey(&rootlessScreenPrivateKeyRec, PRIVATE_SCREEN, 0))

+        return FALSE;

+    if (!dixRegisterPrivateKey(&rootlessWindowPrivateKeyRec, PRIVATE_WINDOW, 0))

+        return FALSE;

+    if (!dixRegisterPrivateKey(&rootlessWindowOldPixmapPrivateKeyRec, PRIVATE_WINDOW, 0))

         return FALSE;

 

     s = malloc(sizeof(RootlessScreenRec));