summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorAlexander Preisinger <alexander.preisinger@gmail.com>2013-10-25 10:27:58 +0200
committerAlexander Preisinger <alexander.preisinger@gmail.com>2013-10-25 10:30:12 +0200
commitcb3327fe48a35b20900c9ad47ddf4c17486a1e04 (patch)
tree36f4fda0ff43f332b2b209cd65ba1cfd5bcb47cd /video
parentbef2135a44ee07b68fe255c8ae4491b2e45e0895 (diff)
downloadmpv-cb3327fe48a35b20900c9ad47ddf4c17486a1e04.tar.bz2
mpv-cb3327fe48a35b20900c9ad47ddf4c17486a1e04.tar.xz
wayland: better name for mouse coordinates
I had to look up what the surf_x and surf_y members do. That means the name is not very good. Also a comment.
Diffstat (limited to 'video')
-rw-r--r--video/out/wayland_common.c10
-rw-r--r--video/out/wayland_common.h4
2 files changed, 7 insertions, 7 deletions
diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c
index 239e57519b..710dbd44c4 100644
--- a/video/out/wayland_common.c
+++ b/video/out/wayland_common.c
@@ -337,11 +337,11 @@ static void pointer_handle_motion(void *data,
struct vo_wayland_state *wl = data;
wl->cursor.pointer = pointer;
- wl->window.surf_x = wl_fixed_to_int(sx_w);
- wl->window.surf_y = wl_fixed_to_int(sy_w);
+ wl->window.mouse_x = wl_fixed_to_int(sx_w);
+ wl->window.mouse_y = wl_fixed_to_int(sy_w);
- vo_mouse_movement(wl->vo, wl->window.surf_x,
- wl->window.surf_y);
+ vo_mouse_movement(wl->vo, wl->window.mouse_x,
+ wl->window.mouse_y);
}
static void pointer_handle_button(void *data,
@@ -357,7 +357,7 @@ static void pointer_handle_button(void *data,
((state == WL_POINTER_BUTTON_STATE_PRESSED)
? MP_KEY_STATE_DOWN : MP_KEY_STATE_UP));
- if (!mp_input_test_dragging(wl->vo->input_ctx, wl->window.surf_x, wl->window.surf_y) &&
+ if (!mp_input_test_dragging(wl->vo->input_ctx, wl->window.mouse_x, wl->window.mouse_y) &&
(button == BTN_LEFT) && (state == WL_POINTER_BUTTON_STATE_PRESSED))
wl_shell_surface_move(wl->window.shell_surface, wl->input.seat, serial);
}
diff --git a/video/out/wayland_common.h b/video/out/wayland_common.h
index 956069707a..30fc9b72d2 100644
--- a/video/out/wayland_common.h
+++ b/video/out/wayland_common.h
@@ -73,8 +73,8 @@ struct vo_wayland_state {
bool is_fullscreen; // don't keep aspect ratio in fullscreen mode
struct wl_surface *surface;
- int32_t surf_x;
- int32_t surf_y;
+ int32_t mouse_x; // mouse position inside the surface
+ int32_t mouse_y;
struct wl_shell_surface *shell_surface;
int events; /* mplayer events (VO_EVENT_RESIZE) */
} window;