Merge branch 'add-japanese-keymap' of git://github.com/metalefty/xrdp into metalefty-add-japanese-keymap

Conflicts:
	xrdp/xrdp_keyboard.ini

genkeymap/dump-keymaps.sh

@@ -19,6 +19,13 @@ setxkbmap -model pc104 -layout de
 setxkbmap -model pc104 -layout it
 ./xrdp-genkeymap ../instfiles/km-0410.ini
 
+# Japanese 'jp' 0x0411
+setxkbmap -model jp106 -layout jp -variant OADG109A
+./xrdp-genkeymap ../instfiles/km-0411.ini
+./xrdp-genkeymap ../instfiles/km-e0010411.ini
+./xrdp-genkeymap ../instfiles/km-e0200411.ini
+./xrdp-genkeymap ../instfiles/km-e0210411.ini
+
 # Polish 'pl' 0x0415
 setxkbmap -model pc104 -layout pl
 ./xrdp-genkeymap ../instfiles/km-0415.ini

instfiles/Makefile.am

@@ -22,10 +22,14 @@ startscript_DATA = \
   km-0409.ini \
   km-040c.ini \
   km-0410.ini \
+  km-0411.ini \
   km-0415.ini \
   km-0419.ini \
   km-041d.ini \
-  km-0816.ini
+  km-0816.ini \
+  km-e0010411.ini \
+  km-e0200411.ini \
+  km-e0210411.ini
 
 # must be tab below
 install-data-hook:

xrdp/xrdp_keyboard.ini

@@ -62,9 +62,9 @@ rdp_layout_de=0x00000407
 rdp_layout_fr=0x0000040C
 rdp_layout_it=0x00000410
 rdp_layout_jp=0x00000411
-rdp_layout_jp1=0x00100411
-rdp_layout_jp2=0x02000411
-rdp_layout_jp3=0x02100411
+rdp_layout_jp2=0xe0010411
+rdp_layout_jp3=0xe0200411
+rdp_layout_jp4=0xe0210411
 rdp_layout_ru=0x00000419
 rdp_layout_se=0x0000041D
 rdp_layout_pt=0x00000816
@@ -78,9 +78,9 @@ rdp_layout_de=de
 rdp_layout_fr=fr
 rdp_layout_it=it
 rdp_layout_jp=jp
-rdp_layout_jp1=jp
 rdp_layout_jp2=jp
 rdp_layout_jp3=jp
+rdp_layout_jp4=jp
 rdp_layout_ru=ru
 rdp_layout_se=se
 rdp_layout_pt=pt
@@ -105,11 +105,11 @@ layouts_map=default_layouts_map
 rdp_layout_us=us
 rdp_layout_de=de
 rdp_layout_fr=fr
-rdp_layout_it=it
 rdp_layout_jp=jp
-rdp_layout_jp1=jp
 rdp_layout_jp2=jp
 rdp_layout_jp3=jp
+rdp_layout_jp4=jp
+rdp_layout_it=it
 rdp_layout_ru=ru
 rdp_layout_se=se
 rdp_layout_pt=pt