I would like to make this change below to fix us.swapctrlcaps mapping on usb keyboards. I noticed on my pinebook (which apparently has an usb keyboard) that with the encoding us.swapctrlcaps, the console switching key combination (Control + Alt + F1...12) is not adjusted to the new location of the Control key. This differs from my pc's keyboard which is still a traditional ps/2 style keyboard. Switching consoles with CapsLock + Alt + F1... gets annoying since it turns CapsLock on all the time. It is also out of sync with X where I have of course also my keyboard modified with swapctrlcaps. # wscons.conf: encoding us.swapctrlcaps Index: hidkbdmap.c =================================================================== RCS file: /cvsroot/src/sys/dev/hid/hidkbdmap.c,v retrieving revision 1.2 diff -u -r1.2 hidkbdmap.c --- hidkbdmap.c 11 Jan 2020 21:43:10 -0000 1.2 +++ hidkbdmap.c 1 Apr 2020 20:39:41 -0000 @@ -279,8 +279,8 @@ Static const keysym_t hidkbd_keydesc_swapctrlcaps[] = { /* pos command normal shifted */ - KC(57), KS_Control_L, - KC(224), KS_Cmd1, KS_Caps_Lock, + KC(57), KS_Cmd1, KS_Control_L, + KC(224), KS_Caps_Lock, }; For comparison, in src/sys/dev/pckbport/wskbdmap_mfii.c the KS_Cmd1 code is also moved to the new Control key, rather than remaining on the original one. static const keysym_t pckbd_keydesc_swapctrlcaps[] = { /* pos command normal shifted */ KC(29), KS_Caps_Lock, KC(58), KS_Cmd1, KS_Control_L, }; Objections to committing this? -Olaf. -- Olaf 'Rhialto' Seibert -- rhialto at falu dot nl ___ Anyone who is capable of getting themselves made President should on \X/ no account be allowed to do the job. --Douglas Adams, "THGTTG"
Attachment:
signature.asc
Description: PGP signature