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

xwayland: Save natural geometry from initially maximized views

Browse source
This commit is contained in:
John Lindgren 2023-02-07 21:12:56 -05:00 • committed by Johan Malm
parent 09599861ac
commit a417c1c761
1 changed files with 55 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

68
src/xwayland.c
View file

@ -106,6 +106,38 @@ xwayland_surface_from_view(struct view *view)
return xwayland_view->xwayland_surface; return xwayland_view->xwayland_surface;
} }
static void
ensure_initial_geometry(struct view *view)
{
if (!view->w || !view->h) {
struct wlr_xwayland_surface *xwayland_surface =
xwayland_surface_from_view(view);
view->x = xwayland_surface->x;
view->y = xwayland_surface->y;
view->w = xwayland_surface->width;
view->h = xwayland_surface->height;
/*
* If there is no pending move/resize yet, then set
* current values (used in map()).
*/
struct view_pending_move_resize *pending =
&view->pending_move_resize;
if (!pending->width || !pending->height) {
pending->x = view->x;
pending->y = view->y;
pending->width = view->w;
pending->height = view->h;
}
}
}
static bool
want_deco(struct wlr_xwayland_surface *xwayland_surface)
{
return xwayland_surface->decorations ==
WLR_XWAYLAND_SURFACE_DECORATIONS_ALL;
}
static void static void
handle_commit(struct wl_listener *listener, void *data) handle_commit(struct wl_listener *listener, void *data)
{ {
@ -320,6 +352,15 @@ handle_request_maximize(struct wl_listener *listener, void *data)
{ {
struct view *view = wl_container_of(listener, view, request_maximize); struct view *view = wl_container_of(listener, view, request_maximize);
assert(view); assert(view);
if (!view->been_mapped) {
ensure_initial_geometry(view);
/*
* Set decorations early to avoid changing geometry
* after maximize (reduces visual glitches).
*/
view_set_decorations(view,
want_deco(xwayland_surface_from_view(view)));
}
view_toggle_maximize(view); view_toggle_maximize(view);
} }
@ -328,6 +369,9 @@ handle_request_fullscreen(struct wl_listener *listener, void *data)
{ {
struct view *view = wl_container_of(listener, view, request_fullscreen); struct view *view = wl_container_of(listener, view, request_fullscreen);
bool fullscreen = xwayland_surface_from_view(view)->fullscreen; bool fullscreen = xwayland_surface_from_view(view)->fullscreen;
if (!view->been_mapped) {
ensure_initial_geometry(view);
}
view_set_fullscreen(view, fullscreen, NULL); view_set_fullscreen(view, fullscreen, NULL);
} }
@ -389,13 +433,6 @@ get_string_prop(struct view *view, const char *prop)
return ""; return "";
} }
static bool
want_deco(struct wlr_xwayland_surface *xwayland_surface)
{
return xwayland_surface->decorations ==
WLR_XWAYLAND_SURFACE_DECORATIONS_ALL;
}
static void static void
handle_set_decorations(struct wl_listener *listener, void *data) handle_set_decorations(struct wl_listener *listener, void *data)
{ {
@ -471,18 +508,13 @@ map(struct view *view)
return; return;
} }
view->mapped = true; view->mapped = true;
ensure_initial_geometry(view);
wlr_scene_node_set_enabled(&view->scene_tree->node, true); wlr_scene_node_set_enabled(&view->scene_tree->node, true);
struct wlr_xwayland_surface *xwayland_surface = struct wlr_xwayland_surface *xwayland_surface =
xwayland_surface_from_view(view); xwayland_surface_from_view(view);
if (!view->fullscreen && xwayland_surface->fullscreen) { if (!view->fullscreen && xwayland_surface->fullscreen) {
view_set_fullscreen(view, true, NULL); view_set_fullscreen(view, true, NULL);
} }
if (!view->maximized && !view->fullscreen) {
view->x = xwayland_surface->x;
view->y = xwayland_surface->y;
view->w = xwayland_surface->width;
view->h = xwayland_surface->height;
}
if (view->surface != xwayland_surface->surface) { if (view->surface != xwayland_surface->surface) {
if (view->surface) { if (view->surface) {
@ -516,6 +548,16 @@ map(struct view *view)
set_initial_position(view, xwayland_surface); set_initial_position(view, xwayland_surface);
} }
/*
* When mapping the view for the first time, visual
* artifacts are reduced if we display it immediately at
* the final intended position/size rather than waiting
* for handle_commit().
*/
view->x = view->pending_move_resize.x;
view->y = view->pending_move_resize.y;
view->w = view->pending_move_resize.width;
view->h = view->pending_move_resize.height;
view_moved(view); view_moved(view);
view->been_mapped = true; view->been_mapped = true;
} }