[PATCH 6/9] compositor: Store original output scale

alexl at redhat.com alexl at redhat.com
Tue May 28 07:23:37 PDT 2013


From: Alexander Larsson <alexl at redhat.com>

We want this so we can restore the original mode
with the original size (after having been fullscreen).
---
 src/compositor.c | 1 +
 src/compositor.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/compositor.c b/src/compositor.c
index 79acc76..8f82ba6 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -2697,6 +2697,7 @@ weston_output_init(struct weston_output *output, struct weston_compositor *c,
 	output->mm_width = mm_width;
 	output->mm_height = mm_height;
 	output->dirty = 1;
+	output->origin_scale = scale;
 
 	weston_output_transform_scale_init(output, transform, scale);
 	weston_output_init_zoom(output);
diff --git a/src/compositor.h b/src/compositor.h
index 3b428c5..b17d832 100644
--- a/src/compositor.h
+++ b/src/compositor.h
@@ -187,6 +187,7 @@ struct weston_output {
 
 	struct weston_mode *current;
 	struct weston_mode *origin;
+	int32_t origin_scale;
 	struct wl_list mode_list;
 
 	void (*start_repaint_loop)(struct weston_output *output);
-- 
1.8.1.4



More information about the wayland-devel mailing list