rpms/xorg-x11-server/devel xorg-x11-server-1.1.1-offscreen-pixmaps.patch, 1.3, 1.4 xorg-x11-server.spec, 1.160, 1.161

[fedora-cvs-commits at redhat.com]

Author: krh

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17199

Modified Files:
	xorg-x11-server-1.1.1-offscreen-pixmaps.patch 
	xorg-x11-server.spec 
Log Message:
* Mon Aug 28 2006 Kristian Høgsberg <krh at redhat.com> - 1.1.1-31.fc6
- Update xorg-x11-server-1.1.1-offscreen-pixmaps.patch to log transitions.


xorg-x11-server-1.1.1-offscreen-pixmaps.patch:
 xaa.h     |    3 +++
 xaaInit.c |   52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 53 insertions(+), 2 deletions(-)

Index: xorg-x11-server-1.1.1-offscreen-pixmaps.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.1.1-offscreen-pixmaps.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xorg-x11-server-1.1.1-offscreen-pixmaps.patch	8 Aug 2006 18:17:36 -0000	1.3
+++ xorg-x11-server-1.1.1-offscreen-pixmaps.patch	28 Aug 2006 23:00:23 -0000	1.4
@@ -1,5 +1,17 @@
---- xorg-server-1.1.1/hw/xfree86/xaa/xaaInit.c.offscreen-pixmaps	2006-07-05 14:31:42.000000000 -0400
-+++ xorg-server-1.1.1/hw/xfree86/xaa/xaaInit.c	2006-08-08 14:02:05.000000000 -0400
+--- ./hw/xfree86/xaa/xaa.h.offscreen-pixmaps	2006-08-28 15:33:34.000000000 -0400
++++ ./hw/xfree86/xaa/xaa.h	2006-08-28 15:33:36.000000000 -0400
+@@ -1373,6 +1373,9 @@
+    );
+    CARD32 *CPUToScreenTextureDstFormats;
+ #endif /* RENDER */
++
++   unsigned int savedOffscreenDepths;
++
+ } XAAInfoRec, *XAAInfoRecPtr;
+ 
+ #define SET_SYNC_FLAG(infoRec)	(infoRec)->NeedToSync = TRUE
+--- ./hw/xfree86/xaa/xaaInit.c.offscreen-pixmaps	2006-07-05 14:31:42.000000000 -0400
++++ ./hw/xfree86/xaa/xaaInit.c	2006-08-28 15:31:03.000000000 -0400
 @@ -4,6 +4,7 @@
  #include <xorg-config.h>
  #endif
@@ -16,7 +28,7 @@
  
  #define MAX_PREALLOC_MEM	65536	/* MUST be >= 1024 */
  
-@@ -98,6 +100,29 @@
+@@ -98,6 +100,49 @@
      xfree(infoRec);
  }
  
@@ -32,21 +44,41 @@
 +    Atom atom;
 +
 +    atom = MakeAtom(atom_name, strlen(atom_name), 0);
-+    if (info->selection->selection == atom &&
-+	info->kind == SelectionSetOwner &&
-+	info->selection->window != None)
++    if (info->selection->selection != atom)
++	return;
++
++    if (info->kind == SelectionSetOwner && info->selection->window != None)
 +    {
++	infoRec->savedOffscreenDepths = infoRec->offscreenDepths;
 +	infoRec->offscreenDepths = 0;
 +	infoRec->Flags &= ~OFFSCREEN_PIXMAPS;
 +       
 +	XAAMoveOutOffscreenPixmaps(pScreen);
 +	XAAInvalidatePixmapCache(pScreen);
++
++	xf86MsgVerb(X_INFO, 3, "'%s' selection grabbed; evicting pixmaps for screen %d\n",
++		    atom_name, pScreen->myNum);
++    }
++    else if (infoRec->savedOffscreenDepths > 0)
++    {
++	infoRec->Flags |= OFFSCREEN_PIXMAPS;
++	infoRec->offscreenDepths = infoRec->savedOffscreenDepths;
++
++	if (!SwitchedOut) {
++	    xf86MsgVerb(X_INFO, 3, "'%s' selection released; pulling in pixmaps for screen %d\n",
++		      atom_name, pScreen->myNum);
++
++	    XAAMoveInOffscreenPixmaps(pScreen);
++	} else {
++	    xf86MsgVerb(X_INFO, 3, "'%s' selection released; will pull in pixmaps for screen %d when switched back in.\n",
++			atom_name, pScreen->myNum);
++	}
 +    }
 +}
  
  Bool 
  XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
-@@ -228,11 +253,11 @@
+@@ -228,11 +273,11 @@
      if(infoRec->Flags & MICROSOFT_ZERO_LINE_BIAS)
  	miSetZeroLineBias(pScreen, OCTANT1 | OCTANT2 | OCTANT3 | OCTANT4);
  
@@ -60,7 +92,7 @@
  static Bool
  XAACloseScreen (int i, ScreenPtr pScreen)
  {
-@@ -264,6 +289,9 @@
+@@ -264,6 +309,9 @@
  
      xfree ((pointer) pScreenPriv);
  


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- xorg-x11-server.spec	25 Aug 2006 21:54:45 -0000	1.160
+++ xorg-x11-server.spec	28 Aug 2006 23:00:23 -0000	1.161
@@ -8,7 +8,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{?dist}.0 -> 25%{?dist}.1 ...
-Release:   30%{?dist}
+Release:   31%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -707,6 +707,9 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Mon Aug 28 2006 Kristian Høgsberg <krh at redhat.com> - 1.1.1-31.fc6
+- Update xorg-x11-server-1.1.1-offscreen-pixmaps.patch to log transitions.
+
 * Fri Aug 25 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-30.fc6
 - xorg-x11-server-1.1.1-pci-paranoia.patch: In xf86MatchPciInstances, fail
   gracefully if xf86PciVideoInfo is NULL (like, on Xen).