From c548657c7b52f867c9d7598231219fd90ba7fe81 Mon Sep 17 00:00:00 2001
From: Kevin Cave <kevin@scarygliders.net>
Date: Sat, 18 Jan 2014 16:28:06 +0000
Subject: Update genkeymap.c

Add a "shiftaltgr" section to the keymap generator, which should satisfy keyboard layouts such as km-0415
---
 genkeymap/genkeymap.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/genkeymap/genkeymap.c b/genkeymap/genkeymap.c
index 46513513..91ec9e89 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[5] = {"noshift", "shift", "altgr", "capslock", "shiftcapslock"};
-    int states[5] = {0, 1, 0x80, 2, 3};
+    char *sections[6] = {"noshift", "shift", "altgr", "shiftaltgr", "capslock", "shiftcapslock"};
+    int states[6] = {0, 1, 0x80, 0x81, 2, 3};
     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 < 5; idx++) /* Sections and states */
+    for (idx = 0; idx < 6; idx++) /* Sections and states */
     {
         fprintf(outf, "[%s]\n", sections[idx]);
         e.state = states[idx];
-- 
cgit v1.2.1


From 2aa8d672d98e4a6d4581e4977e568058a381efbd Mon Sep 17 00:00:00 2001
From: Kevin Cave <kevin@scarygliders.net>
Date: Sat, 18 Jan 2014 16:44:08 +0000
Subject: Update readme.txt

---
 genkeymap/readme.txt | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/genkeymap/readme.txt b/genkeymap/readme.txt
index 0cfeb2e9..344fce72 100644
--- a/genkeymap/readme.txt
+++ b/genkeymap/readme.txt
@@ -1,35 +1,42 @@
-
-crating a new keymap file.
+Creating a new keymap file.
+---------------------------
 
 The names of the files are
 
 km-xxxx.ini
 
-where the xxx is replaces ny the hex number of the layout of interest.
+where the xxxx is replaced by the hex number of the layout of interest.
+
+The files have 6 section
 
-The files have 5 section
+[noshift], [shift], [altgr], [shiftaltgr], [capslock], [shiftcapslock]
 
-[noshift], [shift], [altgr], [capslock], [shiftcapslock]
+In each section there are multiple lines for each key.
 
-In each section there are multiple lines for each key
-An example line looks like
+An example line looks like;
 
 Key10=49:49
 
 In this line, 10 is the X11 scancode, the first 49 is the keysym value,
 the second 49 if the unicode value of the key.  This is the definition
 for the 'noshift' '1' key on a en-us keyboard.  In this case, the keysym
-and the unicode value are the same.  Here is an example where they are
-not.
-This is the definition for the backspace key.
+and the unicode value are the same.
+
+Here is an example where they are not;
+
+This is the definition for the backspace key;
 Key22=65288:8
 
-And this is the star on the keypad
+And this is the star on the keypad;
 Key63=65450:42
 
-To create a new file run xrdp-genkeymap filename
+To create a new file run "xrdp-genkeymap <filename>"
+
+Example: ./xrdp-genkeymap /etc/xrdp/km-0409.ini
 
-Example ./xrdp-genkeymap /etc/xrdp/km-0409.ini
+Note: You need to have enough rights to be able to write to the
+/etc/xrdp directory.
 
-Note: You need to have rights to the /etc/xrdp directory.
+Alternatively, create the keymap file in a directory of your choice, then
+copy or move it over to /etc/xrdp using sudo/su.
 
-- 
cgit v1.2.1


From a1ffd4a28e0956f6fb6dfc23b502e5cb36531d69 Mon Sep 17 00:00:00 2001
From: Kevin Cave <kevin@scarygliders.net>
Date: Sat, 18 Jan 2014 16:48:16 +0000
Subject: Update readme.txt

Corrected spelling and grammar.
Updated to reflect additional "shiftaltgr" section.
---
 genkeymap/readme.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/genkeymap/readme.txt b/genkeymap/readme.txt
index 344fce72..d9df684d 100644
--- a/genkeymap/readme.txt
+++ b/genkeymap/readme.txt
@@ -1,13 +1,13 @@
 Creating a new keymap file.
 ---------------------------
 
-The names of the files are
+The names of the files are of the format;
 
 km-xxxx.ini
 
 where the xxxx is replaced by the hex number of the layout of interest.
 
-The files have 6 section
+The files have 6 sections;
 
 [noshift], [shift], [altgr], [shiftaltgr], [capslock], [shiftcapslock]
 
-- 
cgit v1.2.1