From 2f8d3ba9da68c120a5a4f156a0da06c135b9e862 Mon Sep 17 00:00:00 2001 From: Jay Sorg Date: Sat, 10 Dec 2016 00:11:28 -0800 Subject: add unicode support --- libxrdp/xrdp_fastpath.c | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) (limited to 'libxrdp/xrdp_fastpath.c') diff --git a/libxrdp/xrdp_fastpath.c b/libxrdp/xrdp_fastpath.c index 008c8289..daa08373 100644 --- a/libxrdp/xrdp_fastpath.c +++ b/libxrdp/xrdp_fastpath.c @@ -265,12 +265,30 @@ static int APP_CC xrdp_fastpath_process_EVENT_UNICODE(struct xrdp_fastpath *self, int eventFlags, struct stream *s) { - if (!s_check_rem(s, 2)) - { - return 1; - } - in_uint8s(s, 2); - return 0; + int flags; + int code; + + flags = 0; + if (!s_check_rem(s, 2)) + { + return 1; + } + in_uint16_le(s, code); /* keyCode (1 byte) */ + if (eventFlags & FASTPATH_INPUT_KBDFLAGS_RELEASE) + { + flags |= KBD_FLAG_UP; + } + else + { + flags |= KBD_FLAG_DOWN; + } + if (eventFlags & FASTPATH_INPUT_KBDFLAGS_EXTENDED) + { + flags |= KBD_FLAG_EXT; + } + xrdp_fastpath_session_callback(self, RDP_INPUT_UNICODE, + code, 0, flags, 0); + return 0; } /*****************************************************************************/ -- cgit v1.2.3 From c264862afe5ef3b21f0774bc108782fbc68bede3 Mon Sep 17 00:00:00 2001 From: Jay Sorg Date: Sat, 10 Dec 2016 01:06:45 -0800 Subject: change some magics to defines --- common/xrdp_constants.h | 6 ++++++ libxrdp/xrdp_fastpath.c | 2 +- xrdp/xrdp_wm.c | 41 ++++++++++++++++++++++------------------- 3 files changed, 29 insertions(+), 20 deletions(-) (limited to 'libxrdp/xrdp_fastpath.c') diff --git a/common/xrdp_constants.h b/common/xrdp_constants.h index 795264a5..3ac8504f 100644 --- a/common/xrdp_constants.h +++ b/common/xrdp_constants.h @@ -623,4 +623,10 @@ #define XRDP_MAX_BITMAP_CACHE_IDX 2000 #define XRDP_BITMAP_CACHE_ENTRIES 2048 +#define XR_MIN_KEY_CODE 8 +#define XR_MAX_KEY_CODE 256 + +#define XR_RDP_SCAN_LSHIFT 42 +#define XR_RDP_SCAN_ALT 56 + #endif diff --git a/libxrdp/xrdp_fastpath.c b/libxrdp/xrdp_fastpath.c index daa08373..33e9c9d0 100644 --- a/libxrdp/xrdp_fastpath.c +++ b/libxrdp/xrdp_fastpath.c @@ -273,7 +273,7 @@ xrdp_fastpath_process_EVENT_UNICODE(struct xrdp_fastpath *self, { return 1; } - in_uint16_le(s, code); /* keyCode (1 byte) */ + in_uint16_le(s, code); /* unicode (2 byte) */ if (eventFlags & FASTPATH_INPUT_KBDFLAGS_RELEASE) { flags |= KBD_FLAG_UP; diff --git a/xrdp/xrdp_wm.c b/xrdp/xrdp_wm.c index 26d488ec..446939bc 100644 --- a/xrdp/xrdp_wm.c +++ b/xrdp/xrdp_wm.c @@ -1531,66 +1531,69 @@ xrdp_wm_key_unicode(struct xrdp_wm *self, int device_flags, int unicode) { int index; - for (index = 8; index < 256; index++) + for (index = XR_MIN_KEY_CODE; index < XR_MAX_KEY_CODE; index++) { if (unicode == self->keymap.keys_noshift[index].chr) { - xrdp_wm_key(self, device_flags, index - 8); + xrdp_wm_key(self, device_flags, index - XR_MIN_KEY_CODE); return 0; } } - for (index = 8; index < 256; index++) + for (index = XR_MIN_KEY_CODE; index < XR_MAX_KEY_CODE; index++) { if (unicode == self->keymap.keys_shift[index].chr) { if (device_flags & KBD_FLAG_UP) { - xrdp_wm_key(self, device_flags, index - 8); - xrdp_wm_key(self, KBD_FLAG_UP, 42); + xrdp_wm_key(self, device_flags, index - XR_MIN_KEY_CODE); + xrdp_wm_key(self, KBD_FLAG_UP, XR_RDP_SCAN_LSHIFT); } else { - xrdp_wm_key(self, KBD_FLAG_DOWN, 42); - xrdp_wm_key(self, device_flags, index - 8); + xrdp_wm_key(self, KBD_FLAG_DOWN, XR_RDP_SCAN_LSHIFT); + xrdp_wm_key(self, device_flags, index - XR_MIN_KEY_CODE); } return 0; } } - for (index = 8; index < 256; index++) + for (index = XR_MIN_KEY_CODE; index < XR_MAX_KEY_CODE; index++) { if (unicode == self->keymap.keys_altgr[index].chr) { if (device_flags & KBD_FLAG_UP) { - xrdp_wm_key(self, device_flags, index - 8); - xrdp_wm_key(self, KBD_FLAG_UP | KBD_FLAG_EXT, 56); + xrdp_wm_key(self, device_flags, index - XR_MIN_KEY_CODE); + xrdp_wm_key(self, KBD_FLAG_UP | KBD_FLAG_EXT, + XR_RDP_SCAN_ALT); } else { - xrdp_wm_key(self, KBD_FLAG_DOWN | KBD_FLAG_EXT, 56); - xrdp_wm_key(self, device_flags, index - 8); + xrdp_wm_key(self, KBD_FLAG_DOWN | KBD_FLAG_EXT, + XR_RDP_SCAN_ALT); + xrdp_wm_key(self, device_flags, index - XR_MIN_KEY_CODE); } return 0; } } - for (index = 8; index < 256; index++) + for (index = XR_MIN_KEY_CODE; index < XR_MAX_KEY_CODE; index++) { if (unicode == self->keymap.keys_shiftaltgr[index].chr) { if (device_flags & KBD_FLAG_UP) { - xrdp_wm_key(self, device_flags, index - 8); - xrdp_wm_key(self, KBD_FLAG_UP | KBD_FLAG_EXT, 56); - xrdp_wm_key(self, KBD_FLAG_UP, 42); + xrdp_wm_key(self, device_flags, index - XR_MIN_KEY_CODE); + xrdp_wm_key(self, KBD_FLAG_UP | KBD_FLAG_EXT, XR_RDP_SCAN_ALT); + xrdp_wm_key(self, KBD_FLAG_UP, XR_RDP_SCAN_LSHIFT); } else { - xrdp_wm_key(self, KBD_FLAG_DOWN, 42); - xrdp_wm_key(self, KBD_FLAG_DOWN | KBD_FLAG_EXT, 56); - xrdp_wm_key(self, device_flags, index - 8); + xrdp_wm_key(self, KBD_FLAG_DOWN, XR_RDP_SCAN_LSHIFT); + xrdp_wm_key(self, KBD_FLAG_DOWN | KBD_FLAG_EXT, + XR_RDP_SCAN_ALT); + xrdp_wm_key(self, device_flags, index - XR_MIN_KEY_CODE); } return 0; } -- cgit v1.2.3