Mon Aug 31 17:51:56 2020 UTC ()
behave like USB keyboards - KB_US uses ctrl-alt-Fn, KB_APPLE variant uses
Command-Fn


(macallan)
diff -r1.7 -r1.8 src/sys/dev/adb/adb_keymap.h
cvs diff -r1.7 -r1.8 src/sys/dev/adb/adb_keymap.h (expand / switch to unified diff)

--- src/sys/dev/adb/adb_keymap.h 2020/08/29 22:33:53 1.7
+++ src/sys/dev/adb/adb_keymap.h 2020/08/31 17:51:56 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: adb_keymap.h,v 1.7 2020/08/29 22:33:53 macallan Exp $ */ 1/* $NetBSD: adb_keymap.h,v 1.8 2020/08/31 17:51:56 macallan Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 1997 The NetBSD Foundation, Inc. 4 * Copyright (c) 1997 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Juergen Hannken-Illjes. 8 * by Juergen Hannken-Illjes.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -79,31 +79,31 @@ static const keysym_t akbd_keydesc_us[]  @@ -79,31 +79,31 @@ static const keysym_t akbd_keydesc_us[]
79 KC(41), KS_semicolon, KS_colon, 79 KC(41), KS_semicolon, KS_colon,
80 KC(42), KS_backslash, KS_bar, 80 KC(42), KS_backslash, KS_bar,
81 KC(43), KS_comma, KS_less, 81 KC(43), KS_comma, KS_less,
82 KC(44), KS_slash, KS_question, 82 KC(44), KS_slash, KS_question,
83 KC(45), KS_n, 83 KC(45), KS_n,
84 KC(46), KS_m, 84 KC(46), KS_m,
85 KC(47), KS_period, KS_greater, 85 KC(47), KS_period, KS_greater,
86 KC(48), KS_Tab, 86 KC(48), KS_Tab,
87 KC(49), KS_space, 87 KC(49), KS_space,
88 KC(50), KS_grave, KS_asciitilde, 88 KC(50), KS_grave, KS_asciitilde,
89 KC(51), KS_Delete, 89 KC(51), KS_Delete,
90 KC(52), KS_KP_Enter, /* Pretend this is alt-R ? */ 90 KC(52), KS_KP_Enter, /* Pretend this is alt-R ? */
91 KC(53), KS_Escape, 91 KC(53), KS_Escape,
92 KC(54), KS_Control_L, 92 KC(54), KS_Cmd1, KS_Control_L,
93 KC(55), KS_Cmd, KS_Meta_L, /* Command */ 93 KC(55), KS_Meta_L, /* Command */
94 KC(56), KS_Shift_L, 94 KC(56), KS_Shift_L,
95 KC(57), KS_Caps_Lock, 95 KC(57), KS_Caps_Lock,
96 KC(58), KS_Alt_L, /* Option */ 96 KC(58), KS_Cmd2, KS_Alt_L, /* Option */
97 KC(59), KS_Left, 97 KC(59), KS_Left,
98 KC(60), KS_Right, 98 KC(60), KS_Right,
99 KC(61), KS_Cmd_ScrollSlowDown, KS_Down, 99 KC(61), KS_Cmd_ScrollSlowDown, KS_Down,
100 KC(62), KS_Cmd_ScrollSlowUp, KS_Up, 100 KC(62), KS_Cmd_ScrollSlowUp, KS_Up,
101 KC(65), KS_KP_Decimal, 101 KC(65), KS_KP_Decimal,
102 KC(67), KS_KP_Multiply, 102 KC(67), KS_KP_Multiply,
103 KC(69), KS_KP_Add, 103 KC(69), KS_KP_Add,
104 KC(71), KS_Num_Lock, 104 KC(71), KS_Num_Lock,
105 KC(75), KS_KP_Divide, 105 KC(75), KS_KP_Divide,
106 KC(76), KS_KP_Enter, 106 KC(76), KS_KP_Enter,
107 KC(78), KS_KP_Subtract, 107 KC(78), KS_KP_Subtract,
108 108
109 KC(81), KS_KP_Equal, 109 KC(81), KS_KP_Equal,
@@ -144,26 +144,33 @@ static const keysym_t akbd_keydesc_us[]  @@ -144,26 +144,33 @@ static const keysym_t akbd_keydesc_us[]
144 KC(116), KS_Cmd_ScrollFastUp, KS_Prior, 144 KC(116), KS_Cmd_ScrollFastUp, KS_Prior,
145 KC(117), KS_Delete, /* BackSpace */ 145 KC(117), KS_Delete, /* BackSpace */
146 KC(118), KS_Cmd_Screen3, KS_f4, 146 KC(118), KS_Cmd_Screen3, KS_f4,
147 KC(119), KS_End, 147 KC(119), KS_End,
148 KC(120), KS_Cmd_Screen1, KS_f2, 148 KC(120), KS_Cmd_Screen1, KS_f2,
149 KC(121), KS_Cmd_ScrollFastDown, KS_Next, 149 KC(121), KS_Cmd_ScrollFastDown, KS_Next,
150 KC(122), KS_Cmd_Screen0, KS_f1, 150 KC(122), KS_Cmd_Screen0, KS_f1,
151 KC(123), KS_Shift_R, 151 KC(123), KS_Shift_R,
152 KC(124), KS_Alt_R, 152 KC(124), KS_Alt_R,
153 KC(125), KS_Control_R, 153 KC(125), KS_Control_R,
154 KC(127), KS_Cmd_Debugger, 154 KC(127), KS_Cmd_Debugger,
155}; 155};
156 156
 157static const keysym_t akbd_keydesc_apple[] = {
 158/* pos command normal shifted */
 159 KC(54), KS_Control_L,
 160 KC(55), KS_Cmd, KS_Meta_L, /* Command */
 161 KC(58), KS_Alt_L, /* Option */
 162};
 163
