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

Update offscreen-pixmaps patch to always look up atom.

Browse Source
This commit is contained in:
Kristian Høgsberg 2006-08-08 18:17:36 +00:00
parent 22c56dc860
commit 65fb70476f
1 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,22 @@
--- ./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.offscreen-pixmaps 2006-07-05 14:31:42.000000000 -0400
+++ ./hw/xfree86/xaa/xaaInit.c 2006-08-07 18:44:21.000000000 -0400 +++ xorg-server-1.1.1/hw/xfree86/xaa/xaaInit.c 2006-08-08 14:02:05.000000000 -0400
@@ -98,6 +98,34 @@ @@ -4,6 +4,7 @@
#include <xorg-config.h>
#endif
+#include <string.h>
#include "misc.h"
#include "xf86.h"
#include "xf86_OSproc.h"
@@ -20,6 +21,7 @@
#include "xaawrap.h"
#include "xf86fbman.h"
#include "servermd.h"
+#include "selection.h"
#define MAX_PREALLOC_MEM 65536 /* MUST be >= 1024 */
@@ -98,6 +100,29 @@
xfree(infoRec); xfree(infoRec);
} }
@ -8,19 +24,14 @@
+SelectionChangedCallback (CallbackListPtr *list, +SelectionChangedCallback (CallbackListPtr *list,
+ pointer xaaData, pointer callData) + pointer xaaData, pointer callData)
+{ +{
+ static Atom atom = BAD_RESOURCE;
+ static char atom_name[] = "_COMPIZ_GL_INCLUDE_INFERIORS"; + static char atom_name[] = "_COMPIZ_GL_INCLUDE_INFERIORS";
+ +
+ SelectionInfoPtr info = call_data; + SelectionInfoRec *info = callData;
+ XAAInfoRecPtr infoRec = xaa_data; + XAAInfoRecPtr infoRec = xaaData;
+ + ScreenPtr pScreen = infoRec->pScrn->pScreen;
+ if (atom == BAD_RESOURCE) + Atom atom;
+ {
+ atom = MakeAtom(atom_name, strlen(atom_name), True);
+ if (atom == BAD_RESOURCE)
+ return;
+ }
+ +
+ atom = MakeAtom(atom_name, strlen(atom_name), 0);
+ if (info->selection->selection == atom && + if (info->selection->selection == atom &&
+ info->kind == SelectionSetOwner && + info->kind == SelectionSetOwner &&
+ info->selection->window != None) + info->selection->window != None)
@ -35,7 +46,7 @@
Bool Bool
XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec) XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
@@ -228,11 +256,11 @@ @@ -228,11 +253,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);
@ -49,11 +60,12 @@
static Bool static Bool
XAACloseScreen (int i, ScreenPtr pScreen) XAACloseScreen (int i, ScreenPtr pScreen)
{ {
@@ -264,6 +292,8 @@ @@ -264,6 +289,9 @@
xfree ((pointer) pScreenPriv); xfree ((pointer) pScreenPriv);
+ DeleteCallback(&SelectionCallback, SelectionChangedCallback, infoRec); + DeleteCallback(&SelectionCallback, SelectionChangedCallback,
+ pScreenPriv->AccelInfoRec);
+ +
return (*pScreen->CloseScreen) (i, pScreen); return (*pScreen->CloseScreen) (i, pScreen);
} }