[vlc-commits] xdg_shell: use xdg-decoration (unstable v1) protocol

Rémi Denis-Courmont git at videolan.org
Sun Dec 2 19:25:40 CET 2018


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Dec  2 16:16:39 2018 +0200| [3ebd72e0393b36b9a3601a0dfbf6a0ba2daa075e] | committer: Rémi Denis-Courmont

xdg_shell: use xdg-decoration (unstable v1) protocol

...rather than KDE-specific stuff.

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

 configure.ac                                       |  2 +-
 modules/video_output/Makefile.am                   | 18 +++--
 modules/video_output/wayland/server-decoration.xml | 94 ----------------------
 modules/video_output/wayland/xdg-shell.c           | 50 ++++++++----
 4 files changed, 47 insertions(+), 117 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1f33f5dc88..42498eae13 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3201,7 +3201,7 @@ AS_IF([test "${enable_wayland}" != "no"], [
   ])
 
   dnl wayland-protocols
-  PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >= 1.12], [
+  PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >= 1.15], [
     WAYLAND_PROTOCOLS="$(${PKG_CONFIG} wayland-protocols --variable pkgdatadir)"
   ], [
     wl_err="$wl_err ${WAYLAND_PROTOCOLS_PKG_ERRORS}."
diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
index e4e590712c..6a5a6e8602 100644
--- a/modules/video_output/Makefile.am
+++ b/modules/video_output/Makefile.am
@@ -268,8 +268,8 @@ libxdg_shell_plugin_la_SOURCES = \
 nodist_libxdg_shell_plugin_la_SOURCES = \
 	video_output/wayland/xdg-shell-client-protocol.h \
 	video_output/wayland/xdg-shell-protocol.c \
-	video_output/wayland/server-decoration-client-protocol.h \
-	video_output/wayland/server-decoration-protocol.c
+	video_output/wayland/xdg-decoration-client-protocol.h \
+	video_output/wayland/xdg-decoration-protocol.c
 libxdg_shell_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DXDG_SHELL \
 	-I$(builddir)/video_output/wayland
 libxdg_shell_plugin_la_CFLAGS = \
@@ -293,11 +293,15 @@ video_output/wayland/xdg-shell-protocol.c: \
 		video_output/Makefile.am
 	$(AM_V_GEN)$(WAYLAND_SCANNER) private-code $< $@
 
-video_output/wayland/server-decoration-client-protocol.h: \
-		video_output/wayland/server-decoration.xml
-video_output/wayland/server-decoration-protocol.c: \
-		video_output/wayland/server-decoration.xml
-EXTRA_DIST += video_output/wayland/server-decoration.xml
+video_output/wayland/xdg-decoration-client-protocol.h: \
+		$(WAYLAND_PROTOCOLS)/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml \
+		video_output/Makefile.am
+	$(AM_V_GEN)$(WAYLAND_SCANNER) client-header $< $@
+
+video_output/wayland/xdg-decoration-protocol.c: \
+		$(WAYLAND_PROTOCOLS)/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml \
+		video_output/Makefile.am
+	$(AM_V_GEN)$(WAYLAND_SCANNER) private-code $< $@
 
 libegl_wl_plugin_la_SOURCES = video_output/opengl/egl.c
 libegl_wl_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_PLATFORM_WAYLAND=1
diff --git a/modules/video_output/wayland/server-decoration.xml b/modules/video_output/wayland/server-decoration.xml
deleted file mode 100644
index 8bc106c7c4..0000000000
--- a/modules/video_output/wayland/server-decoration.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<protocol name="server_decoration">
-  <copyright><![CDATA[
-    Copyright (C) 2015 Martin Gräßlin
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation, either version 2.1 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  ]]></copyright>
-  <interface  name="org_kde_kwin_server_decoration_manager" version="1">
-      <description summary="Server side window decoration manager">
-        This interface allows to coordinate whether the server should create
-        a server-side window decoration around a wl_surface representing a
-        shell surface (wl_shell_surface or similar). By announcing support
-        for this interface the server indicates that it supports server
-        side decorations.
-      </description>
-      <request name="create">
-        <description summary="Create a server-side decoration object for a given surface">
-            When a client creates a server-side decoration object it indicates
-            that it supports the protocol. The client is supposed to tell the
-            server whether it wants server-side decorations or will provide
-            client-side decorations.
-
-            If the client does not create a server-side decoration object for
-            a surface the server interprets this as lack of support for this
-            protocol and considers it as client-side decorated. Nevertheless a
-            client-side decorated surface should use this protocol to indicate
-            to the server that it does not want a server-side deco.
-        </description>
-        <arg name="id" type="new_id" interface="org_kde_kwin_server_decoration"/>
-        <arg name="surface" type="object" interface="wl_surface"/>
-      </request>
-      <enum name="mode">
-            <description summary="Possible values to use in request_mode and the event mode."/>
-            <entry name="None" value="0" summary="Undecorated: The surface is not decorated at all, neither server nor client-side. An example is a popup surface which should not be decorated."/>
-            <entry name="Client" value="1" summary="Client-side decoration: The decoration is part of the surface and the client."/>
-            <entry name="Server" value="2" summary="Server-side decoration: The server embeds the surface into a decoration frame."/>
-      </enum>
-      <event name="default_mode">
-          <description summary="The default mode used on the server">
-              This event is emitted directly after binding the interface. It contains
-              the default mode for the decoration. When a new server decoration object
-              is created this new object will be in the default mode until the first
-              request_mode is requested.
-
-              The server may change the default mode at any time.
-          </description>
-          <arg name="mode" type="uint" summary="The default decoration mode applied to newly created server decorations."/>
-      </event>
-  </interface>
-  <interface name="org_kde_kwin_server_decoration" version="1">
-      <request name="release" type="destructor">
-        <description summary="release the server decoration object"/>
-      </request>
-      <enum name="mode">
-            <description summary="Possible values to use in request_mode and the event mode."/>
-            <entry name="None" value="0" summary="Undecorated: The surface is not decorated at all, neither server nor client-side. An example is a popup surface which should not be decorated."/>
-            <entry name="Client" value="1" summary="Client-side decoration: The decoration is part of the surface and the client."/>
-            <entry name="Server" value="2" summary="Server-side decoration: The server embeds the surface into a decoration frame."/>
-      </enum>
-      <request name="request_mode">
-          <description summary="The decoration mode the surface wants to use."/>
-          <arg name="mode" type="uint" summary="The mode this surface wants to use."/>
-      </request>
-      <event name="mode">
-          <description summary="The new decoration mode applied by the server">
-              This event is emitted directly after the decoration is created and
-              represents the base decoration policy by the server. E.g. a server
-              which wants all surfaces to be client-side decorated will send Client,
-              a server which wants server-side decoration will send Server.
-
-              The client can request a different mode through the decoration request.
-              The server will acknowledge this by another event with the same mode. So
-              even if a server prefers server-side decoration it's possible to force a
-              client-side decoration.
-
-              The server may emit this event at any time. In this case the client can
-              again request a different mode. It's the responsibility of the server to
-              prevent a feedback loop.
-          </description>
-          <arg name="mode" type="uint" summary="The decoration mode applied to the surface by the server."/>
-      </event>
-  </interface>
-</protocol>
diff --git a/modules/video_output/wayland/xdg-shell.c b/modules/video_output/wayland/xdg-shell.c
index 389b1c9bc2..7d06336862 100644
--- a/modules/video_output/wayland/xdg-shell.c
+++ b/modules/video_output/wayland/xdg-shell.c
@@ -36,7 +36,7 @@
 #include <wayland-cursor.h>
 #ifdef XDG_SHELL
 # include "xdg-shell-client-protocol.h"
-# include "server-decoration-client-protocol.h"
+# include "xdg-decoration-client-protocol.h"
 #else
 # define xdg_wm_base wl_shell
 # define xdg_wm_base_add_listener(s, l, q) (void)0
@@ -75,8 +75,8 @@ typedef struct
     struct xdg_surface *surface;
     struct xdg_toplevel *toplevel;
 #ifdef XDG_SHELL
-    struct org_kde_kwin_server_decoration_manager *deco_manager;
-    struct org_kde_kwin_server_decoration *deco;
+    struct zxdg_decoration_manager_v1 *deco_manager;
+    struct zxdg_toplevel_decoration_v1 *deco;
 #endif
 
     uint32_t default_output;
@@ -230,13 +230,13 @@ static void SetDecoration(vout_window_t *wnd, bool decorated)
 {
     vout_window_sys_t *sys = wnd->sys;
     const uint_fast32_t deco_mode = decorated
-        ? ORG_KDE_KWIN_SERVER_DECORATION_MODE_SERVER
-        : ORG_KDE_KWIN_SERVER_DECORATION_MODE_CLIENT;
+        ? ZXDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE
+        : ZXDG_TOPLEVEL_DECORATION_V1_MODE_CLIENT_SIDE;
 
     if (sys->deco != NULL)
-        org_kde_kwin_server_decoration_request_mode(sys->deco, deco_mode);
+        zxdg_toplevel_decoration_v1_set_mode(sys->deco, deco_mode);
     else
-    if (deco_mode != ORG_KDE_KWIN_SERVER_DECORATION_MODE_CLIENT)
+    if (deco_mode != ZXDG_TOPLEVEL_DECORATION_V1_MODE_CLIENT_SIDE)
         msg_Err(wnd, "server-side decoration not supported");
 }
 #endif
@@ -329,6 +329,22 @@ static const struct xdg_wm_base_listener xdg_wm_base_cbs =
 {
     xdg_wm_base_ping_cb,
 };
+
+static void xdg_toplevel_decoration_configure_cb(void *data,
+                                      struct zxdg_toplevel_decoration_v1 *deco,
+                                                 uint32_t mode)
+{
+    vout_window_t *wnd = data;
+
+    msg_Dbg(wnd, "new decoration mode: %"PRIu32, mode);
+    (void) deco;
+}
+
+static const struct zxdg_toplevel_decoration_v1_listener
+                                                  xdg_toplevel_decoration_cbs =
+{
+    xdg_toplevel_decoration_configure_cb,
+};
 #else
 static void wl_shell_surface_configure_cb(void *data,
                                           struct wl_shell_surface *toplevel,
@@ -398,9 +414,9 @@ static void registry_global_cb(void *data, struct wl_registry *registry,
         output_create(wnd, registry, name, vers, &sys->outputs);
 #ifdef XDG_SHELL
     else
-    if (!strcmp(iface, "org_kde_kwin_server_decoration_manager"))
+    if (!strcmp(iface, "zxdg_decoration_manager_v1"))
         sys->deco_manager = wl_registry_bind(registry, name,
-                         &org_kde_kwin_server_decoration_manager_interface, 1);
+                                     &zxdg_decoration_manager_v1_interface, 1);
 #endif
 }
 
@@ -564,8 +580,12 @@ static int Open(vout_window_t *wnd, const vout_window_cfg_t *cfg)
 
 #ifdef XDG_SHELL
     if (sys->deco_manager != NULL)
-        sys->deco = org_kde_kwin_server_decoration_manager_create(
-                                                   sys->deco_manager, surface);
+        sys->deco = zxdg_decoration_manager_v1_get_toplevel_decoration(
+                                                  sys->deco_manager, toplevel);
+    if (sys->deco != NULL)
+        zxdg_toplevel_decoration_v1_add_listener(sys->deco,
+                                                 &xdg_toplevel_decoration_cbs,
+                                                 wnd);
     SetDecoration(wnd, cfg->is_decorated);
 #endif
 
@@ -594,9 +614,9 @@ error:
     output_destroy_all(&sys->outputs);
 #ifdef XDG_SHELL
     if (sys->deco != NULL)
-        org_kde_kwin_server_decoration_destroy(sys->deco);
+        zxdg_toplevel_decoration_v1_destroy(sys->deco);
     if (sys->deco_manager != NULL)
-        org_kde_kwin_server_decoration_manager_destroy(sys->deco_manager);
+        zxdg_decoration_manager_v1_destroy(sys->deco_manager);
 #endif
     if (sys->cursor_surface != NULL)
         wl_surface_destroy(sys->cursor_surface);
@@ -636,9 +656,9 @@ static void Close(vout_window_t *wnd)
     output_destroy_all(&sys->outputs);
 #ifdef XDG_SHELL
     if (sys->deco != NULL)
-        org_kde_kwin_server_decoration_destroy(sys->deco);
+        zxdg_toplevel_decoration_v1_destroy(sys->deco);
     if (sys->deco_manager != NULL)
-        org_kde_kwin_server_decoration_manager_destroy(sys->deco_manager);
+        zxdg_decoration_manager_v1_destroy(sys->deco_manager);
 #endif
     if (sys->cursor_surface != NULL)
         wl_surface_destroy(sys->cursor_surface);



More information about the vlc-commits mailing list