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:
Tomas Carnecky 2008-08-28 18:05:40 -04:00 • committed by Eamon Walsh
commit ebea78cdba
78 changed files with 287 additions and 146 deletions

View file

@ -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;
/**

View file

@ -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;

View file

@ -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);