summaryrefslogtreecommitdiff
path: root/src/lib/ecore_wayland
diff options
context:
space:
mode:
authorDuna Oh <duna.oh@samsung.com>2016-01-14 11:18:24 -0500
committerChris Michael <cpmichael@osg.samsung.com>2016-01-14 11:19:24 -0500
commit01dc2540db2b16ef9a0453ac632af9c58f956884 (patch)
tree4d6a45277ea8256f6a6b86944a2ee8bef7472636 /src/lib/ecore_wayland
parentc36c4e246ce9df19b6e2c2f88d394be388ac4012 (diff)
ecore_wayland: move check for pointer capability
Summary: We don't need to work for cursor if system doesn't have pointer devices. Since this function is called by elementary(e.g. entry) also, we move a check condition into the function. @fix Reviewers: raster, zmike, devilhorns, ManMower, gwanglim Subscribers: cedric, JHyun, input.hacker, jpeg Differential Revision: https://phab.enlightenment.org/D3566
Diffstat (limited to 'src/lib/ecore_wayland')
-rw-r--r--src/lib/ecore_wayland/ecore_wl_input.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/ecore_wayland/ecore_wl_input.c b/src/lib/ecore_wayland/ecore_wl_input.c
index a69932f8bf..90d5e497c0 100644
--- a/src/lib/ecore_wayland/ecore_wl_input.c
+++ b/src/lib/ecore_wayland/ecore_wl_input.c
@@ -300,6 +300,8 @@ ecore_wl_input_cursor_from_name_set(Ecore_Wl_Input *input, const char *cursor_na
300 LOGFN(__FILE__, __LINE__, __FUNCTION__); 300 LOGFN(__FILE__, __LINE__, __FUNCTION__);
301 301
302 if (!input) return; 302 if (!input) return;
303 /* No pointer device. Don't need to set cursor and update it */
304 if (!input->pointer) return;
303 305
304 _pointer_update_stop(input); 306 _pointer_update_stop(input);
305 307
@@ -979,9 +981,8 @@ _ecore_wl_input_cb_pointer_enter(void *data, struct wl_pointer *pointer EINA_UNU
979 input->display->serial = serial; 981 input->display->serial = serial;
980 input->pointer_enter_serial = serial; 982 input->pointer_enter_serial = serial;
981 983
982 if (input->pointer)
983 /* The cursor on the surface is undefined until we set it */ 984 /* The cursor on the surface is undefined until we set it */
984 ecore_wl_input_cursor_from_name_set(input, "left_ptr"); 985 ecore_wl_input_cursor_from_name_set(input, "left_ptr");
985 986
986 if ((win = ecore_wl_window_surface_find(surface))) 987 if ((win = ecore_wl_window_surface_find(surface)))
987 { 988 {