diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-06-21 16:33:55 +1000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-06-22 11:41:20 -0700 |
| commit | 82d41ada993d8cbdcdfea878d1a5b031afe4e593 (patch) | |
| tree | a4ffc248b9aca8b221ef8aa9c9549bb248be3a21 /composite/compint.h | |
| parent | c6bc52cb6663138d1273447cb7661fa6e958f539 (diff) | |
composite: fix freeing of old pixmap until after move/resize/cbw (bug 28345)
The fixes for the composite reallocation failure, were freeing the oldpixmap
straight after reallocating the new one, however this led to some wierd
effects in e16 compositing, and I think in a few other places. This patch
moves the freeing of the pixmap into the post wrapped stage. I'm not sure if
we are actually better off breaking ABI and adding another callback from the
ConfigureWindow to composite to make sure the old pixmap is always freed,
but this should be satisfactory as we should always hit one of the freeing
paths or else its a bug in the DIX.
bug: https://bugs.freedesktop.org/show_bug.cgi?id=28435
Reported-by: Andrew Randrianasulu <randrik@mail.ru>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'composite/compint.h')
| -rw-r--r-- | composite/compint.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/composite/compint.h b/composite/compint.h index 9c1ffd501..80083b01d 100644 --- a/composite/compint.h +++ b/composite/compint.h @@ -127,9 +127,14 @@ typedef struct _CompScreen { UnrealizeWindowProcPtr UnrealizeWindow; ClipNotifyProcPtr ClipNotify; /* - * Called from ConfigureWindow. + * Called from ConfigureWindow, these + * three track changes to the offscreen storage + * geometry */ ConfigNotifyProcPtr ConfigNotify; + MoveWindowProcPtr MoveWindow; + ResizeWindowProcPtr ResizeWindow; + ChangeBorderWidthProcPtr ChangeBorderWidth; /* * Reparenting has an effect on Subwindows redirect */ @@ -281,6 +286,16 @@ void compClipNotify (WindowPtr pWin, int dx, int dy); void +compMoveWindow (WindowPtr pWin, int x, int y, WindowPtr pSib, VTKind kind); + +void +compResizeWindow (WindowPtr pWin, int x, int y, + unsigned int w, unsigned int h, WindowPtr pSib); + +void +compChangeBorderWidth (WindowPtr pWin, unsigned int border_width); + +void compReparentWindow (WindowPtr pWin, WindowPtr pPriorParent); Bool |