diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2015-11-17 16:00:27 +0800 |
|---|---|---|
| committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2015-11-19 12:50:56 +0200 |
| commit | 496adb3bb3e2b762155aaa80a52b91874ba6b715 (patch) | |
| tree | 0b88d6cb4d4751d448841e01759366dc8717fb8f /clients/simple-damage.c | |
| parent | 4bcc54d1a56057293d3a7a34e9592707406a6c9a (diff) | |
| download | weston-496adb3bb3e2b762155aaa80a52b91874ba6b715.tar.gz | |
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>
Diffstat (limited to 'clients/simple-damage.c')
| -rw-r--r-- | clients/simple-damage.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/clients/simple-damage.c b/clients/simple-damage.c index 13e220a4..a4869b44 100644 --- a/clients/simple-damage.c +++ b/clients/simple-damage.c @@ -38,7 +38,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 "scaler-client-protocol.h" int print_debug = 0; @@ -50,7 +50,7 @@ struct display { struct wl_compositor *compositor; struct wl_scaler *scaler; struct xdg_shell *shell; - struct _wl_fullscreen_shell *fshell; + struct zwp_fullscreen_shell_v1 *fshell; struct wl_shm *shm; uint32_t formats; }; @@ -294,10 +294,10 @@ create_window(struct display *display, int width, int height, xdg_surface_set_title(window->xdg_surface, "simple-damage"); } 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 { assert(0); } @@ -677,9 +677,9 @@ registry_handle_global(void *data, struct wl_registry *registry, 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); @@ -742,7 +742,7 @@ destroy_display(struct display *display) xdg_shell_destroy(display->shell); if (display->fshell) - _wl_fullscreen_shell_release(display->fshell); + zwp_fullscreen_shell_v1_release(display->fshell); if (display->scaler) wl_scaler_destroy(display->scaler); |