1 files changed, 36 insertions, 84 deletions

diff --git a/xorg-server/hw/xwin/winclipboardwrappers.c b/xorg-server/hw/xwin/winclipboardwrappers.c
index c68d78aa3..a096a2a51 100644
--- a/xorg-server/hw/xwin/winclipboardwrappers.c
+++ b/xorg-server/hw/xwin/winclipboardwrappers.c
@@ -88,7 +88,7 @@ winProcQueryTree (ClientPtr client)
 {
   int			iReturn;
 
-  ErrorF ("winProcQueryTree - Hello\n");
+  winDebug ("winProcQueryTree - Hello\n");
 
   /*
    * This procedure is only used for initialization.
@@ -116,7 +116,7 @@ winProcQueryTree (ClientPtr client)
   /* Do nothing if clipboard is not enabled */
   if (!g_fClipboard)
     {
-      ErrorF ("winProcQueryTree - Clipboard is not enabled, "
+      winDebug ("winProcQueryTree - Clipboard is not enabled, "
 	      "returning.\n");
       return iReturn;
     }
@@ -124,7 +124,7 @@ winProcQueryTree (ClientPtr client)
   /* If the clipboard client has already been started, abort */
   if (g_fClipboardLaunched)
     {
-      ErrorF ("winProcQueryTree - Clipboard client already "
+      winDebug ("winProcQueryTree - Clipboard client already "
 	      "launched, returning.\n");
       return iReturn;
     }
@@ -166,7 +166,7 @@ winProcQueryTree (ClientPtr client)
 	  return iReturn;
 	}
       
-      ErrorF ("winProcQueryTree - winInitClipboard returned.\n");
+      winDebug ("winProcQueryTree - winInitClipboard returned.\n");
     }
   
   /* Flag that clipboard client has been launched */
@@ -189,12 +189,14 @@ winProcEstablishConnection (ClientPtr client)
   static int		s_iCallCount = 0;
   static unsigned long	s_ulServerGeneration = 0;
 
-  if (s_iCallCount == 0 || s_iCallCount == CLIP_NUM_CALLS) ErrorF ("winProcEstablishConnection - Hello\n");
+  #ifdef WINDBG
+  if (s_iCallCount == 0 || s_iCallCount == CLIP_NUM_CALLS) winDebug ("winProcEstablishConnection - Hello\n");
+  #endif
 
   /* Do nothing if clipboard is not enabled */
   if (!g_fClipboard)
     {
-      ErrorF ("winProcEstablishConnection - Clipboard is not enabled, "
+      winDebug ("winProcEstablishConnection - Clipboard is not enabled, "
 	      "returning.\n");
       
       /* Unwrap the original function, call it, and return */
@@ -222,10 +224,12 @@ winProcEstablishConnection (ClientPtr client)
       && !g_fClipboardLaunched
       && s_iCallCount < CLIP_NUM_CALLS)
     {
-      if (s_iCallCount == 1) ErrorF ("winProcEstablishConnection - Xdmcp, waiting to "
+      #ifdef WINDBG
+      if (s_iCallCount == 1) winDebug ("winProcEstablishConnection - Xdmcp, waiting to "
 	      "start clipboard client until %dth call", CLIP_NUM_CALLS);
-      if (s_iCallCount == CLIP_NUM_CALLS - 1) ErrorF (".\n");
-      else ErrorF (".");
+      if (s_iCallCount == CLIP_NUM_CALLS - 1) winDebug (".\n");
+      else winDebug (".");
+      #endif
       return (*winProcEstablishConnectionOrig) (client);
     }
 
@@ -256,7 +260,7 @@ winProcEstablishConnection (ClientPtr client)
   /* If the clipboard client has already been started, abort */
   if (g_fClipboardLaunched)
     {
-      ErrorF ("winProcEstablishConnection - Clipboard client already "
+      winDebug ("winProcEstablishConnection - Clipboard client already "
 	      "launched, returning.\n");
       return iReturn;
     }
@@ -296,7 +300,7 @@ winProcEstablishConnection (ClientPtr client)
 	  return iReturn;
 	}
       
-      ErrorF ("winProcEstablishConnection - winInitClipboard returned.\n");
+      winDebug ("winProcEstablishConnection - winInitClipboard returned.\n");
     }
   
   /* Flag that clipboard client has been launched */
@@ -310,30 +314,26 @@ winProcEstablishConnection (ClientPtr client)
  * Wrapper for internal SetSelectionOwner function.
  * Grabs ownership of Windows clipboard when X11 clipboard owner changes.
  */
-
 int
 winProcSetSelectionOwner (ClientPtr client)
 {
   int			i;
   DrawablePtr		pDrawable;
   WindowPtr		pWindow = None;
-  Bool			fOwnedToNotOwned = FALSE;
   static Window		s_iOwners[CLIP_NUM_SELECTIONS] = {None};
   static unsigned long	s_ulServerGeneration = 0;
   REQUEST(xSetSelectionOwnerReq);
   
   REQUEST_SIZE_MATCH(xSetSelectionOwnerReq);
 
-#if 0
-  ErrorF ("winProcSetSelectionOwner - Hello.\n");
-#endif
+  winDebug ("winProcSetSelectionOwner - Hello.\n");
 
   /* Watch for server reset */
   if (s_ulServerGeneration != serverGeneration)
     {
       /* Save new generation number */
       s_ulServerGeneration = serverGeneration;
-
+                  
       /* Initialize static variables */
       for (i = 0; i < CLIP_NUM_SELECTIONS; ++i)
 	s_iOwners[i] = None;
@@ -342,9 +342,9 @@ winProcSetSelectionOwner (ClientPtr client)
   /* Abort if clipboard not completely initialized yet */
   if (!g_fClipboardStarted)
     {
-      /* ErrorF ("winProcSetSelectionOwner - Clipboard not yet started, "
-	      "aborting.\n"); */
-      goto winProcSetSelectionOwner_Done;
+        winDebug ("winProcSetSelectionOwner - Clipboard not yet started, "
+	        "aborting.\n");
+        goto winProcSetSelectionOwner_Done;
     }
   
   /* Grab window if we have one */
@@ -367,12 +367,8 @@ winProcSetSelectionOwner (ClientPtr client)
       if (None == stuff->window
 	  && None != s_iOwners[CLIP_OWN_PRIMARY])
 	{
-	  fOwnedToNotOwned = TRUE;
-
-#if 0
-	  ErrorF ("winProcSetSelectionOwner - PRIMARY - Going from "
+	  winDebug ("winProcSetSelectionOwner - PRIMARY - Going from "
 		  "owned to not owned.\n");
-#endif
 
 	  /* Adjust last owned selection */
 	  if (None != s_iOwners[CLIP_OWN_CLIPBOARD])
@@ -384,10 +380,8 @@ winProcSetSelectionOwner (ClientPtr client)
       /* Save new selection owner or None */
       s_iOwners[CLIP_OWN_PRIMARY] = stuff->window;
 
-#if 0
-      ErrorF ("winProcSetSelectionOwner - PRIMARY - Now owned by: %d\n",
-	      stuff->window);
-#endif
+      winDebug ("winProcSetSelectionOwner - PRIMARY - Now owned by: 0x%x (clipboard is 0x%x)\n",
+	      stuff->window,g_iClipboardWindow);
     }
   else if (MakeAtom ("CLIPBOARD", 9, TRUE) == stuff->selection)
     {
@@ -395,12 +389,8 @@ winProcSetSelectionOwner (ClientPtr client)
       if (None == stuff->window
 	  && None != s_iOwners[CLIP_OWN_CLIPBOARD])
 	{
-	  fOwnedToNotOwned = TRUE;
-	  
-#if 0
-	  ErrorF ("winProcSetSelectionOwner - CLIPBOARD - Going from "
+	  winDebug ("winProcSetSelectionOwner - CLIPBOARD - Going from "
 		  "owned to not owned.\n");
-#endif
 
 	  /* Adjust last owned selection */
 	  if (None != s_iOwners[CLIP_OWN_PRIMARY])
@@ -412,10 +402,8 @@ winProcSetSelectionOwner (ClientPtr client)
       /* Save new selection owner or None */
       s_iOwners[CLIP_OWN_CLIPBOARD] = stuff->window;
 
-#if 0
-      ErrorF ("winProcSetSelectionOwner - CLIPBOARD - Now owned by: %d\n",
-	      stuff->window);
-#endif
+      winDebug ("winProcSetSelectionOwner - CLIPBOARD - Now owned by: 0x%x, clipboard is 0x%x\n",
+	      stuff->window,g_iClipboardWindow);
     }
   else
     goto winProcSetSelectionOwner_Done;
@@ -430,48 +418,17 @@ winProcSetSelectionOwner (ClientPtr client)
   if (g_iClipboardWindow == s_iOwners[CLIP_OWN_CLIPBOARD])
     s_iOwners[CLIP_OWN_CLIPBOARD] = None;
 
-  /*
-   * Handle case when selection is being disowned,
-   * WM_DRAWCLIPBOARD did not do the disowning,
-   * both monitored selections are no longer owned,
-   * an owned to not owned transition was detected,
-   * and we currently own the Win32 clipboard.
-   */
-  if (stuff->window == None
-      && s_iOwners[CLIP_OWN_PRIMARY] == None
-      && s_iOwners[CLIP_OWN_CLIPBOARD] == None
-      && fOwnedToNotOwned
-      && g_hwndClipboard != NULL
-      && g_hwndClipboard == GetClipboardOwner ())
-    {
-#if 0
-      ErrorF ("winProcSetSelectionOwner - We currently own the "
-	      "clipboard and neither the PRIMARY nor the CLIPBOARD "
-	      "selections are owned, releasing ownership of Win32 "
-	      "clipboard.\n");
-#endif
-      
-      /* Release ownership of the Windows clipboard */
-      OpenClipboard (NULL);
-      EmptyClipboard ();
-      CloseClipboard ();
-
-      goto winProcSetSelectionOwner_Done;
-    }
-
   /* Abort if no window at this point */
   if (None == stuff->window)
     {
-#if 0
-      ErrorF ("winProcSetSelectionOwner - No window, returning.\n");
-#endif
+      winDebug ("winProcSetSelectionOwner - No window, returning.\n");
       goto winProcSetSelectionOwner_Done;
     }
 
   /* Abort if invalid selection */
   if (!ValidAtom (stuff->selection))
     {
-      ErrorF ("winProcSetSelectionOwner - Found BadAtom, aborting.\n");
+      winDebug ("winProcSetSelectionOwner - Found BadAtom, aborting.\n");
       goto winProcSetSelectionOwner_Done;
     }
 
@@ -481,32 +438,24 @@ winProcSetSelectionOwner (ClientPtr client)
   /* Abort if clipboard manager is owning the selection */
   if (pDrawable->id == g_iClipboardWindow)
     {
-#if 0
-      ErrorF ("winProcSetSelectionOwner - We changed ownership, "
+      winDebug ("winProcSetSelectionOwner - We changed ownership, "
 	      "aborting.\n");
-#endif
       goto winProcSetSelectionOwner_Done;
     }
 
   /* Abort if root window is taking ownership */
   if (pDrawable->id == 0)
     {
-      ErrorF ("winProcSetSelectionOwner - Root window taking ownership, "
+      winDebug ("winProcSetSelectionOwner - Root window taking ownership, "
 	      "aborting\n");
       goto winProcSetSelectionOwner_Done;
     }
 
-  /* Close clipboard if we have it open already */
-  if (GetOpenClipboardWindow () == g_hwndClipboard)
-    {
-      CloseClipboard ();
-    }
-
   /* Access the Windows clipboard */
   if (!OpenClipboard (g_hwndClipboard))
     {
-      ErrorF ("winProcSetSelectionOwner - OpenClipboard () failed: %08x\n",
-	      (int) GetLastError ());
+      ErrorF ("winProcSetSelectionOwner - OpenClipboard () failed: %08x, hwnd: %08x\n",
+	      (int) GetLastError (),g_hwndClipboard);
       goto winProcSetSelectionOwner_Done;
     }
 
@@ -515,9 +464,12 @@ winProcSetSelectionOwner (ClientPtr client)
     {
       ErrorF ("winProcSetSelectionOwner - EmptyClipboard () failed: %08x\n",
 	      (int) GetLastError ());
+      CloseClipboard ();
       goto winProcSetSelectionOwner_Done;
     }
 
+  winDebug("winProcSetSelectionOwner - SetClipboardData NULL\n");
+
   /* Advertise Unicode if we support it */
   if (g_fUnicodeSupport)
     SetClipboardData (CF_UNICODETEXT, NULL);
@@ -537,6 +489,6 @@ winProcSetSelectionOwner (ClientPtr client)
       goto winProcSetSelectionOwner_Done;
     }
 
- winProcSetSelectionOwner_Done:
+winProcSetSelectionOwner_Done:
   return (*winProcSetSelectionOwnerOrig) (client);
 }