StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

state: call xkb_filter_new from the dispatcher 

Pass the new filter as a parameter instead of getting a new one in each
action function, and introducing a failure condition there.

Signed-off-by: Ran Benita <ran234@gmail.com>
master
Ran Benita 2012-09-14 15:33:54 +03:00
parent 04f1b3be07
commit 2c19c9388b
1 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/state.c
View File

@ -184,13 +184,10 @@ xkb_filter_group_set_func(struct xkb_state *state,
static int static int
xkb_filter_group_set_new(struct xkb_state *state, xkb_filter_group_set_new(struct xkb_state *state,
struct xkb_filter *filter,
const struct xkb_key *key, const struct xkb_key *key,
const union xkb_action *action) const union xkb_action *action)
{ {
struct xkb_filter *filter = xkb_filter_new(state);
if (!filter)
return -1;
filter->key = key; filter->key = key;
filter->func = xkb_filter_group_set_func; filter->func = xkb_filter_group_set_func;
filter->action = *action; filter->action = *action;
@ -228,13 +225,10 @@ xkb_filter_group_lock_func(struct xkb_state *state,
static int static int
xkb_filter_group_lock_new(struct xkb_state *state, xkb_filter_group_lock_new(struct xkb_state *state,
struct xkb_filter *filter,
const struct xkb_key *key, const struct xkb_key *key,
const union xkb_action *action) const union xkb_action *action)
{ {
struct xkb_filter *filter = xkb_filter_new(state);
if (!filter)
return -1;
filter->key = key; filter->key = key;
filter->func = xkb_filter_group_lock_func; filter->func = xkb_filter_group_lock_func;
filter->action = *action; filter->action = *action;
@ -276,13 +270,10 @@ xkb_filter_mod_set_func(struct xkb_state *state,
static int static int
xkb_filter_mod_set_new(struct xkb_state *state, xkb_filter_mod_set_new(struct xkb_state *state,
struct xkb_filter *filter,
const struct xkb_key *key, const struct xkb_key *key,
const union xkb_action *action) const union xkb_action *action)
{ {
struct xkb_filter *filter = xkb_filter_new(state);
if (!filter)
return -1;
filter->key = key; filter->key = key;
filter->func = xkb_filter_mod_set_func; filter->func = xkb_filter_mod_set_func;
filter->action = *action; filter->action = *action;
@ -316,13 +307,10 @@ xkb_filter_mod_lock_func(struct xkb_state *state,
static int static int
xkb_filter_mod_lock_new(struct xkb_state *state, xkb_filter_mod_lock_new(struct xkb_state *state,
struct xkb_filter *filter,
const struct xkb_key *key, const struct xkb_key *key,
const union xkb_action *action) const union xkb_action *action)
{ {
struct xkb_filter *filter = xkb_filter_new(state);
if (!filter)
return -1;
filter->key = key; filter->key = key;
filter->func = xkb_filter_mod_lock_func; filter->func = xkb_filter_mod_lock_func;
filter->action = *action; filter->action = *action;
@ -439,13 +427,11 @@ xkb_filter_mod_latch_func(struct xkb_state *state,
static int static int
xkb_filter_mod_latch_new(struct xkb_state *state, xkb_filter_mod_latch_new(struct xkb_state *state,
struct xkb_filter *filter,
const struct xkb_key *key, const struct xkb_key *key,
const union xkb_action *action) const union xkb_action *action)
{ {
enum xkb_key_latch_state latch = LATCH_KEY_DOWN; enum xkb_key_latch_state latch = LATCH_KEY_DOWN;
struct xkb_filter *filter = xkb_filter_new(state);
if (!filter)
return -1;
filter->key = key; filter->key = key;
filter->priv = latch; filter->priv = latch;
@ -458,6 +444,7 @@ xkb_filter_mod_latch_new(struct xkb_state *state,
} }
typedef int (*filter_action_new_func_t)(struct xkb_state *state, typedef int (*filter_action_new_func_t)(struct xkb_state *state,
struct xkb_filter *filter,
const struct xkb_key *key, const struct xkb_key *key,
const union xkb_action *action); const union xkb_action *action);
@ -496,8 +483,15 @@ xkb_filter_apply_all(struct xkb_state *state,
return; return;
act = xkb_key_get_action(state, key); act = xkb_key_get_action(state, key);
if (filter_action_new_funcs[act->type]) if (filter_action_new_funcs[act->type]) {
send = filter_action_new_funcs[act->type](state, key, act); filter = xkb_filter_new(state);
if (!filter)
goto err;
send = filter_action_new_funcs[act->type](state, filter, key, act);
}
err:
return;
} }
XKB_EXPORT struct xkb_state * XKB_EXPORT struct xkb_state *