commit bb901fac90064ba58d5d82332eeac3c8e860a2e0
author Kristian Høgsberg <krh@bitplanet.net> Mon Jan 09 11:22:32 2012 -0500
committer Kristian Høgsberg <krh@bitplanet.net> Mon Jan 09 11:22:32 2012 -0500
tree 680b0a260656541432e1be582ac11add6ba509ef
parent 5388080949dabd8bb4d27c60898080d9817b64f2

window: Return pointer type from widget enter handler

clients/window.c

diff --git a/clients/window.c b/clients/window.c
index 70642a4..7ca1e1d 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -1267,6 +1267,7 @@
 			struct input *input, uint32_t time, int32_t x, int32_t y)
 {
 	struct widget *old;
+	int pointer = POINTER_LEFT_PTR;
 
 	if (focus == window->focus_widget)
 		return;
@@ -1280,9 +1281,12 @@
 
 	if (focus) {
 		if (focus->enter_handler)
-			focus->enter_handler(focus, input, time,
-					     x, y, focus->user_data);
+			pointer = focus->enter_handler(focus, input, time,
+						       x, y, focus->user_data);
 		window->focus_widget = focus;
+
+		pointer = input_get_pointer_image_for_location(input, pointer);
+		input_set_pointer_image(input, time, pointer);
 	}
 }
 
@@ -2221,7 +2225,7 @@
 	return menu_set_item(menu, y);
 }
 
-static void
+static int
 menu_enter_handler(struct widget *widget,
 		   struct input *input, uint32_t time,
 		   int32_t x, int32_t y, void *data)
@@ -2230,6 +2234,8 @@
 	struct menu *menu = window_get_user_data(window);
 
 	menu_set_item(menu, y);
+
+	return POINTER_LEFT_PTR;
 }
 
 static void