From 2424a9c020d3644323caca8f29ae5b3b2c355de1 Mon Sep 17 00:00:00 2001
From: Koichiro IWAO <meta@vmeta.jp>
Date: Thu, 16 Feb 2017 09:16:28 +0900
Subject: [PATCH] Workaround for a regression of JP keyboard detection #663

caused by 9c31bd5.  This is not a complete fix but just a workaround
because keylayout value of Japanese keyboard can be other than these
4 values. This workaround still doesn't cover all JP keyboards.

  - 0x00000411
  - 0xe0010411
  - 0xe0200411
  - 0xe0210411

Looking for `0411` in lower 16 bits is enough to detect JP keyboards.
---
 xrdp/xrdp_keyboard.ini | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/xrdp/xrdp_keyboard.ini b/xrdp/xrdp_keyboard.ini
index 299239dd..cd4d9868 100644
--- a/xrdp/xrdp_keyboard.ini
+++ b/xrdp/xrdp_keyboard.ini
@@ -62,6 +62,9 @@ rdp_layout_de=0x00000407
 rdp_layout_fr=0x0000040C
 rdp_layout_it=0x00000410
 rdp_layout_jp=0x00000411
+rdp_layout_jp=0xe0010411
+rdp_layout_jp=0xe0200411
+rdp_layout_jp=0xe0210411
 rdp_layout_kr=0x00000412
 rdp_layout_ru=0x00000419
 rdp_layout_se=0x0000041D