Clipboard.c: Fix: re-claim selection on reconnect

On reconnect claim the selection ownership if one of nxagent's clients is a selection owner. The code for this was already there but could not work because the lastSelectionOwner array was always dropped at the beginning of nxagentInitClipboard.

Clipboard.c: Fix: re-claim selection on reconnect
20120205 · Ulrich Sibiller · Mike Gabriel · 8500b4bc · 20120205
Commit 20120205 authored Nov 18, 2019 by Ulrich Sibiller Committed by Mike Gabriel Jan 05, 2020
Show whitespace changes
Inline Side-by-side

Showing with 14 additions and 6 deletions

Clipboard.c nx-X11/programs/Xserver/hw/nxagent/Clipboard.c +14 -6

No files found.
--- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
@@ -2127,6 +2127,8 @@ Bool nxagentInitClipboard(WindowPtr pWin)
  fprintf(stderr, "%s: Got called.\n", __func__);
  #endif

+  if (!nxagentReconnectTrap)
+  {
    SAFE_free(lastSelectionOwner);

    lastSelectionOwner = (SelectionOwner *) malloc(nxagentMaxSelections * sizeof(SelectionOwner));
@@ -2135,10 +2137,15 @@ Bool nxagentInitClipboard(WindowPtr pWin)
    {
      FatalError("nxagentInitClipboard: Failed to allocate memory for the clipboard selections.\n");
    }
-
-
    nxagentInitSelectionOwner(nxagentPrimarySelection, XA_PRIMARY);
    nxagentInitSelectionOwner(nxagentClipboardSelection, nxagentAtoms[10]);   /* CLIPBOARD */
+  }
+  else
+  {
+    /* the clipboard selection atom might have changed on the new X
+       server. Primary is constant. */
+    lastSelectionOwner[nxagentClipboardSelection].selection = nxagentAtoms[10];   /* CLIPBOARD */
+  }

  #ifdef NXAGENT_TIMESTAMP
  {
@@ -2229,10 +2236,9 @@ Bool nxagentInitClipboard(WindowPtr pWin)

  if (nxagentReconnectTrap)
  {
-    /*
-     * Only for PRIMARY and CLIPBOARD selections.
-     */
-
+    if (nxagentOption(Clipboard) == ClipboardServer ||
+	nxagentOption(Clipboard) == ClipboardBoth)
+    {
      for (int i = 0; i < nxagentMaxSelections; i++)
      {
        /*
@@ -2246,6 +2252,8 @@ Bool nxagentInitClipboard(WindowPtr pWin)
         }
      }
    }
+    /* FIXME: Shouldn't we reset lastServer* and lastClient* here? */
+  }
  else
  {
    nxagentClearSelectionOwner(nxagentPrimarySelection);