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: Set view->output prior to view_set_fullscreen()

Browse source
This commit is contained in:
John Lindgren 2023-02-20 13:36:15 -05:00 • committed by Johan Malm
parent ed19bc4f9e
commit bdbbbb2e62
5 changed files with 30 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/view.h
View file

@ -138,9 +138,7 @@ void view_restore_to(struct view *view, struct wlr_box geometry);
void view_set_untiled(struct view *view); void view_set_untiled(struct view *view);
void view_maximize(struct view *view, bool maximize, void view_maximize(struct view *view, bool maximize,
bool store_natural_geometry); bool store_natural_geometry);
/* output is optional, defaults to current nearest output */ void view_set_fullscreen(struct view *view, bool fullscreen);
void view_set_fullscreen(struct view *view, bool fullscreen,
struct output *output);
void view_toggle_maximize(struct view *view); void view_toggle_maximize(struct view *view);
void view_toggle_decorations(struct view *view); void view_toggle_decorations(struct view *view);
void view_toggle_always_on_top(struct view *view); void view_toggle_always_on_top(struct view *view);

2
src/foreign.c
View file

@ -25,7 +25,7 @@ handle_request_fullscreen(struct wl_listener *listener, void *data)
{ {
struct view *view = wl_container_of(listener, view, toplevel.fullscreen); struct view *view = wl_container_of(listener, view, toplevel.fullscreen);
struct wlr_foreign_toplevel_handle_v1_fullscreen_event *event = data; struct wlr_foreign_toplevel_handle_v1_fullscreen_event *event = data;
view_set_fullscreen(view, event->fullscreen, NULL); view_set_fullscreen(view, event->fullscreen);
} }
static void static void

8
src/view.c
View file

@ -687,7 +687,7 @@ void
view_toggle_fullscreen(struct view *view) view_toggle_fullscreen(struct view *view)
{ {
assert(view); assert(view);
view_set_fullscreen(view, !view->fullscreen, NULL); view_set_fullscreen(view, !view->fullscreen);
} }
/* For internal use only. Does not update geometry. */ /* For internal use only. Does not update geometry. */
@ -722,20 +722,18 @@ set_fullscreen(struct view *view, bool fullscreen)
} }
void void
view_set_fullscreen(struct view *view, bool fullscreen, struct output *output) view_set_fullscreen(struct view *view, bool fullscreen)
{ {
assert(view); assert(view);
if (fullscreen == view->fullscreen) { if (fullscreen == view->fullscreen) {
return; return;
} }
if (fullscreen) { if (fullscreen) {
if (!output_is_usable(output)) { struct output *output = view_output(view);
output = view_output(view);
if (!output_is_usable(output)) { if (!output_is_usable(output)) {
/* Prevent fullscreen with no available outputs */ /* Prevent fullscreen with no available outputs */
return; return;
} }
}
/* /*
* Fullscreen via keybind or client request cancels * Fullscreen via keybind or client request cancels
* interactive move/resize since we can't move/resize * interactive move/resize since we can't move/resize

28
src/xdg.c
View file

@ -185,6 +185,24 @@ handle_request_maximize(struct wl_listener *listener, void *data)
/*store_natural_geometry*/ true); /*store_natural_geometry*/ true);
} }
static void
set_fullscreen_from_request(struct view *view,
struct wlr_xdg_toplevel_requested *requested)
{
if (!view->fullscreen && requested->fullscreen
&& requested->fullscreen_output) {
struct output *output = output_from_wlr_output(view->server,
requested->fullscreen_output);
if (output_is_usable(output)) {
view->output = output;
} else {
wlr_log(WLR_ERROR,
"invalid output in fullscreen request");
}
}
view_set_fullscreen(view, requested->fullscreen);
}
static void static void
handle_request_fullscreen(struct wl_listener *listener, void *data) handle_request_fullscreen(struct wl_listener *listener, void *data)
{ {
@ -192,10 +210,8 @@ handle_request_fullscreen(struct wl_listener *listener, void *data)
if (!view->mapped && !view->output) { if (!view->mapped && !view->output) {
view->output = output_nearest_to_cursor(view->server); view->output = output_nearest_to_cursor(view->server);
} }
struct wlr_xdg_toplevel *xdg_toplevel = xdg_toplevel_from_view(view); set_fullscreen_from_request(view,
struct output *output = output_from_wlr_output(view->server, &xdg_toplevel_from_view(view)->requested);
xdg_toplevel->requested.fullscreen_output);
view_set_fullscreen(view, xdg_toplevel->requested.fullscreen, output);
} }
static void static void
@ -361,9 +377,7 @@ xdg_toplevel_view_map(struct view *view)
} }
if (!view->fullscreen && requested->fullscreen) { if (!view->fullscreen && requested->fullscreen) {
struct output *output = output_from_wlr_output( set_fullscreen_from_request(view, requested);
view->server, requested->fullscreen_output);
view_set_fullscreen(view, true, output);
} else if (!view->maximized && requested->maximized) { } else if (!view->maximized && requested->maximized) {
view_maximize(view, true, view_maximize(view, true,
/*store_natural_geometry*/ true); /*store_natural_geometry*/ true);

4
src/xwayland.c
View file

@ -313,7 +313,7 @@ handle_request_fullscreen(struct wl_listener *listener, void *data)
if (!view->mapped) { if (!view->mapped) {
ensure_initial_geometry_and_output(view); ensure_initial_geometry_and_output(view);
} }
view_set_fullscreen(view, fullscreen, NULL); view_set_fullscreen(view, fullscreen);
} }
static void static void
@ -429,7 +429,7 @@ xwayland_view_map(struct view *view)
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);
} }
if (view->surface != xwayland_surface->surface) { if (view->surface != xwayland_surface->surface) {