Swap Compose and Kana values to conform to USB HID spec

Should fix https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/204

Current state conflicts with XKB which defines them correctly.

NUM and CAPS are still incorrectly swapped, but it's equally wrong on
XKB's side and everywhere else, so it's just cosmetic and a breaking
change just to satisfy USB HID ordering is not worth it, since the keys
work fine this way anyway.

Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-input-evdev/-/merge_requests/8>
This commit is contained in:
Martin Rys
2024-09-03 14:35:26 +02:00
committed by Peter Hutterer
parent 917c2ea204
commit b9327e6b28

View File

@@ -75,8 +75,8 @@
#define CAPSFLAG 1
#define NUMFLAG 2
#define SCROLLFLAG 4
#define MODEFLAG 8
#define COMPOSEFLAG 16
#define COMPOSEFLAG 8
#define MODEFLAG 16
#ifndef ABS_MT_SLOT
#define ABS_MT_SLOT 0x2f
@@ -1117,8 +1117,8 @@ EvdevKbdCtrl(DeviceIntPtr device, KeybdCtrl *ctrl)
{ CAPSFLAG, LED_CAPSL },
{ NUMFLAG, LED_NUML },
{ SCROLLFLAG, LED_SCROLLL },
{ MODEFLAG, LED_KANA },
{ COMPOSEFLAG, LED_COMPOSE }
{ COMPOSEFLAG, LED_COMPOSE },
{ MODEFLAG, LED_KANA }
};
InputInfoPtr pInfo;