XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

XKB: Sanitise vmods in actions

Browse Source 
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>
This commit is contained in:
Daniel Stone
2008-04-25 19:47:16 +03:00
parent 4f3078df2a
commit 61c508fa78
5 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/xkbstr.h
View File

@@ -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 {