commit dc8c8fce72a169fe5d1dd716e29b406ea044ae4b
author Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> Fri May 25 16:01:41 2012 +0300
committer Kristian Høgsberg <krh@bitplanet.net> Fri May 25 23:28:54 2012 -0400
tree d5446bfc0430f33d290ea7c119af45d9785dcd2f
parent d8f527c845b16c2e7465a0756d5b85710a75f776

window: rename enum pointer_type to cursor_type

This avoids confusion with the pointer devices (struct wl_pointer).

clients/window.c

diff --git a/clients/window.c b/clients/window.c
index c4e01e7..4c94d16 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -288,8 +288,8 @@
 };
 
 enum {
-	POINTER_DEFAULT = 100,
-	POINTER_UNSET
+	CURSOR_DEFAULT = 100,
+	CURSOR_UNSET
 };
 
 enum window_location {
@@ -1332,7 +1332,7 @@
 	widget_schedule_redraw(frame_button->widget);
 	frame_button->state = FRAME_BUTTON_OVER;
 
-	return POINTER_LEFT_PTR;
+	return CURSOR_LEFT_PTR;
 }
 
 static void
@@ -1512,25 +1512,25 @@
 
 	switch (location) {
 	case THEME_LOCATION_RESIZING_TOP:
-		return POINTER_TOP;
+		return CURSOR_TOP;
 	case THEME_LOCATION_RESIZING_BOTTOM:
-		return POINTER_BOTTOM;
+		return CURSOR_BOTTOM;
 	case THEME_LOCATION_RESIZING_LEFT:
-		return POINTER_LEFT;
+		return CURSOR_LEFT;
 	case THEME_LOCATION_RESIZING_RIGHT:
-		return POINTER_RIGHT;
+		return CURSOR_RIGHT;
 	case THEME_LOCATION_RESIZING_TOP_LEFT:
-		return POINTER_TOP_LEFT;
+		return CURSOR_TOP_LEFT;
 	case THEME_LOCATION_RESIZING_TOP_RIGHT:
-		return POINTER_TOP_RIGHT;
+		return CURSOR_TOP_RIGHT;
 	case THEME_LOCATION_RESIZING_BOTTOM_LEFT:
-		return POINTER_BOTTOM_LEFT;
+		return CURSOR_BOTTOM_LEFT;
 	case THEME_LOCATION_RESIZING_BOTTOM_RIGHT:
-		return POINTER_BOTTOM_RIGHT;
+		return CURSOR_BOTTOM_RIGHT;
 	case THEME_LOCATION_EXTERIOR:
 	case THEME_LOCATION_TITLEBAR:
 	default:
-		return POINTER_LEFT_PTR;
+		return CURSOR_LEFT_PTR;
 	}
 }
 
@@ -1605,7 +1605,7 @@
 		case THEME_LOCATION_TITLEBAR:
 			if (!window->shell_surface)
 				break;
-			input_set_pointer_image(input, time, POINTER_DRAGGING);
+			input_set_pointer_image(input, time, CURSOR_DRAGGING);
 			input_ungrab(input);
 			wl_shell_surface_move(window->shell_surface,
 					      input_get_seat(input),
@@ -1697,7 +1697,7 @@
 		       float x, float y)
 {
 	struct widget *old, *widget;
-	int pointer = POINTER_LEFT_PTR;
+	int pointer = CURSOR_LEFT_PTR;
 
 	if (focus == input->focus_widget)
 		return;
@@ -1733,7 +1733,7 @@
 	struct input *input = data;
 	struct window *window = input->pointer_focus;
 	struct widget *widget;
-	int cursor = POINTER_LEFT_PTR;
+	int cursor = CURSOR_LEFT_PTR;
 	float sx = wl_fixed_to_double(sx_w);
 	float sy = wl_fixed_to_double(sy_w);
 
@@ -1864,7 +1864,7 @@
 	input_set_focus_widget(input, NULL, 0, 0);
 
 	input->pointer_focus = NULL;
-	input->current_cursor = POINTER_UNSET;
+	input->current_cursor = CURSOR_UNSET;
 }
 
 static void
@@ -2763,7 +2763,7 @@
 	if (widget == menu->widget)
 		menu_set_item(data, y);
 
-	return POINTER_LEFT_PTR;
+	return CURSOR_LEFT_PTR;
 }
 
 static int
@@ -2775,7 +2775,7 @@
 	if (widget == menu->widget)
 		menu_set_item(data, y);
 
-	return POINTER_LEFT_PTR;
+	return CURSOR_LEFT_PTR;
 }
 
 static void