xwayland: Also hook screen's MoveWindow method
Not only hook the ResizeWindow method of the screen (which really is MoveAndResize) but also hook the MoveWindow method for checking if we need to setup a viewport for resolution change emulation. Our resolution change emulation check if the windows origin matches the monitors origin and the windows origin can also be changed by just a move without being resized. Also checking on a move becomes esp. important when we move to checking on changes to the top-level non-window-manager client (X11)Window instead of on changes to the xwl_window later on in this patch series. Acked-by: Olivier Fourdan <ofourdan@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
parent
4fc107460a
commit
10df0437a2
|
@ -644,6 +644,9 @@ xwl_screen_init(ScreenPtr pScreen, int argc, char **argv)
|
|||
xwl_screen->ResizeWindow = pScreen->ResizeWindow;
|
||||
pScreen->ResizeWindow = xwl_resize_window;
|
||||
|
||||
xwl_screen->MoveWindow = pScreen->MoveWindow;
|
||||
pScreen->MoveWindow = xwl_move_window;
|
||||
|
||||
if (xwl_screen->rootless) {
|
||||
xwl_screen->SetWindowPixmap = pScreen->SetWindowPixmap;
|
||||
pScreen->SetWindowPixmap = xwl_window_set_window_pixmap;
|
||||
|
|
|
@ -65,6 +65,7 @@ struct xwl_screen {
|
|||
SetWindowPixmapProcPtr SetWindowPixmap;
|
||||
ChangeWindowAttributesProcPtr ChangeWindowAttributes;
|
||||
ResizeWindowProcPtr ResizeWindow;
|
||||
MoveWindowProcPtr MoveWindow;
|
||||
|
||||
struct xorg_list output_list;
|
||||
struct xorg_list seat_list;
|
||||
|
|
|
@ -693,6 +693,28 @@ xwl_resize_window(WindowPtr window,
|
|||
xwl_window_check_resolution_change_emulation(xwl_window);
|
||||
}
|
||||
|
||||
void
|
||||
xwl_move_window(WindowPtr window,
|
||||
int x, int y,
|
||||
WindowPtr next_sib,
|
||||
VTKind kind)
|
||||
{
|
||||
ScreenPtr screen = window->drawable.pScreen;
|
||||
struct xwl_screen *xwl_screen;
|
||||
struct xwl_window *xwl_window;
|
||||
|
||||
xwl_screen = xwl_screen_get(screen);
|
||||
xwl_window = xwl_window_from_window(window);
|
||||
|
||||
screen->MoveWindow = xwl_screen->MoveWindow;
|
||||
(*screen->MoveWindow) (window, x, y, next_sib, kind);
|
||||
xwl_screen->MoveWindow = screen->MoveWindow;
|
||||
screen->MoveWindow = xwl_move_window;
|
||||
|
||||
if (xwl_window && (xwl_window_get(window) || xwl_window_is_toplevel(window)))
|
||||
xwl_window_check_resolution_change_emulation(xwl_window);
|
||||
}
|
||||
|
||||
static void
|
||||
frame_callback(void *data,
|
||||
struct wl_callback *callback,
|
||||
|
|
|
@ -33,6 +33,7 @@
|
|||
#include <X11/X.h>
|
||||
#include <dix.h>
|
||||
#include <propertyst.h>
|
||||
#include <validate.h>
|
||||
|
||||
#include "xwayland-types.h"
|
||||
|
||||
|
@ -73,6 +74,10 @@ void xwl_resize_window(WindowPtr window,
|
|||
int x, int y,
|
||||
unsigned int width, unsigned int height,
|
||||
WindowPtr sib);
|
||||
void xwl_move_window(WindowPtr window,
|
||||
int x, int y,
|
||||
WindowPtr next_sib,
|
||||
VTKind kind);
|
||||
Bool xwl_destroy_window(WindowPtr window);
|
||||
void xwl_window_post_damage(struct xwl_window *xwl_window);
|
||||
void xwl_window_create_frame_callback(struct xwl_window *xwl_window);
|
||||
|
|
Loading…
Reference in New Issue
Block a user