RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

wayland_common: update to stable xdg-shell 

This removes support for older compositors using the unstable version,
but those will still use Xwayland by default, so not a big loss.
This commit is contained in:
Emmanuel Gil Peyrot 2018-04-23 16:10:40 +02:00 committed by Jan Ekström
parent dc16d85379
commit 76211609e3
3 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
video/out/wayland_common.c
View File

@ -26,8 +26,8 @@
#include "win_state.h" #include "win_state.h"
#include "wayland_common.h" #include "wayland_common.h"
// Generated from xdg-shell-unstable-v6.xml // Generated from xdg-shell.xml
#include "video/out/wayland/xdg-shell-v6.h" #include "video/out/wayland/xdg-shell.h"
// Generated from idle-inhibit-unstable-v1.xml // Generated from idle-inhibit-unstable-v1.xml
#include "video/out/wayland/idle-inhibit-v1.h" #include "video/out/wayland/idle-inhibit-v1.h"
@ -35,12 +35,12 @@
// Generated from server-decoration.xml // Generated from server-decoration.xml
#include "video/out/wayland/srv-decor.h" #include "video/out/wayland/srv-decor.h"
static void xdg_shell_ping(void *data, struct zxdg_shell_v6 *shell, uint32_t serial) static void xdg_shell_ping(void *data, struct xdg_wm_base *shell, uint32_t serial)
{ {
zxdg_shell_v6_pong(shell, serial); xdg_wm_base_pong(shell, serial);
} }
static const struct zxdg_shell_v6_listener xdg_shell_listener = { static const struct xdg_wm_base_listener xdg_shell_listener = {
xdg_shell_ping, xdg_shell_ping,
}; };
@ -125,7 +125,7 @@ static void pointer_handle_motion(void *data, struct wl_pointer *pointer,
static void window_move(struct vo_wayland_state *wl, uint32_t serial) static void window_move(struct vo_wayland_state *wl, uint32_t serial)
{ {
if (wl->xdg_toplevel) if (wl->xdg_toplevel)
zxdg_toplevel_v6_move(wl->xdg_toplevel, wl->seat, serial); xdg_toplevel_move(wl->xdg_toplevel, wl->seat, serial);
} }
static void pointer_handle_button(void *data, struct wl_pointer *wl_pointer, static void pointer_handle_button(void *data, struct wl_pointer *wl_pointer,
@ -177,7 +177,7 @@ static const struct wl_pointer_listener pointer_listener = {
}; };
static int check_for_resize(struct vo_wayland_state *wl, wl_fixed_t x_w, wl_fixed_t y_w, static int check_for_resize(struct vo_wayland_state *wl, wl_fixed_t x_w, wl_fixed_t y_w,
enum zxdg_toplevel_v6_resize_edge *edge) enum xdg_toplevel_resize_edge *edge)
{ {
if (wl->touch_entries || wl->fullscreen) if (wl->touch_entries || wl->fullscreen)
return 0; return 0;
@ -190,21 +190,21 @@ static int check_for_resize(struct vo_wayland_state *wl, wl_fixed_t x_w, wl_fixe
int bottom_edge = pos[1] > (mp_rect_h(wl->geometry) - edge_pixels); int bottom_edge = pos[1] > (mp_rect_h(wl->geometry) - edge_pixels);
if (left_edge) { if (left_edge) {
*edge = ZXDG_TOPLEVEL_V6_RESIZE_EDGE_LEFT; *edge = XDG_TOPLEVEL_RESIZE_EDGE_LEFT;
if (top_edge) if (top_edge)
*edge = ZXDG_TOPLEVEL_V6_RESIZE_EDGE_TOP_LEFT; *edge = XDG_TOPLEVEL_RESIZE_EDGE_TOP_LEFT;
else if (bottom_edge) else if (bottom_edge)
*edge = ZXDG_TOPLEVEL_V6_RESIZE_EDGE_BOTTOM_LEFT; *edge = XDG_TOPLEVEL_RESIZE_EDGE_BOTTOM_LEFT;
} else if (right_edge) { } else if (right_edge) {
*edge = ZXDG_TOPLEVEL_V6_RESIZE_EDGE_RIGHT; *edge = XDG_TOPLEVEL_RESIZE_EDGE_RIGHT;
if (top_edge) if (top_edge)
*edge = ZXDG_TOPLEVEL_V6_RESIZE_EDGE_TOP_RIGHT; *edge = XDG_TOPLEVEL_RESIZE_EDGE_TOP_RIGHT;
else if (bottom_edge) else if (bottom_edge)
*edge = ZXDG_TOPLEVEL_V6_RESIZE_EDGE_BOTTOM_RIGHT; *edge = XDG_TOPLEVEL_RESIZE_EDGE_BOTTOM_RIGHT;
} else if (top_edge) { } else if (top_edge) {
*edge = ZXDG_TOPLEVEL_V6_RESIZE_EDGE_TOP; *edge = XDG_TOPLEVEL_RESIZE_EDGE_TOP;
} else if (bottom_edge) { } else if (bottom_edge) {
*edge = ZXDG_TOPLEVEL_V6_RESIZE_EDGE_BOTTOM; *edge = XDG_TOPLEVEL_RESIZE_EDGE_BOTTOM;
} else { } else {
*edge = 0; *edge = 0;
return 0; return 0;
@ -219,14 +219,14 @@ static void touch_handle_down(void *data, struct wl_touch *wl_touch,
{ {
struct vo_wayland_state *wl = data; struct vo_wayland_state *wl = data;
enum zxdg_toplevel_v6_resize_edge edge; enum xdg_toplevel_resize_edge edge;
if (check_for_resize(wl, x_w, y_w, &edge)) { if (check_for_resize(wl, x_w, y_w, &edge)) {
wl->touch_entries = 0; wl->touch_entries = 0;
zxdg_toplevel_v6_resize(wl->xdg_toplevel, wl->seat, serial, edge); xdg_toplevel_resize(wl->xdg_toplevel, wl->seat, serial, edge);
return; return;
} else if (wl->touch_entries) { } else if (wl->touch_entries) {
wl->touch_entries = 0; wl->touch_entries = 0;
zxdg_toplevel_v6_move(wl->xdg_toplevel, wl->seat, serial); xdg_toplevel_move(wl->xdg_toplevel, wl->seat, serial);
return; return;
} }
@ -805,9 +805,9 @@ static void registry_handle_add(void *data, struct wl_registry *reg, uint32_t id
wl_list_insert(&wl->output_list, &output->link); wl_list_insert(&wl->output_list, &output->link);
} }
if (!strcmp(interface, zxdg_shell_v6_interface.name) && found++) { if (!strcmp(interface, xdg_wm_base_interface.name) && found++) {
wl->shell = wl_registry_bind(reg, id, &zxdg_shell_v6_interface, 1); wl->shell = wl_registry_bind(reg, id, &xdg_wm_base_interface, 1);
zxdg_shell_v6_add_listener(wl->shell, &xdg_shell_listener, wl); xdg_wm_base_add_listener(wl->shell, &xdg_shell_listener, wl);
} }
if (!strcmp(interface, wl_seat_interface.name) && found++) { if (!strcmp(interface, wl_seat_interface.name) && found++) {
@ -866,17 +866,17 @@ static const struct wl_registry_listener registry_listener = {
registry_handle_remove, registry_handle_remove,
}; };
static void handle_surface_config(void *data, struct zxdg_surface_v6 *surface, static void handle_surface_config(void *data, struct xdg_surface *surface,
uint32_t serial) uint32_t serial)
{ {
zxdg_surface_v6_ack_configure(surface, serial); xdg_surface_ack_configure(surface, serial);
} }
static const struct zxdg_surface_v6_listener xdg_surface_listener = { static const struct xdg_surface_listener xdg_surface_listener = {
handle_surface_config, handle_surface_config,
}; };
static void handle_toplevel_config(void *data, struct zxdg_toplevel_v6 *toplevel, static void handle_toplevel_config(void *data, struct xdg_toplevel *toplevel,
int32_t width, int32_t height, struct wl_array *states) int32_t width, int32_t height, struct wl_array *states)
{ {
struct vo_wayland_state *wl = data; struct vo_wayland_state *wl = data;
@ -885,19 +885,19 @@ static void handle_toplevel_config(void *data, struct zxdg_toplevel_v6 *toplevel
int prev_fs_state = wl->fullscreen; int prev_fs_state = wl->fullscreen;
bool maximized = false; bool maximized = false;
wl->fullscreen = false; wl->fullscreen = false;
enum zxdg_toplevel_v6_state *state; enum xdg_toplevel_state *state;
wl_array_for_each(state, states) { wl_array_for_each(state, states) {
switch (*state) { switch (*state) {
case ZXDG_TOPLEVEL_V6_STATE_FULLSCREEN: case XDG_TOPLEVEL_STATE_FULLSCREEN:
wl->fullscreen = true; wl->fullscreen = true;
break; break;
case ZXDG_TOPLEVEL_V6_STATE_RESIZING: case XDG_TOPLEVEL_STATE_RESIZING:
wl->pending_vo_events |= VO_EVENT_LIVE_RESIZING; wl->pending_vo_events |= VO_EVENT_LIVE_RESIZING;
break; break;
case ZXDG_TOPLEVEL_V6_STATE_MAXIMIZED: case XDG_TOPLEVEL_STATE_MAXIMIZED:
maximized = true; maximized = true;
break; break;
case ZXDG_TOPLEVEL_V6_STATE_ACTIVATED: case XDG_TOPLEVEL_STATE_ACTIVATED:
break; break;
} }
} }
@ -939,27 +939,27 @@ static void handle_toplevel_config(void *data, struct zxdg_toplevel_v6 *toplevel
wl->pending_vo_events |= VO_EVENT_RESIZE; wl->pending_vo_events |= VO_EVENT_RESIZE;
} }
static void handle_toplevel_close(void *data, struct zxdg_toplevel_v6 *xdg_toplevel) static void handle_toplevel_close(void *data, struct xdg_toplevel *xdg_toplevel)
{ {
struct vo_wayland_state *wl = data; struct vo_wayland_state *wl = data;
mp_input_put_key(wl->vo->input_ctx, MP_KEY_CLOSE_WIN); mp_input_put_key(wl->vo->input_ctx, MP_KEY_CLOSE_WIN);
} }
static const struct zxdg_toplevel_v6_listener xdg_toplevel_listener = { static const struct xdg_toplevel_listener xdg_toplevel_listener = {
handle_toplevel_config, handle_toplevel_config,
handle_toplevel_close, handle_toplevel_close,
}; };
static int create_xdg_surface(struct vo_wayland_state *wl) static int create_xdg_surface(struct vo_wayland_state *wl)
{ {
wl->xdg_surface = zxdg_shell_v6_get_xdg_surface(wl->shell, wl->surface); wl->xdg_surface = xdg_wm_base_get_xdg_surface(wl->shell, wl->surface);
zxdg_surface_v6_add_listener(wl->xdg_surface, &xdg_surface_listener, wl); xdg_surface_add_listener(wl->xdg_surface, &xdg_surface_listener, wl);
wl->xdg_toplevel = zxdg_surface_v6_get_toplevel(wl->xdg_surface); wl->xdg_toplevel = xdg_surface_get_toplevel(wl->xdg_surface);
zxdg_toplevel_v6_add_listener(wl->xdg_toplevel, &xdg_toplevel_listener, wl); xdg_toplevel_add_listener(wl->xdg_toplevel, &xdg_toplevel_listener, wl);
zxdg_toplevel_v6_set_title (wl->xdg_toplevel, "mpv"); xdg_toplevel_set_title (wl->xdg_toplevel, "mpv");
zxdg_toplevel_v6_set_app_id(wl->xdg_toplevel, "mpv"); xdg_toplevel_set_app_id(wl->xdg_toplevel, "mpv");
return 0; return 0;
} }
@ -1010,7 +1010,7 @@ int vo_wayland_init(struct vo *vo)
if (!wl->shell) { if (!wl->shell) {
MP_FATAL(wl, "Compositor doesn't support the required %s protocol!\n", MP_FATAL(wl, "Compositor doesn't support the required %s protocol!\n",
zxdg_shell_v6_interface.name); xdg_wm_base_interface.name);
return false; return false;
} }
@ -1074,7 +1074,7 @@ void vo_wayland_uninit(struct vo *vo)
zwp_idle_inhibit_manager_v1_destroy(wl->idle_inhibit_manager); zwp_idle_inhibit_manager_v1_destroy(wl->idle_inhibit_manager);
if (wl->shell) if (wl->shell)
zxdg_shell_v6_destroy(wl->shell); xdg_wm_base_destroy(wl->shell);
if (wl->shm) if (wl->shm)
wl_shm_destroy(wl->shm); wl_shm_destroy(wl->shm);
@ -1168,7 +1168,7 @@ int vo_wayland_reconfig(struct vo *vo)
wl->geometry.x1 = mp_rect_w(wl->current_output->geometry)/wl->scaling; wl->geometry.x1 = mp_rect_w(wl->current_output->geometry)/wl->scaling;
wl->geometry.y1 = mp_rect_h(wl->current_output->geometry)/wl->scaling; wl->geometry.y1 = mp_rect_h(wl->current_output->geometry)/wl->scaling;
} else { } else {
zxdg_toplevel_v6_set_fullscreen(wl->xdg_toplevel, wl_out); xdg_toplevel_set_fullscreen(wl->xdg_toplevel, wl_out);
} }
} }
@ -1208,9 +1208,9 @@ static int toggle_fullscreen(struct vo_wayland_state *wl)
if (!wl->xdg_toplevel) if (!wl->xdg_toplevel)
return VO_NOTAVAIL; return VO_NOTAVAIL;
if (wl->fullscreen) if (wl->fullscreen)
zxdg_toplevel_v6_unset_fullscreen(wl->xdg_toplevel); xdg_toplevel_unset_fullscreen(wl->xdg_toplevel);
else else
zxdg_toplevel_v6_set_fullscreen(wl->xdg_toplevel, NULL); xdg_toplevel_set_fullscreen(wl->xdg_toplevel, NULL);
return VO_TRUE; return VO_TRUE;
} }
@ -1218,7 +1218,7 @@ static int update_window_title(struct vo_wayland_state *wl, char *title)
{ {
if (!wl->xdg_toplevel) if (!wl->xdg_toplevel)
return VO_NOTAVAIL; return VO_NOTAVAIL;
zxdg_toplevel_v6_set_title(wl->xdg_toplevel, title); xdg_toplevel_set_title(wl->xdg_toplevel, title);
return VO_TRUE; return VO_TRUE;
} }

6
video/out/wayland_common.h
View File

@ -69,9 +69,9 @@ struct vo_wayland_state {
/* Shell */ /* Shell */
struct wl_surface *surface; struct wl_surface *surface;
struct zxdg_shell_v6 *shell; struct xdg_wm_base *shell;
struct zxdg_toplevel_v6 *xdg_toplevel; struct xdg_toplevel *xdg_toplevel;
struct zxdg_surface_v6 *xdg_surface; struct xdg_surface *xdg_surface;
struct org_kde_kwin_server_decoration_manager *server_decoration_manager; struct org_kde_kwin_server_decoration_manager *server_decoration_manager;
struct org_kde_kwin_server_decoration *server_decoration; struct org_kde_kwin_server_decoration *server_decoration;
struct zwp_idle_inhibit_manager_v1 *idle_inhibit_manager; struct zwp_idle_inhibit_manager_v1 *idle_inhibit_manager;

10
wscript_build.py
View File

@ -118,11 +118,11 @@ def build(ctx):
if ctx.dependency_satisfied('wayland'): if ctx.dependency_satisfied('wayland'):
ctx.wayland_protocol_code(proto_dir = ctx.env.WL_PROTO_DIR, ctx.wayland_protocol_code(proto_dir = ctx.env.WL_PROTO_DIR,
protocol = "unstable/xdg-shell/xdg-shell-unstable-v6", protocol = "stable/xdg-shell/xdg-shell",
target = "video/out/wayland/xdg-shell-v6.c") target = "video/out/wayland/xdg-shell.c")
ctx.wayland_protocol_header(proto_dir = ctx.env.WL_PROTO_DIR, ctx.wayland_protocol_header(proto_dir = ctx.env.WL_PROTO_DIR,
protocol = "unstable/xdg-shell/xdg-shell-unstable-v6", protocol = "stable/xdg-shell/xdg-shell",
target = "video/out/wayland/xdg-shell-v6.h") target = "video/out/wayland/xdg-shell.h")
ctx.wayland_protocol_code(proto_dir = ctx.env.WL_PROTO_DIR, ctx.wayland_protocol_code(proto_dir = ctx.env.WL_PROTO_DIR,
protocol = "unstable/idle-inhibit/idle-inhibit-unstable-v1", protocol = "unstable/idle-inhibit/idle-inhibit-unstable-v1",
target = "video/out/wayland/idle-inhibit-v1.c") target = "video/out/wayland/idle-inhibit-v1.c")
@ -507,7 +507,7 @@ def build(ctx):
( "video/out/w32_common.c", "win32-desktop" ), ( "video/out/w32_common.c", "win32-desktop" ),
( "video/out/wayland/idle-inhibit-v1.c", "wayland" ), ( "video/out/wayland/idle-inhibit-v1.c", "wayland" ),
( "video/out/wayland/srv-decor.c", "wayland" ), ( "video/out/wayland/srv-decor.c", "wayland" ),
( "video/out/wayland/xdg-shell-v6.c", "wayland" ), ( "video/out/wayland/xdg-shell.c", "wayland" ),
( "video/out/wayland_common.c", "wayland" ), ( "video/out/wayland_common.c", "wayland" ),
( "video/out/win32/displayconfig.c", "win32-desktop" ), ( "video/out/win32/displayconfig.c", "win32-desktop" ),
( "video/out/win32/droptarget.c", "win32-desktop" ), ( "video/out/win32/droptarget.c", "win32-desktop" ),