mirror of
https://github.com/reactos/reactos.git
synced 2026-11-16 04:17:39 +08:00
[NTUSER] Pass keyboard repeat delay and rate to keyboard drivers
Do it once a new keyboard is detected, or when SPI changed.
This commit is contained in:
@@ -189,7 +189,7 @@ OpenInputDevice(
|
||||
ERR("ZwDeviceIoControlFile('%wZ', IOCTL_KEYBOARD_QUERY_ATTRIBUTES) failed with status 0x%08x\n", &DeviceInfo->DeviceName, Status);
|
||||
}
|
||||
UserInitKeyboard(DeviceInfo->Handle);
|
||||
InterlockedOr(&gKeyboardFlags, KBD_UPDATE_LEDS);
|
||||
InterlockedOr(&gKeyboardFlags, KBD_UPDATE_LEDS | KBD_UPDATE_TYPEMATIC);
|
||||
KeSetEvent(gKeyboardUpdatesEvent, IO_NO_INCREMENT, FALSE);
|
||||
}
|
||||
else if (DeviceInfo->DeviceType == RIM_TYPEMOUSE)
|
||||
@@ -426,6 +426,7 @@ ProcessKeyboardUpdates(
|
||||
VOID)
|
||||
{
|
||||
PINPUT_DEVICE_INFO DeviceInfo;
|
||||
KEYBOARD_TYPEMATIC_PARAMETERS GlobalTypematic, LocalTypematic;
|
||||
IO_STATUS_BLOCK Iosb;
|
||||
DWORD Updates;
|
||||
|
||||
@@ -433,6 +434,11 @@ ProcessKeyboardUpdates(
|
||||
if (!Updates)
|
||||
return;
|
||||
|
||||
RtlZeroMemory(&LocalTypematic, sizeof(LocalTypematic));
|
||||
RtlZeroMemory(&GlobalTypematic, sizeof(GlobalTypematic));
|
||||
GlobalTypematic.Rate = gspv.dwKbdSpeed;
|
||||
GlobalTypematic.Delay = gspv.iKbdDelay;
|
||||
|
||||
AcquireDeviceInfoListMutex();
|
||||
for (DeviceInfo = gpInputDeviceInfo; DeviceInfo; DeviceInfo = DeviceInfo->pNextDeviceInfo)
|
||||
{
|
||||
@@ -451,6 +457,26 @@ ProcessKeyboardUpdates(
|
||||
&gIndicators, sizeof(gIndicators),
|
||||
NULL, 0);
|
||||
}
|
||||
|
||||
if (Updates & KBD_UPDATE_TYPEMATIC)
|
||||
{
|
||||
/* Update typematic */
|
||||
#define CLAMP(v, lo, hi) ((v) < (lo) ? (lo) : (v) > (hi) ? (hi) : (v))
|
||||
LocalTypematic.Rate = CLAMP(GlobalTypematic.Rate,
|
||||
DeviceInfo->Keyboard.Attributes.KeyRepeatMinimum.Rate,
|
||||
DeviceInfo->Keyboard.Attributes.KeyRepeatMaximum.Rate);
|
||||
LocalTypematic.Delay = CLAMP(GlobalTypematic.Delay,
|
||||
DeviceInfo->Keyboard.Attributes.KeyRepeatMinimum.Delay,
|
||||
DeviceInfo->Keyboard.Attributes.KeyRepeatMaximum.Delay);
|
||||
ZwDeviceIoControlFile(DeviceInfo->Handle,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
&Iosb,
|
||||
IOCTL_KEYBOARD_SET_TYPEMATIC,
|
||||
&LocalTypematic, sizeof(LocalTypematic),
|
||||
NULL, 0);
|
||||
}
|
||||
}
|
||||
ReleaseDeviceInfoListMutex();
|
||||
}
|
||||
|
||||
@@ -147,6 +147,7 @@ VOID FASTCALL IntFreeImeHotKeys(VOID);
|
||||
extern DWORD gSystemFS;
|
||||
extern UINT gSystemCPCharSet;
|
||||
#define KBD_UPDATE_LEDS 0x1
|
||||
#define KBD_UPDATE_TYPEMATIC 0x2
|
||||
extern LONG gKeyboardFlags;
|
||||
extern PKEVENT gKeyboardUpdatesEvent;
|
||||
extern PTHREADINFO ptiRawInput;
|
||||
|
||||
@@ -869,7 +869,11 @@ SpiGetSet(UINT uiAction, UINT uiParam, PVOID pvParam, FLONG fl)
|
||||
return SpiGetInt(pvParam, &gspv.dwKbdSpeed, fl);
|
||||
|
||||
case SPI_SETKEYBOARDSPEED:
|
||||
return SpiSetInt(&gspv.dwKbdSpeed, uiParam, KEY_KBD, VAL_KBDSPD, fl);
|
||||
if (!SpiSetInt(&gspv.dwKbdSpeed, uiParam, KEY_KBD, VAL_KBDSPD, fl))
|
||||
return 0;
|
||||
InterlockedOr(&gKeyboardFlags, KBD_UPDATE_TYPEMATIC);
|
||||
KeSetEvent(gKeyboardUpdatesEvent, IO_NO_INCREMENT, FALSE);
|
||||
return (UINT_PTR)KEY_KBD;
|
||||
|
||||
case SPI_LANGDRIVER:
|
||||
ERR("SPI_LANGDRIVER is unimplemented\n");
|
||||
@@ -908,7 +912,11 @@ SpiGetSet(UINT uiAction, UINT uiParam, PVOID pvParam, FLONG fl)
|
||||
return SpiGetInt(pvParam, &gspv.iKbdDelay, fl);
|
||||
|
||||
case SPI_SETKEYBOARDDELAY:
|
||||
return SpiSetInt(&gspv.iKbdDelay, uiParam, KEY_KBD, VAL_KBDDELAY, fl);
|
||||
if (!SpiSetInt(&gspv.iKbdDelay, uiParam, KEY_KBD, VAL_KBDDELAY, fl))
|
||||
return 0;
|
||||
InterlockedOr(&gKeyboardFlags, KBD_UPDATE_TYPEMATIC);
|
||||
KeSetEvent(gKeyboardUpdatesEvent, IO_NO_INCREMENT, FALSE);
|
||||
return (UINT_PTR)KEY_KBD;
|
||||
|
||||
case SPI_ICONHORIZONTALSPACING:
|
||||
if (pvParam)
|
||||
|
||||
Reference in New Issue
Block a user