usergreen
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Pull Requests Activity

Ecore_Wayland: Fix always resetting the wayland pointer surface to 

default when we get a mouse move. Now we will store the current
cursor, so it can be restored later (this is part of a bug fix for
#1293).



SVN revision: 75312
This commit is contained in:
Christopher Michael 2012-08-16 09:37:52 +00:00
parent cde4673abe
commit 6423de3f17
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
legacy/ecore/src/lib/ecore_wayland/ecore_wl_input.c
View File

@ -170,6 +170,8 @@ ecore_wl_input_cursor_from_name_set(Ecore_Wl_Input *input, const char *cursor_na
if (!input) return; if (!input) return;
eina_stringshare_replace(&input->cursor_name, cursor_name);
/* No cursor */ /* No cursor */
if (!cursor_name) if (!cursor_name)
{ {
@ -178,10 +180,16 @@ ecore_wl_input_cursor_from_name_set(Ecore_Wl_Input *input, const char *cursor_na
} }
if (!(cursor = ecore_wl_cursor_get(cursor_name))) if (!(cursor = ecore_wl_cursor_get(cursor_name)))
return; {
ecore_wl_input_pointer_set(input, NULL, 0, 0);
return;
}
if ((!cursor->images) || (!cursor->images[0])) if ((!cursor->images) || (!cursor->images[0]))
return; {
ecore_wl_input_pointer_set(input, NULL, 0, 0);
return;
}
cursor_image = cursor->images[0]; cursor_image = cursor->images[0];
if ((buffer = wl_cursor_image_get_buffer(cursor_image))) if ((buffer = wl_cursor_image_get_buffer(cursor_image)))
@ -256,6 +264,9 @@ _ecore_wl_input_del(Ecore_Wl_Input *input)
{ {
if (!input) return; if (!input) return;
if (input->cursor_name) eina_stringshare_del(input->cursor_name);
input->cursor_name = NULL;
if (input->keyboard_focus) if (input->keyboard_focus)
{ {
Ecore_Wl_Window *win = NULL; Ecore_Wl_Window *win = NULL;
@ -362,7 +373,7 @@ _ecore_wl_input_cb_pointer_motion(void *data, struct wl_pointer *pointer __UNUSE
if (input->pointer_focus) if (input->pointer_focus)
_ecore_wl_input_mouse_move_send(input, input->pointer_focus, timestamp); _ecore_wl_input_mouse_move_send(input, input->pointer_focus, timestamp);
ecore_wl_input_cursor_default_restore(input); ecore_wl_input_cursor_from_name_set(input, input->cursor_name);
} }
static void static void
@ -429,7 +440,12 @@ _ecore_wl_input_cb_pointer_frame(void *data, struct wl_callback *callback, unsig
input->cursor_frame_cb = NULL; input->cursor_frame_cb = NULL;
} }
/* TODO: Finish me */ if (!input->cursor_name)
{
ecore_wl_input_pointer_set(input, NULL, 0, 0);
return;
}
if (!input->cursor_frame_cb) if (!input->cursor_frame_cb)
{ {
input->cursor_frame_cb = wl_surface_frame(input->cursor_surface); input->cursor_frame_cb = wl_surface_frame(input->cursor_surface);
@ -670,7 +686,7 @@ _ecore_wl_input_cb_pointer_enter(void *data, struct wl_pointer *pointer __UNUSED
_ecore_wl_input_mouse_in_send(input, win, input->timestamp); _ecore_wl_input_mouse_in_send(input, win, input->timestamp);
/* The cursor on the surface is undefined until we set it */ /* The cursor on the surface is undefined until we set it */
ecore_wl_window_cursor_default_restore(win); ecore_wl_input_cursor_from_name_set(input, "left_ptr");
/* NB: This whole 'if' below is a major HACK due to wayland's stupidness /* NB: This whole 'if' below is a major HACK due to wayland's stupidness
* of not sending a mouse_up (or any notification at all for that matter) * of not sending a mouse_up (or any notification at all for that matter)