Use fullscreen-shell.xml from wayland-protocols
Use the fullscreen-shell protocol XML from the wayland-protocols
installation, and remove the one we provide ourself.
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Mariusz Ceier <mceier+wayland@gmail.com>
Acked-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
diff --git a/clients/simple-shm.c b/clients/simple-shm.c
index b2253c0..8a3c539 100644
--- a/clients/simple-shm.c
+++ b/clients/simple-shm.c
@@ -36,7 +36,7 @@
#include <wayland-client.h>
#include "shared/os-compatibility.h"
#include "xdg-shell-client-protocol.h"
-#include "fullscreen-shell-client-protocol.h"
+#include "fullscreen-shell-unstable-v1-client-protocol.h"
#include <sys/types.h>
#include "ivi-application-client-protocol.h"
@@ -47,7 +47,7 @@
struct wl_registry *registry;
struct wl_compositor *compositor;
struct xdg_shell *shell;
- struct _wl_fullscreen_shell *fshell;
+ struct zwp_fullscreen_shell_v1 *fshell;
struct wl_shm *shm;
uint32_t formats;
struct ivi_application *ivi_application;
@@ -180,10 +180,10 @@
xdg_surface_set_title(window->xdg_surface, "simple-shm");
} else if (display->fshell) {
- _wl_fullscreen_shell_present_surface(display->fshell,
- window->surface,
- _WL_FULLSCREEN_SHELL_PRESENT_METHOD_DEFAULT,
- NULL);
+ zwp_fullscreen_shell_v1_present_surface(display->fshell,
+ window->surface,
+ ZWP_FULLSCREEN_SHELL_V1_PRESENT_METHOD_DEFAULT,
+ NULL);
} else if (display->ivi_application ) {
uint32_t id_ivisurf = IVI_SURFACE_ID + (uint32_t)getpid();
window->ivi_surface =
@@ -374,9 +374,9 @@
id, &xdg_shell_interface, 1);
xdg_shell_use_unstable_version(d->shell, XDG_VERSION);
xdg_shell_add_listener(d->shell, &xdg_shell_listener, d);
- } else if (strcmp(interface, "_wl_fullscreen_shell") == 0) {
+ } else if (strcmp(interface, "zwp_fullscreen_shell_v1") == 0) {
d->fshell = wl_registry_bind(registry,
- id, &_wl_fullscreen_shell_interface, 1);
+ id, &zwp_fullscreen_shell_v1_interface, 1);
} else if (strcmp(interface, "wl_shm") == 0) {
d->shm = wl_registry_bind(registry,
id, &wl_shm_interface, 1);
@@ -483,7 +483,7 @@
xdg_shell_destroy(display->shell);
if (display->fshell)
- _wl_fullscreen_shell_release(display->fshell);
+ zwp_fullscreen_shell_v1_release(display->fshell);
if (display->compositor)
wl_compositor_destroy(display->compositor);