From 20a962b64073bc16591928e74bdff5f80f5accad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Fri, 24 Oct 2014 12:02:00 +0200
Subject: keymap: support combining shift & capslock with altgr

Add support for combining shift & caps lock keys with altgr so that
capital national characters can be written. There was some support for
shift+altgr in xrdp-keygen but it was never actually used.
---
 genkeymap/genkeymap.c | 8 ++++----
 genkeymap/readme.txt  | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'genkeymap')

diff --git a/genkeymap/genkeymap.c b/genkeymap/genkeymap.c
index 91ec9e89..16de6e10 100644
--- a/genkeymap/genkeymap.c
+++ b/genkeymap/genkeymap.c
@@ -45,8 +45,8 @@ int main(int argc, char **argv)
     char text[256];
     char *displayname = NULL;
     char *outfname;
-    char *sections[6] = {"noshift", "shift", "altgr", "shiftaltgr", "capslock", "shiftcapslock"};
-    int states[6] = {0, 1, 0x80, 0x81, 2, 3};
+    char *sections[8] = {"noshift", "shift", "altgr", "shiftaltgr", "capslock", "capslockaltgr", "shiftcapslock", "shiftcapslockaltgr"};
+    int states[8] = {0, 1, 0x80, 0x81, 2, 0x82, 3, 0x83};
     int i;
     int idx;
     int char_count;
@@ -94,7 +94,7 @@ int main(int argc, char **argv)
     e.display = dpy;
     e.same_screen = True;
 
-    for (idx = 0; idx < 6; idx++) /* Sections and states */
+    for (idx = 0; idx < 8; idx++) /* Sections and states */
     {
         fprintf(outf, "[%s]\n", sections[idx]);
         e.state = states[idx];
@@ -115,7 +115,7 @@ int main(int argc, char **argv)
             fprintf(outf, "Key%d=%d:%d\n", i, (int) ks, unicode);
         }
 
-        if (idx != 4)
+        if (idx != 7)
         {
             fprintf(outf, "\n");
         }
diff --git a/genkeymap/readme.txt b/genkeymap/readme.txt
index d9df684d..b2b3b890 100644
--- a/genkeymap/readme.txt
+++ b/genkeymap/readme.txt
@@ -7,9 +7,10 @@ km-xxxx.ini
 
 where the xxxx is replaced by the hex number of the layout of interest.
 
-The files have 6 sections;
+The files have 8 sections;
 
-[noshift], [shift], [altgr], [shiftaltgr], [capslock], [shiftcapslock]
+[noshift], [shift], [altgr], [shiftaltgr], [capslock], [capslockaltgr],
+[shiftcapslock], [shiftcapslockaltgr]
 
 In each section there are multiple lines for each key.
 
-- 
cgit v1.2.1


From 89a651f948f3333ce6cf4eb64c6b83335c343bc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Fri, 24 Oct 2014 12:16:00 +0200
Subject: dump-keymaps: generate 'pl' keymap

---
 genkeymap/dump-keymaps.sh | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'genkeymap')

diff --git a/genkeymap/dump-keymaps.sh b/genkeymap/dump-keymaps.sh
index e0f3b3b2..a78caa95 100755
--- a/genkeymap/dump-keymaps.sh
+++ b/genkeymap/dump-keymaps.sh
@@ -19,6 +19,10 @@ setxkbmap -model pc104 -layout de
 setxkbmap -model pc104 -layout it
 ./xrdp-genkeymap ../instfiles/km-0410.ini
 
+# Polish 'pl' 0x0415
+setxkbmap -model pc104 -layout pl
+./xrdp-genkeymap ../instfiles/km-0415.ini
+
 # Russia 'ru' 0x0419
 setxkbmap -model pc104 -layout ru
 ./xrdp-genkeymap ../instfiles/km-0419.ini
-- 
cgit v1.2.1