frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XQuartz: Cleaned up keymap setting for easier maintenance 

(cherry picked from commit b9dfed9e88389cbd29406a20d38ee4297638649b)
This commit is contained in:
Jeremy Huddleston 2009-09-28 17:05:29 -07:00
parent f3223c71cf
commit f11a356bce
1 changed files with 57 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
hw/xquartz/quartzKeyboard.c
View File

@ -279,34 +279,6 @@ static void DarwinBuildModifierMaps(darwinKeyboardInfo *info) {
} }
} }
/*
* DarwinLoadKeyboardMapping
* Load the keyboard map from a file or system and convert
* it to an equivalent X keyboard map and modifier map.
*/
static void DarwinLoadKeyboardMapping(KeySymsRec *keySyms) {
DarwinBuildModifierMaps(&keyInfo);
keySyms->map = keyInfo.keyMap;
keySyms->mapWidth = GLYPHS_PER_KEY;
keySyms->minKeyCode = MIN_KEYCODE;
keySyms->maxKeyCode = MAX_KEYCODE;
}
/*
* DarwinKeyboardSetDeviceKeyMap
* Load a keymap into the keyboard device
*/
static void DarwinKeyboardSetDeviceKeyMap(KeySymsRec *keySyms, CARD8 *modmap) {
DeviceIntPtr pDev;
for (pDev = inputInfo.devices; pDev; pDev = pDev->next)
if ((pDev->coreEvents || pDev == inputInfo.keyboard) && pDev->key)
XkbApplyMappingChange(pDev, keySyms, keySyms->minKeyCode,
keySyms->maxKeyCode - keySyms->minKeyCode + 1,
modmap, serverClient);
}
/* /*
* DarwinKeyboardInit * DarwinKeyboardInit
* Get the Darwin keyboard map and compute an equivalent * Get the Darwin keyboard map and compute an equivalent
@ -314,64 +286,83 @@ static void DarwinKeyboardSetDeviceKeyMap(KeySymsRec *keySyms, CARD8 *modmap) {
* device structure. * device structure.
*/ */
void DarwinKeyboardInit(DeviceIntPtr pDev) { void DarwinKeyboardInit(DeviceIntPtr pDev) {
KeySymsRec keySyms;
XkbComponentNamesRec names;
CFIndex value;
BOOL ok;
// Open a shared connection to the HID System. // Open a shared connection to the HID System.
// Note that the Event Status Driver is really just a wrapper // Note that the Event Status Driver is really just a wrapper
// for a kIOHIDParamConnectType connection. // for a kIOHIDParamConnectType connection.
assert(darwinParamConnect = NXOpenEventStatus()); assert(darwinParamConnect = NXOpenEventStatus());
bzero(&names, sizeof(names));
/* We need to really have rules... or something... */ /* We need to really have rules... or something... */
//XkbSetRulesDflts("base", "pc105", "us", NULL, NULL); //XkbSetRulesDflts("base", "pc105", "us", NULL, NULL);
InitKeyboardDeviceStruct(pDev, NULL, NULL, DarwinChangeKeyboardControl); InitKeyboardDeviceStruct(pDev, NULL, NULL, DarwinChangeKeyboardControl);
pthread_mutex_lock(&keyInfo_mutex); DarwinKeyboardReloadHandler();
DarwinLoadKeyboardMapping(&keySyms);
DarwinKeyboardSetDeviceKeyMap(&keySyms, keyInfo.modMap);
pthread_mutex_unlock(&keyInfo_mutex);
/* Get our key repeat settings from GlobalPreferences */
(void)CFPreferencesAppSynchronize(CFSTR(".GlobalPreferences"));
value = CFPreferencesGetAppIntegerValue(CFSTR("InitialKeyRepeat"), CFSTR(".GlobalPreferences"), &ok);
if(!ok)
value = 35;
if(value == 300000) { // off
XkbSetRepeatKeys(pDev, -1, AutoRepeatModeOff);
} else {
pDev->key->xkbInfo->desc->ctrls->repeat_delay = value * 15;
value = CFPreferencesGetAppIntegerValue(CFSTR("KeyRepeat"), CFSTR(".GlobalPreferences"), &ok);
if(!ok)
value = 6;
pDev->key->xkbInfo->desc->ctrls->repeat_interval = value * 15;
XkbSetRepeatKeys(pDev, -1, AutoRepeatModeOn);
}
CopyKeyClass(pDev, inputInfo.keyboard); CopyKeyClass(pDev, inputInfo.keyboard);
} }
/* Set the repeat rates based on global preferences and keycodes for modifiers.
* Precondition: Has the keyInfo_mutex lock.
*/
static void DarwinKeyboardSetRepeat(DeviceIntPtr pDev, CFIndex initialKeyRepeatValue, CFIndex keyRepeatValue) {
if(initialKeyRepeatValue == 300000) { // off
XkbSetRepeatKeys(pDev, -1, AutoRepeatModeOff);
} else {
pDev->key->xkbInfo->desc->ctrls->repeat_delay = initialKeyRepeatValue * 15;
pDev->key->xkbInfo->desc->ctrls->repeat_interval = keyRepeatValue * 15;
XkbSetRepeatKeys(pDev, -1, AutoRepeatModeOn);
/* TODO: Turn off key-repeat for modifier keys, on for others */
// Test: Shouldn't this turn off all the key repeats???
//for(i=MIN_KEYCODE; i <= MAX_KEYCODE; i++)
// XkbSetRepeatKeys(pDev, i, AutoRepeatModeOff);
}
}
void DarwinKeyboardReloadHandler(void) { void DarwinKeyboardReloadHandler(void) {
KeySymsRec keySyms; KeySymsRec keySyms;
CFIndex initialKeyRepeatValue, keyRepeatValue;
BOOL ok;
DeviceIntPtr pDev = darwinKeyboard;
DEBUG_LOG("DarwinKeyboardReloadHandler\n"); DEBUG_LOG("DarwinKeyboardReloadHandler\n");
// if (pDev->key) {
// if (pDev->key->curKeySyms.map) xfree(pDev->key->curKeySyms.map);
// xfree(pDev->key);
// }
/* Get our key repeat settings from GlobalPreferences */
(void)CFPreferencesAppSynchronize(CFSTR(".GlobalPreferences"));
pthread_mutex_lock(&keyInfo_mutex); initialKeyRepeatValue = CFPreferencesGetAppIntegerValue(CFSTR("InitialKeyRepeat"), CFSTR(".GlobalPreferences"), &ok);
DarwinLoadKeyboardMapping(&keySyms); if(!ok)
DarwinKeyboardSetDeviceKeyMap(&keySyms, keyInfo.modMap); initialKeyRepeatValue = 35;
pthread_mutex_unlock(&keyInfo_mutex);
keyRepeatValue = CFPreferencesGetAppIntegerValue(CFSTR("KeyRepeat"), CFSTR(".GlobalPreferences"), &ok);
if(!ok)
keyRepeatValue = 6;
pthread_mutex_lock(&keyInfo_mutex); {
/* Initialize our keySyms */
DarwinBuildModifierMaps(&keyInfo);
keySyms.map = keyInfo.keyMap;
keySyms.mapWidth = GLYPHS_PER_KEY;
keySyms.minKeyCode = MIN_KEYCODE;
keySyms.maxKeyCode = MAX_KEYCODE;
/* Apply the mappings to darwinKeyboard */
XkbApplyMappingChange(darwinKeyboard, &keySyms, keySyms.minKeyCode,
keySyms.maxKeyCode - keySyms.minKeyCode + 1,
keyInfo.modMap, serverClient);
DarwinKeyboardSetRepeat(darwinKeyboard, initialKeyRepeatValue, keyRepeatValue);
/* Apply the mappings to the core keyboard */
for (pDev = inputInfo.devices; pDev; pDev = pDev->next) {
if ((pDev->coreEvents || pDev == inputInfo.keyboard) && pDev->key) {
XkbApplyMappingChange(pDev, &keySyms, keySyms.minKeyCode,
keySyms.maxKeyCode - keySyms.minKeyCode + 1,
keyInfo.modMap, serverClient);
DarwinKeyboardSetRepeat(pDev, initialKeyRepeatValue, keyRepeatValue);
}
}
} pthread_mutex_unlock(&keyInfo_mutex);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------