andreacavalli
/
xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

XQuartz: Use an empty xkb keymap by default 

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 5172253bae)
This commit is contained in:
Jeremy Huddleston 2010-02-10 15:52:14 -08:00
parent 5b4fabb910
commit 31292a7c77
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xquartz/darwin.c
View File

@ -45,6 +45,7 @@
#include "site.h"
#include "globals.h"
#include "dix.h"
#include "xkbsrv.h"
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
@ -463,6 +464,11 @@ int DarwinParseModifierList(const char *constmodifiers, int separatelr)
*/
void InitInput( int argc, char **argv )
{
XkbRMLVOSet rmlvo = { .rules = "base", .model = "empty", .layout = "empty",
.variant = NULL, .options = NULL };
/* We need to really have rules... or something... */
XkbSetRulesDflts(&rmlvo);
darwinKeyboard = AddInputDevice(serverClient, DarwinKeybdProc, TRUE);
RegisterKeyboardDevice( darwinKeyboard );
darwinKeyboard->name = strdup("keyboard");

16
hw/xquartz/quartzKeyboard.c
View File

@ -301,9 +301,6 @@ void DarwinKeyboardInit(DeviceIntPtr pDev) {
// for a kIOHIDParamConnectType connection.
assert(darwinParamConnect = NXOpenEventStatus());
/* We need to really have rules... or something... */
//XkbSetRulesDflts("base", "pc105", "us", NULL, NULL);
InitKeyboardDeviceStruct(pDev, NULL, DarwinKeyboardBell, DarwinChangeKeyboardControl);
DarwinKeyboardReloadHandler();
@ -775,12 +772,9 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
#endif
}
// There seems to be an issue with this in 1.5+, shift-space is not
// producing space, it's sending NoSymbol... ?
//if (k[3] == k[2]) k[3] = NoSymbol;
//if (k[1] == k[0]) k[1] = NoSymbol;
//if (k[0] == k[2] && k[1] == k[3]) k[2] = k[3] = NoSymbol;
//if (k[3] == k[0] && k[2] == k[1] && k[2] == NoSymbol) k[3] = NoSymbol;
if (k[3] == k[2]) k[3] = NoSymbol;
if (k[1] == k[0]) k[1] = NoSymbol;
if (k[0] == k[2] && k[1] == k[3]) k[2] = k[3] = NoSymbol;
}
/* Fix up some things that are normally missing.. */
@ -791,7 +785,7 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
if (k[0] == NoSymbol && k[1] == NoSymbol
&& k[2] == NoSymbol && k[3] == NoSymbol)
k[0] = k[1] = k[2] = k[3] = known_keys[i].keysym;
k[0] = known_keys[i].keysym;
}
}
@ -804,7 +798,7 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
k = info->keyMap + known_numeric_keys[i].keycode * GLYPHS_PER_KEY;
if (k[0] == known_numeric_keys[i].normal)
k[0] = k[1] = k[2] = k[3] = known_numeric_keys[i].keypad;
k[0] = known_numeric_keys[i].keypad;
}
}