commit ff39efa5c01eb51daf73593cd7a39cc3fac6d48e
author Hardening <rdp.effort@gmail.com> Wed Sep 18 23:56:35 2013 +0200
committer Kristian Høgsberg <krh@bitplanet.net> Sat Sep 21 11:40:17 2013 -0700
tree 754846a4f22eec2e650be1727c69fa12e7067ad3
parent a2df51c19f46f8b8b6a9968e18490d7ce99d32c1

Rename current, origin, scale, origin_scale

This patch renames that fields to have consistent names.

src/compositor-x11.c

diff --git a/src/compositor-x11.c b/src/compositor-x11.c
index e04ea06..1dd5037 100644
--- a/src/compositor-x11.c
+++ b/src/compositor-x11.c
@@ -420,10 +420,10 @@
 			break;
 		}
 
-		transformed_rect.x1 *= output_base->scale;
-		transformed_rect.y1 *= output_base->scale;
-		transformed_rect.x2 *= output_base->scale;
-		transformed_rect.y2 *= output_base->scale;
+		transformed_rect.x1 *= output_base->current_scale;
+		transformed_rect.y1 *= output_base->current_scale;
+		transformed_rect.x2 *= output_base->current_scale;
+		transformed_rect.y2 *= output_base->current_scale;
 
 		output_rects[i].x = transformed_rect.x1;
 		output_rects[i].y = transformed_rect.y1;
@@ -891,8 +891,8 @@
 	output->base.set_backlight = NULL;
 	output->base.set_dpms = NULL;
 	output->base.switch_mode = NULL;
-	output->base.current = &output->mode;
-	output->base.origin = output->base.current;
+	output->base.current_mode = &output->mode;
+	output->base.original_mode = output->base.current_mode;
 	output->base.make = "xwayland";
 	output->base.model = "none";
 	weston_output_init(&output->base, &c->base,