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

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

Instead of complicated wrapping, just call fbSetShape() 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 20:25:46 +02:00
parent fa46ba1901
commit f7e2c1030d
5 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fb/fb.h
View File

@ -842,6 +842,8 @@ fbPolyFillRect(DrawablePtr pDrawable,
#define fbFillPolygon miFillPolygon #define fbFillPolygon miFillPolygon
#define fbSetShape miSetShape
/* /*
* fbfillsp.c * fbfillsp.c
*/ */

1
hw/xwin/win.h
View File

@ -509,7 +509,6 @@ typedef struct _winPrivScreenRec {
ReparentWindowProcPtr ReparentWindow; ReparentWindowProcPtr ReparentWindow;
ResizeWindowProcPtr ResizeWindow; ResizeWindowProcPtr ResizeWindow;
MoveWindowProcPtr MoveWindow; MoveWindowProcPtr MoveWindow;
SetShapeProcPtr SetShape;
ModifyPixmapHeaderProcPtr ModifyPixmapHeader; ModifyPixmapHeaderProcPtr ModifyPixmapHeader;
winCursorRec cursor; winCursorRec cursor;

6
hw/xwin/winmultiwindowshape.c
View File

@ -33,6 +33,8 @@
#include <xwin-config.h> #include <xwin-config.h>
#endif #endif
#include "mi/mi_priv.h"
#include "win.h" #include "win.h"
/* /*
@ -50,9 +52,7 @@ winSetShapeMultiWindow(WindowPtr pWin, int kind)
ErrorF("winSetShapeMultiWindow - pWin: %p kind: %i\n", pWin, kind); ErrorF("winSetShapeMultiWindow - pWin: %p kind: %i\n", pWin, kind);
#endif #endif
WIN_UNWRAP(SetShape); fbSetShape(pWin, kind);
(*pScreen->SetShape) (pWin, kind);
WIN_WRAP(SetShape, winSetShapeMultiWindow);
/* Update the Windows window's shape */ /* Update the Windows window's shape */
winReshapeMultiWindow(pWin); winReshapeMultiWindow(pWin);

2
hw/xwin/winscrinit.c
View File

@ -380,7 +380,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
/* Save a pointer to each lower-level window procedure */ /* Save a pointer to each lower-level window procedure */
WRAP(RealizeWindow); WRAP(RealizeWindow);
WRAP(UnrealizeWindow); WRAP(UnrealizeWindow);
WRAP(SetShape);
/* Assign rootless window procedures to be top level procedures */ /* Assign rootless window procedures to be top level procedures */
pScreen->CreateWindow = winCreateWindowRootless; pScreen->CreateWindow = winCreateWindowRootless;
@ -413,7 +412,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
WRAP(RestackWindow); WRAP(RestackWindow);
WRAP(ResizeWindow); WRAP(ResizeWindow);
WRAP(MoveWindow); WRAP(MoveWindow);
WRAP(SetShape);
WRAP(ModifyPixmapHeader); WRAP(ModifyPixmapHeader);
/* Assign multi-window window procedures to be top level procedures */ /* Assign multi-window window procedures to be top level procedures */

4
hw/xwin/winwindow.c
View File

@ -213,9 +213,7 @@ winSetShapeRootless(WindowPtr pWin, int kind)
winTrace("winSetShapeRootless (%p, %i)\n", pWin, kind); winTrace("winSetShapeRootless (%p, %i)\n", pWin, kind);
#endif #endif
WIN_UNWRAP(SetShape); fbSetShape(pWin, kind);
(*pScreen->SetShape) (pWin, kind);
WIN_WRAP(SetShape, winSetShapeRootless);
winReshapeRootless(pWin); winReshapeRootless(pWin);
winUpdateRgnRootless(pWin); winUpdateRgnRootless(pWin);