libweston: introduce weston_output_from_resource()
This is a simple wrapper for casting the user data of a wl_resource into a struct weston_output pointer. Using the wrapper clearly marks all the places where a wl_output protocol object is used. Replace ALL wl_output related calls to wl_resource_get_user_data() with a call to weston_output_from_resource(). v2: add type assert in weston_output_from_resource(). Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Armin Krezović <krezovic.armin@gmail.com>
This commit is contained in:
@@ -302,7 +302,7 @@ weston_desktop_wl_shell_surface_protocol_set_fullscreen(struct wl_client *wl_cli
|
||||
struct weston_output *output = NULL;
|
||||
|
||||
if (output_resource != NULL)
|
||||
output = wl_resource_get_user_data(output_resource);
|
||||
output = weston_output_from_resource(output_resource);
|
||||
|
||||
weston_desktop_wl_shell_change_state(surface, FULLSCREEN, NULL, 0, 0);
|
||||
weston_desktop_api_fullscreen_requested(surface->desktop, dsurface,
|
||||
|
||||
@@ -553,7 +553,7 @@ weston_desktop_xdg_surface_protocol_set_fullscreen(struct wl_client *wl_client,
|
||||
struct weston_output *output = NULL;
|
||||
|
||||
if (output_resource != NULL)
|
||||
output = wl_resource_get_user_data(output_resource);
|
||||
output = weston_output_from_resource(output_resource);
|
||||
|
||||
weston_desktop_xdg_surface_ensure_added(surface);
|
||||
weston_desktop_api_fullscreen_requested(surface->desktop, dsurface,
|
||||
|
||||
@@ -507,7 +507,7 @@ weston_desktop_xdg_toplevel_protocol_set_fullscreen(struct wl_client *wl_client,
|
||||
struct weston_output *output = NULL;
|
||||
|
||||
if (output_resource != NULL)
|
||||
output = wl_resource_get_user_data(output_resource);
|
||||
output = weston_output_from_resource(output_resource);
|
||||
|
||||
weston_desktop_xdg_toplevel_ensure_added(toplevel);
|
||||
weston_desktop_api_fullscreen_requested(toplevel->base.desktop, dsurface,
|
||||
|
||||
Reference in New Issue
Block a user