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:
parent
5b36b64192
commit
082c0f7fb3
|
@ -72,10 +72,10 @@ typedef struct _Drawable {
|
|||
|
||||
typedef struct _Pixmap {
|
||||
DrawableRec drawable;
|
||||
PrivateRec *devPrivates;
|
||||
int refcnt;
|
||||
int devKind;
|
||||
DevUnion devPrivate;
|
||||
PrivateRec *devPrivates;
|
||||
#ifdef COMPOSITE
|
||||
short screen_x;
|
||||
short screen_y;
|
||||
|
|
|
@ -124,6 +124,7 @@ typedef struct _WindowOpt {
|
|||
|
||||
typedef struct _Window {
|
||||
DrawableRec drawable;
|
||||
PrivateRec *devPrivates;
|
||||
WindowPtr parent; /* ancestor chain */
|
||||
WindowPtr nextSib; /* next lower sibling */
|
||||
WindowPtr prevSib; /* next higher sibling */
|
||||
|
@ -160,7 +161,6 @@ typedef struct _Window {
|
|||
#ifdef COMPOSITE
|
||||
unsigned redirectDraw:2; /* rendering is redirected from here */
|
||||
#endif
|
||||
PrivateRec *devPrivates;
|
||||
} WindowRec;
|
||||
|
||||
/*
|
||||
|
|
|
@ -728,7 +728,7 @@ CreatePicture (Picture pid,
|
|||
|
||||
/* security creation/labeling check */
|
||||
*error = XaceHook(XACE_RESOURCE_ACCESS, client, pid, PictureType, pPicture,
|
||||
RC_DRAWABLE, pDrawable, DixCreateAccess|DixSetAttrAccess);
|
||||
RT_PIXMAP, pDrawable, DixCreateAccess|DixSetAttrAccess);
|
||||
if (*error != Success)
|
||||
goto out;
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user