frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rootless: Fix SetShape regression 

This fixes a regression in miext/rootless from 643cb6e87c

Found-by: tinderbox
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Pierre-Loup A. Griffais <pgriffais@nvidia.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Jeremy Huddleston 2010-06-05 15:58:21 -07:00 committed by Keith Packard
parent 6b4af3b792
commit 1768e51976
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
miext/rootless/rootlessWindow.c
View File

@ -288,12 +288,12 @@ static void RootlessReshapeFrame(WindowPtr pWin)
* shaped when the window is framed. * shaped when the window is framed.
*/ */
void void
RootlessSetShape(WindowPtr pWin) RootlessSetShape(WindowPtr pWin, int kind)
{ {
ScreenPtr pScreen = pWin->drawable.pScreen; ScreenPtr pScreen = pWin->drawable.pScreen;
SCREEN_UNWRAP(pScreen, SetShape); SCREEN_UNWRAP(pScreen, SetShape);
pScreen->SetShape(pWin); pScreen->SetShape(pWin, kind);
SCREEN_WRAP(pScreen, SetShape); SCREEN_WRAP(pScreen, SetShape);
RootlessReshapeFrame(pWin); RootlessReshapeFrame(pWin);

2
miext/rootless/rootlessWindow.h
View File

@ -39,7 +39,7 @@
Bool RootlessCreateWindow(WindowPtr pWin); Bool RootlessCreateWindow(WindowPtr pWin);
Bool RootlessDestroyWindow(WindowPtr pWin); Bool RootlessDestroyWindow(WindowPtr pWin);
void RootlessSetShape(WindowPtr pWin); void RootlessSetShape(WindowPtr pWin, int kind);
Bool RootlessChangeWindowAttributes(WindowPtr pWin, unsigned long vmask); Bool RootlessChangeWindowAttributes(WindowPtr pWin, unsigned long vmask);
Bool RootlessPositionWindow(WindowPtr pWin, int x, int y); Bool RootlessPositionWindow(WindowPtr pWin, int x, int y);