xserver: Branch 'XACE-SELINUX' - 45 commits
Eamon Walsh
ewalsh at kemper.freedesktop.org
Mon Nov 26 12:56:43 PST 2007
XTrap/xtrapdi.c | 36 -
Xext/EVI.c | 6
Xext/appgroup.c | 38 -
Xext/bigreq.c | 13
Xext/cup.c | 8
Xext/dpms.c | 27
Xext/fontcache.c | 29
Xext/mbuf.c | 35 -
Xext/mitmisc.c | 15
Xext/panoramiX.c | 14
Xext/saver.c | 26
Xext/security.c | 16
Xext/shape.c | 32 -
Xext/shm.c | 23
Xext/sync.c | 40 -
Xext/xcmisc.c | 17
Xext/xevie.c | 15
Xext/xf86bigfont.c | 9
Xext/xprint.c | 64 --
Xext/xres.c | 13
Xext/xselinux.c | 24
Xext/xtest.c | 19
Xext/xvmain.c | 53 -
Xext/xvmc.c | 29
Xi/extinit.c | 115 ---
composite/compext.c | 20
configure.ac | 7
damageext/damageext.c | 21
dbe/dbe.c | 21
dix/Makefile.am | 4
dix/extension.c | 2
dix/protocol.txt | 1054 ++++++++++++++++++++++++++++++++++
dix/registry.c | 323 ++++------
hw/darwin/quartz/applewm.c | 41 -
hw/darwin/quartz/pseudoramiX.c | 14
hw/darwin/quartz/xpr/appledri.c | 29
hw/dmx/dmx.c | 40 -
hw/xfree86/dixmods/extmod/xf86dga2.c | 68 --
hw/xfree86/dixmods/extmod/xf86misc.c | 46 -
hw/xfree86/dixmods/extmod/xf86vmode.c | 67 --
hw/xfree86/dri/xf86dri.c | 38 -
hw/xfree86/loader/dixsym.c | 3
hw/xwin/winwindowswm.c | 31 -
include/dix-config.h.in | 3
include/registry.h | 13
randr/randr.c | 68 --
randr/rrxinerama.c | 26
record/record.c | 20
render/render.c | 90 --
xfixes/xfixes.c | 78 --
xkb/xkb.c | 63 --
51 files changed, 1263 insertions(+), 1643 deletions(-)
New commits:
commit decd5a7c605e42c99b6a4523c8e1833b859d9b24
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Mon Nov 26 15:26:49 2007 -0500
registry: Rebase registry to use the server config file of protocol names.
diff --git a/dix/extension.c b/dix/extension.c
index 0e97976..42fdc12 100644
--- a/dix/extension.c
+++ b/dix/extension.c
@@ -60,6 +60,7 @@ SOFTWARE.
#include "scrnintstr.h"
#include "dispatch.h"
#include "privates.h"
+#include "registry.h"
#include "xace.h"
#define EXTENSION_BASE 128
@@ -143,6 +144,7 @@ AddExtension(char *name, int NumEvents, int NumErrors,
ext->errorLast = 0;
}
+ RegisterExtensionNames(ext);
return(ext);
}
diff --git a/dix/registry.c b/dix/registry.c
index 1cf7fa5..02b42d4 100644
--- a/dix/registry.c
+++ b/dix/registry.c
@@ -23,17 +23,30 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifdef XREGISTRY
+#include <stdlib.h>
+#include <string.h>
#include <X11/X.h>
#include <X11/Xproto.h>
#include "resource.h"
#include "registry.h"
#define BASE_SIZE 16
-#define CORE "X11:"
+#define CORE "X11"
+#define FILENAME SERVER_MISC_CONFIG_PATH "/protocol.txt"
-static const char ***requests, **events, **errors, **resources;
+#define PROT_COMMENT '#'
+#define PROT_REQUEST 'R'
+#define PROT_EVENT 'V'
+#define PROT_ERROR 'E'
+
+static FILE *fh;
+
+static char ***requests, **events, **errors, **resources;
static unsigned nmajor, *nminor, nevent, nerror, nresource;
+/*
+ * File parsing routines
+ */
static int double_size(void *p, unsigned n, unsigned size)
{
char **ptr = (char **)p;
@@ -57,58 +70,131 @@ static int double_size(void *p, unsigned n, unsigned size)
return TRUE;
}
-/*
- * Registration functions
- */
-
-void
-RegisterRequestName(unsigned major, unsigned minor, const char *name)
+static void
+RegisterRequestName(unsigned major, unsigned minor, char *name)
{
while (major >= nmajor) {
- if (!double_size(&requests, nmajor, sizeof(const char **)))
+ if (!double_size(&requests, nmajor, sizeof(char **)))
return;
if (!double_size(&nminor, nmajor, sizeof(unsigned)))
return;
nmajor = nmajor ? nmajor * 2 : BASE_SIZE;
}
while (minor >= nminor[major]) {
- if (!double_size(requests+major, nminor[major], sizeof(const char *)))
+ if (!double_size(requests+major, nminor[major], sizeof(char *)))
return;
nminor[major] = nminor[major] ? nminor[major] * 2 : BASE_SIZE;
}
+ free(requests[major][minor]);
requests[major][minor] = name;
}
-void
-RegisterEventName(unsigned event, const char *name) {
+static void
+RegisterEventName(unsigned event, char *name) {
while (event >= nevent) {
- if (!double_size(&events, nevent, sizeof(const char *)))
+ if (!double_size(&events, nevent, sizeof(char *)))
return;
nevent = nevent ? nevent * 2 : BASE_SIZE;
}
+ free(events[event]);
events[event] = name;
}
-void
-RegisterErrorName(unsigned error, const char *name) {
+static void
+RegisterErrorName(unsigned error, char *name) {
while (error >= nerror) {
- if (!double_size(&errors, nerror, sizeof(const char *)))
+ if (!double_size(&errors, nerror, sizeof(char *)))
return;
nerror = nerror ? nerror * 2 : BASE_SIZE;
}
+ free(errors[error]);
errors[error] = name;
}
void
-RegisterResourceName(RESTYPE resource, const char *name)
+RegisterExtensionNames(ExtensionEntry *extEntry)
+{
+ char buf[256], *lineobj, *ptr;
+ unsigned offset;
+
+ if (fh == NULL)
+ return;
+
+ rewind(fh);
+
+ while (fgets(buf, sizeof(buf), fh)) {
+ ptr = strchr(buf, '\n');
+ if (ptr)
+ *ptr = 0;
+
+ switch (buf[0]) {
+ case PROT_REQUEST:
+ case PROT_EVENT:
+ case PROT_ERROR:
+ break;
+ case PROT_COMMENT:
+ case '\0':
+ continue;
+ default:
+ continue;
+ }
+
+ ptr = strchr(buf, ' ');
+ if (!ptr || ptr != buf + 4) {
+ LogMessage(X_WARNING, "Invalid line in " FILENAME ", skipping\n");
+ continue;
+ }
+ lineobj = strdup(ptr + 1);
+ if (!lineobj)
+ continue;
+
+ ptr = strchr(buf, ':');
+ if (!ptr) {
+ LogMessage(X_WARNING, "Invalid line in " FILENAME ", skipping\n");
+ continue;
+ }
+ *ptr = 0;
+
+ if (strcmp(buf + 5, extEntry->name))
+ continue;
+
+ offset = strtol(buf + 1, &ptr, 10);
+ if (offset == 0 && ptr == buf + 1) {
+ LogMessage(X_WARNING, "Invalid line in " FILENAME ", skipping\n");
+ continue;
+ }
+
+ switch(buf[0]) {
+ case PROT_REQUEST:
+ if (extEntry->base)
+ RegisterRequestName(extEntry->base, offset, lineobj);
+ else
+ RegisterRequestName(offset, 0, lineobj);
+ break;
+ case PROT_EVENT:
+ RegisterEventName(extEntry->eventBase + offset, lineobj);
+ break;
+ case PROT_ERROR:
+ RegisterErrorName(extEntry->errorBase + offset, lineobj);
+ break;
+ }
+ }
+}
+
+/*
+ * Registration functions
+ */
+
+void
+RegisterResourceName(RESTYPE resource, char *name)
{
resource &= TypeMask;
while (resource >= nresource) {
- if (!double_size(&resources, nresource, sizeof(const char *)))
+ if (!double_size(&resources, nresource, sizeof(char *)))
return;
nresource = nresource ? nresource * 2 : BASE_SIZE;
}
@@ -166,13 +252,25 @@ LookupResourceName(RESTYPE resource)
void
dixResetRegistry(void)
{
+ ExtensionEntry extEntry;
+
/* Free all memory */
- while (nmajor)
- xfree(requests[--nmajor]);
+ while (nmajor--) {
+ while (nminor[nmajor])
+ free(requests[nmajor][--nminor[nmajor]]);
+ xfree(requests[nmajor]);
+ }
xfree(requests);
xfree(nminor);
+
+ while (nevent--)
+ free(events[nevent]);
xfree(events);
+
+ while (nerror--)
+ free(errors[nerror]);
xfree(errors);
+
xfree(resources);
requests = NULL;
@@ -183,6 +281,13 @@ dixResetRegistry(void)
nmajor = nevent = nerror = nresource = 0;
+ /* Open the protocol file */
+ if (fh)
+ fclose(fh);
+ fh = fopen(FILENAME, "r");
+ if (!fh)
+ LogMessage(X_WARNING, "Failed to open protocol names file " FILENAME);
+
/* Add built-in resources */
RegisterResourceName(RT_NONE, "NONE");
RegisterResourceName(RT_WINDOW, "WINDOW");
@@ -196,181 +301,9 @@ dixResetRegistry(void)
RegisterResourceName(RT_PASSIVEGRAB, "PASSIVE GRAB");
/* Add the core protocol */
- RegisterRequestName(X_CreateWindow, 0, CORE "CreateWindow");
- RegisterRequestName(X_ChangeWindowAttributes, 0, CORE "ChangeWindowAttributes");
- RegisterRequestName(X_GetWindowAttributes, 0, CORE "GetWindowAttributes");
- RegisterRequestName(X_DestroyWindow, 0, CORE "DestroyWindow");
- RegisterRequestName(X_DestroySubwindows, 0, CORE "DestroySubwindows");
- RegisterRequestName(X_ChangeSaveSet, 0, CORE "ChangeSaveSet");
- RegisterRequestName(X_ReparentWindow, 0, CORE "ReparentWindow");
- RegisterRequestName(X_MapWindow, 0, CORE "MapWindow");
- RegisterRequestName(X_MapSubwindows, 0, CORE "MapSubwindows");
- RegisterRequestName(X_UnmapWindow, 0, CORE "UnmapWindow");
- RegisterRequestName(X_UnmapSubwindows, 0, CORE "UnmapSubwindows");
- RegisterRequestName(X_ConfigureWindow, 0, CORE "ConfigureWindow");
- RegisterRequestName(X_CirculateWindow, 0, CORE "CirculateWindow");
- RegisterRequestName(X_GetGeometry, 0, CORE "GetGeometry");
- RegisterRequestName(X_QueryTree, 0, CORE "QueryTree");
- RegisterRequestName(X_InternAtom, 0, CORE "InternAtom");
- RegisterRequestName(X_GetAtomName, 0, CORE "GetAtomName");
- RegisterRequestName(X_ChangeProperty, 0, CORE "ChangeProperty");
- RegisterRequestName(X_DeleteProperty, 0, CORE "DeleteProperty");
- RegisterRequestName(X_GetProperty, 0, CORE "GetProperty");
- RegisterRequestName(X_ListProperties, 0, CORE "ListProperties");
- RegisterRequestName(X_SetSelectionOwner, 0, CORE "SetSelectionOwner");
- RegisterRequestName(X_GetSelectionOwner, 0, CORE "GetSelectionOwner");
- RegisterRequestName(X_ConvertSelection, 0, CORE "ConvertSelection");
- RegisterRequestName(X_SendEvent, 0, CORE "SendEvent");
- RegisterRequestName(X_GrabPointer, 0, CORE "GrabPointer");
- RegisterRequestName(X_UngrabPointer, 0, CORE "UngrabPointer");
- RegisterRequestName(X_GrabButton, 0, CORE "GrabButton");
- RegisterRequestName(X_UngrabButton, 0, CORE "UngrabButton");
- RegisterRequestName(X_ChangeActivePointerGrab, 0, CORE "ChangeActivePointerGrab");
- RegisterRequestName(X_GrabKeyboard, 0, CORE "GrabKeyboard");
- RegisterRequestName(X_UngrabKeyboard, 0, CORE "UngrabKeyboard");
- RegisterRequestName(X_GrabKey, 0, CORE "GrabKey");
- RegisterRequestName(X_UngrabKey, 0, CORE "UngrabKey");
- RegisterRequestName(X_AllowEvents, 0, CORE "AllowEvents");
- RegisterRequestName(X_GrabServer, 0, CORE "GrabServer");
- RegisterRequestName(X_UngrabServer, 0, CORE "UngrabServer");
- RegisterRequestName(X_QueryPointer, 0, CORE "QueryPointer");
- RegisterRequestName(X_GetMotionEvents, 0, CORE "GetMotionEvents");
- RegisterRequestName(X_TranslateCoords, 0, CORE "TranslateCoords");
- RegisterRequestName(X_WarpPointer, 0, CORE "WarpPointer");
- RegisterRequestName(X_SetInputFocus, 0, CORE "SetInputFocus");
- RegisterRequestName(X_GetInputFocus, 0, CORE "GetInputFocus");
- RegisterRequestName(X_QueryKeymap, 0, CORE "QueryKeymap");
- RegisterRequestName(X_OpenFont, 0, CORE "OpenFont");
- RegisterRequestName(X_CloseFont, 0, CORE "CloseFont");
- RegisterRequestName(X_QueryFont, 0, CORE "QueryFont");
- RegisterRequestName(X_QueryTextExtents, 0, CORE "QueryTextExtents");
- RegisterRequestName(X_ListFonts, 0, CORE "ListFonts");
- RegisterRequestName(X_ListFontsWithInfo, 0, CORE "ListFontsWithInfo");
- RegisterRequestName(X_SetFontPath, 0, CORE "SetFontPath");
- RegisterRequestName(X_GetFontPath, 0, CORE "GetFontPath");
- RegisterRequestName(X_CreatePixmap, 0, CORE "CreatePixmap");
- RegisterRequestName(X_FreePixmap, 0, CORE "FreePixmap");
- RegisterRequestName(X_CreateGC, 0, CORE "CreateGC");
- RegisterRequestName(X_ChangeGC, 0, CORE "ChangeGC");
- RegisterRequestName(X_CopyGC, 0, CORE "CopyGC");
- RegisterRequestName(X_SetDashes, 0, CORE "SetDashes");
- RegisterRequestName(X_SetClipRectangles, 0, CORE "SetClipRectangles");
- RegisterRequestName(X_FreeGC, 0, CORE "FreeGC");
- RegisterRequestName(X_ClearArea, 0, CORE "ClearArea");
- RegisterRequestName(X_CopyArea, 0, CORE "CopyArea");
- RegisterRequestName(X_CopyPlane, 0, CORE "CopyPlane");
- RegisterRequestName(X_PolyPoint, 0, CORE "PolyPoint");
- RegisterRequestName(X_PolyLine, 0, CORE "PolyLine");
- RegisterRequestName(X_PolySegment, 0, CORE "PolySegment");
- RegisterRequestName(X_PolyRectangle, 0, CORE "PolyRectangle");
- RegisterRequestName(X_PolyArc, 0, CORE "PolyArc");
- RegisterRequestName(X_FillPoly, 0, CORE "FillPoly");
- RegisterRequestName(X_PolyFillRectangle, 0, CORE "PolyFillRectangle");
- RegisterRequestName(X_PolyFillArc, 0, CORE "PolyFillArc");
- RegisterRequestName(X_PutImage, 0, CORE "PutImage");
- RegisterRequestName(X_GetImage, 0, CORE "GetImage");
- RegisterRequestName(X_PolyText8, 0, CORE "PolyText8");
- RegisterRequestName(X_PolyText16, 0, CORE "PolyText16");
- RegisterRequestName(X_ImageText8, 0, CORE "ImageText8");
- RegisterRequestName(X_ImageText16, 0, CORE "ImageText16");
- RegisterRequestName(X_CreateColormap, 0, CORE "CreateColormap");
- RegisterRequestName(X_FreeColormap, 0, CORE "FreeColormap");
- RegisterRequestName(X_CopyColormapAndFree, 0, CORE "CopyColormapAndFree");
- RegisterRequestName(X_InstallColormap, 0, CORE "InstallColormap");
- RegisterRequestName(X_UninstallColormap, 0, CORE "UninstallColormap");
- RegisterRequestName(X_ListInstalledColormaps, 0, CORE "ListInstalledColormaps");
- RegisterRequestName(X_AllocColor, 0, CORE "AllocColor");
- RegisterRequestName(X_AllocNamedColor, 0, CORE "AllocNamedColor");
- RegisterRequestName(X_AllocColorCells, 0, CORE "AllocColorCells");
- RegisterRequestName(X_AllocColorPlanes, 0, CORE "AllocColorPlanes");
- RegisterRequestName(X_FreeColors, 0, CORE "FreeColors");
- RegisterRequestName(X_StoreColors, 0, CORE "StoreColors");
- RegisterRequestName(X_StoreNamedColor, 0, CORE "StoreNamedColor");
- RegisterRequestName(X_QueryColors, 0, CORE "QueryColors");
- RegisterRequestName(X_LookupColor, 0, CORE "LookupColor");
- RegisterRequestName(X_CreateCursor, 0, CORE "CreateCursor");
- RegisterRequestName(X_CreateGlyphCursor, 0, CORE "CreateGlyphCursor");
- RegisterRequestName(X_FreeCursor, 0, CORE "FreeCursor");
- RegisterRequestName(X_RecolorCursor, 0, CORE "RecolorCursor");
- RegisterRequestName(X_QueryBestSize, 0, CORE "QueryBestSize");
- RegisterRequestName(X_QueryExtension, 0, CORE "QueryExtension");
- RegisterRequestName(X_ListExtensions, 0, CORE "ListExtensions");
- RegisterRequestName(X_ChangeKeyboardMapping, 0, CORE "ChangeKeyboardMapping");
- RegisterRequestName(X_GetKeyboardMapping, 0, CORE "GetKeyboardMapping");
- RegisterRequestName(X_ChangeKeyboardControl, 0, CORE "ChangeKeyboardControl");
- RegisterRequestName(X_GetKeyboardControl, 0, CORE "GetKeyboardControl");
- RegisterRequestName(X_Bell, 0, CORE "Bell");
- RegisterRequestName(X_ChangePointerControl, 0, CORE "ChangePointerControl");
- RegisterRequestName(X_GetPointerControl, 0, CORE "GetPointerControl");
- RegisterRequestName(X_SetScreenSaver, 0, CORE "SetScreenSaver");
- RegisterRequestName(X_GetScreenSaver, 0, CORE "GetScreenSaver");
- RegisterRequestName(X_ChangeHosts, 0, CORE "ChangeHosts");
- RegisterRequestName(X_ListHosts, 0, CORE "ListHosts");
- RegisterRequestName(X_SetAccessControl, 0, CORE "SetAccessControl");
- RegisterRequestName(X_SetCloseDownMode, 0, CORE "SetCloseDownMode");
- RegisterRequestName(X_KillClient, 0, CORE "KillClient");
- RegisterRequestName(X_RotateProperties, 0, CORE "RotateProperties");
- RegisterRequestName(X_ForceScreenSaver, 0, CORE "ForceScreenSaver");
- RegisterRequestName(X_SetPointerMapping, 0, CORE "SetPointerMapping");
- RegisterRequestName(X_GetPointerMapping, 0, CORE "GetPointerMapping");
- RegisterRequestName(X_SetModifierMapping, 0, CORE "SetModifierMapping");
- RegisterRequestName(X_GetModifierMapping, 0, CORE "GetModifierMapping");
- RegisterRequestName(X_NoOperation, 0, CORE "NoOperation");
-
- RegisterErrorName(Success, CORE "Success");
- RegisterErrorName(BadRequest, CORE "BadRequest");
- RegisterErrorName(BadValue, CORE "BadValue");
- RegisterErrorName(BadWindow, CORE "BadWindow");
- RegisterErrorName(BadPixmap, CORE "BadPixmap");
- RegisterErrorName(BadAtom, CORE "BadAtom");
- RegisterErrorName(BadCursor, CORE "BadCursor");
- RegisterErrorName(BadFont, CORE "BadFont");
- RegisterErrorName(BadMatch, CORE "BadMatch");
- RegisterErrorName(BadDrawable, CORE "BadDrawable");
- RegisterErrorName(BadAccess, CORE "BadAccess");
- RegisterErrorName(BadAlloc, CORE "BadAlloc");
- RegisterErrorName(BadColor, CORE "BadColor");
- RegisterErrorName(BadGC, CORE "BadGC");
- RegisterErrorName(BadIDChoice, CORE "BadIDChoice");
- RegisterErrorName(BadName, CORE "BadName");
- RegisterErrorName(BadLength, CORE "BadLength");
- RegisterErrorName(BadImplementation, CORE "BadImplementation");
-
- RegisterEventName(X_Error, CORE "Error");
- RegisterEventName(X_Reply, CORE "Reply");
- RegisterEventName(KeyPress, CORE "KeyPress");
- RegisterEventName(KeyRelease, CORE "KeyRelease");
- RegisterEventName(ButtonPress, CORE "ButtonPress");
- RegisterEventName(ButtonRelease, CORE "ButtonRelease");
- RegisterEventName(MotionNotify, CORE "MotionNotify");
- RegisterEventName(EnterNotify, CORE "EnterNotify");
- RegisterEventName(LeaveNotify, CORE "LeaveNotify");
- RegisterEventName(FocusIn, CORE "FocusIn");
- RegisterEventName(FocusOut, CORE "FocusOut");
- RegisterEventName(KeymapNotify, CORE "KeymapNotify");
- RegisterEventName(Expose, CORE "Expose");
- RegisterEventName(GraphicsExpose, CORE "GraphicsExpose");
- RegisterEventName(NoExpose, CORE "NoExpose");
- RegisterEventName(VisibilityNotify, CORE "VisibilityNotify");
- RegisterEventName(CreateNotify, CORE "CreateNotify");
- RegisterEventName(DestroyNotify, CORE "DestroyNotify");
- RegisterEventName(UnmapNotify, CORE "UnmapNotify");
- RegisterEventName(MapNotify, CORE "MapNotify");
- RegisterEventName(MapRequest, CORE "MapRequest");
- RegisterEventName(ReparentNotify, CORE "ReparentNotify");
- RegisterEventName(ConfigureNotify, CORE "ConfigureNotify");
- RegisterEventName(ConfigureRequest, CORE "ConfigureRequest");
- RegisterEventName(GravityNotify, CORE "GravityNotify");
- RegisterEventName(ResizeRequest, CORE "ResizeRequest");
- RegisterEventName(CirculateNotify, CORE "CirculateNotify");
- RegisterEventName(CirculateRequest, CORE "CirculateRequest");
- RegisterEventName(PropertyNotify, CORE "PropertyNotify");
- RegisterEventName(SelectionClear, CORE "SelectionClear");
- RegisterEventName(SelectionRequest, CORE "SelectionRequest");
- RegisterEventName(SelectionNotify, CORE "SelectionNotify");
- RegisterEventName(ColormapNotify, CORE "ColormapNotify");
- RegisterEventName(ClientMessage, CORE "ClientMessage");
- RegisterEventName(MappingNotify, CORE "MappingNotify");
+ memset(&extEntry, 0, sizeof(extEntry));
+ extEntry.name = CORE;
+ RegisterExtensionNames(&extEntry);
}
#endif /* XREGISTRY */
diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c
index 1a259f5..79cc6e7 100644
--- a/hw/xfree86/loader/dixsym.c
+++ b/hw/xfree86/loader/dixsym.c
@@ -288,9 +288,6 @@ _X_HIDDEN void *dixLookupTab[] = {
SYMVAR(ResourceStateCallback)
/* registry.c */
#ifdef XREGISTRY
- SYMFUNC(RegisterRequestName)
- SYMFUNC(RegisterEventName)
- SYMFUNC(RegisterErrorName)
SYMFUNC(RegisterResourceName)
#endif
/* swaprep.c */
diff --git a/include/registry.h b/include/registry.h
index d57f32d..90c3de3 100644
--- a/include/registry.h
+++ b/include/registry.h
@@ -15,6 +15,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifdef XREGISTRY
#include "resource.h"
+#include "extnsionst.h"
/* Internal string registry - for auditing, debugging, security, etc. */
@@ -22,13 +23,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
* Registration functions. The name string is not copied, so it must
* not be a stack variable.
*/
-void RegisterRequestName(unsigned major, unsigned minor, const char *name);
-void RegisterEventName(unsigned event, const char *name);
-void RegisterErrorName(unsigned error, const char *name);
-void RegisterResourceName(RESTYPE type, const char *name);
+void RegisterResourceName(RESTYPE type, char *name);
+void RegisterExtensionNames(ExtensionEntry *ext);
/*
- * Lookup functions. The returned string must not be modified.
+ * Lookup functions. The returned string must not be modified or freed.
*/
const char *LookupRequestName(int major, int minor);
const char *LookupEventName(int event);
@@ -49,10 +48,8 @@ void dixResetRegistry(void);
/* Define calls away when the registry is not being built. */
-#define RegisterRequestName(a, b, c) { ; }
-#define RegisterEventName(a, b) { ; }
-#define RegisterErrorName(a, b) { ; }
#define RegisterResourceName(a, b) { ; }
+#define RegisterExtensionNames(a) { ; }
#define LookupRequestName(a, b) XREGISTRY_UNKNOWN
#define LookupEventName(a) XREGISTRY_UNKNOWN
commit 9b0e72c8d960d056276f5fa93f3cc2872825711e
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Mon Nov 26 15:26:04 2007 -0500
registry: Add a great big list of protocol names, like the XErrorDB that
ships with Xlib. This is considered temporary, until server-side XCB can
solve the problem programmatically.
diff --git a/dix/Makefile.am b/dix/Makefile.am
index 65c387c..2cf9014 100644
--- a/dix/Makefile.am
+++ b/dix/Makefile.am
@@ -42,6 +42,10 @@ INCLUDES = -I$(top_srcdir)/Xprint
EXTRA_DIST = buildatoms BuiltInAtoms CHANGES Xserver.d Xserver-dtrace.h.in
+# Install list of protocol names
+miscconfigdir = $(SERVER_MISC_CONFIG_PATH)
+dist_miscconfig_DATA = protocol.txt
+
if XSERVER_DTRACE
# Generate dtrace header file for C sources to include
BUILT_SOURCES = Xserver-dtrace.h
diff --git a/dix/protocol.txt b/dix/protocol.txt
new file mode 100644
index 0000000..f4cdf7b
--- /dev/null
+++ b/dix/protocol.txt
@@ -0,0 +1,1054 @@
+# Registry of protocol names used by X Server
+# This will eventually be replaced by server-side XCB
+#
+# Format is Xnnn <extension-name>:<object-name>
+# R=Request, V=Event, E=Error
+#
+# This is a security-sensitive file, please set permissions as appropriate.
+#
+R001 Adobe-DPS-Extension:Init
+R002 Adobe-DPS-Extension:CreateContext
+R003 Adobe-DPS-Extension:CreateSpace
+R004 Adobe-DPS-Extension:GiveInput
+R005 Adobe-DPS-Extension:GetStatus
+R006 Adobe-DPS-Extension:DestroySpace
+R007 Adobe-DPS-Extension:Reset
+R008 Adobe-DPS-Extension:NotifyContext
+R009 Adobe-DPS-Extension:CreateContextFromID
+R010 Adobe-DPS-Extension:XIDFromContext
+R011 Adobe-DPS-Extension:ContextFromXID
+R012 Adobe-DPS-Extension:SetStatusMask
+R013 Adobe-DPS-Extension:CreateSecureContext
+R014 Adobe-DPS-Extension:NotifyWhenReady
+R000 Apple-DRI:QueryVersion
+R001 Apple-DRI:QueryDirectRenderingCapable
+R002 Apple-DRI:CreateSurface
+R003 Apple-DRI:DestroySurface
+R004 Apple-DRI:AuthConnection
+V000 Apple-DRI:ObsoleteEvent1
+V001 Apple-DRI:ObsoleteEvent2
+V002 Apple-DRI:ObsoleteEvent3
+V003 Apple-DRI:SurfaceNotify
+E000 Apple-DRI:ClientNotLocal
+E001 Apple-DRI:OperationNotSupported
+R000 Apple-WM:QueryVersion
+R001 Apple-WM:FrameGetRect
+R002 Apple-WM:FrameHitTest
+R003 Apple-WM:FrameDraw
+R004 Apple-WM:DisableUpdate
+R005 Apple-WM:ReenableUpdate
+R006 Apple-WM:SelectInput
+R007 Apple-WM:SetWindowMenuCheck
+R008 Apple-WM:SetFrontProcess
+R009 Apple-WM:SetWindowLevel
+R010 Apple-WM:SetCanQuit
+R011 Apple-WM:SetWindowMenu
+V000 Apple-WM:ControllerNotify
+V001 Apple-WM:ActivationNotify
+V002 Apple-WM:PasteboardNotify
+E000 Apple-WM:ClientNotLocal
+E001 Apple-WM:OperationNotSupported
+R000 BIG-REQUESTS:Enable
+R000 Composite:CompositeQueryVersion
+R001 Composite:CompositeRedirectWindow
+R002 Composite:CompositeRedirectSubwindows
+R003 Composite:CompositeUnredirectWindow
+R004 Composite:CompositeUnredirectSubwindows
+R005 Composite:CompositeCreateRegionFromBorderClip
+R006 Composite:CompositeNameWindowPixmap
+R007 Composite:CompositeGetOverlayWindow
+R008 Composite:CompositeReleaseOverlayWindow
+R000 DAMAGE:QueryVersion
+R001 DAMAGE:Create
+R002 DAMAGE:Destroy
+R003 DAMAGE:Subtract
+R004 DAMAGE:Add
+V000 DAMAGE:Notify
+E000 DAMAGE:BadDamage
+R000 DEC-XTRAP:Reset
+R001 DEC-XTRAP:GetAvailable
+R002 DEC-XTRAP:Config
+R003 DEC-XTRAP:StartTrap
+R004 DEC-XTRAP:StopTrap
+R005 DEC-XTRAP:GetCurrent
+R006 DEC-XTRAP:GetStatistics
+R007 DEC-XTRAP:SimulateXEvent
+R008 DEC-XTRAP:GetVersion
+R009 DEC-XTRAP:GetLastInpTime
+V000 DEC-XTRAP:Event
+E002 DEC-XTRAP:BadIO
+E004 DEC-XTRAP:BadStatistics
+E005 DEC-XTRAP:BadDevices
+E007 DEC-XTRAP:BadScreen
+E008 DEC-XTRAP:BadSwapReq
+R000 DMX:DMXQueryVersion
+R001 DMX:DMXGetScreenCount
+R002 DMX:DMXGetScreenInfoDEPRECATED
+R003 DMX:DMXGetWindowAttributes
+R004 DMX:DMXGetInputCount
+R005 DMX:DMXGetInputAttributes
+R006 DMX:DMXForceWindowCreationDEPRECATED
+R007 DMX:DMXReconfigureScreenDEPRECATED
+R008 DMX:DMXSync
+R009 DMX:DMXForceWindowCreation
+R010 DMX:DMXGetScreenAttributes
+R011 DMX:DMXChangeScreensAttributes
+R012 DMX:DMXAddScreen
+R013 DMX:DMXRemoveScreen
+R014 DMX:DMXGetDesktopAttributes
+R015 DMX:DMXChangeDesktopAttributes
+R016 DMX:DMXAddInput
+R017 DMX:DMXRemoveInput
+R000 DOUBLE-BUFFER:GetVersion
+R001 DOUBLE-BUFFER:AllocateBackBufferName
+R002 DOUBLE-BUFFER:DeallocateBackBufferName
+R003 DOUBLE-BUFFER:SwapBuffers
+R004 DOUBLE-BUFFER:BeginIdiom
+R005 DOUBLE-BUFFER:EndIdiom
+R006 DOUBLE-BUFFER:GetVisualInfo
+R007 DOUBLE-BUFFER:GetBackBufferAttributes
+E000 DOUBLE-BUFFER:BadBuffer
+R000 DPMS:GetVersion
+R001 DPMS:Capable
+R002 DPMS:GetTimeouts
+R003 DPMS:SetTimeouts
+R004 DPMS:Enable
+R005 DPMS:Disable
+R006 DPMS:ForceLevel
+R007 DPMS:Info
+R000 Extended-Visual-Information:QueryVersion
+R001 Extended-Visual-Information:GetVisualInfo
+R000 FontCache:QueryVersion
+R001 FontCache:GetCacheSettings
+R002 FontCache:ChangeCacheSettings
+R003 FontCache:GetCacheStatistics
+E000 FontCache:BadProtocol
+E001 FontCache:CannotAllocMemory
+R001 GLX:
+R002 GLX:Large
+R003 GLX:CreateContext
+R004 GLX:DestroyContext
+R005 GLX:MakeCurrent
+R006 GLX:IsDirect
+R007 GLX:QueryVersion
+R008 GLX:WaitGL
+R009 GLX:WaitX
+R010 GLX:CopyContext
+R011 GLX:SwapBuffers
+R012 GLX:UseXFont
+R013 GLX:CreateGLXPixmap
+R014 GLX:GetVisualConfigs
+R015 GLX:DestroyGLXPixmap
+R016 GLX:VendorPrivate
+R017 GLX:VendorPrivateWithReply
+R018 GLX:QueryExtensionsString
+R019 GLX:QueryServerString
+R020 GLX:ClientInfo
+R101 GLX:NewList
+R102 GLX:EndList
+R103 GLX:DeleteLists
+R104 GLX:GenLists
+R105 GLX:FeedbackBuffer
+R106 GLX:SelectBuffer
+R107 GLX:Mode
+R108 GLX:Finish
+R109 GLX:PixelStoref
+R110 GLX:PixelStorei
+R111 GLX:ReadPixels
+R112 GLX:GetBooleanv
+R113 GLX:GetClipPlane
+R114 GLX:GetDoublev
+R115 GLX:GetError
+R116 GLX:GetFloatv
+R117 GLX:GetIntegerv
+R118 GLX:GetLightfv
+R119 GLX:GetLightiv
+R120 GLX:GetMapdv
+R121 GLX:GetMapfv
+R122 GLX:GetMapiv
+R123 GLX:GetMaterialfv
+R124 GLX:GetMaterialiv
+R125 GLX:GetPixelfv
+R126 GLX:GetPixelMapuiv
+R127 GLX:GetPixelMapusv
+R128 GLX:GetPolygonStipple
+R129 GLX:GetString
+R130 GLX:GetTexEnvfv
+R131 GLX:GetTexEnviv
+R132 GLX:GetTexGendv
+R133 GLX:GetTexGenfv
+R134 GLX:GetTexGeniv
+R135 GLX:GetTexImage
+R136 GLX:GetTexParameterfv
+R137 GLX:GetTexParameteriv
+R138 GLX:GetTexLevelParameterfv
+R139 GLX:GetTexLevelParameteriv
+R140 GLX:IsEnabled
+R141 GLX:IsList
+R142 GLX:Flush
+E000 GLX:BadContext
+E001 GLX:BadContextState
+E002 GLX:BadDrawable
+E003 GLX:BadPixmap
+E004 GLX:BadContextTag
+E005 GLX:BadCurrentWindow
+E006 GLX:BadRenderRequest
+E007 GLX:BadLargeRequest
+E008 GLX:UnsupportedPrivateRequest
+R000 LBX:QueryVersion
+R001 LBX:StartProxy
+R002 LBX:StopProxy
+R003 LBX:Switch
+R004 LBX:NewClient
+R005 LBX:CloseClient
+R006 LBX:ModifySequence
+R007 LBX:AllowMotion
+R008 LBX:IncrementPixel
+R009 LBX:Delta
+R010 LBX:GetModifierMapping
+R011 LBX:QueryTag
+R012 LBX:InvalidateTag
+R013 LBX:PolyPoint
+R014 LBX:PolyLine
+R015 LBX:PolySegment
+R016 LBX:PolyRectangle
+R017 LBX:PolyArc
+R018 LBX:FillPoly
+R019 LBX:PolyFillRectangle
+R020 LBX:PolyFillArc
+R021 LBX:GetKeyboardMapping
+R022 LBX:QueryFont
+R023 LBX:ChangeProperty
+R024 LBX:GetProperty
+R025 LBX:TagData
+R026 LBX:CopyArea
+R027 LBX:CopyPlane
+R028 LBX:PolyText8
+R029 LBX:PolyText16
+R030 LBX:ImageText8
+R031 LBX:ImageText16
+R032 LBX:QueryExtension
+R033 LBX:PutImage
+R034 LBX:GetImage
+R035 LBX:BeginLargeRequest
+R036 LBX:LargeRequestData
+R037 LBX:EndLargeRequest
+R038 LBX:InternAtoms
+R039 LBX:GetWinAttrAndGeom
+R040 LBX:GrabCmap
+R041 LBX:ReleaseCmap
+R042 LBX:AllocColor
+R043 LBX:Sync
+E000 LBX:BadLbxClient
+R000 MIT-SCREEN-SAVER:QueryVersion
+R001 MIT-SCREEN-SAVER:QueryInfo
+R002 MIT-SCREEN-SAVER:SelectInput
+R003 MIT-SCREEN-SAVER:SetAttributes
+R004 MIT-SCREEN-SAVER:UnsetAttributes
+R005 MIT-SCREEN-SAVER:Suspend
+V000 MIT-SCREEN-SAVER:Notify
+R000 MIT-SHM:QueryVersion
+R001 MIT-SHM:Attach
+R002 MIT-SHM:Detach
+R003 MIT-SHM:PutImage
+R004 MIT-SHM:GetImage
+R005 MIT-SHM:CreatePixmap
+V000 MIT-SHM:Completion
+E000 MIT-SHM:BadShmSeg
+R000 MIT-SUNDRY-NONSTANDARD:SetBugMode
+R001 MIT-SUNDRY-NONSTANDARD:GetBugMode
+R000 Multi-Buffering:GetBufferVersion
+R001 Multi-Buffering:CreateImageBuffers
+R002 Multi-Buffering:DestroyImageBuffers
+R003 Multi-Buffering:DisplayImageBuffers
+R004 Multi-Buffering:SetMBufferAttributes
+R005 Multi-Buffering:GetMBufferAttributes
+R006 Multi-Buffering:SetBufferAttributes
+R007 Multi-Buffering:GetBufferAttributes
+R008 Multi-Buffering:GetBufferInfo
+R009 Multi-Buffering:CreateStereoWindow
+R010 Multi-Buffering:ClearImageBufferArea
+V000 Multi-Buffering:ClobberNotify
+V001 Multi-Buffering:UpdateNotify
+E000 Multi-Buffering:BadBuffer
+R000 RANDR:QueryVersion
+R001 RANDR:OldGetScreenInfo
+R002 RANDR:SetScreenConfig
+R003 RANDR:OldScreenChangeSelectInput
+R004 RANDR:SelectInput
+R005 RANDR:GetScreenInfo
+R006 RANDR:GetScreenSizeRange
+R007 RANDR:SetScreenSize
+R008 RANDR:GetScreenResources
+R009 RANDR:GetOutputInfo
+R010 RANDR:ListOutputProperties
+R011 RANDR:QueryOutputProperty
+R012 RANDR:ConfigureOutputProperty
+R013 RANDR:ChangeOutputProperty
+R014 RANDR:DeleteOutputProperty
+R015 RANDR:GetOutputProperty
+R016 RANDR:CreateMode
+R017 RANDR:DestroyMode
+R018 RANDR:AddOutputMode
+R019 RANDR:DeleteOutputMode
+R020 RANDR:GetCrtcInfo
+R021 RANDR:SetCrtcConfig
+R022 RANDR:GetCrtcGammaSize
+R023 RANDR:GetCrtcGamma
+R024 RANDR:SetCrtcGamma
+V000 RANDR:ScreenChangeNotify
+V001 RANDR:Notify
+E000 RANDR:BadRROutput
+E001 RANDR:BadRRCrtc
+E002 RANDR:BadRRMode
+R000 RECORD:QueryVersion
+R001 RECORD:CreateContext
+R002 RECORD:RegisterClients
+R003 RECORD:UnregisterClients
+R004 RECORD:GetContext
+R005 RECORD:EnableContext
+R006 RECORD:DisableContext
+R007 RECORD:FreeContext
+E000 RECORD:BadContext
+R000 RENDER:QueryVersion
+R001 RENDER:QueryPictFormats
+R002 RENDER:QueryPictIndexValues
+R003 RENDER:QueryDithers
+R004 RENDER:CreatePicture
+R005 RENDER:ChangePicture
+R006 RENDER:SetPictureClipRectangles
+R007 RENDER:FreePicture
+R008 RENDER:Composite
+R009 RENDER:Scale
+R010 RENDER:Trapezoids
+R011 RENDER:Triangles
+R012 RENDER:TriStrip
+R013 RENDER:TriFan
+R014 RENDER:ColorTrapezoids
+R015 RENDER:ColorTriangles
+R016 RENDER:Transform
+R017 RENDER:CreateGlyphSet
+R018 RENDER:ReferenceGlyphSet
+R019 RENDER:FreeGlyphSet
+R020 RENDER:AddGlyphs
+R021 RENDER:AddGlyphsFromPicture
+R022 RENDER:FreeGlyphs
+R023 RENDER:CompositeGlyphs8
+R024 RENDER:CompositeGlyphs16
+R025 RENDER:CompositeGlyphs32
+R026 RENDER:FillRectangles
+R027 RENDER:CreateCursor
+R028 RENDER:SetPictureTransform
+R029 RENDER:QueryFilters
+R030 RENDER:SetPictureFilter
+R031 RENDER:CreateAnimCursor
+R032 RENDER:AddTraps
+R033 RENDER:CreateSolidFill
+R034 RENDER:CreateLinearGradient
+R035 RENDER:CreateRadialGradient
+R036 RENDER:CreateConicalGradient
+E000 RENDER:BadPictFormat
+E001 RENDER:BadPicture
+E002 RENDER:BadPictOp
+E003 RENDER:BadGlyphSet
+E004 RENDER:BadGlyph
+R000 SECURITY:QueryVersion
+R001 SECURITY:GenerateAuthorization
+R002 SECURITY:RevokeAuthorization
+V000 SECURITY:AuthorizationRevoked
+E000 SECURITY:BadAuthorization
+E001 SECURITY:BadAuthorizationProtocol
+R000 SELinux:SELinuxQueryVersion
+R001 SELinux:SELinuxSetSelectionManager
+R002 SELinux:SELinuxGetSelectionManager
+R003 SELinux:SELinuxSetDeviceContext
+R004 SELinux:SELinuxGetDeviceContext
+R005 SELinux:SELinuxSetPropertyCreateContext
+R006 SELinux:SELinuxGetPropertyCreateContext
+R007 SELinux:SELinuxGetPropertyContext
+R008 SELinux:SELinuxSetWindowCreateContext
+R009 SELinux:SELinuxGetWindowCreateContext
+R010 SELinux:SELinuxGetWindowContext
+R000 SHAPE:QueryVersion
+R001 SHAPE:Rectangles
+R002 SHAPE:Mask
+R003 SHAPE:Combine
+R004 SHAPE:Offset
+R005 SHAPE:QueryExtents
+R006 SHAPE:SelectInput
+R007 SHAPE:InputSelected
+R008 SHAPE:GetRectangles
+V000 SHAPE:Notify
+R000 SYNC:Initialize
+R001 SYNC:ListSystemCounters
+R002 SYNC:CreateCounter
+R003 SYNC:SetCounter
+R004 SYNC:ChangeCounter
+R005 SYNC:QueryCounter
+R006 SYNC:DestroyCounter
+R007 SYNC:Await
+R008 SYNC:CreateAlarm
+R009 SYNC:ChangeAlarm
+R010 SYNC:QueryAlarm
+R011 SYNC:DestroyAlarm
+R012 SYNC:SetPriority
+R013 SYNC:GetPriority
+V000 SYNC:CounterNotify
+V001 SYNC:AlarmNotify
+E000 SYNC:BadCounter
+E001 SYNC:BadAlarm
+R000 TOG-CUP:QueryVersion
+R001 TOG-CUP:GetReservedColormapEntries
+R002 TOG-CUP:StoreColors
+R000 Windows-WM:QueryVersion
+R001 Windows-WM:FrameGetRect
+R002 Windows-WM:FrameDraw
+R003 Windows-WM:FrameSetTitle
+R004 Windows-WM:DisableUpdate
+R005 Windows-WM:ReenableUpdate
+R006 Windows-WM:SelectInput
+R007 Windows-WM:SetFrontProcess
+V000 Windows-WM:ControllerNotify
+V001 Windows-WM:ActivationNotify
+E000 Windows-WM:ClientNotLocal
+E001 Windows-WM:OperationNotSupported
+R000 X-Resource:QueryVersion
+R001 X-Resource:QueryClients
+R002 X-Resource:QueryClientResources
+R003 X-Resource:QueryClientPixmapBytes
+R001 X11:CreateWindow
+R002 X11:ChangeWindowAttributes
+R003 X11:GetWindowAttributes
+R004 X11:DestroyWindow
+R005 X11:DestroySubwindows
+R006 X11:ChangeSaveSet
+R007 X11:ReparentWindow
+R008 X11:MapWindow
+R009 X11:MapSubwindows
+R010 X11:UnmapWindow
+R011 X11:UnmapSubwindows
+R012 X11:ConfigureWindow
+R013 X11:CirculateWindow
+R014 X11:GetGeometry
+R015 X11:QueryTree
+R016 X11:InternAtom
+R017 X11:GetAtomName
+R018 X11:ChangeProperty
+R019 X11:DeleteProperty
+R020 X11:GetProperty
+R021 X11:ListProperties
+R022 X11:SetSelectionOwner
+R023 X11:GetSelectionOwner
+R024 X11:ConvertSelection
+R025 X11:SendEvent
+R026 X11:GrabPointer
+R027 X11:UngrabPointer
+R028 X11:GrabButton
+R029 X11:UngrabButton
+R030 X11:ChangeActivePointerGrab
+R031 X11:GrabKeyboard
+R032 X11:UngrabKeyboard
+R033 X11:GrabKey
+R034 X11:UngrabKey
+R035 X11:AllowEvents
+R036 X11:GrabServer
+R037 X11:UngrabServer
+R038 X11:QueryPointer
+R039 X11:GetMotionEvents
+R040 X11:TranslateCoords
+R041 X11:WarpPointer
+R042 X11:SetInputFocus
+R043 X11:GetInputFocus
+R044 X11:QueryKeymap
+R045 X11:OpenFont
+R046 X11:CloseFont
+R047 X11:QueryFont
+R048 X11:QueryTextExtents
+R049 X11:ListFonts
+R050 X11:ListFontsWithInfo
+R051 X11:SetFontPath
+R052 X11:GetFontPath
+R053 X11:CreatePixmap
+R054 X11:FreePixmap
+R055 X11:CreateGC
+R056 X11:ChangeGC
+R057 X11:CopyGC
+R058 X11:SetDashes
+R059 X11:SetClipRectangles
+R060 X11:FreeGC
+R061 X11:ClearArea
+R062 X11:CopyArea
+R063 X11:CopyPlane
+R064 X11:PolyPoint
+R065 X11:PolyLine
+R066 X11:PolySegment
+R067 X11:PolyRectangle
+R068 X11:PolyArc
+R069 X11:FillPoly
+R070 X11:PolyFillRectangle
+R071 X11:PolyFillArc
+R072 X11:PutImage
+R073 X11:GetImage
+R074 X11:PolyText8
+R075 X11:PolyText16
+R076 X11:ImageText8
+R077 X11:ImageText16
+R078 X11:CreateColormap
+R079 X11:FreeColormap
+R080 X11:CopyColormapAndFree
+R081 X11:InstallColormap
+R082 X11:UninstallColormap
+R083 X11:ListInstalledColormaps
+R084 X11:AllocColor
+R085 X11:AllocNamedColor
+R086 X11:AllocColorCells
+R087 X11:AllocColorPlanes
+R088 X11:FreeColors
+R089 X11:StoreColors
+R090 X11:StoreNamedColor
+R091 X11:QueryColors
+R092 X11:LookupColor
+R093 X11:CreateCursor
+R094 X11:CreateGlyphCursor
+R095 X11:FreeCursor
+R096 X11:RecolorCursor
+R097 X11:QueryBestSize
+R098 X11:QueryExtension
+R099 X11:ListExtensions
+R100 X11:ChangeKeyboardMapping
+R101 X11:GetKeyboardMapping
+R102 X11:ChangeKeyboardControl
+R103 X11:GetKeyboardControl
+R104 X11:Bell
+R105 X11:ChangePointerControl
+R106 X11:GetPointerControl
+R107 X11:SetScreenSaver
+R108 X11:GetScreenSaver
+R109 X11:ChangeHosts
+R110 X11:ListHosts
+R111 X11:SetAccessControl
+R112 X11:SetCloseDownMode
+R113 X11:KillClient
+R114 X11:RotateProperties
+R115 X11:ForceScreenSaver
+R116 X11:SetPointerMapping
+R117 X11:GetPointerMapping
+R118 X11:SetModifierMapping
+R119 X11:GetModifierMapping
+R127 X11:NoOperation
+V000 X11:X_Error
+V001 X11:X_Reply
+V002 X11:KeyPress
+V003 X11:KeyRelease
+V004 X11:ButtonPress
+V005 X11:ButtonRelease
+V006 X11:MotionNotify
+V007 X11:EnterNotify
+V008 X11:LeaveNotify
+V009 X11:FocusIn
+V010 X11:FocusOut
+V011 X11:KeymapNotify
+V012 X11:Expose
+V013 X11:GraphicsExpose
+V014 X11:NoExpose
+V015 X11:VisibilityNotify
+V016 X11:CreateNotify
+V017 X11:DestroyNotify
+V018 X11:UnmapNotify
+V019 X11:MapNotify
+V020 X11:MapRequest
+V021 X11:ReparentNotify
+V022 X11:ConfigureNotify
+V023 X11:ConfigureRequest
+V024 X11:GravityNotify
+V025 X11:ResizeRequest
+V026 X11:CirculateNotify
+V027 X11:CirculateRequest
+V028 X11:PropertyNotify
+V029 X11:SelectionClear
+V030 X11:SelectionRequest
+V031 X11:SelectionNotify
+V032 X11:ColormapNotify
+V033 X11:ClientMessage
+V034 X11:MappingNotify
+E000 X11:Success
+E001 X11:BadRequest
+E002 X11:BadValue
+E003 X11:BadWindow
+E004 X11:BadPixmap
+E005 X11:BadAtom
+E006 X11:BadCursor
+E007 X11:BadFont
+E008 X11:BadMatch
+E009 X11:BadDrawable
+E010 X11:BadAccess
+E011 X11:BadAlloc
+E012 X11:BadColor
+E013 X11:BadGC
+E014 X11:BadIDChoice
+E015 X11:BadName
+E016 X11:BadLength
+E017 X11:BadImplementation
+R001 X3D-PEX:GetExtensionInfo
+R002 X3D-PEX:GetEnumeratedTypeInfo
+R003 X3D-PEX:GetImpDepConstants
+R004 X3D-PEX:CreateLookupTable
+R005 X3D-PEX:CopyLookupTable
+R006 X3D-PEX:FreeLookupTable
+R007 X3D-PEX:GetTableInfo
+R008 X3D-PEX:GetPredefinedEntries
+R009 X3D-PEX:GetDefinedIndices
+R010 X3D-PEX:GetTableEntry
+R011 X3D-PEX:GetTableEntries
+R012 X3D-PEX:SetTableEntries
+R013 X3D-PEX:DeleteTableEntries
+R014 X3D-PEX:CreatePipelineContext
+R015 X3D-PEX:CopyPipelineContext
+R016 X3D-PEX:FreePipelineContext
+R017 X3D-PEX:GetPipelineContext
+R018 X3D-PEX:ChangePipelineContext
+R019 X3D-PEX:CreateRenderer
+R020 X3D-PEX:FreeRenderer
+R021 X3D-PEX:ChangeRenderer
+R022 X3D-PEX:GetRendererAttributes
+R023 X3D-PEX:GetRendererDynamics
+R024 X3D-PEX:BeginRendering
+R025 X3D-PEX:EndRendering
+R026 X3D-PEX:BeginStructure
+R027 X3D-PEX:EndStructure
+R028 X3D-PEX:OutputCommands
+R029 X3D-PEX:Network
+R030 X3D-PEX:CreateStructure
+R031 X3D-PEX:CopyStructure
+R032 X3D-PEX:DestroyStructures
+R033 X3D-PEX:GetStructureInfo
+R034 X3D-PEX:GetElementInfo
+R035 X3D-PEX:GetStructuresInNetwork
+R036 X3D-PEX:GetAncestors
+R037 X3D-PEX:GetDescendants
+R038 X3D-PEX:FetchElements
+R039 X3D-PEX:SetEditingMode
+R040 X3D-PEX:SetElementPointer
+R041 X3D-PEX:SetElementPointerAtLabel
+R042 X3D-PEX:ElementSearch
+R043 X3D-PEX:StoreElements
+R044 X3D-PEX:DeleteElements
+R045 X3D-PEX:DeleteElementsToLabel
+R046 X3D-PEX:DeleteBetweenLabels
+R047 X3D-PEX:CopyElements
+R048 X3D-PEX:ChangeStructureRefs
+R049 X3D-PEX:CreateNameSet
+R050 X3D-PEX:CopyNameSet
+R051 X3D-PEX:FreeNameSet
+R052 X3D-PEX:GetNameSet
+R053 X3D-PEX:ChangeNameSet
+R054 X3D-PEX:CreateSearchContext
+R055 X3D-PEX:CopySearchContext
+R056 X3D-PEX:FreeSearchContext
+R057 X3D-PEX:GetSearchContext
+R058 X3D-PEX:ChangeSearchContext
+R059 X3D-PEX:SearchNetwork
+R060 X3D-PEX:CreatePhigsWks
+R061 X3D-PEX:FreePhigsWks
+R062 X3D-PEX:GetWksInfo
+R063 X3D-PEX:GetDynamics
+R064 X3D-PEX:GetViewRep
+R065 X3D-PEX:RedrawAllStructures
+R066 X3D-PEX:UpdateWorkstation
+R067 X3D-PEX:RedrawClipRegion
+R068 X3D-PEX:ExecuteDeferredActions
+R069 X3D-PEX:SetViewPriority
+R070 X3D-PEX:SetDisplayUpdateMode
+R071 X3D-PEX:MapDCtoWC
+R072 X3D-PEX:MapWCtoDC
+R073 X3D-PEX:SetViewRep
+R074 X3D-PEX:SetWksWindow
+R075 X3D-PEX:SetWksViewport
+R076 X3D-PEX:SetHlhsrMode
+R077 X3D-PEX:SetWksBufferMode
+R078 X3D-PEX:PostStructure
+R079 X3D-PEX:UnpostStructure
+R080 X3D-PEX:UnpostAllStructures
+R081 X3D-PEX:GetWksPostings
+R082 X3D-PEX:GetPickDevice
+R083 X3D-PEX:ChangePickDevice
+R084 X3D-PEX:CreatePickMeasure
+R085 X3D-PEX:FreePickMeasure
+R086 X3D-PEX:GetPickMeasure
+R087 X3D-PEX:UpdatePickMeasure
+R088 X3D-PEX:OpenFont
+R089 X3D-PEX:CloseFont
+R090 X3D-PEX:QueryFont
+R091 X3D-PEX:ListFonts
+R092 X3D-PEX:ListFontsWithInfo
+R093 X3D-PEX:QueryTextExtents
+R094 X3D-PEX:MatchRenderingTargets
+R095 X3D-PEX:Escape
+R096 X3D-PEX:EscapeWithReply
+R097 X3D-PEX:Elements
+R098 X3D-PEX:AccumulateState
+R099 X3D-PEX:BeginPickOne
+R100 X3D-PEX:EndPickOne
+R101 X3D-PEX:PickOne
+R102 X3D-PEX:BeginPickAll
+R103 X3D-PEX:EndPickAll
+R104 X3D-PEX:PickAll
+E000 X3D-PEX:ColorTypeError
+E001 X3D-PEX:erStateError
+E002 X3D-PEX:FloatingPointFormatError
+E003 X3D-PEX:LabelError
+E004 X3D-PEX:LookupTableError
+E005 X3D-PEX:NameSetError
+E006 X3D-PEX:PathError
+E007 X3D-PEX:FontError
+E008 X3D-PEX:PhigsWksError
+E009 X3D-PEX:PickMeasureError
+E010 X3D-PEX:PipelineContextError
+E011 X3D-PEX:erError
+E012 X3D-PEX:SearchContextError
+E013 X3D-PEX:StructureError
+E014 X3D-PEX:OutputCommandError
+R000 XC-APPGROUP:QueryVersion
+R001 XC-APPGROUP:Create
+R002 XC-APPGROUP:Destroy
+R003 XC-APPGROUP:GetAttr
+R004 XC-APPGROUP:Query
+R005 XC-APPGROUP:CreateAssoc
+R006 XC-APPGROUP:DestroyAssoc
+E000 XC-APPGROUP:BadAppGroup
+R000 XC-MISC:GetVersion
+R001 XC-MISC:GetXIDRange
+R002 XC-MISC:GetXIDList
+R000 XEVIE:QueryVersion
+R001 XEVIE:Start
+R002 XEVIE:End
+R003 XEVIE:Send
+R004 XEVIE:SelectInput
+R000 XFIXES:QueryVersion
+R001 XFIXES:ChangeSaveSet
+R002 XFIXES:SelectSelectionInput
+R003 XFIXES:SelectCursorInput
+R004 XFIXES:GetCursorImage
+R005 XFIXES:CreateRegion
+R006 XFIXES:CreateRegionFromBitmap
+R007 XFIXES:CreateRegionFromWindow
+R008 XFIXES:CreateRegionFromGC
+R009 XFIXES:CreateRegionFromPicture
+R010 XFIXES:DestroyRegion
+R011 XFIXES:SetRegion
+R012 XFIXES:CopyRegion
+R013 XFIXES:UnionRegion
+R014 XFIXES:IntersectRegion
+R015 XFIXES:SubtractRegion
+R016 XFIXES:InvertRegion
+R017 XFIXES:TranslateRegion
+R018 XFIXES:RegionExtents
+R019 XFIXES:FetchRegion
+R020 XFIXES:SetGCClipRegion
+R021 XFIXES:SetWindowShapeRegion
+R022 XFIXES:SetPictureClipRegion
+R023 XFIXES:SetCursorName
+R024 XFIXES:GetCursorName
+R025 XFIXES:GetCursorImageAndName
+R026 XFIXES:ChangeCursor
+R027 XFIXES:ChangeCursorByName
+R028 XFIXES:ExpandRegion
+R029 XFIXES:HideCursor
+R030 XFIXES:ShowCursor
+V000 XFIXES:SelectionNotify
+V001 XFIXES:CursorNotify
+E000 XFIXES:BadRegion
+R000 XFree86-Bigfont:QueryVersion
+R001 XFree86-Bigfont:QueryFont
+R000 XFree86-DGA:QueryVersion
+R001 XFree86-DGA:GetVideoLL
+R002 XFree86-DGA:DirectVideo
+R003 XFree86-DGA:GetViewPortSize
+R004 XFree86-DGA:SetViewPort
+R005 XFree86-DGA:GetVidPage
+R006 XFree86-DGA:SetVidPage
+R007 XFree86-DGA:InstallColormap
+R008 XFree86-DGA:QueryDirectVideo
+R009 XFree86-DGA:ViewPortChanged
+R010 XFree86-DGA:Obsolete1
+R011 XFree86-DGA:Obsolete2
+R012 XFree86-DGA:QueryModes
+R013 XFree86-DGA:SetMode
+R014 XFree86-DGA:SetViewport
+R015 XFree86-DGA:InstallColormap
+R016 XFree86-DGA:SelectInput
+R017 XFree86-DGA:FillRectangle
+R018 XFree86-DGA:CopyArea
+R019 XFree86-DGA:CopyTransparentArea
+R020 XFree86-DGA:GetViewportStatus
+R021 XFree86-DGA:Sync
+R022 XFree86-DGA:OpenFramebuffer
+R023 XFree86-DGA:CloseFramebuffer
+R024 XFree86-DGA:SetClientVersion
+R025 XFree86-DGA:ChangePixmapMode
+R026 XFree86-DGA:CreateColormap
+E000 XFree86-DGA:ClientNotLocal
+E001 XFree86-DGA:NoDirectVideoMode
+E002 XFree86-DGA:ScreenNotActive
+E003 XFree86-DGA:DirectNotActivated
+E004 XFree86-DGA:OperationNotSupported
+R000 XFree86-DRI:QueryVersion
+R001 XFree86-DRI:QueryDirectRenderingCapable
+R002 XFree86-DRI:OpenConnection
+R003 XFree86-DRI:CloseConnection
+R004 XFree86-DRI:GetClientDriverName
+R005 XFree86-DRI:CreateContext
+R006 XFree86-DRI:DestroyContext
+R007 XFree86-DRI:CreateDrawable
+R008 XFree86-DRI:DestroyDrawable
+R009 XFree86-DRI:GetDrawableInfo
+R010 XFree86-DRI:GetDeviceInfo
+R011 XFree86-DRI:AuthConnection
+R012 XFree86-DRI:OpenFullScreen
+R013 XFree86-DRI:CloseFullScreen
+E000 XFree86-DRI:ClientNotLocal
+E001 XFree86-DRI:OperationNotSupported
+R000 XFree86-Misc:QueryVersion
+R001 XFree86-Misc:GetSaver
+R002 XFree86-Misc:SetSaver
+R003 XFree86-Misc:GetMouseSettings
+R004 XFree86-Misc:GetKbdSettings
+R005 XFree86-Misc:SetMouseSettings
+R006 XFree86-Misc:SetKbdSettings
+R007 XFree86-Misc:SetGrabKeysState
+R008 XFree86-Misc:SetClientVersion
+R009 XFree86-Misc:GetFilePaths
+R010 XFree86-Misc:PassMessage
+E000 XFree86-Misc:BadMouseProtocol
+E001 XFree86-Misc:BadMouseBaudRate
+E002 XFree86-Misc:BadMouseFlags
+E003 XFree86-Misc:BadMouseCombo
+E004 XFree86-Misc:BadKbdType
+E005 XFree86-Misc:ModInDevDisabled
+E006 XFree86-Misc:ModInDevClientNotLocal
+E007 XFree86-Misc:NoModule
+R000 XFree86-VidModeExtension:QueryVersion
+R001 XFree86-VidModeExtension:GetModeLine
+R002 XFree86-VidModeExtension:ModModeLine
+R003 XFree86-VidModeExtension:SwitchMode
+R004 XFree86-VidModeExtension:GetMonitor
+R005 XFree86-VidModeExtension:LockModeSwitch
+R006 XFree86-VidModeExtension:GetAllModeLines
+R007 XFree86-VidModeExtension:AddModeLine
+R008 XFree86-VidModeExtension:DeleteModeLine
+R009 XFree86-VidModeExtension:ValidateModeLine
+R010 XFree86-VidModeExtension:SwitchToMode
+R011 XFree86-VidModeExtension:GetViewPort
+R012 XFree86-VidModeExtension:SetViewPort
+R013 XFree86-VidModeExtension:GetDotClocks
+R014 XFree86-VidModeExtension:SetClientVersion
+R015 XFree86-VidModeExtension:SetGamma
+R016 XFree86-VidModeExtension:GetGamma
+R017 XFree86-VidModeExtension:GetGammaRamp
+R018 XFree86-VidModeExtension:SetGammaRamp
+R019 XFree86-VidModeExtension:GetGammaRampSize
+R020 XFree86-VidModeExtension:GetPermissions
+V000 XFree86-VidModeExtension:Notify
+E000 XFree86-VidModeExtension:BadClock
+E001 XFree86-VidModeExtension:BadHTimings
+E002 XFree86-VidModeExtension:BadVTimings
+E003 XFree86-VidModeExtension:ModeUnsuitable
+E004 XFree86-VidModeExtension:ExtensionDisabled
+E005 XFree86-VidModeExtension:ClientNotLocal
+E006 XFree86-VidModeExtension:ZoomLocked
+R001 XIE:QueryImageExtension
+R002 XIE:QueryTechniques
+R003 XIE:CreateColorList
+R004 XIE:DestroyColorList
+R005 XIE:PurgeColorList
+R006 XIE:QueryColorList
+R007 XIE:CreateLUT
+R008 XIE:DestroyLUT
+R009 XIE:CreatePhotomap
+R010 XIE:DestroyPhotomap
+R011 XIE:QueryPhotomap
+R012 XIE:CreateROI
+R013 XIE:DestroyROI
+R014 XIE:CreatePhotospace
+R015 XIE:DestroyPhotospace
+R016 XIE:ExecuteImmediate
+R017 XIE:CreatePhotoflo
+R018 XIE:DestroyPhotoflo
+R019 XIE:ExecutePhotoflo
+R020 XIE:ModifyPhotoflo
+R021 XIE:RedefinePhotoflo
+R022 XIE:PutClientData
+R023 XIE:GetClientData
+R024 XIE:QueryPhotoflo
+R025 XIE:Await
+R026 XIE:Abort
+E000 XIE:ColorListError
+E001 XIE:LUTError
+E002 XIE:PhotofloError
+E003 XIE:PhotomapError
+E004 XIE:PhotospaceError
+E005 XIE:ROIError
+E006 XIE:FloError
+R000 XINERAMA:QueryVersion
+R001 XINERAMA:GetState
+R002 XINERAMA:GetScreenCount
+R003 XINERAMA:GetScreenSize
+R004 XINERAMA:IsActive
+R005 XINERAMA:QueryScreens
+R001 XInputExtension:GetExtensionVersion
+R002 XInputExtension:ListInputDevices
+R003 XInputExtension:OpenDevice
+R004 XInputExtension:CloseDevice
+R005 XInputExtension:SetDeviceMode
+R006 XInputExtension:SelectExtensionEvent
+R007 XInputExtension:GetSelectedExtensionEvents
+R008 XInputExtension:ChangeDeviceDontPropagateList
+R009 XInputExtension:GetDeviceDontPropagageList
+R010 XInputExtension:GetDeviceMotionEvents
+R011 XInputExtension:ChangeKeyboardDevice
+R012 XInputExtension:ChangePointerDevice
+R013 XInputExtension:GrabDevice
+R014 XInputExtension:UngrabDevice
+R015 XInputExtension:GrabDeviceKey
+R016 XInputExtension:UngrabDeviceKey
+R017 XInputExtension:GrabDeviceButton
+R018 XInputExtension:UngrabDeviceButton
+R019 XInputExtension:AllowDeviceEvents
+R020 XInputExtension:GetDeviceFocus
+R021 XInputExtension:SetDeviceFocus
+R022 XInputExtension:GetFeedbackControl
+R023 XInputExtension:ChangeFeedbackControl
+R024 XInputExtension:GetDeviceKeyMapping
+R025 XInputExtension:ChangeDeviceKeyMapping
+R026 XInputExtension:GetDeviceModifierMapping
+R027 XInputExtension:SetDeviceModifierMapping
+R028 XInputExtension:GetDeviceButtonMapping
+R029 XInputExtension:SetDeviceButtonMapping
+R030 XInputExtension:QueryDeviceState
+R031 XInputExtension:SendExtensionEvent
+R032 XInputExtension:DeviceBell
+R033 XInputExtension:SetDeviceValuators
+R034 XInputExtension:GetDeviceControl
+R035 XInputExtension:ChangeDeviceControl
+V000 XInputExtension:DeviceValuator
+V001 XInputExtension:DeviceKeyPress
+V002 XInputExtension:DeviceKeyRelease
+V003 XInputExtension:DeviceButtonPress
+V004 XInputExtension:DeviceButtonRelease
+V005 XInputExtension:DeviceMotionNotify
+V006 XInputExtension:DeviceFocusIn
+V007 XInputExtension:DeviceFocusOut
+V008 XInputExtension:ProximityIn
+V009 XInputExtension:ProximityOut
+V010 XInputExtension:DeviceStateNotify
+V011 XInputExtension:DeviceMappingNotify
+V012 XInputExtension:ChangeDeviceNotify
+V013 XInputExtension:DeviceKeystateNotify
+V014 XInputExtension:DeviceButtonstateNotify
+V015 XInputExtension:DevicePresenceNotify
+E000 XInputExtension:BadDevice
+E001 XInputExtension:BadEvent
+E002 XInputExtension:BadMode
+E003 XInputExtension:DeviceBusy
+E004 XInputExtension:BadClass
+R000 XKEYBOARD:UseExtension
+R001 XKEYBOARD:SelectEvents
+R002 XKEYBOARD:Obsolete
+R003 XKEYBOARD:Bell
+R004 XKEYBOARD:GetState
+R005 XKEYBOARD:LatchLockState
+R006 XKEYBOARD:GetControls
+R007 XKEYBOARD:SetControls
+R008 XKEYBOARD:GetMap
+R009 XKEYBOARD:SetMap
+R010 XKEYBOARD:GetCompatMap
+R011 XKEYBOARD:SetCompatMap
+R012 XKEYBOARD:GetIndicatorState
+R013 XKEYBOARD:GetIndicatorMap
+R014 XKEYBOARD:SetIndicatorMap
+R015 XKEYBOARD:GetNamedIndicator
+R016 XKEYBOARD:SetNamedIndicator
+R017 XKEYBOARD:GetNames
+R018 XKEYBOARD:SetNames
+R019 XKEYBOARD:GetGeometry
+R020 XKEYBOARD:SetGeometry
+R021 XKEYBOARD:PerClientFlags
+R022 XKEYBOARD:ListComponents
+R023 XKEYBOARD:GetKbdByName
+R024 XKEYBOARD:GetDeviceInfo
+R025 XKEYBOARD:SetDeviceInfo
+R101 XKEYBOARD:SetDebuggingFlags
+V000 XKEYBOARD:EventCode
+E000 XKEYBOARD:BadKeyboard
+R000 XTEST:GetVersion
+R001 XTEST:CompareCursor
+R002 XTEST:FakeInput
+R003 XTEST:GrabControl
+R000 XVideo:QueryExtension
+R001 XVideo:QueryAdaptors
+R002 XVideo:QueryEncodings
+R003 XVideo:GrabPort
+R004 XVideo:UngrabPort
+R005 XVideo:PutVideo
+R006 XVideo:PutStill
+R007 XVideo:GetVideo
+R008 XVideo:GetStill
+R009 XVideo:StopVideo
+R010 XVideo:SelectVideoNotify
+R011 XVideo:SelectPortNotify
+R012 XVideo:QueryBestSize
+R013 XVideo:SetPortAttribute
+R014 XVideo:GetPortAttribute
+R015 XVideo:QueryPortAttributes
+R016 XVideo:ListImageFormats
+R017 XVideo:QueryImageAttributes
+R018 XVideo:PutImage
+R019 XVideo:ShmPutImage
+V000 XVideo:VideoNotify
+V001 XVideo:PortNotify
+E000 XVideo:BadPort
+E001 XVideo:BadEncoding
+E002 XVideo:BadControl
+R000 XVideo-MotionCompensation:QueryVersion
+R001 XVideo-MotionCompensation:ListSurfaceTypes
+R002 XVideo-MotionCompensation:CreateContext
+R003 XVideo-MotionCompensation:DestroyContext
+R004 XVideo-MotionCompensation:CreateSurface
+R005 XVideo-MotionCompensation:DestroySurface
+R006 XVideo-MotionCompensation:CreateSubpicture
+R007 XVideo-MotionCompensation:DestroySubpicture
+R008 XVideo-MotionCompensation:ListSubpictureTypes
+R009 XVideo-MotionCompensation:GetDRInfo
+E000 XVideo-MotionCompensation:BadContext
+E001 XVideo-MotionCompensation:BadSurface
+E002 XVideo-MotionCompensation:BadSubpicture
+R000 XpExtension:QueryVersion
+R001 XpExtension:GetPrinterList
+R002 XpExtension:CreateContext
+R003 XpExtension:SetContext
+R004 XpExtension:GetContext
+R005 XpExtension:DestroyContext
+R006 XpExtension:GetContextScreen
+R007 XpExtension:StartJob
+R008 XpExtension:EndJob
+R009 XpExtension:StartDoc
+R010 XpExtension:EndDoc
+R011 XpExtension:PutDocumentData
+R012 XpExtension:GetDocumentData
+R013 XpExtension:StartPage
+R014 XpExtension:EndPage
+R015 XpExtension:SelectInput
+R016 XpExtension:InputSelected
+R017 XpExtension:GetAttributes
+R018 XpExtension:SetAttributes
+R019 XpExtension:GetOneAttribute
+R020 XpExtension:RehashPrinterList
+R021 XpExtension:GetPageDimensions
+R022 XpExtension:QueryScreens
+R023 XpExtension:SetImageResolution
+R024 XpExtension:GetImageResolution
+V000 XpExtension:PrintNotify
+V001 XpExtension:AttributeNotify
+E000 XpExtension:BadContext
+E001 XpExtension:BadSequence
+E002 XpExtension:BadResourceID
commit c0f9e204baf0218466973868c5ea6ed0f78e6b8b
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Mon Nov 26 15:24:15 2007 -0500
registry: rename the SERVERCONFIGdir and relocate it to /usr/lib/xorg
by default.
diff --git a/configure.ac b/configure.ac
index 477058c..d78bc1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -460,9 +460,10 @@ AC_ARG_WITH(xkb-path, AS_HELP_STRING([--with-xkb-path=PATH], [Path to XK
AC_ARG_WITH(xkb-output, AS_HELP_STRING([--with-xkb-output=PATH], [Path to XKB output dir (default: ${datadir}/X11/xkb/compiled)]),
[ XKBOUTPUT="$withval" ],
[ XKBOUTPUT="compiled" ])
-AC_ARG_WITH(serverconfig-path, AS_HELP_STRING([--with-serverconfig-path=PATH], [Path to server config (default: ${libdir}/xserver)]),
+AC_ARG_WITH(serverconfig-path, AS_HELP_STRING([--with-serverconfig-path=PATH],
+ [Directory where ancillary server config files are installed (default: ${libdir}/xorg)]),
[ SERVERCONFIG="$withval" ],
- [ SERVERCONFIG="${libdir}/xserver" ])
+ [ SERVERCONFIG="${libdir}/xorg" ])
APPLE_APPLICATIONS_DIR="${bindir}/Applications"
AC_ARG_WITH(apple-applications-dir,AS_HELP_STRING([--with-apple-applications-dir=PATH], [Path to the Applications directory (default: ${bindir}/Applications)]),
[ APPLE_APPLICATIONS_DIR="${withval}" ].
@@ -1024,7 +1025,7 @@ fi
AC_DEFINE_DIR(COMPILEDDEFAULTFONTPATH, FONTPATH, [Default font path])
AC_DEFINE_DIR(PCI_TXT_IDS_PATH, PCI_TXT_IDS_DIR, [Default PCI text file ID path])
-AC_DEFINE_DIR(SERVERCONFIGdir, SERVERCONFIG, [Server config path])
+AC_DEFINE_DIR(SERVER_MISC_CONFIG_PATH, SERVERCONFIG, [Server miscellaneous config path])
AC_DEFINE_DIR(BASE_FONT_PATH, FONTDIR, [Default base font path])
AC_DEFINE_DIR(DRI_DRIVER_PATH, DRI_DRIVER_PATH, [Default DRI driver path])
AC_DEFINE_UNQUOTED(XVENDORNAME, ["$VENDOR_NAME"], [Vendor name])
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index 8ceeb8d..c442962 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -21,6 +21,9 @@
/* Default font path */
#undef COMPILEDDEFAULTFONTPATH
+/* Miscellaneous server configuration files path */
+#undef SERVER_MISC_CONFIG_PATH
+
/* Support Composite Extension */
#undef COMPOSITE
commit 4363d70c6b420648b501126d1fbdebfafc7ae09f
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 18:58:55 2007 -0500
registry: Fix some mistakes in the reversion of prior commits.
diff --git a/Xext/bigreq.c b/Xext/bigreq.c
index fd8bcb8..4f0724b 100644
--- a/Xext/bigreq.c
+++ b/Xext/bigreq.c
@@ -52,7 +52,7 @@ BigReqExtensionInit(INITARGS)
{
AddExtension(XBigReqExtensionName, 0, 0,
ProcBigReqDispatch, ProcBigReqDispatch,
- BigReqResetProc, StandardMinorOpcode)))
+ BigReqResetProc, StandardMinorOpcode);
}
/*ARGSUSED*/
diff --git a/Xext/dpms.c b/Xext/dpms.c
index d518a16..6f01fa3 100644
--- a/Xext/dpms.c
+++ b/Xext/dpms.c
@@ -75,7 +75,7 @@ DPMSExtensionInit(INITARGS)
{
AddExtension(DPMSExtensionName, 0, 0,
ProcDPMSDispatch, SProcDPMSDispatch,
- DPMSResetProc, StandardMinorOpcode)))
+ DPMSResetProc, StandardMinorOpcode);
}
/*ARGSUSED*/
diff --git a/Xext/fontcache.c b/Xext/fontcache.c
index 06b0c85..eca7309 100644
--- a/Xext/fontcache.c
+++ b/Xext/fontcache.c
@@ -72,7 +72,7 @@ FontCacheExtensionInit(INITARGS)
{
AddExtension(FONTCACHENAME, FontCacheNumberEvents, FontCacheNumberErrors,
ProcFontCacheDispatch, SProcFontCacheDispatch,
- FontCacheResetProc, StandardMinorOpcode)))
+ FontCacheResetProc, StandardMinorOpcode);
}
/*ARGSUSED*/
diff --git a/Xext/mitmisc.c b/Xext/mitmisc.c
index a5f3b0f..e793d4d 100644
--- a/Xext/mitmisc.c
+++ b/Xext/mitmisc.c
@@ -58,7 +58,7 @@ MITMiscExtensionInit(INITARGS)
{
AddExtension(MITMISCNAME, 0, 0,
ProcMITDispatch, SProcMITDispatch,
- MITResetProc, StandardMinorOpcode)))
+ MITResetProc, StandardMinorOpcode);
}
/*ARGSUSED*/
diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c
index 44d2b19..a42d2e2 100644
--- a/Xext/xcmisc.c
+++ b/Xext/xcmisc.c
@@ -66,7 +66,7 @@ XCMiscExtensionInit(INITARGS)
{
AddExtension(XCMiscExtensionName, 0, 0,
ProcXCMiscDispatch, SProcXCMiscDispatch,
- XCMiscResetProc, StandardMinorOpcode))
+ XCMiscResetProc, StandardMinorOpcode);
}
/*ARGSUSED*/
diff --git a/Xext/xres.c b/Xext/xres.c
index 243460c..feadad2 100644
--- a/Xext/xres.c
+++ b/Xext/xres.c
@@ -17,6 +17,7 @@
#include "dixstruct.h"
#include "extnsionst.h"
#include "swaprep.h"
+#include "registry.h"
#include <X11/extensions/XResproto.h>
#include "pixmapstr.h"
#include "windowstr.h"
diff --git a/Xext/xtest.c b/Xext/xtest.c
index 8e1732c..db6d545 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -86,7 +86,7 @@ XTestExtensionInit(INITARGS)
{
AddExtension(XTestExtensionName, 0, 0,
ProcXTestDispatch, SProcXTestDispatch,
- XTestResetProc, StandardMinorOpcode))
+ XTestResetProc, StandardMinorOpcode);
}
/*ARGSUSED*/
commit 140a4660aca1c283613d5b62f51668b44b45baf6
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 18:49:30 2007 -0500
Revert "registry: Register XTrap extension protocol names."
This reverts commit b38a91993364aa80cfd99721e319e1458d9fb760.
Moving all the names into dix/registry.c
diff --git a/XTrap/xtrapdi.c b/XTrap/xtrapdi.c
index 15a38ea..7dd9584 100644
--- a/XTrap/xtrapdi.c
+++ b/XTrap/xtrapdi.c
@@ -62,7 +62,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "misc.h" /* Server swapping macros */
#include "dixstruct.h" /* Server ClientRec definitions */
#include "resource.h" /* Used with the MakeAtom call */
-#include "registry.h"
#ifdef PC
# include "scrintst.h" /* Screen struct */
# include "extnsist.h"
@@ -464,41 +463,6 @@ void DEC_XTRAPInit()
XETrap_avail.data.xtrap_revision);
#endif
- RegisterRequestName(extEntry->base, XETrap_Reset,
- XTrapExtName ":Reset");
- RegisterRequestName(extEntry->base, XETrap_GetAvailable,
- XTrapExtName ":GetAvailable");
- RegisterRequestName(extEntry->base, XETrap_Config,
- XTrapExtName ":Config");
- RegisterRequestName(extEntry->base, XETrap_StartTrap,
- XTrapExtName ":StartTrap");
- RegisterRequestName(extEntry->base, XETrap_StopTrap,
- XTrapExtName ":StopTrap");
- RegisterRequestName(extEntry->base, XETrap_GetCurrent,
- XTrapExtName ":GetCurrent");
- RegisterRequestName(extEntry->base, XETrap_GetStatistics,
- XTrapExtName ":GetStatistics");
-#ifndef _XINPUT
- RegisterRequestName(extEntry->base, XETrap_SimulateXEvent,
- XTrapExtName ":SimulateXEvent");
-#endif
- RegisterRequestName(extEntry->base, XETrap_GetVersion,
- XTrapExtName ":GetVersion");
- RegisterRequestName(extEntry->base, XETrap_GetLastInpTime,
- XTrapExtName ":GetLastInpTime");
-
- RegisterEventName(extEntry->eventBase, XTrapExtName ":Event");
-
- RegisterErrorName(extEntry->errorBase + BadIO,
- XTrapExtName ":BadIO");
- RegisterErrorName(extEntry->errorBase + BadStatistics,
- XTrapExtName ":BadStatistics");
- RegisterErrorName(extEntry->errorBase + BadDevices,
- XTrapExtName ":BadDevices");
- RegisterErrorName(extEntry->errorBase + BadScreen,
- XTrapExtName ":BadScreen");
- RegisterErrorName(extEntry->errorBase + BadSwapReq,
- XTrapExtName ":BadSwapReq");
return;
}
commit ed8a39c48ab9dac085fcf58b9641364b5608f3f4
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 18:47:52 2007 -0500
Revert "registry: Register XKB extension protocol names."
This reverts commit a5cf3f21f712e46dbf9bca289e67be75f2b531d3.
Moving all the names into dix/registry.c
diff --git a/xkb/xkb.c b/xkb/xkb.c
index 49c63fa..23e1dc7 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -35,7 +35,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <X11/Xproto.h>
#include "misc.h"
#include "inputstr.h"
-#include "registry.h"
#define XKBSRV_NEED_FILE_FUNCS
#include <xkbsrv.h>
#include "extnsionst.h"
@@ -6227,62 +6226,8 @@ XkbExtensionInit(void)
XkbErrorBase = (unsigned char)extEntry->errorBase;
XkbKeyboardErrorCode = XkbErrorBase+XkbKeyboard;
RT_XKBCLIENT = CreateNewResourceType(XkbClientGone);
- } else
- return;
-
- RegisterRequestName(XkbReqCode, X_kbUseExtension,
- XkbName ":UseExtension");
- RegisterRequestName(XkbReqCode, X_kbSelectEvents,
- XkbName ":SelectEvents");
- RegisterRequestName(XkbReqCode, X_kbBell,
- XkbName ":Bell");
- RegisterRequestName(XkbReqCode, X_kbGetState,
- XkbName ":GetState");
- RegisterRequestName(XkbReqCode, X_kbLatchLockState,
- XkbName ":LatchLockState");
- RegisterRequestName(XkbReqCode, X_kbGetControls,
- XkbName ":GetControls");
- RegisterRequestName(XkbReqCode, X_kbSetControls,
- XkbName ":SetControls");
- RegisterRequestName(XkbReqCode, X_kbGetMap,
- XkbName ":GetMap");
- RegisterRequestName(XkbReqCode, X_kbSetMap,
- XkbName ":SetMap");
- RegisterRequestName(XkbReqCode, X_kbGetCompatMap,
- XkbName ":GetCompatMap");
- RegisterRequestName(XkbReqCode, X_kbSetCompatMap,
- XkbName ":SetCompatMap");
- RegisterRequestName(XkbReqCode, X_kbGetIndicatorState,
- XkbName ":GetIndicatorState");
- RegisterRequestName(XkbReqCode, X_kbGetIndicatorMap,
- XkbName ":GetIndicatorMap");
- RegisterRequestName(XkbReqCode, X_kbSetIndicatorMap,
- XkbName ":SetIndicatorMap");
- RegisterRequestName(XkbReqCode, X_kbGetNamedIndicator,
- XkbName ":GetNamedIndicator");
- RegisterRequestName(XkbReqCode, X_kbSetNamedIndicator,
- XkbName ":SetNamedIndicator");
- RegisterRequestName(XkbReqCode, X_kbGetNames,
- XkbName ":GetNames");
- RegisterRequestName(XkbReqCode, X_kbSetNames,
- XkbName ":SetNames");
- RegisterRequestName(XkbReqCode, X_kbGetGeometry,
- XkbName ":GetGeometry");
- RegisterRequestName(XkbReqCode, X_kbSetGeometry,
- XkbName ":SetGeometry");
- RegisterRequestName(XkbReqCode, X_kbPerClientFlags,
- XkbName ":PerClientFlags");
- RegisterRequestName(XkbReqCode, X_kbListComponents,
- XkbName ":ListComponents");
- RegisterRequestName(XkbReqCode, X_kbGetKbdByName,
- XkbName ":GetKbdByName");
- RegisterRequestName(XkbReqCode, X_kbGetDeviceInfo,
- XkbName ":GetDeviceInfo");
- RegisterRequestName(XkbReqCode, X_kbSetDeviceInfo,
- XkbName ":SetDeviceInfo");
- RegisterRequestName(XkbReqCode, X_kbSetDebuggingFlags,
- XkbName ":SetDebuggingFlags");
-
- RegisterEventName(extEntry->eventBase, XkbName ":EventCode");
- RegisterErrorName(extEntry->errorBase, XkbName ":Keyboard");
+ }
+ return;
}
+
+
commit 17b0c729b553e2f0f8f82497698b282a47db3326
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 18:46:43 2007 -0500
registry: Remove registry code from XInput extension.
Moving all the names into dix/registry.c
diff --git a/Xi/extinit.c b/Xi/extinit.c
index bf5ebd2..2ffdafb 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -959,119 +959,4 @@ XInputExtensionInit(void)
} else {
FatalError("IExtensionInit: AddExtensions failed\n");
}
-
- RegisterRequestName(IReqCode, X_GetExtensionVersion,
- INAME ":GetExtensionVersion");
- RegisterRequestName(IReqCode, X_ListInputDevices,
- INAME ":ListInputDevices");
- RegisterRequestName(IReqCode, X_OpenDevice,
- INAME ":OpenDevice");
- RegisterRequestName(IReqCode, X_CloseDevice,
- INAME ":CloseDevice");
- RegisterRequestName(IReqCode, X_SetDeviceMode,
- INAME ":SetDeviceMode");
- RegisterRequestName(IReqCode, X_SelectExtensionEvent,
- INAME ":SelectExtensionEvent");
- RegisterRequestName(IReqCode, X_GetSelectedExtensionEvents,
- INAME ":GetSelectedExtensionEvents");
- RegisterRequestName(IReqCode, X_ChangeDeviceDontPropagateList,
- INAME ":ChangeDeviceDontPropagateList");
- RegisterRequestName(IReqCode, X_GetDeviceDontPropagateList,
- INAME ":GetDeviceDontPropagageList");
- RegisterRequestName(IReqCode, X_GetDeviceMotionEvents,
- INAME ":GetDeviceMotionEvents");
- RegisterRequestName(IReqCode, X_ChangeKeyboardDevice,
- INAME ":ChangeKeyboardDevice");
- RegisterRequestName(IReqCode, X_ChangePointerDevice,
- INAME ":ChangePointerDevice");
- RegisterRequestName(IReqCode, X_GrabDevice,
- INAME ":GrabDevice");
- RegisterRequestName(IReqCode, X_UngrabDevice,
- INAME ":UngrabDevice");
- RegisterRequestName(IReqCode, X_GrabDeviceKey,
- INAME ":GrabDeviceKey");
- RegisterRequestName(IReqCode, X_UngrabDeviceKey,
- INAME ":UngrabDeviceKey");
- RegisterRequestName(IReqCode, X_GrabDeviceButton,
- INAME ":GrabDeviceButton");
- RegisterRequestName(IReqCode, X_UngrabDeviceButton,
- INAME ":UngrabDeviceButton");
- RegisterRequestName(IReqCode, X_AllowDeviceEvents,
- INAME ":AllowDeviceEvents");
- RegisterRequestName(IReqCode, X_GetDeviceFocus,
- INAME ":GetDeviceFocus");
- RegisterRequestName(IReqCode, X_SetDeviceFocus,
- INAME ":SetDeviceFocus");
- RegisterRequestName(IReqCode, X_GetFeedbackControl,
- INAME ":GetFeedbackControl");
- RegisterRequestName(IReqCode, X_ChangeFeedbackControl,
- INAME ":ChangeFeedbackControl");
- RegisterRequestName(IReqCode, X_GetDeviceKeyMapping,
- INAME ":GetDeviceKeyMapping");
- RegisterRequestName(IReqCode, X_ChangeDeviceKeyMapping,
- INAME ":ChangeDeviceKeyMapping");
- RegisterRequestName(IReqCode, X_GetDeviceModifierMapping,
- INAME ":GetDeviceModifierMapping");
- RegisterRequestName(IReqCode, X_SetDeviceModifierMapping,
- INAME ":SetDeviceModifierMapping");
- RegisterRequestName(IReqCode, X_GetDeviceButtonMapping,
- INAME ":GetDeviceButtonMapping");
- RegisterRequestName(IReqCode, X_SetDeviceButtonMapping,
- INAME ":SetDeviceButtonMapping");
- RegisterRequestName(IReqCode, X_QueryDeviceState,
- INAME ":QueryDeviceState");
- RegisterRequestName(IReqCode, X_SendExtensionEvent,
- INAME ":SendExtensionEvent");
- RegisterRequestName(IReqCode, X_DeviceBell,
- INAME ":DeviceBell");
- RegisterRequestName(IReqCode, X_SetDeviceValuators,
- INAME ":SetDeviceValuators");
- RegisterRequestName(IReqCode, X_GetDeviceControl,
- INAME ":GetDeviceControl");
- RegisterRequestName(IReqCode, X_ChangeDeviceControl,
- INAME ":ChangeDeviceControl");
-
- RegisterEventName(extEntry->eventBase + XI_DeviceValuator,
- INAME ":DeviceValuator");
- RegisterEventName(extEntry->eventBase + XI_DeviceKeyPress,
- INAME ":DeviceKeyPress");
- RegisterEventName(extEntry->eventBase + XI_DeviceKeyRelease,
- INAME ":DeviceKeyRelease");
- RegisterEventName(extEntry->eventBase + XI_DeviceButtonPress,
- INAME ":DeviceButtonPress");
- RegisterEventName(extEntry->eventBase + XI_DeviceButtonRelease,
- INAME ":DeviceButtonRelease");
- RegisterEventName(extEntry->eventBase + XI_DeviceMotionNotify,
- INAME ":DeviceMotionNotify");
- RegisterEventName(extEntry->eventBase + XI_DeviceFocusIn,
- INAME ":DeviceFocusIn");
- RegisterEventName(extEntry->eventBase + XI_DeviceFocusOut,
- INAME ":DeviceFocusOut");
- RegisterEventName(extEntry->eventBase + XI_ProximityIn,
- INAME ":ProximityIn");
- RegisterEventName(extEntry->eventBase + XI_ProximityOut,
- INAME ":ProximityOut");
- RegisterEventName(extEntry->eventBase + XI_DeviceStateNotify,
- INAME ":DeviceStateNotify");
- RegisterEventName(extEntry->eventBase + XI_DeviceMappingNotify,
- INAME ":DeviceMappingNotify");
- RegisterEventName(extEntry->eventBase + XI_ChangeDeviceNotify,
- INAME ":ChangeDeviceNotify");
- RegisterEventName(extEntry->eventBase + XI_DeviceKeystateNotify,
- INAME ":DeviceKeystateNotify");
- RegisterEventName(extEntry->eventBase + XI_DeviceButtonstateNotify,
- INAME ":DeviceButtonstateNotify");
- RegisterEventName(extEntry->eventBase + XI_DevicePresenceNotify,
- INAME ":DevicePresenceNotify");
-
- RegisterErrorName(extEntry->errorBase + XI_BadDevice,
- INAME ":BadDevice");
- RegisterErrorName(extEntry->errorBase + XI_BadEvent,
- INAME ":BadEvent");
- RegisterErrorName(extEntry->errorBase + XI_BadMode,
- INAME ":BadMode");
- RegisterErrorName(extEntry->errorBase + XI_DeviceBusy,
- INAME ":DeviceBusy");
- RegisterErrorName(extEntry->errorBase + XI_BadClass,
- INAME ":BadClass");
}
commit e86852aff62a861823b8e419434e0401b8cdc8e0
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 18:44:56 2007 -0500
Revert "registry: Register XFixes extension protocol names."
This reverts commit 106758893b68033f14f69c4ee6591fb6a149ba37.
Moving all the names into dix/registry.c
diff --git a/xfixes/xfixes.c b/xfixes/xfixes.c
index ccce7b9..0db4989 100755
--- a/xfixes/xfixes.c
+++ b/xfixes/xfixes.c
@@ -45,7 +45,6 @@
#endif
#include "xfixesint.h"
-#include "registry.h"
/*
* Must use these instead of the constants from xfixeswire.h. They advertise
@@ -258,80 +257,5 @@ XFixesExtensionInit(void)
(EventSwapPtr) SXFixesSelectionNotifyEvent;
EventSwapVector[XFixesEventBase + XFixesCursorNotify] =
(EventSwapPtr) SXFixesCursorNotifyEvent;
- } else
- return;
-
- RegisterRequestName(XFixesReqCode, X_XFixesQueryVersion,
- XFIXES_NAME ":QueryVersion");
- RegisterRequestName(XFixesReqCode, X_XFixesChangeSaveSet,
- XFIXES_NAME ":ChangeSaveSet");
- RegisterRequestName(XFixesReqCode, X_XFixesSelectSelectionInput,
- XFIXES_NAME ":SelectSelectionInput");
- RegisterRequestName(XFixesReqCode, X_XFixesSelectCursorInput,
- XFIXES_NAME ":SelectCursorInput");
- RegisterRequestName(XFixesReqCode, X_XFixesGetCursorImage,
- XFIXES_NAME ":GetCursorImage");
- /*************** Version 2 ******************/
- RegisterRequestName(XFixesReqCode, X_XFixesCreateRegion,
- XFIXES_NAME ":CreateRegion");
- RegisterRequestName(XFixesReqCode, X_XFixesCreateRegionFromBitmap,
- XFIXES_NAME ":CreateRegionFromBitmap");
- RegisterRequestName(XFixesReqCode, X_XFixesCreateRegionFromWindow,
- XFIXES_NAME ":CreateRegionFromWindow");
- RegisterRequestName(XFixesReqCode, X_XFixesCreateRegionFromGC,
- XFIXES_NAME ":CreateRegionFromGC");
- RegisterRequestName(XFixesReqCode, X_XFixesCreateRegionFromPicture,
- XFIXES_NAME ":CreateRegionFromPicture");
- RegisterRequestName(XFixesReqCode, X_XFixesDestroyRegion,
- XFIXES_NAME ":DestroyRegion");
- RegisterRequestName(XFixesReqCode, X_XFixesSetRegion,
- XFIXES_NAME ":SetRegion");
- RegisterRequestName(XFixesReqCode, X_XFixesCopyRegion,
- XFIXES_NAME ":CopyRegion");
- RegisterRequestName(XFixesReqCode, X_XFixesUnionRegion,
- XFIXES_NAME ":UnionRegion");
- RegisterRequestName(XFixesReqCode, X_XFixesIntersectRegion,
- XFIXES_NAME ":IntersectRegion");
- RegisterRequestName(XFixesReqCode, X_XFixesSubtractRegion,
- XFIXES_NAME ":SubtractRegion");
- RegisterRequestName(XFixesReqCode, X_XFixesInvertRegion,
- XFIXES_NAME ":InvertRegion");
- RegisterRequestName(XFixesReqCode, X_XFixesTranslateRegion,
- XFIXES_NAME ":TranslateRegion");
- RegisterRequestName(XFixesReqCode, X_XFixesRegionExtents,
- XFIXES_NAME ":RegionExtents");
- RegisterRequestName(XFixesReqCode, X_XFixesFetchRegion,
- XFIXES_NAME ":FetchRegion");
- RegisterRequestName(XFixesReqCode, X_XFixesSetGCClipRegion,
- XFIXES_NAME ":SetGCClipRegion");
- RegisterRequestName(XFixesReqCode, X_XFixesSetWindowShapeRegion,
- XFIXES_NAME ":SetWindowShapeRegion");
- RegisterRequestName(XFixesReqCode, X_XFixesSetPictureClipRegion,
- XFIXES_NAME ":SetPictureClipRegion");
- RegisterRequestName(XFixesReqCode, X_XFixesSetCursorName,
- XFIXES_NAME ":SetCursorName");
- RegisterRequestName(XFixesReqCode, X_XFixesGetCursorName,
- XFIXES_NAME ":GetCursorName");
- RegisterRequestName(XFixesReqCode, X_XFixesGetCursorImageAndName,
- XFIXES_NAME ":GetCursorImageAndName");
- RegisterRequestName(XFixesReqCode, X_XFixesChangeCursor,
- XFIXES_NAME ":ChangeCursor");
- RegisterRequestName(XFixesReqCode, X_XFixesChangeCursorByName,
- XFIXES_NAME ":ChangeCursorByName");
- /*************** Version 3 ******************/
- RegisterRequestName(XFixesReqCode, X_XFixesExpandRegion,
- XFIXES_NAME ":ExpandRegion");
- /*************** Version 4 ******************/
- RegisterRequestName(XFixesReqCode, X_XFixesHideCursor,
- XFIXES_NAME ":HideCursor");
- RegisterRequestName(XFixesReqCode, X_XFixesShowCursor,
- XFIXES_NAME ":ShowCursor");
-
- RegisterEventName(XFixesEventBase + XFixesSelectionNotify,
- XFIXES_NAME ":SelectionNotify");
- RegisterEventName(XFixesEventBase + XFixesCursorNotify,
- XFIXES_NAME ":CursorNotify");
-
- RegisterErrorName(XFixesErrorBase + BadRegion,
- XFIXES_NAME ":BadRegion");
+ }
}
commit 5269da2bde3cf4feb12fa2bd87bff6ee6d8730a1
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 18:43:38 2007 -0500
Revert "registry: Register XvMC extension protocol names."
This reverts commit 853ea337bdad17f8f6ec7d940de14ce2cbbbf93e.
Moving all the names into dix/registry.c
diff --git a/Xext/xvmc.c b/Xext/xvmc.c
index a1e0ed1..7ae8cc0 100644
--- a/Xext/xvmc.c
+++ b/Xext/xvmc.c
@@ -16,7 +16,6 @@
#include "scrnintstr.h"
#include "extnsionst.h"
#include "servermd.h"
-#include "registry.h"
#include <X11/Xfuncproto.h>
#include "xvdix.h"
#include <X11/extensions/XvMC.h>
@@ -701,34 +700,6 @@ XvMCExtensionInit(void)
XvMCReqCode = extEntry->base;
XvMCEventBase = extEntry->eventBase;
XvMCErrorBase = extEntry->errorBase;
-
- RegisterRequestName(XvMCReqCode, xvmc_QueryVersion,
- XvMCName ":QueryVersion");
- RegisterRequestName(XvMCReqCode, xvmc_ListSurfaceTypes,
- XvMCName ":ListSurfaceTypes");
- RegisterRequestName(XvMCReqCode, xvmc_CreateContext,
- XvMCName ":CreateContext");
- RegisterRequestName(XvMCReqCode, xvmc_DestroyContext,
- XvMCName ":DestroyContext");
- RegisterRequestName(XvMCReqCode, xvmc_CreateSurface,
- XvMCName ":CreateSurface");
- RegisterRequestName(XvMCReqCode, xvmc_DestroySurface,
- XvMCName ":DestroySurface");
- RegisterRequestName(XvMCReqCode, xvmc_CreateSubpicture,
- XvMCName ":CreateSubpicture");
- RegisterRequestName(XvMCReqCode, xvmc_DestroySubpicture,
- XvMCName ":DestroySubpicture");
- RegisterRequestName(XvMCReqCode, xvmc_ListSubpictureTypes,
- XvMCName ":ListSubpictureTypes");
- RegisterRequestName(XvMCReqCode, xvmc_GetDRInfo,
- XvMCName ":GetDRInfo");
-
- RegisterErrorName(XvMCErrorBase + XvMCBadContext,
- XvMCName ":BadContext");
- RegisterErrorName(XvMCErrorBase + XvMCBadSurface,
- XvMCName ":BadSurface");
- RegisterErrorName(XvMCErrorBase + XvMCBadSubpicture,
- XvMCName ":BadSubpicture");
}
static Bool
commit 03a86c8d5e20a6e47f3c294f0087f205cf2a72dd
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 18:42:19 2007 -0500
Revert "registry: Register Xv extension protocol names."
This reverts commit 12766c5b5ffdab95255a63b2c8421ee773fd43b5.
Moving all the names into dix/registry.c
diff --git a/Xext/xvmain.c b/Xext/xvmain.c
index b3449b4..a2fc108 100644
--- a/Xext/xvmain.c
+++ b/Xext/xvmain.c
@@ -92,7 +92,6 @@ SOFTWARE.
#include "resource.h"
#include "opaque.h"
#include "input.h"
-#include "registry.h"
#define GLOBAL
@@ -196,58 +195,6 @@ XvExtensionInit(void)
(void)MakeAtom(XvName, strlen(XvName), xTrue);
- RegisterRequestName(XvReqCode, xv_QueryExtension,
- XvName ":QueryExtension");
- RegisterRequestName(XvReqCode, xv_QueryAdaptors,
- XvName ":QueryAdaptors");
- RegisterRequestName(XvReqCode, xv_QueryEncodings,
- XvName ":QueryEncodings");
- RegisterRequestName(XvReqCode, xv_GrabPort,
- XvName ":GrabPort");
- RegisterRequestName(XvReqCode, xv_UngrabPort,
- XvName ":UngrabPort");
- RegisterRequestName(XvReqCode, xv_PutVideo,
- XvName ":PutVideo");
- RegisterRequestName(XvReqCode, xv_PutStill,
- XvName ":PutStill");
- RegisterRequestName(XvReqCode, xv_GetVideo,
- XvName ":GetVideo");
- RegisterRequestName(XvReqCode, xv_GetStill,
- XvName ":GetStill");
- RegisterRequestName(XvReqCode, xv_StopVideo,
- XvName ":StopVideo");
- RegisterRequestName(XvReqCode, xv_SelectVideoNotify,
- XvName ":SelectVideoNotify");
- RegisterRequestName(XvReqCode, xv_SelectPortNotify,
- XvName ":SelectPortNotify");
- RegisterRequestName(XvReqCode, xv_QueryBestSize,
- XvName ":QueryBestSize");
- RegisterRequestName(XvReqCode, xv_SetPortAttribute,
- XvName ":SetPortAttribute");
- RegisterRequestName(XvReqCode, xv_GetPortAttribute,
- XvName ":GetPortAttribute");
- RegisterRequestName(XvReqCode, xv_QueryPortAttributes,
- XvName ":QueryPortAttributes");
- RegisterRequestName(XvReqCode, xv_ListImageFormats,
- XvName ":ListImageFormats");
- RegisterRequestName(XvReqCode, xv_QueryImageAttributes,
- XvName ":QueryImageAttributes");
- RegisterRequestName(XvReqCode, xv_PutImage,
- XvName ":PutImage");
- RegisterRequestName(XvReqCode, xv_ShmPutImage,
- XvName ":ShmPutImage");
-
- RegisterEventName(XvEventBase + XvVideoNotify,
- XvName ":VideoNotify");
- RegisterEventName(XvEventBase + XvPortNotify,
- XvName ":PortNotify");
-
- RegisterErrorName(XvErrorBase + XvBadPort,
- XvName ":BadPort");
- RegisterErrorName(XvErrorBase + XvBadEncoding,
- XvName ":BadEncoding");
- RegisterErrorName(XvErrorBase + XvBadControl,
- XvName ":BadControl");
}
}
commit edcf490cdb965e2a5bfc0169c01732d2924da3ae
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 18:41:10 2007 -0500
registry: Remove registry code from XTest extension.
Moving all the names into dix/registry.c
diff --git a/Xext/xtest.c b/Xext/xtest.c
index effa3b9..8e1732c 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -42,7 +42,6 @@ from The Open Group.
#include "scrnintstr.h"
#include "dixevents.h"
#include "sleepuntil.h"
-#include "registry.h"
#define _XTEST_SERVER_
#include <X11/extensions/XTest.h>
#include <X11/extensions/xteststr.h>
@@ -85,21 +84,9 @@ static DISPATCH_PROC(SProcXTestGrabControl);
void
XTestExtensionInit(INITARGS)
{
- ExtensionEntry *extEntry;
-
- if (!(extEntry = AddExtension(XTestExtensionName, 0, 0,
- ProcXTestDispatch, SProcXTestDispatch,
- XTestResetProc, StandardMinorOpcode)))
- return;
-
- RegisterRequestName(extEntry->base, X_XTestGetVersion,
- XTestExtensionName ":GetVersion");
- RegisterRequestName(extEntry->base, X_XTestCompareCursor,
- XTestExtensionName ":CompareCursor");
- RegisterRequestName(extEntry->base, X_XTestFakeInput,
- XTestExtensionName ":FakeInput");
- RegisterRequestName(extEntry->base, X_XTestGrabControl,
- XTestExtensionName ":GrabControl");
+ AddExtension(XTestExtensionName, 0, 0,
+ ProcXTestDispatch, SProcXTestDispatch,
+ XTestResetProc, StandardMinorOpcode))
}
/*ARGSUSED*/
commit 5fea1ed50f37691a5273bf2897479781de808ff5
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 18:39:48 2007 -0500
registry: Remove registry code from SELinux extension.
Moving all the names into dix/registry.c
diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index cefde9d..8f52c1e 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -1399,28 +1399,4 @@ XSELinuxExtensionInit(INITARGS)
/* Label objects that were created before we could register ourself */
SELinuxLabelInitial();
-
- /* Add names to registry */
- RegisterRequestName(extEntry->base, X_SELinuxQueryVersion,
- XSELINUX_EXTENSION_NAME ":SELinuxQueryVersion");
- RegisterRequestName(extEntry->base, X_SELinuxSetSelectionManager,
- XSELINUX_EXTENSION_NAME ":SELinuxSetSelectionManager");
- RegisterRequestName(extEntry->base, X_SELinuxGetSelectionManager,
- XSELINUX_EXTENSION_NAME ":SELinuxGetSelectionManager");
- RegisterRequestName(extEntry->base, X_SELinuxSetDeviceContext,
- XSELINUX_EXTENSION_NAME ":SELinuxSetDeviceContext");
- RegisterRequestName(extEntry->base, X_SELinuxGetDeviceContext,
- XSELINUX_EXTENSION_NAME ":SELinuxGetDeviceContext");
- RegisterRequestName(extEntry->base, X_SELinuxSetPropertyCreateContext,
- XSELINUX_EXTENSION_NAME ":SELinuxSetPropertyCreateContext");
- RegisterRequestName(extEntry->base, X_SELinuxGetPropertyCreateContext,
- XSELINUX_EXTENSION_NAME ":SELinuxGetPropertyCreateContext");
- RegisterRequestName(extEntry->base, X_SELinuxGetPropertyContext,
- XSELINUX_EXTENSION_NAME ":SELinuxGetPropertyContext");
- RegisterRequestName(extEntry->base, X_SELinuxSetWindowCreateContext,
- XSELINUX_EXTENSION_NAME ":SELinuxSetWindowCreateContext");
- RegisterRequestName(extEntry->base, X_SELinuxGetWindowCreateContext,
- XSELINUX_EXTENSION_NAME ":SELinuxGetWindowCreateContext");
- RegisterRequestName(extEntry->base, X_SELinuxGetWindowContext,
- XSELINUX_EXTENSION_NAME ":SELinuxGetWindowContext");
}
commit 9a8af33718d085656a672e4c27df200485c84154
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 18:38:24 2007 -0500
Revert "registry: Register Resource extension protocol names."
This reverts commit 5c8b1a91726817816d20faefad21c7a68ab634cc.
Moving all the names into dix/registry.c
diff --git a/Xext/xres.c b/Xext/xres.c
index efa6c49..243460c 100644
--- a/Xext/xres.c
+++ b/Xext/xres.c
@@ -17,7 +17,6 @@
#include "dixstruct.h"
#include "extnsionst.h"
#include "swaprep.h"
-#include "registry.h"
#include <X11/extensions/XResproto.h>
#include "pixmapstr.h"
#include "windowstr.h"
@@ -388,18 +387,7 @@ SProcResDispatch (ClientPtr client)
void
ResExtensionInit(INITARGS)
{
- ExtensionEntry *extEntry;
-
- extEntry = AddExtension(XRES_NAME, 0, 0,
+ (void) AddExtension(XRES_NAME, 0, 0,
ProcResDispatch, SProcResDispatch,
ResResetProc, StandardMinorOpcode);
-
- RegisterRequestName(extEntry->base, X_XResQueryVersion,
- XRES_NAME ":QueryVersion");
- RegisterRequestName(extEntry->base, X_XResQueryClients,
- XRES_NAME ":QueryClients");
- RegisterRequestName(extEntry->base, X_XResQueryClientResources,
- XRES_NAME ":QueryClientResources");
- RegisterRequestName(extEntry->base, X_XResQueryClientPixmapBytes,
- XRES_NAME ":QueryClientPixmapBytes");
}
commit e6023e0208fae8f19c566f9df1a8aa20494f40ab
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 18:36:49 2007 -0500
Revert "registry: Register XPrint extension protocol names."
This reverts commit f077578e42eee424b0e534774574c84af9d6f85b.
Moving all the names into dix/registry.c
diff --git a/Xext/xprint.c b/Xext/xprint.c
index 48559dd..ef51118 100644
--- a/Xext/xprint.c
+++ b/Xext/xprint.c
@@ -80,7 +80,6 @@ copyright holders.
#include "pixmapstr.h"
#include "extnsionst.h"
#include "dixstruct.h"
-#include "registry.h"
#include <X11/Xatom.h>
#include <X11/extensions/Print.h>
#include <X11/extensions/Printstr.h>
@@ -311,69 +310,6 @@ XpExtensionInit(INITARGS)
screenInfo.screens[i]->CloseScreen = XpCloseScreen;
}
}
-
- RegisterRequestName(XpReqCode, X_PrintQueryVersion,
- XP_PRINTNAME ":QueryVersion");
- RegisterRequestName(XpReqCode, X_PrintGetPrinterList,
- XP_PRINTNAME ":GetPrinterList");
- RegisterRequestName(XpReqCode, X_PrintCreateContext,
- XP_PRINTNAME ":CreateContext");
- RegisterRequestName(XpReqCode, X_PrintSetContext,
- XP_PRINTNAME ":SetContext");
- RegisterRequestName(XpReqCode, X_PrintGetContext,
- XP_PRINTNAME ":GetContext");
- RegisterRequestName(XpReqCode, X_PrintDestroyContext,
- XP_PRINTNAME ":DestroyContext");
- RegisterRequestName(XpReqCode, X_PrintGetContextScreen,
- XP_PRINTNAME ":GetContextScreen");
- RegisterRequestName(XpReqCode, X_PrintStartJob,
- XP_PRINTNAME ":StartJob");
- RegisterRequestName(XpReqCode, X_PrintEndJob,
- XP_PRINTNAME ":EndJob");
- RegisterRequestName(XpReqCode, X_PrintStartDoc,
- XP_PRINTNAME ":StartDoc");
- RegisterRequestName(XpReqCode, X_PrintEndDoc,
- XP_PRINTNAME ":EndDoc");
- RegisterRequestName(XpReqCode, X_PrintPutDocumentData,
- XP_PRINTNAME ":PutDocumentData");
- RegisterRequestName(XpReqCode, X_PrintGetDocumentData,
- XP_PRINTNAME ":GetDocumentData");
- RegisterRequestName(XpReqCode, X_PrintStartPage,
- XP_PRINTNAME ":StartPage");
- RegisterRequestName(XpReqCode, X_PrintEndPage,
- XP_PRINTNAME ":EndPage");
- RegisterRequestName(XpReqCode, X_PrintSelectInput,
- XP_PRINTNAME ":SelectInput");
- RegisterRequestName(XpReqCode, X_PrintInputSelected,
- XP_PRINTNAME ":InputSelected");
- RegisterRequestName(XpReqCode, X_PrintGetAttributes,
- XP_PRINTNAME ":GetAttributes");
- RegisterRequestName(XpReqCode, X_PrintSetAttributes,
- XP_PRINTNAME ":SetAttributes");
- RegisterRequestName(XpReqCode, X_PrintGetOneAttribute,
- XP_PRINTNAME ":GetOneAttribute");
- RegisterRequestName(XpReqCode, X_PrintRehashPrinterList,
- XP_PRINTNAME ":RehashPrinterList");
- RegisterRequestName(XpReqCode, X_PrintGetPageDimensions,
- XP_PRINTNAME ":GetPageDimensions");
- RegisterRequestName(XpReqCode, X_PrintQueryScreens,
- XP_PRINTNAME ":QueryScreens");
- RegisterRequestName(XpReqCode, X_PrintSetImageResolution,
- XP_PRINTNAME ":SetImageResolution");
- RegisterRequestName(XpReqCode, X_PrintGetImageResolution,
- XP_PRINTNAME ":GetImageResolution");
-
- RegisterEventName(XpEventBase + XPPrintNotify,
- XP_PRINTNAME ":PrintNotify");
- RegisterEventName(XpEventBase + XPAttributeNotify,
- XP_PRINTNAME ":AttributeNotify");
-
- RegisterErrorName(XpErrorBase + XPBadContext,
- XP_PRINTNAME ":BadContext");
- RegisterErrorName(XpErrorBase + XPBadSequence,
- XP_PRINTNAME ":BadSequence");
- RegisterErrorName(XpErrorBase + XPBadResourceID,
- XP_PRINTNAME ":BadResourceID");
}
static void
commit 277345fb7065d74c3b0d076382affb78cbe67569
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 18:35:57 2007 -0500
registry: Remove registry code from XF86Bigfont extension.
Moving all the names into dix/registry.c
diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c
index e2f5890..3362742 100644
--- a/Xext/xf86bigfont.c
+++ b/Xext/xf86bigfont.c
@@ -71,7 +71,6 @@
#include "gcstruct.h"
#include "dixfontstr.h"
#include "extnsionst.h"
-#include "registry.h"
#define _XF86BIGFONT_SERVER_
#include <X11/extensions/xf86bigfstr.h>
@@ -186,13 +185,7 @@ XFree86BigfontExtensionInit()
# endif
#endif
#endif
- } else
- return;
-
- RegisterRequestName(extEntry->base, X_XF86BigfontQueryVersion,
- XF86BIGFONTNAME ":QueryVersion");
- RegisterRequestName(extEntry->base, X_XF86BigfontQueryFont,
- XF86BIGFONTNAME ":QueryFont");
+ }
}
commit bf27edd365ffd275e5453f44d130eeacbfe0ecd9
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 18:34:14 2007 -0500
Revert "registry: Register EVIE extension protocol names."
This reverts commit 48891d5696f56711f23743cb03be39cf6b26c522.
Moving all the names into dix/registry.c
diff --git a/Xext/xevie.c b/Xext/xevie.c
index 8dc1678..7dd67bb 100644
--- a/Xext/xevie.c
+++ b/Xext/xevie.c
@@ -45,7 +45,6 @@ of the copyright holder.
#include "colormapst.h"
#include "scrnintstr.h"
#include "servermd.h"
-#include "registry.h"
#define _XEVIE_SERVER_
#include <X11/extensions/Xeviestr.h>
#include <X11/Xfuncproto.h>
@@ -147,21 +146,9 @@ XevieExtensionInit (void)
StandardMinorOpcode))) {
ReqCode = (unsigned char)extEntry->base;
ErrorBase = extEntry->errorBase;
- } else
- return;
+ }
/* PC servers initialize the desktop colors (citems) here! */
-
- RegisterRequestName(ReqCode, X_XevieQueryVersion,
- XEVIENAME ":QueryVersion");
- RegisterRequestName(ReqCode, X_XevieStart,
- XEVIENAME ":Start");
- RegisterRequestName(ReqCode, X_XevieEnd,
- XEVIENAME ":End");
- RegisterRequestName(ReqCode, X_XevieSend,
- XEVIENAME ":Send");
- RegisterRequestName(ReqCode, X_XevieSelectInput,
- XEVIENAME ":SelectInput");
}
/*ARGSUSED*/
commit 687427179420b18a55a1a02b8a9f2a32ea8eac8d
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 18:32:54 2007 -0500
registry: Remove registry code from XC-MISC extension.
Moving all the names into dix/registry.c
diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c
index ba0402c..44d2b19 100644
--- a/Xext/xcmisc.c
+++ b/Xext/xcmisc.c
@@ -39,7 +39,6 @@ from The Open Group.
#include "dixstruct.h"
#include "extnsionst.h"
#include "swaprep.h"
-#include "registry.h"
#include <X11/extensions/xcmiscstr.h>
#include "modinit.h"
@@ -65,19 +64,9 @@ static DISPATCH_PROC(SProcXCMiscGetXIDRange);
void
XCMiscExtensionInit(INITARGS)
{
- ExtensionEntry *extEntry;
-
- if (!(extEntry = AddExtension(XCMiscExtensionName, 0, 0,
- ProcXCMiscDispatch, SProcXCMiscDispatch,
- XCMiscResetProc, StandardMinorOpcode)))
- return;
-
- RegisterRequestName(extEntry->base, X_XCMiscGetVersion,
- XCMiscExtensionName ":GetVersion");
- RegisterRequestName(extEntry->base, X_XCMiscGetXIDRange,
- XCMiscExtensionName ":GetXIDRange");
- RegisterRequestName(extEntry->base, X_XCMiscGetXIDList,
- XCMiscExtensionName ":GetXIDList");
+ AddExtension(XCMiscExtensionName, 0, 0,
+ ProcXCMiscDispatch, SProcXCMiscDispatch,
+ XCMiscResetProc, StandardMinorOpcode))
}
/*ARGSUSED*/
commit 4b0274e8f712e51b18618a2a0bdbe03b17b9736b
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 18:25:15 2007 -0500
Revert "registry: Register SYNC extension protocol names."
This reverts commit 9f597f6c87e0b14cc382d8e5929e42f822db4329.
Moving all the names into dix/registry.c
diff --git a/Xext/sync.c b/Xext/sync.c
index 7290147..10d4481 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -67,7 +67,6 @@ PERFORMANCE OF THIS SOFTWARE.
#include "dixstruct.h"
#include "resource.h"
#include "opaque.h"
-#include "registry.h"
#define _SYNC_SERVER
#include <X11/extensions/sync.h>
#include <X11/extensions/syncstr.h>
@@ -2412,45 +2411,6 @@ SyncExtensionInit(INITARGS)
fprintf(stderr, "Sync Extension %d.%d\n",
SYNC_MAJOR_VERSION, SYNC_MINOR_VERSION);
#endif
-
- RegisterRequestName(extEntry->base, X_SyncInitialize,
- SYNC_NAME ":Initialize");
- RegisterRequestName(extEntry->base, X_SyncListSystemCounters,
- SYNC_NAME ":ListSystemCounters");
- RegisterRequestName(extEntry->base, X_SyncCreateCounter,
- SYNC_NAME ":CreateCounter");
- RegisterRequestName(extEntry->base, X_SyncSetCounter,
- SYNC_NAME ":SetCounter");
- RegisterRequestName(extEntry->base, X_SyncChangeCounter,
- SYNC_NAME ":ChangeCounter");
- RegisterRequestName(extEntry->base, X_SyncQueryCounter,
- SYNC_NAME ":QueryCounter");
- RegisterRequestName(extEntry->base, X_SyncDestroyCounter,
- SYNC_NAME ":DestroyCounter");
- RegisterRequestName(extEntry->base, X_SyncAwait,
- SYNC_NAME ":Await");
- RegisterRequestName(extEntry->base, X_SyncCreateAlarm,
- SYNC_NAME ":CreateAlarm");
- RegisterRequestName(extEntry->base, X_SyncChangeAlarm,
- SYNC_NAME ":ChangeAlarm");
- RegisterRequestName(extEntry->base, X_SyncQueryAlarm,
- SYNC_NAME ":QueryAlarm");
- RegisterRequestName(extEntry->base, X_SyncDestroyAlarm,
- SYNC_NAME ":DestroyAlarm");
- RegisterRequestName(extEntry->base, X_SyncSetPriority,
- SYNC_NAME ":SetPriority");
- RegisterRequestName(extEntry->base, X_SyncGetPriority,
- SYNC_NAME ":GetPriority");
-
- RegisterEventName(SyncEventBase + XSyncCounterNotify,
- SYNC_NAME ":CounterNotify");
- RegisterEventName(SyncEventBase + XSyncAlarmNotify,
- SYNC_NAME ":AlarmNotify");
-
- RegisterErrorName(SyncErrorBase + XSyncBadCounter,
- SYNC_NAME ":BadCounter");
- RegisterErrorName(SyncErrorBase + XSyncBadAlarm,
- SYNC_NAME ":BadAlarm");
}
commit 4c7cf5aa4c802dcde895c723879a80a87620c0f7
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 18:23:57 2007 -0500
Revert "registry: Register SHM extension protocol names."
This reverts commit 2c9646ad4e65bb061d910c9e2b1a8a978f21fa17.
Moving all the names to dix/registry.c
diff --git a/Xext/shm.c b/Xext/shm.c
index dfe759f..e3d7a23 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -59,7 +59,6 @@ in this Software without prior written authorization from The Open Group.
#include "servermd.h"
#include "shmint.h"
#include "xace.h"
-#include "registry.h"
#define _XSHM_SERVER_
#include <X11/extensions/shmstr.h>
#include <X11/Xfuncproto.h>
@@ -274,27 +273,7 @@ ShmExtensionInit(INITARGS)
ShmCompletionCode = extEntry->eventBase;
BadShmSegCode = extEntry->errorBase;
EventSwapVector[ShmCompletionCode] = (EventSwapPtr) SShmCompletionEvent;
- } else
- return;
-
- RegisterRequestName(ShmReqCode, X_ShmQueryVersion,
- SHMNAME ":QueryVersion");
- RegisterRequestName(ShmReqCode, X_ShmAttach,
- SHMNAME ":Attach");
- RegisterRequestName(ShmReqCode, X_ShmDetach,
- SHMNAME ":Detach");
- RegisterRequestName(ShmReqCode, X_ShmPutImage,
- SHMNAME ":PutImage");
- RegisterRequestName(ShmReqCode, X_ShmGetImage,
- SHMNAME ":GetImage");
- RegisterRequestName(ShmReqCode, X_ShmCreatePixmap,
- SHMNAME ":CreatePixmap");
-
- RegisterEventName(extEntry->eventBase + ShmCompletion,
- SHMNAME ":Completion");
-
- RegisterErrorName(extEntry->errorBase + BadShmSeg,
- SHMNAME ":BadShmSeg");
+ }
}
/*ARGSUSED*/
commit 67e82e306f67a215c6c89868cc1d3649747bd93d
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 18:22:59 2007 -0500
Revert "registry: Register SHAPE extension protocol names."
This reverts commit 4e274e90e16b1d954391e1af3e2074fb10f70ee7.
Moving all the names to dix/registry.c
diff --git a/Xext/shape.c b/Xext/shape.c
index 567737c..e84eb34 100644
--- a/Xext/shape.c
+++ b/Xext/shape.c
@@ -43,7 +43,6 @@ in this Software without prior written authorization from The Open Group.
#include "dixstruct.h"
#include "resource.h"
#include "opaque.h"
-#include "registry.h"
#define _SHAPE_SERVER_ /* don't want Xlib structures */
#include <X11/extensions/shapestr.h>
#include "regionstr.h"
@@ -112,6 +111,9 @@ static DISPATCH_PROC(SProcShapeSelectInput);
#include "panoramiXsrv.h"
#endif
+#if 0
+static unsigned char ShapeReqCode = 0;
+#endif
static int ShapeEventBase = 0;
static RESTYPE ClientType, EventType; /* resource types for event masks */
@@ -152,32 +154,12 @@ ShapeExtensionInit(void)
ProcShapeDispatch, SProcShapeDispatch,
ShapeResetProc, StandardMinorOpcode)))
{
+#if 0
+ ShapeReqCode = (unsigned char)extEntry->base;
+#endif
ShapeEventBase = extEntry->eventBase;
EventSwapVector[ShapeEventBase] = (EventSwapPtr) SShapeNotifyEvent;
- } else
- return;
-
- RegisterRequestName(extEntry->base, X_ShapeQueryVersion,
- SHAPENAME ":QueryVersion");
- RegisterRequestName(extEntry->base, X_ShapeRectangles,
- SHAPENAME ":Rectangles");
- RegisterRequestName(extEntry->base, X_ShapeMask,
- SHAPENAME ":Mask");
- RegisterRequestName(extEntry->base, X_ShapeCombine,
- SHAPENAME ":Combine");
- RegisterRequestName(extEntry->base, X_ShapeOffset,
- SHAPENAME ":Offset");
- RegisterRequestName(extEntry->base, X_ShapeQueryExtents,
- SHAPENAME ":QueryExtents");
- RegisterRequestName(extEntry->base, X_ShapeSelectInput,
- SHAPENAME ":SelectInput");
- RegisterRequestName(extEntry->base, X_ShapeInputSelected,
- SHAPENAME ":InputSelected");
- RegisterRequestName(extEntry->base, X_ShapeGetRectangles,
- SHAPENAME ":GetRectangles");
-
- RegisterEventName(ShapeEventBase + ShapeNotify,
- SHAPENAME ":Notify");
+ }
}
/*ARGSUSED*/
commit 8583bf78ad056ffe2d83b54e5c9a0a217e425a7b
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 18:21:09 2007 -0500
registry: Remove registry code from XC-SECURITY extension.
Moving all the names to dix/registry.c
diff --git a/Xext/security.c b/Xext/security.c
index eef4f69..6aab3a3 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -1114,20 +1114,4 @@ SecurityExtensionInit(INITARGS)
/* Label objects that were created before we could register ourself */
SecurityLabelInitial();
-
- /* Register protocol names */
- RegisterRequestName(extEntry->base, X_SecurityQueryVersion,
- SECURITY_EXTENSION_NAME ":QueryVersion");
- RegisterRequestName(extEntry->base, X_SecurityGenerateAuthorization,
- SECURITY_EXTENSION_NAME ":GenerateAuthorization");
- RegisterRequestName(extEntry->base, X_SecurityRevokeAuthorization,
- SECURITY_EXTENSION_NAME ":RevokeAuthorization");
-
- RegisterEventName(SecurityEventBase + XSecurityAuthorizationRevoked,
- SECURITY_EXTENSION_NAME ":AuthorizationRevoked");
-
- RegisterErrorName(SecurityErrorBase + XSecurityBadAuthorization,
- SECURITY_EXTENSION_NAME ":BadAuthorization");
- RegisterErrorName(SecurityErrorBase + XSecurityBadAuthorizationProtocol,
- SECURITY_EXTENSION_NAME ":BadAuthorizationProtocol");
}
commit 55744d8e5d7bf1ff27cd25de54e14e799dd1a70a
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 18:19:44 2007 -0500
Revert "registry: Register MIT-SCREEN-SAVER extension protocol names."
This reverts commit 58c3240fcbec23aad122e1c340f6bb6d3b18f779.
Moving all the names into dix/registry.c
diff --git a/Xext/saver.c b/Xext/saver.c
index 43dd3e2..20dbc92 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -49,7 +49,6 @@ in this Software without prior written authorization from the X Consortium.
#include "cursorstr.h"
#include "colormapst.h"
#include "xace.h"
-#include "registry.h"
#ifdef PANORAMIX
#include "panoramiX.h"
#include "panoramiXsrv.h"
@@ -63,6 +62,9 @@ in this Software without prior written authorization from the X Consortium.
#include "modinit.h"
+#if 0
+static unsigned char ScreenSaverReqCode = 0;
+#endif
static int ScreenSaverEventBase = 0;
static DISPATCH_PROC(ProcScreenSaverQueryInfo);
@@ -272,26 +274,12 @@ ScreenSaverExtensionInit(INITARGS)
ProcScreenSaverDispatch, SProcScreenSaverDispatch,
ScreenSaverResetProc, StandardMinorOpcode)))
{
+#if 0
+ ScreenSaverReqCode = (unsigned char)extEntry->base;
+#endif
ScreenSaverEventBase = extEntry->eventBase;
EventSwapVector[ScreenSaverEventBase] = (EventSwapPtr) SScreenSaverNotifyEvent;
- } else
- return;
-
- RegisterRequestName(extEntry->base, X_ScreenSaverQueryVersion,
- ScreenSaverName ":QueryVersion");
- RegisterRequestName(extEntry->base, X_ScreenSaverQueryInfo,
- ScreenSaverName ":QueryInfo");
- RegisterRequestName(extEntry->base, X_ScreenSaverSelectInput,
- ScreenSaverName ":SelectInput");
- RegisterRequestName(extEntry->base, X_ScreenSaverSetAttributes,
- ScreenSaverName ":SetAttributes");
- RegisterRequestName(extEntry->base, X_ScreenSaverUnsetAttributes,
- ScreenSaverName ":UnsetAttributes");
- RegisterRequestName(extEntry->base, X_ScreenSaverSuspend,
- ScreenSaverName ":Suspend");
-
- RegisterEventName(ScreenSaverEventBase + ScreenSaverNotify,
- ScreenSaverName ":Notify");
+ }
}
/*ARGSUSED*/
commit 36ef45928c783292cef18acfdd83ae057826c989
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 18:18:01 2007 -0500
registry: Remove registry code from MIT-MISC extension.
Moving all the names to dix/registry.c
diff --git a/Xext/mitmisc.c b/Xext/mitmisc.c
index 0b23152..a5f3b0f 100644
--- a/Xext/mitmisc.c
+++ b/Xext/mitmisc.c
@@ -38,7 +38,6 @@ in this Software without prior written authorization from The Open Group.
#include "os.h"
#include "dixstruct.h"
#include "extnsionst.h"
-#include "registry.h"
#define _MITMISC_SERVER_
#include <X11/extensions/mitmiscstr.h>
#include "modinit.h"
@@ -57,17 +56,9 @@ static DISPATCH_PROC(SProcMITSetBugMode);
void
MITMiscExtensionInit(INITARGS)
{
- ExtensionEntry *extEntry;
-
- if (!(extEntry = AddExtension(MITMISCNAME, 0, 0,
- ProcMITDispatch, SProcMITDispatch,
- MITResetProc, StandardMinorOpcode)))
- return;
-
- RegisterRequestName(extEntry->base, X_MITSetBugMode,
- MITMISCNAME ":SetBugMode");
- RegisterRequestName(extEntry->base, X_MITGetBugMode,
- MITMISCNAME ":GetBugMode");
+ AddExtension(MITMISCNAME, 0, 0,
+ ProcMITDispatch, SProcMITDispatch,
+ MITResetProc, StandardMinorOpcode)))
}
/*ARGSUSED*/
commit 816e6e612e4bc3cea1e67e7ea79d5b640458011f
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 18:15:37 2007 -0500
Revert "registry: Register Multibuffer extension protocol names."
This reverts commit 3877faf7d9fe00ed634077e38a198ae4b91a2bb4.
Moving all the names into dix/registry.c
diff --git a/Xext/mbuf.c b/Xext/mbuf.c
index ba99f3f..9f17c86 100644
--- a/Xext/mbuf.c
+++ b/Xext/mbuf.c
@@ -43,7 +43,6 @@ in this Software without prior written authorization from The Open Group.
#include "resource.h"
#include "opaque.h"
#include "sleepuntil.h"
-#include "registry.h"
#define _MULTIBUF_SERVER_ /* don't want Xlib structures */
#include <X11/extensions/multibufst.h>
@@ -255,39 +254,7 @@ MultibufferExtensionInit()
MultibufferErrorBase = extEntry->errorBase;
EventSwapVector[MultibufferEventBase + MultibufferClobberNotify] = (EventSwapPtr) SClobberNotifyEvent;
EventSwapVector[MultibufferEventBase + MultibufferUpdateNotify] = (EventSwapPtr) SUpdateNotifyEvent;
- } else
- return;
-
- RegisterRequestName(extEntry->base, X_MbufGetBufferVersion,
- MULTIBUFFER_PROTOCOL_NAME ":GetBufferVersion");
- RegisterRequestName(extEntry->base, X_MbufCreateImageBuffers,
- MULTIBUFFER_PROTOCOL_NAME ":CreateImageBuffers");
- RegisterRequestName(extEntry->base, X_MbufDestroyImageBuffers,
- MULTIBUFFER_PROTOCOL_NAME ":DestroyImageBuffers");
- RegisterRequestName(extEntry->base, X_MbufDisplayImageBuffers,
- MULTIBUFFER_PROTOCOL_NAME ":DisplayImageBuffers");
- RegisterRequestName(extEntry->base, X_MbufSetMBufferAttributes,
- MULTIBUFFER_PROTOCOL_NAME ":SetMBufferAttributes");
- RegisterRequestName(extEntry->base, X_MbufGetMBufferAttributes,
- MULTIBUFFER_PROTOCOL_NAME ":GetMBufferAttributes");
- RegisterRequestName(extEntry->base, X_MbufSetBufferAttributes,
- MULTIBUFFER_PROTOCOL_NAME ":SetBufferAttributes");
- RegisterRequestName(extEntry->base, X_MbufGetBufferAttributes,
- MULTIBUFFER_PROTOCOL_NAME ":GetBufferAttributes");
- RegisterRequestName(extEntry->base, X_MbufGetBufferInfo,
- MULTIBUFFER_PROTOCOL_NAME ":GetBufferInfo");
- RegisterRequestName(extEntry->base, X_MbufCreateStereoWindow,
- MULTIBUFFER_PROTOCOL_NAME ":CreateStereoWindow");
- RegisterRequestName(extEntry->base, X_MbufClearImageBufferArea,
- MULTIBUFFER_PROTOCOL_NAME ":ClearImageBufferArea");
-
- RegisterEventName(MultibufferEventBase + MultibufferClobberNotify,
- MULTIBUFFER_PROTOCOL_NAME ":ClobberNotify");
- RegisterEventName(MultibufferEventBase + MultibufferUpdateNotify,
- MULTIBUFFER_PROTOCOL_NAME ":UpdateNotify");
-
- RegisterErrorName(MultibufferErrorBase + BadBuffer,
- MULTIBUFFER_PROTOCOL_NAME ":BadBuffer");
+ }
}
/*ARGSUSED*/
commit 40a0da044e911ea51de003f3621331ffbe2842bc
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 18:13:43 2007 -0500
registry: Remove registry code from Fontcache extension.
Moving all the names into dix/registry.c
diff --git a/Xext/fontcache.c b/Xext/fontcache.c
index 9fae2d7..06b0c85 100644
--- a/Xext/fontcache.c
+++ b/Xext/fontcache.c
@@ -42,7 +42,6 @@
#include "scrnintstr.h"
#include "inputstr.h"
#include "servermd.h"
-#include "registry.h"
#define _FONTCACHE_SERVER_
#include <X11/extensions/fontcacheP.h>
#include <X11/extensions/fontcachstr.h>
@@ -71,31 +70,9 @@ static DISPATCH_PROC(SProcFontCacheChangeCacheSettings);
void
FontCacheExtensionInit(INITARGS)
{
- ExtensionEntry* extEntry;
-
- if (!
- (extEntry = AddExtension(FONTCACHENAME,
- FontCacheNumberEvents,
- FontCacheNumberErrors,
- ProcFontCacheDispatch,
- SProcFontCacheDispatch,
- FontCacheResetProc,
- StandardMinorOpcode)))
- return;
-
- RegisterRequestName(extEntry->base, X_FontCacheQueryVersion,
- FONTCACHENAME ":QueryVersion");
- RegisterRequestName(extEntry->base, X_FontCacheGetCacheSettings,
- FONTCACHENAME ":GetCacheSettings");
- RegisterRequestName(extEntry->base, X_FontCacheChangeCacheSettings,
- FONTCACHENAME ":ChangeCacheSettings");
- RegisterRequestName(extEntry->base, X_FontCacheGetCacheStatistics,
- FONTCACHENAME ":GetCacheStatistics");
-
- RegisterErrorName(extEntry->errorBase + FontCacheBadProtocol,
- FONTCACHENAME ":BadProtocol");
- RegisterErrorName(extEntry->errorBase + FontCacheCannotAllocMemory,
- FONTCACHENAME ":CannotAllocMemory");
+ AddExtension(FONTCACHENAME, FontCacheNumberEvents, FontCacheNumberErrors,
+ ProcFontCacheDispatch, SProcFontCacheDispatch,
+ FontCacheResetProc, StandardMinorOpcode)))
}
/*ARGSUSED*/
commit 46412baf60ed639ddc1d5fb601f73a75e39737f7
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 18:11:06 2007 -0500
registry: Remove registry code from EVI extension.
Moving all the names into dix/registry.c
diff --git a/Xext/EVI.c b/Xext/EVI.c
index b6752c0..6abd508 100644
--- a/Xext/EVI.c
+++ b/Xext/EVI.c
@@ -30,7 +30,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "dixstruct.h"
#include "extnsionst.h"
#include "dix.h"
-#include "registry.h"
#define _XEVI_SERVER_
#include <X11/extensions/XEVIstr.h>
#include "EVIstruct.h"
@@ -189,9 +188,4 @@ EVIExtensionInit(INITARGS)
return;
eviPriv = eviDDXInit();
-
- RegisterRequestName(extEntry->base, X_EVIQueryVersion,
- EVINAME ":QueryVersion");
- RegisterRequestName(extEntry->base, X_EVIGetVisualInfo,
- EVINAME ":GetVisualInfo");
}
commit 460c43032f05aad3f0f552901a52d199f61c7f4f
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 18:08:18 2007 -0500
registry: Remove registry code from DPMS extension.
Moving all the names into dix/registry.c
diff --git a/Xext/dpms.c b/Xext/dpms.c
index 613493a..d518a16 100644
--- a/Xext/dpms.c
+++ b/Xext/dpms.c
@@ -44,7 +44,6 @@ Equipment Corporation.
#include "dixstruct.h"
#include "extnsionst.h"
#include "opaque.h"
-#include "registry.h"
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
#include <X11/extensions/dpmsstr.h>
@@ -74,29 +73,9 @@ static void DPMSResetProc(ExtensionEntry* extEntry);
void
DPMSExtensionInit(INITARGS)
{
- ExtensionEntry *extEntry;
-
- if (!(extEntry = AddExtension(DPMSExtensionName, 0, 0,
- ProcDPMSDispatch, SProcDPMSDispatch,
- DPMSResetProc, StandardMinorOpcode)))
- return;
-
- RegisterRequestName(extEntry->base, X_DPMSGetVersion,
- DPMSExtensionName ":GetVersion");
- RegisterRequestName(extEntry->base, X_DPMSCapable,
- DPMSExtensionName ":Capable");
- RegisterRequestName(extEntry->base, X_DPMSGetTimeouts,
- DPMSExtensionName ":GetTimeouts");
- RegisterRequestName(extEntry->base, X_DPMSSetTimeouts,
- DPMSExtensionName ":SetTimeouts");
- RegisterRequestName(extEntry->base, X_DPMSEnable,
- DPMSExtensionName ":Enable");
- RegisterRequestName(extEntry->base, X_DPMSDisable,
- DPMSExtensionName ":Disable");
- RegisterRequestName(extEntry->base, X_DPMSForceLevel,
- DPMSExtensionName ":ForceLevel");
- RegisterRequestName(extEntry->base, X_DPMSInfo,
- DPMSExtensionName ":Info");
+ AddExtension(DPMSExtensionName, 0, 0,
+ ProcDPMSDispatch, SProcDPMSDispatch,
+ DPMSResetProc, StandardMinorOpcode)))
}
/*ARGSUSED*/
commit 76e89d45b497d4afa4e60e1d0ec50b62f54f6b88
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 18:06:40 2007 -0500
registry: Remove registry code from TOG-CUP extension.
Moving all the names into dix/registry.c
diff --git a/Xext/cup.c b/Xext/cup.c
index 4adfc61..44c9664 100644
--- a/Xext/cup.c
+++ b/Xext/cup.c
@@ -39,7 +39,6 @@ in this Software without prior written authorization from The Open Group.
#include "scrnintstr.h"
#include "servermd.h"
#include "swapreq.h"
-#include "registry.h"
#define _XCUP_SERVER_
#include <X11/extensions/Xcupstr.h>
#include <X11/Xfuncproto.h>
@@ -136,13 +135,6 @@ XcupExtensionInit (INITARGS)
return;
/* PC servers initialize the desktop colors (citems) here! */
-
- RegisterRequestName(extEntry->base, X_XcupQueryVersion,
- XCUPNAME ":QueryVersion");
- RegisterRequestName(extEntry->base, X_XcupGetReservedColormapEntries,
- XCUPNAME ":GetReservedColormapEntries");
- RegisterRequestName(extEntry->base, X_XcupStoreColors,
- XCUPNAME ":StoreColors");
}
/*ARGSUSED*/
commit ce93c5772da52ab88faef7e5b661b681d5b60b1e
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 18:03:57 2007 -0500
registry: Remove registry code from BigRequests extension.
Moving all the names into dix/registry.c
diff --git a/Xext/bigreq.c b/Xext/bigreq.c
index 6303f38..fd8bcb8 100644
--- a/Xext/bigreq.c
+++ b/Xext/bigreq.c
@@ -37,7 +37,6 @@ from The Open Group.
#include "os.h"
#include "dixstruct.h"
#include "extnsionst.h"
-#include "registry.h"
#include <X11/extensions/bigreqstr.h>
#include "opaque.h"
#include "modinit.h"
@@ -51,15 +50,9 @@ static DISPATCH_PROC(ProcBigReqDispatch);
void
BigReqExtensionInit(INITARGS)
{
- ExtensionEntry *extEntry;
-
- if (!(extEntry = AddExtension(XBigReqExtensionName, 0, 0,
- ProcBigReqDispatch, ProcBigReqDispatch,
- BigReqResetProc, StandardMinorOpcode)))
- return;
-
- RegisterRequestName(extEntry->base, X_BigReqEnable,
- XBigReqExtensionName ":Enable");
+ AddExtension(XBigReqExtensionName, 0, 0,
+ ProcBigReqDispatch, ProcBigReqDispatch,
+ BigReqResetProc, StandardMinorOpcode)))
}
/*ARGSUSED*/
commit 0756d1271209e6ae14cc641dddca095271b43150
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 17:59:40 2007 -0500
Revert "registry: Register APPGROUP extension protocol names."
This reverts commit b504678ba5407a6fd8d47d051305f7c3d5606dfe.
Moving all the names into dix/registry.c
diff --git a/Xext/appgroup.c b/Xext/appgroup.c
index 4fb4020..c40782d 100644
--- a/Xext/appgroup.c
+++ b/Xext/appgroup.c
@@ -39,7 +39,6 @@ from The Open Group.
#include "windowstr.h"
#include "colormapst.h"
#include "servermd.h"
-#include "registry.h"
#define _XAG_SERVER_
#include <X11/extensions/Xagstr.h>
#include "xacestr.h"
@@ -763,35 +762,14 @@ static void XagCallClientStateChange(
void
XagExtensionInit(INITARGS)
{
- ExtensionEntry *extEntry;
-
- if ((extEntry = AddExtension (XAGNAME,
- 0,
- XagNumberErrors,
- ProcXagDispatch,
- SProcXagDispatch,
- XagResetProc,
- StandardMinorOpcode))) {
+ if (AddExtension (XAGNAME,
+ 0,
+ XagNumberErrors,
+ ProcXagDispatch,
+ SProcXagDispatch,
+ XagResetProc,
+ StandardMinorOpcode)) {
RT_APPGROUP = CreateNewResourceType (XagAppGroupFree);
XaceRegisterCallback(XACE_AUTH_AVAIL, XagCallClientStateChange, NULL);
- } else
- return;
-
- RegisterRequestName(extEntry->base, X_XagQueryVersion,
- XAGNAME ":QueryVersion");
- RegisterRequestName(extEntry->base, X_XagCreate,
- XAGNAME ":Create");
- RegisterRequestName(extEntry->base, X_XagDestroy,
- XAGNAME ":Destroy");
- RegisterRequestName(extEntry->base, X_XagGetAttr,
- XAGNAME ":GetAttr");
- RegisterRequestName(extEntry->base, X_XagQuery,
- XAGNAME ":Query");
- RegisterRequestName(extEntry->base, X_XagCreateAssoc,
- XAGNAME ":CreateAssoc");
- RegisterRequestName(extEntry->base, X_XagDestroyAssoc,
- XAGNAME ":DestroyAssoc");
-
- RegisterErrorName(extEntry->errorBase + XagBadAppGroup,
- XAGNAME ":BadAppGroup");
+ }
}
commit 5aff37d1d69be493727856a29628bd782d50b90f
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 17:57:06 2007 -0500
Revert "registry: Register RENDER extension protocol names."
This reverts commit 8964c6d8e14ae47798762191e359b2bf138ca32e.
Moving all the names into dix/registry.c
diff --git a/render/render.c b/render/render.c
index 5fc91a9..db9168b 100644
--- a/render/render.c
+++ b/render/render.c
@@ -40,7 +40,6 @@
#include "colormapst.h"
#include "extnsionst.h"
#include "servermd.h"
-#include "registry.h"
#include <X11/extensions/render.h>
#include <X11/extensions/renderproto.h>
#include "picturestr.h"
@@ -263,95 +262,6 @@ RenderExtensionInit (void)
RenderReqCode = (CARD8) extEntry->base;
#endif
RenderErrBase = extEntry->errorBase;
-
- RegisterRequestName(extEntry->base, X_RenderQueryVersion,
- RENDER_NAME ":QueryVersion");
- RegisterRequestName(extEntry->base, X_RenderQueryPictFormats,
- RENDER_NAME ":QueryPictFormats");
- RegisterRequestName(extEntry->base, X_RenderQueryPictIndexValues,
- RENDER_NAME ":QueryPictIndexValues");
- RegisterRequestName(extEntry->base, X_RenderQueryDithers,
- RENDER_NAME ":QueryDithers");
- RegisterRequestName(extEntry->base, X_RenderCreatePicture,
- RENDER_NAME ":CreatePicture");
- RegisterRequestName(extEntry->base, X_RenderChangePicture,
- RENDER_NAME ":ChangePicture");
- RegisterRequestName(extEntry->base, X_RenderSetPictureClipRectangles,
- RENDER_NAME ":SetPictureClipRectangles");
- RegisterRequestName(extEntry->base, X_RenderFreePicture,
- RENDER_NAME ":FreePicture");
- RegisterRequestName(extEntry->base, X_RenderComposite,
- RENDER_NAME ":Composite");
- RegisterRequestName(extEntry->base, X_RenderScale,
- RENDER_NAME ":Scale");
- RegisterRequestName(extEntry->base, X_RenderTrapezoids,
- RENDER_NAME ":Trapezoids");
- RegisterRequestName(extEntry->base, X_RenderTriangles,
- RENDER_NAME ":Triangles");
- RegisterRequestName(extEntry->base, X_RenderTriStrip,
- RENDER_NAME ":TriStrip");
- RegisterRequestName(extEntry->base, X_RenderTriFan,
- RENDER_NAME ":TriFan");
- RegisterRequestName(extEntry->base, X_RenderColorTrapezoids,
- RENDER_NAME ":ColorTrapezoids");
- RegisterRequestName(extEntry->base, X_RenderColorTriangles,
- RENDER_NAME ":ColorTriangles");
- RegisterRequestName(extEntry->base, X_RenderCreateGlyphSet,
- RENDER_NAME ":CreateGlyphSet");
- RegisterRequestName(extEntry->base, X_RenderReferenceGlyphSet,
- RENDER_NAME ":ReferenceGlyphSet");
- RegisterRequestName(extEntry->base, X_RenderFreeGlyphSet,
- RENDER_NAME ":FreeGlyphSet");
- RegisterRequestName(extEntry->base, X_RenderAddGlyphs,
- RENDER_NAME ":AddGlyphs");
- RegisterRequestName(extEntry->base, X_RenderAddGlyphsFromPicture,
- RENDER_NAME ":AddGlyphsFromPicture");
- RegisterRequestName(extEntry->base, X_RenderFreeGlyphs,
- RENDER_NAME ":FreeGlyphs");
- RegisterRequestName(extEntry->base, X_RenderCompositeGlyphs8,
- RENDER_NAME ":CompositeGlyphs8");
- RegisterRequestName(extEntry->base, X_RenderCompositeGlyphs16,
- RENDER_NAME ":CompositeGlyphs16");
- RegisterRequestName(extEntry->base, X_RenderCompositeGlyphs32,
- RENDER_NAME ":CompositeGlyphs32");
- RegisterRequestName(extEntry->base, X_RenderFillRectangles,
- RENDER_NAME ":FillRectangles");
- /* 0.5 */
- RegisterRequestName(extEntry->base, X_RenderCreateCursor,
- RENDER_NAME ":CreateCursor");
- /* 0.6 */
- RegisterRequestName(extEntry->base, X_RenderSetPictureTransform,
- RENDER_NAME ":SetPictureTransform");
- RegisterRequestName(extEntry->base, X_RenderQueryFilters,
- RENDER_NAME ":QueryFilters");
- RegisterRequestName(extEntry->base, X_RenderSetPictureFilter,
- RENDER_NAME ":SetPictureFilter");
- /* 0.8 */
- RegisterRequestName(extEntry->base, X_RenderCreateAnimCursor,
- RENDER_NAME ":CreateAnimCursor");
- /* 0.9 */
- RegisterRequestName(extEntry->base, X_RenderAddTraps,
- RENDER_NAME ":AddTraps");
- /* 0.10 */
- RegisterRequestName(extEntry->base, X_RenderCreateSolidFill,
- RENDER_NAME ":CreateSolidFill");
- RegisterRequestName(extEntry->base, X_RenderCreateLinearGradient,
- RENDER_NAME ":CreateLinearGradient");
- RegisterRequestName(extEntry->base, X_RenderCreateRadialGradient,
- RENDER_NAME ":CreateRadialGradient");
- RegisterRequestName(extEntry->base, X_RenderCreateConicalGradient,
- RENDER_NAME ":CreateConicalGradient");
-
- RegisterErrorName(RenderErrBase + BadPictFormat,
- RENDER_NAME ":BadPictFormat");
- RegisterErrorName(RenderErrBase + BadPicture,
- RENDER_NAME ":BadPicture");
- RegisterErrorName(RenderErrBase + BadPictOp,
- RENDER_NAME ":BadPictOp");
- RegisterErrorName(RenderErrBase + BadGlyphSet,
- RENDER_NAME ":BadGlyphSet");
- RegisterErrorName(RenderErrBase + BadGlyph,
- RENDER_NAME ":BadGlyph");
}
static void
commit e585a2ddb495b50a53e15cccc368ca0858fc9d23
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 17:55:47 2007 -0500
Revert "registry: Register Record extension protocol names."
This reverts commit ea09c9acc8f0d5577f54c864ff88b7f03d93b2f4.
Moving all the names into dix/registry.c
diff --git a/record/record.c b/record/record.c
index 2ca3782..debe3c4 100644
--- a/record/record.c
+++ b/record/record.c
@@ -43,7 +43,6 @@ and Jim Haggerty of Metheus.
#include <X11/extensions/recordstr.h>
#include "set.h"
#include "swaprep.h"
-#include "registry.h"
#include <stdio.h>
#include <assert.h>
@@ -2966,24 +2965,5 @@ RecordExtensionInit(void)
}
RecordErrorBase = extentry->errorBase;
- RegisterRequestName(extentry->base, X_RecordQueryVersion,
- RECORD_NAME ":QueryVersion");
- RegisterRequestName(extentry->base, X_RecordCreateContext,
- RECORD_NAME ":CreateContext");
- RegisterRequestName(extentry->base, X_RecordRegisterClients,
- RECORD_NAME ":RegisterClients");
- RegisterRequestName(extentry->base, X_RecordUnregisterClients,
- RECORD_NAME ":UnregisterClients");
- RegisterRequestName(extentry->base, X_RecordGetContext,
- RECORD_NAME ":GetContext");
- RegisterRequestName(extentry->base, X_RecordEnableContext,
- RECORD_NAME ":EnableContext");
- RegisterRequestName(extentry->base, X_RecordDisableContext,
- RECORD_NAME ":DisableContext");
- RegisterRequestName(extentry->base, X_RecordFreeContext,
- RECORD_NAME ":FreeContext");
-
- RegisterErrorName(RecordErrorBase + XRecordBadContext,
- RECORD_NAME ":BadContext");
} /* RecordExtensionInit */
commit d4577e485367468227e031eb434b739eff7b5e9a
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 17:51:27 2007 -0500
Revert "registry: Register RANDR extension protocol names."
This reverts commit c827db57e4d9ca14c82b099dcfc9b7a0c0b5ba0a.
Moving all the names into dix/registry.c
diff --git a/randr/randr.c b/randr/randr.c
index d5b9819..bc2b995 100644
--- a/randr/randr.c
+++ b/randr/randr.c
@@ -32,7 +32,6 @@
#endif
#include "randrstr.h"
-#include "registry.h"
/* From render.h */
#ifndef SubPixelUnknown
@@ -352,73 +351,6 @@ RRExtensionInit (void)
#ifdef PANORAMIX
RRXineramaExtensionInit();
#endif
-
- RegisterRequestName(extEntry->base, X_RRQueryVersion,
- RANDR_NAME ":QueryVersion");
- RegisterRequestName(extEntry->base, X_RROldGetScreenInfo,
- RANDR_NAME ":OldGetScreenInfo");
- RegisterRequestName(extEntry->base, X_RR1_0SetScreenConfig,
- RANDR_NAME ":1_0SetScreenConfig");
- RegisterRequestName(extEntry->base, X_RRSetScreenConfig,
- RANDR_NAME ":SetScreenConfig");
- RegisterRequestName(extEntry->base, X_RROldScreenChangeSelectInput,
- RANDR_NAME ":OldScreenChangeSelectInput");
- RegisterRequestName(extEntry->base, X_RRSelectInput,
- RANDR_NAME ":SelectInput");
- RegisterRequestName(extEntry->base, X_RRGetScreenInfo,
- RANDR_NAME ":GetScreenInfo");
- /* V1.2 additions */
- RegisterRequestName(extEntry->base, X_RRGetScreenSizeRange,
- RANDR_NAME ":GetScreenSizeRange");
- RegisterRequestName(extEntry->base, X_RRSetScreenSize,
- RANDR_NAME ":SetScreenSize");
- RegisterRequestName(extEntry->base, X_RRGetScreenResources,
- RANDR_NAME ":GetScreenResources");
- RegisterRequestName(extEntry->base, X_RRGetOutputInfo,
- RANDR_NAME ":GetOutputInfo");
- RegisterRequestName(extEntry->base, X_RRListOutputProperties,
- RANDR_NAME ":ListOutputProperties");
- RegisterRequestName(extEntry->base, X_RRQueryOutputProperty,
- RANDR_NAME ":QueryOutputProperty");
- RegisterRequestName(extEntry->base, X_RRConfigureOutputProperty,
- RANDR_NAME ":ConfigureOutputProperty");
- RegisterRequestName(extEntry->base, X_RRChangeOutputProperty,
- RANDR_NAME ":ChangeOutputProperty");
- RegisterRequestName(extEntry->base, X_RRDeleteOutputProperty,
- RANDR_NAME ":DeleteOutputProperty");
- RegisterRequestName(extEntry->base, X_RRGetOutputProperty,
- RANDR_NAME ":GetOutputProperty");
- RegisterRequestName(extEntry->base, X_RRCreateMode,
- RANDR_NAME ":CreateMode");
- RegisterRequestName(extEntry->base, X_RRDestroyMode,
- RANDR_NAME ":DestroyMode");
- RegisterRequestName(extEntry->base, X_RRAddOutputMode,
- RANDR_NAME ":AddOutputMode");
- RegisterRequestName(extEntry->base, X_RRDeleteOutputMode,
- RANDR_NAME ":DeleteOutputMode");
- RegisterRequestName(extEntry->base, X_RRGetCrtcInfo,
- RANDR_NAME ":GetCrtcInfo");
- RegisterRequestName(extEntry->base, X_RRSetCrtcConfig,
- RANDR_NAME ":SetCrtcConfig");
- RegisterRequestName(extEntry->base, X_RRGetCrtcGammaSize,
- RANDR_NAME ":GetCrtcGammaSize");
- RegisterRequestName(extEntry->base, X_RRGetCrtcGamma,
- RANDR_NAME ":GetCrtcGamma");
- RegisterRequestName(extEntry->base, X_RRSetCrtcGamma,
- RANDR_NAME ":SetCrtcGamma");
-
- RegisterEventName(RREventBase + RRScreenChangeNotify,
- RANDR_NAME ":ScreenChangeNotify");
- /* V1.2 additions */
- RegisterEventName(RREventBase + RRNotify,
- RANDR_NAME ":Notify");
-
- RegisterErrorName(RRErrorBase + BadRROutput,
- RANDR_NAME ":BadRROutput");
- RegisterErrorName(RRErrorBase + BadRRCrtc,
- RANDR_NAME ":BadRRCrtc");
- RegisterErrorName(RRErrorBase + BadRRMode,
- RANDR_NAME ":BadRRMode");
}
static int
commit a541e826c9310d3051e53834833c6c3a08654148
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 17:50:26 2007 -0500
Revert "registry: Register WINDOWSWM extension protocol names."
This reverts commit 4c3285c883cc50a91bc5262bbc9d073d816f860a.
Moving all the names into dix/registry.c
diff --git a/hw/xwin/winwindowswm.c b/hw/xwin/winwindowswm.c
index 1356465..e1994de 100755
--- a/hw/xwin/winwindowswm.c
+++ b/hw/xwin/winwindowswm.c
@@ -41,7 +41,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "scrnintstr.h"
#include "servermd.h"
#include "swaprep.h"
-#include "registry.h"
#define _WINDOWSWM_SERVER_
#include "windowswmstr.h"
@@ -106,35 +105,7 @@ winWindowsWMExtensionInit ()
WMErrorBase = extEntry->errorBase;
WMEventBase = extEntry->eventBase;
EventSwapVector[WMEventBase] = (EventSwapPtr) SNotifyEvent;
- } else
- return;
-
- RegisterRequestName(WMReqCode, X_WindowsWMQueryVersion,
- WINDOWSWMNAME ":QueryVersion");
- RegisterRequestName(WMReqCode, X_WindowsWMFrameGetRect,
- WINDOWSWMNAME ":FrameGetRect");
- RegisterRequestName(WMReqCode, X_WindowsWMFrameDraw,
- WINDOWSWMNAME ":FrameDraw");
- RegisterRequestName(WMReqCode, X_WindowsWMFrameSetTitle,
- WINDOWSWMNAME ":FrameSetTitle");
- RegisterRequestName(WMReqCode, X_WindowsWMDisableUpdate,
- WINDOWSWMNAME ":DisableUpdate");
- RegisterRequestName(WMReqCode, X_WindowsWMReenableUpdate,
- WINDOWSWMNAME ":ReenableUpdate");
- RegisterRequestName(WMReqCode, X_WindowsWMSelectInput,
- WINDOWSWMNAME ":SelectInput");
- RegisterRequestName(WMReqCode, X_WindowsWMSetFrontProcess,
- WINDOWSWMNAME ":SetFrontProcess");
-
- RegisterEventName(WMEventBase + WindowsWMControllerNotify,
- WINDOWSWMNAME ":ControllerNotify");
- RegisterEventName(WMEventBase + WindowsWMActivationNotify,
- WINDOWSWMNAME ":ActivationNotify");
-
- RegisterErrorName(WMErrorBase + WindowsWMClientNotLocal,
- WINDOWSWMNAME ":ClientNotLocal");
- RegisterErrorName(WMErrorBase + WindowsWMOperationNotSupported,
- WINDOWSWMNAME ":OperationNotSupported");
+ }
}
/*ARGSUSED*/
commit 993595430bd0580ab4d936be6b70fb91b8bb1d16
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 17:48:46 2007 -0500
Revert "registry: Register XF86DRI extension protocol names."
This reverts commit b7786724080fd3928ef7b8c294346661d7ffd90b.
Moving all the names into dix/registry.c
diff --git a/hw/xfree86/dri/xf86dri.c b/hw/xfree86/dri/xf86dri.c
index d16910f..ea11b38 100644
--- a/hw/xfree86/dri/xf86dri.c
+++ b/hw/xfree86/dri/xf86dri.c
@@ -53,7 +53,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "cursorstr.h"
#include "scrnintstr.h"
#include "servermd.h"
-#include "registry.h"
#define _XF86DRI_SERVER_
#include "xf86dristr.h"
#include "swaprep.h"
@@ -113,42 +112,7 @@ XFree86DRIExtensionInit(void)
StandardMinorOpcode))) {
DRIReqCode = (unsigned char)extEntry->base;
DRIErrorBase = extEntry->errorBase;
- } else
- return;
-
- RegisterRequestName(DRIReqCode, X_XF86DRIQueryVersion,
- XF86DRINAME ":QueryVersion");
- RegisterRequestName(DRIReqCode, X_XF86DRIQueryDirectRenderingCapable,
- XF86DRINAME ":QueryDirectRenderingCapable");
- RegisterRequestName(DRIReqCode, X_XF86DRIOpenConnection,
- XF86DRINAME ":OpenConnection");
- RegisterRequestName(DRIReqCode, X_XF86DRICloseConnection,
- XF86DRINAME ":CloseConnection");
- RegisterRequestName(DRIReqCode, X_XF86DRIGetClientDriverName,
- XF86DRINAME ":GetClientDriverName");
- RegisterRequestName(DRIReqCode, X_XF86DRICreateContext,
- XF86DRINAME ":CreateContext");
- RegisterRequestName(DRIReqCode, X_XF86DRIDestroyContext,
- XF86DRINAME ":DestroyContext");
- RegisterRequestName(DRIReqCode, X_XF86DRICreateDrawable,
- XF86DRINAME ":CreateDrawable");
- RegisterRequestName(DRIReqCode, X_XF86DRIDestroyDrawable,
- XF86DRINAME ":DestroyDrawable");
- RegisterRequestName(DRIReqCode, X_XF86DRIGetDrawableInfo,
- XF86DRINAME ":GetDrawableInfo");
- RegisterRequestName(DRIReqCode, X_XF86DRIGetDeviceInfo,
- XF86DRINAME ":GetDeviceInfo");
- RegisterRequestName(DRIReqCode, X_XF86DRIAuthConnection,
- XF86DRINAME ":AuthConnection");
- RegisterRequestName(DRIReqCode, X_XF86DRIOpenFullScreen,
- XF86DRINAME ":OpenFullScreen");
- RegisterRequestName(DRIReqCode, X_XF86DRICloseFullScreen,
- XF86DRINAME ":CloseFullScreen");
-
- RegisterErrorName(DRIErrorBase + XF86DRIClientNotLocal,
- XF86DRINAME ":ClientNotLocal");
- RegisterErrorName(DRIErrorBase + XF86DRIOperationNotSupported,
- XF86DRINAME ":OperationNotSupported");
+ }
}
/*ARGSUSED*/
commit 6b73c215c9d612534af290230b2e914d42d819cd
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 17:47:30 2007 -0500
Revert "registry: Register XF86VidMode extension protocol names."
This reverts commit 960677e876c068400fb45e1764bb5470cd8c389f.
Moving all the names into dix/registry.c
diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c
index 17ba44a..718d40f 100644
--- a/hw/xfree86/dixmods/extmod/xf86vmode.c
+++ b/hw/xfree86/dixmods/extmod/xf86vmode.c
@@ -43,7 +43,6 @@ from Kaleb S. KEITHLEY
#include "extnsionst.h"
#include "scrnintstr.h"
#include "servermd.h"
-#include "registry.h"
#define _XF86VIDMODE_SERVER_
#include <X11/extensions/xf86vmstr.h>
#include "swaprep.h"
@@ -210,71 +209,7 @@ XFree86VidModeExtensionInit(void)
XF86VidModeEventBase = extEntry->eventBase;
EventSwapVector[XF86VidModeEventBase] = (EventSwapPtr)SXF86VidModeNotifyEvent;
#endif
- } else
- return;
-
- RegisterRequestName(extEntry->base, X_XF86VidModeQueryVersion,
- XF86VIDMODENAME ":QueryVersion");
- RegisterRequestName(extEntry->base, X_XF86VidModeGetModeLine,
- XF86VIDMODENAME ":GetModeLine");
- RegisterRequestName(extEntry->base, X_XF86VidModeModModeLine,
- XF86VIDMODENAME ":ModModeLine");
- RegisterRequestName(extEntry->base, X_XF86VidModeSwitchMode,
- XF86VIDMODENAME ":SwitchMode");
- RegisterRequestName(extEntry->base, X_XF86VidModeGetMonitor,
- XF86VIDMODENAME ":GetMonitor");
- RegisterRequestName(extEntry->base, X_XF86VidModeLockModeSwitch,
- XF86VIDMODENAME ":LockModeSwitch");
- RegisterRequestName(extEntry->base, X_XF86VidModeGetAllModeLines,
- XF86VIDMODENAME ":GetAllModeLines");
- RegisterRequestName(extEntry->base, X_XF86VidModeAddModeLine,
- XF86VIDMODENAME ":AddModeLine");
- RegisterRequestName(extEntry->base, X_XF86VidModeDeleteModeLine,
- XF86VIDMODENAME ":DeleteModeLine");
- RegisterRequestName(extEntry->base, X_XF86VidModeValidateModeLine,
- XF86VIDMODENAME ":ValidateModeLine");
- RegisterRequestName(extEntry->base, X_XF86VidModeSwitchToMode,
- XF86VIDMODENAME ":SwitchToMode");
- RegisterRequestName(extEntry->base, X_XF86VidModeGetViewPort,
- XF86VIDMODENAME ":GetViewPort");
- RegisterRequestName(extEntry->base, X_XF86VidModeSetViewPort,
- XF86VIDMODENAME ":SetViewPort");
- RegisterRequestName(extEntry->base, X_XF86VidModeGetDotClocks,
- XF86VIDMODENAME ":GetDotClocks");
- RegisterRequestName(extEntry->base, X_XF86VidModeSetClientVersion,
- XF86VIDMODENAME ":SetClientVersion");
- RegisterRequestName(extEntry->base, X_XF86VidModeSetGamma,
- XF86VIDMODENAME ":SetGamma");
- RegisterRequestName(extEntry->base, X_XF86VidModeGetGamma,
- XF86VIDMODENAME ":GetGamma");
- RegisterRequestName(extEntry->base, X_XF86VidModeGetGammaRamp,
- XF86VIDMODENAME ":GetGammaRamp");
- RegisterRequestName(extEntry->base, X_XF86VidModeSetGammaRamp,
- XF86VIDMODENAME ":SetGammaRamp");
- RegisterRequestName(extEntry->base, X_XF86VidModeGetGammaRampSize,
- XF86VIDMODENAME ":GetGammaRampSize");
- RegisterRequestName(extEntry->base, X_XF86VidModeGetPermissions,
- XF86VIDMODENAME ":GetPermissions");
-
-#ifdef XF86VIDMODE_EVENTS
- RegisterEventName(extEntry->eventBase + XF86VidModeNotify,
- XF86VIDMODENAME ":Notify");
-#endif
-
- RegisterErrorName(extEntry->errorBase + XF86VidModeBadClock,
- XF86VIDMODENAME ":BadClock");
- RegisterErrorName(extEntry->errorBase + XF86VidModeBadHTimings,
- XF86VIDMODENAME ":BadHTimings");
- RegisterErrorName(extEntry->errorBase + XF86VidModeBadVTimings,
- XF86VIDMODENAME ":BadVTimings");
- RegisterErrorName(extEntry->errorBase + XF86VidModeModeUnsuitable,
- XF86VIDMODENAME ":ModeUnsuitable");
- RegisterErrorName(extEntry->errorBase + XF86VidModeExtensionDisabled,
- XF86VIDMODENAME ":ExtensionDisabled");
- RegisterErrorName(extEntry->errorBase + XF86VidModeClientNotLocal,
- XF86VIDMODENAME ":ClientNotLocal");
- RegisterErrorName(extEntry->errorBase + XF86VidModeZoomLocked,
- XF86VIDMODENAME ":ZoomLocked");
+ }
}
/*ARGSUSED*/
commit 8e2cd7a804664bbd2d03789dcd5c93223122e929
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 17:45:30 2007 -0500
Revert "registry: Register XF86Misc extension protocol names."
This reverts commit 2cd1b32b77e0ceeaccb3f01c4ac13a97c557668c.
Moving all the names into dix/registry.c
diff --git a/hw/xfree86/dixmods/extmod/xf86misc.c b/hw/xfree86/dixmods/extmod/xf86misc.c
index 274b1d3..66278a2 100644
--- a/hw/xfree86/dixmods/extmod/xf86misc.c
+++ b/hw/xfree86/dixmods/extmod/xf86misc.c
@@ -19,7 +19,6 @@
#include "scrnintstr.h"
#include "inputstr.h"
#include "servermd.h"
-#include "registry.h"
#define _XF86MISC_SERVER_
#undef _XF86MISC_SAVER_COMPAT_
#include <X11/extensions/xf86mscstr.h>
@@ -138,50 +137,7 @@ XFree86MiscExtensionInit(void)
XF86MiscReqCode = (unsigned char)extEntry->base;
#endif
miscErrorBase = extEntry->errorBase;
- } else
- return;
-
- RegisterRequestName(extEntry->base, X_XF86MiscQueryVersion,
- XF86MISCNAME ":QueryVersion");
-#ifdef _XF86MISC_SAVER_COMPAT_
- RegisterRequestName(extEntry->base, X_XF86MiscGetSaver,
- XF86MISCNAME ":GetSaver");
- RegisterRequestName(extEntry->base, X_XF86MiscSetSaver,
- XF86MISCNAME ":SetSaver");
-#endif
- RegisterRequestName(extEntry->base, X_XF86MiscGetMouseSettings,
- XF86MISCNAME ":GetMouseSettings");
- RegisterRequestName(extEntry->base, X_XF86MiscGetKbdSettings,
- XF86MISCNAME ":GetKbdSettings");
- RegisterRequestName(extEntry->base, X_XF86MiscSetMouseSettings,
- XF86MISCNAME ":SetMouseSettings");
- RegisterRequestName(extEntry->base, X_XF86MiscSetKbdSettings,
- XF86MISCNAME ":SetKbdSettings");
- RegisterRequestName(extEntry->base, X_XF86MiscSetGrabKeysState,
- XF86MISCNAME ":SetGrabKeysState");
- RegisterRequestName(extEntry->base, X_XF86MiscSetClientVersion,
- XF86MISCNAME ":SetClientVersion");
- RegisterRequestName(extEntry->base, X_XF86MiscGetFilePaths,
- XF86MISCNAME ":GetFilePaths");
- RegisterRequestName(extEntry->base, X_XF86MiscPassMessage,
- XF86MISCNAME ":PassMessage");
-
- RegisterErrorName(extEntry->errorBase + XF86MiscBadMouseProtocol,
- XF86MISCNAME ":BadMouseProtocol");
- RegisterErrorName(extEntry->errorBase + XF86MiscBadMouseBaudRate,
- XF86MISCNAME ":BadMouseBaudRate");
- RegisterErrorName(extEntry->errorBase + XF86MiscBadMouseFlags,
- XF86MISCNAME ":BadMouseFlags");
- RegisterErrorName(extEntry->errorBase + XF86MiscBadMouseCombo,
- XF86MISCNAME ":BadMouseCombo");
- RegisterErrorName(extEntry->errorBase + XF86MiscBadKbdType,
- XF86MISCNAME ":BadKbdType");
- RegisterErrorName(extEntry->errorBase + XF86MiscModInDevDisabled,
- XF86MISCNAME ":ModInDevDisabled");
- RegisterErrorName(extEntry->errorBase + XF86MiscModInDevClientNotLocal,
- XF86MISCNAME ":ModInDevClientNotLocal");
- RegisterErrorName(extEntry->errorBase + XF86MiscNoModule,
- XF86MISCNAME ":NoModule");
+ }
}
/*ARGSUSED*/
commit 0356153a58cef87d655bccacd8e2cf03d577bd19
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 17:43:18 2007 -0500
Revert "registry: Register XF86DGA extension protocol names."
This reverts commit 3815284e899b61731b6a63c4ba14c5d773e24eb6.
Moving all the names into dix/registry.c
diff --git a/hw/xfree86/dixmods/extmod/xf86dga2.c b/hw/xfree86/dixmods/extmod/xf86dga2.c
index 3b866c7..295e05e 100644
--- a/hw/xfree86/dixmods/extmod/xf86dga2.c
+++ b/hw/xfree86/dixmods/extmod/xf86dga2.c
@@ -22,7 +22,6 @@
#include "cursorstr.h"
#include "scrnintstr.h"
#include "servermd.h"
-#include "registry.h"
#define _XF86DGA_SERVER_
#include <X11/extensions/xf86dga.h>
#include <X11/extensions/xf86dgastr.h>
@@ -100,72 +99,7 @@ XFree86DGAExtensionInit(INITARGS)
DGAEventBase = extEntry->eventBase;
for (i = KeyPress; i <= MotionNotify; i++)
SetCriticalEvent (DGAEventBase + i);
- } else
- return;
-
- RegisterRequestName(DGAReqCode, X_XF86DGAQueryVersion,
- XF86DGANAME ":QueryVersion");
- RegisterRequestName(DGAReqCode, X_XF86DGAGetVideoLL,
- XF86DGANAME ":GetVideoLL");
- RegisterRequestName(DGAReqCode, X_XF86DGADirectVideo,
- XF86DGANAME ":DirectVideo");
- RegisterRequestName(DGAReqCode, X_XF86DGAGetViewPortSize,
- XF86DGANAME ":GetViewPortSize");
- RegisterRequestName(DGAReqCode, X_XF86DGASetViewPort,
- XF86DGANAME ":SetViewPort");
- RegisterRequestName(DGAReqCode, X_XF86DGAGetVidPage,
- XF86DGANAME ":GetVidPage");
- RegisterRequestName(DGAReqCode, X_XF86DGASetVidPage,
- XF86DGANAME ":SetVidPage");
- RegisterRequestName(DGAReqCode, X_XF86DGAInstallColormap,
- XF86DGANAME ":InstallColormap");
- RegisterRequestName(DGAReqCode, X_XF86DGAQueryDirectVideo,
- XF86DGANAME ":QueryDirectVideo");
- RegisterRequestName(DGAReqCode, X_XF86DGAViewPortChanged,
- XF86DGANAME ":ViewPortChanged");
- RegisterRequestName(DGAReqCode, X_XDGAQueryModes,
- XF86DGANAME ":QueryModes");
- RegisterRequestName(DGAReqCode, X_XDGASetMode,
- XF86DGANAME ":SetMode");
- RegisterRequestName(DGAReqCode, X_XDGASetViewport,
- XF86DGANAME ":SetViewport");
- RegisterRequestName(DGAReqCode, X_XDGAInstallColormap,
- XF86DGANAME ":InstallColormap");
- RegisterRequestName(DGAReqCode, X_XDGASelectInput,
- XF86DGANAME ":SelectInput");
- RegisterRequestName(DGAReqCode, X_XDGAFillRectangle,
- XF86DGANAME ":FillRectangle");
- RegisterRequestName(DGAReqCode, X_XDGACopyArea,
- XF86DGANAME ":CopyArea");
- RegisterRequestName(DGAReqCode, X_XDGACopyTransparentArea,
- XF86DGANAME ":CopyTransparentArea");
- RegisterRequestName(DGAReqCode, X_XDGAGetViewportStatus,
- XF86DGANAME ":GetViewportStatus");
- RegisterRequestName(DGAReqCode, X_XDGASync,
- XF86DGANAME ":Sync");
- RegisterRequestName(DGAReqCode, X_XDGAOpenFramebuffer,
- XF86DGANAME ":OpenFramebuffer");
- RegisterRequestName(DGAReqCode, X_XDGACloseFramebuffer,
- XF86DGANAME ":CloseFramebuffer");
- RegisterRequestName(DGAReqCode, X_XDGASetClientVersion,
- XF86DGANAME ":SetClientVersion");
- RegisterRequestName(DGAReqCode, X_XDGAChangePixmapMode,
- XF86DGANAME ":ChangePixmapMode");
- RegisterRequestName(DGAReqCode, X_XDGACreateColormap,
- XF86DGANAME ":CreateColormap");
-
- /* 7 Events: Don't know where they are defined. EFW */
-
- RegisterErrorName(extEntry->errorBase + XF86DGAClientNotLocal,
- XF86DGANAME ":ClientNotLocal");
- RegisterErrorName(extEntry->errorBase + XF86DGANoDirectVideoMode,
- XF86DGANAME ":NoDirectVideoMode");
- RegisterErrorName(extEntry->errorBase + XF86DGAScreenNotActive,
- XF86DGANAME ":ScreenNotActive");
- RegisterErrorName(extEntry->errorBase + XF86DGADirectNotActivated,
- XF86DGANAME ":DirectNotActivated");
- RegisterErrorName(extEntry->errorBase + XF86DGAOperationNotSupported,
- XF86DGANAME ":OperationNotSupported");
+ }
}
commit de93c1e9df14577e158b6dc3ccec7ee48f592386
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 17:40:57 2007 -0500
Revert "registry: Register DMX extension protocol names."
This reverts commit 32f3f5a1e7654f8bb43ea16b9227b3994e616739.
Moving all the names into dix/registry.c
diff --git a/hw/dmx/dmx.c b/hw/dmx/dmx.c
index 840356f..5f1fc05 100644
--- a/hw/dmx/dmx.c
+++ b/hw/dmx/dmx.c
@@ -54,7 +54,6 @@
#define EXTENSION_PROC_ARGS void *
#include "extnsionst.h"
#include "opaque.h"
-#include "registry.h"
#include "dmxextension.h"
#include <X11/extensions/dmxproto.h>
@@ -127,45 +126,6 @@ void DMXExtensionInit(void)
ProcDMXDispatch, SProcDMXDispatch,
DMXResetProc, StandardMinorOpcode)))
DMXCode = extEntry->base;
- else
- return;
-
- RegisterRequestName(DMXCode, X_DMXQueryVersion,
- DMX_EXTENSION_NAME ":DMXQueryVersion");
- RegisterRequestName(DMXCode, X_DMXGetScreenCount,
- DMX_EXTENSION_NAME ":DMXGetScreenCount");
- RegisterRequestName(DMXCode, X_DMXGetScreenInformationDEPRECATED,
- DMX_EXTENSION_NAME ":DMXGetScreenInfoDEPRECATED");
- RegisterRequestName(DMXCode, X_DMXGetWindowAttributes,
- DMX_EXTENSION_NAME ":DMXGetWindowAttributes");
- RegisterRequestName(DMXCode, X_DMXGetInputCount,
- DMX_EXTENSION_NAME ":DMXGetInputCount");
- RegisterRequestName(DMXCode, X_DMXGetInputAttributes,
- DMX_EXTENSION_NAME ":DMXGetInputAttributes");
- RegisterRequestName(DMXCode, X_DMXForceWindowCreationDEPRECATED,
- DMX_EXTENSION_NAME ":DMXForceWindowCreationDEPRECATED");
- RegisterRequestName(DMXCode, X_DMXReconfigureScreenDEPRECATED,
- DMX_EXTENSION_NAME ":DMXReconfigureScreenDEPRECATED");
- RegisterRequestName(DMXCode, X_DMXSync,
- DMX_EXTENSION_NAME ":DMXSync");
- RegisterRequestName(DMXCode, X_DMXForceWindowCreation,
- DMX_EXTENSION_NAME ":DMXForceWindowCreation");
- RegisterRequestName(DMXCode, X_DMXGetScreenAttributes,
- DMX_EXTENSION_NAME ":DMXGetScreenAttributes");
- RegisterRequestName(DMXCode, X_DMXChangeScreensAttributes,
- DMX_EXTENSION_NAME ":DMXChangeScreensAttributes");
- RegisterRequestName(DMXCode, X_DMXAddScreen,
- DMX_EXTENSION_NAME ":DMXAddScreen");
- RegisterRequestName(DMXCode, X_DMXRemoveScreen,
- DMX_EXTENSION_NAME ":DMXRemoveScreen");
- RegisterRequestName(DMXCode, X_DMXGetDesktopAttributes,
- DMX_EXTENSION_NAME ":DMXGetDesktopAttributes");
- RegisterRequestName(DMXCode, X_DMXChangeDesktopAttributes,
- DMX_EXTENSION_NAME ":DMXChangeDesktopAttributes");
- RegisterRequestName(DMXCode, X_DMXAddInput,
- DMX_EXTENSION_NAME ":DMXAddInput");
- RegisterRequestName(DMXCode, X_DMXRemoveInput,
- DMX_EXTENSION_NAME ":DMXRemoveInput");
}
static void dmxSetScreenAttribute(int bit, DMXScreenAttributesPtr attr,
commit 2d3e0cdf4bd7ab069bad7244ede7c2d489e92b17
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 17:39:56 2007 -0500
Revert "registry: Register APPLEDRI extension protocol names."
This reverts commit 3464b419230c6d17e940d967b567c5d2cb22d232.
Moving all the names into dix/registry.c
diff --git a/hw/darwin/quartz/xpr/appledri.c b/hw/darwin/quartz/xpr/appledri.c
index d9690fd..70b7400 100644
--- a/hw/darwin/quartz/xpr/appledri.c
+++ b/hw/darwin/quartz/xpr/appledri.c
@@ -53,7 +53,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "swaprep.h"
#include "dri.h"
#include "dristruct.h"
-#include "registry.h"
static int DRIErrorBase = 0;
@@ -93,33 +92,7 @@ AppleDRIExtensionInit(void)
DRIErrorBase = extEntry->errorBase;
DRIEventBase = extEntry->eventBase;
EventSwapVector[DRIEventBase] = (EventSwapPtr) SNotifyEvent;
- } else
- return;
-
- RegisterRequestName(DRIReqCode, X_AppleDRIQueryVersion,
- APPLEDRINAME ":QueryVersion");
- RegisterRequestName(DRIReqCode, X_AppleDRIQueryDirectRenderingCapable,
- APPLEDRINAME ":QueryDirectRenderingCapable");
- RegisterRequestName(DRIReqCode, X_AppleDRICreateSurface,
- APPLEDRINAME ":CreateSurface");
- RegisterRequestName(DRIReqCode, X_AppleDRIDestroySurface,
- APPLEDRINAME ":DestroySurface");
- RegisterRequestName(DRIReqCode, X_AppleDRIAuthConnection,
- APPLEDRINAME ":AuthConnection");
-
- RegisterEventName(DRIEventBase + AppleDRIObsoleteEvent1,
- APPLEDRINAME ":ObsoleteEvent1");
- RegisterEventName(DRIEventBase + AppleDRIObsoleteEvent2,
- APPLEDRINAME ":ObsoleteEvent2");
- RegisterEventName(DRIEventBase + AppleDRIObsoleteEvent3,
- APPLEDRINAME ":ObsoleteEvent3");
- RegisterEventName(DRIEventBase + AppleDRISurfaceNotify,
- APPLEDRINAME ":SurfaceNotify");
-
- RegisterErrorName(DRIEventBase + AppleDRIClientNotLocal,
- APPLEDRINAME ":ClientNotLocal");
- RegisterErrorName(DRIEventBase + AppleDRIOperationNotSupported,
- APPLEDRINAME ":OperationNotSupported");
+ }
}
/*ARGSUSED*/
commit 546d46224e355d4f00232da5538548e3c8853e40
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 17:37:48 2007 -0500
Revert "registry: Register XINERAMA extension protocol names."
This reverts commit b9f5ab98c8dea36dcce1ad15fd2e059a77e77c39.
Moving all the names into dix/registry.c
diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index 1ba0c4d..26c2809 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -53,7 +53,6 @@ Equipment Corporation.
#include "globals.h"
#include "servermd.h"
#include "resource.h"
-#include "registry.h"
#ifdef RENDER
#include "picturestr.h"
#endif
@@ -590,19 +589,6 @@ void PanoramiXExtensionInit(int argc, char *argv[])
#ifdef RENDER
PanoramiXRenderInit ();
#endif
-
- RegisterRequestName(extEntry->base, X_PanoramiXQueryVersion,
- PANORAMIX_PROTOCOL_NAME ":QueryVersion");
- RegisterRequestName(extEntry->base, X_PanoramiXGetState,
- PANORAMIX_PROTOCOL_NAME ":GetState");
- RegisterRequestName(extEntry->base, X_PanoramiXGetScreenCount,
- PANORAMIX_PROTOCOL_NAME ":GetScreenCount");
- RegisterRequestName(extEntry->base, X_PanoramiXGetScreenSize,
- PANORAMIX_PROTOCOL_NAME ":GetScreenSize");
- RegisterRequestName(extEntry->base, X_XineramaIsActive,
- PANORAMIX_PROTOCOL_NAME ":IsActive");
- RegisterRequestName(extEntry->base, X_XineramaQueryScreens,
- PANORAMIX_PROTOCOL_NAME ":QueryScreens");
}
extern Bool CreateConnectionBlock(void);
diff --git a/hw/darwin/quartz/pseudoramiX.c b/hw/darwin/quartz/pseudoramiX.c
index cdd4fff..787601b 100644
--- a/hw/darwin/quartz/pseudoramiX.c
+++ b/hw/darwin/quartz/pseudoramiX.c
@@ -42,7 +42,6 @@ Equipment Corporation.
#include "window.h"
#include <X11/extensions/panoramiXproto.h>
#include "globals.h"
-#include "registry.h"
extern int noPseudoramiXExtension;
extern int noPanoramiXExtension;
@@ -148,19 +147,6 @@ void PseudoramiXExtensionInit(int argc, char *argv[])
PANORAMIX_PROTOCOL_NAME);
return;
}
-
- RegisterRequestName(extEntry->base, X_PanoramiXQueryVersion,
- PANORAMIX_PROTOCOL_NAME ":QueryVersion");
- RegisterRequestName(extEntry->base, X_PanoramiXGetState,
- PANORAMIX_PROTOCOL_NAME ":GetState");
- RegisterRequestName(extEntry->base, X_PanoramiXGetScreenCount,
- PANORAMIX_PROTOCOL_NAME ":GetScreenCount");
- RegisterRequestName(extEntry->base, X_PanoramiXGetScreenSize,
- PANORAMIX_PROTOCOL_NAME ":GetScreenSize");
- RegisterRequestName(extEntry->base, X_XineramaIsActive,
- PANORAMIX_PROTOCOL_NAME ":IsActive");
- RegisterRequestName(extEntry->base, X_XineramaQueryScreens,
- PANORAMIX_PROTOCOL_NAME ":QueryScreens");
}
diff --git a/randr/rrxinerama.c b/randr/rrxinerama.c
index c499802..896f61f 100644
--- a/randr/rrxinerama.c
+++ b/randr/rrxinerama.c
@@ -71,7 +71,6 @@
#include "randrstr.h"
#include "swaprep.h"
#include <X11/extensions/panoramiXproto.h>
-#include "registry.h"
#define RR_XINERAMA_MAJOR_VERSION 1
#define RR_XINERAMA_MINOR_VERSION 1
@@ -424,8 +423,6 @@ RRXineramaResetProc(ExtensionEntry* extEntry)
void
RRXineramaExtensionInit(void)
{
- ExtensionEntry *extEntry;
-
#ifdef PANORAMIX
if(!noPanoramiXExtension)
return;
@@ -439,22 +436,9 @@ RRXineramaExtensionInit(void)
if (screenInfo.numScreens > 1)
return;
- extEntry = AddExtension(PANORAMIX_PROTOCOL_NAME, 0, 0,
- ProcRRXineramaDispatch,
- SProcRRXineramaDispatch,
- RRXineramaResetProc,
- StandardMinorOpcode);
-
- RegisterRequestName(extEntry->base, X_PanoramiXQueryVersion,
- PANORAMIX_PROTOCOL_NAME ":QueryVersion");
- RegisterRequestName(extEntry->base, X_PanoramiXGetState,
- PANORAMIX_PROTOCOL_NAME ":GetState");
- RegisterRequestName(extEntry->base, X_PanoramiXGetScreenCount,
- PANORAMIX_PROTOCOL_NAME ":GetScreenCount");
- RegisterRequestName(extEntry->base, X_PanoramiXGetScreenSize,
- PANORAMIX_PROTOCOL_NAME ":GetScreenSize");
- RegisterRequestName(extEntry->base, X_XineramaIsActive,
- PANORAMIX_PROTOCOL_NAME ":IsActive");
- RegisterRequestName(extEntry->base, X_XineramaQueryScreens,
- PANORAMIX_PROTOCOL_NAME ":QueryScreens");
+ (void) AddExtension(PANORAMIX_PROTOCOL_NAME, 0,0,
+ ProcRRXineramaDispatch,
+ SProcRRXineramaDispatch,
+ RRXineramaResetProc,
+ StandardMinorOpcode);
}
commit fd2d83d5bf5b35c8a2b05f725486be166783921e
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 17:34:48 2007 -0500
Revert "registry: Register APPLEWM extension protocol names."
This reverts commit eee46b4681ec55297604b0425705f2b18381f7ca.
Moving all the names into dix/registry.c
diff --git a/hw/darwin/quartz/applewm.c b/hw/darwin/quartz/applewm.c
index fecafe8..308c510 100644
--- a/hw/darwin/quartz/applewm.c
+++ b/hw/darwin/quartz/applewm.c
@@ -42,7 +42,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "servermd.h"
#include "swaprep.h"
#include "propertyst.h"
-#include "registry.h"
#include <X11/Xatom.h>
#include "darwin.h"
#define _APPLEWM_SERVER_
@@ -128,45 +127,7 @@ AppleWMExtensionInit(
WMEventBase = extEntry->eventBase;
EventSwapVector[WMEventBase] = (EventSwapPtr) SNotifyEvent;
appleWMProcs = procsPtr;
- } else
- return;
-
- RegisterRequestName(WMReqCode, X_AppleWMQueryVersion,
- APPLEWMNAME ":QueryVersion");
- RegisterRequestName(WMReqCode, X_AppleWMFrameGetRect,
- APPLEWMNAME ":FrameGetRect");
- RegisterRequestName(WMReqCode, X_AppleWMFrameHitTest,
- APPLEWMNAME ":FrameHitTest");
- RegisterRequestName(WMReqCode, X_AppleWMFrameDraw,
- APPLEWMNAME ":FrameDraw");
- RegisterRequestName(WMReqCode, X_AppleWMDisableUpdate,
- APPLEWMNAME ":DisableUpdate");
- RegisterRequestName(WMReqCode, X_AppleWMReenableUpdate,
- APPLEWMNAME ":ReenableUpdate");
- RegisterRequestName(WMReqCode, X_AppleWMSelectInput,
- APPLEWMNAME ":SelectInput");
- RegisterRequestName(WMReqCode, X_AppleWMSetWindowMenuCheck,
- APPLEWMNAME ":SetWindowMenuCheck");
- RegisterRequestName(WMReqCode, X_AppleWMSetFrontProcess,
- APPLEWMNAME ":SetFrontProcess");
- RegisterRequestName(WMReqCode, X_AppleWMSetWindowLevel,
- APPLEWMNAME ":SetWindowLevel");
- RegisterRequestName(WMReqCode, X_AppleWMSetCanQuit,
- APPLEWMNAME ":SetCanQuit");
- RegisterRequestName(WMReqCode, X_AppleWMSetWindowMenu,
- APPLEWMNAME ":SetWindowMenu");
-
- RegisterEventName(WMEventBase + AppleWMControllerNotify,
- APPLEWMNAME ":ControllerNotify");
- RegisterEventName(WMEventBase + AppleWMActivationNotify,
- APPLEWMNAME ":ActivationNotify");
- RegisterEventName(WMEventBase + AppleWMPasteboardNotify,
- APPLEWMNAME ":PasteboardNotify");
-
- RegisterErrorName(WMErrorBase + AppleWMClientNotLocal,
- APPLEWMNAME ":ClientNotLocal");
- RegisterErrorName(WMErrorBase + AppleWMOperationNotSupported,
- APPLEWMNAME ":OperationNotSupported");
+ }
}
/*ARGSUSED*/
commit c934e1af27189571c1e7dd838872e380c3580eeb
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 17:32:35 2007 -0500
Revert "registry: Register DBE extension protocol names."
This reverts commit 2e1e5be1d9067816525aa13a1d818e8ca6899599.
Moving all the names into dix/registry.c
diff --git a/dbe/dbe.c b/dbe/dbe.c
index a872544..8175a35 100644
--- a/dbe/dbe.c
+++ b/dbe/dbe.c
@@ -51,7 +51,6 @@
#include "extnsionst.h"
#include "gcstruct.h"
#include "dixstruct.h"
-#include "registry.h"
#define NEED_DBE_PROTOCOL
#include "dbestruct.h"
#include "midbe.h"
@@ -1748,25 +1747,5 @@ DbeExtensionInit(void)
dbeErrorBase = extEntry->errorBase;
- RegisterRequestName(extEntry->base, X_DbeGetVersion,
- DBE_PROTOCOL_NAME ":GetVersion");
- RegisterRequestName(extEntry->base, X_DbeAllocateBackBufferName,
- DBE_PROTOCOL_NAME ":AllocateBackBufferName");
- RegisterRequestName(extEntry->base, X_DbeDeallocateBackBufferName,
- DBE_PROTOCOL_NAME ":DeallocateBackBufferName");
- RegisterRequestName(extEntry->base, X_DbeSwapBuffers,
- DBE_PROTOCOL_NAME ":SwapBuffers");
- RegisterRequestName(extEntry->base, X_DbeBeginIdiom,
- DBE_PROTOCOL_NAME ":BeginIdiom");
- RegisterRequestName(extEntry->base, X_DbeEndIdiom,
- DBE_PROTOCOL_NAME ":EndIdiom");
- RegisterRequestName(extEntry->base, X_DbeGetVisualInfo,
- DBE_PROTOCOL_NAME ":GetVisualInfo");
- RegisterRequestName(extEntry->base, X_DbeGetBackBufferAttributes,
- DBE_PROTOCOL_NAME ":GetBackBufferAttributes");
-
- RegisterErrorName(dbeErrorBase + DbeBadBuffer,
- DBE_PROTOCOL_NAME ":BadBuffer");
-
} /* DbeExtensionInit() */
commit b9ab6f300a46aa8879b11eac51857357cc379c2f
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 17:31:00 2007 -0500
Revert "registry: Register DAMAGE extension protocol names."
This reverts commit 20db50b4c44a14f7eeac2b1de17ada68482521da.
Moving all the names into dix/registry.c
diff --git a/damageext/damageext.c b/damageext/damageext.c
index ac2198b..517c72d 100755
--- a/damageext/damageext.c
+++ b/damageext/damageext.c
@@ -25,7 +25,6 @@
#endif
#include "damageextint.h"
-#include "registry.h"
static unsigned char DamageReqCode;
static int DamageEventBase;
@@ -527,23 +526,5 @@ DamageExtensionInit(void)
DamageErrorBase = extEntry->errorBase;
EventSwapVector[DamageEventBase + XDamageNotify] =
(EventSwapPtr) SDamageNotifyEvent;
- } else
- return;
-
- RegisterRequestName(DamageReqCode, X_DamageQueryVersion,
- DAMAGE_NAME ":QueryVersion");
- RegisterRequestName(DamageReqCode, X_DamageCreate,
- DAMAGE_NAME ":Create");
- RegisterRequestName(DamageReqCode, X_DamageDestroy,
- DAMAGE_NAME ":Destroy");
- RegisterRequestName(DamageReqCode, X_DamageSubtract,
- DAMAGE_NAME ":Subtract");
- RegisterRequestName(DamageReqCode, X_DamageAdd,
- DAMAGE_NAME ":Add");
-
- RegisterEventName(DamageEventBase + XDamageNotify,
- DAMAGE_NAME ":Notify");
-
- RegisterErrorName(extEntry->errorBase + BadDamage,
- DAMAGE_NAME ":BadDamage");
+ }
}
commit 26586a7ad5e999b34996d147fb43998deea89178
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Tue Nov 20 17:27:37 2007 -0500
Revert "registry: Register composite extension protocol names."
This reverts commit 166ef972febc00c665e1d5aeb68e75d7bbcf9879.
Moving all the names into dix/registry.c
diff --git a/composite/compext.c b/composite/compext.c
index 98adabb..2918556 100644
--- a/composite/compext.c
+++ b/composite/compext.c
@@ -46,7 +46,6 @@
#include "compint.h"
#include "xace.h"
-#include "registry.h"
#define SERVER_COMPOSITE_MAJOR 0
#define SERVER_COMPOSITE_MINOR 4
@@ -755,23 +754,4 @@ CompositeExtensionInit (void)
/* Initialization succeeded */
noCompositeExtension = FALSE;
-
- RegisterRequestName(CompositeReqCode, X_CompositeQueryVersion,
- COMPOSITE_NAME ":CompositeQueryVersion");
- RegisterRequestName(CompositeReqCode, X_CompositeRedirectWindow,
- COMPOSITE_NAME ":CompositeRedirectWindow");
- RegisterRequestName(CompositeReqCode, X_CompositeRedirectSubwindows,
- COMPOSITE_NAME ":CompositeRedirectSubwindows");
- RegisterRequestName(CompositeReqCode, X_CompositeUnredirectWindow,
- COMPOSITE_NAME ":CompositeUnredirectWindow");
- RegisterRequestName(CompositeReqCode, X_CompositeUnredirectSubwindows,
- COMPOSITE_NAME ":CompositeUnredirectSubwindows");
- RegisterRequestName(CompositeReqCode, X_CompositeCreateRegionFromBorderClip,
- COMPOSITE_NAME ":CompositeCreateRegionFromBorderClip");
- RegisterRequestName(CompositeReqCode, X_CompositeNameWindowPixmap,
- COMPOSITE_NAME ":CompositeNameWindowPixmap");
- RegisterRequestName(CompositeReqCode, X_CompositeGetOverlayWindow,
- COMPOSITE_NAME ":CompositeGetOverlayWindow");
- RegisterRequestName(CompositeReqCode, X_CompositeReleaseOverlayWindow,
- COMPOSITE_NAME ":CompositeReleaseOverlayWindow");
}
More information about the xorg-commit
mailing list