Tk Source Code

Artifact ef4b3bd59077942dafea88b20e19d5db5a55e5bb:

Attachment "tk-multimedia-patch-8.6" to ticket [49952618] added by ralfixx 2017-01-26 11:05:02. (unpublished)

---

--- tk8.6.6/xlib/X11/keysymdef.h.orig	2015-10-23 17:01:01.000000000 +0200
+++ tk8.6.6/xlib/X11/keysymdef.h	2017-01-26 11:33:41.503412108 +0100
@@ -1167,3 +1167,13 @@
 #define XK_Hebrew_switch        0xFF7E  /* Alias for mode_switch */
 #endif /* XK_HEBREW */
 
+/* multimedia keys, defined same as on Linux
+   /usr/include/pkg/libxkbcommon/xkbcommon/xkbcommon-keysyms.h
+*/
+#define XK_XF86AudioLowerVolume	0x1008FF11   /* Volume control down        */
+#define XK_XF86AudioMute	0x1008FF12   /* Mute sound from the system */
+#define XK_XF86AudioRaiseVolume	0x1008FF13   /* Volume control up          */
+#define XK_XF86AudioPlay	0x1008FF14   /* Start playing of audio >   */
+#define XK_XF86AudioStop	0x1008FF15   /* Stop playing audio         */
+#define XK_XF86AudioPrev	0x1008FF16   /* Previous track             */
+#define XK_XF86AudioNext	0x1008FF17   /* Next track                 */

Diff finished.  Thu Jan 26 11:33:48 2017


--- tk8.6.6/generic/ks_names.h.orig	2015-10-23 17:01:00.000000000 +0200
+++ tk8.6.6/generic/ks_names.h	2017-01-26 11:32:12.429414699 +0100
@@ -920,3 +920,10 @@
 { "hebrew_shin", 0xcf9 },
 { "hebrew_taf", 0xcfa },
 { "Hebrew_switch", 0xFF7E },
+{ "XF86AudioLowerVolume", 0x1008FF11 },
+{ "XF86AudioMute", 0x1008FF12 },
+{ "XF86AudioRaiseVolume", 0x1008FF13 },
+{ "XF86AudioPlay", 0x1008FF14 },
+{ "XF86AudioStop", 0x1008FF15 },
+{ "XF86AudioPrev", 0x1008FF16 },
+{ "XF86AudioNext", 0x1008FF17 },

Diff finished.  Thu Jan 26 11:32:43 2017


--- tk8.6.6/win/tkWinKey.c.orig	2015-10-23 17:01:01.000000000 +0200
+++ tk8.6.6/win/tkWinKey.c	2017-01-26 11:21:13.342182874 +0100
@@ -21,8 +21,9 @@
  * like a worthwhile improvement to use the table.
  */
 
-#define MAX_KEYCODE 145 /* VK_SCROLL is the last entry in our table below */
+#define MAX_KEYCODE 179 /* VK_MEDIA_PLAY_PAUSE is the last entry in our table below */
 
+/* cf. https://msdn.microsoft.com/en-us/library/windows/desktop/dd375731(v=vs.85).aspx */
 static const KeySym keymap[] = {
     NoSymbol, NoSymbol, NoSymbol, XK_Cancel, NoSymbol,
     NoSymbol, NoSymbol, NoSymbol, XK_BackSpace, XK_Tab,
@@ -53,7 +54,13 @@
     XK_F19, XK_F20, XK_F21, XK_F22, XK_F23,
     XK_F24, NoSymbol, NoSymbol, NoSymbol, NoSymbol,
     NoSymbol, NoSymbol, NoSymbol, NoSymbol, XK_Num_Lock,
-    XK_Scroll_Lock
+    XK_Scroll_Lock, NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    NoSymbol, NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*150 0x96*/
+    NoSymbol, NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*155 0x9b*/
+    NoSymbol, NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*160 0xa0*/
+    NoSymbol, NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*165 0xa5*/
+    NoSymbol, NoSymbol, NoSymbol, XK_XF86AudioMute, XK_XF86AudioLowerVolume, /*170 0xaa*/
+    XK_XF86AudioRaiseVolume, XK_XF86AudioNext, XK_XF86AudioPrev, XK_XF86AudioStop, XK_XF86AudioPlay  /*175 0xaf*/
 };
 
 /*

Diff finished.  Thu Jan 26 11:26:18 2017