elementary: Port elementary cursor code to use ecore_wl2 library
Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
parent
b3af99a3ea
commit
67033e85ba
|
@ -146,9 +146,9 @@ struct _Elm_Cursor
|
||||||
Ecore_X_Window win;
|
Ecore_X_Window win;
|
||||||
} x;
|
} x;
|
||||||
#endif
|
#endif
|
||||||
#ifdef HAVE_ELEMENTARY_WAYLAND
|
#ifdef HAVE_ELEMENTARY_WL2
|
||||||
struct {
|
struct {
|
||||||
Ecore_Wl_Window *win;
|
Ecore_Wl2_Window *win;
|
||||||
} wl;
|
} wl;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -282,9 +282,9 @@ _elm_cursor_set(Elm_Cursor *cur)
|
||||||
if (cur->x.win)
|
if (cur->x.win)
|
||||||
ecore_x_window_cursor_set(cur->x.win, cur->x.cursor);
|
ecore_x_window_cursor_set(cur->x.win, cur->x.cursor);
|
||||||
#endif
|
#endif
|
||||||
#ifdef HAVE_ELEMENTARY_WAYLAND
|
#ifdef HAVE_ELEMENTARY_WL2
|
||||||
if (cur->wl.win)
|
if (cur->wl.win)
|
||||||
ecore_wl_window_cursor_from_name_set(cur->wl.win, cur->cursor_name);
|
ecore_wl2_window_cursor_from_name_set(cur->wl.win, cur->cursor_name);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
evas_event_thaw(cur->evas);
|
evas_event_thaw(cur->evas);
|
||||||
|
@ -340,9 +340,9 @@ _elm_cursor_mouse_out(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_
|
||||||
if (cur->x.win)
|
if (cur->x.win)
|
||||||
ecore_x_window_cursor_set(cur->x.win, ECORE_X_CURSOR_X);
|
ecore_x_window_cursor_set(cur->x.win, ECORE_X_CURSOR_X);
|
||||||
#endif
|
#endif
|
||||||
#ifdef HAVE_ELEMENTARY_WAYLAND
|
#ifdef HAVE_ELEMENTARY_WL2
|
||||||
if (cur->wl.win)
|
if (cur->wl.win)
|
||||||
ecore_wl_window_cursor_default_restore(cur->wl.win);
|
ecore_wl2_window_cursor_from_name_set(cur->wl.win, NULL);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
evas_event_thaw(cur->evas);
|
evas_event_thaw(cur->evas);
|
||||||
|
@ -418,7 +418,7 @@ _elm_cursor_cur_set(Elm_Cursor *cur)
|
||||||
cur->x.cursor = ecore_x_cursor_shape_get(cur_id->id);
|
cur->x.cursor = ecore_x_cursor_shape_get(cur_id->id);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#ifdef HAVE_ELEMENTARY_WAYLAND
|
#ifdef HAVE_ELEMENTARY_WL2
|
||||||
cur->wl.win = elm_win_wl_window_get(top);
|
cur->wl.win = elm_win_wl_window_get(top);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -541,9 +541,9 @@ elm_object_cursor_unset(Evas_Object *obj)
|
||||||
else if (cur->x.win)
|
else if (cur->x.win)
|
||||||
ecore_x_window_cursor_set(cur->x.win, ECORE_X_CURSOR_X);
|
ecore_x_window_cursor_set(cur->x.win, ECORE_X_CURSOR_X);
|
||||||
#endif
|
#endif
|
||||||
#ifdef HAVE_ELEMENTARY_WAYLAND
|
#ifdef HAVE_ELEMENTARY_WL2
|
||||||
else if (cur->wl.win)
|
else if (cur->wl.win)
|
||||||
ecore_wl_window_cursor_default_restore(cur->wl.win);
|
ecore_wl2_window_cursor_from_name_set(cur->wl.win, NULL);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue