summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2015-10-01 10:24:43 -0400
committerChris Michael <cp.michael@samsung.com>2015-12-03 10:22:37 -0500
commit4e35e34b164b5eb309493e4b0751dc0b870b03bf (patch)
tree6ba2ded7f5737513ba9c369a2dad2ba08ed93d08
parent0102b00ea84c1d4643a619fd4b543636ca28ff91 (diff)
elementary: Port elementary cursor code to use ecore_wl2 library
Signed-off-by: Chris Michael <cp.michael@samsung.com>
-rw-r--r--src/lib/els_cursor.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/els_cursor.c b/src/lib/els_cursor.c
index 4e6a44327..ac6ede256 100644
--- a/src/lib/els_cursor.c
+++ b/src/lib/els_cursor.c
@@ -146,9 +146,9 @@ struct _Elm_Cursor
146 Ecore_X_Window win; 146 Ecore_X_Window win;
147 } x; 147 } x;
148#endif 148#endif
149#ifdef HAVE_ELEMENTARY_WAYLAND 149#ifdef HAVE_ELEMENTARY_WL2
150 struct { 150 struct {
151 Ecore_Wl_Window *win; 151 Ecore_Wl2_Window *win;
152 } wl; 152 } wl;
153#endif 153#endif
154 154
@@ -282,9 +282,9 @@ _elm_cursor_set(Elm_Cursor *cur)
282 if (cur->x.win) 282 if (cur->x.win)
283 ecore_x_window_cursor_set(cur->x.win, cur->x.cursor); 283 ecore_x_window_cursor_set(cur->x.win, cur->x.cursor);
284#endif 284#endif
285#ifdef HAVE_ELEMENTARY_WAYLAND 285#ifdef HAVE_ELEMENTARY_WL2
286 if (cur->wl.win) 286 if (cur->wl.win)
287 ecore_wl_window_cursor_from_name_set(cur->wl.win, cur->cursor_name); 287 ecore_wl2_window_cursor_from_name_set(cur->wl.win, cur->cursor_name);
288#endif 288#endif
289 } 289 }
290 evas_event_thaw(cur->evas); 290 evas_event_thaw(cur->evas);
@@ -340,9 +340,9 @@ _elm_cursor_mouse_out(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_
340 if (cur->x.win) 340 if (cur->x.win)
341 ecore_x_window_cursor_set(cur->x.win, ECORE_X_CURSOR_X); 341 ecore_x_window_cursor_set(cur->x.win, ECORE_X_CURSOR_X);
342#endif 342#endif
343#ifdef HAVE_ELEMENTARY_WAYLAND 343#ifdef HAVE_ELEMENTARY_WL2
344 if (cur->wl.win) 344 if (cur->wl.win)
345 ecore_wl_window_cursor_default_restore(cur->wl.win); 345 ecore_wl2_window_cursor_from_name_set(cur->wl.win, NULL);
346#endif 346#endif
347 } 347 }
348 evas_event_thaw(cur->evas); 348 evas_event_thaw(cur->evas);
@@ -418,7 +418,7 @@ _elm_cursor_cur_set(Elm_Cursor *cur)
418 cur->x.cursor = ecore_x_cursor_shape_get(cur_id->id); 418 cur->x.cursor = ecore_x_cursor_shape_get(cur_id->id);
419 } 419 }
420#endif 420#endif
421#ifdef HAVE_ELEMENTARY_WAYLAND 421#ifdef HAVE_ELEMENTARY_WL2
422 cur->wl.win = elm_win_wl_window_get(top); 422 cur->wl.win = elm_win_wl_window_get(top);
423#endif 423#endif
424 } 424 }
@@ -541,9 +541,9 @@ elm_object_cursor_unset(Evas_Object *obj)
541 else if (cur->x.win) 541 else if (cur->x.win)
542 ecore_x_window_cursor_set(cur->x.win, ECORE_X_CURSOR_X); 542 ecore_x_window_cursor_set(cur->x.win, ECORE_X_CURSOR_X);
543#endif 543#endif
544#ifdef HAVE_ELEMENTARY_WAYLAND 544#ifdef HAVE_ELEMENTARY_WL2
545 else if (cur->wl.win) 545 else if (cur->wl.win)
546 ecore_wl_window_cursor_default_restore(cur->wl.win); 546 ecore_wl2_window_cursor_from_name_set(cur->wl.win, NULL);
547#endif 547#endif
548 } 548 }
549 549