xserver: Branch 'master'
Keith Packard
keithp at kemper.freedesktop.org
Sat Jun 5 17:14:41 PDT 2010
miext/rootless/rootlessWindow.c | 4 ++--
miext/rootless/rootlessWindow.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 1768e51976ae8949d999309bd2384ccad72deecd
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date: Sat Jun 5 15:58:21 2010 -0700
rootless: Fix SetShape regression
This fixes a regression in miext/rootless from 643cb6e87c10ab554c03ada81930001a8ebcc909
Found-by: tinderbox
Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
Reviewed-by: Pierre-Loup A. Griffais <pgriffais at nvidia.com>
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c
index ce088c7..4d541f4 100644
--- a/miext/rootless/rootlessWindow.c
+++ b/miext/rootless/rootlessWindow.c
@@ -288,12 +288,12 @@ static void RootlessReshapeFrame(WindowPtr pWin)
* shaped when the window is framed.
*/
void
-RootlessSetShape(WindowPtr pWin)
+RootlessSetShape(WindowPtr pWin, int kind)
{
ScreenPtr pScreen = pWin->drawable.pScreen;
SCREEN_UNWRAP(pScreen, SetShape);
- pScreen->SetShape(pWin);
+ pScreen->SetShape(pWin, kind);
SCREEN_WRAP(pScreen, SetShape);
RootlessReshapeFrame(pWin);
diff --git a/miext/rootless/rootlessWindow.h b/miext/rootless/rootlessWindow.h
index ca104a4..2b018e0 100644
--- a/miext/rootless/rootlessWindow.h
+++ b/miext/rootless/rootlessWindow.h
@@ -39,7 +39,7 @@
Bool RootlessCreateWindow(WindowPtr pWin);
Bool RootlessDestroyWindow(WindowPtr pWin);
-void RootlessSetShape(WindowPtr pWin);
+void RootlessSetShape(WindowPtr pWin, int kind);
Bool RootlessChangeWindowAttributes(WindowPtr pWin, unsigned long vmask);
Bool RootlessPositionWindow(WindowPtr pWin, int x, int y);
More information about the xorg-commit
mailing list