From dc948866643c03639a405fb20272e026205b609a Mon Sep 17 00:00:00 2001 From: Sunderland93 Date: Wed, 5 Dec 2018 22:51:07 +0400 Subject: [PATCH 1/6] Initial support for xdg-decoration-unstable-v1 --- Makefile.common | 3 ++- gfx/common/wayland/generate_wayland_protos.sh | 10 +++++++--- gfx/drivers_context/wayland_ctx.c | 12 ++++++++++++ qb/config.libs.sh | 2 +- 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/Makefile.common b/Makefile.common index 47a567c99f..d400a480fa 100644 --- a/Makefile.common +++ b/Makefile.common @@ -867,7 +867,8 @@ ifeq ($(HAVE_WAYLAND), 1) input/drivers/wayland_input.o \ gfx/common/wayland/xdg-shell.o \ gfx/common/wayland/xdg-shell-unstable-v6.o \ - gfx/common/wayland/idle-inhibit-unstable-v1.o + gfx/common/wayland/idle-inhibit-unstable-v1.o \ + gfx/common/wayland/xdg-decoration-unstable-v1.o ifeq ($(HAVE_EGL), 1) LIBS += $(EGL_LIBS) endif diff --git a/gfx/common/wayland/generate_wayland_protos.sh b/gfx/common/wayland/generate_wayland_protos.sh index 22e19281cf..8c0cc7f155 100755 --- a/gfx/common/wayland/generate_wayland_protos.sh +++ b/gfx/common/wayland/generate_wayland_protos.sh @@ -9,12 +9,16 @@ fi #Generate xdg-shell_v6 header and .c files $WAYSCAN client-header $WAYLAND_PROTOS/unstable/xdg-shell/xdg-shell-unstable-v6.xml $OUTPUT/xdg-shell-unstable-v6.h -$WAYSCAN code $WAYLAND_PROTOS/unstable/xdg-shell/xdg-shell-unstable-v6.xml $OUTPUT/xdg-shell-unstable-v6.c +$WAYSCAN private-code $WAYLAND_PROTOS/unstable/xdg-shell/xdg-shell-unstable-v6.xml $OUTPUT/xdg-shell-unstable-v6.c #Generate xdg-shell header and .c files $WAYSCAN client-header $WAYLAND_PROTOS/stable/xdg-shell/xdg-shell.xml $OUTPUT/xdg-shell.h -$WAYSCAN code $WAYLAND_PROTOS/stable/xdg-shell/xdg-shell.xml $OUTPUT/xdg-shell.c +$WAYSCAN private-code $WAYLAND_PROTOS/stable/xdg-shell/xdg-shell.xml $OUTPUT/xdg-shell.c #Generate idle-inhibit header and .c files $WAYSCAN client-header $WAYLAND_PROTOS/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml $OUTPUT/idle-inhibit-unstable-v1.h -$WAYSCAN code $WAYLAND_PROTOS/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml $OUTPUT/idle-inhibit-unstable-v1.c +$WAYSCAN private-code $WAYLAND_PROTOS/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml $OUTPUT/idle-inhibit-unstable-v1.c + +#Generate xdg-decoration header and .c files +$WAYSCAN client-header $WAYLAND_PROTOS/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml $OUTPUT/xdg-decoration-unstable-v1.h +$WAYSCAN private-code $WAYLAND_PROTOS/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml $OUTPUT/xdg-decoration-unstable-v1.c diff --git a/gfx/drivers_context/wayland_ctx.c b/gfx/drivers_context/wayland_ctx.c index 138f485935..d05c65d321 100644 --- a/gfx/drivers_context/wayland_ctx.c +++ b/gfx/drivers_context/wayland_ctx.c @@ -56,6 +56,9 @@ /* Generated from xdg-shell.xml */ #include "../common/wayland/xdg-shell.h" +/* Generated from xdg-decoration-unstable-v1.h */ +#include "../common/wayland/xdg-decoration-unstable-v1.h" + typedef struct touch_pos { @@ -103,6 +106,8 @@ typedef struct gfx_ctx_wayland_data struct wl_touch *wl_touch; struct wl_seat *seat; struct wl_shm *shm; + struct zxdg_decoration_manager_v1 *deco_manager; + struct zxdg_toplevel_decoration_v1 *deco; struct zwp_idle_inhibit_manager_v1 *idle_inhibit_manager; struct zwp_idle_inhibitor_v1 *idle_inhibitor; int swap_interval; @@ -842,6 +847,9 @@ static void registry_handle_global(void *data, struct wl_registry *reg, else if (string_is_equal(interface, "zwp_idle_inhibit_manager_v1")) wl->idle_inhibit_manager = (struct zwp_idle_inhibit_manager_v1*)wl_registry_bind( reg, id, &zwp_idle_inhibit_manager_v1_interface, 1); + else if (string_is_equal(interface, "zxdg_decoration_manager_v1")) + wl->deco_manager = (struct zxdg_decoration_manager_v1*)wl_registry_bind( + reg, id, &zxdg_decoration_manager_v1_interface, 1); } static void registry_handle_global_remove(void *data, @@ -938,6 +946,10 @@ static void gfx_ctx_wl_destroy_resources(gfx_ctx_wayland_data_t *wl) wl_shell_surface_destroy(wl->shell_surf); if (wl->idle_inhibit_manager) zwp_idle_inhibit_manager_v1_destroy(wl->idle_inhibit_manager); + if (wl->deco) + zxdg_toplevel_decoration_v1_destroy(wl->deco); + if (wl->deco_manager) + zxdg_decoration_manager_v1_destroy(wl->deco_manager); if (wl->idle_inhibitor) zwp_idle_inhibitor_v1_destroy(wl->idle_inhibitor); diff --git a/qb/config.libs.sh b/qb/config.libs.sh index 233fd9760a..d31c45c589 100644 --- a/qb/config.libs.sh +++ b/qb/config.libs.sh @@ -457,7 +457,7 @@ check_pkgconf X11 x11 check_pkgconf XCB xcb check_pkgconf WAYLAND wayland-egl 1.14 check_pkgconf WAYLAND_CURSOR wayland-cursor 1.14 -check_pkgconf WAYLAND_PROTOS wayland-protocols 1.13 +check_pkgconf WAYLAND_PROTOS wayland-protocols 1.15 check_pkgconf XKBCOMMON xkbcommon 0.3.2 check_pkgconf DBUS dbus-1 check_pkgconf XEXT xext From f45154f15c29429693f29dad8b0104803eb7c607 Mon Sep 17 00:00:00 2001 From: Sunderland93 Date: Sun, 9 Dec 2018 14:56:36 +0400 Subject: [PATCH 2/6] Add support for zxdg_decoration_manager_v1 --- gfx/drivers_context/wayland_ctx.c | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/gfx/drivers_context/wayland_ctx.c b/gfx/drivers_context/wayland_ctx.c index d05c65d321..ca1626330c 100644 --- a/gfx/drivers_context/wayland_ctx.c +++ b/gfx/drivers_context/wayland_ctx.c @@ -1094,10 +1094,18 @@ static void gfx_ctx_wl_update_title(void *data, void *data2) video_driver_get_window_title(title, sizeof(title)); if (wl && title[0]) { - if (wl->xdg_toplevel) - xdg_toplevel_set_title(wl->xdg_toplevel, title); - else if (wl->zxdg_toplevel) - zxdg_toplevel_v6_set_title(wl->zxdg_toplevel, title); + if (wl->xdg_toplevel) { + if (wl->deco) { + zxdg_toplevel_decoration_v1_set_mode(wl->deco, ZXDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE); + } + xdg_toplevel_set_title(wl->xdg_toplevel, title); + } + else if (wl->zxdg_toplevel) { + if (wl->deco) { + zxdg_toplevel_decoration_v1_set_mode(wl->deco, ZXDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE); + } + zxdg_toplevel_v6_set_title(wl->zxdg_toplevel, title); + } else if (wl->shell_surf) wl_shell_surface_set_title(wl->shell_surf, title); } @@ -1280,6 +1288,11 @@ static void *gfx_ctx_wl_init(video_frame_info_t *video_info, void *video_driver) { RARCH_WARN("[Wayland]: Compositor doesn't support zwp_idle_inhibit_manager_v1 protocol!\n"); } + + if (!wl->deco_manager) + { + RARCH_WARN("[Wayland]: Compositor doesn't support zxdg_decoration_manager_v1 protocol!\n"); + } wl->input.fd = wl_display_get_fd(wl->input.dpy); @@ -1513,6 +1526,11 @@ static bool gfx_ctx_wl_set_video_mode(void *data, xdg_toplevel_set_app_id(wl->xdg_toplevel, "RetroArch"); xdg_toplevel_set_title(wl->xdg_toplevel, "RetroArch"); + if (wl->deco_manager) { + wl->deco = zxdg_decoration_manager_v1_get_toplevel_decoration( + wl->deco_manager, wl->xdg_toplevel); + } + /* Waiting for xdg_toplevel to be configured before starting to draw */ wl_surface_commit(wl->surface); wl->configured = true; @@ -1533,6 +1551,11 @@ static bool gfx_ctx_wl_set_video_mode(void *data, zxdg_toplevel_v6_set_app_id(wl->zxdg_toplevel, "RetroArch"); zxdg_toplevel_v6_set_title(wl->zxdg_toplevel, "RetroArch"); + if (wl->deco_manager) { + wl->deco = zxdg_decoration_manager_v1_get_toplevel_decoration( + wl->deco_manager, wl->xdg_toplevel); + } + /* Waiting for xdg_toplevel to be configured before starting to draw */ wl_surface_commit(wl->surface); wl->configured = true; From 058a880a8b1cffecb5be9b53b4846563e57e4b14 Mon Sep 17 00:00:00 2001 From: Sunderland93 Date: Sun, 9 Dec 2018 18:42:45 +0400 Subject: [PATCH 3/6] Add KDE's server-decoration protocol as fallback (for KDE) --- Makefile.common | 3 ++- gfx/common/wayland/generate_wayland_protos.sh | 4 +++ gfx/drivers_context/wayland_ctx.c | 25 ++++++++++++++++++- 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/Makefile.common b/Makefile.common index d400a480fa..c6fbe390f9 100644 --- a/Makefile.common +++ b/Makefile.common @@ -868,7 +868,8 @@ ifeq ($(HAVE_WAYLAND), 1) gfx/common/wayland/xdg-shell.o \ gfx/common/wayland/xdg-shell-unstable-v6.o \ gfx/common/wayland/idle-inhibit-unstable-v1.o \ - gfx/common/wayland/xdg-decoration-unstable-v1.o + gfx/common/wayland/xdg-decoration-unstable-v1.o \ + gfx/common/wayland/server-decorations.o ifeq ($(HAVE_EGL), 1) LIBS += $(EGL_LIBS) endif diff --git a/gfx/common/wayland/generate_wayland_protos.sh b/gfx/common/wayland/generate_wayland_protos.sh index 8c0cc7f155..973b76bc49 100755 --- a/gfx/common/wayland/generate_wayland_protos.sh +++ b/gfx/common/wayland/generate_wayland_protos.sh @@ -22,3 +22,7 @@ $WAYSCAN private-code $WAYLAND_PROTOS/unstable/idle-inhibit/idle-inhibit-unstabl #Generate xdg-decoration header and .c files $WAYSCAN client-header $WAYLAND_PROTOS/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml $OUTPUT/xdg-decoration-unstable-v1.h $WAYSCAN private-code $WAYLAND_PROTOS/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml $OUTPUT/xdg-decoration-unstable-v1.c + +#Generate server-decorations header and .c files +$WAYSCAN client-header gfx/common/wayland/server-decoration.xml $OUTPUT/server-decorations.h +$WAYSCAN private-code gfx/common/wayland/server-decoration.xml $OUTPUT/server-decorations.c diff --git a/gfx/drivers_context/wayland_ctx.c b/gfx/drivers_context/wayland_ctx.c index ca1626330c..23378e913a 100644 --- a/gfx/drivers_context/wayland_ctx.c +++ b/gfx/drivers_context/wayland_ctx.c @@ -59,6 +59,9 @@ /* Generated from xdg-decoration-unstable-v1.h */ #include "../common/wayland/xdg-decoration-unstable-v1.h" +/* Generated from server-decoration.xml */ +#include "../common/wayland/server-decorations.h" + typedef struct touch_pos { @@ -106,6 +109,8 @@ typedef struct gfx_ctx_wayland_data struct wl_touch *wl_touch; struct wl_seat *seat; struct wl_shm *shm; + struct org_kde_kwin_server_decoration *server_deco; + struct org_kde_kwin_server_decoration_manager *server_deco_manager; struct zxdg_decoration_manager_v1 *deco_manager; struct zxdg_toplevel_decoration_v1 *deco; struct zwp_idle_inhibit_manager_v1 *idle_inhibit_manager; @@ -850,6 +855,9 @@ static void registry_handle_global(void *data, struct wl_registry *reg, else if (string_is_equal(interface, "zxdg_decoration_manager_v1")) wl->deco_manager = (struct zxdg_decoration_manager_v1*)wl_registry_bind( reg, id, &zxdg_decoration_manager_v1_interface, 1); + else if (string_is_equal(interface, "org_kde_kwin_server_decoration_manager")) + wl->server_deco_manager = (struct org_kde_kwin_server_decoration_manager*)wl_registry_bind( + reg, id, &org_kde_kwin_server_decoration_interface, 1); } static void registry_handle_global_remove(void *data, @@ -950,6 +958,8 @@ static void gfx_ctx_wl_destroy_resources(gfx_ctx_wayland_data_t *wl) zxdg_toplevel_decoration_v1_destroy(wl->deco); if (wl->deco_manager) zxdg_decoration_manager_v1_destroy(wl->deco_manager); + if (wl->server_deco) + org_kde_kwin_server_decoration_destroy(wl->server_deco); if (wl->idle_inhibitor) zwp_idle_inhibitor_v1_destroy(wl->idle_inhibitor); @@ -1097,13 +1107,17 @@ static void gfx_ctx_wl_update_title(void *data, void *data2) if (wl->xdg_toplevel) { if (wl->deco) { zxdg_toplevel_decoration_v1_set_mode(wl->deco, ZXDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE); + } else if (wl->server_deco) { + org_kde_kwin_server_decoration_request_mode(wl->server_deco, ORG_KDE_KWIN_SERVER_DECORATION_MODE_SERVER); } xdg_toplevel_set_title(wl->xdg_toplevel, title); } else if (wl->zxdg_toplevel) { if (wl->deco) { zxdg_toplevel_decoration_v1_set_mode(wl->deco, ZXDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE); - } + } else if (wl->server_deco) { + org_kde_kwin_server_decoration_request_mode(wl->server_deco, ORG_KDE_KWIN_SERVER_DECORATION_MODE_SERVER); + } zxdg_toplevel_v6_set_title(wl->zxdg_toplevel, title); } else if (wl->shell_surf) @@ -1293,6 +1307,11 @@ static void *gfx_ctx_wl_init(video_frame_info_t *video_info, void *video_driver) { RARCH_WARN("[Wayland]: Compositor doesn't support zxdg_decoration_manager_v1 protocol!\n"); } + + if (!wl->server_deco_manager) + { + RARCH_WARN("[Wayland]: Compositor doesn't support org_kde_kwin_server_decoration_manager protocol!\n"); + } wl->input.fd = wl_display_get_fd(wl->input.dpy); @@ -1529,6 +1548,8 @@ static bool gfx_ctx_wl_set_video_mode(void *data, if (wl->deco_manager) { wl->deco = zxdg_decoration_manager_v1_get_toplevel_decoration( wl->deco_manager, wl->xdg_toplevel); + } else if (wl->server_deco_manager) { + wl->server_deco = org_kde_kwin_server_decoration_manager_create(wl->server_deco_manager, wl->surface); } /* Waiting for xdg_toplevel to be configured before starting to draw */ @@ -1554,6 +1575,8 @@ static bool gfx_ctx_wl_set_video_mode(void *data, if (wl->deco_manager) { wl->deco = zxdg_decoration_manager_v1_get_toplevel_decoration( wl->deco_manager, wl->xdg_toplevel); + } else if (wl->server_deco_manager) { + wl->server_deco = org_kde_kwin_server_decoration_manager_create(wl->server_deco_manager, wl->surface); } /* Waiting for xdg_toplevel to be configured before starting to draw */ From d1c15efc2486ff102e360b8fd729cec64ee90cef Mon Sep 17 00:00:00 2001 From: Sunderland93 Date: Sun, 9 Dec 2018 18:47:47 +0400 Subject: [PATCH 4/6] Revert "Add KDE's server-decoration protocol as fallback (for KDE)" This reverts commit 058a880a8b1cffecb5be9b53b4846563e57e4b14. --- Makefile.common | 3 +-- gfx/common/wayland/generate_wayland_protos.sh | 4 --- gfx/drivers_context/wayland_ctx.c | 25 +------------------ 3 files changed, 2 insertions(+), 30 deletions(-) diff --git a/Makefile.common b/Makefile.common index c6fbe390f9..d400a480fa 100644 --- a/Makefile.common +++ b/Makefile.common @@ -868,8 +868,7 @@ ifeq ($(HAVE_WAYLAND), 1) gfx/common/wayland/xdg-shell.o \ gfx/common/wayland/xdg-shell-unstable-v6.o \ gfx/common/wayland/idle-inhibit-unstable-v1.o \ - gfx/common/wayland/xdg-decoration-unstable-v1.o \ - gfx/common/wayland/server-decorations.o + gfx/common/wayland/xdg-decoration-unstable-v1.o ifeq ($(HAVE_EGL), 1) LIBS += $(EGL_LIBS) endif diff --git a/gfx/common/wayland/generate_wayland_protos.sh b/gfx/common/wayland/generate_wayland_protos.sh index 973b76bc49..8c0cc7f155 100755 --- a/gfx/common/wayland/generate_wayland_protos.sh +++ b/gfx/common/wayland/generate_wayland_protos.sh @@ -22,7 +22,3 @@ $WAYSCAN private-code $WAYLAND_PROTOS/unstable/idle-inhibit/idle-inhibit-unstabl #Generate xdg-decoration header and .c files $WAYSCAN client-header $WAYLAND_PROTOS/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml $OUTPUT/xdg-decoration-unstable-v1.h $WAYSCAN private-code $WAYLAND_PROTOS/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml $OUTPUT/xdg-decoration-unstable-v1.c - -#Generate server-decorations header and .c files -$WAYSCAN client-header gfx/common/wayland/server-decoration.xml $OUTPUT/server-decorations.h -$WAYSCAN private-code gfx/common/wayland/server-decoration.xml $OUTPUT/server-decorations.c diff --git a/gfx/drivers_context/wayland_ctx.c b/gfx/drivers_context/wayland_ctx.c index 23378e913a..ca1626330c 100644 --- a/gfx/drivers_context/wayland_ctx.c +++ b/gfx/drivers_context/wayland_ctx.c @@ -59,9 +59,6 @@ /* Generated from xdg-decoration-unstable-v1.h */ #include "../common/wayland/xdg-decoration-unstable-v1.h" -/* Generated from server-decoration.xml */ -#include "../common/wayland/server-decorations.h" - typedef struct touch_pos { @@ -109,8 +106,6 @@ typedef struct gfx_ctx_wayland_data struct wl_touch *wl_touch; struct wl_seat *seat; struct wl_shm *shm; - struct org_kde_kwin_server_decoration *server_deco; - struct org_kde_kwin_server_decoration_manager *server_deco_manager; struct zxdg_decoration_manager_v1 *deco_manager; struct zxdg_toplevel_decoration_v1 *deco; struct zwp_idle_inhibit_manager_v1 *idle_inhibit_manager; @@ -855,9 +850,6 @@ static void registry_handle_global(void *data, struct wl_registry *reg, else if (string_is_equal(interface, "zxdg_decoration_manager_v1")) wl->deco_manager = (struct zxdg_decoration_manager_v1*)wl_registry_bind( reg, id, &zxdg_decoration_manager_v1_interface, 1); - else if (string_is_equal(interface, "org_kde_kwin_server_decoration_manager")) - wl->server_deco_manager = (struct org_kde_kwin_server_decoration_manager*)wl_registry_bind( - reg, id, &org_kde_kwin_server_decoration_interface, 1); } static void registry_handle_global_remove(void *data, @@ -958,8 +950,6 @@ static void gfx_ctx_wl_destroy_resources(gfx_ctx_wayland_data_t *wl) zxdg_toplevel_decoration_v1_destroy(wl->deco); if (wl->deco_manager) zxdg_decoration_manager_v1_destroy(wl->deco_manager); - if (wl->server_deco) - org_kde_kwin_server_decoration_destroy(wl->server_deco); if (wl->idle_inhibitor) zwp_idle_inhibitor_v1_destroy(wl->idle_inhibitor); @@ -1107,17 +1097,13 @@ static void gfx_ctx_wl_update_title(void *data, void *data2) if (wl->xdg_toplevel) { if (wl->deco) { zxdg_toplevel_decoration_v1_set_mode(wl->deco, ZXDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE); - } else if (wl->server_deco) { - org_kde_kwin_server_decoration_request_mode(wl->server_deco, ORG_KDE_KWIN_SERVER_DECORATION_MODE_SERVER); } xdg_toplevel_set_title(wl->xdg_toplevel, title); } else if (wl->zxdg_toplevel) { if (wl->deco) { zxdg_toplevel_decoration_v1_set_mode(wl->deco, ZXDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE); - } else if (wl->server_deco) { - org_kde_kwin_server_decoration_request_mode(wl->server_deco, ORG_KDE_KWIN_SERVER_DECORATION_MODE_SERVER); - } + } zxdg_toplevel_v6_set_title(wl->zxdg_toplevel, title); } else if (wl->shell_surf) @@ -1307,11 +1293,6 @@ static void *gfx_ctx_wl_init(video_frame_info_t *video_info, void *video_driver) { RARCH_WARN("[Wayland]: Compositor doesn't support zxdg_decoration_manager_v1 protocol!\n"); } - - if (!wl->server_deco_manager) - { - RARCH_WARN("[Wayland]: Compositor doesn't support org_kde_kwin_server_decoration_manager protocol!\n"); - } wl->input.fd = wl_display_get_fd(wl->input.dpy); @@ -1548,8 +1529,6 @@ static bool gfx_ctx_wl_set_video_mode(void *data, if (wl->deco_manager) { wl->deco = zxdg_decoration_manager_v1_get_toplevel_decoration( wl->deco_manager, wl->xdg_toplevel); - } else if (wl->server_deco_manager) { - wl->server_deco = org_kde_kwin_server_decoration_manager_create(wl->server_deco_manager, wl->surface); } /* Waiting for xdg_toplevel to be configured before starting to draw */ @@ -1575,8 +1554,6 @@ static bool gfx_ctx_wl_set_video_mode(void *data, if (wl->deco_manager) { wl->deco = zxdg_decoration_manager_v1_get_toplevel_decoration( wl->deco_manager, wl->xdg_toplevel); - } else if (wl->server_deco_manager) { - wl->server_deco = org_kde_kwin_server_decoration_manager_create(wl->server_deco_manager, wl->surface); } /* Waiting for xdg_toplevel to be configured before starting to draw */ From 613e3f265549772089873c83f7ac3037deb5f7ba Mon Sep 17 00:00:00 2001 From: Sunderland93 Date: Sun, 9 Dec 2018 18:55:30 +0400 Subject: [PATCH 5/6] Add generated wayland-protocols to .gitignore --- .gitignore | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.gitignore b/.gitignore index 28188376c9..369bb4d452 100644 --- a/.gitignore +++ b/.gitignore @@ -163,3 +163,13 @@ retroarch_switch.lst retroarch_switch.nacp retroarch_switch.nro retroarch_switch.nso + +# Wayland +gfx/common/wayland/idle-inhibit-unstable-v1.c +gfx/common/wayland/idle-inhibit-unstable-v1.h +gfx/common/wayland/xdg-shell-unstable-v6.c +gfx/common/wayland/xdg-shell-unstable-v6.h +gfx/common/wayland/xdg-decoration-unstable-v1.h +gfx/common/wayland/xdg-decoration-unstable-v1.c +gfx/common/wayland/xdg-shell.c +gfx/common/wayland/xdg-shell.h From 27f2cc0bff80b08cd65564cbe018152eabc3c0f8 Mon Sep 17 00:00:00 2001 From: Sunderland93 Date: Sun, 9 Dec 2018 19:28:45 +0400 Subject: [PATCH 6/6] Increase minimal Wayland version to 1.15 --- qb/config.libs.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qb/config.libs.sh b/qb/config.libs.sh index ba8c62dad5..9542d643ab 100644 --- a/qb/config.libs.sh +++ b/qb/config.libs.sh @@ -455,8 +455,8 @@ check_pkgconf V4L2 libv4l2 check_pkgconf FREETYPE freetype2 check_pkgconf X11 x11 check_pkgconf XCB xcb -check_pkgconf WAYLAND wayland-egl 1.14 -check_pkgconf WAYLAND_CURSOR wayland-cursor 1.14 +check_pkgconf WAYLAND wayland-egl 1.15 +check_pkgconf WAYLAND_CURSOR wayland-cursor 1.15 check_pkgconf WAYLAND_PROTOS wayland-protocols 1.15 check_pkgconf XKBCOMMON xkbcommon 0.3.2 check_pkgconf DBUS dbus-1 @@ -474,7 +474,7 @@ check_val '' XEXT -lXext check_val '' XF86VM -lXxf86vm if [ "$HAVE_WAYLAND_PROTOS" = yes ] && [ "$HAVE_WAYLAND" = yes ]; then - check_pkgconf WAYLAND_SCANNER wayland-scanner 1.13 + check_pkgconf WAYLAND_SCANNER wayland-scanner 1.15 ./gfx/common/wayland/generate_wayland_protos.sh else die : 'Notice: wayland-egl or wayland-protocols not present. Skiping Wayland code paths.'