diff options
| author | Alexander Preisinger <alexander.preisinger@gmail.com> | 2014-01-28 13:07:00 +0100 |
|---|---|---|
| committer | Alexander Preisinger <alexander.preisinger@gmail.com> | 2014-04-16 16:38:54 +0200 |
| commit | 5528ad3031148ce19583ad8cd3c949fa4df4eb54 (patch) | |
| tree | 220e9f1cbd6ca9799844c7df3c40db21e74570de /video/out/wayland_common.h | |
| parent | 6fcec75baa6bb8b33be284aad108cf3f9920ef15 (diff) | |
| download | mpv-5528ad3031148ce19583ad8cd3c949fa4df4eb54.tar.bz2 mpv-5528ad3031148ce19583ad8cd3c949fa4df4eb54.tar.xz | |
wayland/shm: Use subsurfaces for OSD
Diffstat (limited to 'video/out/wayland_common.h')
| -rw-r--r-- | video/out/wayland_common.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/video/out/wayland_common.h b/video/out/wayland_common.h index 3bad89b367..020282761a 100644 --- a/video/out/wayland_common.h +++ b/video/out/wayland_common.h @@ -27,6 +27,8 @@ #include "config.h" +#include "sub/osd.h" + #if HAVE_GL_WAYLAND #include <wayland-egl.h> #include <EGL/egl.h> @@ -77,6 +79,8 @@ struct vo_wayland_state { int display_fd; struct wl_shm *shm; + + struct wl_subcompositor *subcomp; } display; struct { @@ -95,11 +99,14 @@ struct vo_wayland_state { int32_t fs_width; // fullscreen sizes int32_t fs_height; - struct wl_surface *surface; + struct wl_surface *video_surface; 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) */ + + struct wl_surface *osd_surfaces[MAX_OSD_PARTS]; + struct wl_subsurface *osd_subsurfaces[MAX_OSD_PARTS]; } window; struct { |