summaryrefslogtreecommitdiffstats
path: root/video/out/x11_common.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-07-27 21:53:29 +0200
committerwm4 <wm4@nowhere>2014-07-27 21:53:29 +0200
commit4c533fbb16b99c4b28fbd968d81bb0b44e3084b5 (patch)
treeceefb95dadc18ee01c29bc6c556d07ad9a8bc22c /video/out/x11_common.c
parent89391e7c949216d7edec461e9bb2cb6c787475c6 (diff)
downloadmpv-4c533fbb16b99c4b28fbd968d81bb0b44e3084b5.tar.bz2
mpv-4c533fbb16b99c4b28fbd968d81bb0b44e3084b5.tar.xz
vo: remove vo_mouse_movement() wrapper
So that VO backends don't have to access the VO just for that.
Diffstat (limited to 'video/out/x11_common.c')
-rw-r--r--video/out/x11_common.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/video/out/x11_common.c b/video/out/x11_common.c
index f43c5c03a8..539d66e641 100644
--- a/video/out/x11_common.c
+++ b/video/out/x11_common.c
@@ -835,7 +835,8 @@ int vo_x11_check_events(struct vo *vo)
};
x11_send_ewmh_msg(x11, "_NET_WM_MOVERESIZE", params);
} else {
- vo_mouse_movement(vo, Event.xmotion.x, Event.xmotion.y);
+ mp_input_set_mouse_pos(vo->input_ctx, Event.xmotion.x,
+ Event.xmotion.y);
}
x11->win_drag_button1_down = false;
break;
@@ -1560,7 +1561,7 @@ static void vo_x11_selectinput_witherr(struct vo *vo,
Window w,
long event_mask)
{
- if (!vo->opts->enable_mouse_movements)
+ if (!mp_input_mouse_enabled(vo->input_ctx))
event_mask &= ~(PointerMotionMask | ButtonPressMask | ButtonReleaseMask);
XSelectInput(display, w, NoEventMask);