summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-09-27 15:39:28 +0200
committerwm4 <wm4@nowhere>2013-09-27 15:39:28 +0200
commitede652774ee83d2d311763358a1d3b820d9f5e17 (patch)
treef14c07a4fec55eb932e979f353843dba08583657 /video
parent3871024ec32aaed04fe93a6b7af1c9d0df8f6248 (diff)
downloadmpv-ede652774ee83d2d311763358a1d3b820d9f5e17.tar.bz2
mpv-ede652774ee83d2d311763358a1d3b820d9f5e17.tar.xz
input: translate mouse position to OSD space early
Until now, mouse positions were just passed to the core as-is, even if the mouse coordinates didn't map to any useful coordinate space, like OSD coordinates. Lua scripting (used by the OSC, the only current user of mouse input) had to translate mouse coordinates manually to OSD space using mp_get_osd_mouse_pos(). This actually didn't work correctly in cases mouse coordinates didn't map to OSD (like vo_xv): the mouse coordinates the OSC got were correct, but input.c was still expecting "real" mosue coordinates for mouse areas. Fix this by converting to OSD coordinates before passing the mouse position to the core.
Diffstat (limited to 'video')
-rw-r--r--video/out/vo.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/video/out/vo.c b/video/out/vo.c
index aa027fc349..6f876d1898 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -601,5 +601,7 @@ void vo_mouse_movement(struct vo *vo, int posx, int posy)
{
if (!vo->opts->enable_mouse_movements)
return;
- mp_input_set_mouse_pos(vo->input_ctx, posx, posy);
+ float p[2] = {posx, posy};
+ vo_control(vo, VOCTRL_WINDOW_TO_OSD_COORDS, p);
+ mp_input_set_mouse_pos(vo->input_ctx, p[0], p[1]);
}