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/x11_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/x11_common.c')
| -rw-r--r-- | video/out/x11_common.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/video/out/x11_common.c b/video/out/x11_common.c index bbb6fca997..648f1d57eb 100644 --- a/video/out/x11_common.c +++ b/video/out/x11_common.c @@ -766,7 +766,8 @@ int vo_x11_check_events(struct vo *vo) break; case ButtonRelease: mplayer_put_key(vo->key_fifo, - MP_MOUSE_BTN0 + Event.xbutton.button - 1); + (MP_MOUSE_BTN0 + Event.xbutton.button - 1) + | MP_KEY_STATE_UP); break; case PropertyNotify: { char *name = XGetAtomName(display, Event.xproperty.atom); |