struct wl_resource *buffer_resource)
{
struct weston_output *output =
- weston_output_from_resource(output_resource);
+ weston_head_from_resource(output_resource)->output;
struct weston_buffer *buffer =
weston_buffer_from_resource(buffer_resource);
struct input_panel_surface *input_panel_surface =
wl_resource_get_user_data(resource);
struct desktop_shell *shell = input_panel_surface->shell;
+ struct weston_head *head;
wl_list_insert(&shell->input_panel.surfaces,
&input_panel_surface->link);
- input_panel_surface->output = weston_output_from_resource(output_resource);
+ head = weston_head_from_resource(output_resource);
+ input_panel_surface->output = head->output;
input_panel_surface->panel = 0;
}
surface->committed = background_committed;
surface->committed_private = shell;
weston_surface_set_label_func(surface, background_get_label);
- surface->output = weston_output_from_resource(output_resource);
+ surface->output = weston_head_from_resource(output_resource)->output;
view->output = surface->output;
sh_output = find_shell_output_from_weston_output(shell, surface->output);
surface->committed = panel_committed;
surface->committed_private = shell;
weston_surface_set_label_func(surface, panel_get_label);
- surface->output = weston_output_from_resource(output_resource);
+ surface->output = weston_head_from_resource(output_resource)->output;
view->output = surface->output;
sh_output = find_shell_output_from_weston_output(shell, surface->output);
}
if (output_res) {
- output = weston_output_from_resource(output_res);
+ output = weston_head_from_resource(output_res)->output;
fsout = fs_output_for_output(output);
fs_output_set_surface(fsout, surface, method, 0, 0);
} else {
struct weston_seat *seat;
struct fs_output *fsout;
- output = weston_output_from_resource(output_res);
+ output = weston_head_from_resource(output_res)->output;
fsout = fs_output_for_output(output);
if (surface_res == NULL) {
struct input_panel_surface *input_panel_surface =
wl_resource_get_user_data(resource);
struct ivi_shell *shell = input_panel_surface->shell;
+ struct weston_head *head;
wl_list_insert(&shell->input_panel.surfaces,
&input_panel_surface->link);
- input_panel_surface->output = weston_output_from_resource(output_resource);
+ head = weston_head_from_resource(output_resource);
+ input_panel_surface->output = head->output;
input_panel_surface->panel = 0;
}
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,
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,
}
wl_list_insert(&head->resource_list, wl_resource_get_link(resource));
- wl_resource_set_implementation(resource, &output_interface, output,
+ wl_resource_set_implementation(resource, &output_interface, head,
unbind_resource);
assert(output);
* \return The backing object (user data) of a wl_resource representing a
* wl_output protocol object.
*/
-WL_EXPORT struct weston_output *
-weston_output_from_resource(struct wl_resource *resource)
+WL_EXPORT struct weston_head *
+weston_head_from_resource(struct wl_resource *resource)
{
assert(wl_resource_instance_of(resource, &wl_output_interface,
&output_interface));
void
weston_pending_output_coldplug(struct weston_compositor *compositor);
-struct weston_output *
-weston_output_from_resource(struct wl_resource *resource);
+struct weston_head *
+weston_head_from_resource(struct wl_resource *resource);
#ifdef __cplusplus
}
struct wl_resource *buffer_resource)
{
struct weston_output *output =
- weston_output_from_resource(output_resource);
+ weston_head_from_resource(output_resource)->output;
struct weston_buffer *buffer =
weston_buffer_from_resource(buffer_resource);