enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 13 Pull Requests 2 Projects Releases Wiki Activity

ecore-wl: Reset input's pointer & keyboard focus on events 

Summary: If we get pointer or keyboard leave events, then reset the
Ecore_Wl_Input's idea of focus (eg: set input->pointer_focus and
input->keyboard_focus fields to NULL) just in case we cannot find a
window for this surface.

@fix

Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2015-07-14 14:22:42 -04:00
parent 8ed6417196
commit dca6f0756d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/ecore_wayland/ecore_wl_input.c
View File

@ -975,6 +975,7 @@ _ecore_wl_input_cb_pointer_leave(void *data, struct wl_pointer *pointer EINA_UNU
if (!(input = data)) return;
input->display->serial = serial;
input->pointer_focus = NULL;
/* NB: Commented out for now. Not needed in most circumstances, but left
* here for any corner-cases */
@ -984,7 +985,6 @@ _ecore_wl_input_cb_pointer_leave(void *data, struct wl_pointer *pointer EINA_UNU
if (!(win = ecore_wl_window_surface_find(surface))) return;
win->pointer_device = NULL;
input->pointer_focus = NULL;
/* _ecore_wl_input_mouse_move_send(input, win, input->timestamp); */
_ecore_wl_input_mouse_out_send(input, win, input->timestamp);
@ -1040,6 +1040,8 @@ _ecore_wl_input_cb_keyboard_leave(void *data, struct wl_keyboard *keyboard EINA_
if (input->repeat.tmr) ecore_timer_del(input->repeat.tmr);
input->repeat.tmr = NULL;
input->keyboard_focus = NULL;
if (!input->timestamp)
{
struct timeval tv;
@ -1055,8 +1057,6 @@ _ecore_wl_input_cb_keyboard_leave(void *data, struct wl_keyboard *keyboard EINA_
win->keyboard_device = NULL;
_ecore_wl_input_focus_out_send(input, win, input->timestamp);
input->keyboard_focus = NULL;
}
static void