diff options
| author | wm4 <wm4@nowhere> | 2013-07-01 23:54:59 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-07-02 12:19:16 +0200 |
| commit | c4766dc3c6233d3353b79fbd226202e7b8e3fc46 (patch) | |
| tree | ed8f8b06e53d5130c3a290ac0eadf873eaf0a7ec /video/out/w32_common.c | |
| parent | 2f8dcac28b64cecd537ab1fad366b2c2052c2ead (diff) | |
| download | mpv-c4766dc3c6233d3353b79fbd226202e7b8e3fc46.tar.bz2 mpv-c4766dc3c6233d3353b79fbd226202e7b8e3fc46.tar.xz | |
input: require VOs to send key up events, redo input key lookup
Making key up events implicit was sort-of a nice idea, but it's too
tricky and unreliable and makes the key lookup code (interpret_keys())
hard to reason about. See e.g. previous commit for subtle bugs and
issues this caused.
Make key-up events explicit instead. Add key up events to all VOs.
Any time MP_KEY_STATE_DOWN is used, the matching key up event must
use MP_KEY_STATE_UP.
Rewrite the key lookup code. It should be simpler and more robust now.
(Even though the LOC increases, because the new code is less "compact".)
Diffstat (limited to 'video/out/w32_common.c')
| -rw-r--r-- | video/out/w32_common.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/video/out/w32_common.c b/video/out/w32_common.c index 77433db885..13ec8e7053 100644 --- a/video/out/w32_common.c +++ b/video/out/w32_common.c @@ -225,19 +225,19 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, mouse_button = MP_MOUSE_BTN0 | MP_KEY_STATE_DOWN; break; case WM_LBUTTONUP: - mouse_button = MP_MOUSE_BTN0; + mouse_button = MP_MOUSE_BTN0 | MP_KEY_STATE_UP; break; case WM_MBUTTONDOWN: mouse_button = MP_MOUSE_BTN1 | MP_KEY_STATE_DOWN; break; case WM_MBUTTONUP: - mouse_button = MP_MOUSE_BTN1; + mouse_button = MP_MOUSE_BTN1 | MP_KEY_STATE_UP; break; case WM_RBUTTONDOWN: mouse_button = MP_MOUSE_BTN2 | MP_KEY_STATE_DOWN; break; case WM_RBUTTONUP: - mouse_button = MP_MOUSE_BTN2; + mouse_button = MP_MOUSE_BTN2 | MP_KEY_STATE_UP; break; case WM_MOUSEWHEEL: { int x = GET_WHEEL_DELTA_WPARAM(wParam); @@ -250,6 +250,7 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, break; case WM_XBUTTONUP: mouse_button = HIWORD(wParam) == 1 ? MP_MOUSE_BTN5 : MP_MOUSE_BTN6; + mouse_button |= MP_KEY_STATE_UP; break; } |