diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-04-14 16:57:29 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-04-17 10:03:40 +1000 |
| commit | b406886bbffadaa52864a99f2a0520999eadc15d (patch) | |
| tree | 815537f8c64b5de361d9232b537f9e62c2f4b865 /hw/xnest/Keyboard.c | |
| parent | 4e4e263bc073bf452f19c932b937c4881ae71f64 (diff) | |
input: allow NULL as XkbRMVLOSet in InitKeyboardDeviceStruct.
Virtually all callers use
XkbGetRulesDefault(&rmlvo);
InitKeyboardDeviceStruct(..., rmlvo);
Let's save them the trouble and accept NULL as a hint to take the
default RMLVO.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Benjamin Close <Benjamin.Close@clearchain.com>
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Diffstat (limited to 'hw/xnest/Keyboard.c')
| -rw-r--r-- | hw/xnest/Keyboard.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c index 8404c8bfa..f94e26079 100644 --- a/hw/xnest/Keyboard.c +++ b/hw/xnest/Keyboard.c @@ -121,7 +121,6 @@ xnestKeyboardProc(DeviceIntPtr pDev, int onoff) int i; XKeyboardState values; XkbDescPtr xkb; - XkbRMLVOSet rmlvo; int op, event, error, major, minor; switch (onoff) @@ -165,13 +164,7 @@ xnestKeyboardProc(DeviceIntPtr pDev, int onoff) } XkbGetControls(xnestDisplay, XkbAllControlsMask, xkb); - rmlvo.rules = XKB_DFLT_RULES; - rmlvo.model = XKB_DFLT_MODEL; - rmlvo.layout = XKB_DFLT_LAYOUT; - rmlvo.variant = XKB_DFLT_VARIANT; - rmlvo.options = XKB_DFLT_OPTIONS; - - InitKeyboardDeviceStruct(pDev, &rmlvo, + InitKeyboardDeviceStruct(pDev, NULL, xnestBell, xnestChangeKeyboardControl); XkbDDXChangeControls(pDev, xkb->ctrls, xkb->ctrls); XkbFreeKeyboard(xkb, 0, False); |