1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-24 07:42:17 +00:00
mpv/video/out/wayland_common.h
wm4 1b09f46338 x11_common: use private variables for window state
Store the window state (position and size) in vo_x11_state, instead of
in vo->dx/dy/dwidth/dheight. The VO variables are overwritten by vo.c on
every vo_config() call, which is extremely not helpful.

Now vo->dx/dy are mostly unused (except for passing the position forced
by the --geometry option), and vo->dwidth/dheight are set for the VO,
and otherwise read for resize detection only.

In the long term, the way vo_config() handles the --geometry option
should be changed, and vo->dx/dy should be removed.

Remove some useless stuff: VO_EVENT_MOVE and VO_EVENT_KEYPRESS were
generated, but unused. Wayland changes by Alexander Preisinger.
2013-03-03 14:19:57 +01:00

153 lines
3.8 KiB
C

/*
* This file is part of MPlayer.
* Copyright © 2012-2013 Scott Moreau <oreaus@gmail.com>
* Copyright © 2012-2013 Alexander Preisinger <alexander.preisinger@gmail.com>
*
* MPlayer is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* MPlayer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef MPLAYER_WAYLAND_COMMON_H
#define MPLAYER_WAYLAND_COMMON_H
#include <stdint.h>
#include <stdbool.h>
#include <wayland-client.h>
#include <wayland-cursor.h>
#include <xkbcommon/xkbcommon.h>
#include "config.h"
enum vo_wayland_window_type {
TYPE_TOPLEVEL,
TYPE_FULLSCREEN
};
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 */
struct wl_output *output;
uint32_t flags;
int32_t width;
int32_t height;
struct wl_list link;
};
struct vo_wayland_display {
struct wl_output *output;
struct wl_display *display;
struct wl_registry *registry;
struct wl_compositor *compositor;
struct wl_shell *shell;
struct {
struct wl_shm *shm;
struct wl_cursor *default_cursor;
struct wl_cursor_theme *theme;
struct wl_surface *surface;
/* save timer and pointer for fading out */
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;
struct wl_list output_list;
struct wl_output *fs_output; /* fullscreen output */
int output_mode_received;
uint32_t formats;
uint32_t mask;
};
struct vo_wayland_window {
int32_t width;
int32_t height;
int32_t p_width;
int32_t p_height;
int32_t pending_width;
int32_t pending_height;
uint32_t edges;
int resize_needed;
struct wl_surface *surface;
struct wl_shell_surface *shell_surface;
struct wl_buffer *buffer;
struct wl_callback *callback;
int events; /* mplayer events */
enum vo_wayland_window_type type; /* is fullscreen */
};
struct vo_wayland_input {
struct wl_seat *seat;
struct wl_keyboard *keyboard;
struct wl_pointer *pointer;
struct {
struct xkb_context *context;
struct xkb_keymap *keymap;
struct xkb_state *state;
xkb_mod_mask_t shift_mask;
xkb_mod_mask_t control_mask;
xkb_mod_mask_t alt_mask;
} xkb;
int modifiers;
struct {
uint32_t sym;
uint32_t key;
uint32_t time;
int timer_fd;
struct vo_wayland_task task;
} repeat;
};
struct vo_wayland_state {
struct vo *vo;
struct vo_wayland_display *display;
struct vo_wayland_window *window;
struct vo_wayland_input *input;
};
int vo_wayland_init(struct vo *vo);
void vo_wayland_uninit(struct vo *vo);
void vo_wayland_ontop(struct vo *vo);
void vo_wayland_border(struct vo *vo);
void vo_wayland_fullscreen(struct vo *vo);
void vo_wayland_update_screeninfo(struct vo *vo);
int vo_wayland_check_events(struct vo *vo);
void vo_wayland_update_window_title(struct vo *vo);
#endif /* MPLAYER_WAYLAND_COMMON_H */