From b0266a4e7f46543b68e8348df4b5cb1cc5e8268c Mon Sep 17 00:00:00 2001
From: Harold L Hunt II <huntharo@msu.edu>
Date: Tue, 13 Jan 2004 01:05:52 +0000
Subject: [PATCH] XWin Server - Sync with 4.3.0-39 release. Disable clipboard
 status     messages.

---
 hw/xwin/winclipboardwndproc.c  | 12 ++++++++++++
 hw/xwin/winclipboardwrappers.c | 12 +++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/hw/xwin/winclipboardwndproc.c b/hw/xwin/winclipboardwndproc.c
index 1d273c2bc..51a08c53f 100644
--- a/hw/xwin/winclipboardwndproc.c
+++ b/hw/xwin/winclipboardwndproc.c
@@ -87,7 +87,9 @@ winClipboardWindowProc (HWND hwnd, UINT message,
     {
     case WM_DESTROY:
       {
+#if 0
 	ErrorF ("winClipboardWindowProc - WM_DESTROY\n");
+#endif
 
 	/* Remove ourselves from the clipboard chain */
 	ChangeClipboardChain (hwnd, s_hwndNextViewer);
@@ -101,7 +103,9 @@ winClipboardWindowProc (HWND hwnd, UINT message,
 
     case WM_CREATE:
       {
+#if 0
 	ErrorF ("winClipboardWindowProc - WM_CREATE\n");
+#endif
 	
 	/* Add ourselves to the clipboard viewer chain */
 	s_hwndNextViewer = SetClipboardViewer (hwnd);
@@ -150,8 +154,10 @@ winClipboardWindowProc (HWND hwnd, UINT message,
 	/* Bail when we still own the clipboard */
 	if (hwnd == GetClipboardOwner ())
 	  {
+#if 0
 	    ErrorF ("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
 		    "We own the clipboard, returning.\n");
+#endif
 	    return 0;
 	  }
 
@@ -163,9 +169,11 @@ winClipboardWindowProc (HWND hwnd, UINT message,
 	if (!IsClipboardFormatAvailable (CF_TEXT)
 	    && !IsClipboardFormatAvailable (CF_UNICODETEXT))
 	  {
+#if 0
 	    ErrorF ("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
 		    "Clipboard does not contain CF_TEXT nor "
 		    "CF_UNICODETEXT.\n");
+#endif
 
 	    /*
 	     * We need to make sure that the X Server has processed
@@ -225,11 +233,13 @@ winClipboardWindowProc (HWND hwnd, UINT message,
 	    ErrorF ("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
 		    "Could not reassert ownership of PRIMARY\n");
 	  }
+#if 0
 	else
 	  {
 	    ErrorF ("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
 		    "Reasserted ownership of PRIMARY\n");
 	  }
+#endif
 	
 	/* Reassert ownership of the CLIPBOARD */	  
 	iReturn = XSetSelectionOwner (pDisplay,
@@ -243,11 +253,13 @@ winClipboardWindowProc (HWND hwnd, UINT message,
 	    ErrorF ("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
 		    "Could not reassert ownership of CLIPBOARD\n");
 	  }
+#if 0
 	else
 	  {
 	    ErrorF ("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
 		    "Reasserted ownership of CLIPBOARD\n");
 	  }
+#endif
 	
 	/* Flush the pending SetSelectionOwner event now */
 	XFlush (pDisplay);
diff --git a/hw/xwin/winclipboardwrappers.c b/hw/xwin/winclipboardwrappers.c
index 91ffa4624..c14b7d8e8 100755
--- a/hw/xwin/winclipboardwrappers.c
+++ b/hw/xwin/winclipboardwrappers.c
@@ -41,13 +41,6 @@
 #define CLIP_OWN_CLIPBOARD		1
 
 
-/*
- * Globals
- */
-
-static Window		g_iOwners[CLIP_NUM_SELECTIONS] = {None};
-
-
 /*
  * Local function prototypes
  */
@@ -289,6 +282,7 @@ winProcSetSelectionOwner (ClientPtr client)
   DrawablePtr		pDrawable;
   WindowPtr		pWindow = None;
   Bool			fOwnedToNotOwned = FALSE;
+  static Window		g_iOwners[CLIP_NUM_SELECTIONS] = {None};
   REQUEST(xSetSelectionOwnerReq);
   
   REQUEST_SIZE_MATCH(xSetSelectionOwnerReq);
@@ -375,10 +369,12 @@ winProcSetSelectionOwner (ClientPtr client)
       && 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);
@@ -410,8 +406,10 @@ winProcSetSelectionOwner (ClientPtr client)
   /* Abort if clipboard manager is owning the selection */
   if (pDrawable->id == g_iClipboardWindow)
     {
+#if 0
       ErrorF ("winProcSetSelectionOwner - We changed ownership, "
 	      "aborting.\n");
+#endif
       goto winProcSetSelectionOwner_Done;
     }