Merge pull request #516 from metalefty/keymaps

Adjust Japanese keymaps

genkeymap/dump-keymaps.sh

@@ -24,11 +24,8 @@ setxkbmap -model pc104 -layout it
 ./xrdp-genkeymap ../instfiles/km-00000410.ini
 
 # Japanese 'jp' 0x00000411
-setxkbmap -model jp106 -layout jp -variant OADG109A
+setxkbmap -model pc105 -layout jp -variant OADG109A
 ./xrdp-genkeymap ../instfiles/km-00000411.ini
-./xrdp-genkeymap ../instfiles/km-e0010411.ini
-./xrdp-genkeymap ../instfiles/km-e0200411.ini
-./xrdp-genkeymap ../instfiles/km-e0210411.ini
 
 # Polish 'pl' 0x00000415
 setxkbmap -model pc104 -layout pl

instfiles/Makefile.am

@@ -26,10 +26,7 @@ dist_startscript_DATA = \
   km-0000080c.ini \
   km-00000813.ini \
   km-00000816.ini \
-  km-0000100c.ini \
-  km-e0010411.ini \
-  km-e0200411.ini \
-  km-e0210411.ini
+  km-0000100c.ini 
 
 #
 # platform specific files

xrdp/xrdp_keyboard.ini

@@ -62,9 +62,6 @@ rdp_layout_de=0x00000407
 rdp_layout_fr=0x0000040C
 rdp_layout_it=0x00000410
 rdp_layout_jp=0x00000411
-rdp_layout_jp2=0xe0010411
-rdp_layout_jp3=0xe0200411
-rdp_layout_jp4=0xe0210411
 rdp_layout_ru=0x00000419
 rdp_layout_se=0x0000041D
 rdp_layout_ch=0x00000807
@@ -79,9 +76,6 @@ rdp_layout_de=de
 rdp_layout_fr=fr
 rdp_layout_it=it
 rdp_layout_jp=jp
-rdp_layout_jp2=jp
-rdp_layout_jp3=jp
-rdp_layout_jp4=jp
 rdp_layout_ru=ru
 rdp_layout_se=se
 rdp_layout_ch=ch
@@ -109,9 +103,6 @@ rdp_layout_us=us
 rdp_layout_de=de
 rdp_layout_fr=fr
 rdp_layout_jp=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