コミット: b2a09ce2ef5c8996cd2f5154d13eaa97cf434d97 - bhyve_keyboard_layout_patch (git)

FreeBSD bhyve keyboard layout patch

コミットメタ情報

• リビジョン: b2a09ce2ef5c8996cd2f5154d13eaa97cf434d97 (tree)
• 日時: 2021-01-02 12:40:49
• 作者: Koine Yuusuke(koinec) <koinec@user...>
• コミッター: Koine Yuusuke(koinec)

ログメッセージ

kbdlayout: regist old version(2020/05/29-v3: support for QEMU extended keyevent message)

変更サマリ

• modified: kbdlayout_option/bhyve_kbdlayout_fbsd121r.patch
• modified: kbdlayout_option/bhyve_kbdlayout_fbsd13c.patch

差分

--- a/kbdlayout_option/bhyve_kbdlayout_fbsd121r.patch
+++ b/kbdlayout_option/bhyve_kbdlayout_fbsd121r.patch
@@ -1,6 +1,6 @@
 diff -upN bhyve_orig/Makefile bhyve/Makefile
 --- bhyve_orig/Makefile	2020-05-01 11:25:57.446272000 +0900
-+++ bhyve/Makefile	2020-04-28 21:10:08.503651000 +0900
++++ bhyve/Makefile	2020-05-28 09:25:47.142698000 +0900
 @@ -95,4 +95,6 @@ CFLAGS+=-DGDB_LOG
  
  WARNS?=	2
@@ -8,9 +8,41 @@ diff -upN bhyve_orig/Makefile bhyve/Makefile
 +SUBDIR=	kbdlayout
 +
  .include <bsd.prog.mk>
