enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

replace ev->keyname with ev->key 

see efl 5ae4cfd1923e502731f4d8fc2bf67b1f536a9216
This commit is contained in:
Mike Blumenkrantz 2014-03-13 13:00:57 -04:00 committed by Cedric BAIL
parent fa73db7efa
commit a6f78e8dab
29 changed files with 114 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/e_actions.c
View File

@ -2638,7 +2638,7 @@ typedef struct _Delayed_Action Delayed_Action;
struct _Delayed_Action struct _Delayed_Action
{ {
int mouse, button; int mouse, button;
const char *keyname; const char *key;
E_Object *obj; E_Object *obj;
Ecore_Timer *timer; Ecore_Timer *timer;
struct struct
@ -2653,7 +2653,7 @@ static void
_delayed_action_free(Delayed_Action *da) _delayed_action_free(Delayed_Action *da)
{ {
if (da->obj) e_object_unref(da->obj); if (da->obj) e_object_unref(da->obj);
if (da->keyname) eina_stringshare_del(da->keyname); if (da->key) eina_stringshare_del(da->key);
if (da->timer) ecore_timer_del(da->timer); if (da->timer) ecore_timer_del(da->timer);
if (da->def.action) eina_stringshare_del(da->def.action); if (da->def.action) eina_stringshare_del(da->def.action);
if (da->def.params) eina_stringshare_del(da->def.params); if (da->def.params) eina_stringshare_del(da->def.params);
@ -2773,7 +2773,7 @@ _delayed_action_key_add(E_Object *obj, const char *params, Ecore_Event_Key *ev)
e_object_ref(da->obj); e_object_ref(da->obj);
} }
da->mouse = 0; da->mouse = 0;
da->keyname = eina_stringshare_add(ev->keyname); da->key = eina_stringshare_add(ev->key);
if (params) _delayed_action_list_parse(da, params); if (params) _delayed_action_list_parse(da, params);
_delayed_actions = eina_list_append(_delayed_actions, da); _delayed_actions = eina_list_append(_delayed_actions, da);
} }
@ -2787,7 +2787,7 @@ _delayed_action_key_del(E_Object *obj, const char *params __UNUSED__, Ecore_Even
EINA_LIST_FOREACH(_delayed_actions, l, da) EINA_LIST_FOREACH(_delayed_actions, l, da)
{ {
if ((da->obj == obj) && (!da->mouse) && if ((da->obj == obj) && (!da->mouse) &&
(!strcmp(da->keyname, ev->keyname))) (!strcmp(da->key, ev->key)))
{ {
_delayed_action_do(da); _delayed_action_do(da);
_delayed_action_free(da); _delayed_action_free(da);

8
src/bin/e_bindings.c
View File

@ -498,7 +498,7 @@ e_bindings_key_down_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Ev
mod = _e_bindings_modifiers(ev->modifiers); mod = _e_bindings_modifiers(ev->modifiers);
EINA_LIST_FOREACH(key_bindings, l, binding) EINA_LIST_FOREACH(key_bindings, l, binding)
{ {
if ((binding->key) && (!strcmp(binding->key, ev->keyname)) && if ((binding->key) && (!strcmp(binding->key, ev->key)) &&
((binding->any_mod) || (binding->mod == mod))) ((binding->any_mod) || (binding->mod == mod)))
{ {
if (_e_bindings_context_match(binding->ctxt, ctxt)) if (_e_bindings_context_match(binding->ctxt, ctxt))
@ -531,7 +531,7 @@ e_bindings_key_up_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Even
mod = _e_bindings_modifiers(ev->modifiers); mod = _e_bindings_modifiers(ev->modifiers);
EINA_LIST_FOREACH(key_bindings, l, binding) EINA_LIST_FOREACH(key_bindings, l, binding)
{ {
if ((binding->key) && (!strcmp(binding->key, ev->keyname)) && if ((binding->key) && (!strcmp(binding->key, ev->key)) &&
((binding->any_mod) || (binding->mod == mod))) ((binding->any_mod) || (binding->mod == mod)))
{ {
if (_e_bindings_context_match(binding->ctxt, ctxt)) if (_e_bindings_context_match(binding->ctxt, ctxt))
@ -564,7 +564,7 @@ e_bindings_key_down_event_find(E_Binding_Context ctxt, Ecore_Event_Key *ev)
mod = _e_bindings_modifiers(ev->modifiers); mod = _e_bindings_modifiers(ev->modifiers);
EINA_LIST_FOREACH(key_bindings, l, binding) EINA_LIST_FOREACH(key_bindings, l, binding)
{ {
if ((binding->key) && (!strcmp(binding->key, ev->keyname)) && if ((binding->key) && (!strcmp(binding->key, ev->key)) &&
((binding->any_mod) || (binding->mod == mod))) ((binding->any_mod) || (binding->mod == mod)))
{ {
if (_e_bindings_context_match(binding->ctxt, ctxt)) if (_e_bindings_context_match(binding->ctxt, ctxt))
@ -589,7 +589,7 @@ e_bindings_key_up_event_find(E_Binding_Context ctxt, Ecore_Event_Key *ev)
mod = _e_bindings_modifiers(ev->modifiers); mod = _e_bindings_modifiers(ev->modifiers);
EINA_LIST_FOREACH(key_bindings, l, binding) EINA_LIST_FOREACH(key_bindings, l, binding)
{ {
if ((binding->key) && (!strcmp(binding->key, ev->keyname)) && if ((binding->key) && (!strcmp(binding->key, ev->key)) &&
((binding->any_mod) || (binding->mod == mod))) ((binding->any_mod) || (binding->mod == mod)))
{ {
if (_e_bindings_context_match(binding->ctxt, ctxt)) if (_e_bindings_context_match(binding->ctxt, ctxt))

4
src/bin/e_desklock.c
View File

@ -1280,9 +1280,9 @@ _e_desklock_ask_presentation_key_down(void *data, Evas *e __UNUSED__, Evas_Objec
Evas_Event_Key_Down *ev = event; Evas_Event_Key_Down *ev = event;
E_Dialog *dia = data; E_Dialog *dia = data;
if (strcmp(ev->keyname, "Return") == 0) if (strcmp(ev->key, "Return") == 0)
_e_desklock_ask_presentation_yes(NULL, dia); _e_desklock_ask_presentation_yes(NULL, dia);
else if (strcmp(ev->keyname, "Escape") == 0) else if (strcmp(ev->key, "Escape") == 0)
_e_desklock_ask_presentation_no(NULL, dia); _e_desklock_ask_presentation_no(NULL, dia);
} }

8
src/bin/e_dialog.c
View File

@ -320,7 +320,7 @@ _e_dialog_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED_
ev = event; ev = event;
dia = data; dia = data;
if (!strcmp(ev->keyname, "Tab")) if (!strcmp(ev->key, "Tab"))
{ {
if (evas_key_modifier_is_set(evas_key_modifier_get(e_win_evas_get(dia->win)), "Shift")) if (evas_key_modifier_is_set(evas_key_modifier_get(e_win_evas_get(dia->win)), "Shift"))
{ {
@ -367,8 +367,8 @@ _e_dialog_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED_
} }
} }
} }
else if (((!strcmp(ev->keyname, "Return")) || else if (((!strcmp(ev->key, "Return")) ||
(!strcmp(ev->keyname, "KP_Enter")))) (!strcmp(ev->key, "KP_Enter"))))
{ {
Evas_Object *o = NULL; Evas_Object *o = NULL;
@ -378,7 +378,7 @@ _e_dialog_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED_
o = e_widget_focused_object_get(dia->box_object); o = e_widget_focused_object_get(dia->box_object);
if (o) e_widget_activate(o); if (o) e_widget_activate(o);
} }
else if (!strcmp(ev->keyname, "Escape")) else if (!strcmp(ev->key, "Escape"))
e_object_del(E_OBJECT(dia)); e_object_del(E_OBJECT(dia));
} }

4
src/bin/e_entry_dialog.c
View File

@ -130,10 +130,10 @@ _e_entry_cb_key_down(void *data, Evas_Object *obj __UNUSED__, void *event_info)
ev = event_info; ev = event_info;
if (!(ed = data)) return; if (!(ed = data)) return;
if (!strcmp(ev->keyname, "Return")) if (!strcmp(ev->key, "Return"))
_e_entry_dialog_ok(data, ed->dia); _e_entry_dialog_ok(data, ed->dia);
else else
if (!strcmp(ev->keyname, "Escape")) if (!strcmp(ev->key, "Escape"))
_e_entry_dialog_cancel(data, ed->dia); _e_entry_dialog_cancel(data, ed->dia);
} }

14
src/bin/e_fm.c
View File

@ -7392,12 +7392,12 @@ _e_fm2_cb_drag_finished(E_Drag *drag, int dropped __UNUSED__)
static void static void
_e_fm_drag_key_down_cb(E_Drag *drag, Ecore_Event_Key *e) _e_fm_drag_key_down_cb(E_Drag *drag, Ecore_Event_Key *e)
{ {
if (!strncmp(e->keyname, "Alt", 3)) if (!strncmp(e->key, "Alt", 3))
{ {
ecore_x_dnd_source_action_set(ECORE_X_ATOM_XDND_ACTION_ASK); ecore_x_dnd_source_action_set(ECORE_X_ATOM_XDND_ACTION_ASK);
edje_object_signal_emit(drag->object, "e,state,ask", "e"); edje_object_signal_emit(drag->object, "e,state,ask", "e");
} }
else if (!strncmp(e->keyname, "Shift", 5)) else if (!strncmp(e->key, "Shift", 5))
{ {
if (e->modifiers == ECORE_EVENT_MODIFIER_CTRL) if (e->modifiers == ECORE_EVENT_MODIFIER_CTRL)
{ {
@ -7410,7 +7410,7 @@ _e_fm_drag_key_down_cb(E_Drag *drag, Ecore_Event_Key *e)
edje_object_signal_emit(drag->object, "e,state,move", "e"); edje_object_signal_emit(drag->object, "e,state,move", "e");
} }
} }
else if (!strncmp(e->keyname, "Control", 7)) else if (!strncmp(e->key, "Control", 7))
{ {
if (e->modifiers == ECORE_EVENT_MODIFIER_SHIFT) if (e->modifiers == ECORE_EVENT_MODIFIER_SHIFT)
{ {
@ -7430,11 +7430,11 @@ _e_fm_drag_key_up_cb(E_Drag *drag, Ecore_Event_Key *e)
{ {
/* Default action would be move. ;) */ /* Default action would be move. ;) */
if (!strncmp(e->keyname, "Alt", 3)) if (!strncmp(e->key, "Alt", 3))
ecore_x_dnd_source_action_set(ECORE_X_ATOM_XDND_ACTION_MOVE); ecore_x_dnd_source_action_set(ECORE_X_ATOM_XDND_ACTION_MOVE);
else if (!strncmp(e->keyname, "Shift", 5)) else if (!strncmp(e->key, "Shift", 5))
ecore_x_dnd_source_action_set(ECORE_X_ATOM_XDND_ACTION_MOVE); ecore_x_dnd_source_action_set(ECORE_X_ATOM_XDND_ACTION_MOVE);
else if (!strncmp(e->keyname, "Control", 7)) else if (!strncmp(e->key, "Control", 7))
ecore_x_dnd_source_action_set(ECORE_X_ATOM_XDND_ACTION_MOVE); ecore_x_dnd_source_action_set(ECORE_X_ATOM_XDND_ACTION_MOVE);
edje_object_signal_emit(drag->object, "e,state,move", "e"); edje_object_signal_emit(drag->object, "e,state,move", "e");
@ -7817,7 +7817,7 @@ _e_fm2_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event
e_fm2_pan_set(obj, sd->pos.x, sd->pos.y - sd->h); e_fm2_pan_set(obj, sd->pos.x, sd->pos.y - sd->h);
evas_object_smart_callback_call(sd->obj, "pan_changed", NULL); evas_object_smart_callback_call(sd->obj, "pan_changed", NULL);
} }
else if (!strcmp(ev->keyname, "Next")) else if (!strcmp(ev->key, "Next"))
{ {
/* down h * n pixels */ /* down h * n pixels */
e_fm2_pan_set(obj, sd->pos.x, sd->pos.y + sd->h); e_fm2_pan_set(obj, sd->pos.x, sd->pos.y + sd->h);

2
src/bin/e_grab_dialog.c
View File

@ -13,7 +13,7 @@ _e_grab_dialog_key_handler(void *data, int type __UNUSED__, Ecore_Event_Key *ev)
E_Grab_Dialog *eg = data; E_Grab_Dialog *eg = data;
if (ev->window != eg->grab_win) return ECORE_CALLBACK_RENEW; if (ev->window != eg->grab_win) return ECORE_CALLBACK_RENEW;
if (!strcmp(ev->keyname, "Escape") && if (!strcmp(ev->key, "Escape") &&
!(ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT) && !(ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT) &&
!(ev->modifiers & ECORE_EVENT_MODIFIER_CTRL) && !(ev->modifiers & ECORE_EVENT_MODIFIER_CTRL) &&
!(ev->modifiers & ECORE_EVENT_MODIFIER_ALT) && !(ev->modifiers & ECORE_EVENT_MODIFIER_ALT) &&

18
src/bin/e_ilist.c
View File

@ -973,7 +973,7 @@ _e_smart_event_key_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, voi
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) sd->on_hold = 1; if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) sd->on_hold = 1;
else sd->on_hold = 0; else sd->on_hold = 0;
if ((!strcmp(ev->keyname, "Up")) || (!strcmp(ev->keyname, "KP_Up"))) if ((!strcmp(ev->key, "Up")) || (!strcmp(ev->key, "KP_Up")))
{ {
n = ns; n = ns;
do do
@ -999,7 +999,7 @@ _e_smart_event_key_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, voi
e_ilist_selected_set(sd->o_smart, n); e_ilist_selected_set(sd->o_smart, n);
} }
} }
else if ((!strcmp(ev->keyname, "Down")) || (!strcmp(ev->keyname, "KP_Down"))) else if ((!strcmp(ev->key, "Down")) || (!strcmp(ev->key, "KP_Down")))
{ {
n = ns; n = ns;
do do
@ -1025,7 +1025,7 @@ _e_smart_event_key_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, voi
e_ilist_selected_set(sd->o_smart, n); e_ilist_selected_set(sd->o_smart, n);
} }
} }
else if ((!strcmp(ev->keyname, "Home")) || (!strcmp(ev->keyname, "KP_Home"))) else if ((!strcmp(ev->key, "Home")) || (!strcmp(ev->key, "KP_Home")))
{ {
n = -1; n = -1;
do do
@ -1051,7 +1051,7 @@ _e_smart_event_key_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, voi
e_ilist_selected_set(sd->o_smart, n); e_ilist_selected_set(sd->o_smart, n);
} }
} }
else if ((!strcmp(ev->keyname, "End")) || (!strcmp(ev->keyname, "KP_End"))) else if ((!strcmp(ev->key, "End")) || (!strcmp(ev->key, "KP_End")))
{ {
n = eina_list_count(sd->items); n = eina_list_count(sd->items);
do do
@ -1077,9 +1077,9 @@ _e_smart_event_key_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, voi
e_ilist_selected_set(sd->o_smart, n); e_ilist_selected_set(sd->o_smart, n);
} }
} }
else if ((!strcmp(ev->keyname, "Return")) || else if ((!strcmp(ev->key, "Return")) ||
(!strcmp(ev->keyname, "KP_Enter")) || (!strcmp(ev->key, "KP_Enter")) ||
(!strcmp(ev->keyname, "space") && !sd->typebuf.buf)) (!strcmp(ev->key, "space") && !sd->typebuf.buf))
{ {
if (!sd->on_hold) if (!sd->on_hold)
{ {
@ -1090,9 +1090,9 @@ _e_smart_event_key_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, voi
} }
} }
} }
else if (!strcmp(ev->keyname, "Escape")) else if (!strcmp(ev->key, "Escape"))
_e_typebuf_clean(obj); _e_typebuf_clean(obj);
else if (strcmp(ev->keyname, "BackSpace") && strcmp(ev->keyname, "Tab") && ev->string) else if (strcmp(ev->key, "BackSpace") && strcmp(ev->key, "Tab") && ev->string)
_e_typebuf_add(obj, ev->string); _e_typebuf_add(obj, ev->string);
sd->on_hold = 0; sd->on_hold = 0;

4
src/bin/e_screensaver.c
View File

@ -158,9 +158,9 @@ _e_screensaver_ask_presentation_key_down(void *data, Evas *e __UNUSED__, Evas_Ob
Evas_Event_Key_Down *ev = event; Evas_Event_Key_Down *ev = event;
E_Dialog *dia = data; E_Dialog *dia = data;
if (strcmp(ev->keyname, "Return") == 0) if (strcmp(ev->key, "Return") == 0)
_e_screensaver_ask_presentation_yes(NULL, dia); _e_screensaver_ask_presentation_yes(NULL, dia);
else if (strcmp(ev->keyname, "Escape") == 0) else if (strcmp(ev->key, "Escape") == 0)
_e_screensaver_ask_presentation_no(NULL, dia); _e_screensaver_ask_presentation_no(NULL, dia);
} }

16
src/bin/e_scrollframe.c
View File

@ -700,26 +700,26 @@ _e_smart_event_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE
if (!sd->pan_obj) return; if (!sd->pan_obj) return;
sd->pan_func.max_get(sd->pan_obj, &mx, &my); sd->pan_func.max_get(sd->pan_obj, &mx, &my);
edje_object_part_geometry_get(sd->edje_obj, "e.swallow.content", NULL, NULL, &vw, &vh); edje_object_part_geometry_get(sd->edje_obj, "e.swallow.content", NULL, NULL, &vw, &vh);
if (!strcmp(ev->keyname, "Left")) if (!strcmp(ev->key, "Left"))
x -= sd->step.x; x -= sd->step.x;
else if (!strcmp(ev->keyname, "Right")) else if (!strcmp(ev->key, "Right"))
x += sd->step.x; x += sd->step.x;
else if (!strcmp(ev->keyname, "Up")) else if (!strcmp(ev->key, "Up"))
y -= sd->step.y; y -= sd->step.y;
else if (!strcmp(ev->keyname, "Home")) else if (!strcmp(ev->key, "Home"))
y = 0; y = 0;
else if (!strcmp(ev->keyname, "End")) else if (!strcmp(ev->key, "End"))
y = my; y = my;
else if (!strcmp(ev->keyname, "Down")) else if (!strcmp(ev->key, "Down"))
y += sd->step.y; y += sd->step.y;
else if (!strcmp(ev->keyname, "Prior")) else if (!strcmp(ev->key, "Prior"))
{ {
if (sd->page.y < 0) if (sd->page.y < 0)
y -= -(sd->page.y * vh) / 100; y -= -(sd->page.y * vh) / 100;
else else
y -= sd->page.y; y -= sd->page.y;
} }
else if (!strcmp(ev->keyname, "Next")) else if (!strcmp(ev->key, "Next"))
{ {
if (sd->page.y < 0) if (sd->page.y < 0)
y += -(sd->page.y * vh) / 100; y += -(sd->page.y * vh) / 100;

24
src/bin/e_slider.c
View File

@ -427,10 +427,10 @@ _e_smart_event_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE
E_Smart_Data *sd = data; E_Smart_Data *sd = data;
if (sd->disabled) return; if (sd->disabled) return;
if ((!strcmp(ev->keyname, "Up")) || if ((!strcmp(ev->key, "Up")) ||
(!strcmp(ev->keyname, "KP_Up")) || (!strcmp(ev->key, "KP_Up")) ||
(!strcmp(ev->keyname, "Left")) || (!strcmp(ev->key, "Left")) ||
(!strcmp(ev->keyname, "KP_Left"))) (!strcmp(ev->key, "KP_Left")))
{ {
if (sd->step_count > 0) if (sd->step_count > 0)
{ {
@ -441,10 +441,10 @@ _e_smart_event_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE
edje_object_part_drag_step(sd->edje_obj, "e.dragable.slider", -1, -1); edje_object_part_drag_step(sd->edje_obj, "e.dragable.slider", -1, -1);
sd->direction = -1; sd->direction = -1;
} }
else if ((!strcmp(ev->keyname, "Down")) || else if ((!strcmp(ev->key, "Down")) ||
(!strcmp(ev->keyname, "KP_Down")) || (!strcmp(ev->key, "KP_Down")) ||
(!strcmp(ev->keyname, "Right")) || (!strcmp(ev->key, "Right")) ||
(!strcmp(ev->keyname, "KP_Right"))) (!strcmp(ev->key, "KP_Right")))
{ {
if (sd->step_count > 0) if (sd->step_count > 0)
{ {
@ -455,14 +455,14 @@ _e_smart_event_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE
edje_object_part_drag_step(sd->edje_obj, "e.dragable.slider", 1, 1); edje_object_part_drag_step(sd->edje_obj, "e.dragable.slider", 1, 1);
sd->direction = 1; sd->direction = 1;
} }
else if ((!strcmp(ev->keyname, "Home")) || else if ((!strcmp(ev->key, "Home")) ||
(!strcmp(ev->keyname, "KP_Home"))) (!strcmp(ev->key, "KP_Home")))
{ {
edje_object_part_drag_value_set(sd->edje_obj, "e.dragable.slider", 0., 0.); edje_object_part_drag_value_set(sd->edje_obj, "e.dragable.slider", 0., 0.);
sd->direction = 0; sd->direction = 0;
} }
else if ((!strcmp(ev->keyname, "End")) || else if ((!strcmp(ev->key, "End")) ||
(!strcmp(ev->keyname, "KP_End"))) (!strcmp(ev->key, "KP_End")))
{ {
edje_object_part_drag_value_set(sd->edje_obj, "e.dragable.slider", 1., 1.); edje_object_part_drag_value_set(sd->edje_obj, "e.dragable.slider", 1., 1.);
sd->direction = 0; sd->direction = 0;

16
src/bin/e_slidesel.c
View File

@ -182,26 +182,26 @@ _e_smart_event_key_down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *
sd = data; sd = data;
ev = event_info; ev = event_info;
if (!strcmp(ev->keyname, "Left")) if (!strcmp(ev->key, "Left"))
x -= sd->step.x; x -= sd->step.x;
else if (!strcmp(ev->keyname, "Right")) else if (!strcmp(ev->key, "Right"))
x += sd->step.x; x += sd->step.x;
else if (!strcmp(ev->keyname, "Up")) else if (!strcmp(ev->key, "Up"))
y -= sd->step.y; y -= sd->step.y;
else if (!strcmp(ev->keyname, "Home")) else if (!strcmp(ev->key, "Home"))
y = 0; y = 0;
else if (!strcmp(ev->keyname, "End")) else if (!strcmp(ev->key, "End"))
y = my; y = my;
else if (!strcmp(ev->keyname, "Down")) else if (!strcmp(ev->key, "Down"))
y += sd->step.y; y += sd->step.y;
else if (!strcmp(ev->keyname, "Prior")) else if (!strcmp(ev->key, "Prior"))
{ {
if (sd->page.y < 0) if (sd->page.y < 0)
y -= -(sd->page.y * vh) / 100; y -= -(sd->page.y * vh) / 100;
else else
y -= sd->page.y; y -= sd->page.y;
} }
else if (!strcmp(ev->keyname, "Next")) else if (!strcmp(ev->key, "Next"))
{ {
if (sd->page.y < 0) if (sd->page.y < 0)
y += -(sd->page.y * vh) / 100; y += -(sd->page.y * vh) / 100;

2
src/bin/e_utils.c
View File

@ -1451,7 +1451,7 @@ e_util_binding_match(const Eina_List *bindlist, Ecore_Event_Key *ev, unsigned in
{ {
if (bi != skip) if (bi != skip)
{ {
if ((bi->modifiers == mod) && (!strcmp(bi->key, ev->keyname))) if ((bi->modifiers == mod) && (!strcmp(bi->key, ev->key)))
return bi; return bi;
} }
if (num) (*num)++; if (num) (*num)++;

18
src/bin/e_widget_toolbar.c
View File

@ -466,8 +466,8 @@ _e_wid_cb_key_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED_
ev = event_info; ev = event_info;
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return; if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
wd = e_widget_data_get(data); wd = e_widget_data_get(data);
if ((!strcmp(ev->keyname, "Up")) || (!strcmp(ev->keyname, "KP_Up")) || if ((!strcmp(ev->key, "Up")) || (!strcmp(ev->key, "KP_Up")) ||
(!strcmp(ev->keyname, "Left")) || (!strcmp(ev->keyname, "KP_Left"))) (!strcmp(ev->key, "Left")) || (!strcmp(ev->key, "KP_Left")))
{ {
EINA_LIST_FOREACH(wd->items, l, it) EINA_LIST_FOREACH(wd->items, l, it)
{ {
@ -479,10 +479,10 @@ _e_wid_cb_key_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED_
} }
} }
} }
else if ((!strcmp(ev->keyname, "Down")) || else if ((!strcmp(ev->key, "Down")) ||
(!strcmp(ev->keyname, "KP_Down")) || (!strcmp(ev->key, "KP_Down")) ||
(!strcmp(ev->keyname, "Right")) || (!strcmp(ev->key, "Right")) ||
(!strcmp(ev->keyname, "KP_Right"))) (!strcmp(ev->key, "KP_Right")))
{ {
EINA_LIST_FOREACH(wd->items, l, it) EINA_LIST_FOREACH(wd->items, l, it)
{ {
@ -494,8 +494,8 @@ _e_wid_cb_key_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED_
} }
} }
} }
else if ((!strcmp(ev->keyname, "Home")) || else if ((!strcmp(ev->key, "Home")) ||
(!strcmp(ev->keyname, "KP_Home"))) (!strcmp(ev->key, "KP_Home")))
{ {
EINA_LIST_FOREACH(wd->items, l, it) EINA_LIST_FOREACH(wd->items, l, it)
{ {
@ -506,7 +506,7 @@ _e_wid_cb_key_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED_
} }
} }
} }
else if ((!strcmp(ev->keyname, "End")) || (!strcmp(ev->keyname, "KP_End"))) else if ((!strcmp(ev->key, "End")) || (!strcmp(ev->key, "KP_End")))
{ {
EINA_LIST_FOREACH(wd->items, l, it) EINA_LIST_FOREACH(wd->items, l, it)
{ {

2
src/modules/backlight/e_mod_main.c
View File

@ -172,7 +172,7 @@ _backlight_input_win_key_down_cb(void *data, int type __UNUSED__, void *event)
if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN) if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN)
mod |= E_BINDING_MODIFIER_WIN; mod |= E_BINDING_MODIFIER_WIN;
if (binding->key && (!strcmp(binding->key, ev->keyname)) && if (binding->key && (!strcmp(binding->key, ev->key)) &&
((binding->modifiers == mod) || (binding->any_mod))) ((binding->modifiers == mod) || (binding->any_mod)))
{ {
_backlight_popup_free(inst); _backlight_popup_free(inst);

10
src/modules/conf/e_conf.c
View File

@ -416,7 +416,7 @@ _e_configure_keydown_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE
win = data; win = data;
eco = win->data; eco = win->data;
if (!strcmp(ev->keyname, "Tab")) if (!strcmp(ev->key, "Tab"))
{ {
if (evas_key_modifier_is_set(evas_key_modifier_get(e_win_evas_get(win)), "Shift")) if (evas_key_modifier_is_set(evas_key_modifier_get(e_win_evas_get(win)), "Shift"))
{ {
@ -437,9 +437,9 @@ _e_configure_keydown_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE
e_widget_focus_set(eco->item_list, 0); e_widget_focus_set(eco->item_list, 0);
} }
} }
else if (((!strcmp(ev->keyname, "Return")) || else if (((!strcmp(ev->key, "Return")) ||
(!strcmp(ev->keyname, "KP_Enter")) || (!strcmp(ev->key, "KP_Enter")) ||
(!strcmp(ev->keyname, "space")))) (!strcmp(ev->key, "space"))))
{ {
Evas_Object *o = NULL; Evas_Object *o = NULL;
@ -456,7 +456,7 @@ _e_configure_keydown_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE
e_widget_activate(o); e_widget_activate(o);
} }
} }
else if (!strcmp(ev->keyname, "Escape")) else if (!strcmp(ev->key, "Escape"))
e_widget_activate(eco->close); e_widget_activate(eco->close);
} }

8
src/modules/conf_intl/e_int_config_imc_import.c
View File

@ -326,7 +326,7 @@ _imc_import_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE
ev = event; ev = event;
import = data; import = data;
if ((!e_widget_fsel_typebuf_visible_get(import->fsel_obj)) && (!strcmp(ev->keyname, "Tab"))) if ((!e_widget_fsel_typebuf_visible_get(import->fsel_obj)) && (!strcmp(ev->key, "Tab")))
{ {
if (evas_key_modifier_is_set(evas_key_modifier_get(e_win_evas_get(import->win)), "Shift")) if (evas_key_modifier_is_set(evas_key_modifier_get(e_win_evas_get(import->win)), "Shift"))
{ {
@ -363,9 +363,9 @@ _imc_import_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE
} }
} }
} }
else if (((!strcmp(ev->keyname, "Return")) || else if (((!strcmp(ev->key, "Return")) ||
(!strcmp(ev->keyname, "KP_Enter")) || (!strcmp(ev->key, "KP_Enter")) ||
(!strcmp(ev->keyname, "space")))) (!strcmp(ev->key, "space"))))
{ {
Evas_Object *o = NULL; Evas_Object *o = NULL;

8
src/modules/conf_theme/e_int_config_theme_import.c
View File

@ -318,7 +318,7 @@ _theme_import_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNU
ev = event; ev = event;
import = data; import = data;
if ((!e_widget_fsel_typebuf_visible_get(import->fsel_obj)) && (!strcmp(ev->keyname, "Tab"))) if ((!e_widget_fsel_typebuf_visible_get(import->fsel_obj)) && (!strcmp(ev->key, "Tab")))
{ {
if (evas_key_modifier_is_set(evas_key_modifier_get(e_win_evas_get(import->win)), "Shift")) if (evas_key_modifier_is_set(evas_key_modifier_get(e_win_evas_get(import->win)), "Shift"))
{ {
@ -355,9 +355,9 @@ _theme_import_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNU
} }
} }
} }
else if (((!strcmp(ev->keyname, "Return")) || else if (((!strcmp(ev->key, "Return")) ||
(!strcmp(ev->keyname, "KP_Enter")) || (!strcmp(ev->key, "KP_Enter")) ||
(!strcmp(ev->keyname, "space")))) (!strcmp(ev->key, "space"))))
{ {
Evas_Object *o = NULL; Evas_Object *o = NULL;

4
src/modules/connman/agent.c
View File

@ -119,9 +119,9 @@ _dialog_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *o __UNUSED__,
Evas_Event_Key_Down *ev = event; Evas_Event_Key_Down *ev = event;
E_Connman_Agent *agent = data; E_Connman_Agent *agent = data;
if (!strcmp(ev->keyname, "Return")) if (!strcmp(ev->key, "Return"))
_dialog_ok_cb(agent, agent->dialog); _dialog_ok_cb(agent, agent->dialog);
else if (strcmp(ev->keyname, "Escape") == 0) else if (strcmp(ev->key, "Escape") == 0)
_dialog_cancel_cb(agent, agent->dialog); _dialog_cancel_cb(agent, agent->dialog);
} }

2
src/modules/everything/evry.c
View File

@ -2011,7 +2011,7 @@ _evry_cb_key_down(void *data, int type __UNUSED__, void *event)
if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN) if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN)
mod |= E_BINDING_MODIFIER_WIN; mod |= E_BINDING_MODIFIER_WIN;
if (!(binding->key && (!strcmp(binding->key, ev->keyname)) && if (!(binding->key && (!strcmp(binding->key, ev->key)) &&
(((unsigned int)binding->modifiers == mod) || (binding->any_mod)))) (((unsigned int)binding->modifiers == mod) || (binding->any_mod))))
continue; continue;

4
src/modules/fileman/e_fwin.c
View File

@ -2710,9 +2710,9 @@ _e_fwin_file_open_dialog_cb_key_down(void *data,
E_Fwin_Page *page = data; E_Fwin_Page *page = data;
E_Fwin *fwin = page->fwin; E_Fwin *fwin = page->fwin;
if (!strcmp(ev->keyname, "Escape")) if (!strcmp(ev->key, "Escape"))
_e_fwin_cb_close(fwin->fad, fwin->fad->dia); _e_fwin_cb_close(fwin->fad, fwin->fad->dia);
else if (!strcmp(ev->keyname, "Return")) else if (!strcmp(ev->key, "Return"))
_e_fwin_cb_open(fwin->fad, fwin->fad->dia); _e_fwin_cb_open(fwin->fad, fwin->fad->dia);
} }

2
src/modules/mixer/e_mod_main.c
View File

@ -533,7 +533,7 @@ _mixer_popup_input_window_key_down_cb(void *data, int type __UNUSED__, void *eve
if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN) if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN)
mod |= E_BINDING_MODIFIER_WIN; mod |= E_BINDING_MODIFIER_WIN;
if (binding->key && (!strcmp(binding->key, ev->keyname)) && if (binding->key && (!strcmp(binding->key, ev->key)) &&
((binding->modifiers == mod) || (binding->any_mod))) ((binding->modifiers == mod) || (binding->any_mod)))
{ {
if (!(act = e_action_find(binding->action))) continue; if (!(act = e_action_find(binding->action))) continue;

2
src/modules/pager/e_mod_config.c
View File

@ -493,7 +493,7 @@ _grab_cb_key_down(void *data, __UNUSED__ int type, void *event)
ev = event; ev = event;
if (!(cfdata = data)) return ECORE_CALLBACK_PASS_ON; if (!(cfdata = data)) return ECORE_CALLBACK_PASS_ON;
if (!strcmp(ev->keyname, "Delete")) if (!strcmp(ev->key, "Delete"))
{ {
if (cfdata->grab.btn == 1) if (cfdata->grab.btn == 1)
cfdata->btn.drag = 0; cfdata->btn.drag = 0;

2
src/modules/pager/e_mod_main.c
View File

@ -2700,7 +2700,7 @@ _pager_popup_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event
if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN) if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN)
mod |= E_BINDING_MODIFIER_WIN; mod |= E_BINDING_MODIFIER_WIN;
if (binding->key && (!strcmp(binding->key, ev->keyname)) && if (binding->key && (!strcmp(binding->key, ev->key)) &&
((binding->modifiers == mod))) ((binding->modifiers == mod)))
{ {
E_Action *act; E_Action *act;

10
src/modules/quickaccess/e_mod_quickaccess.c
View File

@ -634,10 +634,10 @@ _grab_key_down_cb(void *data, int type __UNUSED__, void *event)
E_Quick_Access_Entry *entry; E_Quick_Access_Entry *entry;
unsigned int mod = E_BINDING_MODIFIER_NONE; unsigned int mod = E_BINDING_MODIFIER_NONE;
if (!strcmp(ev->keyname, "Control_L") || !strcmp(ev->keyname, "Control_R") || if (!strcmp(ev->key, "Control_L") || !strcmp(ev->key, "Control_R") ||
!strcmp(ev->keyname, "Shift_L") || !strcmp(ev->keyname, "Shift_R") || !strcmp(ev->key, "Shift_L") || !strcmp(ev->key, "Shift_R") ||
!strcmp(ev->keyname, "Alt_L") || !strcmp(ev->keyname, "Alt_R") || !strcmp(ev->key, "Alt_L") || !strcmp(ev->key, "Alt_R") ||
!strcmp(ev->keyname, "Super_L") || !strcmp(ev->keyname, "Super_R")) !strcmp(ev->key, "Super_L") || !strcmp(ev->key, "Super_R"))
return ECORE_CALLBACK_RENEW; return ECORE_CALLBACK_RENEW;
if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT) if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)
@ -661,7 +661,7 @@ _grab_key_down_cb(void *data, int type __UNUSED__, void *event)
bi->context = E_BINDING_CONTEXT_ANY; bi->context = E_BINDING_CONTEXT_ANY;
bi->modifiers = mod; bi->modifiers = mod;
bi->key = eina_stringshare_add(ev->keyname); bi->key = eina_stringshare_add(ev->key);
bi->action = eina_stringshare_ref(_act_toggle); bi->action = eina_stringshare_ref(_act_toggle);
bi->params = eina_stringshare_ref(entry->id); bi->params = eina_stringshare_ref(entry->id);

14
src/modules/shot/e_mod_main.c
View File

@ -80,7 +80,7 @@ _key_down_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSE
{ {
Evas_Event_Key_Down *ev = event; Evas_Event_Key_Down *ev = event;
if (!strcmp(ev->keyname, "Tab")) if (!strcmp(ev->key, "Tab"))
{ {
if (evas_key_modifier_is_set(evas_key_modifier_get(e_win_evas_get(win)), "Shift")) if (evas_key_modifier_is_set(evas_key_modifier_get(e_win_evas_get(win)), "Shift"))
{ {
@ -117,9 +117,9 @@ _key_down_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSE
} }
} }
} }
else if (((!strcmp(ev->keyname, "Return")) || else if (((!strcmp(ev->key, "Return")) ||
(!strcmp(ev->keyname, "KP_Enter")) || (!strcmp(ev->key, "KP_Enter")) ||
(!strcmp(ev->keyname, "space")))) (!strcmp(ev->key, "space"))))
{ {
Evas_Object *o = NULL; Evas_Object *o = NULL;
@ -129,7 +129,7 @@ _key_down_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSE
o = e_widget_focused_object_get(o_box); o = e_widget_focused_object_get(o_box);
if (o) e_widget_activate(o); if (o) e_widget_activate(o);
} }
else if (!strcmp(ev->keyname, "Escape")) else if (!strcmp(ev->key, "Escape"))
_win_cancel_cb(NULL, NULL); _win_cancel_cb(NULL, NULL);
} }
@ -137,9 +137,9 @@ static void
_save_key_down_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event) _save_key_down_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event)
{ {
Evas_Event_Key_Down *ev = event; Evas_Event_Key_Down *ev = event;
if ((!strcmp(ev->keyname, "Return")) || (!strcmp(ev->keyname, "KP_Enter"))) if ((!strcmp(ev->key, "Return")) || (!strcmp(ev->key, "KP_Enter")))
_file_select_ok_cb(NULL, fsel_dia); _file_select_ok_cb(NULL, fsel_dia);
else if (!strcmp(ev->keyname, "Escape")) else if (!strcmp(ev->key, "Escape"))
_file_select_cancel_cb(NULL, fsel_dia); _file_select_cancel_cb(NULL, fsel_dia);
} }

2
src/modules/syscon/e_syscon.c
View File

@ -418,7 +418,7 @@ _cb_key_down(__UNUSED__ void *data, __UNUSED__ int type, void *event)
} }
edje_object_signal_emit(o_selected, "e,state,unfocused", "e"); edje_object_signal_emit(o_selected, "e,state,unfocused", "e");
} }
else if ((!strcmp(ev->keyname, "KP_Enter")) || (!strcmp(ev->keyname, "Return"))) else if ((!strcmp(ev->key, "KP_Enter")) || (!strcmp(ev->key, "Return")))
{ {
if (!o_selected) return ECORE_CALLBACK_RENEW; if (!o_selected) return ECORE_CALLBACK_RENEW;
edje_object_signal_emit(o_selected, "e,state,focused", "e"); edje_object_signal_emit(o_selected, "e,state,focused", "e");

4
src/modules/winlist/e_winlist.c
View File

@ -1355,7 +1355,7 @@ _e_winlist_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN) if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN)
mod |= E_BINDING_MODIFIER_WIN; mod |= E_BINDING_MODIFIER_WIN;
if (binding->key && (!strcmp(binding->key, ev->keyname)) && if (binding->key && (!strcmp(binding->key, ev->key)) &&
((binding->modifiers == mod) || (binding->any_mod))) ((binding->modifiers == mod) || (binding->any_mod)))
{ {
if (!_act_winlist) continue; if (!_act_winlist) continue;
@ -1421,7 +1421,7 @@ _e_winlist_cb_key_up(void *data __UNUSED__, int type __UNUSED__, void *event)
if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN) if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN)
mod |= E_BINDING_MODIFIER_WIN; mod |= E_BINDING_MODIFIER_WIN;
if (binding->key && (!strcmp(binding->key, ev->keyname)) && if (binding->key && (!strcmp(binding->key, ev->key)) &&
((binding->modifiers == mod) || (binding->any_mod))) ((binding->modifiers == mod) || (binding->any_mod)))
{ {
if (!_act_winlist) continue; if (!_act_winlist) continue;

8
src/modules/wizard/e_wizard.c
View File

@ -351,16 +351,16 @@ _e_wizard_cb_key_down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *ob
ev = event; ev = event;
if (!o_content) return; if (!o_content) return;
if (!strcmp(ev->keyname, "Tab")) if (!strcmp(ev->key, "Tab"))
{ {
if (evas_key_modifier_is_set(ev->modifiers, "Shift")) if (evas_key_modifier_is_set(ev->modifiers, "Shift"))
e_widget_focus_jump(o_content, 0); e_widget_focus_jump(o_content, 0);
else else
e_widget_focus_jump(o_content, 1); e_widget_focus_jump(o_content, 1);
} }
else if (((!strcmp(ev->keyname, "Return")) || else if (((!strcmp(ev->key, "Return")) ||
(!strcmp(ev->keyname, "KP_Enter")) || (!strcmp(ev->key, "KP_Enter")) ||
(!strcmp(ev->keyname, "space")))) (!strcmp(ev->key, "space"))))
{ {
Evas_Object *o; Evas_Object *o;