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-rdp.c

diff --git a/src/compositor-rdp.c b/src/compositor-rdp.c
index 4d369cc..642a6b7 100644
--- a/src/compositor-rdp.c
+++ b/src/compositor-rdp.c
@@ -369,12 +369,12 @@
 		return -ENOENT;
 	}
 
-	if(local_mode == output->current)
+	if(local_mode == output->current_mode)
 		return 0;
 
-	output->current->flags = 0;
-	output->current = local_mode;
-	output->current->flags = WL_OUTPUT_MODE_CURRENT | WL_OUTPUT_MODE_PREFERRED;
+	output->current_mode->flags = 0;
+	output->current_mode = local_mode;
+	output->current_mode->flags = WL_OUTPUT_MODE_CURRENT | WL_OUTPUT_MODE_PREFERRED;
 
 	pixman_renderer_output_destroy(output);
 	pixman_renderer_output_create(output);
@@ -466,7 +466,7 @@
 		goto out_free_output_and_modes;
 	}
 
-	output->base.current = currentMode;
+	output->base.current_mode = currentMode;
 	weston_output_init(&output->base, &c->base, 0, 0, width, height,
 			   WL_OUTPUT_TRANSFORM_NORMAL, 1);
 
@@ -489,7 +489,7 @@
 	loop = wl_display_get_event_loop(c->base.wl_display);
 	output->finish_frame_timer = wl_event_loop_add_timer(loop, finish_frame_handler, output);
 
-	output->base.origin = output->base.current;
+	output->base.original_mode = output->base.current_mode;
 	output->base.start_repaint_loop = rdp_output_start_repaint_loop;
 	output->base.repaint = rdp_output_repaint;
 	output->base.destroy = rdp_output_destroy;