From: Pekka Paalanen <[email protected]> Migrate the x11 frontend to use the new head-based output configuration API: listen for heads_changed, and process all heads.
Signed-off-by: Pekka Paalanen <[email protected]> --- compositor/main.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/compositor/main.c b/compositor/main.c index 103470f3..0da9cba8 100644 --- a/compositor/main.c +++ b/compositor/main.c @@ -1645,10 +1645,9 @@ out: return ret; } -static void -x11_backend_output_configure(struct wl_listener *listener, void *data) +static int +x11_backend_output_configure(struct weston_output *output) { - struct weston_output *output = data; struct wet_output_config defaults = { .width = 1024, .height = 600, @@ -1656,10 +1655,7 @@ x11_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 @@ -1695,6 +1691,8 @@ load_x11_backend(struct weston_compositor *c, config.base.struct_version = WESTON_X11_BACKEND_CONFIG_VERSION; config.base.struct_size = sizeof(struct weston_x11_backend_config); + wet_set_simple_head_configurator(c, x11_backend_output_configure); + /* load the actual backend and configure it */ ret = weston_compositor_load_backend(c, WESTON_BACKEND_X11, &config.base); @@ -1702,8 +1700,6 @@ load_x11_backend(struct weston_compositor *c, if (ret < 0) return ret; - wet_set_pending_output_handler(c, x11_backend_output_configure); - api = weston_windowed_output_get_api(c); if (!api) { -- 2.13.6 _______________________________________________ wayland-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/wayland-devel
