frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

devPrivates rework: move devPrivates field in drawable structure types 

to just below the DrawableRec.  Wish there were a better way to do this
but it has to be in the same place for all drawable types.
This commit is contained in:
Eamon Walsh 2007-09-19 13:59:35 -04:00 committed by Eamon Walsh
parent 5b36b64192
commit 082c0f7fb3
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/pixmapstr.h
View File

@ -72,10 +72,10 @@ typedef struct _Drawable {
typedef struct _Pixmap { typedef struct _Pixmap {
DrawableRec drawable; DrawableRec drawable;
PrivateRec *devPrivates;
int refcnt; int refcnt;
int devKind; int devKind;
DevUnion devPrivate; DevUnion devPrivate;
PrivateRec *devPrivates;
#ifdef COMPOSITE #ifdef COMPOSITE
short screen_x; short screen_x;
short screen_y; short screen_y;

2
include/windowstr.h
View File

@ -124,6 +124,7 @@ typedef struct _WindowOpt {
typedef struct _Window { typedef struct _Window {
DrawableRec drawable; DrawableRec drawable;
PrivateRec *devPrivates;
WindowPtr parent; /* ancestor chain */ WindowPtr parent; /* ancestor chain */
WindowPtr nextSib; /* next lower sibling */ WindowPtr nextSib; /* next lower sibling */
WindowPtr prevSib; /* next higher sibling */ WindowPtr prevSib; /* next higher sibling */
@ -160,7 +161,6 @@ typedef struct _Window {
#ifdef COMPOSITE #ifdef COMPOSITE
unsigned redirectDraw:2; /* rendering is redirected from here */ unsigned redirectDraw:2; /* rendering is redirected from here */
#endif #endif
PrivateRec *devPrivates;
} WindowRec; } WindowRec;
/* /*

2
render/picture.c
View File

@ -728,7 +728,7 @@ CreatePicture (Picture pid,
/* security creation/labeling check */ /* security creation/labeling check */
*error = XaceHook(XACE_RESOURCE_ACCESS, client, pid, PictureType, pPicture, *error = XaceHook(XACE_RESOURCE_ACCESS, client, pid, PictureType, pPicture,
RC_DRAWABLE, pDrawable, DixCreateAccess|DixSetAttrAccess); RT_PIXMAP, pDrawable, DixCreateAccess|DixSetAttrAccess);
if (*error != Success) if (*error != Success)
goto out; goto out;