[vlc-commits] xdg-shell: drop support for unstable protocol version

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Jul  2 20:06:12 2018 +0300| [89473deb59c680d78025501abaebafb4a4baec47] | committer: Rémi Denis-Courmont

xdg-shell: drop support for unstable protocol version

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=89473deb59c680d78025501abaebafb4a4baec47
---

 modules/video_output/wayland/xdg-shell.c | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/modules/video_output/wayland/xdg-shell.c b/modules/video_output/wayland/xdg-shell.c
index 5f531f807c..636fd5db7e 100644
--- a/modules/video_output/wayland/xdg-shell.c
+++ b/modules/video_output/wayland/xdg-shell.c
@@ -36,8 +36,6 @@
 #include <wayland-cursor.h>
 #ifdef XDG_SHELL
 #include "xdg-shell-client-protocol.h"
-/** Temporary backward compatibility hack for XDG shell unstable v6 */
-# define XDG_SHELL_UNSTABLE
 #else
 # define xdg_wm_base wl_shell
 # define xdg_wm_base_add_listener(s, l, q) (void)0
@@ -98,9 +96,6 @@ struct vout_window_sys_t
         } latch;
         bool configured;
     } wm;
-# ifdef XDG_SHELL_UNSTABLE
-    bool unstable;
-#endif
 
     struct wl_list outputs;
     struct wl_list seats;
@@ -372,24 +367,9 @@ static void registry_global_cb(void *data, struct wl_registry *registry,
                                            (vers < 2) ? vers : 2);
     else
 #ifdef XDG_SHELL
-# ifdef XDG_SHELL_UNSTABLE
-    if (!strcmp(iface, "zxdg_shell_v6") && sys->wm_base == NULL)
-        sys->wm_base = wl_registry_bind(registry, name, &xdg_wm_base_interface,
-                                        1);
-    else
     if (!strcmp(iface, "xdg_wm_base"))
-    {
-        if (sys->wm_base != NULL)
-            xdg_wm_base_destroy(sys->wm_base);
-        sys->unstable = false;
         sys->wm_base = wl_registry_bind(registry, name, &xdg_wm_base_interface,
                                         1);
-    }
-# else
-    if (!strcmp(iface, "xdg_wm_base"))
-        sys->wm_base = wl_registry_bind(registry, name, &xdg_wm_base_interface,
-                                        1);
-# endif
 #else
     if (!strcmp(iface, "wl_shell"))
         sys->wm_base = wl_registry_bind(registry, name, &wl_shell_interface,
@@ -510,9 +490,6 @@ static int Open(vout_window_t *wnd, const vout_window_cfg_t *cfg)
     if (sys->registry == NULL)
         goto error;
 
-#ifdef XDG_SHELL_UNSTABLE
-    sys->unstable = true;
-#endif
     wl_registry_add_listener(sys->registry, &registry_cbs, wnd);
     wl_display_roundtrip(display); /* complete registry enumeration */
 
@@ -603,13 +580,6 @@ static int Open(vout_window_t *wnd, const vout_window_cfg_t *cfg)
 
     if (cfg->is_fullscreen)
         vout_window_SetFullScreen(wnd, NULL);
-#ifdef XDG_SHELL_UNSTABLE
-    if (sys->unstable)
-    {
-        msg_Warn(wnd, "using XDG shell unstable version");
-        msg_Info(wnd, "The window manager needs an update.");
-    }
-#endif
     return VLC_SUCCESS;
 
 error: