Changeset 106755 in vbox for trunk/src/VBox/Additions/x11/VBoxClient

Timestamp:

Oct 28, 2024 2:37:18 PM (5 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

165639

Message:

Additions: Linux/Wayland: Split Clipboard and DnD helpers (part 2), bugref:10796.

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• wayland-helper-dcp.cpp (modified) (9 diffs)
• wayland-helper-gtk.cpp (modified) (9 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/wayland-helper-dcp.cpp

@@ -1244 +1244 @@
 
 /**
- * @interface_method_impl{VBCLWAYLANDHELPER,pfnProbe}
+ * @interface_method_impl{VBCLWAYLANDHELPER_CLIPBOARD,pfnProbe}
  */
 static DECLCALLBACK(int) vbcl_wayland_hlp_dcp_probe(void)
@@ -1268 +1268 @@
 
 /**
- * @interface_method_impl{VBCLWAYLANDHELPER,pfnInit}
+ * @interface_method_impl{VBCLWAYLANDHELPER_CLIPBOARD,pfnInit}
  */
 RTDECL(int) vbcl_wayland_hlp_dcp_init(void)
@@ -1279 +1279 @@
 
 /**
- * @interface_method_impl{VBCLWAYLANDHELPER,pfnTerm}
+ * @interface_method_impl{VBCLWAYLANDHELPER_CLIPBOARD,pfnTerm}
  */
 RTDECL(int) vbcl_wayland_hlp_dcp_term(void)
@@ -1301 +1301 @@
 
 /**
- * @interface_method_impl{VBCLWAYLANDHELPER,pfnSetClipboardCtx}
+ * @interface_method_impl{VBCLWAYLANDHELPER_CLIPBOARD,pfnSetClipboardCtx}
  */
 static DECLCALLBACK(void) vbcl_wayland_hlp_dcp_set_clipboard_ctx(PVBGLR3SHCLCMDCTX pCtx)
@@ -1309 +1309 @@
 
 /**
- * @interface_method_impl{VBCLWAYLANDHELPER,pfnPopup}
+ * @interface_method_impl{VBCLWAYLANDHELPER_CLIPBOARD,pfnPopup}
  */
 static DECLCALLBACK(int) vbcl_wayland_hlp_dcp_popup(void)
@@ -1529 +1529 @@
 
 /**
- * @interface_method_impl{VBCLWAYLANDHELPER,pfnHGClipReport}
+ * @interface_method_impl{VBCLWAYLANDHELPER_CLIPBOARD,pfnHGClipReport}
  */
 static DECLCALLBACK(int) vbcl_wayland_hlp_dcp_hg_clip_report(SHCLFORMATS fFormats)
@@ -1611 +1611 @@
 
 /**
- * @interface_method_impl{VBCLWAYLANDHELPER,pfnGHClipRead}
+ * @interface_method_impl{VBCLWAYLANDHELPER_CLIPBOARD,pfnGHClipRead}
  */
 static DECLCALLBACK(int) vbcl_wayland_hlp_dcp_gh_clip_read(SHCLFORMAT uFmt)
@@ -1625 +1625 @@
 }
 
-/* Helper callbacks. */
-const VBCLWAYLANDHELPER g_WaylandHelperDcp =
-{
-    "wayland-dcp",                              /* .pszName */
-    vbcl_wayland_hlp_dcp_probe,                 /* .pfnProbe */
+static const VBCLWAYLANDHELPER_CLIPBOARD g_WaylandHelperDcpClip =
+{
     vbcl_wayland_hlp_dcp_init,                  /* .pfnInit */
     vbcl_wayland_hlp_dcp_term,                  /* .pfnTerm */
@@ -1637 +1634 @@
     vbcl_wayland_hlp_dcp_gh_clip_read,          /* .pfnGHClipRead */
 };
+
+static const VBCLWAYLANDHELPER_DND g_WaylandHelperDcpDnD =
+{
+    NULL,                                       /* .pfnInit */
+    NULL,                                       /* .pfnTerm */
+};
+
+/* Helper callbacks. */
+const VBCLWAYLANDHELPER g_WaylandHelperDcp =
+{
+    "wayland-dcp",                              /* .pszName */
+    vbcl_wayland_hlp_dcp_probe,                 /* .pfnProbe */
+    g_WaylandHelperDcpClip,                     /* .clip */
+    g_WaylandHelperDcpDnD,                      /* .dnd */
+};

trunk/src/VBox/Additions/x11/VBoxClient/wayland-helper-gtk.cpp

@@ -389 +389 @@
 
 /**
- * @interface_method_impl{VBCLWAYLANDHELPER,pfnProbe}
+ * @interface_method_impl{VBCLWAYLANDHELPER_CLIPBOARD,pfnProbe}
  */
 static DECLCALLBACK(int) vbcl_wayland_hlp_gtk_probe(void)
@@ -402 +402 @@
 
 /**
- * @interface_method_impl{VBCLWAYLANDHELPER,pfnInit}
+ * @interface_method_impl{VBCLWAYLANDHELPER_CLIPBOARD,pfnInit}
  */
 RTDECL(int) vbcl_wayland_hlp_gtk_init(void)
@@ -414 +414 @@
 
 /**
- * @interface_method_impl{VBCLWAYLANDHELPER,pfnTerm}
+ * @interface_method_impl{VBCLWAYLANDHELPER_CLIPBOARD,pfnTerm}
  */
 RTDECL(int) vbcl_wayland_hlp_gtk_term(void)
@@ -442 +442 @@
 
 /**
- * @interface_method_impl{VBCLWAYLANDHELPER,pfnSetClipboardCtx}
+ * @interface_method_impl{VBCLWAYLANDHELPER_CLIPBOARD,pfnSetClipboardCtx}
  */
 static DECLCALLBACK(void) vbcl_wayland_hlp_gtk_set_clipboard_ctx(PVBGLR3SHCLCMDCTX pCtx)
@@ -484 +484 @@
 
 /**
- * @interface_method_impl{VBCLWAYLANDHELPER,pfnPopup}
+ * @interface_method_impl{VBCLWAYLANDHELPER_CLIPBOARD,pfnPopup}
  */
 static DECLCALLBACK(int) vbcl_wayland_hlp_gtk_popup(void)
@@ -561 +561 @@
 
 /**
- * @interface_method_impl{VBCLWAYLANDHELPER,pfnHGClipReport}
+ * @interface_method_impl{VBCLWAYLANDHELPER_CLIPBOARD,pfnHGClipReport}
  */
 static DECLCALLBACK(int) vbcl_wayland_hlp_gtk_hg_clip_report(SHCLFORMATS fFormats)
@@ -639 +639 @@
 
 /**
- * @interface_method_impl{VBCLWAYLANDHELPER,pfnGHClipRead}
+ * @interface_method_impl{VBCLWAYLANDHELPER_CLIPBOARD,pfnGHClipRead}
  */
 static DECLCALLBACK(int) vbcl_wayland_hlp_gtk_gh_clip_read(SHCLFORMAT uFmt)
@@ -688 +688 @@
 }
 
-/* Helper callbacks. */
-const VBCLWAYLANDHELPER g_WaylandHelperGtk =
-{
-    "wayland-gtk",                              /* .pszName */
-    vbcl_wayland_hlp_gtk_probe,                 /* .pfnProbe */
+
+/***********************************************************************
+ * DnD.
+ **********************************************************************/
+
+/**
+ * @interface_method_impl{VBCLWAYLANDHELPER_DND,pfnInit}
+ */
+RTDECL(int) vbcl_wayland_hlp_gtk_dnd_init(void)
+{
+    VBCL_LOG_CALLBACK;
+
+    return VINF_SUCCESS;
+}
+
+/**
+ * @interface_method_impl{VBCLWAYLANDHELPER_DND,pfnTerm}
+ */
+RTDECL(int) vbcl_wayland_hlp_gtk_dnd_term(void)
+{
+    VBCL_LOG_CALLBACK;
+
+    return VINF_SUCCESS;
+}
+
+
+static const VBCLWAYLANDHELPER_CLIPBOARD g_WaylandHelperGtkClip =
+{
     vbcl_wayland_hlp_gtk_init,                  /* .pfnInit */
     vbcl_wayland_hlp_gtk_term,                  /* .pfnTerm */
@@ -700 +723 @@
     vbcl_wayland_hlp_gtk_gh_clip_read,          /* .pfnGHClipRead */
 };
+
+static const VBCLWAYLANDHELPER_DND g_WaylandHelperGtkDnD =
+{
+    vbcl_wayland_hlp_gtk_dnd_init,              /* .pfnInit */
+    vbcl_wayland_hlp_gtk_dnd_term,              /* .pfnTerm */
+};
+
+/* Helper callbacks. */
+const VBCLWAYLANDHELPER g_WaylandHelperGtk =
+{
+    "wayland-gtk",                              /* .pszName */
+    vbcl_wayland_hlp_gtk_probe,                 /* .pfnProbe */
+    g_WaylandHelperGtkClip,                     /* .clip */
+    g_WaylandHelperGtkDnD,                      /* .dnd */
+};