svn merge ^/branches/released .

1 files changed, 0 insertions, 23 deletions

diff --git a/xorg-server/miext/rootless/rootlessWindow.c b/xorg-server/miext/rootless/rootlessWindow.c
index a9cecd2e3..7c822e34a 100644
--- a/xorg-server/miext/rootless/rootlessWindow.c
+++ b/xorg-server/miext/rootless/rootlessWindow.c
@@ -57,15 +57,10 @@ extern Bool no_configure_window;
 extern int darwinMainScreenX, darwinMainScreenY;

 #endif

 

-#ifdef ROOTLESS_GLOBAL_COORDS

 #define SCREEN_TO_GLOBAL_X \

     (pScreen->x + rootlessGlobalOffsetX)

 #define SCREEN_TO_GLOBAL_Y \

     (pScreen->y + rootlessGlobalOffsetY)

-#else

-#define SCREEN_TO_GLOBAL_X 0

-#define SCREEN_TO_GLOBAL_Y 0

-#endif

 

 #define DEFINE_ATOM_HELPER(func,atom_name)                      \

   static Atom func (void) {                                       \

@@ -186,11 +181,6 @@ static void
 RootlessDestroyFrame(WindowPtr pWin, RootlessWindowPtr winRec)

 {

     SCREENREC(pWin->drawable.pScreen)->imp->DestroyFrame(winRec->wid);

-

-#ifdef ROOTLESS_TRACK_DAMAGE

-    RegionUninit(&winRec->damage);

-#endif

-

     free(winRec);

     SETWINREC(pWin, NULL);

 }

@@ -347,15 +337,6 @@ RootlessPositionWindow(WindowPtr pWin, int x, int y)
 

             winRec->pixmap->devPrivate.ptr = winRec->pixelData;

             SetPixmapBaseToScreen(winRec->pixmap, x - bw, y - bw);

-

-#ifdef ROOTLESS_TRACK_DAMAGE

-            // Move damaged region to correspond to new window position

-            if (RegionNotEmpty(&winRec->damage)) {

-                RegionTranslate(&winRec->damage,

-                                 x - bw - winRec->x,

-                                 y - bw - winRec->y);

-            }

-#endif

         }

     }

 

@@ -387,10 +368,6 @@ RootlessInitializeFrame(WindowPtr pWin, RootlessWindowRec *winRec)
     winRec->width = d->width + 2*bw;

     winRec->height = d->height + 2*bw;

     winRec->borderWidth = bw;

-

-#ifdef ROOTLESS_TRACK_DAMAGE

-    RegionNull(&winRec->damage);

-#endif

 }

 

 /*