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

XQuartz: Honor system key repeat rate 

(cherry picked from commit 4303c9be39a86f5a21de108f72b90a989435905e)
This commit is contained in:
Jeremy Huddleston 2008-12-31 12:44:43 -08:00
parent 1a69d56afd
commit 3986b683ad
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hw/xquartz/quartzKeyboard.c
View File

@ -323,7 +323,9 @@ static void DarwinKeyboardSetDeviceKeyMap(KeySymsRec *keySyms) {
*/ */
void DarwinKeyboardInit(DeviceIntPtr pDev) { void DarwinKeyboardInit(DeviceIntPtr pDev) {
KeySymsRec keySyms; KeySymsRec keySyms;
XkbComponentNamesRec names; 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
@ -332,7 +334,7 @@ void DarwinKeyboardInit(DeviceIntPtr pDev) {
DarwinLoadKeyboardMapping(&keySyms); DarwinLoadKeyboardMapping(&keySyms);
bzero(&names, sizeof(names)); 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);
@ -342,8 +344,26 @@ void DarwinKeyboardInit(DeviceIntPtr pDev) {
QuartzBell, DarwinChangeKeyboardControl)); QuartzBell, DarwinChangeKeyboardControl));
pthread_mutex_unlock(&keyInfo_mutex); pthread_mutex_unlock(&keyInfo_mutex);
// TODO: What do we do now in 1.6? /* Get our key repeat settings from GlobalPreferences */
//SwitchCoreKeyboard(pDev); (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);
}
// TODO: What do we do now in 1.6?
//SwitchCoreKeyboard(pDev);
DarwinKeyboardSetDeviceKeyMap(&keySyms); DarwinKeyboardSetDeviceKeyMap(&keySyms);
} }