Changeset 93314 in vbox

Timestamp:

Jan 18, 2022 1:59:14 PM (3 years ago)

Author:

vboxsync

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

149384

Message:

Shared Clipboard/X11: Renaming "formats" to "targets", to better point out this is what X uses as clipboard formats.

File:

• trunk/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp (modified) (8 diffs)

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp ¶

@@ -94 +94 @@
 class formats;
 SHCL_X11_DECL(Atom) clipGetAtom(PSHCLX11CTX pCtx, const char *pszName);
-SHCL_X11_DECL(void) clipQueryX11Formats(PSHCLX11CTX pCtx);
+SHCL_X11_DECL(void) clipQueryX11Targets(PSHCLX11CTX pCtx);
 
 static int          clipInitInternal(PSHCLX11CTX pCtx);
@@ -702 +702 @@
         /* We may already be out of date. */
         clipSetXtNeedsUpdate(pCtx, false);
-        clipQueryX11Formats(pCtx);
+        clipQueryX11Targets(pCtx);
         return;
     }
@@ -719 +719 @@
 
 /**
- * Notifies the VBox clipboard about available data formats, based on the
- * "targets" information obtained from the X11 clipboard.
- *
- * @note  Callback for XtGetSelectionValue().
+ * Notifies the VBox clipboard about available data formats ("targets" on X11),
+ * based on the information obtained from the X11 clipboard.
+ *
+ * @note  Callback installed by clipQueryX11Targets() for XtGetSelectionValue().
  * @note  This function is treated as API glue, and as such is not part of any
  *        unit test.  So keep it simple, be paranoid and log everything.
  */
-SHCL_X11_DECL(void) clipConvertX11TargetsCallback(Widget widget, XtPointer pClient,
-                                                  Atom * /* selection */, Atom *atomType,
-                                                  XtPointer pValue, long unsigned int *pcLen,
-                                                  int *piFormat)
+SHCL_X11_DECL(void) clipQueryX11TargetsCallback(Widget widget, XtPointer pClient,
+                                                Atom * /* selection */, Atom *atomType,
+                                                XtPointer pValue, long unsigned int *pcLen,
+                                                int *piFormat)
 {
     RT_NOREF(piFormat);
@@ -797 +797 @@
 
 /**
- * Callback to notify us when the contents of the X11 clipboard change.
+ * Queries the current formats ("targets") of the X11 clipboard ("CLIPBOARD").
  *
  * @param   pCtx                The X11 clipboard context to use.
  */
-SHCL_X11_DECL(void) clipQueryX11Formats(PSHCLX11CTX pCtx)
+SHCL_X11_DECL(void) clipQueryX11Targets(PSHCLX11CTX pCtx)
 {
 #ifndef TESTCASE
@@ -817 +817 @@
                         clipGetAtom(pCtx, "CLIPBOARD"),
                         clipGetAtom(pCtx, "TARGETS"),
-                        clipConvertX11TargetsCallback, pCtx,
+                        clipQueryX11TargetsCallback, pCtx,
                         CurrentTime);
 #else
@@ -860 +860 @@
             if (   (event.fixes.subtype == 0  /* XFixesSetSelectionOwnerNotify */)
                 && (event.fixes.owner != 0))
-                clipQueryX11Formats(pCtx);
+                clipQueryX11Targets(pCtx);
             else
                 clipReportEmpty(pCtx);
@@ -890 +890 @@
         {
             if (pCtx->fGrabClipboardOnStart)
-                clipQueryX11Formats(pCtx);
+                clipQueryX11Targets(pCtx);
 
             pCtx->fThreadStarted = true;
@@ -1949 +1949 @@
     clipSetXtBusy(pCtx, false);
     if (clipGetXtNeedsUpdate(pCtx))
-        clipQueryX11Formats(pCtx);
+        clipQueryX11Targets(pCtx);
 #endif