Merge pull request #105 from scarygliders/devel

Devel - please pull/merge these changes to the xrdp-genkeymap utility

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"};
+    char *sections[6] = {"noshift", "shift", "altgr", "shiftaltgr", "capslock", "shiftcapslock"};
-    int states[5] = {0, 1, 0x80, 2, 3};
+    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];

genkeymap/readme.txt

@@ -1,35 +1,42 @@
+Creating a new keymap file.
+---------------------------
 
-crating a new keymap file.
+The names of the files are of the format;
-
-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 sections;
 
-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
+and the unicode value are the same.
-not.
+
-This is the definition for the backspace key.
+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.