jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ac0dd3107567de6da9b6552dc0ca0481a8a4cbd8
commit ac0dd3107567de6da9b6552dc0ca0481a8a4cbd8 Author: Jean-Philippe Andre <[email protected]> Date: Tue Aug 9 14:50:36 2016 +0900 ecore_input_evas: Enable cancel events by default After my input event changes, the propagation path has been altered from: ecore_x -> evas_event to: ecore_x -> ecore_input_evas -> evas_event But ecore_input_evas was ignoring cancel events by default. There should be no good reason to disable cancel events anymore, according to @jypark. Also, this fixes an actual bug :) Fixes T4301 --- src/lib/ecore_input_evas/ecore_input_evas.c | 49 +++++++++++------------------ 1 file changed, 19 insertions(+), 30 deletions(-) diff --git a/src/lib/ecore_input_evas/ecore_input_evas.c b/src/lib/ecore_input_evas/ecore_input_evas.c index 59bfc29..1cef2da 100644 --- a/src/lib/ecore_input_evas/ecore_input_evas.c +++ b/src/lib/ecore_input_evas/ecore_input_evas.c @@ -63,8 +63,6 @@ static Eina_Hash *_window_hash = NULL; static Eina_List *_last_events = NULL; static double _last_events_timeout = 0.5; static Eina_Bool _last_events_enable = EINA_FALSE; -static Eina_Bool _cancel_events_enable = EINA_FALSE; - static Eina_Bool _ecore_event_evas_mouse_button(Ecore_Event_Mouse_Button *e, Ecore_Event_Press press, @@ -490,36 +488,33 @@ _ecore_event_evas_mouse_button(Ecore_Event_Mouse_Button *e, Ecore_Event_Press pr //error handle // 1. ecore up without ecore down // 2. ecore cancel without ecore down - if (_cancel_events_enable) + if (press != ECORE_DOWN) { - if (press != ECORE_DOWN) + //ECORE_UP or ECORE_CANCEL + eel = _ecore_event_evas_lookup(e->multi.device, e->buttons, e->window, EINA_FALSE); + if (!eel) { - //ECORE_UP or ECORE_CANCEL - eel = _ecore_event_evas_lookup(e->multi.device, e->buttons, e->window, EINA_FALSE); - if (!eel) - { - WRN("ButtonEvent has no history."); - return ECORE_CALLBACK_PASS_ON; - } - - if ((e->window == eel->win) && - ((eel->state == ECORE_INPUT_UP) || - (eel->state == ECORE_INPUT_CANCEL))) - { - WRN("ButtonEvent has wrong history. Last state=%d", eel->state); - return ECORE_CALLBACK_PASS_ON; - } + WRN("ButtonEvent has no history."); + return ECORE_CALLBACK_PASS_ON; } - if (!faked) + if ((e->window == eel->win) && + ((eel->state == ECORE_INPUT_UP) || + (eel->state == ECORE_INPUT_CANCEL))) { - Eina_Bool ret = EINA_FALSE; - ret = _ecore_event_evas_push_mouse_button(e, press); - /* This ButtonEvent is worng */ - if (!ret) return ECORE_CALLBACK_PASS_ON; + WRN("ButtonEvent has wrong history. Last state=%d", eel->state); + return ECORE_CALLBACK_PASS_ON; } } + if (!faked) + { + Eina_Bool ret = EINA_FALSE; + ret = _ecore_event_evas_push_mouse_button(e, press); + /* This ButtonEvent is worng */ + if (!ret) return ECORE_CALLBACK_PASS_ON; + } + if (e->multi.device == 0) { ecore_event_evas_modifier_lock_update(lookup->evas, e->modifiers); @@ -651,8 +646,6 @@ ecore_event_evas_mouse_button_up(void *data EINA_UNUSED, int type EINA_UNUSED, v EAPI Eina_Bool ecore_event_evas_mouse_button_cancel(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { - if (!_cancel_events_enable) return EINA_FALSE; - return _ecore_event_evas_mouse_button_cancel((Ecore_Event_Mouse_Button *)event); } @@ -818,10 +811,6 @@ ecore_event_evas_init(void) if (tmp) _last_events_timeout = ((double) atoi(tmp)) / 60; } - if (getenv("ECORE_INPUT_CANCEL")) - { - _cancel_events_enable = EINA_TRUE; - } return _ecore_event_evas_init_count; --
