diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2010-04-13 10:04:56 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2010-04-13 10:04:56 -0700 |
| commit | 3ab6d90bb56238f84057d6e87267a10d750f2894 (patch) | |
| tree | 20437eb2d92899e17a1acb84c6e35e9429d62506 | |
| parent | 16706e8da0342a21835ffb263fa9d23653fba308 (diff) | |
XQuartz: Use an empty xkb keymap by default
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 5172253bae3b9867118c6717434e73c173acd5e9)
Conflicts:
hw/xquartz/darwin.c
hw/xquartz/quartzKeyboard.c
| -rw-r--r-- | hw/xquartz/darwin.c | 3 | ||||
| -rw-r--r-- | hw/xquartz/quartzKeyboard.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c index a3426c406..9d21ef026 100644 --- a/hw/xquartz/darwin.c +++ b/hw/xquartz/darwin.c @@ -45,6 +45,7 @@ #include "site.h" #include "globals.h" #include "dix.h" +#include "xkbsrv.h" #ifdef XINPUT # include <X11/extensions/XI.h> @@ -428,6 +429,8 @@ int DarwinParseModifierList(const char *constmodifiers, int separatelr) */ void InitInput( int argc, char **argv ) { + XkbSetRulesDflts("base", "empty", "empty", NULL, NULL); + darwinKeyboard = AddInputDevice(DarwinKeybdProc, TRUE); RegisterKeyboardDevice( darwinKeyboard ); darwinKeyboard->name = strdup("keyboard"); diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c index fad3ffcc1..c89ebf086 100644 --- a/hw/xquartz/quartzKeyboard.c +++ b/hw/xquartz/quartzKeyboard.c @@ -308,9 +308,6 @@ void DarwinKeyboardInit(DeviceIntPtr pDev) { bzero(&names, sizeof(names)); - /* We need to really have rules... or something... */ - //XkbSetRulesDflts("base", "pc105", "us", NULL, NULL); - pthread_mutex_lock(&keyInfo_mutex); /* Initialize our keySyms */ |