mirror of
https://github.com/mpv-player/mpv.git
synced 2024-09-20 20:03:10 +02:00
79068baf43
According to MS documentation, an application should return TRUE from
WM_XBUTTONUP and WM_XBUTTONDOWN if it processes these messages.
DefWindowProc generates the WM_APPCOMMAND message when it processes the
WM_XBUTTONUP message, so if an application properly handles WM_XBUTTONUP
messages, extra WM_APPCOMMAND messages won't be generated.
Because mpv doesn't properly handle these messages,
WM_XBUTTONUP causes APPCOMMAND_BROWSER_BACKWARD to be generated, resulting
in duplicated keys and improper fix 438ead7a, which prevents the processing
of the appcommand from sources other than mouse clicks.
Fix this by following the documentation, and the back and forward
appcommands can be added.
126 lines
4.6 KiB
C
126 lines
4.6 KiB
C
/*
|
|
* This file is part of mpv.
|
|
*
|
|
* mpv is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* mpv is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with mpv. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include <windows.h>
|
|
#include "osdep/w32_keyboard.h"
|
|
#include "input/keycodes.h"
|
|
|
|
struct keymap {
|
|
int from;
|
|
int to;
|
|
};
|
|
|
|
static const struct keymap vk_map_ext[] = {
|
|
// cursor keys
|
|
{VK_LEFT, MP_KEY_LEFT}, {VK_UP, MP_KEY_UP}, {VK_RIGHT, MP_KEY_RIGHT},
|
|
{VK_DOWN, MP_KEY_DOWN},
|
|
|
|
// navigation block
|
|
{VK_INSERT, MP_KEY_INSERT}, {VK_DELETE, MP_KEY_DELETE},
|
|
{VK_HOME, MP_KEY_HOME}, {VK_END, MP_KEY_END}, {VK_PRIOR, MP_KEY_PAGE_UP},
|
|
{VK_NEXT, MP_KEY_PAGE_DOWN},
|
|
|
|
// numpad independent of numlock
|
|
{VK_RETURN, MP_KEY_KPENTER},
|
|
|
|
{0, 0}
|
|
};
|
|
|
|
static const struct keymap vk_map[] = {
|
|
// special keys
|
|
{VK_ESCAPE, MP_KEY_ESC}, {VK_BACK, MP_KEY_BS}, {VK_TAB, MP_KEY_TAB},
|
|
{VK_RETURN, MP_KEY_ENTER}, {VK_PAUSE, MP_KEY_PAUSE},
|
|
{VK_SLEEP, MP_KEY_SLEEP}, {VK_SNAPSHOT, MP_KEY_PRINT},
|
|
{VK_APPS, MP_KEY_MENU},
|
|
|
|
// F-keys
|
|
{VK_F1, MP_KEY_F+1}, {VK_F2, MP_KEY_F+2}, {VK_F3, MP_KEY_F+3},
|
|
{VK_F4, MP_KEY_F+4}, {VK_F5, MP_KEY_F+5}, {VK_F6, MP_KEY_F+6},
|
|
{VK_F7, MP_KEY_F+7}, {VK_F8, MP_KEY_F+8}, {VK_F9, MP_KEY_F+9},
|
|
{VK_F10, MP_KEY_F+10}, {VK_F11, MP_KEY_F+11}, {VK_F12, MP_KEY_F+12},
|
|
{VK_F13, MP_KEY_F+13}, {VK_F14, MP_KEY_F+14}, {VK_F15, MP_KEY_F+15},
|
|
{VK_F16, MP_KEY_F+16}, {VK_F17, MP_KEY_F+17}, {VK_F18, MP_KEY_F+18},
|
|
{VK_F19, MP_KEY_F+19}, {VK_F20, MP_KEY_F+20}, {VK_F21, MP_KEY_F+21},
|
|
{VK_F22, MP_KEY_F+22}, {VK_F23, MP_KEY_F+23}, {VK_F24, MP_KEY_F+24},
|
|
|
|
// numpad with numlock
|
|
{VK_NUMPAD0, MP_KEY_KP0}, {VK_NUMPAD1, MP_KEY_KP1},
|
|
{VK_NUMPAD2, MP_KEY_KP2}, {VK_NUMPAD3, MP_KEY_KP3},
|
|
{VK_NUMPAD4, MP_KEY_KP4}, {VK_NUMPAD5, MP_KEY_KP5},
|
|
{VK_NUMPAD6, MP_KEY_KP6}, {VK_NUMPAD7, MP_KEY_KP7},
|
|
{VK_NUMPAD8, MP_KEY_KP8}, {VK_NUMPAD9, MP_KEY_KP9},
|
|
{VK_DECIMAL, MP_KEY_KPDEC},
|
|
|
|
// numpad without numlock
|
|
{VK_INSERT, MP_KEY_KPINS}, {VK_END, MP_KEY_KPEND}, {VK_DOWN, MP_KEY_KPDOWN},
|
|
{VK_NEXT, MP_KEY_KPPGDOWN}, {VK_LEFT, MP_KEY_KPLEFT}, {VK_CLEAR, MP_KEY_KP5},
|
|
{VK_RIGHT, MP_KEY_KPRIGHT}, {VK_HOME, MP_KEY_KPHOME}, {VK_UP, MP_KEY_KPUP},
|
|
{VK_PRIOR, MP_KEY_KPPGUP}, {VK_DELETE, MP_KEY_KPDEL},
|
|
|
|
{0, 0}
|
|
};
|
|
|
|
static const struct keymap appcmd_map[] = {
|
|
{APPCOMMAND_MEDIA_NEXTTRACK, MP_KEY_NEXT},
|
|
{APPCOMMAND_MEDIA_PREVIOUSTRACK, MP_KEY_PREV},
|
|
{APPCOMMAND_MEDIA_STOP, MP_KEY_STOP},
|
|
{APPCOMMAND_MEDIA_PLAY_PAUSE, MP_KEY_PLAYPAUSE},
|
|
{APPCOMMAND_MEDIA_PLAY, MP_KEY_PLAY},
|
|
{APPCOMMAND_MEDIA_PAUSE, MP_KEY_PAUSE},
|
|
{APPCOMMAND_MEDIA_RECORD, MP_KEY_RECORD},
|
|
{APPCOMMAND_MEDIA_FAST_FORWARD, MP_KEY_FORWARD},
|
|
{APPCOMMAND_MEDIA_REWIND, MP_KEY_REWIND},
|
|
{APPCOMMAND_MEDIA_CHANNEL_UP, MP_KEY_CHANNEL_UP},
|
|
{APPCOMMAND_MEDIA_CHANNEL_DOWN, MP_KEY_CHANNEL_DOWN},
|
|
{APPCOMMAND_VOLUME_MUTE, MP_KEY_MUTE},
|
|
{APPCOMMAND_VOLUME_DOWN, MP_KEY_VOLUME_DOWN},
|
|
{APPCOMMAND_VOLUME_UP, MP_KEY_VOLUME_UP},
|
|
{APPCOMMAND_BROWSER_HOME, MP_KEY_HOMEPAGE},
|
|
{APPCOMMAND_LAUNCH_MAIL, MP_KEY_MAIL},
|
|
{APPCOMMAND_BROWSER_FAVORITES, MP_KEY_FAVORITES},
|
|
{APPCOMMAND_BROWSER_SEARCH, MP_KEY_SEARCH},
|
|
{APPCOMMAND_BROWSER_BACKWARD, MP_KEY_GO_BACK},
|
|
{APPCOMMAND_BROWSER_FORWARD, MP_KEY_GO_FORWARD},
|
|
{0, 0}
|
|
};
|
|
|
|
static int lookup_keymap(const struct keymap *map, int key)
|
|
{
|
|
while (map->from && map->from != key) map++;
|
|
return map->to;
|
|
}
|
|
|
|
int mp_w32_vkey_to_mpkey(UINT vkey, bool extended)
|
|
{
|
|
// The extended flag is set for the navigation cluster and the arrow keys,
|
|
// so it can be used to differentiate between them and the numpad. The
|
|
// numpad enter key also has this flag set.
|
|
int mpkey = lookup_keymap(extended ? vk_map_ext : vk_map, vkey);
|
|
|
|
// If we got the extended flag for a key we don't recognize, search the
|
|
// normal keymap before giving up
|
|
if (extended && !mpkey)
|
|
mpkey = lookup_keymap(vk_map, vkey);
|
|
|
|
return mpkey;
|
|
}
|
|
|
|
int mp_w32_appcmd_to_mpkey(UINT appcmd)
|
|
{
|
|
return lookup_keymap(appcmd_map, appcmd);
|
|
}
|