diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2008-04-25 19:54:29 +0300 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2009-01-22 15:08:57 +1100 |
| commit | feb757f384382c7782ceac55f99d54c7caadbd9d (patch) | |
| tree | 550c2383f9e2dd668d05495f20aea02b2e1ecaf8 /xkb/xkbtext.c | |
| parent | b5f49382fe48f0a762d9a15fb10a7d7e1183fc8d (diff) | |
XKB: Sanitise vmods for redirected keys
Turn two unsigned chars into one unsigned int for both vmods and the
vmod mask. As a bonus, remove broken unused accessor macro for setting
the vmods.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'xkb/xkbtext.c')
| -rw-r--r-- | xkb/xkbtext.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xkb/xkbtext.c b/xkb/xkbtext.c index e91ab2e97..b9f16a8cc 100644 --- a/xkb/xkbtext.c +++ b/xkb/xkbtext.c @@ -1006,8 +1006,8 @@ unsigned vmods,vmods_mask; act= &action->redirect; kc= act->new_key; - vmods= XkbSARedirectVMods(act); - vmods_mask= XkbSARedirectVModsMask(act); + vmods= act->vmods; + vmods_mask= act->vmods_mask; if (xkb && xkb->names && xkb->names->keys && (kc<=xkb->max_key_code) && (xkb->names->keys[kc].name[0]!='\0')) { char *kn; |