From 3815190d52f8ae453c2458335394eb5b18ab9bf5 Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 14 Sep 2010 13:17:20 +0000 Subject: xserver libX11 pixman git update 14/9/2010 --- xorg-server/miext/rootless/rootlessWindow.c | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'xorg-server/miext/rootless/rootlessWindow.c') diff --git a/xorg-server/miext/rootless/rootlessWindow.c b/xorg-server/miext/rootless/rootlessWindow.c index e4fde4395..a86020cc5 100644 --- a/xorg-server/miext/rootless/rootlessWindow.c +++ b/xorg-server/miext/rootless/rootlessWindow.c @@ -51,15 +51,10 @@ extern Bool no_configure_window; #include "rootlessCommon.h" #include "rootlessWindow.h" -#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) { \ @@ -180,11 +175,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); } @@ -341,15 +331,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 } } @@ -381,10 +362,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 } /* -- cgit v1.2.3