Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/dev/pckbport/wskbdmap_mfii.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/dev/pckbport/wskbdmap_mfii.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.2.4.6 retrieving revision 1.10.10.1 diff -u -p -r1.2.4.6 -r1.10.10.1 --- src/sys/dev/pckbport/wskbdmap_mfii.c 2004/09/21 13:32:19 1.2.4.6 +++ src/sys/dev/pckbport/wskbdmap_mfii.c 2006/04/19 03:25:59 1.10.10.1 @@ -1,4 +1,4 @@ -/* $NetBSD: wskbdmap_mfii.c,v 1.2.4.6 2004/09/21 13:32:19 skrll Exp $ */ +/* $NetBSD: wskbdmap_mfii.c,v 1.10.10.1 2006/04/19 03:25:59 elad Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: wskbdmap_mfii.c,v 1.2.4.6 2004/09/21 13:32:19 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wskbdmap_mfii.c,v 1.10.10.1 2006/04/19 03:25:59 elad Exp $"); #include #include @@ -158,6 +158,40 @@ static const keysym_t pckbd_keydesc_us[] KC(221), KS_Menu, }; +#ifndef WSKBD_USONLY +static const keysym_t pckbd_keydesc_gr[] = { +/* pos normal shifted altgr shift-altgr */ + KC(14), KS_Delete, KS_BackSpace, + KC(16), KS_q, KS_Q, KS_semicolon, KS_colon, + KC(17), KS_w, KS_W, KS_gr_teliko_s, KS_gr_S, + KC(18), KS_e, KS_E, KS_gr_e, KS_gr_E, + KC(19), KS_r, KS_R, KS_gr_r, KS_gr_R, + KC(20), KS_t, KS_T, KS_gr_t, KS_gr_T, + KC(21), KS_y, KS_Y, KS_gr_y, KS_gr_Y, + KC(22), KS_u, KS_U, KS_gr_u, KS_gr_U, + KC(23), KS_i, KS_I, KS_gr_i, KS_gr_I, + KC(24), KS_o, KS_O, KS_gr_o, KS_gr_O, + KC(25), KS_p, KS_P, KS_gr_p, KS_gr_P, + KC(30), KS_a, KS_A, KS_gr_a, KS_gr_A, + KC(31), KS_s, KS_S, KS_gr_s, KS_gr_S, + KC(32), KS_d, KS_D, KS_gr_d, KS_gr_D, + KC(33), KS_f, KS_F, KS_gr_f, KS_gr_F, + KC(34), KS_g, KS_G, KS_gr_g, KS_gr_G, + KC(35), KS_h, KS_H, KS_gr_h, KS_gr_H, + KC(36), KS_j, KS_J, KS_gr_j, KS_gr_J, + KC(37), KS_k, KS_K, KS_gr_k, KS_gr_K, + KC(38), KS_l, KS_L, KS_gr_l, KS_gr_L, + KC(39), KS_semicolon, KS_colon, KS_dead_semi, KS_dead_colon, + KC(44), KS_z, KS_Z, KS_gr_z, KS_gr_Z, + KC(45), KS_x, KS_X, KS_gr_x, KS_gr_X, + KC(46), KS_c, KS_C, KS_gr_c, KS_gr_C, + KC(47), KS_v, KS_V, KS_gr_v, KS_gr_V, + KC(48), KS_b, KS_B, KS_gr_b, KS_gr_B, + KC(49), KS_n, KS_N, KS_gr_n, KS_gr_N, + KC(50), KS_m, KS_M, KS_gr_m, KS_gr_M, + KC(184), KS_Mode_switch, KS_Multi_key, +}; + static const keysym_t pckbd_keydesc_de[] = { /* pos normal shifted altgr shift-altgr */ KC(3), KS_2, KS_quotedbl, KS_twosuperior, @@ -274,7 +308,7 @@ static const keysym_t pckbd_keydesc_fr[] KC(13), KS_equal, KS_plus, KS_braceright, KC(16), KS_a, KC(17), KS_z, - KC(26), KS_dead_circumflex, KS_dead_diaeresis, + KC(26), KS_dead_circumflex, KS_dead_diaeresis, KC(27), KS_dollar, KS_sterling, KS_currency, KC(30), KS_q, KC(39), KS_m, @@ -391,15 +425,15 @@ static const keysym_t pckbd_keydesc_pt[] /* pos normal shifted altgr shift-altgr */ KC(3), KS_2, KS_quotedbl, KS_at, KC(4), KS_3, KS_numbersign, KS_sterling, - KC(5), KS_4, KS_dollar, + KC(5), KS_4, KS_dollar, KS_section, KC(7), KS_6, KS_ampersand, KC(8), KS_7, KS_slash, KS_braceleft, KC(9), KS_8, KS_parenleft, KS_bracketleft, KC(10), KS_9, KS_parenright, KS_bracketright, KC(11), KS_0, KS_equal, KS_braceright, KC(12), KS_apostrophe, KS_question, - KC(13), KS_less, KS_greater, - KC(26), KS_plus, KS_asterisk, + KC(13), KS_guillemotleft, KS_guillemotright, + KC(26), KS_plus, KS_asterisk, KS_dead_diaeresis, KC(27), KS_dead_acute, KS_dead_grave, KC(39), KS_ccedilla, KS_Ccedilla, KC(40), KS_masculine, KS_ordfeminine, @@ -509,6 +543,7 @@ static const keysym_t pckbd_keydesc_iope KC(87), KS_Cmd_Screen9, KS_f10, KC(88), KS_f11, }; +#endif /* WSKBD_USONLY */ #define KBD_MAP(name, base, map) \ { name, base, sizeof(map)/sizeof(keysym_t), map } @@ -518,6 +553,7 @@ static const keysym_t pckbd_keydesc_iope const struct wscons_keydesc pckbd_keydesctab[] = { KBD_MAP(KB_US, 0, pckbd_keydesc_us), +#ifndef WSKBD_USONLY KBD_MAP(KB_DE, KB_US, pckbd_keydesc_de), KBD_MAP(KB_DE | KB_NODEAD, KB_DE, pckbd_keydesc_de_nodead), KBD_MAP(KB_FR, KB_US, pckbd_keydesc_fr), @@ -542,16 +578,21 @@ const struct wscons_keydesc pckbd_keydes pckbd_keydesc_swapctrlcaps), KBD_MAP(KB_ES , KB_US, pckbd_keydesc_es), KBD_MAP(KB_PT, KB_US, pckbd_keydesc_pt), + KBD_MAP(KB_GR, KB_US, pckbd_keydesc_gr), +#endif /* WSKBD_USONLY */ /* placeholders */ KBD_NULLMAP(KB_US | KB_MACHDEP, KB_US), +#ifndef WSKBD_USONLY KBD_NULLMAP(KB_DE | KB_MACHDEP, KB_DE), + KBD_NULLMAP(KB_ES | KB_MACHDEP, KB_ES), KBD_NULLMAP(KB_FR | KB_MACHDEP, KB_FR), KBD_NULLMAP(KB_JP | KB_MACHDEP, KB_JP), KBD_NULLMAP(KB_US | KB_MACHDEP | KB_SWAPCTRLCAPS, KB_US | KB_SWAPCTRLCAPS), KBD_NULLMAP(KB_JP | KB_MACHDEP | KB_SWAPCTRLCAPS, KB_JP | KB_SWAPCTRLCAPS), +#endif /* WSKBD_USONLY */ {0, 0, 0, 0} };