Module Name: src
Committed By: jakllsch
Date: Mon Jun 20 00:05:58 UTC 2016
Modified Files:
src/sys/dev/adb: adb_keymap.h
Log Message:
Add us.dvorak keymap variant for ADB keyboards. Addresses PR 51255.
Tested by sevan@.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/adb/adb_keymap.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/adb/adb_keymap.h
diff -u src/sys/dev/adb/adb_keymap.h:1.5 src/sys/dev/adb/adb_keymap.h:1.6
--- src/sys/dev/adb/adb_keymap.h:1.5 Sat Nov 8 16:52:35 2014
+++ src/sys/dev/adb/adb_keymap.h Mon Jun 20 00:05:58 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: adb_keymap.h,v 1.5 2014/11/08 16:52:35 macallan Exp $ */
+/* $NetBSD: adb_keymap.h,v 1.6 2016/06/20 00:05:58 jakllsch Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -154,6 +154,50 @@ static const keysym_t akbd_keydesc_us[]
KC(127), KS_Cmd_Debugger,
};
+static const keysym_t akbd_keydesc_us_dvorak[] = {
+/* pos command normal shifted */
+ KC(0), KS_a,
+ KC(1), KS_o,
+ KC(2), KS_e,
+ KC(3), KS_u,
+ KC(4), KS_d,
+ KC(5), KS_i,
+ KC(6), KS_semicolon, KS_colon,
+ KC(7), KS_q,
+ KC(8), KS_j,
+ KC(9), KS_k,
+
+ KC(11), KS_x,
+ KC(12), KS_apostrophe, KS_quotedbl,
+ KC(13), KS_comma, KS_less,
+ KC(14), KS_period, KS_greater,
+ KC(15), KS_p,
+ KC(16), KS_f,
+ KC(17), KS_y,
+
+ KC(24), KS_bracketright, KS_braceright,
+ KC(27), KS_bracketleft, KS_braceleft,
+
+ KC(30), KS_equal, KS_plus,
+ KC(31), KS_r,
+ KC(32), KS_g,
+ KC(33), KS_slash, KS_question,
+ KC(34), KS_c,
+ KC(35), KS_l,
+
+ KC(37), KS_n,
+ KC(38), KS_h,
+ KC(39), KS_minus, KS_underscore,
+ KC(40), KS_t,
+ KC(41), KS_s,
+
+ KC(43), KS_w,
+ KC(44), KS_z,
+ KC(45), KS_b,
+ KC(46), KS_m,
+ KC(47), KS_v,
+};
+
static const keysym_t akbd_keydesc_fr[] = {
/* pos normal shifted altgr shift-altgr */
KC(0), KS_q,
@@ -406,6 +450,7 @@ static const keysym_t akbd_keydesc_pt[]
static const struct wscons_keydesc akbd_keydesctab[] = {
KBD_MAP(KB_US, 0, akbd_keydesc_us),
+ KBD_MAP(KB_US | KB_DVORAK, KB_US, akbd_keydesc_us_dvorak),
KBD_MAP(KB_FR, KB_US, akbd_keydesc_fr),
KBD_MAP(KB_JP, KB_US, akbd_keydesc_jp),
KBD_MAP(KB_FR | KB_NODEAD, KB_FR, akbd_keydesc_fr_nodead),
