Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-6]: src/sys/arch/macppc/dev Pull up revision 1.5 (requested by ...
details: https://anonhg.NetBSD.org/src/rev/2d767800091e
branches: netbsd-1-6
changeset: 530238:2d767800091e
user: tron <tron%NetBSD.org@localhost>
date: Mon Jun 02 14:42:38 2003 +0000
description:
Pull up revision 1.5 (requested by manu in ticket #1183):
Merged mac68k and macppc keayboards, since they are the same. The file
could move to <arch/mac> if one day we create it.
Fixed french keymap: option was not mapped correctly, thus making
impossible to use |{}[] (tested).
Added jp keymap from PR/15438, and sf, sv, de and uk keymaps from
OpenBSD.
(all untested).
diffstat:
sys/arch/macppc/dev/akbdmap.h | 213 +-----------------------------------------
1 files changed, 2 insertions(+), 211 deletions(-)
diffs (218 lines):
diff -r 90ff75d69b38 -r 2d767800091e sys/arch/macppc/dev/akbdmap.h
--- a/sys/arch/macppc/dev/akbdmap.h Mon Jun 02 14:42:32 2003 +0000
+++ b/sys/arch/macppc/dev/akbdmap.h Mon Jun 02 14:42:38 2003 +0000
@@ -1,212 +1,3 @@
-/* $NetBSD: akbdmap.h,v 1.4 2002/03/04 04:03:36 dbj Exp $ */
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Juergen Hannken-Illjes.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* XXX This list is incomplete. */
-
-#define KC(n) KS_KEYCODE(n)
-
-static const keysym_t akbd_keydesc_us[] = {
-/* pos command normal shifted */
- KC(0), KS_a,
- KC(1), KS_s,
- KC(2), KS_d,
- KC(3), KS_f,
- KC(4), KS_h,
- KC(5), KS_g,
- KC(6), KS_z,
- KC(7), KS_x,
- KC(8), KS_c,
- KC(9), KS_v,
+/* $NetBSD: akbdmap.h,v 1.4.8.1 2003/06/02 14:42:38 tron Exp $ */
- KC(11), KS_b,
- KC(12), KS_q,
- KC(13), KS_w,
- KC(14), KS_e,
- KC(15), KS_r,
- KC(16), KS_y,
- KC(17), KS_t,
- KC(18), KS_1, KS_exclam,
- KC(19), KS_2, KS_at,
- KC(20), KS_3, KS_numbersign,
- KC(21), KS_4, KS_dollar,
- KC(22), KS_6, KS_asciicircum,
- KC(23), KS_5, KS_percent,
- KC(24), KS_equal, KS_plus,
- KC(25), KS_9, KS_parenleft,
- KC(26), KS_7, KS_ampersand,
- KC(27), KS_minus, KS_underscore,
- KC(28), KS_8, KS_asterisk,
- KC(29), KS_0, KS_parenright,
- KC(30), KS_bracketright, KS_braceright,
- KC(31), KS_o,
- KC(32), KS_u,
- KC(33), KS_bracketleft, KS_braceleft,
- KC(34), KS_i,
- KC(35), KS_p,
- KC(36), KS_Return,
- KC(37), KS_l,
- KC(38), KS_j,
- KC(39), KS_apostrophe, KS_quotedbl,
- KC(40), KS_k,
- KC(41), KS_semicolon, KS_colon,
- KC(42), KS_backslash, KS_bar,
- KC(43), KS_comma, KS_less,
- KC(44), KS_slash, KS_question,
- KC(45), KS_n,
- KC(46), KS_m,
- KC(47), KS_period, KS_greater,
- KC(48), KS_Tab,
- KC(49), KS_space,
- KC(50), KS_grave, KS_asciitilde,
- KC(51), KS_Delete,
- KC(52), KS_KP_Enter, /* Maybe we should pretend this is alt-R */
- KC(53), KS_Escape,
- KC(54), KS_Control_L,
- KC(55), KS_Cmd, /* Command */
- KC(56), KS_Shift_L,
- KC(57), KS_Caps_Lock,
- KC(58), KS_Cmd1, /* Option */
- KC(59), KS_Left,
- KC(60), KS_Right,
- KC(61), KS_Down,
- KC(62), KS_Up,
-
- KC(65), KS_KP_Decimal,
- KC(67), KS_KP_Multiply,
- KC(69), KS_KP_Add,
- KC(71), KS_Clear,
- KC(75), KS_KP_Divide,
- KC(76), KS_KP_Enter,
- KC(78), KS_KP_Subtract,
-
- KC(81), KS_KP_Equal,
- KC(82), KS_KP_0,
- KC(83), KS_KP_1,
- KC(84), KS_KP_2,
- KC(85), KS_KP_3,
- KC(86), KS_KP_4,
- KC(87), KS_KP_5,
- KC(88), KS_KP_6,
- KC(89), KS_KP_7,
-
- KC(91), KS_KP_8,
- KC(92), KS_KP_9,
-
- KC(95), KS_comma, /* XXX KS_KP_comma */
- KC(96), KS_f5,
- KC(97), KS_f6,
- KC(98), KS_f7,
- KC(99), KS_f3,
- KC(100), KS_f8,
-
- KC(101), KS_f9,
-
- KC(103), KS_f11,
-
- KC(106), KS_KP_Enter,
-
- KC(109), KS_f10,
-
- KC(111), KS_f12,
-
- KC(115), KS_Home,
- KC(116), KS_Prior,
-
- KC(118), KS_f4,
- KC(119), KS_End,
- KC(120), KS_f2,
- KC(121), KS_Next,
- KC(122), KS_f1,
-
- KC(127), KS_Cmd_Debugger,
-};
-
-static const keysym_t akbd_keydesc_fr[] = {
-/* pos normal shifted altgr shift-altgr */
- KC(0), KS_q,
- KC(6), KS_w,
- KC(10), KS_at, KS_numbersign,
- KC(12), KS_a,
- KC(13), KS_z,
- KC(18), KS_ampersand, KS_1,
- KC(19), KS_eacute, KS_2, KS_asciitilde,
- KC(20), KS_quotedbl, KS_3, KS_numbersign,
- KC(21), KS_apostrophe, KS_4, KS_braceleft,
- KC(22), KS_section, KS_6, KS_bar,
- KC(23), KS_parenleft, KS_5, KS_bracketleft, KS_braceleft,
- KC(24), KS_minus, KS_underscore, KS_braceright,
- KC(25), KS_ccedilla, KS_9, KS_asciicircum,
- KC(26), KS_egrave, KS_7, KS_grave,
- KC(27), KS_parenright, KS_degree, KS_bracketright, KS_braceright,
- KC(28), KS_exclam, KS_8, KS_bar,
- KC(29), KS_agrave, KS_0, KS_at,
- KC(30), KS_dollar, KS_asterisk,
- KC(33), KS_dead_circumflex, KS_dead_diaeresis,
- KC(39), KS_mu, KS_percent,
- KC(40), KS_k,
- KC(41), KS_m,
- KC(42), KS_grave, KS_sterling,
- KC(43), KS_semicolon, KS_period,
- KC(44), KS_equal, KS_plus,
- KC(46), KS_comma, KS_question,
- KC(47), KS_colon, KS_slash, KS_backslash,
- KC(50), KS_less, KS_greater,
- KC(52), KS_Alt_R,
- KC(55), KS_Meta_L, /* Command */
- KC(58), KS_Alt_R, /* Option */
-};
-
-#if 0
-static const keysym_t akbd_keydesc_jp[] = {
-/* pos command normal shifted */
- KC(42), KS_grave, KS_asciitilde,
- KC(93), KS_backslash, KS_bar,
-};
-#endif
-
-#define KBD_MAP(name, base, map) \
- { name, base, sizeof(map)/sizeof(keysym_t), map }
-
-static const struct wscons_keydesc akbd_keydesctab[] = {
- KBD_MAP(KB_US, 0, akbd_keydesc_us),
- KBD_MAP(KB_FR, KB_US, akbd_keydesc_fr),
- {0, 0, 0, 0}
-};
-
-#undef KBD_MAP
-#undef KC
+#include "../../mac68k/dev/akbdmap.h"
Home |
Main Index |
Thread Index |
Old Index