summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorsimonbachmann <simonbachmann@bluewin.ch>2017-04-08 07:30:32 (GMT)
committersimonbachmann <simonbachmann@bluewin.ch>2017-04-08 07:30:32 (GMT)
commit37020fe58d94418d36281f0f065df4a2cbc71609 (patch)
treebf25ed2c9298ee69144aeeec85f356f1aed5773f /win
parent2bcefceaa3b03be056a7a45f481dc9e4adcbbbd7 (diff)
parent735fd7e290750c83ddd6d0e1db7e1511c306936b (diff)
downloadtk-37020fe58d94418d36281f0f065df4a2cbc71609.zip
tk-37020fe58d94418d36281f0f065df4a2cbc71609.tar.gz
tk-37020fe58d94418d36281f0f065df4a2cbc71609.tar.bz2
merge trunk
Diffstat (limited to 'win')
-rw-r--r--win/tkWinKey.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/win/tkWinKey.c b/win/tkWinKey.c
index 1ebf312..357a804 100644
--- a/win/tkWinKey.c
+++ b/win/tkWinKey.c
@@ -21,7 +21,8 @@
* 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,
@@ -53,7 +54,13 @@ static const KeySym keymap[] = {
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*/
};
/*