mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-03 09:01:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

(Partly) fix handling of client-initiated configure requests

Browse source 
- Add missing call to wlr_scene_node_set_position() in
  unmanaged_handle_commit() -- this fixes moving unmanaged XWayland
  windows.

- Update view->pending_move_resize when we receive a configure request
  for a managed XWayland surface -- this fixes moving managed but
  undecorated XWayland windows.

- Also update view->pending_move_resize when we move a surface while a
  configure request is already pending -- this fixes a discrepancy
  between displayed and actual position for XWayland windows that try to
  set their own initial position, but then get overridden by labwc's
  positioning.

Moving undecorated XWayland windows is still really glitchy -- it appears
that an XWayland window gets sent incorrect mouse motion coordinates when
there is a pending configure request moving the window itself.
This commit is contained in:
John Lindgren 2022-07-02 13:18:31 -04:00 • committed by Johan Malm
parent 3c345201cd
commit 80792d446f
3 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/labwc.h
View file

@ -365,6 +365,7 @@ struct view {
struct xwayland_unmanaged { struct xwayland_unmanaged {
struct server *server; struct server *server;
struct wlr_xwayland_surface *xwayland_surface; struct wlr_xwayland_surface *xwayland_surface;
struct wlr_scene_node *node;
struct wl_list link; struct wl_list link;
int lx, ly; int lx, ly;

7
src/xwayland-unmanaged.c
View file

@ -20,6 +20,8 @@ unmanaged_handle_commit(struct wl_listener *listener, void *data)
struct wlr_xwayland_surface *xsurface = unmanaged->xwayland_surface; struct wlr_xwayland_surface *xsurface = unmanaged->xwayland_surface;
unmanaged->lx = xsurface->x; unmanaged->lx = xsurface->x;
unmanaged->ly = xsurface->y; unmanaged->ly = xsurface->y;
wlr_scene_node_set_position(unmanaged->node,
unmanaged->lx, unmanaged->ly);
} }
static void static void
@ -59,10 +61,11 @@ unmanaged_handle_map(struct wl_listener *listener, void *data)
} }
/* node will be destroyed automatically once surface is destroyed */ /* node will be destroyed automatically once surface is destroyed */
struct wlr_scene_node *node = &wlr_scene_surface_create( unmanaged->node = &wlr_scene_surface_create(
unmanaged->server->unmanaged_tree, unmanaged->server->unmanaged_tree,
xsurface->surface)->buffer->node; xsurface->surface)->buffer->node;
wlr_scene_node_set_position(node, unmanaged->lx, unmanaged->ly); wlr_scene_node_set_position(unmanaged->node,
unmanaged->lx, unmanaged->ly);
} }
static void static void

14
src/xwayland.c
View file

@ -144,6 +144,13 @@ handle_request_configure(struct wl_listener *listener, void *data)
int height = event->height; int height = event->height;
view_adjust_size(view, &width, &height); view_adjust_size(view, &width, &height);
view->pending_move_resize.update_x = event->x != view->x;
view->pending_move_resize.update_y = event->y != view->y;
view->pending_move_resize.x = event->x;
view->pending_move_resize.y = event->y;
view->pending_move_resize.width = width;
view->pending_move_resize.height = height;
wlr_xwayland_surface_configure(view->xwayland_surface, wlr_xwayland_surface_configure(view->xwayland_surface,
event->x, event->y, width, height); event->x, event->y, width, height);
} }
@ -216,6 +223,13 @@ move(struct view *view, double x, double y)
{ {
view->x = x; view->x = x;
view->y = y; view->y = y;
/* override any previous pending move */
view->pending_move_resize.update_x = false;
view->pending_move_resize.update_y = false;
view->pending_move_resize.x = x;
view->pending_move_resize.y = y;
struct wlr_xwayland_surface *s = view->xwayland_surface; struct wlr_xwayland_surface *s = view->xwayland_surface;
wlr_xwayland_surface_configure(s, (int16_t)x, (int16_t)y, wlr_xwayland_surface_configure(s, (int16_t)x, (int16_t)y,
(uint16_t)s->width, (uint16_t)s->height); (uint16_t)s->width, (uint16_t)s->height);