forked from enlightenment/efl
evas/evas_event - trivial changes
modify indentation to look more clearly. use Eina_Bool SVN revision: 65089
This commit is contained in:
parent
d908a5d876
commit
c5f717d2b0
|
@ -1197,14 +1197,15 @@ evas_event_feed_key_down(Evas *e, const char *keyname, const char *key, const ch
|
|||
if (!keyname) return;
|
||||
if (e->events_frozen > 0) return;
|
||||
e->last_timestamp = timestamp;
|
||||
|
||||
_evas_walk(e);
|
||||
{
|
||||
|
||||
Evas_Event_Key_Down ev;
|
||||
int exclusive;
|
||||
Eina_Bool exclusive;
|
||||
|
||||
_evas_object_event_new();
|
||||
|
||||
exclusive = 0;
|
||||
exclusive = EINA_FALSE;
|
||||
ev.keyname = (char *)keyname;
|
||||
ev.data = (void *)data;
|
||||
ev.modifiers = &(e->modifiers);
|
||||
|
@ -1214,6 +1215,7 @@ evas_event_feed_key_down(Evas *e, const char *keyname, const char *key, const ch
|
|||
ev.compose = compose;
|
||||
ev.timestamp = timestamp;
|
||||
ev.event_flags = EVAS_EVENT_FLAG_NONE;
|
||||
|
||||
if (e->grabs)
|
||||
{
|
||||
Eina_List *l;
|
||||
|
@ -1235,8 +1237,10 @@ evas_event_feed_key_down(Evas *e, const char *keyname, const char *key, const ch
|
|||
if (!(e->modifiers.mask & g->not_modifiers))
|
||||
{
|
||||
if (e->events_frozen <= 0)
|
||||
evas_object_event_callback_call(g->object, EVAS_CALLBACK_KEY_DOWN, &ev);
|
||||
if (g->exclusive) exclusive = 1;
|
||||
evas_object_event_callback_call(g->object,
|
||||
EVAS_CALLBACK_KEY_DOWN,
|
||||
&ev);
|
||||
if (g->exclusive) exclusive = EINA_TRUE;
|
||||
}
|
||||
}
|
||||
if (e->delete_me) break;
|
||||
|
@ -1252,7 +1256,8 @@ evas_event_feed_key_down(Evas *e, const char *keyname, const char *key, const ch
|
|||
g = eina_list_data_get(l);
|
||||
l = eina_list_next(l);
|
||||
if (g->delete_me)
|
||||
evas_key_grab_free(g->object, g->keyname, g->modifiers, g->not_modifiers);
|
||||
evas_key_grab_free(g->object, g->keyname, g->modifiers,
|
||||
g->not_modifiers);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1260,10 +1265,10 @@ evas_event_feed_key_down(Evas *e, const char *keyname, const char *key, const ch
|
|||
if ((e->focused) && (!exclusive))
|
||||
{
|
||||
if (e->events_frozen <= 0)
|
||||
evas_object_event_callback_call(e->focused, EVAS_CALLBACK_KEY_DOWN, &ev);
|
||||
evas_object_event_callback_call(e->focused, EVAS_CALLBACK_KEY_DOWN,
|
||||
&ev);
|
||||
}
|
||||
_evas_post_event_callback_call(e);
|
||||
}
|
||||
_evas_unwalk(e);
|
||||
}
|
||||
|
||||
|
@ -1277,13 +1282,13 @@ evas_event_feed_key_up(Evas *e, const char *keyname, const char *key, const char
|
|||
if (e->events_frozen > 0) return;
|
||||
e->last_timestamp = timestamp;
|
||||
_evas_walk(e);
|
||||
{
|
||||
|
||||
Evas_Event_Key_Up ev;
|
||||
int exclusive;
|
||||
Eina_Bool exclusive;
|
||||
|
||||
_evas_object_event_new();
|
||||
|
||||
exclusive = 0;
|
||||
exclusive = EINA_FALSE;
|
||||
ev.keyname = (char *)keyname;
|
||||
ev.data = (void *)data;
|
||||
ev.modifiers = &(e->modifiers);
|
||||
|
@ -1293,6 +1298,7 @@ evas_event_feed_key_up(Evas *e, const char *keyname, const char *key, const char
|
|||
ev.compose = compose;
|
||||
ev.timestamp = timestamp;
|
||||
ev.event_flags = EVAS_EVENT_FLAG_NONE;
|
||||
|
||||
if (e->grabs)
|
||||
{
|
||||
Eina_List *l;
|
||||
|
@ -1314,8 +1320,9 @@ evas_event_feed_key_up(Evas *e, const char *keyname, const char *key, const char
|
|||
(!strcmp(keyname, g->keyname)))
|
||||
{
|
||||
if (e->events_frozen <= 0)
|
||||
evas_object_event_callback_call(g->object, EVAS_CALLBACK_KEY_UP, &ev);
|
||||
if (g->exclusive) exclusive = 1;
|
||||
evas_object_event_callback_call(g->object,
|
||||
EVAS_CALLBACK_KEY_UP, &ev);
|
||||
if (g->exclusive) exclusive = EINA_TRUE;
|
||||
}
|
||||
if (e->delete_me) break;
|
||||
}
|
||||
|
@ -1331,7 +1338,8 @@ evas_event_feed_key_up(Evas *e, const char *keyname, const char *key, const char
|
|||
EINA_LIST_FOREACH_SAFE(e->grabs, ll, l_next, gr)
|
||||
{
|
||||
if (gr->delete_me)
|
||||
evas_key_grab_free(gr->object, gr->keyname, gr->modifiers, gr->not_modifiers);
|
||||
evas_key_grab_free(gr->object, gr->keyname,
|
||||
gr->modifiers, gr->not_modifiers);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1339,10 +1347,10 @@ evas_event_feed_key_up(Evas *e, const char *keyname, const char *key, const char
|
|||
if ((e->focused) && (!exclusive))
|
||||
{
|
||||
if (e->events_frozen <= 0)
|
||||
evas_object_event_callback_call(e->focused, EVAS_CALLBACK_KEY_UP, &ev);
|
||||
evas_object_event_callback_call(e->focused, EVAS_CALLBACK_KEY_UP,
|
||||
&ev);
|
||||
}
|
||||
_evas_post_event_callback_call(e);
|
||||
}
|
||||
_evas_unwalk(e);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue