xserver: Branch 'xorg-server-1.2-apple'
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Wed Nov 28 23:03:27 PST 2007
hw/darwin/darwinKeyboard.c | 126 ---------------------------------------------
hw/darwin/darwinKeyboard.h | 18 ------
2 files changed, 144 deletions(-)
New commits:
commit 1b35aa5c00c326f6b13134cd18272d5148b330ee
Author: Jeremy Huddleston <jeremy at yuffie.local>
Date: Wed Nov 28 23:00:59 2007 -0800
Darwin: Removed the NSDefaults keymapping
most users are able to use .Xmodmap for their issues... we should probably eventually do something like this to support MM and non-apple keyboards...
diff --git a/hw/darwin/darwinKeyboard.c b/hw/darwin/darwinKeyboard.c
index 237ea0c..e4de71a 100644
--- a/hw/darwin/darwinKeyboard.c
+++ b/hw/darwin/darwinKeyboard.c
@@ -212,9 +212,6 @@ static void DarwinChangeKeyboardControl( DeviceIntPtr device, KeybdCtrl *ctrl )
}
darwinKeyboardInfo keyInfo;
-KeySymRemapList *keySymRemapList = NULL;
-ModMaskRemapList *modMaskRemapList = NULL;
-
static FILE *fref = NULL;
static char *inBuffer = NULL;
@@ -461,8 +458,6 @@ Bool DarwinParseNXKeyMapping(
}
}
- DEBUG_LOG("DarwinParseNXKeyMapping: Parsing keymap file: %s.\n", darwinKeymapFile);
-
if (!haveKeymap) {
// get the Darwin keyboard map
keyMap.size = NXKeyMappingLength( darwinParamConnect );
@@ -637,108 +632,6 @@ Bool DarwinParseNXKeyMapping(
return TRUE;
}
-/* Return the modifier mask for the given string. If no match, return -1 */
-static CARD8 strToXModMask(const char *str) {
- if(!strcmp(str, "shift")) {
- return ShiftMask;
- } else if(!strcmp(str, "lock")) {
- return LockMask;
- } else if(!strcmp(str, "control")) {
- return ControlMask;
- } else if(!strcmp(str, "mod1")) {
- return Mod1Mask;
- } else if(!strcmp(str, "mod2")) {
- return Mod2Mask;
- } else if(!strcmp(str, "mod3")) {
- return Mod3Mask;
- } else if(!strcmp(str, "mod4")) {
- return Mod4Mask;
- } else if(!strcmp(str, "mod5")) {
- return Mod5Mask;
- }
- DEBUG_LOG("Invalid str: %s\n", str);
- return -1;
-}
-
-/* Return the KeySym for the given string. If no match, return -1 */
-static KeySym strToXKeySym(const char *str) {
- if(!strcmp(str, "Shift_L")) {
- return XK_Shift_L;
- } else if(!strcmp(str, "Shift_R")) {
- return XK_Shift_R;
- } else if(!strcmp(str, "Caps_Lock")) {
- return XK_Caps_Lock;
- } else if(!strcmp(str, "Control_L")) {
- return XK_Control_L;
- } else if(!strcmp(str, "Control_R")) {
- return XK_Control_R;
- } else if(!strcmp(str, "Alt_L")) {
- return XK_Alt_L;
- } else if(!strcmp(str, "Alt_R")) {
- return XK_Alt_R;
- } else if(!strcmp(str, "Meta_L")) {
- return XK_Meta_L;
- } else if(!strcmp(str, "Meta_R")) {
- return XK_Meta_R;
- } else if(!strcmp(str, "Mode_switch")) {
- return XK_Mode_switch;
- } else if(!strcmp(str, "Multi_key")) {
- return XK_Multi_key;
- }
- DEBUG_LOG("Invalid str: %s\n", str);
- return -1;
-}
-
-Bool DarwinKeyboardModMaskRemapStr(const char *keyS, const char *mask) {
- KeySym key;
- KeySym modMask;
- ModMaskRemapList *m;
-
- key = strToXKeySym(keyS);
- modMask = strToXModMask(mask);
-
- if(key == -1 || modMask == -1)
- return 0;
-
- m = (ModMaskRemapList *)xalloc(sizeof(ModMaskRemapList));
- if(!m) {
- DEBUG_LOG("Error allocating memory.\n");
- return 0;
- }
-
- m->key = key;
- m->modMask = modMask;
- m->next = modMaskRemapList;
- modMaskRemapList = m;
-
- return 1;
-}
-
-Bool DarwinKeyboardKeySymRemapStr(const char *fromS, const char *toS) {
- KeySym from;
- KeySym to;
- KeySymRemapList *m;
-
- from = strToXKeySym(fromS);
- to = strToXKeySym(toS);
-
- if(from == -1 || to == -1)
- return 0;
-
- m = (KeySymRemapList *)xalloc(sizeof(KeySymRemapList));
- if(!m) {
- DEBUG_LOG("Error allocating memory.\n");
- return 0;
- }
-
- m->from = from;
- m->to = to;
- m->next = keySymRemapList;
- keySymRemapList = m;
-
- return 1;
-}
-
/*
* DarwinBuildModifierMaps
* Use the keyMap field of keyboard info structure to populate
@@ -825,12 +718,6 @@ DarwinBuildModifierMaps(darwinKeyboardInfo *info) {
info->modMap[MIN_KEYCODE + i] = Mod3Mask;
break;
}
-
- /* Use modMaskRemapList to overwrite default ModMasks */
- ModMaskRemapList *m;
- for(m = modMaskRemapList; m; m = m->next)
- if(*k == m->key)
- info->modMap[MIN_KEYCODE + i] = m->modMask;
}
}
@@ -858,19 +745,6 @@ DarwinLoadKeyboardMapping(KeySymsRec *keySyms)
}
}
- /* Use keySymRemapList to overwrite default key mappings.
- * We do this because IOKit doesn't know about Mode_shift, etc and we
- * want to allow the user to set thisa key to this. We could use
- * custom keymap files, but this is easier for the user to work with.
- */
- for (i = 0; i < NUM_KEYCODES; i++) {
- k = keyInfo.keyMap + i * GLYPHS_PER_KEY;
- KeySymRemapList *m;
- for(m = keySymRemapList; m; m = m->next)
- if(*k == m->from)
- *k = m->to;
- }
-
DarwinBuildModifierMaps(&keyInfo);
#ifdef DUMP_DARWIN_KEYMAP
diff --git a/hw/darwin/darwinKeyboard.h b/hw/darwin/darwinKeyboard.h
index 9237702..368aee9 100644
--- a/hw/darwin/darwinKeyboard.h
+++ b/hw/darwin/darwinKeyboard.h
@@ -44,24 +44,6 @@ typedef struct darwinKeyboardInfo_struct {
unsigned char modifierKeycodes[32][2];
} darwinKeyboardInfo;
-typedef struct KeySymRemapList_struct {
- KeySym from;
- KeySym to;
- struct KeySymRemapList_struct *next;
-} KeySymRemapList;
-
-typedef struct ModMaskRemapList_struct {
- KeySym key;
- CARD8 modMask;
- struct ModMaskRemapList_struct *next;
-} ModMaskRemapList;
-
-/* Add remappings to our lists.
- * Return true on success.
- */
-Bool DarwinKeyboardKeySymRemapStr(const char *from, const char *to);
-Bool DarwinKeyboardModMaskRemapStr(const char *key, const char *mask);
-
void DarwinKeyboardReload(DeviceIntPtr pDev);
unsigned int DarwinModeSystemKeymapSeed(void);
Bool DarwinModeReadSystemKeymap(darwinKeyboardInfo *info);
More information about the xorg-commit
mailing list