summaryrefslogtreecommitdiff
path: root/legacy/ecore/src/lib/ecore_wayland/ecore_wl_input.c
diff options
context:
space:
mode:
authorChristopher Michael <cp.michael@samsung.com>2012-10-16 11:57:25 +0000
committerChristopher Michael <cpmichael1@comcast.net>2012-10-16 11:57:25 +0000
commitaae18b4dd9d4cfa4c046117b2c13a2a06a17f6b6 (patch)
treeecb32e62c5019f5d70a8691e181d0e50111843cf /legacy/ecore/src/lib/ecore_wayland/ecore_wl_input.c
parentd8301202a0f1674b0790cf805051c19bf6058066 (diff)
Ecore_Wayland: More fixes for recent wayland changes.
Signed-off-by: Christopher Michael <cp.michael@samsung.com> SVN revision: 78056
Diffstat (limited to '')
-rw-r--r--legacy/ecore/src/lib/ecore_wayland/ecore_wl_input.c22
1 files changed, 2 insertions, 20 deletions
diff --git a/legacy/ecore/src/lib/ecore_wayland/ecore_wl_input.c b/legacy/ecore/src/lib/ecore_wayland/ecore_wl_input.c
index ee8fde1355..c0e8d5cec4 100644
--- a/legacy/ecore/src/lib/ecore_wayland/ecore_wl_input.c
+++ b/legacy/ecore/src/lib/ecore_wayland/ecore_wl_input.c
@@ -176,18 +176,13 @@ ecore_wl_input_cursor_from_name_set(Ecore_Wl_Input *input, const char *cursor_na
176 /* try to get this cursor from the theme */ 176 /* try to get this cursor from the theme */
177 if (!(cursor = ecore_wl_cursor_get(input->cursor_name))) 177 if (!(cursor = ecore_wl_cursor_get(input->cursor_name)))
178 { 178 {
179 printf("No Cursor %s in Theme\n", input->cursor_name);
180 /* if the theme does not have this cursor, default to left pointer */ 179 /* if the theme does not have this cursor, default to left pointer */
181 if (!(cursor = ecore_wl_cursor_get("left_ptr"))) 180 if (!(cursor = ecore_wl_cursor_get("left_ptr")))
182 { 181 return;
183 printf("Failed to get Left Pointer Cursor\n");
184 return;
185 }
186 } 182 }
187 183
188 if ((!cursor->images) || (!cursor->images[0])) 184 if ((!cursor->images) || (!cursor->images[0]))
189 { 185 {
190 printf("Cursor %s has no images\n", input->cursor_name);
191 ecore_wl_input_pointer_set(input, NULL, 0, 0); 186 ecore_wl_input_pointer_set(input, NULL, 0, 0);
192 return; 187 return;
193 } 188 }
@@ -206,8 +201,6 @@ ecore_wl_input_cursor_from_name_set(Ecore_Wl_Input *input, const char *cursor_na
206 if (!input->cursor_frame_cb) 201 if (!input->cursor_frame_cb)
207 _ecore_wl_input_cb_pointer_frame(input, NULL, 0); 202 _ecore_wl_input_cb_pointer_frame(input, NULL, 0);
208 } 203 }
209 else
210 printf("No Buffer from Cursor Image\n");
211} 204}
212 205
213EAPI void 206EAPI void
@@ -330,19 +323,16 @@ _ecore_wl_input_seat_handle_capabilities(void *data, struct wl_seat *seat, enum
330{ 323{
331 Ecore_Wl_Input *input; 324 Ecore_Wl_Input *input;
332 325
333 printf("Seat Handle Capabilities\n");
334 if (!(input = data)) return; 326 if (!(input = data)) return;
335 printf("\tInput Valid\n"); 327
336 if ((caps & WL_SEAT_CAPABILITY_POINTER) && (!input->pointer)) 328 if ((caps & WL_SEAT_CAPABILITY_POINTER) && (!input->pointer))
337 { 329 {
338 printf("\tCreate New Pointer\n");
339 input->pointer = wl_seat_get_pointer(seat); 330 input->pointer = wl_seat_get_pointer(seat);
340 wl_pointer_set_user_data(input->pointer, input); 331 wl_pointer_set_user_data(input->pointer, input);
341 wl_pointer_add_listener(input->pointer, &pointer_listener, input); 332 wl_pointer_add_listener(input->pointer, &pointer_listener, input);
342 } 333 }
343 else if (!(caps & WL_SEAT_CAPABILITY_POINTER) && (input->pointer)) 334 else if (!(caps & WL_SEAT_CAPABILITY_POINTER) && (input->pointer))
344 { 335 {
345 printf("\tDestroy POinter\n");
346 wl_pointer_destroy(input->pointer); 336 wl_pointer_destroy(input->pointer);
347 input->pointer = NULL; 337 input->pointer = NULL;
348 } 338 }
@@ -380,8 +370,6 @@ _ecore_wl_input_cb_pointer_motion(void *data, struct wl_pointer *pointer __UNUSE
380 370
381 /* LOGFN(__FILE__, __LINE__, __FUNCTION__); */ 371 /* LOGFN(__FILE__, __LINE__, __FUNCTION__); */
382 372
383 printf("Input Cb Pointer Motion\n");
384
385 if (!(input = data)) return; 373 if (!(input = data)) return;
386 374
387 _pointer_x = input->sx = wl_fixed_to_int(sx); 375 _pointer_x = input->sx = wl_fixed_to_int(sx);
@@ -689,8 +677,6 @@ _ecore_wl_input_cb_pointer_enter(void *data, struct wl_pointer *pointer __UNUSED
689 677
690 LOGFN(__FILE__, __LINE__, __FUNCTION__); 678 LOGFN(__FILE__, __LINE__, __FUNCTION__);
691 679
692 printf("Input Cb Pointer Enter\n");
693
694 if (!surface) return; 680 if (!surface) return;
695 if (!(input = data)) return; 681 if (!(input = data)) return;
696 682
@@ -758,8 +744,6 @@ _ecore_wl_input_cb_pointer_leave(void *data, struct wl_pointer *pointer __UNUSED
758 Ecore_Wl_Input *input; 744 Ecore_Wl_Input *input;
759 Ecore_Wl_Window *win; 745 Ecore_Wl_Window *win;
760 746
761 printf("Input Cb Pointer Leave\n");
762
763 LOGFN(__FILE__, __LINE__, __FUNCTION__); 747 LOGFN(__FILE__, __LINE__, __FUNCTION__);
764 748
765 if (!surface) return; 749 if (!surface) return;
@@ -790,8 +774,6 @@ _ecore_wl_input_cb_keyboard_enter(void *data, struct wl_keyboard *keyboard __UNU
790 Ecore_Wl_Input *input; 774 Ecore_Wl_Input *input;
791 Ecore_Wl_Window *win = NULL; 775 Ecore_Wl_Window *win = NULL;
792 776
793 printf("Keyboard Enter Event\n");
794
795 LOGFN(__FILE__, __LINE__, __FUNCTION__); 777 LOGFN(__FILE__, __LINE__, __FUNCTION__);
796 778
797 if (!surface) return; 779 if (!surface) return;