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

(!1705) xwin: drop wrapping on ScreenRec->PositionWindow() 

Instead of complicated wrapping, just call fbPositionWindow directly.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-09-26 17:50:53 +02:00
parent 390e3aa0d4
commit 467b254497
4 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/xwin/win.h
View File

@ -501,7 +501,6 @@ typedef struct _winPrivScreenRec {
/* Window Procedures for Rootless mode */ /* Window Procedures for Rootless mode */
CreateWindowProcPtr CreateWindow; CreateWindowProcPtr CreateWindow;
PositionWindowProcPtr PositionWindow;
ChangeWindowAttributesProcPtr ChangeWindowAttributes; ChangeWindowAttributesProcPtr ChangeWindowAttributes;
RealizeWindowProcPtr RealizeWindow; RealizeWindowProcPtr RealizeWindow;
UnrealizeWindowProcPtr UnrealizeWindow; UnrealizeWindowProcPtr UnrealizeWindow;

7
hw/xwin/winmultiwindowwindow.c
View File

@ -159,12 +159,9 @@ winDestroyWindowMultiWindow(WindowPtr pWin)
Bool Bool
winPositionWindowMultiWindow(WindowPtr pWin, int x, int y) winPositionWindowMultiWindow(WindowPtr pWin, int x, int y)
{ {
Bool fResult = TRUE;
int iX, iY, iWidth, iHeight; int iX, iY, iWidth, iHeight;
ScreenPtr pScreen = pWin->drawable.pScreen;
winWindowPriv(pWin); winWindowPriv(pWin);
winScreenPriv(pScreen);
HWND hWnd = pWinPriv->hWnd; HWND hWnd = pWinPriv->hWnd;
RECT rcNew; RECT rcNew;
@ -181,9 +178,7 @@ winPositionWindowMultiWindow(WindowPtr pWin, int x, int y)
winTrace("winPositionWindowMultiWindow - pWin: %p\n", pWin); winTrace("winPositionWindowMultiWindow - pWin: %p\n", pWin);
#endif #endif
WIN_UNWRAP(PositionWindow); Bool fResult = fbPositionWindow(pWin, x, y);
fResult = (*pScreen->PositionWindow) (pWin, x, y);
WIN_WRAP(PositionWindow, winPositionWindowMultiWindow);
#if ENABLE_DEBUG #if ENABLE_DEBUG
ErrorF("winPositionWindowMultiWindow: (x, y) = (%d, %d)\n", x, y); ErrorF("winPositionWindowMultiWindow: (x, y) = (%d, %d)\n", x, y);

2
hw/xwin/winscrinit.c
View File

@ -380,7 +380,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
WRAP(CreateWindow); WRAP(CreateWindow);
WRAP(RealizeWindow); WRAP(RealizeWindow);
WRAP(UnrealizeWindow); WRAP(UnrealizeWindow);
WRAP(PositionWindow);
WRAP(ChangeWindowAttributes); WRAP(ChangeWindowAttributes);
WRAP(SetShape); WRAP(SetShape);
@ -412,7 +411,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
WRAP(CreateWindow); WRAP(CreateWindow);
WRAP(RealizeWindow); WRAP(RealizeWindow);
WRAP(UnrealizeWindow); WRAP(UnrealizeWindow);
WRAP(PositionWindow);
WRAP(ChangeWindowAttributes); WRAP(ChangeWindowAttributes);
WRAP(ReparentWindow); WRAP(ReparentWindow);
WRAP(RestackWindow); WRAP(RestackWindow);

9
hw/xwin/winwindow.c
View File

@ -104,18 +104,11 @@ winDestroyWindowRootless(WindowPtr pWin)
Bool Bool
winPositionWindowRootless(WindowPtr pWin, int x, int y) winPositionWindowRootless(WindowPtr pWin, int x, int y)
{ {
Bool fResult = FALSE;
ScreenPtr pScreen = pWin->drawable.pScreen;
winScreenPriv(pScreen);
#if ENABLE_DEBUG #if ENABLE_DEBUG
winTrace("winPositionWindowRootless (%p)\n", pWin); winTrace("winPositionWindowRootless (%p)\n", pWin);
#endif #endif
WIN_UNWRAP(PositionWindow); Bool fResult = fbPositionWindow(pWin, x, y);
fResult = (*pScreen->PositionWindow) (pWin, x, y);
WIN_WRAP(PositionWindow, winPositionWindowRootless);
winUpdateRgnRootless(pWin); winUpdateRgnRootless(pWin);