summaryrefslogtreecommitdiffstats
path: root/mpvcore
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 /mpvcore
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 'mpvcore')
-rw-r--r--mpvcore/command.c13
-rw-r--r--mpvcore/command.h2
-rw-r--r--mpvcore/mp_lua.c4
3 files changed, 2 insertions, 17 deletions
diff --git a/mpvcore/command.c b/mpvcore/command.c
index 70a14630a3..24b4fe8985 100644
--- a/mpvcore/command.c
+++ b/mpvcore/command.c
@@ -85,19 +85,6 @@ static char *format_delay(double time)
return talloc_asprintf(NULL, "%d ms", ROUND(time * 1000));
}
-// Get current mouse position in OSD coordinate space.
-void mp_get_osd_mouse_pos(struct MPContext *mpctx, float *x, float *y)
-{
- int wx, wy;
- mp_input_get_mouse_pos(mpctx->input, &wx, &wy);
- float p[2] = {wx, wy};
- // Raw window coordinates (VO mouse events) to OSD resolution.
- if (mpctx->video_out)
- vo_control(mpctx->video_out, VOCTRL_WINDOW_TO_OSD_COORDS, p);
- *x = p[0];
- *y = p[1];
-}
-
// Property-option bridge.
static int mp_property_generic_option(struct m_option *prop, int action,
void *arg, MPContext *mpctx)
diff --git a/mpvcore/command.h b/mpvcore/command.h
index 1ac5b6f8f0..dfdc066ac7 100644
--- a/mpvcore/command.h
+++ b/mpvcore/command.h
@@ -24,8 +24,6 @@ struct mp_cmd;
void command_init(struct MPContext *mpctx);
-void mp_get_osd_mouse_pos(struct MPContext *mpctx, float *x, float *y);
-
void run_command(struct MPContext *mpctx, struct mp_cmd *cmd);
char *mp_property_expand_string(struct MPContext *mpctx, const char *str);
void property_print_help(void);
diff --git a/mpvcore/mp_lua.c b/mpvcore/mp_lua.c
index e03f3e6aee..4741cb1f33 100644
--- a/mpvcore/mp_lua.c
+++ b/mpvcore/mp_lua.c
@@ -457,8 +457,8 @@ static int script_get_screen_size(lua_State *L)
static int script_get_mouse_pos(lua_State *L)
{
struct MPContext *mpctx = get_mpctx(L);
- float px, py;
- mp_get_osd_mouse_pos(mpctx, &px, &py);
+ int px, py;
+ mp_input_get_mouse_pos(mpctx->input, &px, &py);
double sw, sh;
osd_object_get_scale_factor(mpctx->osd, mpctx->osd->objs[OSDTYPE_EXTERNAL],
&sw, &sh);