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/xquartz | |
| 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/xquartz')
| -rw-r--r-- | hw/xquartz/quartzKeyboard.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c index 823c2e67c..2b8cb13f8 100644 --- a/hw/xquartz/quartzKeyboard.c +++ b/hw/xquartz/quartzKeyboard.c @@ -317,7 +317,6 @@ void DarwinKeyboardInit(DeviceIntPtr pDev) { XkbComponentNamesRec names; CFIndex value; BOOL ok; - XkbRMLVOSet rmlvo; // Open a shared connection to the HID System. // Note that the Event Status Driver is really just a wrapper @@ -328,8 +327,7 @@ void DarwinKeyboardInit(DeviceIntPtr pDev) { bzero(&names, sizeof(names)); - XkbGetRulesDflts(&rmlvo); - InitKeyboardDeviceStruct(pDev, &rmlvo, QuartzBell, + InitKeyboardDeviceStruct(pDev, NULL, QuartzBell, DarwinChangeKeyboardControl); /* Get our key repeat settings from GlobalPreferences */ |