+diff -upN bhyve_orig/atkbdc.c bhyve/atkbdc.c
+--- bhyve_orig/atkbdc.c	2020-05-01 11:25:57.441270000 +0900
++++ bhyve/atkbdc.c	2020-05-28 16:28:56.411057000 +0900
+@@ -211,24 +211,25 @@ atkbdc_kbd_read(struct atkbdc_softc *sc)
+ 		0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
+ 	};
+ 	uint8_t val;
++	uint8_t trans;
+ 	uint8_t release = 0;
+ 
+ 	assert(pthread_mutex_isowned_np(&sc->mtx));
+ 
+ 	if (sc->ram[0] & KBD_TRANSLATION) {
+-		while (ps2kbd_read(sc->ps2kbd_sc, &val) != -1) {
++		while (ps2kbd_read(sc->ps2kbd_sc, &val, &trans) != -1) {
+ 			if (val == 0xf0) {
+ 				release = 0x80;
+ 				continue;
+ 			} else {
+-				val = translation[val] | release;
++				val = ((trans) ? translation[val] : val) | release;
+ 			}
+ 			atkbdc_kbd_queue_data(sc, val);
+ 			break;
+ 		}
+ 	} else {
+ 		while (sc->kbd.bcnt < FIFOSZ) {
+-			if (ps2kbd_read(sc->ps2kbd_sc, &val) != -1)
++			if (ps2kbd_read(sc->ps2kbd_sc, &val, &trans) != -1)
+ 				atkbdc_kbd_queue_data(sc, val);
+ 			else
+ 				break;
 diff -upN bhyve_orig/bhyve.8 bhyve/bhyve.8
 --- bhyve_orig/bhyve.8	2020-05-01 11:25:57.441891000 +0900
-+++ bhyve/bhyve.8	2020-05-01 12:24:39.448446000 +0900
++++ bhyve/bhyve.8	2020-05-28 14:26:02.139585000 +0900
 @@ -44,6 +44,7 @@
  .Op Ar ,threads=n
  .Oc
@@ -19,7 +51,7 @@ diff -upN bhyve_orig/bhyve.8 bhyve/bhyve.8
  .Op Fl l Ar help|lpcdev Ns Op , Ns Ar conf
  .Op Fl m Ar memsize Ns Op Ar K|k|M|m|G|g|T|t
  .Op Fl p Ar vcpu:hostcpu
-@@ -144,6 +145,12 @@ Print help message and exit.
+@@ -144,6 +145,13 @@ Print help message and exit.
  .It Fl H
  Yield the virtual CPU thread when a HLT instruction is detected.
  If this option is not specified, virtual CPUs will use 100% of a host CPU.
@@ -28,13 +60,14 @@ diff -upN bhyve_orig/bhyve.8 bhyve/bhyve.8
 +The value that can be specified sets the file name in
 +.Ar /usr/share/bhyve/kbdlayout .
 +This specification only works when loaded with UEFI mode.(Not working via console or SSH)
-+If not specified, the US keyboard layout(default) is specified.
++If you are using a VNC client that supports QEMU Extended Key Event Message (e.g. TigerVNC), don't need to specify this option.
++If you are using a VNC client that doesn't support it(e.g. tightVNC), and you don't specify this option, the US keyboard layout(default) is specified.
  .It Fl l Op Ar help|lpcdev Ns Op , Ns Ar conf
  Allow devices behind the LPC PCI-ISA bridge to be configured.
  The only supported devices are the TTY-class devices
 diff -upN bhyve_orig/bhyverun.c bhyve/bhyverun.c
 --- bhyve_orig/bhyverun.c	2020-05-01 11:25:57.439138000 +0900
-+++ bhyve/bhyverun.c	2020-05-01 11:56:57.568136000 +0900
++++ bhyve/bhyverun.c	2020-05-28 09:25:47.144660000 +0900
 @@ -165,6 +165,8 @@ char *vmname;
  int guest_ncpus;
  uint16_t cores, maxcpus, sockets, threads;
@@ -84,7 +117,7 @@ diff -upN bhyve_orig/bhyverun.c bhyve/bhyverun.c
  			if (strncmp(optarg, "help", strlen(optarg)) == 0) {
 diff -upN bhyve_orig/bhyverun.h bhyve/bhyverun.h
 --- bhyve_orig/bhyverun.h	2020-05-01 11:25:57.444136000 +0900
-+++ bhyve/bhyverun.h	2020-04-28 20:51:08.322277000 +0900
++++ bhyve/bhyverun.h	2020-05-28 09:25:47.145111000 +0900
 @@ -39,6 +39,7 @@ extern int guest_ncpus;
  extern uint16_t cores, sockets, threads;
  extern char *guest_uuid_str;
@@ -93,10 +126,47 @@ diff -upN bhyve_orig/bhyverun.h bhyve/bhyverun.h
  
  void *paddr_guest2host(struct vmctx *ctx, uintptr_t addr, size_t len);
  
+diff -upN bhyve_orig/console.c bhyve/console.c
+--- bhyve_orig/console.c	2020-05-01 11:25:57.441001000 +0900
++++ bhyve/console.c	2020-05-28 10:47:10.699395000 +0900
+@@ -106,10 +106,10 @@ console_ptr_register(ptr_event_func_t event_cb, void *
+ }
+ 
+ void
+-console_key_event(int down, uint32_t keysym)
++console_key_event(int down, uint32_t keysym, uint32_t keycode)
+ {
+ 	if (console.kbd_event_cb)
+-		(*console.kbd_event_cb)(down, keysym, console.kbd_arg);
++		(*console.kbd_event_cb)(down, keysym, keycode, console.kbd_arg);
+ }
+ 
+ void
+diff -upN bhyve_orig/console.h bhyve/console.h
+--- bhyve_orig/console.h	2020-05-01 11:25:57.446732000 +0900
++++ bhyve/console.h	2020-05-28 10:47:47.290438000 +0900
+@@ -34,7 +34,7 @@
+ struct bhyvegc;
+ 
+ typedef void (*fb_render_func_t)(struct bhyvegc *gc, void *arg);
+-typedef void (*kbd_event_func_t)(int down, uint32_t keysym, void *arg);
++typedef void (*kbd_event_func_t)(int down, uint32_t keysym, uint32_t keycode, void *arg);
+ typedef void (*ptr_event_func_t)(uint8_t mask, int x, int y, void *arg);
+ 
+ void console_init(int w, int h, void *fbaddr);
+@@ -47,7 +47,7 @@ void console_fb_register(fb_render_func_t render_cb, v
+ void console_refresh(void);
+ 
+ void console_kbd_register(kbd_event_func_t event_cb, void *arg, int pri);
+-void console_key_event(int down, uint32_t keysym);
++void console_key_event(int down, uint32_t keysym, uint32_t keycode);
+ 
+ void console_ptr_register(ptr_event_func_t event_cb, void *arg, int pri);
+ void console_ptr_event(uint8_t button, int x, int y);
 Common subdirectories: bhyve_orig/kbdlayout and bhyve/kbdlayout
 diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
 --- bhyve_orig/ps2kbd.c	2020-05-01 11:25:57.446548000 +0900
-+++ bhyve/ps2kbd.c	2020-04-30 21:16:15.390220000 +0900
++++ bhyve/ps2kbd.c	2020-05-28 16:28:16.325233000 +0900
 @@ -31,15 +31,20 @@
  __FBSDID("$FreeBSD: releng/12.1/usr.sbin/bhyve/ps2kbd.c 341757 2018-12-09 06:41:57Z araujo $");
  
@@ -118,7 +188,7 @@ diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
  #include "atkbdc.h"
  #include "console.h"
  
-@@ -58,6 +63,8 @@ __FBSDID("$FreeBSD: releng/12.1/usr.sbin/bhyve/ps2kbd.
+@@ -58,8 +63,11 @@ __FBSDID("$FreeBSD: releng/12.1/usr.sbin/bhyve/ps2kbd.
  
  #define	PS2KBD_FIFOSZ		16
  
@@ -126,8 +196,11 @@ diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
 +
  struct fifo {
  	uint8_t	buf[PS2KBD_FIFOSZ];
++	uint8_t	trans[PS2KBD_FIFOSZ];
  	int	rindex;		/* index to read from */
-@@ -86,7 +93,7 @@ struct extended_translation {
+ 	int	windex;		/* index to write to */
+ 	int	num;		/* number of bytes in the fifo */
+@@ -86,7 +94,7 @@ struct extended_translation {
  /*
   * FIXME: Pause/break and Print Screen/SysRq require special handling.
   */
@@ -136,7 +209,7 @@ diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
  		{0xff08, 0x66},		/* Back space */
  		{0xff09, 0x0d},		/* Tab */
  		{0xff0d, 0x5a},		/* Return */
-@@ -158,7 +165,7 @@ static const struct extended_translation extended_tran
+@@ -158,7 +166,7 @@ static const struct extended_translation extended_tran
  };
  
  /* ASCII to type 2 scancode lookup table */
@@ -145,16 +218,197 @@ diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
  		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-@@ -316,7 +323,7 @@ ps2kbd_keysym_queue(struct ps2kbd_softc *sc,
+@@ -197,26 +205,28 @@ fifo_reset(struct ps2kbd_softc *sc)
+ }
+ 
+ static void
+-fifo_put(struct ps2kbd_softc *sc, uint8_t val)
++fifo_put(struct ps2kbd_softc *sc, uint8_t val, uint8_t trans)
+ {
+ 	struct fifo *fifo;
+ 
+ 	fifo = &sc->fifo;
+ 	if (fifo->num < fifo->size) {
+ 		fifo->buf[fifo->windex] = val;
++		fifo->trans[fifo->windex] = trans;
+ 		fifo->windex = (fifo->windex + 1) % fifo->size;
+ 		fifo->num++;
+ 	}
+ }
+ 
+ static int
+-fifo_get(struct ps2kbd_softc *sc, uint8_t *val)
++fifo_get(struct ps2kbd_softc *sc, uint8_t *val, uint8_t *trans)
+ {
+ 	struct fifo *fifo;
+ 
+ 	fifo = &sc->fifo;
+ 	if (fifo->num > 0) {
+ 		*val = fifo->buf[fifo->rindex];
++		*trans = fifo->trans[fifo->rindex];
+ 		fifo->rindex = (fifo->rindex + 1) % fifo->size;
+ 		fifo->num--;
+ 		return (0);
+@@ -226,12 +236,12 @@ fifo_get(struct ps2kbd_softc *sc, uint8_t *val)
+ }
+ 
+ int
+-ps2kbd_read(struct ps2kbd_softc *sc, uint8_t *val)
++ps2kbd_read(struct ps2kbd_softc *sc, uint8_t *val, uint8_t *trans)
+ {
+ 	int retval;
+ 
+ 	pthread_mutex_lock(&sc->mtx);
+-	retval = fifo_get(sc, val);
++	retval = fifo_get(sc, val, trans);
+ 	pthread_mutex_unlock(&sc->mtx);
+ 
+ 	return (retval);
+@@ -244,13 +254,13 @@ ps2kbd_write(struct ps2kbd_softc *sc, uint8_t val)
+ 	if (sc->curcmd) {
+ 		switch (sc->curcmd) {
+ 		case PS2KC_SET_TYPEMATIC:
+-			fifo_put(sc, PS2KC_ACK);
++			fifo_put(sc, PS2KC_ACK, 0);
+ 			break;
+ 		case PS2KC_SET_SCANCODE_SET:
+-			fifo_put(sc, PS2KC_ACK);
++			fifo_put(sc, PS2KC_ACK, 0);
+ 			break;
+ 		case PS2KC_SET_LEDS:
+-			fifo_put(sc, PS2KC_ACK);
++			fifo_put(sc, PS2KC_ACK, 0);
+ 			break;
+ 		default:
+ 			fprintf(stderr, "Unhandled ps2 keyboard current "
+@@ -261,41 +271,41 @@ ps2kbd_write(struct ps2kbd_softc *sc, uint8_t val)
+ 	} else {
+ 		switch (val) {
+ 		case 0x00:
+-			fifo_put(sc, PS2KC_ACK);
++			fifo_put(sc, PS2KC_ACK, 0);
+ 			break;
+ 		case PS2KC_RESET_DEV:
+ 			fifo_reset(sc);
+-			fifo_put(sc, PS2KC_ACK);
+-			fifo_put(sc, PS2KC_BAT_SUCCESS);
++			fifo_put(sc, PS2KC_ACK, 0);
++			fifo_put(sc, PS2KC_BAT_SUCCESS, 0);
+ 			break;
+ 		case PS2KC_DISABLE:
+ 			sc->enabled = false;
+-			fifo_put(sc, PS2KC_ACK);
++			fifo_put(sc, PS2KC_ACK, 0);
+ 			break;
+ 		case PS2KC_ENABLE:
+ 			sc->enabled = true;
+ 			fifo_reset(sc);
+-			fifo_put(sc, PS2KC_ACK);
++			fifo_put(sc, PS2KC_ACK, 0);
+ 			break;
+ 		case PS2KC_SET_TYPEMATIC:
+ 			sc->curcmd = val;
+-			fifo_put(sc, PS2KC_ACK);
++			fifo_put(sc, PS2KC_ACK, 0);
+ 			break;
+ 		case PS2KC_SEND_DEV_ID:
+-			fifo_put(sc, PS2KC_ACK);
+-			fifo_put(sc, 0xab);
+-			fifo_put(sc, 0x83);
++			fifo_put(sc, PS2KC_ACK, 0);
++			fifo_put(sc, 0xab, 0);
++			fifo_put(sc, 0x83, 0);
+ 			break;
+ 		case PS2KC_SET_SCANCODE_SET:
+ 			sc->curcmd = val;
+-			fifo_put(sc, PS2KC_ACK);
++			fifo_put(sc, PS2KC_ACK, 0);
+ 			break;
+ 		case PS2KC_ECHO:
+-			fifo_put(sc, PS2KC_ECHO);
++			fifo_put(sc, PS2KC_ECHO, 0);
+ 			break;
+ 		case PS2KC_SET_LEDS:
+ 			sc->curcmd = val;
+-			fifo_put(sc, PS2KC_ACK);
++			fifo_put(sc, PS2KC_ACK, 0);
+ 			break;
+ 		default:
+ 			fprintf(stderr, "Unhandled ps2 keyboard command "
+@@ -311,26 +321,32 @@ ps2kbd_write(struct ps2kbd_softc *sc, uint8_t val)
+  */
+ static void
+ ps2kbd_keysym_queue(struct ps2kbd_softc *sc,
+-    int down, uint32_t keysym)
++    int down, uint32_t keysym, uint32_t keycode)
+ {
  	assert(pthread_mutex_isowned_np(&sc->mtx));
  	int e0_prefix, found;
  	uint8_t code;
 -	const struct extended_translation *trans;
 +	struct extended_translation *trans;
  
- 	found = 0;
- 	if (keysym < 0x80) {
-@@ -366,10 +373,91 @@ ps2kbd_event(int down, uint32_t keysym, void *arg)
+-	found = 0;
+-	if (keysym < 0x80) {
+-		code = ascii_translations[keysym];
+-		e0_prefix = 0;
++	if (keycode) {
++		code = (uint8_t)(keycode & 0x7f);
++		e0_prefix = ((keycode & 0x80) ?  SCANCODE_E0_PREFIX : 0);
+ 		found = 1;
+ 	} else {
+-		for (trans = &(extended_translations[0]); trans->keysym != 0;
+-		    trans++) {
+-			if (keysym == trans->keysym) {
+-				code = trans->scancode;
+-				e0_prefix = trans->flags & SCANCODE_E0_PREFIX;
+-				found = 1;
+-				break;
++		found = 0;
++		if (keysym < 0x80) {
++			code = ascii_translations[keysym];
++			e0_prefix = 0;
++			found = 1;
++		} else {
++			for (trans = &(extended_translations[0]); trans->keysym != 0;
++		    	trans++) {
++				if (keysym == trans->keysym) {
++					code = trans->scancode;
++					e0_prefix = trans->flags & SCANCODE_E0_PREFIX;
++					found = 1;
++					break;
++				}
+ 			}
+ 		}
+ 	}
+@@ -341,14 +357,14 @@ ps2kbd_keysym_queue(struct ps2kbd_softc *sc,
+ 	}
+ 
+ 	if (e0_prefix)
+-		fifo_put(sc, 0xe0);
++		fifo_put(sc, 0xe0, 0);
+ 	if (!down)
+-		fifo_put(sc, 0xf0);
+-	fifo_put(sc, code);
++		fifo_put(sc, 0xf0, 0);
++	fifo_put(sc, code, (keycode ? 0 : 1));
+ }
+ 
+ static void
+-ps2kbd_event(int down, uint32_t keysym, void *arg)
++ps2kbd_event(int down, uint32_t keysym, uint32_t keycode, void *arg)
+ {
+ 	struct ps2kbd_softc *sc = arg;
+ 	int fifo_full;
+@@ -359,17 +375,98 @@ ps2kbd_event(int down, uint32_t keysym, void *arg)
+ 		return;
+ 	}
+ 	fifo_full = sc->fifo.num == PS2KBD_FIFOSZ;
+-	ps2kbd_keysym_queue(sc, down, keysym);
++	ps2kbd_keysym_queue(sc, down, keysym, keycode);
+ 	pthread_mutex_unlock(&sc->mtx);
+ 
+ 	if (!fifo_full)
  		atkbdc_event(sc->atkbdc_sc, 1);
  }
  
@@ -246,3 +500,156 @@ diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
  
  	sc = calloc(1, sizeof (struct ps2kbd_softc));
  	pthread_mutex_init(&sc->mtx, NULL);
+diff -upN bhyve_orig/ps2kbd.h bhyve/ps2kbd.h
+--- bhyve_orig/ps2kbd.h	2020-05-01 11:25:57.441775000 +0900
++++ bhyve/ps2kbd.h	2020-05-28 13:42:50.937234000 +0900
+@@ -35,7 +35,7 @@ struct atkbdc_softc;
+ 
+ struct ps2kbd_softc *ps2kbd_init(struct atkbdc_softc *sc);
+ 
+-int ps2kbd_read(struct ps2kbd_softc *sc, uint8_t *val);
++int ps2kbd_read(struct ps2kbd_softc *sc, uint8_t *val, uint8_t *trans);
+ void ps2kbd_write(struct ps2kbd_softc *sc, uint8_t val);
+ 
+ #endif /* _PS2KBD_H_ */
+diff -upN bhyve_orig/rfb.c bhyve/rfb.c
+--- bhyve_orig/rfb.c	2020-05-01 11:25:57.446856000 +0900
++++ bhyve/rfb.c	2020-05-28 13:16:38.135646000 +0900
+@@ -97,7 +97,10 @@ struct rfb_softc {
+ 	bool	enc_raw_ok;
+ 	bool	enc_zlib_ok;
+ 	bool	enc_resize_ok;
++	bool	enc_extkeyevent_ok;
+ 
++	bool	enc_extkeyevent_send;
++
+ 	z_stream	zstream;
+ 	uint8_t		*zbuf;
+ 	int		zbuflen;
+@@ -143,7 +146,10 @@ struct rfb_pixfmt_msg {
+ #define	RFB_ENCODING_RAW		0
+ #define	RFB_ENCODING_ZLIB		6
+ #define	RFB_ENCODING_RESIZE		-223
++#define	RFB_ENCODING_EXT_KEYEVENT	-258
+ 
++#define	RFB_CLIENTMSG_EXT_KEYEVENT	0
++
+ #define	RFB_MAX_WIDTH			2000
+ #define	RFB_MAX_HEIGHT			1200
+ #define	RFB_ZLIB_BUFSZ			RFB_MAX_WIDTH*RFB_MAX_HEIGHT*4
+@@ -170,6 +176,19 @@ struct rfb_key_msg {
+ 	uint8_t		type;
+ 	uint8_t		down;
+ 	uint16_t	pad;
++	uint32_t	sym;
++};
++
++struct rfb_client_msg {
++	uint8_t		type;
++	uint8_t		subtype;
++};
++
++struct rfb_extended_key_msg {
++	uint8_t		type;
++	uint8_t		subtype;
++	uint16_t	down;
++	uint32_t	sym;
+ 	uint32_t	code;
+ };
+ 
+@@ -248,6 +267,27 @@ rfb_send_resize_update_msg(struct rfb_softc *rc, int c
+ }
+ 
+ static void
++rfb_send_extended_keyevent_update_msg(struct rfb_softc *rc, int cfd)
++{
++	struct rfb_srvr_updt_msg supdt_msg;
++	struct rfb_srvr_rect_hdr srect_hdr;
++
++	/* Number of rectangles: 1 */
++	supdt_msg.type = 0;
++	supdt_msg.pad = 0;
++	supdt_msg.numrects = htons(1);
++	stream_write(cfd, &supdt_msg, sizeof(struct rfb_srvr_updt_msg));
++
++	/* Rectangle header */
++	srect_hdr.x = htons(0);
++	srect_hdr.y = htons(0);
++	srect_hdr.width = htons(rc->width);
++	srect_hdr.height = htons(rc->height);
++	srect_hdr.encoding = htonl(RFB_ENCODING_EXT_KEYEVENT);
++	stream_write(cfd, &srect_hdr, sizeof(struct rfb_srvr_rect_hdr));
++}
++
++static void
+ rfb_recv_set_pixfmt_msg(struct rfb_softc *rc, int cfd)
+ {
+ 	struct rfb_pixfmt_msg pixfmt_msg;
+@@ -281,6 +321,9 @@ rfb_recv_set_encodings_msg(struct rfb_softc *rc, int c
+ 		case RFB_ENCODING_RESIZE:
+ 			rc->enc_resize_ok = true;
+ 			break;
++		case RFB_ENCODING_EXT_KEYEVENT:
++			rc->enc_extkeyevent_ok = true;
++			break;
+ 		}
+ 	}
+ }
+@@ -646,6 +689,11 @@ rfb_recv_update_msg(struct rfb_softc *rc, int cfd, int
+ 			rfb_send_resize_update_msg(rc, cfd);
+ 	}
+ 
++	if (rc->enc_extkeyevent_ok && (!rc->enc_extkeyevent_send)) {
++		rfb_send_extended_keyevent_update_msg(rc, cfd);
++		rc->enc_extkeyevent_send = true;
++	}
++
+ 	if (discardonly)
+ 		return;
+ 
+@@ -659,10 +707,24 @@ rfb_recv_key_msg(struct rfb_softc *rc, int cfd)
+ 
+ 	(void)stream_read(cfd, ((void *)&key_msg) + 1, sizeof(key_msg) - 1);
+ 
+-	console_key_event(key_msg.down, htonl(key_msg.code));
++	console_key_event(key_msg.down, htonl(key_msg.sym), htonl(0));
+ }
+ 
+ static void
++rfb_recv_client_msg(struct rfb_softc *rc, int cfd)
++{
++	struct rfb_client_msg client_msg;
++	struct rfb_extended_key_msg extkey_msg;
++
++	(void)stream_read(cfd, ((void *)&client_msg) + 1, sizeof(client_msg) - 1);
++
++	if (client_msg.subtype == RFB_CLIENTMSG_EXT_KEYEVENT ) {
++		(void)stream_read(cfd, ((void *)&extkey_msg) + 2, sizeof(extkey_msg) - 2);
++		console_key_event((int)extkey_msg.down, htonl(extkey_msg.sym), htonl(extkey_msg.code));
++	}
++}
++
++static void
+ rfb_recv_ptr_msg(struct rfb_softc *rc, int cfd)
+ {
+ 	struct rfb_ptr_msg ptr_msg;
+@@ -901,6 +963,9 @@ rfb_handle(struct rfb_softc *rc, int cfd)
+ 		case 6:
+ 			rfb_recv_cuttext_msg(rc, cfd);
+ 			break;
++		case 255:
++			rfb_recv_client_msg(rc, cfd);
++			break;
+ 		default:
+ 			WPRINTF(("rfb unknown cli-code %d!\n", buf[0] & 0xff));
+ 			goto done;
+@@ -935,6 +1000,9 @@ rfb_thr(void *arg)
+ 		rc->enc_raw_ok = false;
+ 		rc->enc_zlib_ok = false;
+ 		rc->enc_resize_ok = false;
++		rc->enc_extkeyevent_ok = false;
++
++		rc->enc_extkeyevent_send = false;
+ 
+ 		cfd = accept(rc->sfd, NULL, NULL);
+ 		if (rc->conn_wait) {

--- a/kbdlayout_option/bhyve_kbdlayout_fbsd13c.patch
+++ b/kbdlayout_option/bhyve_kbdlayout_fbsd13c.patch
@@ -1,6 +1,6 @@
 diff -upN bhyve_orig/Makefile bhyve/Makefile
 --- bhyve_orig/Makefile	2020-04-23 09:06:39.000000000 +0900
-+++ bhyve/Makefile	2020-05-02 13:09:01.382770000 +0900
++++ bhyve/Makefile	2020-05-29 18:03:10.627095000 +0900
 @@ -99,4 +99,6 @@ CFLAGS+=-DGDB_LOG
  
  WARNS?=	2
@@ -8,9 +8,41 @@ diff -upN bhyve_orig/Makefile bhyve/Makefile
 +SUBDIR=	kbdlayout
 +
  .include <bsd.prog.mk>
+diff -upN bhyve_orig/atkbdc.c bhyve/atkbdc.c
+--- bhyve_orig/atkbdc.c	2020-04-23 09:06:39.000000000 +0900
++++ bhyve/atkbdc.c	2020-05-29 18:03:10.653893000 +0900
+@@ -211,24 +211,25 @@ atkbdc_kbd_read(struct atkbdc_softc *sc)
+ 		0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
+ 	};
+ 	uint8_t val;
++	uint8_t trans;
+ 	uint8_t release = 0;
+ 
+ 	assert(pthread_mutex_isowned_np(&sc->mtx));
+ 
+ 	if (sc->ram[0] & KBD_TRANSLATION) {
+-		while (ps2kbd_read(sc->ps2kbd_sc, &val) != -1) {
++		while (ps2kbd_read(sc->ps2kbd_sc, &val, &trans) != -1) {
+ 			if (val == 0xf0) {
+ 				release = 0x80;
+ 				continue;
+ 			} else {
+-				val = translation[val] | release;
++				val = ((trans) ? translation[val] : val) | release;
+ 			}
+ 			atkbdc_kbd_queue_data(sc, val);
+ 			break;
+ 		}
+ 	} else {
+ 		while (sc->kbd.bcnt < FIFOSZ) {
+-			if (ps2kbd_read(sc->ps2kbd_sc, &val) != -1)
++			if (ps2kbd_read(sc->ps2kbd_sc, &val, &trans) != -1)
+ 				atkbdc_kbd_queue_data(sc, val);
+ 			else
+ 				break;
 diff -upN bhyve_orig/bhyve.8 bhyve/bhyve.8
 --- bhyve_orig/bhyve.8	2020-04-23 09:06:39.000000000 +0900
-+++ bhyve/bhyve.8	2020-05-02 13:11:28.198679000 +0900
++++ bhyve/bhyve.8	2020-05-29 18:11:54.290185000 +0900
 @@ -47,6 +47,7 @@
  .Sm on
  .Op Fl G Ar port
@@ -19,7 +51,7 @@ diff -upN bhyve_orig/bhyve.8 bhyve/bhyve.8
  .Oo Fl l
  .Sm off
  .Cm help | Ar lpcdev Op Cm \&, Ar conf
-@@ -161,6 +162,12 @@ Print help message and exit.
+@@ -161,6 +162,13 @@ Print help message and exit.
  .It Fl H
  Yield the virtual CPU thread when a HLT instruction is detected.
  If this option is not specified, virtual CPUs will use 100% of a host CPU.
@@ -28,13 +60,14 @@ diff -upN bhyve_orig/bhyve.8 bhyve/bhyve.8
 +The value that can be specified sets the file name in
 +.Ar /usr/share/bhyve/kbdlayout .
 +This specification only works when loaded with UEFI mode.(Not working via console or SSH)
-+If not specified, the US keyboard layout(default) is specified.
++If you are using a VNC client that supports QEMU Extended Key Event Message (e.g. TigerVNC), don't need to specify this option.
++If you are using a VNC client that doesn't support it(e.g. tightVNC), and you don't specify this option, the US keyboard layout(default) is specified.
  .It Fl l Op Ar help|lpcdev Ns Op , Ns Ar conf
  Allow devices behind the LPC PCI-ISA bridge to be configured.
  The only supported devices are the TTY-class devices
 diff -upN bhyve_orig/bhyverun.c bhyve/bhyverun.c
 --- bhyve_orig/bhyverun.c	2020-04-23 09:06:39.000000000 +0900
-+++ bhyve/bhyverun.c	2020-05-02 13:09:01.437624000 +0900
++++ bhyve/bhyverun.c	2020-05-29 18:03:10.699642000 +0900
 @@ -168,6 +168,8 @@ char *vmname;
  int guest_ncpus;
  uint16_t cores, maxcpus, sockets, threads;
@@ -84,7 +117,7 @@ diff -upN bhyve_orig/bhyverun.c bhyve/bhyverun.c
  			if (strncmp(optarg, "help", strlen(optarg)) == 0) {
 diff -upN bhyve_orig/bhyverun.h bhyve/bhyverun.h
 --- bhyve_orig/bhyverun.h	2020-04-23 09:06:39.000000000 +0900
-+++ bhyve/bhyverun.h	2020-05-02 13:09:01.444814000 +0900
++++ bhyve/bhyverun.h	2020-05-29 18:03:10.703030000 +0900
 @@ -39,6 +39,7 @@ extern int guest_ncpus;
  extern uint16_t cores, sockets, threads;
  extern char *guest_uuid_str;
@@ -93,10 +126,47 @@ diff -upN bhyve_orig/bhyverun.h bhyve/bhyverun.h
  
  void *paddr_guest2host(struct vmctx *ctx, uintptr_t addr, size_t len);
  
+diff -upN bhyve_orig/console.c bhyve/console.c
+--- bhyve_orig/console.c	2020-04-23 09:06:39.000000000 +0900
++++ bhyve/console.c	2020-05-29 18:03:10.705936000 +0900
+@@ -106,10 +106,10 @@ console_ptr_register(ptr_event_func_t event_cb, void *
+ }
+ 
+ void
+-console_key_event(int down, uint32_t keysym)
++console_key_event(int down, uint32_t keysym, uint32_t keycode)
+ {
+ 	if (console.kbd_event_cb)
+-		(*console.kbd_event_cb)(down, keysym, console.kbd_arg);
++		(*console.kbd_event_cb)(down, keysym, keycode, console.kbd_arg);
+ }
+ 
+ void
+diff -upN bhyve_orig/console.h bhyve/console.h
+--- bhyve_orig/console.h	2020-04-23 09:06:39.000000000 +0900
++++ bhyve/console.h	2020-05-29 18:03:10.708779000 +0900
+@@ -34,7 +34,7 @@
+ struct bhyvegc;
+ 
+ typedef void (*fb_render_func_t)(struct bhyvegc *gc, void *arg);
+-typedef void (*kbd_event_func_t)(int down, uint32_t keysym, void *arg);
++typedef void (*kbd_event_func_t)(int down, uint32_t keysym, uint32_t keycode, void *arg);
+ typedef void (*ptr_event_func_t)(uint8_t mask, int x, int y, void *arg);
+ 
+ void console_init(int w, int h, void *fbaddr);
+@@ -47,7 +47,7 @@ void console_fb_register(fb_render_func_t render_cb, v
+ void console_refresh(void);
+ 
+ void console_kbd_register(kbd_event_func_t event_cb, void *arg, int pri);
+-void console_key_event(int down, uint32_t keysym);
++void console_key_event(int down, uint32_t keysym, uint32_t keycode);
+ 
+ void console_ptr_register(ptr_event_func_t event_cb, void *arg, int pri);
+ void console_ptr_event(uint8_t button, int x, int y);
 Common subdirectories: bhyve_orig/kbdlayout and bhyve/kbdlayout
 diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
 --- bhyve_orig/ps2kbd.c	2020-04-23 09:06:39.000000000 +0900
-+++ bhyve/ps2kbd.c	2020-05-02 13:09:01.462761000 +0900
++++ bhyve/ps2kbd.c	2020-05-29 18:03:10.788431000 +0900
 @@ -31,15 +31,20 @@
  __FBSDID("$FreeBSD: head/usr.sbin/bhyve/ps2kbd.c 356523 2020-01-08 22:55:22Z vmaffione $");
  
@@ -118,7 +188,7 @@ diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
  #include "atkbdc.h"
  #include "debug.h"
  #include "console.h"
-@@ -59,6 +64,8 @@ __FBSDID("$FreeBSD: head/usr.sbin/bhyve/ps2kbd.c 35652
+@@ -59,8 +64,11 @@ __FBSDID("$FreeBSD: head/usr.sbin/bhyve/ps2kbd.c 35652
  
  #define	PS2KBD_FIFOSZ		16
  
@@ -126,8 +196,11 @@ diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
 +
  struct fifo {
  	uint8_t	buf[PS2KBD_FIFOSZ];
++	uint8_t	trans[PS2KBD_FIFOSZ];
  	int	rindex;		/* index to read from */
-@@ -87,7 +94,7 @@ struct extended_translation {
+ 	int	windex;		/* index to write to */
+ 	int	num;		/* number of bytes in the fifo */
+@@ -87,7 +95,7 @@ struct extended_translation {
  /*
   * FIXME: Pause/break and Print Screen/SysRq require special handling.
   */
@@ -136,7 +209,7 @@ diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
  		{0xff08, 0x66},		/* Back space */
  		{0xff09, 0x0d},		/* Tab */
  		{0xff0d, 0x5a},		/* Return */
-@@ -159,7 +166,7 @@ static const struct extended_translation extended_tran
+@@ -159,7 +167,7 @@ static const struct extended_translation extended_tran
  };
  
  /* ASCII to type 2 scancode lookup table */
@@ -145,16 +218,197 @@ diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
  		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-@@ -317,7 +324,7 @@ ps2kbd_keysym_queue(struct ps2kbd_softc *sc,
+@@ -198,26 +206,28 @@ fifo_reset(struct ps2kbd_softc *sc)
+ }
+ 
+ static void
+-fifo_put(struct ps2kbd_softc *sc, uint8_t val)
++fifo_put(struct ps2kbd_softc *sc, uint8_t val, uint8_t trans)
+ {
+ 	struct fifo *fifo;
+ 
+ 	fifo = &sc->fifo;
+ 	if (fifo->num < fifo->size) {
+ 		fifo->buf[fifo->windex] = val;
++		fifo->trans[fifo->windex] = trans;
+ 		fifo->windex = (fifo->windex + 1) % fifo->size;
+ 		fifo->num++;
+ 	}
+ }
+ 
+ static int
+-fifo_get(struct ps2kbd_softc *sc, uint8_t *val)
++fifo_get(struct ps2kbd_softc *sc, uint8_t *val, uint8_t *trans)
+ {
+ 	struct fifo *fifo;
+ 
+ 	fifo = &sc->fifo;
+ 	if (fifo->num > 0) {
+ 		*val = fifo->buf[fifo->rindex];
++		*trans = fifo->trans[fifo->rindex];
+ 		fifo->rindex = (fifo->rindex + 1) % fifo->size;
+ 		fifo->num--;
+ 		return (0);
+@@ -227,12 +237,12 @@ fifo_get(struct ps2kbd_softc *sc, uint8_t *val)
+ }
+ 
+ int
+-ps2kbd_read(struct ps2kbd_softc *sc, uint8_t *val)
++ps2kbd_read(struct ps2kbd_softc *sc, uint8_t *val, uint8_t *trans)
+ {
+ 	int retval;
+ 
+ 	pthread_mutex_lock(&sc->mtx);
+-	retval = fifo_get(sc, val);
++	retval = fifo_get(sc, val, trans);
+ 	pthread_mutex_unlock(&sc->mtx);
+ 
+ 	return (retval);
+@@ -245,13 +255,13 @@ ps2kbd_write(struct ps2kbd_softc *sc, uint8_t val)
+ 	if (sc->curcmd) {
+ 		switch (sc->curcmd) {
+ 		case PS2KC_SET_TYPEMATIC:
+-			fifo_put(sc, PS2KC_ACK);
++			fifo_put(sc, PS2KC_ACK, 0);
+ 			break;
+ 		case PS2KC_SET_SCANCODE_SET:
+-			fifo_put(sc, PS2KC_ACK);
++			fifo_put(sc, PS2KC_ACK, 0);
+ 			break;
+ 		case PS2KC_SET_LEDS:
+-			fifo_put(sc, PS2KC_ACK);
++			fifo_put(sc, PS2KC_ACK, 0);
+ 			break;
+ 		default:
+ 			EPRINTLN("Unhandled ps2 keyboard current "
+@@ -262,41 +272,41 @@ ps2kbd_write(struct ps2kbd_softc *sc, uint8_t val)
+ 	} else {
+ 		switch (val) {
+ 		case 0x00:
+-			fifo_put(sc, PS2KC_ACK);
++			fifo_put(sc, PS2KC_ACK, 0);
+ 			break;
+ 		case PS2KC_RESET_DEV:
+ 			fifo_reset(sc);
+-			fifo_put(sc, PS2KC_ACK);
+-			fifo_put(sc, PS2KC_BAT_SUCCESS);
++			fifo_put(sc, PS2KC_ACK, 0);
++			fifo_put(sc, PS2KC_BAT_SUCCESS, 0);
+ 			break;
+ 		case PS2KC_DISABLE:
+ 			sc->enabled = false;
+-			fifo_put(sc, PS2KC_ACK);
++			fifo_put(sc, PS2KC_ACK, 0);
+ 			break;
+ 		case PS2KC_ENABLE:
+ 			sc->enabled = true;
+ 			fifo_reset(sc);
+-			fifo_put(sc, PS2KC_ACK);
++			fifo_put(sc, PS2KC_ACK, 0);
+ 			break;
+ 		case PS2KC_SET_TYPEMATIC:
+ 			sc->curcmd = val;
+-			fifo_put(sc, PS2KC_ACK);
++			fifo_put(sc, PS2KC_ACK, 0);
+ 			break;
+ 		case PS2KC_SEND_DEV_ID:
+-			fifo_put(sc, PS2KC_ACK);
+-			fifo_put(sc, 0xab);
+-			fifo_put(sc, 0x83);
++			fifo_put(sc, PS2KC_ACK, 0);
++			fifo_put(sc, 0xab, 0);
++			fifo_put(sc, 0x83, 0);
+ 			break;
+ 		case PS2KC_SET_SCANCODE_SET:
+ 			sc->curcmd = val;
+-			fifo_put(sc, PS2KC_ACK);
++			fifo_put(sc, PS2KC_ACK, 0);
+ 			break;
+ 		case PS2KC_ECHO:
+-			fifo_put(sc, PS2KC_ECHO);
++			fifo_put(sc, PS2KC_ECHO, 0);
+ 			break;
+ 		case PS2KC_SET_LEDS:
+ 			sc->curcmd = val;
+-			fifo_put(sc, PS2KC_ACK);
++			fifo_put(sc, PS2KC_ACK, 0);
+ 			break;
+ 		default:
+ 			EPRINTLN("Unhandled ps2 keyboard command "
+@@ -312,26 +322,32 @@ ps2kbd_write(struct ps2kbd_softc *sc, uint8_t val)
+  */
+ static void
+ ps2kbd_keysym_queue(struct ps2kbd_softc *sc,
+-    int down, uint32_t keysym)
++    int down, uint32_t keysym, uint32_t keycode)
+ {
  	assert(pthread_mutex_isowned_np(&sc->mtx));
  	int e0_prefix, found;
  	uint8_t code;
 -	const struct extended_translation *trans;
 +	struct extended_translation *trans;
  
- 	found = 0;
- 	if (keysym < 0x80) {
-@@ -367,10 +374,91 @@ ps2kbd_event(int down, uint32_t keysym, void *arg)
+-	found = 0;
+-	if (keysym < 0x80) {
+-		code = ascii_translations[keysym];
+-		e0_prefix = 0;
++	if (keycode) {
++		code = (uint8_t)(keycode & 0x7f);
++		e0_prefix = ((keycode & 0x80) ?  SCANCODE_E0_PREFIX : 0);
+ 		found = 1;
+ 	} else {
+-		for (trans = &(extended_translations[0]); trans->keysym != 0;
+-		    trans++) {
+-			if (keysym == trans->keysym) {
+-				code = trans->scancode;
+-				e0_prefix = trans->flags & SCANCODE_E0_PREFIX;
+-				found = 1;
+-				break;
++		found = 0;
++		if (keysym < 0x80) {
++			code = ascii_translations[keysym];
++			e0_prefix = 0;
++			found = 1;
++		} else {
++			for (trans = &(extended_translations[0]); trans->keysym != 0;
++		    	trans++) {
++				if (keysym == trans->keysym) {
++					code = trans->scancode;
++					e0_prefix = trans->flags & SCANCODE_E0_PREFIX;
++					found = 1;
++					break;
++				}
+ 			}
+ 		}
+ 	}
+@@ -342,14 +358,14 @@ ps2kbd_keysym_queue(struct ps2kbd_softc *sc,
+ 	}
+ 
+ 	if (e0_prefix)
+-		fifo_put(sc, 0xe0);
++		fifo_put(sc, 0xe0, 0);
+ 	if (!down)
+-		fifo_put(sc, 0xf0);
+-	fifo_put(sc, code);
++		fifo_put(sc, 0xf0, 0);
++	fifo_put(sc, code, (keycode ? 0 : 1));
+ }
+ 
+ static void
+-ps2kbd_event(int down, uint32_t keysym, void *arg)
++ps2kbd_event(int down, uint32_t keysym, uint32_t keycode, void *arg)
+ {
+ 	struct ps2kbd_softc *sc = arg;
+ 	int fifo_full;
+@@ -360,17 +376,98 @@ ps2kbd_event(int down, uint32_t keysym, void *arg)
+ 		return;
+ 	}
+ 	fifo_full = sc->fifo.num == PS2KBD_FIFOSZ;
+-	ps2kbd_keysym_queue(sc, down, keysym);
++	ps2kbd_keysym_queue(sc, down, keysym, keycode);
+ 	pthread_mutex_unlock(&sc->mtx);
+ 
+ 	if (!fifo_full)
  		atkbdc_event(sc->atkbdc_sc, 1);
  }
  
@@ -246,3 +500,156 @@ diff -upN bhyve_orig/ps2kbd.c bhyve/ps2kbd.c
  
  	sc = calloc(1, sizeof (struct ps2kbd_softc));
  	pthread_mutex_init(&sc->mtx, NULL);
+diff -upN bhyve_orig/ps2kbd.h bhyve/ps2kbd.h
+--- bhyve_orig/ps2kbd.h	2020-04-23 09:06:39.000000000 +0900
++++ bhyve/ps2kbd.h	2020-05-29 18:03:10.795460000 +0900
+@@ -35,7 +35,7 @@ struct atkbdc_softc;
+ 
+ struct ps2kbd_softc *ps2kbd_init(struct atkbdc_softc *sc);
+ 
+-int ps2kbd_read(struct ps2kbd_softc *sc, uint8_t *val);
++int ps2kbd_read(struct ps2kbd_softc *sc, uint8_t *val, uint8_t *trans);
+ void ps2kbd_write(struct ps2kbd_softc *sc, uint8_t val);
+ 
+ #endif /* _PS2KBD_H_ */
+diff -upN bhyve_orig/rfb.c bhyve/rfb.c
+--- bhyve_orig/rfb.c	2020-04-23 09:06:39.000000000 +0900
++++ bhyve/rfb.c	2020-05-29 18:03:10.843000000 +0900
+@@ -99,7 +99,10 @@ struct rfb_softc {
+ 	bool	enc_raw_ok;
+ 	bool	enc_zlib_ok;
+ 	bool	enc_resize_ok;
++	bool	enc_extkeyevent_ok;
+ 
++	bool	enc_extkeyevent_send;
++
+ 	z_stream	zstream;
+ 	uint8_t		*zbuf;
+ 	int		zbuflen;
+@@ -145,7 +148,10 @@ struct rfb_pixfmt_msg {
+ #define	RFB_ENCODING_RAW		0
+ #define	RFB_ENCODING_ZLIB		6
+ #define	RFB_ENCODING_RESIZE		-223
++#define	RFB_ENCODING_EXT_KEYEVENT	-258
+ 
++#define	RFB_CLIENTMSG_EXT_KEYEVENT	0
++
+ #define	RFB_MAX_WIDTH			2000
+ #define	RFB_MAX_HEIGHT			1200
+ #define	RFB_ZLIB_BUFSZ			RFB_MAX_WIDTH*RFB_MAX_HEIGHT*4
+@@ -172,6 +178,19 @@ struct rfb_key_msg {
+ 	uint8_t		type;
+ 	uint8_t		down;
+ 	uint16_t	pad;
++	uint32_t	sym;
++};
++
++struct rfb_client_msg {
++	uint8_t		type;
++	uint8_t		subtype;
++};
++
++struct rfb_extended_key_msg {
++	uint8_t		type;
++	uint8_t		subtype;
++	uint16_t	down;
++	uint32_t	sym;
+ 	uint32_t	code;
+ };
+ 
+@@ -250,6 +269,27 @@ rfb_send_resize_update_msg(struct rfb_softc *rc, int c
+ }
+ 
+ static void
++rfb_send_extended_keyevent_update_msg(struct rfb_softc *rc, int cfd)
++{
++	struct rfb_srvr_updt_msg supdt_msg;
++	struct rfb_srvr_rect_hdr srect_hdr;
++
++	/* Number of rectangles: 1 */
++	supdt_msg.type = 0;
++	supdt_msg.pad = 0;
++	supdt_msg.numrects = htons(1);
++	stream_write(cfd, &supdt_msg, sizeof(struct rfb_srvr_updt_msg));
++
++	/* Rectangle header */
++	srect_hdr.x = htons(0);
++	srect_hdr.y = htons(0);
++	srect_hdr.width = htons(rc->width);
++	srect_hdr.height = htons(rc->height);
++	srect_hdr.encoding = htonl(RFB_ENCODING_EXT_KEYEVENT);
++	stream_write(cfd, &srect_hdr, sizeof(struct rfb_srvr_rect_hdr));
++}
++
++static void
+ rfb_recv_set_pixfmt_msg(struct rfb_softc *rc, int cfd)
+ {
+ 	struct rfb_pixfmt_msg pixfmt_msg;
+@@ -283,6 +323,9 @@ rfb_recv_set_encodings_msg(struct rfb_softc *rc, int c
+ 		case RFB_ENCODING_RESIZE:
+ 			rc->enc_resize_ok = true;
+ 			break;
++		case RFB_ENCODING_EXT_KEYEVENT:
++			rc->enc_extkeyevent_ok = true;
++			break;
+ 		}
+ 	}
+ }
+@@ -648,6 +691,11 @@ rfb_recv_update_msg(struct rfb_softc *rc, int cfd, int
+ 			rfb_send_resize_update_msg(rc, cfd);
+ 	}
+ 
++	if (rc->enc_extkeyevent_ok && (!rc->enc_extkeyevent_send)) {
++		rfb_send_extended_keyevent_update_msg(rc, cfd);
++		rc->enc_extkeyevent_send = true;
++	}
++
+ 	if (discardonly)
+ 		return;
+ 
+@@ -661,10 +709,24 @@ rfb_recv_key_msg(struct rfb_softc *rc, int cfd)
+ 
+ 	(void)stream_read(cfd, ((void *)&key_msg) + 1, sizeof(key_msg) - 1);
+ 
+-	console_key_event(key_msg.down, htonl(key_msg.code));
++	console_key_event(key_msg.down, htonl(key_msg.sym), htonl(0));
+ }
+ 
+ static void
++rfb_recv_client_msg(struct rfb_softc *rc, int cfd)
++{
++	struct rfb_client_msg client_msg;
++	struct rfb_extended_key_msg extkey_msg;
++
++	(void)stream_read(cfd, ((void *)&client_msg) + 1, sizeof(client_msg) - 1);
++
++	if (client_msg.subtype == RFB_CLIENTMSG_EXT_KEYEVENT ) {
++		(void)stream_read(cfd, ((void *)&extkey_msg) + 2, sizeof(extkey_msg) - 2);
++		console_key_event((int)extkey_msg.down, htonl(extkey_msg.sym), htonl(extkey_msg.code));
++	}
++}
++
++static void
+ rfb_recv_ptr_msg(struct rfb_softc *rc, int cfd)
+ {
+ 	struct rfb_ptr_msg ptr_msg;
+@@ -903,6 +965,9 @@ rfb_handle(struct rfb_softc *rc, int cfd)
+ 		case 6:
+ 			rfb_recv_cuttext_msg(rc, cfd);
+ 			break;
++		case 255:
++			rfb_recv_client_msg(rc, cfd);
++			break;
+ 		default:
+ 			WPRINTF(("rfb unknown cli-code %d!", buf[0] & 0xff));
+ 			goto done;
+@@ -937,6 +1002,9 @@ rfb_thr(void *arg)
+ 		rc->enc_raw_ok = false;
+ 		rc->enc_zlib_ok = false;
+ 		rc->enc_resize_ok = false;
++		rc->enc_extkeyevent_ok = false;
++
++		rc->enc_extkeyevent_send = false;
+ 
+ 		cfd = accept(rc->sfd, NULL, NULL);
+ 		if (rc->conn_wait) {