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

xwayland: Restore the ResizeWindow handler 

For now it just chains to ResizeWindow hook.

This is preparation work for the next commit, no functional change.

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1521>
This commit is contained in:
Olivier Fourdan 2024-05-06 11:37:36 +02:00 committed by Marge Bot
parent 7745fde24e
commit 539859bde0
4 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/xwayland/xwayland-screen.c
View File

@ -1145,6 +1145,9 @@ xwl_screen_init(ScreenPtr pScreen, int argc, char **argv)
xwl_screen->ConfigNotify = pScreen->ConfigNotify; xwl_screen->ConfigNotify = pScreen->ConfigNotify;
pScreen->ConfigNotify = xwl_config_notify; pScreen->ConfigNotify = xwl_config_notify;
xwl_screen->ResizeWindow = pScreen->ResizeWindow;
pScreen->ResizeWindow = xwl_resize_window;
xwl_screen->MoveWindow = pScreen->MoveWindow; xwl_screen->MoveWindow = pScreen->MoveWindow;
pScreen->MoveWindow = xwl_move_window; pScreen->MoveWindow = xwl_move_window;

1
hw/xwayland/xwayland-screen.h
View File

@ -78,6 +78,7 @@ struct xwl_screen {
XYToWindowProcPtr XYToWindow; XYToWindowProcPtr XYToWindow;
SetWindowPixmapProcPtr SetWindowPixmap; SetWindowPixmapProcPtr SetWindowPixmap;
ChangeWindowAttributesProcPtr ChangeWindowAttributes; ChangeWindowAttributesProcPtr ChangeWindowAttributes;
ResizeWindowProcPtr ResizeWindow;
MoveWindowProcPtr MoveWindow; MoveWindowProcPtr MoveWindow;
SourceValidateProcPtr SourceValidate; SourceValidateProcPtr SourceValidate;
SetShapeProcPtr SetShape; SetShapeProcPtr SetShape;

17
hw/xwayland/xwayland-window.c
View File

@ -1830,6 +1830,23 @@ xwl_config_notify(WindowPtr window,
return ret; return ret;
} }
void
xwl_resize_window(WindowPtr window,
int x, int y,
unsigned int width, unsigned int height,
WindowPtr sib)
{
ScreenPtr screen = window->drawable.pScreen;
struct xwl_screen *xwl_screen;
xwl_screen = xwl_screen_get(screen);
screen->ResizeWindow = xwl_screen->ResizeWindow;
screen->ResizeWindow(window, x, y, width, height, sib);
xwl_screen->ResizeWindow = screen->ResizeWindow;
screen->ResizeWindow = xwl_resize_window;
}
void void
xwl_move_window(WindowPtr window, xwl_move_window(WindowPtr window,
int x, int y, int x, int y,

4
hw/xwayland/xwayland-window.h
View File

@ -135,6 +135,10 @@ int xwl_config_notify(WindowPtr window,
int x, int y, int x, int y,
int width, int height, int bw, int width, int height, int bw,
WindowPtr sib); WindowPtr sib);
void xwl_resize_window(WindowPtr window,
int x, int y,
unsigned int width, unsigned int height,
WindowPtr sib);
void xwl_move_window(WindowPtr window, void xwl_move_window(WindowPtr window,
int x, int y, int x, int y,
WindowPtr next_sib, WindowPtr next_sib,