mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor-wayland: windowed/fullscreen not on fullscreen-shell

Browse Source 
The set_windowed and set_fullscreen functions are only useful on a
desktop shell, and never called on fullscreen-shell.

Remove the confusing dead code, and ensure we notice if these functions
get called in the wrong environment.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Acked-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Pekka Paalanen
2017-10-18 12:31:40 +03:00
parent 7d2fc9291b
commit 441954325e
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston/compositor-wayland.c
+4 -7
View File
@@ -877,6 +877,8 @@ wayland_output_set_windowed(struct wayland_output *output)
zxdg_toplevel_v6_unset_fullscreen(output->parent.xdg_toplevel); zxdg_toplevel_v6_unset_fullscreen(output->parent.xdg_toplevel);
} else if (output->parent.shell_surface) { } else if (output->parent.shell_surface) {
wl_shell_surface_set_toplevel(output->parent.shell_surface); wl_shell_surface_set_toplevel(output->parent.shell_surface);
} else {
abort();
} }
return 0; return 0;
@@ -887,9 +889,6 @@ wayland_output_set_fullscreen(struct wayland_output *output,
enum wl_shell_surface_fullscreen_method method, enum wl_shell_surface_fullscreen_method method,
uint32_t framerate, struct wl_output *target) uint32_t framerate, struct wl_output *target)
{ {
struct wayland_backend *b =
to_wayland_backend(output->base.compositor);
if (output->frame) { if (output->frame) {
frame_destroy(output->frame); frame_destroy(output->frame);
output->frame = NULL; output->frame = NULL;
@@ -902,10 +901,8 @@ wayland_output_set_fullscreen(struct wayland_output *output,
} else if (output->parent.shell_surface) { } else if (output->parent.shell_surface) {
wl_shell_surface_set_fullscreen(output->parent.shell_surface, wl_shell_surface_set_fullscreen(output->parent.shell_surface,
method, framerate, target); method, framerate, target);
} else if (b->parent.fshell) { } else {
zwp_fullscreen_shell_v1_present_surface(b->parent.fshell, abort();
output->parent.surface,
method, target);
} }
} }