diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2008-04-25 19:47:16 +0300 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2009-01-22 15:08:57 +1100 |
| commit | 61c508fa78aa08ea2666fde950fbafad95d65056 (patch) | |
| tree | 0a63921127f1ce11c6842d3497c12f3ca4a4953c /include | |
| parent | 4f3078df2acf07364a17f738bc5c32f9a5962723 (diff) | |
XKB: Sanitise vmods in actions
Turn vmods from two unsigned chars into one int.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/xkbstr.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/include/xkbstr.h b/include/xkbstr.h index 4afe010d2..c1752a30c 100644 --- a/include/xkbstr.h +++ b/include/xkbstr.h @@ -123,14 +123,8 @@ typedef struct _XkbModAction { unsigned char flags; unsigned char mask; unsigned char real_mods; - /* FIXME: Make this an int. */ - unsigned char vmods1; - unsigned char vmods2; + unsigned int vmods; } XkbModAction; -#define XkbModActionVMods(a) ((short) (((a)->vmods1 << 8) | (a)->vmods2)) -#define XkbSetModActionVMods(a,v) \ - ((a)->vmods1 = (((v) >> 8) & 0xff), \ - (a)->vmods2 = (v) & 0xff) typedef struct _XkbGroupAction { unsigned char type; @@ -149,8 +143,7 @@ typedef struct _XkbISOAction { /* FIXME: Make this an int. */ char group_XXX; unsigned char affect; - unsigned char vmods1; - unsigned char vmods2; + unsigned int vmods; } XkbISOAction; typedef struct _XkbPtrAction { |