sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

Allow only synthetic events with keyval 0

Browse source 
We allow KeyEvents with a key symbol of '0' to fall through only
if they are marked as synthetic. Otherwise we discard them without
mercy.

Synthetic events are useful to test ClutterText behaviour; in fact,
we do use them inside the test suite exactly for that reason.
This commit is contained in:
Emmanuele Bassi 2008-12-11 12:24:45 +00:00
parent 77b3b9d5f4
commit 786bc4d4d5
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
clutter/clutter-text.c
View file

@ -920,20 +920,36 @@ clutter_text_key_press (ClutterActor *actor,
pool = clutter_binding_pool_find (G_OBJECT_TYPE_NAME (actor)); pool = clutter_binding_pool_find (G_OBJECT_TYPE_NAME (actor));
g_assert (pool != NULL); g_assert (pool != NULL);
res = clutter_binding_pool_activate (pool, keyval, /* we allow passing synthetic events that only contain
event->modifier_state, * the Unicode value and not the key symbol
G_OBJECT (actor)); */
if (keyval == 0 && (event->flags & CLUTTER_EVENT_FLAG_SYNTHETIC))
res = FALSE;
else
res = clutter_binding_pool_activate (pool, keyval,
event->modifier_state,
G_OBJECT (actor));
/* if the key binding has handled the event we bail out
* as fast as we can; otherwise, we try to insert the
* Unicode character inside the key event into the text
* actor
*/
if (res) if (res)
return TRUE; return TRUE;
else else
{ {
gunichar key_unichar = clutter_key_event_unicode (event); gunichar key_unichar = clutter_key_event_unicode (event);
if (key_unichar == '\r') /* return is reported as CR we want LF */ /* return is reported as CR, but we want LF */
if (key_unichar == '\r')
key_unichar = '\n'; key_unichar = '\n';
if (g_unichar_validate (key_unichar)) if (g_unichar_validate (key_unichar))
{ {
/* truncate the eventual selection so that the
* Unicode character can replace it
*/
clutter_text_truncate_selection (self); clutter_text_truncate_selection (self);
clutter_text_insert_unichar (self, key_unichar); clutter_text_insert_unichar (self, key_unichar);