From 44ed70b469beb97b6438d07a8048418f6302a0e2 Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Tue, 17 Mar 2015 13:22:37 -0500 Subject: [PATCH] compositor-fbdev: allow configuring transform in the ini file Signed-off-by: Derek Foreman Reviewed-by: Pekka Paalanen Tested-by: Thilo Cestonaro --- src/compositor-fbdev.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/compositor-fbdev.c b/src/compositor-fbdev.c index ae526e53..c08f1706 100644 --- a/src/compositor-fbdev.c +++ b/src/compositor-fbdev.c @@ -503,11 +503,14 @@ fbdev_output_create(struct fbdev_compositor *compositor, { struct fbdev_output *output; pixman_transform_t transform; + struct weston_config_section *section; int fb_fd; int shadow_width, shadow_height; int width, height; unsigned int bytes_per_pixel; struct wl_event_loop *loop; + uint32_t config_transform; + char *s; weston_log("Creating fbdev output.\n"); @@ -552,10 +555,19 @@ fbdev_output_create(struct fbdev_compositor *compositor, output->base.model = output->fb_info.id; output->base.name = strdup("fbdev"); + section = weston_config_get_section(compositor->base.config, + "output", "name", + output->base.name); + weston_config_section_get_string(section, "transform", &s, "normal"); + if (weston_parse_transform(s, &config_transform) < 0) + weston_log("Invalid transform \"%s\" for output %s\n", + s, output->base.name); + free(s); + weston_output_init(&output->base, &compositor->base, 0, 0, output->fb_info.width_mm, output->fb_info.height_mm, - WL_OUTPUT_TRANSFORM_NORMAL, + config_transform, 1); width = output->fb_info.x_resolution;