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

xdg,xwayland: Set initial output for views

Browse source
This commit is contained in:
John Lindgren 2023-02-03 14:45:04 -05:00 • committed by Johan Malm
parent 64bea4f511
commit ed19bc4f9e
2 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/xdg.c
View file

@ -178,6 +178,9 @@ static void
handle_request_maximize(struct wl_listener *listener, void *data) 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);
if (!view->mapped && !view->output) {
view->output = output_nearest_to_cursor(view->server);
}
view_maximize(view, xdg_toplevel_from_view(view)->requested.maximized, view_maximize(view, xdg_toplevel_from_view(view)->requested.maximized,
/*store_natural_geometry*/ true); /*store_natural_geometry*/ true);
} }
@ -186,6 +189,9 @@ static void
handle_request_fullscreen(struct wl_listener *listener, void *data) 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);
if (!view->mapped && !view->output) {
view->output = output_nearest_to_cursor(view->server);
}
struct wlr_xdg_toplevel *xdg_toplevel = xdg_toplevel_from_view(view); struct wlr_xdg_toplevel *xdg_toplevel = xdg_toplevel_from_view(view);
struct output *output = output_from_wlr_output(view->server, struct output *output = output_from_wlr_output(view->server,
xdg_toplevel->requested.fullscreen_output); xdg_toplevel->requested.fullscreen_output);
@ -317,6 +323,9 @@ xdg_toplevel_view_map(struct view *view)
return; return;
} }
view->mapped = true; view->mapped = true;
if (!view->output) {
view->output = output_nearest_to_cursor(view->server);
}
struct wlr_xdg_surface *xdg_surface = xdg_surface_from_view(view); struct wlr_xdg_surface *xdg_surface = xdg_surface_from_view(view);
view->surface = xdg_surface->surface; view->surface = xdg_surface->surface;
wlr_scene_node_set_enabled(&view->scene_tree->node, true); wlr_scene_node_set_enabled(&view->scene_tree->node, true);

19
src/xwayland.c
View file

@ -74,7 +74,7 @@ xwayland_surface_from_view(struct view *view)
} }
static void static void
ensure_initial_geometry(struct view *view) ensure_initial_geometry_and_output(struct view *view)
{ {
if (wlr_box_empty(&view->current)) { if (wlr_box_empty(&view->current)) {
struct wlr_xwayland_surface *xwayland_surface = struct wlr_xwayland_surface *xwayland_surface =
@ -91,6 +91,13 @@ ensure_initial_geometry(struct view *view)
view->pending = view->current; view->pending = view->current;
} }
} }
if (!view->output) {
/*
* Just use the cursor output since we don't know yet
* whether the surface position is meaningful.
*/
view->output = output_nearest_to_cursor(view->server);
}
} }
static bool static bool
@ -286,8 +293,8 @@ static void
handle_request_maximize(struct wl_listener *listener, void *data) 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);
if (!view->been_mapped) { if (!view->mapped) {
ensure_initial_geometry(view); ensure_initial_geometry_and_output(view);
/* /*
* Set decorations early to avoid changing geometry * Set decorations early to avoid changing geometry
* after maximize (reduces visual glitches). * after maximize (reduces visual glitches).
@ -303,8 +310,8 @@ 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) { if (!view->mapped) {
ensure_initial_geometry(view); ensure_initial_geometry_and_output(view);
} }
view_set_fullscreen(view, fullscreen, NULL); view_set_fullscreen(view, fullscreen, NULL);
} }
@ -417,7 +424,7 @@ xwayland_view_map(struct view *view)
return; return;
} }
view->mapped = true; view->mapped = true;
ensure_initial_geometry(view); ensure_initial_geometry_and_output(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);