libweston: make wl_output point to weston_head
The user data of a wl_resource representing a wl_output protocol object used to be a pointer to weston_output. Now that weston_output is being split, wl_output more accurately refers to weston_head which is a single monitor. Change the wl_output user data to point to weston_head. weston_output_from_resource() is replaced with weston_head_from_resource(). This change is not strictly necessary, but architecturally it is the right thing to do. In the future there might appear the need to refer to a specific head of a cloned pair, for instance. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> v5 Reviewed-by: Derek Foreman <derekf@osg.samsung.com> Reviewed-by: Ian Ray <ian.ray@ge.com> Reviewed-by: Daniel Stone <daniels@collabora.com> Acked-by: Derek Foreman <derekf@osg.samsung.com>
This commit is contained in:
@@ -308,7 +308,7 @@ weston_desktop_wl_shell_surface_protocol_set_fullscreen(struct wl_client *wl_cli
|
||||
struct weston_output *output = NULL;
|
||||
|
||||
if (output_resource != NULL)
|
||||
output = weston_output_from_resource(output_resource);
|
||||
output = weston_head_from_resource(output_resource)->output;
|
||||
|
||||
weston_desktop_wl_shell_change_state(surface, FULLSCREEN, NULL, 0, 0);
|
||||
weston_desktop_api_fullscreen_requested(surface->desktop, dsurface,
|
||||
|
||||
@@ -515,7 +515,7 @@ weston_desktop_xdg_toplevel_protocol_set_fullscreen(struct wl_client *wl_client,
|
||||
struct weston_output *output = NULL;
|
||||
|
||||
if (output_resource != NULL)
|
||||
output = weston_output_from_resource(output_resource);
|
||||
output = weston_head_from_resource(output_resource)->output;
|
||||
|
||||
weston_desktop_xdg_toplevel_ensure_added(toplevel);
|
||||
weston_desktop_api_fullscreen_requested(toplevel->base.desktop, dsurface,
|
||||
|
||||
Reference in New Issue
Block a user