summaryrefslogtreecommitdiffstats
path: root/video/out/wayland_common.h
diff options
context:
space:
mode:
authorAlexander Preisinger <alexander.preisinger@gmail.com>2013-05-01 15:41:33 +0200
committerAlexander Preisinger <alexander.preisinger@gmail.com>2013-05-01 15:41:33 +0200
commitdb0c3d79f8dc53e07d0215fd1c67a0922e735d8f (patch)
tree4a1c3e2262375bd79aadf64353764d71d4e90a2d /video/out/wayland_common.h
parent048c68e5c22c6e2db54f228c6af7acfacad2d880 (diff)
downloadmpv-db0c3d79f8dc53e07d0215fd1c67a0922e735d8f.tar.bz2
mpv-db0c3d79f8dc53e07d0215fd1c67a0922e735d8f.tar.xz
wayland: use GetTimerMS for hiding mouse cursor
This commit remove a lot of linux specific code, like epoll. It also reduces the complexity of the code. Instead of epoll we use poll which makes the wayland backend more portable to other platforms.
Diffstat (limited to 'video/out/wayland_common.h')
-rw-r--r--video/out/wayland_common.h16
1 files changed, 3 insertions, 13 deletions
diff --git a/video/out/wayland_common.h b/video/out/wayland_common.h
index 20d3853fcf..30706686fe 100644
--- a/video/out/wayland_common.h
+++ b/video/out/wayland_common.h
@@ -35,15 +35,6 @@ enum vo_wayland_window_type {
};
struct vo;
-struct vo_wayland_state;
-
-struct vo_wayland_task {
- void (*run)(struct vo_wayland_task *task,
- uint32_t events,
- struct vo_wayland_state *wl);
-
- struct wl_list link;
-};
struct vo_wayland_output {
uint32_t id; /* unique name */
@@ -68,14 +59,13 @@ struct vo_wayland_display {
struct wl_surface *surface;
/* save timer and pointer for fading out */
+ int mouse_timer;
+ bool mouse_waiting_hide;
struct wl_pointer *pointer;
uint32_t serial;
- int timer_fd;
- struct vo_wayland_task task;
} cursor;
- int display_fd, epoll_fd;
- struct vo_wayland_task display_task;
+ int display_fd;
struct wl_list output_list;
struct wl_output *fs_output; /* fullscreen output */