rpms/xorg-x11-server
7
0
Fork 0
Code Issues Pull Requests Releases Activity

* Mon Aug 28 2006 Kristian Høgsberg <krh@redhat.com> - 1.1.1-31.fc6

Browse Source 
- Update xorg-x11-server-1.1.1-offscreen-pixmaps.patch to log transitions.
This commit is contained in:
Kristian Høgsberg 2006-08-28 23:00:23 +00:00
parent 0066a0f753
commit 8d0b84f5a3
2 changed files with 44 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
xorg-x11-server-1.1.1-offscreen-pixmaps.patch
View File

@ -1,5 +1,17 @@
--- xorg-server-1.1.1/hw/xfree86/xaa/xaaInit.c.offscreen-pixmaps 2006-07-05 14:31:42.000000000 -0400 --- ./hw/xfree86/xaa/xaa.h.offscreen-pixmaps 2006-08-28 15:33:34.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 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 @@ @@ -4,6 +4,7 @@
#include <xorg-config.h> #include <xorg-config.h>
#endif #endif
@ -16,7 +28,7 @@
#define MAX_PREALLOC_MEM 65536 /* MUST be >= 1024 */ #define MAX_PREALLOC_MEM 65536 /* MUST be >= 1024 */
@@ -98,6 +100,29 @@ @@ -98,6 +100,49 @@
xfree(infoRec); xfree(infoRec);
} }
@ -32,21 +44,41 @@
+ Atom atom; + Atom atom;
+ +
+ atom = MakeAtom(atom_name, strlen(atom_name), 0); + atom = MakeAtom(atom_name, strlen(atom_name), 0);
+ if (info->selection->selection == atom && + if (info->selection->selection != atom)
+ info->kind == SelectionSetOwner && + return;
+ info->selection->window != None) +
+ if (info->kind == SelectionSetOwner && info->selection->window != None)
+ { + {
+ infoRec->savedOffscreenDepths = infoRec->offscreenDepths;
+ infoRec->offscreenDepths = 0; + infoRec->offscreenDepths = 0;
+ infoRec->Flags &= ~OFFSCREEN_PIXMAPS; + infoRec->Flags &= ~OFFSCREEN_PIXMAPS;
+ +
+ XAAMoveOutOffscreenPixmaps(pScreen); + XAAMoveOutOffscreenPixmaps(pScreen);
+ XAAInvalidatePixmapCache(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 Bool
XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec) XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
@@ -228,11 +253,11 @@ @@ -228,11 +273,11 @@
if(infoRec->Flags & MICROSOFT_ZERO_LINE_BIAS) if(infoRec->Flags & MICROSOFT_ZERO_LINE_BIAS)
miSetZeroLineBias(pScreen, OCTANT1 | OCTANT2 | OCTANT3 | OCTANT4); miSetZeroLineBias(pScreen, OCTANT1 | OCTANT2 | OCTANT3 | OCTANT4);
@ -60,7 +92,7 @@
static Bool static Bool
XAACloseScreen (int i, ScreenPtr pScreen) XAACloseScreen (int i, ScreenPtr pScreen)
{ {
@@ -264,6 +289,9 @@ @@ -264,6 +309,9 @@
xfree ((pointer) pScreenPriv); xfree ((pointer) pScreenPriv);

5
xorg-x11-server.spec
View File

@ -8,7 +8,7 @@ Version: 1.1.1
# upgrades to officially released distribution releases, if the package # upgrades to officially released distribution releases, if the package
# Version field above is not changing, append and/or bump a digit /after/ # Version field above is not changing, append and/or bump a digit /after/
# the dist tag. ie: 25%{?dist}.0 -> 25%{?dist}.1 ... # the dist tag. ie: 25%{?dist}.0 -> 25%{?dist}.1 ...
Release: 30%{?dist} Release: 31%{?dist}
URL: http://www.x.org URL: http://www.x.org
License: MIT/X11 License: MIT/X11
Group: User Interface/X Group: User Interface/X
@ -707,6 +707,9 @@ rm -rf $RPM_BUILD_ROOT
# ------------------------------------------------------------------- # -------------------------------------------------------------------
%changelog %changelog
* Mon Aug 28 2006 Kristian Høgsberg <krh@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@redhat.com> 1.1.1-30.fc6 * Fri Aug 25 2006 Adam Jackson <ajackson@redhat.com> 1.1.1-30.fc6
- xorg-x11-server-1.1.1-pci-paranoia.patch: In xf86MatchPciInstances, fail - xorg-x11-server-1.1.1-pci-paranoia.patch: In xf86MatchPciInstances, fail
gracefully if xf86PciVideoInfo is NULL (like, on Xen). gracefully if xf86PciVideoInfo is NULL (like, on Xen).