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

(!1714) rootless: use window position notify hook 

Wrapping ScreenRec's function pointers is problematic for many reasons, so
use the new window position notify hook instead.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-09-27 17:28:17 +02:00
parent 2ffc5f1523
commit 4d24ece1c3
4 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
miext/rootless/rootlessCommon.h
View File

@ -91,7 +91,6 @@ typedef struct _RootlessScreenRec {
RestackWindowProcPtr RestackWindow; RestackWindowProcPtr RestackWindow;
ReparentWindowProcPtr ReparentWindow; ReparentWindowProcPtr ReparentWindow;
ChangeBorderWidthProcPtr ChangeBorderWidth; ChangeBorderWidthProcPtr ChangeBorderWidth;
PositionWindowProcPtr PositionWindow;
ChangeWindowAttributesProcPtr ChangeWindowAttributes; ChangeWindowAttributesProcPtr ChangeWindowAttributes;
PaintWindowProcPtr PaintWindow; PaintWindowProcPtr PaintWindow;

2
miext/rootless/rootlessScreen.c
View File

@ -650,6 +650,7 @@ RootlessWrap(ScreenPtr pScreen)
RootlessScreenRec *s = SCREENREC(pScreen); RootlessScreenRec *s = SCREENREC(pScreen);
dixScreenHookWindowDestroy(pScreen, RootlessWindowDestroy, NULL); dixScreenHookWindowDestroy(pScreen, RootlessWindowDestroy, NULL);
dixScreenHookWindowPosition(pScreen, RootlessWindowPosition, NULL);
#define WRAP(a) \ #define WRAP(a) \
if (pScreen->a) { \ if (pScreen->a) { \
@ -671,7 +672,6 @@ RootlessWrap(ScreenPtr pScreen)
WRAP(RealizeWindow); WRAP(RealizeWindow);
WRAP(UnrealizeWindow); WRAP(UnrealizeWindow);
WRAP(MoveWindow); WRAP(MoveWindow);
WRAP(PositionWindow);
WRAP(ResizeWindow); WRAP(ResizeWindow);
WRAP(RestackWindow); WRAP(RestackWindow);
WRAP(ReparentWindow); WRAP(ReparentWindow);

13
miext/rootless/rootlessWindow.c
View File

@ -300,18 +300,16 @@ RootlessChangeWindowAttributes(WindowPtr pWin, unsigned long vmask)
} }
/* /*
* RootlessPositionWindow * @brief DIX move/resize hook
*
* This is a hook for when DIX moves or resizes a window. * This is a hook for when DIX moves or resizes a window.
* Update the frame position now although the physical window is moved * Update the frame position now although the physical window is moved
* in RootlessMoveWindow. (x, y) are *inside* position. After this, * in RootlessMoveWindow. (x, y) are *inside* position. After this,
* mi and fb are expecting the pixmap to be at the new location. * mi and fb are expecting the pixmap to be at the new location.
*/ */
Bool void RootlessWindowPosition(ScreenPtr pScreen, WindowPtr pWin, void *arg, int32_t x, int32_t y)
RootlessPositionWindow(WindowPtr pWin, int x, int y)
{ {
ScreenPtr pScreen = pWin->drawable.pScreen;
RootlessWindowRec *winRec = WINREC(pWin); RootlessWindowRec *winRec = WINREC(pWin);
Bool result;
RL_DEBUG_MSG("positionwindow start (win %p (%lu) @ %i, %i)\n", pWin, RootlessWID(pWin), x, y); RL_DEBUG_MSG("positionwindow start (win %p (%lu) @ %i, %i)\n", pWin, RootlessWID(pWin), x, y);
@ -325,12 +323,7 @@ RootlessPositionWindow(WindowPtr pWin, int x, int y)
} }
} }
SCREEN_UNWRAP(pScreen, PositionWindow);
result = pScreen->PositionWindow(pWin, x, y);
SCREEN_WRAP(pScreen, PositionWindow);
RL_DEBUG_MSG("positionwindow end\n"); RL_DEBUG_MSG("positionwindow end\n");
return result;
} }
/* /*

2
miext/rootless/rootlessWindow.h
View File

@ -42,7 +42,7 @@ void RootlessWindowDestroy(ScreenPtr pScreen, WindowPtr pWin, void *arg);
void RootlessSetShape(WindowPtr pWin, int kind); 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); void RootlessWindowPosition(ScreenPtr pScreen, WindowPtr pWin, void *arg, int32_t x, int32_t y);
Bool RootlessRealizeWindow(WindowPtr pWin); Bool RootlessRealizeWindow(WindowPtr pWin);
Bool RootlessUnrealizeWindow(WindowPtr pWin); Bool RootlessUnrealizeWindow(WindowPtr pWin);
void RootlessRestackWindow(WindowPtr pWin, WindowPtr pOldNextSib); void RootlessRestackWindow(WindowPtr pWin, WindowPtr pOldNextSib);