[PATCH 2/2] foreignv2: rename export and import calls

Marco Martin notmart at gmail.com
Mon Sep 18 12:09:05 UTC 2017

as export is a reserved keyword in C++, in order for the
output generated by wayland_scanner to compile correctly
rename export to export_toplevel and import to import_toplevel
this needs a new protocol version as is an incompatible change

Signed-off-by: Marco Martin <notmart at gmail.com>
 unstable/xdg-foreign/xdg-foreign-unstable-v2.xml | 26 ++++++++++++------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/unstable/xdg-foreign/xdg-foreign-unstable-v2.xml b/unstable/xdg-foreign/xdg-foreign-unstable-v2.xml
index 062b090..8e824c1 100644
--- a/unstable/xdg-foreign/xdg-foreign-unstable-v2.xml
+++ b/unstable/xdg-foreign/xdg-foreign-unstable-v2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<protocol name="xdg_foreign_unstable_v1">
+<protocol name="xdg_foreign_unstable_v2">
     Copyright © 2015-2016 Red Hat Inc.
@@ -56,7 +56,7 @@
-  <interface name="zxdg_exporter_v1" version="1">
+  <interface name="zxdg_exporter_v2" version="1">
     <description summary="interface for exporting surfaces">
       A global interface used for exporting surfaces that can later be imported
       using xdg_importer.
@@ -69,9 +69,9 @@
-    <request name="export">
-      <description summary="export a surface">
-	The export request exports the passed surface so that it can later be
+    <request name="export_toplevel">
+      <description summary="export a toplevel surface">
+	The export_toplevel request exports the passed surface so that it can later be
 	imported via xdg_importer. When called, a new xdg_exported object will
 	be created and xdg_exported.handle will be sent immediately. See the
 	corresponding interface and event for details.
@@ -80,14 +80,14 @@
 	be used to create a xdg_imported multiple times. Only xdg_surface
 	surfaces may be exported.
-      <arg name="id" type="new_id" interface="zxdg_exported_v1"
+      <arg name="id" type="new_id" interface="zxdg_exported_v2"
 	   summary="the new xdg_exported object"/>
       <arg name="surface" type="object" interface="wl_surface"
 	   summary="the surface to export"/>
-  <interface name="zxdg_importer_v1" version="1">
+  <interface name="zxdg_importer_v2" version="1">
     <description summary="interface for importing surfaces">
       A global interface used for importing surfaces exported by xdg_exporter.
       With this interface, a client can create a reference to a surface of
@@ -101,22 +101,22 @@
-    <request name="import">
-      <description summary="import a surface">
-	The import request imports a surface from any client given a handle
+    <request name="import_toplevel">
+      <description summary="import a toplevel surface">
+	The import_toplevel request imports a surface from any client given a handle
 	retrieved by exporting said surface using xdg_exporter.export. When
 	called, a new xdg_imported object will be created. This new object
 	represents the imported surface, and the importing client can
 	manipulate its relationship using it. See xdg_imported for details.
-      <arg name="id" type="new_id" interface="zxdg_imported_v1"
+      <arg name="id" type="new_id" interface="zxdg_imported_v2"
 	   summary="the new xdg_imported object"/>
       <arg name="handle" type="string"
 	   summary="the exported surface handle"/>
-  <interface name="zxdg_exported_v1" version="1">
+  <interface name="zxdg_exported_v2" version="1">
     <description summary="an exported surface handle">
       A xdg_exported object represents an exported reference to a surface. The
       exported surface may be referenced as long as the xdg_exported object not
@@ -143,7 +143,7 @@
-  <interface name="zxdg_imported_v1" version="1">
+  <interface name="zxdg_imported_v2" version="1">
     <description summary="an imported surface handle">
       A xdg_imported object represents an imported reference to surface exported
       by some client. A client can use this interface to manipulate

More information about the wayland-devel mailing list