[xorg-commit-diffs] xc/programs/Xserver/hw/xwin winclipboard.h, 1.1.4.1.2.12, 1.1.4.1.2.13 winclipboardwrappers.c, 1.1.2.14, 1.1.2.15 winwndproc.c, 1.1.4.1.2.16, 1.1.4.1.2.17

[Harold L Hunt II]

Committed by: harold

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

Modified Files:
      Tag: CYGWIN
	winclipboard.h winclipboardwrappers.c winwndproc.c 
Log Message:
More RandR work, fiddle the clipboard a little bit more.

Index: winclipboard.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/winclipboard.h,v
retrieving revision 1.1.4.1.2.12
retrieving revision 1.1.4.1.2.13
diff -u -d -r1.1.4.1.2.12 -r1.1.4.1.2.13
--- a/winclipboard.h	30 Mar 2004 14:56:46 -0000	1.1.4.1.2.12
+++ b/winclipboard.h	30 Mar 2004 18:42:28 -0000	1.1.4.1.2.13
@@ -112,7 +112,7 @@
  */
 
 void *
-winClipboardProc (void  *);
+winClipboardProc (void *);
 
 void
 winDeinitClipboard (void);

Index: winclipboardwrappers.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/Attic/winclipboardwrappers.c,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -d -r1.1.2.14 -r1.1.2.15
--- a/winclipboardwrappers.c	27 Mar 2004 19:54:22 -0000	1.1.2.14
+++ b/winclipboardwrappers.c	30 Mar 2004 18:42:28 -0000	1.1.2.15
@@ -413,6 +413,16 @@
     goto winProcSetSelectionOwner_Done;
 
   /*
+   * At this point, if one of the selections is still owned by the 
+   * clipboard manager then it should be marked as unowned since
+   * we will be taking ownership of the Win32 clipboard.
+   */
+  if (g_iClipboardWindow == s_iOwners[CLIP_OWN_PRIMARY])
+    s_iOwners[CLIP_OWN_PRIMARY] = None;
+  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,

Index: winwndproc.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/winwndproc.c,v
retrieving revision 1.1.4.1.2.16
retrieving revision 1.1.4.1.2.17
diff -u -d -r1.1.4.1.2.16 -r1.1.4.1.2.17
--- a/winwndproc.c	26 Mar 2004 03:21:41 -0000	1.1.4.1.2.16
+++ b/winwndproc.c	30 Mar 2004 18:42:28 -0000	1.1.4.1.2.17
@@ -277,6 +277,14 @@
 	  ErrorF ("winWindowProc - WM_DISPLAYCHANGE - Recreated "
 		  "primary surface\n");
 #endif
+
+#if 0
+	  /* Multi-Window mode uses RandR for resizes */
+	  if (s_pScreenInfo->fMultiWindow)
+	    {
+	      RRSetScreenConfig ();
+	    }
+#endif
 	}
       else
 	{
@@ -286,6 +294,8 @@
 #endif
 	}
 
+
+
       /* Store the new display dimensions and depth */
       if (s_pScreenInfo->fMultipleMonitors)
 	{