devilhorns pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=01dc2540db2b16ef9a0453ac632af9c58f956884

commit 01dc2540db2b16ef9a0453ac632af9c58f956884
Author: Duna Oh <duna...@samsung.com>
Date:   Thu Jan 14 11:18:24 2016 -0500

    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
---
 src/lib/ecore_wayland/ecore_wl_input.c | 5 +++--
 1 file 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 a69932f..90d5e49 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
    LOGFN(__FILE__, __LINE__, __FUNCTION__);
 
    if (!input) return;
+   /* No pointer device. Don't need to set cursor and update it */
+   if (!input->pointer) return;
 
    _pointer_update_stop(input);
 
@@ -979,9 +981,8 @@ _ecore_wl_input_cb_pointer_enter(void *data, struct 
wl_pointer *pointer EINA_UNU
    input->display->serial = serial;
    input->pointer_enter_serial = serial;
 
-   if (input->pointer)
    /* The cursor on the surface is undefined until we set it */
-     ecore_wl_input_cursor_from_name_set(input, "left_ptr");
+   ecore_wl_input_cursor_from_name_set(input, "left_ptr");
 
    if ((win = ecore_wl_window_surface_find(surface)))
      {

-- 


Reply via email to