From 7c772976fb1b5694763737a2894012dc86a8c7c7 Mon Sep 17 00:00:00 2001 From: nicm Date: Mon, 23 Jan 2023 09:36:39 +0000 Subject: [PATCH] Add Backtab key, based on a change from Crystal Kolipe kolipe.c at exoticsilicon dot com. ok miod --- sys/arch/armv7/exynos/crosec_kbd.c | 4 ++-- sys/arch/luna88k/dev/omkbdmap.c | 4 ++-- sys/dev/adb/akbdmap.h | 4 ++-- sys/dev/hil/hilkbdmap.c | 6 +++--- sys/dev/pckbc/wskbdmap_mfii.c | 4 ++-- sys/dev/sun/sunkbdmap.c | 4 ++-- sys/dev/wscons/wsemul_vt100_keys.c | 5 ++++- sys/dev/wscons/wsksymdef.h | 3 ++- 8 files changed, 19 insertions(+), 15 deletions(-) diff --git a/sys/arch/armv7/exynos/crosec_kbd.c b/sys/arch/armv7/exynos/crosec_kbd.c index 75256439095..886ff51c9cf 100644 --- a/sys/arch/armv7/exynos/crosec_kbd.c +++ b/sys/arch/armv7/exynos/crosec_kbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crosec_kbd.c,v 1.4 2021/03/25 04:12:01 jsg Exp $ */ +/* $OpenBSD: crosec_kbd.c,v 1.5 2023/01/23 09:36:39 nicm Exp $ */ /* * Copyright (c) 2013 Patrick Wildt * @@ -62,7 +62,7 @@ static const keysym_t cros_ec_keyboard_keydesc_us[] = { KC(19), KS_h, KC(24), KS_BackSpace, KC(26), KS_Control_L, - KC(27), KS_Tab, + KC(27), KS_Tab, KS_Backtab, KC(29), KS_t, KC(32), KS_y, KC(42), KS_5, diff --git a/sys/arch/luna88k/dev/omkbdmap.c b/sys/arch/luna88k/dev/omkbdmap.c index 0f582d1d472..098051778ec 100644 --- a/sys/arch/luna88k/dev/omkbdmap.c +++ b/sys/arch/luna88k/dev/omkbdmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: omkbdmap.c,v 1.3 2017/11/03 06:54:06 aoyama Exp $ */ +/* $OpenBSD: omkbdmap.c,v 1.4 2023/01/23 09:36:39 nicm Exp $ */ /* Partially from: * $NetBSD: lunaws.c,v 1.6 2002/03/17 19:40:42 atatat Exp $ @@ -181,7 +181,7 @@ const u_int8_t omkbd_raw[0x80] = { static const keysym_t omkbd_keydesc_jp[] = { /* pos command normal shifted */ - KC(0x09), KS_Tab, + KC(0x09), KS_Tab, KS_Backtab, KC(0x0a), KS_Cmd1, KS_Control_L, KC(0x0b), KS_Mode_switch, /* Kana */ KC(0x0c), KS_Shift_R, diff --git a/sys/dev/adb/akbdmap.h b/sys/dev/adb/akbdmap.h index 798e3338869..14a08e53c3e 100644 --- a/sys/dev/adb/akbdmap.h +++ b/sys/dev/adb/akbdmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: akbdmap.h,v 1.10 2014/09/06 10:18:34 mpi Exp $ */ +/* $OpenBSD: akbdmap.h,v 1.11 2023/01/23 09:36:39 nicm Exp $ */ /* $NetBSD: akbdmap.h,v 1.7 2005/05/05 22:29:41 abs Exp $ */ /*- @@ -219,7 +219,7 @@ static const keysym_t akbd_keydesc_us[] = { KC(45), KS_n, KC(46), KS_m, KC(47), KS_period, KS_greater, - KC(48), KS_Tab, + KC(48), KS_Tab, KS_Backtab, KC(49), KS_space, KC(50), KS_grave, KS_asciitilde, KC(51), KS_Cmd_ResetEmul, KS_Delete, diff --git a/sys/dev/hil/hilkbdmap.c b/sys/dev/hil/hilkbdmap.c index 27152d258c4..9a11f58d6d2 100644 --- a/sys/dev/hil/hilkbdmap.c +++ b/sys/dev/hil/hilkbdmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hilkbdmap.c,v 1.8 2021/11/16 10:20:52 landry Exp $ */ +/* $OpenBSD: hilkbdmap.c,v 1.9 2023/01/23 09:36:39 nicm Exp $ */ /* * Copyright (c) 2003, Miodrag Vallat. * All rights reserved. @@ -218,7 +218,7 @@ static const keysym_t hilkbd_keydesc_us[] = { KC(35), KS_Cmd_Screen10, KS_f11, /* also KS_KP_F3 */ KC(36), KS_KP_Delete, KS_KP_Decimal, KC(37), KS_Cmd_Screen8, KS_f9, /* also KS_KP_F1 */ - KC(38), KS_Tab, /* numeric pad */ + KC(38), KS_Tab, KS_Backtab, /* numeric pad */ KC(39), KS_Cmd_Screen11, KS_f12, /* also KS_KP_F4 */ KC(40), KS_h, KS_H, KS_yen, KC(41), KS_g, KS_G, KS_currency, @@ -235,7 +235,7 @@ static const keysym_t hilkbd_keydesc_us[] = { KC(52), KS_e, KS_E, KS_ae, KC(53), KS_w, KS_W, KS_asciitilde, KC(54), KS_q, KS_Q, KS_periodcentered, - KC(55), KS_Tab, + KC(55), KS_Tab, KS_Backtab, KC(56), KS_7, KS_ampersand, KS_backslash, KC(57), KS_6, KS_asciicircum, KS_asciicircum, KC(58), KS_5, KS_percent, KS_onehalf, diff --git a/sys/dev/pckbc/wskbdmap_mfii.c b/sys/dev/pckbc/wskbdmap_mfii.c index cb77017dedf..f945f4517c2 100644 --- a/sys/dev/pckbc/wskbdmap_mfii.c +++ b/sys/dev/pckbc/wskbdmap_mfii.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wskbdmap_mfii.c,v 1.47 2021/05/01 16:11:16 visa Exp $ */ +/* $OpenBSD: wskbdmap_mfii.c,v 1.48 2023/01/23 09:36:40 nicm Exp $ */ /* $NetBSD: wskbdmap_mfii.c,v 1.15 2000/05/19 16:40:04 drochner Exp $ */ /* @@ -59,7 +59,7 @@ static const keysym_t pckbd_keydesc_us[] = { KC(12), KS_minus, KS_underscore, KC(13), KS_equal, KS_plus, KC(14), KS_Cmd_ResetEmul, KS_Delete, - KC(15), KS_Tab, + KC(15), KS_Tab, KS_Backtab, KC(16), KS_q, KC(17), KS_w, KC(18), KS_e, diff --git a/sys/dev/sun/sunkbdmap.c b/sys/dev/sun/sunkbdmap.c index b37cf6724c9..c084bdde12e 100644 --- a/sys/dev/sun/sunkbdmap.c +++ b/sys/dev/sun/sunkbdmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sunkbdmap.c,v 1.6 2014/01/26 17:48:08 miod Exp $ */ +/* $OpenBSD: sunkbdmap.c,v 1.7 2023/01/23 09:36:40 nicm Exp $ */ /* * Copyright (c) 2002, 2003 Miodrag Vallat. @@ -239,7 +239,7 @@ const keysym_t sunkbd_keydesc_us[] = { KC(0x32), KS_KP_Delete, KS_KP_Decimal, KC(0x33), KS_Copy, KC(0x34), KS_Home, - KC(0x35), KS_Tab, + KC(0x35), KS_Tab, KS_Backtab, KC(0x36), KS_q, KC(0x37), KS_w, KC(0x38), KS_e, diff --git a/sys/dev/wscons/wsemul_vt100_keys.c b/sys/dev/wscons/wsemul_vt100_keys.c index 5783649bd10..ce824687b3c 100644 --- a/sys/dev/wscons/wsemul_vt100_keys.c +++ b/sys/dev/wscons/wsemul_vt100_keys.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsemul_vt100_keys.c,v 1.8 2015/03/14 03:38:50 jsg Exp $ */ +/* $OpenBSD: wsemul_vt100_keys.c,v 1.9 2023/01/23 09:36:40 nicm Exp $ */ /* $NetBSD: wsemul_vt100_keys.c,v 1.3 1999/04/22 20:06:02 mycroft Exp $ */ /* @@ -174,6 +174,9 @@ wsemul_vt100_translate(void *cookie, kbd_t layout, keysym_t in, case KS_KP_Next: *out = "\033[6~"; return (4); + case KS_Backtab: + *out = "\033[Z"; + return (3); case KS_Home: case KS_KP_Home: *out = "\033[7~"; diff --git a/sys/dev/wscons/wsksymdef.h b/sys/dev/wscons/wsksymdef.h index d8ce33aa0a7..881510d1e7b 100644 --- a/sys/dev/wscons/wsksymdef.h +++ b/sys/dev/wscons/wsksymdef.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wsksymdef.h,v 1.39 2021/09/20 17:32:39 anton Exp $ */ +/* $OpenBSD: wsksymdef.h,v 1.40 2023/01/23 09:36:40 nicm Exp $ */ /* $NetBSD: wsksymdef.h,v 1.34.4.1 2000/07/07 09:49:54 hannken Exp $ */ /*- @@ -626,6 +626,7 @@ #define KS_Open 0xf393 #define KS_Paste 0xf394 #define KS_Cut 0xf395 +#define KS_Backtab 0xf396 #define KS_Menu 0xf3c0 #define KS_Pause 0xf3c1 -- 2.20.1