mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

weston: migrate wayland to head-based output API 

Migrate the Wayland frontend to use the new head-based output
configuration API: listen for heads_changed, and process all heads.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
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:
Pekka Paalanen 2017-08-17 16:59:53 +03:00
parent 30465bdca6
commit 46e2f02449
1 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
compositor/main.c
View File

@ -1642,19 +1642,9 @@ load_x11_backend(struct weston_compositor *c,
return 0;
}
static void
wayland_backend_output_configure_hotplug(struct wl_listener *listener, void *data)
static int
wayland_backend_output_configure(struct weston_output *output)
{
struct weston_output *output = data;
/* This backend has all values hardcoded, so nothing can be configured here */
weston_output_enable(output);
}
static void
wayland_backend_output_configure(struct wl_listener *listener, void *data)
{
struct weston_output *output = data;
struct wet_output_config defaults = {
.width = 1024,
.height = 640,
@ -1662,10 +1652,7 @@ wayland_backend_output_configure(struct wl_listener *listener, void *data)
.transform = WL_OUTPUT_TRANSFORM_NORMAL
};
if (wet_configure_windowed_output_from_config(output, &defaults) < 0)
weston_log("Cannot configure output \"%s\".\n", output->name);
weston_output_enable(output);
return wet_configure_windowed_output_from_config(output, &defaults);
}
static int
@ -1732,13 +1719,15 @@ load_wayland_backend(struct weston_compositor *c,
if (api == NULL) {
/* We will just assume if load_backend() finished cleanly and
* windowed_output_api is not present that wayland backend is
* started with --sprawl or runs on fullscreen-shell. */
wet_set_pending_output_handler(c, wayland_backend_output_configure_hotplug);
* started with --sprawl or runs on fullscreen-shell.
* In this case, all values are hardcoded, so nothing can be
* configured; simply create and enable an output. */
wet_set_simple_head_configurator(c, NULL);
return 0;
}
wet_set_pending_output_handler(c, wayland_backend_output_configure);
wet_set_simple_head_configurator(c, wayland_backend_output_configure);
section = NULL;
while (weston_config_next_section(wc, &section, &section_name)) {