Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
xserver
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Carlos Garnacho
xserver
Commits
ebea78cd
Commit
ebea78cd
authored
Aug 28, 2008
by
Tomas Carnecky
Committed by
Eamon Walsh
Aug 28, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Prepare for array-index based devPrivates.
TODO: static indices can be made just an int; some indices can be combined.
parent
ec7907f8
Changes
78
Hide whitespace changes
Inline
Side-by-side
Showing
78 changed files
with
287 additions
and
146 deletions
+287
-146
Xext/geext.c
Xext/geext.c
+2
-1
Xext/mbuf.c
Xext/mbuf.c
+4
-2
Xext/panoramiX.c
Xext/panoramiX.c
+4
-2
Xext/saver.c
Xext/saver.c
+2
-1
Xext/security.c
Xext/security.c
+2
-1
Xext/shm.c
Xext/shm.c
+2
-1
Xext/xevie.c
Xext/xevie.c
+3
-1
Xext/xselinux.c
Xext/xselinux.c
+6
-3
Xext/xvmain.c
Xext/xvmain.c
+2
-1
Xext/xvmc.c
Xext/xvmc.c
+3
-2
Xi/extinit.c
Xi/extinit.c
+2
-1
composite/compext.c
composite/compext.c
+2
-1
composite/compinit.c
composite/compinit.c
+6
-3
damageext/damageext.c
damageext/damageext.c
+3
-1
dbe/dbe.c
dbe/dbe.c
+4
-2
dbe/midbe.c
dbe/midbe.c
+6
-3
dix/devices.c
dix/devices.c
+4
-2
dix/events.c
dix/events.c
+2
-1
dix/window.c
dix/window.c
+2
-1
exa/exa.c
exa/exa.c
+4
-2
fb/fballpriv.c
fb/fballpriv.c
+8
-3
fb/fboverlay.c
fb/fboverlay.c
+2
-1
glx/glxext.c
glx/glxext.c
+2
-1
glx/glxscreens.c
glx/glxscreens.c
+2
-1
hw/dmx/dmxscrinit.c
hw/dmx/dmxscrinit.c
+13
-6
hw/kdrive/ephyr/ephyrdriext.c
hw/kdrive/ephyr/ephyrdriext.c
+4
-2
hw/kdrive/src/kdrive.c
hw/kdrive/src/kdrive.c
+2
-1
hw/kdrive/src/kxv.c
hw/kdrive/src/kxv.c
+4
-3
hw/xfree86/common/xf86DGA.c
hw/xfree86/common/xf86DGA.c
+3
-2
hw/xfree86/common/xf86DPMS.c
hw/xfree86/common/xf86DPMS.c
+3
-2
hw/xfree86/common/xf86Globals.c
hw/xfree86/common/xf86Globals.c
+6
-3
hw/xfree86/common/xf86RAC.c
hw/xfree86/common/xf86RAC.c
+4
-2
hw/xfree86/common/xf86RandR.c
hw/xfree86/common/xf86RandR.c
+3
-2
hw/xfree86/common/xf86VidMode.c
hw/xfree86/common/xf86VidMode.c
+3
-2
hw/xfree86/common/xf86cmap.c
hw/xfree86/common/xf86cmap.c
+5
-3
hw/xfree86/common/xf86fbman.c
hw/xfree86/common/xf86fbman.c
+5
-3
hw/xfree86/common/xf86sbusBus.c
hw/xfree86/common/xf86sbusBus.c
+2
-1
hw/xfree86/common/xf86xv.c
hw/xfree86/common/xf86xv.c
+4
-2
hw/xfree86/common/xf86xvmc.c
hw/xfree86/common/xf86xvmc.c
+2
-1
hw/xfree86/dixmods/extmod/xf86dga2.c
hw/xfree86/dixmods/extmod/xf86dga2.c
+2
-1
hw/xfree86/dixmods/extmod/xf86vmode.c
hw/xfree86/dixmods/extmod/xf86vmode.c
+5
-3
hw/xfree86/dri/dri.c
hw/xfree86/dri/dri.c
+4
-3
hw/xfree86/dri2/dri2.c
hw/xfree86/dri2/dri2.c
+6
-3
hw/xfree86/exa/examodule.c
hw/xfree86/exa/examodule.c
+2
-1
hw/xfree86/modes/xf86RandR12.c
hw/xfree86/modes/xf86RandR12.c
+2
-1
hw/xfree86/ramdac/xf86Cursor.c
hw/xfree86/ramdac/xf86Cursor.c
+2
-1
hw/xfree86/shadowfb/shadow.c
hw/xfree86/shadowfb/shadow.c
+4
-2
hw/xfree86/xaa/xaaInit.c
hw/xfree86/xaa/xaaInit.c
+6
-3
hw/xfree86/xaa/xaaOverlayDF.c
hw/xfree86/xaa/xaaOverlayDF.c
+2
-1
hw/xfree86/xaa/xaaStateChange.c
hw/xfree86/xaa/xaaStateChange.c
+2
-1
hw/xfree86/xaa/xaaWrapper.c
hw/xfree86/xaa/xaaWrapper.c
+4
-2
hw/xnest/GC.c
hw/xnest/GC.c
+2
-1
hw/xnest/Pixmap.c
hw/xnest/Pixmap.c
+2
-1
hw/xnest/Screen.c
hw/xnest/Screen.c
+2
-1
hw/xnest/Window.c
hw/xnest/Window.c
+2
-1
hw/xquartz/darwin.c
hw/xquartz/darwin.c
+2
-1
hw/xquartz/quartz.c
hw/xquartz/quartz.c
+2
-1
hw/xquartz/xpr/dri.c
hw/xquartz/xpr/dri.c
+6
-3
hw/xquartz/xpr/xprCursor.c
hw/xquartz/xpr/xprCursor.c
+2
-1
hw/xwin/winglobals.c
hw/xwin/winglobals.c
+10
-5
mi/mibank.c
mi/mibank.c
+5
-2
mi/midispcur.c
mi/midispcur.c
+4
-3
mi/mioverlay.c
mi/mioverlay.c
+4
-2
mi/mipointer.c
mi/mipointer.c
+4
-2
mi/miscrinit.c
mi/miscrinit.c
+4
-2
mi/misprite.c
mi/misprite.c
+4
-2
miext/cw/cw.c
miext/cw/cw.c
+8
-4
miext/damage/damage.c
miext/damage/damage.c
+8
-4
miext/rootless/rootlessScreen.c
miext/rootless/rootlessScreen.c
+8
-4
miext/shadow/shadow.c
miext/shadow/shadow.c
+2
-1
randr/randr.c
randr/randr.c
+4
-2
record/record.c
record/record.c
+2
-1
render/animcur.c
render/animcur.c
+3
-1
render/picture.c
render/picture.c
+4
-2
render/render.c
render/render.c
+2
-1
xfixes/cursor.c
xfixes/cursor.c
+3
-1
xfixes/xfixes.c
xfixes/xfixes.c
+3
-1
xkb/xkbActions.c
xkb/xkbActions.c
+2
-1
No files found.
Xext/geext.c
View file @
ebea78cd
...
...
@@ -40,7 +40,8 @@
int
GEEventBase
;
int
GEErrorBase
;
DevPrivateKey
GEClientPrivateKey
=
&
GEClientPrivateKey
;
static
int
GEClientPrivateKeyIndex
;
DevPrivateKey
GEClientPrivateKey
=
&
GEClientPrivateKeyIndex
;
int
GEEventType
;
/* The opcode for all GenericEvents will have. */
int
RT_GECLIENT
=
0
;
...
...
Xext/mbuf.c
View file @
ebea78cd
...
...
@@ -61,8 +61,10 @@ in this Software without prior written authorization from The Open Group.
static
int
MultibufferEventBase
;
static
int
MultibufferErrorBase
;
static
DevPrivateKey
MultibufferScreenPrivKey
=
&
MultibufferScreenPrivKey
;
static
DevPrivateKey
MultibufferWindowPrivKey
=
&
MultibufferWindowPrivKey
;
static
int
MultibufferScreenPrivKeyIndex
;
static
DevPrivateKey
MultibufferScreenPrivKey
=
&
MultibufferScreenPrivKeyIndex
;
static
int
MultibufferWindowPrivKeyIndex
;
static
DevPrivateKey
MultibufferWindowPrivKey
=
&
MultibufferWindowPrivKeyIndex
;
static
void
PerformDisplayRequest
(
MultibuffersPtr
*
/* ppMultibuffers */
,
...
...
Xext/panoramiX.c
View file @
ebea78cd
...
...
@@ -107,8 +107,10 @@ static void PanoramiXResetProc(ExtensionEntry*);
int
(
*
SavedProcVector
[
256
])
(
ClientPtr
client
)
=
{
NULL
,
};
static
DevPrivateKey
PanoramiXGCKey
=
&
PanoramiXGCKey
;
static
DevPrivateKey
PanoramiXScreenKey
=
&
PanoramiXScreenKey
;
static
int
PanoramiXGCKeyIndex
;
static
DevPrivateKey
PanoramiXGCKey
=
&
PanoramiXGCKeyIndex
;
static
int
PanoramiXScreenKeyIndex
;
static
DevPrivateKey
PanoramiXScreenKey
=
&
PanoramiXScreenKeyIndex
;
typedef
struct
{
DDXPointRec
clipOrg
;
...
...
Xext/saver.c
View file @
ebea78cd
...
...
@@ -228,7 +228,8 @@ MakeScreenPrivate (
ScreenPtr
/* pScreen */
);
static
DevPrivateKey
ScreenPrivateKey
=
&
ScreenPrivateKey
;
static
int
ScreenPrivateKeyIndex
;
static
DevPrivateKey
ScreenPrivateKey
=
&
ScreenPrivateKeyIndex
;
#define GetScreenPrivate(s) ((ScreenSaverScreenPrivatePtr) \
dixLookupPrivate(&(s)->devPrivates, ScreenPrivateKey))
...
...
Xext/security.c
View file @
ebea78cd
...
...
@@ -50,7 +50,8 @@ static RESTYPE RTEventClient;
static
CallbackListPtr
SecurityValidateGroupCallback
=
NULL
;
/* Private state record */
static
DevPrivateKey
stateKey
=
&
stateKey
;
static
int
stateKeyIndex
;
static
DevPrivateKey
stateKey
=
&
stateKeyIndex
;
/* This is what we store as client security state */
typedef
struct
{
...
...
Xext/shm.c
View file @
ebea78cd
...
...
@@ -139,7 +139,8 @@ static ShmDescPtr Shmsegs;
static
Bool
sharedPixmaps
;
static
ShmFuncsPtr
shmFuncs
[
MAXSCREENS
];
static
DestroyPixmapProcPtr
destroyPixmap
[
MAXSCREENS
];
static
DevPrivateKey
shmPixmapPrivate
=
&
shmPixmapPrivate
;
static
int
shmPixmapPrivateIndex
;
static
DevPrivateKey
shmPixmapPrivate
=
&
shmPixmapPrivateIndex
;
static
ShmFuncs
miFuncs
=
{
NULL
,
NULL
};
static
ShmFuncs
fbFuncs
=
{
fbShmCreatePixmap
,
NULL
};
...
...
Xext/xevie.c
View file @
ebea78cd
...
...
@@ -77,9 +77,11 @@ DeviceIntPtr xeviemouse = NULL;
Mask
xevieMask
=
0
;
int
xevieEventSent
=
0
;
int
xevieKBEventSent
=
0
;
static
DevPrivateKey
xevieDevicePrivateKey
=
&
xevieDevicePrivateKey
;
static
Bool
xevieModifiersOn
=
FALSE
;
static
int
xevieDevicePrivateKeyIndex
;
static
DevPrivateKey
xevieDevicePrivateKey
=
&
xevieDevicePrivateKeyIndex
;
#define XEVIEINFO(dev) ((xevieDeviceInfoPtr) \
dixLookupPrivate(&(dev)->devPrivates, xevieDevicePrivateKey))
...
...
Xext/xselinux.c
View file @
ebea78cd
...
...
@@ -62,9 +62,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
/* private state keys */
static
DevPrivateKey
subjectKey
=
&
subjectKey
;
static
DevPrivateKey
objectKey
=
&
objectKey
;
static
DevPrivateKey
dataKey
=
&
dataKey
;
static
int
subjectKeyIndex
;
static
DevPrivateKey
subjectKey
=
&
subjectKeyIndex
;
static
int
objectKeyIndex
;
static
DevPrivateKey
objectKey
=
&
objectKeyIndex
;
static
int
dataKeyIndex
;
static
DevPrivateKey
dataKey
=
&
dataKeyIndex
;
/* subject state (clients and devices only) */
typedef
struct
{
...
...
Xext/xvmain.c
View file @
ebea78cd
...
...
@@ -105,7 +105,8 @@ SOFTWARE.
#endif
#include "xvdisp.h"
static
DevPrivateKey
XvScreenKey
=
&
XvScreenKey
;
static
int
XvScreenKeyIndex
;
static
DevPrivateKey
XvScreenKey
=
&
XvScreenKeyIndex
;
unsigned
long
XvExtensionGeneration
=
0
;
unsigned
long
XvScreenGeneration
=
0
;
unsigned
long
XvResourceGeneration
=
0
;
...
...
Xext/xvmc.c
View file @
ebea78cd
...
...
@@ -34,7 +34,8 @@
#define DR_CLIENT_DRIVER_NAME_SIZE 48
#define DR_BUSID_SIZE 48
static
DevPrivateKey
XvMCScreenKey
=
NULL
;
static
int
XvMCScreenKeyIndex
;
static
DevPrivateKey
XvMCScreenKey
;
unsigned
long
XvMCGeneration
=
0
;
...
...
@@ -709,7 +710,7 @@ XvMCScreenInit(ScreenPtr pScreen, int num, XvMCAdaptorPtr pAdapt)
{
XvMCScreenPtr
pScreenPriv
;
XvMCScreenKey
=
&
XvMCScreenKey
;
XvMCScreenKey
=
&
XvMCScreenKey
Index
;
if
(
!
(
pScreenPriv
=
(
XvMCScreenPtr
)
xalloc
(
sizeof
(
XvMCScreenRec
))))
return
BadAlloc
;
...
...
Xi/extinit.c
View file @
ebea78cd
...
...
@@ -352,7 +352,8 @@ Mask PropagateMask[MAX_DEVICES];
*
*/
DevPrivateKey
XIClientPrivateKey
=
&
XIClientPrivateKey
;
static
int
XIClientPrivateKeyIndex
;
DevPrivateKey
XIClientPrivateKey
=
&
XIClientPrivateKeyIndex
;
static
XExtensionVersion
thisversion
=
{
XI_Present
,
XI_2_Major
,
...
...
composite/compext.c
View file @
ebea78cd
...
...
@@ -51,7 +51,8 @@
#define SERVER_COMPOSITE_MINOR 4
static
CARD8
CompositeReqCode
;
static
DevPrivateKey
CompositeClientPrivateKey
=
&
CompositeClientPrivateKey
;
static
int
CompositeClientPrivateKeyIndex
;
static
DevPrivateKey
CompositeClientPrivateKey
=
&
CompositeClientPrivateKeyIndex
;
RESTYPE
CompositeClientWindowType
;
RESTYPE
CompositeClientSubwindowsType
;
RESTYPE
CompositeClientOverlayType
;
...
...
composite/compinit.c
View file @
ebea78cd
...
...
@@ -46,9 +46,12 @@
#include "compint.h"
DevPrivateKey
CompScreenPrivateKey
=
&
CompScreenPrivateKey
;
DevPrivateKey
CompWindowPrivateKey
=
&
CompWindowPrivateKey
;
DevPrivateKey
CompSubwindowsPrivateKey
=
&
CompSubwindowsPrivateKey
;
static
int
CompScreenPrivateKeyIndex
;
DevPrivateKey
CompScreenPrivateKey
=
&
CompScreenPrivateKeyIndex
;
static
int
CompWindowPrivateKeyIndex
;
DevPrivateKey
CompWindowPrivateKey
=
&
CompWindowPrivateKeyIndex
;
static
int
CompSubwindowsPrivateKeyIndex
;
DevPrivateKey
CompSubwindowsPrivateKey
=
&
CompSubwindowsPrivateKeyIndex
;
static
Bool
...
...
damageext/damageext.c
View file @
ebea78cd
...
...
@@ -29,10 +29,12 @@
static
unsigned
char
DamageReqCode
;
static
int
DamageEventBase
;
static
int
DamageErrorBase
;
static
DevPrivateKey
DamageClientPrivateKey
=
&
DamageClientPrivateKey
;
static
RESTYPE
DamageExtType
;
static
RESTYPE
DamageExtWinType
;
static
int
DamageClientPrivateKeyIndex
;
static
DevPrivateKey
DamageClientPrivateKey
=
&
DamageClientPrivateKeyIndex
;
/* Version of the damage extension supported by the server, as opposed to the
* DAMAGE_* defines from damageproto for what version the proto header
* supports.
...
...
dbe/dbe.c
View file @
ebea78cd
...
...
@@ -62,8 +62,10 @@
static
Bool
(
*
DbeInitFunct
[
MAXSCREENS
])();
/* pScreen, pDbeScreenPriv */
/* These are static globals copied to DBE's screen private for use by DDX */
static
DevPrivateKey
dbeScreenPrivKey
=
&
dbeScreenPrivKey
;
static
DevPrivateKey
dbeWindowPrivKey
=
&
dbeWindowPrivKey
;
static
int
dbeScreenPrivKeyIndex
;
static
DevPrivateKey
dbeScreenPrivKey
=
&
dbeScreenPrivKeyIndex
;
static
int
dbeWindowPrivKeyIndex
;
static
DevPrivateKey
dbeWindowPrivKey
=
&
dbeWindowPrivKeyIndex
;
/* These are static globals copied to DBE's screen private for use by DDX */
static
RESTYPE
dbeDrawableResType
;
...
...
dbe/midbe.c
View file @
ebea78cd
...
...
@@ -60,11 +60,14 @@
#include <stdio.h>
static
DevPrivateKey
miDbeWindowPrivPrivKey
=
&
miDbeWindowPrivPrivKey
;
static
int
miDbeWindowPrivPrivKeyIndex
;
static
DevPrivateKey
miDbeWindowPrivPrivKey
=
&
miDbeWindowPrivPrivKeyIndex
;
static
RESTYPE
dbeDrawableResType
;
static
RESTYPE
dbeWindowPrivResType
;
static
DevPrivateKey
dbeScreenPrivKey
=
&
dbeScreenPrivKey
;
static
DevPrivateKey
dbeWindowPrivKey
=
&
dbeWindowPrivKey
;
static
int
dbeScreenPrivKeyIndex
;
static
DevPrivateKey
dbeScreenPrivKey
=
&
dbeScreenPrivKeyIndex
;
static
int
dbeWindowPrivKeyIndex
;
static
DevPrivateKey
dbeWindowPrivKey
=
&
dbeWindowPrivKeyIndex
;
/******************************************************************************
...
...
dix/devices.c
View file @
ebea78cd
...
...
@@ -91,9 +91,11 @@ SOFTWARE.
* This file handles input device-related stuff.
*/
DevPrivateKey
CoreDevicePrivateKey
=
&
CoreDevicePrivateKey
;
static
int
CoreDevicePrivateKeyIndex
;
DevPrivateKey
CoreDevicePrivateKey
=
&
CoreDevicePrivateKeyIndex
;
/* Used to sture classes currently not in use by an MD */
DevPrivateKey
UnusedClassesPrivateKey
=
&
UnusedClassesPrivateKey
;
static
int
UnusedClassesPrivateKeyIndex
;
DevPrivateKey
UnusedClassesPrivateKey
=
&
UnusedClassesPrivateKeyIndex
;
/**
...
...
dix/events.c
View file @
ebea78cd
...
...
@@ -1504,7 +1504,8 @@ CheckGrabForSyncs(DeviceIntPtr thisDev, Bool thisMode, Bool otherMode)
}
/* Only ever used if a grab is called on an attached slave device. */
static
DevPrivateKey
GrabPrivateKey
=
&
GrabPrivateKey
;
static
int
GrabPrivateKeyIndex
;
static
DevPrivateKey
GrabPrivateKey
=
&
GrabPrivateKeyIndex
;
typedef
struct
_GrabMemoryRec
{
DeviceIntPtr
oldmaster
;
}
GrabMemoryRec
,
*
GrabMemoryPtr
;
...
...
dix/window.c
View file @
ebea78cd
...
...
@@ -154,7 +154,8 @@ _X_EXPORT int screenIsSaved = SCREEN_SAVER_OFF;
_X_EXPORT
ScreenSaverStuffRec
savedScreenInfo
[
MAXSCREENS
];
_X_EXPORT
DevPrivateKey
FocusPrivatesKey
=
&
FocusPrivatesKey
;
static
int
FocusPrivatesKeyIndex
;
_X_EXPORT
DevPrivateKey
FocusPrivatesKey
=
&
FocusPrivatesKeyIndex
;
static
Bool
TileScreenSaver
(
int
i
,
int
kind
);
...
...
exa/exa.c
View file @
ebea78cd
...
...
@@ -38,8 +38,10 @@
#include "exa.h"
#include "cw.h"
DevPrivateKey
exaScreenPrivateKey
=
&
exaScreenPrivateKey
;
DevPrivateKey
exaPixmapPrivateKey
=
&
exaPixmapPrivateKey
;
static
int
exaScreenPrivateKeyIndex
;
DevPrivateKey
exaScreenPrivateKey
=
&
exaScreenPrivateKeyIndex
;
static
int
exaPixmapPrivateKeyIndex
;
DevPrivateKey
exaPixmapPrivateKey
=
&
exaPixmapPrivateKeyIndex
;
static
_X_INLINE
void
*
ExaGetPixmapAddress
(
PixmapPtr
p
)
...
...
fb/fballpriv.c
View file @
ebea78cd
...
...
@@ -27,18 +27,23 @@
#include "fb.h"
#ifdef FB_SCREEN_PRIVATE
static
DevPrivateKey
fbScreenPrivateKey
=
&
fbScreenPrivateKey
;
static
int
fbScreenPrivateKeyIndex
;
static
DevPrivateKey
fbScreenPrivateKey
=
&
fbScreenPrivateKeyIndex
;
DevPrivateKey
fbGetScreenPrivateKey
(
void
)
{
return
fbScreenPrivateKey
;
}
#endif
static
DevPrivateKey
fbGCPrivateKey
=
&
fbGCPrivateKey
;
static
int
fbGCPrivateKeyIndex
;
static
DevPrivateKey
fbGCPrivateKey
=
&
fbGCPrivateKeyIndex
;
DevPrivateKey
fbGetGCPrivateKey
(
void
)
{
return
fbGCPrivateKey
;
}
static
DevPrivateKey
fbWinPrivateKey
=
&
fbWinPrivateKey
;
static
int
fbWinPrivateKeyIndex
;
static
DevPrivateKey
fbWinPrivateKey
=
&
fbWinPrivateKeyIndex
;
DevPrivateKey
fbGetWinPrivateKey
(
void
)
{
return
fbWinPrivateKey
;
...
...
fb/fboverlay.c
View file @
ebea78cd
...
...
@@ -33,7 +33,8 @@
#include "fboverlay.h"
#include "shmint.h"
static
DevPrivateKey
fbOverlayScreenPrivateKey
=
&
fbOverlayScreenPrivateKey
;
static
int
fbOverlayScreenPrivateKeyIndex
;
static
DevPrivateKey
fbOverlayScreenPrivateKey
=
&
fbOverlayScreenPrivateKeyIndex
;
DevPrivateKey
fbOverlayGetScreenPrivateKey
(
void
)
{
...
...
glx/glxext.c
View file @
ebea78cd
...
...
@@ -54,7 +54,8 @@ RESTYPE __glXSwapBarrierRes;
*/
xGLXSingleReply
__glXReply
;
static
DevPrivateKey
glxClientPrivateKey
=
&
glxClientPrivateKey
;
static
int
glxClientPrivateKeyIndex
;
static
DevPrivateKey
glxClientPrivateKey
=
&
glxClientPrivateKeyIndex
;
/*
** Client that called into GLX dispatch.
...
...
glx/glxscreens.c
View file @
ebea78cd
...
...
@@ -48,7 +48,8 @@
#include "glxutil.h"
#include "glxext.h"
static
DevPrivateKey
glxScreenPrivateKey
=
&
glxScreenPrivateKey
;
static
int
glxScreenPrivateKeyIndex
;
static
DevPrivateKey
glxScreenPrivateKey
=
&
glxScreenPrivateKeyIndex
;
const
char
GLServerVersion
[]
=
"1.4"
;
static
const
char
GLServerExtensions
[]
=
...
...
hw/dmx/dmxscrinit.c
View file @
ebea78cd
...
...
@@ -67,15 +67,22 @@ static Bool dmxSaveScreen(ScreenPtr pScreen, int what);
static
unsigned
long
dmxGeneration
;
static
unsigned
long
*
dmxCursorGeneration
;
static
int
dmxGCPrivateKeyIndex
;
DevPrivateKey
dmxGCPrivateKey
=
&
dmxGCPrivateKey
;
/**< Private index for GCs */
DevPrivateKey
dmxWinPrivateKey
=
&
dmxWinPrivateKey
;
/**< Private index for Windows */
DevPrivateKey
dmxPixPrivateKey
=
&
dmxPixPrivateKey
;
/**< Private index for Pixmaps */
static
int
dmxWinPrivateKeyIndex
;
DevPrivateKey
dmxWinPrivateKey
=
&
dmxWinPrivateKeyIndex
;
/**< Private index for Windows */
static
int
dmxPixPrivateKeyIndex
;
DevPrivateKey
dmxPixPrivateKey
=
&
dmxPixPrivateKeyIndex
;
/**< Private index for Pixmaps */
int
dmxFontPrivateIndex
;
/**< Private index for Fonts */
DevPrivateKey
dmxScreenPrivateKey
=
&
dmxScreenPrivateKey
;
/**< Private index for Screens */
DevPrivateKey
dmxColormapPrivateKey
=
&
dmxColormapPrivateKey
;
/**< Private index for Colormaps */
static
int
dmxScreenPrivateKeyIndex
;
DevPrivateKey
dmxScreenPrivateKey
=
&
dmxScreenPrivateKeyIndex
;
/**< Private index for Screens */
static
int
dmxColormapPrivateKeyIndex
;
DevPrivateKey
dmxColormapPrivateKey
=
&
dmxColormapPrivateKeyIndex
;
/**< Private index for Colormaps */
#ifdef RENDER
DevPrivateKey
dmxPictPrivateKey
=
&
dmxPictPrivateKey
;
/**< Private index for Picts */
DevPrivateKey
dmxGlyphSetPrivateKey
=
&
dmxGlyphSetPrivateKey
;
/**< Private index for GlyphSets */
static
int
dmxPictPrivateKeyIndex
;
DevPrivateKey
dmxPictPrivateKey
=
&
dmxPictPrivateKeyIndex
;
/**< Private index for Picts */
static
int
dmxGlyphSetPrivateKeyIndex
;
DevPrivateKey
dmxGlyphSetPrivateKey
=
&
dmxGlyphSetPrivateKeyIndex
;
/**< Private index for GlyphSets */
#endif
/** Initialize the parts of screen \a idx that require access to the
...
...
hw/kdrive/ephyr/ephyrdriext.c
View file @
ebea78cd
...
...
@@ -111,8 +111,10 @@ static Bool findWindowPairFromLocal (WindowPtr a_local,
static
unsigned
char
DRIReqCode
=
0
;
static
DevPrivateKey
ephyrDRIWindowKey
=
&
ephyrDRIWindowKey
;
static
DevPrivateKey
ephyrDRIScreenKey
=
&
ephyrDRIScreenKey
;
static
int
ephyrDRIWindowKeyIndex
;
static
DevPrivateKey
ephyrDRIWindowKey
=
&
ephyrDRIWindowKeyIndex
;
static
int
ephyrDRIScreenKeyIndex
;
static
DevPrivateKey
ephyrDRIScreenKey
=
&
ephyrDRIScreenKeyIndex
;
#define GET_EPHYR_DRI_WINDOW_PRIV(win) ((EphyrDRIWindowPrivPtr) \
dixLookupPrivate(&(win)->devPrivates, ephyrDRIWindowKey))
...
...
hw/kdrive/src/kdrive.c
View file @
ebea78cd
...
...
@@ -67,7 +67,8 @@ KdDepths kdDepths[] = {
#define KD_DEFAULT_BUTTONS 5
DevPrivateKey
kdScreenPrivateKey
=
&
kdScreenPrivateKey
;
static
int
kdScreenPrivateKeyIndex
;
DevPrivateKey
kdScreenPrivateKey
=
&
kdScreenPrivateKeyIndex
;
unsigned
long
kdGeneration
;
Bool
kdVideoTest
;
...
...
hw/kdrive/src/kxv.c
View file @
ebea78cd
...
...
@@ -103,9 +103,10 @@ static void KdXVClipNotify(WindowPtr pWin, int dx, int dy);
/* misc */
static
Bool
KdXVInitAdaptors
(
ScreenPtr
,
KdVideoAdaptorPtr
*
,
int
);
DevPrivateKey
KdXVWindowKey
=
&
KdXVWindowKey
;
DevPrivateKey
KdXvScreenKey
=
&
KdXvScreenKey
;
static
int
KdXVWindowKeyIndex
;
DevPrivateKey
KdXVWindowKey
=
&
KdXVWindowKeyIndex
;
static
int
KdXvScreenKeyIndex
;
DevPrivateKey
KdXvScreenKey
=
&
KdXvScreenKeyIndex
;
static
unsigned
long
KdXVGeneration
=
0
;
static
unsigned
long
PortResource
=
0
;
...
...
hw/xfree86/common/xf86DGA.c
View file @
ebea78cd
...
...
@@ -50,7 +50,8 @@
#include "mi.h"
static
DevPrivateKey
DGAScreenKey
=
NULL
;
static
int
DGAScreenKeyIndex
;
static
DevPrivateKey
DGAScreenKey
;
static
int
mieq_installed
=
0
;
static
Bool
DGACloseScreen
(
int
i
,
ScreenPtr
pScreen
);
...
...
@@ -116,7 +117,7 @@ DGAInit(
if
(
!
modes
||
num
<=
0
)
return
FALSE
;
DGAScreenKey
=
&
DGAScreenKey
;
DGAScreenKey
=
&
DGAScreenKey
Index
;
if
(
!
(
pScreenPriv
=
(
DGAScreenPtr
)
xalloc
(
sizeof
(
DGAScreenRec
))))
return
FALSE
;
...
...
hw/xfree86/common/xf86DPMS.c
View file @
ebea78cd
...
...
@@ -47,7 +47,8 @@
#ifdef DPMSExtension
static
DevPrivateKey
DPMSKey
=
NULL
;
static
int
DPMSKeyIndex
;
static
DevPrivateKey
DPMSKey
;
static
Bool
DPMSClose
(
int
i
,
ScreenPtr
pScreen
);
static
int
DPMSCount
=
0
;
#endif
...
...
@@ -62,7 +63,7 @@ xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags)
pointer
DPMSOpt
;
MessageType
enabled_from
=
X_INFO
;
DPMSKey
=
&
DPMSKey
;
DPMSKey
=
&
DPMSKey
Index
;
if
(
DPMSDisabledSwitch
)
DPMSEnabled
=
FALSE
;
...
...
hw/xfree86/common/xf86Globals.c
View file @
ebea78cd
...
...
@@ -47,10 +47,13 @@
/* Globals that video drivers may access */
/* Index into pScreen.devPrivates */
DevPrivateKey
xf86CreateRootWindowKey
=
&
xf86CreateRootWindowKey
;
static
int
xf86CreateRootWindowKeyIndex
;
DevPrivateKey
xf86CreateRootWindowKey
=
&
xf86CreateRootWindowKeyIndex
;
/* Index of ScrnInfo in pScreen.devPrivates */
_X_EXPORT
DevPrivateKey
xf86ScreenKey
=
&
xf86ScreenKey
;
_X_EXPORT
DevPrivateKey
xf86PixmapKey
=
&
xf86PixmapKey
;
static
int
xf86ScreenKeyIndex
;
_X_EXPORT
DevPrivateKey
xf86ScreenKey
=
&
xf86ScreenKeyIndex
;
static
int
xf86PixmapKeyIndex
;
_X_EXPORT
DevPrivateKey
xf86PixmapKey
=
&
xf86PixmapKeyIndex
;
_X_EXPORT
ScrnInfoPtr
*
xf86Screens
=
NULL
;
/* List of ScrnInfos */
_X_EXPORT
const
unsigned
char
byte_reversed
[
256
]
=
{
...
...
hw/xfree86/common/xf86RAC.c
View file @
ebea78cd
...
...
@@ -256,8 +256,10 @@ static miPointerSpriteFuncRec RACSpriteFuncs = {
RACSpriteMoveCursor
};
static
DevPrivateKey
RACScreenKey
=
&
RACScreenKey
;
static
DevPrivateKey
RACGCKey
=
&
RACGCKey
;
static
int
RACScreenKeyIndex
;
static
DevPrivateKey
RACScreenKey
=
&
RACScreenKeyIndex
;
static
int
RACGCKeyIndex
;
static
DevPrivateKey
RACGCKey
=
&
RACGCKeyIndex
;
Bool
...
...
hw/xfree86/common/xf86RandR.c
View file @
ebea78cd
...
...
@@ -46,7 +46,8 @@ typedef struct _xf86RandRInfo {
Rotation
rotation
;
}
XF86RandRInfoRec
,
*
XF86RandRInfoPtr
;
static
DevPrivateKey
xf86RandRKey
=
NULL
;
static
int
xf86RandRKeyIndex
;
static
DevPrivateKey
xf86RandRKey
;
#define XF86RANDRINFO(p) ((XF86RandRInfoPtr)dixLookupPrivate(&(p)->devPrivates, xf86RandRKey))
...
...
@@ -423,7 +424,7 @@ xf86RandRInit (ScreenPtr pScreen)
return
TRUE
;
#endif
xf86RandRKey
=
&
xf86RandRKey
;
xf86RandRKey
=
&
xf86RandRKey
Index
;
randrp
=
xalloc
(
sizeof
(
XF86RandRInfoRec
));
if
(
!
randrp
)
...
...
hw/xfree86/common/xf86VidMode.c
View file @
ebea78cd
...
...
@@ -47,7 +47,8 @@
#include "vidmodeproc.h"
#include "xf86cmap.h"
static
DevPrivateKey
VidModeKey
=
NULL
;
static
int
VidModeKeyIndex
;
static
DevPrivateKey
VidModeKey
;
static
int
VidModeCount
=
0
;
static
Bool
VidModeClose
(
int
i
,
ScreenPtr
pScreen
);
...
...
@@ -72,7 +73,7 @@ VidModeExtensionInit(ScreenPtr pScreen)
return
FALSE
;
}
VidModeKey
=
&
VidModeKey
;
VidModeKey
=
&
VidModeKey
Index
;
if
(
!
dixSetPrivate
(
&
pScreen
->
devPrivates
,
VidModeKey
,
xcalloc
(
sizeof
(
VidModeRec
),
1
)))
{
...
...
hw/xfree86/common/xf86cmap.c
View file @
ebea78cd
...
...
@@ -101,8 +101,10 @@ typedef struct {
int
overscan
;
}
CMapColormapRec
,
*
CMapColormapPtr
;
static
DevPrivateKey
CMapScreenKey
=
NULL
;
static
DevPrivateKey
CMapColormapKey
=
&
CMapColormapKey
;
static
int
CMapScreenKeyIndex
;
static
DevPrivateKey
CMapScreenKey
;
static
int
CMapColormapKeyIndex
;
static
DevPrivateKey
CMapColormapKey
=
&
CMapColormapKeyIndex
;
static
void
CMapInstallColormap
(
ColormapPtr
);
static
void
CMapStoreColors
(
ColormapPtr
,
int
,
xColorItem
*
);
...
...
@@ -142,7 +144,7 @@ _X_EXPORT Bool xf86HandleColormaps(
if
(
!
maxColors
||
!
sigRGBbits
||
!
loadPalette
)
return
FALSE
;
CMapScreenKey
=
&
CMapScreenKey
;
CMapScreenKey
=
&
CMapScreenKey
Index
;
elements
=
1
<<
sigRGBbits
;
...
...
hw/xfree86/common/xf86fbman.c
View file @
ebea78cd
...
...
@@ -42,14 +42,15 @@
#define DEBUG
*/
static
DevPrivateKey
xf86FBManagerKey
=
NULL
;
static
int
xf86FBManagerKeyIndex
;
static
DevPrivateKey
xf86FBManagerKey
;
_X_EXPORT
Bool
xf86RegisterOffscreenManager
(
ScreenPtr
pScreen
,
FBManagerFuncsPtr
funcs
){
xf86FBManagerKey
=
&
xf86FBManagerKey
;
xf86FBManagerKey
=
&
xf86FBManagerKey
Index
;
dixSetPrivate
(
&
pScreen
->
devPrivates
,
xf86FBManagerKey
,
funcs
);
return
TRUE
;
...
...
@@ -269,7 +270,8 @@ xf86PurgeUnlockedOffscreenAreas(ScreenPtr pScreen)
\************************************************************/
static
DevPrivateKey
xf86FBScreenKey
=
&
xf86FBScreenKey
;
static
int
xf86FBScreenKeyIndex
;
static
DevPrivateKey
xf86FBScreenKey
=
&
xf86FBScreenKeyIndex
;
typedef
struct
_FBLink
{
FBArea
area
;
...
...
hw/xfree86/common/xf86sbusBus.c
View file @
ebea78cd
...
...
@@ -602,7 +602,8 @@ xf86SbusUseBuiltinMode(ScrnInfoPtr pScrn, sbusDevicePtr psdp)
pScrn
->
virtualY
=
psdp
->
height
;
}
static
DevPrivateKey
sbusPaletteKey
=
&
sbusPaletteKey
;
static
sbusPaletteKeyIndex
;
static
DevPrivateKey
sbusPaletteKey
=
&
sbusPaletteKeyIndex
;
typedef
struct
_sbusCmap
{
sbusDevicePtr
psdp
;
CloseScreenProcPtr
CloseScreen
;
...
...
hw/xfree86/common/xf86xv.c
View file @
ebea78cd
...
...
@@ -110,8 +110,10 @@ static void xf86XVAdjustFrame(int index, int x, int y, int flags);
static
Bool
xf86XVInitAdaptors
(
ScreenPtr
,
XF86VideoAdaptorPtr
*
,
int
);
static
DevPrivateKey
XF86XVWindowKey
=
&
XF86XVWindowKey
;
DevPrivateKey
XF86XvScreenKey
;
static
int
XF86XVWindowKeyIndex
;
static
DevPrivateKey
XF86XVWindowKey
=
&
XF86XVWindowKeyIndex
;
static
int
XF86XvScreenKeyIndex
;
DevPrivateKey
XF86XvScreenKey
=
&
XF86XvScreenKeyIndex
;
static
unsigned
long
PortResource
=
0
;
DevPrivateKey
(
*
XvGetScreenKeyProc
)(
void
)
=
NULL
;
...
...
hw/xfree86/common/xf86xvmc.c
View file @
ebea78cd
...
...
@@ -56,7 +56,8 @@ typedef struct {
XvMCAdaptorPtr
dixinfo
;
}
xf86XvMCScreenRec
,
*
xf86XvMCScreenPtr
;
static
DevPrivateKey
XF86XvMCScreenKey
=
&
XF86XvMCScreenKey
;
static
int
XF86XvMCScreenKeyIndex
;
static
DevPrivateKey
XF86XvMCScreenKey
=
&
XF86XvMCScreenKeyIndex
;
#define XF86XVMC_GET_PRIVATE(pScreen) (xf86XvMCScreenPtr) \
dixLookupPrivate(&(pScreen)->devPrivates, XF86XvMCScreenKey)
...
...
hw/xfree86/dixmods/extmod/xf86dga2.c
View file @
ebea78cd
...
...
@@ -62,7 +62,8 @@ unsigned char DGAReqCode = 0;
int
DGAErrorBase
;
int
DGAEventBase
;
static
DevPrivateKey
DGAClientPrivateKey
=
&
DGAClientPrivateKey
;
static
int
DGAClientPrivateKeyIndex
;
static
DevPrivateKey
DGAClientPrivateKey
=
&
DGAClientPrivateKeyIndex
;
static
int
DGACallbackRefCount
=
0
;