diff --git a/hw/xnest/Screen.c b/hw/xnest/Screen.c index 51c32817e..279ba2431 100644 --- a/hw/xnest/Screen.c +++ b/hw/xnest/Screen.c @@ -344,7 +344,7 @@ breakout: pScreen->RealizeWindow = xnestRealizeWindow; pScreen->UnrealizeWindow = xnestUnrealizeWindow; pScreen->PostValidateTree = NULL; - pScreen->WindowExposures = xnestWindowExposures; + pScreen->WindowExposures = miWindowExposures; pScreen->CopyWindow = xnestCopyWindow; pScreen->ClipNotify = xnestClipNotify; pScreen->ClearToBackground = xnest_screen_ClearToBackground; diff --git a/hw/xnest/Window.c b/hw/xnest/Window.c index 527dce153..4d02c1ced 100644 --- a/hw/xnest/Window.c +++ b/hw/xnest/Window.c @@ -391,40 +391,6 @@ xnestClipNotify(WindowPtr pWin, int dx, int dy) xnestShapeWindow(pWin); } -static Bool -xnestWindowExposurePredicate(Display * dpy, XEvent * event, XPointer ptr) -{ - return (event->type == Expose && event->xexpose.window == *(Window *) ptr); -} - -void -xnestWindowExposures(WindowPtr pWin, RegionPtr pRgn) -{ - XEvent event; - Window window; - BoxRec Box; - - XSync(xnestDisplay, FALSE); - - window = xnestWindow(pWin); - - while (XCheckIfEvent(xnestDisplay, &event, - xnestWindowExposurePredicate, (char *) &window)) { - - Box.x1 = pWin->drawable.x + wBorderWidth(pWin) + event.xexpose.x; - Box.y1 = pWin->drawable.y + wBorderWidth(pWin) + event.xexpose.y; - Box.x2 = Box.x1 + event.xexpose.width; - Box.y2 = Box.y1 + event.xexpose.height; - - event.xexpose.type = ProcessedExpose; - - if (RegionContainsRect(pRgn, &Box) != rgnIN) - XPutBackEvent(xnestDisplay, &event); - } - - miWindowExposures(pWin, pRgn); -} - void xnestSetShape(WindowPtr pWin, int kind) { diff --git a/hw/xnest/XNWindow.h b/hw/xnest/XNWindow.h index 68b829711..db6491ebb 100644 --- a/hw/xnest/XNWindow.h +++ b/hw/xnest/XNWindow.h @@ -65,7 +65,6 @@ Bool xnestRealizeWindow(WindowPtr pWin); Bool xnestUnrealizeWindow(WindowPtr pWin); void xnestCopyWindow(WindowPtr pWin, xPoint oldOrigin, RegionPtr oldRegion); void xnestClipNotify(WindowPtr pWin, int dx, int dy); -void xnestWindowExposures(WindowPtr pWin, RegionPtr pRgn); void xnestSetShape(WindowPtr pWin, int kind); void xnestShapeWindow(WindowPtr pWin);