mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-03 04:14:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Add KDE's server-decoration protocol as fallback (for KDE)"

Browse Source 
This reverts commit 058a880a8b1cffecb5be9b53b4846563e57e4b14.
This commit is contained in:
Sunderland93 2018-12-09 18:47:47 +04:00
parent 058a880a8b
commit d1c15efc24
3 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.common
View File

@ -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

4
gfx/common/wayland/generate_wayland_protos.sh
View File

@ -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

25
gfx/drivers_context/wayland_ctx.c
View File

@ -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 */