157static const keysym_t akbd_keydesc_us_dvorak[] = { 164static const keysym_t akbd_keydesc_us_dvorak[] = {
158/* pos command normal shifted */ 165/* pos command normal shifted */
159 KC(0), KS_a, 166 KC(0), KS_a,
160 KC(1), KS_o, 167 KC(1), KS_o,
161 KC(2), KS_e, 168 KC(2), KS_e,
162 KC(3), KS_u, 169 KC(3), KS_u,
163 KC(4), KS_d, 170 KC(4), KS_d,
164 KC(5), KS_i, 171 KC(5), KS_i,
165 KC(6), KS_semicolon, KS_colon, 172 KC(6), KS_semicolon, KS_colon,
166 KC(7), KS_q, 173 KC(7), KS_q,
167 KC(8), KS_j, 174 KC(8), KS_j,
168 KC(9), KS_k, 175 KC(9), KS_k,
169 176
@@ -440,32 +447,49 @@ static const keysym_t akbd_keydesc_pt[]  @@ -440,32 +447,49 @@ static const keysym_t akbd_keydesc_pt[]
440 KC(43), KS_comma, KS_semicolon, 447 KC(43), KS_comma, KS_semicolon,
441 KC(44), KS_minus, KS_underscore, 448 KC(44), KS_minus, KS_underscore,
442 KC(47), KS_period, KS_colon, 449 KC(47), KS_period, KS_colon,
443 KC(50), KS_less, KS_greater, 450 KC(50), KS_less, KS_greater,
444 KC(58), KS_Mode_switch, 451 KC(58), KS_Mode_switch,
445 KC(81), KS_KP_Equal, 452 KC(81), KS_KP_Equal,
446}; 453};
447 454
448#define KBD_MAP(name, base, map) \ 455#define KBD_MAP(name, base, map) \
449 { name, base, sizeof(map)/sizeof(keysym_t), map } 456 { name, base, sizeof(map)/sizeof(keysym_t), map }
450 457
451static const struct wscons_keydesc akbd_keydesctab[] = { 458static const struct wscons_keydesc akbd_keydesctab[] = {
452 KBD_MAP(KB_US, 0, akbd_keydesc_us), 459 KBD_MAP(KB_US, 0, akbd_keydesc_us),
 460 KBD_MAP(KB_US | KB_APPLE, KB_US, akbd_keydesc_apple),
453 KBD_MAP(KB_US | KB_DVORAK, KB_US, akbd_keydesc_us_dvorak), 461 KBD_MAP(KB_US | KB_DVORAK, KB_US, akbd_keydesc_us_dvorak),
 462 KBD_MAP(KB_US | KB_DVORAK | KB_APPLE, KB_US | KB_DVORAK,
 463 akbd_keydesc_apple),
454 KBD_MAP(KB_FR, KB_US, akbd_keydesc_fr), 464 KBD_MAP(KB_FR, KB_US, akbd_keydesc_fr),
455 KBD_MAP(KB_JP, KB_US, akbd_keydesc_jp), 
456 KBD_MAP(KB_FR | KB_NODEAD, KB_FR, akbd_keydesc_fr_nodead), 465 KBD_MAP(KB_FR | KB_NODEAD, KB_FR, akbd_keydesc_fr_nodead),
 466 KBD_MAP(KB_FR | KB_APPLE, KB_FR, akbd_keydesc_apple),
 467 KBD_MAP(KB_FR | KB_NODEAD | KB_APPLE, KB_FR | KB_DVORAK,
 468 akbd_keydesc_apple),
 469 KBD_MAP(KB_JP, KB_US, akbd_keydesc_jp),
 470 KBD_MAP(KB_JP | KB_APPLE, KB_JP, akbd_keydesc_apple),
457 KBD_MAP(KB_SF, KB_US, akbd_keydesc_sf), 471 KBD_MAP(KB_SF, KB_US, akbd_keydesc_sf),
 472 KBD_MAP(KB_SF | KB_APPLE, KB_SF, akbd_keydesc_apple),
458 KBD_MAP(KB_SV, KB_US, akbd_keydesc_sv), 473 KBD_MAP(KB_SV, KB_US, akbd_keydesc_sv),
 474 KBD_MAP(KB_SV | KB_APPLE, KB_SV, akbd_keydesc_apple),
459 KBD_MAP(KB_SV | KB_NODEAD, KB_SV, akbd_keydesc_sv_nodead), 475 KBD_MAP(KB_SV | KB_NODEAD, KB_SV, akbd_keydesc_sv_nodead),
 476 KBD_MAP(KB_SV | KB_NODEAD | KB_APPLE, KB_SV | KB_NODEAD,
 477 akbd_keydesc_apple),
460 KBD_MAP(KB_DE, KB_US, akbd_keydesc_de), 478 KBD_MAP(KB_DE, KB_US, akbd_keydesc_de),
 479 KBD_MAP(KB_DE | KB_APPLE, KB_DE, akbd_keydesc_apple),
461 KBD_MAP(KB_DE | KB_NODEAD, KB_DE, akbd_keydesc_de_nodead), 480 KBD_MAP(KB_DE | KB_NODEAD, KB_DE, akbd_keydesc_de_nodead),
 481 KBD_MAP(KB_DE | KB_NODEAD | KB_APPLE, KB_DE | KB_NODEAD,
 482 akbd_keydesc_apple),
462 KBD_MAP(KB_UK, KB_US, akbd_keydesc_uk), 483 KBD_MAP(KB_UK, KB_US, akbd_keydesc_uk),
 484 KBD_MAP(KB_UK | KB_APPLE, KB_UK, akbd_keydesc_apple),
463 KBD_MAP(KB_ES, KB_US, akbd_keydesc_es), 485 KBD_MAP(KB_ES, KB_US, akbd_keydesc_es),
 486 KBD_MAP(KB_ES | KB_APPLE, KB_ES, akbd_keydesc_apple),
464 KBD_MAP(KB_PT, KB_US, akbd_keydesc_pt), 487 KBD_MAP(KB_PT, KB_US, akbd_keydesc_pt),
 488 KBD_MAP(KB_PT | KB_APPLE, KB_PT, akbd_keydesc_apple),
465 {0, 0, 0, 0} 489 {0, 0, 0, 0}
466}; 490};
467 491
468#undef KBD_MAP 492#undef KBD_MAP
469#undef KC 493#undef KC
470 494
471extern keysym_t adb_to_usb[]; 495extern keysym_t adb_to_usb[];