mirror of
https://github.com/X11Libre/xserver.git
synced 2026-09-25 21:02:21 +00:00
Prepare for array-index based devPrivates.
TODO: static indices can be made just an int; some indices can be combined.
This commit is contained in:
parent
ec7907f8fa
commit
ebea78cdba
78 changed files with 287 additions and 146 deletions
|
|
@ -43,11 +43,15 @@
|
|||
#define CW_ASSERT(x) do {} while (0)
|
||||
#endif
|
||||
|
||||
DevPrivateKey cwGCKey = &cwGCKey;
|
||||
DevPrivateKey cwScreenKey = &cwScreenKey;
|
||||
DevPrivateKey cwWindowKey = &cwWindowKey;
|
||||
static int cwGCKeyIndex;
|
||||
DevPrivateKey cwGCKey = &cwGCKeyIndex;
|
||||
static int cwScreenKeyIndex;
|
||||
DevPrivateKey cwScreenKey = &cwScreenKeyIndex;
|
||||
static int cwWindowKeyIndex;
|
||||
DevPrivateKey cwWindowKey = &cwWindowKeyIndex;
|
||||
#ifdef RENDER
|
||||
DevPrivateKey cwPictureKey = &cwPictureKey;
|
||||
static int cwPictureKeyIndex;
|
||||
DevPrivateKey cwPictureKey = &cwPictureKeyIndex;
|
||||
#endif
|
||||
extern GCOps cwGCOps;
|
||||
|
||||
|
|
|
|||
|
|
@ -70,10 +70,14 @@
|
|||
|
||||
#define pixmapDamage(pPixmap) damagePixPriv(pPixmap)
|
||||
|
||||
static DevPrivateKey damageScrPrivateKey = &damageScrPrivateKey;
|
||||
static DevPrivateKey damagePixPrivateKey = &damagePixPrivateKey;
|
||||
static DevPrivateKey damageGCPrivateKey = &damageGCPrivateKey;
|
||||
static DevPrivateKey damageWinPrivateKey = &damageWinPrivateKey;
|
||||
static int damageScrPrivateKeyIndex;
|
||||
static DevPrivateKey damageScrPrivateKey = &damageScrPrivateKeyIndex;
|
||||
static int damagePixPrivateKeyIndex;
|
||||
static DevPrivateKey damagePixPrivateKey = &damagePixPrivateKeyIndex;
|
||||
static int damageGCPrivateKeyIndex;
|
||||
static DevPrivateKey damageGCPrivateKey = &damageGCPrivateKeyIndex;
|
||||
static int damageWinPrivateKeyIndex;
|
||||
static DevPrivateKey damageWinPrivateKey = &damageWinPrivateKeyIndex;
|
||||
|
||||
static DamagePtr *
|
||||
getDrawableDamageRef (DrawablePtr pDrawable)
|
||||
|
|
|
|||
|
|
@ -62,10 +62,14 @@ extern int RootlessMiValidateTree(WindowPtr pRoot, WindowPtr pChild,
|
|||
extern Bool RootlessCreateGC(GCPtr pGC);
|
||||
|
||||
// Initialize globals
|
||||
DevPrivateKey rootlessGCPrivateKey = &rootlessGCPrivateKey;
|
||||
DevPrivateKey rootlessScreenPrivateKey = &rootlessScreenPrivateKey;
|
||||
DevPrivateKey rootlessWindowPrivateKey = &rootlessWindowPrivateKey;
|
||||
DevPrivateKey rootlessWindowOldPixmapPrivateKey = &rootlessWindowOldPixmapPrivateKey;
|
||||
static int rootlessGCPrivateKeyIndex;
|
||||
DevPrivateKey rootlessGCPrivateKey = &rootlessGCPrivateKeyIndex;
|
||||
static int rootlessScreenPrivateKeyIndex;
|
||||
DevPrivateKey rootlessScreenPrivateKey = &rootlessScreenPrivateKeyIndex;
|
||||
static int rootlessWindowPrivateKeyIndex;
|
||||
DevPrivateKey rootlessWindowPrivateKey = &rootlessWindowPrivateKeyIndex;
|
||||
static int rootlessWindowOldPixmapPrivateKeyIndex;
|
||||
DevPrivateKey rootlessWindowOldPixmapPrivateKey = &rootlessWindowOldPixmapPrivateKeyIndex;
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -36,7 +36,8 @@
|
|||
#include "gcstruct.h"
|
||||
#include "shadow.h"
|
||||
|
||||
DevPrivateKey shadowScrPrivateKey = &shadowScrPrivateKey;
|
||||
static int shadowScrPrivateKeyIndex;
|
||||
DevPrivateKey shadowScrPrivateKey = &shadowScrPrivateKeyIndex;
|
||||
|
||||
#define wrap(priv, real, mem) {\
|
||||
priv->mem = real->mem; \
|
||||
|
|
|
|||
Loading…
Reference in a new issue