isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-21 07:24:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

state: make null source state encounterd in json treated as wildcard

Browse Source 
To be properly useful the state machine needs to be able to specify the
default transitions to a target state with no specified source state.
This commit is contained in:
Øyvind Kolås 2010-06-14 15:45:07 +01:00
parent 66de8656e9
commit d5c93f6d55
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
clutter/clutter-state.c
View File

@ -1680,7 +1680,26 @@ parse_state_transition (JsonArray *array,
} }
source_name = json_object_get_string_member (object, "source"); source_name = json_object_get_string_member (object, "source");
source_state = clutter_state_get_state (clos->state, source_name, FALSE); if (source_name)
{
source_name = g_intern_string (source_name);
source_state = g_hash_table_lookup (clos->state->priv->states,
source_name);
if (source_state == NULL)
{
source_state = state_new (clos->state, source_name);
g_hash_table_insert (clos->state->priv->states,
(gpointer) source_name, source_state);
}
}
else
{
/* the parsed transition is to be the default transition to
* the specified target state if no other more specific transition
* exist with both source_name and target_name specified.
*/
source_state = NULL;
}
target_name = json_object_get_string_member (object, "target"); target_name = json_object_get_string_member (object, "target");
target_state = clutter_state_get_state (clos->state, target_name, TRUE); target_state = clutter_state_get_state (clos->state, target_name, TRUE);