Add keydescs for swapctrlcaps, and clean up formating.
This commit is contained in:
parent
c7d782764a
commit
0fe49daba1
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: mkbdmap.h,v 1.5 2001/03/02 00:25:06 marcus Exp $ */
|
||||
/* $NetBSD: mkbdmap.h,v 1.6 2002/07/05 14:29:06 tsutsui Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2001 Marcus Comstedt
|
||||
|
@ -35,66 +35,65 @@
|
|||
#define KC(n) KS_KEYCODE(n)
|
||||
|
||||
static const keysym_t mkbd_keydesc_jp[] = {
|
||||
/* pos normal shifted */
|
||||
KC(4), KS_a,
|
||||
KC(5), KS_b,
|
||||
KC(6), KS_c,
|
||||
KC(7), KS_d,
|
||||
KC(8), KS_e,
|
||||
KC(9), KS_f,
|
||||
KC(10), KS_g,
|
||||
KC(11), KS_h,
|
||||
KC(12), KS_i,
|
||||
KC(13), KS_j,
|
||||
KC(14), KS_k,
|
||||
KC(15), KS_l,
|
||||
KC(16), KS_m,
|
||||
KC(17), KS_n,
|
||||
KC(18), KS_o,
|
||||
KC(19), KS_p,
|
||||
KC(20), KS_q,
|
||||
KC(21), KS_r,
|
||||
KC(22), KS_s,
|
||||
KC(23), KS_t,
|
||||
KC(24), KS_u,
|
||||
KC(25), KS_v,
|
||||
KC(26), KS_w,
|
||||
KC(27), KS_x,
|
||||
KC(28), KS_y,
|
||||
KC(29), KS_z,
|
||||
/* pos command normal shifted */
|
||||
KC(4), KS_a,
|
||||
KC(5), KS_b,
|
||||
KC(6), KS_c,
|
||||
KC(7), KS_d,
|
||||
KC(8), KS_e,
|
||||
KC(9), KS_f,
|
||||
KC(10), KS_g,
|
||||
KC(11), KS_h,
|
||||
KC(12), KS_i,
|
||||
KC(13), KS_j,
|
||||
KC(14), KS_k,
|
||||
KC(15), KS_l,
|
||||
KC(16), KS_m,
|
||||
KC(17), KS_n,
|
||||
KC(18), KS_o,
|
||||
KC(19), KS_p,
|
||||
KC(20), KS_q,
|
||||
KC(21), KS_r,
|
||||
KC(22), KS_s,
|
||||
KC(23), KS_t,
|
||||
KC(24), KS_u,
|
||||
KC(25), KS_v,
|
||||
KC(26), KS_w,
|
||||
KC(27), KS_x,
|
||||
KC(28), KS_y,
|
||||
KC(29), KS_z,
|
||||
|
||||
KC(30), KS_1, KS_exclam,
|
||||
KC(31), KS_2, KS_quotedbl,
|
||||
KC(32), KS_3, KS_numbersign,
|
||||
KC(33), KS_4, KS_dollar,
|
||||
KC(34), KS_5, KS_percent,
|
||||
KC(35), KS_6, KS_ampersand,
|
||||
KC(36), KS_7, KS_apostrophe,
|
||||
KC(37), KS_8, KS_parenleft,
|
||||
KC(38), KS_9, KS_parenright,
|
||||
KC(39), KS_0, KS_asciitilde,
|
||||
KC(30), KS_1, KS_exclam,
|
||||
KC(31), KS_2, KS_quotedbl,
|
||||
KC(32), KS_3, KS_numbersign,
|
||||
KC(33), KS_4, KS_dollar,
|
||||
KC(34), KS_5, KS_percent,
|
||||
KC(35), KS_6, KS_ampersand,
|
||||
KC(36), KS_7, KS_apostrophe,
|
||||
KC(37), KS_8, KS_parenleft,
|
||||
KC(38), KS_9, KS_parenright,
|
||||
KC(39), KS_0, KS_asciitilde,
|
||||
|
||||
KC(40), KS_Return,
|
||||
KC(41), KS_Cmd_Debugger,
|
||||
KS_Escape,
|
||||
KC(42), KS_BackSpace,
|
||||
KC(43), KS_Tab,
|
||||
KC(44), KS_space,
|
||||
KC(40), KS_Return,
|
||||
KC(41), KS_Cmd_Debugger, KS_Escape,
|
||||
KC(42), KS_BackSpace,
|
||||
KC(43), KS_Tab,
|
||||
KC(44), KS_space,
|
||||
|
||||
KC(45), KS_minus, KS_equal,
|
||||
KC(46), KS_asciicircum, KS_macron,
|
||||
KC(47), KS_at, KS_grave,
|
||||
KC(48), KS_bracketleft, KS_braceleft,
|
||||
KC(45), KS_minus, KS_equal,
|
||||
KC(46), KS_asciicircum, KS_macron,
|
||||
KC(47), KS_at, KS_grave,
|
||||
KC(48), KS_bracketleft, KS_braceleft,
|
||||
/* no 49 */
|
||||
KC(50), KS_bracketright,KS_braceright,
|
||||
KC(51), KS_semicolon, KS_plus,
|
||||
KC(52), KS_colon, KS_asterisk,
|
||||
KC(53), KS_Zenkaku_Hankaku,
|
||||
KC(54), KS_comma, KS_less,
|
||||
KC(55), KS_period, KS_greater,
|
||||
KC(56), KS_slash, KS_question,
|
||||
KC(50), KS_bracketright,KS_braceright,
|
||||
KC(51), KS_semicolon, KS_plus,
|
||||
KC(52), KS_colon, KS_asterisk,
|
||||
KC(53), KS_Zenkaku_Hankaku,
|
||||
KC(54), KS_comma, KS_less,
|
||||
KC(55), KS_period, KS_greater,
|
||||
KC(56), KS_slash, KS_question,
|
||||
|
||||
KC(57), KS_Caps_Lock,
|
||||
KC(57), KS_Caps_Lock,
|
||||
|
||||
KC(58), KS_Cmd_Screen0, KS_f1,
|
||||
KC(59), KS_Cmd_Screen1, KS_f2,
|
||||
|
@ -106,130 +105,134 @@ static const keysym_t mkbd_keydesc_jp[] = {
|
|||
KC(65), KS_Cmd_Screen7, KS_f8,
|
||||
KC(66), KS_Cmd_Screen8, KS_f9,
|
||||
KC(67), KS_Cmd_Screen9, KS_f10,
|
||||
KC(68), KS_f11,
|
||||
KC(69), KS_f12,
|
||||
KC(68), KS_f11,
|
||||
KC(69), KS_f12,
|
||||
|
||||
KC(70), KS_Print_Screen,
|
||||
KC(71), KS_Hold_Screen,
|
||||
KC(72), KS_Pause,
|
||||
KC(73), KS_Insert,
|
||||
KC(74), KS_Home,
|
||||
KC(75), KS_Prior,
|
||||
KC(76), KS_Delete,
|
||||
KC(77), KS_End,
|
||||
KC(78), KS_Next,
|
||||
KC(79), KS_Right,
|
||||
KC(80), KS_Left,
|
||||
KC(81), KS_Down,
|
||||
KC(82), KS_Up,
|
||||
KC(70), KS_Print_Screen,
|
||||
KC(71), KS_Hold_Screen,
|
||||
KC(72), KS_Pause,
|
||||
KC(73), KS_Insert,
|
||||
KC(74), KS_Home,
|
||||
KC(75), KS_Prior,
|
||||
KC(76), KS_Delete,
|
||||
KC(77), KS_End,
|
||||
KC(78), KS_Next,
|
||||
KC(79), KS_Right,
|
||||
KC(80), KS_Left,
|
||||
KC(81), KS_Down,
|
||||
KC(82), KS_Up,
|
||||
|
||||
/* 83-99 is numeric keypad */
|
||||
|
||||
/* 100 is european keyboard only */
|
||||
|
||||
KC(101), KS_Help,
|
||||
KC(101), KS_Help,
|
||||
|
||||
/* no 102-134 */
|
||||
|
||||
KC(135), KS_backslash, KS_underscore,
|
||||
KC(136), KS_Hiragana_Katakana,
|
||||
KC(137), KS_yen, KS_bar,
|
||||
KC(138), KS_Henkan_Mode,
|
||||
KC(139), KS_Muhenkan,
|
||||
KC(135), KS_backslash, KS_underscore,
|
||||
KC(136), KS_Hiragana_Katakana,
|
||||
KC(137), KS_yen, KS_bar,
|
||||
KC(138), KS_Henkan_Mode,
|
||||
KC(139), KS_Muhenkan,
|
||||
|
||||
KC(0xe0), KS_Cmd1,
|
||||
KS_Control_L,
|
||||
KC(0xe1), KS_Shift_L,
|
||||
KC(0xe2), KS_Cmd2,
|
||||
KS_Alt_L,
|
||||
KC(0xe3), KS_Meta_L,
|
||||
KC(0xe4), KS_Control_R,
|
||||
KC(0xe5), KS_Shift_R,
|
||||
KC(0xe6), KS_Alt_R, KS_Multi_key,
|
||||
KC(0xe7), KS_Meta_R,
|
||||
KC(224), KS_Cmd1, KS_Control_L,
|
||||
KC(225), KS_Shift_L,
|
||||
KC(226), KS_Cmd2, KS_Alt_L,
|
||||
KC(227), KS_Meta_L,
|
||||
KC(228), KS_Control_R,
|
||||
KC(229), KS_Shift_R,
|
||||
KC(230), KS_Alt_R, KS_Multi_key,
|
||||
KC(231), KS_Meta_R,
|
||||
};
|
||||
|
||||
|
||||
static const keysym_t mkbd_keydesc_uk[] = {
|
||||
/* pos normal shifted */
|
||||
/* pos command normal shifted */
|
||||
|
||||
KC(32), KS_3, KS_sterling,
|
||||
KC(32), KS_3, KS_sterling,
|
||||
|
||||
KC(35), KS_6, KS_asciicircum,
|
||||
KC(36), KS_7, KS_ampersand,
|
||||
KC(37), KS_8, KS_asterisk,
|
||||
KC(38), KS_9, KS_parenleft,
|
||||
KC(39), KS_0, KS_parenright,
|
||||
KC(35), KS_6, KS_asciicircum,
|
||||
KC(36), KS_7, KS_ampersand,
|
||||
KC(37), KS_8, KS_asterisk,
|
||||
KC(38), KS_9, KS_parenleft,
|
||||
KC(39), KS_0, KS_parenright,
|
||||
|
||||
KC(45), KS_minus, KS_underscore,
|
||||
KC(46), KS_equal, KS_plus,
|
||||
KC(47), KS_bracketleft, KS_braceleft,
|
||||
KC(48), KS_bracketright,KS_braceright,
|
||||
KC(45), KS_minus, KS_underscore,
|
||||
KC(46), KS_equal, KS_plus,
|
||||
KC(47), KS_bracketleft, KS_braceleft,
|
||||
KC(48), KS_bracketright,KS_braceright,
|
||||
|
||||
KC(50), KS_numbersign, KS_asciitilde,
|
||||
KC(51), KS_semicolon, KS_colon,
|
||||
KC(52), KS_apostrophe, KS_at,
|
||||
KC(53), KS_grave, KS_notsign, KS_brokenbar,
|
||||
KC(50), KS_numbersign, KS_asciitilde,
|
||||
KC(51), KS_semicolon, KS_colon,
|
||||
KC(52), KS_apostrophe, KS_at,
|
||||
KC(53), KS_grave, KS_notsign, KS_brokenbar,
|
||||
|
||||
KC(83), KS_Num_Lock,
|
||||
KC(84), KS_KP_Divide,
|
||||
KC(85), KS_KP_Multiply,
|
||||
KC(86), KS_KP_Subtract,
|
||||
KC(87), KS_KP_Add,
|
||||
KC(88), KS_KP_Enter,
|
||||
KC(89), KS_KP_1,
|
||||
KC(90), KS_KP_2,
|
||||
KC(91), KS_KP_3,
|
||||
KC(92), KS_KP_4,
|
||||
KC(93), KS_KP_5,
|
||||
KC(94), KS_KP_6,
|
||||
KC(95), KS_KP_7,
|
||||
KC(96), KS_KP_8,
|
||||
KC(97), KS_KP_9,
|
||||
KC(98), KS_KP_0,
|
||||
KC(99), KS_KP_Decimal,
|
||||
KC(83), KS_Num_Lock,
|
||||
KC(84), KS_KP_Divide,
|
||||
KC(85), KS_KP_Multiply,
|
||||
KC(86), KS_KP_Subtract,
|
||||
KC(87), KS_KP_Add,
|
||||
KC(88), KS_KP_Enter,
|
||||
KC(89), KS_KP_1,
|
||||
KC(90), KS_KP_2,
|
||||
KC(91), KS_KP_3,
|
||||
KC(92), KS_KP_4,
|
||||
KC(93), KS_KP_5,
|
||||
KC(94), KS_KP_6,
|
||||
KC(95), KS_KP_7,
|
||||
KC(96), KS_KP_8,
|
||||
KC(97), KS_KP_9,
|
||||
KC(98), KS_KP_0,
|
||||
KC(99), KS_KP_Decimal,
|
||||
|
||||
KC(100), KS_backslash, KS_bar,
|
||||
KC(100), KS_backslash, KS_bar,
|
||||
};
|
||||
|
||||
static const keysym_t mkbd_keydesc_us[] = {
|
||||
/* pos normal shifted */
|
||||
/* pos command normal shifted */
|
||||
|
||||
KC(31), KS_2, KS_at,
|
||||
KC(31), KS_2, KS_at,
|
||||
|
||||
KC(35), KS_6, KS_asciicircum,
|
||||
KC(36), KS_7, KS_ampersand,
|
||||
KC(37), KS_8, KS_asterisk,
|
||||
KC(38), KS_9, KS_parenleft,
|
||||
KC(39), KS_0, KS_parenright,
|
||||
KC(35), KS_6, KS_asciicircum,
|
||||
KC(36), KS_7, KS_ampersand,
|
||||
KC(37), KS_8, KS_asterisk,
|
||||
KC(38), KS_9, KS_parenleft,
|
||||
KC(39), KS_0, KS_parenright,
|
||||
|
||||
KC(45), KS_minus, KS_underscore,
|
||||
KC(46), KS_equal, KS_plus,
|
||||
KC(47), KS_bracketleft, KS_braceleft,
|
||||
KC(48), KS_bracketright,KS_braceright,
|
||||
KC(49), KS_backslash, KS_bar,
|
||||
KC(45), KS_minus, KS_underscore,
|
||||
KC(46), KS_equal, KS_plus,
|
||||
KC(47), KS_bracketleft, KS_braceleft,
|
||||
KC(48), KS_bracketright,KS_braceright,
|
||||
KC(49), KS_backslash, KS_bar,
|
||||
|
||||
KC(51), KS_semicolon, KS_colon,
|
||||
KC(52), KS_apostrophe, KS_quotedbl,
|
||||
KC(53), KS_grave, KS_asciitilde,
|
||||
KC(51), KS_semicolon, KS_colon,
|
||||
KC(52), KS_apostrophe, KS_quotedbl,
|
||||
KC(53), KS_grave, KS_asciitilde,
|
||||
|
||||
KC(83), KS_Num_Lock,
|
||||
KC(84), KS_KP_Divide,
|
||||
KC(85), KS_KP_Multiply,
|
||||
KC(86), KS_KP_Subtract,
|
||||
KC(87), KS_KP_Add,
|
||||
KC(88), KS_KP_Enter,
|
||||
KC(89), KS_KP_1,
|
||||
KC(90), KS_KP_2,
|
||||
KC(91), KS_KP_3,
|
||||
KC(92), KS_KP_4,
|
||||
KC(93), KS_KP_5,
|
||||
KC(94), KS_KP_6,
|
||||
KC(95), KS_KP_7,
|
||||
KC(96), KS_KP_8,
|
||||
KC(97), KS_KP_9,
|
||||
KC(98), KS_KP_0,
|
||||
KC(99), KS_KP_Decimal,
|
||||
KC(83), KS_Num_Lock,
|
||||
KC(84), KS_KP_Divide,
|
||||
KC(85), KS_KP_Multiply,
|
||||
KC(86), KS_KP_Subtract,
|
||||
KC(87), KS_KP_Add,
|
||||
KC(88), KS_KP_Enter,
|
||||
KC(89), KS_KP_1,
|
||||
KC(90), KS_KP_2,
|
||||
KC(91), KS_KP_3,
|
||||
KC(92), KS_KP_4,
|
||||
KC(93), KS_KP_5,
|
||||
KC(94), KS_KP_6,
|
||||
KC(95), KS_KP_7,
|
||||
KC(96), KS_KP_8,
|
||||
KC(97), KS_KP_9,
|
||||
KC(98), KS_KP_0,
|
||||
KC(99), KS_KP_Decimal,
|
||||
};
|
||||
|
||||
static const keysym_t mkbd_keydesc_swapctrlcaps[] = {
|
||||
/* pos command normal shifted */
|
||||
KC(57), KS_Cmd1, KS_Control_L,
|
||||
KC(224), KS_Caps_Lock,
|
||||
};
|
||||
|
||||
#define KBD_MAP(name, base, map) \
|
||||
|
@ -239,6 +242,9 @@ static const struct wscons_keydesc mkbd_keydesctab[] = {
|
|||
KBD_MAP(KB_JP, 0, mkbd_keydesc_jp),
|
||||
KBD_MAP(KB_UK, KB_JP, mkbd_keydesc_uk),
|
||||
KBD_MAP(KB_US, KB_JP, mkbd_keydesc_us),
|
||||
KBD_MAP(KB_JP | KB_SWAPCTRLCAPS, KB_JP, mkbd_keydesc_swapctrlcaps),
|
||||
KBD_MAP(KB_UK | KB_SWAPCTRLCAPS, KB_UK, mkbd_keydesc_swapctrlcaps),
|
||||
KBD_MAP(KB_US | KB_SWAPCTRLCAPS, KB_US, mkbd_keydesc_swapctrlcaps),
|
||||
{0, 0, 0, 0}
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue