Add swapctrlcaps to Norwegian map.
Tested on laptop with and without usb keyboard attached on boot,
with no.swapctrlcaps in /etc/kbdtype.
Don't need remapping for X11 in .xmodmaprc anymore.

Index: sys/dev/pckbc/wskbdmap_mfii.c
===================================================================
RCS file: /cvs/src/sys/dev/pckbc/wskbdmap_mfii.c,v
retrieving revision 1.42
diff -u -r1.42 wskbdmap_mfii.c
--- sys/dev/pckbc/wskbdmap_mfii.c       5 Apr 2011 19:12:13 -0000       1.42
+++ sys/dev/pckbc/wskbdmap_mfii.c       6 May 2011 09:17:30 -0000
@@ -1080,6 +1080,7 @@
        KBD_MAP(KB_SV | KB_NODEAD,      KB_SV,  pckbd_keydesc_sv_nodead),
        KBD_MAP(KB_NO,                  KB_DK,  pckbd_keydesc_no),
        KBD_MAP(KB_NO | KB_NODEAD,      KB_NO,  pckbd_keydesc_no_nodead),
+       KBD_MAP(KB_NO | KB_SWAPCTRLCAPS, KB_NO, pckbd_keydesc_swapctrlcaps),
        KBD_MAP(KB_US | KB_DECLK,       KB_US,  pckbd_keydesc_us_declk),
        KBD_MAP(KB_US | KB_DVORAK,      KB_US,  pckbd_keydesc_us_dvorak),
        KBD_MAP(KB_US | KB_SWAPCTRLCAPS, KB_US, pckbd_keydesc_swapctrlcaps),
Index: sys/dev/usb/ukbdmap.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/ukbdmap.c,v
retrieving revision 1.38
diff -u -r1.38 ukbdmap.c
--- sys/dev/usb/ukbdmap.c       5 Apr 2011 19:12:34 -0000       1.38
+++ sys/dev/usb/ukbdmap.c       6 May 2011 09:17:31 -0000
@@ -1142,6 +1142,7 @@
        KBD_MAP(KB_SV | KB_NODEAD,      KB_SV,  ukbd_keydesc_sv_nodead),
        KBD_MAP(KB_NO,                  KB_DK,  ukbd_keydesc_no),
        KBD_MAP(KB_NO | KB_NODEAD,      KB_NO,  ukbd_keydesc_no_nodead),
+       KBD_MAP(KB_NO | KB_SWAPCTRLCAPS, KB_NO, ukbd_keydesc_swapctrlcaps),
        KBD_MAP(KB_US | KB_DVORAK,      KB_US,  ukbd_keydesc_us_dvorak),
        KBD_MAP(KB_US | KB_SWAPCTRLCAPS, KB_US, ukbd_keydesc_swapctrlcaps),
        KBD_MAP(KB_US | KB_IOPENER,     KB_US,  ukbd_keydesc_iopener),

--
    _
_  //
\\//   Eivind Evensen
 \/

Reply via email to