add mappings for media keys

neutrinolabs · Apr 3, 2024 · 76f3809 · 76f3809
1 parent e73f26c
commit 76f3809
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 9 deletions.
diff --git a/genkeymap/genkeymap.c b/genkeymap/genkeymap.c
@@ -42,6 +42,8 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/XKBlib.h>
+#include <X11/XF86keysym.h>
+#include <X11/keysymdef.h>
 #include <locale.h>
 
 extern int xfree86_to_evdev[137 - 8 + 1];
@@ -139,6 +141,11 @@ int main(int argc, char **argv)
 
         for (i = 8; i < 137; i++) /* Keycodes */
         {
+            if (i == 121 || i == 122 || i == 123 || i == 136) /* Skip media keys */
+            {
+                continue;
+            }
+
             if (is_evdev)
             {
                 e.keycode = xfree86_to_evdev[i - 8];
@@ -160,6 +167,28 @@ int main(int argc, char **argv)
             fprintf(outf, "Key%d=%d:%d\n", i, (int) ks, unicode);
         }
 
+        /* Media keys */
+        {
+            fprintf(outf, "Key%d=%d:%d\n", 173, XF86XK_AudioPrev, 0);
+            fprintf(outf, "Key%d=%d:%d\n", 171, XF86XK_AudioNext, 0);
+            fprintf(outf, "Key%d=%d:%d\n", 121, XF86XK_AudioMute, 0);
+            fprintf(outf, "Key%d=%d:%d\n", 172, XF86XK_AudioPlay, 0);
+            fprintf(outf, "Key%d=%d:%d\n", 174, XF86XK_AudioStop, 0);
+            fprintf(outf, "Key%d=%d:%d\n", 122, XF86XK_AudioLowerVolume, 0);
+            fprintf(outf, "Key%d=%d:%d\n", 123, XF86XK_AudioRaiseVolume, 0);
+            fprintf(outf, "Key%d=%d:%d\n", 180, XF86XK_HomePage, 0);
+            fprintf(outf, "Key%d=%d:%d\n", 225, XF86XK_Search, 0);
+            fprintf(outf, "Key%d=%d:%d\n", 164, XF86XK_Favorites, 0);
+            fprintf(outf, "Key%d=%d:%d\n", 181, XF86XK_Reload, 0);
+            fprintf(outf, "Key%d=%d:%d\n", 136, XK_Cancel, 0);
+            fprintf(outf, "Key%d=%d:%d\n", 167, XF86XK_Forward, 0);
+            fprintf(outf, "Key%d=%d:%d\n", 166, XF86XK_Back, 0);
+            fprintf(outf, "Key%d=%d:%d\n", 163, XF86XK_Mail, 0);
+            fprintf(outf, "Key%d=%d:%d\n", 234, XF86XK_AudioMedia, 0);
+            fprintf(outf, "Key%d=%d:%d\n", 156, XF86XK_Launch1, 0);
+            fprintf(outf, "Key%d=%d:%d\n", 157, XF86XK_Launch2, 0);
+        }
+
         if (idx != 7)
         {
             fprintf(outf, "\n");

diff --git a/xrdp/lang.c b/xrdp/lang.c
@@ -40,14 +40,14 @@ static struct codepair g_map[] =
     { 0, 0 }, { 9, 0 }, { 10, 0 }, { 11, 0 }, { 12, 0 }, /* 0 - 4 */
     { 13, 0 }, { 14, 0 }, { 15, 0 }, { 16, 0 }, { 17, 0 }, /* 5 - 9 */
     { 18, 0 }, { 19, 0 }, { 20, 0 }, { 21, 0 }, { 22, 0 }, /* 10 - 14 */
-    { 23, 0 }, { 24, 0 }, { 25, 0 }, { 26, 0 }, { 27, 0 }, /* 15 - 19 */
+    { 23, 0 }, { 24, 173 }, { 25, 0 }, { 26, 0 }, { 27, 0 }, /* 15 - 19 */
     { 28, 0 }, { 29, 0 }, { 30, 0 }, { 31, 0 }, { 32, 0 }, /* 20 - 24 */
-    { 33, 0 }, { 34, 0 }, { 35, 0 }, { 36, 108 }, { 37, 109 }, /* 25 - 29 */
-    { 38, 0 }, { 39, 0 }, { 40, 0 }, { 41, 0 }, { 42, 0 }, /* 30 - 34 */
-    { 43, 0 }, { 44, 0 }, { 45, 0 }, { 46, 0 }, { 47, 0 }, /* 35 - 39 */
+    { 33, 171 }, { 34, 0 }, { 35, 0 }, { 36, 108 }, { 37, 109 }, /* 25 - 29 */
+    { 38, 0 }, { 39, 0 }, { 40, 121 }, { 41, 0 }, { 42, 172 }, /* 30 - 34 */
+    { 43, 0 }, { 44, 174 }, { 45, 0 }, { 46, 0 }, { 47, 0 }, /* 35 - 39 */
     { 48, 0 }, { 49, 0 }, { 50, 0 }, { 51, 0 }, { 52, 0 }, /* 40 - 44 */
-    { 53, 0 }, { 54, 0 }, { 55, 0 }, { 56, 0 }, { 57, 0 }, /* 45 - 49 */
-    { 58, 0 }, { 59, 0 }, { 60, 0 }, { 61, 112 }, { 62, 0 }, /* 50 - 54 */
+    { 53, 0 }, { 54, 122 }, { 55, 0 }, { 56, 123 }, { 57, 0 }, /* 45 - 49 */
+    { 58, 180 }, { 59, 0 }, { 60, 0 }, { 61, 112 }, { 62, 0 }, /* 50 - 54 */
     { 63, 111 }, { 64, 113 }, { 65, 0 }, { 66, 0 }, { 67, 0 }, /* 55 - 59 */
     { 68, 0 }, { 69, 0 }, { 70, 0 }, { 71, 0 }, { 72, 0 }, /* 60 - 64 */
     { 73, 0 }, { 74, 0 }, { 75, 0 }, { 76, 0 }, { 77, 0 }, /* 65 - 69 */
@@ -57,9 +57,9 @@ static struct codepair g_map[] =
     { 93, 0 }, { 94, 0 }, { 95, 0 }, { 96, 0 }, { 97, 0 }, /* 85 - 89 */
     { 98, 0 }, { 0, 115 }, { 0, 116 }, { 0, 117 }, { 102, 0 }, /* 90 - 94 */
     { 103, 0 }, { 104, 0 }, { 105, 0 }, { 106, 0 }, { 107, 0 }, /* 95 - 99 */
-    { 108, 0 }, { 109, 0 }, { 110, 0 }, { 111, 0 }, { 112, 0 }, /* 100 - 104 */
-    { 113, 0 }, { 114, 0 }, { 115, 0 }, { 116, 0 }, { 117, 0 }, /* 105 - 109 */
-    { 118, 0 }, { 119, 0 }, { 120, 0 }, { 121, 0 }, { 122, 0 }, /* 110 - 114 */
+    { 108, 0 }, { 109, 225 }, { 110, 164 }, { 111, 181 }, { 112, 136 }, /* 100 - 104 */
+    { 113, 167 }, { 114, 166 }, { 115, 0 }, { 116, 163 }, { 117, 234 }, /* 105 - 109 */
+    { 118, 156 }, { 119, 157 }, { 120, 0 }, { 121, 0 }, { 122, 0 }, /* 110 - 114 */
     { 123, 0 }, { 124, 0 }, { 125, 0 }, { 126, 0 }, { 127, 0 }, /* 115 - 119 */
     { 128, 0 }, { 129, 0 }, { 130, 0 }, { 131, 0 }, { 132, 0 }, /* 120 - 124 */
     { 133, 0 }, { 134, 0 }, { 135, 0 } /* 125 - 127 */