diff options
Diffstat (limited to 'xorg-server/dix/privates.c')
| -rw-r--r-- | xorg-server/dix/privates.c | 120 |
1 files changed, 71 insertions, 49 deletions
diff --git a/xorg-server/dix/privates.c b/xorg-server/dix/privates.c index e03b2255b..ffa07fede 100644 --- a/xorg-server/dix/privates.c +++ b/xorg-server/dix/privates.c @@ -67,65 +67,74 @@ from The Open Group. static DevPrivateSetRec global_keys[PRIVATE_LAST]; static const Bool xselinux_private[PRIVATE_LAST] = { - [PRIVATE_SCREEN] = TRUE, - [PRIVATE_CLIENT] = TRUE, - [PRIVATE_WINDOW] = TRUE, - [PRIVATE_PIXMAP] = TRUE, - [PRIVATE_GC] = TRUE, - [PRIVATE_CURSOR] = TRUE, - [PRIVATE_COLORMAP] = TRUE, - [PRIVATE_DEVICE] = TRUE, - [PRIVATE_EXTENSION] = TRUE, - [PRIVATE_SELECTION] = TRUE, - [PRIVATE_PROPERTY] = TRUE, - [PRIVATE_PICTURE] = TRUE, - [PRIVATE_GLYPHSET] = TRUE, + /* PRIVATE_XSELINUX,*/ FALSE, + /* PRIVATE_SCREEN,*/ TRUE, + /* [PRIVATE_EXTENSION] =*/TRUE, + /* [PRIVATE_COLORMAP] =*/ TRUE, + /* [PRIVATE_DEVICE] =*/ TRUE, + /* [PRIVATE_CLIENT] = */ TRUE, + /* [PRIVATE_PROPERTY] =*/ TRUE, + /* [PRIVATE_SELECTION] =*/TRUE, + /* [PRIVATE_WINDOW] =*/ TRUE, + /* [PRIVATE_PIXMAP] =*/ TRUE, + /* [PRIVATE_GC] =*/ TRUE, + /* [PRIVATE_CURSOR] =*/ TRUE, + /* PRIVATE_CURSOR_BITS,*/ FALSE, + /* PRIVATE_DAMAGE,*/ FALSE, + /* PRIVATE_GLYPH,*/ FALSE, + /* [PRIVATE_GLYPHSET] =*/ TRUE, + /* [PRIVATE_PICTURE] =*/ TRUE }; static const char *key_names[PRIVATE_LAST] = { /* XSELinux uses the same private keys for numerous objects */ - [PRIVATE_XSELINUX] = "XSELINUX", + /*[PRIVATE_XSELINUX] =*/ "XSELINUX", /* Otherwise, you get a private in just the requested structure */ /* These can have objects created before all of the keys are registered */ - [PRIVATE_SCREEN] = "SCREEN", - [PRIVATE_EXTENSION] = "EXTENSION", - [PRIVATE_COLORMAP] = "COLORMAP", - [PRIVATE_DEVICE] = "DEVICE", + /*[PRIVATE_SCREEN] =*/ "SCREEN", + /*[PRIVATE_EXTENSION] =*/ "EXTENSION", + /*[PRIVATE_COLORMAP] =*/ "COLORMAP", + /*[PRIVATE_DEVICE] =*/ "DEVICE", /* These cannot have any objects before all relevant keys are registered */ - [PRIVATE_CLIENT] = "CLIENT", - [PRIVATE_PROPERTY] = "PROPERTY", - [PRIVATE_SELECTION] = "SELECTION", - [PRIVATE_WINDOW] = "WINDOW", - [PRIVATE_PIXMAP] = "PIXMAP", - [PRIVATE_GC] = "GC", - [PRIVATE_CURSOR] = "CURSOR", - [PRIVATE_CURSOR_BITS] = "CURSOR_BITS", + /*[PRIVATE_CLIENT] =*/ "CLIENT", + /*[PRIVATE_PROPERTY] =*/ "PROPERTY", + /*[PRIVATE_SELECTION] =*/ "SELECTION", + /*[PRIVATE_WINDOW] =*/ "WINDOW", + /*[PRIVATE_PIXMAP] =*/ "PIXMAP", + /*[PRIVATE_GC] =*/ "GC", + /*[PRIVATE_CURSOR] =*/ "CURSOR", + /*[PRIVATE_CURSOR_BITS] =*/ "CURSOR_BITS", /* extension privates */ - [PRIVATE_DAMAGE] = "DAMAGE", - [PRIVATE_GLYPH] = "GLYPH", - [PRIVATE_GLYPHSET] = "GLYPHSET", - [PRIVATE_PICTURE] = "PICTURE", - [PRIVATE_SYNC_FENCE] = "SYNC_FENCE", + /*[PRIVATE_DAMAGE] =*/ "DAMAGE", + /*[PRIVATE_GLYPH] =*/ "GLYPH", + /*[PRIVATE_GLYPHSET] =*/ "GLYPHSET", + /*[PRIVATE_PICTURE] =*/ "PICTURE", + /*[PRIVATE_SYNC_FENCE] =*/ "SYNC_FENCE", }; static const Bool screen_specific_private[PRIVATE_LAST] = { - [PRIVATE_SCREEN] = FALSE, - [PRIVATE_CLIENT] = FALSE, - [PRIVATE_WINDOW] = TRUE, - [PRIVATE_PIXMAP] = TRUE, - [PRIVATE_GC] = TRUE, - [PRIVATE_CURSOR] = FALSE, - [PRIVATE_COLORMAP] = FALSE, - [PRIVATE_DEVICE] = FALSE, - [PRIVATE_EXTENSION] = FALSE, - [PRIVATE_SELECTION] = FALSE, - [PRIVATE_PROPERTY] = FALSE, - [PRIVATE_PICTURE] = TRUE, - [PRIVATE_GLYPHSET] = FALSE, + /*[PRIVATE_XSELINUX] =*/ FALSE, + /*[PRIVATE_SCREEN] =*/ FALSE, + /*[PRIVATE_EXTENSION] =*/ FALSE, + /*[PRIVATE_COLORMAP] =*/ FALSE, + /*[PRIVATE_DEVICE] =*/ FALSE, + /*[PRIVATE_CLIENT] =*/ FALSE, + /*[PRIVATE_PROPERTY] =*/ FALSE, + /*[PRIVATE_SELECTION] =*/ FALSE, + /*[PRIVATE_WINDOW] =*/ TRUE, + /*[PRIVATE_PIXMAP] =*/ TRUE, + /*[PRIVATE_GC] =*/ TRUE, + /*[PRIVATE_CURSOR] =*/ FALSE, + /*[PRIVATE_CURSOR_BITS] =*/ FALSE, + /*[PRIVATE_DAMAGE] =*/ FALSE, + /*[PRIVATE_GLYPH] =*/ FALSE, + /*[PRIVATE_GLYPHSET] =*/ FALSE, + /*[PRIVATE_PICTURE] =*/ TRUE, + /*[PRIVATE_SYNC_FENCE] =*/ FALSE }; typedef Bool (*FixupFunc) (PrivatePtr *privates, int offset, unsigned bytes); @@ -288,11 +297,24 @@ fixupDevices(FixupFunc fixup, unsigned bytes) } static Bool (*const allocated_early[PRIVATE_LAST]) (FixupFunc, unsigned) = { - [PRIVATE_SCREEN] = fixupScreens, - [PRIVATE_CLIENT] = fixupServerClient, - [PRIVATE_EXTENSION] = fixupExtensions, - [PRIVATE_COLORMAP] = fixupDefaultColormaps, - [PRIVATE_DEVICE] = fixupDevices, + /*PRIVATE_XSELINUX,*/ NULL, + /*PRIVATE_SCREEN =*/ fixupScreens, + /*PRIVATE_EXTENSION =*/ fixupExtensions, + /*PRIVATE_COLORMAP =*/ fixupDefaultColormaps, + /*PRIVATE_DEVICE,*/ fixupDevices, + /*PRIVATE_CLIENT =*/ fixupServerClient, + /*PRIVATE_PROPERTY,*/ NULL, + /*PRIVATE_SELECTION,*/ NULL, + /*PRIVATE_WINDOW,*/ NULL, + /*PRIVATE_PIXMAP,*/ NULL, + /*PRIVATE_GC,*/ NULL, + /*PRIVATE_CURSOR,*/ NULL, + /*PRIVATE_CURSOR_BITS,*/ NULL, + /*PRIVATE_DAMAGE,*/ NULL, + /*PRIVATE_GLYPH,*/ NULL, + /*PRIVATE_GLYPHSET,*/ NULL, + /*PRIVATE_PICTURE,*/ NULL, + /*PRIVATE_SYNC_FENCE,*/ NULL }; static void |