mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-03-18 05:33:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

xdg-shell: await configure serial before moving (issue #11)

Browse source
This commit is contained in:
Johan Malm 2020-12-22 21:08:17 +00:00
parent e0770a5672
commit 7c29bcb45e
2 changed files with 42 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
include/labwc.h
View file

@ -181,6 +181,13 @@ struct view {
*/ */
struct border margin; struct border margin;
struct {
bool update_x, update_y;
double x, y;
uint32_t width, height;
uint32_t configure_serial;
} pending_move_resize;
int xdg_grab_offset; int xdg_grab_offset;
bool server_side_deco; bool server_side_deco;

41
src/xdg.c
View file

@ -75,8 +75,26 @@ handle_commit(struct wl_listener *listener, void *data)
{ {
struct view *view = wl_container_of(listener, view, commit); struct view *view = wl_container_of(listener, view, commit);
assert(view->surface); assert(view->surface);
view->w = view->surface->current.width; struct wlr_box size;
view->h = view->surface->current.height; wlr_xdg_surface_get_geometry(view->xdg_surface, &size);
view->w = size.width;
view->h = size.height;
uint32_t serial = view->pending_move_resize.configure_serial;
if (serial > 0 && serial >= view->xdg_surface->configure_serial) {
if (view->pending_move_resize.update_x) {
view->x = view->pending_move_resize.x +
view->pending_move_resize.width - size.width;
}
if (view->pending_move_resize.update_y) {
view->y = view->pending_move_resize.y +
view->pending_move_resize.height - size.height;
}
if (serial == view->xdg_surface->configure_serial) {
view->pending_move_resize.configure_serial = 0;
}
}
} }
static void static void
@ -133,10 +151,21 @@ handle_request_resize(struct wl_listener *listener, void *data)
static void static void
xdg_toplevel_view_configure(struct view *view, struct wlr_box geo) xdg_toplevel_view_configure(struct view *view, struct wlr_box geo)
{ {
view->x = geo.x; view->pending_move_resize.update_x = geo.x != view->x;
view->y = geo.y; view->pending_move_resize.update_y = geo.y != view->y;
wlr_xdg_toplevel_set_size(view->xdg_surface, (uint32_t)geo.width, view->pending_move_resize.x = geo.x;
(uint32_t)geo.height); view->pending_move_resize.y = geo.y;
view->pending_move_resize.width = geo.width;
view->pending_move_resize.height = geo.height;
uint32_t serial = wlr_xdg_toplevel_set_size(view->xdg_surface,
(uint32_t)geo.width, (uint32_t)geo.height);
if (serial > 0) {
view->pending_move_resize.configure_serial = serial;
} else if (view->pending_move_resize.configure_serial == 0) {
view->x = geo.x;
view->y = geo.y;
}
} }
static void static void