[Xorg-commit] xc/programs/Xserver/hw/xwin winclipboardwndproc.c,1.1.4.1.2.7,1.1.4.1.2.8 winclipboardwrappers.c,1.1.2.5,1.1.2.6

[Harold L Hunt II]

Committed by: harold

Update of /cvs/xorg/xc/programs/Xserver/hw/xwin
In directory pdx:/tmp/cvs-serv15820

Modified Files:
      Tag: CYGWIN
	winclipboardwndproc.c winclipboardwrappers.c 
Log Message:
XWin Server - Sync with 4.3.0-39 release.  Disable clipboard status messages.

Index: winclipboardwndproc.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/winclipboardwndproc.c,v
retrieving revision 1.1.4.1.2.7
retrieving revision 1.1.4.1.2.8
diff -u -d -r1.1.4.1.2.7 -r1.1.4.1.2.8
--- winclipboardwndproc.c	12 Jan 2004 01:10:50 -0000	1.1.4.1.2.7
+++ winclipboardwndproc.c	13 Jan 2004 01:05:52 -0000	1.1.4.1.2.8
@@ -87,7 +87,9 @@
     {
     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 @@
 
     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 @@
 	/* 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 @@
 	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 @@
 	    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 @@
 	    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);

Index: winclipboardwrappers.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/Attic/winclipboardwrappers.c,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- winclipboardwrappers.c	12 Jan 2004 01:10:50 -0000	1.1.2.5
+++ winclipboardwrappers.c	13 Jan 2004 01:05:52 -0000	1.1.2.6
@@ -42,13 +42,6 @@
 
 
 /*
- * Globals
- */
-
-static Window		g_iOwners[CLIP_NUM_SELECTIONS] = {None};
-
-
-/*
  * Local function prototypes
  */
 
@@ -289,6 +282,7 @@
   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 @@
       && 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 @@
   /* 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;
     }