dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "efl_ui_focus_manager_root_focus: refactor _state_eval" 

This reverts commit c6ce04e48f.

OK. I bisected and found that this is ythe root cause for 2 pretty
chunky bugs. Reverting this fixes T6870 and fixes T6871.

so that's 2 segvs in existing uses and even olne (elm config) ships
with efl. Having a look at the diff doesn't jump out what is wrong
here, but the best course IMHO is to take this patch and put it back
into review again... :)
This commit is contained in:
Carsten Haitzler 2018-04-07 16:34:29 +09:00
parent 6e0c86eb67
commit e29102e134
2 changed files with 25 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/lib/elementary/efl_ui_focus_manager_root_focus.c
View File

@ -13,6 +13,7 @@
typedef struct {
Efl_Ui_Focus_Object *root;
Eina_List *none_logicals;
Evas_Object *rect;
Eina_Bool rect_registered;
@ -30,48 +31,30 @@ _trap(Efl_Ui_Focus_Manager_Root_Focus_Data *pd, Efl_Ui_Focus_Object *obj)
static void
_state_eval(Eo *obj, Efl_Ui_Focus_Manager_Root_Focus_Data *pd)
{
Efl_Ui_Focus_Object *root;
Eina_Bool none_logical = EINA_FALSE;
if (pd->rect_registered)
efl_ui_focus_manager_calc_unregister(obj, pd->rect);
root = efl_ui_focus_manager_root_get(obj);
none_logical = !!efl_ui_focus_manager_request_subchild(obj, root);
if (none_logical)
pd->rect_registered = EINA_FALSE;
else
if (pd->none_logicals && pd->rect_registered)
{
efl_ui_focus_manager_calc_register(obj, pd->rect, pd->root, NULL);
pd->rect_registered = EINA_TRUE;
efl_ui_focus_manager_calc_unregister(obj, pd->rect);
pd->rect_registered = EINA_FALSE;
}
else if (!pd->none_logicals && !pd->rect_registered)
{
efl_ui_focus_manager_calc_register(obj, pd->rect, pd->root, NULL);
pd->rect_registered = EINA_TRUE;
}
}
EOLIAN static Eina_Bool
_efl_ui_focus_manager_root_focus_efl_ui_focus_manager_calc_register(Eo *obj, Efl_Ui_Focus_Manager_Root_Focus_Data *pd, Efl_Ui_Focus_Object *child, Efl_Ui_Focus_Object *parent, Efl_Ui_Focus_Manager *redirect)
{
Eina_Bool ret = EINA_FALSE;
if (efl_ui_focus_manager_calc_register(efl_super(obj, MY_CLASS), child, parent, redirect))
{
if (child != pd->rect)
_state_eval(obj, pd);
return EINA_TRUE;
pd->none_logicals = eina_list_append(pd->none_logicals, child);
ret = EINA_TRUE;
}
return EINA_FALSE;
}
EOLIAN static Eina_Bool
_efl_ui_focus_manager_root_focus_efl_ui_focus_manager_calc_register_logical(Eo *obj, Efl_Ui_Focus_Manager_Root_Focus_Data *pd, Efl_Ui_Focus_Object *child, Efl_Ui_Focus_Object *parent, Efl_Ui_Focus_Manager *redirect)
{
if (efl_ui_focus_manager_calc_register_logical(efl_super(obj, MY_CLASS), child, parent, redirect))
{
if (redirect)
_state_eval(obj, pd);
return EINA_TRUE;
}
return EINA_FALSE;
if (child != pd->rect)
_state_eval(obj, pd);
return ret;
}
EOLIAN static void
@ -79,6 +62,8 @@ _efl_ui_focus_manager_root_focus_efl_ui_focus_manager_calc_unregister(Eo *obj, E
{
efl_ui_focus_manager_calc_unregister(efl_super(obj, MY_CLASS), child);
pd->none_logicals = eina_list_remove(pd->none_logicals, child);
if (child != pd->rect)
_state_eval(obj, pd);
}
@ -120,10 +105,14 @@ _efl_ui_focus_manager_root_focus_efl_ui_focus_manager_logical_end(Eo *obj, Efl_U
EOLIAN static Eina_Iterator *
_efl_ui_focus_manager_root_focus_efl_ui_focus_manager_border_elements_get(Eo *obj, Efl_Ui_Focus_Manager_Root_Focus_Data *pd)
{
if (pd->rect_registered)
return eina_list_iterator_new(pd->iterator_list);
return efl_ui_focus_manager_border_elements_get(efl_super(obj, MY_CLASS));
if (!!pd->none_logicals)
{
return efl_ui_focus_manager_border_elements_get(efl_super(obj, MY_CLASS));;
}
else
{
return eina_list_iterator_new(pd->iterator_list);
}
}

1
src/lib/elementary/efl_ui_focus_manager_root_focus.eo
View File

@ -1,7 +1,6 @@
class Efl.Ui.Focus.Manager.Root_Focus(Efl.Ui.Focus.Manager.Calc) {
[[ This class ensures that the root is at least focusable, if nothing else is focusable]]
implements {
Efl.Ui.Focus.Manager.Calc.register_logical;
Efl.Ui.Focus.Manager.Calc.register;
Efl.Ui.Focus.Manager.Calc.unregister;
Efl.Ui.Focus.Manager.manager_focus {set; get;}