From 150eabc4c8a08c81c48493583f922a1240b7e91c Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 8 Sep 2006 15:11:04 -0400
Subject: [PATCH 001/552] Add SELinux extension source files.

---
 Xext/XSELinuxConfig |   83 ++
 Xext/xselinux.c     | 1884 +++++++++++++++++++++++++++++++++++++++++++
 Xext/xselinux.h     |   29 +
 3 files changed, 1996 insertions(+)
 create mode 100644 Xext/XSELinuxConfig
 create mode 100644 Xext/xselinux.c
 create mode 100644 Xext/xselinux.h

diff --git a/Xext/XSELinuxConfig b/Xext/XSELinuxConfig
new file mode 100644
index 000000000..faf815e27
--- /dev/null
+++ b/Xext/XSELinuxConfig
@@ -0,0 +1,83 @@
+#
+# Config file for XSELinux extension
+#
+
+#
+# The nonlocal_context rule defines a context to be used for all clients
+# connecting to the server from a remote host.  The nonlocal context must
+# be defined, and it must be a valid context according to the SELinux
+# security policy.  Only one nonlocal_context rule may be defined.
+#
+nonlocal_context			system_u:object_r:remote_xclient_t:s1
+
+#
+# Property rules map a property name to a SELinux type.  The type must
+# be valid according to the SELinux security policy.  There can be any
+# number of property rules.  Additionally, a default property type can be
+# defined for all properties not explicitly listed.  The default
+# property type may not be omitted.  The default rule may appear in
+# any position (it need not be the last property rule listed).
+#
+property WM_NAME			wm_property_t
+property WM_CLASS			wm_property_t
+property WM_ICON_NAME			wm_property_t
+property WM_HINTS			wm_property_t
+property WM_NORMAL_HINTS		wm_property_t
+property WM_COMMAND			wm_property_t
+
+property CUT_BUFFER0			cut_buffer_property_t
+property CUT_BUFFER1			cut_buffer_property_t
+property CUT_BUFFER2			cut_buffer_property_t
+property CUT_BUFFER3			cut_buffer_property_t
+property CUT_BUFFER4			cut_buffer_property_t
+property CUT_BUFFER5			cut_buffer_property_t
+property CUT_BUFFER6			cut_buffer_property_t
+property CUT_BUFFER7			cut_buffer_property_t
+
+property default			unknown_property_t
+
+#
+# Extension rules map an extension name to a SELinux type.  The type must
+# be valid according to the SELinux security policy.  There can be any
+# number of extension rules.  Additionally, a default extension type can
+# be defined for all extensions not explicitly listed.  The default
+# extension type may not be omitted.  The default rule may appear in
+# any position (it need not be the last extension rule listed).
+#
+extension BIG-REQUESTS			std_ext_t
+extension DOUBLE-BUFFER			std_ext_t
+extension DPMS				screensaver_ext_t
+extension Extended-Visual-Information	std_ext_t
+extension FontCache			font_ext_t
+extension GLX				std_ext_t
+extension LBX				std_ext_t
+extension MIT-SCREEN-SAVER		screensaver_ext_t
+extension MIT-SHM			shmem_ext_t
+extension MIT-SUNDRY-NONSTANDARD	std_ext_t
+extension NV-CONTROL			accelgraphics_ext_t
+extension NV-GLX			accelgraphics_ext_t
+extension NVIDIA-GLX			accelgraphics_ext_t
+extension RANDR				std_ext_t
+extension RECORD			debug_ext_t
+extension RENDER			std_ext_t
+extension SECURITY			security_ext_t
+extension SELinux			security_ext_t
+extension SHAPE				std_ext_t
+extension SYNC				sync_ext_t
+extension TOG-CUP			windowmgr_ext_t
+extension X-Resource			debug_ext_t
+extension XAccessControlExtension	security_ext_t
+extension XACEUSR			security_ext_t
+extension XC-APPGROUP			security_ext_t
+extension XC-MISC			std_ext_t
+extension XFree86-Bigfont		font_ext_t
+extension XFree86-DGA			accelgraphics_ext_t
+extension XFree86-Misc			std_ext_t
+extension XFree86-VidModeExtension	video_ext_t
+extension XInputExtension		input_ext_t
+extension XKEYBOARD			input_ext_t
+extension XpExtension                   std_ext_t
+extension XTEST				debug_ext_t
+extension XVideo			video_ext_t
+extension XVideo-MotionCompensation	video_ext_t
+extension default			unknown_ext_t
diff --git a/Xext/xselinux.c b/Xext/xselinux.c
new file mode 100644
index 000000000..5a6d2ef00
--- /dev/null
+++ b/Xext/xselinux.c
@@ -0,0 +1,1884 @@
+/************************************************************
+
+Author: Eamon Walsh <ewalsh@epoch.ncsc.mil>
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+this permission notice appear in supporting documentation.  This permission
+notice shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+********************************************************/
+
+/*
+ * Portions of this code copyright (c) 2005 by Trusted Computer Solutions, Inc.
+ * All rights reserved.
+ */
+
+#include <selinux/flask.h>
+#include <selinux/av_permissions.h>
+#include <selinux/selinux.h>
+#include <selinux/context.h>
+#include <selinux/avc.h>
+
+#include <libaudit.h>
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include <X11/Xfuncproto.h>
+#include "dixstruct.h"
+#include "extnsionst.h"
+#include "resource.h"
+#include "selection.h"
+#include "xacestr.h"
+#include "xselinux.h"
+#define XSERV_t
+#define TRANS_SERVER
+#include <X11/Xtrans/Xtrans.h>
+#include "../os/osdep.h"
+#include <stdio.h>
+#include <stdarg.h>
+#include "modinit.h"
+
+#ifndef XSELINUXCONFIGFILE
+#warning "XSELinux Policy file is not defined"
+#define XSELINUXCONFIGFILE  NULL
+#endif
+
+
+/* Make sure a locally connecting client has a valid context.  The context
+ * for this client is retrieved again later on in AssignClientState(), but
+ * by that point it's too late to reject the client.
+ */
+static char *
+XSELinuxValidContext (ClientPtr client)
+{
+    security_context_t ctx = NULL;
+    XtransConnInfo ci = ((OsCommPtr)client->osPrivate)->trans_conn;
+    char reason[256];
+    char *ret = (char *)NULL;
+
+    if (_XSERVTransIsLocal(ci))
+    {
+        int fd = _XSERVTransGetConnectionNumber(ci);
+        if (getpeercon(fd, &ctx) < 0)
+        {
+            snprintf(reason, sizeof(reason), "Failed to retrieve SELinux context from socket");
+            ret = reason;
+            goto out;
+        }
+        if (security_check_context(ctx))
+        {
+            snprintf(reason, sizeof(reason), "Client's SELinux context is invalid: %s", ctx);
+            ret = reason;
+        }
+
+        freecon(ctx);
+    }
+
+out:
+    return ret;
+}
+
+
+/* devPrivates in client and extension */
+static int clientPrivateIndex;
+static int extnsnPrivateIndex;
+
+/* audit file descriptor */
+static int audit_fd;
+
+/* structure passed to auditing callback */
+typedef struct {
+    ClientPtr client;	/* client */
+    char *property;	/* property name, if any */
+    char *extension;	/* extension name, if any */
+} XSELinuxAuditRec;
+
+/*
+ * Table of SELinux types for property names.
+ */
+static char **propertyTypes = NULL;
+static int propertyTypesCount = 0;
+char *XSELinuxPropertyTypeDefault = NULL;
+
+/*
+ * Table of SELinux types for each extension.
+ */
+static char **extensionTypes = NULL;
+static int extensionTypesCount = 0;
+static char *XSELinuxExtensionTypeDefault = NULL;
+
+/* security context for non-local clients */
+static char *XSELinuxNonlocalContextDefault = NULL;
+
+/* security context for the root window */
+static char *XSELinuxRootWindowContext = NULL;
+
+/* Selection stuff from dix */
+extern Selection *CurrentSelections;
+extern int NumCurrentSelections;
+
+/* 
+ * list of classes corresponding to SIDs in the 
+ * rsid array of the security state structure (below).
+ *
+ * XXX SIDs should be stored in their native objects, not all
+ * bunched together in the client structure.  However, this will
+ * require modification to the resource manager.
+ */
+static security_class_t sClasses[] = {
+    SECCLASS_WINDOW,
+    SECCLASS_DRAWABLE,
+    SECCLASS_GC,
+    SECCLASS_CURSOR,
+    SECCLASS_FONT,
+    SECCLASS_COLORMAP,
+    SECCLASS_PROPERTY,
+    SECCLASS_XCLIENT,
+    SECCLASS_XINPUT
+};
+#define NRES (sizeof(sClasses)/sizeof(sClasses[0]))
+
+/* This is what we store for client security state */
+typedef struct {
+    int haveState;
+    security_id_t sid;
+    security_id_t rsid[NRES];
+    struct avc_entry_ref aeref;
+} XSELinuxClientStateRec;
+
+/* Convenience macros for accessing security state fields */
+#define STATEPTR(client) \
+    ((client)->devPrivates[clientPrivateIndex].ptr)
+#define HAVESTATE(client) \
+    (((XSELinuxClientStateRec*)STATEPTR(client))->haveState)
+#define SID(client) \
+    (((XSELinuxClientStateRec*)STATEPTR(client))->sid)
+#define RSID(client,n) \
+    (((XSELinuxClientStateRec*)STATEPTR(client))->rsid[n])
+#define AEREF(client) \
+    (((XSELinuxClientStateRec*)STATEPTR(client))->aeref)
+#define EXTENSIONSID(ext) \
+    ((ext)->devPrivates[extnsnPrivateIndex].ptr)
+
+/*
+ * Returns the index into the rsid array where the SID for the
+ * given class is stored.
+ */
+static int
+IndexByClass(security_class_t class)
+{
+    int i;
+    for (i=0; i<NRES; i++)
+	if (class == sClasses[i])
+	    return i;
+    return 0;
+}
+
+/*
+ * Does sanity checking on a resource ID.  This can be removed after 
+ * testing.
+ */
+static void
+CheckXID(XID id)
+{
+    /*
+    XID c = CLIENT_ID(id);
+
+    if (c > 10)
+	ErrorF("Warning: possibly mangled ID %x\n", id);
+
+    c = id & RESOURCE_ID_MASK;
+    if (c > 100)
+	ErrorF("Warning: possibly mangled ID %x\n", id);
+        */
+}
+
+/*
+ * Byte-swap a CARD32 id if necessary.
+ */
+static XID
+SwapXID(ClientPtr client, XID id)
+{
+    register char n;
+    if (client->swapped)
+	swapl(&id, n);
+    return id;
+}
+
+/*
+ * ServerPerm - check access permissions on a server-owned object.
+ *
+ * Arguments:
+ * client: Client doing the request.
+ * class: Security class of the server object being accessed.
+ * perm: Permissions required on the object.
+ *
+ * Returns: boolean TRUE=allowed, FALSE=denied.
+ */
+static int
+ServerPerm(ClientPtr client,
+	   security_class_t class,
+	   access_vector_t perm)
+{
+    int idx = IndexByClass(class);
+    if (HAVESTATE(client))
+    {
+	XSELinuxAuditRec auditdata;
+	auditdata.client = client;
+	auditdata.property = NULL;
+	auditdata.extension = NULL;
+	errno = 0;
+        if (avc_has_perm(SID(client), RSID(serverClient,idx), class,
+                         perm, &AEREF(client), &auditdata) < 0)
+        {
+            if (errno != EACCES)
+                ErrorF("ServerPerm: unexpected error %d\n", errno);
+            return FALSE;
+        }
+    }
+    else
+    {
+	ErrorF("No client state in server-perm check!\n");
+        return TRUE;
+    }
+
+    return TRUE;
+}
+
+/*
+ * IDPerm - check access permissions on a resource.
+ *
+ * Arguments:
+ * client: Client doing the request.
+ * id: resource id of the resource being accessed.
+ * class: Security class of the resource being accessed.
+ * perm: Permissions required on the resource.
+ *
+ * Returns: boolean TRUE=allowed, FALSE=denied.
+ */
+static int
+IDPerm(ClientPtr sclient,
+	 XID id,
+	 security_class_t class,
+	 access_vector_t perm)
+{
+    ClientPtr tclient;
+    int idx = IndexByClass(class);
+    XSELinuxAuditRec auditdata;
+
+    if (id == None)
+	return TRUE;
+
+    CheckXID(id);
+    tclient = clients[CLIENT_ID(id)];
+
+    /*
+     * This happens in the case where a client has
+     * disconnected.  XXX might want to make the server
+     * own orphaned resources...
+     */
+    if (!tclient || !HAVESTATE(tclient) || !HAVESTATE(sclient))
+    {
+	return TRUE;
+    }
+
+    auditdata.client = sclient;
+    auditdata.property = NULL;
+    auditdata.extension = NULL;
+    errno = 0;
+    if (avc_has_perm(SID(sclient), RSID(tclient,idx), class,
+		     perm, &AEREF(sclient), &auditdata) < 0)
+    {
+	if (errno != EACCES)
+	    ErrorF("IDPerm: unexpected error %d\n", errno);
+	return FALSE;
+    }
+
+    return TRUE;
+}
+
+/*
+ * ObjectSIDByLabel - get SID for an extension or property.
+ *
+ * Arguments:
+ * class: should be SECCLASS_XEXTENSION or SECCLASS_PROPERTY.
+ * name: name of the extension or property.
+ *
+ * Returns: proper SID for the object or NULL on error.
+ */
+static security_id_t
+ObjectSIDByLabel(security_context_t basecontext, security_class_t class,
+                 const char *name)
+{
+    security_context_t base, new;
+    context_t con;
+    security_id_t sid = NULL;
+    char **ptr, *type = NULL;
+
+    if (basecontext != NULL)
+    {
+        /* use the supplied context */
+        base = strdup(basecontext);
+        if (base == NULL)
+            goto out;
+    }
+    else
+    {
+        /* get server context */
+        if (getcon(&base) < 0)
+            goto out;
+    }
+
+    /* make a new context-manipulation object */
+    con = context_new(base);
+    if (!con)
+	goto out2;
+    
+    /* look in the mappings of names to types */
+    ptr = (class == SECCLASS_PROPERTY) ? propertyTypes : extensionTypes;
+    for (; *ptr; ptr+=2)
+	if (!strcmp(*ptr, name))
+	    break;
+    type = ptr[1];
+
+    /* set the role and type in the context (user unchanged) */
+    if (context_type_set(con, type) ||
+	context_role_set(con, "object_r"))
+	goto out3;
+
+    /* get a context string from the context-manipulation object */
+    new = context_str(con);
+    if (!new)
+	goto out3;
+
+    /* get a SID for the context */
+    if (avc_context_to_sid(new, &sid) < 0)
+	goto out3;
+
+  out3:
+    context_free(con);
+  out2:
+    freecon(base);
+  out:
+    return sid;
+}
+
+/*
+ * AssignClientState - set up client security state.
+ *
+ * Arguments:
+ * client: client to set up (can be serverClient).
+ */
+static void
+AssignClientState(ClientPtr client)
+{
+    int i, needToFree = 0;
+    security_context_t basectx, objctx;
+    XSELinuxClientStateRec *state = (XSELinuxClientStateRec*)STATEPTR(client);
+    Bool isServerClient = FALSE;
+
+    avc_entry_ref_init(&state->aeref);
+
+    if (client->index > 0)
+    {
+	XtransConnInfo ci = ((OsCommPtr)client->osPrivate)->trans_conn;
+	if (_XSERVTransIsLocal(ci)) {
+	    /* for local clients, can get context from the socket */
+	    int fd = _XSERVTransGetConnectionNumber(ci);
+	    if (getpeercon(fd, &basectx) < 0)
+	    {
+		FatalError("Client %d: couldn't get context from socket\n",
+			   client->index);
+	    }
+	    needToFree = 1;
+	}
+        else
+        {
+	    /* for remote clients, need to use a default context */
+	    basectx = XSELinuxNonlocalContextDefault;
+	}
+    }
+    else
+    {
+        isServerClient = TRUE;
+
+	/* use the context of the X server process for the serverClient */
+	if (getcon(&basectx) < 0)
+	{
+	    FatalError("Couldn't get context of X server process\n");
+	}
+	needToFree = 1;
+    }
+
+    /* get a SID from the context */
+    if (avc_context_to_sid(basectx, &state->sid) < 0)
+    {
+	FatalError("Client %d: couldn't get security ID for client\n",
+		   client->index);
+    }
+
+    /* get contexts and then SIDs for each resource type */
+    for (i=0; i<NRES; i++)
+    {
+	if (security_compute_create(basectx, basectx, sClasses[i],
+				    &objctx) < 0)
+	{
+	    FatalError("Client %d: couldn't get context for class %x\n",
+		       client->index, sClasses[i]);
+	}
+	else if (avc_context_to_sid(objctx, &state->rsid[i]) < 0)
+	{
+	    FatalError("Client %d: couldn't get SID for class %x\n",
+		       client->index, sClasses[i]);
+	}
+	freecon(objctx);
+    }
+
+    /* special handling for serverClient windows (that is, root windows) */
+    if (isServerClient == TRUE)
+    {
+        i = IndexByClass(SECCLASS_WINDOW);
+        sidput(state->rsid[i]);
+        if (avc_context_to_sid(XSELinuxRootWindowContext, &state->rsid[i]))
+        {
+            FatalError("Failed to set SID for root window\n");
+        }
+    }
+
+    /* mark as set up, free base context if necessary, and return */
+    state->haveState = TRUE;
+    if (needToFree)
+	freecon(basectx);
+}
+
+/*
+ * FreeClientState - tear down client security state.
+ *
+ * Arguments:
+ * client: client to release (can be serverClient).
+ */
+static void
+FreeClientState(ClientPtr client)
+{
+    int i;
+    XSELinuxClientStateRec *state = (XSELinuxClientStateRec*)STATEPTR(client);
+
+    /* client state may not be set up if its auth was rejected */
+    if (state->haveState) {
+	state = (XSELinuxClientStateRec*)STATEPTR(client);
+	sidput(state->sid);
+	for (i=0; i<NRES; i++)
+	    sidput(state->rsid[i]);
+	state->haveState = FALSE;
+    }
+}
+
+#define REQUEST_SIZE_CHECK(client, req) \
+    (client->req_len >= (sizeof(req) >> 2))
+#define IDPERM(client, req, field, class, perm) \
+    (REQUEST_SIZE_CHECK(client,req) && \
+    IDPerm(client, SwapXID(client,((req*)stuff)->field), class, perm))
+#define CALLBACK(name) static void \
+name(CallbackListPtr *pcbl, pointer nulldata, pointer calldata)
+
+static int
+CheckSendEventPerms(ClientPtr client)
+{
+    register char n;
+    access_vector_t perm = 0;
+    REQUEST(xSendEventReq);
+
+    /* might need type bounds checking here */
+    if (!REQUEST_SIZE_CHECK(client, xSendEventReq))
+	return FALSE;
+
+    switch (stuff->event.u.u.type) {
+	case SelectionClear:
+	case SelectionNotify:
+	case SelectionRequest:
+	case ClientMessage:
+	case PropertyNotify:
+	    perm = WINDOW__CLIENTCOMEVENT;
+	    break;
+	case ButtonPress:
+	case ButtonRelease:
+	case KeyPress:
+	case KeyRelease:
+	case KeymapNotify:
+	case MotionNotify:
+	case EnterNotify:
+	case LeaveNotify:
+	case FocusIn:
+	case FocusOut:
+	    perm = WINDOW__INPUTEVENT;
+	    break;
+	case Expose:
+	case GraphicsExpose:
+	case NoExpose:
+	case VisibilityNotify:
+	    perm = WINDOW__DRAWEVENT;
+	    break;
+	case CirculateNotify:
+	case ConfigureNotify:
+	case CreateNotify:
+	case DestroyNotify:
+	case MapNotify:
+	case UnmapNotify:
+	case GravityNotify:
+	case ReparentNotify:
+	    perm = WINDOW__WINDOWCHANGEEVENT;
+	    break;
+	case CirculateRequest:
+	case ConfigureRequest:
+	case MapRequest:
+	case ResizeRequest:
+	    perm = WINDOW__WINDOWCHANGEREQUEST;
+	    break;
+	case ColormapNotify:
+	case MappingNotify:
+	    perm = WINDOW__SERVERCHANGEEVENT;
+	    break;
+	default:
+	    perm = WINDOW__EXTENSIONEVENT;
+	    break;
+    }
+    if (client->swapped)
+	swapl(&stuff->destination, n);
+    return IDPerm(client, stuff->destination, SECCLASS_WINDOW, perm);
+}
+     
+static int
+CheckConvertSelectionPerms(ClientPtr client)
+{
+    register char n;
+    int rval = TRUE;
+    REQUEST(xConvertSelectionReq);
+    
+    if (!REQUEST_SIZE_CHECK(client, xConvertSelectionReq))
+	return FALSE;
+
+    if (client->swapped)
+    {
+	swapl(&stuff->selection, n);
+	swapl(&stuff->requestor, n);
+    }
+
+    if (ValidAtom(stuff->selection))
+    {
+	int i = 0;
+	while ((i < NumCurrentSelections) &&
+	       CurrentSelections[i].selection != stuff->selection) i++;
+	if (i < NumCurrentSelections)
+	    rval = rval && IDPerm(client, CurrentSelections[i].window,
+				  SECCLASS_WINDOW, WINDOW__CLIENTCOMEVENT);
+    }
+    rval = rval && IDPerm(client, stuff->requestor,
+			  SECCLASS_WINDOW, WINDOW__CLIENTCOMEVENT);
+    return rval;
+}
+
+static int
+CheckSetSelectionOwnerPerms(ClientPtr client)
+{
+    register char n;
+    int rval = TRUE;
+    REQUEST(xSetSelectionOwnerReq);
+
+    if (!REQUEST_SIZE_CHECK(client, xSetSelectionOwnerReq))
+	return FALSE;
+
+    if (client->swapped)
+    {
+	swapl(&stuff->selection, n);
+	swapl(&stuff->window, n);
+    }
+
+    if (ValidAtom(stuff->selection))
+    {
+	int i = 0;
+	while ((i < NumCurrentSelections) &&
+	       CurrentSelections[i].selection != stuff->selection) i++;
+	if (i < NumCurrentSelections)
+	    rval = rval && IDPerm(client, CurrentSelections[i].window,
+				  SECCLASS_WINDOW, WINDOW__CHSELECTION);
+    }
+    rval = rval && IDPerm(client, stuff->window, 
+			  SECCLASS_WINDOW, WINDOW__CHSELECTION);
+    return rval;
+}
+    
+CALLBACK(XSELinuxCoreDispatch)
+{
+    XaceCoreDispatchRec *rec = (XaceCoreDispatchRec*)calldata;
+    ClientPtr client = rec->client;
+    REQUEST(xReq);
+    Bool rval;
+
+    switch(stuff->reqType) {
+    /* Drawable class control requirements */
+    case X_ClearArea:
+	rval = IDPERM(client, xClearAreaReq, window,
+		      SECCLASS_DRAWABLE, DRAWABLE__DRAW);
+	break;
+    case X_PolySegment:
+    case X_PolyRectangle:
+    case X_PolyArc:
+    case X_PolyFillRectangle:
+    case X_PolyFillArc:
+	rval = IDPERM(client, xPolySegmentReq, drawable,
+		      SECCLASS_DRAWABLE, DRAWABLE__DRAW);
+	break;
+    case X_PolyPoint:
+    case X_PolyLine:
+	rval = IDPERM(client, xPolyPointReq, drawable,
+		      SECCLASS_DRAWABLE, DRAWABLE__DRAW);
+	break;
+    case X_FillPoly:
+	rval = IDPERM(client, xFillPolyReq, drawable,
+		      SECCLASS_DRAWABLE, DRAWABLE__DRAW);
+	break;
+    case X_PutImage:
+	rval = IDPERM(client, xPutImageReq, drawable,
+		      SECCLASS_DRAWABLE, DRAWABLE__DRAW);
+	break;
+    case X_CopyArea:
+    case X_CopyPlane:
+	rval = IDPERM(client, xCopyAreaReq, srcDrawable,
+		      SECCLASS_DRAWABLE, DRAWABLE__COPY)
+	    && IDPERM(client, xCopyAreaReq, dstDrawable,
+		      SECCLASS_DRAWABLE, DRAWABLE__DRAW);
+	break;
+    case X_GetImage:
+	rval = IDPERM(client, xGetImageReq, drawable,
+		      SECCLASS_DRAWABLE, DRAWABLE__COPY);
+	break;
+    case X_GetGeometry:
+	rval = IDPERM(client, xResourceReq, id,
+		      SECCLASS_DRAWABLE, DRAWABLE__GETATTR);
+	break;
+
+    /* Window class control requirements */
+    case X_ChangeProperty:
+	rval = IDPERM(client, xChangePropertyReq, window,
+		      SECCLASS_WINDOW, 
+		      WINDOW__CHPROPLIST | WINDOW__CHPROP |
+		      WINDOW__LISTPROP);
+	break;
+    case X_ChangeSaveSet:
+	rval = IDPERM(client, xChangeSaveSetReq, window,
+		      SECCLASS_WINDOW,
+		      WINDOW__CTRLLIFE | WINDOW__CHPARENT);
+	break;
+    case X_ChangeWindowAttributes:
+	rval = IDPERM(client, xChangeWindowAttributesReq, window,
+		      SECCLASS_WINDOW, WINDOW__SETATTR);
+	break;
+    case X_CirculateWindow:
+	rval = IDPERM(client, xCirculateWindowReq, window,
+		      SECCLASS_WINDOW, WINDOW__CHSTACK);
+	break;
+    case X_ConfigureWindow:
+	rval = IDPERM(client, xConfigureWindowReq, window,
+		      SECCLASS_WINDOW,
+		      WINDOW__SETATTR | WINDOW__MOVE | WINDOW__CHSTACK);
+	break;
+    case X_ConvertSelection:
+	rval = CheckConvertSelectionPerms(client);
+	break;
+    case X_CreateWindow:
+	rval = IDPERM(client, xCreateWindowReq, wid,
+		      SECCLASS_WINDOW,
+		      WINDOW__CREATE | WINDOW__SETATTR | WINDOW__MOVE)
+	    && IDPERM(client, xCreateWindowReq, parent,
+		      SECCLASS_WINDOW,
+		      WINDOW__CHSTACK | WINDOW__ADDCHILD)
+	    && IDPERM(client, xCreateWindowReq, wid,
+		      SECCLASS_DRAWABLE, DRAWABLE__CREATE);
+	break;
+    case X_DeleteProperty:
+	rval = IDPERM(client, xDeletePropertyReq, window,
+		      SECCLASS_WINDOW,
+		      WINDOW__CHPROP | WINDOW__CHPROPLIST);
+	break;
+    case X_DestroyWindow:
+    case X_DestroySubwindows:
+	rval = IDPERM(client, xResourceReq, id,
+		      SECCLASS_WINDOW,
+		      WINDOW__ENUMERATE | WINDOW__UNMAP | WINDOW__DESTROY)
+	    && IDPERM(client, xResourceReq, id,
+		      SECCLASS_DRAWABLE, DRAWABLE__DESTROY);
+	break;
+    case X_GetMotionEvents:
+	rval = IDPERM(client, xGetMotionEventsReq, window,
+		      SECCLASS_WINDOW, WINDOW__MOUSEMOTION);
+	break;
+    case X_GetProperty:
+	rval = IDPERM(client, xGetPropertyReq, window,
+		      SECCLASS_WINDOW, WINDOW__LISTPROP);
+	break;
+    case X_GetWindowAttributes:
+	rval = IDPERM(client, xResourceReq, id,
+		      SECCLASS_WINDOW, WINDOW__GETATTR);
+	break;
+    case X_KillClient:
+	rval = IDPERM(client, xResourceReq, id,
+		      SECCLASS_XCLIENT, XCLIENT__KILL);
+	break;
+    case X_ListProperties:
+	rval = IDPERM(client, xResourceReq, id,
+		      SECCLASS_WINDOW, WINDOW__LISTPROP);
+	break;
+    case X_MapWindow:
+    case X_MapSubwindows:
+	rval = IDPERM(client, xResourceReq, id,
+		      SECCLASS_WINDOW,
+		      WINDOW__ENUMERATE | WINDOW__GETATTR | WINDOW__MAP);
+	break;
+    case X_QueryTree:
+	rval = IDPERM(client, xResourceReq, id,
+		      SECCLASS_WINDOW, WINDOW__ENUMERATE | WINDOW__GETATTR);
+	break;
+    case X_RotateProperties:
+	rval = IDPERM(client, xRotatePropertiesReq, window,
+		      SECCLASS_WINDOW, WINDOW__CHPROP | WINDOW__CHPROPLIST);
+	break;
+    case X_ReparentWindow:
+	rval = IDPERM(client, xReparentWindowReq, window,
+		      SECCLASS_WINDOW, WINDOW__CHPARENT | WINDOW__MOVE)
+	    && IDPERM(client, xReparentWindowReq, parent,
+		      SECCLASS_WINDOW, WINDOW__CHSTACK | WINDOW__ADDCHILD);
+	break;
+    case X_SendEvent:
+	rval = CheckSendEventPerms(client);
+	break;
+    case X_SetInputFocus:
+	rval = IDPERM(client, xSetInputFocusReq, focus,
+		      SECCLASS_WINDOW, WINDOW__SETFOCUS)
+	    && ServerPerm(client, SECCLASS_XINPUT, XINPUT__SETFOCUS);
+	break;
+    case X_SetSelectionOwner:
+	rval = CheckSetSelectionOwnerPerms(client);
+	break;
+    case X_TranslateCoords:
+	rval = IDPERM(client, xTranslateCoordsReq, srcWid,
+		      SECCLASS_WINDOW, WINDOW__GETATTR)
+	    && IDPERM(client, xTranslateCoordsReq, dstWid,
+		      SECCLASS_WINDOW, WINDOW__GETATTR);
+	break;
+    case X_UnmapWindow:
+    case X_UnmapSubwindows:
+	rval = IDPERM(client, xResourceReq, id,
+		      SECCLASS_WINDOW,
+		      WINDOW__ENUMERATE | WINDOW__GETATTR |
+		      WINDOW__UNMAP);
+	break;
+    case X_WarpPointer:
+	rval = IDPERM(client, xWarpPointerReq, srcWid,
+		      SECCLASS_WINDOW, WINDOW__GETATTR)
+	    && IDPERM(client, xWarpPointerReq, dstWid,
+		      SECCLASS_WINDOW, WINDOW__GETATTR)
+	    && ServerPerm(client, SECCLASS_XINPUT, XINPUT__WARPPOINTER);
+	break;
+
+    /* Input class control requirements */
+    case X_GrabButton:
+    case X_GrabKey:
+	rval = ServerPerm(client, SECCLASS_XINPUT, XINPUT__PASSIVEGRAB);
+	break;
+    case X_GrabKeyboard:
+    case X_GrabPointer:
+    case X_ChangeActivePointerGrab:
+	rval = ServerPerm(client, SECCLASS_XINPUT, XINPUT__ACTIVEGRAB);
+	break;
+    case X_AllowEvents:
+    case X_UngrabButton:
+    case X_UngrabKey:
+    case X_UngrabKeyboard:
+    case X_UngrabPointer:
+	rval = ServerPerm(client, SECCLASS_XINPUT, XINPUT__UNGRAB);
+	break;
+    case X_GetKeyboardControl:
+    case X_GetKeyboardMapping:
+    case X_GetPointerControl:
+    case X_GetPointerMapping:
+    case X_GetModifierMapping:
+    case X_QueryKeymap:
+    case X_QueryPointer:
+	rval = ServerPerm(client, SECCLASS_XINPUT, XINPUT__GETATTR);
+	break;
+    case X_ChangeKeyboardControl:
+    case X_ChangePointerControl:
+    case X_ChangeKeyboardMapping:
+    case X_SetModifierMapping:
+    case X_SetPointerMapping:
+	rval = ServerPerm(client, SECCLASS_XINPUT, XINPUT__SETATTR);
+	break;
+    case X_Bell:
+	rval = ServerPerm(client, SECCLASS_XINPUT, XINPUT__BELL);
+	break;
+
+    /* Colormap class control requirements */
+    case X_AllocColor:
+    case X_AllocColorCells:
+    case X_AllocColorPlanes:
+    case X_AllocNamedColor:
+	rval = IDPERM(client, xResourceReq, id,
+		      SECCLASS_COLORMAP,
+		      COLORMAP__READ | COLORMAP__STORE);
+	break;
+    case X_CopyColormapAndFree:
+	rval = IDPERM(client, xCopyColormapAndFreeReq, mid,
+		      SECCLASS_COLORMAP, COLORMAP__CREATE)
+	    && IDPERM(client, xCopyColormapAndFreeReq, srcCmap,
+		      SECCLASS_COLORMAP,
+		      COLORMAP__READ | COLORMAP__FREE);
+	break;
+    case X_CreateColormap:
+	rval = IDPERM(client, xCreateColormapReq, mid,
+		      SECCLASS_COLORMAP, COLORMAP__CREATE)
+	    && IDPERM(client, xCreateColormapReq, window,
+		      SECCLASS_DRAWABLE, DRAWABLE__DRAW);
+	break;
+    case X_FreeColormap:
+	rval = IDPERM(client, xResourceReq, id,
+		      SECCLASS_COLORMAP, COLORMAP__FREE);
+	break;
+    case X_FreeColors:
+	rval = IDPERM(client, xFreeColorsReq, cmap,
+		      SECCLASS_COLORMAP, COLORMAP__STORE);
+	break;
+    case X_InstallColormap:
+	rval = IDPERM(client, xResourceReq, id,
+		      SECCLASS_COLORMAP, COLORMAP__INSTALL)
+	    && ServerPerm(client, SECCLASS_COLORMAP, COLORMAP__INSTALL);
+	break;
+    case X_ListInstalledColormaps:
+	rval = ServerPerm(client, SECCLASS_COLORMAP, COLORMAP__LIST);
+	break;
+    case X_LookupColor:
+    case X_QueryColors:
+	rval = IDPERM(client, xResourceReq, id,
+		      SECCLASS_COLORMAP, COLORMAP__READ);
+	break;
+    case X_StoreColors:
+    case X_StoreNamedColor:
+	rval = IDPERM(client, xResourceReq, id,
+		      SECCLASS_COLORMAP, COLORMAP__STORE);
+	break;
+    case X_UninstallColormap:
+	rval = IDPERM(client, xResourceReq, id,
+		      SECCLASS_COLORMAP, COLORMAP__UNINSTALL)
+	    && ServerPerm(client, SECCLASS_COLORMAP, COLORMAP__UNINSTALL);
+	break;
+
+    /* Font class control requirements */
+    case X_CloseFont:
+	rval = IDPERM(client, xResourceReq, id,
+		      SECCLASS_FONT, FONT__FREE);
+	break;
+    case X_ImageText8:
+    case X_ImageText16:
+	/* Font accesses checked through the resource manager */
+	rval = IDPERM(client, xImageTextReq, drawable,
+		      SECCLASS_DRAWABLE, DRAWABLE__DRAW);
+	break;
+    case X_OpenFont:
+	rval = ServerPerm(client, SECCLASS_FONT, FONT__LOAD)
+	    && IDPERM(client, xOpenFontReq, fid,
+		      SECCLASS_FONT, FONT__USE);
+	break;
+    case X_PolyText8:
+    case X_PolyText16:
+	/* Font accesses checked through the resource manager */
+	rval = ServerPerm(client, SECCLASS_FONT, FONT__LOAD)
+	    && IDPERM(client, xPolyTextReq, gc,
+		      SECCLASS_GC, GC__SETATTR)
+	    && IDPERM(client, xPolyTextReq, drawable,
+		      SECCLASS_DRAWABLE, DRAWABLE__DRAW);
+	break;
+	
+    /* Pixmap class control requirements */
+    case X_CreatePixmap:
+	rval = IDPERM(client, xCreatePixmapReq, pid,
+		      SECCLASS_DRAWABLE, DRAWABLE__CREATE);
+	break;
+    case X_FreePixmap:
+	rval = IDPERM(client, xResourceReq, id,
+		      SECCLASS_DRAWABLE, DRAWABLE__DESTROY);
+	break;
+
+    /* Cursor class control requirements */
+    case X_CreateCursor:
+	rval = IDPERM(client, xCreateCursorReq, cid,
+		      SECCLASS_CURSOR, CURSOR__CREATE)
+	    && IDPERM(client, xCreateCursorReq, source,
+		      SECCLASS_DRAWABLE, DRAWABLE__DRAW)
+	    && IDPERM(client, xCreateCursorReq, mask,
+		      SECCLASS_DRAWABLE, DRAWABLE__COPY);
+	break;
+    case X_CreateGlyphCursor:
+	rval = IDPERM(client, xCreateGlyphCursorReq, cid,
+		      SECCLASS_CURSOR, CURSOR__CREATEGLYPH)
+	    && IDPERM(client, xCreateGlyphCursorReq, source,
+		      SECCLASS_FONT, FONT__USE)
+	    && IDPERM(client, xCreateGlyphCursorReq, mask,
+		      SECCLASS_FONT, FONT__USE);
+	break;
+    case X_RecolorCursor:
+	rval = IDPERM(client, xRecolorCursorReq, cursor,
+		      SECCLASS_CURSOR, CURSOR__SETATTR);
+	break;
+    case X_FreeCursor:
+	rval = IDPERM(client, xResourceReq, id,
+		      SECCLASS_CURSOR, CURSOR__FREE);
+	break;
+	    
+    /* GC class control requirements */
+    case X_CreateGC:
+	rval = IDPERM(client, xCreateGCReq, gc,
+		      SECCLASS_GC, GC__CREATE | GC__SETATTR);
+	break;
+    case X_ChangeGC:
+    case X_SetDashes:
+    case X_SetClipRectangles:
+	rval = IDPERM(client, xResourceReq, id,
+		      SECCLASS_GC, GC__SETATTR);
+	break;
+    case X_CopyGC:
+	rval = IDPERM(client, xCopyGCReq, srcGC,
+		      SECCLASS_GC, GC__GETATTR)
+	    && IDPERM(client, xCopyGCReq, dstGC,
+		      SECCLASS_GC, GC__SETATTR);
+	break;
+    case X_FreeGC:
+	rval = IDPERM(client, xResourceReq, id,
+		      SECCLASS_GC, GC__FREE);
+	break;
+
+    /* Server class control requirements */
+    case X_GrabServer:
+	rval = ServerPerm(client, SECCLASS_XSERVER, XSERVER__GRAB);
+	break;
+    case X_UngrabServer:
+	rval = ServerPerm(client, SECCLASS_XSERVER, XSERVER__UNGRAB);
+	break;
+    case X_ForceScreenSaver:
+    case X_GetScreenSaver:
+    case X_SetScreenSaver:
+	rval = ServerPerm(client, SECCLASS_XSERVER, XSERVER__SCREENSAVER);
+	break;
+    case X_ListHosts:
+	rval = ServerPerm(client, SECCLASS_XSERVER, XSERVER__GETHOSTLIST);
+	break;
+    case X_ChangeHosts:
+    case X_SetAccessControl:
+	rval = ServerPerm(client, SECCLASS_XSERVER, XSERVER__SETHOSTLIST);
+	break;
+    case X_GetFontPath:
+	rval = ServerPerm(client, SECCLASS_XSERVER, XSERVER__GETFONTPATH);
+	break;
+    case X_SetFontPath:
+	rval = ServerPerm(client, SECCLASS_XSERVER, XSERVER__SETFONTPATH);
+	break;
+    case X_QueryBestSize:
+	rval = ServerPerm(client, SECCLASS_XSERVER, XSERVER__GETATTR);
+	break;
+
+    default:
+	rval = TRUE;
+	break;
+    }
+    if (!rval)
+	rec->rval = FALSE;
+}
+
+CALLBACK(XSELinuxExtDispatch)
+{
+    XaceExtAccessRec *rec = (XaceExtAccessRec*)calldata;
+    ClientPtr client = rec->client;
+    ExtensionEntry *ext = rec->ext;
+    security_id_t extsid;
+    access_vector_t perm;
+    REQUEST(xReq);
+    
+    /* XXX there should be a separate callback for this */
+    if (!EXTENSIONSID(ext))
+    {
+	extsid = ObjectSIDByLabel(NULL, SECCLASS_XEXTENSION, ext->name);
+	if (!extsid)
+	    return;
+	EXTENSIONSID(ext) = extsid;
+    }
+
+    extsid = (security_id_t)EXTENSIONSID(ext);
+    perm = ((stuff->reqType == X_QueryExtension) ||
+	    (stuff->reqType == X_ListExtensions)) ?
+	XEXTENSION__QUERY : XEXTENSION__USE;
+
+    if (HAVESTATE(client))
+    {
+	XSELinuxAuditRec auditdata;
+	auditdata.client = client;
+	auditdata.property = NULL;
+	auditdata.extension = ext->name;
+	errno = 0;
+	if (avc_has_perm(SID(client), extsid, SECCLASS_XEXTENSION,
+			 perm, &AEREF(client), &auditdata) < 0)
+	{
+	    if (errno != EACCES)
+		ErrorF("ExtDispatch: unexpected error %d\n", errno);
+	    rec->rval = FALSE;
+	}
+    } else
+	ErrorF("No client state in extension dispatcher!\n");
+} /* XSELinuxExtDispatch */
+
+CALLBACK(XSELinuxProperty)
+{
+    XacePropertyAccessRec *rec = (XacePropertyAccessRec*)calldata;
+    WindowPtr pWin = rec->pWin;
+    ClientPtr client = rec->client;
+    ClientPtr tclient;
+    access_vector_t perm = 0;
+    security_id_t propsid;
+    char *propname = NameForAtom(rec->propertyName);
+
+    tclient = wClient(pWin);
+    if (!tclient || !HAVESTATE(tclient))
+        return;
+
+    propsid = ObjectSIDByLabel(SID(tclient)->ctx, SECCLASS_PROPERTY, propname);
+    if (!propsid)
+	return;
+
+    if (rec->access_mode & SecurityReadAccess)
+	perm |= PROPERTY__READ;
+    if (rec->access_mode & SecurityWriteAccess)
+	perm |= PROPERTY__WRITE;
+    if (rec->access_mode & SecurityDestroyAccess)
+	perm |= PROPERTY__FREE;
+    if (!rec->access_mode)
+	perm = PROPERTY__READ | PROPERTY__WRITE | PROPERTY__FREE;
+
+    if (HAVESTATE(client))
+    {
+	XSELinuxAuditRec auditdata;
+	auditdata.client = client;
+	auditdata.property = propname;
+	auditdata.extension = NULL;
+	errno = 0;
+	if (avc_has_perm(SID(client), propsid, SECCLASS_PROPERTY,
+			 perm, &AEREF(client), &auditdata) < 0)
+	{
+	    if (errno != EACCES)
+		ErrorF("Property: unexpected error %d\n", errno);
+	    rec->rval = SecurityIgnoreOperation;
+	}
+    } else
+	ErrorF("No client state in property callback!\n");
+
+    /* XXX this should be saved in the property structure */
+    sidput(propsid);
+} /* XSELinuxProperty */
+
+CALLBACK(XSELinuxResLookup)
+{
+    XaceResourceAccessRec *rec = (XaceResourceAccessRec*)calldata;
+    ClientPtr client = rec->client;
+    REQUEST(xReq);
+    access_vector_t perm = 0;
+    Bool rval = TRUE;
+
+    /* serverClient requests OK */
+    if (client->index == 0)
+	return;
+
+    switch(rec->rtype) {
+	case RT_FONT: {
+	    switch(stuff->reqType) {
+		case X_ImageText8:
+		case X_ImageText16:
+		case X_PolyText8:
+		case X_PolyText16:
+		    perm = FONT__USE;
+		    break;
+		case X_ListFonts:
+		case X_ListFontsWithInfo:
+		case X_QueryFont:
+		case X_QueryTextExtents:
+		    perm = FONT__GETATTR;
+		    break;
+		default:
+		    break;
+	    }
+	    if (perm)
+		rval = IDPerm(client, rec->id, SECCLASS_FONT, perm);
+	    break;
+	}
+	default:
+	    break;
+    }
+    if (!rval)
+	rec->rval = FALSE;
+} /* XSELinuxResLookup */
+
+CALLBACK(XSELinuxMap)
+{
+    XaceMapAccessRec *rec = (XaceMapAccessRec*)calldata;
+    if (!IDPerm(rec->client, rec->pWin->drawable.id,
+		SECCLASS_WINDOW, WINDOW__MAP))
+	rec->rval = FALSE;
+} /* XSELinuxMap */
+
+CALLBACK(XSELinuxBackgrnd)
+{
+    XaceMapAccessRec *rec = (XaceMapAccessRec*)calldata;
+    if (!IDPerm(rec->client, rec->pWin->drawable.id,
+		SECCLASS_WINDOW, WINDOW__TRANSPARENT))
+	rec->rval = FALSE;
+} /* XSELinuxBackgrnd */
+
+CALLBACK(XSELinuxDrawable)
+{
+    XaceDrawableAccessRec *rec = (XaceDrawableAccessRec*)calldata;
+    if (!IDPerm(rec->client, rec->pDraw->id,
+		SECCLASS_DRAWABLE, DRAWABLE__COPY))
+	rec->rval = FALSE;
+} /* XSELinuxDrawable */
+
+CALLBACK(XSELinuxHostlist)
+{
+    XaceHostlistAccessRec *rec = (XaceHostlistAccessRec*)calldata;
+    access_vector_t perm = (rec->access_mode == SecurityReadAccess) ?
+	XSERVER__GETHOSTLIST : XSERVER__SETHOSTLIST;
+
+    if (!ServerPerm(rec->client, SECCLASS_XSERVER, perm))
+	rec->rval = FALSE;
+} /* XSELinuxHostlist */
+
+/* Extension callbacks */
+CALLBACK(XSELinuxClientState)
+{
+    NewClientInfoRec *pci = (NewClientInfoRec *)calldata;
+    ClientPtr client = pci->client;
+
+    switch(client->clientState)
+    {
+    case ClientStateInitial:
+	AssignClientState(serverClient);
+	break;
+
+	case ClientStateRunning:
+	{
+	    AssignClientState(client);
+	    break;
+	}
+	case ClientStateGone:
+	case ClientStateRetained:
+	{
+	    FreeClientState(client);
+	    break;
+	}
+	default: break;
+    }
+} /* XSELinuxClientState */
+
+static char *XSELinuxKeywords[] = {
+#define XSELinuxKeywordComment 0
+    "#",
+#define XSELinuxKeywordProperty 1
+    "property",
+#define XSELinuxKeywordExtension 2
+    "extension",
+#define XSELinuxKeywordNonlocalContext 3
+    "nonlocal_context",
+#define XSELinuxKeywordRootWindowContext 4
+    "root_window_context",
+#define XSELinuxKeywordDefault 5
+    "default"
+};
+
+#define NUMKEYWORDS (sizeof(XSELinuxKeywords) / sizeof(char *))
+
+#ifndef __UNIXOS2__
+#define XSELinuxIsWhitespace(c) ( (c == ' ') || (c == '\t') || (c == '\n') )
+#else
+#define XSELinuxIsWhitespace(c) ( (c == ' ') || (c == '\t') || (c == '\n') || (c == '\r') )
+#endif
+
+static char *
+XSELinuxSkipWhitespace(
+    char *p)
+{
+    while (XSELinuxIsWhitespace(*p))
+	p++;
+    return p;
+} /* XSELinuxSkipWhitespace */
+
+static char *
+XSELinuxParseString(
+    char **rest)
+{
+    char *startOfString;
+    char *s = *rest;
+    char endChar = 0;
+
+    s = XSELinuxSkipWhitespace(s);
+
+    if (*s == '"' || *s == '\'')
+    {
+	endChar = *s++;
+	startOfString = s;
+	while (*s && (*s != endChar))
+	    s++;
+    }
+    else
+    {
+	startOfString = s;
+	while (*s && !XSELinuxIsWhitespace(*s))
+	    s++;
+    }
+    if (*s)
+    {
+	*s = '\0';
+	*rest = s + 1;
+	return startOfString;
+    }
+    else
+    {
+	*rest = s;
+	return (endChar) ? NULL : startOfString;
+    }
+} /* XSELinuxParseString */
+
+static int
+XSELinuxParseKeyword(
+    char **p)
+{
+    int i;
+    char *s = *p;
+    s = XSELinuxSkipWhitespace(s);
+    for (i = 0; i < NUMKEYWORDS; i++)
+    {
+	int len = strlen(XSELinuxKeywords[i]);
+	if (strncmp(s, XSELinuxKeywords[i], len) == 0)
+	{
+	    *p = s + len;
+	    return (i);
+	}
+    }
+    *p = s;
+    return -1;
+} /* XSELinuxParseKeyword */
+
+static Bool
+XSELinuxTypeIsValid(char *typename)
+{
+    security_context_t base, new;
+    context_t con;
+    Bool ret = FALSE;
+
+    /* get the server's context */
+    if (getcon(&base) < 0)
+        goto out;
+
+    /* make a new context-manipulation object */
+    con = context_new(base);
+    if (!con)
+        goto out_free;
+
+    /* set the role */
+    if (context_role_set(con, "object_r"))
+        goto out_free2;
+
+    /* set the type */
+    if (context_type_set(con, typename))
+        goto out_free2;
+
+    /* get a context string - note: context_str() returns a pointer
+     * to the string inside the context; the returned pointer should
+     * not be freed
+     */
+    new = context_str(con);
+    if (!new)
+        goto out_free2;
+
+    /* finally, check to see if it's valid */
+    if (security_check_context(new) == 0)
+        ret = TRUE;
+
+out_free2:
+    context_free(con);
+out_free:
+    freecon(base);
+out:
+    return ret;
+}
+
+static Bool
+XSELinuxParsePropertyTypeRule(char *p)
+{
+    int keyword;
+    char *propname = NULL, *propcopy = NULL;
+    char *typename = NULL, *typecopy = NULL;
+    char **newTypes;
+    Bool defaultPropertyType = FALSE;
+
+    /* get property name */
+    keyword = XSELinuxParseKeyword(&p);
+    if (keyword == XSELinuxKeywordDefault)
+    {
+        defaultPropertyType = TRUE;
+    }
+    else
+    {
+        propname = XSELinuxParseString(&p);
+        if (!propname || (strlen(propname) == 0))
+        {
+            return FALSE;
+        }
+    }
+
+    /* get the SELinux type corresponding to the property */
+    typename = XSELinuxParseString(&p);
+    if (!typename || (strlen(typename) == 0))
+        return FALSE;
+
+    /* validate the type */
+    if (XSELinuxTypeIsValid(typename) != TRUE)
+        return FALSE;
+
+    /* if it's the default property, save it to append to the end of the
+     * property types list
+     */
+    if (defaultPropertyType == TRUE)
+    {
+        if (XSELinuxPropertyTypeDefault != NULL)
+        {
+            return FALSE;
+        }
+        else
+        {
+            XSELinuxPropertyTypeDefault = (char *)xalloc(strlen(typename)+1);
+            if (!XSELinuxPropertyTypeDefault)
+            {
+                ErrorF("XSELinux: out of memory\n");
+                return FALSE;
+            }
+            strcpy(XSELinuxPropertyTypeDefault, typename);
+            return TRUE;
+        }
+    }
+
+    /* insert the property and type into the propertyTypes array */
+    propcopy = (char *)xalloc(strlen(propname)+1);
+    if (!propcopy)
+    {
+        ErrorF("XSELinux: out of memory\n");
+        return FALSE;
+    }
+    strcpy(propcopy, propname);
+
+    typecopy = (char *)xalloc(strlen(typename)+1);
+    if (!typecopy)
+    {
+        ErrorF("XSELinux: out of memory\n");
+        xfree(propcopy);
+        return FALSE;
+    }
+    strcpy(typecopy, typename);
+
+    newTypes = (char **)xrealloc(propertyTypes, sizeof (char *) * ((propertyTypesCount+1) * 2));
+    if (!newTypes)
+    {
+        ErrorF("XSELinux: out of memory\n");
+        xfree(propcopy);
+        xfree(typecopy);
+        return FALSE;
+    }
+
+    propertyTypesCount++;
+
+    newTypes[propertyTypesCount*2 - 2] = propcopy;
+    newTypes[propertyTypesCount*2 - 1] = typecopy;
+    
+    propertyTypes = newTypes;
+
+    return TRUE;
+} /* XSELinuxParsePropertyTypeRule */
+
+static Bool
+XSELinuxParseExtensionTypeRule(char *p)
+{
+    int keyword;
+    char *extname = NULL, *extcopy = NULL;
+    char *typename = NULL, *typecopy = NULL;
+    char **newTypes;
+    Bool defaultExtensionType = FALSE;
+
+    /* get extension name */
+    keyword = XSELinuxParseKeyword(&p);
+    if (keyword == XSELinuxKeywordDefault)
+    {
+        defaultExtensionType = TRUE;
+    }
+    else
+    {
+        extname = XSELinuxParseString(&p);
+        if (!extname || (strlen(extname) == 0))
+        {
+            return FALSE;
+        }
+    }
+
+    /* get the SELinux type corresponding to the extension */
+    typename = XSELinuxParseString(&p);
+    if (!typename || (strlen(typename) == 0))
+        return FALSE;
+
+    /* validate the type */
+    if (XSELinuxTypeIsValid(typename) != TRUE)
+        return FALSE;
+
+    /* if it's the default extension, save it to append to the end of the
+     * extension types list
+     */
+    if (defaultExtensionType == TRUE)
+    {
+        if (XSELinuxExtensionTypeDefault != NULL)
+        {
+            return FALSE;
+        }
+        else
+        {
+            XSELinuxExtensionTypeDefault = (char *)xalloc(strlen(typename)+1);
+            if (!XSELinuxExtensionTypeDefault)
+            {
+                ErrorF("XSELinux: out of memory\n");
+                return FALSE;
+            }
+            strcpy(XSELinuxExtensionTypeDefault, typename);
+            return TRUE;
+        }
+    }
+
+    /* insert the extension and type into the extensionTypes array */
+    extcopy = (char *)xalloc(strlen(extname)+1);
+    if (!extcopy)
+    {
+        ErrorF("XSELinux: out of memory\n");
+        return FALSE;
+    }
+    strcpy(extcopy, extname);
+
+    typecopy = (char *)xalloc(strlen(typename)+1);
+    if (!typecopy)
+    {
+        ErrorF("XSELinux: out of memory\n");
+        xfree(extcopy);
+        return FALSE;
+    }
+    strcpy(typecopy, typename);
+
+    newTypes = (char **)xrealloc(extensionTypes, sizeof(char *) *( (extensionTypesCount+1) * 2));
+    if (!newTypes)
+    {
+        ErrorF("XSELinux: out of memory\n");
+        xfree(extcopy);
+        xfree(typecopy);
+        return FALSE;
+    }
+
+    extensionTypesCount++;
+
+    newTypes[extensionTypesCount*2 - 2] = extcopy;
+    newTypes[extensionTypesCount*2 - 1] = typecopy;
+
+    extensionTypes = newTypes;
+
+    return TRUE;
+} /* XSELinuxParseExtensionTypeRule */
+
+static Bool
+XSELinuxParseNonlocalContext(char *p)
+{
+    char *context;
+
+    context = XSELinuxParseString(&p);
+    if (!context || (strlen(context) == 0))
+    {
+        return FALSE;
+    }
+
+    if (XSELinuxNonlocalContextDefault != NULL)
+    {
+        return FALSE;
+    }
+
+    /* validate the context */
+    if (security_check_context(context))
+    {
+        return FALSE;
+    }
+
+    XSELinuxNonlocalContextDefault = (char *)xalloc(strlen(context)+1);
+    if (!XSELinuxNonlocalContextDefault)
+    {
+        ErrorF("XSELinux: out of memory\n");
+        return FALSE;
+    }
+    strcpy(XSELinuxNonlocalContextDefault, context);
+
+    return TRUE;
+} /* XSELinuxParseNonlocalContext */
+
+static Bool
+XSELinuxParseRootWindowContext(char *p)
+{
+    char *context;
+
+    context = XSELinuxParseString(&p);
+    if (!context || (strlen(context) == 0))
+    {
+        return FALSE;
+    }
+
+    if (XSELinuxRootWindowContext != NULL)
+    {
+        return FALSE;
+    }
+
+    /* validate the context */
+    if (security_check_context(context))
+    {
+        return FALSE;
+    }
+
+    XSELinuxRootWindowContext = (char *)xalloc(strlen(context)+1);
+    if (!XSELinuxRootWindowContext)
+    {
+        ErrorF("XSELinux: out of memory\n");
+        return FALSE;
+    }
+    strcpy(XSELinuxRootWindowContext, context);
+
+    return TRUE;
+} /* XSELinuxParseRootWindowContext */
+
+static Bool
+XSELinuxLoadConfigFile(void)
+{
+    FILE *f;
+    int lineNumber = 0;
+    char **newTypes;
+    Bool ret = FALSE;
+    
+    if (!XSELINUXCONFIGFILE)
+        return FALSE;
+
+    /* some initial bookkeeping */
+    propertyTypesCount = extensionTypesCount = 0;
+    propertyTypes = extensionTypes = NULL;
+    XSELinuxPropertyTypeDefault = XSELinuxExtensionTypeDefault = NULL;
+    XSELinuxNonlocalContextDefault = NULL;
+    XSELinuxRootWindowContext = NULL;
+
+#ifndef __UNIXOS2__
+    f = fopen(XSELINUXCONFIGFILE, "r");
+#else
+    f = fopen((char*)__XOS2RedirRoot(XSELINUXCONFIGFILE), "r");
+#endif
+    if (!f)
+    {
+        ErrorF("Error opening XSELinux policy file %s\n", XSELINUXCONFIGFILE);
+        return FALSE;
+    }
+
+    while (!feof(f))
+    {
+        char buf[200];
+        Bool validLine;
+        char *p;
+
+        if (!(p = fgets(buf, sizeof(buf), f)))
+            break;
+        lineNumber++;
+
+        switch (XSELinuxParseKeyword(&p))
+        {
+            case XSELinuxKeywordComment:
+                validLine = TRUE;
+                break;
+
+            case XSELinuxKeywordProperty:
+                validLine = XSELinuxParsePropertyTypeRule(p);
+                break;
+
+            case XSELinuxKeywordExtension:
+                validLine = XSELinuxParseExtensionTypeRule(p);
+                break;
+
+            case XSELinuxKeywordNonlocalContext:
+                validLine = XSELinuxParseNonlocalContext(p);
+                break;
+
+            case XSELinuxKeywordRootWindowContext:
+                validLine = XSELinuxParseRootWindowContext(p);
+                break;
+
+            default:
+                validLine = (*p == '\0');
+                break;
+        }
+
+        if (!validLine)
+        {
+            ErrorF("XSELinux: Line %d of %s is invalid\n",
+                   lineNumber, XSELINUXCONFIGFILE);
+            goto out;
+        }
+    }
+
+    /* check to make sure the default types and the nonlocal context
+     * were specified
+     */
+    if (XSELinuxPropertyTypeDefault == NULL)
+    {
+        ErrorF("XSELinux: No default property type specified\n");
+        goto out;
+    }
+    else if (XSELinuxExtensionTypeDefault == NULL)
+    {
+        ErrorF("XSELinux: No default extension type specified\n");
+        goto out;
+    }
+    else if (XSELinuxNonlocalContextDefault == NULL)
+    {
+        ErrorF("XSELinux: No default context for non-local clients specified\n");
+        goto out;
+    }
+    else if (XSELinuxRootWindowContext == NULL)
+    {
+        ErrorF("XSELinux: No context specified for the root window\n");
+        goto out;
+    }
+
+    /* Finally, append the default property and extension types to the
+     * bottoms of the propertyTypes and extensionTypes arrays, respectively.
+     * The 'name' of the property / extension is NULL.
+     */
+    newTypes = (char **)xrealloc(propertyTypes, sizeof(char *) *((propertyTypesCount+1) * 2));
+    if (!newTypes)
+    {
+        ErrorF("XSELinux: out of memory\n");
+        goto out;
+    }
+    propertyTypesCount++;
+    newTypes[propertyTypesCount*2 - 2] = NULL;
+    newTypes[propertyTypesCount*2 - 1] = XSELinuxPropertyTypeDefault;
+    propertyTypes = newTypes;
+
+    newTypes = (char **)xrealloc(extensionTypes, sizeof(char *) *((extensionTypesCount+1) * 2));
+    if (!newTypes)
+    {
+        ErrorF("XSELinux: out of memory\n");
+        goto out;
+    }
+    extensionTypesCount++;
+    newTypes[extensionTypesCount*2 - 2] = NULL;
+    newTypes[extensionTypesCount*2 - 1] = XSELinuxExtensionTypeDefault;
+    extensionTypes = newTypes;
+
+    ret = TRUE;
+
+out:
+    fclose(f);
+    return ret;
+} /* XSELinuxLoadConfigFile */
+
+static void
+XSELinuxFreeConfigData(void)
+{
+    char **ptr;
+
+    /* Free all the memory in the table until we reach the NULL, then
+     * skip one past the NULL and free the default type.  Then take care
+     * of some bookkeeping.
+     */
+    for (ptr = propertyTypes; *ptr; ptr++)
+        xfree(*ptr);
+    ptr++;
+    xfree(*ptr);
+
+    XSELinuxPropertyTypeDefault = NULL;
+    propertyTypesCount = 0;
+
+    xfree(propertyTypes);
+    propertyTypes = NULL;
+
+    /* ... and the same for the extension type table */
+    for (ptr = extensionTypes; *ptr; ptr++)
+        xfree(*ptr);
+    ptr++;
+    xfree(*ptr);
+
+    XSELinuxExtensionTypeDefault = NULL;
+    extensionTypesCount = 0;
+
+    xfree(extensionTypes);
+    extensionTypes = NULL;
+
+    /* finally, take care of the context for non-local connections */
+    xfree(XSELinuxNonlocalContextDefault);
+    XSELinuxNonlocalContextDefault = NULL;
+
+    /* ... and for the root window */
+    xfree(XSELinuxRootWindowContext);
+    XSELinuxRootWindowContext = NULL;
+} /* XSELinuxFreeConfigData */
+
+/* Extension dispatch functions */
+static int
+ProcXSELinuxDispatch(ClientPtr client)
+{
+    return BadRequest;
+} /* ProcXSELinuxDispatch */
+
+static void
+XSELinuxResetProc(ExtensionEntry *extEntry)
+{
+    FreeClientState(serverClient);
+
+    XSELinuxFreeConfigData();
+
+    audit_close(audit_fd);
+
+    avc_destroy();
+} /* XSELinuxResetProc */
+
+static void
+XSELinuxAVCAudit(void *auditdata,
+		 security_class_t class,
+		 char *msgbuf,
+		 size_t msgbufsize)
+{
+    XSELinuxAuditRec *audit = (XSELinuxAuditRec*)auditdata;
+    ClientPtr client = audit->client;
+    char requestNum[8];
+    REQUEST(xReq);
+
+    if (stuff)
+	snprintf(requestNum, 8, "%d", stuff->reqType);
+
+    snprintf(msgbuf, msgbufsize, "%s%s%s%s%s%s",
+	     stuff ? "request=" : "",
+	     stuff ? requestNum : "",
+	     audit->property ? " property=" : "",
+	     audit->property ? audit->property : "",
+	     audit->extension ? " extension=" : "",
+	     audit->extension ? audit->extension : "");
+}
+
+static void
+XSELinuxAVCLog(const char *fmt, ...)
+{
+    va_list ap;
+    va_start(ap, fmt);
+    VErrorF(fmt, ap);
+    va_end(ap);
+}
+
+/* XSELinuxExtensionSetup
+ *
+ * Set up the XSELinux Extension (pre-init)
+ */
+void
+XSELinuxExtensionSetup(INITARGS)
+{
+    /* Allocate the client private index */
+    clientPrivateIndex = AllocateClientPrivateIndex();
+    if (!AllocateClientPrivate(clientPrivateIndex, 
+			       sizeof (XSELinuxClientStateRec)))
+	FatalError("XSELinux: Failed to allocate client private.\n");
+
+    /* Allocate the extension private index */
+    extnsnPrivateIndex = AllocateExtensionPrivateIndex();
+    if (!AllocateExtensionPrivate(extnsnPrivateIndex, 0))
+	FatalError("XSELinux: Failed to allocate extension private.\n");
+}
+
+/* XSELinuxExtensionInit
+ *
+ * Initialize the XSELinux Extension
+ */
+void
+XSELinuxExtensionInit(INITARGS)
+{
+    ExtensionEntry	*extEntry;
+    struct avc_log_callback alc = {XSELinuxAVCLog, XSELinuxAVCAudit};
+
+    if (!is_selinux_enabled())
+    {
+        ErrorF("SELinux Extension failed to load: SELinux not enabled\n");
+        return;
+    }
+
+    if (avc_init("xserver", NULL, &alc, NULL, NULL) < 0)
+    {
+	FatalError("couldn't initialize SELinux userspace AVC\n");
+    }
+
+    if (!AddCallback(&ClientStateCallback, XSELinuxClientState, NULL))
+	return;
+
+    /* Load the config file.  If this fails, shut down the server,
+     * since an unknown security status is worse than no security.
+     *
+     * Note that this must come before we assign a security state
+     * for the serverClient, because the serverClient's root windows
+     * are assigned a context based on data in the config file.
+     */
+    if (XSELinuxLoadConfigFile() != TRUE)
+    {
+	FatalError("XSELinux: Failed to load security policy\n");
+    }
+
+    /* prepare for auditing */
+    audit_fd = audit_open();
+    if (audit_fd < 0)
+    {
+        FatalError("XSELinux: Failed to open the system audit log\n");
+    }
+
+    /* register security callbacks */
+    XaceRegisterCallback(XACE_CORE_DISPATCH, XSELinuxCoreDispatch, NULL);
+    XaceRegisterCallback(XACE_EXT_ACCESS, XSELinuxExtDispatch, NULL);
+    XaceRegisterCallback(XACE_EXT_DISPATCH, XSELinuxExtDispatch, NULL);
+    XaceRegisterCallback(XACE_RESOURCE_ACCESS, XSELinuxResLookup, NULL);
+    XaceRegisterCallback(XACE_MAP_ACCESS, XSELinuxMap, NULL);
+    XaceRegisterCallback(XACE_HOSTLIST_ACCESS, XSELinuxHostlist, NULL);
+    XaceRegisterCallback(XACE_BACKGRND_ACCESS, XSELinuxBackgrnd, NULL);
+    XaceRegisterCallback(XACE_DRAWABLE_ACCESS, XSELinuxDrawable, NULL);
+    XaceRegisterCallback(XACE_PROPERTY_ACCESS, XSELinuxProperty, NULL);
+    /* XaceRegisterCallback(XACE_DECLARE_EXT_SECURE, XSELinuxDeclare, NULL);
+    XaceRegisterCallback(XACE_DEVICE_ACCESS, XSELinuxDevice, NULL); */
+
+    /* register extension with server */
+    extEntry = AddExtension(XSELINUX_EXTENSION_NAME,
+			    XSELinuxNumberEvents, XSELinuxNumberErrors,
+			    ProcXSELinuxDispatch, ProcXSELinuxDispatch,
+			    XSELinuxResetProc, StandardMinorOpcode);
+}
diff --git a/Xext/xselinux.h b/Xext/xselinux.h
new file mode 100644
index 000000000..eff6db5f4
--- /dev/null
+++ b/Xext/xselinux.h
@@ -0,0 +1,29 @@
+/************************************************************
+
+Author: Eamon Walsh <ewalsh@epoch.ncsc.mil>
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+this permission notice appear in supporting documentation.  This permission
+notice shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+********************************************************/
+
+#ifndef _XSELINUX_H
+#define _XSELINUX_H
+
+#define XSELINUX_EXTENSION_NAME		"SELinux"
+#define XSELINUX_MAJOR_VERSION		1
+#define XSELINUX_MINOR_VERSION		0
+#define XSELinuxNumberEvents		0
+#define XSELinuxNumberErrors		0
+
+#endif /* _XSELINUX_H */

From 9aa44e3e4c321f42d8e64f83c7f0932470593c26 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 8 Sep 2006 15:15:19 -0400
Subject: [PATCH 002/552] Add SELinux extension configure-time support.

---
 configure.ac            | 16 +++++++++++++++-
 include/dix-config.h.in |  3 +++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 49dfad2d3..cf838b8d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -414,6 +414,7 @@ AC_ARG_ENABLE(xinerama,	      AS_HELP_STRING([--disable-xinerama], [Build Xinera
 AC_ARG_ENABLE(xf86vidmode,    AS_HELP_STRING([--disable-xf86vidmode], [Build XF86VidMode extension (default: enabled)]), [XF86VIDMODE=$enableval], [XF86VIDMODE=yes])
 AC_ARG_ENABLE(xf86misc,       AS_HELP_STRING([--disable-xf86misc], [Build XF86Misc extension (default: enabled)]), [XF86MISC=$enableval], [XF86MISC=yes])
 AC_ARG_ENABLE(xace,     AS_HELP_STRING([--disable-xace], [Build X-ACE extension (default: enabled)]), [XACE=$enableval], [XACE=yes])
+AC_ARG_ENABLE(xselinux,     AS_HELP_STRING([--disable-xselinux], [Build SELinux extension (default: enabled)]), [XSELINUX=$enableval], [XSELINUX=$XACE])
 AC_ARG_ENABLE(xcsecurity,     AS_HELP_STRING([--disable-xcsecurity], [Build Security extension (default: enabled)]), [XCSECURITY=$enableval], [XCSECURITY=$XACE])
 AC_ARG_ENABLE(appgroup,       AS_HELP_STRING([--disable-appgroup], [Build XC-APPGROUP extension (default: enabled)]), [APPGROUP=$enableval], [APPGROUP=$XCSECURITY])
 AC_ARG_ENABLE(xcalibrate,     AS_HELP_STRING([--enable-xcalibrate], [Build XCalibrate extension (default: disabled)]), [XCALIBRATE=$enableval], [XCALIBRATE=no])
@@ -627,6 +628,19 @@ if test "x$XACE" = xyes; then
 	AC_DEFINE(XACE, 1, [Build X-ACE extension])
 fi
 
+AM_CONDITIONAL(XSELINUX, [test "x$XSELINUX" = xyes])
+if test "x$XSELINUX" = xyes; then
+	if test "x$XACE" != xyes; then
+		AC_MSG_ERROR([cannot build SELinux extension without X-ACE])
+	fi
+	AC_CHECK_HEADERS([selinux/selinux.h selinux/avc.h], [], AC_MSG_ERROR([SELinux include files not found]))
+	AC_CHECK_LIB(selinux, avc_init, [], AC_MSG_ERROR([SELinux library not found])) 
+	AC_CHECK_HEADERS([libaudit.h], [], AC_MSG_ERROR([SELinux extension requires audit system headers]))
+	AC_CHECK_LIB(audit, audit_log_avc, [], AC_MSG_ERROR([SELinux extension requires audit system library]))
+	AC_DEFINE(XSELINUX, 1, [Build SELinux extension])
+	SELINUX_LIB="-lselinux -laudit"
+fi
+
 AM_CONDITIONAL(XCSECURITY, [test "x$XCSECURITY" = xyes])
 if test "x$XCSECURITY" = xyes; then
 	if test "x$XACE" != xyes; then
@@ -1042,7 +1056,7 @@ if test "x$XORG" = xyes -o "x$XGL" = xyes; then
 	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
 	XORG_INCS="$XORG_DDXINCS $XORG_OSINCS"
 	XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H"
-	XORG_LIBS="$COMPOSITE_LIB $MI_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XPSTUBS_LIB $OS_LIB"
+	XORG_LIBS="$COMPOSITE_LIB $MI_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XPSTUBS_LIB $SELINUX_LIB $OS_LIB"
 
 dnl Check to see if dlopen is in default libraries (like Solaris, which
 dnl has it in libc), or if libdl is needed to get it.
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index 571a86719..f66454812 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -311,6 +311,9 @@
 /* Build X-ACE extension */
 #undef XACE
 
+/* Build SELinux extension */
+#undef XSELINUX
+
 /* Support XCMisc extension */
 #undef XCMISC
 

From 9c503f09ce78d952d0ece77c424e42b6df3fa9ad Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 8 Sep 2006 15:17:01 -0400
Subject: [PATCH 003/552] Add SELinux extension to the module/extension loader.

---
 hw/xfree86/dixmods/extmod/modinit.h |  5 +++++
 mi/miinitext.c                      | 16 ++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h
index 41f060b2a..131b9e6e6 100644
--- a/hw/xfree86/dixmods/extmod/modinit.h
+++ b/hw/xfree86/dixmods/extmod/modinit.h
@@ -129,6 +129,11 @@ extern void ShmRegisterFuncs(
 extern void XaceExtensionInit(INITARGS);
 #endif
 
+#ifdef XSELINUX
+extern void XSELinuxExtensionSetup(INITARGS);
+extern void XSELinuxExtensionInit(INITARGS);
+#endif
+
 #if 1
 extern void SecurityExtensionSetup(INITARGS);
 extern void SecurityExtensionInit(INITARGS);
diff --git a/mi/miinitext.c b/mi/miinitext.c
index aafd014ae..bab45cd3a 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -248,6 +248,9 @@ typedef void (*InitExtension)(INITARGS);
 #include "securitysrv.h"
 #include <X11/extensions/securstr.h>
 #endif
+#ifdef XSELINUX
+#include "xselinux.h"
+#endif
 #ifdef PANORAMIX
 #include <X11/extensions/panoramiXproto.h>
 #endif
@@ -321,6 +324,10 @@ extern void XaceExtensionInit(INITARGS);
 extern void SecurityExtensionSetup(INITARGS);
 extern void SecurityExtensionInit(INITARGS);
 #endif
+#ifdef XSELINUX
+extern void XSELinuxExtensionSetup(INITARGS);
+extern void XSELinuxExtensionInit(INITARGS);
+#endif
 #ifdef XPRINT
 extern void XpExtensionInit(INITARGS);
 #endif
@@ -532,6 +539,9 @@ InitExtensions(argc, argv)
 #ifdef XCSECURITY
     SecurityExtensionSetup();
 #endif
+#ifdef XSELINUX
+    XSELinuxExtensionSetup();
+#endif
 #ifdef PANORAMIX
 # if !defined(PRINT_ONLY_SERVER) && !defined(NO_PANORAMIX)
   if (!noPanoramiXExtension) PanoramiXExtensionInit();
@@ -600,6 +610,9 @@ InitExtensions(argc, argv)
 #ifdef XCSECURITY
     if (!noSecurityExtension) SecurityExtensionInit();
 #endif
+#ifdef XSELINUX
+    XSELinuxExtensionInit();
+#endif
 #ifdef XPRINT
     XpExtensionInit(); /* server-specific extension, cannot be disabled */
 #endif
@@ -705,6 +718,9 @@ static ExtensionModule staticExtensions[] = {
 #ifdef XCSECURITY
     { SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension, SecurityExtensionSetup, NULL },
 #endif
+#ifdef XSELINUX
+    { XSELinuxExtensionInit, XSELINUX_EXTENSION_NAME, NULL, XSELinuxExtensionSetup, NULL },
+#endif
 #ifdef XPRINT
     { XpExtensionInit, XP_PRINTNAME, NULL, NULL, NULL },
 #endif

From 6950267dd690ef8e29b1c32a157dd64c9b79c06d Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 8 Sep 2006 15:31:18 -0400
Subject: [PATCH 004/552] Add SELinux extension configure-time support.

---
 Xext/Makefile.am | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Xext/Makefile.am b/Xext/Makefile.am
index 6ea3d7445..be04c849a 100644
--- a/Xext/Makefile.am
+++ b/Xext/Makefile.am
@@ -76,6 +76,16 @@ if XACE
 BUILTIN_SRCS += $(XACE_SRCS)
 endif
 
+# SELinux extension: provides SELinux policy support for X objects
+# requires X-ACE extension
+XSELINUX_SRCS = xselinux.c xselinux.h
+if XSELINUX
+BUILTIN_SRCS += $(XSELINUX_SRCS)
+
+SERVERCONFIG_DATA += XSELinuxConfig
+AM_CFLAGS += -DXSELINUXCONFIGFILE=\"$(SERVERCONFIGdir)/XSELinuxConfig\"
+endif
+
 # Security extension: multi-level security to protect clients from each other
 XCSECURITY_SRCS = security.c securitysrv.h
 if XCSECURITY   

From df351f1efbcc95f94c719fcf993c480155c511e9 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 4 Oct 2006 16:23:35 -0400
Subject: [PATCH 005/552] Experimental window property holding security
 context.

---
 Xext/xselinux.c | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 5a6d2ef00..df19e5df0 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -35,6 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #endif
 
 #include <X11/X.h>
+#include <X11/Xatom.h>
 #include <X11/Xproto.h>
 #include <X11/Xfuncproto.h>
 #include "dixstruct.h"
@@ -120,6 +121,10 @@ static char **extensionTypes = NULL;
 static int extensionTypesCount = 0;
 static char *XSELinuxExtensionTypeDefault = NULL;
 
+/* Atoms for SELinux window labeling properties */
+Atom atom_ctx;
+Atom atom_client_ctx;
+
 /* security context for non-local clients */
 static char *XSELinuxNonlocalContextDefault = NULL;
 
@@ -1196,6 +1201,28 @@ CALLBACK(XSELinuxClientState)
     }
 } /* XSELinuxClientState */
 
+/* Labeling callbacks */
+CALLBACK(XSELinuxWindowInit)
+{
+    XaceWindowRec *rec = (XaceWindowRec*)calldata;
+    security_context_t ctx;
+    int rc;
+
+    if (HAVESTATE(rec->client)) {
+	rc = avc_sid_to_context(SID(rec->client), &ctx);
+	if (rc < 0)
+	    FatalError("Failed to get security context!\n");
+	rc = ChangeWindowProperty(rec->pWin, atom_client_ctx, XA_STRING, 8,
+				  PropModeReplace, strlen(ctx), ctx, FALSE);
+	freecon(ctx);
+    } 
+    else
+	rc = ChangeWindowProperty(rec->pWin, atom_client_ctx, XA_STRING, 8,
+				  PropModeReplace, 10, "UNLABELED!", FALSE);
+    if (rc != Success)
+	FatalError("Failed to set context property on window!\n");
+} /* XSELinuxWindowInit */
+
 static char *XSELinuxKeywords[] = {
 #define XSELinuxKeywordComment 0
     "#",
@@ -1844,6 +1871,14 @@ XSELinuxExtensionInit(INITARGS)
     if (!AddCallback(&ClientStateCallback, XSELinuxClientState, NULL))
 	return;
 
+    /* Create atoms for doing window labeling */
+    atom_ctx = MakeAtom("_SELINUX_CONTEXT", 16, 1);
+    if (atom_ctx == BAD_RESOURCE)
+	return;
+    atom_client_ctx = MakeAtom("_SELINUX_CLIENT_CONTEXT", 23, 1);
+    if (atom_client_ctx == BAD_RESOURCE)
+	return;
+
     /* Load the config file.  If this fails, shut down the server,
      * since an unknown security status is worse than no security.
      *
@@ -1873,6 +1908,7 @@ XSELinuxExtensionInit(INITARGS)
     XaceRegisterCallback(XACE_BACKGRND_ACCESS, XSELinuxBackgrnd, NULL);
     XaceRegisterCallback(XACE_DRAWABLE_ACCESS, XSELinuxDrawable, NULL);
     XaceRegisterCallback(XACE_PROPERTY_ACCESS, XSELinuxProperty, NULL);
+    XaceRegisterCallback(XACE_WINDOW_INIT, XSELinuxWindowInit, NULL);
     /* XaceRegisterCallback(XACE_DECLARE_EXT_SECURE, XSELinuxDeclare, NULL);
     XaceRegisterCallback(XACE_DEVICE_ACCESS, XSELinuxDevice, NULL); */
 

From 23f6f08b7b5c9a4297fd223d232a7e9f45376550 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 5 Oct 2006 16:07:26 -0400
Subject: [PATCH 006/552] Improve error handling, messages during
 initialization.

---
 Xext/xselinux.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index df19e5df0..2f960d1a9 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -1211,7 +1211,7 @@ CALLBACK(XSELinuxWindowInit)
     if (HAVESTATE(rec->client)) {
 	rc = avc_sid_to_context(SID(rec->client), &ctx);
 	if (rc < 0)
-	    FatalError("Failed to get security context!\n");
+	    FatalError("XSELinux: Failed to get security context!\n");
 	rc = ChangeWindowProperty(rec->pWin, atom_client_ctx, XA_STRING, 8,
 				  PropModeReplace, strlen(ctx), ctx, FALSE);
 	freecon(ctx);
@@ -1220,7 +1220,7 @@ CALLBACK(XSELinuxWindowInit)
 	rc = ChangeWindowProperty(rec->pWin, atom_client_ctx, XA_STRING, 8,
 				  PropModeReplace, 10, "UNLABELED!", FALSE);
     if (rc != Success)
-	FatalError("Failed to set context property on window!\n");
+	FatalError("XSELinux: Failed to set context property on window!\n");
 } /* XSELinuxWindowInit */
 
 static char *XSELinuxKeywords[] = {
@@ -1859,13 +1859,13 @@ XSELinuxExtensionInit(INITARGS)
 
     if (!is_selinux_enabled())
     {
-        ErrorF("SELinux Extension failed to load: SELinux not enabled\n");
+        ErrorF("XSELinux: Extension failed to load: SELinux not enabled\n");
         return;
     }
 
     if (avc_init("xserver", NULL, &alc, NULL, NULL) < 0)
     {
-	FatalError("couldn't initialize SELinux userspace AVC\n");
+	FatalError("XSELinux: Couldn't initialize SELinux userspace AVC\n");
     }
 
     if (!AddCallback(&ClientStateCallback, XSELinuxClientState, NULL))
@@ -1874,10 +1874,10 @@ XSELinuxExtensionInit(INITARGS)
     /* Create atoms for doing window labeling */
     atom_ctx = MakeAtom("_SELINUX_CONTEXT", 16, 1);
     if (atom_ctx == BAD_RESOURCE)
-	return;
+	FatalError("XSELinux: Failed to create atom\n");
     atom_client_ctx = MakeAtom("_SELINUX_CLIENT_CONTEXT", 23, 1);
     if (atom_client_ctx == BAD_RESOURCE)
-	return;
+	FatalError("XSELinux: Failed to create atom\n");
 
     /* Load the config file.  If this fails, shut down the server,
      * since an unknown security status is worse than no security.

From 92387e99d085b0b081fcedb2f20304eb0ac536b1 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 26 Oct 2006 20:20:57 -0400
Subject: [PATCH 007/552] Change symbol in libaudit library test.

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index fe48e4ff5..1fd4a1b3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -642,7 +642,7 @@ if test "x$XSELINUX" = xyes; then
 	AC_CHECK_HEADERS([selinux/selinux.h selinux/avc.h], [], AC_MSG_ERROR([SELinux include files not found]))
 	AC_CHECK_LIB(selinux, avc_init, [], AC_MSG_ERROR([SELinux library not found])) 
 	AC_CHECK_HEADERS([libaudit.h], [], AC_MSG_ERROR([SELinux extension requires audit system headers]))
-	AC_CHECK_LIB(audit, audit_log_avc, [], AC_MSG_ERROR([SELinux extension requires audit system library]))
+	AC_CHECK_LIB(audit, audit_open, [], AC_MSG_ERROR([SELinux extension requires audit system library]))
 	AC_DEFINE(XSELINUX, 1, [Build SELinux extension])
 	SELINUX_LIB="-lselinux -laudit"
 fi

From f3c60900e575e65254cd2576cc6c90b97c8f63ae Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 29 Nov 2006 22:19:57 -0500
Subject: [PATCH 008/552] Add required root window context to config file.

---
 Xext/XSELinuxConfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Xext/XSELinuxConfig b/Xext/XSELinuxConfig
index faf815e27..9c953f55f 100644
--- a/Xext/XSELinuxConfig
+++ b/Xext/XSELinuxConfig
@@ -9,6 +9,7 @@
 # security policy.  Only one nonlocal_context rule may be defined.
 #
 nonlocal_context			system_u:object_r:remote_xclient_t:s1
+root_window_context			system_u:object_r:root_window_t:s1
 
 #
 # Property rules map a property name to a SELinux type.  The type must

From 83aad2be8a80890f349c2f9caf84786333f7cc8c Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 8 Sep 2006 15:11:04 -0400
Subject: [PATCH 009/552] Add SELinux extension source files.

---
 Xext/XSELinuxConfig |   83 ++
 Xext/xselinux.c     | 1884 +++++++++++++++++++++++++++++++++++++++++++
 Xext/xselinux.h     |   29 +
 3 files changed, 1996 insertions(+)
 create mode 100644 Xext/XSELinuxConfig
 create mode 100644 Xext/xselinux.c
 create mode 100644 Xext/xselinux.h

diff --git a/Xext/XSELinuxConfig b/Xext/XSELinuxConfig
new file mode 100644
index 000000000..faf815e27
--- /dev/null
+++ b/Xext/XSELinuxConfig
@@ -0,0 +1,83 @@
+#
+# Config file for XSELinux extension
+#
+
+#
+# The nonlocal_context rule defines a context to be used for all clients
+# connecting to the server from a remote host.  The nonlocal context must
+# be defined, and it must be a valid context according to the SELinux
+# security policy.  Only one nonlocal_context rule may be defined.
+#
+nonlocal_context			system_u:object_r:remote_xclient_t:s1
+
+#
+# Property rules map a property name to a SELinux type.  The type must
+# be valid according to the SELinux security policy.  There can be any
+# number of property rules.  Additionally, a default property type can be
+# defined for all properties not explicitly listed.  The default
+# property type may not be omitted.  The default rule may appear in
+# any position (it need not be the last property rule listed).
+#
+property WM_NAME			wm_property_t
+property WM_CLASS			wm_property_t
+property WM_ICON_NAME			wm_property_t
+property WM_HINTS			wm_property_t
+property WM_NORMAL_HINTS		wm_property_t
+property WM_COMMAND			wm_property_t
+
+property CUT_BUFFER0			cut_buffer_property_t
+property CUT_BUFFER1			cut_buffer_property_t
+property CUT_BUFFER2			cut_buffer_property_t
+property CUT_BUFFER3			cut_buffer_property_t
+property CUT_BUFFER4			cut_buffer_property_t
+property CUT_BUFFER5			cut_buffer_property_t
+property CUT_BUFFER6			cut_buffer_property_t
+property CUT_BUFFER7			cut_buffer_property_t
+
+property default			unknown_property_t
+
+#
+# Extension rules map an extension name to a SELinux type.  The type must
+# be valid according to the SELinux security policy.  There can be any
+# number of extension rules.  Additionally, a default extension type can
+# be defined for all extensions not explicitly listed.  The default
+# extension type may not be omitted.  The default rule may appear in
+# any position (it need not be the last extension rule listed).
+#
+extension BIG-REQUESTS			std_ext_t
+extension DOUBLE-BUFFER			std_ext_t
+extension DPMS				screensaver_ext_t
+extension Extended-Visual-Information	std_ext_t
+extension FontCache			font_ext_t
+extension GLX				std_ext_t
+extension LBX				std_ext_t
+extension MIT-SCREEN-SAVER		screensaver_ext_t
+extension MIT-SHM			shmem_ext_t
+extension MIT-SUNDRY-NONSTANDARD	std_ext_t
+extension NV-CONTROL			accelgraphics_ext_t
+extension NV-GLX			accelgraphics_ext_t
+extension NVIDIA-GLX			accelgraphics_ext_t
+extension RANDR				std_ext_t
+extension RECORD			debug_ext_t
+extension RENDER			std_ext_t
+extension SECURITY			security_ext_t
+extension SELinux			security_ext_t
+extension SHAPE				std_ext_t
+extension SYNC				sync_ext_t
+extension TOG-CUP			windowmgr_ext_t
+extension X-Resource			debug_ext_t
+extension XAccessControlExtension	security_ext_t
+extension XACEUSR			security_ext_t
+extension XC-APPGROUP			security_ext_t
+extension XC-MISC			std_ext_t
+extension XFree86-Bigfont		font_ext_t
+extension XFree86-DGA			accelgraphics_ext_t
+extension XFree86-Misc			std_ext_t
+extension XFree86-VidModeExtension	video_ext_t
+extension XInputExtension		input_ext_t
+extension XKEYBOARD			input_ext_t
+extension XpExtension                   std_ext_t
+extension XTEST				debug_ext_t
+extension XVideo			video_ext_t
+extension XVideo-MotionCompensation	video_ext_t
+extension default			unknown_ext_t
diff --git a/Xext/xselinux.c b/Xext/xselinux.c
new file mode 100644
index 000000000..5a6d2ef00
--- /dev/null
+++ b/Xext/xselinux.c
@@ -0,0 +1,1884 @@
+/************************************************************
+
+Author: Eamon Walsh <ewalsh@epoch.ncsc.mil>
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+this permission notice appear in supporting documentation.  This permission
+notice shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+********************************************************/
+
+/*
+ * Portions of this code copyright (c) 2005 by Trusted Computer Solutions, Inc.
+ * All rights reserved.
+ */
+
+#include <selinux/flask.h>
+#include <selinux/av_permissions.h>
+#include <selinux/selinux.h>
+#include <selinux/context.h>
+#include <selinux/avc.h>
+
+#include <libaudit.h>
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include <X11/Xfuncproto.h>
+#include "dixstruct.h"
+#include "extnsionst.h"
+#include "resource.h"
+#include "selection.h"
+#include "xacestr.h"
+#include "xselinux.h"
+#define XSERV_t
+#define TRANS_SERVER
+#include <X11/Xtrans/Xtrans.h>
+#include "../os/osdep.h"
+#include <stdio.h>
+#include <stdarg.h>
+#include "modinit.h"
+
+#ifndef XSELINUXCONFIGFILE
+#warning "XSELinux Policy file is not defined"
+#define XSELINUXCONFIGFILE  NULL
+#endif
+
+
+/* Make sure a locally connecting client has a valid context.  The context
+ * for this client is retrieved again later on in AssignClientState(), but
+ * by that point it's too late to reject the client.
+ */
+static char *
+XSELinuxValidContext (ClientPtr client)
+{
+    security_context_t ctx = NULL;
+    XtransConnInfo ci = ((OsCommPtr)client->osPrivate)->trans_conn;
+    char reason[256];
+    char *ret = (char *)NULL;
+
+    if (_XSERVTransIsLocal(ci))
+    {
+        int fd = _XSERVTransGetConnectionNumber(ci);
+        if (getpeercon(fd, &ctx) < 0)
+        {
+            snprintf(reason, sizeof(reason), "Failed to retrieve SELinux context from socket");
+            ret = reason;
+            goto out;
+        }
+        if (security_check_context(ctx))
+        {
+            snprintf(reason, sizeof(reason), "Client's SELinux context is invalid: %s", ctx);
+            ret = reason;
+        }
+
+        freecon(ctx);
+    }
+
+out:
+    return ret;
+}
+
+
+/* devPrivates in client and extension */
+static int clientPrivateIndex;
+static int extnsnPrivateIndex;
+
+/* audit file descriptor */
+static int audit_fd;
+
+/* structure passed to auditing callback */
+typedef struct {
+    ClientPtr client;	/* client */
+    char *property;	/* property name, if any */
+    char *extension;	/* extension name, if any */
+} XSELinuxAuditRec;
+
+/*
+ * Table of SELinux types for property names.
+ */
+static char **propertyTypes = NULL;
+static int propertyTypesCount = 0;
+char *XSELinuxPropertyTypeDefault = NULL;
+
+/*
+ * Table of SELinux types for each extension.
+ */
+static char **extensionTypes = NULL;
+static int extensionTypesCount = 0;
+static char *XSELinuxExtensionTypeDefault = NULL;
+
+/* security context for non-local clients */
+static char *XSELinuxNonlocalContextDefault = NULL;
+
+/* security context for the root window */
+static char *XSELinuxRootWindowContext = NULL;
+
+/* Selection stuff from dix */
+extern Selection *CurrentSelections;
+extern int NumCurrentSelections;
+
+/* 
+ * list of classes corresponding to SIDs in the 
+ * rsid array of the security state structure (below).
+ *
+ * XXX SIDs should be stored in their native objects, not all
+ * bunched together in the client structure.  However, this will
+ * require modification to the resource manager.
+ */
+static security_class_t sClasses[] = {
+    SECCLASS_WINDOW,
+    SECCLASS_DRAWABLE,
+    SECCLASS_GC,
+    SECCLASS_CURSOR,
+    SECCLASS_FONT,
+    SECCLASS_COLORMAP,
+    SECCLASS_PROPERTY,
+    SECCLASS_XCLIENT,
+    SECCLASS_XINPUT
+};
+#define NRES (sizeof(sClasses)/sizeof(sClasses[0]))
+
+/* This is what we store for client security state */
+typedef struct {
+    int haveState;
+    security_id_t sid;
+    security_id_t rsid[NRES];
+    struct avc_entry_ref aeref;
+} XSELinuxClientStateRec;
+
+/* Convenience macros for accessing security state fields */
+#define STATEPTR(client) \
+    ((client)->devPrivates[clientPrivateIndex].ptr)
+#define HAVESTATE(client) \
+    (((XSELinuxClientStateRec*)STATEPTR(client))->haveState)
+#define SID(client) \
+    (((XSELinuxClientStateRec*)STATEPTR(client))->sid)
+#define RSID(client,n) \
+    (((XSELinuxClientStateRec*)STATEPTR(client))->rsid[n])
+#define AEREF(client) \
+    (((XSELinuxClientStateRec*)STATEPTR(client))->aeref)
+#define EXTENSIONSID(ext) \
+    ((ext)->devPrivates[extnsnPrivateIndex].ptr)
+
+/*
+ * Returns the index into the rsid array where the SID for the
+ * given class is stored.
+ */
+static int
+IndexByClass(security_class_t class)
+{
+    int i;
+    for (i=0; i<NRES; i++)
+	if (class == sClasses[i])
+	    return i;
+    return 0;
+}
+
+/*
+ * Does sanity checking on a resource ID.  This can be removed after 
+ * testing.
+ */
+static void
+CheckXID(XID id)
+{
+    /*
+    XID c = CLIENT_ID(id);
+
+    if (c > 10)
+	ErrorF("Warning: possibly mangled ID %x\n", id);
+
+    c = id & RESOURCE_ID_MASK;
+    if (c > 100)
+	ErrorF("Warning: possibly mangled ID %x\n", id);
+        */
+}
+
+/*
+ * Byte-swap a CARD32 id if necessary.
+ */
+static XID
+SwapXID(ClientPtr client, XID id)
+{
+    register char n;
+    if (client->swapped)
+	swapl(&id, n);
+    return id;
+}
+
+/*
+ * ServerPerm - check access permissions on a server-owned object.
+ *
+ * Arguments:
+ * client: Client doing the request.
+ * class: Security class of the server object being accessed.
+ * perm: Permissions required on the object.
+ *
+ * Returns: boolean TRUE=allowed, FALSE=denied.
+ */
+static int
+ServerPerm(ClientPtr client,
+	   security_class_t class,
+	   access_vector_t perm)
+{
+    int idx = IndexByClass(class);
+    if (HAVESTATE(client))
+    {
+	XSELinuxAuditRec auditdata;
+	auditdata.client = client;
+	auditdata.property = NULL;
+	auditdata.extension = NULL;
+	errno = 0;
+        if (avc_has_perm(SID(client), RSID(serverClient,idx), class,
+                         perm, &AEREF(client), &auditdata) < 0)
+        {
+            if (errno != EACCES)
+                ErrorF("ServerPerm: unexpected error %d\n", errno);
+            return FALSE;
+        }
+    }
+    else
+    {
+	ErrorF("No client state in server-perm check!\n");
+        return TRUE;
+    }
+
+    return TRUE;
+}
+
+/*
+ * IDPerm - check access permissions on a resource.
+ *
+ * Arguments:
+ * client: Client doing the request.
+ * id: resource id of the resource being accessed.
+ * class: Security class of the resource being accessed.
+ * perm: Permissions required on the resource.
+ *
+ * Returns: boolean TRUE=allowed, FALSE=denied.
+ */
+static int
+IDPerm(ClientPtr sclient,
+	 XID id,
+	 security_class_t class,
+	 access_vector_t perm)
+{
+    ClientPtr tclient;
+    int idx = IndexByClass(class);
+    XSELinuxAuditRec auditdata;
+
+    if (id == None)
+	return TRUE;
+
+    CheckXID(id);
+    tclient = clients[CLIENT_ID(id)];
+
+    /*
+     * This happens in the case where a client has
+     * disconnected.  XXX might want to make the server
+     * own orphaned resources...
+     */
+    if (!tclient || !HAVESTATE(tclient) || !HAVESTATE(sclient))
+    {
+	return TRUE;
+    }
+
+    auditdata.client = sclient;
+    auditdata.property = NULL;
+    auditdata.extension = NULL;
+    errno = 0;
+    if (avc_has_perm(SID(sclient), RSID(tclient,idx), class,
+		     perm, &AEREF(sclient), &auditdata) < 0)
+    {
+	if (errno != EACCES)
+	    ErrorF("IDPerm: unexpected error %d\n", errno);
+	return FALSE;
+    }
+
+    return TRUE;
+}
+
+/*
+ * ObjectSIDByLabel - get SID for an extension or property.
+ *
+ * Arguments:
+ * class: should be SECCLASS_XEXTENSION or SECCLASS_PROPERTY.
+ * name: name of the extension or property.
+ *
+ * Returns: proper SID for the object or NULL on error.
+ */
+static security_id_t
+ObjectSIDByLabel(security_context_t basecontext, security_class_t class,
+                 const char *name)
+{
+    security_context_t base, new;
+    context_t con;
+    security_id_t sid = NULL;
+    char **ptr, *type = NULL;
+
+    if (basecontext != NULL)
+    {
+        /* use the supplied context */
+        base = strdup(basecontext);
+        if (base == NULL)
+            goto out;
+    }
+    else
+    {
+        /* get server context */
+        if (getcon(&base) < 0)
+            goto out;
+    }
+
+    /* make a new context-manipulation object */
+    con = context_new(base);
+    if (!con)
+	goto out2;
+    
+    /* look in the mappings of names to types */
+    ptr = (class == SECCLASS_PROPERTY) ? propertyTypes : extensionTypes;
+    for (; *ptr; ptr+=2)
+	if (!strcmp(*ptr, name))
+	    break;
+    type = ptr[1];
+
+    /* set the role and type in the context (user unchanged) */
+    if (context_type_set(con, type) ||
+	context_role_set(con, "object_r"))
+	goto out3;
+
+    /* get a context string from the context-manipulation object */
+    new = context_str(con);
+    if (!new)
+	goto out3;
+
+    /* get a SID for the context */
+    if (avc_context_to_sid(new, &sid) < 0)
+	goto out3;
+
+  out3:
+    context_free(con);
+  out2:
+    freecon(base);
+  out:
+    return sid;
+}
+
+/*
+ * AssignClientState - set up client security state.
+ *
+ * Arguments:
+ * client: client to set up (can be serverClient).
+ */
+static void
+AssignClientState(ClientPtr client)
+{
+    int i, needToFree = 0;
+    security_context_t basectx, objctx;
+    XSELinuxClientStateRec *state = (XSELinuxClientStateRec*)STATEPTR(client);
+    Bool isServerClient = FALSE;
+
+    avc_entry_ref_init(&state->aeref);
+
+    if (client->index > 0)
+    {
+	XtransConnInfo ci = ((OsCommPtr)client->osPrivate)->trans_conn;
+	if (_XSERVTransIsLocal(ci)) {
+	    /* for local clients, can get context from the socket */
+	    int fd = _XSERVTransGetConnectionNumber(ci);
+	    if (getpeercon(fd, &basectx) < 0)
+	    {
+		FatalError("Client %d: couldn't get context from socket\n",
+			   client->index);
+	    }
+	    needToFree = 1;
+	}
+        else
+        {
+	    /* for remote clients, need to use a default context */
+	    basectx = XSELinuxNonlocalContextDefault;
+	}
+    }
+    else
+    {
+        isServerClient = TRUE;
+
+	/* use the context of the X server process for the serverClient */
+	if (getcon(&basectx) < 0)
+	{
+	    FatalError("Couldn't get context of X server process\n");
+	}
+	needToFree = 1;
+    }
+
+    /* get a SID from the context */
+    if (avc_context_to_sid(basectx, &state->sid) < 0)
+    {
+	FatalError("Client %d: couldn't get security ID for client\n",
+		   client->index);
+    }
+
+    /* get contexts and then SIDs for each resource type */
+    for (i=0; i<NRES; i++)
+    {
+	if (security_compute_create(basectx, basectx, sClasses[i],
+				    &objctx) < 0)
+	{
+	    FatalError("Client %d: couldn't get context for class %x\n",
+		       client->index, sClasses[i]);
+	}
+	else if (avc_context_to_sid(objctx, &state->rsid[i]) < 0)
+	{
+	    FatalError("Client %d: couldn't get SID for class %x\n",
+		       client->index, sClasses[i]);
+	}
+	freecon(objctx);
+    }
+
+    /* special handling for serverClient windows (that is, root windows) */
+    if (isServerClient == TRUE)
+    {
+        i = IndexByClass(SECCLASS_WINDOW);
+        sidput(state->rsid[i]);
+        if (avc_context_to_sid(XSELinuxRootWindowContext, &state->rsid[i]))
+        {
+            FatalError("Failed to set SID for root window\n");
+        }
+    }
+
+    /* mark as set up, free base context if necessary, and return */
+    state->haveState = TRUE;
+    if (needToFree)
+	freecon(basectx);
+}
+
+/*
+ * FreeClientState - tear down client security state.
+ *
+ * Arguments:
+ * client: client to release (can be serverClient).
+ */
+static void
+FreeClientState(ClientPtr client)
+{
+    int i;
+    XSELinuxClientStateRec *state = (XSELinuxClientStateRec*)STATEPTR(client);
+
+    /* client state may not be set up if its auth was rejected */
+    if (state->haveState) {
+	state = (XSELinuxClientStateRec*)STATEPTR(client);
+	sidput(state->sid);
+	for (i=0; i<NRES; i++)
+	    sidput(state->rsid[i]);
+	state->haveState = FALSE;
+    }
+}
+
+#define REQUEST_SIZE_CHECK(client, req) \
+    (client->req_len >= (sizeof(req) >> 2))
+#define IDPERM(client, req, field, class, perm) \
+    (REQUEST_SIZE_CHECK(client,req) && \
+    IDPerm(client, SwapXID(client,((req*)stuff)->field), class, perm))
+#define CALLBACK(name) static void \
+name(CallbackListPtr *pcbl, pointer nulldata, pointer calldata)
+
+static int
+CheckSendEventPerms(ClientPtr client)
+{
+    register char n;
+    access_vector_t perm = 0;
+    REQUEST(xSendEventReq);
+
+    /* might need type bounds checking here */
+    if (!REQUEST_SIZE_CHECK(client, xSendEventReq))
+	return FALSE;
+
+    switch (stuff->event.u.u.type) {
+	case SelectionClear:
+	case SelectionNotify:
+	case SelectionRequest:
+	case ClientMessage:
+	case PropertyNotify:
+	    perm = WINDOW__CLIENTCOMEVENT;
+	    break;
+	case ButtonPress:
+	case ButtonRelease:
+	case KeyPress:
+	case KeyRelease:
+	case KeymapNotify:
+	case MotionNotify:
+	case EnterNotify:
+	case LeaveNotify:
+	case FocusIn:
+	case FocusOut:
+	    perm = WINDOW__INPUTEVENT;
+	    break;
+	case Expose:
+	case GraphicsExpose:
+	case NoExpose:
+	case VisibilityNotify:
+	    perm = WINDOW__DRAWEVENT;
+	    break;
+	case CirculateNotify:
+	case ConfigureNotify:
+	case CreateNotify:
+	case DestroyNotify:
+	case MapNotify:
+	case UnmapNotify:
+	case GravityNotify:
+	case ReparentNotify:
+	    perm = WINDOW__WINDOWCHANGEEVENT;
+	    break;
+	case CirculateRequest:
+	case ConfigureRequest:
+	case MapRequest:
+	case ResizeRequest:
+	    perm = WINDOW__WINDOWCHANGEREQUEST;
+	    break;
+	case ColormapNotify:
+	case MappingNotify:
+	    perm = WINDOW__SERVERCHANGEEVENT;
+	    break;
+	default:
+	    perm = WINDOW__EXTENSIONEVENT;
+	    break;
+    }
+    if (client->swapped)
+	swapl(&stuff->destination, n);
+    return IDPerm(client, stuff->destination, SECCLASS_WINDOW, perm);
+}
+     
+static int
+CheckConvertSelectionPerms(ClientPtr client)
+{
+    register char n;
+    int rval = TRUE;
+    REQUEST(xConvertSelectionReq);
+    
+    if (!REQUEST_SIZE_CHECK(client, xConvertSelectionReq))
+	return FALSE;
+
+    if (client->swapped)
+    {
+	swapl(&stuff->selection, n);
+	swapl(&stuff->requestor, n);
+    }
+
+    if (ValidAtom(stuff->selection))
+    {
+	int i = 0;
+	while ((i < NumCurrentSelections) &&
+	       CurrentSelections[i].selection != stuff->selection) i++;
+	if (i < NumCurrentSelections)
+	    rval = rval && IDPerm(client, CurrentSelections[i].window,
+				  SECCLASS_WINDOW, WINDOW__CLIENTCOMEVENT);
+    }
+    rval = rval && IDPerm(client, stuff->requestor,
+			  SECCLASS_WINDOW, WINDOW__CLIENTCOMEVENT);
+    return rval;
+}
+
+static int
+CheckSetSelectionOwnerPerms(ClientPtr client)
+{
+    register char n;
+    int rval = TRUE;
+    REQUEST(xSetSelectionOwnerReq);
+
+    if (!REQUEST_SIZE_CHECK(client, xSetSelectionOwnerReq))
+	return FALSE;
+
+    if (client->swapped)
+    {
+	swapl(&stuff->selection, n);
+	swapl(&stuff->window, n);
+    }
+
+    if (ValidAtom(stuff->selection))
+    {
+	int i = 0;
+	while ((i < NumCurrentSelections) &&
+	       CurrentSelections[i].selection != stuff->selection) i++;
+	if (i < NumCurrentSelections)
+	    rval = rval && IDPerm(client, CurrentSelections[i].window,
+				  SECCLASS_WINDOW, WINDOW__CHSELECTION);
+    }
+    rval = rval && IDPerm(client, stuff->window, 
+			  SECCLASS_WINDOW, WINDOW__CHSELECTION);
+    return rval;
+}
+    
+CALLBACK(XSELinuxCoreDispatch)
+{
+    XaceCoreDispatchRec *rec = (XaceCoreDispatchRec*)calldata;
+    ClientPtr client = rec->client;
+    REQUEST(xReq);
+    Bool rval;
+
+    switch(stuff->reqType) {
+    /* Drawable class control requirements */
+    case X_ClearArea:
+	rval = IDPERM(client, xClearAreaReq, window,
+		      SECCLASS_DRAWABLE, DRAWABLE__DRAW);
+	break;
+    case X_PolySegment:
+    case X_PolyRectangle:
+    case X_PolyArc:
+    case X_PolyFillRectangle:
+    case X_PolyFillArc:
+	rval = IDPERM(client, xPolySegmentReq, drawable,
+		      SECCLASS_DRAWABLE, DRAWABLE__DRAW);
+	break;
+    case X_PolyPoint:
+    case X_PolyLine:
+	rval = IDPERM(client, xPolyPointReq, drawable,
+		      SECCLASS_DRAWABLE, DRAWABLE__DRAW);
+	break;
+    case X_FillPoly:
+	rval = IDPERM(client, xFillPolyReq, drawable,
+		      SECCLASS_DRAWABLE, DRAWABLE__DRAW);
+	break;
+    case X_PutImage:
+	rval = IDPERM(client, xPutImageReq, drawable,
+		      SECCLASS_DRAWABLE, DRAWABLE__DRAW);
+	break;
+    case X_CopyArea:
+    case X_CopyPlane:
+	rval = IDPERM(client, xCopyAreaReq, srcDrawable,
+		      SECCLASS_DRAWABLE, DRAWABLE__COPY)
+	    && IDPERM(client, xCopyAreaReq, dstDrawable,
+		      SECCLASS_DRAWABLE, DRAWABLE__DRAW);
+	break;
+    case X_GetImage:
+	rval = IDPERM(client, xGetImageReq, drawable,
+		      SECCLASS_DRAWABLE, DRAWABLE__COPY);
+	break;
+    case X_GetGeometry:
+	rval = IDPERM(client, xResourceReq, id,
+		      SECCLASS_DRAWABLE, DRAWABLE__GETATTR);
+	break;
+
+    /* Window class control requirements */
+    case X_ChangeProperty:
+	rval = IDPERM(client, xChangePropertyReq, window,
+		      SECCLASS_WINDOW, 
+		      WINDOW__CHPROPLIST | WINDOW__CHPROP |
+		      WINDOW__LISTPROP);
+	break;
+    case X_ChangeSaveSet:
+	rval = IDPERM(client, xChangeSaveSetReq, window,
+		      SECCLASS_WINDOW,
+		      WINDOW__CTRLLIFE | WINDOW__CHPARENT);
+	break;
+    case X_ChangeWindowAttributes:
+	rval = IDPERM(client, xChangeWindowAttributesReq, window,
+		      SECCLASS_WINDOW, WINDOW__SETATTR);
+	break;
+    case X_CirculateWindow:
+	rval = IDPERM(client, xCirculateWindowReq, window,
+		      SECCLASS_WINDOW, WINDOW__CHSTACK);
+	break;
+    case X_ConfigureWindow:
+	rval = IDPERM(client, xConfigureWindowReq, window,
+		      SECCLASS_WINDOW,
+		      WINDOW__SETATTR | WINDOW__MOVE | WINDOW__CHSTACK);
+	break;
+    case X_ConvertSelection:
+	rval = CheckConvertSelectionPerms(client);
+	break;
+    case X_CreateWindow:
+	rval = IDPERM(client, xCreateWindowReq, wid,
+		      SECCLASS_WINDOW,
+		      WINDOW__CREATE | WINDOW__SETATTR | WINDOW__MOVE)
+	    && IDPERM(client, xCreateWindowReq, parent,
+		      SECCLASS_WINDOW,
+		      WINDOW__CHSTACK | WINDOW__ADDCHILD)
+	    && IDPERM(client, xCreateWindowReq, wid,
+		      SECCLASS_DRAWABLE, DRAWABLE__CREATE);
+	break;
+    case X_DeleteProperty:
+	rval = IDPERM(client, xDeletePropertyReq, window,
+		      SECCLASS_WINDOW,
+		      WINDOW__CHPROP | WINDOW__CHPROPLIST);
+	break;
+    case X_DestroyWindow:
+    case X_DestroySubwindows:
+	rval = IDPERM(client, xResourceReq, id,
+		      SECCLASS_WINDOW,
+		      WINDOW__ENUMERATE | WINDOW__UNMAP | WINDOW__DESTROY)
+	    && IDPERM(client, xResourceReq, id,
+		      SECCLASS_DRAWABLE, DRAWABLE__DESTROY);
+	break;
+    case X_GetMotionEvents:
+	rval = IDPERM(client, xGetMotionEventsReq, window,
+		      SECCLASS_WINDOW, WINDOW__MOUSEMOTION);
+	break;
+    case X_GetProperty:
+	rval = IDPERM(client, xGetPropertyReq, window,
+		      SECCLASS_WINDOW, WINDOW__LISTPROP);
+	break;
+    case X_GetWindowAttributes:
+	rval = IDPERM(client, xResourceReq, id,
+		      SECCLASS_WINDOW, WINDOW__GETATTR);
+	break;
+    case X_KillClient:
+	rval = IDPERM(client, xResourceReq, id,
+		      SECCLASS_XCLIENT, XCLIENT__KILL);
+	break;
+    case X_ListProperties:
+	rval = IDPERM(client, xResourceReq, id,
+		      SECCLASS_WINDOW, WINDOW__LISTPROP);
+	break;
+    case X_MapWindow:
+    case X_MapSubwindows:
+	rval = IDPERM(client, xResourceReq, id,
+		      SECCLASS_WINDOW,
+		      WINDOW__ENUMERATE | WINDOW__GETATTR | WINDOW__MAP);
+	break;
+    case X_QueryTree:
+	rval = IDPERM(client, xResourceReq, id,
+		      SECCLASS_WINDOW, WINDOW__ENUMERATE | WINDOW__GETATTR);
+	break;
+    case X_RotateProperties:
+	rval = IDPERM(client, xRotatePropertiesReq, window,
+		      SECCLASS_WINDOW, WINDOW__CHPROP | WINDOW__CHPROPLIST);
+	break;
+    case X_ReparentWindow:
+	rval = IDPERM(client, xReparentWindowReq, window,
+		      SECCLASS_WINDOW, WINDOW__CHPARENT | WINDOW__MOVE)
+	    && IDPERM(client, xReparentWindowReq, parent,
+		      SECCLASS_WINDOW, WINDOW__CHSTACK | WINDOW__ADDCHILD);
+	break;
+    case X_SendEvent:
+	rval = CheckSendEventPerms(client);
+	break;
+    case X_SetInputFocus:
+	rval = IDPERM(client, xSetInputFocusReq, focus,
+		      SECCLASS_WINDOW, WINDOW__SETFOCUS)
+	    && ServerPerm(client, SECCLASS_XINPUT, XINPUT__SETFOCUS);
+	break;
+    case X_SetSelectionOwner:
+	rval = CheckSetSelectionOwnerPerms(client);
+	break;
+    case X_TranslateCoords:
+	rval = IDPERM(client, xTranslateCoordsReq, srcWid,
+		      SECCLASS_WINDOW, WINDOW__GETATTR)
+	    && IDPERM(client, xTranslateCoordsReq, dstWid,
+		      SECCLASS_WINDOW, WINDOW__GETATTR);
+	break;
+    case X_UnmapWindow:
+    case X_UnmapSubwindows:
+	rval = IDPERM(client, xResourceReq, id,
+		      SECCLASS_WINDOW,
+		      WINDOW__ENUMERATE | WINDOW__GETATTR |
+		      WINDOW__UNMAP);
+	break;
+    case X_WarpPointer:
+	rval = IDPERM(client, xWarpPointerReq, srcWid,
+		      SECCLASS_WINDOW, WINDOW__GETATTR)
+	    && IDPERM(client, xWarpPointerReq, dstWid,
+		      SECCLASS_WINDOW, WINDOW__GETATTR)
+	    && ServerPerm(client, SECCLASS_XINPUT, XINPUT__WARPPOINTER);
+	break;
+
+    /* Input class control requirements */
+    case X_GrabButton:
+    case X_GrabKey:
+	rval = ServerPerm(client, SECCLASS_XINPUT, XINPUT__PASSIVEGRAB);
+	break;
+    case X_GrabKeyboard:
+    case X_GrabPointer:
+    case X_ChangeActivePointerGrab:
+	rval = ServerPerm(client, SECCLASS_XINPUT, XINPUT__ACTIVEGRAB);
+	break;
+    case X_AllowEvents:
+    case X_UngrabButton:
+    case X_UngrabKey:
+    case X_UngrabKeyboard:
+    case X_UngrabPointer:
+	rval = ServerPerm(client, SECCLASS_XINPUT, XINPUT__UNGRAB);
+	break;
+    case X_GetKeyboardControl:
+    case X_GetKeyboardMapping:
+    case X_GetPointerControl:
+    case X_GetPointerMapping:
+    case X_GetModifierMapping:
+    case X_QueryKeymap:
+    case X_QueryPointer:
+	rval = ServerPerm(client, SECCLASS_XINPUT, XINPUT__GETATTR);
+	break;
+    case X_ChangeKeyboardControl:
+    case X_ChangePointerControl:
+    case X_ChangeKeyboardMapping:
+    case X_SetModifierMapping:
+    case X_SetPointerMapping:
+	rval = ServerPerm(client, SECCLASS_XINPUT, XINPUT__SETATTR);
+	break;
+    case X_Bell:
+	rval = ServerPerm(client, SECCLASS_XINPUT, XINPUT__BELL);
+	break;
+
+    /* Colormap class control requirements */
+    case X_AllocColor:
+    case X_AllocColorCells:
+    case X_AllocColorPlanes:
+    case X_AllocNamedColor:
+	rval = IDPERM(client, xResourceReq, id,
+		      SECCLASS_COLORMAP,
+		      COLORMAP__READ | COLORMAP__STORE);
+	break;
+    case X_CopyColormapAndFree:
+	rval = IDPERM(client, xCopyColormapAndFreeReq, mid,
+		      SECCLASS_COLORMAP, COLORMAP__CREATE)
+	    && IDPERM(client, xCopyColormapAndFreeReq, srcCmap,
+		      SECCLASS_COLORMAP,
+		      COLORMAP__READ | COLORMAP__FREE);
+	break;
+    case X_CreateColormap:
+	rval = IDPERM(client, xCreateColormapReq, mid,
+		      SECCLASS_COLORMAP, COLORMAP__CREATE)
+	    && IDPERM(client, xCreateColormapReq, window,
+		      SECCLASS_DRAWABLE, DRAWABLE__DRAW);
+	break;
+    case X_FreeColormap:
+	rval = IDPERM(client, xResourceReq, id,
+		      SECCLASS_COLORMAP, COLORMAP__FREE);
+	break;
+    case X_FreeColors:
+	rval = IDPERM(client, xFreeColorsReq, cmap,
+		      SECCLASS_COLORMAP, COLORMAP__STORE);
+	break;
+    case X_InstallColormap:
+	rval = IDPERM(client, xResourceReq, id,
+		      SECCLASS_COLORMAP, COLORMAP__INSTALL)
+	    && ServerPerm(client, SECCLASS_COLORMAP, COLORMAP__INSTALL);
+	break;
+    case X_ListInstalledColormaps:
+	rval = ServerPerm(client, SECCLASS_COLORMAP, COLORMAP__LIST);
+	break;
+    case X_LookupColor:
+    case X_QueryColors:
+	rval = IDPERM(client, xResourceReq, id,
+		      SECCLASS_COLORMAP, COLORMAP__READ);
+	break;
+    case X_StoreColors:
+    case X_StoreNamedColor:
+	rval = IDPERM(client, xResourceReq, id,
+		      SECCLASS_COLORMAP, COLORMAP__STORE);
+	break;
+    case X_UninstallColormap:
+	rval = IDPERM(client, xResourceReq, id,
+		      SECCLASS_COLORMAP, COLORMAP__UNINSTALL)
+	    && ServerPerm(client, SECCLASS_COLORMAP, COLORMAP__UNINSTALL);
+	break;
+
+    /* Font class control requirements */
+    case X_CloseFont:
+	rval = IDPERM(client, xResourceReq, id,
+		      SECCLASS_FONT, FONT__FREE);
+	break;
+    case X_ImageText8:
+    case X_ImageText16:
+	/* Font accesses checked through the resource manager */
+	rval = IDPERM(client, xImageTextReq, drawable,
+		      SECCLASS_DRAWABLE, DRAWABLE__DRAW);
+	break;
+    case X_OpenFont:
+	rval = ServerPerm(client, SECCLASS_FONT, FONT__LOAD)
+	    && IDPERM(client, xOpenFontReq, fid,
+		      SECCLASS_FONT, FONT__USE);
+	break;
+    case X_PolyText8:
+    case X_PolyText16:
+	/* Font accesses checked through the resource manager */
+	rval = ServerPerm(client, SECCLASS_FONT, FONT__LOAD)
+	    && IDPERM(client, xPolyTextReq, gc,
+		      SECCLASS_GC, GC__SETATTR)
+	    && IDPERM(client, xPolyTextReq, drawable,
+		      SECCLASS_DRAWABLE, DRAWABLE__DRAW);
+	break;
+	
+    /* Pixmap class control requirements */
+    case X_CreatePixmap:
+	rval = IDPERM(client, xCreatePixmapReq, pid,
+		      SECCLASS_DRAWABLE, DRAWABLE__CREATE);
+	break;
+    case X_FreePixmap:
+	rval = IDPERM(client, xResourceReq, id,
+		      SECCLASS_DRAWABLE, DRAWABLE__DESTROY);
+	break;
+
+    /* Cursor class control requirements */
+    case X_CreateCursor:
+	rval = IDPERM(client, xCreateCursorReq, cid,
+		      SECCLASS_CURSOR, CURSOR__CREATE)
+	    && IDPERM(client, xCreateCursorReq, source,
+		      SECCLASS_DRAWABLE, DRAWABLE__DRAW)
+	    && IDPERM(client, xCreateCursorReq, mask,
+		      SECCLASS_DRAWABLE, DRAWABLE__COPY);
+	break;
+    case X_CreateGlyphCursor:
+	rval = IDPERM(client, xCreateGlyphCursorReq, cid,
+		      SECCLASS_CURSOR, CURSOR__CREATEGLYPH)
+	    && IDPERM(client, xCreateGlyphCursorReq, source,
+		      SECCLASS_FONT, FONT__USE)
+	    && IDPERM(client, xCreateGlyphCursorReq, mask,
+		      SECCLASS_FONT, FONT__USE);
+	break;
+    case X_RecolorCursor:
+	rval = IDPERM(client, xRecolorCursorReq, cursor,
+		      SECCLASS_CURSOR, CURSOR__SETATTR);
+	break;
+    case X_FreeCursor:
+	rval = IDPERM(client, xResourceReq, id,
+		      SECCLASS_CURSOR, CURSOR__FREE);
+	break;
+	    
+    /* GC class control requirements */
+    case X_CreateGC:
+	rval = IDPERM(client, xCreateGCReq, gc,
+		      SECCLASS_GC, GC__CREATE | GC__SETATTR);
+	break;
+    case X_ChangeGC:
+    case X_SetDashes:
+    case X_SetClipRectangles:
+	rval = IDPERM(client, xResourceReq, id,
+		      SECCLASS_GC, GC__SETATTR);
+	break;
+    case X_CopyGC:
+	rval = IDPERM(client, xCopyGCReq, srcGC,
+		      SECCLASS_GC, GC__GETATTR)
+	    && IDPERM(client, xCopyGCReq, dstGC,
+		      SECCLASS_GC, GC__SETATTR);
+	break;
+    case X_FreeGC:
+	rval = IDPERM(client, xResourceReq, id,
+		      SECCLASS_GC, GC__FREE);
+	break;
+
+    /* Server class control requirements */
+    case X_GrabServer:
+	rval = ServerPerm(client, SECCLASS_XSERVER, XSERVER__GRAB);
+	break;
+    case X_UngrabServer:
+	rval = ServerPerm(client, SECCLASS_XSERVER, XSERVER__UNGRAB);
+	break;
+    case X_ForceScreenSaver:
+    case X_GetScreenSaver:
+    case X_SetScreenSaver:
+	rval = ServerPerm(client, SECCLASS_XSERVER, XSERVER__SCREENSAVER);
+	break;
+    case X_ListHosts:
+	rval = ServerPerm(client, SECCLASS_XSERVER, XSERVER__GETHOSTLIST);
+	break;
+    case X_ChangeHosts:
+    case X_SetAccessControl:
+	rval = ServerPerm(client, SECCLASS_XSERVER, XSERVER__SETHOSTLIST);
+	break;
+    case X_GetFontPath:
+	rval = ServerPerm(client, SECCLASS_XSERVER, XSERVER__GETFONTPATH);
+	break;
+    case X_SetFontPath:
+	rval = ServerPerm(client, SECCLASS_XSERVER, XSERVER__SETFONTPATH);
+	break;
+    case X_QueryBestSize:
+	rval = ServerPerm(client, SECCLASS_XSERVER, XSERVER__GETATTR);
+	break;
+
+    default:
+	rval = TRUE;
+	break;
+    }
+    if (!rval)
+	rec->rval = FALSE;
+}
+
+CALLBACK(XSELinuxExtDispatch)
+{
+    XaceExtAccessRec *rec = (XaceExtAccessRec*)calldata;
+    ClientPtr client = rec->client;
+    ExtensionEntry *ext = rec->ext;
+    security_id_t extsid;
+    access_vector_t perm;
+    REQUEST(xReq);
+    
+    /* XXX there should be a separate callback for this */
+    if (!EXTENSIONSID(ext))
+    {
+	extsid = ObjectSIDByLabel(NULL, SECCLASS_XEXTENSION, ext->name);
+	if (!extsid)
+	    return;
+	EXTENSIONSID(ext) = extsid;
+    }
+
+    extsid = (security_id_t)EXTENSIONSID(ext);
+    perm = ((stuff->reqType == X_QueryExtension) ||
+	    (stuff->reqType == X_ListExtensions)) ?
+	XEXTENSION__QUERY : XEXTENSION__USE;
+
+    if (HAVESTATE(client))
+    {
+	XSELinuxAuditRec auditdata;
+	auditdata.client = client;
+	auditdata.property = NULL;
+	auditdata.extension = ext->name;
+	errno = 0;
+	if (avc_has_perm(SID(client), extsid, SECCLASS_XEXTENSION,
+			 perm, &AEREF(client), &auditdata) < 0)
+	{
+	    if (errno != EACCES)
+		ErrorF("ExtDispatch: unexpected error %d\n", errno);
+	    rec->rval = FALSE;
+	}
+    } else
+	ErrorF("No client state in extension dispatcher!\n");
+} /* XSELinuxExtDispatch */
+
+CALLBACK(XSELinuxProperty)
+{
+    XacePropertyAccessRec *rec = (XacePropertyAccessRec*)calldata;
+    WindowPtr pWin = rec->pWin;
+    ClientPtr client = rec->client;
+    ClientPtr tclient;
+    access_vector_t perm = 0;
+    security_id_t propsid;
+    char *propname = NameForAtom(rec->propertyName);
+
+    tclient = wClient(pWin);
+    if (!tclient || !HAVESTATE(tclient))
+        return;
+
+    propsid = ObjectSIDByLabel(SID(tclient)->ctx, SECCLASS_PROPERTY, propname);
+    if (!propsid)
+	return;
+
+    if (rec->access_mode & SecurityReadAccess)
+	perm |= PROPERTY__READ;
+    if (rec->access_mode & SecurityWriteAccess)
+	perm |= PROPERTY__WRITE;
+    if (rec->access_mode & SecurityDestroyAccess)
+	perm |= PROPERTY__FREE;
+    if (!rec->access_mode)
+	perm = PROPERTY__READ | PROPERTY__WRITE | PROPERTY__FREE;
+
+    if (HAVESTATE(client))
+    {
+	XSELinuxAuditRec auditdata;
+	auditdata.client = client;
+	auditdata.property = propname;
+	auditdata.extension = NULL;
+	errno = 0;
+	if (avc_has_perm(SID(client), propsid, SECCLASS_PROPERTY,
+			 perm, &AEREF(client), &auditdata) < 0)
+	{
+	    if (errno != EACCES)
+		ErrorF("Property: unexpected error %d\n", errno);
+	    rec->rval = SecurityIgnoreOperation;
+	}
+    } else
+	ErrorF("No client state in property callback!\n");
+
+    /* XXX this should be saved in the property structure */
+    sidput(propsid);
+} /* XSELinuxProperty */
+
+CALLBACK(XSELinuxResLookup)
+{
+    XaceResourceAccessRec *rec = (XaceResourceAccessRec*)calldata;
+    ClientPtr client = rec->client;
+    REQUEST(xReq);
+    access_vector_t perm = 0;
+    Bool rval = TRUE;
+
+    /* serverClient requests OK */
+    if (client->index == 0)
+	return;
+
+    switch(rec->rtype) {
+	case RT_FONT: {
+	    switch(stuff->reqType) {
+		case X_ImageText8:
+		case X_ImageText16:
+		case X_PolyText8:
+		case X_PolyText16:
+		    perm = FONT__USE;
+		    break;
+		case X_ListFonts:
+		case X_ListFontsWithInfo:
+		case X_QueryFont:
+		case X_QueryTextExtents:
+		    perm = FONT__GETATTR;
+		    break;
+		default:
+		    break;
+	    }
+	    if (perm)
+		rval = IDPerm(client, rec->id, SECCLASS_FONT, perm);
+	    break;
+	}
+	default:
+	    break;
+    }
+    if (!rval)
+	rec->rval = FALSE;
+} /* XSELinuxResLookup */
+
+CALLBACK(XSELinuxMap)
+{
+    XaceMapAccessRec *rec = (XaceMapAccessRec*)calldata;
+    if (!IDPerm(rec->client, rec->pWin->drawable.id,
+		SECCLASS_WINDOW, WINDOW__MAP))
+	rec->rval = FALSE;
+} /* XSELinuxMap */
+
+CALLBACK(XSELinuxBackgrnd)
+{
+    XaceMapAccessRec *rec = (XaceMapAccessRec*)calldata;
+    if (!IDPerm(rec->client, rec->pWin->drawable.id,
+		SECCLASS_WINDOW, WINDOW__TRANSPARENT))
+	rec->rval = FALSE;
+} /* XSELinuxBackgrnd */
+
+CALLBACK(XSELinuxDrawable)
+{
+    XaceDrawableAccessRec *rec = (XaceDrawableAccessRec*)calldata;
+    if (!IDPerm(rec->client, rec->pDraw->id,
+		SECCLASS_DRAWABLE, DRAWABLE__COPY))
+	rec->rval = FALSE;
+} /* XSELinuxDrawable */
+
+CALLBACK(XSELinuxHostlist)
+{
+    XaceHostlistAccessRec *rec = (XaceHostlistAccessRec*)calldata;
+    access_vector_t perm = (rec->access_mode == SecurityReadAccess) ?
+	XSERVER__GETHOSTLIST : XSERVER__SETHOSTLIST;
+
+    if (!ServerPerm(rec->client, SECCLASS_XSERVER, perm))
+	rec->rval = FALSE;
+} /* XSELinuxHostlist */
+
+/* Extension callbacks */
+CALLBACK(XSELinuxClientState)
+{
+    NewClientInfoRec *pci = (NewClientInfoRec *)calldata;
+    ClientPtr client = pci->client;
+
+    switch(client->clientState)
+    {
+    case ClientStateInitial:
+	AssignClientState(serverClient);
+	break;
+
+	case ClientStateRunning:
+	{
+	    AssignClientState(client);
+	    break;
+	}
+	case ClientStateGone:
+	case ClientStateRetained:
+	{
+	    FreeClientState(client);
+	    break;
+	}
+	default: break;
+    }
+} /* XSELinuxClientState */
+
+static char *XSELinuxKeywords[] = {
+#define XSELinuxKeywordComment 0
+    "#",
+#define XSELinuxKeywordProperty 1
+    "property",
+#define XSELinuxKeywordExtension 2
+    "extension",
+#define XSELinuxKeywordNonlocalContext 3
+    "nonlocal_context",
+#define XSELinuxKeywordRootWindowContext 4
+    "root_window_context",
+#define XSELinuxKeywordDefault 5
+    "default"
+};
+
+#define NUMKEYWORDS (sizeof(XSELinuxKeywords) / sizeof(char *))
+
+#ifndef __UNIXOS2__
+#define XSELinuxIsWhitespace(c) ( (c == ' ') || (c == '\t') || (c == '\n') )
+#else
+#define XSELinuxIsWhitespace(c) ( (c == ' ') || (c == '\t') || (c == '\n') || (c == '\r') )
+#endif
+
+static char *
+XSELinuxSkipWhitespace(
+    char *p)
+{
+    while (XSELinuxIsWhitespace(*p))
+	p++;
+    return p;
+} /* XSELinuxSkipWhitespace */
+
+static char *
+XSELinuxParseString(
+    char **rest)
+{
+    char *startOfString;
+    char *s = *rest;
+    char endChar = 0;
+
+    s = XSELinuxSkipWhitespace(s);
+
+    if (*s == '"' || *s == '\'')
+    {
+	endChar = *s++;
+	startOfString = s;
+	while (*s && (*s != endChar))
+	    s++;
+    }
+    else
+    {
+	startOfString = s;
+	while (*s && !XSELinuxIsWhitespace(*s))
+	    s++;
+    }
+    if (*s)
+    {
+	*s = '\0';
+	*rest = s + 1;
+	return startOfString;
+    }
+    else
+    {
+	*rest = s;
+	return (endChar) ? NULL : startOfString;
+    }
+} /* XSELinuxParseString */
+
+static int
+XSELinuxParseKeyword(
+    char **p)
+{
+    int i;
+    char *s = *p;
+    s = XSELinuxSkipWhitespace(s);
+    for (i = 0; i < NUMKEYWORDS; i++)
+    {
+	int len = strlen(XSELinuxKeywords[i]);
+	if (strncmp(s, XSELinuxKeywords[i], len) == 0)
+	{
+	    *p = s + len;
+	    return (i);
+	}
+    }
+    *p = s;
+    return -1;
+} /* XSELinuxParseKeyword */
+
+static Bool
+XSELinuxTypeIsValid(char *typename)
+{
+    security_context_t base, new;
+    context_t con;
+    Bool ret = FALSE;
+
+    /* get the server's context */
+    if (getcon(&base) < 0)
+        goto out;
+
+    /* make a new context-manipulation object */
+    con = context_new(base);
+    if (!con)
+        goto out_free;
+
+    /* set the role */
+    if (context_role_set(con, "object_r"))
+        goto out_free2;
+
+    /* set the type */
+    if (context_type_set(con, typename))
+        goto out_free2;
+
+    /* get a context string - note: context_str() returns a pointer
+     * to the string inside the context; the returned pointer should
+     * not be freed
+     */
+    new = context_str(con);
+    if (!new)
+        goto out_free2;
+
+    /* finally, check to see if it's valid */
+    if (security_check_context(new) == 0)
+        ret = TRUE;
+
+out_free2:
+    context_free(con);
+out_free:
+    freecon(base);
+out:
+    return ret;
+}
+
+static Bool
+XSELinuxParsePropertyTypeRule(char *p)
+{
+    int keyword;
+    char *propname = NULL, *propcopy = NULL;
+    char *typename = NULL, *typecopy = NULL;
+    char **newTypes;
+    Bool defaultPropertyType = FALSE;
+
+    /* get property name */
+    keyword = XSELinuxParseKeyword(&p);
+    if (keyword == XSELinuxKeywordDefault)
+    {
+        defaultPropertyType = TRUE;
+    }
+    else
+    {
+        propname = XSELinuxParseString(&p);
+        if (!propname || (strlen(propname) == 0))
+        {
+            return FALSE;
+        }
+    }
+
+    /* get the SELinux type corresponding to the property */
+    typename = XSELinuxParseString(&p);
+    if (!typename || (strlen(typename) == 0))
+        return FALSE;
+
+    /* validate the type */
+    if (XSELinuxTypeIsValid(typename) != TRUE)
+        return FALSE;
+
+    /* if it's the default property, save it to append to the end of the
+     * property types list
+     */
+    if (defaultPropertyType == TRUE)
+    {
+        if (XSELinuxPropertyTypeDefault != NULL)
+        {
+            return FALSE;
+        }
+        else
+        {
+            XSELinuxPropertyTypeDefault = (char *)xalloc(strlen(typename)+1);
+            if (!XSELinuxPropertyTypeDefault)
+            {
+                ErrorF("XSELinux: out of memory\n");
+                return FALSE;
+            }
+            strcpy(XSELinuxPropertyTypeDefault, typename);
+            return TRUE;
+        }
+    }
+
+    /* insert the property and type into the propertyTypes array */
+    propcopy = (char *)xalloc(strlen(propname)+1);
+    if (!propcopy)
+    {
+        ErrorF("XSELinux: out of memory\n");
+        return FALSE;
+    }
+    strcpy(propcopy, propname);
+
+    typecopy = (char *)xalloc(strlen(typename)+1);
+    if (!typecopy)
+    {
+        ErrorF("XSELinux: out of memory\n");
+        xfree(propcopy);
+        return FALSE;
+    }
+    strcpy(typecopy, typename);
+
+    newTypes = (char **)xrealloc(propertyTypes, sizeof (char *) * ((propertyTypesCount+1) * 2));
+    if (!newTypes)
+    {
+        ErrorF("XSELinux: out of memory\n");
+        xfree(propcopy);
+        xfree(typecopy);
+        return FALSE;
+    }
+
+    propertyTypesCount++;
+
+    newTypes[propertyTypesCount*2 - 2] = propcopy;
+    newTypes[propertyTypesCount*2 - 1] = typecopy;
+    
+    propertyTypes = newTypes;
+
+    return TRUE;
+} /* XSELinuxParsePropertyTypeRule */
+
+static Bool
+XSELinuxParseExtensionTypeRule(char *p)
+{
+    int keyword;
+    char *extname = NULL, *extcopy = NULL;
+    char *typename = NULL, *typecopy = NULL;
+    char **newTypes;
+    Bool defaultExtensionType = FALSE;
+
+    /* get extension name */
+    keyword = XSELinuxParseKeyword(&p);
+    if (keyword == XSELinuxKeywordDefault)
+    {
+        defaultExtensionType = TRUE;
+    }
+    else
+    {
+        extname = XSELinuxParseString(&p);
+        if (!extname || (strlen(extname) == 0))
+        {
+            return FALSE;
+        }
+    }
+
+    /* get the SELinux type corresponding to the extension */
+    typename = XSELinuxParseString(&p);
+    if (!typename || (strlen(typename) == 0))
+        return FALSE;
+
+    /* validate the type */
+    if (XSELinuxTypeIsValid(typename) != TRUE)
+        return FALSE;
+
+    /* if it's the default extension, save it to append to the end of the
+     * extension types list
+     */
+    if (defaultExtensionType == TRUE)
+    {
+        if (XSELinuxExtensionTypeDefault != NULL)
+        {
+            return FALSE;
+        }
+        else
+        {
+            XSELinuxExtensionTypeDefault = (char *)xalloc(strlen(typename)+1);
+            if (!XSELinuxExtensionTypeDefault)
+            {
+                ErrorF("XSELinux: out of memory\n");
+                return FALSE;
+            }
+            strcpy(XSELinuxExtensionTypeDefault, typename);
+            return TRUE;
+        }
+    }
+
+    /* insert the extension and type into the extensionTypes array */
+    extcopy = (char *)xalloc(strlen(extname)+1);
+    if (!extcopy)
+    {
+        ErrorF("XSELinux: out of memory\n");
+        return FALSE;
+    }
+    strcpy(extcopy, extname);
+
+    typecopy = (char *)xalloc(strlen(typename)+1);
+    if (!typecopy)
+    {
+        ErrorF("XSELinux: out of memory\n");
+        xfree(extcopy);
+        return FALSE;
+    }
+    strcpy(typecopy, typename);
+
+    newTypes = (char **)xrealloc(extensionTypes, sizeof(char *) *( (extensionTypesCount+1) * 2));
+    if (!newTypes)
+    {
+        ErrorF("XSELinux: out of memory\n");
+        xfree(extcopy);
+        xfree(typecopy);
+        return FALSE;
+    }
+
+    extensionTypesCount++;
+
+    newTypes[extensionTypesCount*2 - 2] = extcopy;
+    newTypes[extensionTypesCount*2 - 1] = typecopy;
+
+    extensionTypes = newTypes;
+
+    return TRUE;
+} /* XSELinuxParseExtensionTypeRule */
+
+static Bool
+XSELinuxParseNonlocalContext(char *p)
+{
+    char *context;
+
+    context = XSELinuxParseString(&p);
+    if (!context || (strlen(context) == 0))
+    {
+        return FALSE;
+    }
+
+    if (XSELinuxNonlocalContextDefault != NULL)
+    {
+        return FALSE;
+    }
+
+    /* validate the context */
+    if (security_check_context(context))
+    {
+        return FALSE;
+    }
+
+    XSELinuxNonlocalContextDefault = (char *)xalloc(strlen(context)+1);
+    if (!XSELinuxNonlocalContextDefault)
+    {
+        ErrorF("XSELinux: out of memory\n");
+        return FALSE;
+    }
+    strcpy(XSELinuxNonlocalContextDefault, context);
+
+    return TRUE;
+} /* XSELinuxParseNonlocalContext */
+
+static Bool
+XSELinuxParseRootWindowContext(char *p)
+{
+    char *context;
+
+    context = XSELinuxParseString(&p);
+    if (!context || (strlen(context) == 0))
+    {
+        return FALSE;
+    }
+
+    if (XSELinuxRootWindowContext != NULL)
+    {
+        return FALSE;
+    }
+
+    /* validate the context */
+    if (security_check_context(context))
+    {
+        return FALSE;
+    }
+
+    XSELinuxRootWindowContext = (char *)xalloc(strlen(context)+1);
+    if (!XSELinuxRootWindowContext)
+    {
+        ErrorF("XSELinux: out of memory\n");
+        return FALSE;
+    }
+    strcpy(XSELinuxRootWindowContext, context);
+
+    return TRUE;
+} /* XSELinuxParseRootWindowContext */
+
+static Bool
+XSELinuxLoadConfigFile(void)
+{
+    FILE *f;
+    int lineNumber = 0;
+    char **newTypes;
+    Bool ret = FALSE;
+    
+    if (!XSELINUXCONFIGFILE)
+        return FALSE;
+
+    /* some initial bookkeeping */
+    propertyTypesCount = extensionTypesCount = 0;
+    propertyTypes = extensionTypes = NULL;
+    XSELinuxPropertyTypeDefault = XSELinuxExtensionTypeDefault = NULL;
+    XSELinuxNonlocalContextDefault = NULL;
+    XSELinuxRootWindowContext = NULL;
+
+#ifndef __UNIXOS2__
+    f = fopen(XSELINUXCONFIGFILE, "r");
+#else
+    f = fopen((char*)__XOS2RedirRoot(XSELINUXCONFIGFILE), "r");
+#endif
+    if (!f)
+    {
+        ErrorF("Error opening XSELinux policy file %s\n", XSELINUXCONFIGFILE);
+        return FALSE;
+    }
+
+    while (!feof(f))
+    {
+        char buf[200];
+        Bool validLine;
+        char *p;
+
+        if (!(p = fgets(buf, sizeof(buf), f)))
+            break;
+        lineNumber++;
+
+        switch (XSELinuxParseKeyword(&p))
+        {
+            case XSELinuxKeywordComment:
+                validLine = TRUE;
+                break;
+
+            case XSELinuxKeywordProperty:
+                validLine = XSELinuxParsePropertyTypeRule(p);
+                break;
+
+            case XSELinuxKeywordExtension:
+                validLine = XSELinuxParseExtensionTypeRule(p);
+                break;
+
+            case XSELinuxKeywordNonlocalContext:
+                validLine = XSELinuxParseNonlocalContext(p);
+                break;
+
+            case XSELinuxKeywordRootWindowContext:
+                validLine = XSELinuxParseRootWindowContext(p);
+                break;
+
+            default:
+                validLine = (*p == '\0');
+                break;
+        }
+
+        if (!validLine)
+        {
+            ErrorF("XSELinux: Line %d of %s is invalid\n",
+                   lineNumber, XSELINUXCONFIGFILE);
+            goto out;
+        }
+    }
+
+    /* check to make sure the default types and the nonlocal context
+     * were specified
+     */
+    if (XSELinuxPropertyTypeDefault == NULL)
+    {
+        ErrorF("XSELinux: No default property type specified\n");
+        goto out;
+    }
+    else if (XSELinuxExtensionTypeDefault == NULL)
+    {
+        ErrorF("XSELinux: No default extension type specified\n");
+        goto out;
+    }
+    else if (XSELinuxNonlocalContextDefault == NULL)
+    {
+        ErrorF("XSELinux: No default context for non-local clients specified\n");
+        goto out;
+    }
+    else if (XSELinuxRootWindowContext == NULL)
+    {
+        ErrorF("XSELinux: No context specified for the root window\n");
+        goto out;
+    }
+
+    /* Finally, append the default property and extension types to the
+     * bottoms of the propertyTypes and extensionTypes arrays, respectively.
+     * The 'name' of the property / extension is NULL.
+     */
+    newTypes = (char **)xrealloc(propertyTypes, sizeof(char *) *((propertyTypesCount+1) * 2));
+    if (!newTypes)
+    {
+        ErrorF("XSELinux: out of memory\n");
+        goto out;
+    }
+    propertyTypesCount++;
+    newTypes[propertyTypesCount*2 - 2] = NULL;
+    newTypes[propertyTypesCount*2 - 1] = XSELinuxPropertyTypeDefault;
+    propertyTypes = newTypes;
+
+    newTypes = (char **)xrealloc(extensionTypes, sizeof(char *) *((extensionTypesCount+1) * 2));
+    if (!newTypes)
+    {
+        ErrorF("XSELinux: out of memory\n");
+        goto out;
+    }
+    extensionTypesCount++;
+    newTypes[extensionTypesCount*2 - 2] = NULL;
+    newTypes[extensionTypesCount*2 - 1] = XSELinuxExtensionTypeDefault;
+    extensionTypes = newTypes;
+
+    ret = TRUE;
+
+out:
+    fclose(f);
+    return ret;
+} /* XSELinuxLoadConfigFile */
+
+static void
+XSELinuxFreeConfigData(void)
+{
+    char **ptr;
+
+    /* Free all the memory in the table until we reach the NULL, then
+     * skip one past the NULL and free the default type.  Then take care
+     * of some bookkeeping.
+     */
+    for (ptr = propertyTypes; *ptr; ptr++)
+        xfree(*ptr);
+    ptr++;
+    xfree(*ptr);
+
+    XSELinuxPropertyTypeDefault = NULL;
+    propertyTypesCount = 0;
+
+    xfree(propertyTypes);
+    propertyTypes = NULL;
+
+    /* ... and the same for the extension type table */
+    for (ptr = extensionTypes; *ptr; ptr++)
+        xfree(*ptr);
+    ptr++;
+    xfree(*ptr);
+
+    XSELinuxExtensionTypeDefault = NULL;
+    extensionTypesCount = 0;
+
+    xfree(extensionTypes);
+    extensionTypes = NULL;
+
+    /* finally, take care of the context for non-local connections */
+    xfree(XSELinuxNonlocalContextDefault);
+    XSELinuxNonlocalContextDefault = NULL;
+
+    /* ... and for the root window */
+    xfree(XSELinuxRootWindowContext);
+    XSELinuxRootWindowContext = NULL;
+} /* XSELinuxFreeConfigData */
+
+/* Extension dispatch functions */
+static int
+ProcXSELinuxDispatch(ClientPtr client)
+{
+    return BadRequest;
+} /* ProcXSELinuxDispatch */
+
+static void
+XSELinuxResetProc(ExtensionEntry *extEntry)
+{
+    FreeClientState(serverClient);
+
+    XSELinuxFreeConfigData();
+
+    audit_close(audit_fd);
+
+    avc_destroy();
+} /* XSELinuxResetProc */
+
+static void
+XSELinuxAVCAudit(void *auditdata,
+		 security_class_t class,
+		 char *msgbuf,
+		 size_t msgbufsize)
+{
+    XSELinuxAuditRec *audit = (XSELinuxAuditRec*)auditdata;
+    ClientPtr client = audit->client;
+    char requestNum[8];
+    REQUEST(xReq);
+
+    if (stuff)
+	snprintf(requestNum, 8, "%d", stuff->reqType);
+
+    snprintf(msgbuf, msgbufsize, "%s%s%s%s%s%s",
+	     stuff ? "request=" : "",
+	     stuff ? requestNum : "",
+	     audit->property ? " property=" : "",
+	     audit->property ? audit->property : "",
+	     audit->extension ? " extension=" : "",
+	     audit->extension ? audit->extension : "");
+}
+
+static void
+XSELinuxAVCLog(const char *fmt, ...)
+{
+    va_list ap;
+    va_start(ap, fmt);
+    VErrorF(fmt, ap);
+    va_end(ap);
+}
+
+/* XSELinuxExtensionSetup
+ *
+ * Set up the XSELinux Extension (pre-init)
+ */
+void
+XSELinuxExtensionSetup(INITARGS)
+{
+    /* Allocate the client private index */
+    clientPrivateIndex = AllocateClientPrivateIndex();
+    if (!AllocateClientPrivate(clientPrivateIndex, 
+			       sizeof (XSELinuxClientStateRec)))
+	FatalError("XSELinux: Failed to allocate client private.\n");
+
+    /* Allocate the extension private index */
+    extnsnPrivateIndex = AllocateExtensionPrivateIndex();
+    if (!AllocateExtensionPrivate(extnsnPrivateIndex, 0))
+	FatalError("XSELinux: Failed to allocate extension private.\n");
+}
+
+/* XSELinuxExtensionInit
+ *
+ * Initialize the XSELinux Extension
+ */
+void
+XSELinuxExtensionInit(INITARGS)
+{
+    ExtensionEntry	*extEntry;
+    struct avc_log_callback alc = {XSELinuxAVCLog, XSELinuxAVCAudit};
+
+    if (!is_selinux_enabled())
+    {
+        ErrorF("SELinux Extension failed to load: SELinux not enabled\n");
+        return;
+    }
+
+    if (avc_init("xserver", NULL, &alc, NULL, NULL) < 0)
+    {
+	FatalError("couldn't initialize SELinux userspace AVC\n");
+    }
+
+    if (!AddCallback(&ClientStateCallback, XSELinuxClientState, NULL))
+	return;
+
+    /* Load the config file.  If this fails, shut down the server,
+     * since an unknown security status is worse than no security.
+     *
+     * Note that this must come before we assign a security state
+     * for the serverClient, because the serverClient's root windows
+     * are assigned a context based on data in the config file.
+     */
+    if (XSELinuxLoadConfigFile() != TRUE)
+    {
+	FatalError("XSELinux: Failed to load security policy\n");
+    }
+
+    /* prepare for auditing */
+    audit_fd = audit_open();
+    if (audit_fd < 0)
+    {
+        FatalError("XSELinux: Failed to open the system audit log\n");
+    }
+
+    /* register security callbacks */
+    XaceRegisterCallback(XACE_CORE_DISPATCH, XSELinuxCoreDispatch, NULL);
+    XaceRegisterCallback(XACE_EXT_ACCESS, XSELinuxExtDispatch, NULL);
+    XaceRegisterCallback(XACE_EXT_DISPATCH, XSELinuxExtDispatch, NULL);
+    XaceRegisterCallback(XACE_RESOURCE_ACCESS, XSELinuxResLookup, NULL);
+    XaceRegisterCallback(XACE_MAP_ACCESS, XSELinuxMap, NULL);
+    XaceRegisterCallback(XACE_HOSTLIST_ACCESS, XSELinuxHostlist, NULL);
+    XaceRegisterCallback(XACE_BACKGRND_ACCESS, XSELinuxBackgrnd, NULL);
+    XaceRegisterCallback(XACE_DRAWABLE_ACCESS, XSELinuxDrawable, NULL);
+    XaceRegisterCallback(XACE_PROPERTY_ACCESS, XSELinuxProperty, NULL);
+    /* XaceRegisterCallback(XACE_DECLARE_EXT_SECURE, XSELinuxDeclare, NULL);
+    XaceRegisterCallback(XACE_DEVICE_ACCESS, XSELinuxDevice, NULL); */
+
+    /* register extension with server */
+    extEntry = AddExtension(XSELINUX_EXTENSION_NAME,
+			    XSELinuxNumberEvents, XSELinuxNumberErrors,
+			    ProcXSELinuxDispatch, ProcXSELinuxDispatch,
+			    XSELinuxResetProc, StandardMinorOpcode);
+}
diff --git a/Xext/xselinux.h b/Xext/xselinux.h
new file mode 100644
index 000000000..eff6db5f4
--- /dev/null
+++ b/Xext/xselinux.h
@@ -0,0 +1,29 @@
+/************************************************************
+
+Author: Eamon Walsh <ewalsh@epoch.ncsc.mil>
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+this permission notice appear in supporting documentation.  This permission
+notice shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+********************************************************/
+
+#ifndef _XSELINUX_H
+#define _XSELINUX_H
+
+#define XSELINUX_EXTENSION_NAME		"SELinux"
+#define XSELINUX_MAJOR_VERSION		1
+#define XSELINUX_MINOR_VERSION		0
+#define XSELinuxNumberEvents		0
+#define XSELinuxNumberErrors		0
+
+#endif /* _XSELINUX_H */

From 28e80cd65b1207b123c02f895851bb6d207aa3c1 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 8 Sep 2006 15:15:19 -0400
Subject: [PATCH 010/552] Add SELinux extension configure-time support.

---
 configure.ac            | 16 +++++++++++++++-
 include/dix-config.h.in |  3 +++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 002be624c..7e931ced2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -442,6 +442,7 @@ AC_ARG_ENABLE(xinerama,	      AS_HELP_STRING([--disable-xinerama], [Build Xinera
 AC_ARG_ENABLE(xf86vidmode,    AS_HELP_STRING([--disable-xf86vidmode], [Build XF86VidMode extension (default: auto)]), [XF86VIDMODE=$enableval], [XF86VIDMODE=auto])
 AC_ARG_ENABLE(xf86misc,       AS_HELP_STRING([--disable-xf86misc], [Build XF86Misc extension (default: auto)]), [XF86MISC=$enableval], [XF86MISC=auto])
 AC_ARG_ENABLE(xace,     AS_HELP_STRING([--disable-xace], [Build X-ACE extension (default: enabled)]), [XACE=$enableval], [XACE=yes])
+AC_ARG_ENABLE(xselinux,     AS_HELP_STRING([--disable-xselinux], [Build SELinux extension (default: enabled)]), [XSELINUX=$enableval], [XSELINUX=$XACE])
 AC_ARG_ENABLE(xcsecurity,     AS_HELP_STRING([--disable-xcsecurity], [Build Security extension (default: enabled)]), [XCSECURITY=$enableval], [XCSECURITY=$XACE])
 AC_ARG_ENABLE(appgroup,       AS_HELP_STRING([--disable-appgroup], [Build XC-APPGROUP extension (default: enabled)]), [APPGROUP=$enableval], [APPGROUP=$XCSECURITY])
 AC_ARG_ENABLE(xcalibrate,     AS_HELP_STRING([--enable-xcalibrate], [Build XCalibrate extension (default: disabled)]), [XCALIBRATE=$enableval], [XCALIBRATE=no])
@@ -676,6 +677,19 @@ if test "x$XACE" = xyes; then
 	AC_DEFINE(XACE, 1, [Build X-ACE extension])
 fi
 
+AM_CONDITIONAL(XSELINUX, [test "x$XSELINUX" = xyes])
+if test "x$XSELINUX" = xyes; then
+	if test "x$XACE" != xyes; then
+		AC_MSG_ERROR([cannot build SELinux extension without X-ACE])
+	fi
+	AC_CHECK_HEADERS([selinux/selinux.h selinux/avc.h], [], AC_MSG_ERROR([SELinux include files not found]))
+	AC_CHECK_LIB(selinux, avc_init, [], AC_MSG_ERROR([SELinux library not found])) 
+	AC_CHECK_HEADERS([libaudit.h], [], AC_MSG_ERROR([SELinux extension requires audit system headers]))
+	AC_CHECK_LIB(audit, audit_log_avc, [], AC_MSG_ERROR([SELinux extension requires audit system library]))
+	AC_DEFINE(XSELINUX, 1, [Build SELinux extension])
+	SELINUX_LIB="-lselinux -laudit"
+fi
+
 AM_CONDITIONAL(XCSECURITY, [test "x$XCSECURITY" = xyes])
 if test "x$XCSECURITY" = xyes; then
 	if test "x$XACE" != xyes; then
@@ -1162,7 +1176,7 @@ if test "x$XORG" = xyes -o "x$XGL" = xyes; then
 	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
 	XORG_INCS="$XORG_DDXINCS $XORG_OSINCS"
 	XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H"
-	XORG_LIBS="$COMPOSITE_LIB $MI_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XPSTUBS_LIB $OS_LIB"
+	XORG_LIBS="$COMPOSITE_LIB $MI_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XPSTUBS_LIB $SELINUX_LIB $OS_LIB"
 
 	if test "x$DGA" = xauto; then
 		PKG_CHECK_MODULES(DGA, xf86dgaproto, [DGA=yes], [DGA=no])
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index 7aabae2ec..4a0b12800 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -317,6 +317,9 @@
 /* Build X-ACE extension */
 #undef XACE
 
+/* Build SELinux extension */
+#undef XSELINUX
+
 /* Support XCMisc extension */
 #undef XCMISC
 

From a7f4bbea87ada1d699bfd9e3b6a98f06191650f6 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 8 Sep 2006 15:17:01 -0400
Subject: [PATCH 011/552] Add SELinux extension to the module/extension loader.

---
 hw/xfree86/dixmods/extmod/modinit.h |  5 +++++
 mi/miinitext.c                      | 16 ++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h
index 41f060b2a..131b9e6e6 100644
--- a/hw/xfree86/dixmods/extmod/modinit.h
+++ b/hw/xfree86/dixmods/extmod/modinit.h
@@ -129,6 +129,11 @@ extern void ShmRegisterFuncs(
 extern void XaceExtensionInit(INITARGS);
 #endif
 
+#ifdef XSELINUX
+extern void XSELinuxExtensionSetup(INITARGS);
+extern void XSELinuxExtensionInit(INITARGS);
+#endif
+
 #if 1
 extern void SecurityExtensionSetup(INITARGS);
 extern void SecurityExtensionInit(INITARGS);
diff --git a/mi/miinitext.c b/mi/miinitext.c
index cb3447372..e270bc60a 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -248,6 +248,9 @@ typedef void (*InitExtension)(INITARGS);
 #include "securitysrv.h"
 #include <X11/extensions/securstr.h>
 #endif
+#ifdef XSELINUX
+#include "xselinux.h"
+#endif
 #ifdef PANORAMIX
 #include <X11/extensions/panoramiXproto.h>
 #endif
@@ -321,6 +324,10 @@ extern void XaceExtensionInit(INITARGS);
 extern void SecurityExtensionSetup(INITARGS);
 extern void SecurityExtensionInit(INITARGS);
 #endif
+#ifdef XSELINUX
+extern void XSELinuxExtensionSetup(INITARGS);
+extern void XSELinuxExtensionInit(INITARGS);
+#endif
 #ifdef XPRINT
 extern void XpExtensionInit(INITARGS);
 #endif
@@ -532,6 +539,9 @@ InitExtensions(argc, argv)
 #ifdef XCSECURITY
     SecurityExtensionSetup();
 #endif
+#ifdef XSELINUX
+    XSELinuxExtensionSetup();
+#endif
 #ifdef PANORAMIX
 # if !defined(PRINT_ONLY_SERVER) && !defined(NO_PANORAMIX)
   if (!noPanoramiXExtension) PanoramiXExtensionInit();
@@ -600,6 +610,9 @@ InitExtensions(argc, argv)
 #ifdef XCSECURITY
     if (!noSecurityExtension) SecurityExtensionInit();
 #endif
+#ifdef XSELINUX
+    XSELinuxExtensionInit();
+#endif
 #ifdef XPRINT
     XpExtensionInit(); /* server-specific extension, cannot be disabled */
 #endif
@@ -705,6 +718,9 @@ static ExtensionModule staticExtensions[] = {
 #ifdef XCSECURITY
     { SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension, SecurityExtensionSetup, NULL },
 #endif
+#ifdef XSELINUX
+    { XSELinuxExtensionInit, XSELINUX_EXTENSION_NAME, NULL, XSELinuxExtensionSetup, NULL },
+#endif
 #ifdef XPRINT
     { XpExtensionInit, XP_PRINTNAME, NULL, NULL, NULL },
 #endif

From 7f16c38ae2b47b195609d8fedefb7b28f612b2d4 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 8 Sep 2006 15:31:18 -0400
Subject: [PATCH 012/552] Add SELinux extension configure-time support.

---
 Xext/Makefile.am | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Xext/Makefile.am b/Xext/Makefile.am
index 6ea3d7445..be04c849a 100644
--- a/Xext/Makefile.am
+++ b/Xext/Makefile.am
@@ -76,6 +76,16 @@ if XACE
 BUILTIN_SRCS += $(XACE_SRCS)
 endif
 
+# SELinux extension: provides SELinux policy support for X objects
+# requires X-ACE extension
+XSELINUX_SRCS = xselinux.c xselinux.h
+if XSELINUX
+BUILTIN_SRCS += $(XSELINUX_SRCS)
+
+SERVERCONFIG_DATA += XSELinuxConfig
+AM_CFLAGS += -DXSELINUXCONFIGFILE=\"$(SERVERCONFIGdir)/XSELinuxConfig\"
+endif
+
 # Security extension: multi-level security to protect clients from each other
 XCSECURITY_SRCS = security.c securitysrv.h
 if XCSECURITY   

From 3714d9149928754afcd6b2466a1371ca32e17985 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 4 Oct 2006 16:23:35 -0400
Subject: [PATCH 013/552] Experimental window property holding security
 context.

---
 Xext/xselinux.c | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 5a6d2ef00..df19e5df0 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -35,6 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #endif
 
 #include <X11/X.h>
+#include <X11/Xatom.h>
 #include <X11/Xproto.h>
 #include <X11/Xfuncproto.h>
 #include "dixstruct.h"
@@ -120,6 +121,10 @@ static char **extensionTypes = NULL;
 static int extensionTypesCount = 0;
 static char *XSELinuxExtensionTypeDefault = NULL;
 
+/* Atoms for SELinux window labeling properties */
+Atom atom_ctx;
+Atom atom_client_ctx;
+
 /* security context for non-local clients */
 static char *XSELinuxNonlocalContextDefault = NULL;
 
@@ -1196,6 +1201,28 @@ CALLBACK(XSELinuxClientState)
     }
 } /* XSELinuxClientState */
 
+/* Labeling callbacks */
+CALLBACK(XSELinuxWindowInit)
+{
+    XaceWindowRec *rec = (XaceWindowRec*)calldata;
+    security_context_t ctx;
+    int rc;
+
+    if (HAVESTATE(rec->client)) {
+	rc = avc_sid_to_context(SID(rec->client), &ctx);
+	if (rc < 0)
+	    FatalError("Failed to get security context!\n");
+	rc = ChangeWindowProperty(rec->pWin, atom_client_ctx, XA_STRING, 8,
+				  PropModeReplace, strlen(ctx), ctx, FALSE);
+	freecon(ctx);
+    } 
+    else
+	rc = ChangeWindowProperty(rec->pWin, atom_client_ctx, XA_STRING, 8,
+				  PropModeReplace, 10, "UNLABELED!", FALSE);
+    if (rc != Success)
+	FatalError("Failed to set context property on window!\n");
+} /* XSELinuxWindowInit */
+
 static char *XSELinuxKeywords[] = {
 #define XSELinuxKeywordComment 0
     "#",
@@ -1844,6 +1871,14 @@ XSELinuxExtensionInit(INITARGS)
     if (!AddCallback(&ClientStateCallback, XSELinuxClientState, NULL))
 	return;
 
+    /* Create atoms for doing window labeling */
+    atom_ctx = MakeAtom("_SELINUX_CONTEXT", 16, 1);
+    if (atom_ctx == BAD_RESOURCE)
+	return;
+    atom_client_ctx = MakeAtom("_SELINUX_CLIENT_CONTEXT", 23, 1);
+    if (atom_client_ctx == BAD_RESOURCE)
+	return;
+
     /* Load the config file.  If this fails, shut down the server,
      * since an unknown security status is worse than no security.
      *
@@ -1873,6 +1908,7 @@ XSELinuxExtensionInit(INITARGS)
     XaceRegisterCallback(XACE_BACKGRND_ACCESS, XSELinuxBackgrnd, NULL);
     XaceRegisterCallback(XACE_DRAWABLE_ACCESS, XSELinuxDrawable, NULL);
     XaceRegisterCallback(XACE_PROPERTY_ACCESS, XSELinuxProperty, NULL);
+    XaceRegisterCallback(XACE_WINDOW_INIT, XSELinuxWindowInit, NULL);
     /* XaceRegisterCallback(XACE_DECLARE_EXT_SECURE, XSELinuxDeclare, NULL);
     XaceRegisterCallback(XACE_DEVICE_ACCESS, XSELinuxDevice, NULL); */
 

From 354c80da66af141e8ba6d75fed75a0f482987956 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 5 Oct 2006 16:07:26 -0400
Subject: [PATCH 014/552] Improve error handling, messages during
 initialization.

---
 Xext/xselinux.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index df19e5df0..2f960d1a9 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -1211,7 +1211,7 @@ CALLBACK(XSELinuxWindowInit)
     if (HAVESTATE(rec->client)) {
 	rc = avc_sid_to_context(SID(rec->client), &ctx);
 	if (rc < 0)
-	    FatalError("Failed to get security context!\n");
+	    FatalError("XSELinux: Failed to get security context!\n");
 	rc = ChangeWindowProperty(rec->pWin, atom_client_ctx, XA_STRING, 8,
 				  PropModeReplace, strlen(ctx), ctx, FALSE);
 	freecon(ctx);
@@ -1220,7 +1220,7 @@ CALLBACK(XSELinuxWindowInit)
 	rc = ChangeWindowProperty(rec->pWin, atom_client_ctx, XA_STRING, 8,
 				  PropModeReplace, 10, "UNLABELED!", FALSE);
     if (rc != Success)
-	FatalError("Failed to set context property on window!\n");
+	FatalError("XSELinux: Failed to set context property on window!\n");
 } /* XSELinuxWindowInit */
 
 static char *XSELinuxKeywords[] = {
@@ -1859,13 +1859,13 @@ XSELinuxExtensionInit(INITARGS)
 
     if (!is_selinux_enabled())
     {
-        ErrorF("SELinux Extension failed to load: SELinux not enabled\n");
+        ErrorF("XSELinux: Extension failed to load: SELinux not enabled\n");
         return;
     }
 
     if (avc_init("xserver", NULL, &alc, NULL, NULL) < 0)
     {
-	FatalError("couldn't initialize SELinux userspace AVC\n");
+	FatalError("XSELinux: Couldn't initialize SELinux userspace AVC\n");
     }
 
     if (!AddCallback(&ClientStateCallback, XSELinuxClientState, NULL))
@@ -1874,10 +1874,10 @@ XSELinuxExtensionInit(INITARGS)
     /* Create atoms for doing window labeling */
     atom_ctx = MakeAtom("_SELINUX_CONTEXT", 16, 1);
     if (atom_ctx == BAD_RESOURCE)
-	return;
+	FatalError("XSELinux: Failed to create atom\n");
     atom_client_ctx = MakeAtom("_SELINUX_CLIENT_CONTEXT", 23, 1);
     if (atom_client_ctx == BAD_RESOURCE)
-	return;
+	FatalError("XSELinux: Failed to create atom\n");
 
     /* Load the config file.  If this fails, shut down the server,
      * since an unknown security status is worse than no security.

From 5719afe6d3a246985709e6f045617c1e16a7da51 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 26 Oct 2006 20:20:57 -0400
Subject: [PATCH 015/552] Change symbol in libaudit library test.

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 7e931ced2..730646376 100644
--- a/configure.ac
+++ b/configure.ac
@@ -685,7 +685,7 @@ if test "x$XSELINUX" = xyes; then
 	AC_CHECK_HEADERS([selinux/selinux.h selinux/avc.h], [], AC_MSG_ERROR([SELinux include files not found]))
 	AC_CHECK_LIB(selinux, avc_init, [], AC_MSG_ERROR([SELinux library not found])) 
 	AC_CHECK_HEADERS([libaudit.h], [], AC_MSG_ERROR([SELinux extension requires audit system headers]))
-	AC_CHECK_LIB(audit, audit_log_avc, [], AC_MSG_ERROR([SELinux extension requires audit system library]))
+	AC_CHECK_LIB(audit, audit_open, [], AC_MSG_ERROR([SELinux extension requires audit system library]))
 	AC_DEFINE(XSELINUX, 1, [Build SELinux extension])
 	SELINUX_LIB="-lselinux -laudit"
 fi

From a60da1db7cced28c07960a713eb18deb45beb432 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 29 Nov 2006 22:19:57 -0500
Subject: [PATCH 016/552] Add required root window context to config file.

---
 Xext/XSELinuxConfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Xext/XSELinuxConfig b/Xext/XSELinuxConfig
index faf815e27..9c953f55f 100644
--- a/Xext/XSELinuxConfig
+++ b/Xext/XSELinuxConfig
@@ -9,6 +9,7 @@
 # security policy.  Only one nonlocal_context rule may be defined.
 #
 nonlocal_context			system_u:object_r:remote_xclient_t:s1
+root_window_context			system_u:object_r:root_window_t:s1
 
 #
 # Property rules map a property name to a SELinux type.  The type must

From ca77c121075a9de1f47d42f6aaf91c20185231de Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 12 Dec 2006 13:26:52 -0500
Subject: [PATCH 017/552] Naming change: Security*Operation -> Xace*Operation

---
 Xext/xselinux.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 2f960d1a9..8d710f672 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -1090,7 +1090,7 @@ CALLBACK(XSELinuxProperty)
 	{
 	    if (errno != EACCES)
 		ErrorF("Property: unexpected error %d\n", errno);
-	    rec->rval = SecurityIgnoreOperation;
+	    rec->rval = XaceIgnoreOperation;
 	}
     } else
 	ErrorF("No client state in property callback!\n");

From e124806994675e16ca8e3937388f2cadeb529fc3 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 12 Dec 2006 13:35:22 -0500
Subject: [PATCH 018/552] Remove trailing whitespace (whitespace police).

---
 Xext/xselinux.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 8d710f672..1c2b508b5 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -135,8 +135,8 @@ static char *XSELinuxRootWindowContext = NULL;
 extern Selection *CurrentSelections;
 extern int NumCurrentSelections;
 
-/* 
- * list of classes corresponding to SIDs in the 
+/*
+ * list of classes corresponding to SIDs in the
  * rsid array of the security state structure (below).
  *
  * XXX SIDs should be stored in their native objects, not all
@@ -193,7 +193,7 @@ IndexByClass(security_class_t class)
 }
 
 /*
- * Does sanity checking on a resource ID.  This can be removed after 
+ * Does sanity checking on a resource ID.  This can be removed after
  * testing.
  */
 static void
@@ -351,7 +351,7 @@ ObjectSIDByLabel(security_context_t basecontext, security_class_t class,
     con = context_new(base);
     if (!con)
 	goto out2;
-    
+
     /* look in the mappings of names to types */
     ptr = (class == SECCLASS_PROPERTY) ? propertyTypes : extensionTypes;
     for (; *ptr; ptr+=2)
@@ -564,14 +564,14 @@ CheckSendEventPerms(ClientPtr client)
 	swapl(&stuff->destination, n);
     return IDPerm(client, stuff->destination, SECCLASS_WINDOW, perm);
 }
-     
+
 static int
 CheckConvertSelectionPerms(ClientPtr client)
 {
     register char n;
     int rval = TRUE;
     REQUEST(xConvertSelectionReq);
-    
+
     if (!REQUEST_SIZE_CHECK(client, xConvertSelectionReq))
 	return FALSE;
 
@@ -620,11 +620,11 @@ CheckSetSelectionOwnerPerms(ClientPtr client)
 	    rval = rval && IDPerm(client, CurrentSelections[i].window,
 				  SECCLASS_WINDOW, WINDOW__CHSELECTION);
     }
-    rval = rval && IDPerm(client, stuff->window, 
+    rval = rval && IDPerm(client, stuff->window,
 			  SECCLASS_WINDOW, WINDOW__CHSELECTION);
     return rval;
 }
-    
+
 CALLBACK(XSELinuxCoreDispatch)
 {
     XaceCoreDispatchRec *rec = (XaceCoreDispatchRec*)calldata;
@@ -678,7 +678,7 @@ CALLBACK(XSELinuxCoreDispatch)
     /* Window class control requirements */
     case X_ChangeProperty:
 	rval = IDPERM(client, xChangePropertyReq, window,
-		      SECCLASS_WINDOW, 
+		      SECCLASS_WINDOW,
 		      WINDOW__CHPROPLIST | WINDOW__CHPROP |
 		      WINDOW__LISTPROP);
 	break;
@@ -914,7 +914,7 @@ CALLBACK(XSELinuxCoreDispatch)
 	    && IDPERM(client, xPolyTextReq, drawable,
 		      SECCLASS_DRAWABLE, DRAWABLE__DRAW);
 	break;
-	
+
     /* Pixmap class control requirements */
     case X_CreatePixmap:
 	rval = IDPERM(client, xCreatePixmapReq, pid,
@@ -950,7 +950,7 @@ CALLBACK(XSELinuxCoreDispatch)
 	rval = IDPERM(client, xResourceReq, id,
 		      SECCLASS_CURSOR, CURSOR__FREE);
 	break;
-	    
+
     /* GC class control requirements */
     case X_CreateGC:
 	rval = IDPERM(client, xCreateGCReq, gc,
@@ -1018,7 +1018,7 @@ CALLBACK(XSELinuxExtDispatch)
     security_id_t extsid;
     access_vector_t perm;
     REQUEST(xReq);
-    
+
     /* XXX there should be a separate callback for this */
     if (!EXTENSIONSID(ext))
     {
@@ -1215,7 +1215,7 @@ CALLBACK(XSELinuxWindowInit)
 	rc = ChangeWindowProperty(rec->pWin, atom_client_ctx, XA_STRING, 8,
 				  PropModeReplace, strlen(ctx), ctx, FALSE);
 	freecon(ctx);
-    } 
+    }
     else
 	rc = ChangeWindowProperty(rec->pWin, atom_client_ctx, XA_STRING, 8,
 				  PropModeReplace, 10, "UNLABELED!", FALSE);
@@ -1441,7 +1441,7 @@ XSELinuxParsePropertyTypeRule(char *p)
 
     newTypes[propertyTypesCount*2 - 2] = propcopy;
     newTypes[propertyTypesCount*2 - 1] = typecopy;
-    
+
     propertyTypes = newTypes;
 
     return TRUE;
@@ -1612,7 +1612,7 @@ XSELinuxLoadConfigFile(void)
     int lineNumber = 0;
     char **newTypes;
     Bool ret = FALSE;
-    
+
     if (!XSELINUXCONFIGFILE)
         return FALSE;
 
@@ -1837,7 +1837,7 @@ XSELinuxExtensionSetup(INITARGS)
 {
     /* Allocate the client private index */
     clientPrivateIndex = AllocateClientPrivateIndex();
-    if (!AllocateClientPrivate(clientPrivateIndex, 
+    if (!AllocateClientPrivate(clientPrivateIndex,
 			       sizeof (XSELinuxClientStateRec)))
 	FatalError("XSELinux: Failed to allocate client private.\n");
 

From 568c09481e5d62091d032837171a36f409f39379 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@moss-huskies.epoch.ncsc.mil>
Date: Tue, 12 Dec 2006 15:59:08 -0500
Subject: [PATCH 019/552] Split AssignClientState() into two routines, new
 routine is server-specific.

---
 Xext/xselinux.c | 110 ++++++++++++++++++++++++++----------------------
 1 file changed, 59 insertions(+), 51 deletions(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 1c2b508b5..0de209d3d 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -381,6 +381,48 @@ ObjectSIDByLabel(security_context_t basecontext, security_class_t class,
     return sid;
 }
 
+/*
+ * AssignServerState - set up server security state.
+ *
+ * Arguments:
+ */
+static void
+AssignServerState(void)
+{
+    int i;
+    security_context_t basectx, objctx;
+    XSELinuxClientStateRec *state;
+
+    state = (XSELinuxClientStateRec*)STATEPTR(serverClient);
+    avc_entry_ref_init(&state->aeref);
+
+    /* use the context of the X server process for the serverClient */
+    if (getcon(&basectx) < 0)
+	FatalError("Couldn't get context of X server process\n");
+
+    /* get a SID from the context */
+    if (avc_context_to_sid(basectx, &state->sid) < 0)
+	FatalError("Client %d: couldn't get security ID for client\n", 0);
+
+    /* get contexts and then SIDs for each resource type */
+    for (i=0; i<NRES; i++) {
+	if (security_compute_create(basectx, basectx, sClasses[i],
+				    &objctx) < 0)
+	    FatalError("Client %d: couldn't get context for class %x\n", 0,
+		       sClasses[i]);
+
+	if (avc_context_to_sid(objctx, &state->rsid[i]) < 0)
+	    FatalError("Client %d: couldn't get SID for class %x\n", 0,
+		       sClasses[i]);
+
+	freecon(objctx);
+    }
+
+    /* mark as set up, free base context, and return */
+    state->haveState = TRUE;
+    freecon(basectx);
+}
+
 /*
  * AssignClientState - set up client security state.
  *
@@ -392,75 +434,41 @@ AssignClientState(ClientPtr client)
 {
     int i, needToFree = 0;
     security_context_t basectx, objctx;
-    XSELinuxClientStateRec *state = (XSELinuxClientStateRec*)STATEPTR(client);
-    Bool isServerClient = FALSE;
+    XSELinuxClientStateRec *state;
 
+    state = (XSELinuxClientStateRec*)STATEPTR(client);
     avc_entry_ref_init(&state->aeref);
 
-    if (client->index > 0)
-    {
-	XtransConnInfo ci = ((OsCommPtr)client->osPrivate)->trans_conn;
-	if (_XSERVTransIsLocal(ci)) {
-	    /* for local clients, can get context from the socket */
-	    int fd = _XSERVTransGetConnectionNumber(ci);
-	    if (getpeercon(fd, &basectx) < 0)
-	    {
-		FatalError("Client %d: couldn't get context from socket\n",
-			   client->index);
-	    }
-	    needToFree = 1;
-	}
-        else
-        {
-	    /* for remote clients, need to use a default context */
-	    basectx = XSELinuxNonlocalContextDefault;
-	}
-    }
-    else
-    {
-        isServerClient = TRUE;
-
-	/* use the context of the X server process for the serverClient */
-	if (getcon(&basectx) < 0)
-	{
-	    FatalError("Couldn't get context of X server process\n");
-	}
+    XtransConnInfo ci = ((OsCommPtr)client->osPrivate)->trans_conn;
+    if (_XSERVTransIsLocal(ci)) {
+	/* for local clients, can get context from the socket */
+	int fd = _XSERVTransGetConnectionNumber(ci);
+	if (getpeercon(fd, &basectx) < 0)
+	    FatalError("Client %d: couldn't get context from socket\n",
+		       client->index);
 	needToFree = 1;
     }
+    else
+	/* for remote clients, need to use a default context */
+	basectx = XSELinuxNonlocalContextDefault;
 
     /* get a SID from the context */
     if (avc_context_to_sid(basectx, &state->sid) < 0)
-    {
 	FatalError("Client %d: couldn't get security ID for client\n",
 		   client->index);
-    }
 
     /* get contexts and then SIDs for each resource type */
-    for (i=0; i<NRES; i++)
-    {
+    for (i=0; i<NRES; i++) {
 	if (security_compute_create(basectx, basectx, sClasses[i],
 				    &objctx) < 0)
-	{
 	    FatalError("Client %d: couldn't get context for class %x\n",
 		       client->index, sClasses[i]);
-	}
-	else if (avc_context_to_sid(objctx, &state->rsid[i]) < 0)
-	{
+
+	if (avc_context_to_sid(objctx, &state->rsid[i]) < 0)
 	    FatalError("Client %d: couldn't get SID for class %x\n",
 		       client->index, sClasses[i]);
-	}
-	freecon(objctx);
-    }
 
-    /* special handling for serverClient windows (that is, root windows) */
-    if (isServerClient == TRUE)
-    {
-        i = IndexByClass(SECCLASS_WINDOW);
-        sidput(state->rsid[i]);
-        if (avc_context_to_sid(XSELinuxRootWindowContext, &state->rsid[i]))
-        {
-            FatalError("Failed to set SID for root window\n");
-        }
+	freecon(objctx);
     }
 
     /* mark as set up, free base context if necessary, and return */
@@ -1183,7 +1191,7 @@ CALLBACK(XSELinuxClientState)
     switch(client->clientState)
     {
     case ClientStateInitial:
-	AssignClientState(serverClient);
+	AssignServerState();
 	break;
 
 	case ClientStateRunning:

From 7b90944258eba66b61328480759833ad7589bcca Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@moss-huskies.epoch.ncsc.mil>
Date: Tue, 12 Dec 2006 15:59:38 -0500
Subject: [PATCH 020/552] Change MLS levels in config file contexts to more
 sane defaults.

---
 Xext/XSELinuxConfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Xext/XSELinuxConfig b/Xext/XSELinuxConfig
index 9c953f55f..65f401508 100644
--- a/Xext/XSELinuxConfig
+++ b/Xext/XSELinuxConfig
@@ -8,8 +8,8 @@
 # be defined, and it must be a valid context according to the SELinux
 # security policy.  Only one nonlocal_context rule may be defined.
 #
-nonlocal_context			system_u:object_r:remote_xclient_t:s1
-root_window_context			system_u:object_r:root_window_t:s1
+nonlocal_context			system_u:object_r:remote_xclient_t:s0
+root_window_context			system_u:object_r:root_window_t:s0
 
 #
 # Property rules map a property name to a SELinux type.  The type must

From fb6d676de5aa606d943715437a12a68d9a41f386 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@moss-huskies.epoch.ncsc.mil>
Date: Tue, 12 Dec 2006 16:17:51 -0500
Subject: [PATCH 021/552] Add xserver object class to list of object classes.

---
 Xext/xselinux.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 0de209d3d..41d01e4c6 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -152,7 +152,8 @@ static security_class_t sClasses[] = {
     SECCLASS_COLORMAP,
     SECCLASS_PROPERTY,
     SECCLASS_XCLIENT,
-    SECCLASS_XINPUT
+    SECCLASS_XINPUT,
+    SECCLASS_XSERVER
 };
 #define NRES (sizeof(sClasses)/sizeof(sClasses[0]))
 

From cd71e861830081807e5b93ae89c73c17986c6330 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 20 Dec 2006 13:45:24 -0500
Subject: [PATCH 022/552] Naming change: Security*Access -> Dix*Access. Clarify
 some error message strings.

---
 Xext/xselinux.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 41d01e4c6..9b5ee1000 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -403,18 +403,18 @@ AssignServerState(void)
 
     /* get a SID from the context */
     if (avc_context_to_sid(basectx, &state->sid) < 0)
-	FatalError("Client %d: couldn't get security ID for client\n", 0);
+	FatalError("Client %d: context_to_sid(%s) failed\n", 0, basectx);
 
     /* get contexts and then SIDs for each resource type */
     for (i=0; i<NRES; i++) {
 	if (security_compute_create(basectx, basectx, sClasses[i],
 				    &objctx) < 0)
-	    FatalError("Client %d: couldn't get context for class %x\n", 0,
-		       sClasses[i]);
+	    FatalError("Client %d: compute_create(base=%s, cls=%d) failed\n",
+		       0, basectx, sClasses[i]);
 
 	if (avc_context_to_sid(objctx, &state->rsid[i]) < 0)
-	    FatalError("Client %d: couldn't get SID for class %x\n", 0,
-		       sClasses[i]);
+	    FatalError("Client %d: context_to_sid(%s) failed\n",
+		       0, objctx);
 
 	freecon(objctx);
     }
@@ -455,19 +455,19 @@ AssignClientState(ClientPtr client)
 
     /* get a SID from the context */
     if (avc_context_to_sid(basectx, &state->sid) < 0)
-	FatalError("Client %d: couldn't get security ID for client\n",
-		   client->index);
+	FatalError("Client %d: context_to_sid(%s) failed\n",
+		   client->index, basectx);
 
     /* get contexts and then SIDs for each resource type */
     for (i=0; i<NRES; i++) {
 	if (security_compute_create(basectx, basectx, sClasses[i],
 				    &objctx) < 0)
-	    FatalError("Client %d: couldn't get context for class %x\n",
-		       client->index, sClasses[i]);
+	    FatalError("Client %d: compute_create(base=%s, cls=%d) failed\n",
+		       client->index, basectx, sClasses[i]);
 
 	if (avc_context_to_sid(objctx, &state->rsid[i]) < 0)
-	    FatalError("Client %d: couldn't get SID for class %x\n",
-		       client->index, sClasses[i]);
+	    FatalError("Client %d: context_to_sid(%s) failed\n",
+		       client->index, objctx);
 
 	freecon(objctx);
     }
@@ -1078,11 +1078,11 @@ CALLBACK(XSELinuxProperty)
     if (!propsid)
 	return;
 
-    if (rec->access_mode & SecurityReadAccess)
+    if (rec->access_mode & DixReadAccess)
 	perm |= PROPERTY__READ;
-    if (rec->access_mode & SecurityWriteAccess)
+    if (rec->access_mode & DixWriteAccess)
 	perm |= PROPERTY__WRITE;
-    if (rec->access_mode & SecurityDestroyAccess)
+    if (rec->access_mode & DixDestroyAccess)
 	perm |= PROPERTY__FREE;
     if (!rec->access_mode)
 	perm = PROPERTY__READ | PROPERTY__WRITE | PROPERTY__FREE;
@@ -1176,7 +1176,7 @@ CALLBACK(XSELinuxDrawable)
 CALLBACK(XSELinuxHostlist)
 {
     XaceHostlistAccessRec *rec = (XaceHostlistAccessRec*)calldata;
-    access_vector_t perm = (rec->access_mode == SecurityReadAccess) ?
+    access_vector_t perm = (rec->access_mode == DixReadAccess) ?
 	XSERVER__GETHOSTLIST : XSERVER__SETHOSTLIST;
 
     if (!ServerPerm(rec->client, SECCLASS_XSERVER, perm))

From 4b1c9ac3d13767e395b47e76b37f9f3a569e7be1 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 22 Dec 2006 13:04:50 -0500
Subject: [PATCH 023/552] Policy updates.

---
 Xext/XSELinuxConfig | 113 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 86 insertions(+), 27 deletions(-)

diff --git a/Xext/XSELinuxConfig b/Xext/XSELinuxConfig
index 65f401508..1c5016e5f 100644
--- a/Xext/XSELinuxConfig
+++ b/Xext/XSELinuxConfig
@@ -19,13 +19,47 @@ root_window_context			system_u:object_r:root_window_t:s0
 # property type may not be omitted.  The default rule may appear in
 # any position (it need not be the last property rule listed).
 #
-property WM_NAME			wm_property_t
-property WM_CLASS			wm_property_t
-property WM_ICON_NAME			wm_property_t
-property WM_HINTS			wm_property_t
-property WM_NORMAL_HINTS		wm_property_t
-property WM_COMMAND			wm_property_t
+# Properties set by typical clients: WM, _NET_WM, etc.
+property WM_NAME			client_property_t
+property WM_CLASS			client_property_t
+property WM_ICON_NAME			client_property_t
+property WM_HINTS			client_property_t
+property WM_NORMAL_HINTS		client_property_t
+property WM_COMMAND			client_property_t
+property WM_CLIENT_MACHINE		client_property_t
+property WM_LOCALE_NAME			client_property_t
+property WM_CLIENT_LEADER		client_property_t
+property WM_STATE			client_property_t
+property WM_PROTOCOLS			client_property_t
+property WM_WINDOW_ROLE			client_property_t
+property WM_TRANSIENT_FOR		client_property_t
+property _NET_WM_NAME			client_property_t
+property _NET_WM_ICON			client_property_t
+property _NET_WM_ICON_NAME		client_property_t
+property _NET_WM_PID			client_property_t
+property _NET_WM_STATE			client_property_t
+property _NET_WM_DESKTOP		client_property_t
+property _NET_WM_SYNC_REQUEST_COUNTER	client_property_t
+property _NET_WM_WINDOW_TYPE		client_property_t
+property _NET_WM_USER_TIME		client_property_t
+property _MOTIF_DRAG_RECEIVER_INFO	client_property_t
+property XdndAware			client_property_t
 
+# Properties written by xrdb
+property RESOURCE_MANAGER		rm_property_t
+property SCREEN_RESOURCES		rm_property_t
+
+# Properties written by window managers
+property _MIT_PRIORITY_COLORS		wm_property_t
+
+# Properties used for security labeling
+property _SELINUX_CLIENT_CONTEXT	seclabel_property_t
+
+# Properties used to communicate screen information
+property XFree86_VT			info_property_t
+property XFree86_DDC_EDID1_RAWDATA	info_property_t
+
+# Cut buffers
 property CUT_BUFFER0			cut_buffer_property_t
 property CUT_BUFFER1			cut_buffer_property_t
 property CUT_BUFFER2			cut_buffer_property_t
@@ -35,6 +69,7 @@ property CUT_BUFFER5			cut_buffer_property_t
 property CUT_BUFFER6			cut_buffer_property_t
 property CUT_BUFFER7			cut_buffer_property_t
 
+# Default fallback type
 property default			unknown_property_t
 
 #
@@ -45,40 +80,64 @@ property default			unknown_property_t
 # extension type may not be omitted.  The default rule may appear in
 # any position (it need not be the last extension rule listed).
 #
+# Standard extensions
 extension BIG-REQUESTS			std_ext_t
 extension DOUBLE-BUFFER			std_ext_t
-extension DPMS				screensaver_ext_t
 extension Extended-Visual-Information	std_ext_t
-extension FontCache			font_ext_t
-extension GLX				std_ext_t
-extension LBX				std_ext_t
-extension MIT-SCREEN-SAVER		screensaver_ext_t
-extension MIT-SHM			shmem_ext_t
 extension MIT-SUNDRY-NONSTANDARD	std_ext_t
+extension SHAPE				std_ext_t
+extension SYNC				std_ext_t
+extension XC-MISC			std_ext_t
+extension XFIXES			std_ext_t
+extension XFree86-Misc			std_ext_t
+extension XpExtension                   std_ext_t
+
+# Screen management and multihead extensions
+extension RANDR				output_ext_t
+extension XINERAMA			std_ext_t
+
+# Input extensions
+extension XInputExtension		input_ext_t
+extension XKEYBOARD			input_ext_t
+
+# Screensaver, power management extensions
+extension DPMS				screensaver_ext_t
+extension MIT-SCREEN-SAVER		screensaver_ext_t
+
+# Fonting extensions
+extension FontCache			font_ext_t
+extension XFree86-Bigfont		font_ext_t
+
+# Shared memory extensions
+extension MIT-SHM			shmem_ext_t
+
+# Accelerated graphics, OpenGL, direct rendering extensions
+extension DAMAGE			accelgraphics_ext_t
+extension GLX				accelgraphics_ext_t
 extension NV-CONTROL			accelgraphics_ext_t
 extension NV-GLX			accelgraphics_ext_t
 extension NVIDIA-GLX			accelgraphics_ext_t
-extension RANDR				std_ext_t
-extension RECORD			debug_ext_t
 extension RENDER			std_ext_t
+extension XFree86-DGA			accelgraphics_ext_t
+
+# Debugging, testing, and recording extensions
+extension RECORD			debug_ext_t
+extension X-Resource			debug_ext_t
+extension XTEST				debug_ext_t
+
+# Extensions just for window managers
+extension TOG-CUP			windowmgr_ext_t
+
+# Security-related extensions
 extension SECURITY			security_ext_t
 extension SELinux			security_ext_t
-extension SHAPE				std_ext_t
-extension SYNC				sync_ext_t
-extension TOG-CUP			windowmgr_ext_t
-extension X-Resource			debug_ext_t
 extension XAccessControlExtension	security_ext_t
-extension XACEUSR			security_ext_t
 extension XC-APPGROUP			security_ext_t
-extension XC-MISC			std_ext_t
-extension XFree86-Bigfont		font_ext_t
-extension XFree86-DGA			accelgraphics_ext_t
-extension XFree86-Misc			std_ext_t
+
+# Video extensions
 extension XFree86-VidModeExtension	video_ext_t
-extension XInputExtension		input_ext_t
-extension XKEYBOARD			input_ext_t
-extension XpExtension                   std_ext_t
-extension XTEST				debug_ext_t
 extension XVideo			video_ext_t
 extension XVideo-MotionCompensation	video_ext_t
+
+# Default fallback type
 extension default			unknown_ext_t

From 3a9791b456f35adb252a9059b19265c6c447f1ba Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 19 Jan 2007 14:53:09 -0500
Subject: [PATCH 024/552] Policy updates.

---
 Xext/XSELinuxConfig | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/Xext/XSELinuxConfig b/Xext/XSELinuxConfig
index 1c5016e5f..49582647e 100644
--- a/Xext/XSELinuxConfig
+++ b/Xext/XSELinuxConfig
@@ -59,15 +59,16 @@ property _SELINUX_CLIENT_CONTEXT	seclabel_property_t
 property XFree86_VT			info_property_t
 property XFree86_DDC_EDID1_RAWDATA	info_property_t
 
-# Cut buffers
-property CUT_BUFFER0			cut_buffer_property_t
-property CUT_BUFFER1			cut_buffer_property_t
-property CUT_BUFFER2			cut_buffer_property_t
-property CUT_BUFFER3			cut_buffer_property_t
-property CUT_BUFFER4			cut_buffer_property_t
-property CUT_BUFFER5			cut_buffer_property_t
-property CUT_BUFFER6			cut_buffer_property_t
-property CUT_BUFFER7			cut_buffer_property_t
+# Clipboard and selection properties
+property CUT_BUFFER0			clipboard_property_t
+property CUT_BUFFER1			clipboard_property_t
+property CUT_BUFFER2			clipboard_property_t
+property CUT_BUFFER3			clipboard_property_t
+property CUT_BUFFER4			clipboard_property_t
+property CUT_BUFFER5			clipboard_property_t
+property CUT_BUFFER6			clipboard_property_t
+property CUT_BUFFER7			clipboard_property_t
+property _XT_SELECTION_0		clipboard_property_t
 
 # Default fallback type
 property default			unknown_property_t

From 700fccf863593cbea1691789f1f1cafc08a32fee Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 19 Jan 2007 14:56:38 -0500
Subject: [PATCH 025/552] Remove the root window context line from the
 configuration file. This context will be derived through a type_transition
 rule instead.

---
 Xext/XSELinuxConfig |  1 -
 Xext/xselinux.c     | 58 +--------------------------------------------
 2 files changed, 1 insertion(+), 58 deletions(-)

diff --git a/Xext/XSELinuxConfig b/Xext/XSELinuxConfig
index 49582647e..e45fdcc31 100644
--- a/Xext/XSELinuxConfig
+++ b/Xext/XSELinuxConfig
@@ -9,7 +9,6 @@
 # security policy.  Only one nonlocal_context rule may be defined.
 #
 nonlocal_context			system_u:object_r:remote_xclient_t:s0
-root_window_context			system_u:object_r:root_window_t:s0
 
 #
 # Property rules map a property name to a SELinux type.  The type must
diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 9b5ee1000..a6e021319 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -128,9 +128,6 @@ Atom atom_client_ctx;
 /* security context for non-local clients */
 static char *XSELinuxNonlocalContextDefault = NULL;
 
-/* security context for the root window */
-static char *XSELinuxRootWindowContext = NULL;
-
 /* Selection stuff from dix */
 extern Selection *CurrentSelections;
 extern int NumCurrentSelections;
@@ -1241,9 +1238,7 @@ static char *XSELinuxKeywords[] = {
     "extension",
 #define XSELinuxKeywordNonlocalContext 3
     "nonlocal_context",
-#define XSELinuxKeywordRootWindowContext 4
-    "root_window_context",
-#define XSELinuxKeywordDefault 5
+#define XSELinuxKeywordDefault 4
     "default"
 };
 
@@ -1581,39 +1576,6 @@ XSELinuxParseNonlocalContext(char *p)
     return TRUE;
 } /* XSELinuxParseNonlocalContext */
 
-static Bool
-XSELinuxParseRootWindowContext(char *p)
-{
-    char *context;
-
-    context = XSELinuxParseString(&p);
-    if (!context || (strlen(context) == 0))
-    {
-        return FALSE;
-    }
-
-    if (XSELinuxRootWindowContext != NULL)
-    {
-        return FALSE;
-    }
-
-    /* validate the context */
-    if (security_check_context(context))
-    {
-        return FALSE;
-    }
-
-    XSELinuxRootWindowContext = (char *)xalloc(strlen(context)+1);
-    if (!XSELinuxRootWindowContext)
-    {
-        ErrorF("XSELinux: out of memory\n");
-        return FALSE;
-    }
-    strcpy(XSELinuxRootWindowContext, context);
-
-    return TRUE;
-} /* XSELinuxParseRootWindowContext */
-
 static Bool
 XSELinuxLoadConfigFile(void)
 {
@@ -1630,7 +1592,6 @@ XSELinuxLoadConfigFile(void)
     propertyTypes = extensionTypes = NULL;
     XSELinuxPropertyTypeDefault = XSELinuxExtensionTypeDefault = NULL;
     XSELinuxNonlocalContextDefault = NULL;
-    XSELinuxRootWindowContext = NULL;
 
 #ifndef __UNIXOS2__
     f = fopen(XSELINUXCONFIGFILE, "r");
@@ -1671,10 +1632,6 @@ XSELinuxLoadConfigFile(void)
                 validLine = XSELinuxParseNonlocalContext(p);
                 break;
 
-            case XSELinuxKeywordRootWindowContext:
-                validLine = XSELinuxParseRootWindowContext(p);
-                break;
-
             default:
                 validLine = (*p == '\0');
                 break;
@@ -1706,11 +1663,6 @@ XSELinuxLoadConfigFile(void)
         ErrorF("XSELinux: No default context for non-local clients specified\n");
         goto out;
     }
-    else if (XSELinuxRootWindowContext == NULL)
-    {
-        ErrorF("XSELinux: No context specified for the root window\n");
-        goto out;
-    }
 
     /* Finally, append the default property and extension types to the
      * bottoms of the propertyTypes and extensionTypes arrays, respectively.
@@ -1780,10 +1732,6 @@ XSELinuxFreeConfigData(void)
     /* finally, take care of the context for non-local connections */
     xfree(XSELinuxNonlocalContextDefault);
     XSELinuxNonlocalContextDefault = NULL;
-
-    /* ... and for the root window */
-    xfree(XSELinuxRootWindowContext);
-    XSELinuxRootWindowContext = NULL;
 } /* XSELinuxFreeConfigData */
 
 /* Extension dispatch functions */
@@ -1890,10 +1838,6 @@ XSELinuxExtensionInit(INITARGS)
 
     /* Load the config file.  If this fails, shut down the server,
      * since an unknown security status is worse than no security.
-     *
-     * Note that this must come before we assign a security state
-     * for the serverClient, because the serverClient's root windows
-     * are assigned a context based on data in the config file.
      */
     if (XSELinuxLoadConfigFile() != TRUE)
     {

From 2fb8b7f8199c35ae0870cb54b40ee28a4e01d479 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 19 Jan 2007 19:14:51 -0500
Subject: [PATCH 026/552] Split ObjectSIDByLabel into two functions since
 property labeling now involves an additional compute_create lookup.

---
 Xext/xselinux.c | 85 +++++++++++++++++++++++++++++++++++--------------
 1 file changed, 61 insertions(+), 24 deletions(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index a6e021319..5b77269f2 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -314,36 +314,75 @@ IDPerm(ClientPtr sclient,
 }
 
 /*
- * ObjectSIDByLabel - get SID for an extension or property.
+ * GetPropertySID - compute SID for a property object.
  *
  * Arguments:
- * class: should be SECCLASS_XEXTENSION or SECCLASS_PROPERTY.
- * name: name of the extension or property.
+ * basecontext: context of client owning the property.
+ * name: name of the property.
  *
  * Returns: proper SID for the object or NULL on error.
  */
 static security_id_t
-ObjectSIDByLabel(security_context_t basecontext, security_class_t class,
-                 const char *name)
+GetPropertySID(security_context_t base, const char *name)
+{
+    security_context_t new, result;
+    context_t con;
+    security_id_t sid = NULL;
+    char **ptr, *type = NULL;
+
+    /* make a new context-manipulation object */
+    con = context_new(base);
+    if (!con)
+	goto out;
+
+    /* look in the mappings of names to types */
+    for (ptr = propertyTypes; *ptr; ptr+=2)
+	if (!strcmp(*ptr, name))
+	    break;
+    type = ptr[1];
+
+    /* set the role and type in the context (user unchanged) */
+    if (context_type_set(con, type) ||
+	context_role_set(con, "object_r"))
+	goto out2;
+
+    /* get a context string from the context-manipulation object */
+    new = context_str(con);
+    if (!new)
+	goto out2;
+
+    /* perform a transition to obtain the final context */
+    if (security_compute_create(base, new, SECCLASS_PROPERTY, &result) < 0)
+	goto out2;
+
+    /* get a SID for the context */
+    avc_context_to_sid(result, &sid);
+    freecon(result);
+  out2:
+    context_free(con);
+  out:
+    return sid;
+}
+
+/*
+ * GetExtensionSID - compute SID for an extension object.
+ *
+ * Arguments:
+ * name: name of the extension.
+ *
+ * Returns: proper SID for the object or NULL on error.
+ */
+static security_id_t
+GetExtensionSID(const char *name)
 {
     security_context_t base, new;
     context_t con;
     security_id_t sid = NULL;
     char **ptr, *type = NULL;
 
-    if (basecontext != NULL)
-    {
-        /* use the supplied context */
-        base = strdup(basecontext);
-        if (base == NULL)
-            goto out;
-    }
-    else
-    {
-        /* get server context */
-        if (getcon(&base) < 0)
-            goto out;
-    }
+    /* get server context */
+    if (getcon(&base) < 0)
+	goto out;
 
     /* make a new context-manipulation object */
     con = context_new(base);
@@ -351,8 +390,7 @@ ObjectSIDByLabel(security_context_t basecontext, security_class_t class,
 	goto out2;
 
     /* look in the mappings of names to types */
-    ptr = (class == SECCLASS_PROPERTY) ? propertyTypes : extensionTypes;
-    for (; *ptr; ptr+=2)
+    for (ptr = extensionTypes; *ptr; ptr+=2)
 	if (!strcmp(*ptr, name))
 	    break;
     type = ptr[1];
@@ -368,8 +406,7 @@ ObjectSIDByLabel(security_context_t basecontext, security_class_t class,
 	goto out3;
 
     /* get a SID for the context */
-    if (avc_context_to_sid(new, &sid) < 0)
-	goto out3;
+    avc_context_to_sid(new, &sid);
 
   out3:
     context_free(con);
@@ -1028,7 +1065,7 @@ CALLBACK(XSELinuxExtDispatch)
     /* XXX there should be a separate callback for this */
     if (!EXTENSIONSID(ext))
     {
-	extsid = ObjectSIDByLabel(NULL, SECCLASS_XEXTENSION, ext->name);
+	extsid = GetExtensionSID(ext->name);
 	if (!extsid)
 	    return;
 	EXTENSIONSID(ext) = extsid;
@@ -1071,7 +1108,7 @@ CALLBACK(XSELinuxProperty)
     if (!tclient || !HAVESTATE(tclient))
         return;
 
-    propsid = ObjectSIDByLabel(SID(tclient)->ctx, SECCLASS_PROPERTY, propname);
+    propsid = GetPropertySID(SID(tclient)->ctx, propname);
     if (!propsid)
 	return;
 

From 88f89b9ac1b92a0916c46488350ff68c3ffdd490 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 19 Jan 2007 19:15:49 -0500
Subject: [PATCH 027/552] Policy updates: use x prefix in property and ext
 types.

---
 Xext/XSELinuxConfig | 156 ++++++++++++++++++++++----------------------
 1 file changed, 78 insertions(+), 78 deletions(-)

diff --git a/Xext/XSELinuxConfig b/Xext/XSELinuxConfig
index e45fdcc31..38b78312a 100644
--- a/Xext/XSELinuxConfig
+++ b/Xext/XSELinuxConfig
@@ -19,58 +19,58 @@ nonlocal_context			system_u:object_r:remote_xclient_t:s0
 # any position (it need not be the last property rule listed).
 #
 # Properties set by typical clients: WM, _NET_WM, etc.
-property WM_NAME			client_property_t
-property WM_CLASS			client_property_t
-property WM_ICON_NAME			client_property_t
-property WM_HINTS			client_property_t
-property WM_NORMAL_HINTS		client_property_t
-property WM_COMMAND			client_property_t
-property WM_CLIENT_MACHINE		client_property_t
-property WM_LOCALE_NAME			client_property_t
-property WM_CLIENT_LEADER		client_property_t
-property WM_STATE			client_property_t
-property WM_PROTOCOLS			client_property_t
-property WM_WINDOW_ROLE			client_property_t
-property WM_TRANSIENT_FOR		client_property_t
-property _NET_WM_NAME			client_property_t
-property _NET_WM_ICON			client_property_t
-property _NET_WM_ICON_NAME		client_property_t
-property _NET_WM_PID			client_property_t
-property _NET_WM_STATE			client_property_t
-property _NET_WM_DESKTOP		client_property_t
-property _NET_WM_SYNC_REQUEST_COUNTER	client_property_t
-property _NET_WM_WINDOW_TYPE		client_property_t
-property _NET_WM_USER_TIME		client_property_t
-property _MOTIF_DRAG_RECEIVER_INFO	client_property_t
-property XdndAware			client_property_t
+property WM_NAME			client_xproperty_t
+property WM_CLASS			client_xproperty_t
+property WM_ICON_NAME			client_xproperty_t
+property WM_HINTS			client_xproperty_t
+property WM_NORMAL_HINTS		client_xproperty_t
+property WM_COMMAND			client_xproperty_t
+property WM_CLIENT_MACHINE		client_xproperty_t
+property WM_LOCALE_NAME			client_xproperty_t
+property WM_CLIENT_LEADER		client_xproperty_t
+property WM_STATE			client_xproperty_t
+property WM_PROTOCOLS			client_xproperty_t
+property WM_WINDOW_ROLE			client_xproperty_t
+property WM_TRANSIENT_FOR		client_xproperty_t
+property _NET_WM_NAME			client_xproperty_t
+property _NET_WM_ICON			client_xproperty_t
+property _NET_WM_ICON_NAME		client_xproperty_t
+property _NET_WM_PID			client_xproperty_t
+property _NET_WM_STATE			client_xproperty_t
+property _NET_WM_DESKTOP		client_xproperty_t
+property _NET_WM_SYNC_REQUEST_COUNTER	client_xproperty_t
+property _NET_WM_WINDOW_TYPE		client_xproperty_t
+property _NET_WM_USER_TIME		client_xproperty_t
+property _MOTIF_DRAG_RECEIVER_INFO	client_xproperty_t
+property XdndAware			client_xproperty_t
 
 # Properties written by xrdb
-property RESOURCE_MANAGER		rm_property_t
-property SCREEN_RESOURCES		rm_property_t
+property RESOURCE_MANAGER		rm_xproperty_t
+property SCREEN_RESOURCES		rm_xproperty_t
 
 # Properties written by window managers
-property _MIT_PRIORITY_COLORS		wm_property_t
+property _MIT_PRIORITY_COLORS		wm_xproperty_t
 
 # Properties used for security labeling
-property _SELINUX_CLIENT_CONTEXT	seclabel_property_t
+property _SELINUX_CLIENT_CONTEXT	seclabel_xproperty_t
 
 # Properties used to communicate screen information
-property XFree86_VT			info_property_t
-property XFree86_DDC_EDID1_RAWDATA	info_property_t
+property XFree86_VT			info_xproperty_t
+property XFree86_DDC_EDID1_RAWDATA	info_xproperty_t
 
 # Clipboard and selection properties
-property CUT_BUFFER0			clipboard_property_t
-property CUT_BUFFER1			clipboard_property_t
-property CUT_BUFFER2			clipboard_property_t
-property CUT_BUFFER3			clipboard_property_t
-property CUT_BUFFER4			clipboard_property_t
-property CUT_BUFFER5			clipboard_property_t
-property CUT_BUFFER6			clipboard_property_t
-property CUT_BUFFER7			clipboard_property_t
-property _XT_SELECTION_0		clipboard_property_t
+property CUT_BUFFER0			clipboard_xproperty_t
+property CUT_BUFFER1			clipboard_xproperty_t
+property CUT_BUFFER2			clipboard_xproperty_t
+property CUT_BUFFER3			clipboard_xproperty_t
+property CUT_BUFFER4			clipboard_xproperty_t
+property CUT_BUFFER5			clipboard_xproperty_t
+property CUT_BUFFER6			clipboard_xproperty_t
+property CUT_BUFFER7			clipboard_xproperty_t
+property _XT_SELECTION_0		clipboard_xproperty_t
 
 # Default fallback type
-property default			unknown_property_t
+property default			unknown_xproperty_t
 
 #
 # Extension rules map an extension name to a SELinux type.  The type must
@@ -81,63 +81,63 @@ property default			unknown_property_t
 # any position (it need not be the last extension rule listed).
 #
 # Standard extensions
-extension BIG-REQUESTS			std_ext_t
-extension DOUBLE-BUFFER			std_ext_t
-extension Extended-Visual-Information	std_ext_t
-extension MIT-SUNDRY-NONSTANDARD	std_ext_t
-extension SHAPE				std_ext_t
-extension SYNC				std_ext_t
-extension XC-MISC			std_ext_t
-extension XFIXES			std_ext_t
-extension XFree86-Misc			std_ext_t
-extension XpExtension                   std_ext_t
+extension BIG-REQUESTS			std_xext_t
+extension DOUBLE-BUFFER			std_xext_t
+extension Extended-Visual-Information	std_xext_t
+extension MIT-SUNDRY-NONSTANDARD	std_xext_t
+extension SHAPE				std_xext_t
+extension SYNC				std_xext_t
+extension XC-MISC			std_xext_t
+extension XFIXES			std_xext_t
+extension XFree86-Misc			std_xext_t
+extension XpExtension                   std_xext_t
 
 # Screen management and multihead extensions
-extension RANDR				output_ext_t
-extension XINERAMA			std_ext_t
+extension RANDR				output_xext_t
+extension XINERAMA			std_xext_t
 
 # Input extensions
-extension XInputExtension		input_ext_t
-extension XKEYBOARD			input_ext_t
+extension XInputExtension		input_xext_t
+extension XKEYBOARD			input_xext_t
 
 # Screensaver, power management extensions
-extension DPMS				screensaver_ext_t
-extension MIT-SCREEN-SAVER		screensaver_ext_t
+extension DPMS				screensaver_xext_t
+extension MIT-SCREEN-SAVER		screensaver_xext_t
 
 # Fonting extensions
-extension FontCache			font_ext_t
-extension XFree86-Bigfont		font_ext_t
+extension FontCache			font_xext_t
+extension XFree86-Bigfont		font_xext_t
 
 # Shared memory extensions
-extension MIT-SHM			shmem_ext_t
+extension MIT-SHM			shmem_xext_t
 
 # Accelerated graphics, OpenGL, direct rendering extensions
-extension DAMAGE			accelgraphics_ext_t
-extension GLX				accelgraphics_ext_t
-extension NV-CONTROL			accelgraphics_ext_t
-extension NV-GLX			accelgraphics_ext_t
-extension NVIDIA-GLX			accelgraphics_ext_t
-extension RENDER			std_ext_t
-extension XFree86-DGA			accelgraphics_ext_t
+extension DAMAGE			accelgraphics_xext_t
+extension GLX				accelgraphics_xext_t
+extension NV-CONTROL			accelgraphics_xext_t
+extension NV-GLX			accelgraphics_xext_t
+extension NVIDIA-GLX			accelgraphics_xext_t
+extension RENDER			std_xext_t
+extension XFree86-DGA			accelgraphics_xext_t
 
 # Debugging, testing, and recording extensions
-extension RECORD			debug_ext_t
-extension X-Resource			debug_ext_t
-extension XTEST				debug_ext_t
+extension RECORD			debug_xext_t
+extension X-Resource			debug_xext_t
+extension XTEST				debug_xext_t
 
 # Extensions just for window managers
-extension TOG-CUP			windowmgr_ext_t
+extension TOG-CUP			windowmgr_xext_t
 
 # Security-related extensions
-extension SECURITY			security_ext_t
-extension SELinux			security_ext_t
-extension XAccessControlExtension	security_ext_t
-extension XC-APPGROUP			security_ext_t
+extension SECURITY			security_xext_t
+extension SELinux			security_xext_t
+extension XAccessControlExtension	security_xext_t
+extension XC-APPGROUP			security_xext_t
 
 # Video extensions
-extension XFree86-VidModeExtension	video_ext_t
-extension XVideo			video_ext_t
-extension XVideo-MotionCompensation	video_ext_t
+extension XFree86-VidModeExtension	video_xext_t
+extension XVideo			video_xext_t
+extension XVideo-MotionCompensation	video_xext_t
 
 # Default fallback type
-extension default			unknown_ext_t
+extension default			unknown_xext_t

From 2534f5a9027c196f677923aaa38fa9ed9917f73d Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 16 Feb 2007 15:33:48 -0500
Subject: [PATCH 028/552] Remove nasty function pointer type from DevUnion,
 return to documented type.

---
 include/miscstruct.h | 13 +------------
 mfb/mfbbitblt.c      | 28 +++++++++++++++-------------
 2 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/include/miscstruct.h b/include/miscstruct.h
index c39f03ce8..f78458771 100644
--- a/include/miscstruct.h
+++ b/include/miscstruct.h
@@ -50,7 +50,6 @@ SOFTWARE.
 
 #include "misc.h"
 #include <X11/Xprotostr.h>
-#include "gc.h"
 
 typedef xPoint DDXPointRec;
 
@@ -62,17 +61,7 @@ typedef union _DevUnion {
     pointer		ptr;
     long		val;
     unsigned long	uval;
-    RegionPtr   	(*fptr)(
-        DrawablePtr         /* pSrcDrawable */,
-        DrawablePtr         /* pDstDrawable */,
-        GCPtr               /* pGC */,
-        int                 /* srcx */,
-        int                 /* srcy */,
-        int                 /* width */,
-        int                 /* height */,
-        int                 /* dstx */,
-        int                 /* dsty */,
-        unsigned long       /* bitPlane */);
+    pointer		(*fptr)(void);
 } DevUnion;
 
 #endif /* MISCSTRUCT_H */
diff --git a/mfb/mfbbitblt.c b/mfb/mfbbitblt.c
index 0f84df354..270fd96a7 100644
--- a/mfb/mfbbitblt.c
+++ b/mfb/mfbbitblt.c
@@ -400,20 +400,22 @@ int dstx, dsty;
 static unsigned long	copyPlaneGeneration;
 static int		copyPlaneScreenIndex = -1;
 
+typedef RegionPtr (*CopyPlaneFuncPtr)(
+    DrawablePtr         /* pSrcDrawable */,
+    DrawablePtr         /* pDstDrawable */,
+    GCPtr               /* pGC */,
+    int                 /* srcx */,
+    int                 /* srcy */,
+    int                 /* width */,
+    int                 /* height */,
+    int                 /* dstx */,
+    int                 /* dsty */,
+    unsigned long       /* bitPlane */);
+
 Bool
 mfbRegisterCopyPlaneProc (pScreen, proc)
     ScreenPtr	pScreen;
-    RegionPtr	(*proc)(
-        DrawablePtr         /* pSrcDrawable */,
-        DrawablePtr         /* pDstDrawable */,
-        GCPtr               /* pGC */,
-        int                 /* srcx */,
-        int                 /* srcy */,
-        int                 /* width */,
-        int                 /* height */,
-        int                 /* dstx */,
-        int                 /* dsty */,
-        unsigned long       /* bitPlane */);
+    CopyPlaneFuncPtr proc;
 {
     if (copyPlaneGeneration != serverGeneration)
     {
@@ -422,7 +424,7 @@ mfbRegisterCopyPlaneProc (pScreen, proc)
 	    return FALSE;
 	copyPlaneGeneration = serverGeneration;
     }
-    pScreen->devPrivates[copyPlaneScreenIndex].fptr = proc;
+    pScreen->devPrivates[copyPlaneScreenIndex].fptr = (CopyPlaneFuncPtr)proc;
     return TRUE;
 }
 
@@ -468,7 +470,7 @@ unsigned long plane;
     if (pSrcDrawable->depth != 1)
     {
 	if (copyPlaneScreenIndex >= 0 &&
-	    (copyPlane =
+	    (copyPlane = (CopyPlaneFuncPtr)
 		pSrcDrawable->pScreen->devPrivates[copyPlaneScreenIndex].fptr)
 	    )
 	{

From 9a3eb0357e779d5d5f76858f23667956c4c5d721 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 16 Feb 2007 19:30:03 -0500
Subject: [PATCH 029/552] devPrivates rework: add RC_PRIVATES class, make
 ResourceRec visible in the API, and add extra fields and structure supporting
 private storage.

---
 dix/resource.c     |  6 ------
 include/resource.h | 26 ++++++++++++++++++++++++--
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/dix/resource.c b/dix/resource.c
index 4468f4575..584ac94fb 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -169,12 +169,6 @@ static void RebuildTable(
 #define INITHASHSIZE 6
 #define MAXHASHSIZE 11
 
-typedef struct _Resource {
-    struct _Resource	*next;
-    XID			id;
-    RESTYPE		type;
-    pointer		value;
-} ResourceRec, *ResourcePtr;
 #define NullResource ((ResourcePtr)NULL)
 
 typedef struct _ClientResource {
diff --git a/include/resource.h b/include/resource.h
index 3231e8cd9..902305805 100644
--- a/include/resource.h
+++ b/include/resource.h
@@ -53,10 +53,27 @@ SOFTWARE.
  * STUFF FOR RESOURCES 
  *****************************************************************/
 
-/* classes for Resource routines */
+/* Resource structures */
 
 typedef unsigned long RESTYPE;
 
+typedef struct _Private {
+    int			index;
+    pointer		value;
+    struct _Private	*next;
+} PrivateRec, *PrivatePtr;
+
+typedef struct _Resource {
+    struct _Resource	*next;
+    struct _Resource	*nexttype;
+    XID			id;
+    RESTYPE		type;
+    pointer		value;
+    PrivatePtr		privates;
+} ResourceRec, *ResourcePtr;
+
+/* classes for Resource routines */
+
 #define RC_VANILLA	((RESTYPE)0)
 #define RC_CACHED	((RESTYPE)1<<31)
 #define RC_DRAWABLE	((RESTYPE)1<<30)
@@ -66,7 +83,12 @@ typedef unsigned long RESTYPE;
  *  Extensions can use this too!
  */
 #define RC_NEVERRETAIN	((RESTYPE)1<<29)
-#define RC_LASTPREDEF	RC_NEVERRETAIN
+/*  Use class RC_PRIVATES for resources that support extra private data.
+ *  Resources having this class must provide a field of type ResourcePtr
+ *  at the top of the resource structure, which must be initalized to NULL.
+ */
+#define RC_PRIVATES	((RESTYPE)1<<28)
+#define RC_LASTPREDEF	RC_PRIVATES
 #define RC_ANY		(~(RESTYPE)0)
 
 /* types for Resource routines */

From 779faccfb78648a9f7e70b77dcfa9f6e19559772 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 23 Feb 2007 13:19:53 -0500
Subject: [PATCH 030/552] devPrivates rework: add dix header file containing
 new interface.

---
 include/Makefile.am |  1 +
 include/privates.h  | 77 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+)
 create mode 100644 include/privates.h

diff --git a/include/Makefile.am b/include/Makefile.am
index 4289b818d..4d8910b66 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -31,6 +31,7 @@ sdk_HEADERS =		\
 	os.h		\
 	pixmap.h	\
 	pixmapstr.h	\
+	privates.h	\
 	property.h	\
 	propertyst.h	\
 	region.h	\
diff --git a/include/privates.h b/include/privates.h
new file mode 100644
index 000000000..8d7427074
--- /dev/null
+++ b/include/privates.h
@@ -0,0 +1,77 @@
+/***********************************************************
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+******************************************************************/
+
+#ifndef PRIVATES_H
+#define PRIVATES_H 1
+
+#include "dix.h"
+#include "resource.h"
+
+/*****************************************************************
+ * STUFF FOR PRIVATES
+ *****************************************************************/
+
+/*
+ * Request private space for your driver/module in all resources of a type.
+ * A non-null pScreen argument restricts to resources on a given screen.
+ */
+extern int
+dixRequestPrivate(RESTYPE type, unsigned size, pointer pScreen);
+
+/*
+ * Request private space in just one individual resource object.
+ */
+extern int
+dixRequestSinglePrivate(RESTYPE type, unsigned size, pointer instance);
+
+/*
+ * Look up a private pointer.
+ */
+extern pointer
+dixLookupPrivate(RESTYPE type, int index, pointer instance);
+
+/*
+ * Register callbacks to be called on private allocation/freeing.
+ * The calldata argument to the callbacks is a PrivateCallbackPtr.
+ */
+typedef struct _PrivateCallback {
+    pointer value;		/* pointer to private */
+    int index;			/* registration index */
+    ResourcePtr resource;	/* resource record (do not modify!) */
+} PrivateCallbackRec, *PrivateCallbackPtr;
+
+extern int
+dixRegisterPrivateInitFunc(RESTYPE type, int index,
+			   CallbackProcPtr callback, pointer userdata);
+
+extern int
+dixRegisterPrivateDeleteFunc(RESTYPE type, int index,
+			     CallbackProcPtr callback, pointer userdata);
+
+/*
+ * Internal functions
+ */
+extern void
+dixResetPrivates(void);
+
+extern int
+dixUpdatePrivates(void);
+
+extern ResourcePtr
+dixAllocateResourceRec(RESTYPE type, pointer value, pointer parent);
+
+extern void
+dixCallPrivateInitFuncs(ResourcePtr res);
+
+extern void
+dixFreeResourceRec(ResourcePtr res);
+
+#endif /* PRIVATES_H */

From 16f2b8892d9ebcef6410a675d10549043223f617 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 23 Feb 2007 13:20:43 -0500
Subject: [PATCH 031/552] devPrivates rework: add new interface implementation.

---
 dix/privates.c             | 317 +++++++++++++++++++++++++++++++++++++
 hw/xfree86/loader/dixsym.c |   6 +
 2 files changed, 323 insertions(+)

diff --git a/dix/privates.c b/dix/privates.c
index b20a1dbf0..feab86714 100644
--- a/dix/privates.c
+++ b/dix/privates.c
@@ -36,6 +36,7 @@ from The Open Group.
 #include "os.h"
 #include "windowstr.h"
 #include "resource.h"
+#include "privates.h"
 #include "dixstruct.h"
 #include "gcstruct.h"
 #include "colormapst.h"
@@ -44,6 +45,322 @@ from The Open Group.
 #include "inputstr.h"
 #include "extnsionst.h"
 
+typedef struct _PrivateDescItem {
+    int index;
+    RESTYPE type;
+    pointer parent;
+    unsigned size;
+    CallbackListPtr initfuncs;
+    CallbackListPtr deletefuncs;
+} PrivateDescItemRec, *PrivateDescItemPtr;
+
+/* keeps track of whether resource objects have been created */
+static char *instances = NULL;
+static RESTYPE instancesSize = 0;
+static char anyInstances = 0;
+
+/* list of all allocated privates */
+static PrivateDescItemPtr items = NULL;
+static unsigned itemsSize = 0;
+static unsigned nextPrivateIndex = 0;
+
+/* number of extra slots to add when resizing the tables */
+#define PRIV_TAB_INCREMENT 48
+/* set in index value for privates registered after resources were created */
+#define PRIV_DYN_MASK (1<<30)
+/* descriptor item lookup convenience macro */
+#define GET_DESCRIPTOR(index) (items + ((index) & (PRIV_DYN_MASK - 1)))
+/* type mask convenience macro */
+#define TYPE_BITS(type) ((type) & TypeMask)
+
+static _X_INLINE ResourcePtr
+findResourceBucket(RESTYPE type, pointer instance) {
+    ResourcePtr res = *((ResourcePtr *)instance);
+
+    while (res->type != type)
+	res = res->nexttype;
+    return res;
+}
+
+/*
+ * Request functions; the latter calls the former internally.
+ */
+_X_EXPORT int
+dixRequestPrivate(RESTYPE type, unsigned size, pointer parent)
+{
+    int index = nextPrivateIndex;
+
+    /* check if privates descriptor table needs to be resized */
+    if (nextPrivateIndex >= itemsSize) {
+	unsigned bytes;
+	unsigned size = itemsSize;
+
+	while (nextPrivateIndex >= size)
+	    size += PRIV_TAB_INCREMENT;
+
+	bytes = size * sizeof(PrivateDescItemRec);
+	items = (PrivateDescItemPtr)xrealloc(items, bytes);
+	if (!items) {
+	    itemsSize = nextPrivateIndex = 0;
+	    return -1;
+	}
+	memset(items + itemsSize, 0,
+	       (size - itemsSize) * sizeof(PrivateDescItemRec));
+    }
+
+    /* figure out if resource instances already exist */
+    if ((type != RC_ANY && instances[TYPE_BITS(type)]) ||
+	(type == RC_ANY && anyInstances))
+	index |= PRIV_DYN_MASK;
+
+    /* add privates descriptor */
+    items[nextPrivateIndex].index = index;
+    items[nextPrivateIndex].type = type;
+    items[nextPrivateIndex].parent = parent;
+    items[nextPrivateIndex].size = size;
+    nextPrivateIndex++;
+    return index;
+}
+
+_X_EXPORT int
+dixRequestSinglePrivate(RESTYPE type, unsigned size, pointer instance)
+{
+    PrivatePtr ptr;
+    ResourcePtr res = findResourceBucket(type, instance);
+    int index = dixRequestPrivate(type, size, instance);
+    if (index < 0)
+	return index;
+
+    ptr = (PrivatePtr)xalloc(sizeof(PrivateRec) + size);
+    if (!ptr)
+	return -1;
+    ptr->index = index;
+    ptr->value = ptr + 1;
+    ptr->next = res->privates;
+    res->privates = ptr;
+    return index;
+}
+
+/*
+ * Lookup function (some of this could be static inlined)
+ */
+_X_EXPORT pointer
+dixLookupPrivate(RESTYPE type, int index, pointer instance)
+{
+    ResourcePtr res = findResourceBucket(type, instance);
+    PrivatePtr ptr = res->privates;
+    PrivateDescItemPtr item;
+    PrivateCallbackRec calldata;
+
+    /* see if private has already been allocated (likely) */
+    while (ptr) {
+	if (ptr->index == index)
+	    return ptr->value;
+	ptr = ptr->next;
+    }
+
+    /* past this point, need to create private on the fly */
+    /* create the new private */
+    item = GET_DESCRIPTOR(index);
+    ptr = (PrivatePtr)xalloc(sizeof(PrivateRec) + item->size);
+    if (!ptr)
+	return NULL;
+    memset(ptr, 0, sizeof(PrivateRec) + item->size);
+    ptr->index = index;
+    ptr->value = ptr + 1;
+    ptr->next = res->privates;
+    res->privates = ptr;
+
+    /* call any init funcs and return */
+    calldata.value = ptr->value;
+    calldata.index = index;
+    calldata.resource = res;
+    CallCallbacks(&item->initfuncs, &calldata);
+    return ptr->value;
+}
+
+/*
+ * Callback registration
+ */
+_X_EXPORT int
+dixRegisterPrivateInitFunc(RESTYPE type, int index,
+			   CallbackProcPtr callback, pointer data)
+{
+    return AddCallback(&GET_DESCRIPTOR(index)->initfuncs, callback, data);
+}
+
+_X_EXPORT int
+dixRegisterPrivateDeleteFunc(RESTYPE type, int index,
+			     CallbackProcPtr callback, pointer data)
+{
+    return AddCallback(&GET_DESCRIPTOR(index)->deletefuncs, callback, data);
+}
+
+/*
+ * Internal function called from the main loop to reset the subsystem.
+ */
+void
+dixResetPrivates(void)
+{
+    if (items)
+	xfree(items);
+    items = NULL;
+    itemsSize = 0;
+    nextPrivateIndex = 0;
+    
+    if (instances)
+	xfree(instances);
+    instances = NULL;
+    instancesSize = 0;
+    anyInstances = 0;
+}
+
+/*
+ * Internal function called from CreateNewResourceType.
+ */
+int
+dixUpdatePrivates(void)
+{
+    RESTYPE next = lastResourceType + 1;
+
+    /* check if instances table needs to be resized */
+    if (next >= instancesSize) {
+	RESTYPE size = instancesSize;
+
+	while (next >= size)
+	    size += PRIV_TAB_INCREMENT;
+
+	instances = (char *)xrealloc(instances, size);
+	if (!instances) {
+	    instancesSize = 0;
+	    return FALSE;
+	}
+	memset(instances + instancesSize, 0, size - instancesSize);
+	instancesSize = size;
+    }
+    return TRUE;
+}
+
+/*
+ * Internal function called from dixAddResource.
+ * Allocates a ResourceRec along with any private space all in one chunk.
+ */
+ResourcePtr
+dixAllocateResourceRec(RESTYPE type, pointer instance, pointer parent)
+{
+    unsigned i, count = 0, size = sizeof(ResourceRec);
+    ResourcePtr res;
+    PrivatePtr ptr;
+    char *value;
+    
+    /* first pass figures out total size */
+    for (i=0; i<nextPrivateIndex; i++)
+	if (items[i].type == type &&
+	    (items[i].parent == NULL || items[i].parent == parent)) {
+
+	    size += sizeof(PrivateRec) + items[i].size;
+	    count++;
+	}
+
+    /* allocate resource bucket */
+    res = (ResourcePtr)xalloc(size);
+    if (!res)
+	return res;
+    memset(res, 0, size);
+    ptr = (PrivatePtr)(res + 1);
+    value = (char *)(ptr + count);
+    res->privates = (count > 0) ? ptr : NULL;
+
+    /* second pass sets up privates records */
+    count = 0;
+    for (i=0; i<nextPrivateIndex; i++)
+	if (items[i].type == type &&
+	    (items[i].parent == NULL || items[i].parent == parent)) {
+
+	    ptr[count].index = items[i].index;
+	    ptr[count].value = value;
+	    ptr[count].next = ptr + (count + 1);
+	    count++;
+	    value += items[i].size;
+	}
+
+    if (count > 0)
+	ptr[count-1].next = NULL;
+
+    /* hook up back-pointer to resource record(s) */
+    if (type & RC_PRIVATES) {
+	res->nexttype = *((ResourcePtr *)instance);
+	*((ResourcePtr *)instance) = res;
+    }
+
+    instances[TYPE_BITS(type)] = anyInstances = 1;
+    return res;
+}
+    
+/*
+ * Internal function called from dixAddResource.
+ * Calls the init functions on a newly allocated resource.
+ */
+void
+dixCallPrivateInitFuncs(ResourcePtr res)
+{
+    PrivatePtr ptr = res->privates;
+    PrivateCallbackRec calldata;
+
+    calldata.resource = res;
+    while (ptr) {
+	calldata.value = ptr->value;
+	calldata.index = ptr->index;
+	CallCallbacks(&GET_DESCRIPTOR(ptr->index)->initfuncs, &calldata);
+	ptr = ptr->next;
+    }
+}
+
+/*
+ * Internal function called from the various delete resource functions.
+ * Calls delete callbacks before freeing the ResourceRec and other bits.
+ */
+void
+dixFreeResourceRec(ResourcePtr res)
+{
+    ResourcePtr *tmp;
+    PrivatePtr ptr, next, base;
+    PrivateCallbackRec calldata;
+
+    /* first pass calls the delete callbacks */
+    ptr = res->privates;
+    calldata.resource = res;
+    while (ptr) {
+	calldata.value = ptr->value;
+	calldata.index = ptr->index;
+	CallCallbacks(&GET_DESCRIPTOR(ptr->index)->deletefuncs, &calldata);
+	ptr = ptr->next;
+    }
+
+    /* second pass frees any off-struct private records */
+    ptr = res->privates;
+    base = (PrivatePtr)(res + 1);
+    while (ptr && ptr != base) {
+	next = ptr->next;
+	xfree(ptr);
+	ptr = next;
+    }
+
+    /* remove the record from the nexttype linked list and free it*/
+    if (res->type & RC_PRIVATES) {
+	tmp = (ResourcePtr *)res->value;
+	while (*tmp != res)
+	    tmp = &(*tmp)->nexttype;
+	*tmp = (*tmp)->nexttype;
+    }
+    xfree(res);
+}
+
+/*
+ *  Following is the old devPrivates support.  These functions and variables
+ *  are deprecated, and should no longer be used.
+ */
+
 /*
  *  See the Wrappers and devPrivates section in "Definition of the
  *  Porting Layer for the X v11 Sample Server" (doc/Server/ddx.tbl.ms)
diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c
index 32e0e4f68..9136351a2 100644
--- a/hw/xfree86/loader/dixsym.c
+++ b/hw/xfree86/loader/dixsym.c
@@ -63,6 +63,7 @@
 #include "globals.h"
 #include "os.h"
 #include "osdep.h"
+#include "privates.h"
 #include "resource.h"
 #include "servermd.h"
 #include "scrnintstr.h"
@@ -259,6 +260,11 @@ _X_HIDDEN void *dixLookupTab[] = {
     SYMFUNC(GetScratchPixmapHeader)
     SYMFUNC(FreeScratchPixmapHeader)
     /* privates.c */
+    SYMFUNC(dixRequestPrivate)
+    SYMFUNC(dixRequestSinglePrivate)
+    SYMFUNC(dixLookupPrivate)
+    SYMFUNC(dixRegisterPrivateInitFunc)
+    SYMFUNC(dixRegisterPrivateDeleteFunc)
     SYMFUNC(AllocateExtensionPrivate)
     SYMFUNC(AllocateExtensionPrivateIndex)
     SYMFUNC(AllocateClientPrivate)

From 81372f9096b952f4be545654b0b44ac37ef4f2c2 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 23 Feb 2007 13:23:12 -0500
Subject: [PATCH 032/552] devPrivates rework: hook up new interface in resource
 system; add new resource-adding function that takes an additional ScreenPtr
 argument.

---
 dix/main.c                 |  2 ++
 dix/resource.c             | 22 ++++++++++++++++------
 hw/xfree86/loader/dixsym.c |  1 +
 include/resource.h         |  6 ++++++
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/dix/main.c b/dix/main.c
index 3a77533a5..b5954af2b 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -89,6 +89,7 @@ Equipment Corporation.
 #include "os.h"
 #include "windowstr.h"
 #include "resource.h"
+#include "privates.h"
 #include "dixstruct.h"
 #include "gcstruct.h"
 #include "extension.h"
@@ -356,6 +357,7 @@ main(int argc, char *argv[], char *envp[])
 	InitAtoms();
 	InitEvents();
 	InitGlyphCaching();
+	dixResetPrivates();
 	ResetExtensionPrivates();
 	ResetClientPrivates();
 	ResetScreenPrivates();
diff --git a/dix/resource.c b/dix/resource.c
index 584ac94fb..bddc18cc3 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -135,6 +135,7 @@ Equipment Corporation.
 #include "misc.h"
 #include "os.h"
 #include "resource.h"
+#include "privates.h"
 #include "dixstruct.h" 
 #include "opaque.h"
 #include "windowstr.h"
@@ -206,6 +207,8 @@ CreateNewResourceType(DeleteType deleteFunc)
 
     if (next & lastResourceClass)
 	return 0;
+    if (!dixUpdatePrivates())
+	return 0;
     funcs = (DeleteType *)xrealloc(DeleteFuncs,
 				   (next + 1) * sizeof(DeleteType));
     if (!funcs)
@@ -451,7 +454,7 @@ FakeClientID(register int client)
 }
 
 _X_EXPORT Bool
-AddResource(XID id, RESTYPE type, pointer value)
+dixAddResource(XID id, RESTYPE type, pointer value, pointer parent)
 {
     int client;
     register ClientResourceRec *rrec;
@@ -472,7 +475,7 @@ AddResource(XID id, RESTYPE type, pointer value)
 	(rrec->hashsize < MAXHASHSIZE))
 	RebuildTable(client);
     head = &rrec->resources[Hash(client, id)];
-    res = (ResourcePtr)xalloc(sizeof(ResourceRec));
+    res = dixAllocateResourceRec(type, value, parent);
     if (!res)
     {
 	(*DeleteFuncs[type & TypeMask])(value, id);
@@ -486,9 +489,16 @@ AddResource(XID id, RESTYPE type, pointer value)
     rrec->elements++;
     if (!(id & SERVER_BIT) && (id >= rrec->expectID))
 	rrec->expectID = id + 1;
+    dixCallPrivateInitFuncs(res);
     return TRUE;
 }
 
+_X_EXPORT Bool
+AddResource(XID id, RESTYPE type, pointer value)
+{
+    return dixAddResource(id, type, value, NULL);
+}
+
 static void
 RebuildTable(int client)
 {
@@ -570,7 +580,7 @@ FreeResource(XID id, RESTYPE skipDeleteFuncType)
 		    FlushClientCaches(res->id);
 		if (rtype != skipDeleteFuncType)
 		    (*DeleteFuncs[rtype & TypeMask])(res->value, res->id);
-		xfree(res);
+		dixFreeResourceRec(res);
 		if (*eltptr != elements)
 		    prev = head; /* prev may no longer be valid */
 		gotOne = TRUE;
@@ -614,7 +624,7 @@ FreeResourceByType(XID id, RESTYPE type, Bool skipFree)
 		    FlushClientCaches(res->id);
 		if (!skipFree)
 		    (*DeleteFuncs[type & TypeMask])(res->value, res->id);
-		xfree(res);
+		dixFreeResourceRec(res);
 		break;
 	    }
 	    else
@@ -779,7 +789,7 @@ FreeClientNeverRetainResources(ClientPtr client)
 		if (rtype & RC_CACHED)
 		    FlushClientCaches(this->id);
 		(*DeleteFuncs[rtype & TypeMask])(this->value, this->id);
-		xfree(this);	    
+		dixFreeResourceRec(this);
 	    }
 	    else
 		prev = &this->next;
@@ -829,7 +839,7 @@ FreeClientResources(ClientPtr client)
 	    if (rtype & RC_CACHED)
 		FlushClientCaches(this->id);
 	    (*DeleteFuncs[rtype & TypeMask])(this->value, this->id);
-	    xfree(this);	    
+	    dixFreeResourceRec(this);
 	}
     }
     xfree(clientTable[client->index].resources);
diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c
index 9136351a2..773576750 100644
--- a/hw/xfree86/loader/dixsym.c
+++ b/hw/xfree86/loader/dixsym.c
@@ -283,6 +283,7 @@ _X_HIDDEN void *dixLookupTab[] = {
 #endif
     /* resource.c */
     SYMFUNC(AddResource)
+    SYMFUNC(dixAddResource)
     SYMFUNC(ChangeResourceValue)
     SYMFUNC(CreateNewResourceClass)
     SYMFUNC(CreateNewResourceType)
diff --git a/include/resource.h b/include/resource.h
index 902305805..617afbf41 100644
--- a/include/resource.h
+++ b/include/resource.h
@@ -183,6 +183,12 @@ extern Bool AddResource(
     RESTYPE /*type*/,
     pointer /*value*/);
 
+extern Bool dixAddResource(
+    XID /*id*/,
+    RESTYPE /*type*/,
+    pointer /*value*/,
+    pointer /*parent*/);
+
 extern void FreeResource(
     XID /*id*/,
     RESTYPE /*skipDeleteFuncType*/);

From 74f1de1de9633119c2cf26086875717181c8a6f7 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 1 Mar 2007 12:07:33 -0500
Subject: [PATCH 033/552] devPrivates rework: unhook resource system; will try
 a different approach.

---
 dix/resource.c             | 22 ++++++----------------
 hw/xfree86/loader/dixsym.c |  1 -
 include/resource.h         |  6 ------
 3 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/dix/resource.c b/dix/resource.c
index bddc18cc3..c568ed0b0 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -135,7 +135,6 @@ Equipment Corporation.
 #include "misc.h"
 #include "os.h"
 #include "resource.h"
-#include "privates.h"
 #include "dixstruct.h" 
 #include "opaque.h"
 #include "windowstr.h"
@@ -207,8 +206,6 @@ CreateNewResourceType(DeleteType deleteFunc)
 
     if (next & lastResourceClass)
 	return 0;
-    if (!dixUpdatePrivates())
-	return 0;
     funcs = (DeleteType *)xrealloc(DeleteFuncs,
 				   (next + 1) * sizeof(DeleteType));
     if (!funcs)
@@ -454,7 +451,7 @@ FakeClientID(register int client)
 }
 
 _X_EXPORT Bool
-dixAddResource(XID id, RESTYPE type, pointer value, pointer parent)
+AddResource(XID id, RESTYPE type, pointer value)
 {
     int client;
     register ClientResourceRec *rrec;
@@ -475,7 +472,7 @@ dixAddResource(XID id, RESTYPE type, pointer value, pointer parent)
 	(rrec->hashsize < MAXHASHSIZE))
 	RebuildTable(client);
     head = &rrec->resources[Hash(client, id)];
-    res = dixAllocateResourceRec(type, value, parent);
+    res = (ResourcePtr)xalloc(sizeof(ResourceRec));
     if (!res)
     {
 	(*DeleteFuncs[type & TypeMask])(value, id);
@@ -489,16 +486,9 @@ dixAddResource(XID id, RESTYPE type, pointer value, pointer parent)
     rrec->elements++;
     if (!(id & SERVER_BIT) && (id >= rrec->expectID))
 	rrec->expectID = id + 1;
-    dixCallPrivateInitFuncs(res);
     return TRUE;
 }
 
-_X_EXPORT Bool
-AddResource(XID id, RESTYPE type, pointer value)
-{
-    return dixAddResource(id, type, value, NULL);
-}
-
 static void
 RebuildTable(int client)
 {
@@ -580,7 +570,7 @@ FreeResource(XID id, RESTYPE skipDeleteFuncType)
 		    FlushClientCaches(res->id);
 		if (rtype != skipDeleteFuncType)
 		    (*DeleteFuncs[rtype & TypeMask])(res->value, res->id);
-		dixFreeResourceRec(res);
+		xfree(res);
 		if (*eltptr != elements)
 		    prev = head; /* prev may no longer be valid */
 		gotOne = TRUE;
@@ -624,7 +614,7 @@ FreeResourceByType(XID id, RESTYPE type, Bool skipFree)
 		    FlushClientCaches(res->id);
 		if (!skipFree)
 		    (*DeleteFuncs[type & TypeMask])(res->value, res->id);
-		dixFreeResourceRec(res);
+		xfree(res);
 		break;
 	    }
 	    else
@@ -789,7 +779,7 @@ FreeClientNeverRetainResources(ClientPtr client)
 		if (rtype & RC_CACHED)
 		    FlushClientCaches(this->id);
 		(*DeleteFuncs[rtype & TypeMask])(this->value, this->id);
-		dixFreeResourceRec(this);
+		xfree(this);
 	    }
 	    else
 		prev = &this->next;
@@ -839,7 +829,7 @@ FreeClientResources(ClientPtr client)
 	    if (rtype & RC_CACHED)
 		FlushClientCaches(this->id);
 	    (*DeleteFuncs[rtype & TypeMask])(this->value, this->id);
-	    dixFreeResourceRec(this);
+	    xfree(this);
 	}
     }
     xfree(clientTable[client->index].resources);
diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c
index 773576750..9136351a2 100644
--- a/hw/xfree86/loader/dixsym.c
+++ b/hw/xfree86/loader/dixsym.c
@@ -283,7 +283,6 @@ _X_HIDDEN void *dixLookupTab[] = {
 #endif
     /* resource.c */
     SYMFUNC(AddResource)
-    SYMFUNC(dixAddResource)
     SYMFUNC(ChangeResourceValue)
     SYMFUNC(CreateNewResourceClass)
     SYMFUNC(CreateNewResourceType)
diff --git a/include/resource.h b/include/resource.h
index 617afbf41..902305805 100644
--- a/include/resource.h
+++ b/include/resource.h
@@ -183,12 +183,6 @@ extern Bool AddResource(
     RESTYPE /*type*/,
     pointer /*value*/);
 
-extern Bool dixAddResource(
-    XID /*id*/,
-    RESTYPE /*type*/,
-    pointer /*value*/,
-    pointer /*parent*/);
-
 extern void FreeResource(
     XID /*id*/,
     RESTYPE /*skipDeleteFuncType*/);

From e684824709fa8ffe03dde3c8dfbc58c267515a4f Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 1 Mar 2007 15:00:02 -0500
Subject: [PATCH 034/552] devPrivates rework: redo interface and
 implementation.

---
 dix/main.c                 |   3 +-
 dix/privates.c             | 447 +++++++++++++++++--------------------
 dix/resource.c             |   6 +
 hw/xfree86/loader/dixsym.c |   7 +-
 include/privates.h         | 134 ++++++++---
 include/resource.h         |  23 +-
 6 files changed, 323 insertions(+), 297 deletions(-)

diff --git a/dix/main.c b/dix/main.c
index b5954af2b..ed5e358c4 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -357,7 +357,8 @@ main(int argc, char *argv[], char *envp[])
 	InitAtoms();
 	InitEvents();
 	InitGlyphCaching();
-	dixResetPrivates();
+	if (!dixResetPrivates())
+	    FatalError("couldn't init private data storage");
 	ResetExtensionPrivates();
 	ResetClientPrivates();
 	ResetScreenPrivates();
diff --git a/dix/privates.c b/dix/privates.c
index feab86714..c4ecf6ada 100644
--- a/dix/privates.c
+++ b/dix/privates.c
@@ -31,6 +31,7 @@ from The Open Group.
 #endif
 
 #include <X11/X.h>
+#include <stddef.h>
 #include "scrnintstr.h"
 #include "misc.h"
 #include "os.h"
@@ -45,315 +46,265 @@ from The Open Group.
 #include "inputstr.h"
 #include "extnsionst.h"
 
-typedef struct _PrivateDescItem {
-    int index;
+typedef struct _PrivateDesc {
+    devprivate_key_t *key;
     RESTYPE type;
     pointer parent;
     unsigned size;
     CallbackListPtr initfuncs;
     CallbackListPtr deletefuncs;
-} PrivateDescItemRec, *PrivateDescItemPtr;
-
-/* keeps track of whether resource objects have been created */
-static char *instances = NULL;
-static RESTYPE instancesSize = 0;
-static char anyInstances = 0;
+    struct _PrivateDesc *next;
+} PrivateDescRec;
 
 /* list of all allocated privates */
-static PrivateDescItemPtr items = NULL;
-static unsigned itemsSize = 0;
-static unsigned nextPrivateIndex = 0;
+static PrivateDescRec *items = NULL;
 
-/* number of extra slots to add when resizing the tables */
-#define PRIV_TAB_INCREMENT 48
-/* set in index value for privates registered after resources were created */
-#define PRIV_DYN_MASK (1<<30)
-/* descriptor item lookup convenience macro */
-#define GET_DESCRIPTOR(index) (items + ((index) & (PRIV_DYN_MASK - 1)))
-/* type mask convenience macro */
-#define TYPE_BITS(type) ((type) & TypeMask)
-
-static _X_INLINE ResourcePtr
-findResourceBucket(RESTYPE type, pointer instance) {
-    ResourcePtr res = *((ResourcePtr *)instance);
-
-    while (res->type != type)
-	res = res->nexttype;
-    return res;
+static _X_INLINE PrivateDescRec *
+findItem(devprivate_key_t *const key)
+{
+    PrivateDescRec *item = items;
+    while (item) {
+	if (item->key == key)
+	    return item;
+	item = item->next;
+    }
+    return NULL;
 }
 
 /*
- * Request functions; the latter calls the former internally.
+ * Request pre-allocated space in resources of a given type.
  */
 _X_EXPORT int
-dixRequestPrivate(RESTYPE type, unsigned size, pointer parent)
+dixRequestPrivate(RESTYPE type, devprivate_key_t *const key,
+		  unsigned size, pointer parent)
 {
-    int index = nextPrivateIndex;
+    PrivateDescRec *item = findItem(key);
+    if (item) {
+	assert(item->type == type);
+	if (size > item->size)
+	    item->size = size;
+    } else {
+	item = (PrivateDescRec *)xalloc(sizeof(PrivateDescRec));
+	if (!item)
+	    return FALSE;
+	memset(item, 0, sizeof(PrivateDescRec));
 
-    /* check if privates descriptor table needs to be resized */
-    if (nextPrivateIndex >= itemsSize) {
-	unsigned bytes;
-	unsigned size = itemsSize;
-
-	while (nextPrivateIndex >= size)
-	    size += PRIV_TAB_INCREMENT;
-
-	bytes = size * sizeof(PrivateDescItemRec);
-	items = (PrivateDescItemPtr)xrealloc(items, bytes);
-	if (!items) {
-	    itemsSize = nextPrivateIndex = 0;
-	    return -1;
-	}
-	memset(items + itemsSize, 0,
-	       (size - itemsSize) * sizeof(PrivateDescItemRec));
+	/* add privates descriptor */
+	item->key = key;
+	item->type = type;
+	item->parent = parent;
+	item->size = size;
+	item->next = items;
+	items = item;
     }
-
-    /* figure out if resource instances already exist */
-    if ((type != RC_ANY && instances[TYPE_BITS(type)]) ||
-	(type == RC_ANY && anyInstances))
-	index |= PRIV_DYN_MASK;
-
-    /* add privates descriptor */
-    items[nextPrivateIndex].index = index;
-    items[nextPrivateIndex].type = type;
-    items[nextPrivateIndex].parent = parent;
-    items[nextPrivateIndex].size = size;
-    nextPrivateIndex++;
-    return index;
-}
-
-_X_EXPORT int
-dixRequestSinglePrivate(RESTYPE type, unsigned size, pointer instance)
-{
-    PrivatePtr ptr;
-    ResourcePtr res = findResourceBucket(type, instance);
-    int index = dixRequestPrivate(type, size, instance);
-    if (index < 0)
-	return index;
-
-    ptr = (PrivatePtr)xalloc(sizeof(PrivateRec) + size);
-    if (!ptr)
-	return -1;
-    ptr->index = index;
-    ptr->value = ptr + 1;
-    ptr->next = res->privates;
-    res->privates = ptr;
-    return index;
+    return TRUE;
 }
 
 /*
- * Lookup function (some of this could be static inlined)
+ * Allocate a private and attach it to an existing object.
  */
-_X_EXPORT pointer
-dixLookupPrivate(RESTYPE type, int index, pointer instance)
+_X_EXPORT pointer *
+dixAllocatePrivate(PrivateRec **privates, devprivate_key_t *const key)
 {
-    ResourcePtr res = findResourceBucket(type, instance);
-    PrivatePtr ptr = res->privates;
-    PrivateDescItemPtr item;
-    PrivateCallbackRec calldata;
+    PrivateDescRec *item = findItem(key);
+    PrivateRec *ptr;
+    unsigned size = sizeof(PrivateRec);
+    
+    if (item)
+	size += item->size;
 
-    /* see if private has already been allocated (likely) */
-    while (ptr) {
-	if (ptr->index == index)
-	    return ptr->value;
-	ptr = ptr->next;
-    }
-
-    /* past this point, need to create private on the fly */
-    /* create the new private */
-    item = GET_DESCRIPTOR(index);
-    ptr = (PrivatePtr)xalloc(sizeof(PrivateRec) + item->size);
+    ptr = (PrivateRec *)xalloc(size);
     if (!ptr)
 	return NULL;
-    memset(ptr, 0, sizeof(PrivateRec) + item->size);
-    ptr->index = index;
-    ptr->value = ptr + 1;
-    ptr->next = res->privates;
-    res->privates = ptr;
+    memset(ptr, 0, size);
+    ptr->key = key;
+    ptr->value = (size > sizeof(PrivateRec)) ? (ptr + 1) : NULL;
+    ptr->next = *privates;
+    *privates = ptr;
 
     /* call any init funcs and return */
-    calldata.value = ptr->value;
-    calldata.index = index;
-    calldata.resource = res;
-    CallCallbacks(&item->initfuncs, &calldata);
-    return ptr->value;
+    if (item) {
+	PrivateCallbackRec calldata = { key, ptr->value };
+	CallCallbacks(&item->initfuncs, &calldata);
+    }
+    return &ptr->value;
+}
+
+/*
+ * Allocates pre-requested privates in a single chunk.
+ */
+_X_EXPORT PrivateRec *
+dixAllocatePrivates(RESTYPE type, pointer parent)
+{
+    unsigned count = 0, size = 0;
+    PrivateCallbackRec calldata;
+    PrivateDescRec *item;
+    PrivateRec *ptr;
+    char *value;
+
+    /* first pass figures out total size */
+    for (item = items; item; item = item->next)
+	if ((item->type == type || item->type == RC_ANY) &&
+	    (item->parent == NULL || item->parent == parent)) {
+
+	    size += sizeof(PrivateRec) + item->size;
+	    count++;
+	}
+
+    /* allocate one chunk of memory for everything */
+    ptr = (PrivateRec *)xalloc(size);
+    if (!ptr)
+	return NULL;
+    memset(ptr, 0, size);
+    value = (char *)(ptr + count);
+
+    /* second pass sets up records and calls init funcs */
+    count = 0;
+    for (item = items; item; item = item->next)
+	if ((item->type == type || item->type == RC_ANY) &&
+	    (item->parent == NULL || item->parent == parent)) {
+
+	    ptr[count].key = calldata.key = item->key;
+	    ptr[count].dontfree = (count > 0);
+	    ptr[count].value = calldata.value = (items->size ? value : NULL);
+	    ptr[count].next = ptr + (count + 1);
+
+	    CallCallbacks(&item->initfuncs, &calldata);
+
+	    count++;
+	    value += item->size;
+	}
+
+    if (count > 0)
+	ptr[count-1].next = NULL;
+
+    return ptr;
+}
+
+/*
+ * Called to free privates at object deletion time.
+ */
+_X_EXPORT void
+dixFreePrivates(PrivateRec *privates)
+{
+    PrivateRec *ptr, *next;
+    PrivateDescRec *item;
+    PrivateCallbackRec calldata;
+
+    /* first pass calls the delete callbacks */
+    for (ptr = privates; ptr; ptr = ptr->next) {
+	item = findItem(ptr->key);
+	if (item) {
+	    calldata.key = ptr->key;
+	    calldata.value = ptr->value;
+	    CallCallbacks(&item->deletefuncs, &calldata);
+	}
+    }
+	
+    /* second pass frees the memory */
+    ptr = privates;
+    while (ptr) {
+	if (ptr->dontfree)
+	    ptr = ptr->next;
+	else {
+	    next = ptr->next;
+	    while (next && next->dontfree)
+		next = next->next;
+
+	    xfree(ptr);
+	    ptr = next;
+	}
+    }
+
+    /* no more use of privates permitted */
+    *privates = NULL;
 }
 
 /*
  * Callback registration
  */
 _X_EXPORT int
-dixRegisterPrivateInitFunc(RESTYPE type, int index,
+dixRegisterPrivateInitFunc(devprivate_key_t *const key,
 			   CallbackProcPtr callback, pointer data)
 {
-    return AddCallback(&GET_DESCRIPTOR(index)->initfuncs, callback, data);
+    PrivateDescRec *item = findItem(key);
+    if (!item)
+	return FALSE;
+    return AddCallback(&item->initfuncs, callback, data);
 }
 
 _X_EXPORT int
-dixRegisterPrivateDeleteFunc(RESTYPE type, int index,
+dixRegisterPrivateDeleteFunc(devprivate_key_t *const key,
 			     CallbackProcPtr callback, pointer data)
 {
-    return AddCallback(&GET_DESCRIPTOR(index)->deletefuncs, callback, data);
+    PrivateDescRec *item = findItem(key);
+    if (!item)
+	return FALSE;
+    return AddCallback(&item->deletefuncs, callback, data);
 }
 
-/*
- * Internal function called from the main loop to reset the subsystem.
- */
-void
-dixResetPrivates(void)
-{
-    if (items)
-	xfree(items);
-    items = NULL;
-    itemsSize = 0;
-    nextPrivateIndex = 0;
-    
-    if (instances)
-	xfree(instances);
-    instances = NULL;
-    instancesSize = 0;
-    anyInstances = 0;
-}
+/* Table of devPrivates offsets */
+static unsigned *offsets = NULL;
+static unsigned offsetsSize = 0;
 
 /*
- * Internal function called from CreateNewResourceType.
+ * Specify where the devPrivates field is located in a structure type
  */
-int
-dixUpdatePrivates(void)
+_X_EXPORT int
+dixRegisterPrivateOffset(RESTYPE type, unsigned offset)
 {
-    RESTYPE next = lastResourceType + 1;
+    type = type & TypeMask;
 
-    /* check if instances table needs to be resized */
-    if (next >= instancesSize) {
-	RESTYPE size = instancesSize;
-
-	while (next >= size)
-	    size += PRIV_TAB_INCREMENT;
-
-	instances = (char *)xrealloc(instances, size);
-	if (!instances) {
-	    instancesSize = 0;
+    /* resize offsets table if necessary */
+    while (type >= offsetsSize) {
+	offsets = (unsigned *)xrealloc(offsets,
+				       offsetsSize * 2 * sizeof(unsigned));
+	if (!offsets) {
+	    offsetsSize = 0;
 	    return FALSE;
 	}
-	memset(instances + instancesSize, 0, size - instancesSize);
-	instancesSize = size;
+	offsetsSize *= 2;
     }
+
+    offsets[type] = offset;
     return TRUE;
 }
 
-/*
- * Internal function called from dixAddResource.
- * Allocates a ResourceRec along with any private space all in one chunk.
- */
-ResourcePtr
-dixAllocateResourceRec(RESTYPE type, pointer instance, pointer parent)
+_X_EXPORT unsigned
+dixLookupPrivateOffset(RESTYPE type)
 {
-    unsigned i, count = 0, size = sizeof(ResourceRec);
-    ResourcePtr res;
-    PrivatePtr ptr;
-    char *value;
-    
-    /* first pass figures out total size */
-    for (i=0; i<nextPrivateIndex; i++)
-	if (items[i].type == type &&
-	    (items[i].parent == NULL || items[i].parent == parent)) {
-
-	    size += sizeof(PrivateRec) + items[i].size;
-	    count++;
-	}
-
-    /* allocate resource bucket */
-    res = (ResourcePtr)xalloc(size);
-    if (!res)
-	return res;
-    memset(res, 0, size);
-    ptr = (PrivatePtr)(res + 1);
-    value = (char *)(ptr + count);
-    res->privates = (count > 0) ? ptr : NULL;
-
-    /* second pass sets up privates records */
-    count = 0;
-    for (i=0; i<nextPrivateIndex; i++)
-	if (items[i].type == type &&
-	    (items[i].parent == NULL || items[i].parent == parent)) {
-
-	    ptr[count].index = items[i].index;
-	    ptr[count].value = value;
-	    ptr[count].next = ptr + (count + 1);
-	    count++;
-	    value += items[i].size;
-	}
-
-    if (count > 0)
-	ptr[count-1].next = NULL;
-
-    /* hook up back-pointer to resource record(s) */
-    if (type & RC_PRIVATES) {
-	res->nexttype = *((ResourcePtr *)instance);
-	*((ResourcePtr *)instance) = res;
-    }
-
-    instances[TYPE_BITS(type)] = anyInstances = 1;
-    return res;
-}
-    
-/*
- * Internal function called from dixAddResource.
- * Calls the init functions on a newly allocated resource.
- */
-void
-dixCallPrivateInitFuncs(ResourcePtr res)
-{
-    PrivatePtr ptr = res->privates;
-    PrivateCallbackRec calldata;
-
-    calldata.resource = res;
-    while (ptr) {
-	calldata.value = ptr->value;
-	calldata.index = ptr->index;
-	CallCallbacks(&GET_DESCRIPTOR(ptr->index)->initfuncs, &calldata);
-	ptr = ptr->next;
-    }
+    assert(type & RC_PRIVATES);
+    type = type & TypeMask;
+    assert(type < offsetsSize);
+    return offsets[type];
 }
 
 /*
- * Internal function called from the various delete resource functions.
- * Calls delete callbacks before freeing the ResourceRec and other bits.
+ * Called from the main loop to reset the subsystem.
  */
-void
-dixFreeResourceRec(ResourcePtr res)
+int
+dixResetPrivates(void)
 {
-    ResourcePtr *tmp;
-    PrivatePtr ptr, next, base;
-    PrivateCallbackRec calldata;
-
-    /* first pass calls the delete callbacks */
-    ptr = res->privates;
-    calldata.resource = res;
-    while (ptr) {
-	calldata.value = ptr->value;
-	calldata.index = ptr->index;
-	CallCallbacks(&GET_DESCRIPTOR(ptr->index)->deletefuncs, &calldata);
-	ptr = ptr->next;
+    PrivateDescRec *next;
+    while (items) {
+	next = items->next;
+	xfree(items);
+	items = next;
     }
 
-    /* second pass frees any off-struct private records */
-    ptr = res->privates;
-    base = (PrivatePtr)(res + 1);
-    while (ptr && ptr != base) {
-	next = ptr->next;
-	xfree(ptr);
-	ptr = next;
-    }
+    if (offsets)
+	xfree(offsets);
 
-    /* remove the record from the nexttype linked list and free it*/
-    if (res->type & RC_PRIVATES) {
-	tmp = (ResourcePtr *)res->value;
-	while (*tmp != res)
-	    tmp = &(*tmp)->nexttype;
-	*tmp = (*tmp)->nexttype;
-    }
-    xfree(res);
+    offsetsSize = 16;
+    offsets = (unsigned *)xalloc(offsetsSize * sizeof(unsigned));
+    if (!offsets)
+	return FALSE;
+
+    /* register basic resource offsets */
+    if (!dixRegisterPrivateOffset(RT_WINDOW, offsetof(WindowRec,devPrivates)))
+	return FALSE;
+
+    return TRUE;
 }
 
 /*
diff --git a/dix/resource.c b/dix/resource.c
index c568ed0b0..2cad7c01b 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -169,6 +169,12 @@ static void RebuildTable(
 #define INITHASHSIZE 6
 #define MAXHASHSIZE 11
 
+typedef struct _Resource {
+    struct _Resource	*next;
+    XID			id;
+    RESTYPE		type;
+    pointer		value;
+} ResourceRec, *ResourcePtr;
 #define NullResource ((ResourcePtr)NULL)
 
 typedef struct _ClientResource {
diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c
index 9136351a2..5479ed0df 100644
--- a/hw/xfree86/loader/dixsym.c
+++ b/hw/xfree86/loader/dixsym.c
@@ -261,10 +261,13 @@ _X_HIDDEN void *dixLookupTab[] = {
     SYMFUNC(FreeScratchPixmapHeader)
     /* privates.c */
     SYMFUNC(dixRequestPrivate)
-    SYMFUNC(dixRequestSinglePrivate)
-    SYMFUNC(dixLookupPrivate)
     SYMFUNC(dixRegisterPrivateInitFunc)
     SYMFUNC(dixRegisterPrivateDeleteFunc)
+    SYMFUNC(dixAllocatePrivate)
+    SYMFUNC(dixAllocatePrivates)
+    SYMFUNC(dixFreePrivates)
+    SYMFUNC(dixRegisterPrivateOffset)
+    SYMFUNC(dixLookupPrivateOffset)
     SYMFUNC(AllocateExtensionPrivate)
     SYMFUNC(AllocateExtensionPrivateIndex)
     SYMFUNC(AllocateClientPrivate)
diff --git a/include/privates.h b/include/privates.h
index 8d7427074..898fdd9c9 100644
--- a/include/privates.h
+++ b/include/privates.h
@@ -19,59 +19,141 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  * STUFF FOR PRIVATES
  *****************************************************************/
 
-/*
- * Request private space for your driver/module in all resources of a type.
- * A non-null pScreen argument restricts to resources on a given screen.
- */
-extern int
-dixRequestPrivate(RESTYPE type, unsigned size, pointer pScreen);
+typedef struct _PrivateKey {
+    int unused;
+} devprivate_key_t;
+
+typedef struct _Private {
+    devprivate_key_t	*key;
+    int			dontfree;
+    pointer		value;
+    struct _Private	*next;
+} PrivateRec;
 
 /*
- * Request private space in just one individual resource object.
+ * Request pre-allocated private space for your driver/module.
+ * A non-null pScreen argument restricts to objects on a given screen.
  */
 extern int
-dixRequestSinglePrivate(RESTYPE type, unsigned size, pointer instance);
+dixRequestPrivate(RESTYPE type, devprivate_key_t *const key,
+		  unsigned size, pointer pScreen);
+
+/*
+ * Allocates a new private and attaches it to an existing object.
+ */
+extern pointer *
+dixAllocatePrivate(PrivateRec **privates, devprivate_key_t *const key);
 
 /*
  * Look up a private pointer.
  */
-extern pointer
-dixLookupPrivate(RESTYPE type, int index, pointer instance);
+static _X_INLINE pointer
+dixLookupPrivate(PrivateRec **privates, devprivate_key_t *const key)
+{
+    PrivateRec *rec = *privates;
+    pointer *ptr;
+
+    while (rec) {
+	if (rec->key == key)
+	    return rec->value;
+	rec = rec->next;
+    }
+
+    ptr = dixAllocatePrivate(privates, key);
+    return ptr ? *ptr : NULL;
+}
+
+/*
+ * Look up the address of a private pointer.
+ */
+static _X_INLINE pointer *
+dixLookupPrivateAddr(PrivateRec **privates, devprivate_key_t *const key)
+{
+    PrivateRec *rec = *privates;
+
+    while (rec) {
+	if (rec->key == key)
+	    return &rec->value;
+	rec = rec->next;
+    }
+
+    return dixAllocatePrivate(privates, key);
+}
+
+/*
+ * Set a private pointer.
+ */
+static _X_INLINE int
+dixSetPrivate(PrivateRec **privates, devprivate_key_t *const key, pointer val)
+{
+    PrivateRec *rec;
+
+ top:
+    rec = *privates;
+    while (rec) {
+	if (rec->key == key) {
+	    rec->value = val;
+	    return TRUE;
+	}
+	rec = rec->next;
+    }
+
+    if (!dixAllocatePrivate(privates, key))
+	return FALSE;
+    goto top;
+}
 
 /*
  * Register callbacks to be called on private allocation/freeing.
  * The calldata argument to the callbacks is a PrivateCallbackPtr.
  */
 typedef struct _PrivateCallback {
+    devprivate_key_t *key;	/* private registration key */
     pointer value;		/* pointer to private */
-    int index;			/* registration index */
-    ResourcePtr resource;	/* resource record (do not modify!) */
-} PrivateCallbackRec, *PrivateCallbackPtr;
+} PrivateCallbackRec;
 
 extern int
-dixRegisterPrivateInitFunc(RESTYPE type, int index,
+dixRegisterPrivateInitFunc(devprivate_key_t *const key,
 			   CallbackProcPtr callback, pointer userdata);
 
 extern int
-dixRegisterPrivateDeleteFunc(RESTYPE type, int index,
+dixRegisterPrivateDeleteFunc(devprivate_key_t *const key,
 			     CallbackProcPtr callback, pointer userdata);
 
 /*
- * Internal functions
+ * Allocates all pre-requested private space in one chunk.
+ */
+extern PrivateRec *
+dixAllocatePrivates(RESTYPE type, pointer parent);
+
+/*
+ * Frees any private space that is not part of an object.
  */
 extern void
+dixFreePrivates(PrivateRec *privates);
+
+/*
+ * Resets the subsystem, called from the main loop.
+ */
+extern int
 dixResetPrivates(void);
 
+/*
+ * These next two functions are necessary because the position of
+ * the devPrivates field varies by structure and calling code might
+ * only know the resource type, not the structure definition.
+ */
+
+/*
+ * Looks up the offset where the devPrivates field is located by type.
+ */
+extern unsigned
+dixLookupPrivateOffset(RESTYPE type);
+
+/*
+ * Specifies the offset where the devPrivates field is located.
+ */
 extern int
-dixUpdatePrivates(void);
-
-extern ResourcePtr
-dixAllocateResourceRec(RESTYPE type, pointer value, pointer parent);
-
-extern void
-dixCallPrivateInitFuncs(ResourcePtr res);
-
-extern void
-dixFreeResourceRec(ResourcePtr res);
+dixRegisterPrivateOffset(RESTYPE type, unsigned offset);
 
 #endif /* PRIVATES_H */
diff --git a/include/resource.h b/include/resource.h
index 902305805..40259ac27 100644
--- a/include/resource.h
+++ b/include/resource.h
@@ -53,27 +53,10 @@ SOFTWARE.
  * STUFF FOR RESOURCES 
  *****************************************************************/
 
-/* Resource structures */
+/* classes for Resource routines */
 
 typedef unsigned long RESTYPE;
 
-typedef struct _Private {
-    int			index;
-    pointer		value;
-    struct _Private	*next;
-} PrivateRec, *PrivatePtr;
-
-typedef struct _Resource {
-    struct _Resource	*next;
-    struct _Resource	*nexttype;
-    XID			id;
-    RESTYPE		type;
-    pointer		value;
-    PrivatePtr		privates;
-} ResourceRec, *ResourcePtr;
-
-/* classes for Resource routines */
-
 #define RC_VANILLA	((RESTYPE)0)
 #define RC_CACHED	((RESTYPE)1<<31)
 #define RC_DRAWABLE	((RESTYPE)1<<30)
@@ -84,8 +67,8 @@ typedef struct _Resource {
  */
 #define RC_NEVERRETAIN	((RESTYPE)1<<29)
 /*  Use class RC_PRIVATES for resources that support extra private data.
- *  Resources having this class must provide a field of type ResourcePtr
- *  at the top of the resource structure, which must be initalized to NULL.
+ *  Resources having this class must provide a field of type PrivateRec *.
+ *  Refer to the X server documentation on devPrivates for the details.
  */
 #define RC_PRIVATES	((RESTYPE)1<<28)
 #define RC_LASTPREDEF	RC_PRIVATES

From 74175e0af74c530cb712a6772d3c5d61d1be9748 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 5 Mar 2007 12:34:37 -0500
Subject: [PATCH 035/552] devPrivates rework: remove some debugging code from
 dixFreePrivates.

---
 dix/privates.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/dix/privates.c b/dix/privates.c
index c4ecf6ada..a12c8bfcb 100644
--- a/dix/privates.c
+++ b/dix/privates.c
@@ -215,9 +215,6 @@ dixFreePrivates(PrivateRec *privates)
 	    ptr = next;
 	}
     }
-
-    /* no more use of privates permitted */
-    *privates = NULL;
 }
 
 /*

From aaef4d6a4121d9341b670a0ce8fabc3b491049cf Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 7 Mar 2007 09:57:02 -0500
Subject: [PATCH 036/552] devPrivates rework: move reset functions into a
 single call.

---
 dix/main.c          |  8 --------
 dix/privates.c      | 35 +++++++++++++++++++++++++++--------
 include/dix.h       |  2 --
 include/extension.h |  2 --
 include/input.h     |  1 -
 include/screenint.h | 10 ----------
 6 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/dix/main.c b/dix/main.c
index eb75cf548..c40dfddb2 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -359,15 +359,7 @@ main(int argc, char *argv[], char *envp[])
 	InitGlyphCaching();
 	if (!dixResetPrivates())
 	    FatalError("couldn't init private data storage");
-	ResetExtensionPrivates();
-	ResetClientPrivates();
-	ResetScreenPrivates();
-	ResetWindowPrivates();
-	ResetGCPrivates();
-	ResetPixmapPrivates();
-	ResetColormapPrivates();
 	ResetFontPrivateIndex();
-	ResetDevicePrivateIndex();
 	InitCallbackManager();
 	InitVisualWrap();
 	InitOutput(&screenInfo, argc, argv);
diff --git a/dix/privates.c b/dix/privates.c
index 0722d9f29..48ba675bf 100644
--- a/dix/privates.c
+++ b/dix/privates.c
@@ -279,6 +279,15 @@ dixLookupPrivateOffset(RESTYPE type)
 /*
  * Called from the main loop to reset the subsystem.
  */
+static void ResetExtensionPrivates(void);
+static void ResetClientPrivates(void);
+static void ResetScreenPrivates(void);
+static void ResetWindowPrivates(void);
+static void ResetGCPrivates(void);
+static void ResetPixmapPrivates(void);
+static void ResetColormapPrivates(void);
+static void ResetDevicePrivateIndex(void);
+
 int
 dixResetPrivates(void)
 {
@@ -297,6 +306,16 @@ dixResetPrivates(void)
     if (!offsets)
 	return FALSE;
 
+    /* reset legacy devPrivates support */
+    ResetExtensionPrivates();
+    ResetClientPrivates();
+    ResetScreenPrivates();
+    ResetWindowPrivates();
+    ResetGCPrivates();
+    ResetPixmapPrivates();
+    ResetColormapPrivates();
+    ResetDevicePrivateIndex();
+
     /* register basic resource offsets */
     if (!dixRegisterPrivateOffset(RT_WINDOW, offsetof(WindowRec,devPrivates)))
 	return FALSE;
@@ -324,7 +343,7 @@ int extensionPrivateLen;
 unsigned *extensionPrivateSizes;
 unsigned totalExtensionSize;
 
-void
+static void
 ResetExtensionPrivates()
 {
     extensionPrivateCount = 0;
@@ -381,7 +400,7 @@ int clientPrivateLen;
 unsigned *clientPrivateSizes;
 unsigned totalClientSize;
 
-void
+static void
 ResetClientPrivates()
 {
     clientPrivateCount = 0;
@@ -435,7 +454,7 @@ AllocateClientPrivate(int index2, unsigned amount)
 
 int  screenPrivateCount;
 
-void
+static void
 ResetScreenPrivates()
 {
     screenPrivateCount = 0;
@@ -477,7 +496,7 @@ AllocateScreenPrivateIndex()
 
 static int  windowPrivateCount;
 
-void
+static void
 ResetWindowPrivates()
 {
     windowPrivateCount = 0;
@@ -527,7 +546,7 @@ AllocateWindowPrivate(register ScreenPtr pScreen, int index2, unsigned amount)
 
 static int  gcPrivateCount;
 
-void
+static void
 ResetGCPrivates()
 {
     gcPrivateCount = 0;
@@ -576,7 +595,7 @@ AllocateGCPrivate(register ScreenPtr pScreen, int index2, unsigned amount)
  */
 static int  pixmapPrivateCount;
 
-void
+static void
 ResetPixmapPrivates()
 {
     pixmapPrivateCount = 0;
@@ -627,7 +646,7 @@ AllocatePixmapPrivate(register ScreenPtr pScreen, int index2, unsigned amount)
 
 int  colormapPrivateCount;
 
-void
+static void
 ResetColormapPrivates()
 {
     colormapPrivateCount = 0;
@@ -712,7 +731,7 @@ AllocateDevicePrivate(DeviceIntPtr device, int index)
     }
 }
 
-void
+static void
 ResetDevicePrivateIndex(void)
 {
     devicePrivateIndex = 0;
diff --git a/include/dix.h b/include/dix.h
index 5c2c5b862..13f3c05ff 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -591,8 +591,6 @@ void
 ScreenRestructured (ScreenPtr pScreen);
 #endif
 
-extern void ResetClientPrivates(void);
-
 extern int AllocateClientPrivateIndex(void);
 
 extern Bool AllocateClientPrivate(
diff --git a/include/extension.h b/include/extension.h
index 74975c50b..27decc12c 100644
--- a/include/extension.h
+++ b/include/extension.h
@@ -58,8 +58,6 @@ extern Bool EnableDisableExtension(char *name, Bool enable);
 
 extern void EnableDisableExtensionError(char *name, Bool enable);
 
-extern void ResetExtensionPrivates(void);
-
 extern int AllocateExtensionPrivateIndex(void);
 
 extern Bool AllocateExtensionPrivate(
diff --git a/include/input.h b/include/input.h
index fc607d35b..2350a2456 100644
--- a/include/input.h
+++ b/include/input.h
@@ -160,7 +160,6 @@ typedef struct {
 
 extern int AllocateDevicePrivateIndex(void);
 extern Bool AllocateDevicePrivate(DeviceIntPtr device, int index);
-extern void ResetDevicePrivateIndex(void);
 
 extern KeybdCtrl	defaultKeyboardControl;
 extern PtrCtrl		defaultPointerControl;
diff --git a/include/screenint.h b/include/screenint.h
index 1f1434a84..bf8da4432 100644
--- a/include/screenint.h
+++ b/include/screenint.h
@@ -55,12 +55,8 @@ typedef struct _Visual *VisualPtr;
 typedef struct _Depth  *DepthPtr;
 typedef struct _Screen *ScreenPtr;
 
-extern void ResetScreenPrivates(void);
-
 extern int AllocateScreenPrivateIndex(void);
 
-extern void ResetWindowPrivates(void);
-
 extern int AllocateWindowPrivateIndex(void);
 
 extern Bool AllocateWindowPrivate(
@@ -68,8 +64,6 @@ extern Bool AllocateWindowPrivate(
     int /* index */,
     unsigned /* amount */);
 
-extern void ResetGCPrivates(void);
-
 extern int AllocateGCPrivateIndex(void);
 
 extern Bool AllocateGCPrivate(
@@ -86,8 +80,6 @@ extern int AddScreen(
     int /*argc*/,
     char** /*argv*/);
 
-extern void ResetPixmapPrivates(void);
-
 extern int AllocatePixmapPrivateIndex(void);
 
 extern Bool AllocatePixmapPrivate(
@@ -95,8 +87,6 @@ extern Bool AllocatePixmapPrivate(
     int /* index */,
     unsigned /* amount */);
 
-extern void ResetColormapPrivates(void);
-
 
 typedef struct _ColormapRec *ColormapPtr;
 typedef int (*InitCmapPrivFunc)(ColormapPtr, int);

From c45f6762080ef00b41d9f73441a9f0e605253008 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 7 Mar 2007 11:22:42 -0500
Subject: [PATCH 037/552] devPrivates rework: hook up new mechanism in
 backwards-compatibility mode on existing structures that support devPrivates.

---
 dix/devices.c      | 11 ++++++--
 dix/main.c         | 32 ++++++++++++++++--------
 dix/privates.c     | 62 +++++++++++++++++++++++++++-------------------
 include/privates.h | 10 ++++++++
 4 files changed, 76 insertions(+), 39 deletions(-)

diff --git a/dix/devices.c b/dix/devices.c
index 9f4218414..2e04403c5 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -124,8 +124,15 @@ AddInputDevice(DeviceProc deviceProc, Bool autoStart)
 #ifdef XKB
     dev->xkb_interest = NULL;
 #endif
-    dev->nPrivates = 0;
-    dev->devPrivates = NULL;
+    /* must pre-allocate one private for the new devPrivates support */
+    dev->nPrivates = 1;
+    dev->devPrivates = (DevUnion *)xalloc(sizeof(DevUnion));
+    if (!dev->devPrivates) {
+	xfree(dev);
+	return NULL;
+    }
+    dev->devPrivates[0].ptr = NULL;
+
     dev->unwrapProc = NULL;
     dev->coreEvents = TRUE;
     dev->inited = FALSE;
diff --git a/dix/main.c b/dix/main.c
index c40dfddb2..852cbcb62 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -715,18 +715,28 @@ AddScreen(
 	xfree(pScreen);
 	return -1;
     }
+
+    /* must pre-allocate one private for the new devPrivates support */
+    pScreen->WindowPrivateLen = 1;
+    pScreen->WindowPrivateSizes = (unsigned *)xalloc(sizeof(unsigned));
+    pScreen->totalWindowSize = PadToLong(sizeof(WindowRec)) + sizeof(DevUnion);
+    pScreen->GCPrivateLen = 1;
+    pScreen->GCPrivateSizes = (unsigned *)xalloc(sizeof(unsigned));
+    pScreen->totalGCSize = PadToLong(sizeof(GC)) + sizeof(DevUnion);
+    pScreen->PixmapPrivateLen = 1;
+    pScreen->PixmapPrivateSizes = (unsigned *)xalloc(sizeof(unsigned));
+    pScreen->totalPixmapSize = BitmapBytePad(8 * (sizeof(PixmapRec) +
+						  sizeof(DevUnion)));
+    if (pScreen->WindowPrivateSizes && pScreen->GCPrivateSizes &&
+	pScreen->PixmapPrivateSizes)
+	*pScreen->WindowPrivateSizes = *pScreen->GCPrivateSizes =
+	    *pScreen->PixmapPrivateSizes = 0;
+    else {
+	xfree(pScreen);
+	return -1;
+    }
+
     pScreen->myNum = i;
-    pScreen->WindowPrivateLen = 0;
-    pScreen->WindowPrivateSizes = (unsigned *)NULL;
-    pScreen->totalWindowSize =
-        ((sizeof(WindowRec) + sizeof(long) - 1) / sizeof(long)) * sizeof(long);
-    pScreen->GCPrivateLen = 0;
-    pScreen->GCPrivateSizes = (unsigned *)NULL;
-    pScreen->totalGCSize =
-        ((sizeof(GC) + sizeof(long) - 1) / sizeof(long)) * sizeof(long);
-    pScreen->PixmapPrivateLen = 0;
-    pScreen->PixmapPrivateSizes = (unsigned *)NULL;
-    pScreen->totalPixmapSize = BitmapBytePad(sizeof(PixmapRec)*8);
     pScreen->ClipNotify = 0;	/* for R4 ddx compatibility */
     pScreen->CreateScreenResources = 0;
     
diff --git a/dix/privates.c b/dix/privates.c
index 48ba675bf..57da0fa91 100644
--- a/dix/privates.c
+++ b/dix/privates.c
@@ -279,8 +279,8 @@ dixLookupPrivateOffset(RESTYPE type)
 /*
  * Called from the main loop to reset the subsystem.
  */
-static void ResetExtensionPrivates(void);
-static void ResetClientPrivates(void);
+static int ResetExtensionPrivates(void);
+static int ResetClientPrivates(void);
 static void ResetScreenPrivates(void);
 static void ResetWindowPrivates(void);
 static void ResetGCPrivates(void);
@@ -307,8 +307,8 @@ dixResetPrivates(void)
 	return FALSE;
 
     /* reset legacy devPrivates support */
-    ResetExtensionPrivates();
-    ResetClientPrivates();
+    if (!ResetExtensionPrivates() || !ResetClientPrivates())
+	return FALSE;
     ResetScreenPrivates();
     ResetWindowPrivates();
     ResetGCPrivates();
@@ -317,10 +317,14 @@ dixResetPrivates(void)
     ResetDevicePrivateIndex();
 
     /* register basic resource offsets */
-    if (!dixRegisterPrivateOffset(RT_WINDOW, offsetof(WindowRec,devPrivates)))
-	return FALSE;
-
-    return TRUE;
+    return dixRegisterPrivateOffset(RT_WINDOW,
+				    offsetof(WindowRec, devPrivates)) &&
+	dixRegisterPrivateOffset(RT_PIXMAP,
+				 offsetof(PixmapRec, devPrivates)) &&
+	dixRegisterPrivateOffset(RT_GC,
+				 offsetof(GC, devPrivates)) &&
+	dixRegisterPrivateOffset(RT_COLORMAP,
+				 offsetof(ColormapRec, devPrivates));
 }
 
 /*
@@ -343,15 +347,18 @@ int extensionPrivateLen;
 unsigned *extensionPrivateSizes;
 unsigned totalExtensionSize;
 
-static void
+static int
 ResetExtensionPrivates()
 {
-    extensionPrivateCount = 0;
-    extensionPrivateLen = 0;
+    extensionPrivateCount = 1;
+    extensionPrivateLen = 1;
     xfree(extensionPrivateSizes);
-    extensionPrivateSizes = (unsigned *)NULL;
-    totalExtensionSize =
-	((sizeof(ExtensionEntry) + sizeof(long) - 1) / sizeof(long)) * sizeof(long);
+    extensionPrivateSizes = (unsigned *)xalloc(sizeof(unsigned));
+    if (!extensionPrivateSizes)
+	return FALSE;
+    *extensionPrivateSizes = 0;
+    totalExtensionSize = PadToLong(sizeof(ExtensionEntry)) + sizeof(DevUnion);
+    return TRUE;
 }
 
 _X_EXPORT int
@@ -400,15 +407,18 @@ int clientPrivateLen;
 unsigned *clientPrivateSizes;
 unsigned totalClientSize;
 
-static void
+static int
 ResetClientPrivates()
 {
-    clientPrivateCount = 0;
-    clientPrivateLen = 0;
+    clientPrivateCount = 1;
+    clientPrivateLen = 1;
     xfree(clientPrivateSizes);
-    clientPrivateSizes = (unsigned *)NULL;
-    totalClientSize =
-	((sizeof(ClientRec) + sizeof(long) - 1) / sizeof(long)) * sizeof(long);
+    clientPrivateSizes = (unsigned *)xalloc(sizeof(unsigned));
+    if (!clientPrivateSizes)
+	return FALSE;
+    *clientPrivateSizes = 0;
+    totalClientSize = PadToLong(sizeof(ClientRec)) + sizeof(DevUnion);
+    return TRUE;
 }
 
 _X_EXPORT int
@@ -457,7 +467,7 @@ int  screenPrivateCount;
 static void
 ResetScreenPrivates()
 {
-    screenPrivateCount = 0;
+    screenPrivateCount = 1;
 }
 
 /* this can be called after some screens have been created,
@@ -499,7 +509,7 @@ static int  windowPrivateCount;
 static void
 ResetWindowPrivates()
 {
-    windowPrivateCount = 0;
+    windowPrivateCount = 1;
 }
 
 _X_EXPORT int
@@ -549,7 +559,7 @@ static int  gcPrivateCount;
 static void
 ResetGCPrivates()
 {
-    gcPrivateCount = 0;
+    gcPrivateCount = 1;
 }
 
 _X_EXPORT int
@@ -598,7 +608,7 @@ static int  pixmapPrivateCount;
 static void
 ResetPixmapPrivates()
 {
-    pixmapPrivateCount = 0;
+    pixmapPrivateCount = 1;
 }
 
 _X_EXPORT int
@@ -649,7 +659,7 @@ int  colormapPrivateCount;
 static void
 ResetColormapPrivates()
 {
-    colormapPrivateCount = 0;
+    colormapPrivateCount = 1;
 }
 
 
@@ -734,5 +744,5 @@ AllocateDevicePrivate(DeviceIntPtr device, int index)
 static void
 ResetDevicePrivateIndex(void)
 {
-    devicePrivateIndex = 0;
+    devicePrivateIndex = 1;
 }
diff --git a/include/privates.h b/include/privates.h
index 898fdd9c9..9c95350fa 100644
--- a/include/privates.h
+++ b/include/privates.h
@@ -30,6 +30,13 @@ typedef struct _Private {
     struct _Private	*next;
 } PrivateRec;
 
+/*
+ * Backwards compatibility macro.  Use to get the proper PrivateRec
+ * reference from any of the structure types that supported the old
+ * devPrivates mechanism.
+ */
+#define DEVPRIV_PTR(foo) ((PrivateRec **)(&(foo)->devPrivates[0].ptr))
+
 /*
  * Request pre-allocated private space for your driver/module.
  * A non-null pScreen argument restricts to objects on a given screen.
@@ -156,4 +163,7 @@ dixLookupPrivateOffset(RESTYPE type);
 extern int
 dixRegisterPrivateOffset(RESTYPE type, unsigned offset);
 
+/* Used by the legacy support, don't rely on this being here */
+#define PadToLong(w) ((((w) + sizeof(long)-1) / sizeof(long)) * sizeof(long))
+
 #endif /* PRIVATES_H */

From 947f8d249bac61beb10669d935888c4c280b5062 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 8 Mar 2007 12:13:18 -0500
Subject: [PATCH 038/552] devPrivates rework: redo interface again, dropping
 parent and type parameters as well as preallocation routine.

---
 dix/privates.c             | 89 +++++++-------------------------------
 hw/xfree86/loader/dixsym.c |  1 -
 include/privates.h         | 18 ++------
 3 files changed, 19 insertions(+), 89 deletions(-)

diff --git a/dix/privates.c b/dix/privates.c
index 57da0fa91..01d327b8c 100644
--- a/dix/privates.c
+++ b/dix/privates.c
@@ -48,8 +48,6 @@ from The Open Group.
 
 typedef struct _PrivateDesc {
     devprivate_key_t *key;
-    RESTYPE type;
-    pointer parent;
     unsigned size;
     CallbackListPtr initfuncs;
     CallbackListPtr deletefuncs;
@@ -72,15 +70,13 @@ findItem(devprivate_key_t *const key)
 }
 
 /*
- * Request pre-allocated space in resources of a given type.
+ * Request pre-allocated space.
  */
 _X_EXPORT int
-dixRequestPrivate(RESTYPE type, devprivate_key_t *const key,
-		  unsigned size, pointer parent)
+dixRequestPrivate(devprivate_key_t *const key, unsigned size)
 {
     PrivateDescRec *item = findItem(key);
     if (item) {
-	assert(item->type == type);
 	if (size > item->size)
 	    item->size = size;
     } else {
@@ -91,8 +87,6 @@ dixRequestPrivate(RESTYPE type, devprivate_key_t *const key,
 
 	/* add privates descriptor */
 	item->key = key;
-	item->type = type;
-	item->parent = parent;
 	item->size = size;
 	item->next = items;
 	items = item;
@@ -116,7 +110,6 @@ dixAllocatePrivate(PrivateRec **privates, devprivate_key_t *const key)
     ptr = (PrivateRec *)xalloc(size);
     if (!ptr)
 	return NULL;
-    memset(ptr, 0, size);
     ptr->key = key;
     ptr->value = (size > sizeof(PrivateRec)) ? (ptr + 1) : NULL;
     ptr->next = *privates;
@@ -130,57 +123,6 @@ dixAllocatePrivate(PrivateRec **privates, devprivate_key_t *const key)
     return &ptr->value;
 }
 
-/*
- * Allocates pre-requested privates in a single chunk.
- */
-_X_EXPORT PrivateRec *
-dixAllocatePrivates(RESTYPE type, pointer parent)
-{
-    unsigned count = 0, size = 0;
-    PrivateCallbackRec calldata;
-    PrivateDescRec *item;
-    PrivateRec *ptr;
-    char *value;
-
-    /* first pass figures out total size */
-    for (item = items; item; item = item->next)
-	if ((item->type == type || item->type == RC_ANY) &&
-	    (item->parent == NULL || item->parent == parent)) {
-
-	    size += sizeof(PrivateRec) + item->size;
-	    count++;
-	}
-
-    /* allocate one chunk of memory for everything */
-    ptr = (PrivateRec *)xalloc(size);
-    if (!ptr)
-	return NULL;
-    memset(ptr, 0, size);
-    value = (char *)(ptr + count);
-
-    /* second pass sets up records and calls init funcs */
-    count = 0;
-    for (item = items; item; item = item->next)
-	if ((item->type == type || item->type == RC_ANY) &&
-	    (item->parent == NULL || item->parent == parent)) {
-
-	    ptr[count].key = calldata.key = item->key;
-	    ptr[count].dontfree = (count > 0);
-	    ptr[count].value = calldata.value = (items->size ? value : NULL);
-	    ptr[count].next = ptr + (count + 1);
-
-	    CallCallbacks(&item->initfuncs, &calldata);
-
-	    count++;
-	    value += item->size;
-	}
-
-    if (count > 0)
-	ptr[count-1].next = NULL;
-
-    return ptr;
-}
-
 /*
  * Called to free privates at object deletion time.
  */
@@ -204,16 +146,9 @@ dixFreePrivates(PrivateRec *privates)
     /* second pass frees the memory */
     ptr = privates;
     while (ptr) {
-	if (ptr->dontfree)
-	    ptr = ptr->next;
-	else {
-	    next = ptr->next;
-	    while (next && next->dontfree)
-		next = next->next;
-
-	    xfree(ptr);
-	    ptr = next;
-	}
+	next = ptr->next;
+	xfree(ptr);
+	ptr = next;
     }
 }
 
@@ -225,8 +160,11 @@ dixRegisterPrivateInitFunc(devprivate_key_t *const key,
 			   CallbackProcPtr callback, pointer data)
 {
     PrivateDescRec *item = findItem(key);
-    if (!item)
-	return FALSE;
+    if (!item) {
+	if (!dixRequestPrivate(key, 0))
+	    return FALSE;
+	item = findItem(key);
+    }
     return AddCallback(&item->initfuncs, callback, data);
 }
 
@@ -235,8 +173,11 @@ dixRegisterPrivateDeleteFunc(devprivate_key_t *const key,
 			     CallbackProcPtr callback, pointer data)
 {
     PrivateDescRec *item = findItem(key);
-    if (!item)
-	return FALSE;
+    if (!item) {
+	if (!dixRequestPrivate(key, 0))
+	    return FALSE;
+	item = findItem(key);
+    }
     return AddCallback(&item->deletefuncs, callback, data);
 }
 
diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c
index 6b52aea98..e6c2baac3 100644
--- a/hw/xfree86/loader/dixsym.c
+++ b/hw/xfree86/loader/dixsym.c
@@ -264,7 +264,6 @@ _X_HIDDEN void *dixLookupTab[] = {
     SYMFUNC(dixRegisterPrivateInitFunc)
     SYMFUNC(dixRegisterPrivateDeleteFunc)
     SYMFUNC(dixAllocatePrivate)
-    SYMFUNC(dixAllocatePrivates)
     SYMFUNC(dixFreePrivates)
     SYMFUNC(dixRegisterPrivateOffset)
     SYMFUNC(dixLookupPrivateOffset)
diff --git a/include/privates.h b/include/privates.h
index 9c95350fa..d1e269bc3 100644
--- a/include/privates.h
+++ b/include/privates.h
@@ -19,13 +19,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  * STUFF FOR PRIVATES
  *****************************************************************/
 
-typedef struct _PrivateKey {
-    int unused;
-} devprivate_key_t;
+typedef char devprivate_key_t;
 
 typedef struct _Private {
     devprivate_key_t	*key;
-    int			dontfree;
     pointer		value;
     struct _Private	*next;
 } PrivateRec;
@@ -39,11 +36,10 @@ typedef struct _Private {
 
 /*
  * Request pre-allocated private space for your driver/module.
- * A non-null pScreen argument restricts to objects on a given screen.
+ * Calling this is not necessary if only a pointer by itself is needed.
  */
 extern int
-dixRequestPrivate(RESTYPE type, devprivate_key_t *const key,
-		  unsigned size, pointer pScreen);
+dixRequestPrivate(devprivate_key_t *const key, unsigned size);
 
 /*
  * Allocates a new private and attaches it to an existing object.
@@ -128,13 +124,7 @@ dixRegisterPrivateDeleteFunc(devprivate_key_t *const key,
 			     CallbackProcPtr callback, pointer userdata);
 
 /*
- * Allocates all pre-requested private space in one chunk.
- */
-extern PrivateRec *
-dixAllocatePrivates(RESTYPE type, pointer parent);
-
-/*
- * Frees any private space that is not part of an object.
+ * Frees private data.
  */
 extern void
 dixFreePrivates(PrivateRec *privates);

From 2fcb45eb5dc1803b372df8b5765f6a43bea83611 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 8 Mar 2007 12:13:36 -0500
Subject: [PATCH 039/552] devPrivates rework: redo field offset registration,
 drop RC_PRIVATES class.

---
 dix/privates.c     | 16 ++++++++++------
 include/privates.h |  5 +++--
 include/resource.h |  7 +------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/dix/privates.c b/dix/privates.c
index 01d327b8c..29e261f6b 100644
--- a/dix/privates.c
+++ b/dix/privates.c
@@ -195,12 +195,14 @@ dixRegisterPrivateOffset(RESTYPE type, unsigned offset)
 
     /* resize offsets table if necessary */
     while (type >= offsetsSize) {
-	offsets = (unsigned *)xrealloc(offsets,
-				       offsetsSize * 2 * sizeof(unsigned));
+	unsigned i = offsetsSize * 2 * sizeof(int);
+	offsets = (unsigned *)xrealloc(offsets, i);
 	if (!offsets) {
 	    offsetsSize = 0;
 	    return FALSE;
 	}
+	for (i=offsetsSize; i < 2*offsetsSize; i++)
+	    offsets[i] = -1;
 	offsetsSize *= 2;
     }
 
@@ -208,10 +210,9 @@ dixRegisterPrivateOffset(RESTYPE type, unsigned offset)
     return TRUE;
 }
 
-_X_EXPORT unsigned
+_X_EXPORT int
 dixLookupPrivateOffset(RESTYPE type)
 {
-    assert(type & RC_PRIVATES);
     type = type & TypeMask;
     assert(type < offsetsSize);
     return offsets[type];
@@ -233,19 +234,22 @@ int
 dixResetPrivates(void)
 {
     PrivateDescRec *next;
+    unsigned i;
+
+    /* reset internal structures */
     while (items) {
 	next = items->next;
 	xfree(items);
 	items = next;
     }
-
     if (offsets)
 	xfree(offsets);
-
     offsetsSize = 16;
     offsets = (unsigned *)xalloc(offsetsSize * sizeof(unsigned));
     if (!offsets)
 	return FALSE;
+    for (i=0; i < offsetsSize; i++)
+	offsets[i] = -1;
 
     /* reset legacy devPrivates support */
     if (!ResetExtensionPrivates() || !ResetClientPrivates())
diff --git a/include/privates.h b/include/privates.h
index d1e269bc3..6071e3958 100644
--- a/include/privates.h
+++ b/include/privates.h
@@ -142,9 +142,10 @@ dixResetPrivates(void);
  */
 
 /*
- * Looks up the offset where the devPrivates field is located by type.
+ * Looks up the offset where the devPrivates field is located.
+ * Returns -1 if no offset has been registered for the resource type.
  */
-extern unsigned
+extern int
 dixLookupPrivateOffset(RESTYPE type);
 
 /*
diff --git a/include/resource.h b/include/resource.h
index 40259ac27..3231e8cd9 100644
--- a/include/resource.h
+++ b/include/resource.h
@@ -66,12 +66,7 @@ typedef unsigned long RESTYPE;
  *  Extensions can use this too!
  */
 #define RC_NEVERRETAIN	((RESTYPE)1<<29)
-/*  Use class RC_PRIVATES for resources that support extra private data.
- *  Resources having this class must provide a field of type PrivateRec *.
- *  Refer to the X server documentation on devPrivates for the details.
- */
-#define RC_PRIVATES	((RESTYPE)1<<28)
-#define RC_LASTPREDEF	RC_PRIVATES
+#define RC_LASTPREDEF	RC_NEVERRETAIN
 #define RC_ANY		(~(RESTYPE)0)
 
 /* types for Resource routines */

From b9cff1670f29949a5bc41afc19aca443f434febb Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 8 Mar 2007 12:13:52 -0500
Subject: [PATCH 040/552] Add ResourceStateCallback similar in function to
 ClientStateCallback.

---
 dix/resource.c             | 24 ++++++++++++++++++++++++
 hw/xfree86/loader/dixsym.c |  1 +
 include/resource.h         | 13 +++++++++++++
 3 files changed, 38 insertions(+)

diff --git a/dix/resource.c b/dix/resource.c
index 2cad7c01b..edf32ff34 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -193,6 +193,17 @@ _X_EXPORT RESTYPE TypeMask;
 
 static DeleteType *DeleteFuncs = (DeleteType *)NULL;
 
+_X_EXPORT CallbackListPtr ResourceStateCallback;
+
+static _X_INLINE void
+CallResourceStateCallback(ResourceState state, ResourceRec *res)
+{
+    if (ResourceStateCallback) {
+	ResourceStateInfoRec rsi = { state, res->id, res->type, res->value };
+	CallCallbacks(&ResourceStateCallback, &rsi);
+    }
+}
+
 #ifdef XResExtension
 
 _X_EXPORT Atom * ResourceNames = NULL;
@@ -492,6 +503,7 @@ AddResource(XID id, RESTYPE type, pointer value)
     rrec->elements++;
     if (!(id & SERVER_BIT) && (id >= rrec->expectID))
 	rrec->expectID = id + 1;
+    CallResourceStateCallback(ResourceStateAdding, res);
     return TRUE;
 }
 
@@ -572,6 +584,9 @@ FreeResource(XID id, RESTYPE skipDeleteFuncType)
 #endif		    
 		*prev = res->next;
 		elements = --*eltptr;
+
+		CallResourceStateCallback(ResourceStateFreeing, res);
+
 		if (rtype & RC_CACHED)
 		    FlushClientCaches(res->id);
 		if (rtype != skipDeleteFuncType)
@@ -616,6 +631,9 @@ FreeResourceByType(XID id, RESTYPE type, Bool skipFree)
 			      res->value, TypeNameString(res->type));
 #endif		    		    
 		*prev = res->next;
+
+		CallResourceStateCallback(ResourceStateFreeing, res);
+
 		if (type & RC_CACHED)
 		    FlushClientCaches(res->id);
 		if (!skipFree)
@@ -782,6 +800,9 @@ FreeClientNeverRetainResources(ClientPtr client)
 			      this->value, TypeNameString(this->type));
 #endif		    
 		*prev = this->next;
+
+		CallResourceStateCallback(ResourceStateFreeing, this);
+
 		if (rtype & RC_CACHED)
 		    FlushClientCaches(this->id);
 		(*DeleteFuncs[rtype & TypeMask])(this->value, this->id);
@@ -832,6 +853,9 @@ FreeClientResources(ClientPtr client)
 			  this->value, TypeNameString(this->type));
 #endif		    
 	    *head = this->next;
+
+	    CallResourceStateCallback(ResourceStateFreeing, this);
+
 	    if (rtype & RC_CACHED)
 		FlushClientCaches(this->id);
 	    (*DeleteFuncs[rtype & TypeMask])(this->value, this->id);
diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c
index e6c2baac3..1732d1fe4 100644
--- a/hw/xfree86/loader/dixsym.c
+++ b/hw/xfree86/loader/dixsym.c
@@ -300,6 +300,7 @@ _X_HIDDEN void *dixLookupTab[] = {
     SYMFUNC(FindAllClientResources)
     SYMVAR(lastResourceType)
     SYMVAR(TypeMask)
+    SYMVAR(ResourceStateCallback)
 #ifdef RES
     SYMFUNC(RegisterResourceName)
     SYMVAR(ResourceNames)
diff --git a/include/resource.h b/include/resource.h
index 3231e8cd9..9949dd2fc 100644
--- a/include/resource.h
+++ b/include/resource.h
@@ -120,6 +120,19 @@ typedef unsigned long RESTYPE;
 
 #define BAD_RESOURCE 0xe0000000
 
+/* Resource state callback */
+extern CallbackListPtr ResourceStateCallback;
+
+typedef enum {ResourceStateAdding,
+	      ResourceStateFreeing} ResourceState;
+
+typedef struct {
+    ResourceState state;
+    XID id;
+    RESTYPE type;
+    pointer value;
+} ResourceStateInfoRec;
+
 typedef int (*DeleteType)(
     pointer /*value*/,
     XID /*id*/);

From 18339375cd332f0ab1cbdade3dcd9140212ce1ca Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 8 Mar 2007 12:14:06 -0500
Subject: [PATCH 041/552] xselinux: remove context validation function for now.

---
 Xext/xselinux.c | 36 ------------------------------------
 1 file changed, 36 deletions(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 5b77269f2..ab4827e09 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -57,42 +57,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define XSELINUXCONFIGFILE  NULL
 #endif
 
-
-/* Make sure a locally connecting client has a valid context.  The context
- * for this client is retrieved again later on in AssignClientState(), but
- * by that point it's too late to reject the client.
- */
-static char *
-XSELinuxValidContext (ClientPtr client)
-{
-    security_context_t ctx = NULL;
-    XtransConnInfo ci = ((OsCommPtr)client->osPrivate)->trans_conn;
-    char reason[256];
-    char *ret = (char *)NULL;
-
-    if (_XSERVTransIsLocal(ci))
-    {
-        int fd = _XSERVTransGetConnectionNumber(ci);
-        if (getpeercon(fd, &ctx) < 0)
-        {
-            snprintf(reason, sizeof(reason), "Failed to retrieve SELinux context from socket");
-            ret = reason;
-            goto out;
-        }
-        if (security_check_context(ctx))
-        {
-            snprintf(reason, sizeof(reason), "Client's SELinux context is invalid: %s", ctx);
-            ret = reason;
-        }
-
-        freecon(ctx);
-    }
-
-out:
-    return ret;
-}
-
-
 /* devPrivates in client and extension */
 static int clientPrivateIndex;
 static int extnsnPrivateIndex;

From fe05ba75a10ec080e7ec34bff6936103185586b3 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 8 Mar 2007 12:14:30 -0500
Subject: [PATCH 042/552] devPrivates rework: pass address of pointer to
 private callbacks instead of the pointer itself.

---
 dix/privates.c     | 4 ++--
 include/privates.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dix/privates.c b/dix/privates.c
index 29e261f6b..8aab32d0e 100644
--- a/dix/privates.c
+++ b/dix/privates.c
@@ -117,7 +117,7 @@ dixAllocatePrivate(PrivateRec **privates, devprivate_key_t *const key)
 
     /* call any init funcs and return */
     if (item) {
-	PrivateCallbackRec calldata = { key, ptr->value };
+	PrivateCallbackRec calldata = { key, &ptr->value };
 	CallCallbacks(&item->initfuncs, &calldata);
     }
     return &ptr->value;
@@ -138,7 +138,7 @@ dixFreePrivates(PrivateRec *privates)
 	item = findItem(ptr->key);
 	if (item) {
 	    calldata.key = ptr->key;
-	    calldata.value = ptr->value;
+	    calldata.value = &ptr->value;
 	    CallCallbacks(&item->deletefuncs, &calldata);
 	}
     }
diff --git a/include/privates.h b/include/privates.h
index 6071e3958..e57f16712 100644
--- a/include/privates.h
+++ b/include/privates.h
@@ -112,7 +112,7 @@ dixSetPrivate(PrivateRec **privates, devprivate_key_t *const key, pointer val)
  */
 typedef struct _PrivateCallback {
     devprivate_key_t *key;	/* private registration key */
-    pointer value;		/* pointer to private */
+    pointer *value;		/* address of private pointer */
 } PrivateCallbackRec;
 
 extern int

From 6a89106e9c963a495fd40427d242ba0abd44f764 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 19 Mar 2007 16:51:29 -0400
Subject: [PATCH 043/552] xselinux + security: remove confusing CALLBACK macro.

---
 Xext/security.c | 43 ++++++++++++++++++++++++++++++-------------
 Xext/xselinux.c | 32 ++++++++++++++++++++------------
 2 files changed, 50 insertions(+), 25 deletions(-)

diff --git a/Xext/security.c b/Xext/security.c
index 7202d3947..98e91ad48 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -83,9 +83,6 @@ RESTYPE SecurityAuthorizationResType; /* resource type for authorizations */
 
 static RESTYPE RTEventClient;
 
-#define CALLBACK(name) static void \
-name(CallbackListPtr *pcbl, pointer nulldata, pointer calldata)
-
 /* SecurityAudit
  *
  * Arguments:
@@ -779,7 +776,9 @@ SecurityDetermineEventPropogationLimits(
  *	An audit message is generated if access is denied.
  */
 
-CALLBACK(SecurityCheckDeviceAccess)
+static void
+SecurityCheckDeviceAccess(CallbackListPtr *pcbl, pointer unused,
+			  pointer calldata)
 {
     XaceDeviceAccessRec *rec = (XaceDeviceAccessRec*)calldata;
     ClientPtr client = rec->client;
@@ -955,7 +954,9 @@ SecurityAuditResourceIDAccess(
  *	Disallowed resource accesses are audited.
  */
 
-CALLBACK(SecurityCheckResourceIDAccess)
+static void
+SecurityCheckResourceIDAccess(CallbackListPtr *pcbl, pointer unused,
+			      pointer calldata)
 {
     XaceResourceAccessRec *rec = (XaceResourceAccessRec*)calldata;
     ClientPtr client = rec->client;
@@ -1114,7 +1115,9 @@ CALLBACK(SecurityCheckResourceIDAccess)
  * if it is now zero, the timer for this authorization is started.
  */
 
-CALLBACK(SecurityClientStateCallback)
+static void
+SecurityClientStateCallback(CallbackListPtr *pcbl, pointer unused,
+			    pointer calldata)
 {
     NewClientInfoRec *pci = (NewClientInfoRec *)calldata;
     ClientPtr client = pci->client;
@@ -1171,7 +1174,9 @@ CALLBACK(SecurityClientStateCallback)
     }
 } /* SecurityClientStateCallback */
 
-CALLBACK(SecurityCheckDrawableAccess)
+static void
+SecurityCheckDrawableAccess(CallbackListPtr *pcbl, pointer unused,
+			    pointer calldata)
 {
     XaceDrawableAccessRec *rec = (XaceDrawableAccessRec*)calldata;
 
@@ -1179,7 +1184,9 @@ CALLBACK(SecurityCheckDrawableAccess)
 	rec->rval = FALSE;
 }
 
-CALLBACK(SecurityCheckMapAccess)
+static void
+SecurityCheckMapAccess(CallbackListPtr *pcbl, pointer unused,
+		       pointer calldata)
 {
     XaceMapAccessRec *rec = (XaceMapAccessRec*)calldata;
     WindowPtr pWin = rec->pWin;
@@ -1193,7 +1200,9 @@ CALLBACK(SecurityCheckMapAccess)
 	rec->rval = FALSE;
 }
 
-CALLBACK(SecurityCheckBackgrndAccess)
+static void
+SecurityCheckBackgrndAccess(CallbackListPtr *pcbl, pointer unused,
+			    pointer calldata)
 {
     XaceMapAccessRec *rec = (XaceMapAccessRec*)calldata;
 
@@ -1201,7 +1210,9 @@ CALLBACK(SecurityCheckBackgrndAccess)
 	rec->rval = FALSE;
 }
 
-CALLBACK(SecurityCheckExtAccess)
+static void
+SecurityCheckExtAccess(CallbackListPtr *pcbl, pointer unused,
+		       pointer calldata)
 {
     XaceExtAccessRec *rec = (XaceExtAccessRec*)calldata;
 
@@ -1211,7 +1222,9 @@ CALLBACK(SecurityCheckExtAccess)
 	rec->rval = FALSE;
 }
 
-CALLBACK(SecurityCheckHostlistAccess)
+static void
+SecurityCheckHostlistAccess(CallbackListPtr *pcbl, pointer unused,
+			    pointer calldata)
 {
     XaceHostlistAccessRec *rec = (XaceHostlistAccessRec*)calldata;
  
@@ -1227,7 +1240,9 @@ CALLBACK(SecurityCheckHostlistAccess)
     }
 }
 
-CALLBACK(SecurityDeclareExtSecure)
+static void
+SecurityDeclareExtSecure(CallbackListPtr *pcbl, pointer unused,
+			 pointer calldata)
 {
     XaceDeclareExtSecureRec *rec = (XaceDeclareExtSecureRec*)calldata;
 
@@ -1692,7 +1707,9 @@ SecurityMatchString(
 #endif
 
 
-CALLBACK(SecurityCheckPropertyAccess)
+static void
+SecurityCheckPropertyAccess(CallbackListPtr *pcbl, pointer unused,
+			    pointer calldata)
 {    
     XacePropertyAccessRec *rec = (XacePropertyAccessRec*)calldata;
     ClientPtr client = rec->client;
diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index ab4827e09..74d4c6067 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -503,8 +503,6 @@ FreeClientState(ClientPtr client)
 #define IDPERM(client, req, field, class, perm) \
     (REQUEST_SIZE_CHECK(client,req) && \
     IDPerm(client, SwapXID(client,((req*)stuff)->field), class, perm))
-#define CALLBACK(name) static void \
-name(CallbackListPtr *pcbl, pointer nulldata, pointer calldata)
 
 static int
 CheckSendEventPerms(ClientPtr client)
@@ -632,7 +630,8 @@ CheckSetSelectionOwnerPerms(ClientPtr client)
     return rval;
 }
 
-CALLBACK(XSELinuxCoreDispatch)
+static void
+XSELinuxCoreDispatch(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     XaceCoreDispatchRec *rec = (XaceCoreDispatchRec*)calldata;
     ClientPtr client = rec->client;
@@ -1017,7 +1016,8 @@ CALLBACK(XSELinuxCoreDispatch)
 	rec->rval = FALSE;
 }
 
-CALLBACK(XSELinuxExtDispatch)
+static void
+XSELinuxExtDispatch(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     XaceExtAccessRec *rec = (XaceExtAccessRec*)calldata;
     ClientPtr client = rec->client;
@@ -1058,7 +1058,8 @@ CALLBACK(XSELinuxExtDispatch)
 	ErrorF("No client state in extension dispatcher!\n");
 } /* XSELinuxExtDispatch */
 
-CALLBACK(XSELinuxProperty)
+static void
+XSELinuxProperty(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     XacePropertyAccessRec *rec = (XacePropertyAccessRec*)calldata;
     WindowPtr pWin = rec->pWin;
@@ -1106,7 +1107,8 @@ CALLBACK(XSELinuxProperty)
     sidput(propsid);
 } /* XSELinuxProperty */
 
-CALLBACK(XSELinuxResLookup)
+static void
+XSELinuxResLookup(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     XaceResourceAccessRec *rec = (XaceResourceAccessRec*)calldata;
     ClientPtr client = rec->client;
@@ -1147,7 +1149,8 @@ CALLBACK(XSELinuxResLookup)
 	rec->rval = FALSE;
 } /* XSELinuxResLookup */
 
-CALLBACK(XSELinuxMap)
+static void
+XSELinuxMap(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     XaceMapAccessRec *rec = (XaceMapAccessRec*)calldata;
     if (!IDPerm(rec->client, rec->pWin->drawable.id,
@@ -1155,7 +1158,8 @@ CALLBACK(XSELinuxMap)
 	rec->rval = FALSE;
 } /* XSELinuxMap */
 
-CALLBACK(XSELinuxBackgrnd)
+static void
+XSELinuxBackgrnd(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     XaceMapAccessRec *rec = (XaceMapAccessRec*)calldata;
     if (!IDPerm(rec->client, rec->pWin->drawable.id,
@@ -1163,7 +1167,8 @@ CALLBACK(XSELinuxBackgrnd)
 	rec->rval = FALSE;
 } /* XSELinuxBackgrnd */
 
-CALLBACK(XSELinuxDrawable)
+static void
+XSELinuxDrawable(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     XaceDrawableAccessRec *rec = (XaceDrawableAccessRec*)calldata;
     if (!IDPerm(rec->client, rec->pDraw->id,
@@ -1171,7 +1176,8 @@ CALLBACK(XSELinuxDrawable)
 	rec->rval = FALSE;
 } /* XSELinuxDrawable */
 
-CALLBACK(XSELinuxHostlist)
+static void
+XSELinuxHostlist(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     XaceHostlistAccessRec *rec = (XaceHostlistAccessRec*)calldata;
     access_vector_t perm = (rec->access_mode == DixReadAccess) ?
@@ -1182,7 +1188,8 @@ CALLBACK(XSELinuxHostlist)
 } /* XSELinuxHostlist */
 
 /* Extension callbacks */
-CALLBACK(XSELinuxClientState)
+static void
+XSELinuxClientState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     NewClientInfoRec *pci = (NewClientInfoRec *)calldata;
     ClientPtr client = pci->client;
@@ -1209,7 +1216,8 @@ CALLBACK(XSELinuxClientState)
 } /* XSELinuxClientState */
 
 /* Labeling callbacks */
-CALLBACK(XSELinuxWindowInit)
+static void
+XSELinuxWindowInit(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     XaceWindowRec *rec = (XaceWindowRec*)calldata;
     security_context_t ctx;

From 78c962da76efe644b8d485265f1ecdda84b45d27 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 19 Mar 2007 17:04:51 -0400
Subject: [PATCH 044/552] xselinux: use the new ResourceStateCallback instead
 of the XACE_WINDOW_INIT hook.

---
 Xext/xselinux.c | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 74d4c6067..4056d9e92 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -1217,26 +1217,34 @@ XSELinuxClientState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 
 /* Labeling callbacks */
 static void
-XSELinuxWindowInit(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+XSELinuxResourceState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
-    XaceWindowRec *rec = (XaceWindowRec*)calldata;
+    ResourceStateInfoRec *rec = (ResourceStateInfoRec *)calldata;
+    WindowPtr pWin;
+    ClientPtr client;
     security_context_t ctx;
     int rc;
 
-    if (HAVESTATE(rec->client)) {
-	rc = avc_sid_to_context(SID(rec->client), &ctx);
+    if (rec->type != RT_WINDOW)
+	return;
+
+    pWin = (WindowPtr)rec->value;
+    client = wClient(pWin);
+
+    if (HAVESTATE(client)) {
+	rc = avc_sid_to_context(SID(client), &ctx);
 	if (rc < 0)
 	    FatalError("XSELinux: Failed to get security context!\n");
-	rc = ChangeWindowProperty(rec->pWin, atom_client_ctx, XA_STRING, 8,
+	rc = ChangeWindowProperty(pWin, atom_client_ctx, XA_STRING, 8,
 				  PropModeReplace, strlen(ctx), ctx, FALSE);
 	freecon(ctx);
     }
     else
-	rc = ChangeWindowProperty(rec->pWin, atom_client_ctx, XA_STRING, 8,
+	rc = ChangeWindowProperty(pWin, atom_client_ctx, XA_STRING, 8,
 				  PropModeReplace, 10, "UNLABELED!", FALSE);
     if (rc != Success)
 	FatalError("XSELinux: Failed to set context property on window!\n");
-} /* XSELinuxWindowInit */
+} /* XSELinuxResourceState */
 
 static char *XSELinuxKeywords[] = {
 #define XSELinuxKeywordComment 0
@@ -1836,6 +1844,8 @@ XSELinuxExtensionInit(INITARGS)
 
     if (!AddCallback(&ClientStateCallback, XSELinuxClientState, NULL))
 	return;
+    if (!AddCallback(&ResourceStateCallback, XSELinuxResourceState, NULL))
+	return;
 
     /* Create atoms for doing window labeling */
     atom_ctx = MakeAtom("_SELINUX_CONTEXT", 16, 1);
@@ -1870,7 +1880,6 @@ XSELinuxExtensionInit(INITARGS)
     XaceRegisterCallback(XACE_BACKGRND_ACCESS, XSELinuxBackgrnd, NULL);
     XaceRegisterCallback(XACE_DRAWABLE_ACCESS, XSELinuxDrawable, NULL);
     XaceRegisterCallback(XACE_PROPERTY_ACCESS, XSELinuxProperty, NULL);
-    XaceRegisterCallback(XACE_WINDOW_INIT, XSELinuxWindowInit, NULL);
     /* XaceRegisterCallback(XACE_DECLARE_EXT_SECURE, XSELinuxDeclare, NULL);
     XaceRegisterCallback(XACE_DEVICE_ACCESS, XSELinuxDevice, NULL); */
 

From 2945deba1d4a7dce4f6dd0c568297a1c537fdfb4 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 19 Mar 2007 17:09:10 -0400
Subject: [PATCH 045/552] xace: drop XACE_WINDOW_INIT hook, it has been
 superseded by ResourceStateCallback.

---
 Xext/xace.c    | 8 --------
 Xext/xace.h    | 7 +++----
 Xext/xacestr.h | 6 ------
 dix/window.c   | 4 ----
 4 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/Xext/xace.c b/Xext/xace.c
index 6fc5c12ee..ee0f39c20 100644
--- a/Xext/xace.c
+++ b/Xext/xace.c
@@ -182,14 +182,6 @@ int XaceHook(int hook, ...)
 	    calldata = &rec;
 	    break;
 	}
-	case XACE_WINDOW_INIT: {
-	    XaceWindowRec rec = {
-		va_arg(ap, ClientPtr),
-		va_arg(ap, WindowPtr)
-	    };
-	    calldata = &rec;
-	    break;
-	}
 	case XACE_AUDIT_BEGIN: {
 	    XaceAuditRec rec = {
 		va_arg(ap, ClientPtr),
diff --git a/Xext/xace.h b/Xext/xace.h
index 7231b04bc..7360dae5b 100644
--- a/Xext/xace.h
+++ b/Xext/xace.h
@@ -54,10 +54,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define XACE_DECLARE_EXT_SECURE		11
 #define XACE_AUTH_AVAIL			12
 #define XACE_KEY_AVAIL			13
-#define XACE_WINDOW_INIT		14
-#define XACE_AUDIT_BEGIN		15
-#define XACE_AUDIT_END			16
-#define XACE_NUM_HOOKS			17
+#define XACE_AUDIT_BEGIN		14
+#define XACE_AUDIT_END			15
+#define XACE_NUM_HOOKS			16
 
 extern CallbackListPtr XaceHooks[XACE_NUM_HOOKS];
 
diff --git a/Xext/xacestr.h b/Xext/xacestr.h
index 7114d066b..bd3088381 100644
--- a/Xext/xacestr.h
+++ b/Xext/xacestr.h
@@ -119,12 +119,6 @@ typedef struct {
     int count;
 } XaceKeyAvailRec;
 
-/* XACE_WINDOW_INIT */
-typedef struct {
-    ClientPtr client;
-    WindowPtr pWin;
-} XaceWindowRec;
-
 /* XACE_AUDIT_BEGIN */
 /* XACE_AUDIT_END */
 typedef struct {
diff --git a/dix/window.c b/dix/window.c
index e33140dd4..02496f53e 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -529,8 +529,6 @@ InitRootWindow(WindowPtr pWin)
     /* We SHOULD check for an error value here XXX */
     (*pScreen->ChangeWindowAttributes)(pWin, backFlag);
 
-    XaceHook(XACE_WINDOW_INIT, serverClient, pWin);
-
     MapWindow(pWin, serverClient);
 }
 
@@ -763,8 +761,6 @@ CreateWindow(Window wid, register WindowPtr pParent, int x, int y, unsigned w,
     REGION_NULL(pScreen, &pWin->winSize);
     REGION_NULL(pScreen, &pWin->borderSize);
 
-    XaceHook(XACE_WINDOW_INIT, client, pWin);
-
     pHead = RealChildHead(pParent);
     if (pHead)
     {

From 9c144f8ac5cea25deaa543767dbaf371d029c608 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 21 Mar 2007 14:39:00 -0400
Subject: [PATCH 046/552] xace: add XACE_SELECTION_ACCESS hook for selection
 redirection/access.

---
 Xext/xace.c    | 10 ++++++++++
 Xext/xace.h    | 15 ++++++++-------
 Xext/xacestr.h |  8 ++++++++
 dix/dispatch.c |  7 +++----
 4 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/Xext/xace.c b/Xext/xace.c
index ee0f39c20..2b873cbf0 100644
--- a/Xext/xace.c
+++ b/Xext/xace.c
@@ -147,6 +147,16 @@ int XaceHook(int hook, ...)
 	    prv = &rec.rval;
 	    break;
 	}
+	case XACE_SELECTION_ACCESS: {
+	    XaceSelectionAccessRec rec = {
+		va_arg(ap, ClientPtr),
+		va_arg(ap, Selection*),
+		TRUE	/* default allow */
+	    };
+	    calldata = &rec;
+	    prv = &rec.rval;
+	    break;
+	}
 	case XACE_SITE_POLICY: {
 	    XaceSitePolicyRec rec = {
 		va_arg(ap, char*),
diff --git a/Xext/xace.h b/Xext/xace.h
index 7360dae5b..020a047d0 100644
--- a/Xext/xace.h
+++ b/Xext/xace.h
@@ -50,13 +50,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define XACE_BACKGRND_ACCESS		7
 #define XACE_EXT_ACCESS			8
 #define XACE_HOSTLIST_ACCESS		9
-#define XACE_SITE_POLICY		10
-#define XACE_DECLARE_EXT_SECURE		11
-#define XACE_AUTH_AVAIL			12
-#define XACE_KEY_AVAIL			13
-#define XACE_AUDIT_BEGIN		14
-#define XACE_AUDIT_END			15
-#define XACE_NUM_HOOKS			16
+#define XACE_SELECTION_ACCESS		10
+#define XACE_SITE_POLICY		11
+#define XACE_DECLARE_EXT_SECURE		12
+#define XACE_AUTH_AVAIL			13
+#define XACE_KEY_AVAIL			14
+#define XACE_AUDIT_BEGIN		15
+#define XACE_AUDIT_END			16
+#define XACE_NUM_HOOKS			17
 
 extern CallbackListPtr XaceHooks[XACE_NUM_HOOKS];
 
diff --git a/Xext/xacestr.h b/Xext/xacestr.h
index bd3088381..4c480a4ea 100644
--- a/Xext/xacestr.h
+++ b/Xext/xacestr.h
@@ -27,6 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "gcstruct.h"
 #include "windowstr.h"
 #include "inputstr.h"
+#include "selection.h"
 #include "xace.h"
 
 /* XACE_CORE_DISPATCH */
@@ -93,6 +94,13 @@ typedef struct {
     int rval;
 } XaceHostlistAccessRec;
 
+/* XACE_SELECTION_ACCESS */
+typedef struct {
+    ClientPtr client;
+    Selection *selection;
+    int rval;
+} XaceSelectionAccessRec;
+
 /* XACE_SITE_POLICY */
 typedef struct {
     char *policyString;
diff --git a/dix/dispatch.c b/dix/dispatch.c
index d44687ec3..498f18a9c 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -1113,7 +1113,8 @@ ProcGetSelectionOwner(register ClientPtr client)
         reply.type = X_Reply;
 	reply.length = 0;
 	reply.sequenceNumber = client->sequence;
-        if (i < NumCurrentSelections)
+        if (i < NumCurrentSelections &&
+	    XaceHook(XACE_SELECTION_ACCESS, client, &CurrentSelections[i]))
             reply.owner = CurrentSelections[i].window;
         else
             reply.owner = None;
@@ -1153,9 +1154,7 @@ ProcConvertSelection(register ClientPtr client)
 	       CurrentSelections[i].selection != stuff->selection) i++;
 	if ((i < NumCurrentSelections) &&
 	    (CurrentSelections[i].window != None) &&
-	    XaceHook(XACE_RESOURCE_ACCESS, client,
-		     CurrentSelections[i].window, RT_WINDOW,
-		     DixReadAccess, CurrentSelections[i].pWin))
+	    XaceHook(XACE_SELECTION_ACCESS, client, &CurrentSelections[i]))
 	{        
 	    event.u.u.type = SelectionRequest;
 	    event.u.selectionRequest.time = stuff->time;

From 4fa482b4be1150bcffeabb64d018c00ac5951e41 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 21 Mar 2007 14:49:56 -0400
Subject: [PATCH 047/552] xace: bump major version since the hooks have
 changed.

---
 Xext/xace.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Xext/xace.h b/Xext/xace.h
index 020a047d0..d3d5a84be 100644
--- a/Xext/xace.h
+++ b/Xext/xace.h
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifdef XACE
 
 #define XACE_EXTENSION_NAME		"XAccessControlExtension"
-#define XACE_MAJOR_VERSION		1
+#define XACE_MAJOR_VERSION		2
 #define XACE_MINOR_VERSION		0
 
 #include "pixmap.h"     /* for DrawablePtr */

From 4c1fb8069d5dd30a73277698503e9dcc2e9d64c6 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 21 Mar 2007 16:17:14 -0400
Subject: [PATCH 048/552] dix: add new selection fields supporting redirection.
 This is a minor ABI break.

---
 dix/dispatch.c      | 16 ++++++++++++----
 include/selection.h |  4 ++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/dix/dispatch.c b/dix/dispatch.c
index 498f18a9c..b5ed13d0c 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -1074,11 +1074,16 @@ ProcSetSelectionOwner(register ClientPtr client)
 	    NumCurrentSelections++;
 	    CurrentSelections = newsels;
 	    CurrentSelections[i].selection = stuff->selection;
+	    CurrentSelections[i].devPrivates = NULL;
 	}
+	dixFreePrivates(CurrentSelections[i].devPrivates);
         CurrentSelections[i].lastTimeChanged = time;
 	CurrentSelections[i].window = stuff->window;
+	CurrentSelections[i].destwindow = stuff->window;
 	CurrentSelections[i].pWin = pWin;
 	CurrentSelections[i].client = (pWin ? client : NullClient);
+	CurrentSelections[i].destclient = (pWin ? client : NullClient);
+	CurrentSelections[i].devPrivates = NULL;
 	if (SelectionCallback)
 	{
 	    SelectionInfoRec	info;
@@ -1115,7 +1120,7 @@ ProcGetSelectionOwner(register ClientPtr client)
 	reply.sequenceNumber = client->sequence;
         if (i < NumCurrentSelections &&
 	    XaceHook(XACE_SELECTION_ACCESS, client, &CurrentSelections[i]))
-            reply.owner = CurrentSelections[i].window;
+            reply.owner = CurrentSelections[i].destwindow;
         else
             reply.owner = None;
         WriteReplyToClient(client, sizeof(xGetSelectionOwnerReply), &reply);
@@ -1158,14 +1163,13 @@ ProcConvertSelection(register ClientPtr client)
 	{        
 	    event.u.u.type = SelectionRequest;
 	    event.u.selectionRequest.time = stuff->time;
-	    event.u.selectionRequest.owner = 
-			CurrentSelections[i].window;
+	    event.u.selectionRequest.owner = CurrentSelections[i].window;
 	    event.u.selectionRequest.requestor = stuff->requestor;
 	    event.u.selectionRequest.selection = stuff->selection;
 	    event.u.selectionRequest.target = stuff->target;
 	    event.u.selectionRequest.property = stuff->property;
 	    if (TryClientEvents(
-		CurrentSelections[i].client, &event, 1, NoEventMask,
+		CurrentSelections[i].destclient, &event, 1, NoEventMask,
 		NoEventMask /* CantBeFiltered */, NullGrab))
 		return (client->noClientException);
 	}
@@ -4020,9 +4024,11 @@ DeleteWindowFromAnySelections(WindowPtr pWin)
 		info.kind = SelectionWindowDestroy;
 		CallCallbacks(&SelectionCallback, &info);
 	    }
+	    dixFreePrivates(CurrentSelections[i].devPrivates);
             CurrentSelections[i].pWin = (WindowPtr)NULL;
             CurrentSelections[i].window = None;
 	    CurrentSelections[i].client = NullClient;
+	    CurrentSelections[i].devPrivates = NULL;
 	}
 }
 
@@ -4042,9 +4048,11 @@ DeleteClientFromAnySelections(ClientPtr client)
 		info.kind = SelectionWindowDestroy;
 		CallCallbacks(&SelectionCallback, &info);
 	    }
+	    dixFreePrivates(CurrentSelections[i].devPrivates);
             CurrentSelections[i].pWin = (WindowPtr)NULL;
             CurrentSelections[i].window = None;
 	    CurrentSelections[i].client = NullClient;
+	    CurrentSelections[i].devPrivates = NULL;
 	}
 }
 
diff --git a/include/selection.h b/include/selection.h
index fbe7cfca6..93473767a 100644
--- a/include/selection.h
+++ b/include/selection.h
@@ -50,6 +50,7 @@ SOFTWARE.
 ******************************************************************/
 
 #include "dixstruct.h"
+#include "privates.h"
 /*
  *
  *  Selection data structures 
@@ -61,6 +62,9 @@ typedef struct _Selection {
     Window window;
     WindowPtr pWin;
     ClientPtr client;
+    ClientPtr destclient; /* support for redirection */
+    Window destwindow;    /* support for redirection */
+    PrivateRec *devPrivates;
 } Selection;
 
 #endif /* SELECTION_H */

From a3296d111dc4d76aa3afa7e338cbab93eb390ec4 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 21 Mar 2007 17:01:26 -0400
Subject: [PATCH 049/552] xace: add access_mode argument to selection hook.

---
 Xext/xace.c    | 1 +
 Xext/xacestr.h | 1 +
 dix/dispatch.c | 6 ++++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Xext/xace.c b/Xext/xace.c
index 2b873cbf0..9502b5da9 100644
--- a/Xext/xace.c
+++ b/Xext/xace.c
@@ -151,6 +151,7 @@ int XaceHook(int hook, ...)
 	    XaceSelectionAccessRec rec = {
 		va_arg(ap, ClientPtr),
 		va_arg(ap, Selection*),
+		va_arg(ap, Mask),
 		TRUE	/* default allow */
 	    };
 	    calldata = &rec;
diff --git a/Xext/xacestr.h b/Xext/xacestr.h
index 4c480a4ea..edf7b66fb 100644
--- a/Xext/xacestr.h
+++ b/Xext/xacestr.h
@@ -98,6 +98,7 @@ typedef struct {
 typedef struct {
     ClientPtr client;
     Selection *selection;
+    Mask access_mode;
     int rval;
 } XaceSelectionAccessRec;
 
diff --git a/dix/dispatch.c b/dix/dispatch.c
index b5ed13d0c..e4bc93728 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -1119,7 +1119,8 @@ ProcGetSelectionOwner(register ClientPtr client)
 	reply.length = 0;
 	reply.sequenceNumber = client->sequence;
         if (i < NumCurrentSelections &&
-	    XaceHook(XACE_SELECTION_ACCESS, client, &CurrentSelections[i]))
+	    XaceHook(XACE_SELECTION_ACCESS, client, &CurrentSelections[i],
+		     DixReadAccess))
             reply.owner = CurrentSelections[i].destwindow;
         else
             reply.owner = None;
@@ -1159,7 +1160,8 @@ ProcConvertSelection(register ClientPtr client)
 	       CurrentSelections[i].selection != stuff->selection) i++;
 	if ((i < NumCurrentSelections) &&
 	    (CurrentSelections[i].window != None) &&
-	    XaceHook(XACE_SELECTION_ACCESS, client, &CurrentSelections[i]))
+	    XaceHook(XACE_SELECTION_ACCESS, client, &CurrentSelections[i],
+		     DixReadAccess))
 	{        
 	    event.u.u.type = SelectionRequest;
 	    event.u.selectionRequest.time = stuff->time;

From 5486be4898766205149fadce71529724eb78fbf3 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 22 Mar 2007 10:59:21 -0400
Subject: [PATCH 050/552] dix: devPrivates support for PropertyRec.

---
 dix/property.c       | 4 ++++
 include/propertyst.h | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/dix/property.c b/dix/property.c
index d40284901..3aa8e77e8 100644
--- a/dix/property.c
+++ b/dix/property.c
@@ -281,6 +281,7 @@ ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format,
 	    memmove((char *)data, (char *)value, totalSize);
 	pProp->size = len;
         pProp->next = pWin->optional->userProps;
+	pProp->devPrivates = NULL;
         pWin->optional->userProps = pProp;
     }
     else
@@ -383,6 +384,7 @@ DeleteProperty(WindowPtr pWin, Atom propName)
         event.u.property.atom = pProp->propertyName;
 	event.u.property.time = currentTime.milliseconds;
 	DeliverEvents(pWin, &event, 1, (WindowPtr)NULL);
+	dixFreePrivates(pProp->devPrivates);
 	xfree(pProp->data);
         xfree(pProp);
     }
@@ -405,6 +407,7 @@ DeleteAllWindowProperties(WindowPtr pWin)
 	event.u.property.time = currentTime.milliseconds;
 	DeliverEvents(pWin, &event, 1, (WindowPtr)NULL);
 	pNextProp = pProp->next;
+	dixFreePrivates(pProp->devPrivates);
         xfree(pProp->data);
         xfree(pProp);
 	pProp = pNextProp;
@@ -569,6 +572,7 @@ ProcGetProperty(ClientPtr client)
 	}
 	else
 	    prevProp->next = pProp->next;
+	dixFreePrivates(pProp->devPrivates);
 	xfree(pProp->data);
 	xfree(pProp);
     }
diff --git a/include/propertyst.h b/include/propertyst.h
index 6add81d9a..fd1148eb7 100644
--- a/include/propertyst.h
+++ b/include/propertyst.h
@@ -49,6 +49,7 @@ SOFTWARE.
 #define PROPERTYSTRUCT_H 
 #include "misc.h"
 #include "property.h"
+#include "privates.h"
 /* 
  *   PROPERTY -- property element
  */
@@ -60,6 +61,7 @@ typedef struct _Property {
 	short		format;     /* format of data for swapping - 8,16,32 */
 	long		size;       /* size of data in (format/8) bytes */
 	pointer         data;       /* private to client */
+	PrivateRec	*devPrivates;
 } PropertyRec;
 
 #endif /* PROPERTYSTRUCT_H */

From 1b58304ac837735920747ed0f0d10ba331bdaeb7 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 22 Mar 2007 13:06:50 -0400
Subject: [PATCH 051/552] xace: add new argument to property hook for property
 structure itself.

---
 Xext/security.c |  6 -----
 Xext/xace.c     |  3 +--
 Xext/xacestr.h  |  2 ++
 dix/property.c  | 67 +++++++++++++++++++++++++++----------------------
 4 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/Xext/security.c b/Xext/security.c
index 98e91ad48..b7a0925c7 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -28,14 +28,8 @@ in this Software without prior written authorization from The Open Group.
 #include <dix-config.h>
 #endif
 
-#include "dixstruct.h"
-#include "extnsionst.h"
-#include "windowstr.h"
-#include "inputstr.h"
 #include "scrnintstr.h"
-#include "gcstruct.h"
 #include "colormapst.h"
-#include "propertyst.h"
 #include "xacestr.h"
 #include "securitysrv.h"
 #include <X11/extensions/securstr.h>
diff --git a/Xext/xace.c b/Xext/xace.c
index 9502b5da9..8e277ac81 100644
--- a/Xext/xace.c
+++ b/Xext/xace.c
@@ -22,9 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #endif
 
 #include <stdarg.h>
-#include "windowstr.h"
 #include "scrnintstr.h"
-#include "gcstruct.h"
 #include "xacestr.h"
 #include "modinit.h"
 
@@ -97,6 +95,7 @@ int XaceHook(int hook, ...)
 	    XacePropertyAccessRec rec = {
 		va_arg(ap, ClientPtr),
 		va_arg(ap, WindowPtr),
+		va_arg(ap, PropertyPtr),
 		va_arg(ap, Atom),
 		va_arg(ap, Mask),
 		XaceAllowOperation   /* default allow */
diff --git a/Xext/xacestr.h b/Xext/xacestr.h
index edf7b66fb..19d154021 100644
--- a/Xext/xacestr.h
+++ b/Xext/xacestr.h
@@ -27,6 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "gcstruct.h"
 #include "windowstr.h"
 #include "inputstr.h"
+#include "propertyst.h"
 #include "selection.h"
 #include "xace.h"
 
@@ -59,6 +60,7 @@ typedef struct {
 typedef struct {
     ClientPtr client;
     WindowPtr pWin;
+    PropertyPtr pProp;
     Atom propertyName;
     Mask access_mode;
     int rval;
diff --git a/dix/property.c b/dix/property.c
index 3aa8e77e8..5e11b5f6c 100644
--- a/dix/property.c
+++ b/dix/property.c
@@ -91,6 +91,19 @@ PrintPropertys(WindowPtr pWin)
 }
 #endif
 
+static _X_INLINE PropertyPtr
+FindProperty(WindowPtr pWin, Atom propertyName)
+{
+    PropertyPtr pProp = wUserProps(pWin);
+    while (pProp)
+    {
+	if (pProp->propertyName == propertyName)
+	    break;
+	pProp = pProp->next;
+    }
+    return pProp;
+}
+
 int
 ProcRotateProperties(ClientPtr client)
 {
@@ -115,35 +128,33 @@ ProcRotateProperties(ClientPtr client)
 	return(BadAlloc);
     for (i = 0; i < stuff->nAtoms; i++)
     {
-	char action = XaceHook(XACE_PROPERTY_ACCESS, client, pWin, atoms[i],
-				DixReadAccess|DixWriteAccess);
-
-        if (!ValidAtom(atoms[i]) || (XaceErrorOperation == action)) {
+        if (!ValidAtom(atoms[i])) {
             DEALLOCATE_LOCAL(props);
 	    client->errorValue = atoms[i];
             return BadAtom;
         }
-	if (XaceIgnoreOperation == action) {
-            DEALLOCATE_LOCAL(props);
-	    return Success;
-	}
-
         for (j = i + 1; j < stuff->nAtoms; j++)
             if (atoms[j] == atoms[i])
             {
                 DEALLOCATE_LOCAL(props);
                 return BadMatch;
             }
-        pProp = wUserProps (pWin);
-        while (pProp)
-        {
-            if (pProp->propertyName == atoms[i])
-                goto found;
-	    pProp = pProp->next;
-        }
-        DEALLOCATE_LOCAL(props);
-        return BadMatch;
-found: 
+	pProp = FindProperty(pWin, atoms[i]);
+	if (!pProp) {
+	    DEALLOCATE_LOCAL(props);
+	    return BadMatch;
+	}
+	switch (XaceHook(XACE_PROPERTY_ACCESS, client, pWin, pProp, atoms[i],
+			 DixReadAccess|DixWriteAccess))
+	{
+	case XaceErrorOperation:
+            DEALLOCATE_LOCAL(props);
+	    client->errorValue = atoms[i];
+            return BadAtom;
+	case XaceIgnoreOperation:
+            DEALLOCATE_LOCAL(props);
+	    return Success;
+	}
         props[i] = pProp;
     }
     delta = stuff->nPositions;
@@ -219,7 +230,8 @@ ProcChangeProperty(ClientPtr client)
 	return(BadAtom);
     }
 
-    switch (XaceHook(XACE_PROPERTY_ACCESS, client, pWin, stuff->property,
+    switch (XaceHook(XACE_PROPERTY_ACCESS, client, pWin,
+		     FindProperty(pWin, stuff->property), stuff->property,
 		     DixWriteAccess))
     {
     case XaceErrorOperation:
@@ -252,14 +264,8 @@ ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format,
     totalSize = len * sizeInBytes;
 
     /* first see if property already exists */
+    pProp = FindProperty(pWin, property);
 
-    pProp = wUserProps (pWin);
-    while (pProp)
-    {
-	if (pProp->propertyName == property)
-	    break;
-	pProp = pProp->next;
-    }
     if (!pProp)   /* just add to list */
     {
 	if (!pWin->optional && !MakeWindowOptional (pWin))
@@ -490,8 +496,8 @@ ProcGetProperty(ClientPtr client)
 
     if (stuff->delete)
 	access_mode |= DixDestroyAccess;
-    switch (XaceHook(XACE_PROPERTY_ACCESS, client, pWin, stuff->property,
-		     access_mode))
+    switch (XaceHook(XACE_PROPERTY_ACCESS, client, pWin, pProp,
+		     stuff->property, access_mode))
     {
     case XaceErrorOperation:
 	client->errorValue = stuff->property;
@@ -643,7 +649,8 @@ ProcDeleteProperty(register ClientPtr client)
 	return (BadAtom);
     }
 
-    switch (XaceHook(XACE_PROPERTY_ACCESS, client, pWin, stuff->property,
+    switch (XaceHook(XACE_PROPERTY_ACCESS, client, pWin,
+		     FindProperty(pWin, stuff->property), stuff->property,
 		     DixDestroyAccess))
     {
     case XaceErrorOperation:

From 1b766ffc0647d5e9a9bf6938d33548d977b5535e Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 22 Mar 2007 15:55:35 -0400
Subject: [PATCH 052/552] dix: reorganize property code to better support xace
 hook; requires new API for changing a property, dixChangeWindowProperty,
 taking an additional client argument.

---
 Xext/security.c            |  2 +-
 Xext/xselinux.c            |  2 +-
 dix/property.c             | 55 ++++++++++++++++++++++++++------------
 hw/xfree86/loader/dixsym.c |  1 +
 include/property.h         | 11 ++++++++
 5 files changed, 52 insertions(+), 19 deletions(-)

diff --git a/Xext/security.c b/Xext/security.c
index b7a0925c7..00180b99e 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -1715,7 +1715,7 @@ SecurityCheckPropertyAccess(CallbackListPtr *pcbl, pointer unused,
 
     /* if client trusted or window untrusted, allow operation */
 
-    if ( (TRUSTLEVEL(client) == XSecurityClientTrusted) ||
+    if (!client || (TRUSTLEVEL(client) == XSecurityClientTrusted) ||
 	 (TRUSTLEVEL(wClient(pWin)) != XSecurityClientTrusted) )
 	return;
 
diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 4056d9e92..eb721a7c1 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -1070,7 +1070,7 @@ XSELinuxProperty(CallbackListPtr *pcbl, pointer unused, pointer calldata)
     char *propname = NameForAtom(rec->propertyName);
 
     tclient = wClient(pWin);
-    if (!tclient || !HAVESTATE(tclient))
+    if (!client || !tclient || !HAVESTATE(tclient))
         return;
 
     propsid = GetPropertySID(SID(tclient)->ctx, propname);
diff --git a/dix/property.c b/dix/property.c
index 5e11b5f6c..c760ef188 100644
--- a/dix/property.c
+++ b/dix/property.c
@@ -230,19 +230,9 @@ ProcChangeProperty(ClientPtr client)
 	return(BadAtom);
     }
 
-    switch (XaceHook(XACE_PROPERTY_ACCESS, client, pWin,
-		     FindProperty(pWin, stuff->property), stuff->property,
-		     DixWriteAccess))
-    {
-    case XaceErrorOperation:
-	client->errorValue = stuff->property;
-	return BadAtom;
-    case XaceIgnoreOperation:
-	return Success;
-    }
-
-    err = ChangeWindowProperty(pWin, stuff->property, stuff->type, (int)format,
-			       (int)mode, len, (pointer)&stuff[1], TRUE);
+    err = dixChangeWindowProperty(client, pWin, stuff->property, stuff->type,
+				  (int)format, (int)mode, len, &stuff[1],
+				  TRUE);
     if (err != Success)
 	return err;
     else
@@ -250,9 +240,9 @@ ProcChangeProperty(ClientPtr client)
 }
 
 _X_EXPORT int
-ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format, 
-                     int mode, unsigned long len, pointer value, 
-                     Bool sendevent)
+dixChangeWindowProperty(ClientPtr pClient, WindowPtr pWin, Atom property,
+			Atom type, int format, int mode, unsigned long len,
+			pointer value, Bool sendevent)
 {
     PropertyPtr pProp;
     xEvent event;
@@ -286,12 +276,34 @@ ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format,
 	if (len)
 	    memmove((char *)data, (char *)value, totalSize);
 	pProp->size = len;
-        pProp->next = pWin->optional->userProps;
 	pProp->devPrivates = NULL;
+	switch (XaceHook(XACE_PROPERTY_ACCESS, pClient, pWin, pProp, property,
+			 DixWriteAccess))
+	{
+	case XaceErrorOperation:
+	    xfree(data);
+	    xfree(pProp);
+	    pClient->errorValue = property;
+	    return BadAtom;
+	case XaceIgnoreOperation:
+	    xfree(data);
+	    xfree(pProp);
+	    return Success;
+	}
+        pProp->next = pWin->optional->userProps;
         pWin->optional->userProps = pProp;
     }
     else
     {
+	switch (XaceHook(XACE_PROPERTY_ACCESS, pClient, pWin, pProp, property,
+			 DixWriteAccess))
+	{
+	case XaceErrorOperation:
+	    pClient->errorValue = property;
+	    return BadAtom;
+	case XaceIgnoreOperation:
+	    return Success;
+	}
 	/* To append or prepend to a property the request format and type
 		must match those of the already defined property.  The
 		existing format and type are irrelevant when using the mode
@@ -357,6 +369,15 @@ ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format,
     return(Success);
 }
 
+_X_EXPORT int
+ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format, 
+		     int mode, unsigned long len, pointer value, 
+		     Bool sendevent)
+{
+    return dixChangeWindowProperty(NullClient, pWin, property, type, format,
+				   mode, len, value, sendevent);
+}
+
 int
 DeleteProperty(WindowPtr pWin, Atom propName)
 {
diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c
index 1732d1fe4..6957f063e 100644
--- a/hw/xfree86/loader/dixsym.c
+++ b/hw/xfree86/loader/dixsym.c
@@ -192,6 +192,7 @@ _X_HIDDEN void *dixLookupTab[] = {
 #endif
     /* property.c */
     SYMFUNC(ChangeWindowProperty)
+    SYMFUNC(dixChangeWindowProperty)
     /* extension.c */
     SYMFUNC(AddExtension)
     SYMFUNC(AddExtensionAlias)
diff --git a/include/property.h b/include/property.h
index 8b6dc0912..77536aa4d 100644
--- a/include/property.h
+++ b/include/property.h
@@ -52,6 +52,17 @@ SOFTWARE.
 
 typedef struct _Property *PropertyPtr;
 
+extern int dixChangeWindowProperty(
+    ClientPtr /*pClient*/,
+    WindowPtr /*pWin*/,
+    Atom /*property*/,
+    Atom /*type*/,
+    int /*format*/,
+    int /*mode*/,
+    unsigned long /*len*/,
+    pointer /*value*/,
+    Bool /*sendevent*/);
+
 extern int ChangeWindowProperty(
     WindowPtr /*pWin*/,
     Atom /*property*/,

From c9fb8a35332d101897607d8f06ed5a6512eac7cf Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 22 Mar 2007 17:23:26 -0400
Subject: [PATCH 053/552] dix: move access codes to separate header file, add
 DixCreateAccess.

---
 include/Makefile.am |  1 +
 include/dixaccess.h | 29 +++++++++++++++++++++++++++++
 include/resource.h  | 15 +--------------
 3 files changed, 31 insertions(+), 14 deletions(-)
 create mode 100644 include/dixaccess.h

diff --git a/include/Makefile.am b/include/Makefile.am
index 4d8910b66..82e71905e 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -11,6 +11,7 @@ sdk_HEADERS =		\
 	cursor.h	\
 	cursorstr.h	\
 	dix.h		\
+	dixaccess.h	\
 	dixevents.h	\
 	dixfont.h	\
 	dixfontstr.h	\
diff --git a/include/dixaccess.h b/include/dixaccess.h
new file mode 100644
index 000000000..205b76cb1
--- /dev/null
+++ b/include/dixaccess.h
@@ -0,0 +1,29 @@
+/***********************************************************
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+******************************************************************/
+
+#ifndef DIX_ACCESS_H
+#define DIX_ACCESS_H
+
+/* These are the access modes that can be passed in the last parameter
+ * to several of the dix lookup functions.  They were originally part
+ * of the Security extension, now used by XACE.
+ *
+ * You can or these values together to indicate multiple modes
+ * simultaneously.
+ */
+
+#define DixUnknownAccess	0	/* don't know intentions */
+#define DixReadAccess		(1<<0)	/* inspecting the object */
+#define DixWriteAccess		(1<<1)	/* changing the object */
+#define DixDestroyAccess	(1<<2)	/* destroying the object */
+#define DixCreateAccess		(1<<3)	/* creating the object */
+
+#endif /* DIX_ACCESS_H */
diff --git a/include/resource.h b/include/resource.h
index 9949dd2fc..f7fa5f188 100644
--- a/include/resource.h
+++ b/include/resource.h
@@ -48,6 +48,7 @@ SOFTWARE.
 #ifndef RESOURCE_H
 #define RESOURCE_H 1
 #include "misc.h"
+#include "dixaccess.h"
 
 /*****************************************************************
  * STUFF FOR RESOURCES 
@@ -225,20 +226,6 @@ extern pointer LookupClientResourceComplex(
     FindComplexResType func,
     pointer cdata);
 
-/* These are the access modes that can be passed in the last parameter
- * to SecurityLookupIDByType/Class.  The Security extension doesn't
- * currently make much use of these; they're mainly provided as an
- * example of what you might need for discretionary access control.
- * You can or these values together to indicate multiple modes
- * simultaneously.
- */
-
-#define DixUnknownAccess	0	/* don't know intentions */
-#define DixReadAccess		(1<<0)	/* inspecting the object */
-#define DixWriteAccess		(1<<1)	/* changing the object */
-#define DixReadWriteAccess	(DixReadAccess|DixWriteAccess)
-#define DixDestroyAccess	(1<<2)	/* destroying the object */
-
 extern pointer SecurityLookupIDByType(
     ClientPtr /*client*/,
     XID /*id*/,

From e1cc68add0bcdd5e0e4e15cf6ee8a3da136d3534 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 22 Mar 2007 17:33:16 -0400
Subject: [PATCH 054/552] xace: drop the name argument from the property
 callback.

---
 Xext/security.c |  2 +-
 Xext/xace.c     |  1 -
 Xext/xacestr.h  |  2 --
 Xext/xselinux.c |  2 +-
 dix/property.c  | 14 ++++++--------
 5 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/Xext/security.c b/Xext/security.c
index 00180b99e..7ea032f54 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -1708,7 +1708,7 @@ SecurityCheckPropertyAccess(CallbackListPtr *pcbl, pointer unused,
     XacePropertyAccessRec *rec = (XacePropertyAccessRec*)calldata;
     ClientPtr client = rec->client;
     WindowPtr pWin = rec->pWin;
-    ATOM propertyName = rec->propertyName;
+    ATOM propertyName = rec->pProp->propertyName;
     Mask access_mode = rec->access_mode;
     PropertyAccessPtr pacl;
     char action = SecurityDefaultAction;
diff --git a/Xext/xace.c b/Xext/xace.c
index 8e277ac81..a3c4d426e 100644
--- a/Xext/xace.c
+++ b/Xext/xace.c
@@ -96,7 +96,6 @@ int XaceHook(int hook, ...)
 		va_arg(ap, ClientPtr),
 		va_arg(ap, WindowPtr),
 		va_arg(ap, PropertyPtr),
-		va_arg(ap, Atom),
 		va_arg(ap, Mask),
 		XaceAllowOperation   /* default allow */
 	    };
diff --git a/Xext/xacestr.h b/Xext/xacestr.h
index 19d154021..dc1bdfcc9 100644
--- a/Xext/xacestr.h
+++ b/Xext/xacestr.h
@@ -20,7 +20,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef _XACESTR_H
 #define _XACESTR_H
 
-#include <X11/Xdefs.h>
 #include "dixstruct.h"
 #include "resource.h"
 #include "extnsionst.h"
@@ -61,7 +60,6 @@ typedef struct {
     ClientPtr client;
     WindowPtr pWin;
     PropertyPtr pProp;
-    Atom propertyName;
     Mask access_mode;
     int rval;
 } XacePropertyAccessRec;
diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index eb721a7c1..4ed2784e6 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -1067,7 +1067,7 @@ XSELinuxProperty(CallbackListPtr *pcbl, pointer unused, pointer calldata)
     ClientPtr tclient;
     access_vector_t perm = 0;
     security_id_t propsid;
-    char *propname = NameForAtom(rec->propertyName);
+    char *propname = NameForAtom(rec->pProp->propertyName);
 
     tclient = wClient(pWin);
     if (!client || !tclient || !HAVESTATE(tclient))
diff --git a/dix/property.c b/dix/property.c
index c760ef188..9ff6993e6 100644
--- a/dix/property.c
+++ b/dix/property.c
@@ -144,7 +144,7 @@ ProcRotateProperties(ClientPtr client)
 	    DEALLOCATE_LOCAL(props);
 	    return BadMatch;
 	}
-	switch (XaceHook(XACE_PROPERTY_ACCESS, client, pWin, pProp, atoms[i],
+	switch (XaceHook(XACE_PROPERTY_ACCESS, client, pWin, pProp,
 			 DixReadAccess|DixWriteAccess))
 	{
 	case XaceErrorOperation:
@@ -277,8 +277,8 @@ dixChangeWindowProperty(ClientPtr pClient, WindowPtr pWin, Atom property,
 	    memmove((char *)data, (char *)value, totalSize);
 	pProp->size = len;
 	pProp->devPrivates = NULL;
-	switch (XaceHook(XACE_PROPERTY_ACCESS, pClient, pWin, pProp, property,
-			 DixWriteAccess))
+	switch (XaceHook(XACE_PROPERTY_ACCESS, pClient, pWin, pProp,
+			 DixCreateAccess))
 	{
 	case XaceErrorOperation:
 	    xfree(data);
@@ -295,7 +295,7 @@ dixChangeWindowProperty(ClientPtr pClient, WindowPtr pWin, Atom property,
     }
     else
     {
-	switch (XaceHook(XACE_PROPERTY_ACCESS, pClient, pWin, pProp, property,
+	switch (XaceHook(XACE_PROPERTY_ACCESS, pClient, pWin, pProp,
 			 DixWriteAccess))
 	{
 	case XaceErrorOperation:
@@ -517,8 +517,7 @@ ProcGetProperty(ClientPtr client)
 
     if (stuff->delete)
 	access_mode |= DixDestroyAccess;
-    switch (XaceHook(XACE_PROPERTY_ACCESS, client, pWin, pProp,
-		     stuff->property, access_mode))
+    switch (XaceHook(XACE_PROPERTY_ACCESS, client, pWin, pProp, access_mode))
     {
     case XaceErrorOperation:
 	client->errorValue = stuff->property;
@@ -671,8 +670,7 @@ ProcDeleteProperty(register ClientPtr client)
     }
 
     switch (XaceHook(XACE_PROPERTY_ACCESS, client, pWin,
-		     FindProperty(pWin, stuff->property), stuff->property,
-		     DixDestroyAccess))
+		     FindProperty(pWin, stuff->property), DixDestroyAccess))
     {
     case XaceErrorOperation:
 	client->errorValue = stuff->property;

From 84a066cc88fe4326ddacd04ab5e1158a80571c33 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 23 Mar 2007 10:33:53 -0400
Subject: [PATCH 055/552] xace: pass serverClient as default argument to
 dixChangeWindowProperty instead of NullClient.

---
 Xext/security.c |  2 +-
 Xext/xselinux.c | 12 +++++++-----
 dix/property.c  |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Xext/security.c b/Xext/security.c
index 7ea032f54..74ba8d42c 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -1715,7 +1715,7 @@ SecurityCheckPropertyAccess(CallbackListPtr *pcbl, pointer unused,
 
     /* if client trusted or window untrusted, allow operation */
 
-    if (!client || (TRUSTLEVEL(client) == XSecurityClientTrusted) ||
+    if ((TRUSTLEVEL(client) == XSecurityClientTrusted) ||
 	 (TRUSTLEVEL(wClient(pWin)) != XSecurityClientTrusted) )
 	return;
 
diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 4ed2784e6..648bb6efd 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -1070,7 +1070,7 @@ XSELinuxProperty(CallbackListPtr *pcbl, pointer unused, pointer calldata)
     char *propname = NameForAtom(rec->pProp->propertyName);
 
     tclient = wClient(pWin);
-    if (!client || !tclient || !HAVESTATE(tclient))
+    if (!tclient || !HAVESTATE(tclient))
         return;
 
     propsid = GetPropertySID(SID(tclient)->ctx, propname);
@@ -1235,13 +1235,15 @@ XSELinuxResourceState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	rc = avc_sid_to_context(SID(client), &ctx);
 	if (rc < 0)
 	    FatalError("XSELinux: Failed to get security context!\n");
-	rc = ChangeWindowProperty(pWin, atom_client_ctx, XA_STRING, 8,
-				  PropModeReplace, strlen(ctx), ctx, FALSE);
+	rc = dixChangeWindowProperty(serverClient,
+				     pWin, atom_client_ctx, XA_STRING, 8,
+				     PropModeReplace, strlen(ctx), ctx, FALSE);
 	freecon(ctx);
     }
     else
-	rc = ChangeWindowProperty(pWin, atom_client_ctx, XA_STRING, 8,
-				  PropModeReplace, 10, "UNLABELED!", FALSE);
+	rc = dixChangeWindowProperty(serverClient,
+				     pWin, atom_client_ctx, XA_STRING, 8,
+				     PropModeReplace, 10, "UNLABELED!", FALSE);
     if (rc != Success)
 	FatalError("XSELinux: Failed to set context property on window!\n");
 } /* XSELinuxResourceState */
diff --git a/dix/property.c b/dix/property.c
index 9ff6993e6..74d548d8e 100644
--- a/dix/property.c
+++ b/dix/property.c
@@ -374,7 +374,7 @@ ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format,
 		     int mode, unsigned long len, pointer value, 
 		     Bool sendevent)
 {
-    return dixChangeWindowProperty(NullClient, pWin, property, type, format,
+    return dixChangeWindowProperty(serverClient, pWin, property, type, format,
 				   mode, len, value, sendevent);
 }
 

From 299ff4c82998d2a32204bfbecde4993dfbd3d4a5 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 28 Mar 2007 12:57:11 -0400
Subject: [PATCH 056/552] xace: provide creation-time resource hook call in
 CreateWindow().

---
 dix/window.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dix/window.c b/dix/window.c
index e4f1ae1eb..2e852099a 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -729,6 +729,14 @@ CreateWindow(Window wid, WindowPtr pParent, int x, int y, unsigned w,
 
     pWin->borderWidth = bw;
 
+    /*  security creation/labeling check
+     */
+    if (!XaceHook(XACE_RESOURCE_ACCESS, wid, RT_WINDOW, DixCreateAccess, pWin))
+    {
+	xfree(pWin);
+	*error = BadAccess;
+	return NullWindow;
+    }
     /*  can't let untrusted clients have background None windows;
      *  they make it too easy to steal window contents
      */

From 327bc332a61294209d39286228199f54bdde73d1 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 28 Mar 2007 13:00:03 -0400
Subject: [PATCH 057/552] xace: minor comment fixes.

---
 Xext/xacestr.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Xext/xacestr.h b/Xext/xacestr.h
index dc1bdfcc9..184fb9b0b 100644
--- a/Xext/xacestr.h
+++ b/Xext/xacestr.h
@@ -37,7 +37,6 @@ typedef struct {
 } XaceCoreDispatchRec;
 
 /* XACE_RESOURCE_ACCESS */
-/* XACE_RESOURCE_CREATE */
 typedef struct {
     ClientPtr client;
     XID id;
@@ -79,7 +78,7 @@ typedef struct {
     int rval;
 } XaceMapAccessRec;
 
-/* XACE_EXT_DISPATCH_ACCESS */
+/* XACE_EXT_DISPATCH */
 /* XACE_EXT_ACCESS */
 typedef struct {
     ClientPtr client;

From 353e19fd5e18ad55a0dd12a7b63f6af9df7bfe6b Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 3 Apr 2007 14:06:02 -0400
Subject: [PATCH 058/552] devPrivates rework: zero out newly allocated private
 space.

---
 dix/privates.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dix/privates.c b/dix/privates.c
index cc4b01601..8a39437cb 100644
--- a/dix/privates.c
+++ b/dix/privates.c
@@ -107,7 +107,7 @@ dixAllocatePrivate(PrivateRec **privates, devprivate_key_t *const key)
     if (item)
 	size += item->size;
 
-    ptr = (PrivateRec *)xalloc(size);
+    ptr = (PrivateRec *)xcalloc(size, 1);
     if (!ptr)
 	return NULL;
     ptr->key = key;

From 14aea12cadef647369e44639ff5024dd7034570a Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 3 Apr 2007 15:23:56 -0400
Subject: [PATCH 059/552] xace: forgot one of the hook call arguments.  Add it.

---
 dix/window.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dix/window.c b/dix/window.c
index 2e852099a..9967053e0 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -731,7 +731,8 @@ CreateWindow(Window wid, WindowPtr pParent, int x, int y, unsigned w,
 
     /*  security creation/labeling check
      */
-    if (!XaceHook(XACE_RESOURCE_ACCESS, wid, RT_WINDOW, DixCreateAccess, pWin))
+    if (!XaceHook(XACE_RESOURCE_ACCESS, client,
+		  wid, RT_WINDOW, DixCreateAccess, pWin))
     {
 	xfree(pWin);
 	*error = BadAccess;

From 1cb84768f376b477a08a558854609b0743f2bd29 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 3 Apr 2007 15:31:16 -0400
Subject: [PATCH 060/552] security: rewrite to use new devPrivates support.

---
 Xext/security.c | 75 +++++++++++++++++++++++++------------------------
 1 file changed, 38 insertions(+), 37 deletions(-)

diff --git a/Xext/security.c b/Xext/security.c
index bc92594c4..ad04045ae 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -30,6 +30,7 @@ in this Software without prior written authorization from The Open Group.
 
 #include "scrnintstr.h"
 #include "colormapst.h"
+#include "privates.h"
 #include "xacestr.h"
 #include "securitysrv.h"
 #include <X11/extensions/securstr.h>
@@ -53,23 +54,23 @@ in this Software without prior written authorization from The Open Group.
 
 static int SecurityErrorBase;  /* first Security error number */
 static int SecurityEventBase;  /* first Security event number */
-static int securityClientPrivateIndex;
-static int securityExtnsnPrivateIndex;
+static devprivate_key_t stateKey;
 
 /* this is what we store as client security state */
 typedef struct {
+    int haveState;
     unsigned int trustLevel;
     XID authId;
 } SecurityClientStateRec;
 
-#define STATEVAL(extnsn) \
-    ((extnsn)->devPrivates[securityExtnsnPrivateIndex].val)
-#define STATEPTR(client) \
-    ((client)->devPrivates[securityClientPrivateIndex].ptr)
-#define TRUSTLEVEL(client) \
-    (((SecurityClientStateRec*)STATEPTR(client))->trustLevel)
-#define AUTHID(client) \
-    (((SecurityClientStateRec*)STATEPTR(client))->authId)
+#define EXTLEVEL(extnsn) ((Bool) \
+    dixLookupPrivate(DEVPRIV_PTR(extnsn), &stateKey))
+#define HAVESTATE(client) (((SecurityClientStateRec *) \
+    dixLookupPrivate(DEVPRIV_PTR(client), &stateKey))->haveState)
+#define TRUSTLEVEL(client) (((SecurityClientStateRec *) \
+    dixLookupPrivate(DEVPRIV_PTR(client), &stateKey))->trustLevel)
+#define AUTHID(client)(((SecurityClientStateRec *) \
+    dixLookupPrivate(DEVPRIV_PTR(client), &stateKey))->authId)
 
 static CallbackListPtr SecurityValidateGroupCallback = NULL;
 
@@ -1149,7 +1150,7 @@ SecurityClientStateCallback(CallbackListPtr *pcbl, pointer unused,
 	    SecurityAuthorizationPtr pAuth;
 
 	    /* client may not have any state (bad authorization) */
-	    if (!STATEPTR(client))
+	    if (!HAVESTATE(client))
 		break;
 
 	    pAuth = (SecurityAuthorizationPtr)LookupIDByType(AUTHID(client),
@@ -1185,7 +1186,7 @@ SecurityCheckMapAccess(CallbackListPtr *pcbl, pointer unused,
     XaceMapAccessRec *rec = (XaceMapAccessRec*)calldata;
     WindowPtr pWin = rec->pWin;
 
-    if (STATEPTR(rec->client) &&
+    if (HAVESTATE(rec->client) &&
 	(TRUSTLEVEL(rec->client) != XSecurityClientTrusted) &&
 	(pWin->drawable.class == InputOnly) &&
 	pWin->parent && pWin->parent->parent &&
@@ -1211,7 +1212,7 @@ SecurityCheckExtAccess(CallbackListPtr *pcbl, pointer unused,
     XaceExtAccessRec *rec = (XaceExtAccessRec*)calldata;
 
     if ((TRUSTLEVEL(rec->client) != XSecurityClientTrusted) &&
-	!STATEVAL(rec->ext))
+	!EXTLEVEL(rec->ext))
 
 	rec->rval = FALSE;
 }
@@ -1241,7 +1242,7 @@ SecurityDeclareExtSecure(CallbackListPtr *pcbl, pointer unused,
     XaceDeclareExtSecureRec *rec = (XaceDeclareExtSecureRec*)calldata;
 
     /* security state for extensions is simply a boolean trust value */
-    STATEVAL(rec->ext) = rec->secure;
+    dixSetPrivate(DEVPRIV_PTR(rec->ext), &stateKey, (pointer)rec->secure);
 }
 
 /**********************************************************************/
@@ -1887,29 +1888,14 @@ XSecurityOptions(argc, argv, i)
 void
 SecurityExtensionSetup(INITARGS)
 {
-    /* Allocate the client private index */
-    securityClientPrivateIndex = AllocateClientPrivateIndex();
-    if (!AllocateClientPrivate(securityClientPrivateIndex,
-			       sizeof (SecurityClientStateRec)))
-	FatalError("SecurityExtensionSetup: Can't allocate client private.\n");
-
-    /* Allocate the extension private index */
-    securityExtnsnPrivateIndex = AllocateExtensionPrivateIndex();
-    if (!AllocateExtensionPrivate(securityExtnsnPrivateIndex, 0))
-	FatalError("SecurityExtensionSetup: Can't allocate extnsn private.\n");
-
-    /* register callbacks */
-#define XaceRC XaceRegisterCallback
-    XaceRC(XACE_RESOURCE_ACCESS, SecurityCheckResourceIDAccess, NULL);
-    XaceRC(XACE_DEVICE_ACCESS, SecurityCheckDeviceAccess, NULL);
-    XaceRC(XACE_PROPERTY_ACCESS, SecurityCheckPropertyAccess, NULL);
-    XaceRC(XACE_DRAWABLE_ACCESS, SecurityCheckDrawableAccess, NULL);
-    XaceRC(XACE_MAP_ACCESS, SecurityCheckMapAccess, NULL);
-    XaceRC(XACE_BACKGRND_ACCESS, SecurityCheckBackgrndAccess, NULL);
-    XaceRC(XACE_EXT_DISPATCH, SecurityCheckExtAccess, NULL);
-    XaceRC(XACE_EXT_ACCESS, SecurityCheckExtAccess, NULL);
-    XaceRC(XACE_HOSTLIST_ACCESS, SecurityCheckHostlistAccess, NULL);
-    XaceRC(XACE_DECLARE_EXT_SECURE, SecurityDeclareExtSecure, NULL);
+    /* FIXME: this is here so it is registered before other extensions
+     * init themselves.  This also required commit 5e946dd853a4ebc... to
+     * call the setup functions on each server reset.
+     *
+     * The extension security bit should be delivered in some other way,
+     * either in a symbol or in the module data.
+     */
+    XaceRegisterCallback(XACE_DECLARE_EXT_SECURE, SecurityDeclareExtSecure, 0);
 } /* SecurityExtensionSetup */
 
 
@@ -1939,6 +1925,10 @@ SecurityExtensionInit(INITARGS)
 
     RTEventClient |= RC_NEVERRETAIN;
 
+    /* Allocate the private storage */
+    if (!dixRequestPrivate(&stateKey, sizeof(SecurityClientStateRec)))
+	FatalError("SecurityExtensionSetup: Can't allocate client private.\n");
+
     if (!AddCallback(&ClientStateCallback, SecurityClientStateCallback, NULL))
 	return;
 
@@ -1955,4 +1945,15 @@ SecurityExtensionInit(INITARGS)
 
     SecurityLoadPropertyAccessList();
 
+    /* register callbacks */
+#define XaceRC XaceRegisterCallback
+    XaceRC(XACE_RESOURCE_ACCESS, SecurityCheckResourceIDAccess, NULL);
+    XaceRC(XACE_DEVICE_ACCESS, SecurityCheckDeviceAccess, NULL);
+    XaceRC(XACE_PROPERTY_ACCESS, SecurityCheckPropertyAccess, NULL);
+    XaceRC(XACE_DRAWABLE_ACCESS, SecurityCheckDrawableAccess, NULL);
+    XaceRC(XACE_MAP_ACCESS, SecurityCheckMapAccess, NULL);
+    XaceRC(XACE_BACKGRND_ACCESS, SecurityCheckBackgrndAccess, NULL);
+    XaceRC(XACE_EXT_DISPATCH, SecurityCheckExtAccess, NULL);
+    XaceRC(XACE_EXT_ACCESS, SecurityCheckExtAccess, NULL);
+    XaceRC(XACE_HOSTLIST_ACCESS, SecurityCheckHostlistAccess, NULL);
 } /* SecurityExtensionInit */

From 63e46e4fc3e98751f2edbed9c79ef3d5dc2dadc6 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 4 Apr 2007 15:59:51 -0400
Subject: [PATCH 061/552] devPrivates rework: properly free devPrivates on
 compatibility structures, excluding pixmap.

---
 dix/colormap.c  | 2 ++
 dix/devices.c   | 2 ++
 dix/dispatch.c  | 2 ++
 dix/extension.c | 2 ++
 dix/gc.c        | 2 ++
 dix/main.c      | 3 +++
 dix/window.c    | 2 ++
 7 files changed, 15 insertions(+)

diff --git a/dix/colormap.c b/dix/colormap.c
index 73b666971..515557030 100644
--- a/dix/colormap.c
+++ b/dix/colormap.c
@@ -63,6 +63,7 @@ SOFTWARE.
 #include "scrnintstr.h"
 #include "resource.h"
 #include "windowstr.h"
+#include "privates.h"
 
 extern XID clientErrorValue;
 extern int colormapPrivateCount;
@@ -474,6 +475,7 @@ FreeColormap (pointer value, XID mid)
         }
     }
 
+    dixFreePrivates(*DEVPRIV_PTR(pmap));
     if (pmap->devPrivates)
 	xfree(pmap->devPrivates);
 
diff --git a/dix/devices.c b/dix/devices.c
index e51d1b339..4a7ec4d92 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -69,6 +69,7 @@ SOFTWARE.
 #ifdef XKB
 #include <xkbsrv.h>
 #endif
+#include "privates.h"
 #include "xace.h"
 
 #include "dispatch.h"
@@ -502,6 +503,7 @@ CloseDevice(DeviceIntPtr dev)
 	XkbRemoveResourceClient((DevicePtr)dev,dev->xkb_interest->resource);
 #endif
 
+    dixFreePrivates(*DEVPRIV_PTR(dev));
     if (dev->devPrivates)
 	xfree(dev->devPrivates);
 
diff --git a/dix/dispatch.c b/dix/dispatch.c
index 68499f1ec..4fb680fb4 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -134,6 +134,7 @@ int ProcInitialConnection();
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
 #endif
+#include "privates.h"
 #include "xace.h"
 #ifdef XAPPGROUP
 #include "appgroup.h"
@@ -3651,6 +3652,7 @@ CloseDownClient(ClientPtr client)
 #ifdef SMART_SCHEDULE
 	SmartLastClient = NullClient;
 #endif
+	dixFreePrivates(*DEVPRIV_PTR(client));
 	xfree(client);
 
 	while (!clients[currentMaxClients-1])
diff --git a/dix/extension.c b/dix/extension.c
index 88dff15e2..b338c810d 100644
--- a/dix/extension.c
+++ b/dix/extension.c
@@ -59,6 +59,7 @@ SOFTWARE.
 #include "gcstruct.h"
 #include "scrnintstr.h"
 #include "dispatch.h"
+#include "privates.h"
 #include "xace.h"
 
 #define EXTENSION_BASE  128
@@ -290,6 +291,7 @@ CloseDownExtensions()
 	for (j = extensions[i]->num_aliases; --j >= 0;)
 	    xfree(extensions[i]->aliases[j]);
 	xfree(extensions[i]->aliases);
+	dixFreePrivates(*DEVPRIV_PTR(extensions[i]));
 	xfree(extensions[i]);
     }
     xfree(extensions);
diff --git a/dix/gc.c b/dix/gc.c
index 7a76dd99d..e7c48492f 100644
--- a/dix/gc.c
+++ b/dix/gc.c
@@ -61,6 +61,7 @@ SOFTWARE.
 #include "scrnintstr.h"
 #include "region.h"
 
+#include "privates.h"
 #include "dix.h"
 #include <assert.h>
 
@@ -903,6 +904,7 @@ FreeGC(pointer value, XID gid)
     (*pGC->funcs->DestroyGC) (pGC);
     if (pGC->dash != DefaultDash)
 	xfree(pGC->dash);
+    dixFreePrivates(*DEVPRIV_PTR(pGC));
     xfree(pGC);
     return(Success);
 }
diff --git a/dix/main.c b/dix/main.c
index 852cbcb62..b5db193ba 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -103,6 +103,7 @@ Equipment Corporation.
 #include "site.h"
 #include "dixfont.h"
 #include "extnsionst.h"
+#include "privates.h"
 #ifdef XPRINT
 #include "DiPrint.h"
 #endif
@@ -496,6 +497,7 @@ main(int argc, char *argv[], char *envp[])
 
 	FreeAuditTimer();
 
+	dixFreePrivates(*DEVPRIV_PTR(serverClient));
 	xfree(serverClient->devPrivates);
 	serverClient->devPrivates = NULL;
 
@@ -801,6 +803,7 @@ FreeScreen(ScreenPtr pScreen)
     xfree(pScreen->WindowPrivateSizes);
     xfree(pScreen->GCPrivateSizes);
     xfree(pScreen->PixmapPrivateSizes);
+    dixFreePrivates(*DEVPRIV_PTR(pScreen));
     xfree(pScreen->devPrivates);
     xfree(pScreen);
 }
diff --git a/dix/window.c b/dix/window.c
index 9967053e0..b50594797 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -126,6 +126,7 @@ Equipment Corporation.
 #ifdef XAPPGROUP
 #include "appgroup.h"
 #endif
+#include "privates.h"
 #include "xace.h"
 
 /******
@@ -975,6 +976,7 @@ DeleteWindow(pointer value, XID wid)
 	if (pWin->prevSib)
 	    pWin->prevSib->nextSib = pWin->nextSib;
     }
+    dixFreePrivates(*DEVPRIV_PTR(pWin));
     xfree(pWin);
     return Success;
 }

From ed75b056511ccb429c48c6c55d14dc7ae79e75a3 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 4 Apr 2007 12:00:15 -0400
Subject: [PATCH 062/552] dix: add new, combined resource lookup function. 
 Move all dix lookup API deprecated so far to a new file dix/deprecated.c. 
 Remove the deprecation warnings for the time being.

---
 dix/Makefile.am            |   1 +
 dix/deprecated.c           | 162 +++++++++++++++++++++++++++++++++++++
 dix/dixutils.c             |  65 ++-------------
 dix/resource.c             |  88 +++++---------------
 hw/xfree86/loader/dixsym.c |  22 ++---
 include/dix.h              |  43 +++++++---
 include/resource.h         |  55 ++++++++-----
 7 files changed, 265 insertions(+), 171 deletions(-)
 create mode 100644 dix/deprecated.c

diff --git a/dix/Makefile.am b/dix/Makefile.am
index a1f02c1b6..ff0d5d68c 100644
--- a/dix/Makefile.am
+++ b/dix/Makefile.am
@@ -8,6 +8,7 @@ libdix_la_SOURCES = 	\
 	atom.c		\
 	colormap.c	\
 	cursor.c	\
+	deprecated.c	\
 	devices.c	\
 	dispatch.c	\
 	dispatch.h	\
diff --git a/dix/deprecated.c b/dix/deprecated.c
new file mode 100644
index 000000000..2bb81190c
--- /dev/null
+++ b/dix/deprecated.c
@@ -0,0 +1,162 @@
+/***********************************************************
+
+Copyright 1987, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+******************************************************************/
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "dix.h"
+#include "misc.h"
+#include "dixstruct.h"
+
+/*
+ * These are deprecated compatibility functions and will be marked as such
+ * and removed soon!
+ *
+ * Please use the noted replacements instead.
+ */
+
+/* replaced by dixLookupWindow */
+_X_EXPORT WindowPtr
+SecurityLookupWindow(XID id, ClientPtr client, Mask access_mode)
+{
+    WindowPtr pWin;
+    int i = dixLookupWindow(&pWin, id, client, access_mode);
+    static int warn = 1;
+    if (warn > 0 && --warn)
+	ErrorF("Warning: LookupWindow()/SecurityLookupWindow() "
+	       "are deprecated.  Please convert your driver/module "
+	       "to use dixLookupWindow().\n");
+    return (i == Success) ? pWin : NULL;
+}
+
+/* replaced by dixLookupWindow */
+_X_EXPORT WindowPtr
+LookupWindow(XID id, ClientPtr client)
+{
+    return SecurityLookupWindow(id, client, DixUnknownAccess);
+}
+
+/* replaced by dixLookupDrawable */
+_X_EXPORT pointer
+SecurityLookupDrawable(XID id, ClientPtr client, Mask access_mode)
+{
+    DrawablePtr pDraw;
+    int i = dixLookupDrawable(&pDraw, id, client, M_DRAWABLE, access_mode);
+    static int warn = 1;
+    if (warn > 0 && --warn)
+	ErrorF("Warning: LookupDrawable()/SecurityLookupDrawable() "
+	       "are deprecated.  Please convert your driver/module "
+	       "to use dixLookupDrawable().\n");
+    return (i == Success) ? pDraw : NULL;
+}
+
+/* replaced by dixLookupDrawable */
+_X_EXPORT pointer
+LookupDrawable(XID id, ClientPtr client)
+{
+    return SecurityLookupDrawable(id, client, DixUnknownAccess);
+}
+
+/* replaced by dixLookupClient */
+_X_EXPORT ClientPtr
+LookupClient(XID id, ClientPtr client)
+{
+    ClientPtr pClient;
+    int i = dixLookupClient(&pClient, id, client, DixUnknownAccess);
+    static int warn = 1;
+    if (warn > 0 && --warn)
+	ErrorF("Warning: LookupClient() is deprecated.  Please convert your "
+	       "driver/module to use dixLookupClient().\n");
+    return (i == Success) ? pClient : NULL;
+}
+
+/* replaced by dixLookupResource */
+_X_EXPORT pointer
+SecurityLookupIDByType(ClientPtr client, XID id, RESTYPE rtype,
+		       Mask access_mode)
+{
+    pointer retval;
+    int i = dixLookupResource(&retval, id, rtype, client, access_mode);
+    static int warn = 1;
+    if (warn > 0 && --warn)
+	ErrorF("Warning: LookupIDByType()/SecurityLookupIDByType() "
+	       "are deprecated.  Please convert your driver/module "
+	       "to use dixLookupResource().\n");
+    return (i == Success) ? retval : NULL;
+}
+
+/* replaced by dixLookupResource */
+_X_EXPORT pointer
+SecurityLookupIDByClass(ClientPtr client, XID id, RESTYPE classes,
+			Mask access_mode)
+{
+    pointer retval;
+    int i = dixLookupResource(&retval, id, classes, client, access_mode);
+    static int warn = 1;
+    if (warn > 0 && --warn)
+	ErrorF("Warning: LookupIDByClass()/SecurityLookupIDByClass() "
+	       "are deprecated.  Please convert your driver/module "
+	       "to use dixLookupResource().\n");
+    return (i == Success) ? retval : NULL;
+}
+
+/* replaced by dixLookupResource */
+_X_EXPORT pointer
+LookupIDByType(XID id, RESTYPE rtype)
+{
+    return SecurityLookupIDByType(NullClient, id, rtype, DixUnknownAccess);
+}
+
+/* replaced by dixLookupResource */
+_X_EXPORT pointer
+LookupIDByClass(XID id, RESTYPE classes)
+{
+    return SecurityLookupIDByClass(NullClient, id, classes, DixUnknownAccess);
+}
+
+/* end deprecated functions */
diff --git a/dix/dixutils.c b/dix/dixutils.c
index 44d82c944..94e0f2cc1 100644
--- a/dix/dixutils.c
+++ b/dix/dixutils.c
@@ -223,8 +223,8 @@ dixLookupDrawable(DrawablePtr *pDraw, XID id, ClientPtr client,
 	if (!XaceHook(XACE_RESOURCE_ACCESS, client, id, rtype, access, pTmp))
 	    return BadDrawable;
     } else
-	pTmp = (DrawablePtr)SecurityLookupIDByClass(client, id, RC_DRAWABLE,
-						   access);
+	dixLookupResource((void **)&pTmp, id, RC_DRAWABLE, client, access);
+
     if (!pTmp)
 	return BadDrawable;
     if (!((1 << pTmp->type) & (type ? type : M_DRAWABLE)))
@@ -264,11 +264,12 @@ dixLookupGC(GCPtr *pGC, XID id, ClientPtr client, Mask access)
 _X_EXPORT int
 dixLookupClient(ClientPtr *pClient, XID rid, ClientPtr client, Mask access)
 {
-    pointer pRes = (pointer)SecurityLookupIDByClass(client, rid, RC_ANY,
-						    DixReadAccess);
+    pointer pRes;
     int clientIndex = CLIENT_ID(rid);
     client->errorValue = rid;
 
+    dixLookupResource(&pRes, rid, RC_ANY, client, DixReadAccess);
+
     if (clientIndex && pRes && clients[clientIndex] && !(rid & SERVER_BIT)) {
 	*pClient = clients[clientIndex];
 	return Success;
@@ -277,62 +278,6 @@ dixLookupClient(ClientPtr *pClient, XID rid, ClientPtr client, Mask access)
     return BadValue;
 }
 
-/*
- * These are deprecated compatibility functions and will be removed soon!
- * Please use the new dixLookup*() functions above.
- */
-_X_EXPORT _X_DEPRECATED WindowPtr
-SecurityLookupWindow(XID id, ClientPtr client, Mask access_mode)
-{
-    WindowPtr pWin;
-    int i = dixLookupWindow(&pWin, id, client, access_mode);
-    static int warn = 1;
-    if (warn-- > 0)
-	ErrorF("Warning: LookupWindow()/SecurityLookupWindow() "
-	       "are deprecated.  Please convert your driver/module "
-	       "to use dixLookupWindow().\n");
-    return (i == Success) ? pWin : NULL;
-}
-
-_X_EXPORT _X_DEPRECATED WindowPtr
-LookupWindow(XID id, ClientPtr client)
-{
-    return SecurityLookupWindow(id, client, DixUnknownAccess);
-}
-
-_X_EXPORT _X_DEPRECATED pointer
-SecurityLookupDrawable(XID id, ClientPtr client, Mask access_mode)
-{
-    DrawablePtr pDraw;
-    int i = dixLookupDrawable(&pDraw, id, client, M_DRAWABLE, access_mode);
-    static int warn = 1;
-    if (warn-- > 0)
-	ErrorF("Warning: LookupDrawable()/SecurityLookupDrawable() "
-	       "are deprecated.  Please convert your driver/module "
-	       "to use dixLookupDrawable().\n");
-    return (i == Success) ? pDraw : NULL;
-}
-
-_X_EXPORT _X_DEPRECATED pointer
-LookupDrawable(XID id, ClientPtr client)
-{
-    return SecurityLookupDrawable(id, client, DixUnknownAccess);
-}
-
-_X_EXPORT _X_DEPRECATED ClientPtr
-LookupClient(XID id, ClientPtr client)
-{
-    ClientPtr pClient;
-    int i = dixLookupClient(&pClient, id, client, DixUnknownAccess);
-    static int warn = 1;
-    if (warn-- > 0)
-	ErrorF("Warning: LookupClient() is deprecated.  Please convert your "
-	       "driver/module to use dixLookupClient().\n");
-    return (i == Success) ? pClient : NULL;
-}
-
-/* end deprecated functions */
-
 int
 AlterSaveSetForClient(ClientPtr client, WindowPtr pWin, unsigned mode,
                       Bool toRoot, Bool remap)
diff --git a/dix/resource.c b/dix/resource.c
index 81269c3b2..7530e8665 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -899,81 +899,31 @@ LegalNewID(XID id, ClientPtr client)
 	     !LookupIDByClass(id, RC_ANY)));
 }
 
-/* SecurityLookupIDByType and SecurityLookupIDByClass:
- * These are the heart of the resource ID security system.  They take
- * two additional arguments compared to the old LookupID functions:
- * the client doing the lookup, and the access mode (see resource.h).
- * The resource is returned if it exists and the client is allowed access,
- * else NULL is returned.
- */
-
-_X_EXPORT pointer
-SecurityLookupIDByType(ClientPtr client, XID id, RESTYPE rtype, Mask mode)
+_X_EXPORT int
+dixLookupResource(pointer *result, XID id, RESTYPE rtype,
+		  ClientPtr client, Mask mode)
 {
-    int    cid;
-    ResourcePtr res;
-    pointer retval = NULL;
-
-    if (((cid = CLIENT_ID(id)) < MAXCLIENTS) &&
-	clientTable[cid].buckets)
-    {
-	res = clientTable[cid].resources[Hash(cid, id)];
-
-	for (; res; res = res->next)
-	    if ((res->id == id) && (res->type == rtype))
-	    {
-		retval = res->value;
-		break;
-	    }
-    }
-    if (retval && client && 
-	!XaceHook(XACE_RESOURCE_ACCESS, client, id, rtype, mode, retval))
-	retval = NULL;
-
-    return retval;
-}
-
-
-_X_EXPORT pointer
-SecurityLookupIDByClass(ClientPtr client, XID id, RESTYPE classes, Mask mode)
-{
-    int    cid;
+    int cid = CLIENT_ID(id);
+    int istype = (rtype & TypeMask) && (rtype != RC_ANY);
     ResourcePtr res = NULL;
-    pointer retval = NULL;
 
-    if (((cid = CLIENT_ID(id)) < MAXCLIENTS) &&
-	clientTable[cid].buckets)
-    {
+    *result = NULL;
+    client->errorValue = id;
+
+    if ((cid < MAXCLIENTS) && clientTable[cid].buckets) {
 	res = clientTable[cid].resources[Hash(cid, id)];
 
 	for (; res; res = res->next)
-	    if ((res->id == id) && (res->type & classes))
-	    {
-		retval = res->value;
+	    if ((res->id == id) && ((istype && res->type == rtype) ||
+				    (!istype && res->type & rtype)))
 		break;
-	    }
     }
-    if (retval && client &&
-	!XaceHook(XACE_RESOURCE_ACCESS, client, id, res->type, mode, retval))
-	retval = NULL;
-
-    return retval;
-}
-
-/* We can't replace the LookupIDByType and LookupIDByClass functions with
- * macros because of compatibility with loadable servers.
- */
-
-_X_EXPORT pointer
-LookupIDByType(XID id, RESTYPE rtype)
-{
-    return SecurityLookupIDByType(NullClient, id, rtype,
-				  DixUnknownAccess);
-}
-
-_X_EXPORT pointer
-LookupIDByClass(XID id, RESTYPE classes)
-{
-    return SecurityLookupIDByClass(NullClient, id, classes,
-				   DixUnknownAccess);
+    if (res) {
+	if (client && !XaceHook(XACE_RESOURCE_ACCESS, client, id, res->type,
+				mode, res->value))
+	    return BadAccess;
+	*result = res->value;
+	return Success;
+    }
+    return BadValue;
 }
diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c
index 2991c18fa..043f2db90 100644
--- a/hw/xfree86/loader/dixsym.c
+++ b/hw/xfree86/loader/dixsym.c
@@ -114,6 +114,16 @@ _X_HIDDEN void *dixLookupTab[] = {
     SYMFUNC(QueryColors)
     /* cursor.c */
     SYMFUNC(FreeCursor)
+    /* deprecated.c */
+    SYMFUNC(LookupClient)
+    SYMFUNC(LookupDrawable)
+    SYMFUNC(LookupWindow)
+    SYMFUNC(SecurityLookupDrawable)
+    SYMFUNC(SecurityLookupWindow)
+    SYMFUNC(LookupIDByType)
+    SYMFUNC(LookupIDByClass)
+    SYMFUNC(SecurityLookupIDByClass)
+    SYMFUNC(SecurityLookupIDByType)
     /* devices.c */
     SYMFUNC(Ones)
     SYMFUNC(InitButtonClassDeviceStruct)
@@ -160,13 +170,6 @@ _X_HIDDEN void *dixLookupTab[] = {
     SYMFUNC(dixLookupWindow)
     SYMFUNC(dixLookupClient)
     SYMFUNC(dixLookupGC)
-    /* following are deprecated */
-    SYMFUNC(LookupClient)
-    SYMFUNC(LookupDrawable)
-    SYMFUNC(LookupWindow)
-    SYMFUNC(SecurityLookupDrawable)
-    SYMFUNC(SecurityLookupWindow)
-    /* end deprecated */
     SYMFUNC(NoopDDA)
     SYMFUNC(QueueWorkProc)
     SYMFUNC(RegisterBlockAndWakeupHandlers)
@@ -287,16 +290,13 @@ _X_HIDDEN void *dixLookupTab[] = {
     SYMFUNC(ChangeResourceValue)
     SYMFUNC(CreateNewResourceClass)
     SYMFUNC(CreateNewResourceType)
+    SYMFUNC(dixLookupResource)
     SYMFUNC(FakeClientID)
     SYMFUNC(FreeResource)
     SYMFUNC(FreeResourceByType)
     SYMFUNC(GetXIDList)
     SYMFUNC(GetXIDRange)
-    SYMFUNC(LookupIDByType)
-    SYMFUNC(LookupIDByClass)
     SYMFUNC(LegalNewID)
-    SYMFUNC(SecurityLookupIDByClass)
-    SYMFUNC(SecurityLookupIDByType)
     SYMFUNC(FindClientResourcesByType)
     SYMFUNC(FindAllClientResources)
     SYMVAR(lastResourceType)
diff --git a/include/dix.h b/include/dix.h
index 798d617a9..41240b119 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -233,17 +233,6 @@ extern int dixLookupClient(
     ClientPtr client,
     Mask access_mode);
 
-/*
- * These are deprecated compatibility functions and will be removed soon!
- * Please use the new dixLookup*() functions above.
- */
-extern WindowPtr SecurityLookupWindow(XID, ClientPtr, Mask);
-extern WindowPtr LookupWindow(XID, ClientPtr);
-extern pointer SecurityLookupDrawable(XID, ClientPtr, Mask);
-extern pointer LookupDrawable(XID, ClientPtr);
-extern ClientPtr LookupClient(XID, ClientPtr);
-/* end deprecated functions */
-
 extern void NoopDDA(void);
 
 extern int AlterSaveSetForClient(
@@ -641,4 +630,36 @@ extern int xstrcasecmp(char *s1, char *s2);
 /* ffs.c */
 extern int ffs(int i);
 
+/*
+ * These are deprecated compatibility functions and will be removed soon!
+ * Please use the noted replacements instead.
+ */
+
+/* replaced by dixLookupWindow */
+extern WindowPtr SecurityLookupWindow(
+    XID id,
+    ClientPtr client,
+    Mask access_mode);
+
+/* replaced by dixLookupWindow */
+extern WindowPtr LookupWindow(
+    XID id,
+    ClientPtr client);
+
+/* replaced by dixLookupDrawable */
+extern pointer SecurityLookupDrawable(
+    XID id,
+    ClientPtr client,
+    Mask access_mode);
+
+/* replaced by dixLookupDrawable */
+extern pointer LookupDrawable(
+    XID id,
+    ClientPtr client);
+
+/* replaced by dixLookupClient */
+extern ClientPtr LookupClient(
+    XID id,
+    ClientPtr client);
+
 #endif /* DIX_H */
diff --git a/include/resource.h b/include/resource.h
index f7fa5f188..d2ecfdea7 100644
--- a/include/resource.h
+++ b/include/resource.h
@@ -212,32 +212,18 @@ extern Bool LegalNewID(
     XID /*id*/,
     ClientPtr /*client*/);
 
-extern pointer LookupIDByType(
-    XID /*id*/,
-    RESTYPE /*rtype*/);
-
-extern pointer LookupIDByClass(
-    XID /*id*/,
-    RESTYPE /*classes*/);
-
 extern pointer LookupClientResourceComplex(
     ClientPtr client,
     RESTYPE type,
     FindComplexResType func,
     pointer cdata);
 
-extern pointer SecurityLookupIDByType(
-    ClientPtr /*client*/,
-    XID /*id*/,
-    RESTYPE /*rtype*/,
-    Mask /*access_mode*/);
-
-extern pointer SecurityLookupIDByClass(
-    ClientPtr /*client*/,
-    XID /*id*/,
-    RESTYPE /*classes*/,
-    Mask /*access_mode*/);
-
+extern int dixLookupResource(
+    pointer *result,
+    XID id,
+    RESTYPE rtype,
+    ClientPtr client,
+    Mask access_mode);
 
 extern void GetXIDRange(
     int /*client*/,
@@ -258,5 +244,34 @@ extern Atom *ResourceNames;
 void RegisterResourceName(RESTYPE type, char* name);
 #endif
 
+/*
+ * These are deprecated compatibility functions and will be removed soon!
+ * Please use the noted replacements instead.
+ */
+
+/* replaced by dixLookupResource */
+extern pointer SecurityLookupIDByType(
+    ClientPtr client,
+    XID id,
+    RESTYPE rtype,
+    Mask access_mode);
+
+/* replaced by dixLookupResource */
+extern pointer SecurityLookupIDByClass(
+    ClientPtr client,
+    XID id,
+    RESTYPE classes,
+    Mask access_mode);
+
+/* replaced by dixLookupResource */
+extern pointer LookupIDByType(
+    XID id,
+    RESTYPE rtype);
+
+/* replaced by dixLookupResource */
+extern pointer LookupIDByClass(
+    XID id,
+    RESTYPE classes);
+
 #endif /* RESOURCE_H */
 

From 1d550bb2c5cb5b3e588f0e0b68a421dc1cb8bd7c Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 5 Apr 2007 12:12:58 -0400
Subject: [PATCH 063/552] devPrivates rework: minor fix; use calloc and avoid
 initialization.

---
 dix/devices.c  |  3 +--
 dix/main.c     | 13 +++++--------
 dix/privates.c |  6 ++----
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/dix/devices.c b/dix/devices.c
index 4a7ec4d92..ab64fcb04 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -128,12 +128,11 @@ AddInputDevice(DeviceProc deviceProc, Bool autoStart)
 #endif
     /* must pre-allocate one private for the new devPrivates support */
     dev->nPrivates = 1;
-    dev->devPrivates = (DevUnion *)xalloc(sizeof(DevUnion));
+    dev->devPrivates = (DevUnion *)xcalloc(1, sizeof(DevUnion));
     if (!dev->devPrivates) {
 	xfree(dev);
 	return NULL;
     }
-    dev->devPrivates[0].ptr = NULL;
 
     dev->unwrapProc = NULL;
     dev->coreEvents = TRUE;
diff --git a/dix/main.c b/dix/main.c
index b5db193ba..cae50c85d 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -720,20 +720,17 @@ AddScreen(
 
     /* must pre-allocate one private for the new devPrivates support */
     pScreen->WindowPrivateLen = 1;
-    pScreen->WindowPrivateSizes = (unsigned *)xalloc(sizeof(unsigned));
+    pScreen->WindowPrivateSizes = (unsigned *)xcalloc(1, sizeof(unsigned));
     pScreen->totalWindowSize = PadToLong(sizeof(WindowRec)) + sizeof(DevUnion);
     pScreen->GCPrivateLen = 1;
-    pScreen->GCPrivateSizes = (unsigned *)xalloc(sizeof(unsigned));
+    pScreen->GCPrivateSizes = (unsigned *)xcalloc(1, sizeof(unsigned));
     pScreen->totalGCSize = PadToLong(sizeof(GC)) + sizeof(DevUnion);
     pScreen->PixmapPrivateLen = 1;
-    pScreen->PixmapPrivateSizes = (unsigned *)xalloc(sizeof(unsigned));
+    pScreen->PixmapPrivateSizes = (unsigned *)xcalloc(1, sizeof(unsigned));
     pScreen->totalPixmapSize = BitmapBytePad(8 * (sizeof(PixmapRec) +
 						  sizeof(DevUnion)));
-    if (pScreen->WindowPrivateSizes && pScreen->GCPrivateSizes &&
-	pScreen->PixmapPrivateSizes)
-	*pScreen->WindowPrivateSizes = *pScreen->GCPrivateSizes =
-	    *pScreen->PixmapPrivateSizes = 0;
-    else {
+    if (!pScreen->WindowPrivateSizes || !pScreen->GCPrivateSizes ||
+	!pScreen->PixmapPrivateSizes) {
 	xfree(pScreen);
 	return -1;
     }
diff --git a/dix/privates.c b/dix/privates.c
index 8a39437cb..4cb2e358d 100644
--- a/dix/privates.c
+++ b/dix/privates.c
@@ -298,10 +298,9 @@ ResetExtensionPrivates()
     extensionPrivateCount = 1;
     extensionPrivateLen = 1;
     xfree(extensionPrivateSizes);
-    extensionPrivateSizes = (unsigned *)xalloc(sizeof(unsigned));
+    extensionPrivateSizes = (unsigned *)xcalloc(1, sizeof(unsigned));
     if (!extensionPrivateSizes)
 	return FALSE;
-    *extensionPrivateSizes = 0;
     totalExtensionSize = PadToLong(sizeof(ExtensionEntry)) + sizeof(DevUnion);
     return TRUE;
 }
@@ -358,10 +357,9 @@ ResetClientPrivates()
     clientPrivateCount = 1;
     clientPrivateLen = 1;
     xfree(clientPrivateSizes);
-    clientPrivateSizes = (unsigned *)xalloc(sizeof(unsigned));
+    clientPrivateSizes = (unsigned *)xcalloc(1, sizeof(unsigned));
     if (!clientPrivateSizes)
 	return FALSE;
-    *clientPrivateSizes = 0;
     totalClientSize = PadToLong(sizeof(ClientRec)) + sizeof(DevUnion);
     return TRUE;
 }

From 5ad562565ac8ef9257da3afb0de1ae4f90f80fe9 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 5 Apr 2007 14:18:05 -0400
Subject: [PATCH 064/552] devPrivates rework: properly free devPrivates on
 compatibility structures, type pixmap.  Requires ddx'es to call the free
 function from DestroyPixmap.

---
 afb/afb.h               | 1 +
 afb/afbpixmap.c         | 1 +
 cfb/cfb.h               | 1 +
 cfb/cfbpixmap.c         | 1 +
 fb/fb.h                 | 1 +
 fb/fbpixmap.c           | 1 +
 hw/dmx/dmxpixmap.c      | 2 ++
 hw/xgl/xglpixmap.c      | 1 +
 hw/xnest/Pixmap.c       | 2 ++
 hw/xprint/ps/PsPixmap.c | 8 +++++++-
 mfb/mfb.h               | 1 +
 mfb/mfbpixmap.c         | 1 +
 12 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/afb/afb.h b/afb/afb.h
index 5aa2b0c92..b3ed1ee3f 100644
--- a/afb/afb.h
+++ b/afb/afb.h
@@ -55,6 +55,7 @@ SOFTWARE.
 #include "gc.h"
 #include "colormap.h"
 #include "regionstr.h"
+#include "privates.h"
 #include "mibstore.h"
 #include "mfb.h"
 
diff --git a/afb/afbpixmap.c b/afb/afbpixmap.c
index 77ba53513..5a81679e8 100644
--- a/afb/afbpixmap.c
+++ b/afb/afbpixmap.c
@@ -113,6 +113,7 @@ afbDestroyPixmap(pPixmap)
 {
 	if(--pPixmap->refcnt)
 		return(TRUE);
+	dixFreePrivates(*DEVPRIV_PTR(pPixmap));
 	xfree(pPixmap);
 	return(TRUE);
 }
diff --git a/cfb/cfb.h b/cfb/cfb.h
index 8c682ae8d..15332ff97 100644
--- a/cfb/cfb.h
+++ b/cfb/cfb.h
@@ -37,6 +37,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "colormap.h"
 #include "miscstruct.h"
 #include "servermd.h"
+#include "privates.h"
 #include "windowstr.h"
 #include "mfb.h"
 #undef PixelType
diff --git a/cfb/cfbpixmap.c b/cfb/cfbpixmap.c
index 6fdf3eae6..ed01316ed 100644
--- a/cfb/cfbpixmap.c
+++ b/cfb/cfbpixmap.c
@@ -107,6 +107,7 @@ cfbDestroyPixmap(pPixmap)
 {
     if(--pPixmap->refcnt)
 	return TRUE;
+    dixFreePrivates(*DEVPRIV_PTR(pPixmap));
     xfree(pPixmap);
     return TRUE;
 }
diff --git a/fb/fb.h b/fb/fb.h
index e60507874..9e88667c8 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -38,6 +38,7 @@
 #include "mi.h"
 #include "migc.h"
 #include "mibstore.h"
+#include "privates.h"
 #ifdef RENDER
 #include "picturestr.h"
 #else
diff --git a/fb/fbpixmap.c b/fb/fbpixmap.c
index 18c120440..8c3216a6c 100644
--- a/fb/fbpixmap.c
+++ b/fb/fbpixmap.c
@@ -98,6 +98,7 @@ fbDestroyPixmap (PixmapPtr pPixmap)
 {
     if(--pPixmap->refcnt)
 	return TRUE;
+    dixFreePrivates(*DEVPRIV_PTR(pPixmap));
     xfree(pPixmap);
     return TRUE;
 }
diff --git a/hw/dmx/dmxpixmap.c b/hw/dmx/dmxpixmap.c
index 934060675..e617134f1 100644
--- a/hw/dmx/dmxpixmap.c
+++ b/hw/dmx/dmxpixmap.c
@@ -45,6 +45,7 @@
 
 #include "pixmapstr.h"
 #include "servermd.h"
+#include "privates.h"
 
 /** Initialize a private area in \a pScreen for pixmap information. */
 Bool dmxInitPixmap(ScreenPtr pScreen)
@@ -173,6 +174,7 @@ Bool dmxDestroyPixmap(PixmapPtr pPixmap)
 	    dmxSync(dmxScreen, FALSE);
 	}
     }
+    dixFreePrivates(*DEVPRIV_PTR(pPixmap));
     xfree(pPixmap);
 
 #if 0
diff --git a/hw/xgl/xglpixmap.c b/hw/xgl/xglpixmap.c
index 368c3eaeb..166c33eb9 100644
--- a/hw/xgl/xglpixmap.c
+++ b/hw/xgl/xglpixmap.c
@@ -310,6 +310,7 @@ xglDestroyPixmap (PixmapPtr pPixmap)
 
     xglFiniPixmap (pPixmap);
 
+    dixFreePrivates(*DEVPRIV_PTR(pPixmap));
     xfree (pPixmap);
 
     return TRUE;
diff --git a/hw/xnest/Pixmap.c b/hw/xnest/Pixmap.c
index 612df8dac..c4b8aa65e 100644
--- a/hw/xnest/Pixmap.c
+++ b/hw/xnest/Pixmap.c
@@ -24,6 +24,7 @@ is" without express or implied warranty.
 #include "regionstr.h"
 #include "gc.h"
 #include "servermd.h"
+#include "privates.h"
 #include "mi.h"
 
 #include "Xnest.h"
@@ -74,6 +75,7 @@ xnestDestroyPixmap(PixmapPtr pPixmap)
   if(--pPixmap->refcnt)
     return TRUE;
   XFreePixmap(xnestDisplay, xnestPixmap(pPixmap));
+  dixFreePrivates(*DEVPRIV_PTR(pPixmap));
   xfree(pPixmap);
   return TRUE;
 }
diff --git a/hw/xprint/ps/PsPixmap.c b/hw/xprint/ps/PsPixmap.c
index c3259c98c..220feab2b 100644
--- a/hw/xprint/ps/PsPixmap.c
+++ b/hw/xprint/ps/PsPixmap.c
@@ -79,6 +79,7 @@ in this Software without prior written authorization from The Open Group.
 
 #include "windowstr.h"
 #include "gcstruct.h"
+#include "privates.h"
 
 #include "Ps.h"
 
@@ -111,9 +112,13 @@ PsCreatePixmap(
   pPixmap->devKind               = 0;
   pPixmap->refcnt                = 1;
 
+  pPixmap->devPrivates = (DevUnion *)xcalloc(1, sizeof(DevUnion));
+  if( !pPixmap->devPrivates )
+    { xfree(pPixmap); return NullPixmap; }
+
   pPixmap->devPrivate.ptr = (PsPixmapPrivPtr)xcalloc(1, sizeof(PsPixmapPrivRec));
   if( !pPixmap->devPrivate.ptr )
-    { xfree(pPixmap); return NullPixmap; }
+    { xfree(pPixmap->devPrivates); xfree(pPixmap); return NullPixmap; }
   return pPixmap;
 }
 
@@ -196,6 +201,7 @@ PsDestroyPixmap(PixmapPtr pPixmap)
   PsScrubPixmap(pPixmap);
 
   xfree(priv);
+  dixFreePrivates(*DEVPRIV_PTR(pPixmap));
   xfree(pPixmap);
   return TRUE;
 }
diff --git a/mfb/mfb.h b/mfb/mfb.h
index f597b16a5..3cded7b71 100644
--- a/mfb/mfb.h
+++ b/mfb/mfb.h
@@ -58,6 +58,7 @@ SOFTWARE.
 #include "region.h"
 #include "gc.h"
 #include "colormap.h"
+#include "privates.h"
 #include "miscstruct.h"
 #include "mibstore.h"
 
diff --git a/mfb/mfbpixmap.c b/mfb/mfbpixmap.c
index e34972451..b13e3af0f 100644
--- a/mfb/mfbpixmap.c
+++ b/mfb/mfbpixmap.c
@@ -113,6 +113,7 @@ mfbDestroyPixmap(pPixmap)
 {
     if(--pPixmap->refcnt)
 	return TRUE;
+    dixFreePrivates(*DEVPRIV_PTR(pPixmap));
     xfree(pPixmap);
     return TRUE;
 }

From 47bd311e3dcc501cbb202ce79a55ac32e9db50f2 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 17 Apr 2007 13:46:55 -0400
Subject: [PATCH 065/552] security: remove debugging code.

---
 Xext/security.c | 53 -------------------------------------------------
 1 file changed, 53 deletions(-)

diff --git a/Xext/security.c b/Xext/security.c
index ad04045ae..12e79f9a4 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -1281,9 +1281,6 @@ static char *SecurityKeywords[] = {
 
 #define NUMKEYWORDS (sizeof(SecurityKeywords) / sizeof(char *))
 
-#undef PROPDEBUG
-/*#define PROPDEBUG  1*/
-
 static void
 SecurityFreePropertyAccessList(void)
 {
@@ -1638,32 +1635,6 @@ SecurityLoadPropertyAccessList(void)
 		   lineNumber, SecurityPolicyFile);
     } /* end while more input */
 
-#ifdef PROPDEBUG
-    {
-	PropertyAccessPtr pacl;
-	char *op = "aie";
-	for (pacl = PropertyAccessList; pacl; pacl = pacl->next)
-	{
-	    ErrorF("property %s ", NameForAtom(pacl->name));
-	    switch (pacl->windowRestriction)
-	    {
-		case SecurityAnyWindow: ErrorF("any "); break;
-		case SecurityRootWindow: ErrorF("root "); break;
-		case SecurityWindowWithProperty:
-		{
-		    ErrorF("%s ", NameForAtom(pacl->mustHaveProperty));
-		    if (pacl->mustHaveValue)
-			ErrorF(" = \"%s\" ", pacl->mustHaveValue);
-
-		}
-		break;
-	    }
-	    ErrorF("%cr %cw %cd\n", op[pacl->readAction],
-		   op[pacl->writeAction], op[pacl->destroyAction]);
-	}
-    }
-#endif /* PROPDEBUG */
-
     fclose(f);
 } /* SecurityLoadPropertyAccessList */
 
@@ -1696,11 +1667,6 @@ SecurityMatchString(
 	     && (*cs == '\0') );
 } /* SecurityMatchString */
 
-#ifdef PROPDEBUG
-#include <sys/types.h>
-#include <sys/stat.h>
-#endif
-
 
 static void
 SecurityCheckPropertyAccess(CallbackListPtr *pcbl, pointer unused,
@@ -1720,25 +1686,6 @@ SecurityCheckPropertyAccess(CallbackListPtr *pcbl, pointer unused,
 	 (TRUSTLEVEL(wClient(pWin)) != XSecurityClientTrusted) )
 	return;
 
-#ifdef PROPDEBUG
-    /* For testing, it's more convenient if the property rules file gets
-     * reloaded whenever it changes, so we can rapidly try things without
-     * having to reset the server.
-     */
-    {
-	struct stat buf;
-	static time_t lastmod = 0;
-	int ret = stat(SecurityPolicyFile , &buf);
-	if ( (ret == 0) && (buf.st_mtime > lastmod) )
-	{
-	    ErrorF("reloading property rules\n");
-	    SecurityFreePropertyAccessList();
-	    SecurityLoadPropertyAccessList();
-	    lastmod = buf.st_mtime;
-	}
-    }
-#endif
-
     /* If the property atom is bigger than any atoms on the list, 
      * we know we won't find it, so don't even bother looking.
      */

From 9cee4ec5e6e06d23aafb302494b082c77ade4623 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 17 Apr 2007 16:01:56 -0400
Subject: [PATCH 066/552] xace: change the semantics of the return value of
 XACE hooks to allow arbitrary X status codes instead of just TRUE/FALSE.

The dix layer in most cases still does not propagate the return value of
XACE hooks back to the client, however.  There is more error propagation
work to do.
---
 Xext/security.c |  47 +++++-----
 Xext/xace.c     |  49 +++++-----
 Xext/xace.h     |  12 +--
 Xext/xacestr.h  |  20 ++---
 Xext/xselinux.c | 234 +++++++++++++++++++++++++-----------------------
 dix/devices.c   |  10 +--
 dix/dispatch.c  |  11 +--
 dix/dixutils.c  |   7 +-
 dix/events.c    |  19 ++--
 dix/extension.c |   6 +-
 dix/property.c  |  64 +++++--------
 dix/resource.c  |  18 ++--
 dix/window.c    |  13 ++-
 os/access.c     |   2 +-
 14 files changed, 257 insertions(+), 255 deletions(-)

diff --git a/Xext/security.c b/Xext/security.c
index 12e79f9a4..0d46359ec 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -806,7 +806,7 @@ SecurityCheckDeviceAccess(CallbackListPtr *pcbl, pointer unused,
 	    case X_SetModifierMapping:
 		SecurityAudit("client %d attempted request %d\n",
 			      client->index, reqtype);
-		rec->rval = FALSE;
+		rec->status = BadAccess;
 		return;
 	    default:
 		break;
@@ -875,7 +875,7 @@ SecurityCheckDeviceAccess(CallbackListPtr *pcbl, pointer unused,
 	else
 	    SecurityAudit("client %d attempted to access device %d (%s)\n",
 			  client->index, dev->id, devname);
-	rec->rval = FALSE;
+	rec->status = BadAccess;
     }
     return;
 } /* SecurityCheckDeviceAccess */
@@ -1084,7 +1084,7 @@ SecurityCheckResourceIDAccess(CallbackListPtr *pcbl, pointer unused,
     return;
   deny:
     SecurityAuditResourceIDAccess(client, id);
-    rec->rval = FALSE;	/* deny access */
+    rec->status = BadAccess; /* deny access */
 } /* SecurityCheckResourceIDAccess */
 
 
@@ -1176,7 +1176,7 @@ SecurityCheckDrawableAccess(CallbackListPtr *pcbl, pointer unused,
     XaceDrawableAccessRec *rec = (XaceDrawableAccessRec*)calldata;
 
     if (TRUSTLEVEL(rec->client) != XSecurityClientTrusted)
-	rec->rval = FALSE;
+	rec->status = BadAccess;
 }
 
 static void
@@ -1192,7 +1192,7 @@ SecurityCheckMapAccess(CallbackListPtr *pcbl, pointer unused,
 	pWin->parent && pWin->parent->parent &&
 	(TRUSTLEVEL(wClient(pWin->parent)) == XSecurityClientTrusted))
 
-	rec->rval = FALSE;
+	rec->status = BadAccess;
 }
 
 static void
@@ -1202,7 +1202,7 @@ SecurityCheckBackgrndAccess(CallbackListPtr *pcbl, pointer unused,
     XaceMapAccessRec *rec = (XaceMapAccessRec*)calldata;
 
     if (TRUSTLEVEL(rec->client) != XSecurityClientTrusted)
-	rec->rval = FALSE;
+	rec->status = BadAccess;
 }
 
 static void
@@ -1214,7 +1214,7 @@ SecurityCheckExtAccess(CallbackListPtr *pcbl, pointer unused,
     if ((TRUSTLEVEL(rec->client) != XSecurityClientTrusted) &&
 	!EXTLEVEL(rec->ext))
 
-	rec->rval = FALSE;
+	rec->status = BadAccess;
 }
 
 static void
@@ -1225,7 +1225,7 @@ SecurityCheckHostlistAccess(CallbackListPtr *pcbl, pointer unused,
  
     if (TRUSTLEVEL(rec->client) != XSecurityClientTrusted)
     {
-	rec->rval = FALSE;
+	rec->status = BadAccess;
 	if (rec->access_mode == DixWriteAccess)
 	    SecurityAudit("client %d attempted to change host access\n",
 			  rec->client->index);
@@ -1255,14 +1255,14 @@ typedef struct _PropertyAccessRec {
 #define SecurityAnyWindow          0
 #define SecurityRootWindow         1
 #define SecurityWindowWithProperty 2
-    char readAction;
-    char writeAction;
-    char destroyAction;
+    int readAction;
+    int writeAction;
+    int destroyAction;
     struct _PropertyAccessRec *next;
 } PropertyAccessRec, *PropertyAccessPtr;
 
 static PropertyAccessPtr PropertyAccessList = NULL;
-static char SecurityDefaultAction = XaceErrorOperation;
+static int SecurityDefaultAction = BadAtom;
 static char *SecurityPolicyFile = DEFAULTPOLICYFILE;
 static ATOM SecurityMaxPropertyName = 0;
 
@@ -1372,8 +1372,8 @@ SecurityParsePropertyAccessRule(
 {
     char *propname;
     char c;
-    char action = SecurityDefaultAction;
-    char readAction, writeAction, destroyAction;
+    int action = SecurityDefaultAction;
+    int readAction, writeAction, destroyAction;
     PropertyAccessPtr pacl, prev, cur;
     char *mustHaveProperty = NULL;
     char *mustHaveValue = NULL;
@@ -1418,9 +1418,9 @@ SecurityParsePropertyAccessRule(
     {
 	switch (c)
 	{
-	    case 'i': action = XaceIgnoreOperation; break;
-	    case 'a': action = XaceAllowOperation;  break;
-	    case 'e': action = XaceErrorOperation;  break;
+	    case 'i': action = XaceIgnoreError; break;
+	    case 'a': action = Success;  break;
+	    case 'e': action = BadAtom;  break;
 
 	    case 'r': readAction    = action; break;
 	    case 'w': writeAction   = action; break;
@@ -1678,7 +1678,7 @@ SecurityCheckPropertyAccess(CallbackListPtr *pcbl, pointer unused,
     ATOM propertyName = rec->pProp->propertyName;
     Mask access_mode = rec->access_mode;
     PropertyAccessPtr pacl;
-    char action = SecurityDefaultAction;
+    int action = SecurityDefaultAction;
 
     /* if client trusted or window untrusted, allow operation */
 
@@ -1757,7 +1757,7 @@ SecurityCheckPropertyAccess(CallbackListPtr *pcbl, pointer unused,
 	     * If pacl doesn't apply, something above should have
 	     * executed a continue, which will skip the follwing code.
 	     */
-	    action = XaceAllowOperation;
+	    action = Success;
 	    if (access_mode & DixReadAccess)
 		action = max(action, pacl->readAction);
 	    if (access_mode & DixWriteAccess)
@@ -1768,19 +1768,18 @@ SecurityCheckPropertyAccess(CallbackListPtr *pcbl, pointer unused,
 	} /* end for each pacl */
     } /* end if propertyName <= SecurityMaxPropertyName */
 
-    if (XaceAllowOperation != action)
+    if (action != Success)
     { /* audit the access violation */
 	int cid = CLIENT_ID(pWin->drawable.id);
 	int reqtype = ((xReq *)client->requestBuffer)->reqType;
-	char *actionstr = (XaceIgnoreOperation == action) ?
-							"ignored" : "error";
+	char *actionstr = (XaceIgnoreError == action) ? "ignored" : "error";
 	SecurityAudit("client %d attempted request %d with window 0x%x property %s (atom 0x%x) of client %d, %s\n",
 		client->index, reqtype, pWin->drawable.id,
 		      NameForAtom(propertyName), propertyName, cid, actionstr);
     }
     /* return codes increase with strictness */
-    if (action > rec->rval)
-        rec->rval = action;
+    if (action != Success)
+        rec->status = action;
 } /* SecurityCheckPropertyAccess */
 
 
diff --git a/Xext/xace.c b/Xext/xace.c
index aff45d90a..46fe7bc66 100644
--- a/Xext/xace.c
+++ b/Xext/xace.c
@@ -61,10 +61,10 @@ int XaceHook(int hook, ...)
 	case XACE_CORE_DISPATCH: {
 	    XaceCoreDispatchRec rec = {
 		va_arg(ap, ClientPtr),
-		TRUE	/* default allow */
+		Success /* default allow */
 	    };
 	    calldata = &rec;
-	    prv = &rec.rval;
+	    prv = &rec.status;
 	    break;
 	}
 	case XACE_RESOURCE_ACCESS: {
@@ -74,10 +74,10 @@ int XaceHook(int hook, ...)
 		va_arg(ap, RESTYPE),
 		va_arg(ap, Mask),
 		va_arg(ap, pointer),
-		TRUE	/* default allow */
+		Success /* default allow */
 	    };
 	    calldata = &rec;
-	    prv = &rec.rval;
+	    prv = &rec.status;
 	    break;
 	}
 	case XACE_DEVICE_ACCESS: {
@@ -85,10 +85,10 @@ int XaceHook(int hook, ...)
 		va_arg(ap, ClientPtr),
 		va_arg(ap, DeviceIntPtr),
 		va_arg(ap, Bool),
-		TRUE	/* default allow */
+		Success /* default allow */
 	    };
 	    calldata = &rec;
-	    prv = &rec.rval;
+	    prv = &rec.status;
 	    break;
 	}
 	case XACE_PROPERTY_ACCESS: {
@@ -97,20 +97,20 @@ int XaceHook(int hook, ...)
 		va_arg(ap, WindowPtr),
 		va_arg(ap, PropertyPtr),
 		va_arg(ap, Mask),
-		XaceAllowOperation   /* default allow */
+		Success /* default allow */
 	    };
 	    calldata = &rec;
-	    prv = &rec.rval;
+	    prv = &rec.status;
 	    break;
 	}
 	case XACE_DRAWABLE_ACCESS: {
 	    XaceDrawableAccessRec rec = {
 		va_arg(ap, ClientPtr),
 		va_arg(ap, DrawablePtr),
-		TRUE	/* default allow */
+		Success /* default allow */
 	    };
 	    calldata = &rec;
-	    prv = &rec.rval;
+	    prv = &rec.status;
 	    break;
 	}
 	case XACE_MAP_ACCESS:
@@ -118,10 +118,10 @@ int XaceHook(int hook, ...)
 	    XaceMapAccessRec rec = {
 		va_arg(ap, ClientPtr),
 		va_arg(ap, WindowPtr),
-		TRUE	/* default allow */
+		Success /* default allow */
 	    };
 	    calldata = &rec;
-	    prv = &rec.rval;
+	    prv = &rec.status;
 	    break;
 	}
 	case XACE_EXT_DISPATCH:
@@ -129,20 +129,20 @@ int XaceHook(int hook, ...)
 	    XaceExtAccessRec rec = {
 		va_arg(ap, ClientPtr),
 		va_arg(ap, ExtensionEntry*),
-		TRUE	/* default allow */
+		Success /* default allow */
 	    };
 	    calldata = &rec;
-	    prv = &rec.rval;
+	    prv = &rec.status;
 	    break;
 	}
 	case XACE_HOSTLIST_ACCESS: {
 	    XaceHostlistAccessRec rec = {
 		va_arg(ap, ClientPtr),
 		va_arg(ap, Mask),
-		TRUE	/* default allow */
+		Success /* default allow */
 	    };
 	    calldata = &rec;
-	    prv = &rec.rval;
+	    prv = &rec.status;
 	    break;
 	}
 	case XACE_SELECTION_ACCESS: {
@@ -150,20 +150,20 @@ int XaceHook(int hook, ...)
 		va_arg(ap, ClientPtr),
 		va_arg(ap, Selection*),
 		va_arg(ap, Mask),
-		TRUE	/* default allow */
+		Success /* default allow */
 	    };
 	    calldata = &rec;
-	    prv = &rec.rval;
+	    prv = &rec.status;
 	    break;
 	}
 	case XACE_SITE_POLICY: {
 	    XaceSitePolicyRec rec = {
 		va_arg(ap, char*),
 		va_arg(ap, int),
-		FALSE	/* default unrecognized */
+		BadValue /* default unrecognized */
 	    };
 	    calldata = &rec;
-	    prv = &rec.rval;
+	    prv = &rec.status;
 	    break;
 	}
 	case XACE_DECLARE_EXT_SECURE: {
@@ -271,13 +271,14 @@ static int
 XaceCatchDispatchProc(ClientPtr client)
 {
     REQUEST(xReq);
-    int major = stuff->reqType;
+    int rc, major = stuff->reqType;
 
     if (!ProcVector[major])
 	return (BadRequest);
 
-    if (!XaceHook(XACE_CORE_DISPATCH, client))
-	return (BadAccess);
+    rc = XaceHook(XACE_CORE_DISPATCH, client);
+    if (rc != Success)
+        return rc;
 
     return client->swapped ? 
 	(* SwappedProcVector[major])(client) :
@@ -294,7 +295,7 @@ XaceCatchExtProc(ClientPtr client)
     if (!ext || !ProcVector[major])
 	return (BadRequest);
 
-    if (!XaceHook(XACE_EXT_DISPATCH, client, ext))
+    if (XaceHook(XACE_EXT_DISPATCH, client, ext) != Success)
 	return (BadRequest); /* pretend extension doesn't exist */
 
     return client->swapped ?
diff --git a/Xext/xace.h b/Xext/xace.h
index ec138426d..083261273 100644
--- a/Xext/xace.h
+++ b/Xext/xace.h
@@ -20,10 +20,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef _XACE_H
 #define _XACE_H
 
-/* Hook return codes */
-#define XaceErrorOperation  0
-#define XaceAllowOperation  1
-#define XaceIgnoreOperation 2
+/* Special value used for ignore operation.  This is a deprecated feature
+ * only for Security extension support.  Do not use in new code.
+ */
+#define XaceIgnoreError BadRequest
 
 #ifdef XACE
 
@@ -97,10 +97,10 @@ extern void XaceCensorImage(
 /* Define calls away when XACE is not being built. */
 
 #ifdef __GNUC__
-#define XaceHook(args...) XaceAllowOperation
+#define XaceHook(args...) Success
 #define XaceCensorImage(args...) { ; }
 #else
-#define XaceHook(...) XaceAllowOperation
+#define XaceHook(...) Success
 #define XaceCensorImage(...) { ; }
 #endif
 
diff --git a/Xext/xacestr.h b/Xext/xacestr.h
index 184fb9b0b..8eb74d50f 100644
--- a/Xext/xacestr.h
+++ b/Xext/xacestr.h
@@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 /* XACE_CORE_DISPATCH */
 typedef struct {
     ClientPtr client;
-    int rval;
+    int status;
 } XaceCoreDispatchRec;
 
 /* XACE_RESOURCE_ACCESS */
@@ -43,7 +43,7 @@ typedef struct {
     RESTYPE rtype;
     Mask access_mode;
     pointer res;
-    int rval;
+    int status;
 } XaceResourceAccessRec;
 
 /* XACE_DEVICE_ACCESS */
@@ -51,7 +51,7 @@ typedef struct {
     ClientPtr client;
     DeviceIntPtr dev;
     Bool fromRequest;
-    int rval;
+    int status;
 } XaceDeviceAccessRec;
 
 /* XACE_PROPERTY_ACCESS */
@@ -60,14 +60,14 @@ typedef struct {
     WindowPtr pWin;
     PropertyPtr pProp;
     Mask access_mode;
-    int rval;
+    int status;
 } XacePropertyAccessRec;
 
 /* XACE_DRAWABLE_ACCESS */
 typedef struct {
     ClientPtr client;
     DrawablePtr pDraw;
-    int rval;
+    int status;
 } XaceDrawableAccessRec;
 
 /* XACE_MAP_ACCESS */
@@ -75,7 +75,7 @@ typedef struct {
 typedef struct {
     ClientPtr client;
     WindowPtr pWin;
-    int rval;
+    int status;
 } XaceMapAccessRec;
 
 /* XACE_EXT_DISPATCH */
@@ -83,14 +83,14 @@ typedef struct {
 typedef struct {
     ClientPtr client;
     ExtensionEntry *ext;
-    int rval;
+    int status;
 } XaceExtAccessRec;
 
 /* XACE_HOSTLIST_ACCESS */
 typedef struct {
     ClientPtr client;
     Mask access_mode;
-    int rval;
+    int status;
 } XaceHostlistAccessRec;
 
 /* XACE_SELECTION_ACCESS */
@@ -98,14 +98,14 @@ typedef struct {
     ClientPtr client;
     Selection *selection;
     Mask access_mode;
-    int rval;
+    int status;
 } XaceSelectionAccessRec;
 
 /* XACE_SITE_POLICY */
 typedef struct {
     char *policyString;
     int len;
-    int rval;
+    int status;
 } XaceSitePolicyRec;
 
 /* XACE_DECLARE_EXT_SECURE */
diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 648bb6efd..3cec21bb1 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -193,7 +193,7 @@ SwapXID(ClientPtr client, XID id)
  * class: Security class of the server object being accessed.
  * perm: Permissions required on the object.
  *
- * Returns: boolean TRUE=allowed, FALSE=denied.
+ * Returns: X status code.
  */
 static int
 ServerPerm(ClientPtr client,
@@ -211,18 +211,19 @@ ServerPerm(ClientPtr client,
         if (avc_has_perm(SID(client), RSID(serverClient,idx), class,
                          perm, &AEREF(client), &auditdata) < 0)
         {
-            if (errno != EACCES)
-                ErrorF("ServerPerm: unexpected error %d\n", errno);
-            return FALSE;
+            if (errno == EACCES)
+		return BadAccess;
+	    ErrorF("ServerPerm: unexpected error %d\n", errno);
+	    return BadValue;
         }
     }
     else
     {
 	ErrorF("No client state in server-perm check!\n");
-        return TRUE;
+        return Success;
     }
 
-    return TRUE;
+    return Success;
 }
 
 /*
@@ -234,7 +235,7 @@ ServerPerm(ClientPtr client,
  * class: Security class of the resource being accessed.
  * perm: Permissions required on the resource.
  *
- * Returns: boolean TRUE=allowed, FALSE=denied.
+ * Returns: X status code.
  */
 static int
 IDPerm(ClientPtr sclient,
@@ -247,7 +248,7 @@ IDPerm(ClientPtr sclient,
     XSELinuxAuditRec auditdata;
 
     if (id == None)
-	return TRUE;
+	return Success;
 
     CheckXID(id);
     tclient = clients[CLIENT_ID(id)];
@@ -259,7 +260,7 @@ IDPerm(ClientPtr sclient,
      */
     if (!tclient || !HAVESTATE(tclient) || !HAVESTATE(sclient))
     {
-	return TRUE;
+	return Success;
     }
 
     auditdata.client = sclient;
@@ -269,12 +270,13 @@ IDPerm(ClientPtr sclient,
     if (avc_has_perm(SID(sclient), RSID(tclient,idx), class,
 		     perm, &AEREF(sclient), &auditdata) < 0)
     {
-	if (errno != EACCES)
-	    ErrorF("IDPerm: unexpected error %d\n", errno);
-	return FALSE;
+	if (errno == EACCES)
+	    return BadAccess;
+	ErrorF("IDPerm: unexpected error %d\n", errno);
+	return BadValue;
     }
 
-    return TRUE;
+    return Success;
 }
 
 /*
@@ -501,8 +503,9 @@ FreeClientState(ClientPtr client)
 #define REQUEST_SIZE_CHECK(client, req) \
     (client->req_len >= (sizeof(req) >> 2))
 #define IDPERM(client, req, field, class, perm) \
-    (REQUEST_SIZE_CHECK(client,req) && \
-    IDPerm(client, SwapXID(client,((req*)stuff)->field), class, perm))
+    (REQUEST_SIZE_CHECK(client,req) ? \
+     IDPerm(client, SwapXID(client,((req*)stuff)->field), class, perm) : \
+     BadLength)
 
 static int
 CheckSendEventPerms(ClientPtr client)
@@ -513,7 +516,7 @@ CheckSendEventPerms(ClientPtr client)
 
     /* might need type bounds checking here */
     if (!REQUEST_SIZE_CHECK(client, xSendEventReq))
-	return FALSE;
+	return BadLength;
 
     switch (stuff->event.u.u.type) {
 	case SelectionClear:
@@ -574,11 +577,11 @@ static int
 CheckConvertSelectionPerms(ClientPtr client)
 {
     register char n;
-    int rval = TRUE;
+    int rval = Success;
     REQUEST(xConvertSelectionReq);
 
     if (!REQUEST_SIZE_CHECK(client, xConvertSelectionReq))
-	return FALSE;
+	return BadLength;
 
     if (client->swapped)
     {
@@ -591,24 +594,26 @@ CheckConvertSelectionPerms(ClientPtr client)
 	int i = 0;
 	while ((i < NumCurrentSelections) &&
 	       CurrentSelections[i].selection != stuff->selection) i++;
-	if (i < NumCurrentSelections)
-	    rval = rval && IDPerm(client, CurrentSelections[i].window,
-				  SECCLASS_WINDOW, WINDOW__CLIENTCOMEVENT);
-    }
-    rval = rval && IDPerm(client, stuff->requestor,
+	if (i < NumCurrentSelections) {
+	    rval = IDPerm(client, CurrentSelections[i].window,
 			  SECCLASS_WINDOW, WINDOW__CLIENTCOMEVENT);
-    return rval;
+	    if (rval != Success)
+		return rval;
+	}
+    }
+    return IDPerm(client, stuff->requestor,
+		  SECCLASS_WINDOW, WINDOW__CLIENTCOMEVENT);
 }
 
 static int
 CheckSetSelectionOwnerPerms(ClientPtr client)
 {
     register char n;
-    int rval = TRUE;
+    int rval = Success;
     REQUEST(xSetSelectionOwnerReq);
 
     if (!REQUEST_SIZE_CHECK(client, xSetSelectionOwnerReq))
-	return FALSE;
+	return BadLength;
 
     if (client->swapped)
     {
@@ -621,13 +626,15 @@ CheckSetSelectionOwnerPerms(ClientPtr client)
 	int i = 0;
 	while ((i < NumCurrentSelections) &&
 	       CurrentSelections[i].selection != stuff->selection) i++;
-	if (i < NumCurrentSelections)
-	    rval = rval && IDPerm(client, CurrentSelections[i].window,
-				  SECCLASS_WINDOW, WINDOW__CHSELECTION);
-    }
-    rval = rval && IDPerm(client, stuff->window,
+	if (i < NumCurrentSelections) {
+	    rval = IDPerm(client, CurrentSelections[i].window,
+			  SECCLASS_WINDOW, WINDOW__CHSELECTION);
+	    if (rval != Success)
+		return rval;
+	}
+    }
+    return IDPerm(client, stuff->window,
 			  SECCLASS_WINDOW, WINDOW__CHSELECTION);
-    return rval;
 }
 
 static void
@@ -636,7 +643,7 @@ XSELinuxCoreDispatch(CallbackListPtr *pcbl, pointer unused, pointer calldata)
     XaceCoreDispatchRec *rec = (XaceCoreDispatchRec*)calldata;
     ClientPtr client = rec->client;
     REQUEST(xReq);
-    Bool rval;
+    int rval = Success, rval2 = Success, rval3 = Success;
 
     switch(stuff->reqType) {
     /* Drawable class control requirements */
@@ -668,9 +675,9 @@ XSELinuxCoreDispatch(CallbackListPtr *pcbl, pointer unused, pointer calldata)
     case X_CopyArea:
     case X_CopyPlane:
 	rval = IDPERM(client, xCopyAreaReq, srcDrawable,
-		      SECCLASS_DRAWABLE, DRAWABLE__COPY)
-	    && IDPERM(client, xCopyAreaReq, dstDrawable,
-		      SECCLASS_DRAWABLE, DRAWABLE__DRAW);
+		      SECCLASS_DRAWABLE, DRAWABLE__COPY);
+	rval2 = IDPERM(client, xCopyAreaReq, dstDrawable,
+		       SECCLASS_DRAWABLE, DRAWABLE__DRAW);
 	break;
     case X_GetImage:
 	rval = IDPERM(client, xGetImageReq, drawable,
@@ -712,12 +719,12 @@ XSELinuxCoreDispatch(CallbackListPtr *pcbl, pointer unused, pointer calldata)
     case X_CreateWindow:
 	rval = IDPERM(client, xCreateWindowReq, wid,
 		      SECCLASS_WINDOW,
-		      WINDOW__CREATE | WINDOW__SETATTR | WINDOW__MOVE)
-	    && IDPERM(client, xCreateWindowReq, parent,
-		      SECCLASS_WINDOW,
-		      WINDOW__CHSTACK | WINDOW__ADDCHILD)
-	    && IDPERM(client, xCreateWindowReq, wid,
-		      SECCLASS_DRAWABLE, DRAWABLE__CREATE);
+		      WINDOW__CREATE | WINDOW__SETATTR | WINDOW__MOVE);
+	rval2 = IDPERM(client, xCreateWindowReq, parent,
+		       SECCLASS_WINDOW,
+		       WINDOW__CHSTACK | WINDOW__ADDCHILD);
+	rval3 = IDPERM(client, xCreateWindowReq, wid,
+		       SECCLASS_DRAWABLE, DRAWABLE__CREATE);
 	break;
     case X_DeleteProperty:
 	rval = IDPERM(client, xDeletePropertyReq, window,
@@ -728,9 +735,9 @@ XSELinuxCoreDispatch(CallbackListPtr *pcbl, pointer unused, pointer calldata)
     case X_DestroySubwindows:
 	rval = IDPERM(client, xResourceReq, id,
 		      SECCLASS_WINDOW,
-		      WINDOW__ENUMERATE | WINDOW__UNMAP | WINDOW__DESTROY)
-	    && IDPERM(client, xResourceReq, id,
-		      SECCLASS_DRAWABLE, DRAWABLE__DESTROY);
+		      WINDOW__ENUMERATE | WINDOW__UNMAP | WINDOW__DESTROY);
+	rval2 = IDPERM(client, xResourceReq, id,
+		       SECCLASS_DRAWABLE, DRAWABLE__DESTROY);
 	break;
     case X_GetMotionEvents:
 	rval = IDPERM(client, xGetMotionEventsReq, window,
@@ -768,26 +775,26 @@ XSELinuxCoreDispatch(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	break;
     case X_ReparentWindow:
 	rval = IDPERM(client, xReparentWindowReq, window,
-		      SECCLASS_WINDOW, WINDOW__CHPARENT | WINDOW__MOVE)
-	    && IDPERM(client, xReparentWindowReq, parent,
-		      SECCLASS_WINDOW, WINDOW__CHSTACK | WINDOW__ADDCHILD);
+		      SECCLASS_WINDOW, WINDOW__CHPARENT | WINDOW__MOVE);
+	rval2 = IDPERM(client, xReparentWindowReq, parent,
+		       SECCLASS_WINDOW, WINDOW__CHSTACK | WINDOW__ADDCHILD);
 	break;
     case X_SendEvent:
 	rval = CheckSendEventPerms(client);
 	break;
     case X_SetInputFocus:
 	rval = IDPERM(client, xSetInputFocusReq, focus,
-		      SECCLASS_WINDOW, WINDOW__SETFOCUS)
-	    && ServerPerm(client, SECCLASS_XINPUT, XINPUT__SETFOCUS);
+		      SECCLASS_WINDOW, WINDOW__SETFOCUS);
+	rval2 = ServerPerm(client, SECCLASS_XINPUT, XINPUT__SETFOCUS);
 	break;
     case X_SetSelectionOwner:
 	rval = CheckSetSelectionOwnerPerms(client);
 	break;
     case X_TranslateCoords:
 	rval = IDPERM(client, xTranslateCoordsReq, srcWid,
-		      SECCLASS_WINDOW, WINDOW__GETATTR)
-	    && IDPERM(client, xTranslateCoordsReq, dstWid,
 		      SECCLASS_WINDOW, WINDOW__GETATTR);
+	rval2 = IDPERM(client, xTranslateCoordsReq, dstWid,
+		       SECCLASS_WINDOW, WINDOW__GETATTR);
 	break;
     case X_UnmapWindow:
     case X_UnmapSubwindows:
@@ -798,10 +805,10 @@ XSELinuxCoreDispatch(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	break;
     case X_WarpPointer:
 	rval = IDPERM(client, xWarpPointerReq, srcWid,
-		      SECCLASS_WINDOW, WINDOW__GETATTR)
-	    && IDPERM(client, xWarpPointerReq, dstWid,
-		      SECCLASS_WINDOW, WINDOW__GETATTR)
-	    && ServerPerm(client, SECCLASS_XINPUT, XINPUT__WARPPOINTER);
+		      SECCLASS_WINDOW, WINDOW__GETATTR);
+	rval2 = IDPERM(client, xWarpPointerReq, dstWid,
+		       SECCLASS_WINDOW, WINDOW__GETATTR);
+	rval3 = ServerPerm(client, SECCLASS_XINPUT, XINPUT__WARPPOINTER);
 	break;
 
     /* Input class control requirements */
@@ -852,16 +859,16 @@ XSELinuxCoreDispatch(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	break;
     case X_CopyColormapAndFree:
 	rval = IDPERM(client, xCopyColormapAndFreeReq, mid,
-		      SECCLASS_COLORMAP, COLORMAP__CREATE)
-	    && IDPERM(client, xCopyColormapAndFreeReq, srcCmap,
-		      SECCLASS_COLORMAP,
-		      COLORMAP__READ | COLORMAP__FREE);
+		      SECCLASS_COLORMAP, COLORMAP__CREATE);
+	rval2 = IDPERM(client, xCopyColormapAndFreeReq, srcCmap,
+		       SECCLASS_COLORMAP,
+		       COLORMAP__READ | COLORMAP__FREE);
 	break;
     case X_CreateColormap:
 	rval = IDPERM(client, xCreateColormapReq, mid,
-		      SECCLASS_COLORMAP, COLORMAP__CREATE)
-	    && IDPERM(client, xCreateColormapReq, window,
-		      SECCLASS_DRAWABLE, DRAWABLE__DRAW);
+		      SECCLASS_COLORMAP, COLORMAP__CREATE);
+	rval2 = IDPERM(client, xCreateColormapReq, window,
+		       SECCLASS_DRAWABLE, DRAWABLE__DRAW);
 	break;
     case X_FreeColormap:
 	rval = IDPERM(client, xResourceReq, id,
@@ -873,8 +880,8 @@ XSELinuxCoreDispatch(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	break;
     case X_InstallColormap:
 	rval = IDPERM(client, xResourceReq, id,
-		      SECCLASS_COLORMAP, COLORMAP__INSTALL)
-	    && ServerPerm(client, SECCLASS_COLORMAP, COLORMAP__INSTALL);
+		      SECCLASS_COLORMAP, COLORMAP__INSTALL);
+	rval2 = ServerPerm(client, SECCLASS_COLORMAP, COLORMAP__INSTALL);
 	break;
     case X_ListInstalledColormaps:
 	rval = ServerPerm(client, SECCLASS_COLORMAP, COLORMAP__LIST);
@@ -891,8 +898,8 @@ XSELinuxCoreDispatch(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	break;
     case X_UninstallColormap:
 	rval = IDPERM(client, xResourceReq, id,
-		      SECCLASS_COLORMAP, COLORMAP__UNINSTALL)
-	    && ServerPerm(client, SECCLASS_COLORMAP, COLORMAP__UNINSTALL);
+		      SECCLASS_COLORMAP, COLORMAP__UNINSTALL);
+	rval2 = ServerPerm(client, SECCLASS_COLORMAP, COLORMAP__UNINSTALL);
 	break;
 
     /* Font class control requirements */
@@ -907,18 +914,18 @@ XSELinuxCoreDispatch(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 		      SECCLASS_DRAWABLE, DRAWABLE__DRAW);
 	break;
     case X_OpenFont:
-	rval = ServerPerm(client, SECCLASS_FONT, FONT__LOAD)
-	    && IDPERM(client, xOpenFontReq, fid,
-		      SECCLASS_FONT, FONT__USE);
+	rval = ServerPerm(client, SECCLASS_FONT, FONT__LOAD);
+	rval2 = IDPERM(client, xOpenFontReq, fid,
+		       SECCLASS_FONT, FONT__USE);
 	break;
     case X_PolyText8:
     case X_PolyText16:
 	/* Font accesses checked through the resource manager */
-	rval = ServerPerm(client, SECCLASS_FONT, FONT__LOAD)
-	    && IDPERM(client, xPolyTextReq, gc,
-		      SECCLASS_GC, GC__SETATTR)
-	    && IDPERM(client, xPolyTextReq, drawable,
-		      SECCLASS_DRAWABLE, DRAWABLE__DRAW);
+	rval = ServerPerm(client, SECCLASS_FONT, FONT__LOAD);
+	rval2 = IDPERM(client, xPolyTextReq, gc,
+		       SECCLASS_GC, GC__SETATTR);
+	rval3 = IDPERM(client, xPolyTextReq, drawable,
+		       SECCLASS_DRAWABLE, DRAWABLE__DRAW);
 	break;
 
     /* Pixmap class control requirements */
@@ -934,19 +941,19 @@ XSELinuxCoreDispatch(CallbackListPtr *pcbl, pointer unused, pointer calldata)
     /* Cursor class control requirements */
     case X_CreateCursor:
 	rval = IDPERM(client, xCreateCursorReq, cid,
-		      SECCLASS_CURSOR, CURSOR__CREATE)
-	    && IDPERM(client, xCreateCursorReq, source,
-		      SECCLASS_DRAWABLE, DRAWABLE__DRAW)
-	    && IDPERM(client, xCreateCursorReq, mask,
-		      SECCLASS_DRAWABLE, DRAWABLE__COPY);
+		      SECCLASS_CURSOR, CURSOR__CREATE);
+	rval2 = IDPERM(client, xCreateCursorReq, source,
+		       SECCLASS_DRAWABLE, DRAWABLE__DRAW);
+	rval3 = IDPERM(client, xCreateCursorReq, mask,
+		       SECCLASS_DRAWABLE, DRAWABLE__COPY);
 	break;
     case X_CreateGlyphCursor:
 	rval = IDPERM(client, xCreateGlyphCursorReq, cid,
-		      SECCLASS_CURSOR, CURSOR__CREATEGLYPH)
-	    && IDPERM(client, xCreateGlyphCursorReq, source,
-		      SECCLASS_FONT, FONT__USE)
-	    && IDPERM(client, xCreateGlyphCursorReq, mask,
-		      SECCLASS_FONT, FONT__USE);
+		      SECCLASS_CURSOR, CURSOR__CREATEGLYPH);
+	rval2 = IDPERM(client, xCreateGlyphCursorReq, source,
+		       SECCLASS_FONT, FONT__USE);
+	rval3 = IDPERM(client, xCreateGlyphCursorReq, mask,
+		       SECCLASS_FONT, FONT__USE);
 	break;
     case X_RecolorCursor:
 	rval = IDPERM(client, xRecolorCursorReq, cursor,
@@ -970,9 +977,9 @@ XSELinuxCoreDispatch(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	break;
     case X_CopyGC:
 	rval = IDPERM(client, xCopyGCReq, srcGC,
-		      SECCLASS_GC, GC__GETATTR)
-	    && IDPERM(client, xCopyGCReq, dstGC,
-		      SECCLASS_GC, GC__SETATTR);
+		      SECCLASS_GC, GC__GETATTR);
+	rval2 = IDPERM(client, xCopyGCReq, dstGC,
+		       SECCLASS_GC, GC__SETATTR);
 	break;
     case X_FreeGC:
 	rval = IDPERM(client, xResourceReq, id,
@@ -1009,11 +1016,14 @@ XSELinuxCoreDispatch(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	break;
 
     default:
-	rval = TRUE;
 	break;
     }
-    if (!rval)
-	rec->rval = FALSE;
+    if (rval != Success)
+	rec->status = rval;
+    if (rval2 != Success)
+	rec->status = rval2;
+    if (rval != Success)
+	rec->status = rval3;
 }
 
 static void
@@ -1050,9 +1060,10 @@ XSELinuxExtDispatch(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	if (avc_has_perm(SID(client), extsid, SECCLASS_XEXTENSION,
 			 perm, &AEREF(client), &auditdata) < 0)
 	{
-	    if (errno != EACCES)
-		ErrorF("ExtDispatch: unexpected error %d\n", errno);
-	    rec->rval = FALSE;
+	    if (errno == EACCES)
+		rec->status = BadAccess;
+	    ErrorF("ExtDispatch: unexpected error %d\n", errno);
+	    rec->status = BadValue;
 	}
     } else
 	ErrorF("No client state in extension dispatcher!\n");
@@ -1096,9 +1107,10 @@ XSELinuxProperty(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	if (avc_has_perm(SID(client), propsid, SECCLASS_PROPERTY,
 			 perm, &AEREF(client), &auditdata) < 0)
 	{
-	    if (errno != EACCES)
-		ErrorF("Property: unexpected error %d\n", errno);
-	    rec->rval = XaceIgnoreOperation;
+	    if (errno == EACCES)
+		rec->status = BadAccess;
+	    ErrorF("Property: unexpected error %d\n", errno);
+	    rec->status = BadValue;
 	}
     } else
 	ErrorF("No client state in property callback!\n");
@@ -1114,7 +1126,7 @@ XSELinuxResLookup(CallbackListPtr *pcbl, pointer unused, pointer calldata)
     ClientPtr client = rec->client;
     REQUEST(xReq);
     access_vector_t perm = 0;
-    Bool rval = TRUE;
+    int rval = Success;
 
     /* serverClient requests OK */
     if (client->index == 0)
@@ -1145,35 +1157,35 @@ XSELinuxResLookup(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	default:
 	    break;
     }
-    if (!rval)
-	rec->rval = FALSE;
+    if (rval != Success)
+	rec->status = rval;
 } /* XSELinuxResLookup */
 
 static void
 XSELinuxMap(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     XaceMapAccessRec *rec = (XaceMapAccessRec*)calldata;
-    if (!IDPerm(rec->client, rec->pWin->drawable.id,
-		SECCLASS_WINDOW, WINDOW__MAP))
-	rec->rval = FALSE;
+    if (IDPerm(rec->client, rec->pWin->drawable.id,
+               SECCLASS_WINDOW, WINDOW__MAP) != Success)
+	rec->status = BadAccess;
 } /* XSELinuxMap */
 
 static void
 XSELinuxBackgrnd(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     XaceMapAccessRec *rec = (XaceMapAccessRec*)calldata;
-    if (!IDPerm(rec->client, rec->pWin->drawable.id,
-		SECCLASS_WINDOW, WINDOW__TRANSPARENT))
-	rec->rval = FALSE;
+    if (IDPerm(rec->client, rec->pWin->drawable.id,
+               SECCLASS_WINDOW, WINDOW__TRANSPARENT) != Success)
+	rec->status = BadAccess;
 } /* XSELinuxBackgrnd */
 
 static void
 XSELinuxDrawable(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     XaceDrawableAccessRec *rec = (XaceDrawableAccessRec*)calldata;
-    if (!IDPerm(rec->client, rec->pDraw->id,
-		SECCLASS_DRAWABLE, DRAWABLE__COPY))
-	rec->rval = FALSE;
+    if (IDPerm(rec->client, rec->pDraw->id,
+               SECCLASS_DRAWABLE, DRAWABLE__COPY) != Success)
+	rec->status = BadAccess;
 } /* XSELinuxDrawable */
 
 static void
@@ -1183,8 +1195,8 @@ XSELinuxHostlist(CallbackListPtr *pcbl, pointer unused, pointer calldata)
     access_vector_t perm = (rec->access_mode == DixReadAccess) ?
 	XSERVER__GETHOSTLIST : XSERVER__SETHOSTLIST;
 
-    if (!ServerPerm(rec->client, SECCLASS_XSERVER, perm))
-	rec->rval = FALSE;
+    if (ServerPerm(rec->client, SECCLASS_XSERVER, perm) != Success)
+	rec->status = BadAccess;
 } /* XSELinuxHostlist */
 
 /* Extension callbacks */
diff --git a/dix/devices.c b/dix/devices.c
index 1ce6be666..5ffa81daf 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -1206,7 +1206,7 @@ DoSetModifierMapping(ClientPtr client, KeyCode *inputMap,
                 }
             }
 
-            if (!XaceHook(XACE_DEVICE_ACCESS, client, pDev, TRUE))
+            if (XaceHook(XACE_DEVICE_ACCESS, client, pDev, TRUE) != Success)
                 return BadAccess;
 
             /* None of the modifiers (old or new) may be down while we change
@@ -1330,7 +1330,7 @@ ProcChangeKeyboardMapping(ClientPtr client)
 
     for (pDev = inputInfo.devices; pDev; pDev = pDev->next) {
         if ((pDev->coreEvents || pDev == inputInfo.keyboard) && pDev->key) {
-            if (!XaceHook(XACE_DEVICE_ACCESS, client, pDev, TRUE))
+            if (XaceHook(XACE_DEVICE_ACCESS, client, pDev, TRUE) != Success)
                 return BadAccess;
         }
     }
@@ -1682,7 +1682,7 @@ ProcChangeKeyboardControl (ClientPtr client)
     for (pDev = inputInfo.devices; pDev; pDev = pDev->next) {
         if ((pDev->coreEvents || pDev == inputInfo.keyboard) &&
             pDev->kbdfeed && pDev->kbdfeed->CtrlProc) {
-            if (!XaceHook(XACE_DEVICE_ACCESS, client, pDev, TRUE))
+            if (XaceHook(XACE_DEVICE_ACCESS, client, pDev, TRUE) != Success)
                 return BadAccess;
         }
     }
@@ -1944,10 +1944,10 @@ ProcQueryKeymap(ClientPtr client)
     rep.length = 2;
 
     if (XaceHook(XACE_DEVICE_ACCESS, client, inputInfo.keyboard, TRUE))
+	bzero((char *)&rep.map[0], 32);
+    else
 	for (i = 0; i<32; i++)
 	    rep.map[i] = down[i];
-    else
-	bzero((char *)&rep.map[0], 32);
 
     WriteReplyToClient(client, sizeof(xQueryKeymapReply), &rep);
     return Success;
diff --git a/dix/dispatch.c b/dix/dispatch.c
index 0a86dc5fe..4519d8582 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -1120,7 +1120,7 @@ ProcGetSelectionOwner(ClientPtr client)
 	reply.sequenceNumber = client->sequence;
         if (i < NumCurrentSelections &&
 	    XaceHook(XACE_SELECTION_ACCESS, client, &CurrentSelections[i],
-		     DixReadAccess))
+		     DixReadAccess) == Success)
             reply.owner = CurrentSelections[i].destwindow;
         else
             reply.owner = None;
@@ -1161,7 +1161,7 @@ ProcConvertSelection(ClientPtr client)
 	if ((i < NumCurrentSelections) &&
 	    (CurrentSelections[i].window != None) &&
 	    XaceHook(XACE_SELECTION_ACCESS, client, &CurrentSelections[i],
-		     DixReadAccess))
+		     DixReadAccess) == Success)
 	{        
 	    event.u.u.type = SelectionRequest;
 	    event.u.selectionRequest.time = stuff->time;
@@ -2276,7 +2276,7 @@ DoGetImage(ClientPtr client, int format, Drawable drawable,
     }
 
     if (pDraw->type == DRAWABLE_WINDOW &&
-	!XaceHook(XACE_DRAWABLE_ACCESS, client, pDraw))
+	XaceHook(XACE_DRAWABLE_ACCESS, client, pDraw) != Success)
     {
 	pVisibleRegion = NotClippedByChildren((WindowPtr)pDraw);
 	if (pVisibleRegion)
@@ -3343,8 +3343,9 @@ ProcListHosts(ClientPtr client)
     REQUEST_SIZE_MATCH(xListHostsReq);
 
     /* untrusted clients can't list hosts */
-    if (!XaceHook(XACE_HOSTLIST_ACCESS, client, DixReadAccess))
-	return BadAccess;
+    result = XaceHook(XACE_HOSTLIST_ACCESS, client, DixReadAccess);
+    if (result != Success)
+	return result;
 
     result = GetHosts(&pdata, &nHosts, &len, &reply.enabled);
     if (result != Success)
diff --git a/dix/dixutils.c b/dix/dixutils.c
index e97a791a8..4d082cd58 100644
--- a/dix/dixutils.c
+++ b/dix/dixutils.c
@@ -209,6 +209,8 @@ dixLookupDrawable(DrawablePtr *pDraw, XID id, ClientPtr client,
 {
     DrawablePtr pTmp;
     RESTYPE rtype;
+    int rc;
+
     *pDraw = NULL;
     client->errorValue = id;
 
@@ -220,8 +222,9 @@ dixLookupDrawable(DrawablePtr *pDraw, XID id, ClientPtr client,
 
 	/* an access check is required for cached drawables */
 	rtype = (type & M_WINDOW) ? RT_WINDOW : RT_PIXMAP;
-	if (!XaceHook(XACE_RESOURCE_ACCESS, client, id, rtype, access, pTmp))
-	    return BadDrawable;
+	rc = XaceHook(XACE_RESOURCE_ACCESS, client, id, rtype, access, pTmp);
+        if (rc != Success)
+	    return rc;
     } else
 	dixLookupResource((void **)&pTmp, id, RC_DRAWABLE, client, access);
 
diff --git a/dix/events.c b/dix/events.c
index bc6b6ae97..88895b5f2 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -2682,7 +2682,7 @@ CheckPassiveGrabsOnWindow(
 	     (grab->confineTo->realized && 
 				BorderSizeNotEmpty(grab->confineTo))))
 	{
-	    if (!XaceHook(XACE_DEVICE_ACCESS, wClient(pWin), device, FALSE))
+	    if (XaceHook(XACE_DEVICE_ACCESS, wClient(pWin), device, FALSE))
 		return FALSE;
 #ifdef XKB
 	    if (!noXkbExtension) {
@@ -3529,7 +3529,7 @@ EnterLeaveEvent(
 	xKeymapEvent ke;
 	ClientPtr client = grab ? rClient(grab)
 				: clients[CLIENT_ID(pWin->drawable.id)];
-	if (XaceHook(XACE_DEVICE_ACCESS, client, keybd, FALSE))
+	if (XaceHook(XACE_DEVICE_ACCESS, client, keybd, FALSE) == Success)
 	    memmove((char *)&ke.map[0], (char *)&keybd->key->down[1], 31);
 	else
 	    bzero((char *)&ke.map[0], 31);
@@ -3636,7 +3636,7 @@ FocusEvent(DeviceIntPtr dev, int type, int mode, int detail, WindowPtr pWin)
     {
 	xKeymapEvent ke;
 	ClientPtr client = clients[CLIENT_ID(pWin->drawable.id)];
-	if (XaceHook(XACE_DEVICE_ACCESS, client, dev, FALSE))
+	if (XaceHook(XACE_DEVICE_ACCESS, client, dev, FALSE) == Success)
 	    memmove((char *)&ke.map[0], (char *)&dev->key->down[1], 31);
 	else
 	    bzero((char *)&ke.map[0], 31);
@@ -3924,7 +3924,7 @@ ProcSetInputFocus(client)
 
     REQUEST_SIZE_MATCH(xSetInputFocusReq);
 
-    if (!XaceHook(XACE_DEVICE_ACCESS, client, inputInfo.keyboard, TRUE))
+    if (XaceHook(XACE_DEVICE_ACCESS, client, inputInfo.keyboard, TRUE))
 	return Success;
 
     return SetInputFocus(client, inputInfo.keyboard, stuff->focus,
@@ -4239,15 +4239,14 @@ ProcGrabKeyboard(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xGrabKeyboardReq);
 
-    if (XaceHook(XACE_DEVICE_ACCESS, client, inputInfo.keyboard, TRUE))
-	result = GrabDevice(client, inputInfo.keyboard, stuff->keyboardMode,
+    if (XaceHook(XACE_DEVICE_ACCESS, client, inputInfo.keyboard, TRUE)) {
+	result = Success;
+	rep.status = AlreadyGrabbed;
+    } else
+        result = GrabDevice(client, inputInfo.keyboard, stuff->keyboardMode,
 			    stuff->pointerMode, stuff->grabWindow,
 			    stuff->ownerEvents, stuff->time,
 			    KeyPressMask | KeyReleaseMask, &rep.status);
-    else {
-	result = Success;
-	rep.status = AlreadyGrabbed;
-    }
 
     if (result != Success)
 	return result;
diff --git a/dix/extension.c b/dix/extension.c
index d409c3f75..ad4e697b1 100644
--- a/dix/extension.c
+++ b/dix/extension.c
@@ -319,7 +319,7 @@ ProcQueryExtension(ClientPtr client)
     else
     {
 	i = FindExtension((char *)&stuff[1], stuff->nbytes);
-        if (i < 0 || !XaceHook(XACE_EXT_ACCESS, client, extensions[i]))
+        if (i < 0 || XaceHook(XACE_EXT_ACCESS, client, extensions[i]))
             reply.present = xFalse;
         else
         {            
@@ -355,7 +355,7 @@ ProcListExtensions(ClientPtr client)
         for (i=0;  i<NumExtensions; i++)
 	{
 	    /* call callbacks to find out whether to show extension */
-	    if (!XaceHook(XACE_EXT_ACCESS, client, extensions[i]))
+	    if (XaceHook(XACE_EXT_ACCESS, client, extensions[i]) != Success)
 		continue;
 
 	    total_length += strlen(extensions[i]->name) + 1;
@@ -370,7 +370,7 @@ ProcListExtensions(ClientPtr client)
         for (i=0;  i<NumExtensions; i++)
         {
 	    int len;
-	    if (!XaceHook(XACE_EXT_ACCESS, client, extensions[i]))
+	    if (XaceHook(XACE_EXT_ACCESS, client, extensions[i]) != Success)
 		continue;
 
             *bufptr++ = len = strlen(extensions[i]->name);
diff --git a/dix/property.c b/dix/property.c
index 8deb62180..09f9e3152 100644
--- a/dix/property.c
+++ b/dix/property.c
@@ -144,16 +144,12 @@ ProcRotateProperties(ClientPtr client)
 	    DEALLOCATE_LOCAL(props);
 	    return BadMatch;
 	}
-	switch (XaceHook(XACE_PROPERTY_ACCESS, client, pWin, pProp,
-			 DixReadAccess|DixWriteAccess))
-	{
-	case XaceErrorOperation:
+	rc = XaceHook(XACE_PROPERTY_ACCESS, client, pWin, pProp,
+		      DixReadAccess|DixWriteAccess);
+	if (rc != Success) {
             DEALLOCATE_LOCAL(props);
 	    client->errorValue = atoms[i];
-            return BadAtom;
-	case XaceIgnoreOperation:
-            DEALLOCATE_LOCAL(props);
-	    return Success;
+            return (rc == XaceIgnoreError) ? Success : rc;
 	}
         props[i] = pProp;
     }
@@ -246,8 +242,7 @@ dixChangeWindowProperty(ClientPtr pClient, WindowPtr pWin, Atom property,
 {
     PropertyPtr pProp;
     xEvent event;
-    int sizeInBytes;
-    int totalSize;
+    int sizeInBytes, totalSize, rc;
     pointer data;
 
     sizeInBytes = format>>3;
@@ -277,32 +272,24 @@ dixChangeWindowProperty(ClientPtr pClient, WindowPtr pWin, Atom property,
 	    memmove((char *)data, (char *)value, totalSize);
 	pProp->size = len;
 	pProp->devPrivates = NULL;
-	switch (XaceHook(XACE_PROPERTY_ACCESS, pClient, pWin, pProp,
-			 DixCreateAccess))
-	{
-	case XaceErrorOperation:
+	rc = XaceHook(XACE_PROPERTY_ACCESS, pClient, pWin, pProp,
+		      DixCreateAccess);
+	if (rc != Success) {
 	    xfree(data);
 	    xfree(pProp);
 	    pClient->errorValue = property;
-	    return BadAtom;
-	case XaceIgnoreOperation:
-	    xfree(data);
-	    xfree(pProp);
-	    return Success;
+	    return (rc == XaceIgnoreError) ? Success : rc;
 	}
         pProp->next = pWin->optional->userProps;
         pWin->optional->userProps = pProp;
     }
     else
     {
-	switch (XaceHook(XACE_PROPERTY_ACCESS, pClient, pWin, pProp,
-			 DixWriteAccess))
-	{
-	case XaceErrorOperation:
+	rc = XaceHook(XACE_PROPERTY_ACCESS, pClient, pWin, pProp,
+		      DixWriteAccess);
+	if (rc != Success) {
 	    pClient->errorValue = property;
-	    return BadAtom;
-	case XaceIgnoreOperation:
-	    return Success;
+	    return (rc == XaceIgnoreError) ? Success : rc;
 	}
 	/* To append or prepend to a property the request format and type
 		must match those of the already defined property.  The
@@ -471,7 +458,8 @@ int
 ProcGetProperty(ClientPtr client)
 {
     PropertyPtr pProp, prevProp;
-    unsigned long n, len, ind, rc;
+    unsigned long n, len, ind;
+    int rc;
     WindowPtr pWin;
     xGetPropertyReply reply;
     Mask access_mode = DixReadAccess;
@@ -517,13 +505,12 @@ ProcGetProperty(ClientPtr client)
 
     if (stuff->delete)
 	access_mode |= DixDestroyAccess;
-    switch (XaceHook(XACE_PROPERTY_ACCESS, client, pWin, pProp, access_mode))
-    {
-    case XaceErrorOperation:
+
+    rc = XaceHook(XACE_PROPERTY_ACCESS, client, pWin, pProp, access_mode);
+    if (rc != Success) {
 	client->errorValue = stuff->property;
-	return BadAtom;;
-    case XaceIgnoreOperation:
-	return NullPropertyReply(client, pProp->type, pProp->format, &reply);
+	return (rc == XaceIgnoreError) ? 
+	    NullPropertyReply(client, pProp->type, pProp->format, &reply) : rc;
     }
 
     /* If the request type and actual type don't match. Return the
@@ -669,14 +656,11 @@ ProcDeleteProperty(ClientPtr client)
 	return (BadAtom);
     }
 
-    switch (XaceHook(XACE_PROPERTY_ACCESS, client, pWin,
-		     FindProperty(pWin, stuff->property), DixDestroyAccess))
-    {
-    case XaceErrorOperation:
+    result = XaceHook(XACE_PROPERTY_ACCESS, client, pWin,
+		      FindProperty(pWin, stuff->property), DixDestroyAccess);
+    if (result != Success) {
 	client->errorValue = stuff->property;
-	return BadAtom;;
-    case XaceIgnoreOperation:
-	return Success;
+	return (result == XaceIgnoreError) ? Success : result;
     }
 
     result = DeleteProperty(pWin, stuff->property);
diff --git a/dix/resource.c b/dix/resource.c
index e1bb74f64..67124c754 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -918,12 +918,16 @@ dixLookupResource(pointer *result, XID id, RESTYPE rtype,
 				    (!istype && res->type & rtype)))
 		break;
     }
-    if (res) {
-	if (client && !XaceHook(XACE_RESOURCE_ACCESS, client, id, res->type,
-				mode, res->value))
-	    return BadAccess;
-	*result = res->value;
-	return Success;
+    if (!res)
+	return BadValue;
+
+    if (client) {
+	cid = XaceHook(XACE_RESOURCE_ACCESS, client, id, res->type,
+		       mode, res->value);
+	if (cid != Success)
+	    return cid;
     }
-    return BadValue;
+
+    *result = res->value;
+    return Success;
 }
diff --git a/dix/window.c b/dix/window.c
index b50594797..95b7b168c 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -732,17 +732,16 @@ CreateWindow(Window wid, WindowPtr pParent, int x, int y, unsigned w,
 
     /*  security creation/labeling check
      */
-    if (!XaceHook(XACE_RESOURCE_ACCESS, client,
-		  wid, RT_WINDOW, DixCreateAccess, pWin))
-    {
+    *error = XaceHook(XACE_RESOURCE_ACCESS, client, wid, RT_WINDOW,
+		      DixCreateAccess, pWin);
+    if (*error != Success) {
 	xfree(pWin);
-	*error = BadAccess;
 	return NullWindow;
     }
     /*  can't let untrusted clients have background None windows;
      *  they make it too easy to steal window contents
      */
-    if (XaceHook(XACE_BACKGRND_ACCESS, client, pWin))
+    if (XaceHook(XACE_BACKGRND_ACCESS, client, pWin) == Success)
 	pWin->backgroundState = None;
     else {
 	pWin->backgroundState = BackgroundPixel;
@@ -1052,7 +1051,7 @@ ChangeWindowAttributes(WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client)
 	    if (pixID == None)
 	    {
 		/*  can't let untrusted clients have background None windows */
-		if (XaceHook(XACE_BACKGRND_ACCESS, client, pWin)) {
+		if (XaceHook(XACE_BACKGRND_ACCESS, client, pWin) == Success) {
 		    if (pWin->backgroundState == BackgroundPixmap)
 			(*pScreen->DestroyPixmap)(pWin->background.pixmap);
 		    if (!pWin->parent)
@@ -2773,7 +2772,7 @@ MapWindow(WindowPtr pWin, ClientPtr client)
 	return(Success);
 
     /*  general check for permission to map window */
-    if (!XaceHook(XACE_MAP_ACCESS, client, pWin))
+    if (XaceHook(XACE_MAP_ACCESS, client, pWin) != Success)
 	 return Success;
 
     pScreen = pWin->drawable.pScreen;
diff --git a/os/access.c b/os/access.c
index 221b8cbcd..d9fcd4466 100644
--- a/os/access.c
+++ b/os/access.c
@@ -1528,7 +1528,7 @@ AuthorizedClient(ClientPtr client)
 	return TRUE;
 
     /* untrusted clients can't change host access */
-    if (!XaceHook(XACE_HOSTLIST_ACCESS, client, DixWriteAccess))
+    if (XaceHook(XACE_HOSTLIST_ACCESS, client, DixWriteAccess) != Success)
 	return FALSE;
 
     return LocalClient(client);

From ddb26bccd275f4fc011f7a2be685d1ce58555a00 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 24 May 2007 12:20:24 -0400
Subject: [PATCH 067/552] dix: Add a bunch of new access codes.

These were determined through an analysis of the core protocol and 35 of
the most common protocol extensions.  There remain four bits for future
use.
---
 include/dixaccess.h | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/include/dixaccess.h b/include/dixaccess.h
index 205b76cb1..3c62ee354 100644
--- a/include/dixaccess.h
+++ b/include/dixaccess.h
@@ -25,5 +25,29 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define DixWriteAccess		(1<<1)	/* changing the object */
 #define DixDestroyAccess	(1<<2)	/* destroying the object */
 #define DixCreateAccess		(1<<3)	/* creating the object */
+#define DixGetAttrAccess	(1<<4)	/* get object attributes */
+#define DixSetAttrAccess	(1<<5)	/* set object attributes */
+#define DixListPropAccess	(1<<6)  /* list properties of object */
+#define DixGetPropAccess	(1<<7)	/* get properties of object */
+#define DixSetPropAccess	(1<<8)	/* set properties of object */
+#define DixGetFocusAccess	(1<<9)	/* get focus of object */
+#define DixSetFocusAccess	(1<<10)	/* set focus of object */
+#define DixListAccess		(1<<11)	/* list objects */
+#define DixAddAccess		(1<<12)	/* add object */
+#define DixRemoveAccess		(1<<13)	/* remove object */
+#define DixHideAccess		(1<<14)	/* hide object */
+#define DixShowAccess		(1<<15)	/* show object */
+#define DixBlendAccess		(1<<16)	/* mix contents of objects */
+#define DixGrabAccess		(1<<17)	/* exclusive access to object */
+#define DixFreezeAccess		(1<<18)	/* freeze status of object */
+#define DixForceAccess		(1<<19)	/* force status of object */
+#define DixInstallAccess	(1<<20)	/* install object */
+#define DixUninstallAccess	(1<<21)	/* uninstall object */
+#define DixSendAccess		(1<<22)	/* send to object */
+#define DixReceiveAccess	(1<<23)	/* receive from object */
+#define DixUseAccess		(1<<24)	/* use object */
+#define DixManageAccess		(1<<25)	/* manage object */
+#define DixDebugAccess		(1<<26)	/* debug object */
+#define DixBellAccess		(1<<27)	/* audible sound */
 
 #endif /* DIX_ACCESS_H */

From 793470a8356976ddd427280a738dfb6e1c0e4e70 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 4 Jun 2007 12:33:49 -0400
Subject: [PATCH 068/552] dix: fix null pointer dereference in new resource
 lookup function.

---
 dix/resource.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dix/resource.c b/dix/resource.c
index 67124c754..e89ad1fdd 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -908,7 +908,6 @@ dixLookupResource(pointer *result, XID id, RESTYPE rtype,
     ResourcePtr res = NULL;
 
     *result = NULL;
-    client->errorValue = id;
 
     if ((cid < MAXCLIENTS) && clientTable[cid].buckets) {
 	res = clientTable[cid].resources[Hash(cid, id)];
@@ -922,6 +921,7 @@ dixLookupResource(pointer *result, XID id, RESTYPE rtype,
 	return BadValue;
 
     if (client) {
+	client->errorValue = id;
 	cid = XaceHook(XACE_RESOURCE_ACCESS, client, id, res->type,
 		       mode, res->value);
 	if (cid != Success)

From 878cac71aa0018deee861b297638c0744dba631b Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 11 Jun 2007 14:19:37 -0400
Subject: [PATCH 069/552] xselinux: use new libselinux support for private
 Flask definitions.

Removes indirect dependency on kernel headers.
---
 Xext/xselinux.c | 42 ++++++++++++++++++++--
 Xext/xselinux.h | 93 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 133 insertions(+), 2 deletions(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 3cec21bb1..cdb3b3367 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -22,8 +22,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  * All rights reserved.
  */
 
-#include <selinux/flask.h>
-#include <selinux/av_permissions.h>
 #include <selinux/selinux.h>
 #include <selinux/context.h>
 #include <selinux/avc.h>
@@ -96,6 +94,42 @@ static char *XSELinuxNonlocalContextDefault = NULL;
 extern Selection *CurrentSelections;
 extern int NumCurrentSelections;
 
+/* Dynamically allocated security classes and permissions */
+static struct security_class_mapping map[] = {
+    { "drawable",
+      { "create", "destroy", "draw", "copy", "getattr", NULL }},
+    { "window",
+      { "addchild", "create", "destroy", "map", "unmap", "chstack",
+	"chproplist", "chprop", "listprop", "getattr", "setattr", "setfocus",
+	"move", "chselection", "chparent", "ctrllife", "enumerate",
+	"transparent", "mousemotion", "clientcomevent", "inputevent",
+	"drawevent", "windowchangeevent", "windowchangerequest",
+	"serverchangeevent", "extensionevent", NULL }},
+    { "gc",
+      { "create", "free", "getattr", "setattr", NULL }},
+    { "font",
+      { "load", "free", "getattr", "use", NULL }},
+    { "colormap",
+      { "create", "free", "install", "uninstall", "list", "read", "store",
+	"getattr", "setattr", NULL }},
+    { "property",
+      { "create", "free", "read", "write", NULL }},
+    { "cursor",
+      { "create", "createglyph", "free", "assign", "setattr", NULL }},
+    { "xclient",
+      { "kill", NULL }},
+    { "xinput",
+      { "lookup", "getattr", "setattr", "setfocus", "warppointer",
+	"activegrab", "passivegrab", "ungrab", "bell", "mousemotion",
+	"relabelinput", NULL }},
+    { "xserver",
+      { "screensaver", "gethostlist", "sethostlist", "getfontpath",
+	"setfontpath", "getattr", "grab", "ungrab", NULL }},
+    { "xextension",
+      { "query", "use", NULL }},
+    { NULL }
+};
+
 /*
  * list of classes corresponding to SIDs in the
  * rsid array of the security state structure (below).
@@ -1851,6 +1885,10 @@ XSELinuxExtensionInit(INITARGS)
         return;
     }
 
+    if (selinux_set_mapping(map) < 0) {
+	FatalError("XSELinux: Failed to set up security class mapping\n");
+    }
+
     if (avc_init("xserver", NULL, &alc, NULL, NULL) < 0)
     {
 	FatalError("XSELinux: Couldn't initialize SELinux userspace AVC\n");
diff --git a/Xext/xselinux.h b/Xext/xselinux.h
index eff6db5f4..57fcbb20f 100644
--- a/Xext/xselinux.h
+++ b/Xext/xselinux.h
@@ -20,10 +20,103 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef _XSELINUX_H
 #define _XSELINUX_H
 
+/* Extension info */
 #define XSELINUX_EXTENSION_NAME		"SELinux"
 #define XSELINUX_MAJOR_VERSION		1
 #define XSELINUX_MINOR_VERSION		0
 #define XSELinuxNumberEvents		0
 #define XSELinuxNumberErrors		0
 
+/* Private Flask definitions */
+#define SECCLASS_DRAWABLE		1
+#define DRAWABLE__CREATE		0x00000001UL
+#define DRAWABLE__DESTROY		0x00000002UL
+#define DRAWABLE__DRAW			0x00000004UL
+#define DRAWABLE__COPY			0x00000008UL
+#define DRAWABLE__GETATTR		0x00000010UL
+#define SECCLASS_WINDOW			2
+#define WINDOW__ADDCHILD		0x00000001UL
+#define WINDOW__CREATE			0x00000002UL
+#define WINDOW__DESTROY			0x00000004UL
+#define WINDOW__MAP			0x00000008UL
+#define WINDOW__UNMAP			0x00000010UL
+#define WINDOW__CHSTACK			0x00000020UL
+#define WINDOW__CHPROPLIST		0x00000040UL
+#define WINDOW__CHPROP			0x00000080UL
+#define WINDOW__LISTPROP		0x00000100UL
+#define WINDOW__GETATTR			0x00000200UL
+#define WINDOW__SETATTR			0x00000400UL
+#define WINDOW__SETFOCUS		0x00000800UL
+#define WINDOW__MOVE			0x00001000UL
+#define WINDOW__CHSELECTION		0x00002000UL
+#define WINDOW__CHPARENT		0x00004000UL
+#define WINDOW__CTRLLIFE		0x00008000UL
+#define WINDOW__ENUMERATE		0x00010000UL
+#define WINDOW__TRANSPARENT		0x00020000UL
+#define WINDOW__MOUSEMOTION		0x00040000UL
+#define WINDOW__CLIENTCOMEVENT		0x00080000UL
+#define WINDOW__INPUTEVENT		0x00100000UL
+#define WINDOW__DRAWEVENT		0x00200000UL
+#define WINDOW__WINDOWCHANGEEVENT	0x00400000UL
+#define WINDOW__WINDOWCHANGEREQUEST	0x00800000UL
+#define WINDOW__SERVERCHANGEEVENT	0x01000000UL
+#define WINDOW__EXTENSIONEVENT		0x02000000UL
+#define SECCLASS_GC			3
+#define GC__CREATE			0x00000001UL
+#define GC__FREE			0x00000002UL
+#define GC__GETATTR			0x00000004UL
+#define GC__SETATTR			0x00000008UL
+#define SECCLASS_FONT			4
+#define FONT__LOAD			0x00000001UL
+#define FONT__FREE			0x00000002UL
+#define FONT__GETATTR			0x00000004UL
+#define FONT__USE			0x00000008UL
+#define SECCLASS_COLORMAP		5
+#define COLORMAP__CREATE		0x00000001UL
+#define COLORMAP__FREE			0x00000002UL
+#define COLORMAP__INSTALL		0x00000004UL
+#define COLORMAP__UNINSTALL		0x00000008UL
+#define COLORMAP__LIST			0x00000010UL
+#define COLORMAP__READ			0x00000020UL
+#define COLORMAP__STORE			0x00000040UL
+#define COLORMAP__GETATTR		0x00000080UL
+#define COLORMAP__SETATTR		0x00000100UL
+#define SECCLASS_PROPERTY		6
+#define PROPERTY__CREATE		0x00000001UL
+#define PROPERTY__FREE			0x00000002UL
+#define PROPERTY__READ			0x00000004UL
+#define PROPERTY__WRITE			0x00000008UL
+#define SECCLASS_CURSOR			7
+#define CURSOR__CREATE			0x00000001UL
+#define CURSOR__CREATEGLYPH		0x00000002UL
+#define CURSOR__FREE			0x00000004UL
+#define CURSOR__ASSIGN			0x00000008UL
+#define CURSOR__SETATTR			0x00000010UL
+#define SECCLASS_XCLIENT		8
+#define XCLIENT__KILL			0x00000001UL
+#define SECCLASS_XINPUT			9
+#define XINPUT__LOOKUP			0x00000001UL
+#define XINPUT__GETATTR			0x00000002UL
+#define XINPUT__SETATTR			0x00000004UL
+#define XINPUT__SETFOCUS		0x00000008UL
+#define XINPUT__WARPPOINTER		0x00000010UL
+#define XINPUT__ACTIVEGRAB		0x00000020UL
+#define XINPUT__PASSIVEGRAB		0x00000040UL
+#define XINPUT__UNGRAB			0x00000080UL
+#define XINPUT__BELL			0x00000100UL
+#define XINPUT__MOUSEMOTION		0x00000200UL
+#define XINPUT__RELABELINPUT		0x00000400UL
+#define SECCLASS_XSERVER		10
+#define XSERVER__SCREENSAVER		0x00000001UL
+#define XSERVER__GETHOSTLIST		0x00000002UL
+#define XSERVER__SETHOSTLIST		0x00000004UL
+#define XSERVER__GETFONTPATH		0x00000008UL
+#define XSERVER__SETFONTPATH		0x00000010UL
+#define XSERVER__GETATTR		0x00000020UL
+#define XSERVER__GRAB			0x00000040UL
+#define XSERVER__UNGRAB			0x00000080UL
+#define SECCLASS_XEXTENSION		11
+#define XEXTENSION__QUERY		0x00000001UL
+#define XEXTENSION__USE			0x00000002UL
+
 #endif /* _XSELINUX_H */

From 2030e9e5395be43bd8eab15b65c21ca4c2f1e619 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 21 Jun 2007 15:37:18 -0400
Subject: [PATCH 070/552] xselinux: use new libselinux support for context
 labeling.

Remove all the config file parsing code and use the new lookup interface
instead.
---
 Xext/xselinux.c | 591 +++---------------------------------------------
 1 file changed, 30 insertions(+), 561 deletions(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index cdb3b3367..038ec59c4 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 #include <selinux/selinux.h>
-#include <selinux/context.h>
+#include <selinux/label.h>
 #include <selinux/avc.h>
 
 #include <libaudit.h>
@@ -69,27 +69,13 @@ typedef struct {
     char *extension;	/* extension name, if any */
 } XSELinuxAuditRec;
 
-/*
- * Table of SELinux types for property names.
- */
-static char **propertyTypes = NULL;
-static int propertyTypesCount = 0;
-char *XSELinuxPropertyTypeDefault = NULL;
-
-/*
- * Table of SELinux types for each extension.
- */
-static char **extensionTypes = NULL;
-static int extensionTypesCount = 0;
-static char *XSELinuxExtensionTypeDefault = NULL;
+/* labeling handle */
+static struct selabel_handle *label_hnd;
 
 /* Atoms for SELinux window labeling properties */
 Atom atom_ctx;
 Atom atom_client_ctx;
 
-/* security context for non-local clients */
-static char *XSELinuxNonlocalContextDefault = NULL;
-
 /* Selection stuff from dix */
 extern Selection *CurrentSelections;
 extern int NumCurrentSelections;
@@ -325,41 +311,22 @@ IDPerm(ClientPtr sclient,
 static security_id_t
 GetPropertySID(security_context_t base, const char *name)
 {
-    security_context_t new, result;
-    context_t con;
+    security_context_t con, result;
     security_id_t sid = NULL;
-    char **ptr, *type = NULL;
-
-    /* make a new context-manipulation object */
-    con = context_new(base);
-    if (!con)
-	goto out;
 
     /* look in the mappings of names to types */
-    for (ptr = propertyTypes; *ptr; ptr+=2)
-	if (!strcmp(*ptr, name))
-	    break;
-    type = ptr[1];
-
-    /* set the role and type in the context (user unchanged) */
-    if (context_type_set(con, type) ||
-	context_role_set(con, "object_r"))
-	goto out2;
-
-    /* get a context string from the context-manipulation object */
-    new = context_str(con);
-    if (!new)
-	goto out2;
+    if (selabel_lookup(label_hnd, &con, name, SELABEL_X_PROP) < 0)
+	goto out;
 
     /* perform a transition to obtain the final context */
-    if (security_compute_create(base, new, SECCLASS_PROPERTY, &result) < 0)
+    if (security_compute_create(base, con, SECCLASS_PROPERTY, &result) < 0)
 	goto out2;
 
     /* get a SID for the context */
     avc_context_to_sid(result, &sid);
     freecon(result);
   out2:
-    context_free(con);
+    freecon(con);
   out:
     return sid;
 }
@@ -375,41 +342,26 @@ GetPropertySID(security_context_t base, const char *name)
 static security_id_t
 GetExtensionSID(const char *name)
 {
-    security_context_t base, new;
-    context_t con;
+    security_context_t base, con, result;
     security_id_t sid = NULL;
-    char **ptr, *type = NULL;
 
     /* get server context */
     if (getcon(&base) < 0)
 	goto out;
 
-    /* make a new context-manipulation object */
-    con = context_new(base);
-    if (!con)
+    /* look in the mappings of names to types */
+    if (selabel_lookup(label_hnd, &con, name, SELABEL_X_EXT) < 0)
 	goto out2;
 
-    /* look in the mappings of names to types */
-    for (ptr = extensionTypes; *ptr; ptr+=2)
-	if (!strcmp(*ptr, name))
-	    break;
-    type = ptr[1];
-
-    /* set the role and type in the context (user unchanged) */
-    if (context_type_set(con, type) ||
-	context_role_set(con, "object_r"))
-	goto out3;
-
-    /* get a context string from the context-manipulation object */
-    new = context_str(con);
-    if (!new)
+    /* perform a transition to obtain the final context */
+    if (security_compute_create(base, con, SECCLASS_XEXTENSION, &result) < 0)
 	goto out3;
 
     /* get a SID for the context */
-    avc_context_to_sid(new, &sid);
-
+    avc_context_to_sid(result, &sid);
+    freecon(result);
   out3:
-    context_free(con);
+    freecon(con);
   out2:
     freecon(base);
   out:
@@ -467,7 +419,7 @@ AssignServerState(void)
 static void
 AssignClientState(ClientPtr client)
 {
-    int i, needToFree = 0;
+    int i;
     security_context_t basectx, objctx;
     XSELinuxClientStateRec *state;
 
@@ -481,11 +433,12 @@ AssignClientState(ClientPtr client)
 	if (getpeercon(fd, &basectx) < 0)
 	    FatalError("Client %d: couldn't get context from socket\n",
 		       client->index);
-	needToFree = 1;
     }
     else
 	/* for remote clients, need to use a default context */
-	basectx = XSELinuxNonlocalContextDefault;
+	if (selabel_lookup(label_hnd, &basectx, NULL, SELABEL_X_CLIENT) < 0)
+	    FatalError("Client %d: couldn't get default remote connection context\n",
+		       client->index);
 
     /* get a SID from the context */
     if (avc_context_to_sid(basectx, &state->sid) < 0)
@@ -506,10 +459,9 @@ AssignClientState(ClientPtr client)
 	freecon(objctx);
     }
 
-    /* mark as set up, free base context if necessary, and return */
+    /* mark as set up, free base context, and return */
     state->haveState = TRUE;
-    if (needToFree)
-	freecon(basectx);
+    freecon(basectx);
 }
 
 /*
@@ -1294,509 +1246,26 @@ XSELinuxResourceState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	FatalError("XSELinux: Failed to set context property on window!\n");
 } /* XSELinuxResourceState */
 
-static char *XSELinuxKeywords[] = {
-#define XSELinuxKeywordComment 0
-    "#",
-#define XSELinuxKeywordProperty 1
-    "property",
-#define XSELinuxKeywordExtension 2
-    "extension",
-#define XSELinuxKeywordNonlocalContext 3
-    "nonlocal_context",
-#define XSELinuxKeywordDefault 4
-    "default"
-};
-
-#define NUMKEYWORDS (sizeof(XSELinuxKeywords) / sizeof(char *))
-
-#ifndef __UNIXOS2__
-#define XSELinuxIsWhitespace(c) ( (c == ' ') || (c == '\t') || (c == '\n') )
-#else
-#define XSELinuxIsWhitespace(c) ( (c == ' ') || (c == '\t') || (c == '\n') || (c == '\r') )
-#endif
-
-static char *
-XSELinuxSkipWhitespace(
-    char *p)
-{
-    while (XSELinuxIsWhitespace(*p))
-	p++;
-    return p;
-} /* XSELinuxSkipWhitespace */
-
-static char *
-XSELinuxParseString(
-    char **rest)
-{
-    char *startOfString;
-    char *s = *rest;
-    char endChar = 0;
-
-    s = XSELinuxSkipWhitespace(s);
-
-    if (*s == '"' || *s == '\'')
-    {
-	endChar = *s++;
-	startOfString = s;
-	while (*s && (*s != endChar))
-	    s++;
-    }
-    else
-    {
-	startOfString = s;
-	while (*s && !XSELinuxIsWhitespace(*s))
-	    s++;
-    }
-    if (*s)
-    {
-	*s = '\0';
-	*rest = s + 1;
-	return startOfString;
-    }
-    else
-    {
-	*rest = s;
-	return (endChar) ? NULL : startOfString;
-    }
-} /* XSELinuxParseString */
-
-static int
-XSELinuxParseKeyword(
-    char **p)
-{
-    int i;
-    char *s = *p;
-    s = XSELinuxSkipWhitespace(s);
-    for (i = 0; i < NUMKEYWORDS; i++)
-    {
-	int len = strlen(XSELinuxKeywords[i]);
-	if (strncmp(s, XSELinuxKeywords[i], len) == 0)
-	{
-	    *p = s + len;
-	    return (i);
-	}
-    }
-    *p = s;
-    return -1;
-} /* XSELinuxParseKeyword */
-
-static Bool
-XSELinuxTypeIsValid(char *typename)
-{
-    security_context_t base, new;
-    context_t con;
-    Bool ret = FALSE;
-
-    /* get the server's context */
-    if (getcon(&base) < 0)
-        goto out;
-
-    /* make a new context-manipulation object */
-    con = context_new(base);
-    if (!con)
-        goto out_free;
-
-    /* set the role */
-    if (context_role_set(con, "object_r"))
-        goto out_free2;
-
-    /* set the type */
-    if (context_type_set(con, typename))
-        goto out_free2;
-
-    /* get a context string - note: context_str() returns a pointer
-     * to the string inside the context; the returned pointer should
-     * not be freed
-     */
-    new = context_str(con);
-    if (!new)
-        goto out_free2;
-
-    /* finally, check to see if it's valid */
-    if (security_check_context(new) == 0)
-        ret = TRUE;
-
-out_free2:
-    context_free(con);
-out_free:
-    freecon(base);
-out:
-    return ret;
-}
-
-static Bool
-XSELinuxParsePropertyTypeRule(char *p)
-{
-    int keyword;
-    char *propname = NULL, *propcopy = NULL;
-    char *typename = NULL, *typecopy = NULL;
-    char **newTypes;
-    Bool defaultPropertyType = FALSE;
-
-    /* get property name */
-    keyword = XSELinuxParseKeyword(&p);
-    if (keyword == XSELinuxKeywordDefault)
-    {
-        defaultPropertyType = TRUE;
-    }
-    else
-    {
-        propname = XSELinuxParseString(&p);
-        if (!propname || (strlen(propname) == 0))
-        {
-            return FALSE;
-        }
-    }
-
-    /* get the SELinux type corresponding to the property */
-    typename = XSELinuxParseString(&p);
-    if (!typename || (strlen(typename) == 0))
-        return FALSE;
-
-    /* validate the type */
-    if (XSELinuxTypeIsValid(typename) != TRUE)
-        return FALSE;
-
-    /* if it's the default property, save it to append to the end of the
-     * property types list
-     */
-    if (defaultPropertyType == TRUE)
-    {
-        if (XSELinuxPropertyTypeDefault != NULL)
-        {
-            return FALSE;
-        }
-        else
-        {
-            XSELinuxPropertyTypeDefault = (char *)xalloc(strlen(typename)+1);
-            if (!XSELinuxPropertyTypeDefault)
-            {
-                ErrorF("XSELinux: out of memory\n");
-                return FALSE;
-            }
-            strcpy(XSELinuxPropertyTypeDefault, typename);
-            return TRUE;
-        }
-    }
-
-    /* insert the property and type into the propertyTypes array */
-    propcopy = (char *)xalloc(strlen(propname)+1);
-    if (!propcopy)
-    {
-        ErrorF("XSELinux: out of memory\n");
-        return FALSE;
-    }
-    strcpy(propcopy, propname);
-
-    typecopy = (char *)xalloc(strlen(typename)+1);
-    if (!typecopy)
-    {
-        ErrorF("XSELinux: out of memory\n");
-        xfree(propcopy);
-        return FALSE;
-    }
-    strcpy(typecopy, typename);
-
-    newTypes = (char **)xrealloc(propertyTypes, sizeof (char *) * ((propertyTypesCount+1) * 2));
-    if (!newTypes)
-    {
-        ErrorF("XSELinux: out of memory\n");
-        xfree(propcopy);
-        xfree(typecopy);
-        return FALSE;
-    }
-
-    propertyTypesCount++;
-
-    newTypes[propertyTypesCount*2 - 2] = propcopy;
-    newTypes[propertyTypesCount*2 - 1] = typecopy;
-
-    propertyTypes = newTypes;
-
-    return TRUE;
-} /* XSELinuxParsePropertyTypeRule */
-
-static Bool
-XSELinuxParseExtensionTypeRule(char *p)
-{
-    int keyword;
-    char *extname = NULL, *extcopy = NULL;
-    char *typename = NULL, *typecopy = NULL;
-    char **newTypes;
-    Bool defaultExtensionType = FALSE;
-
-    /* get extension name */
-    keyword = XSELinuxParseKeyword(&p);
-    if (keyword == XSELinuxKeywordDefault)
-    {
-        defaultExtensionType = TRUE;
-    }
-    else
-    {
-        extname = XSELinuxParseString(&p);
-        if (!extname || (strlen(extname) == 0))
-        {
-            return FALSE;
-        }
-    }
-
-    /* get the SELinux type corresponding to the extension */
-    typename = XSELinuxParseString(&p);
-    if (!typename || (strlen(typename) == 0))
-        return FALSE;
-
-    /* validate the type */
-    if (XSELinuxTypeIsValid(typename) != TRUE)
-        return FALSE;
-
-    /* if it's the default extension, save it to append to the end of the
-     * extension types list
-     */
-    if (defaultExtensionType == TRUE)
-    {
-        if (XSELinuxExtensionTypeDefault != NULL)
-        {
-            return FALSE;
-        }
-        else
-        {
-            XSELinuxExtensionTypeDefault = (char *)xalloc(strlen(typename)+1);
-            if (!XSELinuxExtensionTypeDefault)
-            {
-                ErrorF("XSELinux: out of memory\n");
-                return FALSE;
-            }
-            strcpy(XSELinuxExtensionTypeDefault, typename);
-            return TRUE;
-        }
-    }
-
-    /* insert the extension and type into the extensionTypes array */
-    extcopy = (char *)xalloc(strlen(extname)+1);
-    if (!extcopy)
-    {
-        ErrorF("XSELinux: out of memory\n");
-        return FALSE;
-    }
-    strcpy(extcopy, extname);
-
-    typecopy = (char *)xalloc(strlen(typename)+1);
-    if (!typecopy)
-    {
-        ErrorF("XSELinux: out of memory\n");
-        xfree(extcopy);
-        return FALSE;
-    }
-    strcpy(typecopy, typename);
-
-    newTypes = (char **)xrealloc(extensionTypes, sizeof(char *) *( (extensionTypesCount+1) * 2));
-    if (!newTypes)
-    {
-        ErrorF("XSELinux: out of memory\n");
-        xfree(extcopy);
-        xfree(typecopy);
-        return FALSE;
-    }
-
-    extensionTypesCount++;
-
-    newTypes[extensionTypesCount*2 - 2] = extcopy;
-    newTypes[extensionTypesCount*2 - 1] = typecopy;
-
-    extensionTypes = newTypes;
-
-    return TRUE;
-} /* XSELinuxParseExtensionTypeRule */
-
-static Bool
-XSELinuxParseNonlocalContext(char *p)
-{
-    char *context;
-
-    context = XSELinuxParseString(&p);
-    if (!context || (strlen(context) == 0))
-    {
-        return FALSE;
-    }
-
-    if (XSELinuxNonlocalContextDefault != NULL)
-    {
-        return FALSE;
-    }
-
-    /* validate the context */
-    if (security_check_context(context))
-    {
-        return FALSE;
-    }
-
-    XSELinuxNonlocalContextDefault = (char *)xalloc(strlen(context)+1);
-    if (!XSELinuxNonlocalContextDefault)
-    {
-        ErrorF("XSELinux: out of memory\n");
-        return FALSE;
-    }
-    strcpy(XSELinuxNonlocalContextDefault, context);
-
-    return TRUE;
-} /* XSELinuxParseNonlocalContext */
-
 static Bool
 XSELinuxLoadConfigFile(void)
 {
-    FILE *f;
-    int lineNumber = 0;
-    char **newTypes;
-    Bool ret = FALSE;
+    struct selinux_opt options[] = {
+	{ SELABEL_OPT_PATH, XSELINUXCONFIGFILE },
+	{ SELABEL_OPT_VALIDATE, (char *)1 },
+    };
 
     if (!XSELINUXCONFIGFILE)
         return FALSE;
 
-    /* some initial bookkeeping */
-    propertyTypesCount = extensionTypesCount = 0;
-    propertyTypes = extensionTypes = NULL;
-    XSELinuxPropertyTypeDefault = XSELinuxExtensionTypeDefault = NULL;
-    XSELinuxNonlocalContextDefault = NULL;
-
-#ifndef __UNIXOS2__
-    f = fopen(XSELINUXCONFIGFILE, "r");
-#else
-    f = fopen((char*)__XOS2RedirRoot(XSELINUXCONFIGFILE), "r");
-#endif
-    if (!f)
-    {
-        ErrorF("Error opening XSELinux policy file %s\n", XSELINUXCONFIGFILE);
-        return FALSE;
-    }
-
-    while (!feof(f))
-    {
-        char buf[200];
-        Bool validLine;
-        char *p;
-
-        if (!(p = fgets(buf, sizeof(buf), f)))
-            break;
-        lineNumber++;
-
-        switch (XSELinuxParseKeyword(&p))
-        {
-            case XSELinuxKeywordComment:
-                validLine = TRUE;
-                break;
-
-            case XSELinuxKeywordProperty:
-                validLine = XSELinuxParsePropertyTypeRule(p);
-                break;
-
-            case XSELinuxKeywordExtension:
-                validLine = XSELinuxParseExtensionTypeRule(p);
-                break;
-
-            case XSELinuxKeywordNonlocalContext:
-                validLine = XSELinuxParseNonlocalContext(p);
-                break;
-
-            default:
-                validLine = (*p == '\0');
-                break;
-        }
-
-        if (!validLine)
-        {
-            ErrorF("XSELinux: Line %d of %s is invalid\n",
-                   lineNumber, XSELINUXCONFIGFILE);
-            goto out;
-        }
-    }
-
-    /* check to make sure the default types and the nonlocal context
-     * were specified
-     */
-    if (XSELinuxPropertyTypeDefault == NULL)
-    {
-        ErrorF("XSELinux: No default property type specified\n");
-        goto out;
-    }
-    else if (XSELinuxExtensionTypeDefault == NULL)
-    {
-        ErrorF("XSELinux: No default extension type specified\n");
-        goto out;
-    }
-    else if (XSELinuxNonlocalContextDefault == NULL)
-    {
-        ErrorF("XSELinux: No default context for non-local clients specified\n");
-        goto out;
-    }
-
-    /* Finally, append the default property and extension types to the
-     * bottoms of the propertyTypes and extensionTypes arrays, respectively.
-     * The 'name' of the property / extension is NULL.
-     */
-    newTypes = (char **)xrealloc(propertyTypes, sizeof(char *) *((propertyTypesCount+1) * 2));
-    if (!newTypes)
-    {
-        ErrorF("XSELinux: out of memory\n");
-        goto out;
-    }
-    propertyTypesCount++;
-    newTypes[propertyTypesCount*2 - 2] = NULL;
-    newTypes[propertyTypesCount*2 - 1] = XSELinuxPropertyTypeDefault;
-    propertyTypes = newTypes;
-
-    newTypes = (char **)xrealloc(extensionTypes, sizeof(char *) *((extensionTypesCount+1) * 2));
-    if (!newTypes)
-    {
-        ErrorF("XSELinux: out of memory\n");
-        goto out;
-    }
-    extensionTypesCount++;
-    newTypes[extensionTypesCount*2 - 2] = NULL;
-    newTypes[extensionTypesCount*2 - 1] = XSELinuxExtensionTypeDefault;
-    extensionTypes = newTypes;
-
-    ret = TRUE;
-
-out:
-    fclose(f);
-    return ret;
+    label_hnd = selabel_open(SELABEL_CTX_X, options, 2);
+    return !!label_hnd;
 } /* XSELinuxLoadConfigFile */
 
 static void
 XSELinuxFreeConfigData(void)
 {
-    char **ptr;
-
-    /* Free all the memory in the table until we reach the NULL, then
-     * skip one past the NULL and free the default type.  Then take care
-     * of some bookkeeping.
-     */
-    for (ptr = propertyTypes; *ptr; ptr++)
-        xfree(*ptr);
-    ptr++;
-    xfree(*ptr);
-
-    XSELinuxPropertyTypeDefault = NULL;
-    propertyTypesCount = 0;
-
-    xfree(propertyTypes);
-    propertyTypes = NULL;
-
-    /* ... and the same for the extension type table */
-    for (ptr = extensionTypes; *ptr; ptr++)
-        xfree(*ptr);
-    ptr++;
-    xfree(*ptr);
-
-    XSELinuxExtensionTypeDefault = NULL;
-    extensionTypesCount = 0;
-
-    xfree(extensionTypes);
-    extensionTypes = NULL;
-
-    /* finally, take care of the context for non-local connections */
-    xfree(XSELinuxNonlocalContextDefault);
-    XSELinuxNonlocalContextDefault = NULL;
+    selabel_close(label_hnd);
+    label_hnd = NULL;
 } /* XSELinuxFreeConfigData */
 
 /* Extension dispatch functions */

From 32c0dcc8c0d1edba5d7e418fd2dc916847a4f069 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 21 Jun 2007 15:39:19 -0400
Subject: [PATCH 071/552] xselinux: adjust the config file format to that
 expected by libselinux.

This file will eventually be moved out of the X source tree.
---
 Xext/XSELinuxConfig | 180 +++++++++++++++++++++-----------------------
 1 file changed, 85 insertions(+), 95 deletions(-)

diff --git a/Xext/XSELinuxConfig b/Xext/XSELinuxConfig
index 38b78312a..66f93c56d 100644
--- a/Xext/XSELinuxConfig
+++ b/Xext/XSELinuxConfig
@@ -3,141 +3,131 @@
 #
 
 #
-# The nonlocal_context rule defines a context to be used for all clients
-# connecting to the server from a remote host.  The nonlocal context must
-# be defined, and it must be a valid context according to the SELinux
-# security policy.  Only one nonlocal_context rule may be defined.
+# The default client rule defines a context to be used for all clients
+# connecting to the server from a remote host.
 #
-nonlocal_context			system_u:object_r:remote_xclient_t:s0
+client	*				system_u:object_r:remote_xclient_t:s0
 
 #
-# Property rules map a property name to a SELinux type.  The type must
-# be valid according to the SELinux security policy.  There can be any
-# number of property rules.  Additionally, a default property type can be
-# defined for all properties not explicitly listed.  The default
-# property type may not be omitted.  The default rule may appear in
-# any position (it need not be the last property rule listed).
+# Property rules map a property name to a context.  A default property
+# rule indicated by an asterisk should follow all other property rules.
 #
 # Properties set by typical clients: WM, _NET_WM, etc.
-property WM_NAME			client_xproperty_t
-property WM_CLASS			client_xproperty_t
-property WM_ICON_NAME			client_xproperty_t
-property WM_HINTS			client_xproperty_t
-property WM_NORMAL_HINTS		client_xproperty_t
-property WM_COMMAND			client_xproperty_t
-property WM_CLIENT_MACHINE		client_xproperty_t
-property WM_LOCALE_NAME			client_xproperty_t
-property WM_CLIENT_LEADER		client_xproperty_t
-property WM_STATE			client_xproperty_t
-property WM_PROTOCOLS			client_xproperty_t
-property WM_WINDOW_ROLE			client_xproperty_t
-property WM_TRANSIENT_FOR		client_xproperty_t
-property _NET_WM_NAME			client_xproperty_t
-property _NET_WM_ICON			client_xproperty_t
-property _NET_WM_ICON_NAME		client_xproperty_t
-property _NET_WM_PID			client_xproperty_t
-property _NET_WM_STATE			client_xproperty_t
-property _NET_WM_DESKTOP		client_xproperty_t
-property _NET_WM_SYNC_REQUEST_COUNTER	client_xproperty_t
-property _NET_WM_WINDOW_TYPE		client_xproperty_t
-property _NET_WM_USER_TIME		client_xproperty_t
-property _MOTIF_DRAG_RECEIVER_INFO	client_xproperty_t
-property XdndAware			client_xproperty_t
+property WM_NAME			system_u:object_r:client_xproperty_t:s0
+property WM_CLASS			system_u:object_r:client_xproperty_t:s0
+property WM_ICON_NAME			system_u:object_r:client_xproperty_t:s0
+property WM_HINTS			system_u:object_r:client_xproperty_t:s0
+property WM_NORMAL_HINTS		system_u:object_r:client_xproperty_t:s0
+property WM_COMMAND			system_u:object_r:client_xproperty_t:s0
+property WM_CLIENT_MACHINE		system_u:object_r:client_xproperty_t:s0
+property WM_LOCALE_NAME			system_u:object_r:client_xproperty_t:s0
+property WM_CLIENT_LEADER		system_u:object_r:client_xproperty_t:s0
+property WM_STATE			system_u:object_r:client_xproperty_t:s0
+property WM_PROTOCOLS			system_u:object_r:client_xproperty_t:s0
+property WM_WINDOW_ROLE			system_u:object_r:client_xproperty_t:s0
+property WM_TRANSIENT_FOR		system_u:object_r:client_xproperty_t:s0
+property _NET_WM_NAME			system_u:object_r:client_xproperty_t:s0
+property _NET_WM_ICON			system_u:object_r:client_xproperty_t:s0
+property _NET_WM_ICON_NAME		system_u:object_r:client_xproperty_t:s0
+property _NET_WM_PID			system_u:object_r:client_xproperty_t:s0
+property _NET_WM_STATE			system_u:object_r:client_xproperty_t:s0
+property _NET_WM_DESKTOP		system_u:object_r:client_xproperty_t:s0
+property _NET_WM_SYNC_REQUEST_COUNTER	system_u:object_r:client_xproperty_t:s0
+property _NET_WM_WINDOW_TYPE		system_u:object_r:client_xproperty_t:s0
+property _NET_WM_USER_TIME		system_u:object_r:client_xproperty_t:s0
+property _MOTIF_DRAG_RECEIVER_INFO	system_u:object_r:client_xproperty_t:s0
+property XdndAware			system_u:object_r:client_xproperty_t:s0
 
 # Properties written by xrdb
-property RESOURCE_MANAGER		rm_xproperty_t
-property SCREEN_RESOURCES		rm_xproperty_t
+property RESOURCE_MANAGER		system_u:object_r:rm_xproperty_t:s0
+property SCREEN_RESOURCES		system_u:object_r:rm_xproperty_t:s0
 
 # Properties written by window managers
-property _MIT_PRIORITY_COLORS		wm_xproperty_t
+property _MIT_PRIORITY_COLORS		system_u:object_r:wm_xproperty_t:s0
 
 # Properties used for security labeling
-property _SELINUX_CLIENT_CONTEXT	seclabel_xproperty_t
+property _SELINUX_CLIENT_CONTEXT	system_u:object_r:seclabel_xproperty_t:s0
 
 # Properties used to communicate screen information
-property XFree86_VT			info_xproperty_t
-property XFree86_DDC_EDID1_RAWDATA	info_xproperty_t
+property XFree86_VT			system_u:object_r:info_xproperty_t:s0
+property XFree86_DDC_EDID1_RAWDATA	system_u:object_r:info_xproperty_t:s0
 
 # Clipboard and selection properties
-property CUT_BUFFER0			clipboard_xproperty_t
-property CUT_BUFFER1			clipboard_xproperty_t
-property CUT_BUFFER2			clipboard_xproperty_t
-property CUT_BUFFER3			clipboard_xproperty_t
-property CUT_BUFFER4			clipboard_xproperty_t
-property CUT_BUFFER5			clipboard_xproperty_t
-property CUT_BUFFER6			clipboard_xproperty_t
-property CUT_BUFFER7			clipboard_xproperty_t
-property _XT_SELECTION_0		clipboard_xproperty_t
+property CUT_BUFFER0			system_u:object_r:clipboard_xproperty_t:s0
+property CUT_BUFFER1			system_u:object_r:clipboard_xproperty_t:s0
+property CUT_BUFFER2			system_u:object_r:clipboard_xproperty_t:s0
+property CUT_BUFFER3			system_u:object_r:clipboard_xproperty_t:s0
+property CUT_BUFFER4			system_u:object_r:clipboard_xproperty_t:s0
+property CUT_BUFFER5			system_u:object_r:clipboard_xproperty_t:s0
+property CUT_BUFFER6			system_u:object_r:clipboard_xproperty_t:s0
+property CUT_BUFFER7			system_u:object_r:clipboard_xproperty_t:s0
+property _XT_SELECTION_0		system_u:object_r:clipboard_xproperty_t:s0
 
 # Default fallback type
-property default			unknown_xproperty_t
+property *	   			system_u:object_r:unknown_xproperty_t:s0
 
 #
-# Extension rules map an extension name to a SELinux type.  The type must
-# be valid according to the SELinux security policy.  There can be any
-# number of extension rules.  Additionally, a default extension type can
-# be defined for all extensions not explicitly listed.  The default
-# extension type may not be omitted.  The default rule may appear in
-# any position (it need not be the last extension rule listed).
+# Extension rules map an extension name to a context.  A default extension
+# rule indicated by an asterisk should follow all other extension rules.
 #
 # Standard extensions
-extension BIG-REQUESTS			std_xext_t
-extension DOUBLE-BUFFER			std_xext_t
-extension Extended-Visual-Information	std_xext_t
-extension MIT-SUNDRY-NONSTANDARD	std_xext_t
-extension SHAPE				std_xext_t
-extension SYNC				std_xext_t
-extension XC-MISC			std_xext_t
-extension XFIXES			std_xext_t
-extension XFree86-Misc			std_xext_t
-extension XpExtension                   std_xext_t
+extension BIG-REQUESTS			system_u:object_r:std_xext_t:s0
+extension DOUBLE-BUFFER			system_u:object_r:std_xext_t:s0
+extension Extended-Visual-Information	system_u:object_r:std_xext_t:s0
+extension MIT-SUNDRY-NONSTANDARD	system_u:object_r:std_xext_t:s0
+extension SHAPE				system_u:object_r:std_xext_t:s0
+extension SYNC				system_u:object_r:std_xext_t:s0
+extension XC-MISC			system_u:object_r:std_xext_t:s0
+extension XFIXES			system_u:object_r:std_xext_t:s0
+extension XFree86-Misc			system_u:object_r:std_xext_t:s0
+extension XpExtension                   system_u:object_r:std_xext_t:s0
 
 # Screen management and multihead extensions
-extension RANDR				output_xext_t
-extension XINERAMA			std_xext_t
+extension RANDR				system_u:object_r:output_xext_t:s0
+extension XINERAMA			system_u:object_r:std_xext_t:s0
 
 # Input extensions
-extension XInputExtension		input_xext_t
-extension XKEYBOARD			input_xext_t
+extension XInputExtension		system_u:object_r:input_xext_t:s0
+extension XKEYBOARD			system_u:object_r:input_xext_t:s0
 
 # Screensaver, power management extensions
-extension DPMS				screensaver_xext_t
-extension MIT-SCREEN-SAVER		screensaver_xext_t
+extension DPMS				system_u:object_r:screensaver_xext_t:s0
+extension MIT-SCREEN-SAVER		system_u:object_r:screensaver_xext_t:s0
 
 # Fonting extensions
-extension FontCache			font_xext_t
-extension XFree86-Bigfont		font_xext_t
+extension FontCache			system_u:object_r:font_xext_t:s0
+extension XFree86-Bigfont		system_u:object_r:font_xext_t:s0
 
 # Shared memory extensions
-extension MIT-SHM			shmem_xext_t
+extension MIT-SHM			system_u:object_r:shmem_xext_t:s0
 
 # Accelerated graphics, OpenGL, direct rendering extensions
-extension DAMAGE			accelgraphics_xext_t
-extension GLX				accelgraphics_xext_t
-extension NV-CONTROL			accelgraphics_xext_t
-extension NV-GLX			accelgraphics_xext_t
-extension NVIDIA-GLX			accelgraphics_xext_t
-extension RENDER			std_xext_t
-extension XFree86-DGA			accelgraphics_xext_t
+extension DAMAGE			system_u:object_r:accelgraphics_xext_t:s0
+extension GLX				system_u:object_r:accelgraphics_xext_t:s0
+extension NV-CONTROL			system_u:object_r:accelgraphics_xext_t:s0
+extension NV-GLX			system_u:object_r:accelgraphics_xext_t:s0
+extension NVIDIA-GLX			system_u:object_r:accelgraphics_xext_t:s0
+extension RENDER			system_u:object_r:std_xext_t:s0
+extension XFree86-DGA			system_u:object_r:accelgraphics_xext_t:s0
 
 # Debugging, testing, and recording extensions
-extension RECORD			debug_xext_t
-extension X-Resource			debug_xext_t
-extension XTEST				debug_xext_t
+extension RECORD			system_u:object_r:debug_xext_t:s0
+extension X-Resource			system_u:object_r:debug_xext_t:s0
+extension XTEST				system_u:object_r:debug_xext_t:s0
 
 # Extensions just for window managers
-extension TOG-CUP			windowmgr_xext_t
+extension TOG-CUP			system_u:object_r:windowmgr_xext_t:s0
 
 # Security-related extensions
-extension SECURITY			security_xext_t
-extension SELinux			security_xext_t
-extension XAccessControlExtension	security_xext_t
-extension XC-APPGROUP			security_xext_t
+extension SECURITY			system_u:object_r:security_xext_t:s0
+extension SELinux			system_u:object_r:security_xext_t:s0
+extension XAccessControlExtension	system_u:object_r:security_xext_t:s0
+extension XC-APPGROUP			system_u:object_r:security_xext_t:s0
 
 # Video extensions
-extension XFree86-VidModeExtension	video_xext_t
-extension XVideo			video_xext_t
-extension XVideo-MotionCompensation	video_xext_t
+extension XFree86-VidModeExtension	system_u:object_r:video_xext_t:s0
+extension XVideo			system_u:object_r:video_xext_t:s0
+extension XVideo-MotionCompensation	system_u:object_r:video_xext_t:s0
 
 # Default fallback type
-extension default			unknown_xext_t
+extension *	   			system_u:object_r:unknown_xext_t:s0

From d445d2f22b5c97fa010370f4ba9cb0555df4a853 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 3 Aug 2007 10:56:18 -0400
Subject: [PATCH 072/552] security: drop the "declare extension security" dix
 call.  Use the SecurityPolicy configuration file instead.

---
 Xext/SecurityPolicy                 |   5 ++
 Xext/bigreq.c                       |   2 -
 Xext/security.c                     | 102 +++++++++++++++++-----------
 Xext/xcmisc.c                       |   2 -
 Xext/xprint.c                       |   1 -
 dix/extension.c                     |   8 ---
 hw/xfree86/dixmods/extmod/modinit.h |   1 -
 hw/xfree86/loader/dixsym.c          |   1 -
 include/extnsionst.h                |   4 --
 mi/miinitext.c                      |   6 +-
 10 files changed, 67 insertions(+), 65 deletions(-)

diff --git a/Xext/SecurityPolicy b/Xext/SecurityPolicy
index cc521c263..0000c5a8f 100644
--- a/Xext/SecurityPolicy
+++ b/Xext/SecurityPolicy
@@ -86,3 +86,8 @@ property XDCCC_GRAY_CORRECTION	root	ar
 # To let untrusted clients use the overlay visuals that many vendors
 # support, include this line.
 property SERVER_OVERLAY_VISUALS	root	ar
+
+# Only trusted extensions can be used by untrusted clients
+trust extension XC-MISC
+trust extension BIG-REQUESTS
+trust extension XpExtension
diff --git a/Xext/bigreq.c b/Xext/bigreq.c
index fcd848aec..d38879079 100644
--- a/Xext/bigreq.c
+++ b/Xext/bigreq.c
@@ -66,8 +66,6 @@ BigReqExtensionInit(INITARGS)
 			ProcBigReqDispatch, ProcBigReqDispatch,
 			BigReqResetProc, StandardMinorOpcode);
 #endif
-
-    DeclareExtensionSecurity(XBigReqExtensionName, TRUE);
 }
 
 /*ARGSUSED*/
diff --git a/Xext/security.c b/Xext/security.c
index b6df61a61..b1c0ce008 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -63,8 +63,6 @@ typedef struct {
     XID authId;
 } SecurityClientStateRec;
 
-#define EXTLEVEL(extnsn) ((Bool) \
-    dixLookupPrivate(DEVPRIV_PTR(extnsn), &stateKey))
 #define HAVESTATE(client) (((SecurityClientStateRec *) \
     dixLookupPrivate(DEVPRIV_PTR(client), &stateKey))->haveState)
 #define TRUSTLEVEL(client) (((SecurityClientStateRec *) \
@@ -74,6 +72,9 @@ typedef struct {
 
 static CallbackListPtr SecurityValidateGroupCallback = NULL;
 
+static char **SecurityTrustedExtensions = NULL;
+static int nSecurityTrustedExtensions = 0;
+
 RESTYPE SecurityAuthorizationResType; /* resource type for authorizations */
 
 static RESTYPE RTEventClient;
@@ -1210,10 +1211,13 @@ SecurityCheckExtAccess(CallbackListPtr *pcbl, pointer unused,
 		       pointer calldata)
 {
     XaceExtAccessRec *rec = (XaceExtAccessRec*)calldata;
+    int i, trusted = 0;
 
-    if ((TRUSTLEVEL(rec->client) != XSecurityClientTrusted) &&
-	!EXTLEVEL(rec->ext))
+    for (i = 0; i < nSecurityTrustedExtensions; i++)
+	if (!strcmp(SecurityTrustedExtensions[i], rec->ext->name))
+	    trusted = 1;
 
+    if ((TRUSTLEVEL(rec->client) != XSecurityClientTrusted) && !trusted)
 	rec->status = BadAccess;
 }
 
@@ -1235,16 +1239,6 @@ SecurityCheckHostlistAccess(CallbackListPtr *pcbl, pointer unused,
     }
 }
 
-static void
-SecurityDeclareExtSecure(CallbackListPtr *pcbl, pointer unused,
-			 pointer calldata)
-{
-    XaceDeclareExtSecureRec *rec = (XaceDeclareExtSecureRec*)calldata;
-
-    /* security state for extensions is simply a boolean trust value */
-    dixSetPrivate(DEVPRIV_PTR(rec->ext), &stateKey, (pointer)rec->secure);
-}
-
 /**********************************************************************/
 
 typedef struct _PropertyAccessRec {
@@ -1276,7 +1270,9 @@ static char *SecurityKeywords[] = {
 #define SecurityKeywordRoot 3
     "root",
 #define SecurityKeywordAny 4
-    "any"
+    "any",
+#define SecurityKeywordExtension 5
+    "trust extension",
 };
 
 #define NUMKEYWORDS (sizeof(SecurityKeywords) / sizeof(char *))
@@ -1500,6 +1496,36 @@ SecurityParsePropertyAccessRule(
     return TRUE;
 } /* SecurityParsePropertyAccessRule */
 
+static Bool
+SecurityParseExtensionRule(
+    char *p)
+{
+    char *extName = SecurityParseString(&p);
+    char *copyExtName;
+    char **newStrings;
+
+    if (!extName)
+	return FALSE;
+
+    copyExtName = (char *)Xalloc(strlen(extName) + 1);
+    if (!copyExtName)
+	return TRUE;
+    strcpy(copyExtName, extName);
+    newStrings = (char **)Xrealloc(SecurityTrustedExtensions,
+			  sizeof (char *) * (nSecurityTrustedExtensions + 1));
+    if (!newStrings)
+    {
+	Xfree(copyExtName);
+	return TRUE;
+    }
+
+    SecurityTrustedExtensions = newStrings;
+    SecurityTrustedExtensions[nSecurityTrustedExtensions++] = copyExtName;
+
+    return TRUE;
+
+} /* SecurityParseExtensionRule */
+
 static char **SecurityPolicyStrings = NULL;
 static int nSecurityPolicyStrings = 0;
 
@@ -1558,6 +1584,21 @@ SecurityFreeSitePolicyStrings(void)
     }
 } /* SecurityFreeSitePolicyStrings */
 
+static void
+SecurityFreeTrustedExtensionStrings(void)
+{
+    if (SecurityTrustedExtensions)
+    {
+	assert(nSecurityTrustedExtensions);
+	while (nSecurityTrustedExtensions--)
+	{
+	    Xfree(SecurityTrustedExtensions[nSecurityTrustedExtensions]);
+	}
+	Xfree(SecurityTrustedExtensions);
+	SecurityTrustedExtensions = NULL;
+	nSecurityTrustedExtensions = 0;
+    }
+} /* SecurityFreeSiteTrustedExtensions */
 
 static void
 SecurityLoadPropertyAccessList(void)
@@ -1616,6 +1657,10 @@ SecurityLoadPropertyAccessList(void)
 		    validLine = SecurityParseSitePolicy(p);
 		break;
 
+		case SecurityKeywordExtension:
+		    validLine = SecurityParseExtensionRule(p);
+		break;
+
 		default:
 		    validLine = (*p == '\0'); /* blank lines OK, others not */
 		break;
@@ -1791,6 +1836,7 @@ SecurityResetProc(
     ExtensionEntry *extEntry)
 {
     SecurityFreePropertyAccessList();
+    SecurityFreeTrustedExtensionStrings();
     SecurityFreeSitePolicyStrings();
 } /* SecurityResetProc */
 
@@ -1811,32 +1857,6 @@ XSecurityOptions(argc, argv, i)
 } /* XSecurityOptions */
 
 
-/* SecurityExtensionSetup
- *
- * Arguments: none.
- *
- * Returns: nothing.
- *
- * Side Effects:
- *	Sets up the Security extension if possible.
- *      This function contains things that need to be done
- *      before any other extension init functions get called.
- */
-
-void
-SecurityExtensionSetup(INITARGS)
-{
-    /* FIXME: this is here so it is registered before other extensions
-     * init themselves.  This also required commit 5e946dd853a4ebc... to
-     * call the setup functions on each server reset.
-     *
-     * The extension security bit should be delivered in some other way,
-     * either in a symbol or in the module data.
-     */
-    XaceRegisterCallback(XACE_DECLARE_EXT_SECURE, SecurityDeclareExtSecure, 0);
-} /* SecurityExtensionSetup */
-
-
 /* SecurityExtensionInit
  *
  * Arguments: none.
diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c
index 8c7a86e6a..d9a7f100d 100644
--- a/Xext/xcmisc.c
+++ b/Xext/xcmisc.c
@@ -80,8 +80,6 @@ XCMiscExtensionInit(INITARGS)
 			ProcXCMiscDispatch, SProcXCMiscDispatch,
 			XCMiscResetProc, StandardMinorOpcode);
 #endif
-
-    DeclareExtensionSecurity(XCMiscExtensionName, TRUE);
 }
 
 /*ARGSUSED*/
diff --git a/Xext/xprint.c b/Xext/xprint.c
index 4ac13e6d1..ff739c0e7 100644
--- a/Xext/xprint.c
+++ b/Xext/xprint.c
@@ -335,7 +335,6 @@ XpExtensionInit(INITARGS)
 	    screenInfo.screens[i]->CloseScreen = XpCloseScreen;
 	}
     }
-    DeclareExtensionSecurity(XP_PRINTNAME, TRUE);
 }
 
 static void
diff --git a/dix/extension.c b/dix/extension.c
index ad4e697b1..ec47ef19c 100644
--- a/dix/extension.c
+++ b/dix/extension.c
@@ -250,14 +250,6 @@ GetExtensionEntry(int major)
     return extensions[major];
 }
 
-_X_EXPORT void
-DeclareExtensionSecurity(char *extname, Bool secure)
-{
-    int i = FindExtension(extname, strlen(extname));
-    if (i >= 0)
-	XaceHook(XACE_DECLARE_EXT_SECURE, extensions[i], secure);
-}
-
 _X_EXPORT unsigned short
 StandardMinorOpcode(ClientPtr client)
 {
diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h
index 131b9e6e6..fb75092c7 100644
--- a/hw/xfree86/dixmods/extmod/modinit.h
+++ b/hw/xfree86/dixmods/extmod/modinit.h
@@ -135,7 +135,6 @@ extern void XSELinuxExtensionInit(INITARGS);
 #endif
 
 #if 1
-extern void SecurityExtensionSetup(INITARGS);
 extern void SecurityExtensionInit(INITARGS);
 #endif
 
diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c
index 043f2db90..1af076b88 100644
--- a/hw/xfree86/loader/dixsym.c
+++ b/hw/xfree86/loader/dixsym.c
@@ -200,7 +200,6 @@ _X_HIDDEN void *dixLookupTab[] = {
     SYMFUNC(AddExtension)
     SYMFUNC(AddExtensionAlias)
     SYMFUNC(CheckExtension)
-    SYMFUNC(DeclareExtensionSecurity)
     SYMFUNC(MinorOpcodeOfRequest)
     SYMFUNC(StandardMinorOpcode)
 #ifdef XEVIE
diff --git a/include/extnsionst.h b/include/extnsionst.h
index 28ae1d539..58bf0a206 100644
--- a/include/extnsionst.h
+++ b/include/extnsionst.h
@@ -107,9 +107,5 @@ extern Bool AddExtensionAlias(
 extern ExtensionEntry *CheckExtension(const char *extname);
 extern ExtensionEntry *GetExtensionEntry(int major);
 
-extern void DeclareExtensionSecurity(
-    char * /*extname*/,
-    Bool /*secure*/);
-
 #endif /* EXTENSIONSTRUCT_H */
 
diff --git a/mi/miinitext.c b/mi/miinitext.c
index f14254051..964ef3e0e 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -321,7 +321,6 @@ extern void XagExtensionInit(INITARGS);
 extern void XaceExtensionInit(INITARGS);
 #endif
 #ifdef XCSECURITY
-extern void SecurityExtensionSetup(INITARGS);
 extern void SecurityExtensionInit(INITARGS);
 #endif
 #ifdef XSELINUX
@@ -538,9 +537,6 @@ InitExtensions(argc, argv)
     int		argc;
     char	*argv[];
 {
-#ifdef XCSECURITY
-    SecurityExtensionSetup();
-#endif
 #ifdef XSELINUX
     XSELinuxExtensionSetup();
 #endif
@@ -719,7 +715,7 @@ static ExtensionModule staticExtensions[] = {
     { XaceExtensionInit, XACE_EXTENSION_NAME, NULL, NULL, NULL },
 #endif
 #ifdef XCSECURITY
-    { SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension, SecurityExtensionSetup, NULL },
+    { SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension, NULL, NULL },
 #endif
 #ifdef XSELINUX
     { XSELinuxExtensionInit, XSELINUX_EXTENSION_NAME, NULL, XSELinuxExtensionSetup, NULL },

From 375864cb74cced40ae688078b1f7750998972535 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 3 Aug 2007 13:23:34 -0400
Subject: [PATCH 073/552] security: drop support for XC-QUERY-SECURITY
 authorization method.

---
 Xext/SecurityPolicy |   7 --
 Xext/security.c     |  64 +-------------
 Xext/securitysrv.h  |   2 -
 os/Makefile.am      |   7 +-
 os/auth.c           |  11 ---
 os/connection.c     |  11 +--
 os/osdep.h          |   3 -
 os/secauth.c        | 202 --------------------------------------------
 8 files changed, 3 insertions(+), 304 deletions(-)
 delete mode 100644 os/secauth.c

diff --git a/Xext/SecurityPolicy b/Xext/SecurityPolicy
index 0000c5a8f..04dfb0e6b 100644
--- a/Xext/SecurityPolicy
+++ b/Xext/SecurityPolicy
@@ -2,13 +2,6 @@ version-1
 
 # $Xorg: SecurityPolicy,v 1.3 2000/08/17 19:47:56 cpqbld Exp $
 
-# The site policy fields are interpreted by the XC-QUERY-SECURITY-1
-# authorization protocol.  The values are arbitrary and site-specific.
-# Refer to the Security Extension Specification for the usage of the policies.
-#sitepolicy A
-#sitepolicy B
-#sitepolicy C
-
 # Property access rules:
 # property <property> <window> <permissions>
 # <window> ::= any | root | <propertyselector>
diff --git a/Xext/security.c b/Xext/security.c
index b1c0ce008..9e3b2dd9d 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -1526,64 +1526,6 @@ SecurityParseExtensionRule(
 
 } /* SecurityParseExtensionRule */
 
-static char **SecurityPolicyStrings = NULL;
-static int nSecurityPolicyStrings = 0;
-
-static Bool
-SecurityParseSitePolicy(
-    char *p)
-{
-    char *policyStr = SecurityParseString(&p);
-    char *copyPolicyStr;
-    char **newStrings;
-
-    if (!policyStr)
-	return FALSE;
-
-    copyPolicyStr = (char *)Xalloc(strlen(policyStr) + 1);
-    if (!copyPolicyStr)
-	return TRUE;
-    strcpy(copyPolicyStr, policyStr);
-    newStrings = (char **)Xrealloc(SecurityPolicyStrings,
-			  sizeof (char *) * (nSecurityPolicyStrings + 1));
-    if (!newStrings)
-    {
-	Xfree(copyPolicyStr);
-	return TRUE;
-    }
-
-    SecurityPolicyStrings = newStrings;
-    SecurityPolicyStrings[nSecurityPolicyStrings++] = copyPolicyStr;
-
-    return TRUE;
-
-} /* SecurityParseSitePolicy */
-
-
-char **
-SecurityGetSitePolicyStrings(n)
-    int *n;
-{
-    *n = nSecurityPolicyStrings;
-    return SecurityPolicyStrings;
-} /* SecurityGetSitePolicyStrings */
-
-static void
-SecurityFreeSitePolicyStrings(void)
-{
-    if (SecurityPolicyStrings)
-    {
-	assert(nSecurityPolicyStrings);
-	while (nSecurityPolicyStrings--)
-	{
-	    Xfree(SecurityPolicyStrings[nSecurityPolicyStrings]);
-	}
-	Xfree(SecurityPolicyStrings);
-	SecurityPolicyStrings = NULL;
-	nSecurityPolicyStrings = 0;
-    }
-} /* SecurityFreeSitePolicyStrings */
-
 static void
 SecurityFreeTrustedExtensionStrings(void)
 {
@@ -1646,6 +1588,7 @@ SecurityLoadPropertyAccessList(void)
 	    switch (SecurityParseKeyword(&p))
 	    {
 		case SecurityKeywordComment:
+		case SecurityKeywordSitePolicy:
 		    validLine = TRUE;
 		break;
 
@@ -1653,10 +1596,6 @@ SecurityLoadPropertyAccessList(void)
 		    validLine = SecurityParsePropertyAccessRule(p);
 		break;
 
-		case SecurityKeywordSitePolicy:
-		    validLine = SecurityParseSitePolicy(p);
-		break;
-
 		case SecurityKeywordExtension:
 		    validLine = SecurityParseExtensionRule(p);
 		break;
@@ -1837,7 +1776,6 @@ SecurityResetProc(
 {
     SecurityFreePropertyAccessList();
     SecurityFreeTrustedExtensionStrings();
-    SecurityFreeSitePolicyStrings();
 } /* SecurityResetProc */
 
 
diff --git a/Xext/securitysrv.h b/Xext/securitysrv.h
index 67d864e2e..7320ab7da 100644
--- a/Xext/securitysrv.h
+++ b/Xext/securitysrv.h
@@ -84,6 +84,4 @@ extern int XSecurityOptions(int argc, char **argv, int i);
 
 #define SECURITY_POLICY_FILE_VERSION "version-1"
 
-extern char **SecurityGetSitePolicyStrings(int *n);
-
 #endif /* _SECURITY_SRV_H */
diff --git a/os/Makefile.am b/os/Makefile.am
index 53b2d7f0c..9dd1b5432 100644
--- a/os/Makefile.am
+++ b/os/Makefile.am
@@ -6,7 +6,6 @@ AM_CFLAGS = $(DIX_CFLAGS)
 SECURERPC_SRCS = rpcauth.c
 INTERNALMALLOC_SRCS = xalloc.c
 
-XCSECURITY_SRCS = secauth.c
 XDMCP_SRCS = xdmcp.c
 STRLCAT_SRCS = strlcat.c strlcpy.c
 XORG_SRCS = log.c
@@ -28,10 +27,6 @@ libos_la_SOURCES = 	\
 	xprintf.c	\
 	$(XORG_SRCS)
 
-if XCSECURITY
-libos_la_SOURCES += $(XCSECURITY_SRCS)
-endif
-
 if XDMCP
 libos_la_SOURCES += $(XDMCP_SRCS)
 endif
@@ -48,7 +43,7 @@ libcwrapper_la_CFLAGS = \
 	$(AM_CFLAGS)
 
 EXTRA_DIST = $(SECURERPC_SRCS) $(INTERNALMALLOC_SRCS) \
-     $(XCSECURITY_SRCS) $(XDMCP_SRCS) $(STRLCAT_SRCS)
+     $(XDMCP_SRCS) $(STRLCAT_SRCS)
 
 if XSERVER_DTRACE
 # Generate dtrace object code for probes in libos & libdix
diff --git a/os/auth.c b/os/auth.c
index b2a145f89..d2aa980a8 100644
--- a/os/auth.c
+++ b/os/auth.c
@@ -42,9 +42,6 @@ from The Open Group.
 # include   "dixstruct.h"
 # include   <sys/types.h>
 # include   <sys/stat.h>
-#ifdef XCSECURITY
-# include   "securitysrv.h"
-#endif
 #ifdef WIN32
 #include    <X11/Xw32defs.h>
 #endif
@@ -89,14 +86,6 @@ static struct protocol   protocols[] = {
 #endif
 },
 #endif
-#ifdef XCSECURITY
-{   (unsigned short) XSecurityAuthorizationNameLen,
-	XSecurityAuthorizationName,
-		NULL, AuthSecurityCheck, NULL,
-		NULL, NULL, NULL,
-		NULL
-},
-#endif
 };
 
 # define NUM_AUTHORIZATION  (sizeof (protocols) /\
diff --git a/os/connection.c b/os/connection.c
index d975f87d2..c1152aad7 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -140,9 +140,6 @@ SOFTWARE.
 #include "appgroup.h"
 #endif
 #include "xace.h"
-#ifdef XCSECURITY
-#include "securitysrv.h"
-#endif
 
 #ifdef X_NOT_POSIX
 #define Pid_t int
@@ -669,13 +666,7 @@ ClientAuthorized(ClientPtr client,
 
     if (auth_id == (XID) ~0L)
     {
-	if (
-#ifdef XCSECURITY	    
-	    (proto_n == 0 ||
-	    strncmp (auth_proto, XSecurityAuthorizationName, proto_n) != 0) &&
-#endif
-	    _XSERVTransGetPeerAddr (trans_conn,
-	        &family, &fromlen, &from) != -1)
+	if (_XSERVTransGetPeerAddr(trans_conn, &family, &fromlen, &from) != -1)
 	{
 	    if (InvalidHost ((struct sockaddr *) from, fromlen, client))
 		AuthAudit(client, FALSE, (struct sockaddr *) from,
diff --git a/os/osdep.h b/os/osdep.h
index 965436df5..0c07a9004 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -260,9 +260,6 @@ extern int  SecureRPCRemove   (AuthRemCArgs);
 extern int  SecureRPCReset    (AuthRstCArgs);
 #endif
 
-/* in secauth.c */
-extern XID AuthSecurityCheck (AuthCheckArgs);
-
 /* in xdmcp.c */
 extern void XdmcpUseMsg (void);
 extern int XdmcpOptions(int argc, char **argv, int i);
diff --git a/os/secauth.c b/os/secauth.c
deleted file mode 100644
index d01879bfd..000000000
--- a/os/secauth.c
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
-Copyright 1996, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-*/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include <X11/X.h>
-#include "os.h"
-#include "osdep.h"
-#include "dixstruct.h"
-#include "swaprep.h"
-
-#ifdef XCSECURITY
-#include "securitysrv.h"
-#endif
-
-static char InvalidPolicyReason[] = "invalid policy specification";
-static char PolicyViolationReason[] = "policy violation";
-
-static Bool
-AuthCheckSitePolicy(
-    unsigned short *data_lengthP,
-    char	**dataP,
-    ClientPtr	client,
-    char	**reason)
-{
-    CARD8	*policy = *(CARD8 **)dataP;
-    int		length;
-    Bool	permit;
-    int		nPolicies;
-    char	**sitePolicies;
-    int		nSitePolicies;
-    Bool	found = FALSE;
-
-    if ((length = *data_lengthP) < 2) {
-	*reason = InvalidPolicyReason;
-	return FALSE;
-    }
-
-    permit = (*policy++ == 0);
-    nPolicies = (CARD8) *policy++;
-
-    length -= 2;
-
-    sitePolicies = SecurityGetSitePolicyStrings(&nSitePolicies);
-
-    while (nPolicies) {
-	int strLen, sitePolicy;
-
-	if (length == 0) {
-	    *reason = InvalidPolicyReason;
-	    return FALSE;
-	}
-
-	strLen = (CARD8) *policy++;
-	if (--length < strLen) {
-	    *reason = InvalidPolicyReason;
-	    return FALSE;
-	}
-
-	if (!found)
-	{
-	    for (sitePolicy = 0; sitePolicy < nSitePolicies; sitePolicy++)
-	    {
-		char *testPolicy = sitePolicies[sitePolicy];
-		if ((strLen == strlen(testPolicy)) &&
-		    (strncmp((char *)policy, testPolicy, strLen) == 0))
-		{
-		    found = TRUE; /* need to continue parsing the policy... */
-		    break;
-		}
-	    }
-	}
-
-	policy += strLen;
-	length -= strLen;
-	nPolicies--;
-    }
-
-    if (found != permit)
-    {
-	*reason = PolicyViolationReason;
-	return FALSE;
-    }
-
-    *data_lengthP = length;
-    *dataP = (char *)policy;
-    return TRUE;
-}
-
-XID
-AuthSecurityCheck (
-    unsigned short	data_length,
-    char		*data,
-    ClientPtr		client,
-    char		**reason)
-{
-#ifdef XCSECURITY
-    xConnSetupPrefix csp;
-    xReq freq;
-
-    if (client->clientState == ClientStateCheckedSecurity)
-    {
-	*reason = "repeated security check not permitted";
-	return (XID) -1;
-    }
-    else if (data_length > 0)
-    {
-	char policy_mask = *data++;
-
-	if (--data_length == 1) {
-	    *reason = InvalidPolicyReason;
-	    return (XID) -1;
-	}
-
-	if (policy_mask & 0x01)	/* Extensions policy */
-	{
-	 /* AuthCheckExtensionPolicy(&data_length, &data, client, reason) */
-	    *reason = "security policy not implemented";
-	    return (XID) -1;
-	}
-
-	if (policy_mask & 0x02)	/* Site policy */
-	{
-	    if (!AuthCheckSitePolicy(&data_length, &data, client, reason))
-		return (XID) -1;
-	}
-
-	if (data_length > 0) {	/* did we consume the whole policy? */
-	    *reason = InvalidPolicyReason;
-	    return (XID) -1;
-	}
-
-    }
-    else if (!GetAccessControl())
-    {
-	/*
-	 * The client - possibly the X FireWall Proxy - gave
-	 * no auth data and host-based authorization is turned
-	 * off.  In this case, the client should be denied
-	 * access to the X server.
-	 */
-	*reason = "server host access control is disabled";
-	return (XID) -1;
-    }
-
-    client->clientState = ClientStateCheckingSecurity;
-
-    csp.success = 2 /* Authenticate */;
-    csp.lengthReason = 0;
-    csp.length = 0;
-    csp.majorVersion = X_PROTOCOL;
-    csp.minorVersion = X_PROTOCOL_REVISION;
-    if (client->swapped)
-	WriteSConnSetupPrefix(client, &csp);
-    else
-	(void)WriteToClient(client, sz_xConnSetupPrefix, (char *) &csp);
-
-    /*
-     * Next time the client sends the real auth data, we want
-     * ProcEstablishConnection to be called.
-     */
-
-    freq.reqType = 1;
-    freq.length = (sz_xReq + sz_xConnClientPrefix) >> 2;
-    client->swapped = FALSE;
-    if (!InsertFakeRequest(client, (char *)&freq, sz_xReq))
-    {
-	*reason = "internal error";
-	return (XID) -1;
-    }
-
-    return (XID) 0;
-#else
-    *reason = "method not supported";
-    return (XID) -1;
-#endif
-}

From 102df4f9bac59d95963572d1a7f31d1a064ca4ca Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 6 Aug 2007 09:16:30 -0400
Subject: [PATCH 074/552] xace: drop site-policy and declare-extension-security
 hooks, add 2 new hooks for controlling access to screens and screen savers.

---
 Xext/xace.c    | 20 +++++++-------------
 Xext/xace.h    |  4 ++--
 Xext/xacestr.h | 14 ++++----------
 3 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/Xext/xace.c b/Xext/xace.c
index 46fe7bc66..50361d06b 100644
--- a/Xext/xace.c
+++ b/Xext/xace.c
@@ -156,24 +156,18 @@ int XaceHook(int hook, ...)
 	    prv = &rec.status;
 	    break;
 	}
-	case XACE_SITE_POLICY: {
-	    XaceSitePolicyRec rec = {
-		va_arg(ap, char*),
-		va_arg(ap, int),
-		BadValue /* default unrecognized */
+	case XACE_SCREEN_ACCESS:
+	case XACE_SCREENSAVER_ACCESS: {
+	    XaceScreenAccessRec rec = {
+		va_arg(ap, ClientPtr),
+		va_arg(ap, ScreenPtr),
+		va_arg(ap, Mask),
+		Success /* default allow */
 	    };
 	    calldata = &rec;
 	    prv = &rec.status;
 	    break;
 	}
-	case XACE_DECLARE_EXT_SECURE: {
-	    XaceDeclareExtSecureRec rec = {
-		va_arg(ap, ExtensionEntry*),
-		va_arg(ap, Bool)
-	    };
-	    calldata = &rec;
-	    break;
-	}
 	case XACE_AUTH_AVAIL: {
 	    XaceAuthAvailRec rec = {
 		va_arg(ap, ClientPtr),
diff --git a/Xext/xace.h b/Xext/xace.h
index 083261273..e2982cfe2 100644
--- a/Xext/xace.h
+++ b/Xext/xace.h
@@ -51,8 +51,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define XACE_EXT_ACCESS			8
 #define XACE_HOSTLIST_ACCESS		9
 #define XACE_SELECTION_ACCESS		10
-#define XACE_SITE_POLICY		11
-#define XACE_DECLARE_EXT_SECURE		12
+#define XACE_SCREEN_ACCESS		11
+#define XACE_SCREENSAVER_ACCESS		12
 #define XACE_AUTH_AVAIL			13
 #define XACE_KEY_AVAIL			14
 #define XACE_AUDIT_BEGIN		15
diff --git a/Xext/xacestr.h b/Xext/xacestr.h
index 8eb74d50f..8d092514d 100644
--- a/Xext/xacestr.h
+++ b/Xext/xacestr.h
@@ -101,18 +101,12 @@ typedef struct {
     int status;
 } XaceSelectionAccessRec;
 
-/* XACE_SITE_POLICY */
 typedef struct {
-    char *policyString;
-    int len;
+    ClientPtr client;
+    ScreenPtr screen;
+    Mask access_mode;
     int status;
-} XaceSitePolicyRec;
-
-/* XACE_DECLARE_EXT_SECURE */
-typedef struct {
-    ExtensionEntry *ext;
-    Bool secure;
-} XaceDeclareExtSecureRec;
+} XaceScreenAccessRec;
 
 /* XACE_AUTH_AVAIL */
 typedef struct {

From acc9a42c926a3f84159780de12ecc1dc6186068a Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 6 Aug 2007 12:16:59 -0400
Subject: [PATCH 075/552] Temporarily disable Security and SELinux extensions
 while changes to XACE are being made.

---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2af3114b6..a0fc31f3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -510,8 +510,8 @@ AC_ARG_ENABLE(xinerama,	      AS_HELP_STRING([--disable-xinerama], [Build Xinera
 AC_ARG_ENABLE(xf86vidmode,    AS_HELP_STRING([--disable-xf86vidmode], [Build XF86VidMode extension (default: auto)]), [XF86VIDMODE=$enableval], [XF86VIDMODE=auto])
 AC_ARG_ENABLE(xf86misc,       AS_HELP_STRING([--disable-xf86misc], [Build XF86Misc extension (default: auto)]), [XF86MISC=$enableval], [XF86MISC=auto])
 AC_ARG_ENABLE(xace,           AS_HELP_STRING([--disable-xace], [Build X-ACE extension (default: enabled)]), [XACE=$enableval], [XACE=yes])
-AC_ARG_ENABLE(xselinux,       AS_HELP_STRING([--disable-xselinux], [Build SELinux extension (default: enabled)]), [XSELINUX=$enableval], [XSELINUX=$XACE])
-AC_ARG_ENABLE(xcsecurity,     AS_HELP_STRING([--disable-xcsecurity], [Build Security extension (default: enabled)]), [XCSECURITY=$enableval], [XCSECURITY=$XACE])
+AC_ARG_ENABLE(xselinux,       AS_HELP_STRING([--disable-xselinux], [Build SELinux extension (TEMPORARILY DISABLED)]), [XSELINUX=no], [XSELINUX=no])
+AC_ARG_ENABLE(xcsecurity,     AS_HELP_STRING([--disable-xcsecurity], [Build Security extension (TEMPORARILY DISABLED)]), [XCSECURITY=no], [XCSECURITY=no])
 AC_ARG_ENABLE(appgroup,       AS_HELP_STRING([--disable-appgroup], [Build XC-APPGROUP extension (default: enabled)]), [APPGROUP=$enableval], [APPGROUP=$XCSECURITY])
 AC_ARG_ENABLE(xcalibrate,     AS_HELP_STRING([--enable-xcalibrate], [Build XCalibrate extension (default: disabled)]), [XCALIBRATE=$enableval], [XCALIBRATE=no])
 AC_ARG_ENABLE(tslib,          AS_HELP_STRING([--enable-tslib], [Build kdrive tslib touchscreen support (default: disabled)]), [TSLIB=$enableval], [TSLIB=no])

From d744df32a15103aa14237175f506350d25b2fec0 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 6 Aug 2007 12:23:21 -0400
Subject: [PATCH 076/552] xace: add hooks + new access codes: core protocol
 colormap requests

---
 dix/colormap.c |  11 +++
 dix/dispatch.c | 226 +++++++++++++++++++++++++++----------------------
 2 files changed, 134 insertions(+), 103 deletions(-)

diff --git a/dix/colormap.c b/dix/colormap.c
index 515557030..7d6e7da4f 100644
--- a/dix/colormap.c
+++ b/dix/colormap.c
@@ -64,6 +64,7 @@ SOFTWARE.
 #include "resource.h"
 #include "windowstr.h"
 #include "privates.h"
+#include "xace.h"
 
 extern XID clientErrorValue;
 extern int colormapPrivateCount;
@@ -412,6 +413,16 @@ CreateColormap (Colormap mid, ScreenPtr pScreen, VisualPtr pVisual,
 	}
     }
 
+    /*  
+     * Security creation/labeling check
+     */
+    i = XaceHook(XACE_RESOURCE_ACCESS, clients[client], mid, RT_COLORMAP,
+		 DixCreateAccess, pmap);
+    if (i != Success) {
+	FreeResource(mid, RT_NONE);
+	return i;
+    }
+
     if (!(*pScreen->CreateColormap)(pmap))
     {
 	FreeResource (mid, RT_NONE);
diff --git a/dix/dispatch.c b/dix/dispatch.c
index ffaad877d..83d761ba1 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -2495,7 +2495,7 @@ ProcCreateColormap(ClientPtr client)
     }
     mid = stuff->mid;
     LEGAL_NEW_RESOURCE(mid, client);
-    result = dixLookupWindow(&pWin, stuff->window, client, DixReadAccess);
+    result = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
     if (result != Success)
         return result;
 
@@ -2521,12 +2521,13 @@ int
 ProcFreeColormap(ClientPtr client)
 {
     ColormapPtr pmap;
+    int rc;
     REQUEST(xResourceReq);
 
     REQUEST_SIZE_MATCH(xResourceReq);
-    pmap = (ColormapPtr )SecurityLookupIDByType(client, stuff->id, RT_COLORMAP,
-						DixDestroyAccess);
-    if (pmap) 
+    rc = dixLookupResource((pointer *)&pmap, stuff->id, RT_COLORMAP, client,
+			   DixDestroyAccess);
+    if (rc == Success)
     {
 	/* Freeing a default colormap is a no-op */
 	if (!(pmap->flags & IsDefault))
@@ -2536,7 +2537,7 @@ ProcFreeColormap(ClientPtr client)
     else 
     {
 	client->errorValue = stuff->id;
-	return (BadColor);
+	return rc;
     }
 }
 
@@ -2547,24 +2548,25 @@ ProcCopyColormapAndFree(ClientPtr client)
     Colormap	mid;
     ColormapPtr	pSrcMap;
     REQUEST(xCopyColormapAndFreeReq);
-    int result;
+    int rc;
 
     REQUEST_SIZE_MATCH(xCopyColormapAndFreeReq);
     mid = stuff->mid;
     LEGAL_NEW_RESOURCE(mid, client);
-    if( (pSrcMap = (ColormapPtr )SecurityLookupIDByType(client,	stuff->srcCmap,
-		RT_COLORMAP, DixReadAccess|DixWriteAccess)) )
+    rc = dixLookupResource((pointer *)&pSrcMap, stuff->srcCmap, RT_COLORMAP,
+			   client, DixReadAccess|DixRemoveAccess);
+    if (rc == Success)
     {
-	result = CopyColormapAndFree(mid, pSrcMap, client->index);
+	rc = CopyColormapAndFree(mid, pSrcMap, client->index);
 	if (client->noClientException != Success)
             return(client->noClientException);
 	else
-            return(result);
+            return rc;
     }
     else
     {
 	client->errorValue = stuff->srcCmap;
-	return(BadColor);
+	return rc;
     }
 }
 
@@ -2572,43 +2574,51 @@ int
 ProcInstallColormap(ClientPtr client)
 {
     ColormapPtr pcmp;
+    int rc;
     REQUEST(xResourceReq);
-
     REQUEST_SIZE_MATCH(xResourceReq);
-    pcmp = (ColormapPtr)SecurityLookupIDByType(client, stuff->id,
-					    RT_COLORMAP, DixReadAccess);
-    if (pcmp)
-    {
-        (*(pcmp->pScreen->InstallColormap)) (pcmp);
-        return (client->noClientException);        
-    }
-    else
-    {
-        client->errorValue = stuff->id;
-        return (BadColor);
-    }
+
+    rc = dixLookupResource((pointer *)&pcmp, stuff->id, RT_COLORMAP, client,
+			   DixInstallAccess);
+    if (rc != Success)
+	goto out;
+
+    rc = XaceHook(XACE_SCREEN_ACCESS, client, pcmp->pScreen, DixSetAttrAccess);
+    if (rc != Success)
+	goto out;
+
+    (*(pcmp->pScreen->InstallColormap)) (pcmp);
+
+    rc = client->noClientException;
+out:
+    client->errorValue = stuff->id;
+    return (rc == BadValue) ? BadColor : rc;
 }
 
 int
 ProcUninstallColormap(ClientPtr client)
 {
     ColormapPtr pcmp;
+    int rc;
     REQUEST(xResourceReq);
-
     REQUEST_SIZE_MATCH(xResourceReq);
-    pcmp = (ColormapPtr)SecurityLookupIDByType(client, stuff->id,
-					RT_COLORMAP, DixReadAccess);
-    if (pcmp)
-    {
-	if(pcmp->mid != pcmp->pScreen->defColormap)
-            (*(pcmp->pScreen->UninstallColormap)) (pcmp);
-        return (client->noClientException);        
-    }
-    else
-    {
-        client->errorValue = stuff->id;
-        return (BadColor);
-    }
+
+    rc = dixLookupResource((pointer *)&pcmp, stuff->id, RT_COLORMAP, client,
+			   DixUninstallAccess);
+    if (rc != Success)
+	goto out;
+
+    rc = XaceHook(XACE_SCREEN_ACCESS, client, pcmp->pScreen, DixSetAttrAccess);
+    if (rc != Success)
+	goto out;
+
+    if(pcmp->mid != pcmp->pScreen->defColormap)
+	(*(pcmp->pScreen->UninstallColormap)) (pcmp);
+
+    rc = client->noClientException;
+out:
+    client->errorValue = stuff->id;
+    return (rc == BadValue) ? BadColor : rc;
 }
 
 int
@@ -2618,11 +2628,16 @@ ProcListInstalledColormaps(ClientPtr client)
     int nummaps, rc;
     WindowPtr pWin;
     REQUEST(xResourceReq);
-
     REQUEST_SIZE_MATCH(xResourceReq);
-    rc = dixLookupWindow(&pWin, stuff->id, client, DixReadAccess);
+
+    rc = dixLookupWindow(&pWin, stuff->id, client, DixGetAttrAccess);
     if (rc != Success)
-        return rc;
+	goto out;
+
+    rc = XaceHook(XACE_SCREEN_ACCESS, client, pWin->drawable.pScreen,
+		  DixGetAttrAccess);
+    if (rc != Success)
+	goto out;
 
     preply = (xListInstalledColormapsReply *) 
 		ALLOCATE_LOCAL(sizeof(xListInstalledColormapsReply) +
@@ -2641,21 +2656,23 @@ ProcListInstalledColormaps(ClientPtr client)
     client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write;
     WriteSwappedDataToClient(client, nummaps * sizeof(Colormap), &preply[1]);
     DEALLOCATE_LOCAL(preply);
-    return(client->noClientException);
+    rc = client->noClientException;
+out:
+    return (rc == BadValue) ? BadColor : rc;
 }
 
 int
 ProcAllocColor (ClientPtr client)
 {
     ColormapPtr pmap;
-    int	retval;
+    int rc;
     xAllocColorReply acr;
     REQUEST(xAllocColorReq);
 
     REQUEST_SIZE_MATCH(xAllocColorReq);
-    pmap = (ColormapPtr)SecurityLookupIDByType(client, stuff->cmap,
-					RT_COLORMAP, DixWriteAccess);
-    if (pmap)
+    rc = dixLookupResource((pointer *)&pmap, stuff->cmap, RT_COLORMAP, client,
+			   DixAddAccess);
+    if (rc == Success)
     {
 	acr.type = X_Reply;
 	acr.length = 0;
@@ -2664,13 +2681,13 @@ ProcAllocColor (ClientPtr client)
 	acr.green = stuff->green;
 	acr.blue = stuff->blue;
 	acr.pixel = 0;
-	if( (retval = AllocColor(pmap, &acr.red, &acr.green, &acr.blue,
+	if( (rc = AllocColor(pmap, &acr.red, &acr.green, &acr.blue,
 	                       &acr.pixel, client->index)) )
 	{
             if (client->noClientException != Success)
                 return(client->noClientException);
 	    else
-	        return (retval);
+	        return rc;
 	}
 #ifdef PANORAMIX
 	if (noPanoramiXExtension || !pmap->pScreen->myNum)
@@ -2682,7 +2699,7 @@ ProcAllocColor (ClientPtr client)
     else
     {
         client->errorValue = stuff->cmap;
-        return (BadColor);
+        return (rc == BadValue) ? BadColor : rc;
     }
 }
 
@@ -2690,15 +2707,14 @@ int
 ProcAllocNamedColor (ClientPtr client)
 {
     ColormapPtr pcmp;
+    int rc;
     REQUEST(xAllocNamedColorReq);
 
     REQUEST_FIXED_SIZE(xAllocNamedColorReq, stuff->nbytes);
-    pcmp = (ColormapPtr)SecurityLookupIDByType(client, stuff->cmap,
-					    RT_COLORMAP, DixWriteAccess);
-    if (pcmp)
+    rc = dixLookupResource((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client,
+			   DixAddAccess);
+    if (rc == Success)
     {
-	int		retval;
-
 	xAllocNamedColorReply ancr;
 
 	ancr.type = X_Reply;
@@ -2712,14 +2728,14 @@ ProcAllocNamedColor (ClientPtr client)
 	    ancr.screenGreen = ancr.exactGreen;
 	    ancr.screenBlue = ancr.exactBlue;
 	    ancr.pixel = 0;
-	    if( (retval = AllocColor(pcmp,
+	    if( (rc = AllocColor(pcmp,
 	                 &ancr.screenRed, &ancr.screenGreen, &ancr.screenBlue,
 			 &ancr.pixel, client->index)) )
 	    {
                 if (client->noClientException != Success)
                     return(client->noClientException);
                 else
-    	            return(retval);
+		    return rc;
 	    }
 #ifdef PANORAMIX
 	    if (noPanoramiXExtension || !pcmp->pScreen->myNum)
@@ -2734,7 +2750,7 @@ ProcAllocNamedColor (ClientPtr client)
     else
     {
         client->errorValue = stuff->cmap;
-        return (BadColor);
+        return (rc == BadValue) ? BadColor : rc;
     }
 }
 
@@ -2742,15 +2758,16 @@ int
 ProcAllocColorCells (ClientPtr client)
 {
     ColormapPtr pcmp;
+    int rc;
     REQUEST(xAllocColorCellsReq);
 
     REQUEST_SIZE_MATCH(xAllocColorCellsReq);
-    pcmp = (ColormapPtr)SecurityLookupIDByType(client, stuff->cmap,
-					RT_COLORMAP, DixWriteAccess);
-    if (pcmp)
+    rc = dixLookupResource((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client,
+			   DixAddAccess);
+    if (rc == Success)
     {
 	xAllocColorCellsReply	accr;
-	int			npixels, nmasks, retval;
+	int			npixels, nmasks;
 	long			length;
 	Pixel			*ppixels, *pmasks;
 
@@ -2772,14 +2789,14 @@ ProcAllocColorCells (ClientPtr client)
             return(BadAlloc);
 	pmasks = ppixels + npixels;
 
-	if( (retval = AllocColorCells(client->index, pcmp, npixels, nmasks, 
+	if( (rc = AllocColorCells(client->index, pcmp, npixels, nmasks, 
 				    (Bool)stuff->contiguous, ppixels, pmasks)) )
 	{
 	    DEALLOCATE_LOCAL(ppixels);
             if (client->noClientException != Success)
                 return(client->noClientException);
 	    else
-	        return(retval);
+	        return rc;
 	}
 #ifdef PANORAMIX
 	if (noPanoramiXExtension || !pcmp->pScreen->myNum)
@@ -2800,7 +2817,7 @@ ProcAllocColorCells (ClientPtr client)
     else
     {
         client->errorValue = stuff->cmap;
-        return (BadColor);
+        return (rc == BadValue) ? BadColor : rc;
     }
 }
 
@@ -2808,15 +2825,16 @@ int
 ProcAllocColorPlanes(ClientPtr client)
 {
     ColormapPtr pcmp;
+    int rc;
     REQUEST(xAllocColorPlanesReq);
 
     REQUEST_SIZE_MATCH(xAllocColorPlanesReq);
-    pcmp = (ColormapPtr)SecurityLookupIDByType(client, stuff->cmap,
-					RT_COLORMAP, DixWriteAccess);
-    if (pcmp)
+    rc = dixLookupResource((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client,
+			   DixAddAccess);
+    if (rc == Success)
     {
 	xAllocColorPlanesReply	acpr;
-	int			npixels, retval;
+	int			npixels;
 	long			length;
 	Pixel			*ppixels;
 
@@ -2838,7 +2856,7 @@ ProcAllocColorPlanes(ClientPtr client)
 	ppixels = (Pixel *)ALLOCATE_LOCAL(length);
 	if(!ppixels)
             return(BadAlloc);
-	if( (retval = AllocColorPlanes(client->index, pcmp, npixels,
+	if( (rc = AllocColorPlanes(client->index, pcmp, npixels,
 	    (int)stuff->red, (int)stuff->green, (int)stuff->blue,
 	    (Bool)stuff->contiguous, ppixels,
 	    &acpr.redMask, &acpr.greenMask, &acpr.blueMask)) )
@@ -2847,7 +2865,7 @@ ProcAllocColorPlanes(ClientPtr client)
             if (client->noClientException != Success)
                 return(client->noClientException);
 	    else
-	        return(retval);
+	        return rc;
 	}
 	acpr.length = length >> 2;
 #ifdef PANORAMIX
@@ -2864,7 +2882,7 @@ ProcAllocColorPlanes(ClientPtr client)
     else
     {
         client->errorValue = stuff->cmap;
-        return (BadColor);
+        return (rc == BadValue) ? BadColor : rc;
     }
 }
 
@@ -2872,34 +2890,34 @@ int
 ProcFreeColors(ClientPtr client)
 {
     ColormapPtr pcmp;
+    int rc;
     REQUEST(xFreeColorsReq);
 
     REQUEST_AT_LEAST_SIZE(xFreeColorsReq);
-    pcmp = (ColormapPtr)SecurityLookupIDByType(client, stuff->cmap,
-					RT_COLORMAP, DixWriteAccess);
-    if (pcmp)
+    rc = dixLookupResource((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client,
+			   DixRemoveAccess);
+    if (rc == Success)
     {
 	int	count;
-        int     retval;
 
 	if(pcmp->flags & AllAllocated)
 	    return(BadAccess);
 	count = ((client->req_len << 2)- sizeof(xFreeColorsReq)) >> 2;
-	retval =  FreeColors(pcmp, client->index, count,
+	rc = FreeColors(pcmp, client->index, count,
 	    (Pixel *)&stuff[1], (Pixel)stuff->planeMask);
         if (client->noClientException != Success)
             return(client->noClientException);
         else
 	{
 	    client->errorValue = clientErrorValue;
-            return(retval);
+            return rc;
 	}
 
     }
     else
     {
         client->errorValue = stuff->cmap;
-        return (BadColor);
+        return (rc == BadValue) ? BadColor : rc;
     }
 }
 
@@ -2907,33 +2925,33 @@ int
 ProcStoreColors (ClientPtr client)
 {
     ColormapPtr pcmp;
+    int rc;
     REQUEST(xStoreColorsReq);
 
     REQUEST_AT_LEAST_SIZE(xStoreColorsReq);
-    pcmp = (ColormapPtr)SecurityLookupIDByType(client, stuff->cmap,
-					RT_COLORMAP, DixWriteAccess);
-    if (pcmp)
+    rc = dixLookupResource((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client,
+			   DixWriteAccess);
+    if (rc == Success)
     {
 	int	count;
-        int     retval;
 
         count = (client->req_len << 2) - sizeof(xStoreColorsReq);
 	if (count % sizeof(xColorItem))
 	    return(BadLength);
 	count /= sizeof(xColorItem);
-	retval = StoreColors(pcmp, count, (xColorItem *)&stuff[1]);
+	rc = StoreColors(pcmp, count, (xColorItem *)&stuff[1]);
         if (client->noClientException != Success)
             return(client->noClientException);
         else
 	{
 	    client->errorValue = clientErrorValue;
-            return(retval);
+            return rc;
 	}
     }
     else
     {
         client->errorValue = stuff->cmap;
-        return (BadColor);
+        return (rc == BadValue) ? BadColor : rc;
     }
 }
 
@@ -2941,33 +2959,33 @@ int
 ProcStoreNamedColor (ClientPtr client)
 {
     ColormapPtr pcmp;
+    int rc;
     REQUEST(xStoreNamedColorReq);
 
     REQUEST_FIXED_SIZE(xStoreNamedColorReq, stuff->nbytes);
-    pcmp = (ColormapPtr)SecurityLookupIDByType(client, stuff->cmap,
-					RT_COLORMAP, DixWriteAccess);
-    if (pcmp)
+    rc = dixLookupResource((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client,
+			   DixWriteAccess);
+    if (rc == Success)
     {
 	xColorItem	def;
-        int             retval;
 
 	if(OsLookupColor(pcmp->pScreen->myNum, (char *)&stuff[1],
 	                 stuff->nbytes, &def.red, &def.green, &def.blue))
 	{
 	    def.flags = stuff->flags;
 	    def.pixel = stuff->pixel;
-	    retval = StoreColors(pcmp, 1, &def);
+	    rc = StoreColors(pcmp, 1, &def);
             if (client->noClientException != Success)
                 return(client->noClientException);
 	    else
-		return(retval);
+		return rc;
 	}
         return (BadName);        
     }
     else
     {
         client->errorValue = stuff->cmap;
-        return (BadColor);
+        return (rc == BadValue) ? BadColor : rc;
     }
 }
 
@@ -2975,14 +2993,15 @@ int
 ProcQueryColors(ClientPtr client)
 {
     ColormapPtr pcmp;
+    int rc;
     REQUEST(xQueryColorsReq);
 
     REQUEST_AT_LEAST_SIZE(xQueryColorsReq);
-    pcmp = (ColormapPtr)SecurityLookupIDByType(client, stuff->cmap,
-					RT_COLORMAP, DixReadAccess);
-    if (pcmp)
+    rc = dixLookupResource((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client,
+			   DixReadAccess);
+    if (rc == Success)
     {
-	int			count, retval;
+	int			count;
 	xrgb 			*prgbs;
 	xQueryColorsReply	qcr;
 
@@ -2990,7 +3009,7 @@ ProcQueryColors(ClientPtr client)
 	prgbs = (xrgb *)ALLOCATE_LOCAL(count * sizeof(xrgb));
 	if(!prgbs && count)
             return(BadAlloc);
-	if( (retval = QueryColors(pcmp, count, (Pixel *)&stuff[1], prgbs)) )
+	if( (rc = QueryColors(pcmp, count, (Pixel *)&stuff[1], prgbs)) )
 	{
    	    if (prgbs) DEALLOCATE_LOCAL(prgbs);
 	    if (client->noClientException != Success)
@@ -2998,7 +3017,7 @@ ProcQueryColors(ClientPtr client)
 	    else
 	    {
 		client->errorValue = clientErrorValue;
-	        return (retval);
+	        return rc;
 	    }
 	}
 	qcr.type = X_Reply;
@@ -3018,7 +3037,7 @@ ProcQueryColors(ClientPtr client)
     else
     {
         client->errorValue = stuff->cmap;
-        return (BadColor);
+        return (rc == BadValue) ? BadColor : rc;
     }
 } 
 
@@ -3026,12 +3045,13 @@ int
 ProcLookupColor(ClientPtr client)
 {
     ColormapPtr pcmp;
+    int rc;
     REQUEST(xLookupColorReq);
 
     REQUEST_FIXED_SIZE(xLookupColorReq, stuff->nbytes);
-    pcmp = (ColormapPtr)SecurityLookupIDByType(client, stuff->cmap,
-					RT_COLORMAP, DixReadAccess);
-    if (pcmp)
+    rc = dixLookupResource((pointer *)&pcmp, stuff->cmap, RT_COLORMAP, client,
+			   DixReadAccess);
+    if (rc == Success)
     {
 	xLookupColorReply lcr;
 
@@ -3056,7 +3076,7 @@ ProcLookupColor(ClientPtr client)
     else
     {
         client->errorValue = stuff->cmap;
-        return (BadColor);
+        return (rc == BadValue) ? BadColor : rc;
     }
 }
 

From 2763056ab5ae31bed422a0948198d98c6ace6d55 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 13 Aug 2007 13:40:47 -0400
Subject: [PATCH 077/552] xace: add hooks + new access codes: core protocol
 window requests

---
 dix/dispatch.c   |  53 ++++++++-------
 dix/window.c     | 166 +++++++++++++++++++++++------------------------
 include/window.h |   2 +-
 3 files changed, 114 insertions(+), 107 deletions(-)

diff --git a/dix/dispatch.c b/dix/dispatch.c
index 83d761ba1..1c40e2fcb 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -556,12 +556,12 @@ ProcCreateWindow(ClientPtr client)
 {
     WindowPtr pParent, pWin;
     REQUEST(xCreateWindowReq);
-    int result, len, rc;
+    int len, rc;
 
     REQUEST_AT_LEAST_SIZE(xCreateWindowReq);
     
     LEGAL_NEW_RESOURCE(stuff->wid, client);
-    rc = dixLookupWindow(&pParent, stuff->parent, client, DixWriteAccess);
+    rc = dixLookupWindow(&pParent, stuff->parent, client, DixAddAccess);
     if (rc != Success)
         return rc;
     len = client->req_len - (sizeof(xCreateWindowReq) >> 2);
@@ -577,7 +577,7 @@ ProcCreateWindow(ClientPtr client)
 			      stuff->borderWidth, stuff->class,
 			      stuff->mask, (XID *) &stuff[1], 
 			      (int)stuff->depth, 
-			      client, stuff->visual, &result);
+			      client, stuff->visual, &rc);
     if (pWin)
     {
 	Mask mask = pWin->eventMask;
@@ -590,7 +590,7 @@ ProcCreateWindow(ClientPtr client)
     if (client->noClientException != Success)
         return(client->noClientException);
     else
-        return(result);
+        return rc;
 }
 
 int
@@ -602,7 +602,7 @@ ProcChangeWindowAttributes(ClientPtr client)
     int len, rc;
 
     REQUEST_AT_LEAST_SIZE(xChangeWindowAttributesReq);
-    rc = dixLookupWindow(&pWin, stuff->window, client, DixWriteAccess);
+    rc = dixLookupWindow(&pWin, stuff->window, client, DixSetAttrAccess);
     if (rc != Success)
         return rc;
     len = client->req_len - (sizeof(xChangeWindowAttributesReq) >> 2);
@@ -627,7 +627,7 @@ ProcGetWindowAttributes(ClientPtr client)
     int rc;
 
     REQUEST_SIZE_MATCH(xResourceReq);
-    rc = dixLookupWindow(&pWin, stuff->id, client, DixReadAccess);
+    rc = dixLookupWindow(&pWin, stuff->id, client, DixGetAttrAccess);
     if (rc != Success)
 	return rc;
     GetWindowAttributes(pWin, client, &wa);
@@ -646,8 +646,13 @@ ProcDestroyWindow(ClientPtr client)
     rc = dixLookupWindow(&pWin, stuff->id, client, DixDestroyAccess);
     if (rc != Success)
 	return rc;
-    if (pWin->parent)
+    if (pWin->parent) {
+	rc = dixLookupWindow(&pWin, pWin->parent->drawable.id, client,
+			     DixRemoveAccess);
+	if (rc != Success)
+	    return rc;
 	FreeResource(stuff->id, RT_NONE);
+    }
     return(client->noClientException);
 }
 
@@ -659,7 +664,7 @@ ProcDestroySubwindows(ClientPtr client)
     int rc;
 
     REQUEST_SIZE_MATCH(xResourceReq);
-    rc = dixLookupWindow(&pWin, stuff->id, client, DixDestroyAccess);
+    rc = dixLookupWindow(&pWin, stuff->id, client, DixRemoveAccess);
     if (rc != Success)
 	return rc;
     DestroySubwindows(pWin, client);
@@ -674,7 +679,7 @@ ProcChangeSaveSet(ClientPtr client)
     int result, rc;
 		  
     REQUEST_SIZE_MATCH(xChangeSaveSetReq);
-    rc = dixLookupWindow(&pWin, stuff->window, client, DixReadAccess);
+    rc = dixLookupWindow(&pWin, stuff->window, client, DixManageAccess);
     if (rc != Success)
         return rc;
     if (client->clientAsMask == (CLIENT_BITS(pWin->drawable.id)))
@@ -702,10 +707,10 @@ ProcReparentWindow(ClientPtr client)
     int result, rc;
 
     REQUEST_SIZE_MATCH(xReparentWindowReq);
-    rc = dixLookupWindow(&pWin, stuff->window, client, DixWriteAccess);
+    rc = dixLookupWindow(&pWin, stuff->window, client, DixManageAccess);
     if (rc != Success)
         return rc;
-    rc = dixLookupWindow(&pParent, stuff->parent, client, DixWriteAccess);
+    rc = dixLookupWindow(&pParent, stuff->parent, client, DixAddAccess);
     if (rc != Success)
         return rc;
     if (SAME_SCREENS(pWin->drawable, pParent->drawable))
@@ -735,7 +740,7 @@ ProcMapWindow(ClientPtr client)
     int rc;
 
     REQUEST_SIZE_MATCH(xResourceReq);
-    rc = dixLookupWindow(&pWin, stuff->id, client, DixReadAccess);
+    rc = dixLookupWindow(&pWin, stuff->id, client, DixShowAccess);
     if (rc != Success)
         return rc;
     MapWindow(pWin, client);
@@ -751,7 +756,7 @@ ProcMapSubwindows(ClientPtr client)
     int rc;
 
     REQUEST_SIZE_MATCH(xResourceReq);
-    rc = dixLookupWindow(&pWin, stuff->id, client, DixReadAccess);
+    rc = dixLookupWindow(&pWin, stuff->id, client, DixListAccess);
     if (rc != Success)
         return rc;
     MapSubwindows(pWin, client);
@@ -767,7 +772,7 @@ ProcUnmapWindow(ClientPtr client)
     int rc;
 
     REQUEST_SIZE_MATCH(xResourceReq);
-    rc = dixLookupWindow(&pWin, stuff->id, client, DixReadAccess);
+    rc = dixLookupWindow(&pWin, stuff->id, client, DixHideAccess);
     if (rc != Success)
         return rc;
     UnmapWindow(pWin, FALSE);
@@ -783,7 +788,7 @@ ProcUnmapSubwindows(ClientPtr client)
     int rc;
 
     REQUEST_SIZE_MATCH(xResourceReq);
-    rc = dixLookupWindow(&pWin, stuff->id, client, DixReadAccess);
+    rc = dixLookupWindow(&pWin, stuff->id, client, DixListAccess);
     if (rc != Success)
         return rc;
     UnmapSubwindows(pWin);
@@ -799,7 +804,8 @@ ProcConfigureWindow(ClientPtr client)
     int len, rc;
 
     REQUEST_AT_LEAST_SIZE(xConfigureWindowReq);
-    rc = dixLookupWindow(&pWin, stuff->window, client, DixWriteAccess);
+    rc = dixLookupWindow(&pWin, stuff->window, client,
+			 DixManageAccess|DixSetAttrAccess);
     if (rc != Success)
         return rc;
     len = client->req_len - (sizeof(xConfigureWindowReq) >> 2);
@@ -827,7 +833,7 @@ ProcCirculateWindow(ClientPtr client)
 	client->errorValue = stuff->direction;
         return BadValue;
     }
-    rc = dixLookupWindow(&pWin, stuff->window, client, DixWriteAccess);
+    rc = dixLookupWindow(&pWin, stuff->window, client, DixManageAccess);
     if (rc != Success)
         return rc;
     CirculateWindow(pWin, (int)stuff->direction, client);
@@ -842,7 +848,7 @@ GetGeometry(ClientPtr client, xGetGeometryReply *rep)
     REQUEST(xResourceReq);
     REQUEST_SIZE_MATCH(xResourceReq);
 
-    rc = dixLookupDrawable(&pDraw, stuff->id, client, M_ANY, DixReadAccess);
+    rc = dixLookupDrawable(&pDraw, stuff->id, client, M_ANY, DixGetAttrAccess);
     if (rc != Success)
 	return rc;
 
@@ -903,7 +909,7 @@ ProcQueryTree(ClientPtr client)
     REQUEST(xResourceReq);
 
     REQUEST_SIZE_MATCH(xResourceReq);
-    rc = dixLookupWindow(&pWin, stuff->id, client, DixReadAccess);
+    rc = dixLookupWindow(&pWin, stuff->id, client, DixListAccess);
     if (rc != Success)
         return rc;
     reply.type = X_Reply;
@@ -1260,10 +1266,10 @@ ProcTranslateCoords(ClientPtr client)
     int rc;
 
     REQUEST_SIZE_MATCH(xTranslateCoordsReq);
-    rc = dixLookupWindow(&pWin, stuff->srcWid, client, DixReadAccess);
+    rc = dixLookupWindow(&pWin, stuff->srcWid, client, DixGetAttrAccess);
     if (rc != Success)
         return rc;
-    rc = dixLookupWindow(&pDst, stuff->dstWid, client, DixReadAccess);
+    rc = dixLookupWindow(&pDst, stuff->dstWid, client, DixGetAttrAccess);
     if (rc != Success)
         return rc;
     rep.type = X_Reply;
@@ -3233,12 +3239,15 @@ ProcQueryBestSize (ClientPtr client)
     }
 
     rc = dixLookupDrawable(&pDraw, stuff->drawable, client, M_ANY,
-			   DixReadAccess);
+			   DixGetAttrAccess);
     if (rc != Success)
 	return rc;
     if (stuff->class != CursorShape && pDraw->type == UNDRAWABLE_WINDOW)
 	return (BadMatch);
     pScreen = pDraw->pScreen;
+    rc = XaceHook(XACE_SCREEN_ACCESS, client, pScreen, DixGetAttrAccess);
+    if (rc != Success)
+	return rc;
     (* pScreen->QueryBestSize)(stuff->class, &stuff->width,
 			       &stuff->height, pScreen);
     reply.type = X_Reply;
diff --git a/dix/window.c b/dix/window.c
index 2f151b09c..3addc73cd 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -733,20 +733,14 @@ CreateWindow(Window wid, WindowPtr pParent, int x, int y, unsigned w,
     /*  security creation/labeling check
      */
     *error = XaceHook(XACE_RESOURCE_ACCESS, client, wid, RT_WINDOW,
-		      DixCreateAccess, pWin);
+		      DixCreateAccess|DixSetAttrAccess, pWin);
     if (*error != Success) {
 	xfree(pWin);
 	return NullWindow;
     }
-    /*  can't let untrusted clients have background None windows;
-     *  they make it too easy to steal window contents
-     */
-    if (XaceHook(XACE_BACKGRND_ACCESS, client, pWin) == Success)
-	pWin->backgroundState = None;
-    else {
-	pWin->backgroundState = BackgroundPixel;
-	pWin->background.pixel = 0;
-    }
+
+    pWin->backgroundState = BackgroundPixel;
+    pWin->background.pixel = 0;
 
     pWin->borderIsPixel = pParent->borderIsPixel;
     pWin->border = pParent->border;
@@ -980,7 +974,7 @@ DeleteWindow(pointer value, XID wid)
     return Success;
 }
 
-void
+int
 DestroySubwindows(WindowPtr pWin, ClientPtr client)
 {
     /* XXX
@@ -992,8 +986,15 @@ DestroySubwindows(WindowPtr pWin, ClientPtr client)
      * If you care, simply delete the call to UnmapSubwindows.
      */
     UnmapSubwindows(pWin);
-    while (pWin->lastChild)
+    while (pWin->lastChild) {
+	int rc = XaceHook(XACE_RESOURCE_ACCESS, client,
+			  pWin->lastChild->drawable.id, RT_WINDOW,
+			  DixDestroyAccess, pWin->lastChild);
+	if (rc != Success)
+	    return rc;
 	FreeResource(pWin->lastChild->drawable.id, RT_NONE);
+    }
+    return Success;
 }
 
 #define DeviceEventMasks (KeyPressMask | KeyReleaseMask | ButtonPressMask | \
@@ -1010,25 +1011,20 @@ DestroySubwindows(WindowPtr pWin, ClientPtr client)
 _X_EXPORT int
 ChangeWindowAttributes(WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client)
 {
-    Mask index2;
     XID *pVlist;
     PixmapPtr pPixmap;
     Pixmap pixID;
     CursorPtr pCursor, pOldCursor;
     Cursor cursorID;
-    WindowPtr pChild;
+    WindowPtr pChild, pLayerWin;
     Colormap cmap;
     ColormapPtr	pCmap;
     xEvent xE;
-    int result;
+    int error, rc;
     ScreenPtr pScreen;
-    Mask vmaskCopy = 0;
-    Mask tmask;
+    Mask index2, tmask, vmaskCopy = 0;
     unsigned int val;
-    int error;
-    Bool checkOptional = FALSE;
-    Bool borderRelative = FALSE;
-    WindowPtr pLayerWin;
+    Bool checkOptional = FALSE, borderRelative = FALSE;
 
     if ((pWin->drawable.class == InputOnly) && (vmask & (~INPUTONLY_LEGAL_MASK)))
 	return BadMatch;
@@ -1050,17 +1046,13 @@ ChangeWindowAttributes(WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client)
 		borderRelative = TRUE;
 	    if (pixID == None)
 	    {
-		/*  can't let untrusted clients have background None windows */
-		if (XaceHook(XACE_BACKGRND_ACCESS, client, pWin) == Success) {
-		    if (pWin->backgroundState == BackgroundPixmap)
-			(*pScreen->DestroyPixmap)(pWin->background.pixmap);
-		    if (!pWin->parent)
-			MakeRootTile(pWin);
-		    else
-			pWin->backgroundState = None;
-		} else {
-		    /* didn't change the backgrnd to None, so don't tell ddx */
-		    index2 = 0; 
+		if (pWin->backgroundState == BackgroundPixmap)
+		    (*pScreen->DestroyPixmap)(pWin->background.pixmap);
+		if (!pWin->parent)
+		    MakeRootTile(pWin);
+		else {
+		    pWin->backgroundState = BackgroundPixel;
+		    pWin->background.pixel = 0;
 		}
 	    }
 	    else if (pixID == ParentRelative)
@@ -1083,9 +1075,9 @@ ChangeWindowAttributes(WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client)
 	    }
 	    else
 	    {	
-		pPixmap = (PixmapPtr)SecurityLookupIDByType(client, pixID,
-						RT_PIXMAP, DixReadAccess);
-		if (pPixmap != (PixmapPtr) NULL)
+		rc = dixLookupResource((pointer *)&pPixmap, pixID, RT_PIXMAP,
+				       client, DixReadAccess);
+		if (rc == Success)
 		{
 		    if	((pPixmap->drawable.depth != pWin->drawable.depth) ||
 			 (pPixmap->drawable.pScreen != pScreen))
@@ -1101,7 +1093,7 @@ ChangeWindowAttributes(WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client)
 		}
 		else
 		{
-		    error = BadPixmap;
+		    error = (rc == BadValue) ? BadPixmap : rc;
 		    client->errorValue = pixID;
 		    goto PatchUp;
 		}
@@ -1130,42 +1122,40 @@ ChangeWindowAttributes(WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client)
 		    error = BadMatch;
 		    goto PatchUp;
 		}
-		if (pWin->borderIsPixel == FALSE)
-		    (*pScreen->DestroyPixmap)(pWin->border.pixmap);
-		pWin->border = pWin->parent->border;
-		if ((pWin->borderIsPixel = pWin->parent->borderIsPixel) == TRUE)
-		{
-		    index2 = CWBorderPixel;
-		}
-		else
-		{
-		    pWin->parent->border.pixmap->refcnt++;
-		}
-	    }
-	    else
-	    {	
-		pPixmap = (PixmapPtr)SecurityLookupIDByType(client, pixID,
-					RT_PIXMAP, DixReadAccess);
-		if (pPixmap)
-		{
-		    if	((pPixmap->drawable.depth != pWin->drawable.depth) ||
-			 (pPixmap->drawable.pScreen != pScreen))
-		    {
-			error = BadMatch;
-			goto PatchUp;
-		    }
+		if (pWin->parent->borderIsPixel == TRUE) {
 		    if (pWin->borderIsPixel == FALSE)
 			(*pScreen->DestroyPixmap)(pWin->border.pixmap);
-		    pWin->borderIsPixel = FALSE;
-		    pWin->border.pixmap = pPixmap;
-		    pPixmap->refcnt++;
+		    pWin->border = pWin->parent->border;
+		    pWin->borderIsPixel = TRUE;
+		    index2 = CWBorderPixel;
+		    break;
 		}
 		else
 		{
-		    error = BadPixmap;
-		    client->errorValue = pixID;
+		    pixID = pWin->parent->border.pixmap->drawable.id;
+		}
+	    }
+	    rc = dixLookupResource((pointer *)&pPixmap, pixID, RT_PIXMAP,
+				   client, DixReadAccess);
+	    if (rc == Success)
+	    {
+		if ((pPixmap->drawable.depth != pWin->drawable.depth) ||
+		    (pPixmap->drawable.pScreen != pScreen))
+		{
+		    error = BadMatch;
 		    goto PatchUp;
 		}
+		if (pWin->borderIsPixel == FALSE)
+		    (*pScreen->DestroyPixmap)(pWin->border.pixmap);
+		pWin->borderIsPixel = FALSE;
+		pWin->border.pixmap = pPixmap;
+		pPixmap->refcnt++;
+	    }
+	    else
+	    {
+		error = (rc == BadValue) ? BadPixmap : rc;
+		client->errorValue = pixID;
+		goto PatchUp;
 	    }
 	    break;
 	  case CWBorderPixel:
@@ -1290,20 +1280,20 @@ ChangeWindowAttributes(WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client)
 #endif /* DO_SAVE_UNDERS */
 	    break;
 	  case CWEventMask:
-	    result = EventSelectForWindow(pWin, client, (Mask )*pVlist);
-	    if (result)
+	    rc = EventSelectForWindow(pWin, client, (Mask )*pVlist);
+	    if (rc)
 	    {
-		error = result;
+		error = rc;
 		goto PatchUp;
 	    }
 	    pVlist++;
 	    break;
 	  case CWDontPropagate:
-	    result = EventSuppressForWindow(pWin, client, (Mask )*pVlist,
+	    rc = EventSuppressForWindow(pWin, client, (Mask )*pVlist,
 					    &checkOptional);
-	    if (result)
+	    if (rc)
 	    {
-		error = result;
+		error = rc;
 		goto PatchUp;
 	    }
 	    pVlist++;
@@ -1317,6 +1307,15 @@ ChangeWindowAttributes(WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client)
 		client->errorValue = val;
 		goto PatchUp;
 	    }
+	    if (val == xTrue) {
+		rc = XaceHook(XACE_RESOURCE_ACCESS, client, pWin->drawable.id,
+			      RT_WINDOW, DixGrabAccess, pWin);
+		if (rc != Success) {
+		    error = rc;
+		    client->errorValue = pWin->drawable.id;
+		    goto PatchUp;
+		}
+	    }
 	    pWin->overrideRedirect = val;
 	    break;
 	  case CWColormap:
@@ -1354,11 +1353,11 @@ ChangeWindowAttributes(WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client)
 		error = BadMatch;
 		goto PatchUp;
 	    }
-	    pCmap = (ColormapPtr)SecurityLookupIDByType(client, cmap,
-					      RT_COLORMAP, DixReadAccess);
-	    if (!pCmap)
+	    rc = dixLookupResource((pointer *)&pCmap, cmap, RT_COLORMAP,
+				   client, DixUseAccess);
+	    if (rc != Success)
 	    {
-		error = BadColor;
+		error = (rc == BadValue) ? BadColor : rc;
 		client->errorValue = cmap;
 		goto PatchUp;
 	    }
@@ -1430,11 +1429,11 @@ ChangeWindowAttributes(WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client)
 	    }
 	    else
 	    {
-		pCursor = (CursorPtr)SecurityLookupIDByType(client, cursorID,
-						RT_CURSOR, DixReadAccess);
-		if (!pCursor)
+		rc = dixLookupResource((pointer *)&pCursor, cursorID,
+				       RT_CURSOR, client, DixReadAccess);
+		if (rc != Success)
 		{
-		    error = BadCursor;
+		    error = (rc == BadValue) ? BadCursor : rc;
 		    client->errorValue = cursorID;
 		    goto PatchUp;
 		}
@@ -2267,7 +2266,7 @@ ConfigureWindow(WindowPtr pWin, Mask mask, XID *vlist, ClientPtr client)
     unsigned short w = pWin->drawable.width,
 		   h = pWin->drawable.height,
 		   bw = pWin->borderWidth;
-    int action, smode = Above;
+    int rc, action, smode = Above;
 #ifdef XAPPGROUP
     ClientPtr win_owner;
     ClientPtr ag_leader = NULL;
@@ -2328,12 +2327,11 @@ ConfigureWindow(WindowPtr pWin, Mask mask, XID *vlist, ClientPtr client)
 	  case CWSibling:
 	    sibwid = (Window ) *pVlist;
 	    pVlist++;
-	    pSib = (WindowPtr )SecurityLookupIDByType(client, sibwid,
-						RT_WINDOW, DixReadAccess);
-	    if (!pSib)
+	    rc = dixLookupWindow(&pSib, sibwid, client, DixGetAttrAccess);
+	    if (rc != Success)
 	    {
 		client->errorValue = sibwid;
-		return(BadWindow);
+		return rc;
 	    }
 	    if (pSib->parent != pParent)
 		return(BadMatch);
diff --git a/include/window.h b/include/window.h
index 312b75e88..472f37973 100644
--- a/include/window.h
+++ b/include/window.h
@@ -119,7 +119,7 @@ extern int DeleteWindow(
     pointer /*pWin*/,
     XID /*wid*/);
 
-extern void DestroySubwindows(
+extern int DestroySubwindows(
     WindowPtr /*pWin*/,
     ClientPtr /*client*/);
 

From 9a183d7ba50e31afa133cc03aee7991517a283ea Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 14 Aug 2007 11:39:26 -0400
Subject: [PATCH 078/552] dix: remove caching of drawables and graphics
 contexts.  The security checks simply bypass the cached values so they are
 unused.

---
 Xext/mbuf.c                    |  2 +-
 dbe/dbe.c                      |  2 +-
 dix/dispatch.c                 | 43 +---------------------------------
 dix/dixutils.c                 | 22 ++++-------------
 dix/resource.c                 | 20 ----------------
 hw/xwin/winclipboardwrappers.c |  1 -
 include/dix.h                  | 13 ----------
 include/dixstruct.h            |  4 ----
 include/resource.h             |  6 ++---
 9 files changed, 10 insertions(+), 103 deletions(-)

diff --git a/Xext/mbuf.c b/Xext/mbuf.c
index ed352e21b..ee2ef6405 100644
--- a/Xext/mbuf.c
+++ b/Xext/mbuf.c
@@ -235,7 +235,7 @@ MultibufferExtensionInit()
      * create the resource types
      */
     MultibufferDrawableResType =
-	CreateNewResourceType(MultibufferDrawableDelete)|RC_CACHED|RC_DRAWABLE;
+	CreateNewResourceType(MultibufferDrawableDelete)|RC_DRAWABLE;
     MultibufferResType = CreateNewResourceType(MultibufferDelete);
     MultibuffersResType = CreateNewResourceType(MultibuffersDelete);
     OtherClientResType = CreateNewResourceType(OtherClientDelete);
diff --git a/dbe/dbe.c b/dbe/dbe.c
index d63620d4f..aec626b79 100644
--- a/dbe/dbe.c
+++ b/dbe/dbe.c
@@ -1783,7 +1783,7 @@ DbeExtensionInit(void)
 
     /* Create the resource types. */
     dbeDrawableResType =
-        CreateNewResourceType(DbeDrawableDelete) | RC_CACHED | RC_DRAWABLE;
+        CreateNewResourceType(DbeDrawableDelete) | RC_DRAWABLE;
     dbeWindowPrivResType =
         CreateNewResourceType(DbeWindowPrivDelete);
 
diff --git a/dix/dispatch.c b/dix/dispatch.c
index 1c40e2fcb..69b1922d3 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -258,34 +258,6 @@ InitSelections(void)
     CurrentSelections = (Selection *)NULL;
     NumCurrentSelections = 0;
 }
-
-void 
-FlushClientCaches(XID id)
-{
-    int i;
-    ClientPtr client;
-
-    client = clients[CLIENT_ID(id)];
-    if (client == NullClient)
-        return ;
-    for (i=0; i<currentMaxClients; i++)
-    {
-	client = clients[i];
-        if (client != NullClient)
-	{
-            if (client->lastDrawableID == id)
-	    {
-		client->lastDrawableID = WindowTable[0]->drawable.id;
-		client->lastDrawable = (DrawablePtr)WindowTable[0];
-	    }
-            else if (client->lastGCID == id)
-	    {
-                client->lastGCID = INVALID;
-		client->lastGC = (GCPtr)NULL;
-	    }
-	}
-    }
-}
 #ifdef SMART_SCHEDULE
 
 #undef SMART_DEBUG
@@ -3702,20 +3674,7 @@ void InitClient(ClientPtr client, int i, pointer ospriv)
     client->sequence = 0; 
     client->clientAsMask = ((Mask)i) << CLIENTOFFSET;
     client->clientGone = FALSE;
-    if (i)
-    {
-	client->closeDownMode = DestroyAll;
-	client->lastDrawable = (DrawablePtr)WindowTable[0];
-	client->lastDrawableID = WindowTable[0]->drawable.id;
-    }
-    else
-    {
-	client->closeDownMode = RetainPermanent;
-	client->lastDrawable = (DrawablePtr)NULL;
-	client->lastDrawableID = INVALID;
-    }
-    client->lastGC = (GCPtr) NULL;
-    client->lastGCID = INVALID;
+    client->closeDownMode = i ? DestroyAll : RetainPermanent;
     client->numSaved = 0;
     client->saveSet = (SaveSetElt *)NULL;
     client->noClientException = Success;
diff --git a/dix/dixutils.c b/dix/dixutils.c
index 14ef7e674..e8d7daf06 100644
--- a/dix/dixutils.c
+++ b/dix/dixutils.c
@@ -208,7 +208,6 @@ dixLookupDrawable(DrawablePtr *pDraw, XID id, ClientPtr client,
 		  Mask type, Mask access)
 {
     DrawablePtr pTmp;
-    RESTYPE rtype;
     int rc;
 
     *pDraw = NULL;
@@ -217,28 +216,15 @@ dixLookupDrawable(DrawablePtr *pDraw, XID id, ClientPtr client,
     if (id == INVALID)
 	return BadDrawable;
 
-    if (id == client->lastDrawableID) {
-	pTmp = client->lastDrawable;
+    rc = dixLookupResource((pointer *)&pTmp, id, RC_DRAWABLE, client, access);
 
-	/* an access check is required for cached drawables */
-	rtype = (type & M_WINDOW) ? RT_WINDOW : RT_PIXMAP;
-	rc = XaceHook(XACE_RESOURCE_ACCESS, client, id, rtype, access, pTmp);
-        if (rc != Success)
-	    return rc;
-    } else
-	dixLookupResource((void **)&pTmp, id, RC_DRAWABLE, client, access);
-
-    if (!pTmp)
+    if (rc == BadValue)
 	return BadDrawable;
+    if (rc != Success)
+	return rc;
     if (!((1 << pTmp->type) & (type ? type : M_DRAWABLE)))
 	return BadMatch;
 
-    if (type & M_DRAWABLE) {
-	client->lastDrawable = pTmp;
-	client->lastDrawableID = id;
-	client->lastGCID = INVALID;
-	client->lastGC = (GCPtr)NULL;
-    }
     *pDraw = pTmp;
     return Success;
 }
diff --git a/dix/resource.c b/dix/resource.c
index ea0a3105c..844d12ec0 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -585,8 +585,6 @@ FreeResource(XID id, RESTYPE skipDeleteFuncType)
 
 		CallResourceStateCallback(ResourceStateFreeing, res);
 
-		if (rtype & RC_CACHED)
-		    FlushClientCaches(res->id);
 		if (rtype != skipDeleteFuncType)
 		    (*DeleteFuncs[rtype & TypeMask])(res->value, res->id);
 		xfree(res);
@@ -597,11 +595,6 @@ FreeResource(XID id, RESTYPE skipDeleteFuncType)
 	    else
 		prev = &res->next;
         }
-	if(clients[cid] && (id == clients[cid]->lastDrawableID))
-	{
-	    clients[cid]->lastDrawable = (DrawablePtr)WindowTable[0];
-	    clients[cid]->lastDrawableID = WindowTable[0]->drawable.id;
-	}
     }
     if (!gotOne)
 	ErrorF("Freeing resource id=%lX which isn't there.\n",
@@ -632,8 +625,6 @@ FreeResourceByType(XID id, RESTYPE type, Bool skipFree)
 
 		CallResourceStateCallback(ResourceStateFreeing, res);
 
-		if (type & RC_CACHED)
-		    FlushClientCaches(res->id);
 		if (!skipFree)
 		    (*DeleteFuncs[type & TypeMask])(res->value, res->id);
 		xfree(res);
@@ -642,11 +633,6 @@ FreeResourceByType(XID id, RESTYPE type, Bool skipFree)
 	    else
 		prev = &res->next;
         }
-	if(clients[cid] && (id == clients[cid]->lastDrawableID))
-	{
-	    clients[cid]->lastDrawable = (DrawablePtr)WindowTable[0];
-	    clients[cid]->lastDrawableID = WindowTable[0]->drawable.id;
-	}
     }
 }
 
@@ -669,8 +655,6 @@ ChangeResourceValue (XID id, RESTYPE rtype, pointer value)
 	for (; res; res = res->next)
 	    if ((res->id == id) && (res->type == rtype))
 	    {
-		if (rtype & RC_CACHED)
-		    FlushClientCaches(res->id);
 		res->value = value;
 		return TRUE;
 	    }
@@ -801,8 +785,6 @@ FreeClientNeverRetainResources(ClientPtr client)
 
 		CallResourceStateCallback(ResourceStateFreeing, this);
 
-		if (rtype & RC_CACHED)
-		    FlushClientCaches(this->id);
 		(*DeleteFuncs[rtype & TypeMask])(this->value, this->id);
 		xfree(this);
 	    }
@@ -854,8 +836,6 @@ FreeClientResources(ClientPtr client)
 
 	    CallResourceStateCallback(ResourceStateFreeing, this);
 
-	    if (rtype & RC_CACHED)
-		FlushClientCaches(this->id);
 	    (*DeleteFuncs[rtype & TypeMask])(this->value, this->id);
 	    xfree(this);
 	}
diff --git a/hw/xwin/winclipboardwrappers.c b/hw/xwin/winclipboardwrappers.c
index 825d3dc70..2cfe0ffce 100755
--- a/hw/xwin/winclipboardwrappers.c
+++ b/hw/xwin/winclipboardwrappers.c
@@ -431,7 +431,6 @@ winProcSetSelectionOwner (ClientPtr client)
    * and we currently own the Win32 clipboard.
    */
   if (None == stuff->window
-      && g_iClipboardWindow != client->lastDrawableID
       && (None == s_iOwners[CLIP_OWN_PRIMARY]
 	  || g_iClipboardWindow == s_iOwners[CLIP_OWN_PRIMARY])
       && (None == s_iOwners[CLIP_OWN_CLIPBOARD]
diff --git a/include/dix.h b/include/dix.h
index 71f4c23fd..daf16cbdc 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -82,8 +82,6 @@ SOFTWARE.
     }
 
 #define VALIDATE_DRAWABLE_AND_GC(drawID, pDraw, pGC, client)\
-    if ((stuff->gc == INVALID) || (client->lastGCID != stuff->gc) ||\
-	(client->lastDrawableID != drawID))\
     {\
 	int rc;\
 	rc = dixLookupDrawable(&(pDraw), drawID, client, M_ANY,\
@@ -95,15 +93,6 @@ SOFTWARE.
 	    return rc;\
 	if ((pGC->depth != pDraw->depth) || (pGC->pScreen != pDraw->pScreen))\
 	    return (BadMatch);\
-	client->lastDrawable = pDraw;\
-	client->lastDrawableID = drawID;\
-	client->lastGC = pGC;\
-	client->lastGCID = stuff->gc;\
-    }\
-    else\
-    {\
-        pGC = client->lastGC;\
-        pDraw = client->lastDrawable;\
     }\
     if (pGC->serialNumber != pDraw->serialNumber)\
 	ValidateGC(pDraw, pGC);
@@ -160,8 +149,6 @@ extern void UpdateCurrentTimeIf(void);
 
 extern void InitSelections(void);
 
-extern void FlushClientCaches(XID /*id*/);
-
 extern int dixDestroyPixmap(
     pointer /*value*/,
     XID /*pid*/);
diff --git a/include/dixstruct.h b/include/dixstruct.h
index dd6347f18..2a3e696fd 100644
--- a/include/dixstruct.h
+++ b/include/dixstruct.h
@@ -101,10 +101,6 @@ typedef struct _Client {
     int         clientGone;
     int         noClientException;	/* this client died or needs to be
 					 * killed */
-    DrawablePtr lastDrawable;
-    Drawable    lastDrawableID;
-    GCPtr       lastGC;
-    GContext    lastGCID;
     SaveSetElt	*saveSet;
     int         numSaved;
     pointer     screenPrivate[MAXSCREENS];
diff --git a/include/resource.h b/include/resource.h
index d2ecfdea7..087d62c09 100644
--- a/include/resource.h
+++ b/include/resource.h
@@ -72,9 +72,9 @@ typedef unsigned long RESTYPE;
 
 /* types for Resource routines */
 
-#define RT_WINDOW	((RESTYPE)1|RC_CACHED|RC_DRAWABLE)
-#define RT_PIXMAP	((RESTYPE)2|RC_CACHED|RC_DRAWABLE)
-#define RT_GC		((RESTYPE)3|RC_CACHED)
+#define RT_WINDOW	((RESTYPE)1|RC_DRAWABLE)
+#define RT_PIXMAP	((RESTYPE)2|RC_DRAWABLE)
+#define RT_GC		((RESTYPE)3)
 #undef RT_FONT
 #undef RT_CURSOR
 #define RT_FONT		((RESTYPE)4)

From 42d6112ec21949a336ee8b34469f2695273ee2d6 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 14 Aug 2007 13:09:38 -0400
Subject: [PATCH 079/552] xace: add hooks + new access codes: core protocol GC
 requests

---
 dix/dispatch.c             | 17 +++++------
 dix/gc.c                   | 58 +++++++++++++++++++++++---------------
 hw/xfree86/common/xf86xv.c |  3 +-
 include/dix.h              |  2 +-
 include/gc.h               |  4 ++-
 mi/mibstore.c              |  3 +-
 mi/midispcur.c             |  9 +++---
 mi/miexpose.c              |  2 +-
 miext/cw/cw.c              |  2 +-
 9 files changed, 60 insertions(+), 40 deletions(-)

diff --git a/dix/dispatch.c b/dix/dispatch.c
index 69b1922d3..4260799bd 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -1583,15 +1583,16 @@ ProcCreateGC(ClientPtr client)
     REQUEST_AT_LEAST_SIZE(xCreateGCReq);
     client->errorValue = stuff->gc;
     LEGAL_NEW_RESOURCE(stuff->gc, client);
-    rc = dixLookupDrawable(&pDraw, stuff->drawable, client, 0, DixReadAccess);
+    rc = dixLookupDrawable(&pDraw, stuff->drawable, client, 0,
+			   DixGetAttrAccess);
     if (rc != Success)
 	return rc;
 
     len = client->req_len -  (sizeof(xCreateGCReq) >> 2);
     if (len != Ones(stuff->mask))
         return BadLength;
-    pGC = (GC *)CreateGC(pDraw, stuff->mask, 
-			 (XID *) &stuff[1], &error);
+    pGC = (GC *)CreateGC(pDraw, stuff->mask, (XID *) &stuff[1], &error,
+			 stuff->gc, client);
     if (error != Success)
         return error;
     if (!AddResource(stuff->gc, RT_GC, (pointer)pGC))
@@ -1608,7 +1609,7 @@ ProcChangeGC(ClientPtr client)
     REQUEST(xChangeGCReq);
     REQUEST_AT_LEAST_SIZE(xChangeGCReq);
 
-    result = dixLookupGC(&pGC, stuff->gc, client, DixWriteAccess);
+    result = dixLookupGC(&pGC, stuff->gc, client, DixSetAttrAccess);
     if (result != Success)
 	return result;
 
@@ -1635,10 +1636,10 @@ ProcCopyGC(ClientPtr client)
     REQUEST(xCopyGCReq);
     REQUEST_SIZE_MATCH(xCopyGCReq);
 
-    result = dixLookupGC(&pGC, stuff->srcGC, client, DixReadAccess);
+    result = dixLookupGC(&pGC, stuff->srcGC, client, DixGetAttrAccess);
     if (result != Success)
 	return result;
-    result = dixLookupGC(&dstGC, stuff->dstGC, client, DixWriteAccess);
+    result = dixLookupGC(&dstGC, stuff->dstGC, client, DixSetAttrAccess);
     if (result != Success)
 	return result;
     if ((dstGC->pScreen != pGC->pScreen) || (dstGC->depth != pGC->depth))
@@ -1667,7 +1668,7 @@ ProcSetDashes(ClientPtr client)
          return BadValue;
     }
 
-    result = dixLookupGC(&pGC,stuff->gc, client, DixWriteAccess);
+    result = dixLookupGC(&pGC,stuff->gc, client, DixSetAttrAccess);
     if (result != Success)
 	return result;
 
@@ -1696,7 +1697,7 @@ ProcSetClipRectangles(ClientPtr client)
 	client->errorValue = stuff->ordering;
         return BadValue;
     }
-    result = dixLookupGC(&pGC,stuff->gc, client, DixWriteAccess);
+    result = dixLookupGC(&pGC,stuff->gc, client, DixSetAttrAccess);
     if (result != Success)
 	return result;
 		 
diff --git a/dix/gc.c b/dix/gc.c
index e7c48492f..ccd586bdd 100644
--- a/dix/gc.c
+++ b/dix/gc.c
@@ -63,6 +63,7 @@ SOFTWARE.
 
 #include "privates.h"
 #include "dix.h"
+#include "xace.h"
 #include <assert.h>
 
 extern XID clientErrorValue;
@@ -148,7 +149,7 @@ _X_EXPORT int
 dixChangeGC(ClientPtr client, GC *pGC, BITS32 mask, CARD32 *pC32, ChangeGCValPtr pUnion)
 {
     BITS32 	index2;
-    int 	error = 0;
+    int 	rc, error = 0;
     PixmapPtr 	pPixmap;
     BITS32	maskQ;
 
@@ -267,14 +268,15 @@ dixChangeGC(ClientPtr client, GC *pGC, BITS32 mask, CARD32 *pC32, ChangeGCValPtr
 		if (pUnion)
 		{
 		    NEXT_PTR(PixmapPtr, pPixmap);
+		    rc = Success;
 		}
 		else
 		{
 		    NEXTVAL(XID, newpix);
-		    pPixmap = (PixmapPtr)SecurityLookupIDByType(client,
-					newpix, RT_PIXMAP, DixReadAccess);
+		    rc = dixLookupResource((pointer *)&pPixmap, newpix,
+					   RT_PIXMAP, client, DixReadAccess);
 		}
-		if (pPixmap)
+		if (rc == Success)
 		{
 		    if ((pPixmap->drawable.depth != pGC->depth) ||
 			(pPixmap->drawable.pScreen != pGC->pScreen))
@@ -293,7 +295,7 @@ dixChangeGC(ClientPtr client, GC *pGC, BITS32 mask, CARD32 *pC32, ChangeGCValPtr
 		else
 		{
 		    clientErrorValue = newpix;
-		    error = BadPixmap;
+		    error = (rc == BadValue) ? BadPixmap : rc;
 		}
 		break;
 	    }
@@ -303,14 +305,15 @@ dixChangeGC(ClientPtr client, GC *pGC, BITS32 mask, CARD32 *pC32, ChangeGCValPtr
 		if (pUnion)
 		{
 		    NEXT_PTR(PixmapPtr, pPixmap);
+		    rc = Success;
 		}
 		else
 		{
 		    NEXTVAL(XID, newstipple)
-		    pPixmap = (PixmapPtr)SecurityLookupIDByType(client,
-				newstipple, RT_PIXMAP, DixReadAccess);
+		    rc = dixLookupResource((pointer *)&pPixmap, newstipple,
+					   RT_PIXMAP, client, DixReadAccess);
 		}
-		if (pPixmap)
+		if (rc == Success)
 		{
 		    if ((pPixmap->drawable.depth != 1) ||
 			(pPixmap->drawable.pScreen != pGC->pScreen))
@@ -328,7 +331,7 @@ dixChangeGC(ClientPtr client, GC *pGC, BITS32 mask, CARD32 *pC32, ChangeGCValPtr
 		else
 		{
 		    clientErrorValue = newstipple;
-		    error = BadPixmap;
+		    error = (rc == BadValue) ? BadPixmap : rc;
 		}
 		break;
 	    }
@@ -345,14 +348,15 @@ dixChangeGC(ClientPtr client, GC *pGC, BITS32 mask, CARD32 *pC32, ChangeGCValPtr
 		if (pUnion)
 		{
 		    NEXT_PTR(FontPtr, pFont);
+		    rc = Success;
 		}
 		else
 		{
 		    NEXTVAL(XID, newfont)
-		    pFont = (FontPtr)SecurityLookupIDByType(client, newfont,
-						RT_FONT, DixReadAccess);
+		    rc = dixLookupResource((pointer *)&pFont, newfont,
+					   RT_FONT, client, DixUseAccess);
 		}
-		if (pFont)
+		if (rc == Success)
 		{
 		    pFont->refcnt++;
 		    if (pGC->font)
@@ -362,7 +366,7 @@ dixChangeGC(ClientPtr client, GC *pGC, BITS32 mask, CARD32 *pC32, ChangeGCValPtr
 		else
 		{
 		    clientErrorValue = newfont;
-		    error = BadFont;
+		    error = (rc == BadValue) ? BadFont : rc;
 		}
 		break;
 	    }
@@ -415,9 +419,15 @@ dixChangeGC(ClientPtr client, GC *pGC, BITS32 mask, CARD32 *pC32, ChangeGCValPtr
 			clipType = CT_NONE;
 			pPixmap = NullPixmap;
 		    }
-		    else
-		        pPixmap = (PixmapPtr)SecurityLookupIDByType(client,
-					pid, RT_PIXMAP, DixReadAccess);
+		    else {
+			rc = dixLookupResource((pointer *)&pPixmap, pid,
+					       RT_PIXMAP, client,
+					       DixReadAccess);
+			if (rc != Success) {
+			    clientErrorValue = pid;
+			    error = (rc == BadValue) ? BadPixmap : rc;
+			}
+		    }
 		}
 
 		if (pPixmap)
@@ -433,11 +443,6 @@ dixChangeGC(ClientPtr client, GC *pGC, BITS32 mask, CARD32 *pC32, ChangeGCValPtr
 			pPixmap->refcnt++;
 		    }
 		}
-		else if (!pUnion && (pid != None))
-		{
-		    clientErrorValue = pid;
-		    error = BadPixmap;
-		}
 		if(error == Success)
 		{
 		    (*pGC->funcs->ChangeClip)(pGC, clipType,
@@ -601,7 +606,8 @@ AllocateGC(ScreenPtr pScreen)
 }
 
 _X_EXPORT GCPtr
-CreateGC(DrawablePtr pDrawable, BITS32 mask, XID *pval, int *pStatus)
+CreateGC(DrawablePtr pDrawable, BITS32 mask, XID *pval, int *pStatus,
+	 XID gcid, ClientPtr client)
 {
     GCPtr pGC;
 
@@ -663,6 +669,12 @@ CreateGC(DrawablePtr pDrawable, BITS32 mask, XID *pval, int *pStatus)
     pGC->stipple = pGC->pScreen->PixmapPerDepth[0];
     pGC->stipple->refcnt++;
 
+    /* security creation/labeling check */
+    *pStatus = XaceHook(XACE_RESOURCE_ACCESS, client, gcid, RT_GC,
+			DixCreateAccess|DixSetAttrAccess, pGC);
+    if (*pStatus != Success)
+	goto out;
+
     pGC->stateChanges = (1 << (GCLastBit+1)) - 1;
     if (!(*pGC->pScreen->CreateGC)(pGC))
 	*pStatus = BadAlloc;
@@ -670,6 +682,8 @@ CreateGC(DrawablePtr pDrawable, BITS32 mask, XID *pval, int *pStatus)
         *pStatus = ChangeGC(pGC, mask, pval);
     else
 	*pStatus = Success;
+
+out:
     if (*pStatus != Success)
     {
 	if (!pGC->tileIsPixel && !pGC->tile.pixmap)
diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c
index 6abe31c2f..70a946922 100644
--- a/hw/xfree86/common/xf86xv.c
+++ b/hw/xfree86/common/xf86xv.c
@@ -1844,7 +1844,8 @@ xf86XVFillKeyHelperDrawable (DrawablePtr pDraw, CARD32 key, RegionPtr clipboxes)
        int status;
        pval[0] = key;
        pval[1] = IncludeInferiors;
-       pGC = CreateGC(pDraw, GCForeground | GCSubwindowMode, pval, &status);
+       pGC = CreateGC(pDraw, GCForeground | GCSubwindowMode, pval, &status,
+		      (XID)0, serverClient);
        if(!pGC) return;
        ValidateGC(pDraw, pGC);
        if (pPriv) pPriv->pGC = pGC;
diff --git a/include/dix.h b/include/dix.h
index daf16cbdc..05366ecd0 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -88,7 +88,7 @@ SOFTWARE.
 			       DixWriteAccess);\
 	if (rc != Success)\
 	    return rc;\
-	rc = dixLookupGC(&(pGC), stuff->gc, client, DixReadAccess);\
+	rc = dixLookupGC(&(pGC), stuff->gc, client, DixUseAccess);\
 	if (rc != Success)\
 	    return rc;\
 	if ((pGC->depth != pDraw->depth) || (pGC->pScreen != pDraw->pScreen))\
diff --git a/include/gc.h b/include/gc.h
index 3b7e38e02..bf4c268a8 100644
--- a/include/gc.h
+++ b/include/gc.h
@@ -115,7 +115,9 @@ extern GCPtr CreateGC(
     DrawablePtr /*pDrawable*/,
     BITS32 /*mask*/,
     XID* /*pval*/,
-    int* /*pStatus*/);
+    int* /*pStatus*/,
+    XID /*gcid*/,
+    ClientPtr /*client*/);
 
 extern int CopyGC(
     GCPtr/*pgcSrc*/,
diff --git a/mi/mibstore.c b/mi/mibstore.c
index 70839ce31..e27c681e8 100644
--- a/mi/mibstore.c
+++ b/mi/mibstore.c
@@ -3468,7 +3468,8 @@ miBSValidateGC (pGC, stateChanges, pDrawable)
 
 	/* We never want ops with the backingGC to generate GraphicsExpose */
 	pBackingGC = CreateGC ((DrawablePtr)pWindowPriv->pBackingPixmap,
-			       GCGraphicsExposures, &noexpose, &status);
+			       GCGraphicsExposures, &noexpose, &status,
+			       (XID)0, serverClient);
 	if (status != Success)
 	    lift_functions = TRUE;
 	else
diff --git a/mi/midispcur.c b/mi/midispcur.c
index de009cbaf..ab1083789 100644
--- a/mi/midispcur.c
+++ b/mi/midispcur.c
@@ -450,7 +450,8 @@ miDCMakeGC(
     gcvals[0] = IncludeInferiors;
     gcvals[1] = FALSE;
     pGC = CreateGC((DrawablePtr)pWin,
-		   GCSubwindowMode|GCGraphicsExposures, gcvals, &status);
+		   GCSubwindowMode|GCGraphicsExposures, gcvals, &status,
+		   (XID)0, serverClient);
     if (pGC && pWin->drawable.pScreen->DrawGuarantee)
 	(*pWin->drawable.pScreen->DrawGuarantee) (pWin, pGC, GuaranteeVisBack);
     *ppGC = pGC;
@@ -746,7 +747,7 @@ miDCMoveCursor (pScreen, pCursor, x, y, w, h, dx, dy, source, mask)
     if (!pScreenPriv->pMoveGC)
     {
 	pScreenPriv->pMoveGC = CreateGC ((DrawablePtr)pTemp,
-	    GCGraphicsExposures, &gcval, &status);
+	    GCGraphicsExposures, &gcval, &status, (XID)0, serverClient);
 	if (!pScreenPriv->pMoveGC)
 	    return FALSE;
     }
@@ -782,14 +783,14 @@ miDCMoveCursor (pScreen, pCursor, x, y, w, h, dx, dy, source, mask)
 	if (!pScreenPriv->pPixSourceGC)
 	{
 	    pScreenPriv->pPixSourceGC = CreateGC ((DrawablePtr)pTemp,
-		GCGraphicsExposures, &gcval, &status);
+		GCGraphicsExposures, &gcval, &status, (XID)0, serverClient);
 	    if (!pScreenPriv->pPixSourceGC)
 		return FALSE;
 	}
 	if (!pScreenPriv->pPixMaskGC)
 	{
 	    pScreenPriv->pPixMaskGC = CreateGC ((DrawablePtr)pTemp,
-		GCGraphicsExposures, &gcval, &status);
+		GCGraphicsExposures, &gcval, &status, (XID)0, serverClient);
 	    if (!pScreenPriv->pPixMaskGC)
 		return FALSE;
 	}
diff --git a/mi/miexpose.c b/mi/miexpose.c
index df04bd291..332b21636 100644
--- a/mi/miexpose.c
+++ b/mi/miexpose.c
@@ -763,7 +763,7 @@ int what;
 	    if (!ResType && !(ResType = CreateNewResourceType(tossGC)))
 		return;
 	    screenContext[i] = CreateGC((DrawablePtr)pWin, (BITS32) 0,
-					(XID *)NULL, &status);
+					(XID *)NULL, &status, 0, serverClient);
 	    if (!screenContext[i])
 		return;
 	    numGCs++;
diff --git a/miext/cw/cw.c b/miext/cw/cw.c
index 7ee013be1..b03f5e3a8 100644
--- a/miext/cw/cw.c
+++ b/miext/cw/cw.c
@@ -123,7 +123,7 @@ cwCreateBackingGC(GCPtr pGC, DrawablePtr pDrawable)
 
     pBackingDrawable = cwGetBackingDrawable(pDrawable, &x_off, &y_off);
     pPriv->pBackingGC = CreateGC(pBackingDrawable, GCGraphicsExposures,
-				 &noexpose, &status);
+				 &noexpose, &status, (XID)0, serverClient);
     if (status != Success)
 	return FALSE;
 

From b424e01ec59d9600a02823f1522949325797268c Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 14 Aug 2007 13:20:42 -0400
Subject: [PATCH 080/552] xace: add hooks + new access codes: core protocol
 property requests

---
 dix/property.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/dix/property.c b/dix/property.c
index c0de5b3f4..5f12dec3c 100644
--- a/dix/property.c
+++ b/dix/property.c
@@ -129,7 +129,7 @@ ProcRotateProperties(ClientPtr client)
 
     REQUEST_FIXED_SIZE(xRotatePropertiesReq, stuff->nAtoms << 2);
     UpdateCurrentTime();
-    rc = dixLookupWindow(&pWin, stuff->window, client, DixWriteAccess);
+    rc = dixLookupWindow(&pWin, stuff->window, client, DixSetPropAccess);
     if (rc != Success)
         return rc;
     if (!stuff->nAtoms)
@@ -217,7 +217,7 @@ ProcChangeProperty(ClientPtr client)
     totalSize = len * sizeInBytes;
     REQUEST_FIXED_SIZE(xChangePropertyReq, totalSize);
 
-    err = dixLookupWindow(&pWin, stuff->window, client, DixWriteAccess);
+    err = dixLookupWindow(&pWin, stuff->window, client, DixSetPropAccess);
     if (err != Success)
 	return err;
     if (!ValidAtom(stuff->property))
@@ -277,7 +277,7 @@ dixChangeWindowProperty(ClientPtr pClient, WindowPtr pWin, Atom property,
 	pProp->size = len;
 	pProp->devPrivates = NULL;
 	rc = XaceHook(XACE_PROPERTY_ACCESS, pClient, pWin, pProp,
-		      DixCreateAccess);
+		      DixCreateAccess|DixWriteAccess);
 	if (rc != Success) {
 	    xfree(data);
 	    xfree(pProp);
@@ -449,13 +449,15 @@ ProcGetProperty(ClientPtr client)
     int rc;
     WindowPtr pWin;
     xGetPropertyReply reply;
-    Mask access_mode = DixReadAccess;
+    Mask access_mode = DixGetPropAccess;
     REQUEST(xGetPropertyReq);
 
     REQUEST_SIZE_MATCH(xGetPropertyReq);
-    if (stuff->delete)
+    if (stuff->delete) {
 	UpdateCurrentTime();
-    rc = dixLookupWindow(&pWin, stuff->window, client, DixReadAccess);
+	access_mode |= DixSetPropAccess;
+    }
+    rc = dixLookupWindow(&pWin, stuff->window, client, access_mode);
     if (rc != Success)
 	return rc;
 
@@ -490,6 +492,7 @@ ProcGetProperty(ClientPtr client)
     if (!pProp) 
 	return NullPropertyReply(client, None, 0, &reply);
 
+    access_mode = DixReadAccess;
     if (stuff->delete)
 	access_mode |= DixDestroyAccess;
 
@@ -581,7 +584,7 @@ ProcListProperties(ClientPtr client)
     REQUEST(xResourceReq);
 
     REQUEST_SIZE_MATCH(xResourceReq);
-    rc = dixLookupWindow(&pWin, stuff->id, client, DixReadAccess);
+    rc = dixLookupWindow(&pWin, stuff->id, client, DixListPropAccess);
     if (rc != Success)
         return rc;
 
@@ -625,7 +628,7 @@ ProcDeleteProperty(ClientPtr client)
               
     REQUEST_SIZE_MATCH(xDeletePropertyReq);
     UpdateCurrentTime();
-    result = dixLookupWindow(&pWin, stuff->window, client, DixWriteAccess);
+    result = dixLookupWindow(&pWin, stuff->window, client, DixSetPropAccess);
     if (result != Success)
         return result;
     if (!ValidAtom(stuff->property))

From dc84bb3418933297a8c005070902d9a91ed3d18f Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 15 Aug 2007 14:13:53 -0400
Subject: [PATCH 081/552] xace: add hooks + new access codes: core protocol
 cursor requests

---
 dix/cursor.c     | 92 ++++++++++++++++++++++++++----------------------
 dix/dispatch.c   | 47 ++++++++++++++-----------
 dix/events.c     | 18 +++++-----
 dix/window.c     |  3 +-
 include/cursor.h | 26 ++++----------
 render/render.c  | 26 ++++++++------
 xfixes/cursor.c  |  8 +++--
 7 files changed, 113 insertions(+), 107 deletions(-)

diff --git a/dix/cursor.c b/dix/cursor.c
index d903124c4..b188e3f98 100644
--- a/dix/cursor.c
+++ b/dix/cursor.c
@@ -59,6 +59,7 @@ SOFTWARE.
 #include "cursorstr.h"
 #include "dixfontstr.h"
 #include "opaque.h"
+#include "xace.h"
 
 typedef struct _GlyphShare {
     FontPtr font;
@@ -161,23 +162,25 @@ CheckForEmptyMask(CursorBitsPtr bits)
  *  \param pmaskbits server-defined padding
  *  \param argb      no padding
  */
-CursorPtr 
-AllocCursorARGB(unsigned char *psrcbits, unsigned char *pmaskbits, CARD32 *argb, 
-                CursorMetricPtr cm,
-                unsigned foreRed, unsigned foreGreen, unsigned foreBlue, 
-                unsigned backRed, unsigned backGreen, unsigned backBlue)
+int
+AllocARGBCursor(unsigned char *psrcbits, unsigned char *pmaskbits,
+		CARD32 *argb, CursorMetricPtr cm,
+		unsigned foreRed, unsigned foreGreen, unsigned foreBlue, 
+		unsigned backRed, unsigned backGreen, unsigned backBlue,
+		CursorPtr *ppCurs, ClientPtr client, XID cid)
 {
     CursorBitsPtr  bits;
     CursorPtr 	pCurs;
-    int		nscr;
+    int		rc, nscr;
     ScreenPtr 	pscr;
 
+    *ppCurs = NULL;
     pCurs = (CursorPtr)xalloc(sizeof(CursorRec) + sizeof(CursorBits));
     if (!pCurs)
     {
 	xfree(psrcbits);
 	xfree(pmaskbits);
-	return (CursorPtr)NULL;
+	return BadAlloc;
     }
     bits = (CursorBitsPtr)((char *)pCurs + sizeof(CursorRec));
     bits->source = psrcbits;
@@ -207,6 +210,15 @@ AllocCursorARGB(unsigned char *psrcbits, unsigned char *pmaskbits, CARD32 *argb,
     pCurs->backGreen = backGreen;
     pCurs->backBlue = backBlue;
 
+    /* security creation/labeling check */
+    rc = XaceHook(XACE_RESOURCE_ACCESS, client, cid, RT_CURSOR,
+		  DixCreateAccess, pCurs);
+    if (rc != Success) {
+	FreeCursorBits(bits);
+	xfree(pCurs);
+	return rc;
+    }
+	
     /*
      * realize the cursor for every screen
      */
@@ -222,59 +234,43 @@ AllocCursorARGB(unsigned char *psrcbits, unsigned char *pmaskbits, CARD32 *argb,
 	    }
 	    FreeCursorBits(bits);
 	    xfree(pCurs);
-	    return (CursorPtr)NULL;
+	    return BadAlloc;
 	}
     }
-    return pCurs;
-}
-
-/**
- *
- * \param psrcbits   server-defined padding
- * \param pmaskbits  server-defined padding
- */
-CursorPtr 
-AllocCursor(unsigned char *psrcbits, unsigned char *pmaskbits, 
-            CursorMetricPtr cm,
-            unsigned foreRed, unsigned foreGreen, unsigned foreBlue,
-            unsigned backRed, unsigned backGreen, unsigned backBlue)
-{
-    return AllocCursorARGB (psrcbits, pmaskbits, (CARD32 *) 0, cm,
-			    foreRed, foreGreen, foreBlue,
-			    backRed, backGreen, backBlue);
+    *ppCurs = pCurs;
+    return rc;
 }
 
 int
 AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar,
                 unsigned foreRed, unsigned foreGreen, unsigned foreBlue, 
                 unsigned backRed, unsigned backGreen, unsigned backBlue,
-                CursorPtr *ppCurs, ClientPtr client)
+		CursorPtr *ppCurs, ClientPtr client, XID cid)
 {
     FontPtr  sourcefont, maskfont;
     unsigned char   *srcbits;
     unsigned char   *mskbits;
     CursorMetricRec cm;
-    int res;
+    int rc;
     CursorBitsPtr  bits;
     CursorPtr 	pCurs;
     int		nscr;
     ScreenPtr 	pscr;
     GlyphSharePtr pShare;
 
-    sourcefont = (FontPtr) SecurityLookupIDByType(client, source, RT_FONT,
-						  DixReadAccess);
-    maskfont = (FontPtr) SecurityLookupIDByType(client, mask, RT_FONT,
-						DixReadAccess);
-
-    if (!sourcefont)
+    rc = dixLookupResource((pointer *)&sourcefont, source, RT_FONT, client,
+			   DixUseAccess);
+    if (rc != Success)
     {
 	client->errorValue = source;
-	return(BadFont);
+	return (rc == BadValue) ? BadFont : rc;
     }
-    if (!maskfont && (mask != None))
+    rc = dixLookupResource((pointer *)&maskfont, mask, RT_FONT, client,
+			   DixUseAccess);
+    if (rc != Success && mask != None)
     {
 	client->errorValue = mask;
-	return(BadFont);
+	return (rc == BadValue) ? BadFont : rc;
     }
     if (sourcefont != maskfont)
 	pShare = (GlyphSharePtr)NULL;
@@ -322,13 +318,13 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar,
 		client->errorValue = maskChar;
 		return BadValue;
 	    }
-	    if ((res = ServerBitsFromGlyph(maskfont, maskChar, &cm, &mskbits)) != 0)
-		return res;
+	    if ((rc = ServerBitsFromGlyph(maskfont, maskChar, &cm, &mskbits)))
+		return rc;
 	}
-	if ((res = ServerBitsFromGlyph(sourcefont, sourceChar, &cm, &srcbits)) != 0)
+	if ((rc = ServerBitsFromGlyph(sourcefont, sourceChar, &cm, &srcbits)))
 	{
 	    xfree(mskbits);
-	    return res;
+	    return rc;
 	}
 	if (sourcefont != maskfont)
 	{
@@ -398,6 +394,15 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar,
     pCurs->backGreen = backGreen;
     pCurs->backBlue = backBlue;
 
+    /* security creation/labeling check */
+    rc = XaceHook(XACE_RESOURCE_ACCESS, client, cid, RT_CURSOR,
+		  DixCreateAccess, pCurs);
+    if (rc != Success) {
+	FreeCursorBits(bits);
+	xfree(pCurs);
+	return rc;
+    }
+	
     /*
      * realize the cursor for every screen
      */
@@ -447,7 +452,8 @@ CreateRootCursor(char *unused1, unsigned int unused2)
     cm.xhot = 0;
     cm.yhot = 0;
 
-    curs = AllocCursor(NULL, NULL, &cm, 0, 0, 0, 0, 0, 0);
+    AllocARGBCursor(NULL, NULL, NULL, &cm, 0, 0, 0, 0, 0, 0,
+		    &curs, serverClient, (XID)0);
 
     if (curs == NullCursor)
         return NullCursor;
@@ -461,8 +467,8 @@ CreateRootCursor(char *unused1, unsigned int unused2)
     cursorfont = (FontPtr)LookupIDByType(fontID, RT_FONT);
     if (!cursorfont)
 	return NullCursor;
-    if (AllocGlyphCursor(fontID, 0, fontID, 1,
-			 0, 0, 0, ~0, ~0, ~0, &curs, serverClient) != Success)
+    if (AllocGlyphCursor(fontID, 0, fontID, 1, 0, 0, 0, ~0, ~0, ~0,
+			 &curs, serverClient, (XID)0) != Success)
 	return NullCursor;
 #endif
 
diff --git a/dix/dispatch.c b/dix/dispatch.c
index 4260799bd..4a9064db7 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -3070,28 +3070,28 @@ ProcCreateCursor (ClientPtr client)
     unsigned short	width, height;
     long		n;
     CursorMetricRec 	cm;
-
+    int rc;
 
     REQUEST(xCreateCursorReq);
 
     REQUEST_SIZE_MATCH(xCreateCursorReq);
     LEGAL_NEW_RESOURCE(stuff->cid, client);
 
-    src = (PixmapPtr)SecurityLookupIDByType(client, stuff->source,
-					      RT_PIXMAP, DixReadAccess);
-    msk = (PixmapPtr)SecurityLookupIDByType(client, stuff->mask,
-					      RT_PIXMAP, DixReadAccess);
-    if (   src == (PixmapPtr)NULL)
-    {
+    rc = dixLookupResource((pointer *)&src, stuff->source, RT_PIXMAP, client,
+			   DixReadAccess);
+    if (rc != Success) {
 	client->errorValue = stuff->source;
-	return (BadPixmap);
+	return (rc == BadValue) ? BadPixmap : rc;
     }
-    if ( msk == (PixmapPtr)NULL)
+
+    rc = dixLookupResource((pointer *)&msk, stuff->mask, RT_PIXMAP, client,
+			   DixReadAccess);
+    if (rc != Success)
     {
 	if (stuff->mask != None)
 	{
 	    client->errorValue = stuff->mask;
-	    return (BadPixmap);
+	    return (rc == BadValue) ? BadPixmap : rc;
 	}
     }
     else if (  src->drawable.width != msk->drawable.width
@@ -3139,13 +3139,17 @@ ProcCreateCursor (ClientPtr client)
     cm.height = height;
     cm.xhot = stuff->x;
     cm.yhot = stuff->y;
-    pCursor = AllocCursor( srcbits, mskbits, &cm,
-	    stuff->foreRed, stuff->foreGreen, stuff->foreBlue,
-	    stuff->backRed, stuff->backGreen, stuff->backBlue);
+    rc = AllocARGBCursor(srcbits, mskbits, NULL, &cm,
+			 stuff->foreRed, stuff->foreGreen, stuff->foreBlue,
+			 stuff->backRed, stuff->backGreen, stuff->backBlue,
+			 &pCursor, client, stuff->cid);
 
-    if (pCursor && AddResource(stuff->cid, RT_CURSOR, (pointer)pCursor))
-	    return (client->noClientException);
-    return BadAlloc;
+    if (rc != Success)
+	return rc;
+    if (!AddResource(stuff->cid, RT_CURSOR, (pointer)pCursor))
+	return BadAlloc;
+
+    return client->noClientException;
 }
 
 int
@@ -3163,7 +3167,7 @@ ProcCreateGlyphCursor (ClientPtr client)
 			   stuff->mask, stuff->maskChar,
 			   stuff->foreRed, stuff->foreGreen, stuff->foreBlue,
 			   stuff->backRed, stuff->backGreen, stuff->backBlue,
-			   &pCursor, client);
+			   &pCursor, client, stuff->cid);
     if (res != Success)
 	return res;
     if (AddResource(stuff->cid, RT_CURSOR, (pointer)pCursor))
@@ -3176,12 +3180,13 @@ int
 ProcFreeCursor (ClientPtr client)
 {
     CursorPtr pCursor;
+    int rc;
     REQUEST(xResourceReq);
 
     REQUEST_SIZE_MATCH(xResourceReq);
-    pCursor = (CursorPtr)SecurityLookupIDByType(client, stuff->id,
-					RT_CURSOR, DixDestroyAccess);
-    if (pCursor) 
+    rc = dixLookupResource((pointer *)&pCursor, stuff->id, RT_CURSOR, client,
+			   DixDestroyAccess);
+    if (rc == Success) 
     {
 	FreeResource(stuff->id, RT_NONE);
 	return (client->noClientException);
@@ -3189,7 +3194,7 @@ ProcFreeCursor (ClientPtr client)
     else 
     {
 	client->errorValue = stuff->id;
-	return (BadCursor);
+	return (rc == BadValue) ? BadCursor : rc;
     }
 }
 
diff --git a/dix/events.c b/dix/events.c
index 3fbe9b829..f109dad4d 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -4115,12 +4115,12 @@ ProcChangeActivePointerGrab(ClientPtr client)
 	newCursor = NullCursor;
     else
     {
-	newCursor = (CursorPtr)SecurityLookupIDByType(client, stuff->cursor,
-						RT_CURSOR, DixReadAccess);
-	if (!newCursor)
+	int rc = dixLookupResource((pointer *)&newCursor, stuff->cursor,
+				   RT_CURSOR, client, DixUseAccess);
+	if (rc != Success)
 	{
 	    client->errorValue = stuff->cursor;
-	    return BadCursor;
+	    return (rc == BadValue) ? BadCursor : rc;
 	}
     }
     if (!grab)
@@ -4889,18 +4889,18 @@ int
 ProcRecolorCursor(ClientPtr client)
 {
     CursorPtr pCursor;
-    int		nscr;
+    int		rc, nscr;
     ScreenPtr	pscr;
     Bool 	displayed;
     REQUEST(xRecolorCursorReq);
 
     REQUEST_SIZE_MATCH(xRecolorCursorReq);
-    pCursor = (CursorPtr)SecurityLookupIDByType(client, stuff->cursor,
-					RT_CURSOR, DixWriteAccess);
-    if ( !pCursor) 
+    rc = dixLookupResource((pointer *)&pCursor, stuff->cursor, RT_CURSOR,
+			   client, DixWriteAccess);
+    if (rc != Success)
     {
 	client->errorValue = stuff->cursor;
-	return (BadCursor);
+	return (rc == BadValue) ? BadCursor : rc;
     }
 
     pCursor->foreRed = stuff->foreRed;
diff --git a/dix/window.c b/dix/window.c
index 3addc73cd..9d1947a53 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -3541,7 +3541,8 @@ TileScreenSaver(int i, int kind)
     {
 	for (j=0; j<BitmapBytePad(32)*16; j++)
 	    srcbits[j] = mskbits[j] = 0x0;
-	cursor = AllocCursor(srcbits, mskbits, &cm, 0, 0, 0, 0, 0, 0);
+	result = AllocARGBCursor(srcbits, mskbits, NULL, &cm, 0, 0, 0, 0, 0, 0,
+				 &cursor, serverClient, (XID)0);
 	if (cursor)
 	{
 	    cursorID = FakeClientID(0);
diff --git a/include/cursor.h b/include/cursor.h
index bdf4fd301..8635cf1a2 100644
--- a/include/cursor.h
+++ b/include/cursor.h
@@ -68,23 +68,7 @@ extern int FreeCursor(
     pointer /*pCurs*/,
     XID /*cid*/);
 
-/* Quartz support on Mac OS X pulls in the QuickDraw
-   framework whose AllocCursor function conflicts here. */ 
-#ifdef __DARWIN__
-#define AllocCursor Darwin_X_AllocCursor
-#endif
-extern CursorPtr AllocCursor(
-    unsigned char* /*psrcbits*/,
-    unsigned char* /*pmaskbits*/,
-    CursorMetricPtr /*cm*/,
-    unsigned /*foreRed*/,
-    unsigned /*foreGreen*/,
-    unsigned /*foreBlue*/,
-    unsigned /*backRed*/,
-    unsigned /*backGreen*/,
-    unsigned /*backBlue*/);
-
-extern CursorPtr AllocCursorARGB(
+extern int AllocARGBCursor(
     unsigned char* /*psrcbits*/,
     unsigned char* /*pmaskbits*/,
     CARD32* /*argb*/,
@@ -94,7 +78,10 @@ extern CursorPtr AllocCursorARGB(
     unsigned /*foreBlue*/,
     unsigned /*backRed*/,
     unsigned /*backGreen*/,
-    unsigned /*backBlue*/);
+    unsigned /*backBlue*/,
+    CursorPtr* /*ppCurs*/,
+    ClientPtr /*client*/,
+    XID /*cid*/);
 
 extern int AllocGlyphCursor(
     Font /*source*/,
@@ -108,7 +95,8 @@ extern int AllocGlyphCursor(
     unsigned /*backGreen*/,
     unsigned /*backBlue*/,
     CursorPtr* /*ppCurs*/,
-    ClientPtr /*client*/);
+    ClientPtr /*client*/,
+    XID /*cid*/);
 
 extern CursorPtr CreateRootCursor(
     char* /*pfilename*/,
diff --git a/render/render.c b/render/render.c
index caaa2781c..e57ffb126 100644
--- a/render/render.c
+++ b/render/render.c
@@ -1492,7 +1492,7 @@ ProcRenderCreateCursor (ClientPtr client)
     CursorMetricRec cm;
     CursorPtr	    pCursor;
     CARD32	    twocolor[3];
-    int		    ncolor;
+    int		    rc, ncolor;
 
     REQUEST_SIZE_MATCH (xRenderCreateCursorReq);
     LEGAL_NEW_RESOURCE(stuff->cid, client);
@@ -1659,16 +1659,20 @@ ProcRenderCreateCursor (ClientPtr client)
     cm.height = height;
     cm.xhot = stuff->x;
     cm.yhot = stuff->y;
-    pCursor = AllocCursorARGB (srcbits, mskbits, argbbits, &cm,
-			       GetColor(twocolor[0], 16),
-			       GetColor(twocolor[0], 8),
-			       GetColor(twocolor[0], 0),
-			       GetColor(twocolor[1], 16),
-			       GetColor(twocolor[1], 8),
-			       GetColor(twocolor[1], 0));
-    if (pCursor && AddResource(stuff->cid, RT_CURSOR, (pointer)pCursor))
-	return (client->noClientException);
-    return BadAlloc;
+    rc = AllocARGBCursor(srcbits, mskbits, argbbits, &cm,
+			 GetColor(twocolor[0], 16),
+			 GetColor(twocolor[0], 8),
+			 GetColor(twocolor[0], 0),
+			 GetColor(twocolor[1], 16),
+			 GetColor(twocolor[1], 8),
+			 GetColor(twocolor[1], 0),
+			 &pCursor, client, stuff->cid);
+    if (rc != Success)
+	return rc;
+    if (!AddResource(stuff->cid, RT_CURSOR, (pointer)pCursor))
+	return BadAlloc;
+
+    return client->noClientException;
 }
 
 static int
diff --git a/xfixes/cursor.c b/xfixes/cursor.c
index 401c403c8..450f366f2 100755
--- a/xfixes/cursor.c
+++ b/xfixes/cursor.c
@@ -980,6 +980,7 @@ createInvisibleCursor (void)
     CursorPtr pCursor;
     static unsigned int *psrcbits, *pmaskbits;
     CursorMetricRec cm;
+    int rc;
 
     psrcbits = (unsigned int *) xalloc(4);
     pmaskbits = (unsigned int *) xalloc(4);
@@ -994,12 +995,13 @@ createInvisibleCursor (void)
     cm.xhot = 0;
     cm.yhot = 0;
 
-    pCursor = AllocCursor(
+    rc = AllocARGBCursor(
 	        (unsigned char *)psrcbits,
 		(unsigned char *)pmaskbits,
-		&cm,
+		NULL, &cm,
 		0, 0, 0,
-		0, 0, 0);
+		0, 0, 0,
+		&pCursor, serverClient, (XID)0);
 
     return pCursor;
 }

From 3c9553ac2cac7f3a41966def44a50d722d7e645b Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 15 Aug 2007 14:14:25 -0400
Subject: [PATCH 082/552] xace: rename hostlist security hook to "server" as
 this hook will be used for other types of server access besides just the host
 list.

---
 Xext/security.c | 8 ++++----
 Xext/xace.c     | 4 ++--
 Xext/xace.h     | 2 +-
 Xext/xacestr.h  | 6 ++++--
 Xext/xselinux.c | 8 ++++----
 dix/dispatch.c  | 2 +-
 os/access.c     | 2 +-
 7 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/Xext/security.c b/Xext/security.c
index 9e3b2dd9d..0059245c1 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -1222,10 +1222,10 @@ SecurityCheckExtAccess(CallbackListPtr *pcbl, pointer unused,
 }
 
 static void
-SecurityCheckHostlistAccess(CallbackListPtr *pcbl, pointer unused,
-			    pointer calldata)
+SecurityCheckServerAccess(CallbackListPtr *pcbl, pointer unused,
+			  pointer calldata)
 {
-    XaceHostlistAccessRec *rec = (XaceHostlistAccessRec*)calldata;
+    XaceServerAccessRec *rec = (XaceServerAccessRec*)calldata;
  
     if (TRUSTLEVEL(rec->client) != XSecurityClientTrusted)
     {
@@ -1851,5 +1851,5 @@ SecurityExtensionInit(INITARGS)
     XaceRC(XACE_BACKGRND_ACCESS, SecurityCheckBackgrndAccess, NULL);
     XaceRC(XACE_EXT_DISPATCH, SecurityCheckExtAccess, NULL);
     XaceRC(XACE_EXT_ACCESS, SecurityCheckExtAccess, NULL);
-    XaceRC(XACE_HOSTLIST_ACCESS, SecurityCheckHostlistAccess, NULL);
+    XaceRC(XACE_SERVER_ACCESS, SecurityCheckServerAccess, NULL);
 } /* SecurityExtensionInit */
diff --git a/Xext/xace.c b/Xext/xace.c
index 50361d06b..de1887f31 100644
--- a/Xext/xace.c
+++ b/Xext/xace.c
@@ -135,8 +135,8 @@ int XaceHook(int hook, ...)
 	    prv = &rec.status;
 	    break;
 	}
-	case XACE_HOSTLIST_ACCESS: {
-	    XaceHostlistAccessRec rec = {
+	case XACE_SERVER_ACCESS: {
+	    XaceServerAccessRec rec = {
 		va_arg(ap, ClientPtr),
 		va_arg(ap, Mask),
 		Success /* default allow */
diff --git a/Xext/xace.h b/Xext/xace.h
index e2982cfe2..f7ff205cc 100644
--- a/Xext/xace.h
+++ b/Xext/xace.h
@@ -49,7 +49,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define XACE_MAP_ACCESS			6
 #define XACE_BACKGRND_ACCESS		7
 #define XACE_EXT_ACCESS			8
-#define XACE_HOSTLIST_ACCESS		9
+#define XACE_SERVER_ACCESS		9
 #define XACE_SELECTION_ACCESS		10
 #define XACE_SCREEN_ACCESS		11
 #define XACE_SCREENSAVER_ACCESS		12
diff --git a/Xext/xacestr.h b/Xext/xacestr.h
index 8d092514d..e4db3a12c 100644
--- a/Xext/xacestr.h
+++ b/Xext/xacestr.h
@@ -86,12 +86,12 @@ typedef struct {
     int status;
 } XaceExtAccessRec;
 
-/* XACE_HOSTLIST_ACCESS */
+/* XACE_SERVER_ACCESS */
 typedef struct {
     ClientPtr client;
     Mask access_mode;
     int status;
-} XaceHostlistAccessRec;
+} XaceServerAccessRec;
 
 /* XACE_SELECTION_ACCESS */
 typedef struct {
@@ -101,6 +101,8 @@ typedef struct {
     int status;
 } XaceSelectionAccessRec;
 
+/* XACE_SCREEN_ACCESS */
+/* XACE_SCREENSAVER_ACCESS */
 typedef struct {
     ClientPtr client;
     ScreenPtr screen;
diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 038ec59c4..9cb2f326b 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -1175,15 +1175,15 @@ XSELinuxDrawable(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 } /* XSELinuxDrawable */
 
 static void
-XSELinuxHostlist(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+XSELinuxServer(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
-    XaceHostlistAccessRec *rec = (XaceHostlistAccessRec*)calldata;
+    XaceServerAccessRec *rec = (XaceServerAccessRec*)calldata;
     access_vector_t perm = (rec->access_mode == DixReadAccess) ?
 	XSERVER__GETHOSTLIST : XSERVER__SETHOSTLIST;
 
     if (ServerPerm(rec->client, SECCLASS_XSERVER, perm) != Success)
 	rec->status = BadAccess;
-} /* XSELinuxHostlist */
+} /* XSELinuxServer */
 
 /* Extension callbacks */
 static void
@@ -1397,7 +1397,7 @@ XSELinuxExtensionInit(INITARGS)
     XaceRegisterCallback(XACE_EXT_DISPATCH, XSELinuxExtDispatch, NULL);
     XaceRegisterCallback(XACE_RESOURCE_ACCESS, XSELinuxResLookup, NULL);
     XaceRegisterCallback(XACE_MAP_ACCESS, XSELinuxMap, NULL);
-    XaceRegisterCallback(XACE_HOSTLIST_ACCESS, XSELinuxHostlist, NULL);
+    XaceRegisterCallback(XACE_SERVER_ACCESS, XSELinuxServer, NULL);
     XaceRegisterCallback(XACE_BACKGRND_ACCESS, XSELinuxBackgrnd, NULL);
     XaceRegisterCallback(XACE_DRAWABLE_ACCESS, XSELinuxDrawable, NULL);
     XaceRegisterCallback(XACE_PROPERTY_ACCESS, XSELinuxProperty, NULL);
diff --git a/dix/dispatch.c b/dix/dispatch.c
index 4a9064db7..8cca44bfc 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -3346,7 +3346,7 @@ ProcListHosts(ClientPtr client)
     REQUEST_SIZE_MATCH(xListHostsReq);
 
     /* untrusted clients can't list hosts */
-    result = XaceHook(XACE_HOSTLIST_ACCESS, client, DixReadAccess);
+    result = XaceHook(XACE_SERVER_ACCESS, client, DixReadAccess);
     if (result != Success)
 	return result;
 
diff --git a/os/access.c b/os/access.c
index 8d96e0420..b049acc04 100644
--- a/os/access.c
+++ b/os/access.c
@@ -1500,7 +1500,7 @@ AuthorizedClient(ClientPtr client)
 	return TRUE;
 
     /* untrusted clients can't change host access */
-    if (XaceHook(XACE_HOSTLIST_ACCESS, client, DixWriteAccess) != Success)
+    if (XaceHook(XACE_SERVER_ACCESS, client, DixWriteAccess) != Success)
 	return FALSE;
 
     return LocalClient(client);

From 568ae737d1d5d476a0bf85659d88910c4e0ef5e0 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 15 Aug 2007 14:14:45 -0400
Subject: [PATCH 083/552] xace: add hooks + new access codes: core protocol
 server requests

---
 dix/dispatch.c    | 11 ++++++++---
 dix/dixfonts.c    | 26 +++++++++++++++++++++-----
 hw/dmx/dmxfont.c  |  4 ++--
 include/dixfont.h |  6 ++++--
 include/os.h      |  2 +-
 os/access.c       | 32 +++++++++++++++++++-------------
 os/connection.c   |  9 +++++++--
 7 files changed, 62 insertions(+), 28 deletions(-)

diff --git a/dix/dispatch.c b/dix/dispatch.c
index 8cca44bfc..0bf92de3c 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -1169,6 +1169,7 @@ ProcConvertSelection(ClientPtr client)
 int
 ProcGrabServer(ClientPtr client)
 {
+    int rc;
     REQUEST_SIZE_MATCH(xReq);
     if (grabState != GrabNone && client != grabClient)
     {
@@ -1178,7 +1179,9 @@ ProcGrabServer(ClientPtr client)
 	IgnoreClient(client);
 	return(client->noClientException);
     }
-    OnlyListenToOneClient(client);
+    rc = OnlyListenToOneClient(client);
+    if (rc != Success)
+	return rc;
     grabState = GrabKickout;
     grabClient = client;
 
@@ -3478,12 +3481,14 @@ int
 ProcGetFontPath(ClientPtr client)
 {
     xGetFontPathReply reply;
-    int stringLens, numpaths;
+    int rc, stringLens, numpaths;
     unsigned char *bufferStart;
     /* REQUEST (xReq); */
 
     REQUEST_SIZE_MATCH(xReq);
-    bufferStart = GetFontPath(&numpaths, &stringLens);
+    rc = GetFontPath(client, &numpaths, &stringLens, &bufferStart);
+    if (rc != Success)
+	return rc;
 
     reply.type = X_Reply;
     reply.sequenceNumber = client->sequence;
diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index c21b3ecb3..4ea630210 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -65,6 +65,7 @@ Equipment Corporation.
 #include "dixfontstr.h"
 #include "closestr.h"
 #include "dixfont.h"
+#include "xace.h"
 
 #ifdef DEBUG
 #include	<stdio.h>
@@ -833,6 +834,10 @@ ListFonts(ClientPtr client, unsigned char *pattern, unsigned length,
     if (length > XLFDMAXFONTNAMELEN)
 	return BadAlloc;
 
+    i = XaceHook(XACE_SERVER_ACCESS, client, DixGetAttrAccess);
+    if (i != Success)
+	return i;
+
     if (!(c = (LFclosurePtr) xalloc(sizeof *c)))
 	return BadAlloc;
     c->fpe_list = (FontPathElementPtr *)
@@ -1105,6 +1110,10 @@ StartListFontsWithInfo(ClientPtr client, int length, unsigned char *pattern,
     if (length > XLFDMAXFONTNAMELEN)
 	return BadAlloc;
 
+    i = XaceHook(XACE_SERVER_ACCESS, client, DixGetAttrAccess);
+    if (i != Success)
+	return i;
+
     if (!(c = (LFWIclosurePtr) xalloc(sizeof *c)))
 	goto badAlloc;
     c->fpe_list = (FontPathElementPtr *)
@@ -1771,7 +1780,9 @@ bail:
 int
 SetFontPath(ClientPtr client, int npaths, unsigned char *paths, int *error)
 {
-    int   err = Success;
+    int err = XaceHook(XACE_SERVER_ACCESS, client, DixManageAccess);
+    if (err != Success)
+	return err;
 
     if (npaths == 0) {
 	if (SetDefaultFontPath(defaultFontPath) != Success)
@@ -1823,14 +1834,18 @@ SetDefaultFontPath(char *path)
     return err;
 }
 
-unsigned char *
-GetFontPath(int *count, int *length)
+int
+GetFontPath(ClientPtr client, int *count, int *length, unsigned char **result)
 {
     int			i;
     unsigned char       *c;
     int			len;
     FontPathElementPtr	fpe;
 
+    i = XaceHook(XACE_SERVER_ACCESS, client, DixGetAttrAccess);
+    if (i != Success)
+	return i;
+
     len = 0;
     for (i = 0; i < num_fpes; i++) {
 	fpe = font_path_elements[i];
@@ -1838,7 +1853,7 @@ GetFontPath(int *count, int *length)
     }
     font_path_string = (unsigned char *) xrealloc(font_path_string, len);
     if (!font_path_string)
-	return NULL;
+	return BadAlloc;
 
     c = font_path_string;
     *length = 0;
@@ -1850,7 +1865,8 @@ GetFontPath(int *count, int *length)
 	c += fpe->name_length;
     }
     *count = num_fpes;
-    return font_path_string;
+    *result = font_path_string;
+    return Success;
 }
 
 _X_EXPORT int
diff --git a/hw/dmx/dmxfont.c b/hw/dmx/dmxfont.c
index 500b5682a..e5f86350a 100644
--- a/hw/dmx/dmxfont.c
+++ b/hw/dmx/dmxfont.c
@@ -66,7 +66,7 @@ static char **dmxGetFontPath(int *npaths)
     char           *newfp;
     int             len, l, i;
 
-    paths = GetFontPath(npaths, &len);
+    GetFontPath(serverClient, npaths, &len, &paths);
 
     newfp = xalloc(*npaths + len);
     c = (unsigned char *)newfp;
@@ -194,7 +194,7 @@ static int dmxProcSetFontPath(ClientPtr client)
     if (total >= 4)
         return BadLength;
 
-    tmpFontPath = GetFontPath(&nOldPaths, &lenOldPaths);
+    GetFontPath(serverClient, &nOldPaths, &lenOldPaths, &tmpFontPath);
     oldFontPath = xalloc(nOldPaths + lenOldPaths);
     memmove(oldFontPath, tmpFontPath, nOldPaths + lenOldPaths);
 
diff --git a/include/dixfont.h b/include/dixfont.h
index 709da6272..54017ce2d 100644
--- a/include/dixfont.h
+++ b/include/dixfont.h
@@ -105,8 +105,10 @@ extern int SetFontPath(ClientPtr /*client*/,
 
 extern int SetDefaultFontPath(char * /*path*/);
 
-extern unsigned char *GetFontPath(int * /*count*/,
-				  int * /*length*/);
+extern int GetFontPath(ClientPtr client,
+		       int *count,
+		       int *length,
+		       unsigned char **result);
 
 extern int LoadGlyphs(ClientPtr /*client*/,
 		      FontPtr /*pfont*/,
diff --git a/include/os.h b/include/os.h
index 3d689478e..891f331c9 100644
--- a/include/os.h
+++ b/include/os.h
@@ -155,7 +155,7 @@ extern void AddEnabledDevice(int /*fd*/);
 
 extern void RemoveEnabledDevice(int /*fd*/);
 
-extern void OnlyListenToOneClient(ClientPtr /*client*/);
+extern int OnlyListenToOneClient(ClientPtr /*client*/);
 
 extern void ListenToAllClients(void);
 
diff --git a/os/access.c b/os/access.c
index b049acc04..33b2eb6a7 100644
--- a/os/access.c
+++ b/os/access.c
@@ -1493,17 +1493,20 @@ LocalClientCredAndGroups(ClientPtr client, int *pUid, int *pGid,
 #endif
 }
 
-static Bool
+static int
 AuthorizedClient(ClientPtr client)
 {
+    int rc;
+
     if (!client || defeatAccessControl)
-	return TRUE;
+	return Success;
 
     /* untrusted clients can't change host access */
-    if (XaceHook(XACE_SERVER_ACCESS, client, DixWriteAccess) != Success)
-	return FALSE;
+    rc = XaceHook(XACE_SERVER_ACCESS, client, DixManageAccess);
+    if (rc != Success)
+	return rc;
 
-    return LocalClient(client);
+    return LocalClient(client) ? Success : BadAccess;
 }
 
 /* Add a host to the access control list.  This is the external interface
@@ -1515,10 +1518,11 @@ AddHost (ClientPtr	client,
 	 unsigned       length,        /* of bytes in pAddr */
 	 pointer        pAddr)
 {
-    int			len;
+    int rc, len;
 
-    if (!AuthorizedClient(client))
-	return(BadAccess);
+    rc = AuthorizedClient(client);
+    if (rc != Success)
+	return rc;
     switch (family) {
     case FamilyLocalHost:
 	len = length;
@@ -1612,11 +1616,12 @@ RemoveHost (
     unsigned            length,        /* of bytes in pAddr */
     pointer             pAddr)
 {
-    int			len;
+    int rc, len;
     register HOST	*host, **prev;
 
-    if (!AuthorizedClient(client))
-	return(BadAccess);
+    rc = AuthorizedClient(client);
+    if (rc != Success)
+	return rc;
     switch (family) {
     case FamilyLocalHost:
 	len = length;
@@ -1873,8 +1878,9 @@ ChangeAccessControl(
     ClientPtr client,
     int fEnabled)
 {
-    if (!AuthorizedClient(client))
-	return BadAccess;
+    int rc = AuthorizedClient(client);
+    if (rc != Success)
+	return rc;
     AccessEnabled = fEnabled;
     return Success;
 }
diff --git a/os/connection.c b/os/connection.c
index c1152aad7..afe392c66 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -1081,11 +1081,15 @@ RemoveEnabledDevice(int fd)
  *    This routine is "undone" by ListenToAllClients()
  *****************/
 
-void
+int
 OnlyListenToOneClient(ClientPtr client)
 {
     OsCommPtr oc = (OsCommPtr)client->osPrivate;
-    int connection = oc->fd;
+    int rc, connection = oc->fd;
+
+    rc = XaceHook(XACE_SERVER_ACCESS, client, DixGrabAccess);
+    if (rc != Success)
+	return rc;
 
     if (! GrabInProgress)
     {
@@ -1106,6 +1110,7 @@ OnlyListenToOneClient(ClientPtr client)
 	XFD_ORSET(&AllSockets, &AllSockets, &AllClients);
 	GrabInProgress = client->index;
     }
+    return rc;
 }
 
 /****************

From b82557c9fb60f11fd2696c8fb2ae17b9dfd915ed Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 16 Aug 2007 10:36:05 -0400
Subject: [PATCH 084/552] xace: add hooks + new access codes: core protocol
 screensaver requests

---
 Xext/dpms.c                    |  4 ++--
 Xext/dpmsproc.h                |  4 +++-
 Xext/dpmsstubs.c               |  2 +-
 Xext/saver.c                   |  4 ++--
 Xext/xtest.c                   |  2 +-
 dix/dispatch.c                 | 26 ++++++++++++++++++++++----
 dix/main.c                     |  4 ++--
 dix/window.c                   | 16 +++++++++++-----
 hw/darwin/darwinEvents.c       |  2 +-
 hw/dmx/dmxdpms.c               |  2 +-
 hw/xfree86/common/xf86DPMS.c   | 16 ++++++++++------
 hw/xfree86/common/xf86Events.c |  6 +++---
 hw/xfree86/common/xf86Init.c   |  2 +-
 hw/xfree86/common/xf86PM.c     |  2 +-
 include/window.h               |  7 ++++---
 mi/mieq.c                      |  4 ++--
 os/WaitFor.c                   |  4 ++--
 17 files changed, 69 insertions(+), 38 deletions(-)

diff --git a/Xext/dpms.c b/Xext/dpms.c
index aced40639..97622cb96 100644
--- a/Xext/dpms.c
+++ b/Xext/dpms.c
@@ -218,7 +218,7 @@ ProcDPMSDisable(client)
 
     REQUEST_SIZE_MATCH(xDPMSDisableReq);
 
-    DPMSSet(DPMSModeOn);
+    DPMSSet(client, DPMSModeOn);
 
     DPMSEnabled = FALSE;
 
@@ -253,7 +253,7 @@ ProcDPMSForceLevel(client)
 	return BadValue;
     }
 
-    DPMSSet(stuff->level);
+    DPMSSet(client, stuff->level);
 
     return(client->noClientException);
 }
diff --git a/Xext/dpmsproc.h b/Xext/dpmsproc.h
index f5485ea79..d57f57318 100644
--- a/Xext/dpmsproc.h
+++ b/Xext/dpmsproc.h
@@ -8,7 +8,9 @@
 #ifndef _DPMSPROC_H_
 #define _DPMSPROC_H_
 
-void DPMSSet(int level);
+#include "dixstruct.h"
+
+int  DPMSSet(ClientPtr client, int level);
 int  DPMSGet(int *plevel);
 Bool DPMSSupported(void);
 
diff --git a/Xext/dpmsstubs.c b/Xext/dpmsstubs.c
index 9f99a2d22..8d58935da 100644
--- a/Xext/dpmsstubs.c
+++ b/Xext/dpmsstubs.c
@@ -46,7 +46,7 @@ int DPMSGet(int *plevel)
     return -1;
 }
 
-void DPMSSet(int level)
+int DPMSSet(ClientPtr client, int level)
 {
 
 }
diff --git a/Xext/saver.c b/Xext/saver.c
index a9f1dd36c..dabfbea1b 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -454,8 +454,8 @@ ScreenSaverFreeAttr (value, id)
     pPriv->attr = NULL;
     if (pPriv->hasWindow)
     {
-	SaveScreens (SCREEN_SAVER_FORCER, ScreenSaverReset);
-	SaveScreens (SCREEN_SAVER_FORCER, ScreenSaverActive);
+	SaveScreens (serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
+	SaveScreens (serverClient, SCREEN_SAVER_FORCER, ScreenSaverActive);
     }
     CheckScreenPrivate (pScreen);
     return TRUE;
diff --git a/Xext/xtest.c b/Xext/xtest.c
index 94d8974b6..8d879c7df 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -458,7 +458,7 @@ ProcXTestFakeInput(client)
 	break;
     }
     if (screenIsSaved == SCREEN_SAVER_ON)
-	SaveScreens(SCREEN_SAVER_OFF, ScreenSaverReset);
+	SaveScreens(serverClient, SCREEN_SAVER_OFF, ScreenSaverReset);
     ev->u.keyButtonPointer.time = currentTime.milliseconds;
     (*dev->public.processInputProc)(ev, dev, nev);
     return client->noClientException;
diff --git a/dix/dispatch.c b/dix/dispatch.c
index 0bf92de3c..2dc32a525 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -3244,10 +3244,17 @@ ProcQueryBestSize (ClientPtr client)
 int
 ProcSetScreenSaver (ClientPtr client)
 {
-    int blankingOption, exposureOption;
+    int rc, i, blankingOption, exposureOption;
     REQUEST(xSetScreenSaverReq);
-
     REQUEST_SIZE_MATCH(xSetScreenSaverReq);
+
+    for (i = 0; i < screenInfo.numScreens; i++) {
+	rc = XaceHook(XACE_SCREENSAVER_ACCESS, client, screenInfo.screens[i],
+		      DixSetAttrAccess);
+	if (rc != Success)
+	    return rc;
+    }
+
     blankingOption = stuff->preferBlank;
     if ((blankingOption != DontPreferBlanking) &&
         (blankingOption != PreferBlanking) &&
@@ -3301,8 +3308,16 @@ int
 ProcGetScreenSaver(ClientPtr client)
 {
     xGetScreenSaverReply rep;
-
+    int rc, i;
     REQUEST_SIZE_MATCH(xReq);
+
+    for (i = 0; i < screenInfo.numScreens; i++) {
+	rc = XaceHook(XACE_SCREENSAVER_ACCESS, client, screenInfo.screens[i],
+		      DixGetAttrAccess);
+	if (rc != Success)
+	    return rc;
+    }
+
     rep.type = X_Reply;
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
@@ -3523,6 +3538,7 @@ ProcChangeCloseDownMode(ClientPtr client)
 
 int ProcForceScreenSaver(ClientPtr client)
 {    
+    int rc;
     REQUEST(xForceScreenSaverReq);
 
     REQUEST_SIZE_MATCH(xForceScreenSaverReq);
@@ -3533,7 +3549,9 @@ int ProcForceScreenSaver(ClientPtr client)
 	client->errorValue = stuff->mode;
         return BadValue;
     }
-    SaveScreens(SCREEN_SAVER_FORCER, (int)stuff->mode);
+    rc = SaveScreens(client, SCREEN_SAVER_FORCER, (int)stuff->mode);
+    if (rc != Success)
+	return rc;
     return client->noClientException;
 }
 
diff --git a/dix/main.c b/dix/main.c
index 4ae09dc4e..3e5d0e438 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -430,7 +430,7 @@ main(int argc, char *argv[], char *envp[])
 	for (i = 0; i < screenInfo.numScreens; i++)
 	    InitRootWindow(WindowTable[i]);
 	DefineInitialRootWindow(WindowTable[0]);
-	SaveScreens(SCREEN_SAVER_FORCER, ScreenSaverReset);
+	SaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
 
 #ifdef PANORAMIX
 	if (!noPanoramiXExtension) {
@@ -449,7 +449,7 @@ main(int argc, char *argv[], char *envp[])
 
 	/* Now free up whatever must be freed */
 	if (screenIsSaved == SCREEN_SAVER_ON)
-	    SaveScreens(SCREEN_SAVER_OFF, ScreenSaverReset);
+	    SaveScreens(serverClient, SCREEN_SAVER_OFF, ScreenSaverReset);
 	FreeScreenSaverTimer();
 	CloseDownExtensions();
 
diff --git a/dix/window.c b/dix/window.c
index 9d1947a53..597c55dbb 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -3369,12 +3369,10 @@ static void DrawLogo(
 );
 #endif
 
-_X_EXPORT void
-SaveScreens(int on, int mode)
+_X_EXPORT int
+SaveScreens(ClientPtr client, int on, int mode)
 {
-    int i;
-    int what;
-    int type;
+    int rc, i, what, type;
 
     if (on == SCREEN_SAVER_FORCER)
     {
@@ -3393,6 +3391,13 @@ SaveScreens(int on, int mode)
 	if (what == screenIsSaved)
 	    type = SCREEN_SAVER_CYCLE;
     }
+
+    for (i = 0; i < screenInfo.numScreens; i++) {
+	rc = XaceHook(XACE_SCREENSAVER_ACCESS, client, screenInfo.screens[i],
+		      DixShowAccess | DixHideAccess);
+	if (rc != Success)
+	    return rc;
+    }
     for (i = 0; i < screenInfo.numScreens; i++)
     {
 	if (on == SCREEN_SAVER_FORCER)
@@ -3480,6 +3485,7 @@ SaveScreens(int on, int mode)
     screenIsSaved = what;
     if (mode == ScreenSaverReset)
        SetScreenSaverTimer();
+    return Success;
 }
 
 static Bool
diff --git a/hw/darwin/darwinEvents.c b/hw/darwin/darwinEvents.c
index 3d7f268ca..97ad8577e 100644
--- a/hw/darwin/darwinEvents.c
+++ b/hw/darwin/darwinEvents.c
@@ -276,7 +276,7 @@ void ProcessInputEvents(void) {
     while (darwinEventQueue.head != darwinEventQueue.tail)
     {
         if (screenIsSaved == SCREEN_SAVER_ON)
-            SaveScreens (SCREEN_SAVER_OFF, ScreenSaverReset);
+            SaveScreens(serverClient, SCREEN_SAVER_OFF, ScreenSaverReset);
 
         e = &darwinEventQueue.events[darwinEventQueue.head];
         xe = e->event;
diff --git a/hw/dmx/dmxdpms.c b/hw/dmx/dmxdpms.c
index 5c176dfc3..ea0d66c3c 100644
--- a/hw/dmx/dmxdpms.c
+++ b/hw/dmx/dmxdpms.c
@@ -175,7 +175,7 @@ void dmxDPMSTerm(DMXScreenInfo *dmxScreen)
 void dmxDPMSWakeup(void)
 {
     if (screenIsSaved == SCREEN_SAVER_ON)
-        SaveScreens(SCREEN_SAVER_OFF, ScreenSaverReset);
+        SaveScreens(serverClient, SCREEN_SAVER_OFF, ScreenSaverReset);
 #ifdef DPMSExtension
     if (DPMSPowerLevel) DPMSSet(0);
 #endif
diff --git a/hw/xfree86/common/xf86DPMS.c b/hw/xfree86/common/xf86DPMS.c
index 3aa83e882..a4ae67e46 100644
--- a/hw/xfree86/common/xf86DPMS.c
+++ b/hw/xfree86/common/xf86DPMS.c
@@ -144,20 +144,23 @@ DPMSClose(int i, ScreenPtr pScreen)
  *	Device dependent DPMS mode setting hook.  This is called whenever
  *	the DPMS mode is to be changed.
  */
-_X_EXPORT void
-DPMSSet(int level)
+_X_EXPORT int
+DPMSSet(ClientPtr client, int level)
 {
-    int i;
+    int rc, i;
     DPMSPtr pDPMS;
     ScrnInfoPtr pScrn;
 
     DPMSPowerLevel = level;
 
     if (DPMSIndex < 0)
-	return;
+	return Success;
 
-    if (level != DPMSModeOn)
-	SaveScreens(SCREEN_SAVER_FORCER, ScreenSaverActive);
+    if (level != DPMSModeOn) {
+	rc = SaveScreens(client, SCREEN_SAVER_FORCER, ScreenSaverActive);
+	if (rc != Success)
+	    return rc;
+    }
 
     /* For each screen, set the DPMS level */
     for (i = 0; i < xf86NumScreens; i++) {
@@ -168,6 +171,7 @@ DPMSSet(int level)
 	    pScrn->DPMSSet(pScrn, level, 0);
 	}
     }
+    return Success;
 }
 
 
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index dd9c34e5c..7c2c2503f 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -853,7 +853,7 @@ xf86VTSwitch()
 #endif
 #ifdef DPMSExtension
     if (DPMSPowerLevel != DPMSModeOn)
-	DPMSSet(DPMSModeOn);
+	DPMSSet(serverClient, DPMSModeOn);
 #endif
     for (i = 0; i < xf86NumScreens; i++) {
       if (!(dispatchException & DE_TERMINATE))
@@ -902,7 +902,7 @@ xf86VTSwitch()
 	    (*xf86Screens[i]->EnableDisableFBAccess) (i, TRUE);
 	}
       }
-      SaveScreens(SCREEN_SAVER_FORCER, ScreenSaverReset);
+      SaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
 
       pInfo = xf86InputDevs;
       while (pInfo) {
@@ -966,7 +966,7 @@ xf86VTSwitch()
     }
 
     /* Turn screen saver off when switching back */
-    SaveScreens(SCREEN_SAVER_FORCER,ScreenSaverReset);
+    SaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
 
     pInfo = xf86InputDevs;
     while (pInfo) {
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index bf7dac6da..27bc9ad0f 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -1086,7 +1086,7 @@ AbortDDX()
 #endif
 #ifdef DPMSExtension /* Turn screens back on */
   if (DPMSPowerLevel != DPMSModeOn)
-      DPMSSet(DPMSModeOn);
+      DPMSSet(serverClient, DPMSModeOn);
 #endif
   if (xf86Screens) {
       if (xf86Screens[0]->vtSema)
diff --git a/hw/xfree86/common/xf86PM.c b/hw/xfree86/common/xf86PM.c
index a6bcc3421..278a51474 100644
--- a/hw/xfree86/common/xf86PM.c
+++ b/hw/xfree86/common/xf86PM.c
@@ -116,7 +116,7 @@ resume(pmEvent event, Bool undo)
 	if (xf86Screens[i]->EnableDisableFBAccess)
 	    (*xf86Screens[i]->EnableDisableFBAccess) (i, TRUE);
     }
-    SaveScreens(SCREEN_SAVER_FORCER, ScreenSaverReset);
+    SaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
     pInfo = xf86InputDevs;
     while (pInfo) {
 	EnableDevice(pInfo->dev);
diff --git a/include/window.h b/include/window.h
index 472f37973..d5437a759 100644
--- a/include/window.h
+++ b/include/window.h
@@ -207,9 +207,10 @@ extern RegionPtr NotClippedByChildren(
 extern void SendVisibilityNotify(
     WindowPtr /*pWin*/);
 
-extern void SaveScreens(
-    int /*on*/,
-    int /*mode*/);
+extern int SaveScreens(
+    ClientPtr client,
+    int on,
+    int mode);
 
 extern WindowPtr FindWindowWithOptional(
     WindowPtr /*w*/);
diff --git a/mi/mieq.c b/mi/mieq.c
index 20c4b6201..5093023c7 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -200,13 +200,13 @@ mieqProcessInputEvents(void)
 
     while (miEventQueue.head != miEventQueue.tail) {
         if (screenIsSaved == SCREEN_SAVER_ON)
-            SaveScreens (SCREEN_SAVER_OFF, ScreenSaverReset);
+            SaveScreens (serverClient, SCREEN_SAVER_OFF, ScreenSaverReset);
 #ifdef DPMSExtension
         else if (DPMSPowerLevel != DPMSModeOn)
             SetScreenSaverTimer();
 
         if (DPMSPowerLevel != DPMSModeOn)
-            DPMSSet(DPMSModeOn);
+            DPMSSet(serverClient, DPMSModeOn);
 #endif
 
         e = &miEventQueue.events[miEventQueue.head];
diff --git a/os/WaitFor.c b/os/WaitFor.c
index ec1592c01..1ef79bc34 100644
--- a/os/WaitFor.c
+++ b/os/WaitFor.c
@@ -583,7 +583,7 @@ TimerInit(void)
 
 #define DPMS_CHECK_MODE(mode,time)\
     if (time > 0 && DPMSPowerLevel < mode && timeout >= time)\
-	DPMSSet(mode);
+	DPMSSet(serverClient, mode);
 
 #define DPMS_CHECK_TIMEOUT(time)\
     if (time > 0 && (time - timeout) > 0)\
@@ -652,7 +652,7 @@ ScreenSaverTimeoutExpire(OsTimerPtr timer,CARD32 now,pointer arg)
     }
 
     ResetOsBuffers(); /* not ideal, but better than nothing */
-    SaveScreens(SCREEN_SAVER_ON, ScreenSaverActive);
+    SaveScreens(serverClient, SCREEN_SAVER_ON, ScreenSaverActive);
 
     if (ScreenSaverInterval > 0)
     {

From 5bee8db003a5d552ee1d85bb6c40a3cb93bd6b2b Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 16 Aug 2007 10:44:51 -0400
Subject: [PATCH 085/552] xace: drop background-none checking hook, add new
 hook for controlling access to other clients.

---
 Xext/security.c | 11 -----------
 Xext/xace.c     | 14 ++++++++++++--
 Xext/xace.h     |  2 +-
 Xext/xacestr.h  |  9 ++++++++-
 Xext/xselinux.c | 10 ----------
 5 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/Xext/security.c b/Xext/security.c
index 0059245c1..bf414a50f 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -1196,16 +1196,6 @@ SecurityCheckMapAccess(CallbackListPtr *pcbl, pointer unused,
 	rec->status = BadAccess;
 }
 
-static void
-SecurityCheckBackgrndAccess(CallbackListPtr *pcbl, pointer unused,
-			    pointer calldata)
-{
-    XaceMapAccessRec *rec = (XaceMapAccessRec*)calldata;
-
-    if (TRUSTLEVEL(rec->client) != XSecurityClientTrusted)
-	rec->status = BadAccess;
-}
-
 static void
 SecurityCheckExtAccess(CallbackListPtr *pcbl, pointer unused,
 		       pointer calldata)
@@ -1848,7 +1838,6 @@ SecurityExtensionInit(INITARGS)
     XaceRC(XACE_PROPERTY_ACCESS, SecurityCheckPropertyAccess, NULL);
     XaceRC(XACE_DRAWABLE_ACCESS, SecurityCheckDrawableAccess, NULL);
     XaceRC(XACE_MAP_ACCESS, SecurityCheckMapAccess, NULL);
-    XaceRC(XACE_BACKGRND_ACCESS, SecurityCheckBackgrndAccess, NULL);
     XaceRC(XACE_EXT_DISPATCH, SecurityCheckExtAccess, NULL);
     XaceRC(XACE_EXT_ACCESS, SecurityCheckExtAccess, NULL);
     XaceRC(XACE_SERVER_ACCESS, SecurityCheckServerAccess, NULL);
diff --git a/Xext/xace.c b/Xext/xace.c
index de1887f31..54e910f82 100644
--- a/Xext/xace.c
+++ b/Xext/xace.c
@@ -113,8 +113,7 @@ int XaceHook(int hook, ...)
 	    prv = &rec.status;
 	    break;
 	}
-	case XACE_MAP_ACCESS:
-	case XACE_BACKGRND_ACCESS: {
+	case XACE_MAP_ACCESS: {
 	    XaceMapAccessRec rec = {
 		va_arg(ap, ClientPtr),
 		va_arg(ap, WindowPtr),
@@ -124,6 +123,17 @@ int XaceHook(int hook, ...)
 	    prv = &rec.status;
 	    break;
 	}
+	case XACE_CLIENT_ACCESS: {
+	    XaceClientAccessRec rec = {
+		va_arg(ap, ClientPtr),
+		va_arg(ap, ClientPtr),
+		va_arg(ap, Mask),
+		Success /* default allow */
+	    };
+	    calldata = &rec;
+	    prv = &rec.status;
+	    break;
+	}
 	case XACE_EXT_DISPATCH:
 	case XACE_EXT_ACCESS: {
 	    XaceExtAccessRec rec = {
diff --git a/Xext/xace.h b/Xext/xace.h
index f7ff205cc..f1a6e9d8c 100644
--- a/Xext/xace.h
+++ b/Xext/xace.h
@@ -47,7 +47,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define XACE_PROPERTY_ACCESS		4
 #define XACE_DRAWABLE_ACCESS		5
 #define XACE_MAP_ACCESS			6
-#define XACE_BACKGRND_ACCESS		7
+#define XACE_CLIENT_ACCESS		7
 #define XACE_EXT_ACCESS			8
 #define XACE_SERVER_ACCESS		9
 #define XACE_SELECTION_ACCESS		10
diff --git a/Xext/xacestr.h b/Xext/xacestr.h
index e4db3a12c..10c625b18 100644
--- a/Xext/xacestr.h
+++ b/Xext/xacestr.h
@@ -71,13 +71,20 @@ typedef struct {
 } XaceDrawableAccessRec;
 
 /* XACE_MAP_ACCESS */
-/* XACE_BACKGRND_ACCESS */
 typedef struct {
     ClientPtr client;
     WindowPtr pWin;
     int status;
 } XaceMapAccessRec;
 
+/* XACE_CLIENT_ACCESS */
+typedef struct {
+    ClientPtr client;
+    ClientPtr target;
+    Mask access_mode;
+    int status;
+} XaceClientAccessRec;
+
 /* XACE_EXT_DISPATCH */
 /* XACE_EXT_ACCESS */
 typedef struct {
diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 9cb2f326b..1ffd79d79 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -1156,15 +1156,6 @@ XSELinuxMap(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	rec->status = BadAccess;
 } /* XSELinuxMap */
 
-static void
-XSELinuxBackgrnd(CallbackListPtr *pcbl, pointer unused, pointer calldata)
-{
-    XaceMapAccessRec *rec = (XaceMapAccessRec*)calldata;
-    if (IDPerm(rec->client, rec->pWin->drawable.id,
-               SECCLASS_WINDOW, WINDOW__TRANSPARENT) != Success)
-	rec->status = BadAccess;
-} /* XSELinuxBackgrnd */
-
 static void
 XSELinuxDrawable(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
@@ -1398,7 +1389,6 @@ XSELinuxExtensionInit(INITARGS)
     XaceRegisterCallback(XACE_RESOURCE_ACCESS, XSELinuxResLookup, NULL);
     XaceRegisterCallback(XACE_MAP_ACCESS, XSELinuxMap, NULL);
     XaceRegisterCallback(XACE_SERVER_ACCESS, XSELinuxServer, NULL);
-    XaceRegisterCallback(XACE_BACKGRND_ACCESS, XSELinuxBackgrnd, NULL);
     XaceRegisterCallback(XACE_DRAWABLE_ACCESS, XSELinuxDrawable, NULL);
     XaceRegisterCallback(XACE_PROPERTY_ACCESS, XSELinuxProperty, NULL);
     /* XaceRegisterCallback(XACE_DECLARE_EXT_SECURE, XSELinuxDeclare, NULL);

From e89301c8790df9fc49de13dd7c7f36e5340c0c31 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 16 Aug 2007 10:57:49 -0400
Subject: [PATCH 086/552] xace: add hooks + new access codes: core protocol
 client requests

---
 dix/dispatch.c |  7 ++++++-
 dix/dixutils.c | 26 +++++++++++++++++---------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/dix/dispatch.c b/dix/dispatch.c
index 2dc32a525..30f44fb1f 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -3519,9 +3519,14 @@ ProcGetFontPath(ClientPtr client)
 int
 ProcChangeCloseDownMode(ClientPtr client)
 {
+    int rc;
     REQUEST(xSetCloseDownModeReq);
-
     REQUEST_SIZE_MATCH(xSetCloseDownModeReq);
+
+    rc = XaceHook(XACE_CLIENT_ACCESS, client, client, DixManageAccess);
+    if (rc != Success)
+	return rc;
+
     if ((stuff->mode == AllTemporary) ||
 	(stuff->mode == RetainPermanent) ||
 	(stuff->mode == RetainTemporary))
diff --git a/dix/dixutils.c b/dix/dixutils.c
index e8d7daf06..786f4e335 100644
--- a/dix/dixutils.c
+++ b/dix/dixutils.c
@@ -254,17 +254,25 @@ _X_EXPORT int
 dixLookupClient(ClientPtr *pClient, XID rid, ClientPtr client, Mask access)
 {
     pointer pRes;
-    int clientIndex = CLIENT_ID(rid);
+    int rc = BadValue, clientIndex = CLIENT_ID(rid);
+
+    if (!clientIndex || !clients[clientIndex] || (rid & SERVER_BIT))
+	goto bad;
+
+    rc = dixLookupResource(&pRes, rid, RC_ANY, client, DixGetAttrAccess);
+    if (rc != Success)
+	goto bad;
+
+    rc = XaceHook(XACE_CLIENT_ACCESS, client, clients[clientIndex], access);
+    if (rc != Success)
+	goto bad;
+
+    *pClient = clients[clientIndex];
+    return Success;
+bad:
     client->errorValue = rid;
-
-    dixLookupResource(&pRes, rid, RC_ANY, client, access);
-
-    if (clientIndex && pRes && clients[clientIndex] && !(rid & SERVER_BIT)) {
-	*pClient = clients[clientIndex];
-	return Success;
-    }
     *pClient = NULL;
-    return BadValue;
+    return rc;
 }
 
 int

From fe9bc481efb0821134e10760c23993c6a7386450 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 16 Aug 2007 12:02:59 -0400
Subject: [PATCH 087/552] xace: add hooks + new access codes: core protocol
 font requests

---
 dix/dispatch.c | 51 ++++++++++++++++++++++++--------------------------
 1 file changed, 24 insertions(+), 27 deletions(-)

diff --git a/dix/dispatch.c b/dix/dispatch.c
index 30f44fb1f..f6a85bb6d 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -1354,23 +1354,21 @@ ProcQueryFont(ClientPtr client)
     xQueryFontReply	*reply;
     FontPtr pFont;
     GC *pGC;
+    int rc;
     REQUEST(xResourceReq);
-
     REQUEST_SIZE_MATCH(xResourceReq);
+
     client->errorValue = stuff->id;		/* EITHER font or gc */
-    pFont = (FontPtr)SecurityLookupIDByType(client, stuff->id, RT_FONT,
-					    DixReadAccess);
-    if (!pFont)
-    {
-	pGC = (GC *) SecurityLookupIDByType(client, stuff->id, RT_GC,
-					    DixReadAccess);
-        if (!pGC)
-	{
-	    client->errorValue = stuff->id;
-            return(BadFont);     /* procotol spec says only error is BadFont */
-	}
-	pFont = pGC->font;
+    rc = dixLookupResource((pointer *)&pFont, stuff->id, RT_FONT, client,
+			   DixGetAttrAccess);
+    if (rc == BadValue) {
+	rc = dixLookupResource((pointer *)&pGC, stuff->id, RT_GC, client,
+			       DixGetAttrAccess);
+	if (rc == Success)
+	    pFont = pGC->font;
     }
+    if (rc != Success)
+	return (rc == BadValue) ? BadFont: rc;
 
     {
 	xCharInfo	*pmax = FONTINKMAX(pFont);
@@ -1409,28 +1407,27 @@ ProcQueryFont(ClientPtr client)
 int
 ProcQueryTextExtents(ClientPtr client)
 {
-    REQUEST(xQueryTextExtentsReq);
     xQueryTextExtentsReply reply;
     FontPtr pFont;
     GC *pGC;
     ExtentInfoRec info;
     unsigned long length;
-
+    int rc;
+    REQUEST(xQueryTextExtentsReq);
     REQUEST_AT_LEAST_SIZE(xQueryTextExtentsReq);
         
-    pFont = (FontPtr)SecurityLookupIDByType(client, stuff->fid, RT_FONT,
-					    DixReadAccess);
-    if (!pFont)
-    {
-        pGC = (GC *)SecurityLookupIDByType(client, stuff->fid, RT_GC,
-					   DixReadAccess);
-        if (!pGC)
-	{
-	    client->errorValue = stuff->fid;
-            return(BadFont);
-	}
-	pFont = pGC->font;
+    client->errorValue = stuff->fid;		/* EITHER font or gc */
+    rc = dixLookupResource((pointer *)&pFont, stuff->fid, RT_FONT, client,
+			   DixGetAttrAccess);
+    if (rc == BadValue) {
+	rc = dixLookupResource((pointer *)&pGC, stuff->fid, RT_GC, client,
+			       DixGetAttrAccess);
+	if (rc == Success)
+	    pFont = pGC->font;
     }
+    if (rc != Success)
+	return (rc == BadValue) ? BadFont: rc;
+
     length = client->req_len - (sizeof(xQueryTextExtentsReq) >> 2);
     length = length << 1;
     if (stuff->oddLength)

From 3ef2e9e623819c625a92f464fb14f1e5c181df42 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 16 Aug 2007 12:27:48 -0400
Subject: [PATCH 088/552] xace: add hooks + new access codes: core protocol
 pixmap requests

---
 dix/dispatch.c | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/dix/dispatch.c b/dix/dispatch.c
index f6a85bb6d..ece240c69 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -1500,7 +1500,7 @@ ProcCreatePixmap(ClientPtr client)
     LEGAL_NEW_RESOURCE(stuff->pid, client);
     
     rc = dixLookupDrawable(&pDraw, stuff->drawable, client, M_ANY,
-			   DixReadAccess);
+			   DixGetAttrAccess);
     if (rc != Success)
 	return rc;
 
@@ -1543,9 +1543,17 @@ CreatePmap:
     {
 	pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
 	pMap->drawable.id = stuff->pid;
+	/* security creation/labeling check */
+	rc = XaceHook(XACE_RESOURCE_ACCESS, client, stuff->pid, RT_PIXMAP,
+		      DixCreateAccess, pMap);
+	if (rc != Success) {
+	    (*pDraw->pScreen->DestroyPixmap)(pMap);
+	    return rc;
+	}
 	if (AddResource(stuff->pid, RT_PIXMAP, (pointer)pMap))
 	    return(client->noClientException);
     }
+    (*pDraw->pScreen->DestroyPixmap)(pMap);
     return (BadAlloc);
 }
 
@@ -1553,13 +1561,13 @@ int
 ProcFreePixmap(ClientPtr client)
 {
     PixmapPtr pMap;
-
+    int rc;
     REQUEST(xResourceReq);
-
     REQUEST_SIZE_MATCH(xResourceReq);
-    pMap = (PixmapPtr)SecurityLookupIDByType(client, stuff->id, RT_PIXMAP,
-					     DixDestroyAccess);
-    if (pMap) 
+
+    rc = dixLookupResource((pointer *)&pMap, stuff->id, RT_PIXMAP, client,
+			   DixDestroyAccess);
+    if (rc == Success)
     {
 	FreeResource(stuff->id, RT_NONE);
 	return(client->noClientException);
@@ -1567,7 +1575,7 @@ ProcFreePixmap(ClientPtr client)
     else 
     {
 	client->errorValue = stuff->id;
-	return (BadPixmap);
+	return (rc == BadValue) ? BadPixmap : rc;
     }
 }
 

From 0a994d4f859a4e48d41a90ed9d2a282bb528c555 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 16 Aug 2007 12:54:35 -0400
Subject: [PATCH 089/552] xace: add hooks + new access codes: core protocol
 selection requests

---
 dix/dispatch.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/dix/dispatch.c b/dix/dispatch.c
index ece240c69..bb30619a2 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -980,9 +980,10 @@ ProcSetSelectionOwner(ClientPtr client)
 {
     WindowPtr pWin;
     TimeStamp time;
+    int rc;
     REQUEST(xSetSelectionOwnerReq);
-
     REQUEST_SIZE_MATCH(xSetSelectionOwnerReq);
+
     UpdateCurrentTime();
     time = ClientTimeToServerTime(stuff->time);
 
@@ -992,7 +993,7 @@ ProcSetSelectionOwner(ClientPtr client)
     	return Success;
     if (stuff->window != None)
     {
-	int rc = dixLookupWindow(&pWin, stuff->window, client, DixReadAccess);
+	rc = dixLookupWindow(&pWin, stuff->window, client, DixSetAttrAccess);
         if (rc != Success)
             return rc;
     }
@@ -1012,6 +1013,10 @@ ProcSetSelectionOwner(ClientPtr client)
         {        
 	    xEvent event;
 
+	    rc = XaceHook(XACE_SELECTION_ACCESS, client, CurrentSelections[i],
+			  DixSetAttrAccess);
+	    if (rc != Success)
+		return rc;
 	    /* If the timestamp in client's request is in the past relative
 		to the time stamp indicating the last time the owner of the
 		selection was set, do not set the selection, just return 
@@ -1049,6 +1054,10 @@ ProcSetSelectionOwner(ClientPtr client)
 	    CurrentSelections = newsels;
 	    CurrentSelections[i].selection = stuff->selection;
 	    CurrentSelections[i].devPrivates = NULL;
+	    rc = XaceHook(XACE_SELECTION_ACCESS, CurrentSelections[i],
+			  DixSetAttrAccess);
+	    if (rc != Success)
+		return rc;
 	}
 	dixFreePrivates(CurrentSelections[i].devPrivates);
         CurrentSelections[i].lastTimeChanged = time;
@@ -1094,7 +1103,7 @@ ProcGetSelectionOwner(ClientPtr client)
 	reply.sequenceNumber = client->sequence;
         if (i < NumCurrentSelections &&
 	    XaceHook(XACE_SELECTION_ACCESS, client, &CurrentSelections[i],
-		     DixReadAccess) == Success)
+		     DixGetAttrAccess) == Success)
             reply.owner = CurrentSelections[i].destwindow;
         else
             reply.owner = None;
@@ -1118,7 +1127,7 @@ ProcConvertSelection(ClientPtr client)
     int rc;
 
     REQUEST_SIZE_MATCH(xConvertSelectionReq);
-    rc = dixLookupWindow(&pWin, stuff->requestor, client, DixReadAccess);
+    rc = dixLookupWindow(&pWin, stuff->requestor, client, DixSetAttrAccess);
     if (rc != Success)
         return rc;
 

From b2b7817497dd5da73d23ec9cc637c563041fc490 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 16 Aug 2007 15:30:25 -0400
Subject: [PATCH 090/552] devPrivates rework: use camelcase standard for name
 of key type.

---
 Xext/security.c    | 10 +++++-----
 dix/privates.c     | 12 ++++++------
 include/privates.h | 22 +++++++++++-----------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/Xext/security.c b/Xext/security.c
index bf414a50f..fe1e48a14 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -54,7 +54,7 @@ in this Software without prior written authorization from The Open Group.
 
 static int SecurityErrorBase;  /* first Security error number */
 static int SecurityEventBase;  /* first Security event number */
-static devprivate_key_t stateKey;
+static const DevPrivateKey stateKey = &stateKey;
 
 /* this is what we store as client security state */
 typedef struct {
@@ -64,11 +64,11 @@ typedef struct {
 } SecurityClientStateRec;
 
 #define HAVESTATE(client) (((SecurityClientStateRec *) \
-    dixLookupPrivate(DEVPRIV_PTR(client), &stateKey))->haveState)
+    dixLookupPrivate(DEVPRIV_PTR(client), stateKey))->haveState)
 #define TRUSTLEVEL(client) (((SecurityClientStateRec *) \
-    dixLookupPrivate(DEVPRIV_PTR(client), &stateKey))->trustLevel)
+    dixLookupPrivate(DEVPRIV_PTR(client), stateKey))->trustLevel)
 #define AUTHID(client)(((SecurityClientStateRec *) \
-    dixLookupPrivate(DEVPRIV_PTR(client), &stateKey))->authId)
+    dixLookupPrivate(DEVPRIV_PTR(client), stateKey))->authId)
 
 static CallbackListPtr SecurityValidateGroupCallback = NULL;
 
@@ -1812,7 +1812,7 @@ SecurityExtensionInit(INITARGS)
     RTEventClient |= RC_NEVERRETAIN;
 
     /* Allocate the private storage */
-    if (!dixRequestPrivate(&stateKey, sizeof(SecurityClientStateRec)))
+    if (!dixRequestPrivate(stateKey, sizeof(SecurityClientStateRec)))
 	FatalError("SecurityExtensionSetup: Can't allocate client private.\n");
 
     if (!AddCallback(&ClientStateCallback, SecurityClientStateCallback, NULL))
diff --git a/dix/privates.c b/dix/privates.c
index f2f1c49ee..4dbba437c 100644
--- a/dix/privates.c
+++ b/dix/privates.c
@@ -47,7 +47,7 @@ from The Open Group.
 #include "extnsionst.h"
 
 typedef struct _PrivateDesc {
-    devprivate_key_t *key;
+    DevPrivateKey key;
     unsigned size;
     CallbackListPtr initfuncs;
     CallbackListPtr deletefuncs;
@@ -58,7 +58,7 @@ typedef struct _PrivateDesc {
 static PrivateDescRec *items = NULL;
 
 static _X_INLINE PrivateDescRec *
-findItem(devprivate_key_t *const key)
+findItem(const DevPrivateKey key)
 {
     PrivateDescRec *item = items;
     while (item) {
@@ -73,7 +73,7 @@ findItem(devprivate_key_t *const key)
  * Request pre-allocated space.
  */
 _X_EXPORT int
-dixRequestPrivate(devprivate_key_t *const key, unsigned size)
+dixRequestPrivate(const DevPrivateKey key, unsigned size)
 {
     PrivateDescRec *item = findItem(key);
     if (item) {
@@ -98,7 +98,7 @@ dixRequestPrivate(devprivate_key_t *const key, unsigned size)
  * Allocate a private and attach it to an existing object.
  */
 _X_EXPORT pointer *
-dixAllocatePrivate(PrivateRec **privates, devprivate_key_t *const key)
+dixAllocatePrivate(PrivateRec **privates, const DevPrivateKey key)
 {
     PrivateDescRec *item = findItem(key);
     PrivateRec *ptr;
@@ -156,7 +156,7 @@ dixFreePrivates(PrivateRec *privates)
  * Callback registration
  */
 _X_EXPORT int
-dixRegisterPrivateInitFunc(devprivate_key_t *const key,
+dixRegisterPrivateInitFunc(const DevPrivateKey key,
 			   CallbackProcPtr callback, pointer data)
 {
     PrivateDescRec *item = findItem(key);
@@ -169,7 +169,7 @@ dixRegisterPrivateInitFunc(devprivate_key_t *const key,
 }
 
 _X_EXPORT int
-dixRegisterPrivateDeleteFunc(devprivate_key_t *const key,
+dixRegisterPrivateDeleteFunc(const DevPrivateKey key,
 			     CallbackProcPtr callback, pointer data)
 {
     PrivateDescRec *item = findItem(key);
diff --git a/include/privates.h b/include/privates.h
index e57f16712..e377b3068 100644
--- a/include/privates.h
+++ b/include/privates.h
@@ -19,10 +19,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  * STUFF FOR PRIVATES
  *****************************************************************/
 
-typedef char devprivate_key_t;
+typedef void *DevPrivateKey;
 
 typedef struct _Private {
-    devprivate_key_t	*key;
+    DevPrivateKey	key;
     pointer		value;
     struct _Private	*next;
 } PrivateRec;
@@ -39,19 +39,19 @@ typedef struct _Private {
  * Calling this is not necessary if only a pointer by itself is needed.
  */
 extern int
-dixRequestPrivate(devprivate_key_t *const key, unsigned size);
+dixRequestPrivate(const DevPrivateKey key, unsigned size);
 
 /*
  * Allocates a new private and attaches it to an existing object.
  */
 extern pointer *
-dixAllocatePrivate(PrivateRec **privates, devprivate_key_t *const key);
+dixAllocatePrivate(PrivateRec **privates, const DevPrivateKey key);
 
 /*
  * Look up a private pointer.
  */
 static _X_INLINE pointer
-dixLookupPrivate(PrivateRec **privates, devprivate_key_t *const key)
+dixLookupPrivate(PrivateRec **privates, const DevPrivateKey key)
 {
     PrivateRec *rec = *privates;
     pointer *ptr;
@@ -70,7 +70,7 @@ dixLookupPrivate(PrivateRec **privates, devprivate_key_t *const key)
  * Look up the address of a private pointer.
  */
 static _X_INLINE pointer *
-dixLookupPrivateAddr(PrivateRec **privates, devprivate_key_t *const key)
+dixLookupPrivateAddr(PrivateRec **privates, const DevPrivateKey key)
 {
     PrivateRec *rec = *privates;
 
@@ -87,7 +87,7 @@ dixLookupPrivateAddr(PrivateRec **privates, devprivate_key_t *const key)
  * Set a private pointer.
  */
 static _X_INLINE int
-dixSetPrivate(PrivateRec **privates, devprivate_key_t *const key, pointer val)
+dixSetPrivate(PrivateRec **privates, const DevPrivateKey key, pointer val)
 {
     PrivateRec *rec;
 
@@ -111,16 +111,16 @@ dixSetPrivate(PrivateRec **privates, devprivate_key_t *const key, pointer val)
  * The calldata argument to the callbacks is a PrivateCallbackPtr.
  */
 typedef struct _PrivateCallback {
-    devprivate_key_t *key;	/* private registration key */
-    pointer *value;		/* address of private pointer */
+    DevPrivateKey key;	/* private registration key */
+    pointer *value;	/* address of private pointer */
 } PrivateCallbackRec;
 
 extern int
-dixRegisterPrivateInitFunc(devprivate_key_t *const key,
+dixRegisterPrivateInitFunc(const DevPrivateKey key, 
 			   CallbackProcPtr callback, pointer userdata);
 
 extern int
-dixRegisterPrivateDeleteFunc(devprivate_key_t *const key,
+dixRegisterPrivateDeleteFunc(const DevPrivateKey key,
 			     CallbackProcPtr callback, pointer userdata);
 
 /*

From 6fd0a0b08de912421718aca17fe34a55ae285ae7 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 16 Aug 2007 16:01:42 -0400
Subject: [PATCH 091/552] devPrivates rework: add const qualifier to key type.

---
 dix/privates.c     | 2 +-
 include/privates.h | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dix/privates.c b/dix/privates.c
index 4dbba437c..1ca361c3d 100644
--- a/dix/privates.c
+++ b/dix/privates.c
@@ -47,7 +47,7 @@ from The Open Group.
 #include "extnsionst.h"
 
 typedef struct _PrivateDesc {
-    DevPrivateKey key;
+    pointer key;
     unsigned size;
     CallbackListPtr initfuncs;
     CallbackListPtr deletefuncs;
diff --git a/include/privates.h b/include/privates.h
index e377b3068..e81e40a93 100644
--- a/include/privates.h
+++ b/include/privates.h
@@ -19,10 +19,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  * STUFF FOR PRIVATES
  *****************************************************************/
 
-typedef void *DevPrivateKey;
+typedef void *const DevPrivateKey;
 
 typedef struct _Private {
-    DevPrivateKey	key;
+    pointer		key;
     pointer		value;
     struct _Private	*next;
 } PrivateRec;
@@ -111,7 +111,7 @@ dixSetPrivate(PrivateRec **privates, const DevPrivateKey key, pointer val)
  * The calldata argument to the callbacks is a PrivateCallbackPtr.
  */
 typedef struct _PrivateCallback {
-    DevPrivateKey key;	/* private registration key */
+    pointer key;	/* key used to set the private */
     pointer *value;	/* address of private pointer */
 } PrivateCallbackRec;
 

From 860a09cfb8afc0a293c7eb5e01762724eb86847a Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 16 Aug 2007 16:10:44 -0400
Subject: [PATCH 092/552] devPrivates rework: Nevermind, can't const due to
 return value warnings.

This reverts commit 6fd0a0b08de912421718aca17fe34a55ae285ae7.
---
 dix/privates.c     | 2 +-
 include/privates.h | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dix/privates.c b/dix/privates.c
index 1ca361c3d..4dbba437c 100644
--- a/dix/privates.c
+++ b/dix/privates.c
@@ -47,7 +47,7 @@ from The Open Group.
 #include "extnsionst.h"
 
 typedef struct _PrivateDesc {
-    pointer key;
+    DevPrivateKey key;
     unsigned size;
     CallbackListPtr initfuncs;
     CallbackListPtr deletefuncs;
diff --git a/include/privates.h b/include/privates.h
index e81e40a93..e377b3068 100644
--- a/include/privates.h
+++ b/include/privates.h
@@ -19,10 +19,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  * STUFF FOR PRIVATES
  *****************************************************************/
 
-typedef void *const DevPrivateKey;
+typedef void *DevPrivateKey;
 
 typedef struct _Private {
-    pointer		key;
+    DevPrivateKey	key;
     pointer		value;
     struct _Private	*next;
 } PrivateRec;
@@ -111,7 +111,7 @@ dixSetPrivate(PrivateRec **privates, const DevPrivateKey key, pointer val)
  * The calldata argument to the callbacks is a PrivateCallbackPtr.
  */
 typedef struct _PrivateCallback {
-    pointer key;	/* key used to set the private */
+    DevPrivateKey key;	/* private registration key */
     pointer *value;	/* address of private pointer */
 } PrivateCallbackRec;
 

From 4017d3190234e189a0bbd33193a148d4d3c7556b Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 28 Aug 2007 09:28:25 -0400
Subject: [PATCH 093/552] devPrivates rework: since API is already broken,
 switch everything over to new system.

Need to update documentation and address some remaining vestiges of
old system such as CursorRec structure, fb "offman" structure, and
FontRec privates.
---
 Xext/dpmsstubs.c                           |   2 +-
 Xext/panoramiX.c                           |  41 +-
 Xext/saver.c                               |  11 +-
 Xext/shm.c                                 |  18 +-
 Xext/xevie.c                               |  19 +-
 Xext/xprint.c                              | 171 ++------
 Xext/xvdisp.c                              |  11 +-
 Xext/xvdix.h                               |   9 +-
 Xext/xvmain.c                              |  32 +-
 Xext/xvmc.c                                |  23 +-
 afb/afb.h                                  |  18 +-
 afb/afbfillarc.c                           |   3 +-
 afb/afbfillrct.c                           |   3 +-
 afb/afbfillsp.c                            |  15 +-
 afb/afbgc.c                                |   7 +-
 afb/afbimggblt.c                           |   4 +-
 afb/afbline.c                              |   6 +-
 afb/afbpixmap.c                            |   2 +-
 afb/afbply1rct.c                           |   4 +-
 afb/afbplygblt.c                           |   4 +-
 afb/afbpntwin.c                            |   4 +-
 afb/afbpolypnt.c                           |   4 +-
 afb/afbscrinit.c                           |  52 ++-
 afb/afbtegblt.c                            |   4 +-
 afb/afbwindow.c                            |  19 +-
 afb/afbzerarc.c                            |   4 +-
 cfb/cfb.h                                  |  14 +-
 cfb/cfballpriv.c                           |  41 +-
 cfb/cfbpixmap.c                            |   2 +-
 cfb/cfbrrop.h                              |   3 +-
 cfb/cfbscrinit.c                           |  20 +-
 cfb/cfbwindow.c                            |   6 +-
 composite/compalloc.c                      |  10 +-
 composite/compext.c                        |  10 +-
 composite/compinit.c                       |  30 +-
 composite/compint.h                        |  16 +-
 configure.ac                               |   1 -
 damageext/damageext.c                      |   6 +-
 damageext/damageextint.h                   |   2 +-
 dbe/dbe.c                                  | 226 +----------
 dbe/dbestruct.h                            |  37 +-
 dbe/midbe.c                                |  37 +-
 dbe/midbestr.h                             |  12 +-
 dix/colormap.c                             |  34 +-
 dix/devices.c                              |  32 +-
 dix/dispatch.c                             |  58 +--
 dix/extension.c                            |  40 +-
 dix/gc.c                                   |  42 +-
 dix/getevents.c                            |  12 +-
 dix/main.c                                 |  54 +--
 dix/pixmap.c                               |  27 +-
 dix/privates.c                             | 448 ---------------------
 dix/window.c                               |  43 +-
 exa/exa.c                                  |  20 +-
 exa/exa_priv.h                             |  10 +-
 fb/fb.h                                    |  20 +-
 fb/fballpriv.c                             |  48 +--
 fb/fboverlay.c                             |  19 +-
 fb/fboverlay.h                             |   9 +-
 fb/fbpixmap.c                              |   2 +-
 fb/fbpseudocolor.c                         |  50 +--
 fb/fbscreen.c                              |   6 +-
 fb/fbwindow.c                              |   4 +-
 fb/wfbrename.h                             |  22 +-
 hw/darwin/darwin.h                         |   6 +-
 hw/darwin/iokit/xfIOKit.h                  |   6 +-
 hw/darwin/iokit/xfIOKitCursor.c            |  18 +-
 hw/darwin/quartz/fullscreen/fullscreen.c   |  28 +-
 hw/darwin/quartz/fullscreen/quartzCursor.c |  16 +-
 hw/darwin/quartz/quartz.c                  |  10 +-
 hw/darwin/quartz/quartzCommon.h            |   4 +-
 hw/darwin/quartz/quartzCursor.c            |  16 +-
 hw/darwin/quartz/xpr/dri.c                 |  47 +--
 hw/darwin/quartz/xpr/dristruct.h           |  21 +-
 hw/darwin/quartz/xpr/xprCursor.c           |  19 +-
 hw/dmx/dmxcmap.c                           |  14 -
 hw/dmx/dmxcmap.h                           |   9 +-
 hw/dmx/dmxdpms.c                           |   7 +-
 hw/dmx/dmxgc.c                             |   6 +-
 hw/dmx/dmxgc.h                             |   4 +-
 hw/dmx/dmxpict.c                           |   3 +-
 hw/dmx/dmxpict.h                           |  10 +-
 hw/dmx/dmxpixmap.c                         |   5 +-
 hw/dmx/dmxpixmap.h                         |   4 +-
 hw/dmx/dmxscrinit.c                        |  46 +--
 hw/dmx/dmxscrinit.h                        |   2 +-
 hw/dmx/dmxwindow.c                         |   3 +-
 hw/dmx/dmxwindow.h                         |   6 +-
 hw/dmx/input/dmxconsole.c                  |  13 +-
 hw/kdrive/savage/s3draw.c                  |  17 +-
 hw/kdrive/savage/s3draw.h                  |  18 +-
 hw/kdrive/src/kaa.c                        |  22 +-
 hw/kdrive/src/kaa.h                        |  13 +-
 hw/kdrive/src/kdrive.h                     |   8 +-
 hw/kdrive/src/kxv.c                        |  44 +-
 hw/xfree86/common/xf86.h                   |  10 +-
 hw/xfree86/common/xf86DGA.c                |  44 +-
 hw/xfree86/common/xf86DPMS.c               |  32 +-
 hw/xfree86/common/xf86Globals.c            |   8 +-
 hw/xfree86/common/xf86Init.c               |  24 +-
 hw/xfree86/common/xf86RandR.c              |  20 +-
 hw/xfree86/common/xf86VidMode.c            |  27 +-
 hw/xfree86/common/xf86cmap.c               | 122 +++---
 hw/xfree86/common/xf86fbman.c              | 148 ++++---
 hw/xfree86/common/xf86sbusBus.c            |  13 +-
 hw/xfree86/common/xf86xv.c                 |  42 +-
 hw/xfree86/common/xf86xvmc.c               |  20 +-
 hw/xfree86/common/xf86xvpriv.h             |   3 +-
 hw/xfree86/dixmods/extmod/xf86dga2.c       |  30 +-
 hw/xfree86/dixmods/extmod/xf86misc.c       |  40 +-
 hw/xfree86/dixmods/extmod/xf86vmode.c      |  43 +-
 hw/xfree86/dixmods/extmod/xvmod.c          |   2 +-
 hw/xfree86/dixmods/extmod/xvmodproc.h      |   2 +-
 hw/xfree86/dri/dri.c                       |  52 +--
 hw/xfree86/dri/dristruct.h                 |  22 +-
 hw/xfree86/exa/examodule.c                 |  18 +-
 hw/xfree86/loader/dixsym.c                 |  18 +-
 hw/xfree86/loader/misym.c                  |   4 +-
 hw/xfree86/loader/xf86sym.c                |   4 +-
 hw/xfree86/modes/xf86RandR12.c             |  13 +-
 hw/xfree86/os-support/solaris/sun_mouse.c  |  14 +-
 hw/xfree86/rac/xf86RAC.c                   |  68 ++--
 hw/xfree86/ramdac/xf86Cursor.c             |  69 ++--
 hw/xfree86/ramdac/xf86CursorPriv.h         |   2 +-
 hw/xfree86/ramdac/xf86HWCurs.c             |  16 +-
 hw/xfree86/shadowfb/shadow.c               |  20 +-
 hw/xfree86/xaa/xaaDashLine.c               |   3 +-
 hw/xfree86/xaa/xaaGC.c                     |   3 +-
 hw/xfree86/xaa/xaaGCmisc.c                 |   3 +-
 hw/xfree86/xaa/xaaInit.c                   |  45 +--
 hw/xfree86/xaa/xaaLineMisc.c               |   3 +-
 hw/xfree86/xaa/xaaOverlayDF.c              |  15 +-
 hw/xfree86/xaa/xaaStateChange.c            |  15 +-
 hw/xfree86/xaa/xaaWrapper.c                |  31 +-
 hw/xfree86/xaa/xaalocal.h                  |  22 +-
 hw/xfree86/xaa/xaawrap.h                   |  14 +-
 hw/xfree86/xf4bpp/mfbfillarc.c             |   3 +-
 hw/xfree86/xf4bpp/mfbimggblt.c             |   3 +-
 hw/xfree86/xf4bpp/mfbzerarc.c              |   3 +-
 hw/xfree86/xf4bpp/ppcArea.c                |   2 +-
 hw/xfree86/xf4bpp/ppcGC.c                  |  10 +-
 hw/xfree86/xf4bpp/ppcIO.c                  |   2 +-
 hw/xfree86/xf4bpp/ppcPixFS.c               |  24 +-
 hw/xfree86/xf4bpp/ppcPixmap.c              |   1 +
 hw/xfree86/xf4bpp/ppcPntWin.c              |   2 +-
 hw/xfree86/xf4bpp/ppcPolyPnt.c             |   2 +-
 hw/xfree86/xf4bpp/ppcWinFS.c               |  24 +-
 hw/xfree86/xf4bpp/ppcWindow.c              |   2 +-
 hw/xfree86/xf4bpp/vgaGC.c                  |   2 +-
 hw/xfree86/xf8_32bpp/cfb8_32.h             |  14 +-
 hw/xfree86/xf8_32bpp/cfbscrinit.c          |  35 +-
 hw/xfree86/xf8_32bpp/xf86overlay.c         |  35 +-
 hw/xgl/egl/xegl.c                          |  20 +-
 hw/xgl/egl/xegl.h                          |   6 +-
 hw/xgl/glx/xglx.c                          |  20 +-
 hw/xgl/xgl.h                               |  33 +-
 hw/xgl/xglpixmap.c                         |   2 +-
 hw/xgl/xglxv.c                             |   8 +-
 hw/xnest/GC.c                              |   2 +-
 hw/xnest/Init.c                            |   2 -
 hw/xnest/Pixmap.c                          |   8 +-
 hw/xnest/Screen.c                          |  22 +-
 hw/xnest/Window.c                          |   2 +-
 hw/xnest/XNGC.h                            |   6 +-
 hw/xnest/XNPixmap.h                        |   6 +-
 hw/xnest/XNWindow.h                        |   6 +-
 hw/xprint/attributes.c                     |  27 +-
 hw/xprint/pcl/Pcl.h                        |   8 +-
 hw/xprint/pcl/PclArc.c                     |   2 +-
 hw/xprint/pcl/PclColor.c                   |  28 +-
 hw/xprint/pcl/PclGC.c                      |  15 +-
 hw/xprint/pcl/PclInit.c                    |  62 +--
 hw/xprint/pcl/PclLine.c                    |   4 +-
 hw/xprint/pcl/PclPixel.c                   |   8 +-
 hw/xprint/pcl/PclPolygon.c                 |   6 +-
 hw/xprint/pcl/PclPrint.c                   |  20 +-
 hw/xprint/pcl/PclText.c                    |   4 +-
 hw/xprint/pcl/PclWindow.c                  |   7 +-
 hw/xprint/pcl/Pclmap.h                     |  10 +-
 hw/xprint/ps/Ps.h                          |   8 +-
 hw/xprint/ps/PsGC.c                        |  14 +-
 hw/xprint/ps/PsInit.c                      |  48 +--
 hw/xprint/ps/PsPixmap.c                    |   9 +-
 hw/xprint/ps/PsPrint.c                     |  33 +-
 hw/xprint/ps/PsWindow.c                    |   7 +-
 hw/xprint/raster/Raster.c                  |  44 +-
 hw/xwin/win.h                              |  40 +-
 hw/xwin/winallpriv.c                       |  18 +-
 hw/xwin/wincursor.c                        |   3 +-
 hw/xwin/winfillsp.c                        |   9 -
 hw/xwin/winglobals.c                       |  10 +-
 hw/xwin/winmultiwindowwndproc.c            |   2 +-
 hw/xwin/winpixmap.c                        |   7 -
 hw/xwin/winscrinit.c                       |   3 -
 hw/xwin/winsetsp.c                         |   9 -
 include/colormapst.h                       |   3 +-
 include/dix-config.h.in                    |   3 -
 include/dix.h                              |   6 -
 include/dixstruct.h                        |   3 +-
 include/extension.h                        |   6 -
 include/extnsionst.h                       |   3 +-
 include/gcstruct.h                         |   3 +-
 include/input.h                            |   3 -
 include/inputstr.h                         |   5 +-
 include/pixmapstr.h                        |  14 +-
 include/privates.h                         |  10 -
 include/screenint.h                        |  28 --
 include/scrnintstr.h                       |  11 +-
 include/window.h                           |   3 -
 include/windowstr.h                        |   3 +-
 include/xkbsrv.h                           |   2 +-
 include/xorg-config.h.in                   |   3 -
 include/xorg-server.h.in                   |   3 -
 mfb/mfb.h                                  |  14 +-
 mfb/mfbbitblt.c                            |  18 +-
 mfb/mfbfillarc.c                           |   3 +-
 mfb/mfbfillrct.c                           |   3 +-
 mfb/mfbfillsp.c                            |   9 +-
 mfb/mfbgc.c                                |  10 +-
 mfb/mfbimggblt.c                           |   3 +-
 mfb/mfbline.c                              |   6 +-
 mfb/mfbpixmap.c                            |   2 +-
 mfb/mfbpntwin.c                            |   5 +-
 mfb/mfbpolypnt.c                           |   3 +-
 mfb/mfbscrinit.c                           |  38 +-
 mfb/mfbwindow.c                            |  14 +-
 mfb/mfbzerarc.c                            |   3 +-
 mi/mi.h                                    |   3 +-
 mi/mibank.c                                |  18 +-
 mi/midispcur.c                             |  30 +-
 mi/miline.h                                |   7 +-
 mi/mioverlay.c                             |  27 +-
 mi/mipointer.c                             |  15 +-
 mi/mipointer.h                             |   3 +-
 mi/miscrinit.c                             |  25 +-
 mi/misprite.c                              |  78 ++--
 miext/cw/cw.c                              |  51 +--
 miext/cw/cw.h                              |  29 +-
 miext/damage/damage.c                      |  41 +-
 miext/damage/damagestr.h                   |  15 +-
 miext/rootless/accel/rlAccel.c             |  13 +-
 miext/rootless/rootlessCommon.h            |  19 +-
 miext/rootless/rootlessGC.c                |  10 +-
 miext/rootless/rootlessScreen.c            |  30 +-
 miext/rootless/rootlessWindow.c            |  12 +-
 miext/shadow/shadow.c                      |  15 +-
 miext/shadow/shadow.h                      |   5 +-
 randr/randr.c                              |  16 +-
 randr/randrstr.h                           |  10 +-
 record/record.c                            |  15 +-
 render/animcur.c                           |  13 +-
 render/glyph.c                             | 321 +--------------
 render/glyphstr.h                          |  43 +-
 render/picture.c                           | 115 +-----
 render/picturestr.h                        |  42 +-
 render/render.c                            |  10 +-
 xfixes/cursor.c                            |  18 +-
 xfixes/xfixes.c                            |   6 +-
 xfixes/xfixesint.h                         |   2 +-
 xkb/ddxFakeMtn.c                           |   2 +-
 xkb/xkbActions.c                           |  13 +-
 261 files changed, 1642 insertions(+), 3957 deletions(-)

diff --git a/Xext/dpmsstubs.c b/Xext/dpmsstubs.c
index 8d58935da..fad07bde6 100644
--- a/Xext/dpmsstubs.c
+++ b/Xext/dpmsstubs.c
@@ -48,5 +48,5 @@ int DPMSGet(int *plevel)
 
 int DPMSSet(ClientPtr client, int level)
 {
-
+    return Success;
 }
diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index 95df04320..26c280990 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -110,8 +110,8 @@ static void PanoramiXResetProc(ExtensionEntry*);
 
 int (* SavedProcVector[256]) (ClientPtr client) = { NULL, };
 
-static int PanoramiXGCIndex = -1;
-static int PanoramiXScreenIndex = -1;
+static DevPrivateKey PanoramiXGCKey = &PanoramiXGCKey;
+static DevPrivateKey PanoramiXScreenKey = &PanoramiXScreenKey;
 
 typedef struct {
   DDXPointRec clipOrg;
@@ -140,8 +140,8 @@ static GCFuncs XineramaGCFuncs = {
 };
 
 #define Xinerama_GC_FUNC_PROLOGUE(pGC)\
-    PanoramiXGCPtr  pGCPriv = \
-		(PanoramiXGCPtr) (pGC)->devPrivates[PanoramiXGCIndex].ptr;\
+    PanoramiXGCPtr  pGCPriv = (PanoramiXGCPtr) \
+	dixLookupPrivate(&(pGC)->devPrivates, PanoramiXGCKey); \
     (pGC)->funcs = pGCPriv->wrapFuncs;
 
 #define Xinerama_GC_FUNC_EPILOGUE(pGC)\
@@ -152,8 +152,8 @@ static GCFuncs XineramaGCFuncs = {
 static Bool
 XineramaCloseScreen (int i, ScreenPtr pScreen)
 {
-    PanoramiXScreenPtr pScreenPriv = 
-        (PanoramiXScreenPtr) pScreen->devPrivates[PanoramiXScreenIndex].ptr;
+    PanoramiXScreenPtr pScreenPriv = (PanoramiXScreenPtr)
+	dixLookupPrivate(&pScreen->devPrivates, PanoramiXScreenKey);
 
     pScreen->CloseScreen = pScreenPriv->CloseScreen;
     pScreen->CreateGC = pScreenPriv->CreateGC;
@@ -171,14 +171,14 @@ static Bool
 XineramaCreateGC(GCPtr pGC)
 {
     ScreenPtr pScreen = pGC->pScreen;
-    PanoramiXScreenPtr pScreenPriv = 
-        (PanoramiXScreenPtr) pScreen->devPrivates[PanoramiXScreenIndex].ptr;
+    PanoramiXScreenPtr pScreenPriv = (PanoramiXScreenPtr)
+	dixLookupPrivate(&pScreen->devPrivates, PanoramiXScreenKey);
     Bool ret;
 
     pScreen->CreateGC = pScreenPriv->CreateGC;
     if((ret = (*pScreen->CreateGC)(pGC))) {
-	PanoramiXGCPtr pGCPriv = 
-		(PanoramiXGCPtr) pGC->devPrivates[PanoramiXGCIndex].ptr;
+	PanoramiXGCPtr pGCPriv = (PanoramiXGCPtr)
+	    dixLookupPrivate(&pGC->devPrivates, PanoramiXGCKey);
 
 	pGCPriv->wrapFuncs = pGC->funcs;
         pGC->funcs = &XineramaGCFuncs;
@@ -284,8 +284,8 @@ XineramaCopyGC (
     unsigned long   mask,
     GCPtr	    pGCDst
 ){
-    PanoramiXGCPtr pSrcPriv =
-                (PanoramiXGCPtr) pGCSrc->devPrivates[PanoramiXGCIndex].ptr;
+    PanoramiXGCPtr pSrcPriv = (PanoramiXGCPtr)
+	dixLookupPrivate(&pGCSrc->devPrivates, PanoramiXGCKey);
     Xinerama_GC_FUNC_PROLOGUE (pGCDst);
 
     if(mask & GCTileStipXOrigin)
@@ -484,20 +484,17 @@ void PanoramiXExtensionInit(int argc, char *argv[])
 		xcalloc(PanoramiXNumScreens, sizeof(PanoramiXData));
 
         BREAK_IF(!panoramiXdataPtr);
-	BREAK_IF((PanoramiXGCIndex = AllocateGCPrivateIndex()) < 0);
-	BREAK_IF((PanoramiXScreenIndex = AllocateScreenPrivateIndex()) < 0);
+
+	if (!dixRequestPrivate(PanoramiXGCKey, sizeof(PanoramiXGCRec))) {
+		noPanoramiXExtension = TRUE;
+		return;
+	}
 	
 	for (i = 0; i < PanoramiXNumScreens; i++) {
 	   pScreen = screenInfo.screens[i];
-	   if(!AllocateGCPrivate(pScreen, PanoramiXGCIndex, 
-						sizeof(PanoramiXGCRec))) {
-		noPanoramiXExtension = TRUE;
-		return;
-	   }
-
 	   pScreenPriv = xalloc(sizeof(PanoramiXScreenRec));
-	   pScreen->devPrivates[PanoramiXScreenIndex].ptr = 
-						(pointer)pScreenPriv;
+	   dixSetPrivate(&pScreen->devPrivates, PanoramiXScreenKey,
+			 pScreenPriv);
 	   if(!pScreenPriv) {
 		noPanoramiXExtension = TRUE;
 		return;
diff --git a/Xext/saver.c b/Xext/saver.c
index dabfbea1b..004258382 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -234,10 +234,12 @@ MakeScreenPrivate (
 	ScreenPtr /* pScreen */
 	);
 
-static int ScreenPrivateIndex;
+static DevPrivateKey ScreenPrivateKey = &ScreenPrivateKey;
 
-#define GetScreenPrivate(s) ((ScreenSaverScreenPrivatePtr)(s)->devPrivates[ScreenPrivateIndex].ptr)
-#define SetScreenPrivate(s,v) ((s)->devPrivates[ScreenPrivateIndex].ptr = (pointer) v);
+#define GetScreenPrivate(s) ((ScreenSaverScreenPrivatePtr) \
+    dixLookupPrivate(&(s)->devPrivates, ScreenPrivateKey))
+#define SetScreenPrivate(s,v) \
+    dixSetPrivate(&(s)->devPrivates, ScreenPrivateKey, v);
 #define SetupScreen(s)	ScreenSaverScreenPrivatePtr pPriv = (s ? GetScreenPrivate(s) : NULL)
 
 #define New(t)	((t *) xalloc (sizeof (t)))
@@ -260,14 +262,13 @@ ScreenSaverExtensionInit(INITARGS)
     AttrType = CreateNewResourceType(ScreenSaverFreeAttr);
     EventType = CreateNewResourceType(ScreenSaverFreeEvents);
     SuspendType = CreateNewResourceType(ScreenSaverFreeSuspend);
-    ScreenPrivateIndex = AllocateScreenPrivateIndex ();
 
     for (i = 0; i < screenInfo.numScreens; i++)
     {
 	pScreen = screenInfo.screens[i];
 	SetScreenPrivate (pScreen, NULL);
     }
-    if (AttrType && EventType && SuspendType && ScreenPrivateIndex != -1 &&
+    if (AttrType && EventType && SuspendType &&
 	(extEntry = AddExtension(ScreenSaverName, ScreenSaverNumberEvents, 0,
 				 ProcScreenSaverDispatch, SProcScreenSaverDispatch,
 				 ScreenSaverResetProc, StandardMinorOpcode)))
diff --git a/Xext/shm.c b/Xext/shm.c
index 7fa834952..8fa584275 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -119,7 +119,7 @@ static int pixmapFormat;
 static int shmPixFormat[MAXSCREENS];
 static ShmFuncsPtr shmFuncs[MAXSCREENS];
 static DestroyPixmapProcPtr destroyPixmap[MAXSCREENS];
-static int  shmPixmapPrivate;
+static DevPrivateKey shmPixmapPrivate = &shmPixmapPrivate;
 static ShmFuncs miFuncs = {NULL, miShmPutImage};
 static ShmFuncs fbFuncs = {fbShmCreatePixmap, fbShmPutImage};
 
@@ -229,20 +229,11 @@ ShmExtensionInit(INITARGS)
       if (!pixmapFormat)
 	pixmapFormat = ZPixmap;
       if (sharedPixmaps)
-      {
 	for (i = 0; i < screenInfo.numScreens; i++)
 	{
 	    destroyPixmap[i] = screenInfo.screens[i]->DestroyPixmap;
 	    screenInfo.screens[i]->DestroyPixmap = ShmDestroyPixmap;
 	}
-	shmPixmapPrivate = AllocatePixmapPrivateIndex();
-	for (i = 0; i < screenInfo.numScreens; i++)
-	{
-	    if (!AllocatePixmapPrivate(screenInfo.screens[i],
-				       shmPixmapPrivate, 0))
-		return;
-	}
-      }
     }
     ShmSegType = CreateNewResourceType(ShmDetachSegment);
     if (ShmSegType &&
@@ -295,7 +286,8 @@ ShmDestroyPixmap (PixmapPtr pPixmap)
     if (pPixmap->refcnt == 1)
     {
 	ShmDescPtr  shmdesc;
-	shmdesc = (ShmDescPtr) pPixmap->devPrivates[shmPixmapPrivate].ptr;
+	shmdesc = (ShmDescPtr)dixLookupPrivate(&pPixmap->devPrivates,
+					       shmPixmapPrivate);
 	if (shmdesc)
 	    ShmDetachSegment ((pointer) shmdesc, pPixmap->drawable.id);
     }
@@ -762,7 +754,7 @@ CreatePmap:
 				shmdesc->addr + stuff->offset);
 
 	if (pMap) {
-            pMap->devPrivates[shmPixmapPrivate].ptr = (pointer) shmdesc;
+	    dixSetPrivate(&pMap->devPrivates, shmPixmapPrivate, shmdesc);
             shmdesc->refcnt++;
 	    pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
 	    pMap->drawable.id = newPix->info[j].id;
@@ -1076,7 +1068,7 @@ CreatePmap:
 			    shmdesc->addr + stuff->offset);
     if (pMap)
     {
-	pMap->devPrivates[shmPixmapPrivate].ptr = (pointer) shmdesc;
+	dixSetPrivate(&pMap->devPrivates, shmPixmapPrivate, shmdesc);
 	shmdesc->refcnt++;
 	pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
 	pMap->drawable.id = stuff->pid;
diff --git a/Xext/xevie.c b/Xext/xevie.c
index 7922913ba..7dd67bbf6 100644
--- a/Xext/xevie.c
+++ b/Xext/xevie.c
@@ -76,11 +76,11 @@ DeviceIntPtr		xeviemouse = NULL;
 Mask			xevieMask = 0;
 int       		xevieEventSent = 0;
 int			xevieKBEventSent = 0;
-static unsigned int             xevieServerGeneration;
-static int                      xevieDevicePrivateIndex;
+static DevPrivateKey    xevieDevicePrivateKey = &xevieDevicePrivateKey;
 static Bool                     xevieModifiersOn = FALSE;
 
-#define XEVIEINFO(dev)  ((xevieDeviceInfoPtr)dev->devPrivates[xevieDevicePrivateIndex].ptr)
+#define XEVIEINFO(dev)  ((xevieDeviceInfoPtr) \
+    dixLookupPrivate(&(dev)->devPrivates, xevieDevicePrivateKey))
 
 Mask xevieFilters[128] = 
 {
@@ -134,12 +134,6 @@ XevieExtensionInit (void)
 {
     ExtensionEntry* extEntry;
 
-    if (serverGeneration != xevieServerGeneration) {
-        if ((xevieDevicePrivateIndex = AllocateDevicePrivateIndex()) == -1)
-            return;
-        xevieServerGeneration = serverGeneration;
-    }
-
     if (!AddCallback(&ServerGrabCallback,XevieServerGrabStateCallback,NULL))
        return;
 
@@ -618,14 +612,11 @@ XevieAdd(DeviceIntPtr device, void* data)
 {
     xevieDeviceInfoPtr xeviep;
 
-    if (!AllocateDevicePrivate(device, xevieDevicePrivateIndex))
-        return FALSE;
-
     xeviep = xalloc (sizeof (xevieDeviceInfoRec));
     if (!xeviep)
             return FALSE;
 
-    device->devPrivates[xevieDevicePrivateIndex].ptr = xeviep;
+    dixSetPrivate(&device->devPrivates, xevieDevicePrivateKey, xeviep);
     XevieUnwrapAdd(device, data);
 
     return TRUE;
@@ -642,7 +633,7 @@ XevieRemove(DeviceIntPtr device,pointer data)
     UNWRAP_UNWRAPPROC(device,xeviep->unwrapProc);
 
     xfree(xeviep);
-    device->devPrivates[xevieDevicePrivateIndex].ptr = NULL;
+    dixSetPrivate(&device->devPrivates, xevieDevicePrivateKey, NULL);
     return TRUE;
 }
 
diff --git a/Xext/xprint.c b/Xext/xprint.c
index ff739c0e7..ef5111837 100644
--- a/Xext/xprint.c
+++ b/Xext/xprint.c
@@ -153,8 +153,6 @@ static int XpFreePage(pointer, XID);
 static Bool XpCloseScreen(int, ScreenPtr);
 static CARD32 GetAllEventMasks(XpContextPtr);
 static struct _XpClient *CreateXpClient(ClientPtr);
-static void InitContextPrivates(XpContextPtr);
-static void ResetContextPrivates(void);
 static struct _XpClient *FindClient(XpContextPtr, ClientPtr);
 static struct _XpClient *AcquireClient(XpContextPtr, ClientPtr);
 
@@ -233,21 +231,12 @@ static XpScreenPtr XpScreens[MAXSCREENS];
 static unsigned char XpReqCode;
 static int XpEventBase;
 static int XpErrorBase;
-static unsigned long XpGeneration = 0;
-static int XpClientPrivateIndex;
+static DevPrivateKey XpClientPrivateKey = &XpClientPrivateKey;
 
-/* Variables for the context private machinery. 
- * These must be initialized at compile time because
- * main() calls InitOutput before InitExtensions, and the
- * output drivers are likely to call AllocateContextPrivate.
- * These variables are reset at CloseScreen time.  CloseScreen
- * is used because it occurs after FreeAllResources, and before
- * the next InitOutput cycle.
- */
-static int  contextPrivateCount = 0;
-static int contextPrivateLen = 0;
-static unsigned *contextPrivateSizes = (unsigned *)NULL;
-static unsigned totalContextSize = sizeof(XpContextRec);
+#define XP_GETPRIV(pClient) ((XpContextPtr) \
+    dixLookupPrivate(&(pClient)->devPrivates, XpClientPrivateKey))
+#define XP_SETPRIV(pClient, p) \
+    dixSetPrivate(&(pClient)->devPrivates, XpClientPrivateKey, p)
 
 /*
  * There are three types of resources involved.  One is the resource associated
@@ -305,20 +294,6 @@ XpExtensionInit(INITARGS)
         EventSwapVector[XpEventBase+1] = (EventSwapPtr) SwapXpAttributeEvent;
     }
 
-    if(XpGeneration != serverGeneration)
-    {
-	XpClientPrivateIndex = AllocateClientPrivateIndex();
-	/*
-	 * We allocate 0 length & simply stuff a pointer to the
-	 * ContextRec in the DevUnion.
-	 */
-	if(AllocateClientPrivate(XpClientPrivateIndex, 0) != TRUE)
-	{
-		/* we can't alloc a client private, should we bail??? XXX */
-	}
-	XpGeneration = serverGeneration;
-    }
-
     for(i = 0; i < MAXSCREENS; i++)
     {
 	/*
@@ -377,14 +352,6 @@ XpCloseScreen(int index, ScreenPtr pScreen)
     }
     XpScreens[index] = (XpScreenPtr)NULL;
 
-    /*
-     * It's wasteful to call ResetContextPrivates() at every CloseScreen, 
-     * but it's the best we know how to do for now.  We do this because we
-     * have to wait until after all resources have been freed (so we know
-     * how to free the ContextRecs), and before the next InitOutput cycle.
-     * See dix/main.c for the order of initialization and reset.
-     */
-    ResetContextPrivates();
     return (*CloseScreen)(index, pScreen);
 }
 
@@ -956,12 +923,10 @@ ProcXpCreateContext(ClientPtr client)
     /*
      * Allocate and add the context resource.
      */
-    if((pContext = (XpContextPtr) xalloc(totalContextSize)) == 
+    if((pContext = (XpContextPtr) xalloc(sizeof(XpContextRec))) == 
        (XpContextPtr) NULL)
 	return BadAlloc;
 
-    InitContextPrivates(pContext);
-
     if(AddResource(stuff->contextID, RTcontext, (pointer) pContext)
        != TRUE)
     {
@@ -975,6 +940,7 @@ ProcXpCreateContext(ClientPtr client)
     pContext->state = 0;
     pContext->clientSlept = (ClientPtr)NULL;
     pContext->imageRes = 0;
+    pContext->devPrivates = NULL;
 
     pContext->funcs.DestroyContext = 0;
     pContext->funcs.StartJob = 0;
@@ -1041,8 +1007,7 @@ ProcXpSetContext(ClientPtr client)
 
     REQUEST_AT_LEAST_SIZE(xPrintSetContextReq);
 
-    if((pContext = client->devPrivates[XpClientPrivateIndex].ptr) != 
-       (pointer)NULL)
+    if((pContext = XP_GETPRIV(client)) != (pointer)NULL)
     {
 	/*
 	 * Erase this client's knowledge of its old context, if any.
@@ -1055,7 +1020,7 @@ ProcXpSetContext(ClientPtr client)
 		FreeXpClient(pPrintClient, TRUE);
         }
 
-        client->devPrivates[XpClientPrivateIndex].ptr = (pointer)NULL;
+	XP_SETPRIV(client, NULL);
     }
     if(stuff->printContext == None)
         return Success;
@@ -1077,7 +1042,7 @@ ProcXpSetContext(ClientPtr client)
     if((pPrintClient = AcquireClient(pContext, client)) == (XpClientPtr)NULL)
         return BadAlloc;
 
-    client->devPrivates[XpClientPrivateIndex].ptr = pContext;
+    XP_SETPRIV(client, pContext);
 
     XpSetFontResFunc(client);
 
@@ -1090,7 +1055,7 @@ ProcXpSetContext(ClientPtr client)
 XpContextPtr
 XpGetPrintContext(ClientPtr client)
 {
-    return (client->devPrivates[XpClientPrivateIndex].ptr);
+    return XP_GETPRIV(client);
 }
 
 static int
@@ -1105,8 +1070,7 @@ ProcXpGetContext(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xPrintGetContextReq);
 
-    if((pContext = client->devPrivates[XpClientPrivateIndex].ptr) == 
-       (pointer)NULL)
+    if((pContext = XP_GETPRIV(client)) == (pointer)NULL)
 	rep.printContext = None;
     else
         rep.printContext = pContext->contextID;
@@ -1249,6 +1213,7 @@ XpFreeContext(pointer data, XID id)
     }
 
     xfree(pContext->printerName);
+    dixFreePrivates(pContext->devPrivates);
     xfree(pContext);
     return Success; /* ??? */
 }
@@ -1284,11 +1249,9 @@ FreeXpClient(XpClientPtr pXpClient, Bool freeResource)
      * If we're freeing the clientRec associated with the context tied
      * to the client's devPrivates, then we need to clear the devPrivates.
      */
-    if(pXpClient->client->devPrivates[XpClientPrivateIndex].ptr == 
-       pXpClient->context)
+    if(XP_GETPRIV(pXpClient->client) == pXpClient->context)
     {
-        pXpClient->client->devPrivates[XpClientPrivateIndex].ptr = 
-					(pointer)NULL;
+	XP_SETPRIV(pXpClient->client, NULL);
     }
 
     for(pPrev = (XpClientPtr)NULL, pCurrent = pContext->clientHead; 
@@ -1372,87 +1335,6 @@ XpFreePage(pointer data, XID id)
     return result;
 }
 
-/*
- * ContextPrivate machinery.
- * Context privates are intended for use by the drivers, allowing the
- * drivers to maintain context-specific data.  The driver should free
- * the associated data at DestroyContext time.
- */
-
-static void
-InitContextPrivates(XpContextPtr context)
-{
-    register char *ptr;
-    DevUnion *ppriv;
-    register unsigned *sizes;
-    register unsigned size;
-    register int i;
-
-    if (totalContextSize == sizeof(XpContextRec))
-        ppriv = (DevUnion *)NULL;
-    else 
-        ppriv = (DevUnion *)(context + 1);
-
-    context->devPrivates = ppriv;
-    sizes = contextPrivateSizes;
-    ptr = (char *)(ppriv + contextPrivateLen);
-    for (i = contextPrivateLen; --i >= 0; ppriv++, sizes++)
-    {
-        if ( (size = *sizes) )
-        {
-            ppriv->ptr = (pointer)ptr;
-            ptr += size;
-        }
-        else
-            ppriv->ptr = (pointer)NULL;
-    }
-}
-
-static void
-ResetContextPrivates(void)
-{
-    contextPrivateCount = 0;
-    contextPrivateLen = 0;
-    xfree(contextPrivateSizes);
-    contextPrivateSizes = (unsigned *)NULL;
-    totalContextSize = sizeof(XpContextRec);
-
-}
-
-int
-XpAllocateContextPrivateIndex(void)
-{
-    return contextPrivateCount++;
-}
-
-Bool
-XpAllocateContextPrivate(int index, unsigned amount)
-{
-    unsigned oldamount;
-
-    if (index >= contextPrivateLen)
-    {
-        unsigned *nsizes;
-        nsizes = (unsigned *)xrealloc(contextPrivateSizes,
-                                      (index + 1) * sizeof(unsigned));
-        if (!nsizes)
-            return FALSE;
-        while (contextPrivateLen <= index)
-        {
-            nsizes[contextPrivateLen++] = 0;
-            totalContextSize += sizeof(DevUnion);
-        }
-        contextPrivateSizes = nsizes;
-    }
-    oldamount = contextPrivateSizes[index];
-    if (amount > oldamount)
-    {
-        contextPrivateSizes[index] = amount;
-        totalContextSize += (amount - oldamount);
-    }
-    return TRUE;
-}
-
 static XpClientPtr
 AcquireClient(XpContextPtr pContext, ClientPtr client)
 {
@@ -1501,8 +1383,7 @@ ProcXpStartJob(ClientPtr client)
     REQUEST_SIZE_MATCH(xPrintStartJobReq);
 
     /* Check to see that a context has been established by this client. */
-    if((pContext = (XpContextPtr)client->devPrivates[XpClientPrivateIndex].ptr)
-       == (XpContextPtr)NULL)
+    if((pContext = XP_GETPRIV(client)) == (XpContextPtr)NULL)
         return XpErrorBase+XPBadContext;
 
     if(pContext->state != 0)
@@ -1542,8 +1423,7 @@ ProcXpEndJob(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xPrintEndJobReq);
 
-    if((pContext = (XpContextPtr)client->devPrivates[XpClientPrivateIndex].ptr)
-       == (XpContextPtr)NULL)
+    if((pContext = XP_GETPRIV(client)) == (XpContextPtr)NULL)
         return XpErrorBase+XPBadSequence;
 
     if(!(pContext->state & JOB_STARTED))
@@ -1648,8 +1528,7 @@ ProcXpStartDoc(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xPrintStartDocReq);
 
-    if((pContext = (XpContextPtr)client->devPrivates[XpClientPrivateIndex].ptr)
-       == (XpContextPtr)NULL)
+    if((pContext = XP_GETPRIV(client)) == (XpContextPtr)NULL)
         return XpErrorBase+XPBadSequence;
 
     if(!(pContext->state & JOB_STARTED) || 
@@ -1684,8 +1563,7 @@ ProcXpEndDoc(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xPrintEndDocReq);
 
-    if((pContext = (XpContextPtr)client->devPrivates[XpClientPrivateIndex].ptr)
-       == (XpContextPtr)NULL)
+    if((pContext = XP_GETPRIV(client)) == (XpContextPtr)NULL)
         return XpErrorBase+XPBadSequence;
 
     if(!(pContext->state & DOC_RAW_STARTED) &&
@@ -1837,8 +1715,7 @@ ProcXpStartPage(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xPrintStartPageReq);
 
-    if((pContext = (XpContextPtr)client->devPrivates[XpClientPrivateIndex].ptr)
-       == (XpContextPtr)NULL)
+    if((pContext = XP_GETPRIV(client)) == (XpContextPtr)NULL)
         return XpErrorBase+XPBadSequence;
 
     if(!(pContext->state & JOB_STARTED))
@@ -1882,8 +1759,7 @@ ProcXpEndPage(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xPrintEndPageReq);
 
-    if((pContext = (XpContextPtr)client->devPrivates[XpClientPrivateIndex].ptr)
-       == (XpContextPtr)NULL)
+    if((pContext = XP_GETPRIV(client)) == (XpContextPtr)NULL)
         return XpErrorBase+XPBadSequence;
 
     if(!(pContext->state & PAGE_STARTED))
@@ -1932,8 +1808,7 @@ ProcXpPutDocumentData(ClientPtr client)
 
     REQUEST_AT_LEAST_SIZE(xPrintPutDocumentDataReq);
 
-    if((pContext = (XpContextPtr)client->devPrivates[XpClientPrivateIndex].ptr)
-       == (XpContextPtr)NULL)
+    if((pContext = XP_GETPRIV(client)) == (XpContextPtr)NULL)
         return XpErrorBase+XPBadSequence;
 
     if(!(pContext->state & DOC_RAW_STARTED) &&
@@ -2443,7 +2318,7 @@ GetAllEventMasks(XpContextPtr pContext)
 XpContextPtr
 XpContextOfClient(ClientPtr client)
 {
-    return (XpContextPtr)client->devPrivates[XpClientPrivateIndex].ptr;
+    return XP_GETPRIV(client);
 }
 
 
diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c
index 21d00aa7f..af2e09b82 100644
--- a/Xext/xvdisp.c
+++ b/Xext/xvdisp.c
@@ -388,8 +388,8 @@ ProcXvQueryAdaptors(ClientPtr client)
       return rc;
 
   pScreen = pWin->drawable.pScreen;
-  pxvs = (XvScreenPtr)pScreen->devPrivates[XvScreenIndex].ptr;
-
+  pxvs = (XvScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
+				       XvGetScreenKey());
   if (!pxvs)
     {
       rep.type = X_Reply;
@@ -2099,7 +2099,8 @@ XineramaXvPutStill(ClientPtr client)
 void XineramifyXv(void)
 {
    ScreenPtr pScreen, screen0 = screenInfo.screens[0];
-   XvScreenPtr xvsp0 = (XvScreenPtr)screen0->devPrivates[XvScreenIndex].ptr;
+   XvScreenPtr xvsp0 = (XvScreenPtr)dixLookupPrivate(&screen0->devPrivates,
+						     XvGetScreenKey());
    XvAdaptorPtr refAdapt, pAdapt;
    XvAttributePtr pAttr;
    XvScreenPtr xvsp;
@@ -2132,8 +2133,8 @@ void XineramifyXv(void)
    
       for(j = 1; j < PanoramiXNumScreens; j++) {
          pScreen = screenInfo.screens[j];
-	 xvsp = (XvScreenPtr)pScreen->devPrivates[XvScreenIndex].ptr;
-
+	 xvsp = (XvScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
+					      XvGetScreenKey());
          /* Do not try to go on if xv is not supported on this screen */
          if (xvsp==NULL) continue ;
 	 
diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index 9e94e05d5..a516cf113 100644
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@@ -55,7 +55,6 @@ SOFTWARE.
 #include "scrnintstr.h"
 #include <X11/extensions/Xvproto.h>
 
-extern int  XvScreenIndex;
 extern unsigned long XvExtensionGeneration;
 extern unsigned long XvScreenGeneration;
 extern unsigned long XvResourceGeneration;
@@ -224,10 +223,8 @@ typedef struct {
   DevUnion devPriv;
 } XvScreenRec, *XvScreenPtr;
 
-#define SCREEN_PROLOGUE(pScreen, field)\
-  ((pScreen)->field = \
-   ((XvScreenPtr) \
-    (pScreen)->devPrivates[XvScreenIndex].ptr)->field)
+#define SCREEN_PROLOGUE(pScreen, field) ((pScreen)->field = ((XvScreenPtr) \
+    dixLookupPrivate(&(pScreen)->devPrivates, XvScreenKey))->field)
 
 #define SCREEN_EPILOGUE(pScreen, field, wrapper)\
     ((pScreen)->field = wrapper)
@@ -242,7 +239,7 @@ extern int SProcXvDispatch(ClientPtr);
 
 extern void XvExtensionInit(void);
 extern int XvScreenInit(ScreenPtr);
-extern int XvGetScreenIndex(void);
+extern DevPrivateKey XvGetScreenKey(void);
 extern unsigned long XvGetRTPort(void);
 extern int XvdiSendPortNotify(XvPortPtr, Atom, INT32);
 extern int XvdiVideoStopped(XvPortPtr, int);
diff --git a/Xext/xvmain.c b/Xext/xvmain.c
index ddf3d1d6b..a2fc10802 100644
--- a/Xext/xvmain.c
+++ b/Xext/xvmain.c
@@ -105,7 +105,7 @@ SOFTWARE.
 #include "xvdisp.h"
 #endif
 
-int  XvScreenIndex = -1;
+static DevPrivateKey XvScreenKey = &XvScreenKey;
 unsigned long XvExtensionGeneration = 0;
 unsigned long XvScreenGeneration = 0;
 unsigned long XvResourceGeneration = 0;
@@ -166,12 +166,6 @@ XvExtensionInit(void)
 	  ErrorF("XvExtensionInit: Unable to allocate resource types\n");
 	  return;
 	}
-      XvScreenIndex = AllocateScreenPrivateIndex ();
-      if (XvScreenIndex < 0)
-	{
-	  ErrorF("XvExtensionInit: Unable to allocate screen private index\n");
-	  return;
-	}
 #ifdef PANORAMIX
         XineramaRegisterConnectionBlockCallback(XineramifyXv);
 #endif
@@ -265,19 +259,13 @@ XvScreenInit(ScreenPtr pScreen)
 	  ErrorF("XvScreenInit: Unable to allocate resource types\n");
 	  return BadAlloc;
 	}
-      XvScreenIndex = AllocateScreenPrivateIndex ();
-      if (XvScreenIndex < 0)
-	{
-	  ErrorF("XvScreenInit: Unable to allocate screen private index\n");
-	  return BadAlloc;
-	}
 #ifdef PANORAMIX
         XineramaRegisterConnectionBlockCallback(XineramifyXv);
 #endif
       XvScreenGeneration = serverGeneration; 
     }
 
-  if (pScreen->devPrivates[XvScreenIndex].ptr)
+  if (dixLookupPrivate(&pScreen->devPrivates, XvScreenKey))
     {
       ErrorF("XvScreenInit: screen devPrivates ptr non-NULL before init\n");
     }
@@ -291,7 +279,7 @@ XvScreenInit(ScreenPtr pScreen)
       return BadAlloc;
     }
 
-  pScreen->devPrivates[XvScreenIndex].ptr = (pointer)pxvs;
+  dixSetPrivate(&pScreen->devPrivates, XvScreenKey, pxvs);
 
   
   pxvs->DestroyPixmap = pScreen->DestroyPixmap;
@@ -313,7 +301,7 @@ XvCloseScreen(
 
   XvScreenPtr pxvs;
 
-  pxvs = (XvScreenPtr) pScreen->devPrivates[XvScreenIndex].ptr;
+  pxvs = (XvScreenPtr)dixLookupPrivate(&pScreen->devPrivates, XvScreenKey);
 
   pScreen->DestroyPixmap = pxvs->DestroyPixmap;
   pScreen->DestroyWindow = pxvs->DestroyWindow;
@@ -323,7 +311,7 @@ XvCloseScreen(
 
   xfree(pxvs);
 
-  pScreen->devPrivates[XvScreenIndex].ptr = (pointer)NULL;
+  dixSetPrivate(&pScreen->devPrivates, XvScreenKey, NULL);
 
   return (*pScreen->CloseScreen)(ii, pScreen);
 
@@ -334,10 +322,10 @@ XvResetProc(ExtensionEntry* extEntry)
 {
 }
 
-_X_EXPORT int
-XvGetScreenIndex(void)
+_X_EXPORT DevPrivateKey
+XvGetScreenKey(void)
 {
-  return XvScreenIndex;
+    return XvScreenKey;
 }
 
 _X_EXPORT unsigned long
@@ -361,7 +349,7 @@ XvDestroyPixmap(PixmapPtr pPix)
 
   SCREEN_PROLOGUE(pScreen, DestroyPixmap);
 
-  pxvs = (XvScreenPtr)pScreen->devPrivates[XvScreenIndex].ptr;
+  pxvs = (XvScreenPtr)dixLookupPrivate(&pScreen->devPrivates, XvScreenKey);
 
   /* CHECK TO SEE IF THIS PORT IS IN USE */
 
@@ -413,7 +401,7 @@ XvDestroyWindow(WindowPtr pWin)
 
   SCREEN_PROLOGUE(pScreen, DestroyWindow);
 
-  pxvs = (XvScreenPtr)pScreen->devPrivates[XvScreenIndex].ptr;
+  pxvs = (XvScreenPtr)dixLookupPrivate(&pScreen->devPrivates, XvScreenKey);
 
   /* CHECK TO SEE IF THIS PORT IS IN USE */
 
diff --git a/Xext/xvmc.c b/Xext/xvmc.c
index ae358936e..7ae8cc0da 100644
--- a/Xext/xvmc.c
+++ b/Xext/xvmc.c
@@ -39,7 +39,7 @@
 #define DR_CLIENT_DRIVER_NAME_SIZE 48
 #define DR_BUSID_SIZE 48
 
-int XvMCScreenIndex = -1;
+static DevPrivateKey XvMCScreenKey = NULL;
 
 unsigned long XvMCGeneration = 0;
 
@@ -63,7 +63,7 @@ typedef struct {
 } XvMCScreenRec, *XvMCScreenPtr; 
 
 #define XVMC_GET_PRIVATE(pScreen) \
-   (XvMCScreenPtr)((pScreen)->devPrivates[XvMCScreenIndex].ptr)
+    (XvMCScreenPtr)(dixLookupPrivate(&(pScreen)->devPrivates, XvMCScreenKey))
 
 
 static int
@@ -153,7 +153,7 @@ ProcXvMCListSurfaceTypes(ClientPtr client)
         return _XvBadPort;
     }
 
-    if(XvMCScreenIndex >= 0) { /* any adaptors at all */
+    if(XvMCScreenKey) { /* any adaptors at all */
        ScreenPtr pScreen = pPort->pAdaptor->pScreen;
        if((pScreenPriv = XVMC_GET_PRIVATE(pScreen))) {  /* any this screen */
           for(i = 0; i < pScreenPriv->num_adaptors; i++) {
@@ -211,7 +211,7 @@ ProcXvMCCreateContext(ClientPtr client)
 
     pScreen = pPort->pAdaptor->pScreen;
 
-    if(XvMCScreenIndex < 0) /* no XvMC adaptors */
+    if(XvMCScreenKey == NULL) /* no XvMC adaptors */
        return BadMatch;
  
     if(!(pScreenPriv = XVMC_GET_PRIVATE(pScreen))) /* none this screen */
@@ -494,7 +494,7 @@ ProcXvMCListSubpictureTypes(ClientPtr client)
 
     pScreen = pPort->pAdaptor->pScreen;
 
-    if(XvMCScreenIndex < 0) /* No XvMC adaptors */
+    if(XvMCScreenKey == NULL) /* No XvMC adaptors */
         return BadMatch;
 
     if(!(pScreenPriv = XVMC_GET_PRIVATE(pScreen)))
@@ -679,7 +679,7 @@ XvMCExtensionInit(void)
 {
    ExtensionEntry *extEntry;
 
-   if(XvMCScreenIndex < 0) /* nobody supports it */
+   if(XvMCScreenKey == NULL) /* nobody supports it */
 	return; 
 
    if(!(XvMCRTContext = CreateNewResourceType(XvMCDestroyContextRes)))
@@ -720,17 +720,12 @@ XvMCScreenInit(ScreenPtr pScreen, int num, XvMCAdaptorPtr pAdapt)
 {
    XvMCScreenPtr pScreenPriv;
 
-   if(XvMCGeneration != serverGeneration) {
-	if((XvMCScreenIndex = AllocateScreenPrivateIndex()) < 0)
-	   return BadAlloc;
-
-	XvMCGeneration = serverGeneration;
-   }
+   XvMCScreenKey = &XvMCScreenKey;
 
    if(!(pScreenPriv = (XvMCScreenPtr)xalloc(sizeof(XvMCScreenRec))))
 	return BadAlloc;
 
-   pScreen->devPrivates[XvMCScreenIndex].ptr = (pointer)pScreenPriv;
+   dixSetPrivate(&pScreen->devPrivates, XvMCScreenKey, pScreenPriv);
 
    pScreenPriv->CloseScreen = pScreen->CloseScreen;
    pScreen->CloseScreen = XvMCCloseScreen;
@@ -754,7 +749,7 @@ XvImagePtr XvMCFindXvImage(XvPortPtr pPort, CARD32 id)
     XvMCAdaptorPtr adaptor = NULL;
     int i;
 
-    if(XvMCScreenIndex < 0) return NULL;
+    if(XvMCScreenKey == NULL) return NULL;
 
     if(!(pScreenPriv = XVMC_GET_PRIVATE(pScreen))) 
         return NULL;
diff --git a/afb/afb.h b/afb/afb.h
index 31ccff9ee..5cfbddfb1 100644
--- a/afb/afb.h
+++ b/afb/afb.h
@@ -60,7 +60,6 @@ SOFTWARE.
 #include "mfb.h"
 
 extern int afbInverseAlu[];
-extern int afbScreenPrivateIndex;
 /* warning: PixelType definition duplicated in maskbits.h */
 #ifndef PixelType
 #define PixelType CARD32
@@ -736,14 +735,15 @@ typedef struct {
 } afbPrivGC;
 typedef afbPrivGC *afbPrivGCPtr;
 
-extern int afbGCPrivateIndex;			/* index into GC private array */
-extern int afbWindowPrivateIndex;		/* index into Window private array */
+extern DevPrivateKey afbScreenPrivateKey;
+extern DevPrivateKey afbGCPrivateKey;
+extern DevPrivateKey afbWindowPrivateKey;
 #ifdef PIXMAP_PER_WINDOW
-extern int frameWindowPrivateIndex;		/* index into Window private array */
+extern DevPrivateKey frameWindowPrivateKey;
 #endif
 
 #define afbGetGCPrivate(pGC) \
-	((afbPrivGC *)((pGC)->devPrivates[afbGCPrivateIndex].ptr))
+    ((afbPrivGC *)dixLookupPrivate(&(pGC)->devPrivates, afbGCPrivateKey))
 
 /* private field of window */
 typedef struct {
@@ -759,7 +759,7 @@ typedef struct {
 
 #define afbGetTypedWidth(pDrawable,wtype)( \
 	(((pDrawable)->type == DRAWABLE_WINDOW) ? \
-	 (int)(((PixmapPtr)((pDrawable)->pScreen->devPrivates[afbScreenPrivateIndex].ptr))->devKind) : \
+	 (int)(((PixmapPtr)dixLookupPrivate(&(pDrawable)->pScreen->devPrivates, afbScreenPrivateKey)->devKind) : \
 	 (int)(((PixmapPtr)pDrawable)->devKind)) / sizeof (wtype))
 
 #define afbGetByteWidth(pDrawable) afbGetTypedWidth(pDrawable, unsigned char)
@@ -769,7 +769,7 @@ typedef struct {
 #define afbGetTypedWidthAndPointer(pDrawable, width, pointer, wtype, ptype) {\
 	PixmapPtr   _pPix; \
 	if ((pDrawable)->type == DRAWABLE_WINDOW) \
-		_pPix = (PixmapPtr)(pDrawable)->pScreen->devPrivates[afbScreenPrivateIndex].ptr; \
+		_pPix = (PixmapPtr)dixLookupPrivate(&(pDrawable)->pScreen->devPrivates, afbScreenPrivateKey); \
 	else \
 		_pPix = (PixmapPtr)(pDrawable); \
 	(pointer) = (ptype *) _pPix->devPrivate.ptr; \
@@ -779,7 +779,7 @@ typedef struct {
 #define afbGetPixelWidthSizeDepthAndPointer(pDrawable, width, size, dep, pointer) {\
 	PixmapPtr _pPix; \
 	if ((pDrawable)->type == DRAWABLE_WINDOW) \
-		_pPix = (PixmapPtr)(pDrawable)->pScreen->devPrivates[afbScreenPrivateIndex].ptr; \
+		_pPix = (PixmapPtr)dixLookupPrivate(&(pDrawable)->pScreen->devPrivates, afbScreenPrivateKey); \
 	else \
 		_pPix = (PixmapPtr)(pDrawable); \
 	(pointer) = (PixelType *)_pPix->devPrivate.ptr; \
@@ -795,7 +795,7 @@ typedef struct {
 	afbGetTypedWidthAndPointer(pDrawable, width, pointer, PixelType, PixelType)
 
 #define afbGetWindowTypedWidthAndPointer(pWin, width, pointer, wtype, ptype) {\
-	PixmapPtr	_pPix = (PixmapPtr)(pWin)->drawable.pScreen->devPrivates[afbScreenPrivateIndex].ptr; \
+	PixmapPtr _pPix = (PixmapPtr)dixLookupPrivate(&(pWin)->drawable.pScreen->devPrivates, afbScreenPrivateKey); \
 	(pointer) = (ptype *) _pPix->devPrivate.ptr; \
 	(width) = ((int) _pPix->devKind) / sizeof (wtype); \
 }
diff --git a/afb/afbfillarc.c b/afb/afbfillarc.c
index fa685ba9a..cfc3133ee 100644
--- a/afb/afbfillarc.c
+++ b/afb/afbfillarc.c
@@ -321,7 +321,8 @@ afbPolyFillArcSolid(register DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parc
 	RegionPtr cclip;
 	unsigned char *rrops;
 
-	priv = (afbPrivGC *) pGC->devPrivates[afbGCPrivateIndex].ptr;
+	priv = (afbPrivGC *)dixLookupPrivate(&pGC->devPrivates,
+					     afbGCPrivateKey);
 	rrops = priv->rrops;
 	cclip = pGC->pCompositeClip;
 	for (arc = parcs, i = narcs; --i >= 0; arc++) {
diff --git a/afb/afbfillrct.c b/afb/afbfillrct.c
index 06fb37365..b4936f097 100644
--- a/afb/afbfillrct.c
+++ b/afb/afbfillrct.c
@@ -93,7 +93,8 @@ afbPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill, xRectangle *pre
 	unsigned char *rrops;
 	unsigned char *rropsOS;
 
-	priv = (afbPrivGC *)pGC->devPrivates[afbGCPrivateIndex].ptr;
+	priv = (afbPrivGC *)dixLookupPrivate(&pGC->devPrivates,
+					     afbGCPrivateKey);
 	prgnClip = pGC->pCompositeClip;
 	rrops = priv->rrops;
 	rropsOS = priv->rropOS;
diff --git a/afb/afbfillsp.c b/afb/afbfillsp.c
index 539c3457c..0118b475a 100644
--- a/afb/afbfillsp.c
+++ b/afb/afbfillsp.c
@@ -123,7 +123,8 @@ afbSolidFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted)
 
 	afbGetPixelWidthSizeDepthAndPointer(pDrawable, nlwidth, sizeDst, depthDst,
 													 pBase);
-	rrops = ((afbPrivGC *)(pGC->devPrivates[afbGCPrivateIndex].ptr))->rrops;
+	rrops = ((afbPrivGC *)dixLookupPrivate(&pGC->devPrivates,
+					       afbGCPrivateKey))->rrops;
 	while (n--) {
 		addrlBase = afbScanline(pBase, ppt->x, ppt->y, nlwidth);
 
@@ -238,8 +239,8 @@ afbStippleFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted)
 	tileHeight = pStipple->drawable.height;
 	psrc = (PixelType *)(pStipple->devPrivate.ptr);
 
-	rrops = ((afbPrivGC *)(pGC->devPrivates[afbGCPrivateIndex].ptr))->rrops;
-
+	rrops = ((afbPrivGC *)dixLookupPrivate(&pGC->devPrivates,
+					       afbGCPrivateKey))->rrops;
 	while (n--) {
 		src = psrc[ppt->y % tileHeight];
 		addrlBase = afbScanline(pBase, ppt->x, ppt->y, nlwidth);
@@ -484,8 +485,8 @@ afbOpaqueStippleFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted)
 	tileHeight = pTile->drawable.height;
 	psrc = (PixelType *)(pTile->devPrivate.ptr);
 	rop = pGC->alu;
-	rropsOS = ((afbPrivGC *)(pGC->devPrivates[afbGCPrivateIndex].ptr))->rropOS;
-
+	rropsOS = ((afbPrivGC *)dixLookupPrivate(&pGC->devPrivates,
+						 afbGCPrivateKey))->rropOS;
 	switch(rop) {
 		case GXcopy:
 			while (n--) {
@@ -793,8 +794,8 @@ afbUnnaturalStippleFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted)
 
 	tileWidth = pTile->drawable.width;
 	tileHeight = pTile->drawable.height;
-	rrops = ((afbPrivGC *)(pGC->devPrivates[afbGCPrivateIndex].ptr))->rrops;
-
+	rrops = ((afbPrivGC *)dixLookupPrivate(&pGC->devPrivates,
+					       afbGCPrivateKey))->rrops;
 	/* this replaces rotating the stipple.  Instead, we just adjust the offset
 	 * at which we start grabbing bits from the stipple.
 	 * Ensure that ppt->x - xSrc >= 0 and ppt->y - ySrc >= 0,
diff --git a/afb/afbgc.c b/afb/afbgc.c
index 59c09e097..1d1fdc58b 100644
--- a/afb/afbgc.c
+++ b/afb/afbgc.c
@@ -154,7 +154,8 @@ afbCreateGC(pGC)
 	/* afb wants to translate before scan convesion */
 	pGC->miTranslate = 1;
 
-	pPriv = (afbPrivGC *)(pGC->devPrivates[afbGCPrivateIndex].ptr);
+	pPriv = (afbPrivGC *)dixLookupPrivate(&pGC->devPrivates,
+					      afbGCPrivateKey);
 	afbReduceRop(pGC->alu, pGC->fgPixel, pGC->planemask, pGC->depth,
 		pPriv->rrops);
 	afbReduceOpaqueStipple(pGC->fgPixel, pGC->bgPixel, pGC->planemask,
@@ -295,8 +296,8 @@ afbValidateGC(pGC, changes, pDrawable)
 					 (oldOrg.y != pGC->lastWinOrg.y);
 
 
-	devPriv = ((afbPrivGCPtr)(pGC->devPrivates[afbGCPrivateIndex].ptr));
-
+	devPriv = (afbPrivGCPtr)dixLookupPrivate(&pGC->devPrivates,
+						 afbGCPrivateKey);
 
 	/*
 		if the client clip is different or moved OR
diff --git a/afb/afbimggblt.c b/afb/afbimggblt.c
index de02aa46a..824f918bc 100644
--- a/afb/afbimggblt.c
+++ b/afb/afbimggblt.c
@@ -145,8 +145,8 @@ afbImageGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase)
 	register int nFirst;/* bits of glyph in current longword */
 	PixelType *pdstSave;
 	int oldFill;
-	afbPrivGC *pPriv = (afbPrivGC *)(pGC->devPrivates[afbGCPrivateIndex].ptr);
-
+	afbPrivGC *pPriv = (afbPrivGC *)dixLookupPrivate(&pGC->devPrivates,
+							 afbGCPrivateKey);
 	xorg = pDrawable->x;
 	yorg = pDrawable->y;
 	afbGetPixelWidthSizeDepthAndPointer(pDrawable, widthDst, sizeDst, depthDst,
diff --git a/afb/afbline.c b/afb/afbline.c
index 9e2e4b9f4..d05675869 100644
--- a/afb/afbline.c
+++ b/afb/afbline.c
@@ -147,7 +147,8 @@ afbLineSS(pDrawable, pGC, mode, npt, pptInit)
 	RegionPtr cclip;
 
 	cclip = pGC->pCompositeClip;
-	rrops = ((afbPrivGC *)(pGC->devPrivates[afbGCPrivateIndex].ptr))->rrops;
+	rrops = ((afbPrivGC *)dixLookupPrivate(&pGC->devPrivates,
+					       afbGCPrivateKey))->rrops;
 	pboxInit = REGION_RECTS(cclip);
 	nboxInit = REGION_NUM_RECTS(cclip);
 
@@ -487,7 +488,8 @@ afbLineSD(pDrawable, pGC, mode, npt, pptInit)
 #endif
 
 	cclip = pGC->pCompositeClip;
-	rrops = ((afbPrivGC *)(pGC->devPrivates[afbGCPrivateIndex].ptr))->rrops;
+	rrops = ((afbPrivGC *)dixLookupPrivate(&pGC->devPrivates,
+					       afbGCPrivateKey))->rrops;
 	pboxInit = REGION_RECTS(cclip);
 	nboxInit = REGION_NUM_RECTS(cclip);
 
diff --git a/afb/afbpixmap.c b/afb/afbpixmap.c
index 5a81679e8..5ae50fb70 100644
--- a/afb/afbpixmap.c
+++ b/afb/afbpixmap.c
@@ -113,7 +113,7 @@ afbDestroyPixmap(pPixmap)
 {
 	if(--pPixmap->refcnt)
 		return(TRUE);
-	dixFreePrivates(*DEVPRIV_PTR(pPixmap));
+	dixFreePrivates(pPixmap->devPrivates);
 	xfree(pPixmap);
 	return(TRUE);
 }
diff --git a/afb/afbply1rct.c b/afb/afbply1rct.c
index 86ec174f4..e9d4d5e09 100644
--- a/afb/afbply1rct.c
+++ b/afb/afbply1rct.c
@@ -100,8 +100,8 @@ afbFillPolygonSolid (pDrawable, pGC, shape, mode, count, ptsIn)
 	int depthDst;
 	register PixelType *pdst;
 
-	devPriv = (afbPrivGC *)(pGC->devPrivates[afbGCPrivateIndex].ptr);
-
+	devPriv = (afbPrivGC *)dixLookupPrivate(&pGC->devPrivates,
+						afbGCPrivateKey);
 	if (mode == CoordModePrevious || shape != Convex ||
 		REGION_NUM_RECTS(pGC->pCompositeClip) != 1) {
 		miFillPolygon (pDrawable, pGC, shape, mode, count, ptsIn);
diff --git a/afb/afbplygblt.c b/afb/afbplygblt.c
index 289d50e1b..79b269b85 100644
--- a/afb/afbplygblt.c
+++ b/afb/afbplygblt.c
@@ -146,8 +146,8 @@ afbPolyGlyphBlt (pDrawable, pGC, x, y, nglyph, ppci, pglyphBase)
 	bbox.y1 = y - info.overallAscent;
 	bbox.y2 = y + info.overallDescent;
 
-	rrops = ((afbPrivGCPtr) pGC->devPrivates[afbGCPrivateIndex].ptr)->rrops;
-
+	rrops = ((afbPrivGCPtr)dixLookupPrivate(&pGC->devPrivates,
+						afbGCPrivateKey))->rrops;
 	switch (RECT_IN_REGION(pGC->pScreen, pGC->pCompositeClip, &bbox)) {
 		case rgnOUT:
 			break;
diff --git a/afb/afbpntwin.c b/afb/afbpntwin.c
index 6082f7caa..89c4489c4 100644
--- a/afb/afbpntwin.c
+++ b/afb/afbpntwin.c
@@ -57,6 +57,7 @@ SOFTWARE.
 #include "regionstr.h"
 #include "pixmapstr.h"
 #include "scrnintstr.h"
+#include "privates.h"
 
 #include "afb.h"
 #include "maskbits.h"
@@ -71,7 +72,8 @@ afbPaintWindow(pWin, pRegion, what)
 	register afbPrivWin		*pPrivWin;
 	unsigned char rrops[AFB_MAX_DEPTH];
 
-	pPrivWin = (afbPrivWin *)(pWin->devPrivates[afbWindowPrivateIndex].ptr);
+    pPrivWin = (afbPrivWin *)dixLookupPrivate(&pWin->devPrivates,
+					      afbWindowPrivateKey);
 
 	switch (what) {
 		case PW_BACKGROUND:
diff --git a/afb/afbpolypnt.c b/afb/afbpolypnt.c
index a9d96edfe..b8ea3ed3e 100644
--- a/afb/afbpolypnt.c
+++ b/afb/afbpolypnt.c
@@ -90,8 +90,8 @@ afbPolyPoint(pDrawable, pGC, mode, npt, pptInit)
 	register unsigned char *rrops;
 	afbPrivGC *pGCPriv;
 
-	pGCPriv = (afbPrivGC *) pGC->devPrivates[afbGCPrivateIndex].ptr;
-
+	pGCPriv = (afbPrivGC *)dixLookupPrivate(&pGC->devPrivates,
+						afbGCPrivateKey);
 	afbGetPixelWidthSizeDepthAndPointer(pDrawable, nlwidth, sizeDst, depthDst,
 													 pBaseSave);
 
diff --git a/afb/afbscrinit.c b/afb/afbscrinit.c
index 71e8d4c1e..8615d935b 100644
--- a/afb/afbscrinit.c
+++ b/afb/afbscrinit.c
@@ -69,13 +69,11 @@ SOFTWARE.
 #include "servermd.h"
 
 #ifdef PIXMAP_PER_WINDOW
-int frameWindowPrivateIndex;
+DevPrivateKey frameWindowPrivateKey = &frameWindowPrivateKey;
 #endif
-int afbWindowPrivateIndex;
-int afbGCPrivateIndex;
-int afbScreenPrivateIndex;
-
-static unsigned long afbGeneration = 0;
+DevPrivateKey afbWindowPrivateKey = &afbWindowPrivateKey;
+DevPrivateKey afbGCPrivateKey = &afbGCPrivateKey;
+DevPrivateKey afbScreenPrivateKey = &afbScreenPrivateKey;
 
 static Bool
 afbCloseScreen(int index, ScreenPtr pScreen)
@@ -87,7 +85,7 @@ afbCloseScreen(int index, ScreenPtr pScreen)
 		xfree(depths[d].vids);
 	xfree(depths);
 	xfree(pScreen->visuals);
-	xfree(pScreen->devPrivates[afbScreenPrivateIndex].ptr);
+	xfree(dixLookupPrivate(&pScreen->devPrivates, afbScreenPrivateKey));
 	return(TRUE);
 }
 
@@ -98,7 +96,8 @@ afbCreateScreenResources(ScreenPtr pScreen)
 
 	pointer oldDevPrivate = pScreen->devPrivate;
 
-	pScreen->devPrivate = pScreen->devPrivates[afbScreenPrivateIndex].ptr;
+	pScreen->devPrivate = dixLookupPrivate(&pScreen->devPrivates,
+					       afbScreenPrivateKey);
 	retval = miCreateScreenResources(pScreen);
 
 	/* Modify screen's pixmap devKind value stored off devPrivate to
@@ -106,7 +105,8 @@ afbCreateScreenResources(ScreenPtr pScreen)
 	 * of a chunky screen in longs as incorrectly setup by the mi routine.
 	 */
 	((PixmapPtr)pScreen->devPrivate)->devKind = BitmapBytePad(pScreen->width);
-	pScreen->devPrivates[afbScreenPrivateIndex].ptr = pScreen->devPrivate;
+	dixSetPrivate(&pScreen->devPrivates, afbScreenPrivateKey,
+		      pScreen->devPrivate);
 	pScreen->devPrivate = oldDevPrivate;
 	return(retval);
 }
@@ -115,7 +115,8 @@ static PixmapPtr
 afbGetWindowPixmap(WindowPtr pWin)
 {
 #ifdef PIXMAP_PER_WINDOW
-    return (PixmapPtr)(pWin->devPrivates[frameWindowPrivateIndex].ptr);
+    return (PixmapPtr)dixLookupPrivate(&pWin->devPrivates,
+				       frameWindowPrivateKey);
 #else
     ScreenPtr pScreen = pWin->drawable.pScreen;
 
@@ -127,33 +128,25 @@ static void
 afbSetWindowPixmap(WindowPtr pWin, PixmapPtr pPix)
 {
 #ifdef PIXMAP_PER_WINDOW
-    pWin->devPrivates[frameWindowPrivateIndex].ptr = (pointer)pPix;
+    dixSetPrivate(&pWin->devPrivates, frameWindowPrivateKey, pPix);
 #else
     (* pWin->drawable.pScreen->SetScreenPixmap)(pPix);
 #endif
 }
 
 static Bool
-afbAllocatePrivates(ScreenPtr pScreen, int *pWinIndex, int *pGCIndex)
+afbAllocatePrivates(ScreenPtr pScreen,
+		    DevPrivateKey *pWinKey, DevPrivateKey *pGCKey)
 {
-	if (afbGeneration != serverGeneration) {
-#ifdef PIXMAP_PER_WINDOW
-		frameWindowPrivateIndex = AllocateWindowPrivateIndex();
-#endif
-		afbWindowPrivateIndex = AllocateWindowPrivateIndex();
-		afbGCPrivateIndex = AllocateGCPrivateIndex();
-		afbGeneration = serverGeneration;
-	}
-	if (pWinIndex)
-		*pWinIndex = afbWindowPrivateIndex;
-	if (pGCIndex)
-		*pGCIndex = afbGCPrivateIndex;
+	if (pWinKey)
+		*pWinKey = afbWindowPrivateKey;
+	if (pGCKey)
+		*pGCKey = afbGCPrivateKey;
 
-	afbScreenPrivateIndex = AllocateScreenPrivateIndex();
 	pScreen->GetWindowPixmap = afbGetWindowPixmap;
 	pScreen->SetWindowPixmap = afbSetWindowPixmap;
-	return(AllocateWindowPrivate(pScreen, afbWindowPrivateIndex, sizeof(afbPrivWin)) &&
-	       AllocateGCPrivate(pScreen, afbGCPrivateIndex, sizeof(afbPrivGC)));
+	return(dixRequestPrivate(afbWindowPrivateKey, sizeof(afbPrivWin)) &&
+	       dixRequestPrivate(afbGCPrivateKey, sizeof(afbPrivGC)));
 }
 
 /* dts * (inch/dot) * (25.4 mm / inch) = mm */
@@ -179,7 +172,7 @@ afbScreenInit(register ScreenPtr pScreen, pointer pbits, int xsize, int ysize, i
 		ErrorF("afbInitVisuals: FALSE\n");
 		return FALSE;
 	}
-	if (!afbAllocatePrivates(pScreen,(int *)NULL, (int *)NULL)) {
+	if (!afbAllocatePrivates(pScreen, NULL, NULL)) {
 		ErrorF("afbAllocatePrivates: FALSE\n");
 		return FALSE;
 	}
@@ -224,7 +217,8 @@ afbScreenInit(register ScreenPtr pScreen, pointer pbits, int xsize, int ysize, i
 	pScreen->CloseScreen = afbCloseScreen;
 	pScreen->CreateScreenResources = afbCreateScreenResources;
 
-	pScreen->devPrivates[afbScreenPrivateIndex].ptr = pScreen->devPrivate;
+	dixSetPrivate(&pScreen->devPrivates, afbScreenPrivateKey,
+		      pScreen->devPrivate);
 	pScreen->devPrivate = oldDevPrivate;
 
 	return TRUE;
diff --git a/afb/afbtegblt.c b/afb/afbtegblt.c
index ba889cb80..c89b23a5d 100644
--- a/afb/afbtegblt.c
+++ b/afb/afbtegblt.c
@@ -261,8 +261,8 @@ afbTEGlyphBlt (pDrawable, pGC, x, y, nglyph, ppci, pglyphBase)
 	xpos += FONTMAXBOUNDS(pfont,leftSideBearing);
 	ypos -= FONTASCENT(pfont);
 
-	rrops = ((afbPrivGCPtr) pGC->devPrivates[afbGCPrivateIndex].ptr)->rropOS;
-
+	rrops = ((afbPrivGCPtr)dixLookupPrivate(&pGC->devPrivates,
+						afbGCPrivateKey))->rropOS;
 	bbox.x1 = xpos;
 	bbox.x2 = xpos + (widthGlyph * nglyph);
 	bbox.y1 = ypos;
diff --git a/afb/afbwindow.c b/afb/afbwindow.c
index a4a1602bc..1d99fe14d 100644
--- a/afb/afbwindow.c
+++ b/afb/afbwindow.c
@@ -56,6 +56,7 @@ SOFTWARE.
 #include <X11/X.h>
 #include "scrnintstr.h"
 #include "windowstr.h"
+#include "privates.h"
 #include "afb.h"
 #include "mistruct.h"
 #include "regionstr.h"
@@ -67,14 +68,16 @@ afbCreateWindow(pWin)
 {
 	register afbPrivWin *pPrivWin;
 
-	pPrivWin = (afbPrivWin *)(pWin->devPrivates[afbWindowPrivateIndex].ptr);
+	pPrivWin = (afbPrivWin *)dixLookupPrivate(&pWin->devPrivates,
+						  afbWindowPrivateKey);
 	pPrivWin->pRotatedBorder = NullPixmap;
 	pPrivWin->pRotatedBackground = NullPixmap;
 	pPrivWin->fastBackground = FALSE;
 	pPrivWin->fastBorder = FALSE;
 #ifdef PIXMAP_PER_WINDOW
-	pWin->devPrivates[frameWindowPrivateIndex].ptr =
-			pWin->pDrawable.pScreen->devPrivates[afbScreenPrivateIndex].ptr;
+	dixSetPrivate(&pWin->devPrivates, frameWindowPrivateKey,
+		      dixLookupPrivate(&pWin->pDrawable.pScreen->devPrivates,
+				       afbScreenPrivateKey));
 #endif
 
 	return (TRUE);
@@ -88,8 +91,8 @@ afbDestroyWindow(pWin)
 {
 	register afbPrivWin *pPrivWin;
 
-	pPrivWin = (afbPrivWin *)(pWin->devPrivates[afbWindowPrivateIndex].ptr);
-
+    pPrivWin = (afbPrivWin *)dixLookupPrivate(&pWin->devPrivates,
+					      afbWindowPrivateKey);
 	if (pPrivWin->pRotatedBorder)
 		(*pWin->drawable.pScreen->DestroyPixmap)(pPrivWin->pRotatedBorder);
 	if (pPrivWin->pRotatedBackground)
@@ -123,7 +126,8 @@ afbPositionWindow(pWin, x, y)
 	register afbPrivWin *pPrivWin;
 	int		reset = 0;
 
-	pPrivWin = (afbPrivWin *)(pWin->devPrivates[afbWindowPrivateIndex].ptr);
+    pPrivWin = (afbPrivWin *)dixLookupPrivate(&pWin->devPrivates,
+					      afbWindowPrivateKey);
 	if (pWin->backgroundState == BackgroundPixmap && pPrivWin->fastBackground) {
 		afbXRotatePixmap(pPrivWin->pRotatedBackground,
 								pWin->drawable.x - pPrivWin->oldRotate.x);
@@ -230,7 +234,8 @@ afbChangeWindowAttributes(pWin, mask)
 	register afbPrivWin *pPrivWin;
 	WindowPtr		pBgWin;
 
-	pPrivWin = (afbPrivWin *)(pWin->devPrivates[afbWindowPrivateIndex].ptr);
+    pPrivWin = (afbPrivWin *)dixLookupPrivate(&pWin->devPrivates,
+					      afbWindowPrivateKey);
 	/*
 	 * When background state changes from ParentRelative and
 	 * we had previously rotated the fast border pixmap to match
diff --git a/afb/afbzerarc.c b/afb/afbzerarc.c
index 2cc30687f..e53488e02 100644
--- a/afb/afbzerarc.c
+++ b/afb/afbzerarc.c
@@ -96,8 +96,8 @@ afbZeroArcSS(DrawablePtr pDraw, GCPtr pGC, xArc *arc)
 	register PixelType *paddr;
 	register unsigned char *rrops;
 
-	rrops = ((afbPrivGC *)(pGC->devPrivates[afbGCPrivateIndex].ptr))->rrops;
-
+	rrops = ((afbPrivGC *)dixLookupPrivate(&pGC->devPrivates,
+					       afbGCPrivateKey))->rrops;
 	afbGetPixelWidthSizeDepthAndPointer(pDraw, nlwidth, sizeDst, depthDst,
 													 addrl);
 	do360 = miZeroArcSetup(arc, &info, TRUE);
diff --git a/cfb/cfb.h b/cfb/cfb.h
index 3c165ff1d..44d4ad0fd 100644
--- a/cfb/cfb.h
+++ b/cfb/cfb.h
@@ -56,8 +56,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
    pixmap.devKind = width_of_pixmap_in_bytes
 */
 
-extern int  cfbGCPrivateIndex;
-extern int  cfbWindowPrivateIndex;
+extern DevPrivateKey cfbGCPrivateKey;
+extern DevPrivateKey cfbWindowPrivateKey;
 
 /* private field of GC */
 typedef struct {
@@ -72,7 +72,7 @@ typedef struct {
 typedef cfbPrivGC	*cfbPrivGCPtr;
 
 #define cfbGetGCPrivate(pGC)	((cfbPrivGCPtr)\
-	(pGC)->devPrivates[cfbGCPrivateIndex].ptr)
+    dixLookupPrivate(&(pGC)->devPrivates, cfbGCPrivateKey))
 
 #define cfbGetCompositeClip(pGC) ((pGC)->pCompositeClip)
 
@@ -93,7 +93,7 @@ typedef struct {
     } cfbPrivWin;
 
 #define cfbGetWindowPrivate(_pWin) ((cfbPrivWin *)\
-	(_pWin)->devPrivates[cfbWindowPrivateIndex].ptr)
+    dixLookupPrivate(&(_pWin)->devPrivates, cfbWindowPrivateKey))
 
 
 /* cfb8bit.c */
@@ -314,8 +314,8 @@ extern int cfb8SegmentSS1RectXor(
 
 extern Bool cfbAllocatePrivates(
     ScreenPtr /*pScreen*/,
-    int * /*window_index*/,
-    int * /*gc_index*/
+    DevPrivateKey * /*window_key*/,
+    DevPrivateKey * /*gc_key*/
 );
 /* cfbbitblt.c */
 
@@ -1230,7 +1230,7 @@ extern void cfbZeroPolyArcSS8Xor(
 
 #define CFB_NEED_SCREEN_PRIVATE
 
-extern int cfbScreenPrivateIndex;
+extern DevPrivateKey cfbScreenPrivateKey;
 #endif
 
 #ifndef CFB_PROTOTYPES_ONLY
diff --git a/cfb/cfballpriv.c b/cfb/cfballpriv.c
index e0ccdf4d0..e6ab93a87 100644
--- a/cfb/cfballpriv.c
+++ b/cfb/cfballpriv.c
@@ -45,48 +45,37 @@ in this Software without prior written authorization from The Open Group.
 #include "mibstore.h"
 
 #if 1 || PSZ==8
-int cfbWindowPrivateIndex = -1;
-int cfbGCPrivateIndex = -1;
+DevPrivateKey cfbWindowPrivateKey = &cfbWindowPrivateKey;
+DevPrivateKey cfbGCPrivateKey = &cfbGCPrivateKey;
 #endif
 #ifdef CFB_NEED_SCREEN_PRIVATE
-int cfbScreenPrivateIndex = -1;
-static unsigned long cfbGeneration = 0;
+DevPrivateKey cfbScreenPrivateKey = &cfbScreenPrivateKey;
 #endif
 
 
 Bool
-cfbAllocatePrivates(pScreen, window_index, gc_index)
+cfbAllocatePrivates(pScreen, window_key, gc_key)
     ScreenPtr	pScreen;
-    int		*window_index, *gc_index;
+    DevPrivateKey *window_key, *gc_key;
 {
-    if (!window_index || !gc_index ||
-	(*window_index == -1 && *gc_index == -1))
+    if (!window_key || !gc_key || (!*window_key && !*gc_key))
     {
     	if (!mfbAllocatePrivates(pScreen,
-			     	 &cfbWindowPrivateIndex, &cfbGCPrivateIndex))
+			     	 &cfbWindowPrivateKey, &cfbGCPrivateKey))
 	    return FALSE;
-    	if (window_index)
-	    *window_index = cfbWindowPrivateIndex;
-    	if (gc_index)
-	    *gc_index = cfbGCPrivateIndex;
+    	if (window_key)
+	    *window_key = cfbWindowPrivateKey;
+    	if (gc_key)
+	    *gc_key = cfbGCPrivateKey;
     }
     else
     {
-	cfbWindowPrivateIndex = *window_index;
-	cfbGCPrivateIndex = *gc_index;
+	cfbWindowPrivateKey = *window_key;
+	cfbGCPrivateKey = *gc_key;
     }
-    if (!AllocateWindowPrivate(pScreen, cfbWindowPrivateIndex,
-			       sizeof(cfbPrivWin)) ||
-	!AllocateGCPrivate(pScreen, cfbGCPrivateIndex, sizeof(cfbPrivGC)))
+    if (!dixRequestPrivate(cfbWindowPrivateKey, sizeof(cfbPrivWin)))
 	return FALSE;
-#ifdef CFB_NEED_SCREEN_PRIVATE
-    if (cfbGeneration != serverGeneration)
-    {
-      cfbScreenPrivateIndex = AllocateScreenPrivateIndex ();
-      cfbGeneration = serverGeneration;
-    }
-    if (cfbScreenPrivateIndex == -1)
+    if (!dixRequestPrivate(cfbGCPrivateKey, sizeof(cfbPrivGC)))
 	return FALSE;
-#endif
     return TRUE;
 }
diff --git a/cfb/cfbpixmap.c b/cfb/cfbpixmap.c
index ed01316ed..247331c6d 100644
--- a/cfb/cfbpixmap.c
+++ b/cfb/cfbpixmap.c
@@ -107,7 +107,7 @@ cfbDestroyPixmap(pPixmap)
 {
     if(--pPixmap->refcnt)
 	return TRUE;
-    dixFreePrivates(*DEVPRIV_PTR(pPixmap));
+    dixFreePrivates(pPixmap->devPrivates);
     xfree(pPixmap);
     return TRUE;
 }
diff --git a/cfb/cfbrrop.h b/cfb/cfbrrop.h
index eeb373a5e..e9ca881be 100644
--- a/cfb/cfbrrop.h
+++ b/cfb/cfbrrop.h
@@ -35,7 +35,8 @@ in this Software without prior written authorization from The Open Group.
 #endif
 
 #define RROP_FETCH_GC(gc) \
-    RROP_FETCH_GCPRIV(((cfbPrivGCPtr)(gc)->devPrivates[cfbGCPrivateIndex].ptr))
+    RROP_FETCH_GCPRIV((cfbPrivGCPtr)dixLookupPrivate(&(gc)->devPrivates, \
+						     cfbGCPrivateKey))
 
 #ifndef RROP
 #define RROP GXset
diff --git a/cfb/cfbscrinit.c b/cfb/cfbscrinit.c
index 83f5cf0a2..48e363971 100644
--- a/cfb/cfbscrinit.c
+++ b/cfb/cfbscrinit.c
@@ -59,7 +59,7 @@ cfbCloseScreen (index, pScreen)
     xfree (depths);
     xfree (pScreen->visuals);
 #ifdef CFB_NEED_SCREEN_PRIVATE
-    xfree (pScreen->devPrivates[cfbScreenPrivateIndex].ptr);
+    xfree (dixLookupPrivate(&pScreen->devPrivates, cfbScreenPrivateKey));
 #else
     xfree (pScreen->devPrivate);
 #endif
@@ -88,7 +88,7 @@ cfbSetupScreen(pScreen, pbits, xsize, ysize, dpix, dpiy, width)
     int dpix, dpiy;		/* dots per inch */
     int width;			/* pixel width of frame buffer */
 {
-    if (!cfbAllocatePrivates(pScreen, (int *) 0, (int *) 0))
+    if (!cfbAllocatePrivates(pScreen, NULL, NULL))
 	return FALSE;
     pScreen->defColormap = FakeClientID(0);
     /* let CreateDefColormap do whatever it wants for pixels */ 
@@ -132,9 +132,11 @@ cfbCreateScreenResources(pScreen)
     Bool retval;
 
     pointer oldDevPrivate = pScreen->devPrivate;
-    pScreen->devPrivate = pScreen->devPrivates[cfbScreenPrivateIndex].ptr;
+    pScreen->devPrivate = dixLookupPrivate(&pScreen->devPrivates,
+					   cfbScreenPrivateKey);
     retval = miCreateScreenResources(pScreen);
-    pScreen->devPrivates[cfbScreenPrivateIndex].ptr = pScreen->devPrivate;
+    dixSetPrivate(&pScreen->devPrivates, cfbScreenPrivateKey,
+		  pScreen->devPrivate);
     pScreen->devPrivate = oldDevPrivate;
     return retval;
 }
@@ -173,7 +175,8 @@ cfbFinishScreenInit(pScreen, pbits, xsize, ysize, dpix, dpiy, width)
     pScreen->CloseScreen = cfbCloseScreen;
 #ifdef CFB_NEED_SCREEN_PRIVATE
     pScreen->CreateScreenResources = cfbCreateScreenResources;
-    pScreen->devPrivates[cfbScreenPrivateIndex].ptr = pScreen->devPrivate;
+    dixSetPrivate(&pScreen->devPrivates, cfbScreenPrivateKey,
+		  pScreen->devPrivate);
     pScreen->devPrivate = oldDevPrivate;
 #endif
     pScreen->GetScreenPixmap = cfbGetScreenPixmap;
@@ -200,7 +203,8 @@ cfbGetScreenPixmap(pScreen)
     ScreenPtr pScreen;
 {
 #ifdef CFB_NEED_SCREEN_PRIVATE
-    return (PixmapPtr)pScreen->devPrivates[cfbScreenPrivateIndex].ptr;
+    return (PixmapPtr)dixLookupPrivate(&pScreen->devPrivates,
+				       cfbScreenPrivateKey);
 #else
     return (PixmapPtr)pScreen->devPrivate;
 #endif
@@ -212,8 +216,8 @@ cfbSetScreenPixmap(pPix)
 {
 #ifdef CFB_NEED_SCREEN_PRIVATE
     if (pPix)
-	pPix->drawable.pScreen->devPrivates[cfbScreenPrivateIndex].ptr =
-	    (pointer)pPix;
+	dixSetPrivate(&pPix->drawable.pScreen->devPrivates,
+		      cfbScreenPrivateKey, pPix);
 #else
     if (pPix)
 	pPix->drawable.pScreen->devPrivate = (pointer)pPix;
diff --git a/cfb/cfbwindow.c b/cfb/cfbwindow.c
index e04b73df2..49cc6f079 100644
--- a/cfb/cfbwindow.c
+++ b/cfb/cfbwindow.c
@@ -75,8 +75,8 @@ cfbCreateWindow(pWin)
 
 #ifdef PIXMAP_PER_WINDOW
     /* Setup pointer to Screen pixmap */
-    pWin->devPrivates[frameWindowPrivateIndex].ptr =
-	(pointer) cfbGetScreenPixmap(pWin->drawable.pScreen);
+    dixSetPrivate(&pWin->devPrivates, frameWindowPrivateKey,
+		  cfbGetScreenPixmap(pWin->drawable.pScreen));
 #endif
 
     return TRUE;
@@ -213,7 +213,7 @@ cfbCopyWindow(pWin, ptOldOrg, prgnSrc)
 
 /* swap in correct PaintWindow* routine.  If we can use a fast output
 routine (i.e. the pixmap is paddable to 32 bits), also pre-rotate a copy
-of it in devPrivates[cfbWindowPrivateIndex].ptr.
+of it in devPrivates under cfbWindowPrivateKey.
 */
 Bool
 cfbChangeWindowAttributes(pWin, mask)
diff --git a/composite/compalloc.c b/composite/compalloc.c
index f555411bf..dbb7f3a05 100644
--- a/composite/compalloc.c
+++ b/composite/compalloc.c
@@ -137,7 +137,7 @@ compRedirectWindow (ClientPtr pClient, WindowPtr pWin, int update)
 	cw->oldy = COMP_ORIGIN_INVALID;
 	cw->damageRegistered = FALSE;
 	cw->damaged = FALSE;
-	pWin->devPrivates[CompWindowPrivateIndex].ptr = cw;
+	dixSetPrivate(&pWin->devPrivates, CompWindowPrivateKey, cw);
     }
     ccw->next = cw->clients;
     cw->clients = ccw;
@@ -212,7 +212,7 @@ compFreeClientWindow (WindowPtr pWin, XID id)
 	
 	REGION_UNINIT (pScreen, &cw->borderClip);
     
-	pWin->devPrivates[CompWindowPrivateIndex].ptr = 0;
+	dixSetPrivate(&pWin->devPrivates, CompWindowPrivateKey, NULL);
 	xfree (cw);
     }
     else if (cw->update == CompositeRedirectAutomatic &&
@@ -297,7 +297,7 @@ compRedirectSubwindows (ClientPtr pClient, WindowPtr pWin, int update)
 	}
 	csw->update = CompositeRedirectAutomatic;
 	csw->clients = 0;
-	pWin->devPrivates[CompSubwindowsPrivateIndex].ptr = csw;
+	dixSetPrivate(&pWin->devPrivates, CompSubwindowsPrivateKey, csw);
     }
     /*
      * Redirect all existing windows
@@ -312,7 +312,7 @@ compRedirectSubwindows (ClientPtr pClient, WindowPtr pWin, int update)
 	    if (!csw->clients)
 	    {
 		xfree (csw);
-		pWin->devPrivates[CompSubwindowsPrivateIndex].ptr = 0;
+		dixSetPrivate(&pWin->devPrivates, CompSubwindowsPrivateKey, 0);
 	    }
 	    xfree (ccw);
 	    return ret;
@@ -385,7 +385,7 @@ compFreeClientSubwindows (WindowPtr pWin, XID id)
      */
     if (!csw->clients)
     {
-	pWin->devPrivates[CompSubwindowsPrivateIndex].ptr = 0;
+	dixSetPrivate(&pWin->devPrivates, CompSubwindowsPrivateKey, NULL);
 	xfree (csw);
     }
 }
diff --git a/composite/compext.c b/composite/compext.c
index 944f8d844..8d2a2d790 100644
--- a/composite/compext.c
+++ b/composite/compext.c
@@ -50,7 +50,7 @@
 #define SERVER_COMPOSITE_MINOR	4
 
 static CARD8	CompositeReqCode;
-static int	CompositeClientPrivateIndex;
+static DevPrivateKey CompositeClientPrivateKey = &CompositeClientPrivateKey;
 RESTYPE		CompositeClientWindowType;
 RESTYPE		CompositeClientSubwindowsType;
 static RESTYPE	CompositeClientOverlayType;
@@ -63,7 +63,8 @@ typedef struct _CompositeClient {
     int	    minor_version;
 } CompositeClientRec, *CompositeClientPtr;
 
-#define GetCompositeClient(pClient)    ((CompositeClientPtr) (pClient)->devPrivates[CompositeClientPrivateIndex].ptr)
+#define GetCompositeClient(pClient) ((CompositeClientPtr) \
+    dixLookupPrivate(&(pClient)->devPrivates, CompositeClientPrivateKey))
 
 static void
 CompositeClientCallback (CallbackListPtr	*list,
@@ -712,9 +713,8 @@ CompositeExtensionInit (void)
     if (!CompositeClientOverlayType)
 	return;
 
-    CompositeClientPrivateIndex = AllocateClientPrivateIndex ();
-    if (!AllocateClientPrivate (CompositeClientPrivateIndex, 
-				sizeof (CompositeClientRec)))
+    if (!dixRequestPrivate(CompositeClientPrivateKey,
+			   sizeof(CompositeClientRec)))
 	return;
     if (!AddCallback (&ClientStateCallback, CompositeClientCallback, 0))
 	return;
diff --git a/composite/compinit.c b/composite/compinit.c
index c557eebc4..757d92913 100644
--- a/composite/compinit.c
+++ b/composite/compinit.c
@@ -46,10 +46,9 @@
 
 #include "compint.h"
 
-int	CompScreenPrivateIndex;
-int	CompWindowPrivateIndex;
-int	CompSubwindowsPrivateIndex;
-static int	CompGeneration;
+DevPrivateKey CompScreenPrivateKey = &CompScreenPrivateKey;
+DevPrivateKey CompWindowPrivateKey = &CompWindowPrivateKey;
+DevPrivateKey CompSubwindowsPrivateKey = &CompSubwindowsPrivateKey;
 
 
 static Bool
@@ -87,7 +86,7 @@ compCloseScreen (int index, ScreenPtr pScreen)
     cs->pOverlayWin = NULL;
 
     xfree (cs);
-    pScreen->devPrivates[CompScreenPrivateIndex].ptr = 0;
+    dixSetPrivate(&pScreen->devPrivates, CompScreenPrivateKey, NULL);
     ret = (*pScreen->CloseScreen) (index, pScreen);
 
     return ret;
@@ -375,25 +374,6 @@ compScreenInit (ScreenPtr pScreen)
 {
     CompScreenPtr   cs;
 
-    if (CompGeneration != serverGeneration)
-    {
-	CompScreenPrivateIndex = AllocateScreenPrivateIndex ();
-	if (CompScreenPrivateIndex == -1)
-	    return FALSE;
-	CompWindowPrivateIndex = AllocateWindowPrivateIndex ();
-	if (CompWindowPrivateIndex == -1)
-	    return FALSE;
-	CompSubwindowsPrivateIndex = AllocateWindowPrivateIndex ();
-	if (CompSubwindowsPrivateIndex == -1)
-	    return FALSE;
-	CompGeneration = serverGeneration;
-    }
-    if (!AllocateWindowPrivate (pScreen, CompWindowPrivateIndex, 0))
-	return FALSE;
-
-    if (!AllocateWindowPrivate (pScreen, CompSubwindowsPrivateIndex, 0))
-	return FALSE;
-
     if (GetCompScreen (pScreen))
 	return TRUE;
     cs = (CompScreenPtr) xalloc (sizeof (CompScreenRec));
@@ -461,7 +441,7 @@ compScreenInit (ScreenPtr pScreen)
     cs->CloseScreen = pScreen->CloseScreen;
     pScreen->CloseScreen = compCloseScreen;
 
-    pScreen->devPrivates[CompScreenPrivateIndex].ptr = (pointer) cs;
+    dixSetPrivate(&pScreen->devPrivates, CompScreenPrivateKey, cs);
 
     RegisterRealChildHeadProc(CompositeRealChildHead);
 
diff --git a/composite/compint.h b/composite/compint.h
index 38b1777a2..79699e4c1 100644
--- a/composite/compint.h
+++ b/composite/compint.h
@@ -64,6 +64,7 @@
 #include "globals.h"
 #include "picturestr.h"
 #include "extnsionst.h"
+#include "privates.h"
 #include "mi.h"
 #include "damage.h"
 #include "damageextint.h"
@@ -159,13 +160,16 @@ typedef struct _CompScreen {
     
 } CompScreenRec, *CompScreenPtr;
 
-extern int  CompScreenPrivateIndex;
-extern int  CompWindowPrivateIndex;
-extern int  CompSubwindowsPrivateIndex;
+extern DevPrivateKey CompScreenPrivateKey;
+extern DevPrivateKey CompWindowPrivateKey;
+extern DevPrivateKey CompSubwindowsPrivateKey;
 
-#define GetCompScreen(s) ((CompScreenPtr) ((s)->devPrivates[CompScreenPrivateIndex].ptr))
-#define GetCompWindow(w) ((CompWindowPtr) ((w)->devPrivates[CompWindowPrivateIndex].ptr))
-#define GetCompSubwindows(w) ((CompSubwindowsPtr) ((w)->devPrivates[CompSubwindowsPrivateIndex].ptr))
+#define GetCompScreen(s) ((CompScreenPtr) \
+    dixLookupPrivate(&(s)->devPrivates, CompScreenPrivateKey))
+#define GetCompWindow(w) ((CompWindowPtr) \
+    dixLookupPrivate(&(w)->devPrivates, CompWindowPrivateKey))
+#define GetCompSubwindows(w) ((CompSubwindowsPtr) \
+    dixLookupPrivate(&(w)->devPrivates, CompSubwindowsPrivateKey))
 
 extern RESTYPE		CompositeClientWindowType;
 extern RESTYPE		CompositeClientSubwindowsType;
diff --git a/configure.ac b/configure.ac
index 8ed2ef8bf..43bc357e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1027,7 +1027,6 @@ AC_DEFINE(XTEST, 1, [Support XTest extension])
 AC_DEFINE(XSYNC, 1, [Support XSync extension])
 AC_DEFINE(XCMISC, 1, [Support XCMisc extension])
 AC_DEFINE(BIGREQS, 1, [Support BigRequests extension])
-AC_DEFINE(PIXPRIV, 1, [Support pixmap privates])
 
 if test "x$WDTRACE" != "xno" ; then
   DIX_LIB='$(top_builddir)/dix/dix.O'
diff --git a/damageext/damageext.c b/damageext/damageext.c
index e1724ecc7..159746536 100755
--- a/damageext/damageext.c
+++ b/damageext/damageext.c
@@ -29,7 +29,7 @@
 static unsigned char	DamageReqCode;
 static int		DamageEventBase;
 static int		DamageErrorBase;
-static int		DamageClientPrivateIndex;
+static DevPrivateKey	DamageClientPrivateKey = &DamageClientPrivateKey;
 static RESTYPE		DamageExtType;
 static RESTYPE		DamageExtWinType;
 
@@ -511,9 +511,7 @@ DamageExtensionInit(void)
     if (!DamageExtWinType)
 	return;
 
-    DamageClientPrivateIndex = AllocateClientPrivateIndex ();
-    if (!AllocateClientPrivate (DamageClientPrivateIndex, 
-				sizeof (DamageClientRec)))
+    if (!dixRequestPrivate(DamageClientPrivateKey, sizeof (DamageClientRec)))
 	return;
     if (!AddCallback (&ClientStateCallback, DamageClientCallback, 0))
 	return;
diff --git a/damageext/damageextint.h b/damageext/damageextint.h
index dfafc9319..e06f28c4e 100644
--- a/damageext/damageextint.h
+++ b/damageext/damageextint.h
@@ -48,7 +48,7 @@ typedef struct _DamageClient {
     int		critical;
 } DamageClientRec, *DamageClientPtr;
 
-#define GetDamageClient(pClient)    ((DamageClientPtr) (pClient)->devPrivates[DamageClientPrivateIndex].ptr)
+#define GetDamageClient(pClient) ((DamageClientPtr)dixLookupPrivate(&(pClient)->devPrivates, DamageClientPrivateKey))
 
 typedef struct _DamageExt {
     DamagePtr		pDamage;
diff --git a/dbe/dbe.c b/dbe/dbe.c
index aec626b79..223b0c983 100644
--- a/dbe/dbe.c
+++ b/dbe/dbe.c
@@ -58,19 +58,16 @@
 /* GLOBALS */
 
 /* Per-screen initialization functions [init'ed by DbeRegisterFunction()] */
-static Bool	(* DbeInitFunct[MAXSCREENS])();	/* pScreen, pDbeScreenPriv */
+static Bool (* DbeInitFunct[MAXSCREENS])();	/* pScreen, pDbeScreenPriv */
 
 /* These are static globals copied to DBE's screen private for use by DDX */
-static int	dbeScreenPrivIndex;
-static int	dbeWindowPrivIndex;
+static DevPrivateKey dbeScreenPrivKey = &dbeScreenPrivKey;
+static DevPrivateKey dbeWindowPrivKey = &dbeWindowPrivKey;
 
 /* These are static globals copied to DBE's screen private for use by DDX */
 static RESTYPE	dbeDrawableResType;
 static RESTYPE	dbeWindowPrivResType;
 
-/* This global is used by DbeAllocWinPrivPrivIndex() */
-static int	winPrivPrivCount = 0;
-
 /* Used to generate DBE's BadBuffer error. */
 static int	dbeErrorBase;
 
@@ -112,146 +109,6 @@ DbeRegisterFunction(ScreenPtr pScreen, Bool (*funct) (/* ??? */))
 
 } /* DbeRegisterFunction() */
 
-
-/******************************************************************************
- *
- * DBE DIX Procedure: DbeAllocWinPriv
- *
- * Description:
- *
- *     This function was cloned from AllocateWindow() in window.c.
- *     This function allocates a window priv structure to be associated 
- *     with a double-buffered window.
- *
- *****************************************************************************/
-static DbeWindowPrivPtr
-DbeAllocWinPriv(ScreenPtr pScreen)
-{
-    DbeWindowPrivPtr		pDbeWindowPriv;
-    DbeScreenPrivPtr		pDbeScreenPriv;
-    register char		*ptr;
-    register DevUnion		*ppriv;
-    register unsigned int	*sizes;
-    register unsigned int	size;
-    register int		i;
-
-    pDbeScreenPriv = DBE_SCREEN_PRIV(pScreen);
-    pDbeWindowPriv = (DbeWindowPrivPtr)xalloc(pDbeScreenPriv->totalWinPrivSize);
-
-    if (pDbeWindowPriv)
-    {
-        ppriv = (DevUnion *)(pDbeWindowPriv + 1);
-        pDbeWindowPriv->devPrivates = ppriv;
-        sizes = pDbeScreenPriv->winPrivPrivSizes;
-        ptr = (char *)(ppriv + pDbeScreenPriv->winPrivPrivLen);
-        for (i = pDbeScreenPriv->winPrivPrivLen; --i >= 0; ppriv++, sizes++)
-        {
-            if ((size = *sizes))
-            {
-                ppriv->ptr = (pointer)ptr;
-                ptr += size;
-            }
-            else
-                ppriv->ptr = (pointer)NULL;
-        }
-    }
-
-    return(pDbeWindowPriv);
-
-} /* DbeAllocWinPriv() */
-
-
-/******************************************************************************
- *
- * DBE DIX Procedure: DbeFallbackAllocWinPriv
- *
- * Description:
- *
- *     This is a fallback function for AllocWinPriv().
- *
- *****************************************************************************/
-
-#if 0 /* NOT USED */
-static DbeWindowPrivPtr
-DbeFallbackAllocWinPriv(pScreen)
-    ScreenPtr	pScreen;
-{
-    return (NULL);
-} /* DbeFallbackAllocWinPriv() */
-#endif
-
-
-/******************************************************************************
- *
- * DBE DIX Procedure: DbeAllocWinPrivPrivIndex
- *
- * Description:
- *
- *     This function was cloned from AllocateWindowPrivateIndex() in window.c.
- *     This function allocates a new window priv priv index by simply returning
- *     an incremented private counter.
- *
- *****************************************************************************/
-
-static int
-DbeAllocWinPrivPrivIndex(void)
-{
-    return winPrivPrivCount++;
-
-} /* DbeAllocWinPrivPrivIndex() */
-
-
-/******************************************************************************
- *
- * DBE DIX Procedure: DbeAllocWinPrivPriv
- *
- * Description:
- *
- *     This function was cloned from AllocateWindowPrivate() in privates.c.
- *     This function allocates a private structure to be hung off
- *     a window private.
- *
- *****************************************************************************/
-
-static Bool
-DbeAllocWinPrivPriv(register ScreenPtr pScreen, int index, unsigned int amount)
-{
-    DbeScreenPrivPtr	pDbeScreenPriv;
-    unsigned int	oldamount;
-
-
-    pDbeScreenPriv = DBE_SCREEN_PRIV(pScreen);
-
-    if (index >= pDbeScreenPriv->winPrivPrivLen)
-    {
-	unsigned *nsizes;
-	nsizes = (unsigned *)xrealloc(pDbeScreenPriv->winPrivPrivSizes,
-				      (index + 1) * sizeof(unsigned));
-	if (!nsizes)
-        {
-	    return(FALSE);
-        }
-
-	while (pDbeScreenPriv->winPrivPrivLen <= index)
-	{
-	    nsizes[pDbeScreenPriv->winPrivPrivLen++] = 0;
-	    pDbeScreenPriv->totalWinPrivSize += sizeof(DevUnion);
-	}
-
-	pDbeScreenPriv->winPrivPrivSizes = nsizes;
-    }
-
-    oldamount = pDbeScreenPriv->winPrivPrivSizes[index];
-
-    if (amount > oldamount)
-    {
-	pDbeScreenPriv->winPrivPrivSizes[index] = amount;
-	pDbeScreenPriv->totalWinPrivSize += (amount - oldamount);
-    }
-    return(TRUE);
-
-} /* DbeAllocWinPrivPriv() */
-
 
 /******************************************************************************
  *
@@ -269,9 +126,6 @@ DbeStubScreen(DbeScreenPrivPtr pDbeScreenPriv, int *nStubbedScreens)
 {
     /* Stub DIX. */
     pDbeScreenPriv->SetupBackgroundPainter = NULL;
-    pDbeScreenPriv->AllocWinPriv           = NULL;
-    pDbeScreenPriv->AllocWinPrivPrivIndex  = NULL;
-    pDbeScreenPriv->AllocWinPrivPriv       = NULL;
 
     /* Do not unwrap PositionWindow nor DestroyWindow.  If the DDX
      * initialization function failed, we assume that it did not wrap
@@ -439,11 +293,10 @@ ProcDbeAllocateBackBufferName(ClientPtr client)
          * Allocate a window priv.
          */
 
-        if (!(pDbeWindowPriv =
-            (*pDbeScreenPriv->AllocWinPriv)(pWin->drawable.pScreen)))
-        {
+        pDbeWindowPriv = (DbeWindowPrivPtr)xalloc(sizeof(DbeWindowPrivRec));
+	if (!pDbeWindowPriv)
             return(BadAlloc);
-        }
+	bzero(pDbeWindowPriv, sizeof(DbeWindowPrivRec));
 
         /* Make the window priv a DBE window priv resource. */
         if (!AddResource(stuff->buffer, dbeWindowPrivResType,
@@ -474,7 +327,7 @@ ProcDbeAllocateBackBufferName(ClientPtr client)
 
 
         /* Actually connect the window priv to the window. */
-        pWin->devPrivates[dbeWindowPrivIndex].ptr = (pointer)pDbeWindowPriv;
+	dixSetPrivate(&pWin->devPrivates, dbeWindowPrivKey, pDbeWindowPriv);
 
     } /* if -- There is no buffer associated with the window. */
 
@@ -1592,10 +1445,11 @@ DbeWindowPrivDelete(pointer pDbeWinPriv, XID id)
     if (pDbeWindowPriv->nBufferIDs == 0)
     {
         /* Reset the DBE window priv pointer. */
-        pDbeWindowPriv->pWindow->devPrivates[dbeWindowPrivIndex].ptr =
-            (pointer)NULL;
+	dixSetPrivate(&pDbeWindowPriv->pWindow->devPrivates, dbeWindowPrivKey,
+		      NULL);
 
         /* We are done with the window priv. */
+	dixFreePrivates(pDbeWindowPriv->devPrivates);
         xfree(pDbeWindowPriv);
     }
 
@@ -1622,12 +1476,6 @@ DbeResetProc(ExtensionEntry *extEntry)
     ScreenPtr		pScreen;
     DbeScreenPrivPtr	pDbeScreenPriv;
     
-
-    if (dbeScreenPrivIndex < 0)
-    {
-	return;
-    }
-
     for (i = 0; i < screenInfo.numScreens; i++)
     {
 	pScreen = screenInfo.screens[i];
@@ -1641,11 +1489,7 @@ DbeResetProc(ExtensionEntry *extEntry)
 	    if (pDbeScreenPriv->ResetProc)
 		(*pDbeScreenPriv->ResetProc)(pScreen);
 
-            if (pDbeScreenPriv->winPrivPrivSizes)
-            {
-	        xfree(pDbeScreenPriv->winPrivPrivSizes);
-            }
-
+	    dixFreePrivates(pDbeScreenPriv->devPrivates);
 	    xfree(pDbeScreenPriv);
 	}
     }
@@ -1766,21 +1610,6 @@ DbeExtensionInit(void)
     if(!noPanoramiXExtension) return;
 #endif
 
-    /* Allocate private pointers in windows and screens. */
-
-    if ((dbeScreenPrivIndex = AllocateScreenPrivateIndex()) < 0)
-    {
-	return;
-    }
-
-    if ((dbeWindowPrivIndex = AllocateWindowPrivateIndex()) < 0)
-    {
-	return;
-    }
-
-    /* Initialize the priv priv counts between server generations. */
-    winPrivPrivCount  = 0;
-
     /* Create the resource types. */
     dbeDrawableResType =
         CreateNewResourceType(DbeDrawableDelete) | RC_DRAWABLE;
@@ -1795,8 +1624,7 @@ DbeExtensionInit(void)
 
 	pScreen = screenInfo.screens[i];
 
-	if (!AllocateWindowPrivate(pScreen, dbeWindowPrivIndex, 0) ||
-	    !(pDbeScreenPriv =
+	if (!(pDbeScreenPriv =
              (DbeScreenPrivPtr)Xcalloc(sizeof(DbeScreenPrivRec))))
 	{
             /* If we can not alloc a window or screen private,
@@ -1805,28 +1633,23 @@ DbeExtensionInit(void)
 
 	    for (j = 0; j < i; j++)
 	    {
-	      xfree(screenInfo.screens[j]->devPrivates[dbeScreenPrivIndex].ptr);
-              screenInfo.screens[j]->devPrivates[dbeScreenPrivIndex].ptr = NULL;
+		xfree(dixLookupPrivate(&screenInfo.screens[j]->devPrivates,
+				       dbeScreenPrivKey));
+		dixSetPrivate(&screenInfo.screens[j]->devPrivates,
+			      dbeScreenPrivKey, NULL);
 	    }
 	    return;
 	}
 
-	pScreen->devPrivates[dbeScreenPrivIndex].ptr = (pointer)pDbeScreenPriv;
-
-        /* Store the DBE priv priv size info for later use when allocating
-         * priv privs at the driver level.
-         */
-        pDbeScreenPriv->winPrivPrivLen   = 0;
-        pDbeScreenPriv->winPrivPrivSizes = (unsigned *)NULL;
-        pDbeScreenPriv->totalWinPrivSize = sizeof(DbeWindowPrivRec);
+	dixSetPrivate(&pScreen->devPrivates, dbeScreenPrivKey, pDbeScreenPriv);
 
         /* Copy the resource types */
         pDbeScreenPriv->dbeDrawableResType   = dbeDrawableResType;
         pDbeScreenPriv->dbeWindowPrivResType = dbeWindowPrivResType;
 
         /* Copy the private indices */
-        pDbeScreenPriv->dbeScreenPrivIndex = dbeScreenPrivIndex;
-        pDbeScreenPriv->dbeWindowPrivIndex = dbeWindowPrivIndex;
+        pDbeScreenPriv->dbeScreenPrivKey = dbeScreenPrivKey;
+        pDbeScreenPriv->dbeWindowPrivKey = dbeWindowPrivKey;
 
         if(DbeInitFunct[i])
         {
@@ -1834,9 +1657,6 @@ DbeExtensionInit(void)
 
             /* Setup DIX. */
             pDbeScreenPriv->SetupBackgroundPainter = DbeSetupBackgroundPainter; 
-            pDbeScreenPriv->AllocWinPriv           = DbeAllocWinPriv;
-            pDbeScreenPriv->AllocWinPrivPrivIndex  = DbeAllocWinPrivPrivIndex;
-            pDbeScreenPriv->AllocWinPrivPriv       = DbeAllocWinPrivPriv;
 
             /* Setup DDX. */
             ddxInitSuccess = (*DbeInitFunct[i])(pScreen, pDbeScreenPriv);
@@ -1868,9 +1688,6 @@ DbeExtensionInit(void)
 #ifndef DISABLE_MI_DBE_BY_DEFAULT
             /* Setup DIX. */
             pDbeScreenPriv->SetupBackgroundPainter = DbeSetupBackgroundPainter; 
-            pDbeScreenPriv->AllocWinPriv           = DbeAllocWinPriv;
-            pDbeScreenPriv->AllocWinPrivPrivIndex  = DbeAllocWinPrivPrivIndex;
-            pDbeScreenPriv->AllocWinPrivPriv       = DbeAllocWinPrivPriv;
 
             /* Setup DDX. */
             ddxInitSuccess = miDbeInit(pScreen, pDbeScreenPriv);
@@ -1909,8 +1726,9 @@ DbeExtensionInit(void)
 
         for (i = 0; i < screenInfo.numScreens; i++)
         {
-             xfree(screenInfo.screens[i]->devPrivates[dbeScreenPrivIndex].ptr);
-             pScreen->devPrivates[dbeScreenPrivIndex].ptr = NULL;
+		xfree(dixLookupPrivate(&screenInfo.screens[i]->devPrivates,
+				       dbeScreenPrivKey));
+		dixSetPrivate(&pScreen->devPrivates, dbeScreenPrivKey, NULL);
         }
         return;
     }
diff --git a/dbe/dbestruct.h b/dbe/dbestruct.h
index 90f13428a..7d5a115ad 100644
--- a/dbe/dbestruct.h
+++ b/dbe/dbestruct.h
@@ -39,14 +39,13 @@
 #define NEED_DBE_PROTOCOL
 #include <X11/extensions/Xdbeproto.h>
 #include "windowstr.h"
+#include "privates.h"
 
 
 /* DEFINES */
 
-#define DBE_SCREEN_PRIV(pScreen) \
-    ((dbeScreenPrivIndex < 0) ? \
-     NULL : \
-     ((DbeScreenPrivPtr)((pScreen)->devPrivates[dbeScreenPrivIndex].ptr)))
+#define DBE_SCREEN_PRIV(pScreen) ((DbeScreenPrivPtr) \
+    dixLookupPrivate(&(pScreen)->devPrivates, dbeScreenPrivKey))
 
 #define DBE_SCREEN_PRIV_FROM_DRAWABLE(pDrawable) \
     DBE_SCREEN_PRIV((pDrawable)->pScreen)
@@ -63,10 +62,8 @@
 #define DBE_SCREEN_PRIV_FROM_GC(pGC)\
     DBE_SCREEN_PRIV((pGC)->pScreen)
 
-#define DBE_WINDOW_PRIV(pWindow)\
-    ((dbeWindowPrivIndex < 0) ? \
-     NULL : \
-     ((DbeWindowPrivPtr)(pWindow->devPrivates[dbeWindowPrivIndex].ptr)))
+#define DBE_WINDOW_PRIV(pWin) ((DbeWindowPrivPtr) \
+    dixLookupPrivate(&(pWin)->devPrivates, dbeWindowPrivKey))
 
 /* Initial size of the buffer ID array in the window priv. */
 #define DBE_INIT_MAX_IDS	2
@@ -142,7 +139,7 @@ typedef struct _DbeWindowPrivRec
 
     /* Device-specific private information.
      */
-    DevUnion		*devPrivates;
+    PrivateRec		*devPrivates;
 
 } DbeWindowPrivRec, *DbeWindowPrivPtr;
 
@@ -155,18 +152,13 @@ typedef struct _DbeWindowPrivRec
 
 typedef struct _DbeScreenPrivRec
 {
-    /* Info for creating window privs */
-    int          winPrivPrivLen;    /* Length of privs in DbeWindowPrivRec   */
-    unsigned int *winPrivPrivSizes; /* Array of private record sizes         */
-    unsigned int totalWinPrivSize;  /* PrivRec + size of all priv priv ptrs  */
-
     /* Resources created by DIX to be used by DDX */
     RESTYPE	dbeDrawableResType;
     RESTYPE	dbeWindowPrivResType;
 
     /* Private indices created by DIX to be used by DDX */
-    int		dbeScreenPrivIndex;
-    int		dbeWindowPrivIndex;
+    DevPrivateKey dbeScreenPrivKey;
+    DevPrivateKey dbeWindowPrivKey;
 
     /* Wrapped functions
      * It is the responsibilty of the DDX layer to wrap PositionWindow().
@@ -180,17 +172,6 @@ typedef struct _DbeScreenPrivRec
 		WindowPtr /*pWin*/,
 		GCPtr /*pGC*/
 );
-    DbeWindowPrivPtr (*AllocWinPriv)(
-		ScreenPtr /*pScreen*/
-);
-    int		(*AllocWinPrivPrivIndex)(
-		void
-);
-    Bool	(*AllocWinPrivPriv)(
-		ScreenPtr /*pScreen*/,
-		int /*index*/,
-		unsigned /*amount*/
-);
 
     /* Per-screen DDX routines */
     Bool	(*GetVisualInfo)(
@@ -223,7 +204,7 @@ typedef struct _DbeScreenPrivRec
 
     /* Device-specific private information.
      */
-    DevUnion	*devPrivates;
+    PrivateRec	*devPrivates;
 
 } DbeScreenPrivRec, *DbeScreenPrivPtr;
 
diff --git a/dbe/midbe.c b/dbe/midbe.c
index 014e365ce..f26a09c6d 100644
--- a/dbe/midbe.c
+++ b/dbe/midbe.c
@@ -59,12 +59,11 @@
 
 #include <stdio.h>
 
-static int	miDbePrivPrivGeneration  =  0;
-static int	miDbeWindowPrivPrivIndex = -1;
+static DevPrivateKey miDbeWindowPrivPrivKey = &miDbeWindowPrivPrivKey;
 static RESTYPE	dbeDrawableResType;
 static RESTYPE	dbeWindowPrivResType;
-static int	dbeScreenPrivIndex = -1;
-static int	dbeWindowPrivIndex = -1;
+static DevPrivateKey dbeScreenPrivKey = &dbeScreenPrivKey;
+static DevPrivateKey dbeWindowPrivKey = &dbeWindowPrivKey;
 
 
 /******************************************************************************
@@ -204,8 +203,8 @@ miDbeAllocBackBufferName(WindowPtr pWin, XID bufId, int swapAction)
 
 
         /* Attach the priv priv to the priv. */
-	pDbeWindowPriv->devPrivates[miDbeWindowPrivPrivIndex].ptr =
-            (pointer)pDbeWindowPrivPriv;
+	dixSetPrivate(&pDbeWindowPriv->devPrivates, miDbeWindowPrivPrivKey,
+		      pDbeWindowPrivPriv);
 
 
         /* Clear the back buffer. */
@@ -778,30 +777,12 @@ miDbeInit(ScreenPtr pScreen, DbeScreenPrivPtr pDbeScreenPriv)
     dbeWindowPrivResType = pDbeScreenPriv->dbeWindowPrivResType;
 
     /* Copy private indices created by DIX */
-    dbeScreenPrivIndex = pDbeScreenPriv->dbeScreenPrivIndex;
-    dbeWindowPrivIndex = pDbeScreenPriv->dbeWindowPrivIndex;
+    dbeScreenPrivKey = pDbeScreenPriv->dbeScreenPrivKey;
+    dbeWindowPrivKey = pDbeScreenPriv->dbeWindowPrivKey;
 
-    /* Reset the window priv privs if generations do not match. */
-    if (miDbePrivPrivGeneration != serverGeneration)
-    {
-        /*
-         **********************************************************************
-         ** Allocate the window priv priv.
-         **********************************************************************
-         */
-
-        miDbeWindowPrivPrivIndex = (*pDbeScreenPriv->AllocWinPrivPrivIndex)();
-
-        /* Make sure we only do this code once. */
-	miDbePrivPrivGeneration = serverGeneration;
-
-    } /* if -- Reset priv privs. */
-
-    if (!(*pDbeScreenPriv->AllocWinPrivPriv)(pScreen,
-        miDbeWindowPrivPrivIndex, sizeof(MiDbeWindowPrivPrivRec)))
-    {
+    if (!dixRequestPrivate(miDbeWindowPrivPrivKey,
+			   sizeof(MiDbeWindowPrivPrivRec)))
         return(FALSE);
-    }
 
     /* Wrap functions. */
     pDbeScreenPriv->PositionWindow = pScreen->PositionWindow;
diff --git a/dbe/midbestr.h b/dbe/midbestr.h
index 1ad0104aa..ae9f206fc 100644
--- a/dbe/midbestr.h
+++ b/dbe/midbestr.h
@@ -42,19 +42,15 @@
 /* DEFINES */
 
 #define MI_DBE_WINDOW_PRIV_PRIV(pDbeWindowPriv) \
-    (((miDbeWindowPrivPrivIndex < 0) || (!pDbeWindowPriv)) ? \
-    NULL : \
-    ((MiDbeWindowPrivPrivPtr) \
-     ((pDbeWindowPriv)->devPrivates[miDbeWindowPrivPrivIndex].ptr)))
+    (!(pDbeWindowPriv) ? NULL : (MiDbeWindowPrivPrivPtr) \
+     dixLookupPrivate(&(pDbeWindowPriv)->devPrivates, miDbeWindowPrivPrivKey))
 
 #define MI_DBE_WINDOW_PRIV_PRIV_FROM_WINDOW(pWin)\
     MI_DBE_WINDOW_PRIV_PRIV(DBE_WINDOW_PRIV(pWin))
 
 #define MI_DBE_SCREEN_PRIV_PRIV(pDbeScreenPriv) \
-    (((miDbeScreenPrivPrivIndex < 0) || (!pDbeScreenPriv)) ? \
-    NULL : \
-    ((MiDbeScreenPrivPrivPtr) \
-     ((pDbeScreenPriv)->devPrivates[miDbeScreenPrivPrivIndex].ptr)))
+    (!(pDbeScreenPriv) ? NULL : (MiDbeScreenPrivPrivPtr) \
+     dixLookupPrivate(&(pDbeScreenPriv)->devPrivates, miDbeScreenPrivPrivKey))
 
 
 /* TYPEDEFS */
diff --git a/dix/colormap.c b/dix/colormap.c
index 7d6e7da4f..98f2f1b22 100644
--- a/dix/colormap.c
+++ b/dix/colormap.c
@@ -67,7 +67,6 @@ SOFTWARE.
 #include "xace.h"
 
 extern XID clientErrorValue;
-extern int colormapPrivateCount;
 
 static Pixel FindBestPixel(
     EntryPtr /*pentFirst*/,
@@ -388,30 +387,11 @@ CreateColormap (Colormap mid, ScreenPtr pScreen, VisualPtr pVisual,
 	    pmap->numPixelsBlue[client] = size;
 	}
     }
-    if (!AddResource(mid, RT_COLORMAP, (pointer)pmap))
-	return (BadAlloc);
-    /* If the device wants a chance to initialize the colormap in any way,
-     * this is it.  In specific, if this is a Static colormap, this is the
-     * time to fill in the colormap's values */
+    pmap->devPrivates = NULL;
     pmap->flags |= BeingCreated;
 
-
-    /*
-     * Allocate the array of devPrivate's for this colormap.
-     */
-
-    if (colormapPrivateCount == 0)
-	pmap->devPrivates = NULL;
-    else
-    {
-	pmap->devPrivates = (DevUnion *) xcalloc (
-	    sizeof(DevUnion), colormapPrivateCount);
-	if (!pmap->devPrivates)
-	{
-	    FreeResource (mid, RT_NONE);
-	    return BadAlloc;
-	}
-    }
+    if (!AddResource(mid, RT_COLORMAP, (pointer)pmap))
+	return (BadAlloc);
 
     /*  
      * Security creation/labeling check
@@ -423,6 +403,9 @@ CreateColormap (Colormap mid, ScreenPtr pScreen, VisualPtr pVisual,
 	return i;
     }
 
+    /* If the device wants a chance to initialize the colormap in any way,
+     * this is it.  In specific, if this is a Static colormap, this is the
+     * time to fill in the colormap's values */
     if (!(*pScreen->CreateColormap)(pmap))
     {
 	FreeResource (mid, RT_NONE);
@@ -486,10 +469,7 @@ FreeColormap (pointer value, XID mid)
         }
     }
 
-    dixFreePrivates(*DEVPRIV_PTR(pmap));
-    if (pmap->devPrivates)
-	xfree(pmap->devPrivates);
-
+    dixFreePrivates(pmap->devPrivates);
     xfree(pmap);
     return(Success);
 }
diff --git a/dix/devices.c b/dix/devices.c
index 4ddfa63da..a62ab6580 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -85,8 +85,7 @@ SOFTWARE.
  * This file handles input device-related stuff.
  */
 
-int CoreDevicePrivatesIndex = 0;
-static int CoreDevicePrivatesGeneration = -1;
+DevPrivateKey CoreDevicePrivateKey = &CoreDevicePrivateKey;
 
 /**
  * Create a new input device and init it to sane values. The device is added
@@ -151,14 +150,7 @@ AddInputDevice(DeviceProc deviceProc, Bool autoStart)
     dev->xkb_interest = NULL;
 #endif
     dev->config_info = NULL;
-    /* must pre-allocate one private for the new devPrivates support */
-    dev->nPrivates = 1;
-    dev->devPrivates = (DevUnion *)xcalloc(1, sizeof(DevUnion));
-    if (!dev->devPrivates) {
-	xfree(dev);
-	return NULL;
-    }
-
+    dev->devPrivates = NULL;
     dev->unwrapProc = NULL;
     dev->coreEvents = TRUE;
     dev->inited = FALSE;
@@ -358,7 +350,7 @@ CoreKeyboardProc(DeviceIntPtr pDev, int what)
         break;
 
     case DEVICE_CLOSE:
-        pDev->devPrivates[CoreDevicePrivatesIndex].ptr = NULL;
+	dixSetPrivate(&pDev->devPrivates, CoreDevicePrivateKey, NULL);
         break;
 
     default:
@@ -390,7 +382,7 @@ CorePointerProc(DeviceIntPtr pDev, int what)
         break;
 
     case DEVICE_CLOSE:
-        pDev->devPrivates[CoreDevicePrivatesIndex].ptr = NULL;
+	dixSetPrivate(&pDev->devPrivates, CoreDevicePrivateKey, NULL);
         break;
 
     default:
@@ -411,11 +403,6 @@ InitCoreDevices(void)
 {
     DeviceIntPtr dev;
 
-    if (CoreDevicePrivatesGeneration != serverGeneration) {
-        CoreDevicePrivatesIndex = AllocateDevicePrivateIndex();
-        CoreDevicePrivatesGeneration = serverGeneration;
-    }
-
     if (!inputInfo.keyboard) {
         dev = AddInputDevice(CoreKeyboardProc, TRUE);
         if (!dev)
@@ -433,9 +420,6 @@ InitCoreDevices(void)
         dev->ActivateGrab = ActivateKeyboardGrab;
         dev->DeactivateGrab = DeactivateKeyboardGrab;
         dev->coreEvents = FALSE;
-        if (!AllocateDevicePrivate(dev, CoreDevicePrivatesIndex))
-            FatalError("Couldn't allocate keyboard devPrivates\n");
-        dev->devPrivates[CoreDevicePrivatesIndex].ptr = NULL;
         (void)ActivateDevice(dev);
         inputInfo.keyboard = dev;
     }
@@ -457,9 +441,6 @@ InitCoreDevices(void)
         dev->ActivateGrab = ActivatePointerGrab;
         dev->DeactivateGrab = DeactivatePointerGrab;
         dev->coreEvents = FALSE;
-        if (!AllocateDevicePrivate(dev, CoreDevicePrivatesIndex))
-            FatalError("Couldn't allocate pointer devPrivates\n");
-        dev->devPrivates[CoreDevicePrivatesIndex].ptr = NULL;
         (void)ActivateDevice(dev);
         inputInfo.pointer = dev;
     }
@@ -609,11 +590,8 @@ CloseDevice(DeviceIntPtr dev)
 	XkbRemoveResourceClient((DevicePtr)dev,dev->xkb_interest->resource);
 #endif
 
-    dixFreePrivates(*DEVPRIV_PTR(dev));
-    if (dev->devPrivates)
-	xfree(dev->devPrivates);
-
     xfree(dev->sync.event);
+    dixFreePrivates(dev->devPrivates);
     xfree(dev);
 }
 
diff --git a/dix/dispatch.c b/dix/dispatch.c
index bb30619a2..1ad3c9437 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -3692,7 +3692,7 @@ CloseDownClient(ClientPtr client)
 #ifdef SMART_SCHEDULE
 	SmartLastClient = NullClient;
 #endif
-	dixFreePrivates(*DEVPRIV_PTR(client));
+	dixFreePrivates(client->devPrivates);
 	xfree(client);
 
 	while (!clients[currentMaxClients-1])
@@ -3712,10 +3712,6 @@ KillAllClients(void)
         }
 }
 
-extern int clientPrivateLen;
-extern unsigned *clientPrivateSizes;
-extern unsigned totalClientSize;
-
 void InitClient(ClientPtr client, int i, pointer ospriv)
 {
     client->index = i;
@@ -3735,6 +3731,7 @@ void InitClient(ClientPtr client, int i, pointer ospriv)
     client->big_requests = FALSE;
     client->priority = 0;
     client->clientState = ClientStateInitial;
+    client->devPrivates = NULL;
 #ifdef XKB
     if (!noXkbExtension) {
 	client->xkbClientFlags = 0;
@@ -3755,54 +3752,6 @@ void InitClient(ClientPtr client, int i, pointer ospriv)
 #endif
 }
 
-int
-InitClientPrivates(ClientPtr client)
-{
-    char *ptr;
-    DevUnion *ppriv;
-    unsigned *sizes;
-    unsigned size;
-    int i;
-
-    if (totalClientSize == sizeof(ClientRec))
-	ppriv = (DevUnion *)NULL;
-    else if (client->index)
-	ppriv = (DevUnion *)(client + 1);
-    else
-    {
-	ppriv = (DevUnion *)xalloc(totalClientSize - sizeof(ClientRec));
-	if (!ppriv)
-	    return 0;
-    }
-    client->devPrivates = ppriv;
-    sizes = clientPrivateSizes;
-    ptr = (char *)(ppriv + clientPrivateLen);
-    if (ppriv)
-	bzero(ppriv, totalClientSize - sizeof(ClientRec));
-    for (i = clientPrivateLen; --i >= 0; ppriv++, sizes++)
-    {
-	if ( (size = *sizes) )
-	{
-	    ppriv->ptr = (pointer)ptr;
-	    ptr += size;
-	}
-	else
-	    ppriv->ptr = (pointer)NULL;
-    }
-
-    /* Allow registrants to initialize the serverClient devPrivates */
-    if (!client->index && ClientStateCallback)
-    {
-	NewClientInfoRec clientinfo;
-
-	clientinfo.client = client; 
-	clientinfo.prefix = (xConnSetupPrefix *)NULL;  
-	clientinfo.setup = (xConnSetup *) NULL;
-	CallCallbacks((&ClientStateCallback), (pointer)&clientinfo);
-    } 
-    return 1;
-}
-
 /************************
  * int NextAvailableClient(ospriv)
  *
@@ -3819,11 +3768,10 @@ ClientPtr NextAvailableClient(pointer ospriv)
     i = nextFreeClientID;
     if (i == MAXCLIENTS)
 	return (ClientPtr)NULL;
-    clients[i] = client = (ClientPtr)xalloc(totalClientSize);
+    clients[i] = client = (ClientPtr)xalloc(sizeof(ClientRec));
     if (!client)
 	return (ClientPtr)NULL;
     InitClient(client, i, ospriv);
-    InitClientPrivates(client);
     if (!InitClientResources(client))
     {
 	xfree(client);
diff --git a/dix/extension.c b/dix/extension.c
index ec47ef19c..c81c1a123 100644
--- a/dix/extension.c
+++ b/dix/extension.c
@@ -73,39 +73,6 @@ int lastEvent = EXTENSION_EVENT_BASE;
 static int lastError = FirstExtensionError;
 static unsigned int NumExtensions = 0;
 
-extern int extensionPrivateLen;
-extern unsigned *extensionPrivateSizes;
-extern unsigned totalExtensionSize;
-
-static void
-InitExtensionPrivates(ExtensionEntry *ext)
-{
-    char *ptr;
-    DevUnion *ppriv;
-    unsigned *sizes;
-    unsigned size;
-    int i;
-
-    if (totalExtensionSize == sizeof(ExtensionEntry))
-	ppriv = (DevUnion *)NULL;
-    else
-	ppriv = (DevUnion *)(ext + 1);
-
-    ext->devPrivates = ppriv;
-    sizes = extensionPrivateSizes;
-    ptr = (char *)(ppriv + extensionPrivateLen);
-    for (i = extensionPrivateLen; --i >= 0; ppriv++, sizes++)
-    {
-	if ( (size = *sizes) )
-	{
-	    ppriv->ptr = (pointer)ptr;
-	    ptr += size;
-	}
-	else
-	    ppriv->ptr = (pointer)NULL;
-    }
-}
-
 _X_EXPORT ExtensionEntry *
 AddExtension(char *name, int NumEvents, int NumErrors, 
 	     int (*MainProc)(ClientPtr c1), 
@@ -122,14 +89,13 @@ AddExtension(char *name, int NumEvents, int NumErrors,
 	        (unsigned)(lastError + NumErrors > LAST_ERROR))
         return((ExtensionEntry *) NULL);
 
-    ext = (ExtensionEntry *) xalloc(totalExtensionSize);
+    ext = (ExtensionEntry *) xalloc(sizeof(ExtensionEntry));
     if (!ext)
 	return((ExtensionEntry *) NULL);
-    bzero(ext, totalExtensionSize);
-    InitExtensionPrivates(ext);
     ext->name = (char *)xalloc(strlen(name) + 1);
     ext->num_aliases = 0;
     ext->aliases = (char **)NULL;
+    ext->devPrivates = NULL;
     if (!ext->name)
     {
 	xfree(ext);
@@ -283,7 +249,7 @@ CloseDownExtensions(void)
 	for (j = extensions[i]->num_aliases; --j >= 0;)
 	    xfree(extensions[i]->aliases[j]);
 	xfree(extensions[i]->aliases);
-	dixFreePrivates(*DEVPRIV_PTR(extensions[i]));
+	dixFreePrivates(extensions[i]->devPrivates);
 	xfree(extensions[i]);
     }
     xfree(extensions);
diff --git a/dix/gc.c b/dix/gc.c
index ccd586bdd..d77932c9e 100644
--- a/dix/gc.c
+++ b/dix/gc.c
@@ -573,45 +573,13 @@ BUG:
    should check for failure to create default tile
 
 */
-
-static GCPtr
-AllocateGC(ScreenPtr pScreen)
-{
-    GCPtr pGC;
-    char *ptr;
-    DevUnion *ppriv;
-    unsigned *sizes;
-    unsigned size;
-    int i;
-
-    pGC = (GCPtr)xalloc(pScreen->totalGCSize);
-    if (pGC)
-    {
-	ppriv = (DevUnion *)(pGC + 1);
-	pGC->devPrivates = ppriv;
-	sizes = pScreen->GCPrivateSizes;
-	ptr = (char *)(ppriv + pScreen->GCPrivateLen);
-	for (i = pScreen->GCPrivateLen; --i >= 0; ppriv++, sizes++)
-	{
-	    if ( (size = *sizes) )
-	    {
-		ppriv->ptr = (pointer)ptr;
-		ptr += size;
-	    }
-	    else
-		ppriv->ptr = (pointer)NULL;
-	}
-    }
-    return pGC;
-}
-
 _X_EXPORT GCPtr
 CreateGC(DrawablePtr pDrawable, BITS32 mask, XID *pval, int *pStatus,
 	 XID gcid, ClientPtr client)
 {
     GCPtr pGC;
 
-    pGC = AllocateGC(pDrawable->pScreen);
+    pGC = (GCPtr)xalloc(sizeof(GC));
     if (!pGC)
     {
 	*pStatus = BadAlloc;
@@ -624,7 +592,7 @@ CreateGC(DrawablePtr pDrawable, BITS32 mask, XID *pval, int *pStatus,
     pGC->planemask = ~0;
     pGC->serialNumber = GC_CHANGE_SERIAL_BIT;
     pGC->funcs = 0;
-
+    pGC->devPrivates = NULL;
     pGC->fgPixel = 0;
     pGC->bgPixel = 1;
     pGC->lineWidth = 0;
@@ -918,7 +886,7 @@ FreeGC(pointer value, XID gid)
     (*pGC->funcs->DestroyGC) (pGC);
     if (pGC->dash != DefaultDash)
 	xfree(pGC->dash);
-    dixFreePrivates(*DEVPRIV_PTR(pGC));
+    dixFreePrivates(pGC->devPrivates);
     xfree(pGC);
     return(Success);
 }
@@ -941,7 +909,7 @@ CreateScratchGC(ScreenPtr pScreen, unsigned depth)
 {
     GCPtr pGC;
 
-    pGC = AllocateGC(pScreen);
+    pGC = (GCPtr)xalloc(sizeof(GC));
     if (!pGC)
 	return (GCPtr)NULL;
 
@@ -950,7 +918,7 @@ CreateScratchGC(ScreenPtr pScreen, unsigned depth)
     pGC->alu = GXcopy; /* dst <- src */
     pGC->planemask = ~0;
     pGC->serialNumber = 0;
-
+    pGC->devPrivates = NULL;
     pGC->fgPixel = 0;
     pGC->bgPixel = 1;
     pGC->lineWidth = 0;
diff --git a/dix/getevents.c b/dix/getevents.c
index 68993030d..a12bcfd78 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -725,7 +725,8 @@ SwitchCoreKeyboard(DeviceIntPtr pDev)
     KeyClassPtr ckeyc = inputInfo.keyboard->key;
     int i = 0;
 
-    if (inputInfo.keyboard->devPrivates[CoreDevicePrivatesIndex].ptr != pDev) {
+    if (pDev != dixLookupPrivate(&inputInfo.keyboard->devPrivates,
+				 CoreDevicePrivateKey)) {
         memcpy(ckeyc->modifierMap, pDev->key->modifierMap, MAP_LENGTH);
         if (ckeyc->modifierKeyMap)
             xfree(ckeyc->modifierKeyMap);
@@ -769,7 +770,8 @@ SwitchCoreKeyboard(DeviceIntPtr pDev)
                           (ckeyc->curKeySyms.maxKeyCode -
                            ckeyc->curKeySyms.minKeyCode),
                           serverClient);
-        inputInfo.keyboard->devPrivates[CoreDevicePrivatesIndex].ptr = pDev;
+	dixSetPrivate(&inputInfo.keyboard->devPrivates, CoreDevicePrivateKey,
+		      pDev);
     }
 }
 
@@ -783,8 +785,10 @@ SwitchCoreKeyboard(DeviceIntPtr pDev)
 _X_EXPORT void
 SwitchCorePointer(DeviceIntPtr pDev)
 {
-    if (inputInfo.pointer->devPrivates[CoreDevicePrivatesIndex].ptr != pDev)
-        inputInfo.pointer->devPrivates[CoreDevicePrivatesIndex].ptr = pDev;
+    if (pDev != dixLookupPrivate(&inputInfo.pointer->devPrivates,
+				 CoreDevicePrivateKey))
+	dixSetPrivate(&inputInfo.pointer->devPrivates,
+		      CoreDevicePrivateKey, pDev);
 }
 
 
diff --git a/dix/main.c b/dix/main.c
index 3e5d0e438..7f7bfa539 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -118,15 +118,12 @@ Equipment Corporation.
 #include "dpmsproc.h"
 #endif
 
-extern int InitClientPrivates(ClientPtr client);
-
 extern void Dispatch(void);
 
 char *ConnectionInfo;
 xConnSetupPrefix connSetupPrefix;
 
 extern FontPtr defaultFont;
-extern int screenPrivateCount;
 
 extern void InitProcVectors(void);
 extern Bool CreateGCperDepthArray(void);
@@ -136,8 +133,6 @@ static
 #endif
 Bool CreateConnectionBlock(void);
 
-static void FreeScreen(ScreenPtr);
-
 _X_EXPORT PaddingInfo PixmapWidthPaddingInfo[33];
 
 int connBlockScreenStart;
@@ -372,8 +367,6 @@ main(int argc, char *argv[], char *envp[])
 	if (screenInfo.numVideoScreens < 0)
 	    screenInfo.numVideoScreens = screenInfo.numScreens;
 	InitExtensions(argc, argv);
-	if (!InitClientPrivates(serverClient))
-	    FatalError("failed to allocate serverClient devprivates");
 	for (i = 0; i < screenInfo.numScreens; i++)
 	{
 	    ScreenPtr pScreen = screenInfo.screens[i];
@@ -472,7 +465,8 @@ main(int argc, char *argv[], char *envp[])
 	    FreeGCperDepth(i);
 	    FreeDefaultStipple(i);
 	    (* screenInfo.screens[i]->CloseScreen)(i, screenInfo.screens[i]);
-	    FreeScreen(screenInfo.screens[i]);
+	    dixFreePrivates(screenInfo.screens[i]->devPrivates);
+	    xfree(screenInfo.screens[i]);
 	    screenInfo.numScreens = i;
 	}
   	CloseDownEvents();
@@ -482,8 +476,7 @@ main(int argc, char *argv[], char *envp[])
 
 	FreeAuditTimer();
 
-	dixFreePrivates(*DEVPRIV_PTR(serverClient));
-	xfree(serverClient->devPrivates);
+	dixFreePrivates(serverClient->devPrivates);
 	serverClient->devPrivates = NULL;
 
 	if (dispatchException & DE_TERMINATE)
@@ -695,32 +688,9 @@ AddScreen(
     if (!pScreen)
 	return -1;
 
-    pScreen->devPrivates = (DevUnion *)xcalloc(sizeof(DevUnion),
-						screenPrivateCount);
-    if (!pScreen->devPrivates && screenPrivateCount)
-    {
-	xfree(pScreen);
-	return -1;
-    }
-
-    /* must pre-allocate one private for the new devPrivates support */
-    pScreen->WindowPrivateLen = 1;
-    pScreen->WindowPrivateSizes = (unsigned *)xcalloc(1, sizeof(unsigned));
-    pScreen->totalWindowSize = PadToLong(sizeof(WindowRec)) + sizeof(DevUnion);
-    pScreen->GCPrivateLen = 1;
-    pScreen->GCPrivateSizes = (unsigned *)xcalloc(1, sizeof(unsigned));
-    pScreen->totalGCSize = PadToLong(sizeof(GC)) + sizeof(DevUnion);
-    pScreen->PixmapPrivateLen = 1;
-    pScreen->PixmapPrivateSizes = (unsigned *)xcalloc(1, sizeof(unsigned));
-    pScreen->totalPixmapSize = BitmapBytePad(8 * (sizeof(PixmapRec) +
-						  sizeof(DevUnion)));
-    if (!pScreen->WindowPrivateSizes || !pScreen->GCPrivateSizes ||
-	!pScreen->PixmapPrivateSizes) {
-	xfree(pScreen);
-	return -1;
-    }
-
+    pScreen->devPrivates = NULL;
     pScreen->myNum = i;
+    pScreen->totalPixmapSize = BitmapBytePad(sizeof(PixmapRec)*8);
     pScreen->ClipNotify = 0;	/* for R4 ddx compatibility */
     pScreen->CreateScreenResources = 0;
     
@@ -772,20 +742,10 @@ AddScreen(
     screenInfo.numScreens++;
     if (!(*pfnInit)(i, pScreen, argc, argv))
     {
-	FreeScreen(pScreen);
+	dixFreePrivates(pScreen->devPrivates);
+	xfree(pScreen);
 	screenInfo.numScreens--;
 	return -1;
     }
     return i;
 }
-
-static void
-FreeScreen(ScreenPtr pScreen)
-{
-    xfree(pScreen->WindowPrivateSizes);
-    xfree(pScreen->GCPrivateSizes);
-    xfree(pScreen->PixmapPrivateSizes);
-    dixFreePrivates(*DEVPRIV_PTR(pScreen));
-    xfree(pScreen->devPrivates);
-    xfree(pScreen);
-}
diff --git a/dix/pixmap.c b/dix/pixmap.c
index c280a3b94..6096cc6b5 100644
--- a/dix/pixmap.c
+++ b/dix/pixmap.c
@@ -109,11 +109,6 @@ _X_EXPORT PixmapPtr
 AllocatePixmap(ScreenPtr pScreen, int pixDataSize)
 {
     PixmapPtr pPixmap;
-    char *ptr;
-    DevUnion *ppriv;
-    unsigned *sizes;
-    unsigned size;
-    int i;
 
     if (pScreen->totalPixmapSize > ((size_t)-1) - pixDataSize)
 	return NullPixmap;
@@ -121,27 +116,7 @@ AllocatePixmap(ScreenPtr pScreen, int pixDataSize)
     pPixmap = (PixmapPtr)xalloc(pScreen->totalPixmapSize + pixDataSize);
     if (!pPixmap)
 	return NullPixmap;
-    ppriv = (DevUnion *)(pPixmap + 1);
-    pPixmap->devPrivates = ppriv;
-    sizes = pScreen->PixmapPrivateSizes;
-    ptr = (char *)(ppriv + pScreen->PixmapPrivateLen);
-    for (i = pScreen->PixmapPrivateLen; --i >= 0; ppriv++, sizes++)
-    {
-        if ((size = *sizes) != 0)
-        {
-	    ppriv->ptr = (pointer)ptr;
-	    ptr += size;
-        }
-        else
-	    ppriv->ptr = (pointer)NULL;
-    }
-
-#ifdef _XSERVER64
-    if (pPixmap) {
-	pPixmap->drawable.pad0 = 0;
-	pPixmap->drawable.pad1 = 0;
-    }
-#endif
 
+    pPixmap->devPrivates = NULL;
     return pPixmap;
 }
diff --git a/dix/privates.c b/dix/privates.c
index 4dbba437c..38c552360 100644
--- a/dix/privates.c
+++ b/dix/privates.c
@@ -30,21 +30,13 @@ from The Open Group.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
 #include <stddef.h>
-#include "scrnintstr.h"
-#include "misc.h"
-#include "os.h"
 #include "windowstr.h"
 #include "resource.h"
 #include "privates.h"
-#include "dixstruct.h"
 #include "gcstruct.h"
 #include "colormapst.h"
-#include "servermd.h"
-#include "site.h"
 #include "inputstr.h"
-#include "extnsionst.h"
 
 typedef struct _PrivateDesc {
     DevPrivateKey key;
@@ -218,18 +210,6 @@ dixLookupPrivateOffset(RESTYPE type)
     return offsets[type];
 }
 
-/*
- * Called from the main loop to reset the subsystem.
- */
-static int ResetExtensionPrivates(void);
-static int ResetClientPrivates(void);
-static void ResetScreenPrivates(void);
-static void ResetWindowPrivates(void);
-static void ResetGCPrivates(void);
-static void ResetPixmapPrivates(void);
-static void ResetColormapPrivates(void);
-static void ResetDevicePrivateIndex(void);
-
 int
 dixResetPrivates(void)
 {
@@ -251,16 +231,6 @@ dixResetPrivates(void)
     for (i=0; i < offsetsSize; i++)
 	offsets[i] = -1;
 
-    /* reset legacy devPrivates support */
-    if (!ResetExtensionPrivates() || !ResetClientPrivates())
-	return FALSE;
-    ResetScreenPrivates();
-    ResetWindowPrivates();
-    ResetGCPrivates();
-    ResetPixmapPrivates();
-    ResetColormapPrivates();
-    ResetDevicePrivateIndex();
-
     /* register basic resource offsets */
     return dixRegisterPrivateOffset(RT_WINDOW,
 				    offsetof(WindowRec, devPrivates)) &&
@@ -271,421 +241,3 @@ dixResetPrivates(void)
 	dixRegisterPrivateOffset(RT_COLORMAP,
 				 offsetof(ColormapRec, devPrivates));
 }
-
-/*
- *  Following is the old devPrivates support.  These functions and variables
- *  are deprecated, and should no longer be used.
- */
-
-/*
- *  See the Wrappers and devPrivates section in "Definition of the
- *  Porting Layer for the X v11 Sample Server" (doc/Server/ddx.tbl.ms)
- *  for information on how to use devPrivates.
- */
-
-/*
- *  extension private machinery
- */
-
-static int  extensionPrivateCount;
-int extensionPrivateLen;
-unsigned *extensionPrivateSizes;
-unsigned totalExtensionSize;
-
-static int
-ResetExtensionPrivates(void)
-{
-    extensionPrivateCount = 1;
-    extensionPrivateLen = 1;
-    xfree(extensionPrivateSizes);
-    extensionPrivateSizes = (unsigned *)xcalloc(1, sizeof(unsigned));
-    if (!extensionPrivateSizes)
-	return FALSE;
-    totalExtensionSize = PadToLong(sizeof(ExtensionEntry)) + sizeof(DevUnion);
-    return TRUE;
-}
-
-_X_EXPORT int
-AllocateExtensionPrivateIndex(void)
-{
-    return extensionPrivateCount++;
-}
-
-_X_EXPORT Bool
-AllocateExtensionPrivate(int index2, unsigned amount)
-{
-    unsigned oldamount;
-
-    /* Round up sizes for proper alignment */
-    amount = ((amount + (sizeof(long) - 1)) / sizeof(long)) * sizeof(long);
-
-    if (index2 >= extensionPrivateLen)
-    {
-	unsigned *nsizes;
-	nsizes = (unsigned *)xrealloc(extensionPrivateSizes,
-				      (index2 + 1) * sizeof(unsigned));
-	if (!nsizes)
-	    return FALSE;
-	while (extensionPrivateLen <= index2)
-	{
-	    nsizes[extensionPrivateLen++] = 0;
-	    totalExtensionSize += sizeof(DevUnion);
-	}
-	extensionPrivateSizes = nsizes;
-    }
-    oldamount = extensionPrivateSizes[index2];
-    if (amount > oldamount)
-    {
-	extensionPrivateSizes[index2] = amount;
-	totalExtensionSize += (amount - oldamount);
-    }
-    return TRUE;
-}
-
-/*
- *  client private machinery
- */
-
-static int  clientPrivateCount;
-int clientPrivateLen;
-unsigned *clientPrivateSizes;
-unsigned totalClientSize;
-
-static int
-ResetClientPrivates(void)
-{
-    clientPrivateCount = 1;
-    clientPrivateLen = 1;
-    xfree(clientPrivateSizes);
-    clientPrivateSizes = (unsigned *)xcalloc(1, sizeof(unsigned));
-    if (!clientPrivateSizes)
-	return FALSE;
-    totalClientSize = PadToLong(sizeof(ClientRec)) + sizeof(DevUnion);
-    return TRUE;
-}
-
-_X_EXPORT int
-AllocateClientPrivateIndex(void)
-{
-    return clientPrivateCount++;
-}
-
-_X_EXPORT Bool
-AllocateClientPrivate(int index2, unsigned amount)
-{
-    unsigned oldamount;
-
-    /* Round up sizes for proper alignment */
-    amount = ((amount + (sizeof(long) - 1)) / sizeof(long)) * sizeof(long);
-
-    if (index2 >= clientPrivateLen)
-    {
-	unsigned *nsizes;
-	nsizes = (unsigned *)xrealloc(clientPrivateSizes,
-				      (index2 + 1) * sizeof(unsigned));
-	if (!nsizes)
-	    return FALSE;
-	while (clientPrivateLen <= index2)
-	{
-	    nsizes[clientPrivateLen++] = 0;
-	    totalClientSize += sizeof(DevUnion);
-	}
-	clientPrivateSizes = nsizes;
-    }
-    oldamount = clientPrivateSizes[index2];
-    if (amount > oldamount)
-    {
-	clientPrivateSizes[index2] = amount;
-	totalClientSize += (amount - oldamount);
-    }
-    return TRUE;
-}
-
-/*
- *  screen private machinery
- */
-
-int  screenPrivateCount;
-
-static void
-ResetScreenPrivates(void)
-{
-    screenPrivateCount = 1;
-}
-
-/* this can be called after some screens have been created,
- * so we have to worry about resizing existing devPrivates
- */
-_X_EXPORT int
-AllocateScreenPrivateIndex(void)
-{
-    int		idx;
-    int		i;
-    ScreenPtr	pScreen;
-    DevUnion	*nprivs;
-
-    idx = screenPrivateCount++;
-    for (i = 0; i < screenInfo.numScreens; i++)
-    {
-	pScreen = screenInfo.screens[i];
-	nprivs = (DevUnion *)xrealloc(pScreen->devPrivates,
-				      screenPrivateCount * sizeof(DevUnion));
-	if (!nprivs)
-	{
-	    screenPrivateCount--;
-	    return -1;
-	}
-	/* Zero the new private */
-	bzero(&nprivs[idx], sizeof(DevUnion));
-	pScreen->devPrivates = nprivs;
-    }
-    return idx;
-}
-
-
-/*
- *  window private machinery
- */
-
-static int  windowPrivateCount;
-
-static void
-ResetWindowPrivates(void)
-{
-    windowPrivateCount = 1;
-}
-
-_X_EXPORT int
-AllocateWindowPrivateIndex(void)
-{
-    return windowPrivateCount++;
-}
-
-_X_EXPORT Bool
-AllocateWindowPrivate(ScreenPtr pScreen, int index2, unsigned amount)
-{
-    unsigned oldamount;
-
-    /* Round up sizes for proper alignment */
-    amount = ((amount + (sizeof(long) - 1)) / sizeof(long)) * sizeof(long);
-
-    if (index2 >= pScreen->WindowPrivateLen)
-    {
-	unsigned *nsizes;
-	nsizes = (unsigned *)xrealloc(pScreen->WindowPrivateSizes,
-				      (index2 + 1) * sizeof(unsigned));
-	if (!nsizes)
-	    return FALSE;
-	while (pScreen->WindowPrivateLen <= index2)
-	{
-	    nsizes[pScreen->WindowPrivateLen++] = 0;
-	    pScreen->totalWindowSize += sizeof(DevUnion);
-	}
-	pScreen->WindowPrivateSizes = nsizes;
-    }
-    oldamount = pScreen->WindowPrivateSizes[index2];
-    if (amount > oldamount)
-    {
-	pScreen->WindowPrivateSizes[index2] = amount;
-	pScreen->totalWindowSize += (amount - oldamount);
-    }
-    return TRUE;
-}
-
-
-/*
- *  gc private machinery 
- */
-
-static int  gcPrivateCount;
-
-static void
-ResetGCPrivates(void)
-{
-    gcPrivateCount = 1;
-}
-
-_X_EXPORT int
-AllocateGCPrivateIndex(void)
-{
-    return gcPrivateCount++;
-}
-
-_X_EXPORT Bool
-AllocateGCPrivate(ScreenPtr pScreen, int index2, unsigned amount)
-{
-    unsigned oldamount;
-
-    /* Round up sizes for proper alignment */
-    amount = ((amount + (sizeof(long) - 1)) / sizeof(long)) * sizeof(long);
-
-    if (index2 >= pScreen->GCPrivateLen)
-    {
-	unsigned *nsizes;
-	nsizes = (unsigned *)xrealloc(pScreen->GCPrivateSizes,
-				      (index2 + 1) * sizeof(unsigned));
-	if (!nsizes)
-	    return FALSE;
-	while (pScreen->GCPrivateLen <= index2)
-	{
-	    nsizes[pScreen->GCPrivateLen++] = 0;
-	    pScreen->totalGCSize += sizeof(DevUnion);
-	}
-	pScreen->GCPrivateSizes = nsizes;
-    }
-    oldamount = pScreen->GCPrivateSizes[index2];
-    if (amount > oldamount)
-    {
-	pScreen->GCPrivateSizes[index2] = amount;
-	pScreen->totalGCSize += (amount - oldamount);
-    }
-    return TRUE;
-}
-
-
-/*
- *  pixmap private machinery
- */
-static int  pixmapPrivateCount;
-
-static void
-ResetPixmapPrivates(void)
-{
-    pixmapPrivateCount = 1;
-}
-
-_X_EXPORT int
-AllocatePixmapPrivateIndex(void)
-{
-    return pixmapPrivateCount++;
-}
-
-_X_EXPORT Bool
-AllocatePixmapPrivate(ScreenPtr pScreen, int index2, unsigned amount)
-{
-    unsigned oldamount;
-
-    /* Round up sizes for proper alignment */
-    amount = ((amount + (sizeof(long) - 1)) / sizeof(long)) * sizeof(long);
-
-    if (index2 >= pScreen->PixmapPrivateLen)
-    {
-	unsigned *nsizes;
-	nsizes = (unsigned *)xrealloc(pScreen->PixmapPrivateSizes,
-				      (index2 + 1) * sizeof(unsigned));
-	if (!nsizes)
-	    return FALSE;
-	while (pScreen->PixmapPrivateLen <= index2)
-	{
-	    nsizes[pScreen->PixmapPrivateLen++] = 0;
-	    pScreen->totalPixmapSize += sizeof(DevUnion);
-	}
-	pScreen->PixmapPrivateSizes = nsizes;
-    }
-    oldamount = pScreen->PixmapPrivateSizes[index2];
-    if (amount > oldamount)
-    {
-	pScreen->PixmapPrivateSizes[index2] = amount;
-	pScreen->totalPixmapSize += (amount - oldamount);
-    }
-    pScreen->totalPixmapSize = BitmapBytePad(pScreen->totalPixmapSize * 8);
-    return TRUE;
-}
-
-
-/*
- *  colormap private machinery
- */
-
-int  colormapPrivateCount;
-
-static void
-ResetColormapPrivates(void)
-{
-    colormapPrivateCount = 1;
-}
-
-
-_X_EXPORT int
-AllocateColormapPrivateIndex (InitCmapPrivFunc initPrivFunc)
-{
-    int		index;
-    int		i;
-    ColormapPtr	pColormap;
-    DevUnion	*privs;
-
-    index = colormapPrivateCount++;
-
-    for (i = 0; i < screenInfo.numScreens; i++)
-    {
-	/*
-	 * AllocateColormapPrivateIndex may be called after the
-	 * default colormap has been created on each screen!
-	 *
-	 * We must resize the devPrivates array for the default
-	 * colormap on each screen, making room for this new private.
-	 * We also call the initialization function 'initPrivFunc' on
-	 * the new private allocated for each default colormap.
-	 */
-
-	ScreenPtr pScreen = screenInfo.screens[i];
-
-	pColormap = (ColormapPtr) LookupIDByType (
-	    pScreen->defColormap, RT_COLORMAP);
-
-	if (pColormap)
-	{
-	    privs = (DevUnion *) xrealloc (pColormap->devPrivates,
-		colormapPrivateCount * sizeof(DevUnion));
-	    if (!privs) {
-		colormapPrivateCount--;
-		return -1;
-	    }
-	    bzero(&privs[index], sizeof(DevUnion));
-	    pColormap->devPrivates = privs;
-	    if (!(*initPrivFunc)(pColormap,index))
-	    {
-		colormapPrivateCount--;
-		return -1;
-	    }
-	}
-    }
-
-    return index;
-}
-
-/*
- *  device private machinery
- */
-
-static int devicePrivateIndex = 0;
-
-_X_EXPORT int
-AllocateDevicePrivateIndex(void)
-{
-    return devicePrivateIndex++;
-}
-
-_X_EXPORT Bool
-AllocateDevicePrivate(DeviceIntPtr device, int index)
-{
-    if (device->nPrivates < ++index) {
-	DevUnion *nprivs = (DevUnion *) xrealloc(device->devPrivates,
-						 index * sizeof(DevUnion));
-	if (!nprivs)
-	    return FALSE;
-	device->devPrivates = nprivs;
-	bzero(&nprivs[device->nPrivates], sizeof(DevUnion)
-	      * (index - device->nPrivates));
-	device->nPrivates = index;
-	return TRUE;
-    } else {
-	return TRUE;
-    }
-}
-
-static void
-ResetDevicePrivateIndex(void)
-{
-    devicePrivateIndex = 1;
-}
diff --git a/dix/window.c b/dix/window.c
index f04beea79..1a598faca 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -345,41 +345,6 @@ MakeRootTile(WindowPtr pWin)
 
 }
 
-WindowPtr
-AllocateWindow(ScreenPtr pScreen)
-{
-    WindowPtr pWin;
-    char *ptr;
-    DevUnion *ppriv;
-    unsigned *sizes;
-    unsigned size;
-    int i;
-
-    pWin = (WindowPtr)xalloc(pScreen->totalWindowSize);
-    if (pWin)
-    {
-	ppriv = (DevUnion *)(pWin + 1);
-	pWin->devPrivates = ppriv;
-	sizes = pScreen->WindowPrivateSizes;
-	ptr = (char *)(ppriv + pScreen->WindowPrivateLen);
-	for (i = pScreen->WindowPrivateLen; --i >= 0; ppriv++, sizes++)
-	{
-	    if ( (size = *sizes) )
-	    {
-		ppriv->ptr = (pointer)ptr;
-		ptr += size;
-	    }
-	    else
-		ppriv->ptr = (pointer)NULL;
-	}
-#if _XSERVER64
-	pWin->drawable.pad0 = 0;
-        pWin->drawable.pad1 = 0;
-#endif
-    }
-    return pWin;
-}
-
 /*****
  * CreateRootWindow
  *    Makes a window at initialization time for specified screen
@@ -392,7 +357,7 @@ CreateRootWindow(ScreenPtr pScreen)
     BoxRec	box;
     PixmapFormatRec *format;
 
-    pWin = AllocateWindow(pScreen);
+    pWin = (WindowPtr)xalloc(sizeof(WindowRec));
     if (!pWin)
 	return FALSE;
 
@@ -405,6 +370,7 @@ CreateRootWindow(ScreenPtr pScreen)
 
     pWin->drawable.pScreen = pScreen;
     pWin->drawable.type = DRAWABLE_WINDOW;
+    pWin->devPrivates = NULL;
 
     pWin->drawable.depth = pScreen->rootDepth;
     for (format = screenInfo.formats;
@@ -689,13 +655,14 @@ CreateWindow(Window wid, WindowPtr pParent, int x, int y, unsigned w,
 	return NullWindow;
     }
 
-    pWin = AllocateWindow(pScreen);
+    pWin = (WindowPtr)xalloc(sizeof(WindowRec));
     if (!pWin)
     {
 	*error = BadAlloc;
 	return NullWindow;
     }
     pWin->drawable = pParent->drawable;
+    pWin->devPrivates = NULL;
     pWin->drawable.depth = depth;
     if (depth == pParent->drawable.depth)
 	pWin->drawable.bitsPerPixel = pParent->drawable.bitsPerPixel;
@@ -968,7 +935,7 @@ DeleteWindow(pointer value, XID wid)
 	if (pWin->prevSib)
 	    pWin->prevSib->nextSib = pWin->nextSib;
     }
-    dixFreePrivates(*DEVPRIV_PTR(pWin));
+    dixFreePrivates(pWin->devPrivates);
     xfree(pWin);
     return Success;
 }
diff --git a/exa/exa.c b/exa/exa.c
index 99707fa5c..4260cbade 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -40,9 +40,8 @@
 #include "exa.h"
 #include "cw.h"
 
-static int exaGeneration;
-int exaScreenPrivateIndex;
-int exaPixmapPrivateIndex;
+DevPrivateKey exaScreenPrivateKey = &exaScreenPrivateKey;
+DevPrivateKey exaPixmapPrivateKey = &exaPixmapPrivateKey;
 
 /**
  * exaGetPixmapOffset() returns the offset (in bytes) within the framebuffer of
@@ -619,12 +618,6 @@ exaDriverInit (ScreenPtr		pScreen,
 #ifdef RENDER
     ps = GetPictureScreenIfSet(pScreen);
 #endif
-    if (exaGeneration != serverGeneration)
-    {
-	exaScreenPrivateIndex = AllocateScreenPrivateIndex();
-	exaPixmapPrivateIndex = AllocatePixmapPrivateIndex();
-	exaGeneration = serverGeneration;
-    }
 
     pExaScr = xcalloc (sizeof (ExaScreenPrivRec), 1);
 
@@ -636,7 +629,7 @@ exaDriverInit (ScreenPtr		pScreen,
 
     pExaScr->info = pScreenInfo;
 
-    pScreen->devPrivates[exaScreenPrivateIndex].ptr = (pointer) pExaScr;
+    dixSetPrivate(&pScreen->devPrivates, exaScreenPrivateKey, pExaScr);
 
     pExaScr->migration = ExaMigrationAlways;
 
@@ -698,8 +691,7 @@ exaDriverInit (ScreenPtr		pScreen,
     if ((pExaScr->info->flags & EXA_OFFSCREEN_PIXMAPS) &&
 	pExaScr->info->offScreenBase < pExaScr->info->memorySize)
     {
-	if (!AllocatePixmapPrivate(pScreen, exaPixmapPrivateIndex,
-				   sizeof (ExaPixmapPrivRec))) {
+	if (!dixRequestPrivate(exaPixmapPrivateKey, sizeof(ExaPixmapPrivRec))) {
             LogMessage(X_WARNING,
 		       "EXA(%d): Failed to allocate pixmap private\n",
 		       pScreen->myNum);
@@ -716,11 +708,7 @@ exaDriverInit (ScreenPtr		pScreen,
 		   pExaScr->info->memorySize - pExaScr->info->offScreenBase);
     }
     else
-    {
         LogMessage(X_INFO, "EXA(%d): No offscreen pixmaps\n", pScreen->myNum);
-	if (!AllocatePixmapPrivate(pScreen, exaPixmapPrivateIndex, 0))
-	    return FALSE;
-    }
 
     DBG_PIXMAP(("============== %ld < %ld\n", pExaScr->info->offScreenBase,
                 pExaScr->info->memorySize));
diff --git a/exa/exa_priv.h b/exa/exa_priv.h
index a456da05e..b577094bc 100644
--- a/exa/exa_priv.h
+++ b/exa/exa_priv.h
@@ -132,9 +132,9 @@ typedef struct {
     (PixmapWidthPaddingInfo[d].padRoundUp+1)))
 #endif
 
-extern int exaScreenPrivateIndex;
-extern int exaPixmapPrivateIndex;
-#define ExaGetScreenPriv(s)	((ExaScreenPrivPtr)(s)->devPrivates[exaScreenPrivateIndex].ptr)
+extern DevPrivateKey exaScreenPrivateKey;
+extern DevPrivateKey exaPixmapPrivateKey;
+#define ExaGetScreenPriv(s) ((ExaScreenPrivPtr)dixLookupPrivate(&(s)->devPrivates, exaScreenPrivateKey))
 #define ExaScreenPriv(s)	ExaScreenPrivPtr    pExaScr = ExaGetScreenPriv(s)
 
 /** Align an offset to an arbitrary alignment */
@@ -150,8 +150,8 @@ extern int exaPixmapPrivateIndex;
 #define EXA_PIXMAP_SCORE_PINNED	    1000
 #define EXA_PIXMAP_SCORE_INIT	    1001
 
-#define ExaGetPixmapPriv(p)	((ExaPixmapPrivPtr)(p)->devPrivates[exaPixmapPrivateIndex].ptr)
-#define ExaSetPixmapPriv(p,a)	((p)->devPrivates[exaPixmapPrivateIndex].ptr = (pointer) (a))
+#define ExaGetPixmapPriv(p) ((ExaPixmapPrivPtr)dixLookupPrivate(&(p)->devPrivates, exaPixmapPrivateKey))
+#define ExaSetPixmapPriv(p,a) dixSetPrivate(&(p)->devPrivates, exaPixmapPrivateKey, a)
 #define ExaPixmapPriv(p)	ExaPixmapPrivPtr pExaPixmap = ExaGetPixmapPriv(p)
 
 typedef struct {
diff --git a/fb/fb.h b/fb/fb.h
index aba2bd252..da85ecf3d 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -37,6 +37,7 @@
 #include "miscstruct.h"
 #include "servermd.h"
 #include "windowstr.h"
+#include "privates.h"
 #include "mi.h"
 #include "migc.h"
 #include "mibstore.h"
@@ -599,13 +600,9 @@ extern void fbSetBits (FbStip *bits, int stride, FbStip data);
     }							    \
 }
 
-/* XXX fb*PrivateIndex should be static, but it breaks the ABI */
-
-extern int	fbGCPrivateIndex;
-extern int	fbGetGCPrivateIndex(void);
+extern DevPrivateKey fbGetGCPrivateKey(void);
 #ifndef FB_NO_WINDOW_PIXMAPS
-extern int	fbWinPrivateIndex;
-extern int	fbGetWinPrivateIndex(void);
+extern DevPrivateKey fbGetWinPrivateKey(void);
 #endif
 extern const GCOps	fbGCOps;
 extern const GCFuncs	fbGCFuncs;
@@ -641,8 +638,7 @@ typedef void (*FinishWrapProcPtr)(DrawablePtr pDraw);
 
 
 #ifdef FB_SCREEN_PRIVATE
-extern int	fbScreenPrivateIndex;
-extern int	fbGetScreenPrivateIndex(void);
+extern DevPrivateKey fbGetScreenPrivateKey(void);
 
 /* private field of a screen */
 typedef struct {
@@ -655,7 +651,7 @@ typedef struct {
 } FbScreenPrivRec, *FbScreenPrivPtr;
 
 #define fbGetScreenPrivate(pScreen) ((FbScreenPrivPtr) \
-				     (pScreen)->devPrivates[fbGetScreenPrivateIndex()].ptr)
+	dixLookupPrivate(&(pScreen)->devPrivates, fbGetScreenPrivateKey()))
 #endif
 
 /* private field of GC */
@@ -670,7 +666,7 @@ typedef struct {
 } FbGCPrivRec, *FbGCPrivPtr;
 
 #define fbGetGCPrivate(pGC)	((FbGCPrivPtr)\
-	(pGC)->devPrivates[fbGetGCPrivateIndex()].ptr)
+	dixLookupPrivate(&(pGC)->devPrivates, fbGetGCPrivateKey()))
 
 #define fbGetCompositeClip(pGC) ((pGC)->pCompositeClip)
 #define fbGetExpose(pGC)	((pGC)->fExpose)
@@ -682,7 +678,7 @@ typedef struct {
 #define fbGetWindowPixmap(d)	fbGetScreenPixmap(((DrawablePtr) (d))->pScreen)
 #else
 #define fbGetWindowPixmap(pWin)	((PixmapPtr)\
-	((WindowPtr) (pWin))->devPrivates[fbGetWinPrivateIndex()].ptr)
+    dixLookupPrivate(&((WindowPtr)(pWin))->devPrivates, fbGetWinPrivateKey()))
 #endif
 
 #ifdef ROOTLESS
@@ -835,7 +831,7 @@ fb24_32ModifyPixmapHeader (PixmapPtr   pPixmap,
  * fballpriv.c
  */
 Bool
-fbAllocatePrivates(ScreenPtr pScreen, int *pGCIndex);
+fbAllocatePrivates(ScreenPtr pScreen, DevPrivateKey *pGCIndex);
     
 /*
  * fbarc.c
diff --git a/fb/fballpriv.c b/fb/fballpriv.c
index 8efb8fa99..68cb2e4c0 100644
--- a/fb/fballpriv.c
+++ b/fb/fballpriv.c
@@ -27,51 +27,33 @@
 #include "fb.h"
 
 #ifdef FB_SCREEN_PRIVATE
-int fbScreenPrivateIndex;
-int fbGetScreenPrivateIndex(void)
+static DevPrivateKey fbScreenPrivateKey = &fbScreenPrivateKey;
+DevPrivateKey fbGetScreenPrivateKey(void)
 {
-    return fbScreenPrivateIndex;
+    return fbScreenPrivateKey;
 }
 #endif
-int fbGCPrivateIndex;
-int fbGetGCPrivateIndex(void)
+static DevPrivateKey fbGCPrivateKey = &fbGCPrivateKey;
+DevPrivateKey fbGetGCPrivateKey(void)
 {
-    return fbGCPrivateIndex;
+    return fbGCPrivateKey;
 }
 #ifndef FB_NO_WINDOW_PIXMAPS
-int fbWinPrivateIndex;
-int fbGetWinPrivateIndex(void)
+static DevPrivateKey fbWinPrivateKey = &fbWinPrivateKey;
+DevPrivateKey fbGetWinPrivateKey(void)
 {
-    return fbWinPrivateIndex;
+    return fbWinPrivateKey;
 }
 #endif
-int fbGeneration;
 
 Bool
-fbAllocatePrivates(ScreenPtr pScreen, int *pGCIndex)
+fbAllocatePrivates(ScreenPtr pScreen, DevPrivateKey *pGCKey)
 {
-    if (fbGeneration != serverGeneration)
-    {
-	fbGCPrivateIndex = miAllocateGCPrivateIndex ();
-#ifndef FB_NO_WINDOW_PIXMAPS
-	fbWinPrivateIndex = AllocateWindowPrivateIndex();
-#endif
-#ifdef FB_SCREEN_PRIVATE
-	fbScreenPrivateIndex = AllocateScreenPrivateIndex ();
-	if (fbScreenPrivateIndex == -1)
-	    return FALSE;
-#endif
-	
-	fbGeneration = serverGeneration;
-    }
-    if (pGCIndex)
-	*pGCIndex = fbGCPrivateIndex;
-    if (!AllocateGCPrivate(pScreen, fbGCPrivateIndex, sizeof(FbGCPrivRec)))
+    if (pGCKey)
+	*pGCKey = fbGCPrivateKey;
+    
+    if (!dixRequestPrivate(fbGCPrivateKey, sizeof(FbGCPrivRec)))
 	return FALSE;
-#ifndef FB_NO_WINDOW_PIXMAPS
-    if (!AllocateWindowPrivate(pScreen, fbWinPrivateIndex, 0))
-	return FALSE;
-#endif
 #ifdef FB_SCREEN_PRIVATE
     {
 	FbScreenPrivPtr	pScreenPriv;
@@ -79,7 +61,7 @@ fbAllocatePrivates(ScreenPtr pScreen, int *pGCIndex)
 	pScreenPriv = (FbScreenPrivPtr) xalloc (sizeof (FbScreenPrivRec));
 	if (!pScreenPriv)
 	    return FALSE;
-	pScreen->devPrivates[fbScreenPrivateIndex].ptr = (pointer) pScreenPriv;
+	dixSetPrivate(&pScreen->devPrivates, fbScreenPrivateKey, pScreenPriv);
     }
 #endif
     return TRUE;
diff --git a/fb/fboverlay.c b/fb/fboverlay.c
index 5d7481eed..0d3c24073 100644
--- a/fb/fboverlay.c
+++ b/fb/fboverlay.c
@@ -33,12 +33,11 @@
 #include "fboverlay.h"
 #include "shmint.h"
 
-int	fbOverlayGeneration;
-int	fbOverlayScreenPrivateIndex = -1;
+static DevPrivateKey fbOverlayScreenPrivateKey = &fbOverlayScreenPrivateKey;
 
-int fbOverlayGetScreenPrivateIndex(void)
+DevPrivateKey fbOverlayGetScreenPrivateKey(void)
 {
-    return fbOverlayScreenPrivateIndex;
+    return fbOverlayScreenPrivateKey;
 }
 
 /*
@@ -65,7 +64,7 @@ fbOverlayCreateWindow(WindowPtr pWin)
 	pPixmap = pScrPriv->layer[i].u.run.pixmap;
 	if (pWin->drawable.depth == pPixmap->drawable.depth)
 	{
-	    pWin->devPrivates[fbWinPrivateIndex].ptr = (pointer) pPixmap;
+	    dixSetPrivate(&pWin->devPrivates, fbGetWinPrivateKey(), pPixmap);
 	    /*
 	     * Make sure layer keys are written correctly by
 	     * having non-root layers set to full while the
@@ -108,7 +107,7 @@ fbOverlayWindowLayer(WindowPtr pWin)
     int                 i;
 
     for (i = 0; i < pScrPriv->nlayers; i++)
-	if (pWin->devPrivates[fbWinPrivateIndex].ptr ==
+	if (dixLookupPrivate(&pWin->devPrivates, fbGetWinPrivateKey()) ==
 	    (pointer) pScrPriv->layer[i].u.run.pixmap)
 	    return i;
     return 0;
@@ -358,12 +357,6 @@ fbOverlayFinishScreenInit(ScreenPtr	pScreen,
     VisualID	defaultVisual;
     FbOverlayScrPrivPtr	pScrPriv;
 
-    if (fbOverlayGeneration != serverGeneration)
-    {
-	fbOverlayScreenPrivateIndex = AllocateScreenPrivateIndex ();
-	fbOverlayGeneration = serverGeneration;
-    }
-
     pScrPriv = xalloc (sizeof (FbOverlayScrPrivRec));
     if (!pScrPriv)
 	return FALSE;
@@ -433,7 +426,7 @@ fbOverlayFinishScreenInit(ScreenPtr	pScreen,
     pScrPriv->layer[1].u.init.width = width2;
     pScrPriv->layer[1].u.init.depth = depth2;
     
-    pScreen->devPrivates[fbOverlayScreenPrivateIndex].ptr = (pointer) pScrPriv;
+    dixSetPrivate(&pScreen->devPrivates, fbOverlayScreenPrivateKey, pScrPriv);
     
     /* overwrite miCloseScreen with our own */
     pScreen->CloseScreen = fbOverlayCloseScreen;
diff --git a/fb/fboverlay.h b/fb/fboverlay.h
index af0acb889..85a28ec2f 100644
--- a/fb/fboverlay.h
+++ b/fb/fboverlay.h
@@ -25,9 +25,9 @@
 #ifndef _FBOVERLAY_H_
 #define _FBOVERLAY_H_
 
-extern int	fbOverlayGeneration;
-extern int	fbOverlayScreenPrivateIndex; /* XXX should be static */
-extern int	fbOverlayGetScreenPrivateIndex(void);
+#include "privates.h"
+
+extern DevPrivateKey fbOverlayGetScreenPrivateKey(void);
 
 #ifndef FB_OVERLAY_MAX
 #define FB_OVERLAY_MAX	2
@@ -58,8 +58,7 @@ typedef struct _fbOverlayScrPriv {
 } FbOverlayScrPrivRec, *FbOverlayScrPrivPtr;
 
 #define fbOverlayGetScrPriv(s) \
-    ((fbOverlayGetScreenPrivateIndex() != -1) ? \
-     (s)->devPrivates[fbOverlayGetScreenPrivateIndex()].ptr : NULL)
+    dixLookupPrivate(&(s)->devPrivates, fbOverlayGetScreenPrivateKey())
 Bool
 fbOverlayCreateWindow(WindowPtr pWin);
 
diff --git a/fb/fbpixmap.c b/fb/fbpixmap.c
index 2b77c4f34..cd8cbcd5d 100644
--- a/fb/fbpixmap.c
+++ b/fb/fbpixmap.c
@@ -96,7 +96,7 @@ fbDestroyPixmap (PixmapPtr pPixmap)
 {
     if(--pPixmap->refcnt)
 	return TRUE;
-    dixFreePrivates(*DEVPRIV_PTR(pPixmap));
+    dixFreePrivates(pPixmap->devPrivates);
     xfree(pPixmap);
     return TRUE;
 }
diff --git a/fb/fbpseudocolor.c b/fb/fbpseudocolor.c
index 271e98145..1b9b18a7e 100644
--- a/fb/fbpseudocolor.c
+++ b/fb/fbpseudocolor.c
@@ -125,13 +125,11 @@ typedef struct {
 } xxScrPrivRec, *xxScrPrivPtr;
 
 #define xxGetScrPriv(s)	((xxScrPrivPtr) \
-				 (xxScrPrivateIndex != -1) \
-                          ? (s)->devPrivates[xxScrPrivateIndex].ptr\
-				: NULL)
+    dixLookupPrivate(&(s)->devPrivates, xxScrPrivateKey))
 #define xxScrPriv(s)     xxScrPrivPtr pScrPriv = xxGetScrPriv(s)
 
 #define xxGetCmapPriv(s) ((xxCmapPrivPtr) \
-                          (s)->devPrivates[xxColormapPrivateIndex].ptr)
+    dixLookupPrivate(&(s)->devPrivates, xxColormapPrivateKey))
 #define xxCmapPriv(s)    xxCmapPrivPtr pCmapPriv = xxGetCmapPriv(s);
 
 typedef struct _xxGCPriv {
@@ -140,13 +138,12 @@ typedef struct _xxGCPriv {
 } xxGCPrivRec, *xxGCPrivPtr;
 
 #define xxGetGCPriv(pGC) ((xxGCPrivPtr) \
-				      (pGC)->devPrivates[xxGCPrivateIndex].ptr)
+    dixLookupPrivate(&(pGC)->devPrivates, xxGCPrivateKey))
 #define xxGCPriv(pGC)   xxGCPrivPtr  pGCPriv = xxGetGCPriv(pGC)
 
-int xxScrPrivateIndex = -1;
-int xxGCPrivateIndex;
-int xxColormapPrivateIndex = -1;
-int xxGeneration;
+static DevPrivateKey xxScrPrivateKey = &xxScrPrivateKey;
+static DevPrivateKey xxGCPrivateKey = &xxGCPrivateKey;
+static DevPrivateKey xxColormapPrivateKey = &xxColormapPrivateKey;
 
 
 #define wrap(priv,real,mem,func) {\
@@ -355,12 +352,6 @@ xxMyVisual(ScreenPtr pScreen, VisualID vid)
     return FALSE;
 }
 
-static Bool
-xxInitColormapDummy(ColormapPtr pmap, int index)
-{
-    return TRUE;
-}
-
 static Bool
 xxInitColormapPrivate(ColormapPtr pmap)
 {
@@ -368,14 +359,14 @@ xxInitColormapPrivate(ColormapPtr pmap)
     xxCmapPrivPtr	pCmapPriv;
     pointer		cmap;
 
-    pmap->devPrivates[xxColormapPrivateIndex].ptr = (pointer) -1;
+    dixSetPrivate(&pmap->devPrivates, xxColormapPrivateKey, (pointer) -1);
     
     if (xxMyVisual(pmap->pScreen,pmap->pVisual->vid)) {
 	DBG("CreateColormap\n");
 	pCmapPriv = (xxCmapPrivPtr) xalloc (sizeof (xxCmapPrivRec));
 	if (!pCmapPriv)
 	    return FALSE;
-	pmap->devPrivates[xxColormapPrivateIndex].ptr = (pointer) pCmapPriv;
+	dixSetPrivate(&pmap->devPrivates, xxColormapPrivateKey, pCmapPriv);
 	cmap = xalloc(sizeof (CARD32) * (1 << pScrPriv->myDepth));
 	if (!cmap)
 	return FALSE;
@@ -677,7 +668,7 @@ xxCreateWindow(WindowPtr pWin)
     
     DBG("CreateWindow\n");
 
-    pWin->devPrivates[fbWinPrivateIndex].ptr = (pointer) pScrPriv->pPixmap;
+    dixSetPrivate(&pWin->devPrivates, fbGetWinPrivateKey(), pScrPriv->pPixmap);
     PRINT_RECTS(pScrPriv->region);
 	if (!pWin->parent) {
 	REGION_EMPTY (pWin->drawable.pScreen, &pScrPriv->region);
@@ -746,9 +737,10 @@ xxCopyWindow(WindowPtr	pWin,
     xxPickMyWindows(pWin,&rgn);
 
     unwrap (pScrPriv, pScreen, CopyWindow);
-    pWin->devPrivates[fbWinPrivateIndex].ptr = fbGetScreenPixmap(pScreen);
+    dixSetPrivate(&pWin->devPrivates, fbGetWinPrivateKey(),
+		  fbGetScreenPixmap(pScreen));
     pScreen->CopyWindow(pWin, ptOldOrg, prgnSrc);
-    pWin->devPrivates[fbWinPrivateIndex].ptr = pPixmap;
+    dixSetPrivate(&pWin->devPrivates, fbGetWinPrivateKey(), pPixmap);
     wrap(pScrPriv, pScreen, CopyWindow, xxCopyWindow);
 
     REGION_INTERSECT(pScreen,&rgn,&rgn,&rgn_new);
@@ -1098,21 +1090,7 @@ xxSetup(ScreenPtr pScreen, int myDepth, int baseDepth, char* addr, xxSyncFunc sy
     PictureScreenPtr	ps = GetPictureScreenIfSet(pScreen);
 #endif
 
-    if (xxGeneration != serverGeneration) {
-	xxScrPrivateIndex = AllocateScreenPrivateIndex ();
-	if (xxScrPrivateIndex == -1)
-	    return FALSE;
-	xxColormapPrivateIndex
-	    = AllocateColormapPrivateIndex (xxInitColormapDummy);
-	if (xxColormapPrivateIndex == -1)
-	    return FALSE;
-	xxGCPrivateIndex = AllocateGCPrivateIndex ();
-	if (xxGCPrivateIndex == -1)
-	    return FALSE;
-	xxGeneration = serverGeneration;
-    }
-
-    if (!AllocateGCPrivate (pScreen, xxGCPrivateIndex, sizeof (xxGCPrivRec)))
+    if (!dixRequestPrivate(xxGCPrivateKey, sizeof (xxGCPrivRec)))
 	return FALSE;
 
     pScrPriv = (xxScrPrivPtr) xalloc (sizeof (xxScrPrivRec));
@@ -1190,7 +1168,7 @@ xxSetup(ScreenPtr pScreen, int myDepth, int baseDepth, char* addr, xxSyncFunc sy
     }
 #endif
     pScrPriv->addr = addr;
-    pScreen->devPrivates[xxScrPrivateIndex].ptr = (pointer) pScrPriv;
+    dixSetPrivate(&pScreen->devPrivates, xxScrPrivateKey, pScrPriv);
 
     pDefMap = (ColormapPtr) LookupIDByType(pScreen->defColormap, RT_COLORMAP);
     if (!xxInitColormapPrivate(pDefMap))
diff --git a/fb/fbscreen.c b/fb/fbscreen.c
index 661268c74..c99ba08e2 100644
--- a/fb/fbscreen.c
+++ b/fb/fbscreen.c
@@ -38,7 +38,7 @@ fbCloseScreen (int index, ScreenPtr pScreen)
     xfree (pScreen->visuals);
     xfree (pScreen->devPrivate);
 #ifdef FB_SCREEN_PRIVATE
-    xfree (pScreen->devPrivates[fbScreenPrivateIndex].ptr);
+    xfree (dixLookupPrivate(&pScreen->devPrivates, fbGetScreenPrivateKey()));
 #endif
     return TRUE;
 }
@@ -93,7 +93,7 @@ _fbSetWindowPixmap (WindowPtr pWindow, PixmapPtr pPixmap)
 #ifdef FB_NO_WINDOW_PIXMAPS
     FatalError ("Attempted to set window pixmap without fb support\n");
 #else
-    pWindow->devPrivates[fbWinPrivateIndex].ptr = (pointer) pPixmap;
+    dixSetPrivate(&pWindow->devPrivates, fbGetWinPrivateKey(), pPixmap);
 #endif
 }
 
@@ -107,7 +107,7 @@ fbSetupScreen(ScreenPtr	pScreen,
 	      int	width,		/* pixel width of frame buffer */
 	      int	bpp)		/* bits per pixel for screen */
 {
-    if (!fbAllocatePrivates(pScreen, (int *) 0))
+    if (!fbAllocatePrivates(pScreen, NULL))
 	return FALSE;
     pScreen->defColormap = FakeClientID(0);
     /* let CreateDefColormap do whatever it wants for pixels */ 
diff --git a/fb/fbwindow.c b/fb/fbwindow.c
index 144f08362..594cc612f 100644
--- a/fb/fbwindow.c
+++ b/fb/fbwindow.c
@@ -32,8 +32,8 @@ Bool
 fbCreateWindow(WindowPtr pWin)
 {
 #ifndef FB_NO_WINDOW_PIXMAPS
-    pWin->devPrivates[fbWinPrivateIndex].ptr = 
-	(pointer) fbGetScreenPixmap(pWin->drawable.pScreen);
+    dixSetPrivate(&pWin->devPrivates, fbGetWinPrivateKey(),
+		  fbGetScreenPixmap(pWin->drawable.pScreen));
 #endif
 #ifdef FB_SCREEN_PRIVATE
     if (pWin->drawable.bitsPerPixel == 32)
diff --git a/fb/wfbrename.h b/fb/wfbrename.h
index 5ea9092f8..a6296fb1d 100644
--- a/fb/wfbrename.h
+++ b/fb/wfbrename.h
@@ -84,14 +84,14 @@
 #define fbFixCoordModePrevious wfbFixCoordModePrevious
 #define fbGCFuncs wfbGCFuncs
 #define fbGCOps wfbGCOps
-#define fbGCPrivateIndex wfbGCPrivateIndex
+#define fbGCPrivateKey wfbGCPrivateKey
 #define fbGeneration wfbGeneration
-#define fbGetGCPrivateIndex wfbGetGCPrivateIndex
+#define fbGetGCPrivateKey wfbGetGCPrivateKey
 #define fbGetImage wfbGetImage
-#define fbGetScreenPrivateIndex wfbGetScreenPrivateIndex
+#define fbGetScreenPrivateKey wfbGetScreenPrivateKey
 #define fbGetSpans wfbGetSpans
 #define _fbGetWindowPixmap _wfbGetWindowPixmap
-#define fbGetWinPrivateIndex wfbGetWinPrivateIndex
+#define fbGetWinPrivateKey wfbGetWinPrivateKey
 #define fbGlyph16 wfbGlyph16
 #define fbGlyph24 wfbGlyph24
 #define fbGlyph32 wfbGlyph32
@@ -117,10 +117,10 @@
 #define fbOverlayCreateWindow wfbOverlayCreateWindow
 #define fbOverlayFinishScreenInit wfbOverlayFinishScreenInit
 #define fbOverlayGeneration wfbOverlayGeneration
-#define fbOverlayGetScreenPrivateIndex wfbOverlayGetScreenPrivateIndex
+#define fbOverlayGetScreenPrivateKey wfbOverlayGetScreenPrivateKey
 #define fbOverlayPaintKey wfbOverlayPaintKey
 #define fbOverlayPaintWindow wfbOverlayPaintWindow
-#define fbOverlayScreenPrivateIndex wfbOverlayScreenPrivateIndex
+#define fbOverlayScreenPrivateKey wfbOverlayScreenPrivateKey
 #define fbOverlaySetupScreen wfbOverlaySetupScreen
 #define fbOverlayUpdateLayerRegion wfbOverlayUpdateLayerRegion
 #define fbOverlayWindowExposures wfbOverlayWindowExposures
@@ -160,7 +160,7 @@
 #define fbResolveColor wfbResolveColor
 #define fbRestoreAreas wfbRestoreAreas
 #define fbSaveAreas wfbSaveAreas
-#define fbScreenPrivateIndex wfbScreenPrivateIndex
+#define fbScreenPrivateKey wfbScreenPrivateKey
 #define fbSegment wfbSegment
 #define fbSelectBres wfbSelectBres
 #define fbSetSpans wfbSetSpans
@@ -185,14 +185,14 @@
 #define fbUnrealizeFont wfbUnrealizeFont
 #define fbValidateGC wfbValidateGC
 #define fbWalkCompositeRegion wfbWalkCompositeRegion
-#define fbWinPrivateIndex wfbWinPrivateIndex
+#define fbWinPrivateKey wfbWinPrivateKey
 #define fbZeroLine wfbZeroLine
 #define fbZeroSegment wfbZeroSegment
 #define free_pixman_pict wfb_free_pixman_pict
 #define image_from_pict wfb_image_from_pict
-#define xxScrPrivateIndex wfbxxScrPrivateIndex
-#define xxGCPrivateIndex wfbxxGCPrivateIndex
-#define xxColormapPrivateIndex wfbxxColormapPrivateIndex
+#define xxScrPrivateKey wfbxxScrPrivateKey
+#define xxGCPrivateKey wfbxxGCPrivateKey
+#define xxColormapPrivateKey wfbxxColormapPrivateKey
 #define xxGeneration wfbxxGeneration
 #define xxPrintVisuals wfbxxPrintVisuals
 #define xxGCFuncs wfbxxGCFuncs
diff --git a/hw/darwin/darwin.h b/hw/darwin/darwin.h
index fc4a58a95..70101eca5 100644
--- a/hw/darwin/darwin.h
+++ b/hw/darwin/darwin.h
@@ -88,8 +88,8 @@ void DarwinModeBell(int volume, DeviceIntPtr pDevice, pointer ctrl, int class);
 #define kern_assert(x) { if ((x) != KERN_SUCCESS) \
     FatalError("assert failed on line %d of %s with kernel return 0x%x!\n", \
                 __LINE__, __FILE__, x); }
-#define SCREEN_PRIV(pScreen) \
-    ((DarwinFramebufferPtr)pScreen->devPrivates[darwinScreenIndex].ptr)
+#define SCREEN_PRIV(pScreen) ((DarwinFramebufferPtr) \
+    dixLookupPrivate(&(pScreen)->devPrivates, darwinScreenKey))
 
 
 #define MIN_KEYCODE XkbMinLegalKeyCode     // unfortunately, this isn't 0...
@@ -98,7 +98,7 @@ void DarwinModeBell(int volume, DeviceIntPtr pDevice, pointer ctrl, int class);
 /*
  * Global variables from darwin.c
  */
-extern int              darwinScreenIndex; // index into pScreen.devPrivates
+extern DevPrivateKey    darwinScreenKey; // index into pScreen.devPrivates
 extern int              darwinScreensFound;
 extern io_connect_t     darwinParamConnect;
 extern int              darwinEventReadFD;
diff --git a/hw/darwin/iokit/xfIOKit.h b/hw/darwin/iokit/xfIOKit.h
index 27d27bc70..7d9a48702 100644
--- a/hw/darwin/iokit/xfIOKit.h
+++ b/hw/darwin/iokit/xfIOKit.h
@@ -45,10 +45,10 @@ typedef struct {
     unsigned char      *shadowPtr;
 } XFIOKitScreenRec, *XFIOKitScreenPtr;
 
-#define XFIOKIT_SCREEN_PRIV(pScreen) \
-    ((XFIOKitScreenPtr)pScreen->devPrivates[xfIOKitScreenIndex].ptr)
+#define XFIOKIT_SCREEN_PRIV(pScreen) ((XFIOKitScreenPtr) \
+    dixLookupPrivate(&pScreen->devPrivates, xfIOKitScreenKey))
 
-extern int xfIOKitScreenIndex; // index into pScreen.devPrivates
+extern DevPrivateKey xfIOKitScreenKey; // index into pScreen.devPrivates
 extern io_connect_t xfIOKitInputConnect;
 
 Bool XFIOKitInitCursor(ScreenPtr pScreen);
diff --git a/hw/darwin/iokit/xfIOKitCursor.c b/hw/darwin/iokit/xfIOKitCursor.c
index 8388513a3..224710114 100644
--- a/hw/darwin/iokit/xfIOKitCursor.c
+++ b/hw/darwin/iokit/xfIOKitCursor.c
@@ -73,8 +73,8 @@
 #include <assert.h>
 #define DUMP_DARWIN_CURSOR FALSE
 
-#define CURSOR_PRIV(pScreen) \
-    ((XFIOKitCursorScreenPtr)pScreen->devPrivates[darwinCursorScreenIndex].ptr)
+#define CURSOR_PRIV(pScreen) ((XFIOKitCursorScreenPtr) \
+    dixLookupPrivate(&pScreen->devPrivates, darwinCursorScreenKey))
 
 // The cursors format are documented in IOFramebufferShared.h.
 #define RGBto34WithGamma(red, green, blue)  \
@@ -99,8 +99,7 @@ typedef struct {
     ColormapPtr             pInstalledMap;
 } XFIOKitCursorScreenRec, *XFIOKitCursorScreenPtr;
 
-static int darwinCursorScreenIndex = -1;
-static unsigned long darwinCursorGeneration = 0;
+static DevPrivateKey darwinCursorScreenKey = &darwinCursorScreenKey;
 
 /*
 ===========================================================================
@@ -679,17 +678,10 @@ XFIOKitInitCursor(
         return FALSE;
     }
 
-    // allocate private storage for this screen's hardware cursor info
-    if (darwinCursorGeneration != serverGeneration) {
-        if ((darwinCursorScreenIndex = AllocateScreenPrivateIndex()) < 0)
-            return FALSE;
-        darwinCursorGeneration = serverGeneration; 	
-    }
-
     ScreenPriv = xcalloc( 1, sizeof(XFIOKitCursorScreenRec) );
     if (!ScreenPriv) return FALSE;
 
-    pScreen->devPrivates[darwinCursorScreenIndex].ptr = (pointer) ScreenPriv;
+    dixSetPrivate(&pScreen->devPrivates, darwinCursorScreenKey, ScreenPriv);
 
     // check if a hardware cursor is supported
     if (!iokitScreen->cursorShmem->hardwareCursorCapable) {
@@ -722,7 +714,7 @@ XFIOKitInitCursor(
 
     // initialize hardware cursor handling
     PointPriv = (miPointerScreenPtr)
-                    pScreen->devPrivates[miPointerScreenIndex].ptr;
+	dixLookupPrivate(&pScreen->devPrivates, miPointerScreenKey);
 
     ScreenPriv->spriteFuncs = PointPriv->spriteFuncs;
     PointPriv->spriteFuncs = &darwinSpriteFuncsRec; 
diff --git a/hw/darwin/quartz/fullscreen/fullscreen.c b/hw/darwin/quartz/fullscreen/fullscreen.c
index 02f6e89a8..ee16e55e5 100644
--- a/hw/darwin/quartz/fullscreen/fullscreen.c
+++ b/hw/darwin/quartz/fullscreen/fullscreen.c
@@ -49,18 +49,17 @@ typedef struct {
 } FSScreenRec, *FSScreenPtr;
 
 #define FULLSCREEN_PRIV(pScreen) \
-    ((FSScreenPtr)pScreen->devPrivates[fsScreenIndex].ptr)
+    ((FSScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, fsScreenKey))
 
-static int                  fsScreenIndex;
+static DevPrivateKey        fsScreenKey = &fsScreenKey;
 static CGDirectDisplayID   *quartzDisplayList = NULL;
 static int                  quartzNumScreens = 0;
 static FSScreenPtr          quartzScreens[MAXSCREENS];
 
-static int                  darwinCmapPrivateIndex = -1;
-static unsigned long        darwinCmapGeneration = 0;
+static DevPrivateKey        darwinCmapPrivateKey = &darwinCmapPrivateKey;
 
-#define CMAP_PRIV(pCmap) \
-    ((CGDirectPaletteRef) (pCmap)->devPrivates[darwinCmapPrivateIndex].ptr)
+#define CMAP_PRIV(pCmap) ((CGDirectPaletteRef) \
+    dixLookupPrivate(&(pCmap)->devPrivates, darwinCmapPrivateKey))
 
 /*
  =============================================================================
@@ -95,16 +94,6 @@ FSCreateColormap(
 {
     CGDirectPaletteRef  pallete;
 
-    // Allocate private storage for the hardware dependent colormap info.
-    if (darwinCmapGeneration != serverGeneration) {
-        if ((darwinCmapPrivateIndex =
-                AllocateColormapPrivateIndex(FSInitCmapPrivates)) < 0)
-        {
-            return FALSE;
-        }
-        darwinCmapGeneration = serverGeneration;
-    }
-
     pallete = CGPaletteCreateDefaultColorPalette();
     if (!pallete) return FALSE;
 
@@ -283,17 +272,10 @@ static void FSResumeScreen(
  */
 static void FSDisplayInit(void)
 {
-    static unsigned long generation = 0;
     CGDisplayCount quartzDisplayCount = 0;
 
     ErrorF("Display mode: Full screen Quartz -- Direct Display\n");
 
-    // Allocate private storage for each screen's mode specific info
-    if (generation != serverGeneration) {
-        fsScreenIndex = AllocateScreenPrivateIndex();
-        generation = serverGeneration;
-    }
-
     // Find all the CoreGraphics displays
     CGGetActiveDisplayList(0, NULL, &quartzDisplayCount);
     quartzDisplayList = xalloc(quartzDisplayCount * sizeof(CGDirectDisplayID));
diff --git a/hw/darwin/quartz/fullscreen/quartzCursor.c b/hw/darwin/quartz/fullscreen/quartzCursor.c
index 77fa008f2..bee83b875 100644
--- a/hw/darwin/quartz/fullscreen/quartzCursor.c
+++ b/hw/darwin/quartz/fullscreen/quartzCursor.c
@@ -56,8 +56,7 @@ typedef struct {
     miPointerSpriteFuncPtr  spriteFuncs;
 } QuartzCursorScreenRec, *QuartzCursorScreenPtr;
 
-static int darwinCursorScreenIndex = -1;
-static unsigned long darwinCursorGeneration = 0;
+static DevPrivateKey darwinCursorScreenKey = &darwinCursorScreenKey;
 static CursorPtr quartzLatentCursor = NULL;
 static QD_Cursor gQDArrow; // QuickDraw arrow cursor
 
@@ -66,8 +65,8 @@ static CCrsrHandle currentCursor = NULL;
 static pthread_mutex_t cursorMutex;
 static pthread_cond_t cursorCondition;
 
-#define CURSOR_PRIV(pScreen) \
-    ((QuartzCursorScreenPtr)pScreen->devPrivates[darwinCursorScreenIndex].ptr)
+#define CURSOR_PRIV(pScreen) ((QuartzCursorScreenPtr) \
+    dixLookupPrivate(&(pScreen)->devPrivates, darwinCursorScreenKey))
 
 #define HIDE_QD_CURSOR(pScreen, visible)                                \
     if (visible) {                                                      \
@@ -592,13 +591,6 @@ QuartzInitCursor(
         return FALSE;
     }
 
-    // allocate private storage for this screen's QuickDraw cursor info
-    if (darwinCursorGeneration != serverGeneration) {
-        if ((darwinCursorScreenIndex = AllocateScreenPrivateIndex()) < 0)
-            return FALSE;
-        darwinCursorGeneration = serverGeneration;
-    }
-
     ScreenPriv = xcalloc( 1, sizeof(QuartzCursorScreenRec) );
     if (!ScreenPriv) return FALSE;
 
@@ -611,7 +603,7 @@ QuartzInitCursor(
     // initialize QuickDraw cursor handling
     GetQDGlobalsArrow(&gQDArrow);
     PointPriv = (miPointerScreenPtr)
-                    pScreen->devPrivates[miPointerScreenIndex].ptr;
+	dixLookupPrivate(&pScreen->devPrivates, miPointerScreenKey);
 
     ScreenPriv->spriteFuncs = PointPriv->spriteFuncs;
     PointPriv->spriteFuncs = &quartzSpriteFuncsRec;
diff --git a/hw/darwin/quartz/quartz.c b/hw/darwin/quartz/quartz.c
index 038b21eff..eac765257 100644
--- a/hw/darwin/quartz/quartz.c
+++ b/hw/darwin/quartz/quartz.c
@@ -62,7 +62,7 @@ int                     quartzUseAGL = 1;
 int                     quartzEnableKeyEquivalents = 1;
 int                     quartzServerVisible = TRUE;
 int                     quartzServerQuitting = FALSE;
-int                     quartzScreenIndex = 0;
+DevPrivateKey           quartzScreenKey = &quartzScreenKey;
 int                     aquaMenuBarHeight = 0;
 int                     noPseudoramiXExtension = TRUE;
 QuartzModeProcsPtr      quartzProcs = NULL;
@@ -121,14 +121,6 @@ void DarwinModeInitOutput(
     int argc,
     char **argv )
 {
-    static unsigned long generation = 0;
-
-    // Allocate private storage for each screen's Quartz specific info
-    if (generation != serverGeneration) {
-        quartzScreenIndex = AllocateScreenPrivateIndex();
-        generation = serverGeneration;
-    }
-
     if (serverGeneration == 0) {
         QuartzAudioInit();
     }
diff --git a/hw/darwin/quartz/quartzCommon.h b/hw/darwin/quartz/quartzCommon.h
index f5dff662c..5e199d362 100644
--- a/hw/darwin/quartz/quartzCommon.h
+++ b/hw/darwin/quartz/quartzCommon.h
@@ -58,7 +58,7 @@ typedef struct {
 } QuartzScreenRec, *QuartzScreenPtr;
 
 #define QUARTZ_PRIV(pScreen) \
-    ((QuartzScreenPtr)pScreen->devPrivates[quartzScreenIndex].ptr)
+    ((QuartzScreenPtr)dixLookupPrivate(&pScreen->devPrivates, quartzScreenKey))
 
 // Data stored at startup for Cocoa front end
 extern int              quartzEventWriteFD;
@@ -73,7 +73,7 @@ extern int              quartzEnableKeyEquivalents;
 // Other shared data
 extern int              quartzServerVisible;
 extern int              quartzServerQuitting;
-extern int              quartzScreenIndex;
+extern DevPrivateKey    quartzScreenKey;
 extern int              aquaMenuBarHeight;
 
 // Name of GLX bundle for native OpenGL
diff --git a/hw/darwin/quartz/quartzCursor.c b/hw/darwin/quartz/quartzCursor.c
index 6ed6a7677..a121ce17c 100644
--- a/hw/darwin/quartz/quartzCursor.c
+++ b/hw/darwin/quartz/quartzCursor.c
@@ -57,8 +57,7 @@ typedef struct {
     miPointerSpriteFuncPtr  spriteFuncs;
 } QuartzCursorScreenRec, *QuartzCursorScreenPtr;
 
-static int darwinCursorScreenIndex = -1;
-static unsigned long darwinCursorGeneration = 0;
+static DevPrivateKey darwinCursorScreenKey = &darwinCursorScreenKey;
 static CursorPtr quartzLatentCursor = NULL;
 static QD_Cursor gQDArrow; // QuickDraw arrow cursor
 
@@ -67,8 +66,8 @@ static CCrsrHandle currentCursor = NULL;
 static pthread_mutex_t cursorMutex;
 static pthread_cond_t cursorCondition;
 
-#define CURSOR_PRIV(pScreen) \
-    ((QuartzCursorScreenPtr)pScreen->devPrivates[darwinCursorScreenIndex].ptr)
+#define CURSOR_PRIV(pScreen) ((QuartzCursorScreenPtr) \
+    dixLookupPrivate(&pScreen->devPrivates, darwinCursorScreenKey))
 
 #define HIDE_QD_CURSOR(pScreen, visible)                                \
     if (visible) {                                                      \
@@ -595,13 +594,6 @@ QuartzInitCursor(
         return FALSE;
     }
 
-    // allocate private storage for this screen's QuickDraw cursor info
-    if (darwinCursorGeneration != serverGeneration) {
-        if ((darwinCursorScreenIndex = AllocateScreenPrivateIndex()) < 0)
-            return FALSE;
-        darwinCursorGeneration = serverGeneration;
-    }
-
     ScreenPriv = xcalloc( 1, sizeof(QuartzCursorScreenRec) );
     if (!ScreenPriv) return FALSE;
 
@@ -614,7 +606,7 @@ QuartzInitCursor(
     // initialize QuickDraw cursor handling
     GetQDGlobalsArrow(&gQDArrow);
     PointPriv = (miPointerScreenPtr)
-                    pScreen->devPrivates[miPointerScreenIndex].ptr;
+	dixLookupPrivate(&pScreen->devPrivates, miPointerScreenKey);
 
     ScreenPriv->spriteFuncs = PointPriv->spriteFuncs;
     PointPriv->spriteFuncs = &quartzSpriteFuncsRec;
diff --git a/hw/darwin/quartz/xpr/dri.c b/hw/darwin/quartz/xpr/dri.c
index 08ee38221..8c6ed99ac 100644
--- a/hw/darwin/quartz/xpr/dri.c
+++ b/hw/darwin/quartz/xpr/dri.c
@@ -65,9 +65,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <AvailabilityMacros.h>
 
-static int DRIScreenPrivIndex = -1;
-static int DRIWindowPrivIndex = -1;
-static int DRIPixmapPrivIndex = -1;
+static DevPrivateKey DRIScreenPrivKey = &DRIScreenPrivKey;
+static DevPrivateKey DRIWindowPrivKey = &DRIWindowPrivKey;
+static DevPrivateKey DRIPixmapPrivKey = &DRIPixmapPrivKey;
 
 static RESTYPE DRIDrawablePrivResType;
 
@@ -179,11 +179,11 @@ DRIScreenInit(ScreenPtr pScreen)
 
     pDRIPriv = (DRIScreenPrivPtr) xcalloc(1, sizeof(DRIScreenPrivRec));
     if (!pDRIPriv) {
-        pScreen->devPrivates[DRIScreenPrivIndex].ptr = NULL;
+	dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL);
         return FALSE;
     }
 
-    pScreen->devPrivates[DRIScreenPrivIndex].ptr = (pointer) pDRIPriv;
+    dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, pDRIPriv);
     pDRIPriv->directRenderingSupport = TRUE;
     pDRIPriv->nrWindows = 0;
 
@@ -214,13 +214,6 @@ DRIFinishScreenInit(ScreenPtr pScreen)
 {
     DRIScreenPrivPtr  pDRIPriv = DRI_SCREEN_PRIV(pScreen);
 
-    /* Allocate zero sized private area for each window. Should a window
-     * become a DRI window, we'll hang a DRIWindowPrivateRec off of this
-     * private index.
-     */
-    if (!AllocateWindowPrivate(pScreen, DRIWindowPrivIndex, 0))
-        return FALSE;
-
     /* Wrap DRI support */
     pDRIPriv->wrap.ValidateTree = pScreen->ValidateTree;
     pScreen->ValidateTree = DRIValidateTree;
@@ -249,31 +242,13 @@ DRICloseScreen(ScreenPtr pScreen)
 
     if (pDRIPriv && pDRIPriv->directRenderingSupport) {
         xfree(pDRIPriv);
-        pScreen->devPrivates[DRIScreenPrivIndex].ptr = NULL;
+	dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL);
     }
 }
 
 Bool
 DRIExtensionInit(void)
 {
-    static unsigned long DRIGeneration = 0;
-
-    if (DRIGeneration != serverGeneration) {
-        if ((DRIScreenPrivIndex = AllocateScreenPrivateIndex()) < 0)
-            return FALSE;
-        DRIGeneration = serverGeneration;
-    }
-
-    /*
-     * Allocate a window private index with a zero sized private area for
-     * each window, then should a window become a DRI window, we'll hang
-     * a DRIWindowPrivateRec off of this private index. Do same for pixmaps.
-     */
-    if ((DRIWindowPrivIndex = AllocateWindowPrivateIndex()) < 0)
-        return FALSE;
-    if ((DRIPixmapPrivIndex = AllocatePixmapPrivateIndex()) < 0)
-        return FALSE;
-
     DRIDrawablePrivResType = CreateNewResourceType(DRIDrawablePrivDelete);
 
     return TRUE;
@@ -417,7 +392,8 @@ DRICreateSurface(ScreenPtr pScreen, Drawable id,
             }
 
             /* save private off of preallocated index */
-            pWin->devPrivates[DRIWindowPrivIndex].ptr = (pointer)pDRIDrawablePriv;
+	    dixSetPrivate(&pWin->devPrivates, DRIWindowPrivKey,
+			  pDRIDrawablePriv);
         }
     }
 
@@ -450,7 +426,8 @@ DRICreateSurface(ScreenPtr pScreen, Drawable id,
             }
 
             /* save private off of preallocated index */
-            pPix->devPrivates[DRIPixmapPrivIndex].ptr = (pointer)pDRIDrawablePriv;
+	    dixSetPrivate(&pPix->devPrivates, DRIPixmapPrivKey,
+			  pDRIDrawablePriv);
         }
     }
 #endif
@@ -577,9 +554,9 @@ DRIDrawablePrivDelete(pointer pResource, XID id)
     xfree(pDRIDrawablePriv);
 
     if (pDrawable->type == DRAWABLE_WINDOW) {
-        pWin->devPrivates[DRIWindowPrivIndex].ptr = NULL;
+	dixSetPrivate(&pWin->devPrivates, DRIWindowPrivKey, NULL);
     } else if (pDrawable->type == DRAWABLE_PIXMAP) {
-        pPix->devPrivates[DRIPixmapPrivIndex].ptr = NULL;
+	dixSetPrivate(&pPix->devPrivates, DRIPixmapPrivKey, NULL);
     }
 
     --pDRIPriv->nrWindows;
diff --git a/hw/darwin/quartz/xpr/dristruct.h b/hw/darwin/quartz/xpr/dristruct.h
index 9a3d01c9b..19d78a973 100644
--- a/hw/darwin/quartz/xpr/dristruct.h
+++ b/hw/darwin/quartz/xpr/dristruct.h
@@ -40,15 +40,11 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #define DRI_MAX_DRAWABLES 256
 
-#define DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin) \
-    ((DRIWindowPrivIndex < 0) ? \
-     NULL : \
-     ((DRIDrawablePrivPtr)((pWin)->devPrivates[DRIWindowPrivIndex].ptr)))
+#define DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin) ((DRIDrawablePrivPtr) \
+    dixLookupPrivate(&(pWin)->devPrivates, DRIWindowPrivKey))
 
-#define DRI_DRAWABLE_PRIV_FROM_PIXMAP(pPix) \
-    ((DRIPixmapPrivIndex < 0) ? \
-     NULL : \
-     ((DRIDrawablePrivPtr)((pPix)->devPrivates[DRIPixmapPrivIndex].ptr)))
+#define DRI_DRAWABLE_PRIV_FROM_PIXMAP(pPix) ((DRIDrawablePrivPtr) \
+    dixLookupPrivate(&(pPix)->devPrivates, DRIPixmapPrivKey))
 
 typedef struct _DRIDrawablePrivRec
 {
@@ -61,13 +57,12 @@ typedef struct _DRIDrawablePrivRec
     x_list          *notifiers;     /* list of (FUN . DATA) */
 } DRIDrawablePrivRec, *DRIDrawablePrivPtr;
 
-#define DRI_SCREEN_PRIV(pScreen) \
-    ((DRIScreenPrivIndex < 0) ? \
-     NULL : \
-     ((DRIScreenPrivPtr)((pScreen)->devPrivates[DRIScreenPrivIndex].ptr)))
+#define DRI_SCREEN_PRIV(pScreen) ((DRIScreenPrivPtr) \
+    dixLookupPrivate(&(pScreen)->devPrivates, DRIScreenPrivKey))
 
 #define DRI_SCREEN_PRIV_FROM_INDEX(screenIndex) ((DRIScreenPrivPtr) \
-    (screenInfo.screens[screenIndex]->devPrivates[DRIScreenPrivIndex].ptr))
+    dixLookupPrivate(&screenInfo.screens[screenIndex]->devPrivates, \
+		     DRIScreenPrivKey))
 
 
 typedef struct _DRIScreenPrivRec
diff --git a/hw/darwin/quartz/xpr/xprCursor.c b/hw/darwin/quartz/xpr/xprCursor.c
index e7f23b78b..c0516e84c 100644
--- a/hw/darwin/quartz/xpr/xprCursor.c
+++ b/hw/darwin/quartz/xpr/xprCursor.c
@@ -53,11 +53,10 @@ typedef struct {
     miPointerSpriteFuncPtr  spriteFuncs;
 } QuartzCursorScreenRec, *QuartzCursorScreenPtr;
 
-static int darwinCursorScreenIndex = -1;
-static unsigned long darwinCursorGeneration = 0;
+static DevPrivateKey darwinCursorScreenKey = &darwinCursorScreenKey;
 
-#define CURSOR_PRIV(pScreen) \
-    ((QuartzCursorScreenPtr)pScreen->devPrivates[darwinCursorScreenIndex].ptr)
+#define CURSOR_PRIV(pScreen) ((QuartzCursorScreenPtr) \
+    dixLookupPrivate(&pScreen->devPrivates, darwinCursorScreenKey))
 
 
 static Bool
@@ -360,15 +359,6 @@ QuartzInitCursor(ScreenPtr pScreen)
     if (!miDCInitialize(pScreen, &quartzScreenFuncsRec))
         return FALSE;
 
-    /* allocate private storage for this screen's QuickDraw cursor info */
-    if (darwinCursorGeneration != serverGeneration)
-    {
-        if ((darwinCursorScreenIndex = AllocateScreenPrivateIndex()) < 0)
-            return FALSE;
-
-        darwinCursorGeneration = serverGeneration;
-    }
-
     ScreenPriv = xcalloc(1, sizeof(QuartzCursorScreenRec));
     if (ScreenPriv == NULL)
         return FALSE;
@@ -379,7 +369,8 @@ QuartzInitCursor(ScreenPtr pScreen)
     ScreenPriv->QueryBestSize = pScreen->QueryBestSize;
     pScreen->QueryBestSize = QuartzCursorQueryBestSize;
 
-    PointPriv = (miPointerScreenPtr) pScreen->devPrivates[miPointerScreenIndex].ptr;
+    PointPriv = (miPointerScreenPtr)
+	dixLookupPrivate(&pScreen->devPrivates, miPointerScreenKey);
 
     ScreenPriv->spriteFuncs = PointPriv->spriteFuncs;
     PointPriv->spriteFuncs = &quartzSpriteFuncsRec;
diff --git a/hw/dmx/dmxcmap.c b/hw/dmx/dmxcmap.c
index 949d7d689..4aa586aff 100644
--- a/hw/dmx/dmxcmap.c
+++ b/hw/dmx/dmxcmap.c
@@ -46,24 +46,10 @@
 
 #include "micmap.h"
 
-static int dmxInitColormapPrivateFunc(ColormapPtr pColormap, int index)
-{
-    return TRUE;
-}
-
 static Bool dmxAllocateColormapPrivates(ColormapPtr pColormap)
 {
-    static unsigned long dmxColormapGeneration;
     dmxColormapPrivPtr   pCmapPriv;
 
-    if (dmxColormapGeneration != serverGeneration) {
-	if ((dmxColormapPrivateIndex
-	     = AllocateColormapPrivateIndex(dmxInitColormapPrivateFunc)) < 0)
-	    return FALSE;
-
-	dmxColormapGeneration = serverGeneration;
-    }
-
     pCmapPriv = (dmxColormapPrivPtr)xalloc(sizeof(*pCmapPriv));
     if (!pCmapPriv)
 	return FALSE;
diff --git a/hw/dmx/dmxcmap.h b/hw/dmx/dmxcmap.h
index 228f8662e..f968f8622 100644
--- a/hw/dmx/dmxcmap.h
+++ b/hw/dmx/dmxcmap.h
@@ -56,15 +56,14 @@ extern Bool dmxBECreateColormap(ColormapPtr pColormap);
 extern Bool dmxBEFreeColormap(ColormapPtr pColormap);
 
 /** Private index.  \see dmxcmap.c \see dmxscrinit.c \see dmxwindow.c */
-extern int dmxColormapPrivateIndex;
+extern DevPrivateKey dmxColormapPrivateKey;
 
 /** Set colormap private structure. */
 #define DMX_SET_COLORMAP_PRIV(_pCMap, _pCMapPriv)			\
-    (_pCMap)->devPrivates[dmxColormapPrivateIndex].ptr			\
-	= (pointer)(_pCMapPriv);
+    dixSetPrivate(&(_pCMap)->devPrivates, dmxColormapPrivateKey, _pCMapPriv)
 
 /** Get colormap private structure. */
-#define DMX_GET_COLORMAP_PRIV(_pCMap)					\
-    (dmxColormapPrivPtr)(_pCMap)->devPrivates[dmxColormapPrivateIndex].ptr
+#define DMX_GET_COLORMAP_PRIV(_pCMap) (dmxColormapPrivPtr)		\
+    dixLookupPrivate(&(_pCMap)->devPrivates, dmxColormapPrivateKey)
 
 #endif /* DMXCMAP_H */
diff --git a/hw/dmx/dmxdpms.c b/hw/dmx/dmxdpms.c
index ea0d66c3c..8c745a6aa 100644
--- a/hw/dmx/dmxdpms.c
+++ b/hw/dmx/dmxdpms.c
@@ -177,7 +177,7 @@ void dmxDPMSWakeup(void)
     if (screenIsSaved == SCREEN_SAVER_ON)
         SaveScreens(serverClient, SCREEN_SAVER_OFF, ScreenSaverReset);
 #ifdef DPMSExtension
-    if (DPMSPowerLevel) DPMSSet(0);
+    if (DPMSPowerLevel) DPMSSet(serverClient, 0);
 #endif
 }
 
@@ -190,11 +190,11 @@ Bool DPMSSupported(void)
 }
 
 /** This is used by clients (e.g., xset) to set the DPMS level. */
-void DPMSSet(int level)
+int DPMSSet(ClientPtr client, int level)
 {
     int i;
 
-    if (!dpmsSupported) return;
+    if (!dpmsSupported) return Success;
 
     if (level < 0) level = DPMSModeOn;
     if (level > 3) level = DPMSModeOff;
@@ -208,5 +208,6 @@ void DPMSSet(int level)
 	    dmxSync(dmxScreen, FALSE);
 	}
     }
+    return Success;
 }
 #endif
diff --git a/hw/dmx/dmxgc.c b/hw/dmx/dmxgc.c
index 981f64d0a..ce1730cff 100644
--- a/hw/dmx/dmxgc.c
+++ b/hw/dmx/dmxgc.c
@@ -82,13 +82,9 @@ static GCOps dmxGCOps = {
     dmxPushPixels
 };
 
-/** Initialize the GC on \a pScreen, which currently involves allocating
- *  the GC private associated with this screen. */
+/** Initialize the GC on \a pScreen */
 Bool dmxInitGC(ScreenPtr pScreen)
 {
-    if (!AllocateGCPrivate(pScreen, dmxGCPrivateIndex, sizeof(dmxGCPrivRec)))
-	return FALSE;
-
     return TRUE;
 }
 
diff --git a/hw/dmx/dmxgc.h b/hw/dmx/dmxgc.h
index 3d49f6735..2da3ba85e 100644
--- a/hw/dmx/dmxgc.h
+++ b/hw/dmx/dmxgc.h
@@ -64,11 +64,11 @@ extern void dmxBECreateGC(ScreenPtr pScreen, GCPtr pGC);
 extern Bool dmxBEFreeGC(GCPtr pGC);
 
 /** Private index.  \see dmxgc.c \see dmxscrinit.c */
-extern int dmxGCPrivateIndex;
+extern DevPrivateKey dmxGCPrivateKey;
 
 /** Get private. */
 #define DMX_GET_GC_PRIV(_pGC)						\
-    (dmxGCPrivPtr)(_pGC)->devPrivates[dmxGCPrivateIndex].ptr
+    (dmxGCPrivPtr)dixLookupPrivate(&(_pGC)->devPrivates, dmxGCPrivateKey)
 
 #define DMX_GC_FUNC_PROLOGUE(_pGC)					\
 do {									\
diff --git a/hw/dmx/dmxpict.c b/hw/dmx/dmxpict.c
index 478542a13..f2110b534 100644
--- a/hw/dmx/dmxpict.c
+++ b/hw/dmx/dmxpict.c
@@ -144,8 +144,7 @@ Bool dmxPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
     if (!miPictureInit(pScreen, formats, nformats))
 	return FALSE;
 
-    if (!AllocatePicturePrivate(pScreen, dmxPictPrivateIndex,
-				sizeof(dmxPictPrivRec)))
+    if (!dixRequestPrivate(dmxPictPrivateKey, sizeof(dmxPictPrivRec)))
 	return FALSE;
 
     ps = GetPictureScreen(pScreen);
diff --git a/hw/dmx/dmxpict.h b/hw/dmx/dmxpict.h
index c178ef39c..a81eb7d37 100644
--- a/hw/dmx/dmxpict.h
+++ b/hw/dmx/dmxpict.h
@@ -116,19 +116,19 @@ extern Bool dmxBEFreeGlyphSet(ScreenPtr pScreen, GlyphSetPtr glyphSet);
 extern int dmxBECreatePicture(PicturePtr pPicture);
 extern Bool dmxBEFreePicture(PicturePtr pPicture);
 
-extern int dmxPictPrivateIndex;		/**< Index for picture private data */
-extern int dmxGlyphSetPrivateIndex;	/**< Index for glyphset private data */
+extern DevPrivateKey dmxPictPrivateKey;	/**< Index for picture private data */
+extern DevPrivateKey dmxGlyphSetPrivateKey; /**< Index for glyphset private data */
 
 
 /** Get the picture private data given a picture pointer */
 #define DMX_GET_PICT_PRIV(_pPict)					\
-    (dmxPictPrivPtr)(_pPict)->devPrivates[dmxPictPrivateIndex].ptr
+    (dmxPictPrivPtr)dixLookupPrivate(&(_pPict)->devPrivates, dmxPictPrivateKey)
 
 /** Set the glyphset private data given a glyphset pointer */
 #define DMX_SET_GLYPH_PRIV(_pGlyph, _pPriv)				\
-    GlyphSetSetPrivate((_pGlyph), dmxGlyphSetPrivateIndex, (_pPriv))
+    GlyphSetSetPrivate((_pGlyph), dmxGlyphSetPrivateKey, (_pPriv))
 /** Get the glyphset private data given a glyphset pointer */
 #define DMX_GET_GLYPH_PRIV(_pGlyph)					\
-    (dmxGlyphPrivPtr)GlyphSetGetPrivate((_pGlyph), dmxGlyphSetPrivateIndex)
+    (dmxGlyphPrivPtr)GlyphSetGetPrivate((_pGlyph), dmxGlyphSetPrivateKey)
 
 #endif /* DMXPICT_H */
diff --git a/hw/dmx/dmxpixmap.c b/hw/dmx/dmxpixmap.c
index 323ae606a..f8d012630 100644
--- a/hw/dmx/dmxpixmap.c
+++ b/hw/dmx/dmxpixmap.c
@@ -49,8 +49,7 @@
 /** Initialize a private area in \a pScreen for pixmap information. */
 Bool dmxInitPixmap(ScreenPtr pScreen)
 {
-    if (!AllocatePixmapPrivate(pScreen, dmxPixPrivateIndex,
-			       sizeof(dmxPixPrivRec)))
+    if (!dixRequestPrivate(dmxPixPrivateKey, sizeof(dmxPixPrivRec)))
 	return FALSE;
 
     return TRUE;
@@ -173,7 +172,7 @@ Bool dmxDestroyPixmap(PixmapPtr pPixmap)
 	    dmxSync(dmxScreen, FALSE);
 	}
     }
-    dixFreePrivates(*DEVPRIV_PTR(pPixmap));
+    dixFreePrivates(pPixmap->devPrivates);
     xfree(pPixmap);
 
 #if 0
diff --git a/hw/dmx/dmxpixmap.h b/hw/dmx/dmxpixmap.h
index 4ecd10fd8..3cfd99e6d 100644
--- a/hw/dmx/dmxpixmap.h
+++ b/hw/dmx/dmxpixmap.h
@@ -57,10 +57,10 @@ extern void      dmxBECreatePixmap(PixmapPtr pPixmap);
 extern Bool      dmxBEFreePixmap(PixmapPtr pPixmap);
 
 /** Private index.  \see dmxpicmap.h \see dmxscrinit.c */
-extern int dmxPixPrivateIndex;
+extern DevPrivateKey dmxPixPrivateKey;
 
 /** Get pixmap private pointer. */
 #define DMX_GET_PIXMAP_PRIV(_pPix)					\
-    (dmxPixPrivPtr)(_pPix)->devPrivates[dmxPixPrivateIndex].ptr
+    (dmxPixPrivPtr)dixLookupPrivate(&(_pPix)->devPrivates, dmxPixPrivateKey)
 
 #endif /* DMXPIXMAP_H */
diff --git a/hw/dmx/dmxscrinit.c b/hw/dmx/dmxscrinit.c
index 8ae448a5e..9b15bb38c 100644
--- a/hw/dmx/dmxscrinit.c
+++ b/hw/dmx/dmxscrinit.c
@@ -67,15 +67,15 @@ static Bool dmxSaveScreen(ScreenPtr pScreen, int what);
 static unsigned long dmxGeneration;
 static unsigned long *dmxCursorGeneration;
 
-int dmxGCPrivateIndex;          /**< Private index for GCs       */
-int dmxWinPrivateIndex;         /**< Private index for Windows   */
-int dmxPixPrivateIndex;         /**< Private index for Pixmaps   */
+DevPrivateKey dmxGCPrivateKey = &dmxGCPrivateKey; /**< Private index for GCs       */
+DevPrivateKey dmxWinPrivateKey = &dmxWinPrivateKey; /**< Private index for Windows   */
+DevPrivateKey dmxPixPrivateKey = &dmxPixPrivateKey; /**< Private index for Pixmaps   */
 int dmxFontPrivateIndex;        /**< Private index for Fonts     */
-int dmxScreenPrivateIndex;      /**< Private index for Screens   */
-int dmxColormapPrivateIndex;    /**< Private index for Colormaps */
+DevPrivateKey dmxScreenPrivateKey = &dmxScreenPrivateKey; /**< Private index for Screens   */
+DevPrivateKey dmxColormapPrivateKey = &dmxColormapPrivateKey; /**< Private index for Colormaps */
 #ifdef RENDER
-int dmxPictPrivateIndex;        /**< Private index for Picts     */
-int dmxGlyphSetPrivateIndex;    /**< Private index for GlyphSets */
+DevPrivateKey dmxPictPrivateKey = &dmxPictPrivateKey; /**< Private index for Picts     */
+DevPrivateKey dmxGlyphSetPrivateKey = &dmxGlyphSetPrivateKey; /**< Private index for GlyphSets */
 #endif
 
 /** Initialize the parts of screen \a idx that require access to the
@@ -208,43 +208,11 @@ Bool dmxScreenInit(int idx, ScreenPtr pScreen, int argc, char *argv[])
     int                   i, j;
 
     if (dmxGeneration != serverGeneration) {
-#ifdef RENDER
-	/* Allocate picture private index */
-	dmxPictPrivateIndex = AllocatePicturePrivateIndex();
-	if (dmxPictPrivateIndex == -1)
-	    return FALSE;
-
-	/* Allocate glyph set private index */
-	dmxGlyphSetPrivateIndex = AllocateGlyphSetPrivateIndex();
-	if (dmxGlyphSetPrivateIndex == -1)
-	    return FALSE;
-#endif
-
-	/* Allocate GC private index */
-	dmxGCPrivateIndex = AllocateGCPrivateIndex();
-	if (dmxGCPrivateIndex == -1)
-	    return FALSE;
-
-	/* Allocate window private index */
-	dmxWinPrivateIndex = AllocateWindowPrivateIndex();
-	if (dmxWinPrivateIndex == -1)
-	    return FALSE;
-
-	/* Allocate pixmap private index */
-	dmxPixPrivateIndex = AllocatePixmapPrivateIndex();
-	if (dmxPixPrivateIndex == -1)
-	    return FALSE;
-
 	/* Allocate font private index */
 	dmxFontPrivateIndex = AllocateFontPrivateIndex();
 	if (dmxFontPrivateIndex == -1)
 	    return FALSE;
 
-        /* Allocate screen private index */
-        dmxScreenPrivateIndex = AllocateScreenPrivateIndex();
-        if (dmxScreenPrivateIndex == -1)
-            return FALSE;
-
 	dmxGeneration = serverGeneration;
     }
 
diff --git a/hw/dmx/dmxscrinit.h b/hw/dmx/dmxscrinit.h
index 46a0a00a4..a4642350c 100644
--- a/hw/dmx/dmxscrinit.h
+++ b/hw/dmx/dmxscrinit.h
@@ -41,7 +41,7 @@
 #include "scrnintstr.h"
 
 /** Private index.  \see dmxscrrinit.c \see input/dmxconcole.c */
-extern int dmxScreenPrivateIndex;
+extern DevPrivateKey dmxScreenPrivateKey;
 
 extern Bool dmxScreenInit(int idx, ScreenPtr pScreen, int argc, char *argv[]);
 
diff --git a/hw/dmx/dmxwindow.c b/hw/dmx/dmxwindow.c
index b66f2a3bb..fa6b9a279 100644
--- a/hw/dmx/dmxwindow.c
+++ b/hw/dmx/dmxwindow.c
@@ -64,8 +64,7 @@ static void dmxDoSetShape(WindowPtr pWindow);
 /** Initialize the private area for the window functions. */
 Bool dmxInitWindow(ScreenPtr pScreen)
 {
-    if (!AllocateWindowPrivate(pScreen, dmxWinPrivateIndex,
-			       sizeof(dmxWinPrivRec)))
+    if (!dixRequestPrivate(dmxWinPrivateKey, sizeof(dmxWinPrivRec)))
 	return FALSE;
 
     return TRUE;
diff --git a/hw/dmx/dmxwindow.h b/hw/dmx/dmxwindow.h
index f976c7954..1a984331e 100644
--- a/hw/dmx/dmxwindow.h
+++ b/hw/dmx/dmxwindow.h
@@ -107,11 +107,11 @@ extern void dmxSetShape(WindowPtr pWindow);
 #endif
 
 /** Private index.  \see dmxwindow.c \see dmxscrinit.c */
-extern int dmxWinPrivateIndex;
+extern DevPrivateKey dmxWinPrivateKey;
 
 /** Get window private pointer. */
-#define DMX_GET_WINDOW_PRIV(_pWin)					\
-    ((dmxWinPrivPtr)(_pWin)->devPrivates[dmxWinPrivateIndex].ptr)
+#define DMX_GET_WINDOW_PRIV(_pWin) ((dmxWinPrivPtr) \
+    dixLookupPrivate(&(_pWin)->devPrivates, dmxWinPrivateKey))
 
 /* All of these macros are only used in dmxwindow.c */
 #define DMX_WINDOW_FUNC_PROLOGUE(_pGC)					\
diff --git a/hw/dmx/input/dmxconsole.c b/hw/dmx/input/dmxconsole.c
index cc820a204..b2a2ec302 100644
--- a/hw/dmx/input/dmxconsole.c
+++ b/hw/dmx/input/dmxconsole.c
@@ -612,7 +612,8 @@ static Bool dmxCloseConsoleScreen(int idx, ScreenPtr pScreen)
 {
     myPrivate *priv, *last;
 
-    for (last = priv = pScreen->devPrivates[dmxScreenPrivateIndex].ptr;
+    for (last = priv = (myPrivate *)dixLookupPrivate(&pScreen->devPrivates,
+						     dmxScreenPrivateKey);
          priv;
          priv = priv->next) dmxCloseConsole(last = priv);
     
@@ -846,13 +847,15 @@ void dmxConsoleInit(DevicePtr pDev)
 
     dmxConsoleDraw(priv, 1, 1);
 
-    if (screenInfo.screens[0]->devPrivates[dmxScreenPrivateIndex].ptr)
-        priv->next = (screenInfo.screens[0]
-                      ->devPrivates[dmxScreenPrivateIndex].ptr);
+    if (dixLookupPrivate(&screenInfo.screens[0]->devPrivates,
+			 dmxScreenPrivateKey))
+        priv->next = dixLookupPrivate(&screenInfo.screens[0]->devPrivates,
+				      dmxScreenPrivateKey);
     else 
         DMX_WRAP(CloseScreen, dmxCloseConsoleScreen,
                  priv, screenInfo.screens[0]);
-    screenInfo.screens[0]->devPrivates[dmxScreenPrivateIndex].ptr = priv;
+    dixSetPrivate(&screenInfo.screens[0]->devPrivates, dmxScreenPrivateKey,
+		  priv);
 }
 
 /** Fill in the \a info structure for the specified \a pDev.  Only used
diff --git a/hw/kdrive/savage/s3draw.c b/hw/kdrive/savage/s3draw.c
index 258dbcf79..39cc256b3 100644
--- a/hw/kdrive/savage/s3draw.c
+++ b/hw/kdrive/savage/s3draw.c
@@ -78,9 +78,8 @@ short s3alu[16] = {
 #define PixTransStore(t)	*pix_trans = (t)
 #endif
 
-int	s3GCPrivateIndex;
-int	s3WindowPrivateIndex;
-int	s3Generation;
+DevPrivateKey s3GCPrivateKey = &s3GCPrivateKey;
+DevPrivateKey s3WindowPrivateKey = &s3WindowPrivateKey;
 
 /*
   s3DoBitBlt
@@ -2182,7 +2181,7 @@ s3CreateWindow (WindowPtr pWin)
     KdScreenPriv(pWin->drawable.pScreen);
     s3ScreenInfo(pScreenPriv);
     
-    pWin->devPrivates[s3WindowPrivateIndex].ptr = 0;
+    dixSetPrivate(&pWin->devPrivates, s3WindowPrivateKey, NULL);
     return KdCreateWindow (pWin);
 }
 
@@ -3095,15 +3094,7 @@ s3DrawInit (ScreenPtr pScreen)
     }
     else
     {
-	if (serverGeneration != s3Generation)
-	{
-	    s3GCPrivateIndex = AllocateGCPrivateIndex ();
-	    s3WindowPrivateIndex = AllocateWindowPrivateIndex ();
-	    s3Generation = serverGeneration;
-	}
-	if (!AllocateWindowPrivate(pScreen, s3WindowPrivateIndex, 0))
-	    return FALSE;
-	if (!AllocateGCPrivate(pScreen, s3GCPrivateIndex, sizeof (s3PrivGCRec)))
+	if (!dixRequestPrivate(s3GCPrivateKey, sizeof (s3PrivGCRec)))
 	    return FALSE;
 	pScreen->CreateGC = s3CreateGC;
 	pScreen->CreateWindow = s3CreateWindow;
diff --git a/hw/kdrive/savage/s3draw.h b/hw/kdrive/savage/s3draw.h
index 068904370..eab8e395e 100644
--- a/hw/kdrive/savage/s3draw.h
+++ b/hw/kdrive/savage/s3draw.h
@@ -24,8 +24,8 @@
 #ifndef _S3DRAW_H_
 #define _S3DRAW_H_
 
-extern int  s3GCPrivateIndex;
-extern int  s3WindowPrivateIndex;
+extern DevPrivateKey s3GCPrivateKey;
+extern DevPrivateKey s3WindowPrivateKey;
 
 typedef struct _s3Pattern {
     S3PatternCache    	*cache;
@@ -42,16 +42,16 @@ typedef struct _s3PrivGC {
     s3PatternPtr    pPattern;	    /* pattern */
 } s3PrivGCRec, *s3PrivGCPtr;
 
-#define s3GetGCPrivate(g)	    ((s3PrivGCPtr) \
-			    (g)->devPrivates[s3GCPrivateIndex].ptr)
+#define s3GetGCPrivate(g) ((s3PrivGCPtr) \
+    dixLookupPrivate(&(g)->devPrivates, s3GCPrivateKey))
 
-#define s3GCPrivate(g)	    s3PrivGCPtr s3Priv = s3GetGCPrivate(g)
+#define s3GCPrivate(g)    s3PrivGCPtr s3Priv = s3GetGCPrivate(g)
 
-#define s3GetWindowPrivate(w)    ((s3PatternPtr) \
-			    (w)->devPrivates[s3WindowPrivateIndex].ptr)
+#define s3GetWindowPrivate(w) ((s3PatternPtr) \
+    dixLookupPrivate(&(w)->devPrivates, s3WindowPrivateKey))
 
-#define s3SetWindowPrivate(w,p) (\
-	    (w)->devPrivates[s3WindowPrivateIndex].ptr = (pointer) p)
+#define s3SetWindowPrivate(w,p) \
+    dixSetPrivate(&(w)->devPrivates, s3WindowPrivateKey, p)
 
 void	_s3LoadPattern (ScreenPtr pScreen, int fb, s3PatternPtr pPattern);
 
diff --git a/hw/kdrive/src/kaa.c b/hw/kdrive/src/kaa.c
index c9805ddb6..da618bee5 100644
--- a/hw/kdrive/src/kaa.c
+++ b/hw/kdrive/src/kaa.c
@@ -42,9 +42,8 @@
 #define DBG_PIXMAP(a)
 #endif
  
-int kaaGeneration;
-int kaaScreenPrivateIndex;
-int kaaPixmapPrivateIndex;
+DevPrivateKey kaaScreenPrivateKey = &kaaScreenPrivateKey;
+DevPrivateKey kaaPixmapPrivateKey = &kaaPixmapPrivateKey;
 
 #define KAA_PIXMAP_SCORE_MOVE_IN    10
 #define KAA_PIXMAP_SCORE_MAX	    20
@@ -1066,13 +1065,6 @@ kaaDrawInit (ScreenPtr		pScreen,
     PictureScreenPtr	ps = GetPictureScreenIfSet(pScreen);
 #endif
     
-    if (kaaGeneration != serverGeneration)
-    {
-	kaaScreenPrivateIndex = AllocateScreenPrivateIndex();
-	kaaPixmapPrivateIndex = AllocatePixmapPrivateIndex();
-	kaaGeneration = serverGeneration;
-    }
-
     pKaaScr = xalloc (sizeof (KaaScreenPrivRec));
 
     if (!pKaaScr)
@@ -1080,7 +1072,7 @@ kaaDrawInit (ScreenPtr		pScreen,
     
     pKaaScr->info = pScreenInfo;
     
-    pScreen->devPrivates[kaaScreenPrivateIndex].ptr = (pointer) pKaaScr;
+    dixSetPrivate(&pScreen->devPrivates, kaaScreenPrivateKey, pKaaScr);
     
     /*
      * Hook up asynchronous drawing
@@ -1106,17 +1098,11 @@ kaaDrawInit (ScreenPtr		pScreen,
     if ((pKaaScr->info->flags & KAA_OFFSCREEN_PIXMAPS) &&
 	screen->off_screen_base < screen->memory_size)
     {
-	if (!AllocatePixmapPrivate(pScreen, kaaPixmapPrivateIndex,
-				   sizeof (KaaPixmapPrivRec)))
+	if (!dixRequestPrivate(kaaPixmapPrivateKey, sizeof (KaaPixmapPrivRec)))
 	    return FALSE;
 	pScreen->CreatePixmap = kaaCreatePixmap;
 	pScreen->DestroyPixmap = kaaDestroyPixmap;
     }
-    else
-    {
-	if (!AllocatePixmapPrivate(pScreen, kaaPixmapPrivateIndex, 0))
-	    return FALSE;
-    }
 
     return TRUE;
 }
diff --git a/hw/kdrive/src/kaa.h b/hw/kdrive/src/kaa.h
index db890a75b..90b963b10 100644
--- a/hw/kdrive/src/kaa.h
+++ b/hw/kdrive/src/kaa.h
@@ -27,11 +27,14 @@
 
 #include "picturestr.h"
 
-#define KaaGetScreenPriv(s)	((KaaScreenPrivPtr)(s)->devPrivates[kaaScreenPrivateIndex].ptr)
+#define KaaGetScreenPriv(s) ((KaaScreenPrivPtr) \
+    dixLookupPrivate(&(s)->devPrivates, kaaScreenPrivateKey))
 #define KaaScreenPriv(s)	KaaScreenPrivPtr    pKaaScr = KaaGetScreenPriv(s)
 
-#define KaaGetPixmapPriv(p)	((KaaPixmapPrivPtr)(p)->devPrivates[kaaPixmapPrivateIndex].ptr)
-#define KaaSetPixmapPriv(p,a)	((p)->devPrivates[kaaPixmapPrivateIndex].ptr = (pointer) (a))
+#define KaaGetPixmapPriv(p) ((KaaPixmapPrivPtr) \
+    dixLookupPrivate(&(p)->devPrivates, kaaPixmapPrivateKey))
+#define KaaSetPixmapPriv(p,a) \
+    dixSetPrivate(&(p)->devPrivates, kaaPixmapPrivateKey, a)
 #define KaaPixmapPriv(p)	KaaPixmapPrivPtr pKaaPixmap = KaaGetPixmapPriv(p)
 
 typedef struct {
@@ -46,8 +49,8 @@ typedef struct {
     Bool	    dirty;
 } KaaPixmapPrivRec, *KaaPixmapPrivPtr;
 
-extern int kaaScreenPrivateIndex;
-extern int kaaPixmapPrivateIndex;
+extern DevPrivateKey kaaScreenPrivateKey;
+extern DevPrivateKey kaaPixmapPrivateKey;
 
 
 void
diff --git a/hw/kdrive/src/kdrive.h b/hw/kdrive/src/kdrive.h
index 2da008df9..d6646f0ef 100644
--- a/hw/kdrive/src/kdrive.h
+++ b/hw/kdrive/src/kdrive.h
@@ -498,7 +498,7 @@ typedef struct _KaaScreenInfo {
     (PixmapWidthPaddingInfo[d].padRoundUp+1)))
 #endif
 
-extern int		kdScreenPrivateIndex;
+extern DevPrivateKey	kdScreenPrivateKey;
 extern unsigned long	kdGeneration;
 extern Bool		kdEnabled;
 extern Bool		kdSwitchPending;
@@ -510,9 +510,9 @@ extern char		*kdSwitchCmd;
 extern KdOsFuncs	*kdOsFuncs;
 
 #define KdGetScreenPriv(pScreen) ((KdPrivScreenPtr) \
-				  (pScreen)->devPrivates[kdScreenPrivateIndex].ptr)
-#define KdSetScreenPriv(pScreen,v) ((pScreen)->devPrivates[kdScreenPrivateIndex].ptr = \
-				    (pointer) v)
+    dixLookupPrivate(&(pScreen)->devPrivates, kdScreenPrivateKey))
+#define KdSetScreenPriv(pScreen,v) \
+    dixSetPrivate(&(pScreen)->devPrivates, kdScreenPrivateKey, v)
 #define KdScreenPriv(pScreen) KdPrivScreenPtr pScreenPriv = KdGetScreenPriv(pScreen)
 
 /* kaa.c */
diff --git a/hw/kdrive/src/kxv.c b/hw/kdrive/src/kxv.c
index b8fbd731b..fa506861c 100644
--- a/hw/kdrive/src/kxv.c
+++ b/hw/kdrive/src/kxv.c
@@ -104,23 +104,22 @@ static void KdXVClipNotify(WindowPtr pWin, int dx, int dy);
 static Bool KdXVInitAdaptors(ScreenPtr, KdVideoAdaptorPtr*, int);
 
 
-int KdXVWindowIndex = -1;
-int KdXvScreenIndex = -1;
-static unsigned long KdXVGeneration = 0;
+DevPrivateKey KdXVWindowKey = &KdXVWindowKey;
+DevPrivateKey KdXvScreenKey = &KdXvScreenKey;
 static unsigned long PortResource = 0;
 
-int (*XvGetScreenIndexProc)(void) = XvGetScreenIndex;
+int (*XvGetScreenKeyProc)(void) = XvGetScreenKey;
 unsigned long (*XvGetRTPortProc)(void) = XvGetRTPort;
 int (*XvScreenInitProc)(ScreenPtr) = XvScreenInit;
 
-#define GET_XV_SCREEN(pScreen) \
-	((XvScreenPtr)((pScreen)->devPrivates[KdXvScreenIndex].ptr))
+#define GET_XV_SCREEN(pScreen) ((XvScreenPtr) \
+    dixLookupPrivate(&(pScreen)->devPrivates, KdXvScreenKey))
 
 #define GET_KDXV_SCREEN(pScreen) \
   	((KdXVScreenPtr)(GET_XV_SCREEN(pScreen)->devPriv.ptr))
 
-#define GET_KDXV_WINDOW(pWin) \
-	((KdXVWindowPtr)((pWin)->devPrivates[KdXVWindowIndex].ptr))
+#define GET_KDXV_WINDOW(pWin) ((KdXVWindowPtr) \
+    dixLookupPrivate(&(pWin)->devPrivates, KdXVWindowKey))
 
 static KdXVInitGenericAdaptorPtr *GenDrivers = NULL;
 static int NumGenDrivers = 0;
@@ -192,21 +191,12 @@ KdXVScreenInit(
 
 /*   fprintf(stderr,"KdXVScreenInit initializing %d adaptors\n",num); */
 
-  if(KdXVGeneration != serverGeneration) {
-	if((KdXVWindowIndex = AllocateWindowPrivateIndex()) < 0)
-	    return FALSE;
-	KdXVGeneration = serverGeneration;
-  }
-
-  if(!AllocateWindowPrivate(pScreen,KdXVWindowIndex,0))
-        return FALSE;
-
-  if(!XvGetScreenIndexProc || !XvGetRTPortProc || !XvScreenInitProc)
+  if(!XvGetScreenKeyProc || !XvGetRTPortProc || !XvScreenInitProc)
 	return FALSE;  
 
   if(Success != (*XvScreenInitProc)(pScreen)) return FALSE;
 
-  KdXvScreenIndex = (*XvGetScreenIndexProc)();
+  KdXvScreenIndex = (*XvGetScreenKeyProc)();
   PortResource = (*XvGetRTPortProc)();
 
   pxvs = GET_XV_SCREEN(pScreen);
@@ -938,7 +928,7 @@ KdXVEnlistPortInWindow(WindowPtr pWin, XvPortRecPrivatePtr portPriv)
 	if(!winPriv) return BadAlloc;
 	winPriv->PortRec = portPriv;
 	winPriv->next = PrivRoot;
-	pWin->devPrivates[KdXVWindowIndex].ptr = (pointer)winPriv;
+	dixSetPrivate(&pWin->devPrivates, KdXVWindowKey, winPriv);
    }   
    return Success;
 }
@@ -956,8 +946,7 @@ KdXVRemovePortFromWindow(WindowPtr pWin, XvPortRecPrivatePtr portPriv)
 	    if(prevPriv) 
 		prevPriv->next = winPriv->next;
 	    else 
-		pWin->devPrivates[KdXVWindowIndex].ptr = 
-					(pointer)winPriv->next;
+		dixSetPrivate(&pWin->devPrivates, KdXVWindowKey, winPriv->next);
 	    xfree(winPriv);
 	    break;
 	}
@@ -981,7 +970,8 @@ KdXVCreateWindow(WindowPtr pWin)
   ret = (*pScreen->CreateWindow)(pWin);
   pScreen->CreateWindow = KdXVCreateWindow;
 
-  if(ret) pWin->devPrivates[KdXVWindowIndex].ptr = NULL;
+  if (ret)
+      dixSetPrivate(&pWin->devPrivates, KdXVWindowKey, NULL);
 
   return ret;
 }
@@ -1010,7 +1000,7 @@ KdXVDestroyWindow(WindowPtr pWin)
      xfree(tmp);
   }
 
-  pWin->devPrivates[KdXVWindowIndex].ptr = NULL;
+  dixSetPrivate(&pWin->devPrivates, KdXVWindowKey, NULL);
 
   pScreen->DestroyWindow = ScreenPriv->DestroyWindow;
   ret = (*pScreen->DestroyWindow)(pWin);
@@ -1067,8 +1057,7 @@ KdXVWindowExposures(WindowPtr pWin, RegionPtr reg1, RegionPtr reg2)
 	    pPriv->pDraw = NULL;
 
 	    if(!pPrev) 
-	       pWin->devPrivates[KdXVWindowIndex].ptr = 		
-						(pointer)(WinPriv->next);
+		dixSetPrivate(&pWin->devPrivates, KdXVWindowKey, WinPriv->next);
 	    else
 	       pPrev->next = WinPriv->next;
 	    tmp = WinPriv;
@@ -1117,8 +1106,7 @@ KdXVClipNotify(WindowPtr pWin, int dx, int dy)
 	    pPriv->pDraw = NULL;
 
 	    if(!pPrev) 
-	       pWin->devPrivates[KdXVWindowIndex].ptr = 		
-						(pointer)(WinPriv->next);
+		dixSetPrivate(&pWin->devPrivates, KdXVWindowKey, winPriv->next);
 	    else
 	       pPrev->next = WinPriv->next;
 	    tmp = WinPriv;
diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index 69d619e6f..f8febc5a4 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -57,9 +57,9 @@
 /* General parameters */
 extern int xf86DoConfigure;
 extern Bool xf86DoConfigurePass1;
-extern int xf86ScreenIndex;		/* Index into pScreen.devPrivates */
-extern int xf86CreateRootWindowIndex;	/* Index into pScreen.devPrivates */
-extern int xf86PixmapIndex;
+extern DevPrivateKey xf86ScreenKey;
+extern DevPrivateKey xf86CreateRootWindowKey;
+extern DevPrivateKey xf86PixmapKey;
 extern ScrnInfoPtr *xf86Screens;	/* List of pointers to ScrnInfoRecs */
 extern const unsigned char byte_reversed[256];
 extern ScrnInfoPtr xf86CurrentScreen;
@@ -72,8 +72,8 @@ extern Bool sbusSlotClaimed;
 extern confDRIRec xf86ConfigDRI;
 extern Bool xf86inSuspend;
 
-#define XF86SCRNINFO(p) ((ScrnInfoPtr)((p)->devPrivates[xf86ScreenIndex].ptr))
-
+#define XF86SCRNINFO(p) ((ScrnInfoPtr)dixLookupPrivate(&(p)->devPrivates, \
+						       xf86ScreenKey))
 #define XF86FLIP_PIXELS() \
 	do { \
 	    if (xf86GetFlipPixels()) { \
diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c
index 9474ec8e0..68f538fae 100644
--- a/hw/xfree86/common/xf86DGA.c
+++ b/hw/xfree86/common/xf86DGA.c
@@ -49,8 +49,7 @@
 
 #include "mi.h"
 
-static unsigned long DGAGeneration = 0;
-static int DGAScreenIndex = -1;
+static DevPrivateKey DGAScreenKey = NULL;
 static int mieq_installed = 0;
 
 static Bool DGACloseScreen(int i, ScreenPtr pScreen);
@@ -68,8 +67,8 @@ DGACopyModeInfo(
 
 _X_EXPORT int *XDGAEventBase = NULL;
 
-#define DGA_GET_SCREEN_PRIV(pScreen) \
-	((DGAScreenPtr)((pScreen)->devPrivates[DGAScreenIndex].ptr))
+#define DGA_GET_SCREEN_PRIV(pScreen) ((DGAScreenPtr) \
+    dixLookupPrivate(&(pScreen)->devPrivates, DGAScreenKey))
 
 
 typedef struct _FakedVisualList{
@@ -116,11 +115,7 @@ DGAInit(
     if(!modes || num <= 0)
 	return FALSE;
 
-    if(DGAGeneration != serverGeneration) {
-	if((DGAScreenIndex = AllocateScreenPrivateIndex()) < 0)
-	    return FALSE;
-	DGAGeneration = serverGeneration;
-    }
+    DGAScreenKey = &DGAScreenKey;
 
     if(!(pScreenPriv = (DGAScreenPtr)xalloc(sizeof(DGAScreenRec))))
 	return FALSE;
@@ -148,7 +143,7 @@ DGAInit(
 	    modes[i].flags &= ~DGA_PIXMAP_AVAILABLE;
 #endif
 
-    pScreen->devPrivates[DGAScreenIndex].ptr = (pointer)pScreenPriv;
+    dixSetPrivate(&pScreen->devPrivates, DGAScreenKey, pScreenPriv);
     pScreenPriv->CloseScreen = pScreen->CloseScreen;
     pScreen->CloseScreen = DGACloseScreen;
     pScreenPriv->DestroyColormap = pScreen->DestroyColormap;
@@ -176,7 +171,7 @@ DGAReInitModes(
     int i;
 
     /* No DGA? Ignore call (but don't make it look like it failed) */
-    if(DGAScreenIndex < 0)
+    if(DGAScreenKey == NULL)
 	return TRUE;
 	
     pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
@@ -350,7 +345,7 @@ xf86SetDGAMode(
    DGAModePtr pMode = NULL;
 
    /* First check if DGAInit was successful on this screen */
-   if (DGAScreenIndex < 0)
+   if (DGAScreenKey == NULL)
 	return BadValue;
    pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
    if (!pScreenPriv)
@@ -485,7 +480,7 @@ DGAChangePixmapMode(int index, int *x, int *y, int mode)
    DGAModePtr   pMode;
    PixmapPtr    pPix;
 
-   if(DGAScreenIndex < 0)
+   if(DGAScreenKey == NULL)
 	return FALSE;
 
    pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
@@ -535,11 +530,12 @@ DGAChangePixmapMode(int index, int *x, int *y, int mode)
 _X_EXPORT Bool
 DGAAvailable(int index) 
 {
-   if(DGAScreenIndex < 0)
+   if(DGAScreenKey == NULL)
 	return FALSE;
    
-   if (!xf86NoSharedResources(((ScrnInfoPtr)screenInfo.screens[index]->
-			 devPrivates[xf86ScreenIndex].ptr)->scrnIndex,MEM))
+   if (!xf86NoSharedResources(((ScrnInfoPtr)dixLookupPrivate(
+				   &screenInfo.screens[index]->devPrivates,
+				   xf86ScreenKey))->scrnIndex, MEM))
        return FALSE;
    
    if(DGA_GET_SCREEN_PRIV(screenInfo.screens[index]))
@@ -553,7 +549,7 @@ DGAActive(int index)
 {
    DGAScreenPtr pScreenPriv;
 
-   if(DGAScreenIndex < 0)
+   if(DGAScreenKey == NULL)
 	return FALSE;
 
    pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
@@ -574,7 +570,7 @@ DGAShutdown()
     ScrnInfoPtr pScrn;
     int i;
 
-    if(DGAScreenIndex < 0)
+    if(DGAScreenKey == NULL)
 	return;
 
     for(i = 0; i < screenInfo.numScreens; i++) {
@@ -904,7 +900,7 @@ DGAVTSwitch(void)
 
        /* Alternatively, this could send events to DGA clients */
 
-       if(DGAScreenIndex >= 0) {
+       if(DGAScreenKey) {
 	   DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
 
 	   if(pScreenPriv && pScreenPriv->current)
@@ -921,7 +917,7 @@ DGAStealKeyEvent(int index, int key_code, int is_down)
    DGAScreenPtr pScreenPriv;
    dgaEvent    de;
     
-   if(DGAScreenIndex < 0) /* no DGA */
+   if(DGAScreenKey == NULL) /* no DGA */
         return FALSE;
 
    pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
@@ -945,7 +941,7 @@ DGAStealMotionEvent(int index, int dx, int dy)
    DGAScreenPtr pScreenPriv;
     dgaEvent    de;
 
-   if(DGAScreenIndex < 0) /* no DGA */
+   if(DGAScreenKey == NULL) /* no DGA */
         return FALSE;
     
    pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
@@ -980,7 +976,7 @@ DGAStealButtonEvent(int index, int button, int is_down)
     DGAScreenPtr pScreenPriv;
     dgaEvent de;
 
-    if (DGAScreenIndex < 0)
+    if (DGAScreenKey == NULL)
         return FALSE;
     
     pScreenPriv = DGA_GET_SCREEN_PRIV(screenInfo.screens[index]);
@@ -1006,7 +1002,7 @@ Bool
 DGAIsDgaEvent (xEvent *e)
 {
     int	    coreEquiv;
-    if (DGAScreenIndex < 0 || XDGAEventBase == 0)
+    if (DGAScreenKey == NULL || XDGAEventBase == 0)
 	return FALSE;
     coreEquiv = e->u.u.type - *XDGAEventBase;
     if (KeyPress <= coreEquiv && coreEquiv <= MotionNotify)
@@ -1275,7 +1271,7 @@ DGAHandleEvent(int screen_num, xEvent *event, DeviceIntPtr device, int nevents)
     int		    coreEquiv;
 
     /* no DGA */
-    if (DGAScreenIndex < 0 || XDGAEventBase == 0)
+    if (DGAScreenKey == NULL || XDGAEventBase == 0)
 	return;
     pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
     
diff --git a/hw/xfree86/common/xf86DPMS.c b/hw/xfree86/common/xf86DPMS.c
index a4ae67e46..536d38e8f 100644
--- a/hw/xfree86/common/xf86DPMS.c
+++ b/hw/xfree86/common/xf86DPMS.c
@@ -47,8 +47,7 @@
 
 
 #ifdef DPMSExtension
-static int DPMSGeneration = 0;
-static int DPMSIndex = -1;
+static DevPrivateKey DPMSKey = NULL;
 static Bool DPMSClose(int i, ScreenPtr pScreen);
 static int DPMSCount = 0;
 #endif
@@ -62,18 +61,15 @@ xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags)
     DPMSPtr pDPMS;
     pointer DPMSOpt;
 
-    if (serverGeneration != DPMSGeneration) {
-	if ((DPMSIndex = AllocateScreenPrivateIndex()) < 0)
-	    return FALSE;
-	DPMSGeneration = serverGeneration;
-    }
+    DPMSKey = &DPMSKey;
 
     if (DPMSDisabledSwitch)
 	DPMSEnabled = FALSE;
-    if (!(pScreen->devPrivates[DPMSIndex].ptr = xcalloc(sizeof(DPMSRec), 1)))
+    if (!dixSetPrivate(&pScreen->devPrivates, DPMSKey,
+		       xcalloc(sizeof(DPMSRec), 1)))
 	return FALSE;
 
-    pDPMS = (DPMSPtr)pScreen->devPrivates[DPMSIndex].ptr;
+    pDPMS = (DPMSPtr)dixLookupPrivate(&pScreen->devPrivates, DPMSKey);
     pScrn->DPMSSet = set;
     pDPMS->Flags = flags;
     DPMSOpt = xf86FindOption(pScrn->options, "dpms");
@@ -110,10 +106,10 @@ DPMSClose(int i, ScreenPtr pScreen)
     DPMSPtr pDPMS;
 
     /* This shouldn't happen */
-    if (DPMSIndex < 0)
+    if (DPMSKey == NULL)
 	return FALSE;
 
-    pDPMS = (DPMSPtr)pScreen->devPrivates[DPMSIndex].ptr;
+    pDPMS = (DPMSPtr)dixLookupPrivate(&pScreen->devPrivates, DPMSKey);
 
     /* This shouldn't happen */
     if (!pDPMS)
@@ -132,9 +128,9 @@ DPMSClose(int i, ScreenPtr pScreen)
     }
     
     xfree((pointer)pDPMS);
-    pScreen->devPrivates[DPMSIndex].ptr = NULL;
+    dixSetPrivate(&pScreen->devPrivates, DPMSKey, NULL);
     if (--DPMSCount == 0)
-	DPMSIndex = -1;
+	DPMSKey = NULL;
     return pScreen->CloseScreen(i, pScreen);
 }
 
@@ -153,7 +149,7 @@ DPMSSet(ClientPtr client, int level)
 
     DPMSPowerLevel = level;
 
-    if (DPMSIndex < 0)
+    if (DPMSKey == NULL)
 	return Success;
 
     if (level != DPMSModeOn) {
@@ -165,7 +161,8 @@ DPMSSet(ClientPtr client, int level)
     /* For each screen, set the DPMS level */
     for (i = 0; i < xf86NumScreens; i++) {
     	pScrn = xf86Screens[i];
-	pDPMS = (DPMSPtr)screenInfo.screens[i]->devPrivates[DPMSIndex].ptr;
+	pDPMS = (DPMSPtr)dixLookupPrivate(&screenInfo.screens[i]->devPrivates,
+					  DPMSKey);
 	if (pDPMS && pScrn->DPMSSet && pDPMS->Enabled && pScrn->vtSema) { 
 	    xf86EnableAccess(pScrn);
 	    pScrn->DPMSSet(pScrn, level, 0);
@@ -186,14 +183,15 @@ DPMSSupported(void)
     DPMSPtr pDPMS;
     ScrnInfoPtr pScrn;
 
-    if (DPMSIndex < 0) {
+    if (DPMSKey == NULL) {
 	return FALSE;
     }
 
     /* For each screen, check if DPMS is supported */
     for (i = 0; i < xf86NumScreens; i++) {
     	pScrn = xf86Screens[i];
-	pDPMS = (DPMSPtr)screenInfo.screens[i]->devPrivates[DPMSIndex].ptr;
+	pDPMS = (DPMSPtr)dixLookupPrivate(&screenInfo.screens[i]->devPrivates,
+					  DPMSKey);
 	if (pDPMS && pScrn->DPMSSet)
 	    return TRUE;
     }
diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
index 7dc45b75d..4b5105632 100644
--- a/hw/xfree86/common/xf86Globals.c
+++ b/hw/xfree86/common/xf86Globals.c
@@ -46,10 +46,12 @@
 
 /* Globals that video drivers may access */
 
-_X_EXPORT int xf86ScreenIndex = -1;	/* Index of ScrnInfo in pScreen.devPrivates */
-int xf86CreateRootWindowIndex = -1;	/* Index into pScreen.devPrivates */
+/* Index into pScreen.devPrivates */
+DevPrivateKey xf86CreateRootWindowKey = &xf86CreateRootWindowKey;
+/* Index of ScrnInfo in pScreen.devPrivates */
+_X_EXPORT DevPrivateKey xf86ScreenKey = &xf86ScreenKey;
+_X_EXPORT DevPrivateKey xf86PixmapKey = &xf86PixmapKey;
 _X_EXPORT ScrnInfoPtr *xf86Screens = NULL;	/* List of ScrnInfos */
-_X_EXPORT int xf86PixmapIndex = 0;
 _X_EXPORT const unsigned char byte_reversed[256] =
 {
     0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 90f744c64..06af74f43 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -139,8 +139,8 @@ xf86CreateRootWindow(WindowPtr pWin)
   int err = Success;
   ScreenPtr pScreen = pWin->drawable.pScreen;
   RootWinPropPtr pProp;
-  CreateWindowProcPtr CreateWindow =
-    (CreateWindowProcPtr)(pScreen->devPrivates[xf86CreateRootWindowIndex].ptr);
+  CreateWindowProcPtr CreateWindow = (CreateWindowProcPtr)
+      dixLookupPrivate(&pScreen->devPrivates, xf86CreateRootWindowKey);
 
 #ifdef DEBUG
   ErrorF("xf86CreateRootWindow(%p)\n", pWin);
@@ -156,7 +156,7 @@ xf86CreateRootWindow(WindowPtr pWin)
 
   /* Unhook this function ... */
   pScreen->CreateWindow = CreateWindow;
-  pScreen->devPrivates[xf86CreateRootWindowIndex].ptr = NULL;
+  dixSetPrivate(&pScreen->devPrivates, xf86CreateRootWindowKey, NULL);
 
   /* ... and call the previous CreateWindow fuction, if any */
   if (NULL!=pScreen->CreateWindow) {
@@ -476,7 +476,6 @@ void
 InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
 {
   int                    i, j, k, scr_index;
-  static unsigned long   generation = 0;
   char                   **modulelist;
   pointer                *optionlist;
   screenLayoutPtr	 layout;
@@ -487,14 +486,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
   
   xf86Initialising = TRUE;
 
-  /* Do this early? */
-  if (generation != serverGeneration) {
-      xf86ScreenIndex = AllocateScreenPrivateIndex();
-      xf86CreateRootWindowIndex = AllocateScreenPrivateIndex();
-      xf86PixmapIndex = AllocatePixmapPrivateIndex();
-      generation = serverGeneration;
-  }
-
   if (serverGeneration == 1) {
 
     pScreenInfo->numScreens = 0;
@@ -1060,8 +1051,8 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
 	 * Hook in our ScrnInfoRec, and initialise some other pScreen
 	 * fields.
 	 */
-	screenInfo.screens[scr_index]->devPrivates[xf86ScreenIndex].ptr
-	  = (pointer)xf86Screens[i];
+	dixSetPrivate(&screenInfo.screens[scr_index]->devPrivates,
+		      xf86ScreenKey, xf86Screens[i]);
 	xf86Screens[i]->pScreen = screenInfo.screens[scr_index];
 	/* The driver should set this, but make sure it is set anyway */
 	xf86Screens[i]->vtSema = TRUE;
@@ -1077,8 +1068,9 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
 	     i, xf86Screens[i]->pScreen->CreateWindow );
 #endif
 
-      screenInfo.screens[scr_index]->devPrivates[xf86CreateRootWindowIndex].ptr
-	= (void*)(xf86Screens[i]->pScreen->CreateWindow);
+      dixSetPrivate(&screenInfo.screens[scr_index]->devPrivates,
+		    xf86CreateRootWindowKey,
+		    xf86Screens[i]->pScreen->CreateWindow);
       xf86Screens[i]->pScreen->CreateWindow = xf86CreateRootWindow;
 
 #ifdef RENDER
diff --git a/hw/xfree86/common/xf86RandR.c b/hw/xfree86/common/xf86RandR.c
index 288d72193..4432ad96b 100644
--- a/hw/xfree86/common/xf86RandR.c
+++ b/hw/xfree86/common/xf86RandR.c
@@ -45,10 +45,9 @@ typedef struct _xf86RandRInfo {
     Rotation			    rotation;
 } XF86RandRInfoRec, *XF86RandRInfoPtr;
 
-static int	    xf86RandRIndex = -1;
-static int	    xf86RandRGeneration;
+static DevPrivateKey xf86RandRKey = NULL;
 
-#define XF86RANDRINFO(p)    ((XF86RandRInfoPtr) (p)->devPrivates[xf86RandRIndex].ptr)
+#define XF86RANDRINFO(p) ((XF86RandRInfoPtr)dixLookupPrivate(&(p)->devPrivates, xf86RandRKey))
 
 static int
 xf86RandRModeRefresh (DisplayModePtr mode)
@@ -338,14 +337,14 @@ xf86RandRCloseScreen (int index, ScreenPtr pScreen)
     scrp->currentMode = scrp->modes;
     pScreen->CloseScreen = randrp->CloseScreen;
     xfree (randrp);
-    pScreen->devPrivates[xf86RandRIndex].ptr = 0;
+    dixSetPrivate(&pScreen->devPrivates, xf86RandRKey, NULL);
     return (*pScreen->CloseScreen) (index, pScreen);
 }
 
 _X_EXPORT Rotation
 xf86GetRotation(ScreenPtr pScreen)
 {
-    if (xf86RandRIndex == -1)
+    if (xf86RandRKey == NULL)
        return RR_Rotate_0;
 
     return XF86RANDRINFO(pScreen)->rotation;
@@ -359,7 +358,7 @@ xf86RandRSetNewVirtualAndDimensions(ScreenPtr pScreen,
 {
     XF86RandRInfoPtr randrp;
 
-    if (xf86RandRIndex == -1)
+    if (xf86RandRKey == NULL)
 	return FALSE;
 
     randrp = XF86RANDRINFO(pScreen);
@@ -401,11 +400,8 @@ xf86RandRInit (ScreenPtr    pScreen)
     if (!noPanoramiXExtension)
 	return TRUE;
 #endif
-    if (xf86RandRGeneration != serverGeneration)
-    {
-	xf86RandRIndex = AllocateScreenPrivateIndex();
-	xf86RandRGeneration = serverGeneration;
-    }
+
+    xf86RandRKey = &xf86RandRKey;
 
     randrp = xalloc (sizeof (XF86RandRInfoRec));
     if (!randrp)
@@ -433,7 +429,7 @@ xf86RandRInit (ScreenPtr    pScreen)
 
     randrp->rotation = RR_Rotate_0;
 
-    pScreen->devPrivates[xf86RandRIndex].ptr = randrp;
+    dixSetPrivate(&pScreen->devPrivates, xf86RandRKey, randrp);
     return TRUE;
 }
 
diff --git a/hw/xfree86/common/xf86VidMode.c b/hw/xfree86/common/xf86VidMode.c
index fb9151346..763e5c540 100644
--- a/hw/xfree86/common/xf86VidMode.c
+++ b/hw/xfree86/common/xf86VidMode.c
@@ -47,12 +47,11 @@
 #include "vidmodeproc.h"
 #include "xf86cmap.h"
 
-static int VidModeGeneration = 0;
-static int VidModeIndex = -1;
+static DevPrivateKey VidModeKey = NULL;
 static int VidModeCount = 0;
 static Bool VidModeClose(int i, ScreenPtr pScreen);
 
-#define VMPTR(p) ((VidModePtr)(p)->devPrivates[VidModeIndex].ptr)
+#define VMPTR(p) ((VidModePtr)dixLookupPrivate(&(p)->devPrivates, VidModeKey))
 
 #endif
 
@@ -75,15 +74,10 @@ VidModeExtensionInit(ScreenPtr pScreen)
 	return FALSE;
     }
 
-    if (serverGeneration != VidModeGeneration) {
-	if ((VidModeIndex = AllocateScreenPrivateIndex()) < 0) {
-	    DEBUG_P("AllocateScreenPrivateIndex() failed");
-	    return FALSE;
-	}
-	VidModeGeneration = serverGeneration;
-    }
+    VidModeKey = &VidModeKey;
 
-    if (!(pScreen->devPrivates[VidModeIndex].ptr = xcalloc(sizeof(VidModeRec), 1))) {
+    if (!dixSetPrivate(&pScreen->devPrivates, VidModeKey,
+		       xcalloc(sizeof(VidModeRec), 1))) {
 	DEBUG_P("xcalloc failed");
 	return FALSE;
     }
@@ -118,10 +112,9 @@ VidModeClose(int i, ScreenPtr pScreen)
     pScreen->CloseScreen = pVidMode->CloseScreen;
 
     if (--VidModeCount == 0) {
-	if (pScreen->devPrivates[VidModeIndex].ptr)
-	  xfree(pScreen->devPrivates[VidModeIndex].ptr);
-	pScreen->devPrivates[VidModeIndex].ptr = NULL;
-	VidModeIndex = -1;
+	xfree(dixLookupPrivate(&pScreen->devPrivates, VidModeKey));
+	dixSetPrivate(&pScreen->devPrivates, VidModeKey, NULL);
+	VidModeKey = NULL;
     }
     return pScreen->CloseScreen(i, pScreen);
 }
@@ -134,8 +127,8 @@ VidModeAvailable(int scrnIndex)
 
     DEBUG_P("VidModeAvailable");
 
-    if (VidModeIndex < 0) {
-	DEBUG_P("VidModeIndex < 0");
+    if (VidModeKey == NULL) {
+	DEBUG_P("VidModeKey == NULL");
 	return FALSE;
     }
  
diff --git a/hw/xfree86/common/xf86cmap.c b/hw/xfree86/common/xf86cmap.c
index ea6a26dcd..764647ee4 100644
--- a/hw/xfree86/common/xf86cmap.c
+++ b/hw/xfree86/common/xf86cmap.c
@@ -60,7 +60,7 @@
 #include "xf86cmap.h"
 
 #define SCREEN_PROLOGUE(pScreen, field) ((pScreen)->field = \
-   ((CMapScreenPtr) (pScreen)->devPrivates[CMapScreenIndex].ptr)->field)
+    ((CMapScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, CMapScreenKey))->field)
 #define SCREEN_EPILOGUE(pScreen, field, wrapper)\
     ((pScreen)->field = wrapper)
 
@@ -102,9 +102,8 @@ typedef struct {
   int		overscan;
 } CMapColormapRec, *CMapColormapPtr;
 
-static unsigned long CMapGeneration = 0;
-static int CMapScreenIndex = -1;
-static int CMapColormapIndex = -1;
+static DevPrivateKey CMapScreenKey = NULL;
+static DevPrivateKey CMapColormapKey = &CMapColormapKey;
 
 static void CMapInstallColormap(ColormapPtr);
 static void CMapStoreColors(ColormapPtr, int, xColorItem *);
@@ -119,7 +118,6 @@ static int  CMapChangeGamma(int, Gamma);
 
 static void ComputeGamma(CMapScreenPtr);
 static Bool CMapAllocateColormapPrivate(ColormapPtr);
-static Bool CMapInitDefMap(ColormapPtr,int);
 static void CMapRefreshColors(ColormapPtr, int, int*);
 static void CMapSetOverscan(ColormapPtr, int, int *);
 static void CMapReinstallMap(ColormapPtr);
@@ -145,13 +143,7 @@ _X_EXPORT Bool xf86HandleColormaps(
     if(!maxColors || !sigRGBbits || !loadPalette)
 	return FALSE;
 
-    if(CMapGeneration != serverGeneration) {
-	if(((CMapScreenIndex = AllocateScreenPrivateIndex()) < 0) ||
-	   ((CMapColormapIndex = AllocateColormapPrivateIndex(
-					CMapInitDefMap)) < 0))
-		return FALSE;
-	CMapGeneration = serverGeneration;
-    }
+    CMapScreenKey = &CMapScreenKey;
 
     elements = 1 << sigRGBbits;
 
@@ -169,7 +161,7 @@ _X_EXPORT Bool xf86HandleColormaps(
 	return FALSE;     
     }
 
-    pScreen->devPrivates[CMapScreenIndex].ptr = (pointer)pScreenPriv;
+    dixSetPrivate(&pScreen->devPrivates, CMapScreenKey, pScreenPriv);
      
     pScreenPriv->CloseScreen = pScreen->CloseScreen;
     pScreenPriv->CreateColormap = pScreen->CreateColormap;
@@ -225,12 +217,6 @@ _X_EXPORT Bool xf86HandleColormaps(
     return TRUE;
 }
 
-static Bool 
-CMapInitDefMap(ColormapPtr cmap, int index)
-{
-    return TRUE;
-}
-
 
 /**** Screen functions ****/
 
@@ -254,8 +240,8 @@ CMapColormapUseMax(VisualPtr pVisual, CMapScreenPtr pScreenPriv)
 static Bool
 CMapAllocateColormapPrivate(ColormapPtr pmap)
 {
-    CMapScreenPtr pScreenPriv = 
-        (CMapScreenPtr) pmap->pScreen->devPrivates[CMapScreenIndex].ptr;
+    CMapScreenPtr pScreenPriv = (CMapScreenPtr)dixLookupPrivate(
+	&pmap->pScreen->devPrivates, CMapScreenKey);
     CMapColormapPtr pColPriv;
     CMapLinkPtr pLink;
     int numColors;
@@ -274,7 +260,7 @@ CMapAllocateColormapPrivate(ColormapPtr pmap)
 	return FALSE;
     }	
 
-    pmap->devPrivates[CMapColormapIndex].ptr = (pointer)pColPriv;
+    dixSetPrivate(&pmap->devPrivates, CMapColormapKey, pColPriv);
  
     pColPriv->numColors = numColors;
     pColPriv->colors = colors;
@@ -296,8 +282,8 @@ static Bool
 CMapCreateColormap (ColormapPtr pmap)
 {
     ScreenPtr pScreen = pmap->pScreen;
-    CMapScreenPtr pScreenPriv = 
-        (CMapScreenPtr)pScreen->devPrivates[CMapScreenIndex].ptr;
+    CMapScreenPtr pScreenPriv = (CMapScreenPtr)dixLookupPrivate(
+	&pScreen->devPrivates, CMapScreenKey);
     Bool ret = FALSE;
 
     pScreen->CreateColormap = pScreenPriv->CreateColormap;
@@ -314,10 +300,10 @@ static void
 CMapDestroyColormap (ColormapPtr cmap)
 {
     ScreenPtr pScreen = cmap->pScreen;
-    CMapScreenPtr pScreenPriv = 
-        (CMapScreenPtr) pScreen->devPrivates[CMapScreenIndex].ptr;
-    CMapColormapPtr pColPriv = 
-	(CMapColormapPtr) cmap->devPrivates[CMapColormapIndex].ptr;
+    CMapScreenPtr pScreenPriv = (CMapScreenPtr)dixLookupPrivate(
+	&pScreen->devPrivates, CMapScreenKey);
+    CMapColormapPtr pColPriv = (CMapColormapPtr)dixLookupPrivate(
+	&cmap->devPrivates, CMapColormapKey);
     CMapLinkPtr prevLink = NULL, pLink = pScreenPriv->maps;
 
     if(pColPriv) {
@@ -356,8 +342,8 @@ CMapStoreColors(
 ){
     ScreenPtr 	pScreen = pmap->pScreen;
     VisualPtr	pVisual = pmap->pVisual;
-    CMapScreenPtr pScreenPriv = 
-        	(CMapScreenPtr) pScreen->devPrivates[CMapScreenIndex].ptr;
+    CMapScreenPtr pScreenPriv = (CMapScreenPtr)dixLookupPrivate(
+	&pScreen->devPrivates, CMapScreenKey);
     int 	*indices = pScreenPriv->PreAllocIndices;
     int		num = ndef;
 
@@ -373,8 +359,8 @@ CMapStoreColors(
 	return;
 
     if(pVisual->class == DirectColor) {
-	CMapColormapPtr pColPriv = 
-	   (CMapColormapPtr) pmap->devPrivates[CMapColormapIndex].ptr;
+	CMapColormapPtr pColPriv = (CMapColormapPtr)dixLookupPrivate(
+	    &pmap->devPrivates, CMapColormapKey);
 	int i;
 
 	if (CMapColormapUseMax(pVisual, pScreenPriv)) {
@@ -431,8 +417,8 @@ CMapInstallColormap(ColormapPtr pmap)
 {
     ScreenPtr 	  pScreen = pmap->pScreen;
     int		  index = pScreen->myNum;
-    CMapScreenPtr pScreenPriv = 
-        (CMapScreenPtr) pScreen->devPrivates[CMapScreenIndex].ptr;
+    CMapScreenPtr pScreenPriv = (CMapScreenPtr)dixLookupPrivate(
+	&pScreen->devPrivates, CMapScreenKey);
 
     if (pmap == miInstalledMaps[index])
 	return;
@@ -462,8 +448,8 @@ static Bool
 CMapEnterVT(int index, int flags)
 {
     ScreenPtr pScreen = screenInfo.screens[index];
-    CMapScreenPtr pScreenPriv = 
-        (CMapScreenPtr) pScreen->devPrivates[CMapScreenIndex].ptr;
+    CMapScreenPtr pScreenPriv = (CMapScreenPtr)dixLookupPrivate(
+	&pScreen->devPrivates, CMapScreenKey);
 
     if((*pScreenPriv->EnterVT)(index, flags)) {
 	if(miInstalledMaps[index])
@@ -478,8 +464,8 @@ static Bool
 CMapSwitchMode(int index, DisplayModePtr mode, int flags)
 {
     ScreenPtr pScreen = screenInfo.screens[index];
-    CMapScreenPtr pScreenPriv = 
-        (CMapScreenPtr) pScreen->devPrivates[CMapScreenIndex].ptr;
+    CMapScreenPtr pScreenPriv = (CMapScreenPtr)dixLookupPrivate(
+	&pScreen->devPrivates, CMapScreenKey);
 
     if((*pScreenPriv->SwitchMode)(index, mode, flags)) {
 	if(miInstalledMaps[index])
@@ -494,8 +480,8 @@ static int
 CMapSetDGAMode(int index, int num, DGADevicePtr dev)
 {
     ScreenPtr pScreen = screenInfo.screens[index];
-    CMapScreenPtr pScreenPriv = 
-        (CMapScreenPtr) pScreen->devPrivates[CMapScreenIndex].ptr;
+    CMapScreenPtr pScreenPriv = (CMapScreenPtr)dixLookupPrivate(
+	&pScreen->devPrivates, CMapScreenKey);
     int ret;
 
     ret = (*pScreenPriv->SetDGAMode)(index, num, dev);
@@ -516,10 +502,10 @@ CMapSetDGAMode(int index, int num, DGADevicePtr dev)
 static void
 CMapReinstallMap(ColormapPtr pmap)
 {
-    CMapScreenPtr pScreenPriv = 
-        (CMapScreenPtr) pmap->pScreen->devPrivates[CMapScreenIndex].ptr;
-    CMapColormapPtr cmapPriv = 
-	(CMapColormapPtr) pmap->devPrivates[CMapColormapIndex].ptr;
+    CMapScreenPtr pScreenPriv = (CMapScreenPtr)dixLookupPrivate(
+	&pmap->pScreen->devPrivates, CMapScreenKey);
+    CMapColormapPtr cmapPriv = (CMapColormapPtr)dixLookupPrivate(
+	&pmap->devPrivates, CMapColormapKey);
     ScrnInfoPtr pScrn = xf86Screens[pmap->pScreen->myNum];
     int i = cmapPriv->numColors;
     int *indices = pScreenPriv->PreAllocIndices;
@@ -547,10 +533,10 @@ CMapReinstallMap(ColormapPtr pmap)
 static void 
 CMapRefreshColors(ColormapPtr pmap, int defs, int* indices)
 {
-    CMapScreenPtr pScreenPriv = 
-        (CMapScreenPtr) pmap->pScreen->devPrivates[CMapScreenIndex].ptr;
-    CMapColormapPtr pColPriv = 
-	(CMapColormapPtr) pmap->devPrivates[CMapColormapIndex].ptr;
+    CMapScreenPtr pScreenPriv = (CMapScreenPtr)dixLookupPrivate(
+	&pmap->pScreen->devPrivates, CMapScreenKey);
+    CMapColormapPtr pColPriv = (CMapColormapPtr)dixLookupPrivate(
+	&pmap->devPrivates, CMapColormapKey);
     VisualPtr pVisual = pmap->pVisual;
     ScrnInfoPtr pScrn = xf86Screens[pmap->pScreen->myNum];
     int numColors, i;
@@ -681,10 +667,10 @@ CMapCompareColors(LOCO *color1, LOCO *color2)
 static void
 CMapSetOverscan(ColormapPtr pmap, int defs, int *indices)
 {
-    CMapScreenPtr pScreenPriv = 
-        (CMapScreenPtr) pmap->pScreen->devPrivates[CMapScreenIndex].ptr;
-    CMapColormapPtr pColPriv = 
-	(CMapColormapPtr) pmap->devPrivates[CMapColormapIndex].ptr;
+    CMapScreenPtr pScreenPriv = (CMapScreenPtr)dixLookupPrivate(
+	&pmap->pScreen->devPrivates, CMapScreenKey);
+    CMapColormapPtr pColPriv = (CMapColormapPtr)dixLookupPrivate(
+	&pmap->devPrivates, CMapColormapKey);
     ScrnInfoPtr pScrn = xf86Screens[pmap->pScreen->myNum];
     VisualPtr pVisual = pmap->pVisual;
     int i;
@@ -819,8 +805,8 @@ CMapSetOverscan(ColormapPtr pmap, int defs, int *indices)
 static void
 CMapUnwrapScreen(ScreenPtr pScreen)
 {
-    CMapScreenPtr pScreenPriv = 
-        (CMapScreenPtr) pScreen->devPrivates[CMapScreenIndex].ptr;
+    CMapScreenPtr pScreenPriv = (CMapScreenPtr)dixLookupPrivate(
+	&pScreen->devPrivates, CMapScreenKey);
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
 
     pScreen->CloseScreen = pScreenPriv->CloseScreen;
@@ -904,10 +890,11 @@ CMapChangeGamma(
     CMapLinkPtr pLink;
         
     /* Is this sufficient checking ? */
-    if(CMapScreenIndex == -1)
+    if(CMapScreenKey == NULL)
 	return BadImplementation;
 
-    pScreenPriv = (CMapScreenPtr)pScreen->devPrivates[CMapScreenIndex].ptr;
+    pScreenPriv = (CMapScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
+						  CMapScreenKey);
     if(!pScreenPriv)
 	return BadImplementation;
  
@@ -925,8 +912,8 @@ CMapChangeGamma(
     /* mark all colormaps on this screen */
     pLink = pScreenPriv->maps;
     while(pLink) {
-    	pColPriv = 
-	 (CMapColormapPtr) pLink->cmap->devPrivates[CMapColormapIndex].ptr;
+    	pColPriv = (CMapColormapPtr)dixLookupPrivate(&pLink->cmap->devPrivates,
+						     CMapColormapKey);
 	pColPriv->recalculate = TRUE;
 	pLink = pLink->next;
     }
@@ -997,10 +984,11 @@ xf86ChangeGammaRamp(
     CMapScreenPtr pScreenPriv;
     CMapLinkPtr pLink;
 
-    if(CMapScreenIndex == -1)
+    if(CMapScreenKey == NULL)
         return BadImplementation;
 
-    pScreenPriv = (CMapScreenPtr)pScreen->devPrivates[CMapScreenIndex].ptr;
+    pScreenPriv = (CMapScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
+						  CMapScreenKey);
     if(!pScreenPriv)
         return BadImplementation;
 
@@ -1012,8 +1000,8 @@ xf86ChangeGammaRamp(
     /* mark all colormaps on this screen */
     pLink = pScreenPriv->maps;
     while(pLink) {
-        pColPriv =
-         (CMapColormapPtr) pLink->cmap->devPrivates[CMapColormapIndex].ptr;
+    	pColPriv = (CMapColormapPtr)dixLookupPrivate(&pLink->cmap->devPrivates,
+						     CMapColormapKey);
         pColPriv->recalculate = TRUE;
         pLink = pLink->next;
     }
@@ -1056,9 +1044,10 @@ xf86GetGammaRampSize(ScreenPtr pScreen)
 {
     CMapScreenPtr pScreenPriv;
 
-    if(CMapScreenIndex == -1) return 0;
+    if(CMapScreenKey == NULL) return 0;
 
-    pScreenPriv = (CMapScreenPtr)pScreen->devPrivates[CMapScreenIndex].ptr;
+    pScreenPriv = (CMapScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
+						  CMapScreenKey);
     if(!pScreenPriv) return 0;
 
     return pScreenPriv->gammaElements;
@@ -1076,10 +1065,11 @@ xf86GetGammaRamp(
     LOCO *entry;
     int shift, sigbits;
 
-    if(CMapScreenIndex == -1) 
+    if(CMapScreenKey == NULL) 
 	return BadImplementation;
 
-    pScreenPriv = (CMapScreenPtr)pScreen->devPrivates[CMapScreenIndex].ptr;
+    pScreenPriv = (CMapScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
+						  CMapScreenKey);
     if(!pScreenPriv) 
 	return BadImplementation;
 
diff --git a/hw/xfree86/common/xf86fbman.c b/hw/xfree86/common/xf86fbman.c
index 537d53d7d..9fd2e6c70 100644
--- a/hw/xfree86/common/xf86fbman.c
+++ b/hw/xfree86/common/xf86fbman.c
@@ -42,21 +42,15 @@
 #define DEBUG
 */
 
-static int xf86FBMangerIndex = -1;
-static unsigned long xf86ManagerGeneration = 0;
+static DevPrivateKey xf86FBManagerKey = NULL;
 
 _X_EXPORT Bool xf86RegisterOffscreenManager(
     ScreenPtr pScreen, 
     FBManagerFuncsPtr funcs
 ){
 
-   if(xf86ManagerGeneration != serverGeneration) {
-	if((xf86FBMangerIndex = AllocateScreenPrivateIndex()) < 0)
-		return FALSE;
-	xf86ManagerGeneration = serverGeneration;
-   }
-
-   pScreen->devPrivates[xf86FBMangerIndex].ptr = (pointer)funcs;
+   xf86FBManagerKey = &xf86FBManagerKey;
+   dixSetPrivate(&pScreen->devPrivates, xf86FBManagerKey, funcs);
 
    return TRUE;
 }
@@ -65,9 +59,9 @@ _X_EXPORT Bool xf86RegisterOffscreenManager(
 _X_EXPORT Bool
 xf86FBManagerRunning(ScreenPtr pScreen)
 {
-    if(xf86FBMangerIndex < 0) 
+    if(xf86FBManagerKey == NULL) 
 	return FALSE;
-    if(!pScreen->devPrivates[xf86FBMangerIndex].ptr) 
+    if(!dixLookupPrivate(&pScreen->devPrivates, xf86FBManagerKey))
 	return FALSE;
 
     return TRUE;
@@ -81,9 +75,10 @@ xf86RegisterFreeBoxCallback(
 ){
    FBManagerFuncsPtr funcs;
 
-   if(xf86FBMangerIndex < 0) 
+   if(xf86FBManagerKey == NULL) 
 	return FALSE;
-   if(!(funcs = (FBManagerFuncsPtr)pScreen->devPrivates[xf86FBMangerIndex].ptr))
+   if(!(funcs = (FBManagerFuncsPtr)dixLookupPrivate(&pScreen->devPrivates,
+						    xf86FBManagerKey)))
 	return FALSE;
 
    return (*funcs->RegisterFreeBoxCallback)(pScreen, FreeBoxCallback, devPriv);
@@ -101,9 +96,10 @@ xf86AllocateOffscreenArea(
 ){
    FBManagerFuncsPtr funcs;
 
-   if(xf86FBMangerIndex < 0) 
+   if(xf86FBManagerKey == NULL) 
 	return NULL;
-   if(!(funcs = (FBManagerFuncsPtr)pScreen->devPrivates[xf86FBMangerIndex].ptr))
+   if(!(funcs = (FBManagerFuncsPtr)dixLookupPrivate(&pScreen->devPrivates,
+						    xf86FBManagerKey)))
 	return NULL;
 
    return (*funcs->AllocateOffscreenArea)(
@@ -122,9 +118,10 @@ xf86AllocateOffscreenLinear(
 ){
    FBManagerFuncsPtr funcs;
 
-   if(xf86FBMangerIndex < 0) 
+   if(xf86FBManagerKey == NULL) 
 	return NULL;
-   if(!(funcs = (FBManagerFuncsPtr)pScreen->devPrivates[xf86FBMangerIndex].ptr))
+   if(!(funcs = (FBManagerFuncsPtr)dixLookupPrivate(&pScreen->devPrivates,
+						    xf86FBManagerKey)))
 	return NULL;
 
    return (*funcs->AllocateOffscreenLinear)(
@@ -139,10 +136,10 @@ xf86FreeOffscreenArea(FBAreaPtr area)
 
    if(!area) return;
 
-   if(xf86FBMangerIndex < 0) 
+   if(xf86FBManagerKey == NULL) 
 	return;
-   if(!(funcs = 
-	(FBManagerFuncsPtr)area->pScreen->devPrivates[xf86FBMangerIndex].ptr))
+   if(!(funcs = (FBManagerFuncsPtr)dixLookupPrivate(
+	    &area->pScreen->devPrivates, xf86FBManagerKey)))
 	return;
 
    (*funcs->FreeOffscreenArea)(area);
@@ -158,10 +155,10 @@ xf86FreeOffscreenLinear(FBLinearPtr linear)
 
    if(!linear) return;
 
-   if(xf86FBMangerIndex < 0) 
+   if(xf86FBManagerKey == NULL) 
 	return;
-   if(!(funcs = 
-	(FBManagerFuncsPtr)linear->pScreen->devPrivates[xf86FBMangerIndex].ptr))
+   if(!(funcs = (FBManagerFuncsPtr)dixLookupPrivate(
+	    &linear->pScreen->devPrivates, xf86FBManagerKey)))
 	return;
 
    (*funcs->FreeOffscreenLinear)(linear);
@@ -179,10 +176,10 @@ xf86ResizeOffscreenArea(
 
    if(!resize) return FALSE;
 
-   if(xf86FBMangerIndex < 0) 
+   if(xf86FBManagerKey == NULL) 
 	return FALSE;
-   if(!(funcs = 
-	(FBManagerFuncsPtr)resize->pScreen->devPrivates[xf86FBMangerIndex].ptr))
+   if(!(funcs = (FBManagerFuncsPtr)dixLookupPrivate(
+	    &resize->pScreen->devPrivates, xf86FBManagerKey)))
 	return FALSE;
 
    return (*funcs->ResizeOffscreenArea)(resize, w, h);
@@ -197,10 +194,10 @@ xf86ResizeOffscreenLinear(
 
    if(!resize) return FALSE;
 
-   if(xf86FBMangerIndex < 0) 
+   if(xf86FBManagerKey == NULL) 
 	return FALSE;
-   if(!(funcs = 
-	(FBManagerFuncsPtr)resize->pScreen->devPrivates[xf86FBMangerIndex].ptr))
+   if(!(funcs = (FBManagerFuncsPtr)dixLookupPrivate(
+	    &resize->pScreen->devPrivates, xf86FBManagerKey)))
 	return FALSE;
 
    return (*funcs->ResizeOffscreenLinear)(resize, size);
@@ -220,9 +217,10 @@ xf86QueryLargestOffscreenArea(
    *w = 0;
    *h = 0;
 
-   if(xf86FBMangerIndex < 0) 
+   if(xf86FBManagerKey == NULL) 
 	return FALSE;
-   if(!(funcs = (FBManagerFuncsPtr)pScreen->devPrivates[xf86FBMangerIndex].ptr))
+   if(!(funcs = (FBManagerFuncsPtr)dixLookupPrivate(&pScreen->devPrivates,
+						    xf86FBManagerKey)))
 	return FALSE;
 
    return (*funcs->QueryLargestOffscreenArea)(
@@ -240,9 +238,10 @@ xf86QueryLargestOffscreenLinear(
 
    *size = 0;
 
-   if(xf86FBMangerIndex < 0) 
+   if(xf86FBManagerKey == NULL) 
 	return FALSE;
-   if(!(funcs = (FBManagerFuncsPtr)pScreen->devPrivates[xf86FBMangerIndex].ptr))
+   if(!(funcs = (FBManagerFuncsPtr)dixLookupPrivate(&pScreen->devPrivates,
+						    xf86FBManagerKey)))
 	return FALSE;
 
    return (*funcs->QueryLargestOffscreenLinear)(
@@ -255,9 +254,10 @@ xf86PurgeUnlockedOffscreenAreas(ScreenPtr pScreen)
 {
    FBManagerFuncsPtr funcs;
 
-   if(xf86FBMangerIndex < 0) 
+   if(xf86FBManagerKey == NULL) 
 	return FALSE;
-   if(!(funcs = (FBManagerFuncsPtr)pScreen->devPrivates[xf86FBMangerIndex].ptr))
+   if(!(funcs = (FBManagerFuncsPtr)dixLookupPrivate(&pScreen->devPrivates,
+						    xf86FBManagerKey)))
 	return FALSE;
 
    return (*funcs->PurgeOffscreenAreas)(pScreen);
@@ -269,8 +269,7 @@ xf86PurgeUnlockedOffscreenAreas(ScreenPtr pScreen)
 
 \************************************************************/ 
 
-static unsigned long xf86FBGeneration = 0;
-static int xf86FBScreenIndex = -1;
+static DevPrivateKey xf86FBScreenKey = &xf86FBScreenKey;
 
 typedef struct _FBLink {
   FBArea area;
@@ -320,8 +319,8 @@ localRegisterFreeBoxCallback(
    FreeBoxCallbackProcPtr *newCallbacks;
    DevUnion *newPrivates; 
 
-   offman = pScreen->devPrivates[xf86FBScreenIndex].ptr;
-
+   offman = (FBManagerPtr)dixLookupPrivate(&pScreen->devPrivates,
+					   xf86FBScreenKey);
    newCallbacks = xrealloc( offman->FreeBoxesUpdateCallback, 
 		sizeof(FreeBoxCallbackProcPtr) * (offman->NumCallbacks + 1));
 
@@ -446,8 +445,8 @@ localAllocateOffscreenArea(
    FBManagerPtr offman;
    FBAreaPtr area = NULL;
 
-   offman = pScreen->devPrivates[xf86FBScreenIndex].ptr;
-
+   offman = (FBManagerPtr)dixLookupPrivate(&pScreen->devPrivates,
+					   xf86FBScreenKey);
    if((area = AllocateArea(offman, w, h, gran, moveCB, removeCB, privData)))
 	SendCallFreeBoxCallbacks(offman);
 
@@ -464,8 +463,8 @@ localFreeOffscreenArea(FBAreaPtr area)
    ScreenPtr pScreen;
 
    pScreen = area->pScreen;
-   offman = pScreen->devPrivates[xf86FBScreenIndex].ptr;
-       
+   offman = (FBManagerPtr)dixLookupPrivate(&pScreen->devPrivates,
+					   xf86FBScreenKey);
    pLink = offman->UsedAreas;
    if(!pLink) return;  
  
@@ -505,8 +504,8 @@ localResizeOffscreenArea(
    FBLinkPtr pLink, newLink, pLinkPrev = NULL;
 
    pScreen = resize->pScreen;
-   offman = pScreen->devPrivates[xf86FBScreenIndex].ptr;
-
+   offman = (FBManagerPtr)dixLookupPrivate(&pScreen->devPrivates,
+					   xf86FBScreenKey);
    /* find this link */
    if(!(pLink = offman->UsedAreas))
 	return FALSE;  
@@ -625,8 +624,8 @@ localQueryLargestOffscreenArea(
     if((preferences < 0) || (preferences > 3))
 	return FALSE;	
 
-    offman = pScreen->devPrivates[xf86FBScreenIndex].ptr;
-
+    offman = (FBManagerPtr)dixLookupPrivate(&pScreen->devPrivates,
+					    xf86FBScreenKey);
     if(severity < 0) severity = 0;
     if(severity > 2) severity = 2;
 
@@ -731,8 +730,8 @@ localPurgeUnlockedOffscreenAreas(ScreenPtr pScreen)
    RegionRec FreedRegion;
    Bool anyUsed = FALSE;
 
-   offman = pScreen->devPrivates[xf86FBScreenIndex].ptr;
-       
+   offman = (FBManagerPtr)dixLookupPrivate(&pScreen->devPrivates,
+					   xf86FBScreenKey);
    pLink = offman->UsedAreas;
    if(!pLink) return TRUE;  
  
@@ -780,8 +779,8 @@ LinearRemoveCBWrapper(FBAreaPtr area)
    FBLinearLinkPtr pLink, pLinkPrev = NULL;
    ScreenPtr pScreen = area->pScreen;
 
-   offman = pScreen->devPrivates[xf86FBScreenIndex].ptr;
-       
+   offman = (FBManagerPtr)dixLookupPrivate(&pScreen->devPrivates,
+					   xf86FBScreenKey);
    pLink = offman->LinearAreas;
    if(!pLink) return;  
  
@@ -911,7 +910,8 @@ localAllocateOffscreenLinear(
    BoxPtr extents;
    int w, h, pitch;
 
-   offman = pScreen->devPrivates[xf86FBScreenIndex].ptr;
+   offman = (FBManagerPtr)dixLookupPrivate(&pScreen->devPrivates,
+					   xf86FBScreenKey);
 
    /* Try to allocate from linear memory first...... */
 #ifdef DEBUG
@@ -991,8 +991,8 @@ localFreeOffscreenLinear(FBLinearPtr linear)
    FBLinearLinkPtr pLink, pLinkPrev = NULL;
    ScreenPtr pScreen = linear->pScreen;
 
-   offman = pScreen->devPrivates[xf86FBScreenIndex].ptr;
-
+   offman = (FBManagerPtr)dixLookupPrivate(&pScreen->devPrivates,
+					   xf86FBScreenKey);
    pLink = offman->LinearAreas;
    if(!pLink) return;  
  
@@ -1049,8 +1049,8 @@ localResizeOffscreenLinear(FBLinearPtr resize, int length)
    FBLinearLinkPtr pLink;
    ScreenPtr pScreen = resize->pScreen;
 
-   offman = pScreen->devPrivates[xf86FBScreenIndex].ptr;
-       
+   offman = (FBManagerPtr)dixLookupPrivate(&pScreen->devPrivates,
+					   xf86FBScreenKey);
    pLink = offman->LinearAreas;
    if(!pLink) return FALSE;  
  
@@ -1099,7 +1099,8 @@ localQueryLargestOffscreenLinear(
     int priority
 )
 {
-    FBManagerPtr offman = pScreen->devPrivates[xf86FBScreenIndex].ptr;
+    FBManagerPtr offman = (FBManagerPtr)dixLookupPrivate(&pScreen->devPrivates,
+							 xf86FBScreenKey);
     FBLinearLinkPtr pLink;
     FBLinearLinkPtr pLinkRet;
 
@@ -1130,7 +1131,8 @@ localQueryLargestOffscreenLinear(
 	    FBManagerPtr offman;
 	    BoxPtr extents;
 
-	    offman = pScreen->devPrivates[xf86FBScreenIndex].ptr;
+	    offman = (FBManagerPtr)dixLookupPrivate(&pScreen->devPrivates,
+						    xf86FBScreenKey);
 	    extents = REGION_EXTENTS(pScreen, offman->InitialBoxes);
 	    if((extents->x2 - extents->x1) == w)
 	    	*size = w * h;
@@ -1162,9 +1164,8 @@ xf86FBCloseScreen (int i, ScreenPtr pScreen)
 {
    FBLinkPtr pLink, tmp;
    FBLinearLinkPtr pLinearLink, tmp2;
-   FBManagerPtr offman = 
-	(FBManagerPtr) pScreen->devPrivates[xf86FBScreenIndex].ptr;
-
+   FBManagerPtr offman = (FBManagerPtr)dixLookupPrivate(&pScreen->devPrivates,
+							xf86FBScreenKey);
    
    pScreen->CloseScreen = offman->CloseScreen;
 
@@ -1188,7 +1189,7 @@ xf86FBCloseScreen (int i, ScreenPtr pScreen)
    xfree(offman->FreeBoxesUpdateCallback);
    xfree(offman->devPrivates);
    xfree(offman);
-   pScreen->devPrivates[xf86FBScreenIndex].ptr = NULL;
+   dixSetPrivate(&pScreen->devPrivates, xf86FBScreenKey, NULL);
 
    return (*pScreen->CloseScreen) (i, pScreen);
 }
@@ -1332,19 +1333,13 @@ xf86InitFBManagerRegion(
    if(REGION_NIL(FullRegion))
 	return FALSE;
 
-   if(xf86FBGeneration != serverGeneration) {
-	if((xf86FBScreenIndex = AllocateScreenPrivateIndex()) < 0)
-		return FALSE;
-	xf86FBGeneration = serverGeneration;
-   }
-
    if(!xf86RegisterOffscreenManager(pScreen, &xf86FBManFuncs))
 	return FALSE;
 
    offman = xalloc(sizeof(FBManager));
    if(!offman) return FALSE;
 
-   pScreen->devPrivates[xf86FBScreenIndex].ptr = (pointer)offman;
+   dixSetPrivate(&pScreen->devPrivates, xf86FBScreenKey, offman);
 
    offman->CloseScreen = pScreen->CloseScreen;
    pScreen->CloseScreen = xf86FBCloseScreen;
@@ -1380,11 +1375,11 @@ xf86InitFBManagerLinear(
 	return FALSE;
 
    /* we expect people to have called the Area setup first for pixmap cache */
-   if (!pScreen->devPrivates[xf86FBScreenIndex].ptr)
+   if (!dixLookupPrivate(&pScreen->devPrivates, xf86FBScreenKey))
 	return FALSE;
 
-   offman = pScreen->devPrivates[xf86FBScreenIndex].ptr;
-
+   offman = (FBManagerPtr)dixLookupPrivate(&pScreen->devPrivates,
+					   xf86FBScreenKey);
    offman->LinearAreas = xalloc(sizeof(FBLinearLink));
    if (!offman->LinearAreas)
 	return FALSE;
@@ -1424,13 +1419,14 @@ xf86AllocateLinearOffscreenArea (
    BoxPtr extents;
    int w, h;
 
-   if(xf86FBMangerIndex < 0) 
+   if(xf86FBManagerKey == NULL) 
         return NULL;
-   if(!(funcs = (FBManagerFuncsPtr)pScreen->devPrivates[xf86FBMangerIndex].ptr))
+   if(!(funcs = (FBManagerFuncsPtr)dixLookupPrivate(&pScreen->devPrivates,
+						    xf86FBManagerKey)))
         return NULL;
 
-   offman = pScreen->devPrivates[xf86FBScreenIndex].ptr;
-
+   offman = (FBManagerPtr)dixLookupPrivate(&pScreen->devPrivates,
+					   xf86FBScreenKey);
    extents = REGION_EXTENTS(pScreen, offman->InitialBoxes);
    w = extents->x2 - extents->x1;
 
diff --git a/hw/xfree86/common/xf86sbusBus.c b/hw/xfree86/common/xf86sbusBus.c
index 2e06ffac4..4ec099a19 100644
--- a/hw/xfree86/common/xf86sbusBus.c
+++ b/hw/xfree86/common/xf86sbusBus.c
@@ -602,8 +602,7 @@ xf86SbusUseBuiltinMode(ScrnInfoPtr pScrn, sbusDevicePtr psdp)
     pScrn->virtualY = psdp->height;
 }
 
-static int sbusPaletteIndex = -1;
-static unsigned long sbusPaletteGeneration = 0;
+static DevPrivateKey sbusPaletteKey = &sbusPaletteKey;
 typedef struct _sbusCmap {
     sbusDevicePtr psdp;
     CloseScreenProcPtr CloseScreen;
@@ -613,7 +612,8 @@ typedef struct _sbusCmap {
     unsigned char origBlue[16];
 } sbusCmapRec, *sbusCmapPtr;
 
-#define SBUSCMAPPTR(pScreen) ((sbusCmapPtr)((pScreen)->devPrivates[sbusPaletteIndex].ptr))
+#define SBUSCMAPPTR(pScreen) ((sbusCmapPtr) \
+    dixLookupPrivate(&(pScreen)->devPrivates, sbusPaletteKey))
 
 static void
 xf86SbusCmapLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
@@ -673,13 +673,8 @@ xf86SbusHandleColormaps(ScreenPtr pScreen, sbusDevicePtr psdp)
     struct fbcmap fbcmap;
     unsigned char data[2];
 
-    if(sbusPaletteGeneration != serverGeneration) {
-	if((sbusPaletteIndex = AllocateScreenPrivateIndex()) < 0)
-	    return FALSE;
-	sbusPaletteGeneration = serverGeneration;
-    }
     cmap = xnfcalloc(1, sizeof(sbusCmapRec));
-    pScreen->devPrivates[sbusPaletteIndex].ptr = cmap;
+    dixSetPrivate(&pScreen->devPrivates, sbusPaletteKey, cmap);
     cmap->psdp = psdp;
     fbcmap.index = 0;
     fbcmap.count = 16;
diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c
index 70a946922..f972b1f18 100644
--- a/hw/xfree86/common/xf86xv.c
+++ b/hw/xfree86/common/xf86xv.c
@@ -110,23 +110,22 @@ static void xf86XVAdjustFrame(int index, int x, int y, int flags);
 static Bool xf86XVInitAdaptors(ScreenPtr, XF86VideoAdaptorPtr*, int);
 
 
-static int XF86XVWindowIndex = -1;
-int XF86XvScreenIndex = -1;
-static unsigned long XF86XVGeneration = 0;
+static DevPrivateKey XF86XVWindowKey = &XF86XVWindowKey;
+DevPrivateKey XF86XvScreenKey;
 static unsigned long PortResource = 0;
 
-int (*XvGetScreenIndexProc)(void) = NULL;
+DevPrivateKey (*XvGetScreenKeyProc)(void) = NULL;
 unsigned long (*XvGetRTPortProc)(void) = NULL;
 int (*XvScreenInitProc)(ScreenPtr) = NULL;
 
 #define GET_XV_SCREEN(pScreen) \
-	((XvScreenPtr)((pScreen)->devPrivates[XF86XvScreenIndex].ptr))
+    ((XvScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, XF86XvScreenKey))
 
 #define GET_XF86XV_SCREEN(pScreen) \
-	((XF86XVScreenPtr)(GET_XV_SCREEN(pScreen)->devPriv.ptr))
+    ((XF86XVScreenPtr)(GET_XV_SCREEN(pScreen)->devPriv.ptr))
 
 #define GET_XF86XV_WINDOW(pWin) \
-	((XF86XVWindowPtr)((pWin)->devPrivates[XF86XVWindowIndex].ptr))
+    ((XF86XVWindowPtr)dixLookupPrivate(&(pWin)->devPrivates, XF86XVWindowKey))
 
 static xf86XVInitGenericAdaptorPtr *GenDrivers = NULL;
 static int NumGenDrivers = 0;
@@ -233,21 +232,12 @@ xf86XVScreenInit(
   XvScreenPtr pxvs;
 
   if(num <= 0 ||
-     !XvGetScreenIndexProc || !XvGetRTPortProc || !XvScreenInitProc)
-	return FALSE;
-
-  if(XF86XVGeneration != serverGeneration) {
-	if((XF86XVWindowIndex = AllocateWindowPrivateIndex()) < 0)
-	    return FALSE;
-	XF86XVGeneration = serverGeneration;
-  }
-
-  if(!AllocateWindowPrivate(pScreen,XF86XVWindowIndex,0))
+     !XvGetScreenKeyProc || !XvGetRTPortProc || !XvScreenInitProc)
 	return FALSE;
 
   if(Success != (*XvScreenInitProc)(pScreen)) return FALSE;
 
-  XF86XvScreenIndex = (*XvGetScreenIndexProc)();
+  XF86XvScreenKey = (*XvGetScreenKeyProc)();
   PortResource = (*XvGetRTPortProc)();
 
   pxvs = GET_XV_SCREEN(pScreen);
@@ -977,7 +967,7 @@ xf86XVEnlistPortInWindow(WindowPtr pWin, XvPortRecPrivatePtr portPriv)
 	memset(winPriv, 0, sizeof(XF86XVWindowRec));
 	winPriv->PortRec = portPriv;
 	winPriv->next = PrivRoot;
-	pWin->devPrivates[XF86XVWindowIndex].ptr = (pointer)winPriv;
+	dixSetPrivate(&pWin->devPrivates, XF86XVWindowKey, winPriv);
    }
 
    portPriv->pDraw = (DrawablePtr)pWin;
@@ -998,8 +988,8 @@ xf86XVRemovePortFromWindow(WindowPtr pWin, XvPortRecPrivatePtr portPriv)
 	    if(prevPriv)
 		prevPriv->next = winPriv->next;
 	    else
-		pWin->devPrivates[XF86XVWindowIndex].ptr =
-					(pointer)winPriv->next;
+		dixSetPrivate(&pWin->devPrivates, XF86XVWindowKey,
+			      winPriv->next);
 	    xfree(winPriv);
 	    break;
 	}
@@ -1037,7 +1027,7 @@ xf86XVDestroyWindow(WindowPtr pWin)
      xfree(tmp);
   }
 
-  pWin->devPrivates[XF86XVWindowIndex].ptr = NULL;
+  dixSetPrivate(&pWin->devPrivates, XF86XVWindowKey, NULL);
 
   pScreen->DestroyWindow = ScreenPriv->DestroyWindow;
   ret = (*pScreen->DestroyWindow)(pWin);
@@ -1094,8 +1084,8 @@ xf86XVWindowExposures(WindowPtr pWin, RegionPtr reg1, RegionPtr reg2)
 	    pPriv->pDraw = NULL;
 
 	    if(!pPrev)
-	       pWin->devPrivates[XF86XVWindowIndex].ptr =
-						(pointer)(WinPriv->next);
+		dixSetPrivate(&pWin->devPrivates, XF86XVWindowKey,
+			      WinPriv->next);
 	    else
 	       pPrev->next = WinPriv->next;
 	    tmp = WinPriv;
@@ -1146,8 +1136,8 @@ xf86XVClipNotify(WindowPtr pWin, int dx, int dy)
 	    pPriv->pDraw = NULL;
 
 	    if(!pPrev)
-	       pWin->devPrivates[XF86XVWindowIndex].ptr =
-						(pointer)(WinPriv->next);
+		dixSetPrivate(&pWin->devPrivates, XF86XVWindowKey,
+			      WinPriv->next);
 	    else
 	       pPrev->next = WinPriv->next;
 	    tmp = WinPriv;
diff --git a/hw/xfree86/common/xf86xvmc.c b/hw/xfree86/common/xf86xvmc.c
index f8ff0bed4..05267a240 100644
--- a/hw/xfree86/common/xf86xvmc.c
+++ b/hw/xfree86/common/xf86xvmc.c
@@ -56,11 +56,10 @@ typedef struct {
   XvMCAdaptorPtr dixinfo;
 } xf86XvMCScreenRec, *xf86XvMCScreenPtr;
 
-static unsigned long XF86XvMCGeneration = 0;
-static int XF86XvMCScreenIndex = -1;
+static DevPrivateKey XF86XvMCScreenKey = &XF86XvMCScreenKey;
 
-#define XF86XVMC_GET_PRIVATE(pScreen) \
-   (xf86XvMCScreenPtr)((pScreen)->devPrivates[XF86XvMCScreenIndex].ptr)
+#define XF86XVMC_GET_PRIVATE(pScreen) (xf86XvMCScreenPtr) \
+    dixLookupPrivate(&(pScreen)->devPrivates, XF86XvMCScreenKey)
 
 
 static int 
@@ -164,19 +163,12 @@ _X_EXPORT Bool xf86XvMCScreenInit(
 {
    XvMCAdaptorPtr pAdapt;
    xf86XvMCScreenPtr pScreenPriv;
-   XvScreenPtr pxvs = 
-	(XvScreenPtr)(pScreen->devPrivates[XF86XvScreenIndex].ptr);
-
+   XvScreenPtr pxvs = (XvScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
+						    XF86XvScreenKey);
    int i, j;
 
    if(!XvMCScreenInitProc) return FALSE;
 
-   if(XF86XvMCGeneration != serverGeneration) {
-	if((XF86XvMCScreenIndex = AllocateScreenPrivateIndex()) < 0)
-	   return FALSE;
-	XF86XvMCGeneration = serverGeneration;
-   }
-
    if(!(pAdapt = xalloc(sizeof(XvMCAdaptorRec) * num_adaptors)))
 	return FALSE;
 
@@ -185,7 +177,7 @@ _X_EXPORT Bool xf86XvMCScreenInit(
 	return FALSE;
    }
 
-   pScreen->devPrivates[XF86XvMCScreenIndex].ptr = (pointer)pScreenPriv; 
+   dixSetPrivate(&pScreen->devPrivates, XF86XvMCScreenKey, pScreenPriv);
 
    pScreenPriv->CloseScreen = pScreen->CloseScreen;
    pScreen->CloseScreen = xf86XvMCCloseScreen;
diff --git a/hw/xfree86/common/xf86xvpriv.h b/hw/xfree86/common/xf86xvpriv.h
index e716c9c6a..4200dac80 100644
--- a/hw/xfree86/common/xf86xvpriv.h
+++ b/hw/xfree86/common/xf86xvpriv.h
@@ -30,10 +30,11 @@
 #define _XF86XVPRIV_H_
 
 #include "xf86xv.h"
+#include "privates.h"
 
 /*** These are DDX layer privates ***/
 
-extern int XF86XvScreenIndex;
+extern DevPrivateKey XF86XvScreenKey;
 
 typedef struct {
    DestroyWindowProcPtr		DestroyWindow;
diff --git a/hw/xfree86/dixmods/extmod/xf86dga2.c b/hw/xfree86/dixmods/extmod/xf86dga2.c
index fa9530860..295e05e9e 100644
--- a/hw/xfree86/dixmods/extmod/xf86dga2.c
+++ b/hw/xfree86/dixmods/extmod/xf86dga2.c
@@ -62,8 +62,7 @@ unsigned char DGAReqCode = 0;
 int DGAErrorBase;
 int DGAEventBase;
 
-static int DGAGeneration = 0;
-static int DGAClientPrivateIndex;
+static DevPrivateKey DGAClientPrivateKey = &DGAClientPrivateKey;
 static int DGACallbackRefCount = 0;
 
 /* This holds the client's version information */
@@ -72,7 +71,11 @@ typedef struct {
     int		minor;
 } DGAPrivRec, *DGAPrivPtr;
 
-#define DGAPRIV(c) ((c)->devPrivates[DGAClientPrivateIndex].ptr)
+#define DGA_GETPRIV(c) ((DGAPrivPtr) \
+    dixLookupPrivate(&(c)->devPrivates, DGAClientPrivateKey))
+#define DGA_SETPRIV(c,p) \
+    dixSetPrivate(&(c)->devPrivates, DGAClientPrivateKey, p)
+
 
 void
 XFree86DGAExtensionInit(INITARGS)
@@ -97,23 +100,6 @@ XFree86DGAExtensionInit(INITARGS)
 	for (i = KeyPress; i <= MotionNotify; i++)
 	    SetCriticalEvent (DGAEventBase + i);
     }
-
-    /*
-     * Allocate a client private index to hold the client's version
-     * information.
-     */
-    if (DGAGeneration != serverGeneration) {
-	DGAClientPrivateIndex = AllocateClientPrivateIndex();
-	/*
-	 * Allocate 0 length, and use the private to hold a pointer to
-	 * our DGAPrivRec.
-	 */
-	if (!AllocateClientPrivate(DGAClientPrivateIndex, 0)) {
-	    ErrorF("XFree86DGAExtensionInit: AllocateClientPrivate failed\n");
-	    return;
-	}
-	DGAGeneration = serverGeneration;
-    }
 }
 
 
@@ -590,12 +576,12 @@ ProcXDGASetClientVersion(ClientPtr client)
     DGAPrivPtr pPriv;
 
     REQUEST_SIZE_MATCH(xXDGASetClientVersionReq);
-    if ((pPriv = DGAPRIV(client)) == NULL) {
+    if ((pPriv = DGA_GETPRIV(client)) == NULL) {
 	pPriv = xalloc(sizeof(DGAPrivRec));
 	/* XXX Need to look into freeing this */
 	if (!pPriv)
 	    return BadAlloc;
-	DGAPRIV(client) = pPriv;
+	DGA_SETPRIV(client, pPriv);
     }
     pPriv->major = stuff->major;
     pPriv->minor = stuff->minor;
diff --git a/hw/xfree86/dixmods/extmod/xf86misc.c b/hw/xfree86/dixmods/extmod/xf86misc.c
index 3a6f83eca..66278a298 100644
--- a/hw/xfree86/dixmods/extmod/xf86misc.c
+++ b/hw/xfree86/dixmods/extmod/xf86misc.c
@@ -41,8 +41,7 @@
 #endif
 
 static int miscErrorBase;
-static int MiscGeneration = 0;
-static int MiscClientPrivateIndex;
+static DevPrivateKey MiscClientPrivateKey = &MiscClientPrivateKey;
 
 /* This holds the client's version information */
 typedef struct {
@@ -50,7 +49,10 @@ typedef struct {
     int		minor;
 } MiscPrivRec, *MiscPrivPtr;
 
-#define MPRIV(c) ((c)->devPrivates[MiscClientPrivateIndex].ptr)
+#define M_GETPRIV(c) ((MiscPrivPtr) \
+    dixLookupPrivate(&(c)->devPrivates, MiscClientPrivateKey))
+#define M_SETPRIV(c,p) \
+    dixSetPrivate(&(c)->devPrivates, MiscClientPrivateKey, p)
 
 static void XF86MiscResetProc(
     ExtensionEntry* /* extEntry */
@@ -61,7 +63,7 @@ ClientVersion(ClientPtr client, int *major, int *minor)
 {
     MiscPrivPtr pPriv;
 
-    pPriv = MPRIV(client);
+    pPriv = M_GETPRIV(client);
     if (!pPriv) {
 	if (major) *major = 0;
 	if (minor) *minor = 0;
@@ -123,24 +125,6 @@ XFree86MiscExtensionInit(void)
     if (!xf86GetModInDevEnabled())
 	return;
 
-    /*
-     * Allocate a client private index to hold the client's version
-     * information.
-     */
-    if (MiscGeneration != serverGeneration) {
-	MiscClientPrivateIndex = AllocateClientPrivateIndex();
-	/*
-	 * Allocate 0 length, and use the private to hold a pointer to our
-	 * MiscPrivRec.
-	 */
-	if (!AllocateClientPrivate(MiscClientPrivateIndex, 0)) {
-	    ErrorF("XFree86MiscExtensionInit: "
-		   "AllocateClientPrivate failed\n");
-	    return;
-	}
-	MiscGeneration = serverGeneration;
-    }
-    
     if (
 	(extEntry = AddExtension(XF86MISCNAME,
 				XF86MiscNumberEvents,
@@ -205,7 +189,9 @@ ProcXF86MiscSetSaver(client)
     if (stuff->screen > screenInfo.numScreens)
 	return BadValue;
 
-    vptr = (ScrnInfoPtr) screenInfo.screens[stuff->screen]->devPrivates[xf86ScreenIndex].ptr;
+    vptr = (ScrnInfoPtr)
+	dixLookupPrivate(&screenInfo.screens[stuff->screen]->devPrivates,
+			 xf86ScreenKey);
 
     REQUEST_SIZE_MATCH(xXF86MiscSetSaverReq);
 
@@ -233,7 +219,9 @@ ProcXF86MiscGetSaver(client)
     if (stuff->screen > screenInfo.numScreens)
 	return BadValue;
 
-    vptr = (ScrnInfoPtr) screenInfo.screens[stuff->screen]->devPrivates[xf86ScreenIndex].ptr;
+    vptr = (ScrnInfoPtr)
+	dixLookupPrivate(&screenInfo.screens[stuff->screen]->devPrivates,
+			 xf86ScreenKey);
 
     REQUEST_SIZE_MATCH(xXF86MiscGetSaverReq);
     rep.type = X_Reply;
@@ -497,11 +485,11 @@ ProcXF86MiscSetClientVersion(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xXF86MiscSetClientVersionReq);
 
-    if ((pPriv = MPRIV(client)) == NULL) {
+    if ((pPriv = M_GETPRIV(client)) == NULL) {
 	pPriv = xalloc(sizeof(MiscPrivRec));
 	if (!pPriv)
 	    return BadAlloc;
-	MPRIV(client) = pPriv;
+	M_SETPRIV(client, pPriv);
     }
     if (xf86GetVerbosity() > 1) 
 	    ErrorF("SetClientVersion: %i %i\n",stuff->major,stuff->minor);
diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c
index 44ec9f11d..fa3284839 100644
--- a/hw/xfree86/dixmods/extmod/xf86vmode.c
+++ b/hw/xfree86/dixmods/extmod/xf86vmode.c
@@ -52,8 +52,7 @@ from Kaleb S. KEITHLEY
 #define DEFAULT_XF86VIDMODE_VERBOSITY	3
 
 static int VidModeErrorBase;
-static int VidModeGeneration = 0;
-static int VidModeClientPrivateIndex;
+static DevPrivateKey VidModeClientPrivateKey = &VidModeClientPrivateKey;
 
 /* This holds the client's version information */
 typedef struct {
@@ -61,7 +60,10 @@ typedef struct {
     int		minor;
 } VidModePrivRec, *VidModePrivPtr;
 
-#define VMPRIV(c) ((c)->devPrivates[VidModeClientPrivateIndex].ptr)
+#define VM_GETPRIV(c) ((VidModePrivPtr) \
+    dixLookupPrivate(&(c)->devPrivates, VidModeClientPrivateKey))
+#define VM_SETPRIV(c,p) \
+    dixSetPrivate(&(c)->devPrivates, VidModeClientPrivateKey, p)
 
 static void XF86VidModeResetProc(
     ExtensionEntry* /* extEntry */
@@ -145,10 +147,12 @@ typedef struct _XF86VidModeScreenPrivate {
     Bool		hasWindow;
 } XF86VidModeScreenPrivateRec, *XF86VidModeScreenPrivatePtr;
    
-static int ScreenPrivateIndex;
+static DevPrivateKey ScreenPrivateKey = &ScreenPrivateKey;
 
-#define GetScreenPrivate(s) ((ScreenSaverScreenPrivatePtr)(s)->devPrivates[ScreenPrivateIndex].ptr)
-#define SetScreenPrivate(s,v) ((s)->devPrivates[ScreenPrivateIndex].ptr = (pointer) v);
+#define GetScreenPrivate(s) ((ScreenSaverScreenPrivatePtr) \
+    dixLookupPrivate(&(s)->devPrivates, ScreenPrivateKey))
+#define SetScreenPrivate(s,v) \
+    dixSetPrivate(&(s)->devPrivates, ScreenPrivateKey, v)
 #define SetupScreen(s)  ScreenSaverScreenPrivatePtr pPriv = GetScreenPrivate(s)
 
 #define New(t)  (xalloc (sizeof (t)))
@@ -172,7 +176,6 @@ XFree86VidModeExtensionInit(void)
 
 #ifdef XF86VIDMODE_EVENTS
     EventType = CreateNewResourceType(XF86VidModeFreeEvents);
-    ScreenPrivateIndex = AllocateScreenPrivateIndex ();
 #endif
 
     for(i = 0; i < screenInfo.numScreens; i++) {
@@ -187,27 +190,9 @@ XFree86VidModeExtensionInit(void)
     if (!enabled)
 	return;
 
-    /*
-     * Allocate a client private index to hold the client's version
-     * information.
-     */
-    if (VidModeGeneration != serverGeneration) {
-	VidModeClientPrivateIndex = AllocateClientPrivateIndex();
-	/*
-	 * Allocate 0 length, and use the private to hold a pointer to our
-	 * VidModePrivRec.
-	 */
-	if (!AllocateClientPrivate(VidModeClientPrivateIndex, 0)) {
-	    ErrorF("XFree86VidModeExtensionInit: "
-		   "AllocateClientPrivate failed\n");
-	    return;
-	}
-	VidModeGeneration = serverGeneration;
-    }
-
     if (
 #ifdef XF86VIDMODE_EVENTS
-        EventType && ScreenPrivateIndex != -1 &&
+        EventType &&
 #endif
 	(extEntry = AddExtension(XF86VIDMODENAME,
 				XF86VidModeNumberEvents,
@@ -239,7 +224,7 @@ ClientMajorVersion(ClientPtr client)
 {
     VidModePrivPtr pPriv;
 
-    pPriv = VMPRIV(client);
+    pPriv = VM_GETPRIV(client);
     if (!pPriv)
 	return 0;
     else
@@ -1682,11 +1667,11 @@ ProcXF86VidModeSetClientVersion(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xXF86VidModeSetClientVersionReq);
 
-    if ((pPriv = VMPRIV(client)) == NULL) {
+    if ((pPriv = VM_GETPRIV(client)) == NULL) {
 	pPriv = xalloc(sizeof(VidModePrivRec));
 	if (!pPriv)
 	    return BadAlloc;
-	VMPRIV(client) = pPriv;
+	VM_SETPRIV(client, pPriv);
     }
     pPriv->major = stuff->major;
     pPriv->minor = stuff->minor;
diff --git a/hw/xfree86/dixmods/extmod/xvmod.c b/hw/xfree86/dixmods/extmod/xvmod.c
index 7c1450c7a..6b3f1149a 100644
--- a/hw/xfree86/dixmods/extmod/xvmod.c
+++ b/hw/xfree86/dixmods/extmod/xvmod.c
@@ -16,7 +16,7 @@ void
 XvRegister()
 {
     XvScreenInitProc = XvScreenInit;
-    XvGetScreenIndexProc = XvGetScreenIndex;
+    XvGetScreenKeyProc = XvGetScreenKey;
     XvGetRTPortProc = XvGetRTPort;
     XvMCScreenInitProc = XvMCScreenInit;
 }
diff --git a/hw/xfree86/dixmods/extmod/xvmodproc.h b/hw/xfree86/dixmods/extmod/xvmodproc.h
index 81356a149..b39c915b4 100644
--- a/hw/xfree86/dixmods/extmod/xvmodproc.h
+++ b/hw/xfree86/dixmods/extmod/xvmodproc.h
@@ -5,7 +5,7 @@
 
 #include "xvmcext.h"
 
-extern int (*XvGetScreenIndexProc)(void);
+extern DevPrivateKey (*XvGetScreenKeyProc)(void);
 extern unsigned long (*XvGetRTPortProc)(void);
 extern int (*XvScreenInitProc)(ScreenPtr);
 extern int (*XvMCScreenInitProc)(ScreenPtr, int, XvMCAdaptorPtr);
diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
index d1bbfcd14..84c0508bc 100644
--- a/hw/xfree86/dri/dri.c
+++ b/hw/xfree86/dri/dri.c
@@ -79,8 +79,8 @@ extern Bool noPanoramiXExtension;
 #endif
 
 static int DRIEntPrivIndex = -1;
-static int DRIScreenPrivIndex = -1;
-static int DRIWindowPrivIndex = -1;
+static DevPrivateKey DRIScreenPrivKey = &DRIScreenPrivKey;
+static DevPrivateKey DRIWindowPrivKey = &DRIWindowPrivKey;
 static unsigned long DRIGeneration = 0;
 static unsigned int DRIDrawableValidationStamp = 0;
 
@@ -343,20 +343,18 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
 
     pDRIEntPriv = DRI_ENT_PRIV(pScrn);
 
-    if (DRIGeneration != serverGeneration) {
-	if ((DRIScreenPrivIndex = AllocateScreenPrivateIndex()) < 0)
-	    return FALSE;
+    DRIScreenPrivKey = &DRIScreenPrivKey;
+    if (DRIGeneration != serverGeneration)
 	DRIGeneration = serverGeneration;
-    }
 
     pDRIPriv = (DRIScreenPrivPtr) xcalloc(1, sizeof(DRIScreenPrivRec));
     if (!pDRIPriv) {
-        pScreen->devPrivates[DRIScreenPrivIndex].ptr = NULL;
-        DRIScreenPrivIndex = -1;
+	dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL);
+        DRIScreenPrivKey = NULL;
         return FALSE;
     }
 
-    pScreen->devPrivates[DRIScreenPrivIndex].ptr = (pointer) pDRIPriv;
+    dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, pDRIPriv);
     pDRIPriv->drmFD = pDRIEntPriv->drmFD;
     pDRIPriv->directRenderingSupport = TRUE;
     pDRIPriv->pDriverInfo = pDRIInfo;
@@ -381,7 +379,7 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
 		       &pDRIPriv->hSAREA) < 0)
 	{
 	    pDRIPriv->directRenderingSupport = FALSE;
-	    pScreen->devPrivates[DRIScreenPrivIndex].ptr = NULL;
+	    dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL);
 	    drmClose(pDRIPriv->drmFD);
 	    DRIDrvMsg(pScreen->myNum, X_INFO,
 		      "[drm] drmAddMap failed\n");
@@ -398,7 +396,7 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
 		    (drmAddressPtr)(&pDRIPriv->pSAREA)) < 0)
 	{
 	    pDRIPriv->directRenderingSupport = FALSE;
-	    pScreen->devPrivates[DRIScreenPrivIndex].ptr = NULL;
+	    dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL);
 	    drmClose(pDRIPriv->drmFD);
 	    DRIDrvMsg(pScreen->myNum, X_INFO,
 		      "[drm] drmMap failed\n");
@@ -428,7 +426,7 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
 		       &pDRIPriv->pDriverInfo->hFrameBuffer) < 0)
 	    {
 		pDRIPriv->directRenderingSupport = FALSE;
-		pScreen->devPrivates[DRIScreenPrivIndex].ptr = NULL;
+		dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL);
 		drmUnmap(pDRIPriv->pSAREA, pDRIPriv->pDriverInfo->SAREASize);
 		drmClose(pDRIPriv->drmFD);
 		DRIDrvMsg(pScreen->myNum, X_INFO,
@@ -744,8 +742,8 @@ DRICloseScreen(ScreenPtr pScreen)
 	}
 
 	xfree(pDRIPriv);
-	pScreen->devPrivates[DRIScreenPrivIndex].ptr = NULL;
-	DRIScreenPrivIndex = -1;
+	dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL);
+	DRIScreenPrivKey = NULL;
     }
 }
 
@@ -772,30 +770,13 @@ drmServerInfo DRIDRMServerInfo =  {
 Bool
 DRIExtensionInit(void)
 {
-    int		    	i;
-    ScreenPtr		pScreen;
-
-    if (DRIScreenPrivIndex < 0 || DRIGeneration != serverGeneration) {
+    if (!DRIScreenPrivKey || DRIGeneration != serverGeneration) {
 	return FALSE;
     }
 
-    /* Allocate a window private index with a zero sized private area for
-     * each window, then should a window become a DRI window, we'll hang
-     * a DRIWindowPrivateRec off of this private index.
-     */
-    if ((DRIWindowPrivIndex = AllocateWindowPrivateIndex()) < 0)
-	return FALSE;
-
     DRIDrawablePrivResType = CreateNewResourceType(DRIDrawablePrivDelete);
     DRIContextPrivResType = CreateNewResourceType(DRIContextPrivDelete);
 
-    for (i = 0; i < screenInfo.numScreens; i++)
-    {
-	pScreen = screenInfo.screens[i];
-	if (!AllocateWindowPrivate(pScreen, DRIWindowPrivIndex, 0))
-	    return FALSE;
-    }
-
     RegisterBlockAndWakeupHandlers(DRIBlockHandler, DRIWakeupHandler, NULL);
 
     return TRUE;
@@ -1302,9 +1283,8 @@ DRICreateDrawable(ScreenPtr pScreen, ClientPtr client, DrawablePtr pDrawable,
 	    pDRIDrawablePriv->nrects = REGION_NUM_RECTS(&pWin->clipList);
 
 	    /* save private off of preallocated index */
-	    pWin->devPrivates[DRIWindowPrivIndex].ptr =
-						(pointer)pDRIDrawablePriv;
-
+	    dixSetPrivate(&pWin->devPrivates, DRIWindowPrivKey,
+			  pDRIDrawablePriv);
 	    pDRIPriv->nrWindows++;
 
 	    if (pDRIDrawablePriv->nrects)
@@ -1362,7 +1342,7 @@ DRIDrawablePrivDestroy(WindowPtr pWin)
     drmDestroyDrawable(pDRIPriv->drmFD, pDRIDrawablePriv->hwDrawable);
 
     xfree(pDRIDrawablePriv);
-    pWin->devPrivates[DRIWindowPrivIndex].ptr = NULL;
+    dixSetPrivate(&pWin->devPrivates, DRIWindowPrivKey, NULL);
 }
 
 static Bool
diff --git a/hw/xfree86/dri/dristruct.h b/hw/xfree86/dri/dristruct.h
index c3b0aeede..ae970d834 100644
--- a/hw/xfree86/dri/dristruct.h
+++ b/hw/xfree86/dri/dristruct.h
@@ -37,15 +37,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "xf86drm.h"
 
 
-#define DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin) \
-    ((DRIWindowPrivIndex < 0) ? \
-     NULL : \
-     ((DRIDrawablePrivPtr)((pWin)->devPrivates[DRIWindowPrivIndex].ptr)))
-
-#define DRI_DRAWABLE_PRIV_FROM_PIXMAP(pPix) \
-    ((DRIPixmapPrivIndex < 0) ? \
-     NULL : \
-     ((DRIDrawablePrivPtr)((pPix)->devPrivates[DRIWindowPrivIndex].ptr)))
+#define DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin) ((DRIDrawablePrivPtr) \
+    dixLookupPrivate(&(pWin)->devPrivates, DRIWindowPrivKey))
+#define DRI_DRAWABLE_PRIV_FROM_PIXMAP(pPix) ((DRIDrawablePrivPtr) \
+    dixLookupPrivate(&(pPix)->devPrivates, DRIWindowPrivKey))
 
 typedef struct _DRIDrawablePrivRec
 {
@@ -65,13 +60,12 @@ struct _DRIContextPrivRec
     void**     		pContextStore;
 };
 
-#define DRI_SCREEN_PRIV(pScreen) \
-    ((DRIScreenPrivIndex < 0) ? \
-     NULL : \
-     ((DRIScreenPrivPtr)((pScreen)->devPrivates[DRIScreenPrivIndex].ptr)))
+#define DRI_SCREEN_PRIV(pScreen) ((DRIScreenPrivPtr) \
+    dixLookupPrivate(&(pScreen)->devPrivates, DRIScreenPrivKey))
 
 #define DRI_SCREEN_PRIV_FROM_INDEX(screenIndex) ((DRIScreenPrivPtr) \
-    (screenInfo.screens[screenIndex]->devPrivates[DRIScreenPrivIndex].ptr))
+    dixLookupPrivate(&screenInfo.screens[screenIndex]->devPrivates, \
+		     DRIScreenPrivKey))
 
 #define DRI_ENT_PRIV(pScrn)  \
     ((DRIEntPrivIndex < 0) ? \
diff --git a/hw/xfree86/exa/examodule.c b/hw/xfree86/exa/examodule.c
index 4dce58fd8..aac32949c 100644
--- a/hw/xfree86/exa/examodule.c
+++ b/hw/xfree86/exa/examodule.c
@@ -42,8 +42,7 @@ typedef struct _ExaXorgScreenPrivRec {
     OptionInfoPtr		 options;
 } ExaXorgScreenPrivRec, *ExaXorgScreenPrivPtr;
 
-static int exaXorgServerGeneration;
-static int exaXorgScreenPrivateIndex;
+static DevPrivateKey exaXorgScreenPrivateKey = &exaXorgScreenPrivateKey;
 
 typedef enum {
     EXAOPT_MIGRATION_HEURISTIC,
@@ -69,8 +68,8 @@ static Bool
 exaXorgCloseScreen (int i, ScreenPtr pScreen)
 {
     ScrnInfoPtr pScrn = XF86SCRNINFO(pScreen);
-    ExaXorgScreenPrivPtr pScreenPriv =
-	pScreen->devPrivates[exaXorgScreenPrivateIndex].ptr;
+    ExaXorgScreenPrivPtr pScreenPriv = (ExaXorgScreenPrivPtr)
+	dixLookupPrivate(&pScreen->devPrivates, exaXorgScreenPrivateKey);
 
     pScreen->CloseScreen = pScreenPriv->SavedCloseScreen;
 
@@ -86,8 +85,8 @@ static void
 exaXorgEnableDisableFBAccess (int index, Bool enable)
 {
     ScreenPtr pScreen = screenInfo.screens[index];
-    ExaXorgScreenPrivPtr pScreenPriv =
-	pScreen->devPrivates[exaXorgScreenPrivateIndex].ptr;
+    ExaXorgScreenPrivPtr pScreenPriv = (ExaXorgScreenPrivPtr)
+	dixLookupPrivate(&pScreen->devPrivates, exaXorgScreenPrivateKey);
 
     if (!enable)
 	exaEnableDisableFBAccess (index, enable);
@@ -111,11 +110,6 @@ exaDDXDriverInit(ScreenPtr pScreen)
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
     ExaXorgScreenPrivPtr pScreenPriv;
 
-    if (exaXorgServerGeneration != serverGeneration) {
-	exaXorgScreenPrivateIndex = AllocateScreenPrivateIndex();
-	exaXorgServerGeneration = serverGeneration;
-    }
-
     pScreenPriv = xcalloc (1, sizeof(ExaXorgScreenPrivRec));
     if (pScreenPriv == NULL)
 	return;
@@ -166,7 +160,7 @@ exaDDXDriverInit(ScreenPtr pScreen)
 	pExaScr->info->DownloadFromScreen = NULL;
     }
 
-    pScreen->devPrivates[exaXorgScreenPrivateIndex].ptr = pScreenPriv;
+    dixSetPrivate(&pScreen->devPrivates, exaXorgScreenPrivateKey, pScreenPriv);
 
     pScreenPriv->SavedEnableDisableFBAccess = pScrn->EnableDisableFBAccess;
     pScrn->EnableDisableFBAccess = exaXorgEnableDisableFBAccess;
diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c
index 1af076b88..4b3b66a89 100644
--- a/hw/xfree86/loader/dixsym.c
+++ b/hw/xfree86/loader/dixsym.c
@@ -238,7 +238,7 @@ _X_HIDDEN void *dixLookupTab[] = {
 #ifdef XV
     /* XXX These are exported from the DDX, not DIX. */
     SYMVAR(XvScreenInitProc)
-    SYMVAR(XvGetScreenIndexProc)
+    SYMVAR(XvGetScreenKeyProc)
     SYMVAR(XvGetRTPortProc)
     SYMVAR(XvMCScreenInitProc)
 #endif
@@ -270,20 +270,6 @@ _X_HIDDEN void *dixLookupTab[] = {
     SYMFUNC(dixFreePrivates)
     SYMFUNC(dixRegisterPrivateOffset)
     SYMFUNC(dixLookupPrivateOffset)
-    SYMFUNC(AllocateExtensionPrivate)
-    SYMFUNC(AllocateExtensionPrivateIndex)
-    SYMFUNC(AllocateClientPrivate)
-    SYMFUNC(AllocateClientPrivateIndex)
-    SYMFUNC(AllocateGCPrivate)
-    SYMFUNC(AllocateGCPrivateIndex)
-    SYMFUNC(AllocateWindowPrivate)
-    SYMFUNC(AllocateWindowPrivateIndex)
-    SYMFUNC(AllocateScreenPrivateIndex)
-    SYMFUNC(AllocateColormapPrivateIndex)
-    SYMFUNC(AllocateDevicePrivateIndex)
-    SYMFUNC(AllocateDevicePrivate)
-    SYMFUNC(AllocatePixmapPrivateIndex)
-    SYMFUNC(AllocatePixmapPrivate)
     /* resource.c */
     SYMFUNC(AddResource)
     SYMFUNC(ChangeResourceValue)
@@ -521,7 +507,7 @@ _X_HIDDEN void *dixLookupTab[] = {
     SYMFUNC(PictureTransformPoint3d)
     SYMFUNC(PictureGetSubpixelOrder)
     SYMFUNC(PictureSetSubpixelOrder)
-    SYMVAR(PictureScreenPrivateIndex)
+    SYMVAR(PictureScreenPrivateKey)
     /* mipict.c */
     SYMFUNC(miPictureInit)
     SYMFUNC(miComputeCompositeRegion)
diff --git a/hw/xfree86/loader/misym.c b/hw/xfree86/loader/misym.c
index 78ae10e02..e87d35408 100644
--- a/hw/xfree86/loader/misym.c
+++ b/hw/xfree86/loader/misym.c
@@ -200,9 +200,9 @@ _X_HIDDEN void *miLookupTab[] = {
     SYMFUNC(miOverlaySetRootClip)
     SYMVAR(miEmptyBox)
     SYMVAR(miEmptyData)
-    SYMVAR(miZeroLineScreenIndex)
+    SYMVAR(miZeroLineScreenKey)
     SYMVAR(miSpritePointerFuncs)
-    SYMVAR(miPointerScreenIndex)
+    SYMVAR(miPointerScreenKey)
     SYMVAR(miInstalledMaps)
     SYMVAR(miInitVisualsProc)
 #ifdef RENDER
diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c
index 9b8dac82e..7beef3193 100644
--- a/hw/xfree86/loader/xf86sym.c
+++ b/hw/xfree86/loader/xf86sym.c
@@ -1099,8 +1099,8 @@ _X_HIDDEN void *xfree86LookupTab[] = {
     SYMVAR(xf86HUGE_VAL)
 
     /* General variables (from xf86.h) */
-    SYMVAR(xf86ScreenIndex)
-    SYMVAR(xf86PixmapIndex)
+    SYMVAR(xf86ScreenKey)
+    SYMVAR(xf86PixmapKey)
     SYMVAR(xf86Screens)
     SYMVAR(byte_reversed)
     SYMVAR(xf86inSuspend)
diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
index 38435c924..d58cc7070 100644
--- a/hw/xfree86/modes/xf86RandR12.c
+++ b/hw/xfree86/modes/xf86RandR12.c
@@ -59,11 +59,11 @@ static Bool xf86RandR12Init12 (ScreenPtr pScreen);
 static Bool xf86RandR12CreateScreenResources12 (ScreenPtr pScreen);
 #endif
 
-static int	    xf86RandR12Index;
-static int	    xf86RandR12Generation;
+static int xf86RandR12Generation;
+static DevPrivateKey xf86RandR12Key = &xf86RandR12Key;
 
-#define XF86RANDRINFO(p) \
-	((XF86RandRInfoPtr)(p)->devPrivates[xf86RandR12Index].ptr)
+#define XF86RANDRINFO(p) ((XF86RandRInfoPtr) \
+    dixLookupPrivate(&(p)->devPrivates, xf86RandR12Key))
 
 static int
 xf86RandR12ModeRefresh (DisplayModePtr mode)
@@ -482,10 +482,7 @@ xf86RandR12Init (ScreenPtr pScreen)
 	return TRUE;
 #endif
     if (xf86RandR12Generation != serverGeneration)
-    {
-	xf86RandR12Index = AllocateScreenPrivateIndex();
 	xf86RandR12Generation = serverGeneration;
-    }
 
     randrp = xalloc (sizeof (XF86RandRInfoRec));
     if (!randrp)
@@ -511,7 +508,7 @@ xf86RandR12Init (ScreenPtr pScreen)
 
     randrp->maxX = randrp->maxY = 0;
 
-    pScreen->devPrivates[xf86RandR12Index].ptr = randrp;
+    dixSetPrivate(&pScreen->devPrivates, xf86RandR12Key, randrp);
 
 #if RANDR_12_INTERFACE
     if (!xf86RandR12Init12 (pScreen))
diff --git a/hw/xfree86/os-support/solaris/sun_mouse.c b/hw/xfree86/os-support/solaris/sun_mouse.c
index aa509d08b..b1b7797f1 100644
--- a/hw/xfree86/os-support/solaris/sun_mouse.c
+++ b/hw/xfree86/os-support/solaris/sun_mouse.c
@@ -121,8 +121,11 @@ static void vuidMouseSendScreenSize(ScreenPtr pScreen, VuidMsePtr pVuidMse);
 static void vuidMouseAdjustFrame(int index, int x, int y, int flags);
 
 static int vuidMouseGeneration = 0;
-static int vuidMouseScreenIndex;
-#define vuidMouseScreenPrivate(s) ((s)->devPrivates[vuidMouseScreenIndex].ptr)
+static DevPrivateKey vuidMouseScreenKey = &vuidMouseScreenKey;
+#define vuidGetMouseScreenPrivate(s) ((VuidMsePtr) \
+    dixLookupPrivate(&(s)->devPrivates, vuidMouseScreenKey))
+#define vuidSetMouseScreenPrivate(s,p) \
+    dixSetPrivate(&(s)->devPrivates, vuidMouseScreenKey, p)
 #endif /* HAVE_ABSOLUTE_MOUSE_SCALING */
 
 static inline
@@ -455,7 +458,7 @@ static void vuidMouseAdjustFrame(int index, int x, int y, int flags)
       ScrnInfoPtr	pScrn = xf86Screens[index];
       ScreenPtr		pScreen = pScrn->pScreen;
       xf86AdjustFrameProc *wrappedAdjustFrame 
-	  = (xf86AdjustFrameProc *) vuidMouseScreenPrivate(pScreen);
+	  = (xf86AdjustFrameProc *) vuidMouseGetScreenPrivate(pScreen);
       VuidMsePtr	m;
 
       if(wrappedAdjustFrame) {
@@ -496,15 +499,12 @@ vuidMouseProc(DeviceIntPtr pPointer, int what)
     case DEVICE_INIT:
 #ifdef HAVE_ABSOLUTE_MOUSE_SCALING
 	if (vuidMouseGeneration != serverGeneration) {
-	    if ((vuidMouseScreenIndex = AllocateScreenPrivateIndex()) >= 0) {
 		for (i = 0; i < screenInfo.numScreens; i++) {
 		    ScreenPtr pScreen = screenInfo.screens[i];
 		    ScrnInfoPtr pScrn = XF86SCRNINFO(pScreen);
-		    vuidMouseScreenPrivate(pScreen)
-			= (pointer) pScrn->AdjustFrame;
+		    vuidMouseSetScreenPrivate(pScreen, pScrn->AdjustFrame);
 		    pScrn->AdjustFrame = vuidMouseAdjustFrame;
 		}
-	    }
 	    vuidMouseGeneration = serverGeneration;
 	}
 #endif    	
diff --git a/hw/xfree86/rac/xf86RAC.c b/hw/xfree86/rac/xf86RAC.c
index 8492cdb69..5302a86b2 100644
--- a/hw/xfree86/rac/xf86RAC.c
+++ b/hw/xfree86/rac/xf86RAC.c
@@ -39,9 +39,8 @@
                                   pScreen->x = y;}
 #define UNWRAP_SCREEN(x)    pScreen->x = pScreenPriv->x
 
-#define SCREEN_PROLOG(x) \
-            pScreen->x = \
-             ((RACScreenPtr) (pScreen)->devPrivates[RACScreenIndex].ptr)->x
+#define SCREEN_PROLOG(x) pScreen->x = ((RACScreenPtr) \
+    dixLookupPrivate(&(pScreen)->devPrivates, RACScreenKey))->x
 #define SCREEN_EPILOG(x,y) pScreen->x = y;
 
 #define WRAP_PICT_COND(x,y,cond) if (ps)\
@@ -50,9 +49,8 @@
 					ps->x = y;}
 #define UNWRAP_PICT(x) 	if (ps) {ps->x = pScreenPriv->x;}
 
-#define PICTURE_PROLOGUE(field) \
-	ps->field = \
-	((RACScreenPtr) (pScreen)->devPrivates[RACScreenIndex].ptr)->field
+#define PICTURE_PROLOGUE(field) ps->field = \
+	((RACScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, RACScreenKey))->field
 #define PICTURE_EPILOGUE(field, wrap) \
 	ps->field = wrap
 
@@ -65,9 +63,9 @@
 #define UNWRAP_SCREEN_INFO(x)    pScrn->x = pScreenPriv->x
 
 #define SPRITE_PROLOG     miPointerScreenPtr PointPriv = \
-(miPointerScreenPtr)pScreen->devPrivates[miPointerScreenIndex].ptr;\
-                               RACScreenPtr pScreenPriv = \
-((RACScreenPtr) (pScreen)->devPrivates[RACScreenIndex].ptr);\
+    (miPointerScreenPtr)dixLookupPrivate(&pScreen->devPrivates, miPointerScreenKey); \
+    RACScreenPtr pScreenPriv = \
+    ((RACScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, RACScreenKey));\
 			PointPriv->spriteFuncs = pScreenPriv->miSprite;
 #define SPRITE_EPILOG pScreenPriv->miSprite = PointPriv->spriteFuncs;\
 	              PointPriv->spriteFuncs  = &RACSpriteFuncs;
@@ -82,7 +80,7 @@
                            (x)->ops = &RACGCOps;\
                          (x)->funcs = &RACGCFuncs;
 #define GC_UNWRAP(x)\
-           RACGCPtr  pGCPriv = (RACGCPtr) (x)->devPrivates[RACGCIndex].ptr;\
+    RACGCPtr  pGCPriv = (RACGCPtr)dixLookupPrivate(&(x)->devPrivates, RACGCKey);\
                     (x)->ops = pGCPriv->wrapOps;\
 	          (x)->funcs = pGCPriv->wrapFuncs;
 
@@ -255,9 +253,8 @@ static miPointerSpriteFuncRec RACSpriteFuncs = {
     RACSpriteMoveCursor
 };
 
-static int RACScreenIndex = -1;
-static int RACGCIndex = -1;
-static unsigned long RACGeneration = 0;
+static DevPrivateKey RACScreenKey = &RACScreenKey;
+static DevPrivateKey RACGCKey = &RACGCKey;
 
 
 Bool 
@@ -271,24 +268,17 @@ xf86RACInit(ScreenPtr pScreen, unsigned int flag)
 #endif
 
     pScrn = xf86Screens[pScreen->myNum];
-    PointPriv = (miPointerScreenPtr)pScreen->devPrivates[miPointerScreenIndex].ptr;
-
+    PointPriv = (miPointerScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
+						     miPointerScreenKey);
     DPRINT_S("RACInit",pScreen->myNum);
-    if (RACGeneration != serverGeneration) {
-	if (	((RACScreenIndex = AllocateScreenPrivateIndex()) < 0) ||
-		((RACGCIndex = AllocateGCPrivateIndex()) < 0))
-	    return FALSE;
 
-	RACGeneration = serverGeneration;
-    }
-
-    if (!AllocateGCPrivate(pScreen, RACGCIndex, sizeof(RACGCRec)))
+    if (!dixRequestPrivate(RACGCKey, sizeof(RACGCRec)))
 	return FALSE;
 
     if (!(pScreenPriv = xalloc(sizeof(RACScreenRec))))
 	return FALSE;
 
-    pScreen->devPrivates[RACScreenIndex].ptr = (pointer)pScreenPriv;
+    dixSetPrivate(&pScreen->devPrivates, RACScreenKey, pScreenPriv);
     
     WRAP_SCREEN(CloseScreen, RACCloseScreen);
     WRAP_SCREEN(SaveScreen, RACSaveScreen);
@@ -327,10 +317,10 @@ static Bool
 RACCloseScreen (int i, ScreenPtr pScreen)
 {
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-    RACScreenPtr pScreenPriv = 
-	(RACScreenPtr) pScreen->devPrivates[RACScreenIndex].ptr;
-    miPointerScreenPtr PointPriv
-	= (miPointerScreenPtr)pScreen->devPrivates[miPointerScreenIndex].ptr;
+    RACScreenPtr pScreenPriv = (RACScreenPtr)dixLookupPrivate(
+	&pScreen->devPrivates, RACScreenKey);
+    miPointerScreenPtr PointPriv = (miPointerScreenPtr)dixLookupPrivate(
+	&pScreen->devPrivates, miPointerScreenKey);
 #ifdef RENDER
     PictureScreenPtr	ps = GetPictureScreenIfSet(pScreen);
 #endif
@@ -620,8 +610,8 @@ static void
 RACAdjustFrame(int index, int x, int y, int flags)
 {
     ScreenPtr pScreen = screenInfo.screens[index];
-    RACScreenPtr pScreenPriv =
-	(RACScreenPtr) pScreen->devPrivates[RACScreenIndex].ptr;
+    RACScreenPtr pScreenPriv = (RACScreenPtr)dixLookupPrivate(
+	&pScreen->devPrivates, RACScreenKey);
 
     DPRINT_S("RACAdjustFrame",index);
     xf86EnableAccess(xf86Screens[index]);
@@ -633,8 +623,8 @@ static Bool
 RACSwitchMode(int index, DisplayModePtr mode, int flags)
 {
     ScreenPtr pScreen = screenInfo.screens[index];
-    RACScreenPtr pScreenPriv =
-	(RACScreenPtr) pScreen->devPrivates[RACScreenIndex].ptr;
+    RACScreenPtr pScreenPriv = (RACScreenPtr)dixLookupPrivate(
+	&pScreen->devPrivates, RACScreenKey);
 
     DPRINT_S("RACSwitchMode",index);
     xf86EnableAccess(xf86Screens[index]);
@@ -646,8 +636,8 @@ static Bool
 RACEnterVT(int index, int flags)
 {
     ScreenPtr pScreen = screenInfo.screens[index];
-    RACScreenPtr pScreenPriv =
-	(RACScreenPtr) pScreen->devPrivates[RACScreenIndex].ptr;
+    RACScreenPtr pScreenPriv = (RACScreenPtr)dixLookupPrivate(
+	&pScreen->devPrivates, RACScreenKey);
 
     DPRINT_S("RACEnterVT",index);
     xf86EnableAccess(xf86Screens[index]);
@@ -659,8 +649,8 @@ static void
 RACLeaveVT(int index, int flags)
 {
     ScreenPtr pScreen = screenInfo.screens[index];
-    RACScreenPtr pScreenPriv =
-	(RACScreenPtr) pScreen->devPrivates[RACScreenIndex].ptr;
+    RACScreenPtr pScreenPriv = (RACScreenPtr)dixLookupPrivate(
+	&pScreen->devPrivates, RACScreenKey);
 
     DPRINT_S("RACLeaveVT",index);
     xf86EnableAccess(xf86Screens[index]);
@@ -672,8 +662,8 @@ static void
 RACFreeScreen(int index, int flags)
 {
     ScreenPtr pScreen = screenInfo.screens[index];
-    RACScreenPtr pScreenPriv =
-	(RACScreenPtr) pScreen->devPrivates[RACScreenIndex].ptr;
+    RACScreenPtr pScreenPriv = (RACScreenPtr)dixLookupPrivate(
+	&pScreen->devPrivates, RACScreenKey);
 
     DPRINT_S("RACFreeScreen",index);
     xf86EnableAccess(xf86Screens[index]);
@@ -685,7 +675,7 @@ static Bool
 RACCreateGC(GCPtr pGC)
 {
     ScreenPtr    pScreen = pGC->pScreen;
-    RACGCPtr     pGCPriv = (RACGCPtr) (pGC)->devPrivates[RACGCIndex].ptr;
+    RACGCPtr pGCPriv = (RACGCPtr)dixLookupPrivate(&pGC->devPrivates, RACGCKey);
     Bool         ret;
 
     DPRINT_S("RACCreateGC",pScreen->myNum);
diff --git a/hw/xfree86/ramdac/xf86Cursor.c b/hw/xfree86/ramdac/xf86Cursor.c
index 457807698..1c2d6a869 100644
--- a/hw/xfree86/ramdac/xf86Cursor.c
+++ b/hw/xfree86/ramdac/xf86Cursor.c
@@ -8,8 +8,7 @@
 #include "colormapst.h"
 #include "cursorstr.h"
 
-int xf86CursorScreenIndex = -1;
-static unsigned long xf86CursorGeneration = 0;
+DevPrivateKey xf86CursorScreenKey = &xf86CursorScreenKey;
 
 /* sprite functions */
 
@@ -48,12 +47,6 @@ xf86InitCursor(
     xf86CursorScreenPtr ScreenPriv;
     miPointerScreenPtr PointPriv;
 
-    if (xf86CursorGeneration != serverGeneration) {
-	if ((xf86CursorScreenIndex = AllocateScreenPrivateIndex()) < 0)
-	    return FALSE;
-	xf86CursorGeneration = serverGeneration;
-    }
-
     if (!xf86InitHardwareCursor(pScreen, infoPtr))
 	return FALSE;
 
@@ -61,7 +54,7 @@ xf86InitCursor(
     if (!ScreenPriv)
 	return FALSE;
 
-    pScreen->devPrivates[xf86CursorScreenIndex].ptr = ScreenPriv;
+    dixSetPrivate(&pScreen->devPrivates, xf86CursorScreenKey, ScreenPriv);
 
     ScreenPriv->SWCursor = TRUE;
     ScreenPriv->isUp = FALSE;
@@ -84,7 +77,7 @@ xf86InitCursor(
 	ScreenPriv->PalettedCursor = TRUE;
     }
 
-    PointPriv = pScreen->devPrivates[miPointerScreenIndex].ptr;
+    PointPriv = dixLookupPrivate(&pScreen->devPrivates, miPointerScreenKey);
 
     ScreenPriv->showTransparent = PointPriv->showTransparent;
     if (infoPtr->Flags & HARDWARE_CURSOR_SHOW_TRANSPARENT)
@@ -113,10 +106,10 @@ static Bool
 xf86CursorCloseScreen(int i, ScreenPtr pScreen)
 {
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-    miPointerScreenPtr PointPriv =
-	pScreen->devPrivates[miPointerScreenIndex].ptr;
-    xf86CursorScreenPtr ScreenPriv =
-	pScreen->devPrivates[xf86CursorScreenIndex].ptr;
+    miPointerScreenPtr PointPriv = (miPointerScreenPtr)dixLookupPrivate(
+	&pScreen->devPrivates, miPointerScreenKey);
+    xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr)dixLookupPrivate(
+	&pScreen->devPrivates, xf86CursorScreenKey);
 
     if (ScreenPriv->isUp && pScrn->vtSema)
 	xf86SetCursor(pScreen, NullCursor, ScreenPriv->x, ScreenPriv->y);
@@ -146,8 +139,8 @@ xf86CursorQueryBestSize(
    unsigned short *height,
    ScreenPtr pScreen)
 {
-    xf86CursorScreenPtr ScreenPriv =
-	pScreen->devPrivates[xf86CursorScreenIndex].ptr;
+    xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr)dixLookupPrivate(
+	&pScreen->devPrivates, xf86CursorScreenKey);
 
     if (class == CursorShape) {
 	if(*width > ScreenPriv->CursorInfoPtr->MaxWidth)
@@ -161,8 +154,8 @@ xf86CursorQueryBestSize(
 static void
 xf86CursorInstallColormap(ColormapPtr pMap)
 {
-    xf86CursorScreenPtr ScreenPriv =
-	pMap->pScreen->devPrivates[xf86CursorScreenIndex].ptr;
+    xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr)dixLookupPrivate(
+	&pMap->pScreen->devPrivates, xf86CursorScreenKey);
 
     ScreenPriv->pInstalledMap = pMap;
 
@@ -175,8 +168,8 @@ xf86CursorRecolorCursor(
     CursorPtr pCurs,
     Bool displayed)
 {
-    xf86CursorScreenPtr ScreenPriv =
-	pScreen->devPrivates[xf86CursorScreenIndex].ptr;
+    xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr)dixLookupPrivate(
+	&pScreen->devPrivates, xf86CursorScreenKey);
 
     if (!displayed)
 	return;
@@ -195,8 +188,8 @@ xf86CursorEnableDisableFBAccess(
     Bool enable)
 {
     ScreenPtr pScreen = screenInfo.screens[index];
-    xf86CursorScreenPtr ScreenPriv =
-	pScreen->devPrivates[xf86CursorScreenIndex].ptr;
+    xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr)dixLookupPrivate(
+	&pScreen->devPrivates, xf86CursorScreenKey);
 
     if (!enable && ScreenPriv->CurrentCursor != NullCursor) {
 	CursorPtr   currentCursor = ScreenPriv->CurrentCursor;
@@ -226,10 +219,10 @@ xf86CursorSwitchMode(int index, DisplayModePtr mode, int flags)
 {
     Bool ret;
     ScreenPtr pScreen = screenInfo.screens[index];
-    xf86CursorScreenPtr ScreenPriv =
-	pScreen->devPrivates[xf86CursorScreenIndex].ptr;
-    miPointerScreenPtr PointPriv =
-	pScreen->devPrivates[miPointerScreenIndex].ptr;
+    xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr)dixLookupPrivate(
+	&pScreen->devPrivates, xf86CursorScreenKey);
+    miPointerScreenPtr PointPriv = (miPointerScreenPtr)dixLookupPrivate(
+	&pScreen->devPrivates, miPointerScreenKey);
 
     if (ScreenPriv->isUp) {
 	xf86SetCursor(pScreen, NullCursor, ScreenPriv->x, ScreenPriv->y);
@@ -254,8 +247,8 @@ xf86CursorSwitchMode(int index, DisplayModePtr mode, int flags)
 static Bool
 xf86CursorRealizeCursor(ScreenPtr pScreen, CursorPtr pCurs)
 {
-    xf86CursorScreenPtr ScreenPriv =
-	pScreen->devPrivates[xf86CursorScreenIndex].ptr;
+    xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr)dixLookupPrivate(
+	&pScreen->devPrivates, xf86CursorScreenKey);
 
     if (pCurs->refcnt <= 1)
 	pCurs->devPriv[pScreen->myNum] = NULL;
@@ -266,8 +259,8 @@ xf86CursorRealizeCursor(ScreenPtr pScreen, CursorPtr pCurs)
 static Bool
 xf86CursorUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCurs)
 {
-    xf86CursorScreenPtr ScreenPriv =
-	pScreen->devPrivates[xf86CursorScreenIndex].ptr;
+    xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr)dixLookupPrivate(
+	&pScreen->devPrivates, xf86CursorScreenKey);
 
     if (pCurs->refcnt <= 1) {
 	xfree(pCurs->devPriv[pScreen->myNum]);
@@ -280,8 +273,8 @@ xf86CursorUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCurs)
 static void
 xf86CursorSetCursor(ScreenPtr pScreen, CursorPtr pCurs, int x, int y)
 {
-    xf86CursorScreenPtr ScreenPriv =
-	pScreen->devPrivates[xf86CursorScreenIndex].ptr;
+    xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr)dixLookupPrivate(
+	&pScreen->devPrivates, xf86CursorScreenKey);
     xf86CursorInfoPtr infoPtr = ScreenPriv->CursorInfoPtr;
     miPointerScreenPtr PointPriv;
 
@@ -306,8 +299,8 @@ xf86CursorSetCursor(ScreenPtr pScreen, CursorPtr pCurs, int x, int y)
     ScreenPriv->HotX = pCurs->bits->xhot;
     ScreenPriv->HotY = pCurs->bits->yhot;
 
-    PointPriv = pScreen->devPrivates[miPointerScreenIndex].ptr;
-
+    PointPriv = (miPointerScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
+						     miPointerScreenKey);
     if (infoPtr->pScrn->vtSema && (ScreenPriv->ForceHWCursorCount || ((
 #ifdef ARGB_CURSOR
 	pCurs->bits->argb && infoPtr->UseHWCursorARGB &&
@@ -351,8 +344,8 @@ xf86CursorSetCursor(ScreenPtr pScreen, CursorPtr pCurs, int x, int y)
 static void
 xf86CursorMoveCursor(ScreenPtr pScreen, int x, int y)
 {
-    xf86CursorScreenPtr ScreenPriv =
-	pScreen->devPrivates[xf86CursorScreenIndex].ptr;
+    xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr)dixLookupPrivate(
+	&pScreen->devPrivates, xf86CursorScreenKey);
 
     ScreenPriv->x = x;
     ScreenPriv->y = y;
@@ -369,8 +362,8 @@ xf86CursorMoveCursor(ScreenPtr pScreen, int x, int y)
 void
 xf86ForceHWCursor (ScreenPtr pScreen, Bool on)
 {
-    xf86CursorScreenPtr ScreenPriv =
-	pScreen->devPrivates[xf86CursorScreenIndex].ptr;
+    xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr)dixLookupPrivate(
+	&pScreen->devPrivates, xf86CursorScreenKey);
 
     if (on)
     {
diff --git a/hw/xfree86/ramdac/xf86CursorPriv.h b/hw/xfree86/ramdac/xf86CursorPriv.h
index 472e2b06b..f82be2edc 100644
--- a/hw/xfree86/ramdac/xf86CursorPriv.h
+++ b/hw/xfree86/ramdac/xf86CursorPriv.h
@@ -45,6 +45,6 @@ Bool xf86InitHardwareCursor(ScreenPtr pScreen, xf86CursorInfoPtr infoPtr);
 
 CARD32 xf86ReverseBitOrder(CARD32 data);
 
-extern int xf86CursorScreenIndex;
+extern DevPrivateKey xf86CursorScreenKey;
 
 #endif /* _XF86CURSORPRIV_H */
diff --git a/hw/xfree86/ramdac/xf86HWCurs.c b/hw/xfree86/ramdac/xf86HWCurs.c
index 91caea047..0a753be3f 100644
--- a/hw/xfree86/ramdac/xf86HWCurs.c
+++ b/hw/xfree86/ramdac/xf86HWCurs.c
@@ -113,8 +113,8 @@ xf86InitHardwareCursor(ScreenPtr pScreen, xf86CursorInfoPtr infoPtr)
 void
 xf86SetCursor(ScreenPtr pScreen, CursorPtr pCurs, int x, int y)
 {
-    xf86CursorScreenPtr ScreenPriv =
-	pScreen->devPrivates[xf86CursorScreenIndex].ptr;
+    xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr)dixLookupPrivate(
+	&pScreen->devPrivates, xf86CursorScreenKey);
     xf86CursorInfoPtr infoPtr = ScreenPriv->CursorInfoPtr;
     unsigned char *bits;
 
@@ -157,8 +157,8 @@ xf86SetCursor(ScreenPtr pScreen, CursorPtr pCurs, int x, int y)
 void
 xf86SetTransparentCursor(ScreenPtr pScreen)
 {
-    xf86CursorScreenPtr ScreenPriv =
-	pScreen->devPrivates[xf86CursorScreenIndex].ptr;
+    xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr)dixLookupPrivate(
+	&pScreen->devPrivates, xf86CursorScreenKey);
     xf86CursorInfoPtr infoPtr = ScreenPriv->CursorInfoPtr;
 
     if (!ScreenPriv->transparentData)
@@ -178,8 +178,8 @@ xf86SetTransparentCursor(ScreenPtr pScreen)
 void
 xf86MoveCursor(ScreenPtr pScreen, int x, int y)
 {
-    xf86CursorScreenPtr ScreenPriv =
-	pScreen->devPrivates[xf86CursorScreenIndex].ptr;
+    xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr)dixLookupPrivate(
+	&pScreen->devPrivates, xf86CursorScreenKey);
     xf86CursorInfoPtr infoPtr = ScreenPriv->CursorInfoPtr;
 
     x -= infoPtr->pScrn->frameX0 + ScreenPriv->HotX;
@@ -191,8 +191,8 @@ xf86MoveCursor(ScreenPtr pScreen, int x, int y)
 void
 xf86RecolorCursor(ScreenPtr pScreen, CursorPtr pCurs, Bool displayed)
 {
-    xf86CursorScreenPtr ScreenPriv =
-	pScreen->devPrivates[xf86CursorScreenIndex].ptr;
+    xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr)dixLookupPrivate(
+	&pScreen->devPrivates, xf86CursorScreenKey);
     xf86CursorInfoPtr infoPtr = ScreenPriv->CursorInfoPtr;
 
 #ifdef ARGB_CURSOR
diff --git a/hw/xfree86/shadowfb/shadow.c b/hw/xfree86/shadowfb/shadow.c
index c1b6ed1ce..ba6e3a8ee 100644
--- a/hw/xfree86/shadowfb/shadow.c
+++ b/hw/xfree86/shadowfb/shadow.c
@@ -101,14 +101,13 @@ typedef struct {
 } ShadowGCRec, *ShadowGCPtr;
 
 
-static int ShadowScreenIndex = -1;
-static int ShadowGCIndex = -1;
-static unsigned long ShadowGeneration = 0;
+static DevPrivateKey ShadowScreenKey = &ShadowScreenKey;
+static DevPrivateKey ShadowGCKey = &ShadowGCKey;
 
 #define GET_SCREEN_PRIVATE(pScreen) \
-	(ShadowScreenPtr)((pScreen)->devPrivates[ShadowScreenIndex].ptr)
+    (ShadowScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, ShadowScreenKey)
 #define GET_GC_PRIVATE(pGC) \
-	(ShadowGCPtr)((pGC)->devPrivates[ShadowGCIndex].ptr)
+    (ShadowGCPtr)dixLookupPrivate(&(pGC)->devPrivates, ShadowGCKey);
 
 #define SHADOW_GC_FUNC_PROLOGUE(pGC)\
     ShadowGCPtr pGCPriv = GET_GC_PRIVATE(pGC);\
@@ -179,20 +178,13 @@ ShadowFBInit2 (
 
     if(!preRefreshArea && !postRefreshArea) return FALSE;
     
-    if (ShadowGeneration != serverGeneration) {
-	if(((ShadowScreenIndex = AllocateScreenPrivateIndex ()) < 0) ||
-	   ((ShadowGCIndex = AllocateGCPrivateIndex()) < 0))
-	    return FALSE;
-	ShadowGeneration = serverGeneration;
-    }
-
-    if(!AllocateGCPrivate(pScreen, ShadowGCIndex, sizeof(ShadowGCRec)))
+    if(!dixRequestPrivate(ShadowGCKey, sizeof(ShadowGCRec)))
 	return FALSE;
 
     if(!(pPriv = (ShadowScreenPtr)xalloc(sizeof(ShadowScreenRec))))
 	return FALSE;
 
-    pScreen->devPrivates[ShadowScreenIndex].ptr = (pointer)pPriv;  
+    dixSetPrivate(&pScreen->devPrivates, ShadowScreenKey, pPriv);
 
     pPriv->pScrn = pScrn;
     pPriv->preRefresh = preRefreshArea;
diff --git a/hw/xfree86/xaa/xaaDashLine.c b/hw/xfree86/xaa/xaaDashLine.c
index 1a4732baa..63233e05d 100644
--- a/hw/xfree86/xaa/xaaDashLine.c
+++ b/hw/xfree86/xaa/xaaDashLine.c
@@ -35,7 +35,8 @@ XAAPolyLinesDashed(
 #endif
 ){
     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
-    XAAGCPtr   pGCPriv = (XAAGCPtr) (pGC)->devPrivates[XAAGetGCIndex()].ptr;
+    XAAGCPtr   pGCPriv = (XAAGCPtr)dixLookupPrivate(&pGC->devPrivates,
+						    XAAGetGCKey());
     BoxPtr pboxInit = REGION_RECTS(pGC->pCompositeClip);
     int nboxInit = REGION_NUM_RECTS(pGC->pCompositeClip);
     unsigned int bias = miGetZeroLineBias(pDrawable->pScreen);
diff --git a/hw/xfree86/xaa/xaaGC.c b/hw/xfree86/xaa/xaaGC.c
index f3434c9f4..65a482fe7 100644
--- a/hw/xfree86/xaa/xaaGC.c
+++ b/hw/xfree86/xaa/xaaGC.c
@@ -38,7 +38,8 @@ Bool
 XAACreateGC(GCPtr pGC)
 {
     ScreenPtr    pScreen = pGC->pScreen;
-    XAAGCPtr     pGCPriv = (XAAGCPtr)(pGC->devPrivates[XAAGetGCIndex()].ptr);
+    XAAGCPtr     pGCPriv = (XAAGCPtr)dixLookupPrivate(&pGC->devPrivates,
+						      XAAGetGCKey());
     Bool         ret;
 
     XAA_SCREEN_PROLOGUE(pScreen,CreateGC);
diff --git a/hw/xfree86/xaa/xaaGCmisc.c b/hw/xfree86/xaa/xaaGCmisc.c
index a7a3f4081..5823cc064 100644
--- a/hw/xfree86/xaa/xaaGCmisc.c
+++ b/hw/xfree86/xaa/xaaGCmisc.c
@@ -305,7 +305,8 @@ XAAValidatePolylines(
    DrawablePtr   pDraw )
 {
    XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
-   XAAGCPtr   pGCPriv = (XAAGCPtr) (pGC)->devPrivates[XAAGetGCIndex()].ptr;
+   XAAGCPtr pGCPriv = (XAAGCPtr)dixLookupPrivate(&pGC->devPrivates,
+						 XAAGetGCKey());
 
    if(pGC->lineStyle == LineSolid) changes &= ~GCDashList;
    if(!changes) return;
diff --git a/hw/xfree86/xaa/xaaInit.c b/hw/xfree86/xaa/xaaInit.c
index 93f6995aa..614ecf751 100644
--- a/hw/xfree86/xaa/xaaInit.c
+++ b/hw/xfree86/xaa/xaaInit.c
@@ -38,22 +38,20 @@ static int  XAASetDGAMode(int index, int num, DGADevicePtr devRet);
 static void XAAEnableDisableFBAccess (int index, Bool enable);
 static Bool XAAChangeWindowAttributes (WindowPtr pWin, unsigned long mask);
 
-static int XAAScreenIndex = -1;
-static int XAAGCIndex = -1;
-static int XAAPixmapIndex = -1;
+static DevPrivateKey XAAScreenKey = &XAAScreenKey;
+static DevPrivateKey XAAGCKey = &XAAGCKey;
+static DevPrivateKey XAAPixmapKey = &XAAPixmapKey;
 
-static unsigned long XAAGeneration = 0;
-
-int XAAGetScreenIndex(void) {
-    return XAAScreenIndex;
+DevPrivateKey XAAGetScreenKey(void) {
+    return XAAScreenKey;
 }
 
-int XAAGetGCIndex(void) {
-    return XAAGCIndex;
+DevPrivateKey XAAGetGCKey(void) {
+    return XAAGCKey;
 }
 
-int XAAGetPixmapIndex(void) {
-    return XAAPixmapIndex;
+DevPrivateKey XAAGetPixmapKey(void) {
+    return XAAPixmapKey;
 }
 
 /* temp kludge */
@@ -103,25 +101,16 @@ XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
     if (!infoRec)
 	return TRUE;
     
-    if (XAAGeneration != serverGeneration) {
-	if (	((XAAScreenIndex = AllocateScreenPrivateIndex()) < 0) ||
-		((XAAGCIndex = AllocateGCPrivateIndex()) < 0) ||
-		((XAAPixmapIndex = AllocatePixmapPrivateIndex()) < 0))
-		return FALSE;
-
-	XAAGeneration = serverGeneration;
-    }
-
-    if (!AllocateGCPrivate(pScreen, XAAGCIndex, sizeof(XAAGCRec)))
+    if (!dixRequestPrivate(XAAGCKey, sizeof(XAAGCRec)))
 	return FALSE;
 
-    if (!AllocatePixmapPrivate(pScreen, XAAPixmapIndex, sizeof(XAAPixmapRec)))
+    if (!dixRequestPrivate(XAAPixmapKey, sizeof(XAAPixmapRec)))
 	return FALSE;
 
     if (!(pScreenPriv = xalloc(sizeof(XAAScreenRec))))
 	return FALSE;
 
-    pScreen->devPrivates[XAAScreenIndex].ptr = (pointer)pScreenPriv;
+    dixSetPrivate(&pScreen->devPrivates, XAAScreenKey, pScreenPriv);
 
     if(!xf86FBManagerRunning(pScreen))
 	infoRec->Flags &= ~(PIXMAP_CACHE | OFFSCREEN_PIXMAPS);
@@ -226,7 +215,7 @@ XAACloseScreen (int i, ScreenPtr pScreen)
 {
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
     XAAScreenPtr pScreenPriv = 
-	(XAAScreenPtr) pScreen->devPrivates[XAAScreenIndex].ptr;
+	(XAAScreenPtr)dixLookupPrivate(&pScreen->devPrivates, XAAScreenKey);
 
     pScrn->EnterVT = pScreenPriv->EnterVT; 
     pScrn->LeaveVT = pScreenPriv->LeaveVT; 
@@ -524,7 +513,7 @@ XAAEnterVT(int index, int flags)
 {
     ScreenPtr pScreen = screenInfo.screens[index];
     XAAScreenPtr pScreenPriv = 
-	(XAAScreenPtr) pScreen->devPrivates[XAAScreenIndex].ptr;
+	(XAAScreenPtr)dixLookupPrivate(&pScreen->devPrivates, XAAScreenKey);
 
     return((*pScreenPriv->EnterVT)(index, flags));
 }
@@ -534,7 +523,7 @@ XAALeaveVT(int index, int flags)
 {
     ScreenPtr pScreen = screenInfo.screens[index];
     XAAScreenPtr pScreenPriv = 
-	(XAAScreenPtr) pScreen->devPrivates[XAAScreenIndex].ptr;
+	(XAAScreenPtr)dixLookupPrivate(&pScreen->devPrivates, XAAScreenKey);
     XAAInfoRecPtr infoRec = pScreenPriv->AccelInfoRec;
 
     if(infoRec->NeedToSync) {
@@ -557,7 +546,7 @@ XAASetDGAMode(int index, int num, DGADevicePtr devRet)
     ScreenPtr pScreen = screenInfo.screens[index];
     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
     XAAScreenPtr pScreenPriv = 
-	(XAAScreenPtr) pScreen->devPrivates[XAAScreenIndex].ptr;
+	(XAAScreenPtr)dixLookupPrivate(&pScreen->devPrivates, XAAScreenKey);
     int ret;
 
     if (!num && infoRec->dgaSaves) { /* restore old pixmap cache state */
@@ -619,7 +608,7 @@ XAAEnableDisableFBAccess (int index, Bool enable)
     ScreenPtr pScreen = screenInfo.screens[index];
     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
     XAAScreenPtr pScreenPriv = 
-	(XAAScreenPtr) pScreen->devPrivates[XAAScreenIndex].ptr;
+	(XAAScreenPtr)dixLookupPrivate(&pScreen->devPrivates, XAAScreenKey);
 
     if(!enable) {
 	if((infoRec->Flags & OFFSCREEN_PIXMAPS) && (infoRec->OffscreenPixmaps))
diff --git a/hw/xfree86/xaa/xaaLineMisc.c b/hw/xfree86/xaa/xaaLineMisc.c
index 537b08b97..cefb59a8e 100644
--- a/hw/xfree86/xaa/xaaLineMisc.c
+++ b/hw/xfree86/xaa/xaaLineMisc.c
@@ -64,7 +64,8 @@ void
 XAAComputeDash(GCPtr pGC)
 {
     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC);
-    XAAGCPtr   pGCPriv = (XAAGCPtr) (pGC)->devPrivates[XAAGetGCIndex()].ptr;
+    XAAGCPtr   pGCPriv = (XAAGCPtr)dixLookupPrivate(&pGC->devPrivates,
+						    XAAGetGCKey());
     Bool EvenDash = (pGC->numInDashList & 0x01) ? FALSE : TRUE;
     int PatternLength = 0;
     unsigned char* DashPtr = (unsigned char*)pGC->dash;
diff --git a/hw/xfree86/xaa/xaaOverlayDF.c b/hw/xfree86/xaa/xaaOverlayDF.c
index 5897e323b..77c9cb1c9 100644
--- a/hw/xfree86/xaa/xaaOverlayDF.c
+++ b/hw/xfree86/xaa/xaaOverlayDF.c
@@ -152,11 +152,10 @@ typedef struct {
    int (*TiledFillChooser)(GCPtr);
 } XAAOverlayRec, *XAAOverlayPtr;
 
-static int XAAOverlayIndex = -1;
-static unsigned long XAAOverlayGeneration = 0;
+static DevPrivateKey XAAOverlayKey = &XAAOverlayKey;
 
 #define GET_OVERLAY_PRIV(pScreen) \
-    ((XAAOverlayPtr)((pScreen)->devPrivates[XAAOverlayIndex].ptr))
+    (XAAOverlayPtr)dixLookupPrivate(&(pScreen)->devPrivates, XAAOverlayKey)
 
 #define SWITCH_DEPTH(d) \
    if(pOverPriv->currentDepth != d) { \
@@ -174,18 +173,10 @@ XAAInitDualFramebufferOverlay(
     XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
     XAAOverlayPtr pOverPriv;
 
-    if (XAAOverlayGeneration != serverGeneration) {
-	if((XAAOverlayIndex = AllocateScreenPrivateIndex()) < 0)
-		return FALSE;
-
-	XAAOverlayGeneration = serverGeneration;
-    }
-   
-
     if(!(pOverPriv = xalloc(sizeof(XAAOverlayRec))))
 	return FALSE;
 
-    pScreen->devPrivates[XAAOverlayIndex].ptr = (pointer)pOverPriv;
+    dixSetPrivate(&pScreen->devPrivates, XAAOverlayKey, pOverPriv);
 
     pOverPriv->pScrn = pScrn;
     pOverPriv->callback = callback;
diff --git a/hw/xfree86/xaa/xaaStateChange.c b/hw/xfree86/xaa/xaaStateChange.c
index 711f7791f..39ad046c5 100644
--- a/hw/xfree86/xaa/xaaStateChange.c
+++ b/hw/xfree86/xaa/xaaStateChange.c
@@ -276,18 +276,17 @@ typedef struct _XAAStateWrapRec {
 #endif
 } XAAStateWrapRec, *XAAStateWrapPtr;
 
-static int XAAStateIndex = -1;
-static unsigned long XAAStateGeneration = 0;
+static DevPrivateKey XAAStateKey = &XAAStateKey;
 
 /* Wrap functions start here */
 #define GET_STATEPRIV_GC(pGC)   XAAStateWrapPtr pStatePriv =\
-(XAAStateWrapPtr)(pGC->pScreen->devPrivates[XAAStateIndex].ptr)
+(XAAStateWrapPtr)dixLookupPrivate(&(pGC)->pScreen->devPrivates, XAAStateKey)
 
 #define GET_STATEPRIV_SCREEN(pScreen)   XAAStateWrapPtr pStatePriv =\
-(XAAStateWrapPtr)(pScreen->devPrivates[XAAStateIndex].ptr)
+(XAAStateWrapPtr)dixLookupPrivate(&(pScreen)->devPrivates, XAAStateKey)
 
 #define GET_STATEPRIV_PSCRN(pScrn)   XAAStateWrapPtr pStatePriv =\
-(XAAStateWrapPtr)(pScrn->pScreen->devPrivates[XAAStateIndex].ptr)
+(XAAStateWrapPtr)dixLookupPrivate(&(pScrn)->pScreen->devPrivates, XAAStateKey)
 
 #define STATE_CHECK_SP(pStatePriv) {\
 	ScrnInfoPtr pScrn = pStatePriv->pScrn;\
@@ -1526,12 +1525,8 @@ XAAInitStateWrap(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
    XAAStateWrapPtr pStatePriv;
    int i = 0;
    
-   if (XAAStateGeneration != serverGeneration) {
-      if((XAAStateIndex = AllocateScreenPrivateIndex()) < 0) return FALSE;
-      XAAStateGeneration = serverGeneration;
-   }
    if(!(pStatePriv = xalloc(sizeof(XAAStateWrapRec)))) return FALSE;
-   pScreen->devPrivates[XAAStateIndex].ptr = (pointer)pStatePriv;   
+   dixSetPrivate(&pScreen->devPrivates, XAAStateKey, pStatePriv);
    pStatePriv->RestoreAccelState = infoRec->RestoreAccelState;
    pStatePriv->pScrn = pScrn;
    
diff --git a/hw/xfree86/xaa/xaaWrapper.c b/hw/xfree86/xaa/xaaWrapper.c
index 6d8107b61..642ef8c39 100644
--- a/hw/xfree86/xaa/xaaWrapper.c
+++ b/hw/xfree86/xaa/xaaWrapper.c
@@ -90,10 +90,8 @@ typedef struct {
     int depth;
 } xaaWrapperScrPrivRec, *xaaWrapperScrPrivPtr;
 
-#define xaaWrapperGetScrPriv(s)	((xaaWrapperScrPrivPtr)( \
-				 (xaaWrapperScrPrivateIndex != -1) \
-                          ? (s)->devPrivates[xaaWrapperScrPrivateIndex].ptr\
-				: NULL))
+#define xaaWrapperGetScrPriv(s)	((xaaWrapperScrPrivPtr) \
+    dixLookupPrivate(&(s)->devPrivates, xaaWrapperScrPrivateKey))
 #define xaaWrapperScrPriv(s)     xaaWrapperScrPrivPtr pScrPriv = xaaWrapperGetScrPriv(s)
 
 #define wrap(priv,real,mem,func) {\
@@ -131,13 +129,12 @@ typedef struct _xaaWrapperGCPriv {
 } xaaWrapperGCPrivRec, *xaaWrapperGCPrivPtr;
 
 #define xaaWrapperGetGCPriv(pGC) ((xaaWrapperGCPrivPtr) \
-				      (pGC)->devPrivates[xaaWrapperGCPrivateIndex].ptr)
+    dixLookupPrivate(&(pGC)->devPrivates, xaaWrapperGCPrivateKey))
 #define xaaWrapperGCPriv(pGC)   xaaWrapperGCPrivPtr  pGCPriv = xaaWrapperGetGCPriv(pGC)
 
 
-static int xaaWrapperScrPrivateIndex = -1;
-static int xaaWrapperGCPrivateIndex = -1;
-static int xaaWrapperGeneration = -1;
+static DevPrivateKey xaaWrapperScrPrivateKey = &xaaWrapperScrPrivateKey;
+static DevPrivateKey xaaWrapperGCPrivateKey = &xaaWrapperGCPrivateKey;
 
 static Bool
 xaaWrapperCreateScreenResources(ScreenPtr pScreen)
@@ -305,18 +302,8 @@ xaaSetupWrapper(ScreenPtr pScreen, XAAInfoRecPtr infoPtr, int depth, SyncFunc *f
 #ifdef RENDER
     PictureScreenPtr	ps = GetPictureScreenIfSet(pScreen);
 #endif
-    if (xaaWrapperGeneration != serverGeneration) {
-	xaaWrapperScrPrivateIndex = AllocateScreenPrivateIndex ();
-	if (xaaWrapperScrPrivateIndex == -1)
-	    return FALSE;
-	xaaWrapperGCPrivateIndex = AllocateGCPrivateIndex ();
-	if (xaaWrapperGCPrivateIndex == -1)
-	    return FALSE;
-	xaaWrapperGeneration = serverGeneration;
-    }
 
-    if (!AllocateGCPrivate (pScreen, xaaWrapperGCPrivateIndex,
-			    sizeof (xaaWrapperGCPrivRec)))
+    if (!dixRequestPrivate(xaaWrapperGCPrivateKey, sizeof(xaaWrapperGCPrivRec)))
 	return FALSE;
 
     pScrPriv = (xaaWrapperScrPrivPtr) xalloc (sizeof (xaaWrapperScrPrivRec));
@@ -370,7 +357,7 @@ xaaSetupWrapper(ScreenPtr pScreen, XAAInfoRecPtr infoPtr, int depth, SyncFunc *f
     }
 #endif
     pScrPriv->depth = depth;
-    pScreen->devPrivates[xaaWrapperScrPrivateIndex].ptr = (pointer) pScrPriv;
+    dixSetPrivate(&pScreen->devPrivates, xaaWrapperScrPrivateKey, pScrPriv);
 
     *func = XAASync;
     
@@ -521,8 +508,8 @@ xaaWrapperGlyphs (CARD8 op, PicturePtr pSrc, PicturePtr pDst,
 void
 XAASync(ScreenPtr pScreen)
 {
-    XAAScreenPtr pScreenPriv = 
-	(XAAScreenPtr) pScreen->devPrivates[XAAGetScreenIndex()].ptr;
+    XAAScreenPtr pScreenPriv = (XAAScreenPtr)
+	dixLookupPrivate(&pScreen->devPrivates, XAAGetScreenKey());
     XAAInfoRecPtr infoRec = pScreenPriv->AccelInfoRec;
 
     if(infoRec->NeedToSync) {
diff --git a/hw/xfree86/xaa/xaalocal.h b/hw/xfree86/xaa/xaalocal.h
index 3ddea241c..1e536c1fa 100644
--- a/hw/xfree86/xaa/xaalocal.h
+++ b/hw/xfree86/xaa/xaalocal.h
@@ -1639,9 +1639,9 @@ XAAGetPixelFromRGBA (
 extern GCOps XAAFallbackOps;
 extern GCOps *XAAGetFallbackOps(void);
 extern GCFuncs XAAGCFuncs;
-extern int XAAGetScreenIndex(void);
-extern int XAAGetGCIndex(void);
-extern int XAAGetPixmapIndex(void);
+extern DevPrivateKey XAAGetScreenKey(void);
+extern DevPrivateKey XAAGetGCKey(void);
+extern DevPrivateKey XAAGetPixmapKey(void);
 
 extern unsigned int XAAShiftMasks[32];
 
@@ -1650,28 +1650,28 @@ extern unsigned int byte_expand3[256], byte_reversed_expand3[256];
 CARD32 XAAReverseBitOrder(CARD32 data);
 
 #define GET_XAASCREENPTR_FROM_SCREEN(pScreen)\
-	(pScreen)->devPrivates[XAAGetScreenIndex()].ptr
+    dixLookupPrivate(&(pScreen)->devPrivates, XAAGetScreenKey())
 
 #define GET_XAASCREENPTR_FROM_GC(pGC)\
-	(pGC)->pScreen->devPrivates[XAAGetScreenIndex()].ptr
+    dixLookupPrivate(&(pGC)->pScreen->devPrivates, XAAGetScreenKey())
 
 #define GET_XAASCREENPTR_FROM_DRAWABLE(pDraw)\
-	(pDraw)->pScreen->devPrivates[XAAGetScreenIndex()].ptr
+    dixLookupPrivate(&(pDraw)->pScreen->devPrivates, XAAGetScreenKey())
 
 #define GET_XAAINFORECPTR_FROM_SCREEN(pScreen)\
-   ((XAAScreenPtr)((pScreen)->devPrivates[XAAGetScreenIndex()].ptr))->AccelInfoRec
+((XAAScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, XAAGetScreenKey()))->AccelInfoRec
 
 #define GET_XAAINFORECPTR_FROM_GC(pGC)\
-((XAAScreenPtr)((pGC)->pScreen->devPrivates[XAAGetScreenIndex()].ptr))->AccelInfoRec
+((XAAScreenPtr)dixLookupPrivate(&(pGC)->pScreen->devPrivates, XAAGetScreenKey()))->AccelInfoRec
 
 #define GET_XAAINFORECPTR_FROM_DRAWABLE(pDraw)\
-((XAAScreenPtr)((pDraw)->pScreen->devPrivates[XAAGetScreenIndex()].ptr))->AccelInfoRec
+((XAAScreenPtr)dixLookupPrivate(&(pDraw)->pScreen->devPrivates, XAAGetScreenKey()))->AccelInfoRec
 
 #define GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn)\
-((XAAScreenPtr)((pScrn)->pScreen->devPrivates[XAAGetScreenIndex()].ptr))->AccelInfoRec
+((XAAScreenPtr)dixLookupPrivate(&(pScrn)->pScreen->devPrivates, XAAGetScreenKey()))->AccelInfoRec
 
 #define XAA_GET_PIXMAP_PRIVATE(pix)\
-	(XAAPixmapPtr)((pix)->devPrivates[XAAGetPixmapIndex()].ptr)
+    (XAAPixmapPtr)dixLookupPrivate(&(pix)->devPrivates, XAAGetPixmapKey())
 
 #define CHECK_RGB_EQUAL(c) (!((((c) >> 8) ^ (c)) & 0xffff))
 
diff --git a/hw/xfree86/xaa/xaawrap.h b/hw/xfree86/xaa/xaawrap.h
index 32c17a60c..38c97d70b 100644
--- a/hw/xfree86/xaa/xaawrap.h
+++ b/hw/xfree86/xaa/xaawrap.h
@@ -1,14 +1,14 @@
 
 #define XAA_SCREEN_PROLOGUE(pScreen, field)\
   ((pScreen)->field = \
-   ((XAAScreenPtr) (pScreen)->devPrivates[XAAGetScreenIndex()].ptr)->field)
+   ((XAAScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, XAAGetScreenKey()))->field)
 
 #define XAA_SCREEN_EPILOGUE(pScreen, field, wrapper)\
     ((pScreen)->field = wrapper)
 
 
 #define XAA_GC_FUNC_PROLOGUE(pGC)\
-    XAAGCPtr   pGCPriv = (XAAGCPtr) (pGC)->devPrivates[XAAGetGCIndex()].ptr;\
+    XAAGCPtr pGCPriv = (XAAGCPtr)dixLookupPrivate(&(pGC)->devPrivates, XAAGetGCKey()); \
     (pGC)->funcs = pGCPriv->wrapFuncs;\
     if(pGCPriv->flags)\
 	(pGC)->ops = pGCPriv->wrapOps
@@ -24,13 +24,13 @@
 
 
 #define XAA_GC_OP_PROLOGUE(pGC)\
-    XAAGCPtr pGCPriv = (XAAGCPtr)(pGC->devPrivates[XAAGetGCIndex()].ptr);\
+    XAAGCPtr pGCPriv = (XAAGCPtr)dixLookupPrivate(&(pGC)->devPrivates, XAAGetGCKey()); \
     GCFuncs *oldFuncs = pGC->funcs;\
     pGC->funcs = pGCPriv->wrapFuncs;\
     pGC->ops = pGCPriv->wrapOps
 
 #define XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC)\
-    XAAGCPtr pGCPriv = (XAAGCPtr)(pGC->devPrivates[XAAGetGCIndex()].ptr);\
+    XAAGCPtr pGCPriv = (XAAGCPtr)dixLookupPrivate(&(pGC)->devPrivates, XAAGetGCKey()); \
     GCFuncs *oldFuncs = pGC->funcs;\
     if(!REGION_NUM_RECTS(pGC->pCompositeClip)) return; \
     pGC->funcs = pGCPriv->wrapFuncs;\
@@ -44,7 +44,7 @@
 
 
 #define XAA_PIXMAP_OP_PROLOGUE(pGC, pDraw)\
-    XAAGCPtr pGCPriv = (XAAGCPtr)(pGC->devPrivates[XAAGetGCIndex()].ptr);\
+    XAAGCPtr pGCPriv = (XAAGCPtr)dixLookupPrivate(&(pGC)->devPrivates, XAAGetGCKey()); \
     XAAPixmapPtr pixPriv = XAA_GET_PIXMAP_PRIVATE((PixmapPtr)(pDraw));\
     GCFuncs *oldFuncs = pGC->funcs;\
     pGC->funcs = pGCPriv->wrapFuncs;\
@@ -64,7 +64,7 @@
 #ifdef RENDER
 #define XAA_RENDER_PROLOGUE(pScreen,field)\
     (GetPictureScreen(pScreen)->field = \
-     ((XAAScreenPtr) (pScreen)->devPrivates[XAAGetScreenIndex()].ptr)->field)
+     ((XAAScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, XAAGetScreenKey()))->field)
 
 #define XAA_RENDER_EPILOGUE(pScreen, field, wrapper)\
     (GetPictureScreen(pScreen)->field = wrapper)
@@ -74,7 +74,7 @@
 
 #define SYNC_CHECK(pGC) {\
      XAAInfoRecPtr infoRec =\
-((XAAScreenPtr)((pGC)->pScreen->devPrivates[XAAGetScreenIndex()].ptr))->AccelInfoRec;\
+((XAAScreenPtr)dixLookupPrivate(&(pGC)->pScreen->devPrivates, XAAGetScreenKey()))->AccelInfoRec;	\
     if(infoRec->NeedToSync) {\
 	(*infoRec->Sync)(infoRec->pScrn);\
 	infoRec->NeedToSync = FALSE;\
diff --git a/hw/xfree86/xf4bpp/mfbfillarc.c b/hw/xfree86/xf4bpp/mfbfillarc.c
index d5b5372f5..89aeadd2b 100644
--- a/hw/xfree86/xf4bpp/mfbfillarc.c
+++ b/hw/xfree86/xf4bpp/mfbfillarc.c
@@ -253,7 +253,8 @@ xf4bppPolyFillArcSolid
     mfbPrivGC *priv;
     int rop;
 
-    priv = (mfbPrivGC *) pGC->devPrivates[mfbGetGCPrivateIndex()].ptr;
+    priv = (mfbPrivGC *)dixLookupPrivate(&pGC->devPrivates,
+					 mfbGetGCPrivateKey());
     rop = priv->rop;
     if ((rop == RROP_NOP) || !(pGC->planemask & 1))
 #else
diff --git a/hw/xfree86/xf4bpp/mfbimggblt.c b/hw/xfree86/xf4bpp/mfbimggblt.c
index bf53f4ce9..711a16ee5 100644
--- a/hw/xfree86/xf4bpp/mfbimggblt.c
+++ b/hw/xfree86/xf4bpp/mfbimggblt.c
@@ -149,7 +149,8 @@ xf4bppImageGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase)
        backrect.height = FONTASCENT(pGC->font) + FONTDESCENT(pGC->font);
 
 
-       pPrivGC = pGC->devPrivates[mfbGetGCPrivateIndex()].ptr;
+       pPrivGC = (ppcPrivGC *)dixLookupPrivate(&pGC->devPrivates,
+					       mfbGetGCPrivateKey());
        oldfillStyle = pPrivGC->colorRrop.fillStyle; /* GJA */
        oldfg = pPrivGC->colorRrop.fgPixel; /* GJA */
        oldalu = pPrivGC->colorRrop.alu; /* GJA */
diff --git a/hw/xfree86/xf4bpp/mfbzerarc.c b/hw/xfree86/xf4bpp/mfbzerarc.c
index c7a8c4d56..61fc7b184 100644
--- a/hw/xfree86/xf4bpp/mfbzerarc.c
+++ b/hw/xfree86/xf4bpp/mfbzerarc.c
@@ -108,7 +108,8 @@ v16ZeroArcSS
     int pmask;
     register int *paddr;
 
-    if (((mfbPrivGC *)(pGC->devPrivates[mfbGetGCPrivateIndex()].ptr))->rop ==
+    if (((mfbPrivGC *)dixLookupPrivate(&pGC->devPrivates,
+				       mfbGetGCPrivateKey()))->rop ==
 	RROP_BLACK)
 	pixel = 0;
     else
diff --git a/hw/xfree86/xf4bpp/ppcArea.c b/hw/xfree86/xf4bpp/ppcArea.c
index e95696260..df7856a35 100644
--- a/hw/xfree86/xf4bpp/ppcArea.c
+++ b/hw/xfree86/xf4bpp/ppcArea.c
@@ -49,7 +49,7 @@ int alu ;
 unsigned long int fg, bg, pm ;
 int xSrc, ySrc ;
 PixmapPtr pPixmap ;
-ppcPrivGC *pPrivGC = pGC->devPrivates[mfbGetGCPrivateIndex()].ptr;
+ppcPrivGC *pPrivGC = dixLookupPrivate(&pGC->devPrivates, mfbGetGCPrivateKey());
 
 TRACE( ( "xf4bppFillArea(0x%x,%d,0x%x,0x%x)\n", pWin, nboxes, pBox, pGC ) ) ;
 
diff --git a/hw/xfree86/xf4bpp/ppcGC.c b/hw/xfree86/xf4bpp/ppcGC.c
index b59dab312..ca3c5e984 100644
--- a/hw/xfree86/xf4bpp/ppcGC.c
+++ b/hw/xfree86/xf4bpp/ppcGC.c
@@ -183,7 +183,7 @@ register GCPtr pGC ;
          * a pointer to a ppcPrivGC in its slot.
          */
 	*pPriv = vgaPrototypeGCPriv;
-	(pGC->devPrivates[mfbGetGCPrivateIndex()].ptr) = (pointer) pPriv;
+	dixSetPrivate(&pGC->devPrivates, mfbGetGCPrivateKey(), pPriv);
 
 	/* Set the vgaGCOps */
 	*pOps = vgaGCOps;
@@ -209,7 +209,7 @@ xf4bppDestroyGC( pGC )
     if ( pGC->freeCompClip && pGC->pCompositeClip )
 	REGION_DESTROY(pGC->pScreen, pGC->pCompositeClip);
     if(pGC->ops->devPrivate.val) xfree( pGC->ops );
-    xfree( pGC->devPrivates[mfbGetGCPrivateIndex()].ptr ) ;
+    xfree(dixLookupPrivate(&pGC->devPrivates, mfbGetGCPrivateKey()));
     return ;
 }
 
@@ -220,7 +220,7 @@ ppcChangePixmapGC
 	register Mask changes
 )
 {
-register ppcPrivGCPtr devPriv = (ppcPrivGCPtr) (pGC->devPrivates[mfbGetGCPrivateIndex()].ptr ) ;
+register ppcPrivGCPtr devPriv = (ppcPrivGCPtr)dixLookupPrivate(&pGC->devPrivates, mfbGetGCPrivateKey());
 register unsigned long int idx ; /* used for stepping through bitfields */
 
 #define LOWBIT( x ) ( x & - x ) /* Two's complement */
@@ -298,8 +298,8 @@ xf4bppValidateGC( pGC, changes, pDrawable )
     register ppcPrivGCPtr devPriv ;
     WindowPtr pWin ;
 
-    devPriv = (ppcPrivGCPtr) (pGC->devPrivates[mfbGetGCPrivateIndex()].ptr ) ;
-
+    devPriv = (ppcPrivGCPtr)dixLookupPrivate(&pGC->devPrivates,
+					     mfbGetGCPrivateKey());
     if ( pDrawable->type != devPriv->lastDrawableType ) {
 	devPriv->lastDrawableType = pDrawable->type ;
 	xf4bppChangeGCtype( pGC, devPriv ) ;
diff --git a/hw/xfree86/xf4bpp/ppcIO.c b/hw/xfree86/xf4bpp/ppcIO.c
index 8d726e758..bd20218d3 100644
--- a/hw/xfree86/xf4bpp/ppcIO.c
+++ b/hw/xfree86/xf4bpp/ppcIO.c
@@ -219,7 +219,7 @@ xf4bppScreenInit( pScreen, pbits, virtx, virty, dpix, dpiy, width )
   pScreen-> ResolveColor = xf4bppResolveColor;
   mfbFillInScreen(pScreen);
 
-  if (!mfbAllocatePrivates(pScreen, (int*)NULL, (int*)NULL))
+  if (!mfbAllocatePrivates(pScreen, NULL, NULL))
 	return FALSE;
 
   if (!miScreenInit(pScreen, pbits, virtx, virty, dpix, dpiy, width,
diff --git a/hw/xfree86/xf4bpp/ppcPixFS.c b/hw/xfree86/xf4bpp/ppcPixFS.c
index f24168bb0..91b753255 100644
--- a/hw/xfree86/xf4bpp/ppcPixFS.c
+++ b/hw/xfree86/xf4bpp/ppcPixFS.c
@@ -124,7 +124,7 @@ xf4bppSolidPixmapFS( pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted )
 	return ;
     }
 
-    if ( ( alu = ( (ppcPrivGC *) pGC->devPrivates[mfbGetGCPrivateIndex()].ptr )->colorRrop.alu ) == GXnoop )
+    if ( ( alu = ( (ppcPrivGC *)dixLookupPrivate(&pGC->devPrivates, mfbGetGCPrivateKey()))->colorRrop.alu ) == GXnoop )
 	return ;
 
     n = nInit * miFindMaxBand(pGC->pCompositeClip) ;
@@ -142,8 +142,8 @@ xf4bppSolidPixmapFS( pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted )
     n = miClipSpans( pGC->pCompositeClip, pptInit, pwidthInit, nInit,
 	ppt, pwidth, fSorted ) ;
 
-    pm = ( (ppcPrivGC *) pGC->devPrivates[mfbGetGCPrivateIndex()].ptr )->colorRrop.planemask ;
-    fg = ( (ppcPrivGC *) pGC->devPrivates[mfbGetGCPrivateIndex()].ptr )->colorRrop.fgPixel ;
+    pm = ( (ppcPrivGC *)dixLookupPrivate(&pGC->devPrivates, mfbGetGCPrivateKey()) )->colorRrop.planemask ;
+    fg = ( (ppcPrivGC *)dixLookupPrivate(&pGC->devPrivates, mfbGetGCPrivateKey()) )->colorRrop.fgPixel ;
     npm = ( ~ pm ) & ( ( 1 << pDrawable->depth ) - 1 ) ;
 
     for ( ; n-- ; ppt++, pwidth++ ) {
@@ -258,14 +258,14 @@ int fSorted ;
 	return ;
     }
 
-    if ( ( alu = ( (ppcPrivGC *) pGC->devPrivates[mfbGetGCPrivateIndex()].ptr )->colorRrop.alu ) == GXnoop )
+    if ( ( alu = ( (ppcPrivGC *)dixLookupPrivate(&pGC->devPrivates, mfbGetGCPrivateKey()) )->colorRrop.alu ) == GXnoop )
 	return ;
 
     SETSPANPTRS( nInit, n, pwidthInit, pwidthFree, pptInit,
 		pptFree, pwidth, ppt, fSorted ) ;
 
-    pm = ( (ppcPrivGC *) pGC->devPrivates[mfbGetGCPrivateIndex()].ptr )->colorRrop.planemask ;
-    fg = ( (ppcPrivGC *) pGC->devPrivates[mfbGetGCPrivateIndex()].ptr )->colorRrop.fgPixel ;
+    pm = ( (ppcPrivGC *)dixLookupPrivate(&pGC->devPrivates, mfbGetGCPrivateKey()) )->colorRrop.planemask ;
+    fg = ( (ppcPrivGC *)dixLookupPrivate(&pGC->devPrivates, mfbGetGCPrivateKey()) )->colorRrop.fgPixel ;
 
     pTile = pGC->stipple ;
     tlwidth = pTile->devKind ;
@@ -356,15 +356,15 @@ int fSorted ;
 	return ;
     }
 
-    if ( ( alu = ( (ppcPrivGC *) pGC->devPrivates[mfbGetGCPrivateIndex()].ptr )->colorRrop.alu ) == GXnoop )
+    if ( ( alu = ( (ppcPrivGC *)dixLookupPrivate(&pGC->devPrivates, mfbGetGCPrivateKey()) )->colorRrop.alu ) == GXnoop )
 	return ;
 
     SETSPANPTRS( nInit, n, pwidthInit, pwidthFree, pptInit,
 		 pptFree, pwidth, ppt, fSorted ) ;
 
-    fg = ( (ppcPrivGC *) pGC->devPrivates[mfbGetGCPrivateIndex()].ptr )->colorRrop.fgPixel ;
-    bg = ( (ppcPrivGC *) pGC->devPrivates[mfbGetGCPrivateIndex()].ptr )->colorRrop.bgPixel ;
-    pm = ( (ppcPrivGC *) pGC->devPrivates[mfbGetGCPrivateIndex()].ptr )->colorRrop.planemask ;
+    fg = ( (ppcPrivGC *)dixLookupPrivate(&pGC->devPrivates, mfbGetGCPrivateKey()) )->colorRrop.fgPixel ;
+    bg = ( (ppcPrivGC *)dixLookupPrivate(&pGC->devPrivates, mfbGetGCPrivateKey()) )->colorRrop.bgPixel ;
+    pm = ( (ppcPrivGC *)dixLookupPrivate(&pGC->devPrivates, mfbGetGCPrivateKey()) )->colorRrop.planemask ;
     npm = ( ~ pm ) & ( ( 1 << pDrawable->depth ) - 1 ) ;
 
     pTile = pGC->stipple ;
@@ -459,14 +459,14 @@ int fSorted ;
 	return ;
     }
 
-    if ( ( alu = ( (ppcPrivGC *) pGC->devPrivates[mfbGetGCPrivateIndex()].ptr )->colorRrop.alu ) == GXnoop )
+    if ( ( alu = ( (ppcPrivGC *)dixLookupPrivate(&pGC->devPrivates, mfbGetGCPrivateKey()) )->colorRrop.alu ) == GXnoop )
 	return ;
 
     SETSPANPTRS( nInit, n, pwidthInit, pwidthFree, pptInit,
 		 pptFree, pwidth, ppt, fSorted ) ;
 
     /* the following code is for 8 bits per pixel addressable memory only */
-    pm = ( (ppcPrivGC *) pGC->devPrivates[mfbGetGCPrivateIndex()].ptr )->colorRrop.planemask ;
+    pm = ( (ppcPrivGC *)dixLookupPrivate(&pGC->devPrivates, mfbGetGCPrivateKey()) )->colorRrop.planemask ;
     npm = ( ~ pm ) & ( ( 1 << pDrawable->depth ) - 1 ) ;
     pTile = pGC->tile.pixmap ;
     tileWidth = pTile->drawable.width ;
diff --git a/hw/xfree86/xf4bpp/ppcPixmap.c b/hw/xfree86/xf4bpp/ppcPixmap.c
index ec181cfaf..2079e2ee6 100644
--- a/hw/xfree86/xf4bpp/ppcPixmap.c
+++ b/hw/xfree86/xf4bpp/ppcPixmap.c
@@ -137,6 +137,7 @@ xf4bppCopyPixmap(pSrc)
     pDst = xalloc(sizeof(PixmapRec) + size);
     if (!pDst)
 	return NullPixmap;
+    pDst->devPrivates = NULL;
     pDst->drawable = pSrc->drawable;
     pDst->drawable.id = 0;
     pDst->drawable.serialNumber = NEXT_SERIAL_NUMBER;
diff --git a/hw/xfree86/xf4bpp/ppcPntWin.c b/hw/xfree86/xf4bpp/ppcPntWin.c
index 5d7a07e12..482b34b5d 100644
--- a/hw/xfree86/xf4bpp/ppcPntWin.c
+++ b/hw/xfree86/xf4bpp/ppcPntWin.c
@@ -100,7 +100,7 @@ xf4bppPaintWindow(pWin, pRegion, what)
 {
 
     register mfbPrivWin	*pPrivWin;
-    pPrivWin = (mfbPrivWin *)(pWin->devPrivates[mfbGetWindowPrivateIndex()].ptr);
+    pPrivWin = (mfbPrivWin *)dixLookupPrivate(&pWin->devPrivates, mfbGetWindowPrivateKey());
 
     TRACE(("xf4bppPaintWindow( pWin= 0x%x, pRegion= 0x%x, what= %d )\n",
 							pWin,pRegion,what));
diff --git a/hw/xfree86/xf4bpp/ppcPolyPnt.c b/hw/xfree86/xf4bpp/ppcPolyPnt.c
index 1d6905563..c61fd6d26 100644
--- a/hw/xfree86/xf4bpp/ppcPolyPnt.c
+++ b/hw/xfree86/xf4bpp/ppcPolyPnt.c
@@ -102,7 +102,7 @@ if ( pDrawable->type == DRAWABLE_PIXMAP ) {
 	return ;
 }
 
-devPriv = (ppcPrivGC *) ( pGC->devPrivates[mfbGetGCPrivateIndex()].ptr ) ;
+devPriv = (ppcPrivGC *)dixLookupPrivate(&pGC->devPrivates, mfbGetGCPrivateKey());
 if ( ( alu = devPriv->colorRrop.alu ) == GXnoop )
 	return ;
 
diff --git a/hw/xfree86/xf4bpp/ppcWinFS.c b/hw/xfree86/xf4bpp/ppcWinFS.c
index e19ce0d40..982bf424c 100644
--- a/hw/xfree86/xf4bpp/ppcWinFS.c
+++ b/hw/xfree86/xf4bpp/ppcWinFS.c
@@ -96,7 +96,7 @@ xf4bppSolidWindowFS( pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted )
 	return ;
     }
 
-    if ( ( alu = ( (ppcPrivGC *) pGC->devPrivates[mfbGetGCPrivateIndex()].ptr )->colorRrop.alu ) == GXnoop )
+    if ( ( alu = ( (ppcPrivGC *)dixLookupPrivate(&pGC->devPrivates, mfbGetGCPrivateKey()) )->colorRrop.alu ) == GXnoop )
 	return ;
 
     n = nInit * miFindMaxBand( pGC->pCompositeClip ) ;
@@ -114,8 +114,8 @@ xf4bppSolidWindowFS( pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted )
     n = miClipSpans( pGC->pCompositeClip, pptInit, pwidthInit, nInit,
 	ppt, pwidth, fSorted ) ;
 
-    pm = ( (ppcPrivGC *) pGC->devPrivates[mfbGetGCPrivateIndex()].ptr )->colorRrop.planemask ;
-    fg = ( (ppcPrivGC *) pGC->devPrivates[mfbGetGCPrivateIndex()].ptr )->colorRrop.fgPixel ;
+    pm = ( (ppcPrivGC *)dixLookupPrivate(&pGC->devPrivates, mfbGetGCPrivateKey()) )->colorRrop.planemask ;
+    fg = ( (ppcPrivGC *)dixLookupPrivate(&pGC->devPrivates, mfbGetGCPrivateKey()) )->colorRrop.fgPixel ;
 
     for ( ; n-- ; ppt++, pwidth++ )
 	if ( *pwidth )
@@ -163,14 +163,14 @@ int fSorted ;
 	return ;
     }
 
-    if ( ( alu = ( (ppcPrivGC *) pGC->devPrivates[mfbGetGCPrivateIndex()].ptr )->colorRrop.alu ) == GXnoop )
+    if ( ( alu = ( (ppcPrivGC *)dixLookupPrivate(&pGC->devPrivates, mfbGetGCPrivateKey()) )->colorRrop.alu ) == GXnoop )
 	return ;
 
     SETSPANPTRS( nInit, n, pwidthInit, pwidthFree, pptInit,
 		 pptFree, pwidth, ppt, fSorted ) ;
 
-    pm = ( (ppcPrivGC *) pGC->devPrivates[mfbGetGCPrivateIndex()].ptr )->colorRrop.planemask ;
-    fg = ( (ppcPrivGC *) pGC->devPrivates[mfbGetGCPrivateIndex()].ptr )->colorRrop.fgPixel ;
+    pm = ( (ppcPrivGC *)dixLookupPrivate(&pGC->devPrivates, mfbGetGCPrivateKey()) )->colorRrop.planemask ;
+    fg = ( (ppcPrivGC *)dixLookupPrivate(&pGC->devPrivates, mfbGetGCPrivateKey()) )->colorRrop.fgPixel ;
 
     xSrc = pGC->patOrg.x + pDrawable->x ;
     ySrc = pGC->patOrg.y + pDrawable->y ;
@@ -215,15 +215,15 @@ int fSorted ;
 	return ;
     }
 
-    if ( ( alu = ( (ppcPrivGC *) pGC->devPrivates[mfbGetGCPrivateIndex()].ptr )->colorRrop.alu ) == GXnoop )
+    if ( ( alu = ( (ppcPrivGC *)dixLookupPrivate(&pGC->devPrivates, mfbGetGCPrivateKey()) )->colorRrop.alu ) == GXnoop )
 	return ;
 
     SETSPANPTRS( nInit, n, pwidthInit, pwidthFree, pptInit,
 		 pptFree, pwidth, ppt, fSorted ) ;
 
-    pm = ( (ppcPrivGC *) pGC->devPrivates[mfbGetGCPrivateIndex()].ptr )->colorRrop.planemask ;
-    fg = ( (ppcPrivGC *) pGC->devPrivates[mfbGetGCPrivateIndex()].ptr )->colorRrop.fgPixel ;
-    bg = ( (ppcPrivGC *) pGC->devPrivates[mfbGetGCPrivateIndex()].ptr )->colorRrop.bgPixel ;
+    pm = ( (ppcPrivGC *)dixLookupPrivate(&pGC->devPrivates, mfbGetGCPrivateKey()) )->colorRrop.planemask ;
+    fg = ( (ppcPrivGC *)dixLookupPrivate(&pGC->devPrivates, mfbGetGCPrivateKey()) )->colorRrop.fgPixel ;
+    bg = ( (ppcPrivGC *)dixLookupPrivate(&pGC->devPrivates, mfbGetGCPrivateKey()) )->colorRrop.bgPixel ;
 
     xSrc = pGC->patOrg.x + pDrawable->x ;
     ySrc = pGC->patOrg.y + pDrawable->y ;
@@ -260,7 +260,7 @@ int fSorted ;
     TRACE( ( "xf4bppTileWindowFS(pDrawable=0x%x,pGC=0x%x,nInit=%d,pptInit=0x%x,pwidthInit=0x%x,fSorted=%d)\n",
 	    pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted ) ) ;
 
-    if ( ( alu = ( (ppcPrivGC *) pGC->devPrivates[mfbGetGCPrivateIndex()].ptr )->colorRrop.alu ) == GXnoop )
+    if ( ( alu = ( (ppcPrivGC *)dixLookupPrivate(&pGC->devPrivates, mfbGetGCPrivateKey()) )->colorRrop.alu ) == GXnoop )
 	return ;
 
     SETSPANPTRS( nInit, n, pwidthInit, pwidthFree, pptInit,
@@ -268,7 +268,7 @@ int fSorted ;
 
     xSrc = pGC->patOrg.x + pDrawable->x ;
     ySrc = pGC->patOrg.y + pDrawable->y ;
-    pm = ( (ppcPrivGC *) pGC->devPrivates[mfbGetGCPrivateIndex()].ptr )->colorRrop.planemask ;
+    pm = ( (ppcPrivGC *)dixLookupPrivate(&pGC->devPrivates, mfbGetGCPrivateKey()) )->colorRrop.planemask ;
 
     for ( ; n-- ; ppt++, pwidth++ )
 	    xf4bppTileRect( (WindowPtr)pDrawable, pGC->tile.pixmap, alu, pm,
diff --git a/hw/xfree86/xf4bpp/ppcWindow.c b/hw/xfree86/xf4bpp/ppcWindow.c
index 01768d9ff..055466738 100644
--- a/hw/xfree86/xf4bpp/ppcWindow.c
+++ b/hw/xfree86/xf4bpp/ppcWindow.c
@@ -218,7 +218,7 @@ register WindowPtr pWin ;
 
     TRACE(("xf4bppCreateWindowForXYhardware (pWin= 0x%x)\n", pWin));
 
-    pPrivWin = (mfbPrivWin *)(pWin->devPrivates[mfbGetWindowPrivateIndex()].ptr);
+    pPrivWin = (mfbPrivWin *)dixLookupPrivate(&pWin->devPrivates, mfbGetWindowPrivateKey());
     pPrivWin->pRotatedBorder = NullPixmap;
     pPrivWin->pRotatedBackground = NullPixmap;
     pPrivWin->fastBackground = 0;
diff --git a/hw/xfree86/xf4bpp/vgaGC.c b/hw/xfree86/xf4bpp/vgaGC.c
index 5a8604090..6495e5638 100644
--- a/hw/xfree86/xf4bpp/vgaGC.c
+++ b/hw/xfree86/xf4bpp/vgaGC.c
@@ -107,7 +107,7 @@ xf4bppChangeWindowGC( pGC, changes )
 register GC *pGC ;
 register Mask changes ;
 {
-register ppcPrivGCPtr devPriv = (ppcPrivGCPtr) (pGC->devPrivates[mfbGetGCPrivateIndex()].ptr) ;
+register ppcPrivGCPtr devPriv = (ppcPrivGCPtr)dixLookupPrivate(&pGC->devPrivates, mfbGetGCPrivateKey());
 register unsigned long int idx ; /* used for stepping through bitfields */
 
 #define LOWBIT( x ) ( x & - x ) /* Two's complement */
diff --git a/hw/xfree86/xf8_32bpp/cfb8_32.h b/hw/xfree86/xf8_32bpp/cfb8_32.h
index 31028a30b..281e5f2e0 100644
--- a/hw/xfree86/xf8_32bpp/cfb8_32.h
+++ b/hw/xfree86/xf8_32bpp/cfb8_32.h
@@ -22,10 +22,8 @@ typedef struct {
 } cfb8_32ScreenRec, *cfb8_32ScreenPtr;
 
 
-extern int cfb8_32GCPrivateIndex;	/* XXX */
-extern int cfb8_32GetGCPrivateIndex(void);
-extern int cfb8_32ScreenPrivateIndex;	/* XXX */
-extern int cfb8_32GetScreenPrivateIndex(void);
+extern DevPrivateKey cfb8_32GetGCPrivateKey(void);
+extern DevPrivateKey cfb8_32GetScreenPrivateKey(void);
 
 RegionPtr
 cfb8_32CopyArea(
@@ -198,11 +196,11 @@ cfb8_32ChangeWindowAttributes(
 );
 
 
-#define CFB8_32_GET_GC_PRIVATE(pGC)\
-   (cfb8_32GCPtr)((pGC)->devPrivates[cfb8_32GetGCPrivateIndex()].ptr)
+#define CFB8_32_GET_GC_PRIVATE(pGC) ((cfb8_32GCPtr) \
+    dixLookupPrivate(&(pGC)->devPrivates, cfb8_32GetGCPrivateKey()))
 
-#define CFB8_32_GET_SCREEN_PRIVATE(pScreen)\
-   (cfb8_32ScreenPtr)((pScreen)->devPrivates[cfb8_32GetScreenPrivateIndex()].ptr)
+#define CFB8_32_GET_SCREEN_PRIVATE(pScreen) ((cfb8_32ScreenPtr) \
+    dixLookupPrivate(&(pScreen)->devPrivates, cfb8_32GetScreenPrivateKey()))
 
 Bool xf86Overlay8Plus32Init (ScreenPtr pScreen);
 
diff --git a/hw/xfree86/xf8_32bpp/cfbscrinit.c b/hw/xfree86/xf8_32bpp/cfbscrinit.c
index 29dc6691f..fffd8d392 100644
--- a/hw/xfree86/xf8_32bpp/cfbscrinit.c
+++ b/hw/xfree86/xf8_32bpp/cfbscrinit.c
@@ -31,42 +31,41 @@
 /* CAUTION:  We require that cfb8 and cfb32 were NOT 
 	compiled with CFB_NEED_SCREEN_PRIVATE */
 
-int cfb8_32GCPrivateIndex;
-int cfb8_32GetGCPrivateIndex(void) { return cfb8_32GCPrivateIndex; }
-int cfb8_32ScreenPrivateIndex;
-int cfb8_32GetScreenPrivateIndex(void) { return cfb8_32ScreenPrivateIndex; }
-static unsigned long cfb8_32Generation = 0;
+static DevPrivateKey cfb8_32GCPrivateKey = &cfb8_32GCPrivateKey;
+DevPrivateKey cfb8_32GetGCPrivateKey(void)
+{
+    return cfb8_32GCPrivateKey;
+}
+
+static DevPrivateKey cfb8_32ScreenPrivateKey = &cfb8_32ScreenPrivateKey;
+DevPrivateKey cfb8_32GetScreenPrivateKey(void)
+{
+    return cfb8_32ScreenPrivateKey;
+}
 
 static Bool
 cfb8_32AllocatePrivates(ScreenPtr pScreen)
 {
    cfb8_32ScreenPtr pScreenPriv;
 
-   if(cfb8_32Generation != serverGeneration) {
-	if(((cfb8_32GCPrivateIndex = AllocateGCPrivateIndex()) < 0) ||
-	    ((cfb8_32ScreenPrivateIndex = AllocateScreenPrivateIndex()) < 0))
-	    return FALSE;
-	cfb8_32Generation = serverGeneration;
-   }
-
    if (!(pScreenPriv = xalloc(sizeof(cfb8_32ScreenRec))))
         return FALSE;
 
-   pScreen->devPrivates[cfb8_32ScreenPrivateIndex].ptr = (pointer)pScreenPriv;
+   dixSetPrivate(&pScreen->devPrivates, cfb8_32ScreenPrivateKey, pScreenPriv);
    
    
    /* All cfb will have the same GC and Window private indicies */
-   if(!mfbAllocatePrivates(pScreen,&cfbWindowPrivateIndex, &cfbGCPrivateIndex))
+   if(!mfbAllocatePrivates(pScreen, &cfbWindowPrivateKey, &cfbGCPrivateKey))
 	return FALSE;
 
    /* The cfb indicies are the mfb indicies. Reallocating them resizes them */ 
-   if(!AllocateWindowPrivate(pScreen,cfbWindowPrivateIndex,sizeof(cfbPrivWin)))
+   if(!dixRequestPrivate(cfbWindowPrivateKey, sizeof(cfbPrivWin)))
 	return FALSE;
 
-   if(!AllocateGCPrivate(pScreen, cfbGCPrivateIndex, sizeof(cfbPrivGC)))
+   if(!dixRequestPrivate(cfbGCPrivateKey, sizeof(cfbPrivGC)))
         return FALSE;
 
-   if(!AllocateGCPrivate(pScreen, cfb8_32GCPrivateIndex, sizeof(cfb8_32GCRec)))
+   if(!dixRequestPrivate(cfb8_32GCPrivateKey, sizeof(cfb8_32GCRec)))
         return FALSE;
 
    return TRUE;
@@ -166,7 +165,7 @@ cfb8_32CloseScreen (int i, ScreenPtr pScreen)
 	xfree(pScreenPriv->visualData);
 
     xfree((pointer) pScreenPriv);
-    pScreen->devPrivates[cfb8_32ScreenPrivateIndex].ptr = NULL;
+    dixSetPrivate(&pScreen->devPrivates, cfb8_32ScreenPrivateKey, NULL);
 
     return(cfb32CloseScreen(i, pScreen));
 }
diff --git a/hw/xfree86/xf8_32bpp/xf86overlay.c b/hw/xfree86/xf8_32bpp/xf86overlay.c
index c5585ca6d..bab014b8c 100644
--- a/hw/xfree86/xf8_32bpp/xf86overlay.c
+++ b/hw/xfree86/xf8_32bpp/xf86overlay.c
@@ -180,23 +180,22 @@ typedef struct {
 } OverlayPixmapRec, *OverlayPixmapPtr;
 
 
-static int OverlayScreenIndex = -1;
-static int OverlayGCIndex = -1;
-static int OverlayPixmapIndex = -1;
-static unsigned long OverlayGeneration = 0;
+static DevPrivateKey OverlayScreenKey = &OverlayScreenKey;
+static DevPrivateKey OverlayGCKey = &OverlayGCKey;
+static DevPrivateKey OverlayPixmapKey = &OverlayPixmapKey;
 
 /** Macros **/
 
 #define TILE_EXISTS(pGC) (!(pGC)->tileIsPixel && (pGC)->tile.pixmap)
 
-#define OVERLAY_GET_PIXMAP_PRIVATE(pPix) \
-    (OverlayPixmapPtr)((pPix)->devPrivates[OverlayPixmapIndex].ptr)
+#define OVERLAY_GET_PIXMAP_PRIVATE(pPix) ((OverlayPixmapPtr) \
+    dixLookupPrivate(&(pPix)->devPrivates, OverlayPixmapKey))
 
-#define OVERLAY_GET_SCREEN_PRIVATE(pScreen) \
-    (OverlayScreenPtr)((pScreen)->devPrivates[OverlayScreenIndex].ptr)
+#define OVERLAY_GET_SCREEN_PRIVATE(pScreen) ((OverlayScreenPtr) \
+    dixLookupPrivate(&(pScreen)->devPrivates, OverlayScreenKey))
 
-#define OVERLAY_GET_GC_PRIVATE(pGC) \
-    (OverlayGCPtr)((pGC)->devPrivates[OverlayGCIndex].ptr)
+#define OVERLAY_GET_GC_PRIVATE(pGC) ((OverlayGCPtr) \
+    dixLookupPrivate(&(pGC)->devPrivates, OverlayGCKey))
 
 #define OVERLAY_GC_FUNC_PROLOGUE(pGC)\
     OverlayGCPtr pGCPriv = OVERLAY_GET_GC_PRIVATE(pGC);\
@@ -258,26 +257,16 @@ xf86Overlay8Plus32Init (ScreenPtr pScreen)
 {
     OverlayScreenPtr pScreenPriv;
 
-    if(OverlayGeneration != serverGeneration) {
-	if(((OverlayScreenIndex = AllocateScreenPrivateIndex()) < 0) ||
-	   ((OverlayGCIndex = AllocateGCPrivateIndex()) < 0) ||
-	   ((OverlayPixmapIndex = AllocatePixmapPrivateIndex()) < 0))
-		return FALSE;
-
-	OverlayGeneration = serverGeneration;
-    }
-
-    if (!AllocateGCPrivate(pScreen, OverlayGCIndex, sizeof(OverlayGCRec)))
+    if (!dixRequestPrivate(OverlayGCKey, sizeof(OverlayGCRec)))
 	return FALSE;
 
-    if (!AllocatePixmapPrivate(pScreen, OverlayPixmapIndex, 
-						sizeof(OverlayPixmapRec)))
+    if (!dixRequestPrivate(OverlayPixmapKey, sizeof(OverlayPixmapRec)))
 	return FALSE;
 
     if (!(pScreenPriv = xalloc(sizeof(OverlayScreenRec))))
 	return FALSE;
 
-    pScreen->devPrivates[OverlayScreenIndex].ptr = (pointer)pScreenPriv;
+    dixSetPrivate(&pScreen->devPrivates, OverlayScreenKey, pScreenPriv);
 
     pScreenPriv->CreateGC = pScreen->CreateGC;
     pScreenPriv->CloseScreen = pScreen->CloseScreen;
diff --git a/hw/xgl/egl/xegl.c b/hw/xgl/egl/xegl.c
index c671dbe7c..1cf615bb6 100644
--- a/hw/xgl/egl/xegl.c
+++ b/hw/xgl/egl/xegl.c
@@ -42,14 +42,13 @@
 #define XEGL_DEFAULT_SCREEN_WIDTH  800
 #define XEGL_DEFAULT_SCREEN_HEIGHT 600
 
-int xeglScreenGeneration = -1;
-int xeglScreenPrivateIndex;
+DevPrivateKey xeglScreenPrivateKey = &xeglScreenPrivateKey;
 
-#define XEGL_GET_SCREEN_PRIV(pScreen)				         \
-    ((xeglScreenPtr) (pScreen)->devPrivates[xeglScreenPrivateIndex].ptr)
+#define XEGL_GET_SCREEN_PRIV(pScreen) ((xeglScreenPtr) \
+    dixLookupPrivate(&(pScreen)->devPrivates, xeglScreenPrivateKey))
 
-#define XEGL_SET_SCREEN_PRIV(pScreen, v)			       \
-    ((pScreen)->devPrivates[xeglScreenPrivateIndex].ptr = (pointer) v)
+#define XEGL_SET_SCREEN_PRIV(pScreen, v) \
+    dixSetPrivate(&(pScreen)->devPrivates, xeglScreenPrivateKey, v)
 
 #define XEGL_SCREEN_PRIV(pScreen)			       \
     xeglScreenPtr pScreenPriv = XEGL_GET_SCREEN_PRIV (pScreen)
@@ -66,15 +65,6 @@ xeglAllocatePrivates (ScreenPtr pScreen)
 {
     xeglScreenPtr pScreenPriv;
 
-    if (xeglScreenGeneration != serverGeneration)
-    {
-	xeglScreenPrivateIndex = AllocateScreenPrivateIndex ();
-	if (xeglScreenPrivateIndex < 0)
-	    return FALSE;
-
-	xeglScreenGeneration = serverGeneration;
-    }
-
     pScreenPriv = xalloc (sizeof (xeglScreenRec));
     if (!pScreenPriv)
 	return FALSE;
diff --git a/hw/xgl/egl/xegl.h b/hw/xgl/egl/xegl.h
index be9b48c9c..0a07397bf 100644
--- a/hw/xgl/egl/xegl.h
+++ b/hw/xgl/egl/xegl.h
@@ -109,7 +109,7 @@ extern KdMouseInfo     *kdMouseInfo;
 extern KdOsFuncs       *kdOsFuncs;
 extern Bool	       kdDontZap;
 extern Bool	       kdDisableZaphod;
-extern int	       xeglScreenPrivateIndex;
+extern DevPrivateKey   xeglScreenPrivateKey;
 extern KdMouseFuncs    LinuxEvdevMouseFuncs;
 extern KdKeyboardFuncs LinuxEvdevKeyboardFuncs;
 
@@ -117,8 +117,8 @@ extern KdKeyboardFuncs LinuxEvdevKeyboardFuncs;
     (RR_Rotate_0 | RR_Rotate_90 | RR_Rotate_180 | RR_Rotate_270)
 #define RR_Reflect_All (RR_Reflect_X | RR_Reflect_Y)
 
-#define KdGetScreenPriv(pScreen)					   \
-    ((xeglScreenPtr) ((pScreen)->devPrivates[xeglScreenPrivateIndex].ptr))
+#define KdGetScreenPriv(pScreen) ((xeglScreenPtr) \
+    dixLookupPrivate(&(pScreen)->devPrivates, xeglScreenPrivateKey))
 #define KdScreenPriv(pScreen)				  \
     xeglScreenPtr pScreenPriv = KdGetScreenPriv (pScreen)
 
diff --git a/hw/xgl/glx/xglx.c b/hw/xgl/glx/xglx.c
index 92974f0d4..657afc075 100644
--- a/hw/xgl/glx/xglx.c
+++ b/hw/xgl/glx/xglx.c
@@ -105,14 +105,13 @@ typedef struct _xglxScreen {
     CloseScreenProcPtr CloseScreen;
 } xglxScreenRec, *xglxScreenPtr;
 
-int xglxScreenGeneration = -1;
-int xglxScreenPrivateIndex;
+DevPrivateKey xglxScreenPrivateKey = &xglxScreenPrivateKey;
 
-#define XGLX_GET_SCREEN_PRIV(pScreen)				         \
-    ((xglxScreenPtr) (pScreen)->devPrivates[xglxScreenPrivateIndex].ptr)
+#define XGLX_GET_SCREEN_PRIV(pScreen) ((xglxScreenPtr) \
+    dixLookupPrivate(&(pScreen)->devPrivates, xglxScreenPrivateKey))
 
-#define XGLX_SET_SCREEN_PRIV(pScreen, v)			       \
-    ((pScreen)->devPrivates[xglxScreenPrivateIndex].ptr = (pointer) v)
+#define XGLX_SET_SCREEN_PRIV(pScreen, v) \
+    dixSetPrivate(&(pScreen)->devPrivates, xglxScreenPrivateKey, v)
 
 #define XGLX_SCREEN_PRIV(pScreen)			       \
     xglxScreenPtr pScreenPriv = XGLX_GET_SCREEN_PRIV (pScreen)
@@ -148,15 +147,6 @@ xglxAllocatePrivates (ScreenPtr pScreen)
 {
     xglxScreenPtr pScreenPriv;
 
-    if (xglxScreenGeneration != serverGeneration)
-    {
-	xglxScreenPrivateIndex = AllocateScreenPrivateIndex ();
-	if (xglxScreenPrivateIndex < 0)
-	    return FALSE;
-
-	xglxScreenGeneration = serverGeneration;
-    }
-
     pScreenPriv = xalloc (sizeof (xglxScreenRec));
     if (!pScreenPriv)
 	return FALSE;
diff --git a/hw/xgl/xgl.h b/hw/xgl/xgl.h
index 5710bbf5a..ea28ea11d 100644
--- a/hw/xgl/xgl.h
+++ b/hw/xgl/xgl.h
@@ -224,10 +224,11 @@ typedef struct _xglGlyph {
     xglAreaPtr pArea;
 } xglGlyphRec, *xglGlyphPtr;
 
-extern int xglGlyphPrivateIndex;
+extern DevPrivateKey xglGlyphPrivateKey;
 
 #define XGL_GET_GLYPH_PRIV(pScreen, pGlyph) ((xglGlyphPtr)		     \
-    (GetGlyphPrivatesForScreen (pGlyph, pScreen))[xglGlyphPrivateIndex].ptr)
+    dixLookupPrivate(GetGlyphPrivatesForScreen (pGlyph, pScreen),	     \
+    					        xglGlyphPrivateKey))
 
 #define XGL_GLYPH_PRIV(pScreen, pGlyph)				  \
     xglGlyphPtr pGlyphPriv = XGL_GET_GLYPH_PRIV (pScreen, pGlyph)
@@ -295,13 +296,13 @@ typedef struct _xglScreen {
 #endif
 } xglScreenRec, *xglScreenPtr;
 
-extern int xglScreenPrivateIndex;
+extern DevPrivateKey xglScreenPrivateKey;
 
-#define XGL_GET_SCREEN_PRIV(pScreen)				       \
-    ((xglScreenPtr) (pScreen)->devPrivates[xglScreenPrivateIndex].ptr)
+#define XGL_GET_SCREEN_PRIV(pScreen) ((xglScreenPtr) \
+    dixLookupPrivate(&(pScreen)->devPrivates, xglScreenPrivateKey))
 
-#define XGL_SET_SCREEN_PRIV(pScreen, v)				      \
-    ((pScreen)->devPrivates[xglScreenPrivateIndex].ptr = (pointer) v)
+#define XGL_SET_SCREEN_PRIV(pScreen, v) \
+    dixSetPrivate(&(pScreen)->devPrivates, xglScreenPrivateKey, v)
 
 #define XGL_SCREEN_PRIV(pScreen)			     \
     xglScreenPtr pScreenPriv = XGL_GET_SCREEN_PRIV (pScreen)
@@ -336,10 +337,10 @@ typedef struct _xglGC {
     GCOpsPtr	      ops;
 } xglGCRec, *xglGCPtr;
 
-extern int xglGCPrivateIndex;
+extern DevPrivateKey xglGCPrivateKey;
 
-#define XGL_GET_GC_PRIV(pGC)				   \
-    ((xglGCPtr) (pGC)->devPrivates[xglGCPrivateIndex].ptr)
+#define XGL_GET_GC_PRIV(pGC) ((xglGCPtr) \
+    dixLookupPrivate(&(pGC)->devPrivates, xglGCPrivateKey))
 
 #define XGL_GC_PRIV(pGC)		     \
     xglGCPtr pGCPriv = XGL_GET_GC_PRIV (pGC)
@@ -396,10 +397,10 @@ typedef struct _xglPixmap {
 
 } xglPixmapRec, *xglPixmapPtr;
 
-extern int xglPixmapPrivateIndex;
+extern DevPrivateKey xglPixmapPrivateKey;
 
-#define XGL_GET_PIXMAP_PRIV(pPixmap)				       \
-    ((xglPixmapPtr) (pPixmap)->devPrivates[xglPixmapPrivateIndex].ptr)
+#define XGL_GET_PIXMAP_PRIV(pPixmap) ((xglPixmapPtr) \
+    dixLookupPrivate(&(pPixmap)->devPrivates, xglPixmapPrivateKey))
 
 #define XGL_PIXMAP_PRIV(pPixmap)			     \
     xglPixmapPtr pPixmapPriv = XGL_GET_PIXMAP_PRIV (pPixmap)
@@ -411,10 +412,10 @@ typedef struct _xglWin {
     PixmapPtr    pPixmap;
 } xglWinRec, *xglWinPtr;
 
-extern int xglWinPrivateIndex;
+extern DevPrivateKey xglWinPrivateKey;
 
-#define XGL_GET_WINDOW_PRIV(pWin)			      \
-    ((xglWinPtr) (pWin)->devPrivates[xglWinPrivateIndex].ptr)
+#define XGL_GET_WINDOW_PRIV(pWin) ((xglWinPtr) \
+    dixLookupPrivate(&(pWin)->devPrivates, xglWinPrivateKey))
 
 #define XGL_WINDOW_PRIV(pWin)			    \
     xglWinPtr pWinPriv = XGL_GET_WINDOW_PRIV (pWin)
diff --git a/hw/xgl/xglpixmap.c b/hw/xgl/xglpixmap.c
index 166c33eb9..59ed00a72 100644
--- a/hw/xgl/xglpixmap.c
+++ b/hw/xgl/xglpixmap.c
@@ -310,7 +310,7 @@ xglDestroyPixmap (PixmapPtr pPixmap)
 
     xglFiniPixmap (pPixmap);
 
-    dixFreePrivates(*DEVPRIV_PTR(pPixmap));
+    dixFreePrivates(pPixmap->devPrivates);
     xfree (pPixmap);
 
     return TRUE;
diff --git a/hw/xgl/xglxv.c b/hw/xgl/xglxv.c
index aaa66c738..bfa16e3ca 100644
--- a/hw/xgl/xglxv.c
+++ b/hw/xgl/xglxv.c
@@ -35,11 +35,11 @@
 #include <X11/extensions/Xv.h>
 #include <X11/extensions/Xvproto.h>
 
-static unsigned int  xglXvScreenIndex = 0;
+static DevPrivateKey xglXvScreenKey;
 static unsigned long portResource = 0;
 
-#define XGL_GET_XV_SCREEN(pScreen)				   \
-    ((XvScreenPtr) ((pScreen)->devPrivates[xglXvScreenIndex].ptr))
+#define XGL_GET_XV_SCREEN(pScreen) ((XvScreenPtr) \
+    dixLookupPrivate(&(pScreen)->devPrivates, xglXvScreenKey))
 
 #define XGL_XV_SCREEN(pScreen)				\
     XvScreenPtr pXvScreen = XGL_GET_XV_SCREEN (pScreen)
@@ -591,7 +591,7 @@ xglXvScreenInit (ScreenPtr pScreen)
     if (status != Success)
 	return FALSE;
 
-    xglXvScreenIndex = XvGetScreenIndex ();
+    xglXvScreenKey = XvGetScreenKey ();
     portResource = XvGetRTPort ();
 
     pXvScreen = XGL_GET_XV_SCREEN (pScreen);
diff --git a/hw/xnest/GC.c b/hw/xnest/GC.c
index a52ce1f35..06e6e0205 100644
--- a/hw/xnest/GC.c
+++ b/hw/xnest/GC.c
@@ -35,7 +35,7 @@ is" without express or implied warranty.
 #include "XNFont.h"
 #include "Color.h"
 
-int xnestGCPrivateIndex;
+DevPrivateKey xnestGCPrivateKey = &xnestGCPrivateKey;
 
 static GCFuncs xnestFuncs = {
   xnestValidateGC,
diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c
index 5bf0300c6..324cf9696 100644
--- a/hw/xnest/Init.c
+++ b/hw/xnest/Init.c
@@ -74,8 +74,6 @@ InitOutput(ScreenInfo *screenInfo, int argc, char *argv[])
 	break;
       }
   
-  xnestWindowPrivateIndex = AllocateWindowPrivateIndex();
-  xnestGCPrivateIndex = AllocateGCPrivateIndex();
   xnestFontPrivateIndex = AllocateFontPrivateIndex();
   
   if (!xnestNumScreens) xnestNumScreens = 1;
diff --git a/hw/xnest/Pixmap.c b/hw/xnest/Pixmap.c
index c4b8aa65e..c9c662af3 100644
--- a/hw/xnest/Pixmap.c
+++ b/hw/xnest/Pixmap.c
@@ -33,7 +33,7 @@ is" without express or implied warranty.
 #include "Screen.h"
 #include "XNPixmap.h"
 
-int xnestPixmapPrivateIndex;	    
+DevPrivateKey xnestPixmapPrivateKey = &xnestPixmapPrivateKey;
 
 PixmapPtr
 xnestCreatePixmap(ScreenPtr pScreen, int width, int height, int depth)
@@ -56,8 +56,8 @@ xnestCreatePixmap(ScreenPtr pScreen, int width, int height, int depth)
   pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
   pPixmap->refcnt = 1;
   pPixmap->devKind = PixmapBytePad(width, depth);
-  pPixmap->devPrivates[xnestPixmapPrivateIndex].ptr =
-      (pointer)((char *)pPixmap + pScreen->totalPixmapSize);
+  dixSetPrivate(&pPixmap->devPrivates, xnestPixmapPrivateKey,
+		(char *)pPixmap + pScreen->totalPixmapSize);
   if (width && height)
       xnestPixmapPriv(pPixmap)->pixmap = 
 	  XCreatePixmap(xnestDisplay, 
@@ -75,7 +75,7 @@ xnestDestroyPixmap(PixmapPtr pPixmap)
   if(--pPixmap->refcnt)
     return TRUE;
   XFreePixmap(xnestDisplay, xnestPixmap(pPixmap));
-  dixFreePrivates(*DEVPRIV_PTR(pPixmap));
+  dixFreePrivates(pPixmap->devPrivates);
   xfree(pPixmap);
   return TRUE;
 }
diff --git a/hw/xnest/Screen.c b/hw/xnest/Screen.c
index d08e48245..f91454928 100644
--- a/hw/xnest/Screen.c
+++ b/hw/xnest/Screen.c
@@ -49,8 +49,6 @@ Window xnestScreenSaverWindows[MAXSCREENS];
 extern void GlxWrapInitVisuals(miInitVisualsProcPtr *);
 #endif
 
-static int xnestScreenGeneration = -1;
-
 ScreenPtr
 xnestScreen(Window window)
 {
@@ -146,21 +144,13 @@ xnestOpenScreen(int index, ScreenPtr pScreen, int argc, char *argv[])
   VisualID defaultVisual;
   int rootDepth;
 
-  if (!(AllocateWindowPrivate(pScreen, xnestWindowPrivateIndex,
-			    sizeof(xnestPrivWin))  &&
-	  AllocateGCPrivate(pScreen, xnestGCPrivateIndex, 
-			    sizeof(xnestPrivGC)))) 
-    return False;
-
-  if (xnestScreenGeneration != serverGeneration) {
-      if ((xnestPixmapPrivateIndex = AllocatePixmapPrivateIndex()) < 0)
-	  return False;
-      xnestScreenGeneration = serverGeneration;
-  }
-  
-  if (!AllocatePixmapPrivate(pScreen,xnestPixmapPrivateIndex,
-			     sizeof (xnestPrivPixmap)))
+  if (!dixRequestPrivate(xnestWindowPrivateKey, sizeof(xnestPrivWin)))
       return False;
+  if (!dixRequestPrivate(xnestGCPrivateKey, sizeof(xnestPrivGC)))
+    return False;
+  if (!dixRequestPrivate(xnestPixmapPrivateKey, sizeof (xnestPrivPixmap)))
+      return False;
+
   visuals = (VisualPtr)xalloc(xnestNumVisuals * sizeof(VisualRec));
   numVisuals = 0;
 
diff --git a/hw/xnest/Window.c b/hw/xnest/Window.c
index f87a1baa7..0955e61b9 100644
--- a/hw/xnest/Window.c
+++ b/hw/xnest/Window.c
@@ -39,7 +39,7 @@ is" without express or implied warranty.
 #include "Events.h"
 #include "Args.h"
 
-int xnestWindowPrivateIndex;
+DevPrivateKey xnestWindowPrivateKey = &xnestWindowPrivateKey;
 
 static int
 xnestFindWindowMatch(WindowPtr pWin, pointer ptr)
diff --git a/hw/xnest/XNGC.h b/hw/xnest/XNGC.h
index d3ac3df0b..19535fe3a 100644
--- a/hw/xnest/XNGC.h
+++ b/hw/xnest/XNGC.h
@@ -22,10 +22,10 @@ typedef struct {
   int nClipRects;
 } xnestPrivGC;
 
-extern int xnestGCPrivateIndex;
+extern DevPrivateKey xnestGCPrivateKey;
 
-#define xnestGCPriv(pGC) \
-  ((xnestPrivGC *)((pGC)->devPrivates[xnestGCPrivateIndex].ptr))
+#define xnestGCPriv(pGC) ((xnestPrivGC *) \
+    dixLookupPrivate(&(pGC)->devPrivates, xnestGCPrivateKey))
 
 #define xnestGC(pGC) (xnestGCPriv(pGC)->gc)
 
diff --git a/hw/xnest/XNPixmap.h b/hw/xnest/XNPixmap.h
index 6971b1162..3b0833993 100644
--- a/hw/xnest/XNPixmap.h
+++ b/hw/xnest/XNPixmap.h
@@ -15,14 +15,14 @@ is" without express or implied warranty.
 #ifndef XNESTPIXMAP_H
 #define XNESTPIXMAP_H
 
-extern int xnestPixmapPrivateIndex;
+extern DevPrivateKey xnestPixmapPrivateKey;
 
 typedef struct {
   Pixmap pixmap;
 } xnestPrivPixmap;
 
-#define xnestPixmapPriv(pPixmap) \
-  ((xnestPrivPixmap *)((pPixmap)->devPrivates[xnestPixmapPrivateIndex].ptr))
+#define xnestPixmapPriv(pPixmap) ((xnestPrivPixmap *) \
+    dixLookupPrivate(&(pPixmap)->devPrivates, xnestPixmapPrivateKey))
 
 #define xnestPixmap(pPixmap) (xnestPixmapPriv(pPixmap)->pixmap)
 
diff --git a/hw/xnest/XNWindow.h b/hw/xnest/XNWindow.h
index 21be5f5e3..1aaf4e153 100644
--- a/hw/xnest/XNWindow.h
+++ b/hw/xnest/XNWindow.h
@@ -35,10 +35,10 @@ typedef struct {
   Window window;
 } xnestWindowMatch;
 
-extern int xnestWindowPrivateIndex;
+extern DevPrivateKey xnestWindowPrivateKey;
 
-#define xnestWindowPriv(pWin) \
-  ((xnestPrivWin *)((pWin)->devPrivates[xnestWindowPrivateIndex].ptr))
+#define xnestWindowPriv(pWin) ((xnestPrivWin *) \
+    dixLookupPrivate(&(pWin)->devPrivates, xnestWindowPrivateKey))
 
 #define xnestWindow(pWin) (xnestWindowPriv(pWin)->window)
 
diff --git a/hw/xprint/attributes.c b/hw/xprint/attributes.c
index d8ee5adf8..9756e281d 100644
--- a/hw/xprint/attributes.c
+++ b/hw/xprint/attributes.c
@@ -124,7 +124,7 @@ SysAttrs systemAttributes;
  * attrCtxtPrivIndex hold the attribute store's context private index.
  * This index is allocated at the time the attribute store is initialized.
  */
-static int attrCtxtPrivIndex;
+static DevPrivateKey attrCtxtPrivKey = &attrCtxtPrivKey;
 
 /*
  * The ContextAttrs structure descibes the context private space reserved
@@ -521,8 +521,7 @@ XpBuildAttributeStore(
     {
 	if(attrList != (PrAttrPtr)NULL)
 	    FreeAttrList();
-        attrCtxtPrivIndex = XpAllocateContextPrivateIndex();
-        XpAllocateContextPrivate(attrCtxtPrivIndex, sizeof(ContextAttrs));
+	dixRequestPrivate(attrCtxtPrivKey, sizeof(ContextAttrs));
 	BuildSystemAttributes();
 
 	attrGeneration = serverGeneration;
@@ -592,7 +591,8 @@ XpInitAttributes(XpContextPtr pContext)
     PrAttrPtr pPrAttr = attrList;
 
     /* Initialize all the pointers to NULL */
-    pCtxtAttrs = (ContextAttrPtr)pContext->devPrivates[attrCtxtPrivIndex].ptr;
+    pCtxtAttrs = (ContextAttrPtr)dixLookupPrivate(&pContext->devPrivates,
+						  attrCtxtPrivKey);
     (void)memset((void *)pCtxtAttrs, 0, (size_t) sizeof(ContextAttrs));
 
     for(pPrAttr = attrList; pPrAttr != (PrAttrPtr)NULL; pPrAttr = pPrAttr->next)
@@ -612,8 +612,8 @@ XpDestroyAttributes(
 {
     ContextAttrPtr pCtxtAttrs;
 
-    pCtxtAttrs = (ContextAttrPtr)pContext->devPrivates[attrCtxtPrivIndex].ptr;
-
+    pCtxtAttrs = (ContextAttrPtr)dixLookupPrivate(&pContext->devPrivates,
+						  attrCtxtPrivKey);
     if(pCtxtAttrs->printerAttrs != (XrmDatabase)NULL)
 	XrmDestroyDatabase(pCtxtAttrs->printerAttrs);
     if(pCtxtAttrs->docAttrs != (XrmDatabase)NULL)
@@ -661,7 +661,8 @@ XpGetOneAttribute(
     }
     else
     {
-        pCtxtAttrs=(ContextAttrPtr)pContext->devPrivates[attrCtxtPrivIndex].ptr;
+        pCtxtAttrs=(ContextAttrPtr)dixLookupPrivate(&pContext->devPrivates,
+						    attrCtxtPrivKey);
         switch(class)
         {
 	    case XPPrinterAttr:
@@ -714,7 +715,8 @@ XpPutOneAttribute(
     XrmBinding bindings[1];
     XrmQuark quarks[2];
     
-    pCtxtAttrs = (ContextAttrPtr)pContext->devPrivates[attrCtxtPrivIndex].ptr;
+    pCtxtAttrs = (ContextAttrPtr)dixLookupPrivate(&pContext->devPrivates,
+						  attrCtxtPrivKey);
     switch(class)
     {
     case XPPrinterAttr:
@@ -900,7 +902,8 @@ XpGetAttributes(
 	db = systemAttributes.server;
     else
     {
-        pCtxtAttrs=(ContextAttrPtr)pContext->devPrivates[attrCtxtPrivIndex].ptr;
+        pCtxtAttrs=(ContextAttrPtr)dixLookupPrivate(&pContext->devPrivates,
+						    attrCtxtPrivKey);
         switch(class)
         {
 	    case XPServerAttr:
@@ -952,7 +955,8 @@ XpAugmentAttributes(
     db = XrmGetStringDatabase(attributes);
     if(db == (XrmDatabase)NULL) return BadAlloc;
 
-    pCtxtAttrs = (ContextAttrPtr)pContext->devPrivates[attrCtxtPrivIndex].ptr;
+    pCtxtAttrs = (ContextAttrPtr)dixLookupPrivate(&pContext->devPrivates,
+						  attrCtxtPrivKey);
     switch(class)
     {
 	case XPPrinterAttr:
@@ -988,7 +992,8 @@ XpSetAttributes(
     db = XrmGetStringDatabase(attributes);
     if(db == (XrmDatabase)NULL) return BadAlloc;
 
-    pCtxtAttrs=(ContextAttrPtr)pContext->devPrivates[attrCtxtPrivIndex].ptr;
+    pCtxtAttrs=(ContextAttrPtr)dixLookupPrivate(&pContext->devPrivates,
+						attrCtxtPrivKey);
     switch(class)
     {
 	case XPPrinterAttr:
diff --git a/hw/xprint/pcl/Pcl.h b/hw/xprint/pcl/Pcl.h
index 217e30438..216353be8 100644
--- a/hw/xprint/pcl/Pcl.h
+++ b/hw/xprint/pcl/Pcl.h
@@ -83,10 +83,10 @@ typedef char *XPointer;
 /******
  * externally visible variables from PclInit.c
  ******/
-extern int PclScreenPrivateIndex, PclWindowPrivateIndex;
-extern int PclContextPrivateIndex;
-extern int PclPixmapPrivateIndex;
-extern int PclGCPrivateIndex;
+extern DevPrivateKey PclScreenPrivateKey, PclWindowPrivateKey;
+extern DevPrivateKey PclContextPrivateKey;
+extern DevPrivateKey PclPixmapPrivateKey;
+extern DevPrivateKey PclGCPrivateKey;
 
 /******
  * externally visible variables from PclAttVal.c
diff --git a/hw/xprint/pcl/PclArc.c b/hw/xprint/pcl/PclArc.c
index 0d8289e33..20d3f723d 100644
--- a/hw/xprint/pcl/PclArc.c
+++ b/hw/xprint/pcl/PclArc.c
@@ -85,7 +85,7 @@ PclDoArc(
 
     pCon = PclGetContextFromWindow( (WindowPtr) pDrawable );
     pConPriv = (PclContextPrivPtr)
-			pCon->devPrivates[PclContextPrivateIndex].ptr;
+	dixLookupPrivate(&pCon->devPrivates, PclContextPrivateKey);
     XpGetReproductionArea( pCon, &repro );
     
     /* 
diff --git a/hw/xprint/pcl/PclColor.c b/hw/xprint/pcl/PclColor.c
index 8b05da056..5e8ffa63c 100644
--- a/hw/xprint/pcl/PclColor.c
+++ b/hw/xprint/pcl/PclColor.c
@@ -129,8 +129,8 @@ PclCreateColormap(ColormapPtr pColor)
     PclCmapToContexts *new;
     PclScreenPrivPtr sPriv;
 
-    sPriv = (PclScreenPrivPtr)pColor->pScreen
-      ->devPrivates[PclScreenPrivateIndex].ptr;
+    sPriv = (PclScreenPrivPtr)
+	dixLookupPrivate(&pColor->pScreen->devPrivates, PclScreenPrivateKey);
 
 	/*
 	 * Use existing code to initialize the values in the colormap
@@ -175,8 +175,8 @@ PclDestroyColormap(ColormapPtr pColor)
     /*
      * Find the colormap <-> contexts mapping 
      */
-    sPriv = (PclScreenPrivPtr)pColor->pScreen
-      ->devPrivates[PclScreenPrivateIndex].ptr;
+    sPriv = (PclScreenPrivPtr)
+	dixLookupPrivate(&pColor->pScreen->devPrivates, PclScreenPrivateKey);
     pCmap = sPriv->colormaps;
     while( pCmap )
       {
@@ -195,8 +195,8 @@ PclDestroyColormap(ColormapPtr pColor)
 	  con = pCmap->contexts;
 	  while( con )
 	    {
-		cPriv = con->context->devPrivates[PclContextPrivateIndex].ptr;
-
+		cPriv = dixLookupPrivate(&con->context->devPrivates,
+					 PclContextPrivateKey);
 		pPal = cPriv->palettes;
 		while( pPal )
 		  {
@@ -259,8 +259,8 @@ PclStoreColors(ColormapPtr pColor,
     char t[80];
     int i;
 
-    sPriv = (PclScreenPrivPtr)pColor->pScreen
-      ->devPrivates[PclScreenPrivateIndex].ptr;
+    sPriv = (PclScreenPrivPtr)
+	dixLookupPrivate(&pColor->pScreen->devPrivates, PclScreenPrivateKey);
     p = sPriv->colormaps;
     while( p )
       {
@@ -278,8 +278,8 @@ PclStoreColors(ColormapPtr pColor,
 		 * For each context, get the palette ID and update the
 		 * appropriate palette.
 		 */
-		cPriv = con->context
-		  ->devPrivates[PclContextPrivateIndex].ptr;
+		cPriv = dixLookupPrivate(&con->context->devPrivates,
+					 PclContextPrivateKey);
 		pMap = PclFindPaletteMap( cPriv, pColor, NULL );
 
 		/*
@@ -407,7 +407,8 @@ PclUpdateColormap(DrawablePtr pDrawable,
     unsigned short r, g, b, rr, gg, bb;
     int i;
 
-    cPriv = pCon->devPrivates[PclContextPrivateIndex].ptr;
+    cPriv = (PclContextPrivPtr)
+	dixLookupPrivate(&pCon->devPrivates, PclContextPrivateKey);
     
     c = wColormap( win );
     cmap = (ColormapPtr)LookupIDByType( c, RT_COLORMAP );
@@ -436,8 +437,9 @@ PclUpdateColormap(DrawablePtr pDrawable,
 	  /*
 	   * Add the colormap to the screen-level colormap<->context mapping.
 	   */
-	  sPriv = (PclScreenPrivPtr)cmap->pScreen
-	    ->devPrivates[PclScreenPrivateIndex].ptr;
+	  sPriv = (PclScreenPrivPtr)
+	      dixLookupPrivate(&cmap->pScreen->devPrivates,
+			       PclScreenPrivateKey);
 	  pCmap = sPriv->colormaps;
 	  while( pCmap && ( pCmap->colormapId != cmap->mid ) )
 		pCmap = pCmap->next;
diff --git a/hw/xprint/pcl/PclGC.c b/hw/xprint/pcl/PclGC.c
index ba82c566a..e64e779db 100644
--- a/hw/xprint/pcl/PclGC.c
+++ b/hw/xprint/pcl/PclGC.c
@@ -144,7 +144,8 @@ PclGetDrawablePrivateStuff(
 	    return FALSE;
 	  else
 	    {
-		cPriv = pCon->devPrivates[PclContextPrivateIndex].ptr;
+		cPriv = (PclContextPrivPtr)
+		    dixLookupPrivate(&pCon->devPrivates, PclContextPrivateKey);
 		*gc = cPriv->lastGC;
 		*valid = cPriv->validGC;
 		*file = cPriv->pPageFile;
@@ -171,7 +172,8 @@ PclSetDrawablePrivateGC(
       {
 	case DRAWABLE_PIXMAP:
 	  pix = (PixmapPtr)pDrawable;
-	  pixPriv = pix->devPrivates[PclPixmapPrivateIndex].ptr;
+	  pixPriv = (PclPixmapPrivPtr)
+	      dixLookupPrivate(&pix->devPrivates, PclPixmapPrivateKey);
 	  
 	  pixPriv->lastGC = gc;
 	  pixPriv->validGC = 1;
@@ -179,8 +181,8 @@ PclSetDrawablePrivateGC(
 
 	case DRAWABLE_WINDOW:
 	  pCon = PclGetContextFromWindow( (WindowPtr)pDrawable );
-	  pPriv = ((PclContextPrivPtr)
-		   (pCon->devPrivates[PclContextPrivateIndex].ptr));
+	  pPriv = (PclContextPrivPtr)
+	      dixLookupPrivate(&pCon->devPrivates, PclContextPrivateKey);
 	  
 	  pPriv->validGC = 1;
 	  pPriv->lastGC = gc;
@@ -316,13 +318,14 @@ PclUpdateDrawableGC(
     XpContextPtr pCon;
     PclContextPrivPtr cPriv;
     PclGCPrivPtr gcPriv = (PclGCPrivPtr)
-      (pGC->devPrivates[PclGCPrivateIndex].ptr);
+	dixLookupPrivate(&pGC->devPrivates, PclGCPrivateKey);
     
     if( !PclGetDrawablePrivateStuff( pDrawable, &dGC, &valid, outFile ) )
       return FALSE;
 
     pCon = PclGetContextFromWindow( (WindowPtr)pDrawable );
-    cPriv = pCon->devPrivates[PclContextPrivateIndex].ptr;
+    cPriv = (PclContextPrivPtr)
+	dixLookupPrivate(&pCon->devPrivates, PclContextPrivateKey);
 
     /*
      * Here's where we update the colormap.  Since there can be
diff --git a/hw/xprint/pcl/PclInit.c b/hw/xprint/pcl/PclInit.c
index 183225274..478a34244 100644
--- a/hw/xprint/pcl/PclInit.c
+++ b/hw/xprint/pcl/PclInit.c
@@ -67,11 +67,11 @@ static void AllocatePclPrivates(ScreenPtr pScreen);
 static int PclInitContext(XpContextPtr pCon);
 static Bool PclDestroyContext(XpContextPtr pCon);
 
-int PclScreenPrivateIndex;
-int PclContextPrivateIndex;
-int PclPixmapPrivateIndex;
-int PclWindowPrivateIndex;
-int PclGCPrivateIndex;
+DevPrivateKey PclScreenPrivateKey = &PclScreenPrivateKey;
+DevPrivateKey PclContextPrivateKey = &PclContextPrivateKey;
+DevPrivateKey PclPixmapPrivateKey = &PclPixmapPrivateKey;
+DevPrivateKey PclWindowPrivateKey = &PclWindowPrivateKey;
+DevPrivateKey PclGCPrivateKey = &PclGCPrivateKey;
 
 #ifdef XP_PCL_COLOR
 /*
@@ -119,7 +119,8 @@ Bool
 PclCloseScreen(int index,
 	       ScreenPtr pScreen)
 {
-    PclScreenPrivPtr pPriv = pScreen->devPrivates[PclScreenPrivateIndex].ptr;
+    PclScreenPrivPtr pPriv = (PclScreenPrivPtr)
+	dixLookupPrivate(&pScreen->devPrivates, PclScreenPrivateKey);
 
     pScreen->CloseScreen = pPriv->CloseScreen;
     xfree( pPriv );
@@ -157,8 +158,8 @@ InitializePclDriver(
      */
     AllocatePclPrivates(pScreen);
    
-    pPriv =
-      (PclScreenPrivPtr)pScreen->devPrivates[PclScreenPrivateIndex].ptr;
+    pPriv = (PclScreenPrivPtr)
+	dixLookupPrivate(&pScreen->devPrivates, PclScreenPrivateKey);
 
     maxDim = MAX( pScreen->height, pScreen->width );
     xRes = pScreen->width / ( pScreen->mmWidth / 25.4 );
@@ -260,33 +261,13 @@ InitializePclDriver(
 static void
 AllocatePclPrivates(ScreenPtr pScreen)
 {
-    static unsigned long PclGeneration = 0;
+    dixRequestPrivate(PclWindowPrivateKey, sizeof( PclWindowPrivRec ) );
+    dixRequestPrivate(PclContextPrivateKey, sizeof( PclContextPrivRec ) );
+    dixRequestPrivate(PclGCPrivateKey, sizeof( PclGCPrivRec ) );
+    dixRequestPrivate(PclPixmapPrivateKey, sizeof( PclPixmapPrivRec ) );
 
-    if((unsigned long) PclGeneration != serverGeneration)
-    {
-        PclScreenPrivateIndex = AllocateScreenPrivateIndex();
-
-	PclWindowPrivateIndex = AllocateWindowPrivateIndex();
-	AllocateWindowPrivate( pScreen, PclWindowPrivateIndex,
-			       sizeof( PclWindowPrivRec ) );
-
-	PclContextPrivateIndex = XpAllocateContextPrivateIndex();
-	XpAllocateContextPrivate( PclContextPrivateIndex, 
-				  sizeof( PclContextPrivRec ) );
-
-	PclGCPrivateIndex = AllocateGCPrivateIndex();
-	AllocateGCPrivate( pScreen, PclGCPrivateIndex, 
-			   sizeof( PclGCPrivRec ) );
-
-	PclPixmapPrivateIndex = AllocatePixmapPrivateIndex();
-	AllocatePixmapPrivate( pScreen, PclPixmapPrivateIndex, 
-			       sizeof( PclPixmapPrivRec ) );
-	
-        PclGeneration = serverGeneration;
-    }
-
-    pScreen->devPrivates[PclScreenPrivateIndex].ptr = (pointer)xalloc(
-                sizeof(PclScreenPrivRec));
+    dixSetPrivate(&pScreen->devPrivates, PclScreenPrivateKey,
+		  xalloc(sizeof(PclScreenPrivRec)));
 }
 
 /*
@@ -349,8 +330,8 @@ PclInitContext(XpContextPtr pCon)
     /*
      * Set up the context privates
      */
-    pConPriv =
-      (PclContextPrivPtr)pCon->devPrivates[PclContextPrivateIndex].ptr;
+    pConPriv = (PclContextPrivPtr)
+	dixLookupPrivate(&pCon->devPrivates, PclContextPrivateKey);
     
     pConPriv->jobFileName = (char *)NULL;
     pConPriv->pageFileName = (char *)NULL;
@@ -483,7 +464,7 @@ static Bool
 PclDestroyContext(XpContextPtr pCon)
 {
     PclContextPrivPtr pConPriv = (PclContextPrivPtr)
-      pCon->devPrivates[PclContextPrivateIndex].ptr;
+	dixLookupPrivate(&pCon->devPrivates, PclContextPrivateKey);
     PclPaletteMapPtr p, t;
     PclCmapToContexts *pCmap;
     ScreenPtr screen;
@@ -541,7 +522,8 @@ PclDestroyContext(XpContextPtr pCon)
      * Remove the context from the screen-level colormap<->contexts mappings
      */
     screen = screenInfo.screens[pCon->screenNum];
-    sPriv = (PclScreenPrivPtr)screen->devPrivates[PclScreenPrivateIndex].ptr;
+    sPriv = (PclScreenPrivPtr)
+	dixLookupPrivate(&screen->devPrivates, PclScreenPrivateKey);
     pCmap = sPriv->colormaps;
     while( pCmap )
       {
@@ -583,8 +565,8 @@ PclGetContextFromWindow(WindowPtr win)
     
     while( win )
       {
-	  pPriv =
-	    (PclWindowPrivPtr)win->devPrivates[PclWindowPrivateIndex].ptr;
+	  pPriv = (PclWindowPrivPtr)
+	      dixLookupPrivate(&win->devPrivates, PclWindowPrivateKey);
 	  if( pPriv->validContext )
 	    return pPriv->context;
       
diff --git a/hw/xprint/pcl/PclLine.c b/hw/xprint/pcl/PclLine.c
index 52a586d17..68d55a525 100644
--- a/hw/xprint/pcl/PclLine.c
+++ b/hw/xprint/pcl/PclLine.c
@@ -107,7 +107,7 @@ PclPolyLine(
 
     pCon = PclGetContextFromWindow( (WindowPtr) pDrawable );
     pConPriv = (PclContextPrivPtr)
-			pCon->devPrivates[PclContextPrivateIndex].ptr;
+	dixLookupPrivate(&pCon->devPrivates, PclContextPrivateKey);
 
     /*
      * Allocate the storage required to deal with the clipping
@@ -223,7 +223,7 @@ PclPolySegment(
 
     pCon = PclGetContextFromWindow( (WindowPtr) pDrawable );
     pConPriv = (PclContextPrivPtr)
-			pCon->devPrivates[PclContextPrivateIndex].ptr;
+	dixLookupPrivate(&pCon->devPrivates, PclContextPrivateKey);
 
     /*
      * Allocate the storage for the temporary regions.
diff --git a/hw/xprint/pcl/PclPixel.c b/hw/xprint/pcl/PclPixel.c
index f41af272f..d219838f0 100644
--- a/hw/xprint/pcl/PclPixel.c
+++ b/hw/xprint/pcl/PclPixel.c
@@ -125,13 +125,15 @@ PclPolyPoint( pDrawable, pGC, mode, nPoints, pPoints )
     if( pDrawable->type == DRAWABLE_WINDOW )
       {
 	  pCon = PclGetContextFromWindow( (WindowPtr)pDrawable );
-	  cPriv = pCon->devPrivates[PclContextPrivateIndex].ptr;
+	  cPriv = (PclContextPrivPtr)
+	      dixLookupPrivate(&pCon->devPrivates, PclContextPrivateKey);
 	  cPriv->changeMask = GCLineWidth | GCLineStyle;
       }
     else
       {
-	  pPriv =
-	    ((PixmapPtr)pDrawable)->devPrivates[PclPixmapPrivateIndex].ptr;
+	  pPriv = (PclPixmapPrivPtr)
+	      dixLookupPrivate(&((PixmapPtr)pDrawable)->devPrivates,
+			       PclPixmapPrivateKey);
 	  pPriv->changeMask = GCLineWidth | GCLineStyle;
       }
 #endif
diff --git a/hw/xprint/pcl/PclPolygon.c b/hw/xprint/pcl/PclPolygon.c
index 9867758bb..7d95d6484 100644
--- a/hw/xprint/pcl/PclPolygon.c
+++ b/hw/xprint/pcl/PclPolygon.c
@@ -76,7 +76,7 @@ PclPolyRectangle(
 
     pCon = PclGetContextFromWindow( (WindowPtr) pDrawable );
     pConPriv = (PclContextPrivPtr)
-			pCon->devPrivates[PclContextPrivateIndex].ptr;
+	dixLookupPrivate(&pCon->devPrivates, PclContextPrivateKey);
 
     /*
      * Allocate the storage required to deal with the clipping
@@ -170,7 +170,7 @@ PclFillPolygon(
 
     pCon = PclGetContextFromWindow( (WindowPtr) pDrawable );
     pConPriv = (PclContextPrivPtr)
-			pCon->devPrivates[PclContextPrivateIndex].ptr;
+	dixLookupPrivate(&pCon->devPrivates, PclContextPrivateKey);
 
     /*
      * Generate the PCL code to draw the filled polygon, by defining
@@ -283,7 +283,7 @@ PclPolyFillRect(
 
     pCon = PclGetContextFromWindow( (WindowPtr) pDrawable );
     pConPriv = (PclContextPrivPtr)
-			pCon->devPrivates[PclContextPrivateIndex].ptr;
+	dixLookupPrivate(&pCon->devPrivates, PclContextPrivateKey);
 
     /*
      * Allocate the storage required to deal with the clipping
diff --git a/hw/xprint/pcl/PclPrint.c b/hw/xprint/pcl/PclPrint.c
index 176a0025a..ac8ea1537 100644
--- a/hw/xprint/pcl/PclPrint.c
+++ b/hw/xprint/pcl/PclPrint.c
@@ -72,8 +72,8 @@ PclStartJob(
      Bool sendClientData,
      ClientPtr client)
 {
-    PclContextPrivPtr pConPriv = 
-      (PclContextPrivPtr)pCon->devPrivates[PclContextPrivateIndex].ptr;
+    PclContextPrivPtr pConPriv = (PclContextPrivPtr)
+	dixLookupPrivate(&pCon->devPrivates, PclContextPrivateKey);
     PclPaletteMap *pal;
     
     /*
@@ -130,7 +130,7 @@ PclEndJob(
      Bool cancel)
 {
     PclContextPrivPtr priv = (PclContextPrivPtr)
-      pCon->devPrivates[PclContextPrivateIndex].ptr;
+	dixLookupPrivate(&pCon->devPrivates, PclContextPrivateKey);
 
 #ifdef CCP_DEBUG
     FILE *xpoutput;
@@ -250,9 +250,9 @@ PclStartPage(
      WindowPtr pWin)
 {
     PclContextPrivPtr pConPriv = (PclContextPrivPtr)
-      pCon->devPrivates[PclContextPrivateIndex].ptr;
-    PclWindowPrivPtr pWinPriv =
-      (PclWindowPrivPtr)pWin->devPrivates[PclWindowPrivateIndex].ptr;
+	dixLookupPrivate(&pCon->devPrivates, PclContextPrivateKey);
+    PclWindowPrivPtr pWinPriv = (PclWindowPrivPtr)
+	dixLookupPrivate(&pWin->devPrivates, PclWindowPrivateKey);
     xRectangle repro;
     char t[80];
     XpOid orient, plex, tray, medium;
@@ -488,7 +488,7 @@ PclEndPage(
      WindowPtr pWin)
 {
     PclContextPrivPtr pConPriv = (PclContextPrivPtr)
-      pCon->devPrivates[PclContextPrivateIndex].ptr;
+	dixLookupPrivate(&pCon->devPrivates, PclContextPrivateKey);
 
     struct stat statBuf;
 
@@ -532,7 +532,7 @@ PclStartDoc(XpContextPtr pCon,
 	    XPDocumentType type)
 {
     PclContextPrivPtr pConPriv = (PclContextPrivPtr)
-      pCon->devPrivates[PclContextPrivateIndex].ptr;
+	dixLookupPrivate(&pCon->devPrivates, PclContextPrivateKey);
     
 #ifndef XP_PCL_LJ3
     /*
@@ -592,7 +592,7 @@ PclDocumentData(
 {
     int type = 0;
     PclContextPrivPtr pPriv = (PclContextPrivPtr)
-      pCon->devPrivates[PclContextPrivateIndex].ptr;
+	dixLookupPrivate(&pCon->devPrivates, PclContextPrivateKey);
     XpOidDocFmtList *formats;
     XpOidDocFmt *f;
     char t[80];
@@ -700,7 +700,7 @@ PclGetDocumentData(
      int maxBufferSize)
 {
     PclContextPrivPtr pPriv = (PclContextPrivPtr)
-      pCon->devPrivates[PclContextPrivateIndex].ptr;
+	dixLookupPrivate(&pCon->devPrivates, PclContextPrivateKey);
     
     pPriv->getDocClient = client;
     pPriv->getDocBufSize = maxBufferSize;
diff --git a/hw/xprint/pcl/PclText.c b/hw/xprint/pcl/PclText.c
index 246c0195b..324de3014 100644
--- a/hw/xprint/pcl/PclText.c
+++ b/hw/xprint/pcl/PclText.c
@@ -123,7 +123,7 @@ char font_type;
 
     pCon = PclGetContextFromWindow( (WindowPtr)pDrawable );
     pConPriv = (PclContextPrivPtr)
-			pCon->devPrivates[PclContextPrivateIndex].ptr;
+	dixLookupPrivate(&pCon->devPrivates, PclContextPrivateKey);
     pSoftFontInfo = pConPriv->pSoftFontInfo;
     font_type = isInternal(pGC->font);
     if ( font_type == DOWNLOAD_FONT ) {
@@ -293,7 +293,7 @@ char font_type;
 
     pCon = PclGetContextFromWindow( (WindowPtr)pDrawable );
     pConPriv = (PclContextPrivPtr)
-			pCon->devPrivates[PclContextPrivateIndex].ptr;
+	dixLookupPrivate(&pCon->devPrivates, PclContextPrivateKey);
     pSoftFontInfo = pConPriv->pSoftFontInfo;
 
     font_type = isInternal(pGC->font);
diff --git a/hw/xprint/pcl/PclWindow.c b/hw/xprint/pcl/PclWindow.c
index 80f4e91b1..997cfe4f0 100644
--- a/hw/xprint/pcl/PclWindow.c
+++ b/hw/xprint/pcl/PclWindow.c
@@ -97,9 +97,9 @@ PclCreateWindow(
     Bool status = Success;
     ScreenPtr pScreen = pWin->drawable.pScreen;
     PclScreenPrivPtr pScreenPriv = (PclScreenPrivPtr) 
-		     pScreen->devPrivates[PclScreenPrivateIndex].ptr;
+	dixLookupPrivate(&pScreen->devPrivates, PclScreenPrivateKey);
     PclWindowPrivPtr pWinPriv = (PclWindowPrivPtr)
-			 pWin->devPrivates[PclWindowPrivateIndex].ptr;
+	dixLookupPrivate(&pWin->devPrivates, PclWindowPrivateKey);
 
     /*
      * Initialize this window's private struct.
@@ -142,7 +142,8 @@ PclCreateWindow(
     /*
      * Invalidate the window's private print context.
      */
-    pPriv = (PclWindowPrivPtr)pWin->devPrivates[PclWindowPrivateIndex].ptr;
+    pPriv = (PclWindowPrivPtr)
+	dixLookupPrivate(&pWin->devPrivates, PclWindowPrivateKey);
     pPriv->validContext = 0;
     
     return TRUE;
diff --git a/hw/xprint/pcl/Pclmap.h b/hw/xprint/pcl/Pclmap.h
index ae88b5a42..79724213f 100644
--- a/hw/xprint/pcl/Pclmap.h
+++ b/hw/xprint/pcl/Pclmap.h
@@ -82,11 +82,11 @@ copyright holders.
 #define InitializePclDriver		CATNAME(Initialize, PclDriver)
 #define PclCloseScreen			PCLNAME(CloseScreen)
 #define PclGetContextFromWindow		PCLNAME(GetContextFromWindow)
-#define PclScreenPrivateIndex	PCLNAME(ScreenPrivateIndex)
-#define PclWindowPrivateIndex	PCLNAME(WindowPrivateIndex)
-#define PclContextPrivateIndex	PCLNAME(ContextPrivateIndex)
-#define PclPixmapPrivateIndex	PCLNAME(PixmapPrivateIndex)
-#define PclGCPrivateIndex	PCLNAME(GCPrivateIndex)
+#define PclScreenPrivateKey	PCLNAME(ScreenPrivateKey)
+#define PclWindowPrivateKey	PCLNAME(WindowPrivateKey)
+#define PclContextPrivateKey	PCLNAME(ContextPrivateKey)
+#define PclPixmapPrivateKey	PCLNAME(PixmapPrivateKey)
+#define PclGCPrivateKey		PCLNAME(GCPrivateKey)
 
 /* PclPrint.c */
 #define PclStartJob			PCLNAME(StartJob)
diff --git a/hw/xprint/ps/Ps.h b/hw/xprint/ps/Ps.h
index 3adad39e4..db1dd9129 100644
--- a/hw/xprint/ps/Ps.h
+++ b/hw/xprint/ps/Ps.h
@@ -121,10 +121,10 @@ typedef char *XPointer;
  *  Public index variables from PsInit.c
  */
 
-extern int PsScreenPrivateIndex;
-extern int PsWindowPrivateIndex;
-extern int PsContextPrivateIndex;
-extern int PsPixmapPrivateIndex;
+extern DevPrivateKey PsScreenPrivateKey;
+extern DevPrivateKey PsWindowPrivateKey;
+extern DevPrivateKey PsContextPrivateKey;
+extern DevPrivateKey PsPixmapPrivateKey;
 extern XpValidatePoolsRec PsValidatePoolsRec;
 
 /*
diff --git a/hw/xprint/ps/PsGC.c b/hw/xprint/ps/PsGC.c
index 3ec07a77a..19898c90e 100644
--- a/hw/xprint/ps/PsGC.c
+++ b/hw/xprint/ps/PsGC.c
@@ -162,9 +162,11 @@ PsGetDrawablePrivateStuff(
         c = wColormap((WindowPtr)pDrawable);
         cmap = (ColormapPtr)LookupIDByType(c, RT_COLORMAP);
 
-        cPriv = pCon->devPrivates[PsContextPrivateIndex].ptr;
+        cPriv = (PsContextPrivPtr)
+	    dixLookupPrivate(&pCon->devPrivates, PsContextPrivateKey);
         sPriv = (PsScreenPrivPtr)
-                pDrawable->pScreen->devPrivates[PsScreenPrivateIndex].ptr;
+	    dixLookupPrivate(&pDrawable->pScreen->devPrivates,
+			     PsScreenPrivateKey);
         *gc     = cPriv->lastGC;
         *valid  = cPriv->validGC;
         *psOut  = cPriv->pPsOut;
@@ -189,7 +191,8 @@ PsGetPsContextPriv( DrawablePtr pDrawable )
       pCon = PsGetContextFromWindow((WindowPtr)pDrawable);
       if (pCon != NULL)
       {
-        return pCon->devPrivates[PsContextPrivateIndex].ptr;
+	  return (PsContextPrivPtr)
+	      dixLookupPrivate(&pCon->devPrivates, PsContextPrivateKey);
       }
   }
   return NULL;
@@ -257,8 +260,9 @@ PsUpdateDrawableGC(
         PsOut_Offset(*psOut, pDrawable->x, pDrawable->y);
         PsOut_Clip(*psOut, pGC->clientClipType, (PsClipPtr)pGC->clientClip);
       }
-      cPriv = ( PsGetContextFromWindow( (WindowPtr)pDrawable ) )
-             ->devPrivates[PsContextPrivateIndex].ptr;
+      cPriv = (PsContextPrivPtr)dixLookupPrivate(
+	  &PsGetContextFromWindow((WindowPtr)pDrawable)->devPrivates,
+	  PsContextPrivateKey);
       break;
   }
   return TRUE;
diff --git a/hw/xprint/ps/PsInit.c b/hw/xprint/ps/PsInit.c
index 639908f73..6c86fa221 100644
--- a/hw/xprint/ps/PsInit.c
+++ b/hw/xprint/ps/PsInit.c
@@ -97,10 +97,10 @@ static void AllocatePsPrivates(ScreenPtr pScreen);
 static int PsInitContext(XpContextPtr pCon);
 static int PsDestroyContext(XpContextPtr pCon);
 
-int PsScreenPrivateIndex;
-int PsContextPrivateIndex;
-int PsPixmapPrivateIndex;
-int PsWindowPrivateIndex;
+DevPrivateKey PsScreenPrivateKey = &PsScreenPrivateKey;
+DevPrivateKey PsContextPrivateKey = &PsContextPrivateKey;
+DevPrivateKey PsPixmapPrivateKey = &PsPixmapPrivateKey;
+DevPrivateKey PsWindowPrivateKey = &PsWindowPrivateKey;
 
 #ifdef GLXEXT
 extern void GlxWrapInitVisuals(miInitVisualsProcPtr *);
@@ -152,7 +152,8 @@ InitializePsDriver(ndx, pScreen, argc, argv)
   AllocatePsPrivates(pScreen);
 
 #if 0
-  pPriv = (PsScreenPrivPtr)pScreen->devPrivates[PsScreenPrivateIndex].ptr;
+  pPriv = (PsScreenPrivPtr)
+      dixLookupPrivate(&pScreen->devPrivates, PsScreenPrivateKey);
   pPriv->resDB = rmdb;
 #endif
 
@@ -476,28 +477,12 @@ InitializePsDriver(ndx, pScreen, argc, argv)
 static void
 AllocatePsPrivates(ScreenPtr pScreen)
 {
-  static unsigned long PsGeneration = 0;
+    dixRequestPrivate(PsWindowPrivateKey, sizeof(PsWindowPrivRec));
+    dixRequestPrivate(PsContextPrivateKey, sizeof(PsContextPrivRec));
+    dixRequestPrivate(PsPixmapPrivateKey, sizeof(PsPixmapPrivRec));
 
-  if((unsigned long)PsGeneration != serverGeneration)
-  {
-    PsScreenPrivateIndex = AllocateScreenPrivateIndex();
-
-    PsWindowPrivateIndex = AllocateWindowPrivateIndex();
-    AllocateWindowPrivate(pScreen, PsWindowPrivateIndex,
-                          sizeof(PsWindowPrivRec));
-
-    PsContextPrivateIndex = XpAllocateContextPrivateIndex();
-    XpAllocateContextPrivate(PsContextPrivateIndex, 
-                             sizeof(PsContextPrivRec));
-
-    PsPixmapPrivateIndex = AllocatePixmapPrivateIndex();
-    AllocatePixmapPrivate(pScreen, PsPixmapPrivateIndex,
-                          sizeof(PsPixmapPrivRec));
-
-    PsGeneration = serverGeneration;
-  }
-  pScreen->devPrivates[PsScreenPrivateIndex].ptr =
-           (pointer)xalloc(sizeof(PsScreenPrivRec));
+    dixSetPrivate(&pScreen->devPrivates, PsScreenPrivateKey,
+		  xalloc(sizeof(PsScreenPrivRec)));
 }
 
 /*
@@ -552,8 +537,8 @@ PsInitContext(pCon)
   /*
    * Set up the context privates
    */
-  pConPriv =
-      (PsContextPrivPtr)pCon->devPrivates[PsContextPrivateIndex].ptr;
+  pConPriv = (PsContextPrivPtr)
+      dixLookupPrivate(&pCon->devPrivates, PsContextPrivateKey);
 
   memset(pConPriv, 0, sizeof(PsContextPrivRec));
   pConPriv->jobFileName         = (char *)NULL;
@@ -622,8 +607,8 @@ static Bool
 PsDestroyContext(pCon)
   XpContextPtr pCon;
 {
-  PsContextPrivPtr pConPriv =
-      (PsContextPrivPtr)pCon->devPrivates[PsContextPrivateIndex].ptr;
+  PsContextPrivPtr pConPriv = (PsContextPrivPtr)
+      dixLookupPrivate(&pCon->devPrivates, PsContextPrivateKey);
     
   if( pConPriv->pJobFile!=(FILE *)NULL )
   {
@@ -655,7 +640,8 @@ PsGetContextFromWindow(win)
 
   while( win )
   {
-    pPriv = (PsWindowPrivPtr)win->devPrivates[PsWindowPrivateIndex].ptr;
+    pPriv = (PsWindowPrivPtr)
+	dixLookupPrivate(&win->devPrivates, PsWindowPrivateKey);
     if( pPriv->validContext ) return pPriv->context;
     win = win->parent;
   }
diff --git a/hw/xprint/ps/PsPixmap.c b/hw/xprint/ps/PsPixmap.c
index 220feab2b..1fa4e4056 100644
--- a/hw/xprint/ps/PsPixmap.c
+++ b/hw/xprint/ps/PsPixmap.c
@@ -111,14 +111,11 @@ PsCreatePixmap(
   pPixmap->drawable.height       = height;
   pPixmap->devKind               = 0;
   pPixmap->refcnt                = 1;
-
-  pPixmap->devPrivates = (DevUnion *)xcalloc(1, sizeof(DevUnion));
-  if( !pPixmap->devPrivates )
-    { xfree(pPixmap); return NullPixmap; }
+  pPixmap->devPrivates		 = NULL;
 
   pPixmap->devPrivate.ptr = (PsPixmapPrivPtr)xcalloc(1, sizeof(PsPixmapPrivRec));
   if( !pPixmap->devPrivate.ptr )
-    { xfree(pPixmap->devPrivates); xfree(pPixmap); return NullPixmap; }
+    { xfree(pPixmap); return NullPixmap; }
   return pPixmap;
 }
 
@@ -201,7 +198,7 @@ PsDestroyPixmap(PixmapPtr pPixmap)
   PsScrubPixmap(pPixmap);
 
   xfree(priv);
-  dixFreePrivates(*DEVPRIV_PTR(pPixmap));
+  dixFreePrivates(pPixmap->devPrivates);
   xfree(pPixmap);
   return TRUE;
 }
diff --git a/hw/xprint/ps/PsPrint.c b/hw/xprint/ps/PsPrint.c
index 4571c07d7..386646858 100644
--- a/hw/xprint/ps/PsPrint.c
+++ b/hw/xprint/ps/PsPrint.c
@@ -165,8 +165,8 @@ PsStartJob(
   Bool         sendClientData,
   ClientPtr    client)
 {
-  PsContextPrivPtr  pConPriv = 
-      (PsContextPrivPtr)pCon->devPrivates[PsContextPrivateIndex].ptr;
+  PsContextPrivPtr  pConPriv = (PsContextPrivPtr)
+      dixLookupPrivate(&pCon->devPrivates, PsContextPrivateKey);
 
   /* 
    * Create a temporary file to store the printer output.
@@ -191,8 +191,8 @@ PsEndJob(
   struct stat buffer;
   int error;
 
-  PsContextPrivPtr priv =
-    (PsContextPrivPtr)pCon->devPrivates[PsContextPrivateIndex].ptr;
+  PsContextPrivPtr priv = (PsContextPrivPtr)
+      dixLookupPrivate(&pCon->devPrivates, PsContextPrivateKey);
 
   if (cancel == True) {
     if (priv->getDocClient != (ClientPtr) NULL) {
@@ -291,10 +291,10 @@ PsStartPage(
 {
   int                iorient, iplex, icount, ires;
   unsigned short     iwd, iht;
-  PsContextPrivPtr   pConPriv =
-     (PsContextPrivPtr)pCon->devPrivates[PsContextPrivateIndex].ptr;
-  PsWindowPrivPtr    pWinPriv =
-     (PsWindowPrivPtr)pWin->devPrivates[PsWindowPrivateIndex].ptr;
+  PsContextPrivPtr   pConPriv = (PsContextPrivPtr)
+      dixLookupPrivate(&pCon->devPrivates, PsContextPrivateKey);
+  PsWindowPrivPtr    pWinPriv = (PsWindowPrivPtr)
+      dixLookupPrivate(&pWin->devPrivates, PsWindowPrivateKey);
 
 /*
  * Put a pointer to the context in the window private structure
@@ -337,10 +337,10 @@ PsEndPage(
   XpContextPtr pCon,
   WindowPtr    pWin)
 {
-  PsWindowPrivPtr    pWinPriv =
-     (PsWindowPrivPtr)pWin->devPrivates[PsWindowPrivateIndex].ptr;
-  PsContextPrivPtr pConPriv =
-    (PsContextPrivPtr)pCon->devPrivates[PsContextPrivateIndex].ptr;
+  PsWindowPrivPtr    pWinPriv = (PsWindowPrivPtr)
+      dixLookupPrivate(&pWin->devPrivates, PsWindowPrivateKey);
+  PsContextPrivPtr pConPriv = (PsContextPrivPtr)
+      dixLookupPrivate(&pCon->devPrivates, PsContextPrivateKey);
 
   PsOut_EndPage(pConPriv->pPsOut);
 
@@ -366,8 +366,8 @@ PsStartDoc(XpContextPtr pCon, XPDocumentType type)
   int                iorient, iplex, icount, ires;
   unsigned short     iwd, iht;
   char              *title;
-  PsContextPrivPtr   pConPriv = 
-      (PsContextPrivPtr)pCon->devPrivates[PsContextPrivateIndex].ptr;
+  PsContextPrivPtr   pConPriv = (PsContextPrivPtr)
+      dixLookupPrivate(&pCon->devPrivates, PsContextPrivateKey);
 
   /* get job level attributes */ 
   title = XpGetOneAttribute(pCon, XPJobAttr, "job-name");
@@ -420,7 +420,8 @@ PsDocumentData(
         len_opt)
 	return BadValue;
 
-    cPriv = pCon->devPrivates[PsContextPrivateIndex].ptr;
+    cPriv = (PsContextPrivPtr)
+	dixLookupPrivate(&pCon->devPrivates, PsContextPrivateKey);
     psOut = cPriv->pPsOut;
 
     if (pDraw)
@@ -448,7 +449,7 @@ PsGetDocumentData(
   int          maxBufferSize)
 {
   PsContextPrivPtr pPriv = (PsContextPrivPtr)
-    pCon->devPrivates[PsContextPrivateIndex].ptr;
+    dixLookupPrivate(&pCon->devPrivates, PsContextPrivateKey);
 
   pPriv->getDocClient = client;
   pPriv->getDocBufSize = maxBufferSize;
diff --git a/hw/xprint/ps/PsWindow.c b/hw/xprint/ps/PsWindow.c
index 26075a80a..d107e5c26 100644
--- a/hw/xprint/ps/PsWindow.c
+++ b/hw/xprint/ps/PsWindow.c
@@ -123,9 +123,9 @@ PsCreateWindow(WindowPtr pWin)
     Bool status = Success;
     ScreenPtr pScreen = pWin->drawable.pScreen;
     PsScreenPrivPtr pScreenPriv = (PsScreenPrivPtr) 
-		     pScreen->devPrivates[PsScreenPrivateIndex].ptr;
+	dixLookupPrivate(&pScreen->devPrivates, PsScreenPrivateKey);
     PsWindowPrivPtr pWinPriv = (PsWindowPrivPtr)
-			 pWin->devPrivates[PsWindowPrivateIndex].ptr;
+	dixLookupPrivate(&pWin->devPrivates, PsWindowPrivateKey);
 
     /*
      * Initialize this window's private struct.
@@ -165,7 +165,8 @@ PsCreateWindow(WindowPtr pWin)
     return status;
 #endif
 
-  pPriv = (PsWindowPrivPtr)pWin->devPrivates[PsWindowPrivateIndex].ptr;
+  pPriv = (PsWindowPrivPtr)
+      dixLookupPrivate(&pWin->devPrivates, PsWindowPrivateKey);
   pPriv->validContext = 0;
 
   return TRUE;
diff --git a/hw/xprint/raster/Raster.c b/hw/xprint/raster/Raster.c
index 0286a18fa..dccef613c 100644
--- a/hw/xprint/raster/Raster.c
+++ b/hw/xprint/raster/Raster.c
@@ -151,8 +151,8 @@ static int RasterReproducibleArea(XpContextPtr pCon,
 #define DOC_PCL		1
 #define DOC_RASTER	2
 
-static int RasterScreenPrivateIndex, RasterContextPrivateIndex;
-static int RasterGeneration = 0;
+static DevPrivateKey RasterScreenPrivateKey = &RasterScreenPrivateKey;
+static DevPrivateKey RasterContextPrivateKey = &RasterContextPrivateKey;
 static char RASTER_DRIV_NAME[] = "XP-RASTER";
 static int doc_type = DOC_RASTER;
 
@@ -205,7 +205,7 @@ InitializeRasterDriver(
     AllocateRasterPrivates(pScreen);
    
     pPriv = (RasterScreenPrivPtr)
-      pScreen->devPrivates[RasterScreenPrivateIndex].ptr;
+	dixLookupPrivate(&pScreen->devPrivates, RasterScreenPrivateKey);
 
     maxDim = MAX( pScreen->height, pScreen->width );
     numBytes = maxDim + BITMAP_SCANLINE_PAD - 1; /* pixels per row */
@@ -252,7 +252,7 @@ GetPropString(
      char *propName)
 {
     RasterContextPrivPtr pConPriv = (RasterContextPrivPtr)
-      pCon->devPrivates[RasterContextPrivateIndex].ptr;
+	dixLookupPrivate(&pCon->devPrivates, RasterContextPrivateKey);
     char *type;
     XrmValue val;
     struct stat status;
@@ -371,7 +371,7 @@ StartJob(
      ClientPtr client)
 {
     RasterContextPrivPtr pConPriv = (RasterContextPrivPtr)
-			 pCon->devPrivates[RasterContextPrivateIndex].ptr;
+	dixLookupPrivate(&pCon->devPrivates, RasterContextPrivateKey);
 
     SetDocumentType( pCon );
 
@@ -488,7 +488,7 @@ EndJob(
      Bool cancel)
 {
     RasterContextPrivPtr pConPriv = (RasterContextPrivPtr)
-			 pCon->devPrivates[RasterContextPrivateIndex].ptr;
+	dixLookupPrivate(&pCon->devPrivates, RasterContextPrivateKey);
 
     if( cancel == True )
     {
@@ -549,7 +549,7 @@ StartPage(
      WindowPtr pWin)
 {
     RasterContextPrivPtr pConPriv = (RasterContextPrivPtr)
-			 pCon->devPrivates[RasterContextPrivateIndex].ptr;
+	dixLookupPrivate(&pCon->devPrivates, RasterContextPrivateKey);
 
     if(pConPriv->pPageFile != (FILE *)NULL)
     {
@@ -830,7 +830,7 @@ SendPage( XpContextPtr pCon )
 {
     struct stat statBuf;
     RasterContextPrivPtr pConPriv = (RasterContextPrivPtr)
-			 pCon->devPrivates[RasterContextPrivateIndex].ptr;
+	dixLookupPrivate(&pCon->devPrivates, RasterContextPrivateKey);
 
     if(stat(pConPriv->pageFileName, &statBuf) < 0)
         return BadAlloc;
@@ -872,7 +872,7 @@ EndPage(
      WindowPtr pWin)
 {
     RasterContextPrivPtr pConPriv = (RasterContextPrivPtr)
-			 pCon->devPrivates[RasterContextPrivateIndex].ptr;
+	dixLookupPrivate(&pCon->devPrivates, RasterContextPrivateKey);
     struct stat statBuf;
     char *rasterFileName = (char *)NULL, *pCommand = (char *)NULL;
     FILE *pRasterFile = (FILE *)NULL;
@@ -1068,7 +1068,7 @@ DocumentData(
      ClientPtr client)
 {
     RasterContextPrivPtr pConPriv = (RasterContextPrivPtr)
-			 pCon->devPrivates[RasterContextPrivateIndex].ptr;
+	dixLookupPrivate(&pCon->devPrivates, RasterContextPrivateKey);
     char *preRasterStr = PRE_RASTER, *postRasterStr = POST_RASTER,
 	 *noRasterStr = NO_RASTER;
 
@@ -1135,7 +1135,7 @@ GetDocumentData(
     int maxBufferSize)
 {
     RasterContextPrivPtr pConPriv = (RasterContextPrivPtr)
-			 pContext->devPrivates[RasterContextPrivateIndex].ptr;
+	dixLookupPrivate(&pContext->devPrivates, RasterContextPrivateKey);
 
     pConPriv->getDocClient = client;
     pConPriv->getDocBufSize = maxBufferSize;
@@ -1146,17 +1146,9 @@ static void
 AllocateRasterPrivates(
     ScreenPtr pScreen)
 {
-    if(RasterGeneration != serverGeneration)
-    {
-        RasterScreenPrivateIndex = AllocateScreenPrivateIndex();
-	RasterContextPrivateIndex = XpAllocateContextPrivateIndex();
-        XpAllocateContextPrivate( RasterContextPrivateIndex, 
-			     sizeof( RasterContextPrivRec ) );
-
-        RasterGeneration = serverGeneration;
-    }
-    pScreen->devPrivates[RasterScreenPrivateIndex].ptr = (pointer)Xalloc(
-                sizeof(RasterScreenPrivRec));
+    dixRequestPrivate(RasterContextPrivateKey, sizeof( RasterContextPrivRec ) );
+    dixSetPrivate(&pScreen->devPrivates, RasterScreenPrivateKey,
+		  Xalloc(sizeof(RasterScreenPrivRec)));
 }
 
 /*
@@ -1171,7 +1163,7 @@ RasterChangeWindowAttributes(
     Bool status = Success;
     ScreenPtr pScreen = pWin->drawable.pScreen;
     RasterScreenPrivPtr pScreenPriv = (RasterScreenPrivPtr) 
-		     pScreen->devPrivates[RasterScreenPrivateIndex].ptr;
+	dixLookupPrivate(&pScreen->devPrivates, RasterScreenPrivateKey);
 
     if(pWin->backingStore == NotUseful)
     {
@@ -1270,7 +1262,7 @@ RasterInitContext(
      * Set up the context privates
      */
     pConPriv = (RasterContextPrivPtr)
-      pCon->devPrivates[RasterContextPrivateIndex].ptr;
+	dixLookupPrivate(&pCon->devPrivates, RasterContextPrivateKey);
     
     pConPriv->jobFileName = (char *)NULL;
     pConPriv->pageFileName = (char *)NULL;
@@ -1355,7 +1347,7 @@ RasterDestroyContext(
      XpContextPtr pCon)
 {
     RasterContextPrivPtr pConPriv = (RasterContextPrivPtr)
-      pCon->devPrivates[RasterContextPrivateIndex].ptr;
+	dixLookupPrivate(&pCon->devPrivates, RasterContextPrivateKey);
     
     /*
      * Clean up the temporary files
@@ -1477,7 +1469,7 @@ RasterCloseScreen(
 {
     Bool status = Success;
     RasterScreenPrivPtr pScreenPriv = (RasterScreenPrivPtr) 
-		     pScreen->devPrivates[RasterScreenPrivateIndex].ptr;
+	dixLookupPrivate(&pScreen->devPrivates, RasterScreenPrivateKey);
     
     /*
      * Call any wrapped CloseScreen proc.
diff --git a/hw/xwin/win.h b/hw/xwin/win.h
index 09a9fb295..fad5e2b2e 100644
--- a/hw/xwin/win.h
+++ b/hw/xwin/win.h
@@ -631,11 +631,11 @@ extern DWORD			g_dwEvents;
 #ifdef HAS_DEVWINDOWS
 extern int			g_fdMessageQueue;
 #endif
-extern int			g_iScreenPrivateIndex;
-extern int			g_iCmapPrivateIndex;
-extern int			g_iGCPrivateIndex;
-extern int			g_iPixmapPrivateIndex;
-extern int			g_iWindowPrivateIndex;
+extern DevPrivateKey		g_iScreenPrivateKey;
+extern DevPrivateKey		g_iCmapPrivateKey;
+extern DevPrivateKey		g_iGCPrivateKey;
+extern DevPrivateKey		g_iPixmapPrivateKey;
+extern DevPrivateKey		g_iWindowPrivateKey;
 extern unsigned long		g_ulServerGeneration;
 extern CARD32			g_c32LastInputEventTime;
 extern DWORD			g_dwEnginesSupported;
@@ -661,11 +661,11 @@ extern FARPROC			g_fpTrackMouseEvent;
  * Screen privates macros
  */
 
-#define winGetScreenPriv(pScreen) \
-	((winPrivScreenPtr) (pScreen)->devPrivates[g_iScreenPrivateIndex].ptr)
+#define winGetScreenPriv(pScreen) ((winPrivScreenPtr) \
+    dixLookupPrivate(&(pScreen)->devPrivates, g_iScreenPrivateKey))
 
 #define winSetScreenPriv(pScreen,v) \
-	((pScreen)->devPrivates[g_iScreenPrivateIndex].ptr = (pointer) v)
+    dixSetPrivate(&(pScreen)->devPrivates, g_iScreenPrivateKey, v)
 
 #define winScreenPriv(pScreen) \
 	winPrivScreenPtr pScreenPriv = winGetScreenPriv(pScreen)
@@ -675,11 +675,11 @@ extern FARPROC			g_fpTrackMouseEvent;
  * Colormap privates macros
  */
 
-#define winGetCmapPriv(pCmap) \
-	((winPrivCmapPtr) (pCmap)->devPrivates[g_iCmapPrivateIndex].ptr)
+#define winGetCmapPriv(pCmap) ((winPrivCmapPtr) \
+    dixLookupPrivate(&(pCmap)->devPrivates, g_iCmapPrivateKey))
 
 #define winSetCmapPriv(pCmap,v) \
-	((pCmap)->devPrivates[g_iCmapPrivateIndex].ptr = (pointer) v)
+    dixSetPrivate(&(pCmap)->devPrivates, g_iCmapPrivateKey, v)
 
 #define winCmapPriv(pCmap) \
 	winPrivCmapPtr pCmapPriv = winGetCmapPriv(pCmap)
@@ -689,11 +689,11 @@ extern FARPROC			g_fpTrackMouseEvent;
  * GC privates macros
  */
 
-#define winGetGCPriv(pGC) \
-	((winPrivGCPtr) (pGC)->devPrivates[g_iGCPrivateIndex].ptr)
+#define winGetGCPriv(pGC) ((winPrivGCPtr) \
+    dixLookupPrivate(&(pGC)->devPrivates, g_iGCPrivateKey))
 
 #define winSetGCPriv(pGC,v) \
-	((pGC)->devPrivates[g_iGCPrivateIndex].ptr = (pointer) v)
+    dixSetPrivate(&(pGC)->devPrivates, g_iGCPrivateKey, v)
 
 #define winGCPriv(pGC) \
 	winPrivGCPtr pGCPriv = winGetGCPriv(pGC)
@@ -703,11 +703,11 @@ extern FARPROC			g_fpTrackMouseEvent;
  * Pixmap privates macros
  */
 
-#define winGetPixmapPriv(pPixmap) \
-	((winPrivPixmapPtr) (pPixmap)->devPrivates[g_iPixmapPrivateIndex].ptr)
+#define winGetPixmapPriv(pPixmap) ((winPrivPixmapPtr) \
+    dixLookupPrivate(&(pPixmap)->devPrivates, g_iPixmapPrivateKey))
 
 #define winSetPixmapPriv(pPixmap,v) \
-	((pPixmap)->devPrivates[g_iPixmapPrivateIndex].ptr = (pointer) v)
+    dixLookupPrivate(&(pPixmap)->devPrivates, g_iPixmapPrivateKey, v)
 
 #define winPixmapPriv(pPixmap) \
 	winPrivPixmapPtr pPixmapPriv = winGetPixmapPriv(pPixmap)
@@ -717,11 +717,11 @@ extern FARPROC			g_fpTrackMouseEvent;
  * Window privates macros
  */
 
-#define winGetWindowPriv(pWin) \
-	((winPrivWinPtr) (pWin)->devPrivates[g_iWindowPrivateIndex].ptr)
+#define winGetWindowPriv(pWin) ((winPrivWinPtr) \
+    dixLookupPrivate(&(pWin)->devPrivates, g_iWindowPrivateKey))
 
 #define winSetWindowPriv(pWin,v) \
-	((pWin)->devPrivates[g_iWindowPrivateIndex].ptr = (pointer) v)
+    dixLookupPrivate(&(pWin)->devPrivates, g_iWindowPrivateKey, v)
 
 #define winWindowPriv(pWin) \
 	winPrivWinPtr pWinPriv = winGetWindowPriv(pWin)
diff --git a/hw/xwin/winallpriv.c b/hw/xwin/winallpriv.c
index f4decfb59..21ccd9b3b 100644
--- a/hw/xwin/winallpriv.c
+++ b/hw/xwin/winallpriv.c
@@ -57,12 +57,6 @@ winAllocatePrivates (ScreenPtr pScreen)
   /* We need a new slot for our privates if the screen gen has changed */
   if (g_ulServerGeneration != serverGeneration)
     {
-      /* Get an index that we can store our privates at */
-      g_iScreenPrivateIndex = AllocateScreenPrivateIndex ();
-      g_iGCPrivateIndex = AllocateGCPrivateIndex ();
-      g_iPixmapPrivateIndex = AllocatePixmapPrivateIndex ();
-      g_iWindowPrivateIndex = AllocateWindowPrivateIndex ();
-
       g_ulServerGeneration = serverGeneration;
     }
 
@@ -84,24 +78,21 @@ winAllocatePrivates (ScreenPtr pScreen)
   winSetScreenPriv (pScreen, pScreenPriv);
 
   /* Reserve GC memory for our privates */
-  if (!AllocateGCPrivate (pScreen, g_iGCPrivateIndex,
-			  sizeof (winPrivGCRec)))
+  if (!dixRequestPrivate(g_iGCPrivateKey, sizeof (winPrivGCRec)))
     {
       ErrorF ("winAllocatePrivates - AllocateGCPrivate () failed\n");
       return FALSE;
     }
 
   /* Reserve Pixmap memory for our privates */
-  if (!AllocatePixmapPrivate (pScreen, g_iPixmapPrivateIndex,
-			      sizeof (winPrivPixmapRec)))
+  if (!dixRequestPrivate(g_iPixmapPrivateKey, sizeof (winPrivPixmapRec)))
     {
       ErrorF ("winAllocatePrivates - AllocatePixmapPrivates () failed\n");
       return FALSE;
     }
 
   /* Reserve Window memory for our privates */
-  if (!AllocateWindowPrivate (pScreen, g_iWindowPrivateIndex,
-			      sizeof (winPrivWinRec)))
+  if (!dixRequestPrivate(g_iWindowPrivateKey, sizeof (winPrivWinRec)))
     {
       ErrorF ("winAllocatePrivates () - AllocateWindowPrivates () failed\n");
        return FALSE;
@@ -155,9 +146,6 @@ winAllocateCmapPrivates (ColormapPtr pCmap)
   /* Get a new privates index when the server generation changes */
   if (s_ulPrivateGeneration != serverGeneration)
     {
-      /* Get an index that we can store our privates at */
-      g_iCmapPrivateIndex = AllocateColormapPrivateIndex (winInitCmapPrivates);
-      
       /* Save the new server generation */
       s_ulPrivateGeneration = serverGeneration;
     }
diff --git a/hw/xwin/wincursor.c b/hw/xwin/wincursor.c
index c1e619bf8..021b8b82c 100644
--- a/hw/xwin/wincursor.c
+++ b/hw/xwin/wincursor.c
@@ -598,7 +598,8 @@ winInitCursor (ScreenPtr pScreen)
   pScreenPriv->cursor.QueryBestSize = pScreen->QueryBestSize;
   pScreen->QueryBestSize = winCursorQueryBestSize;
   
-  pPointPriv = (miPointerScreenPtr) pScreen->devPrivates[miPointerScreenIndex].ptr;
+  pPointPriv = (miPointerScreenPtr)
+      dixLookupPrivate(&pScreen->devPrivates, miPointerScreenKey);
   
   pScreenPriv->cursor.spriteFuncs = pPointPriv->spriteFuncs;
   pPointPriv->spriteFuncs = &winSpriteFuncsRec;
diff --git a/hw/xwin/winfillsp.c b/hw/xwin/winfillsp.c
index 7e3966965..702f34f96 100644
--- a/hw/xwin/winfillsp.c
+++ b/hw/xwin/winfillsp.c
@@ -35,15 +35,6 @@
 #include "win.h"
 
 
-/*
- * References to external symbols
- */
-
-extern int			g_iPixmapPrivateIndex;
-extern int			g_iGCPrivateIndex;
-extern int                      g_copyROP[];
-
-
 extern void ROP16(HDC hdc, int rop);
 
 #define TRANSLATE_COLOR(color)						\
diff --git a/hw/xwin/winglobals.c b/hw/xwin/winglobals.c
index af8190d3f..fddada39e 100644
--- a/hw/xwin/winglobals.c
+++ b/hw/xwin/winglobals.c
@@ -44,11 +44,11 @@ int		g_iLastScreen = -1;
 #ifdef HAS_DEVWINDOWS
 int		g_fdMessageQueue = WIN_FD_INVALID;
 #endif
-int		g_iScreenPrivateIndex = -1;
-int		g_iCmapPrivateIndex = -1;
-int		g_iGCPrivateIndex = -1;
-int		g_iPixmapPrivateIndex = -1;
-int		g_iWindowPrivateIndex = -1;
+DevPrivateKey	g_iScreenPrivateKey = &g_iScreenPrivateKey;
+DevPrivateKey	g_iCmapPrivateKey = &g_iCmapPrivateKey;
+DevPrivateKey	g_iGCPrivateKey = &g_iGCPrivateKey;
+DevPrivateKey	g_iPixmapPrivateKey = &g_iPixmapPrivateKey;
+DevPrivateKey	g_iWindowPrivateKey = &g_iWindowPrivateKey;
 unsigned long	g_ulServerGeneration = 0;
 Bool		g_fInitializedDefaultScreens = FALSE;
 DWORD		g_dwEnginesSupported = 0;
diff --git a/hw/xwin/winmultiwindowwndproc.c b/hw/xwin/winmultiwindowwndproc.c
index 0a7579b61..20ff9f7db 100644
--- a/hw/xwin/winmultiwindowwndproc.c
+++ b/hw/xwin/winmultiwindowwndproc.c
@@ -365,7 +365,7 @@ winTopLevelWindowProc (HWND hwnd, UINT message,
       ErrorF ("\thenght %08X\n", pWin->drawable.height);
       ErrorF ("\tpScreen %08X\n", pWin->drawable.pScreen);
       ErrorF ("\tserialNumber %08X\n", pWin->drawable.serialNumber);
-      ErrorF ("g_iWindowPrivateIndex %d\n", g_iWindowPrivateIndex);
+      ErrorF ("g_iWindowPrivateKey %p\n", g_iWindowPrivateKey);
       ErrorF ("pWinPriv %08X\n", pWinPriv);
       ErrorF ("s_pScreenPriv %08X\n", s_pScreenPriv);
       ErrorF ("s_pScreenInfo %08X\n", s_pScreenInfo);
diff --git a/hw/xwin/winpixmap.c b/hw/xwin/winpixmap.c
index baff60c92..ffe72079a 100644
--- a/hw/xwin/winpixmap.c
+++ b/hw/xwin/winpixmap.c
@@ -35,13 +35,6 @@
 #include "win.h"
 
 
-/*
- * References to external symbols
- */
-
-extern int			g_iPixmapPrivateIndex;
-
-
 /*
  * Local prototypes
  */
diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c
index 52adba819..2038e6fe5 100644
--- a/hw/xwin/winscrinit.c
+++ b/hw/xwin/winscrinit.c
@@ -73,9 +73,6 @@ winMWExtWMProcs = {
  * References to external symbols
  */
 
-extern winScreenInfo		g_ScreenInfo[];
-extern miPointerScreenFuncRec	g_winPointerCursorFuncs;
-extern int			g_iScreenPrivateIndex;
 extern Bool                     g_fSoftwareCursor;
 
 
diff --git a/hw/xwin/winsetsp.c b/hw/xwin/winsetsp.c
index 8a3faee93..f894d6cda 100644
--- a/hw/xwin/winsetsp.c
+++ b/hw/xwin/winsetsp.c
@@ -35,15 +35,6 @@
 #include "win.h"
 
 
-/*
- * References to external symbols
- */
-
-extern int			g_iPixmapPrivateIndex;
-extern int			g_iGCPrivateIndex;
-extern int                      g_copyROP[];
-
-
 /* See Porting Layer Definition - p. 55 */
 void
 winSetSpansNativeGDI (DrawablePtr	pDrawable,
diff --git a/include/colormapst.h b/include/colormapst.h
index c9d9514ad..f1fc8ebef 100644
--- a/include/colormapst.h
+++ b/include/colormapst.h
@@ -52,6 +52,7 @@ SOFTWARE.
 
 #include "colormap.h"
 #include "screenint.h"
+#include "privates.h"
 
 /* Shared color -- the color is used by AllocColorPlanes */
 typedef struct
@@ -126,7 +127,7 @@ typedef struct _ColormapRec
     Entry 	*green;
     Entry	*blue;
     pointer	devPriv;
-    DevUnion	*devPrivates;	/* dynamic devPrivates added after devPriv
+    PrivateRec	*devPrivates;	/* dynamic devPrivates added after devPriv
 				   already existed - must keep devPriv */
 } ColormapRec;
 	      
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index 01142a59d..8d4d7318e 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -261,9 +261,6 @@
 /* Internal define for Xinerama */
 #undef PANORAMIX
 
-/* Support pixmap privates */
-#undef PIXPRIV
-
 /* Overall prefix */
 #undef PROJECTROOT
 
diff --git a/include/dix.h b/include/dix.h
index 05366ecd0..54629cd14 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -496,12 +496,6 @@ void
 ScreenRestructured (ScreenPtr pScreen);
 #endif
 
-extern int AllocateClientPrivateIndex(void);
-
-extern Bool AllocateClientPrivate(
-    int /*index*/,
-    unsigned /*amount*/);
-
 extern int ffs(int i);
 
 /*
diff --git a/include/dixstruct.h b/include/dixstruct.h
index 2a3e696fd..7f14abab4 100644
--- a/include/dixstruct.h
+++ b/include/dixstruct.h
@@ -29,6 +29,7 @@ SOFTWARE.
 #include "cursor.h"
 #include "gc.h"
 #include "pixmap.h"
+#include "privates.h"
 #include <X11/Xmd.h>
 
 /*
@@ -110,7 +111,7 @@ typedef struct _Client {
     Bool	big_requests;		/* supports large requests */
     int		priority;
     ClientState clientState;
-    DevUnion	*devPrivates;
+    PrivateRec	*devPrivates;
 #ifdef XKB
     unsigned short	xkbClientFlags;
     unsigned short	mapNotifyMask;
diff --git a/include/extension.h b/include/extension.h
index 27decc12c..6e6081740 100644
--- a/include/extension.h
+++ b/include/extension.h
@@ -58,12 +58,6 @@ extern Bool EnableDisableExtension(char *name, Bool enable);
 
 extern void EnableDisableExtensionError(char *name, Bool enable);
 
-extern int AllocateExtensionPrivateIndex(void);
-
-extern Bool AllocateExtensionPrivate(
-    int /*index*/,
-    unsigned /*amount*/);
-
 extern void InitExtensions(int argc, char **argv);
 
 extern void InitVisualWrap(void);
diff --git a/include/extnsionst.h b/include/extnsionst.h
index 58bf0a206..59acd0ef4 100644
--- a/include/extnsionst.h
+++ b/include/extnsionst.h
@@ -53,6 +53,7 @@ SOFTWARE.
 #include "screenint.h"
 #include "extension.h"
 #include "gc.h"
+#include "privates.h"
 
 typedef struct _ExtensionEntry {
     int index;
@@ -69,7 +70,7 @@ typedef struct _ExtensionEntry {
     pointer extPrivate;
     unsigned short (* MinorOpcode)(	/* called for errors */
 	ClientPtr /* client */);
-    DevUnion *devPrivates;
+    PrivateRec *devPrivates;
 } ExtensionEntry;
 
 /* 
diff --git a/include/gcstruct.h b/include/gcstruct.h
index 14f747836..8d9b05575 100644
--- a/include/gcstruct.h
+++ b/include/gcstruct.h
@@ -56,6 +56,7 @@ SOFTWARE.
 #include "region.h"
 #include "pixmap.h"
 #include "screenint.h"
+#include "privates.h"
 #include <X11/Xprotostr.h>
 
 /*
@@ -308,7 +309,7 @@ typedef struct _GC {
     unsigned long       serialNumber;
     GCFuncs		*funcs;
     GCOps		*ops;
-    DevUnion		*devPrivates;
+    PrivateRec		*devPrivates;
     /*
      * The following were moved here from private storage to allow device-
      * independent access to them from screen wrappers.
diff --git a/include/input.h b/include/input.h
index 97a78567f..4f9164a19 100644
--- a/include/input.h
+++ b/include/input.h
@@ -158,9 +158,6 @@ typedef struct {
     unsigned char id;
 } LedCtrl;
 
-extern int AllocateDevicePrivateIndex(void);
-extern Bool AllocateDevicePrivate(DeviceIntPtr device, int index);
-
 extern KeybdCtrl	defaultKeyboardControl;
 extern PtrCtrl		defaultPointerControl;
 
diff --git a/include/inputstr.h b/include/inputstr.h
index 3398949d4..bb7f35096 100644
--- a/include/inputstr.h
+++ b/include/inputstr.h
@@ -52,6 +52,7 @@ SOFTWARE.
 #include "input.h"
 #include "window.h"
 #include "dixstruct.h"
+#include "privates.h"
 
 #define BitIsOn(ptr, bit) (((BYTE *) (ptr))[(bit)>>3] & (1 << ((bit) & 7)))
 
@@ -62,7 +63,7 @@ SOFTWARE.
 
 #define EMASKSIZE	MAX_DEVICES
 
-extern int CoreDevicePrivatesIndex;
+extern DevPrivateKey CoreDevicePrivateKey;
 
 /* Kludge: OtherClients and InputClients must be compatible, see code */
 
@@ -327,7 +328,7 @@ typedef struct _DeviceIntRec {
     void                *pad0;
 #endif
     char                *config_info; /* used by the hotplug layer */
-    DevUnion		*devPrivates;
+    PrivateRec		*devPrivates;
     int			nPrivates;
     DeviceUnwrapProc    unwrapProc;
 } DeviceIntRec;
diff --git a/include/pixmapstr.h b/include/pixmapstr.h
index 459488226..4162c667e 100644
--- a/include/pixmapstr.h
+++ b/include/pixmapstr.h
@@ -47,27 +47,17 @@ SOFTWARE.
 
 #ifndef PIXMAPSTRUCT_H
 #define PIXMAPSTRUCT_H
-#include <X11/Xarch.h>
 #include "pixmap.h"
 #include "screenint.h"
 #include "regionstr.h"
-
-/*
- * The padN members are unfortunate ABI BC.  See fdo bug #6924.
- */
+#include "privates.h"
 
 typedef struct _Drawable {
     unsigned char	type;	/* DRAWABLE_<type> */
     unsigned char	class;	/* specific to type */
     unsigned char	depth;
     unsigned char	bitsPerPixel;
-#if defined(_XSERVER64)
-    XID			pad0;
-#endif
     XID			id;	/* resource id */
-#if defined(_XSERVER64)
-    XID			pad1;
-#endif
     short		x;	/* window: screen absolute, pixmap: 0 */
     short		y;	/* window: screen absolute, pixmap: 0 */
     unsigned short	width;
@@ -85,7 +75,7 @@ typedef struct _Pixmap {
     int			refcnt;
     int			devKind;
     DevUnion		devPrivate;
-    DevUnion		*devPrivates; /* real devPrivates like gcs & windows */
+    PrivateRec		*devPrivates;
 #ifdef COMPOSITE
     short		screen_x;
     short		screen_y;
diff --git a/include/privates.h b/include/privates.h
index e377b3068..9539a2912 100644
--- a/include/privates.h
+++ b/include/privates.h
@@ -27,13 +27,6 @@ typedef struct _Private {
     struct _Private	*next;
 } PrivateRec;
 
-/*
- * Backwards compatibility macro.  Use to get the proper PrivateRec
- * reference from any of the structure types that supported the old
- * devPrivates mechanism.
- */
-#define DEVPRIV_PTR(foo) ((PrivateRec **)(&(foo)->devPrivates[0].ptr))
-
 /*
  * Request pre-allocated private space for your driver/module.
  * Calling this is not necessary if only a pointer by itself is needed.
@@ -154,7 +147,4 @@ dixLookupPrivateOffset(RESTYPE type);
 extern int
 dixRegisterPrivateOffset(RESTYPE type, unsigned offset);
 
-/* Used by the legacy support, don't rely on this being here */
-#define PadToLong(w) ((((w) + sizeof(long)-1) / sizeof(long)) * sizeof(long))
-
 #endif /* PRIVATES_H */
diff --git a/include/screenint.h b/include/screenint.h
index bf8da4432..6d074a375 100644
--- a/include/screenint.h
+++ b/include/screenint.h
@@ -55,22 +55,6 @@ typedef struct _Visual *VisualPtr;
 typedef struct _Depth  *DepthPtr;
 typedef struct _Screen *ScreenPtr;
 
-extern int AllocateScreenPrivateIndex(void);
-
-extern int AllocateWindowPrivateIndex(void);
-
-extern Bool AllocateWindowPrivate(
-    ScreenPtr /* pScreen */,
-    int /* index */,
-    unsigned /* amount */);
-
-extern int AllocateGCPrivateIndex(void);
-
-extern Bool AllocateGCPrivate(
-    ScreenPtr /* pScreen */,
-    int /* index */,
-    unsigned /* amount */);
-
 extern int AddScreen(
     Bool (* /*pfnInit*/)(
 	int /*index*/,
@@ -80,18 +64,6 @@ extern int AddScreen(
     int /*argc*/,
     char** /*argv*/);
 
-extern int AllocatePixmapPrivateIndex(void);
-
-extern Bool AllocatePixmapPrivate(
-    ScreenPtr /* pScreen */,
-    int /* index */,
-    unsigned /* amount */);
-
-
 typedef struct _ColormapRec *ColormapPtr;
-typedef int (*InitCmapPrivFunc)(ColormapPtr, int);
-
-extern int AllocateColormapPrivateIndex(
-    InitCmapPrivFunc /* initPrivFunc */);
 
 #endif /* SCREENINT_H */
diff --git a/include/scrnintstr.h b/include/scrnintstr.h
index 110f4dce9..a24c5f528 100644
--- a/include/scrnintstr.h
+++ b/include/scrnintstr.h
@@ -56,6 +56,7 @@ SOFTWARE.
 #include "validate.h"
 #include <X11/Xproto.h>
 #include "dix.h"
+#include "privates.h"
 
 typedef struct _PixmapFormat {
     unsigned char	depth;
@@ -449,12 +450,6 @@ typedef struct _Screen {
     pointer		devPrivate;
     short       	numVisuals;
     VisualPtr		visuals;
-    int			WindowPrivateLen;
-    unsigned		*WindowPrivateSizes;
-    unsigned		totalWindowSize;
-    int			GCPrivateLen;
-    unsigned		*GCPrivateSizes;
-    unsigned		totalGCSize;
 
     /* Random screen procedures */
 
@@ -546,7 +541,7 @@ typedef struct _Screen {
     pointer wakeupData;
 
     /* anybody can get a piece of this array */
-    DevUnion	*devPrivates;
+    PrivateRec	*devPrivates;
 
     CreateScreenResourcesProcPtr CreateScreenResources;
     ModifyPixmapHeaderProcPtr	ModifyPixmapHeader;
@@ -558,8 +553,6 @@ typedef struct _Screen {
 
     PixmapPtr pScratchPixmap;		/* scratch pixmap "pool" */
 
-    int			PixmapPrivateLen;
-    unsigned int		*PixmapPrivateSizes;
     unsigned int		totalPixmapSize;
 
     MarkWindowProcPtr		MarkWindow;
diff --git a/include/window.h b/include/window.h
index d5437a759..f85eceb2d 100644
--- a/include/window.h
+++ b/include/window.h
@@ -83,9 +83,6 @@ extern int WalkTree(
     VisitWindowProcPtr /*func*/,
     pointer /*data*/);
 
-extern WindowPtr AllocateWindow(
-    ScreenPtr /*pScreen*/);
-
 extern Bool CreateRootWindow(
     ScreenPtr /*pScreen*/);
 
diff --git a/include/windowstr.h b/include/windowstr.h
index 6d874ae9e..ca212ad99 100644
--- a/include/windowstr.h
+++ b/include/windowstr.h
@@ -55,6 +55,7 @@ SOFTWARE.
 #include "property.h"
 #include "resource.h"	/* for ROOT_WINDOW_ID_BASE */
 #include "dix.h"
+#include "privates.h"
 #include "miscstruct.h"
 #include <X11/Xprotostr.h>
 #include "opaque.h"
@@ -159,7 +160,7 @@ typedef struct _Window {
 #ifdef COMPOSITE
     unsigned		redirectDraw:2;	/* rendering is redirected from here */
 #endif
-    DevUnion		*devPrivates;
+    PrivateRec		*devPrivates;
 } WindowRec;
 
 /*
diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 5edee539b..71ea115e6 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -246,7 +246,7 @@ typedef struct
 	device->public.realInputProc = oldprocs->realInputProc; \
 	device->unwrapProc = oldprocs->unwrapProc;
 
-#define XKBDEVICEINFO(dev) ((xkbDeviceInfoPtr) (dev)->devPrivates[xkbDevicePrivateIndex].ptr)
+#define XKBDEVICEINFO(dev) ((xkbDeviceInfoPtr)dixLookupPrivate(&(dev)->devPrivates, xkbDevicePrivateKey))
 
 /***====================================================================***/
 
diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in
index b9643a2a4..97d53a2ee 100644
--- a/include/xorg-config.h.in
+++ b/include/xorg-config.h.in
@@ -57,9 +57,6 @@
 /* Solaris 8 or later? */
 #undef __SOL8__
 
-/* Whether to use pixmap privates */
-#undef PIXPRIV
-
 /* Define to 1 if you have the `walkcontext' function (used on Solaris for
    xorg_backtrace in hw/xfree86/common/xf86Events.c */
 #undef HAVE_WALKCONTEXT
diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
index c117dfa33..4b9104d9f 100644
--- a/include/xorg-server.h.in
+++ b/include/xorg-server.h.in
@@ -70,9 +70,6 @@
 /* Internal define for Xinerama */
 #undef PANORAMIX
 
-/* Support pixmap privates */
-#undef PIXPRIV
-
 /* Support RANDR extension */
 #undef RANDR
 
diff --git a/mfb/mfb.h b/mfb/mfb.h
index 001f43e53..42f3002f2 100644
--- a/mfb/mfb.h
+++ b/mfb/mfb.h
@@ -705,8 +705,8 @@ extern Bool mfbCloseScreen(
 
 extern Bool mfbAllocatePrivates(
     ScreenPtr /*pScreen*/,
-    int * /*pWinIndex*/,
-    int * /*pGCIndex*/
+    DevPrivateKey *pWinKey,
+    DevPrivateKey *pGCIndex
 );
 
 extern Bool mfbScreenInit(
@@ -891,14 +891,10 @@ typedef struct {
 typedef mfbPrivGC	*mfbPrivGCPtr;
 #endif
 
-/* XXX these should be static, but it breaks the ABI */
-extern int  mfbGCPrivateIndex;		/* index into GC private array */
-extern int  mfbGetGCPrivateIndex(void);
-extern int  mfbWindowPrivateIndex;	/* index into Window private array */
-extern int  mfbGetWindowPrivateIndex(void);
+extern DevPrivateKey mfbGetGCPrivateKey(void);
+extern DevPrivateKey mfbGetWindowPrivateKey(void);
 #ifdef PIXMAP_PER_WINDOW
-extern int  frameWindowPrivateIndex;	/* index into Window private array */
-extern int  frameGetWindowPrivateIndex(void);
+extern DevPrivateKey frameGetWindowPrivateKey(void);
 #endif
 
 #ifndef MFB_PROTOTYPES_ONLY
diff --git a/mfb/mfbbitblt.c b/mfb/mfbbitblt.c
index 270fd96a7..3efee45b1 100644
--- a/mfb/mfbbitblt.c
+++ b/mfb/mfbbitblt.c
@@ -397,8 +397,7 @@ int dstx, dsty;
  * must register a function for n-to-1 copy operations
  */
 
-static unsigned long	copyPlaneGeneration;
-static int		copyPlaneScreenIndex = -1;
+static DevPrivateKey copyPlaneScreenKey = &copyPlaneScreenKey;
 
 typedef RegionPtr (*CopyPlaneFuncPtr)(
     DrawablePtr         /* pSrcDrawable */,
@@ -417,14 +416,7 @@ mfbRegisterCopyPlaneProc (pScreen, proc)
     ScreenPtr	pScreen;
     CopyPlaneFuncPtr proc;
 {
-    if (copyPlaneGeneration != serverGeneration)
-    {
-	copyPlaneScreenIndex = AllocateScreenPrivateIndex();
-	if (copyPlaneScreenIndex < 0)
-	    return FALSE;
-	copyPlaneGeneration = serverGeneration;
-    }
-    pScreen->devPrivates[copyPlaneScreenIndex].fptr = (CopyPlaneFuncPtr)proc;
+    dixSetPrivate(&pScreen->devPrivates, copyPlaneScreenKey, proc);
     return TRUE;
 }
 
@@ -469,9 +461,9 @@ unsigned long plane;
 
     if (pSrcDrawable->depth != 1)
     {
-	if (copyPlaneScreenIndex >= 0 &&
-	    (copyPlane = (CopyPlaneFuncPtr)
-		pSrcDrawable->pScreen->devPrivates[copyPlaneScreenIndex].fptr)
+	if ((copyPlane = (CopyPlaneFuncPtr)
+	     dixLookupPrivate(&pSrcDrawable->pScreen->devPrivates,
+			      copyPlaneScreenKey))
 	    )
 	{
 	    return (*copyPlane) (pSrcDrawable, pDstDrawable,
diff --git a/mfb/mfbfillarc.c b/mfb/mfbfillarc.c
index 30ec00dc3..cbf47a0eb 100644
--- a/mfb/mfbfillarc.c
+++ b/mfb/mfbfillarc.c
@@ -289,7 +289,8 @@ mfbPolyFillArcSolid(pDraw, pGC, narcs, parcs)
     RegionPtr cclip;
     int rop;
 
-    priv = (mfbPrivGC *) pGC->devPrivates[mfbGCPrivateIndex].ptr;
+    priv = (mfbPrivGC *)dixLookupPrivate(&pGC->devPrivates,
+					 mfbGetGCPrivateKey());
     rop = priv->rop;
     if ((rop == RROP_NOP) || !(pGC->planemask & 1))
 	return;
diff --git a/mfb/mfbfillrct.c b/mfb/mfbfillrct.c
index f9209d096..506776b3f 100644
--- a/mfb/mfbfillrct.c
+++ b/mfb/mfbfillrct.c
@@ -96,7 +96,8 @@ mfbPolyFillRect(pDrawable, pGC, nrectFill, prectInit)
     if (!(pGC->planemask & 1))
 	return;
 
-    priv = (mfbPrivGC *) pGC->devPrivates[mfbGCPrivateIndex].ptr;
+    priv = (mfbPrivGC *)dixLookupPrivate(&pGC->devPrivates,
+					 mfbGetGCPrivateKey());
     alu = priv->ropFillArea;
     pfn = priv->FillArea;
     ppix = pGC->pRotatedPixmap;
diff --git a/mfb/mfbfillsp.c b/mfb/mfbfillsp.c
index 112f5327c..e9be737da 100644
--- a/mfb/mfbfillsp.c
+++ b/mfb/mfbfillsp.c
@@ -624,7 +624,8 @@ mfbTileFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted)
     if (pGC->fillStyle == FillTiled)
 	rop = pGC->alu;
     else
-	rop = ((mfbPrivGC *)(pGC->devPrivates[mfbGCPrivateIndex].ptr))->ropOpStip;
+	rop = ((mfbPrivGC *)dixLookupPrivate(&pGC->devPrivates,
+					     mfbGetGCPrivateKey()))->ropOpStip;
 
     flip = 0;
     switch(rop)
@@ -769,7 +770,8 @@ mfbUnnaturalTileFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted)
     {
 	pTile = pGC->stipple;
 	tlwidth = pTile->devKind / PGSZB;
-	rop = ((mfbPrivGC *)(pGC->devPrivates[mfbGCPrivateIndex].ptr))->ropOpStip;
+	rop = ((mfbPrivGC *)dixLookupPrivate(&pGC->devPrivates,
+					     mfbGetGCPrivateKey()))->ropOpStip;
     }
 
     xSrc = pDrawable->x;
@@ -926,7 +928,8 @@ mfbUnnaturalStippleFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted)
 		    ppt, pwidth, fSorted);
 
     pTile = pGC->stipple;
-    rop = ((mfbPrivGC *)(pGC->devPrivates[mfbGCPrivateIndex].ptr))->rop;
+    rop = ((mfbPrivGC *)dixLookupPrivate(&pGC->devPrivates,
+					 mfbGetGCPrivateKey()))->rop;
     tlwidth = pTile->devKind / PGSZB;
     xSrc = pDrawable->x;
     ySrc = pDrawable->y;
diff --git a/mfb/mfbgc.c b/mfb/mfbgc.c
index c60e97676..7492d7c04 100644
--- a/mfb/mfbgc.c
+++ b/mfb/mfbgc.c
@@ -381,7 +381,8 @@ matchCommon (
 	FONTMINBOUNDS(pGC->font,leftSideBearing) > 32 ||
 	FONTMINBOUNDS(pGC->font,characterWidth) < 0)
 	return 0;
-    priv = (mfbPrivGC *) pGC->devPrivates[mfbGCPrivateIndex].ptr;
+    priv = (mfbPrivGC *)dixLookupPrivate(&pGC->devPrivates,
+					 mfbGetGCPrivateKey());
     for (i = 0; i < numberCommonOps; i++) {
 	cop = &mfbCommonOps[i];
 	if ((pGC->fgPixel & 1) != cop->fg)
@@ -420,7 +421,8 @@ mfbCreateGC(pGC)
     /* mfb wants to translate before scan convesion */
     pGC->miTranslate = 1;
 
-    pPriv = (mfbPrivGC *)(pGC->devPrivates[mfbGCPrivateIndex].ptr);
+    pPriv = (mfbPrivGC *)dixLookupPrivate(&pGC->devPrivates,
+					  mfbGetGCPrivateKey());
     pPriv->rop = mfbReduceRop(pGC->alu, pGC->fgPixel);
     pGC->fExpose = TRUE;
     pGC->pRotatedPixmap = NullPixmap;
@@ -508,8 +510,8 @@ mfbValidateGC(pGC, changes, pDrawable)
     new_rotate = (oldOrg.x != pGC->lastWinOrg.x) ||
 		 (oldOrg.y != pGC->lastWinOrg.y);
 
-    devPriv = ((mfbPrivGCPtr) (pGC->devPrivates[mfbGCPrivateIndex].ptr));
-
+    devPriv = (mfbPrivGCPtr)dixLookupPrivate(&pGC->devPrivates,
+					     mfbGetGCPrivateKey());
     /*
 	if the client clip is different or moved OR
 	the subwindowMode has changed OR
diff --git a/mfb/mfbimggblt.c b/mfb/mfbimggblt.c
index e5c186b89..2778b625c 100644
--- a/mfb/mfbimggblt.c
+++ b/mfb/mfbimggblt.c
@@ -184,7 +184,8 @@ MFBIMAGEGLYPHBLT(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase)
        but that is usually not a cheap thing to do.
     */
 
-    pPrivGC = pGC->devPrivates[mfbGCPrivateIndex].ptr;
+    pPrivGC = (mfbPrivGC *)dixLookupPrivate(&pGC->devPrivates,
+					    mfbGetGCPrivateKey());
     oldFillArea = pPrivGC->FillArea;
 
     if (pGC->bgPixel & 1)
diff --git a/mfb/mfbline.c b/mfb/mfbline.c
index 863a6187b..65baa5efd 100644
--- a/mfb/mfbline.c
+++ b/mfb/mfbline.c
@@ -146,7 +146,8 @@ mfbLineSS (pDrawable, pGC, mode, npt, pptInit)
 	return;
 
     cclip = pGC->pCompositeClip;
-    alu = ((mfbPrivGC *)(pGC->devPrivates[mfbGCPrivateIndex].ptr))->rop;
+    alu = ((mfbPrivGC *)dixLookupPrivate(&pGC->devPrivates,
+					 mfbGetGCPrivateKey()))->rop;
     pboxInit = REGION_RECTS(cclip);
     nboxInit = REGION_NUM_RECTS(cclip);
 
@@ -525,7 +526,8 @@ mfbLineSD( pDrawable, pGC, mode, npt, pptInit)
 	return;
 
     cclip = pGC->pCompositeClip;
-    fgrop = ((mfbPrivGC *)(pGC->devPrivates[mfbGCPrivateIndex].ptr))->rop;
+    fgrop = ((mfbPrivGC *)dixLookupPrivate(&pGC->devPrivates,
+					   mfbGetGCPrivateKey()))->rop;
     pboxInit = REGION_RECTS(cclip);
     nboxInit = REGION_NUM_RECTS(cclip);
 
diff --git a/mfb/mfbpixmap.c b/mfb/mfbpixmap.c
index b13e3af0f..1f3f011fb 100644
--- a/mfb/mfbpixmap.c
+++ b/mfb/mfbpixmap.c
@@ -113,7 +113,7 @@ mfbDestroyPixmap(pPixmap)
 {
     if(--pPixmap->refcnt)
 	return TRUE;
-    dixFreePrivates(*DEVPRIV_PTR(pPixmap));
+    dixFreePrivates(pPixmap->devPrivates);
     xfree(pPixmap);
     return TRUE;
 }
diff --git a/mfb/mfbpntwin.c b/mfb/mfbpntwin.c
index b18797a40..725d6beb8 100644
--- a/mfb/mfbpntwin.c
+++ b/mfb/mfbpntwin.c
@@ -56,6 +56,7 @@ SOFTWARE.
 #include "regionstr.h"
 #include "pixmapstr.h"
 #include "scrnintstr.h"
+#include "privates.h"
 
 #include "mfb.h"
 #include "maskbits.h"
@@ -69,8 +70,8 @@ mfbPaintWindow(pWin, pRegion, what)
 {
     register mfbPrivWin	*pPrivWin;
 
-    pPrivWin = (mfbPrivWin *)(pWin->devPrivates[mfbWindowPrivateIndex].ptr);
-    
+    pPrivWin = (mfbPrivWin *)dixLookupPrivate(&pWin->devPrivates,
+					      mfbGetWindowPrivateKey());
     switch (what) {
     case PW_BACKGROUND:
 	switch (pWin->backgroundState) {
diff --git a/mfb/mfbpolypnt.c b/mfb/mfbpolypnt.c
index 1c4045126..146cfdce0 100644
--- a/mfb/mfbpolypnt.c
+++ b/mfb/mfbpolypnt.c
@@ -88,7 +88,8 @@ mfbPolyPoint(pDrawable, pGC, mode, npt, pptInit)
     if (!(pGC->planemask & 1))
 	return;
 
-    pGCPriv = (mfbPrivGC *) pGC->devPrivates[mfbGCPrivateIndex].ptr;
+    pGCPriv = (mfbPrivGC *)dixLookupPrivate(&pGC->devPrivates,
+					    mfbGetGCPrivateKey());
     rop = pGCPriv->rop;
 
     mfbGetPixelWidthAndPointer(pDrawable, nlwidth, addrl);
diff --git a/mfb/mfbscrinit.c b/mfb/mfbscrinit.c
index 13ea5d365..515e9e3ce 100644
--- a/mfb/mfbscrinit.c
+++ b/mfb/mfbscrinit.c
@@ -68,13 +68,13 @@ SOFTWARE.
 #include "servermd.h"
 
 #ifdef PIXMAP_PER_WINDOW
-int frameWindowPrivateIndex;
-int frameGetWindowPrivateIndex(void) { return frameWindowPrivateIndex; }
+static DevPrivateKey frameWindowPrivateKey = &frameWindowPrivateKey;
+DevPrivateKey frameGetWindowPrivateKey(void) { return frameWindowPrivateKey; }
 #endif
-int mfbWindowPrivateIndex;
-int mfbGetWindowPrivateIndex(void) { return mfbWindowPrivateIndex; }
-int mfbGCPrivateIndex;
-int mfbGetGCPrivateIndex(void) { return mfbGCPrivateIndex; }
+static DevPrivateKey mfbWindowPrivateKey = &mfbWindowPrivateKey;
+DevPrivateKey mfbGetWindowPrivateKey(void) { return mfbWindowPrivateKey; }
+static DevPrivateKey mfbGCPrivateKey = &mfbGCPrivateKey;
+DevPrivateKey mfbGetGCPrivateKey(void) { return mfbGCPrivateKey; }
 static unsigned long mfbGeneration = 0;
 
 static VisualRec visual = {
@@ -90,30 +90,23 @@ static DepthRec depth = {
 };
 
 Bool
-mfbAllocatePrivates(pScreen, pWinIndex, pGCIndex)
-    ScreenPtr pScreen;
-    int *pWinIndex, *pGCIndex;
+mfbAllocatePrivates(ScreenPtr pScreen,
+		    DevPrivateKey *pWinIndex, DevPrivateKey *pGCIndex)
 {
     if (mfbGeneration != serverGeneration)
     {
-#ifdef PIXMAP_PER_WINDOW
-	frameWindowPrivateIndex = AllocateWindowPrivateIndex();
-#endif
-	mfbWindowPrivateIndex = AllocateWindowPrivateIndex();
-	mfbGCPrivateIndex = miAllocateGCPrivateIndex();
 	visual.vid = FakeClientID(0);
 	VID = visual.vid;
 	mfbGeneration = serverGeneration;
     }
     if (pWinIndex)
-	*pWinIndex = mfbWindowPrivateIndex;
+	*pWinIndex = mfbWindowPrivateKey;
     if (pGCIndex)
-	*pGCIndex = mfbGCPrivateIndex;
+	*pGCIndex = mfbGCPrivateKey;
     pScreen->GetWindowPixmap = mfbGetWindowPixmap;
     pScreen->SetWindowPixmap = mfbSetWindowPixmap;
-    return (AllocateWindowPrivate(pScreen, mfbWindowPrivateIndex,
-				  sizeof(mfbPrivWin)) &&
-	    AllocateGCPrivate(pScreen, mfbGCPrivateIndex, sizeof(mfbPrivGC)));
+    return (dixRequestPrivate(mfbWindowPrivateKey, sizeof(mfbPrivWin)) &&
+	    dixRequestPrivate(mfbGCPrivateKey, sizeof(mfbPrivGC)));
 }
 
 
@@ -126,7 +119,7 @@ mfbScreenInit(pScreen, pbits, xsize, ysize, dpix, dpiy, width)
     int dpix, dpiy;		/* dots per inch */
     int width;			/* pixel width of frame buffer */
 {
-    if 	(!mfbAllocatePrivates(pScreen, (int *)NULL, (int *)NULL))
+    if 	(!mfbAllocatePrivates(pScreen, NULL, NULL))
 	return FALSE;
     pScreen->defColormap = (Colormap) FakeClientID(0);
     /* whitePixel, blackPixel */
@@ -167,7 +160,8 @@ mfbGetWindowPixmap(pWin)
     WindowPtr pWin;
 {
 #ifdef PIXMAP_PER_WINDOW
-    return (PixmapPtr)(pWin->devPrivates[frameWindowPrivateIndex].ptr);
+    return (PixmapPtr)dixLookupPrivate(&pWin->devPrivates,
+				       frameWindowPrivateKey);
 #else
     ScreenPtr pScreen = pWin->drawable.pScreen;
 
@@ -181,7 +175,7 @@ mfbSetWindowPixmap(pWin, pPix)
     PixmapPtr pPix;
 {
 #ifdef PIXMAP_PER_WINDOW
-    pWin->devPrivates[frameWindowPrivateIndex].ptr = (pointer)pPix;
+    dixSetPrivate(&pWin->devPrivates, frameWindowPrivateKey, pPix);
 #else
     (* pWin->drawable.pScreen->SetScreenPixmap)(pPix);
 #endif
diff --git a/mfb/mfbwindow.c b/mfb/mfbwindow.c
index b138d5805..c522b07a3 100644
--- a/mfb/mfbwindow.c
+++ b/mfb/mfbwindow.c
@@ -55,6 +55,7 @@ SOFTWARE.
 #include <X11/X.h>
 #include "scrnintstr.h"
 #include "windowstr.h"
+#include "privates.h"
 #include "mfb.h"
 #include "mistruct.h"
 #include "regionstr.h"
@@ -66,7 +67,8 @@ mfbCreateWindow(pWin)
 {
     register mfbPrivWin *pPrivWin;
 
-    pPrivWin = (mfbPrivWin *)(pWin->devPrivates[mfbWindowPrivateIndex].ptr);
+    pPrivWin = (mfbPrivWin *)dixLookupPrivate(&pWin->devPrivates,
+					      mfbGetWindowPrivateKey());
     pPrivWin->pRotatedBorder = NullPixmap;
     pPrivWin->pRotatedBackground = NullPixmap;
     pPrivWin->fastBackground = FALSE;
@@ -83,8 +85,8 @@ mfbDestroyWindow(pWin)
 {
     register mfbPrivWin *pPrivWin;
 
-    pPrivWin = (mfbPrivWin *)(pWin->devPrivates[mfbWindowPrivateIndex].ptr);
-
+    pPrivWin = (mfbPrivWin *)dixLookupPrivate(&pWin->devPrivates,
+					      mfbGetWindowPrivateKey());
     if (pPrivWin->pRotatedBorder)
 	(*pWin->drawable.pScreen->DestroyPixmap)(pPrivWin->pRotatedBorder);
     if (pPrivWin->pRotatedBackground)
@@ -116,7 +118,8 @@ mfbPositionWindow(pWin, x, y)
     register mfbPrivWin *pPrivWin;
     int	reset = 0;
 
-    pPrivWin = (mfbPrivWin *)(pWin->devPrivates[mfbWindowPrivateIndex].ptr);
+    pPrivWin = (mfbPrivWin *)dixLookupPrivate(&pWin->devPrivates,
+					      mfbGetWindowPrivateKey());
     if (pWin->backgroundState == BackgroundPixmap && pPrivWin->fastBackground)
     {
 	mfbXRotatePixmap(pPrivWin->pRotatedBackground,
@@ -227,7 +230,8 @@ mfbChangeWindowAttributes(pWin, mask)
     register mfbPrivWin *pPrivWin;
     WindowPtr	pBgWin;
 
-    pPrivWin = (mfbPrivWin *)(pWin->devPrivates[mfbWindowPrivateIndex].ptr);
+    pPrivWin = (mfbPrivWin *)dixLookupPrivate(&pWin->devPrivates,
+					      mfbGetWindowPrivateKey());
     /*
      * When background state changes from ParentRelative and
      * we had previously rotated the fast border pixmap to match
diff --git a/mfb/mfbzerarc.c b/mfb/mfbzerarc.c
index 964e2f100..624e45fee 100644
--- a/mfb/mfbzerarc.c
+++ b/mfb/mfbzerarc.c
@@ -92,7 +92,8 @@ mfbZeroArcSS(
     PixelType pmask;
     register PixelType *paddr;
 
-    if (((mfbPrivGC *)(pGC->devPrivates[mfbGCPrivateIndex].ptr))->rop ==
+    if (((mfbPrivGC *)dixLookupPrivate(&pGC->devPrivates,
+				       mfbGetGCPrivateKey()))->rop ==
 	RROP_BLACK)
 	pixel = 0;
     else
diff --git a/mi/mi.h b/mi/mi.h
index c71c9b7c0..8d8f488a0 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -55,6 +55,7 @@ SOFTWARE.
 #include <X11/fonts/font.h>
 #include "input.h"
 #include "cursor.h"
+#include "privates.h"
 
 #define MiBits	CARD32
 
@@ -412,7 +413,7 @@ extern Bool miScreenInit(
     VisualPtr /*visuals*/
 );
 
-extern int miAllocateGCPrivateIndex(
+extern DevPrivateKey miAllocateGCPrivateIndex(
     void
 );
 
diff --git a/mi/mibank.c b/mi/mibank.c
index 00638a4c2..b52399cfe 100644
--- a/mi/mibank.c
+++ b/mi/mibank.c
@@ -177,15 +177,15 @@ typedef struct _miBankQueue
 #define ALLOCATE_LOCAL_ARRAY(atype, ntype) \
     (atype *)ALLOCATE_LOCAL((ntype) * sizeof(atype))
 
-static int           miBankScreenIndex;
-static int           miBankGCIndex;
+static DevPrivateKey miBankScreenKey = &miBankScreenKey;
+static DevPrivateKey miBankGCKey = &miBankGCKey;
 static unsigned long miBankGeneration = 0;
 
-#define BANK_SCRPRIVLVAL pScreen->devPrivates[miBankScreenIndex].ptr
+#define BANK_SCRPRIVLVAL dixLookupPrivate(&pScreen->devPrivates, miBankScreenKey)
 
 #define BANK_SCRPRIVATE ((miBankScreenPtr)(BANK_SCRPRIVLVAL))
 
-#define BANK_GCPRIVLVAL(pGC) (pGC)->devPrivates[miBankGCIndex].ptr
+#define BANK_GCPRIVLVAL(pGC) dixLookupPrivate(&(pGC)->devPrivates, miBankGCKey)
 
 #define BANK_GCPRIVATE(pGC) ((miBankGCPtr)(BANK_GCPRIVLVAL(pGC)))
 
@@ -2116,15 +2116,9 @@ miInitializeBanking(
     /* Private areas */
 
     if (miBankGeneration != serverGeneration)
-    {
-        if (((miBankScreenIndex = AllocateScreenPrivateIndex()) < 0) ||
-            ((miBankGCIndex = AllocateGCPrivateIndex()) < 0))
-            return FALSE;
-
         miBankGeneration = serverGeneration;
-    }
 
-    if (!AllocateGCPrivate(pScreen, miBankGCIndex,
+    if (!dixRequestPrivate(miBankGCKey,
         (nBanks * sizeof(RegionPtr)) +
             (sizeof(miBankGCRec) - sizeof(RegionPtr))))
         return FALSE;
@@ -2273,7 +2267,7 @@ miInitializeBanking(
     SCREEN_WRAP(PaintWindowBorder,     miBankPaintWindow);
     SCREEN_WRAP(CopyWindow,            miBankCopyWindow);
 
-    BANK_SCRPRIVLVAL = (pointer)pScreenPriv;
+    dixSetPrivate(&pScreen->devPrivates, miBankScreenKey, pScreenPriv);
 
     return TRUE;
 }
diff --git a/mi/midispcur.c b/mi/midispcur.c
index feb6c2f98..8b782925a 100644
--- a/mi/midispcur.c
+++ b/mi/midispcur.c
@@ -54,8 +54,7 @@ in this Software without prior written authorization from The Open Group.
 
 /* per-screen private data */
 
-static int	miDCScreenIndex;
-static unsigned long miDCGeneration = 0;
+static DevPrivateKey miDCScreenKey = &miDCScreenKey;
 
 static Bool	miDCCloseScreen(int index, ScreenPtr pScreen);
 
@@ -117,13 +116,6 @@ miDCInitialize (pScreen, screenFuncs)
 {
     miDCScreenPtr   pScreenPriv;
 
-    if (miDCGeneration != serverGeneration)
-    {
-	miDCScreenIndex = AllocateScreenPrivateIndex ();
-	if (miDCScreenIndex < 0)
-	    return FALSE;
-	miDCGeneration = serverGeneration;
-    }
     pScreenPriv = (miDCScreenPtr) xalloc (sizeof (miDCScreenRec));
     if (!pScreenPriv)
 	return FALSE;
@@ -149,7 +141,7 @@ miDCInitialize (pScreen, screenFuncs)
     pScreenPriv->CloseScreen = pScreen->CloseScreen;
     pScreen->CloseScreen = miDCCloseScreen;
     
-    pScreen->devPrivates[miDCScreenIndex].ptr = (pointer) pScreenPriv;
+    dixSetPrivate(&pScreen->devPrivates, miDCScreenKey, pScreenPriv);
 
     if (!miSpriteInitialize (pScreen, &miDCFuncs, screenFuncs))
     {
@@ -170,7 +162,8 @@ miDCCloseScreen (index, pScreen)
 {
     miDCScreenPtr   pScreenPriv;
 
-    pScreenPriv = (miDCScreenPtr) pScreen->devPrivates[miDCScreenIndex].ptr;
+    pScreenPriv = (miDCScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
+						  miDCScreenKey);
     pScreen->CloseScreen = pScreenPriv->CloseScreen;
     tossGC (pScreenPriv->pSourceGC);
     tossGC (pScreenPriv->pMaskGC);
@@ -475,7 +468,8 @@ miDCPutUpCursor (pScreen, pCursor, x, y, source, mask)
 	if (!pPriv)
 	    return FALSE;
     }
-    pScreenPriv = (miDCScreenPtr) pScreen->devPrivates[miDCScreenIndex].ptr;
+    pScreenPriv = (miDCScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
+						  miDCScreenKey);
     pWin = WindowTable[pScreen->myNum];
 #ifdef ARGB_CURSOR
     if (pPriv->pPicture)
@@ -520,7 +514,8 @@ miDCSaveUnderCursor (pScreen, x, y, w, h)
     WindowPtr	    pWin;
     GCPtr	    pGC;
 
-    pScreenPriv = (miDCScreenPtr) pScreen->devPrivates[miDCScreenIndex].ptr;
+    pScreenPriv = (miDCScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
+						  miDCScreenKey);
     pSave = pScreenPriv->pSave;
     pWin = WindowTable[pScreen->myNum];
     if (!pSave || pSave->drawable.width < w || pSave->drawable.height < h)
@@ -552,7 +547,8 @@ miDCRestoreUnderCursor (pScreen, x, y, w, h)
     WindowPtr	    pWin;
     GCPtr	    pGC;
 
-    pScreenPriv = (miDCScreenPtr) pScreen->devPrivates[miDCScreenIndex].ptr;
+    pScreenPriv = (miDCScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
+						  miDCScreenKey);
     pSave = pScreenPriv->pSave;
     pWin = WindowTable[pScreen->myNum];
     if (!pSave)
@@ -578,7 +574,8 @@ miDCChangeSave (pScreen, x, y, w, h, dx, dy)
     GCPtr	    pGC;
     int		    sourcex, sourcey, destx, desty, copyw, copyh;
 
-    pScreenPriv = (miDCScreenPtr) pScreen->devPrivates[miDCScreenIndex].ptr;
+    pScreenPriv = (miDCScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
+						  miDCScreenKey);
     pSave = pScreenPriv->pSave;
     pWin = WindowTable[pScreen->myNum];
     /*
@@ -721,7 +718,8 @@ miDCMoveCursor (pScreen, pCursor, x, y, w, h, dx, dy, source, mask)
 	if (!pPriv)
 	    return FALSE;
     }
-    pScreenPriv = (miDCScreenPtr) pScreen->devPrivates[miDCScreenIndex].ptr;
+    pScreenPriv = (miDCScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
+						  miDCScreenKey);
     pWin = WindowTable[pScreen->myNum];
     pTemp = pScreenPriv->pTemp;
     if (!pTemp ||
diff --git a/mi/miline.h b/mi/miline.h
index b97b8cf9d..ffa4b2743 100644
--- a/mi/miline.h
+++ b/mi/miline.h
@@ -119,9 +119,8 @@ extern void miSetZeroLineBias(
         t = y1;  y1 = y2;  y2 = t;\
 }
 
-#define miGetZeroLineBias(_pScreen) \
-    ((miZeroLineScreenIndex < 0) ? \
-     		0 : ((_pScreen)->devPrivates[miZeroLineScreenIndex].uval))
+#define miGetZeroLineBias(_pScreen) ((unsigned long) \
+    dixLookupPrivate(&(_pScreen)->devPrivates, miZeroLineScreenKey))
 
 #define CalcLineDeltas(_x1,_y1,_x2,_y2,_adx,_ady,_sx,_sy,_SX,_SY,_octant) \
     (_octant) = 0;				\
@@ -148,7 +147,7 @@ extern void miSetZeroLineBias(
 #define IsXDecreasingOctant(_octant)	((_octant) & XDECREASING)
 #define IsYDecreasingOctant(_octant)	((_octant) & YDECREASING)
 
-extern int miZeroLineScreenIndex;
+extern DevPrivateKey miZeroLineScreenKey;
 
 extern int miZeroClipLine(
     int /*xmin*/,
diff --git a/mi/mioverlay.c b/mi/mioverlay.c
index 1dbb85da5..a1f32ad60 100644
--- a/mi/mioverlay.c
+++ b/mi/mioverlay.c
@@ -10,6 +10,7 @@
 #include "mi.h"
 #include "gcstruct.h"
 #include "regionstr.h"
+#include "privates.h"
 #include "mivalidate.h"
 #include "mioverlay.h"
 #include "migc.h"
@@ -53,9 +54,8 @@ typedef struct {
    Bool				copyUnderlay;
 } miOverlayScreenRec, *miOverlayScreenPtr;
 
-static unsigned long miOverlayGeneration = 0;
-static int miOverlayWindowIndex = -1;
-static int miOverlayScreenIndex = -1;
+static DevPrivateKey miOverlayWindowKey = &miOverlayWindowKey;
+static DevPrivateKey miOverlayScreenKey = &miOverlayScreenKey;
 
 static void RebuildTree(WindowPtr);
 static Bool HasUnderlayChildren(WindowPtr);
@@ -85,10 +85,10 @@ static void miOverlaySetShape(WindowPtr);
 #endif
 static void miOverlayChangeBorderWidth(WindowPtr, unsigned int);
 
-#define MIOVERLAY_GET_SCREEN_PRIVATE(pScreen) \
-	((miOverlayScreenPtr)((pScreen)->devPrivates[miOverlayScreenIndex].ptr))
-#define MIOVERLAY_GET_WINDOW_PRIVATE(pWin) \
-	((miOverlayWindowPtr)((pWin)->devPrivates[miOverlayWindowIndex].ptr))
+#define MIOVERLAY_GET_SCREEN_PRIVATE(pScreen) ((miOverlayScreenPtr) \
+	dixLookupPrivate(&(pScreen)->devPrivates, miOverlayScreenKey))
+#define MIOVERLAY_GET_WINDOW_PRIVATE(pWin) ((miOverlayWindowPtr) \
+	dixLookupPrivate(&(pWin)->devPrivates, miOverlayWindowKey))
 #define MIOVERLAY_GET_WINDOW_TREE(pWin) \
 	(MIOVERLAY_GET_WINDOW_PRIVATE(pWin)->tree)
 
@@ -112,22 +112,13 @@ miInitOverlay(
 
     if(!inOverlayFunc || !transFunc) return FALSE;
 
-    if(miOverlayGeneration != serverGeneration) {
-	if(((miOverlayScreenIndex = AllocateScreenPrivateIndex()) < 0) ||
-	   ((miOverlayWindowIndex = AllocateWindowPrivateIndex()) < 0))
-	    return FALSE;
-	
-	miOverlayGeneration = serverGeneration;
-    }
-
-    if(!AllocateWindowPrivate(pScreen, miOverlayWindowIndex,
-				sizeof(miOverlayWindowRec)))
+    if(!dixRequestPrivate(miOverlayWindowKey, sizeof(miOverlayWindowRec)))
 	return FALSE;
 
     if(!(pScreenPriv = xalloc(sizeof(miOverlayScreenRec))))
 	return FALSE;
 
-    pScreen->devPrivates[miOverlayScreenIndex].ptr = (pointer)pScreenPriv;
+    dixSetPrivate(&pScreen->devPrivates, miOverlayScreenKey, pScreenPriv);
 
     pScreenPriv->InOverlay = inOverlayFunc;
     pScreenPriv->MakeTransparent = transFunc;
diff --git a/mi/mipointer.c b/mi/mipointer.c
index b86a26a97..4d1db4fca 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@@ -41,10 +41,10 @@ in this Software without prior written authorization from The Open Group.
 # include   "dixstruct.h"
 # include   "inputstr.h"
 
-_X_EXPORT int miPointerScreenIndex;
-static unsigned long miPointerGeneration = 0;
+_X_EXPORT DevPrivateKey miPointerScreenKey = &miPointerScreenKey;
 
-#define GetScreenPrivate(s) ((miPointerScreenPtr) ((s)->devPrivates[miPointerScreenIndex].ptr))
+#define GetScreenPrivate(s) ((miPointerScreenPtr) \
+    dixLookupPrivate(&(s)->devPrivates, miPointerScreenKey))
 #define SetupScreen(s)	miPointerScreenPtr  pScreenPriv = GetScreenPrivate(s)
 
 /*
@@ -76,13 +76,6 @@ miPointerInitialize (pScreen, spriteFuncs, screenFuncs, waitForUpdate)
 {
     miPointerScreenPtr	pScreenPriv;
 
-    if (miPointerGeneration != serverGeneration)
-    {
-	miPointerScreenIndex = AllocateScreenPrivateIndex();
-	if (miPointerScreenIndex < 0)
-	    return FALSE;
-	miPointerGeneration = serverGeneration;
-    }
     pScreenPriv = (miPointerScreenPtr) xalloc (sizeof (miPointerScreenRec));
     if (!pScreenPriv)
 	return FALSE;
@@ -99,7 +92,7 @@ miPointerInitialize (pScreen, spriteFuncs, screenFuncs, waitForUpdate)
     pScreenPriv->showTransparent = FALSE;
     pScreenPriv->CloseScreen = pScreen->CloseScreen;
     pScreen->CloseScreen = miPointerCloseScreen;
-    pScreen->devPrivates[miPointerScreenIndex].ptr = (pointer) pScreenPriv;
+    dixSetPrivate(&pScreen->devPrivates, miPointerScreenKey, pScreenPriv);
     /*
      * set up screen cursor method table
      */
diff --git a/mi/mipointer.h b/mi/mipointer.h
index 1bce42c26..e864fddf4 100644
--- a/mi/mipointer.h
+++ b/mi/mipointer.h
@@ -28,6 +28,7 @@ in this Software without prior written authorization from The Open Group.
 
 #include "cursor.h"
 #include "input.h"
+#include "privates.h"
 
 typedef struct _miPointerSpriteFuncRec {
     Bool	(*RealizeCursor)(
@@ -166,6 +167,6 @@ extern void miPointerSetPosition(
 extern void miPointerUpdateSprite(
     DeviceIntPtr pDev);
 
-extern int miPointerScreenIndex;
+extern DevPrivateKey miPointerScreenKey;
 
 #endif /* MIPOINTER_H */
diff --git a/mi/miscrinit.c b/mi/miscrinit.c
index cc40cbede..2dd8cd955 100644
--- a/mi/miscrinit.c
+++ b/mi/miscrinit.c
@@ -293,35 +293,22 @@ miScreenInit(pScreen, pbits, xsize, ysize, dpix, dpiy, width,
     return miScreenDevPrivateInit(pScreen, width, pbits);
 }
 
-_X_EXPORT int
+static DevPrivateKey privateKey = &privateKey;
+
+_X_EXPORT DevPrivateKey
 miAllocateGCPrivateIndex()
 {
-    static int privateIndex = -1;
-    static unsigned long miGeneration = 0;
-
-    if (miGeneration != serverGeneration)
-    {
-	privateIndex = AllocateGCPrivateIndex();
-	miGeneration = serverGeneration;
-    }
-    return privateIndex;
+    return privateKey;
 }
 
-_X_EXPORT int miZeroLineScreenIndex;
-static unsigned int miZeroLineGeneration = 0;
+_X_EXPORT DevPrivateKey miZeroLineScreenKey;
 
 _X_EXPORT void
 miSetZeroLineBias(pScreen, bias)
     ScreenPtr pScreen;
     unsigned int bias;
 {
-    if (miZeroLineGeneration != serverGeneration)
-    {
-	miZeroLineScreenIndex = AllocateScreenPrivateIndex();
-	miZeroLineGeneration = serverGeneration;
-    }
-    if (miZeroLineScreenIndex >= 0)
-	pScreen->devPrivates[miZeroLineScreenIndex].uval = bias;
+    dixSetPrivate(&pScreen->devPrivates, miZeroLineScreenKey, (pointer)bias);
 }
 
 _X_EXPORT PixmapPtr
diff --git a/mi/misprite.c b/mi/misprite.c
index 0b402fa59..0af3368b6 100644
--- a/mi/misprite.c
+++ b/mi/misprite.c
@@ -67,8 +67,7 @@ in this Software without prior written authorization from The Open Group.
  * screen wrappers
  */
 
-static int  miSpriteScreenIndex;
-static unsigned long miSpriteGeneration = 0;
+static DevPrivateKey miSpriteScreenKey = &miSpriteScreenKey;
 
 static Bool	    miSpriteCloseScreen(int i, ScreenPtr pScreen);
 static void	    miSpriteGetImage(DrawablePtr pDrawable, int sx, int sy,
@@ -91,10 +90,9 @@ static void	    miSpriteStoreColors(ColormapPtr pMap, int ndef,
 
 static void	    miSpriteComputeSaved(ScreenPtr pScreen);
 
-#define SCREEN_PROLOGUE(pScreen, field)\
-  ((pScreen)->field = \
-   ((miSpriteScreenPtr) (pScreen)->devPrivates[miSpriteScreenIndex].ptr)->field)
-
+#define SCREEN_PROLOGUE(pScreen, field) ((pScreen)->field = \
+   ((miSpriteScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, \
+					miSpriteScreenKey))->field)
 #define SCREEN_EPILOGUE(pScreen, field)\
     ((pScreen)->field = miSprite##field)
 
@@ -128,8 +126,8 @@ miSpriteReportDamage (DamagePtr pDamage, RegionPtr pRegion, void *closure)
     ScreenPtr		    pScreen = closure;
     miSpriteScreenPtr	    pScreenPriv;
     
-    pScreenPriv = (miSpriteScreenPtr) pScreen->devPrivates[miSpriteScreenIndex].ptr;
-    
+    pScreenPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
+						      miSpriteScreenKey);
     if (pScreenPriv->isUp &&
 	RECT_IN_REGION (pScreen, pRegion, &pScreenPriv->saved) != rgnOUT)
     {
@@ -156,14 +154,6 @@ miSpriteInitialize (pScreen, cursorFuncs, screenFuncs)
     if (!DamageSetup (pScreen))
 	return FALSE;
 
-    if (miSpriteGeneration != serverGeneration)
-    {
-	miSpriteScreenIndex = AllocateScreenPrivateIndex ();
-	if (miSpriteScreenIndex < 0)
-	    return FALSE;
-	miSpriteGeneration = serverGeneration;
-    }
-    
     pScreenPriv = (miSpriteScreenPtr) xalloc (sizeof (miSpriteScreenRec));
     if (!pScreenPriv)
 	return FALSE;
@@ -214,7 +204,7 @@ miSpriteInitialize (pScreen, cursorFuncs, screenFuncs)
     pScreenPriv->colors[MASK_COLOR].red = 0;
     pScreenPriv->colors[MASK_COLOR].green = 0;
     pScreenPriv->colors[MASK_COLOR].blue = 0;
-    pScreen->devPrivates[miSpriteScreenIndex].ptr = (pointer) pScreenPriv;
+    dixSetPrivate(&pScreen->devPrivates, miSpriteScreenKey, pScreenPriv);
     
     pScreen->CloseScreen = miSpriteCloseScreen;
     pScreen->GetImage = miSpriteGetImage;
@@ -247,8 +237,8 @@ miSpriteCloseScreen (i, pScreen)
 {
     miSpriteScreenPtr   pScreenPriv;
 
-    pScreenPriv = (miSpriteScreenPtr) pScreen->devPrivates[miSpriteScreenIndex].ptr;
-
+    pScreenPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
+						      miSpriteScreenKey);
     pScreen->CloseScreen = pScreenPriv->CloseScreen;
     pScreen->GetImage = pScreenPriv->GetImage;
     pScreen->GetSpans = pScreenPriv->GetSpans;
@@ -278,8 +268,8 @@ miSpriteGetImage (pDrawable, sx, sy, w, h, format, planemask, pdstLine)
     
     SCREEN_PROLOGUE (pScreen, GetImage);
 
-    pScreenPriv = (miSpriteScreenPtr) pScreen->devPrivates[miSpriteScreenIndex].ptr;
-
+    pScreenPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
+						      miSpriteScreenKey);
     if (pDrawable->type == DRAWABLE_WINDOW &&
         pScreenPriv->isUp &&
 	ORG_OVERLAP(&pScreenPriv->saved,pDrawable->x,pDrawable->y, sx, sy, w, h))
@@ -308,8 +298,8 @@ miSpriteGetSpans (pDrawable, wMax, ppt, pwidth, nspans, pdstStart)
     
     SCREEN_PROLOGUE (pScreen, GetSpans);
 
-    pScreenPriv = (miSpriteScreenPtr) pScreen->devPrivates[miSpriteScreenIndex].ptr;
-
+    pScreenPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
+						      miSpriteScreenKey);
     if (pDrawable->type == DRAWABLE_WINDOW && pScreenPriv->isUp)
     {
 	DDXPointPtr    	pts;
@@ -350,8 +340,8 @@ miSpriteSourceValidate (pDrawable, x, y, width, height)
     
     SCREEN_PROLOGUE (pScreen, SourceValidate);
 
-    pScreenPriv = (miSpriteScreenPtr) pScreen->devPrivates[miSpriteScreenIndex].ptr;
-
+    pScreenPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
+						      miSpriteScreenKey);
     if (pDrawable->type == DRAWABLE_WINDOW && pScreenPriv->isUp &&
 	ORG_OVERLAP(&pScreenPriv->saved, pDrawable->x, pDrawable->y,
 		    x, y, width, height))
@@ -374,7 +364,8 @@ miSpriteCopyWindow (WindowPtr pWindow, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
     
     SCREEN_PROLOGUE (pScreen, CopyWindow);
 
-    pScreenPriv = (miSpriteScreenPtr) pScreen->devPrivates[miSpriteScreenIndex].ptr;
+    pScreenPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
+						      miSpriteScreenKey);
     /*
      * Damage will take care of destination check
      */
@@ -399,8 +390,8 @@ miSpriteBlockHandler (i, blockData, pTimeout, pReadmask)
     ScreenPtr		pScreen = screenInfo.screens[i];
     miSpriteScreenPtr	pPriv;
 
-    pPriv = (miSpriteScreenPtr) pScreen->devPrivates[miSpriteScreenIndex].ptr;
-
+    pPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
+						miSpriteScreenKey);
     SCREEN_PROLOGUE(pScreen, BlockHandler);
     
     (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
@@ -421,8 +412,8 @@ miSpriteInstallColormap (pMap)
     ScreenPtr		pScreen = pMap->pScreen;
     miSpriteScreenPtr	pPriv;
 
-    pPriv = (miSpriteScreenPtr) pScreen->devPrivates[miSpriteScreenIndex].ptr;
-
+    pPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
+						miSpriteScreenKey);
     SCREEN_PROLOGUE(pScreen, InstallColormap);
     
     (*pScreen->InstallColormap) (pMap);
@@ -450,8 +441,8 @@ miSpriteStoreColors (pMap, ndef, pdef)
     int			updated;
     VisualPtr		pVisual;
 
-    pPriv = (miSpriteScreenPtr) pScreen->devPrivates[miSpriteScreenIndex].ptr;
-
+    pPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
+						miSpriteScreenKey);
     SCREEN_PROLOGUE(pScreen, StoreColors);
     
     (*pScreen->StoreColors) (pMap, ndef, pdef);
@@ -518,7 +509,7 @@ static void
 miSpriteFindColors (ScreenPtr pScreen)
 {
     miSpriteScreenPtr	pScreenPriv = (miSpriteScreenPtr)
-			    pScreen->devPrivates[miSpriteScreenIndex].ptr;
+	dixLookupPrivate(&pScreen->devPrivates, miSpriteScreenKey);
     CursorPtr		pCursor;
     xColorItem		*sourceColor, *maskColor;
 
@@ -562,7 +553,8 @@ miSpriteRealizeCursor (pScreen, pCursor)
 {
     miSpriteScreenPtr	pScreenPriv;
 
-    pScreenPriv = (miSpriteScreenPtr) pScreen->devPrivates[miSpriteScreenIndex].ptr;
+    pScreenPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
+						      miSpriteScreenKey);
     if (pCursor == pScreenPriv->pCursor)
 	pScreenPriv->checkPixels = TRUE;
     return (*pScreenPriv->funcs->RealizeCursor) (pScreen, pCursor);
@@ -575,7 +567,8 @@ miSpriteUnrealizeCursor (pScreen, pCursor)
 {
     miSpriteScreenPtr	pScreenPriv;
 
-    pScreenPriv = (miSpriteScreenPtr) pScreen->devPrivates[miSpriteScreenIndex].ptr;
+    pScreenPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
+						      miSpriteScreenKey);
     return (*pScreenPriv->funcs->UnrealizeCursor) (pScreen, pCursor);
 }
 
@@ -588,7 +581,8 @@ miSpriteSetCursor (pScreen, pCursor, x, y)
 {
     miSpriteScreenPtr	pScreenPriv;
 
-    pScreenPriv = (miSpriteScreenPtr) pScreen->devPrivates[miSpriteScreenIndex].ptr;
+    pScreenPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
+						      miSpriteScreenKey);
     if (!pCursor)
     {
     	pScreenPriv->shouldBeUp = FALSE;
@@ -688,7 +682,8 @@ miSpriteMoveCursor (pScreen, x, y)
 {
     miSpriteScreenPtr	pScreenPriv;
 
-    pScreenPriv = (miSpriteScreenPtr) pScreen->devPrivates[miSpriteScreenIndex].ptr;
+    pScreenPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
+						      miSpriteScreenKey);
     miSpriteSetCursor (pScreen, pScreenPriv->pCursor, x, y);
 }
 
@@ -703,7 +698,8 @@ miSpriteRemoveCursor (pScreen)
     miSpriteScreenPtr   pScreenPriv;
 
     DamageDrawInternal (pScreen, TRUE);
-    pScreenPriv = (miSpriteScreenPtr) pScreen->devPrivates[miSpriteScreenIndex].ptr;
+    pScreenPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
+						      miSpriteScreenKey);
     miSpriteIsUpFALSE (pScreen, pScreenPriv);
     pScreenPriv->pCacheWin = NullWindow;
     if (!(*pScreenPriv->funcs->RestoreUnderCursor) (pScreen,
@@ -732,7 +728,8 @@ miSpriteRestoreCursor (pScreen)
 
     DamageDrawInternal (pScreen, TRUE);
     miSpriteComputeSaved (pScreen);
-    pScreenPriv = (miSpriteScreenPtr) pScreen->devPrivates[miSpriteScreenIndex].ptr;
+    pScreenPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
+						      miSpriteScreenKey);
     pCursor = pScreenPriv->pCursor;
     x = pScreenPriv->x - (int)pCursor->bits->xhot;
     y = pScreenPriv->y - (int)pCursor->bits->yhot;
@@ -767,7 +764,8 @@ miSpriteComputeSaved (pScreen)
     int		    wpad, hpad;
     CursorPtr	    pCursor;
 
-    pScreenPriv = (miSpriteScreenPtr) pScreen->devPrivates[miSpriteScreenIndex].ptr;
+    pScreenPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
+						      miSpriteScreenKey);
     pCursor = pScreenPriv->pCursor;
     x = pScreenPriv->x - (int)pCursor->bits->xhot;
     y = pScreenPriv->y - (int)pCursor->bits->yhot;
diff --git a/miext/cw/cw.c b/miext/cw/cw.c
index b03f5e3a8..df4b121d8 100644
--- a/miext/cw/cw.c
+++ b/miext/cw/cw.c
@@ -43,13 +43,12 @@
 #define CW_ASSERT(x) do {} while (0)
 #endif
 
-int cwGCIndex;
-int cwScreenIndex;
-int cwWindowIndex;
+DevPrivateKey cwGCKey = &cwGCKey;
+DevPrivateKey cwScreenKey = &cwScreenKey;
+DevPrivateKey cwWindowKey = &cwWindowKey;
 #ifdef RENDER
-int cwPictureIndex;
+DevPrivateKey cwPictureKey = &cwPictureKey;
 #endif
-static unsigned long cwGeneration = 0;
 extern GCOps cwGCOps;
 
 static Bool
@@ -237,7 +236,7 @@ cwValidateGC(GCPtr pGC, unsigned long stateChanges, DrawablePtr pDrawable)
 static void
 cwChangeGC(GCPtr pGC, unsigned long mask)
 {
-    cwGCPtr	pPriv = (cwGCPtr)(pGC)->devPrivates[cwGCIndex].ptr;
+    cwGCPtr pPriv = (cwGCPtr)dixLookupPrivate(&pGC->devPrivates, cwGCKey);
 
     FUNC_PROLOGUE(pGC, pPriv);
 
@@ -249,7 +248,7 @@ cwChangeGC(GCPtr pGC, unsigned long mask)
 static void
 cwCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst)
 {
-    cwGCPtr	pPriv = (cwGCPtr)(pGCDst)->devPrivates[cwGCIndex].ptr;
+    cwGCPtr pPriv = (cwGCPtr)dixLookupPrivate(&pGCDst->devPrivates, cwGCKey);
 
     FUNC_PROLOGUE(pGCDst, pPriv);
 
@@ -261,7 +260,7 @@ cwCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst)
 static void
 cwDestroyGC(GCPtr pGC)
 {
-    cwGCPtr	pPriv = (cwGCPtr)(pGC)->devPrivates[cwGCIndex].ptr;
+    cwGCPtr pPriv = (cwGCPtr)dixLookupPrivate(&pGC->devPrivates, cwGCKey);
 
     FUNC_PROLOGUE(pGC, pPriv);
 
@@ -275,7 +274,7 @@ cwDestroyGC(GCPtr pGC)
 static void
 cwChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects)
 {
-    cwGCPtr	pPriv = (cwGCPtr)(pGC)->devPrivates[cwGCIndex].ptr;
+    cwGCPtr pPriv = (cwGCPtr)dixLookupPrivate(&pGC->devPrivates, cwGCKey);
 
     FUNC_PROLOGUE(pGC, pPriv);
 
@@ -287,7 +286,7 @@ cwChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects)
 static void
 cwCopyClip(GCPtr pgcDst, GCPtr pgcSrc)
 {
-    cwGCPtr	pPriv = (cwGCPtr)(pgcDst)->devPrivates[cwGCIndex].ptr;
+    cwGCPtr pPriv = (cwGCPtr)dixLookupPrivate(&pgcDst->devPrivates, cwGCKey);
 
     FUNC_PROLOGUE(pgcDst, pPriv);
 
@@ -299,7 +298,7 @@ cwCopyClip(GCPtr pgcDst, GCPtr pgcSrc)
 static void
 cwDestroyClip(GCPtr pGC)
 {
-    cwGCPtr	pPriv = (cwGCPtr)(pGC)->devPrivates[cwGCIndex].ptr;
+    cwGCPtr pPriv = (cwGCPtr)dixLookupPrivate(&pGC->devPrivates, cwGCKey);
 
     FUNC_PROLOGUE(pGC, pPriv);
 
@@ -621,34 +620,14 @@ miInitializeCompositeWrapper(ScreenPtr pScreen)
     Bool has_render = GetPictureScreenIfSet(pScreen) != NULL;
 #endif
 
-    if (cwGeneration != serverGeneration)
-    {
-	cwScreenIndex = AllocateScreenPrivateIndex();
-	if (cwScreenIndex < 0)
-	    return;
-	cwGCIndex = AllocateGCPrivateIndex();
-	cwWindowIndex = AllocateWindowPrivateIndex();
-#ifdef RENDER
-	if (has_render)
-	    cwPictureIndex = AllocatePicturePrivateIndex();
-#endif
-	cwGeneration = serverGeneration;
-    }
-    if (!AllocateGCPrivate(pScreen, cwGCIndex, sizeof(cwGCRec)))
+    if (!dixRequestPrivate(cwGCKey, sizeof(cwGCRec)))
 	return;
-    if (!AllocateWindowPrivate(pScreen, cwWindowIndex, 0))
-	return;
-#ifdef RENDER
-    if (has_render) {
-	if (!AllocatePicturePrivate(pScreen, cwPictureIndex, 0))
-	    return;
-    }
-#endif
+
     pScreenPriv = (cwScreenPtr)xalloc(sizeof(cwScreenRec));
     if (!pScreenPriv)
 	return;
 
-    pScreen->devPrivates[cwScreenIndex].ptr = (pointer)pScreenPriv;
+    dixSetPrivate(&pScreen->devPrivates, cwScreenKey, pScreenPriv);
     
     SCREEN_EPILOGUE(pScreen, CloseScreen, cwCloseScreen);
     SCREEN_EPILOGUE(pScreen, GetImage, cwGetImage);
@@ -675,8 +654,8 @@ cwCloseScreen (int i, ScreenPtr pScreen)
     PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
 #endif
 
-    pScreenPriv = (cwScreenPtr)pScreen->devPrivates[cwScreenIndex].ptr;
-
+    pScreenPriv = (cwScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
+						cwScreenKey);
     pScreen->CloseScreen = pScreenPriv->CloseScreen;
     pScreen->GetImage = pScreenPriv->GetImage;
     pScreen->GetSpans = pScreenPriv->GetSpans;
diff --git a/miext/cw/cw.h b/miext/cw/cw.h
index 0d57b9b9d..45247d670 100644
--- a/miext/cw/cw.h
+++ b/miext/cw/cw.h
@@ -26,6 +26,7 @@
 
 #include "gcstruct.h"
 #include "picturestr.h"
+#include "privates.h"
 
 /*
  * One of these structures is allocated per GC that gets used with a window with
@@ -43,10 +44,10 @@ typedef struct {
     GCFuncs	    *wrapFuncs;	    /* wrapped funcs */
 } cwGCRec, *cwGCPtr;
 
-extern int cwGCIndex;
+extern DevPrivateKey cwGCKey;
 
-#define getCwGC(pGC)	((cwGCPtr)(pGC)->devPrivates[cwGCIndex].ptr)
-#define setCwGC(pGC,p)	((pGC)->devPrivates[cwGCIndex].ptr = (pointer) (p))
+#define getCwGC(pGC) ((cwGCPtr)dixLookupPrivate(&(pGC)->devPrivates, cwGCKey))
+#define setCwGC(pGC,p) dixSetPrivate(&(pGC)->devPrivates, cwGCKey, p)
 
 /*
  * One of these structures is allocated per Picture that gets used with a
@@ -59,17 +60,17 @@ typedef struct {
     unsigned long   stateChanges;
 } cwPictureRec, *cwPicturePtr;
 
-#define getCwPicture(pPicture)	\
-    (pPicture->pDrawable ? (cwPicturePtr)(pPicture)->devPrivates[cwPictureIndex].ptr : 0)
-#define setCwPicture(pPicture,p) ((pPicture)->devPrivates[cwPictureIndex].ptr = (pointer) (p))
+#define getCwPicture(pPicture) (pPicture->pDrawable ? \
+    (cwPicturePtr)dixLookupPrivate(&(pPicture)->devPrivates, cwPictureKey) : 0)
+#define setCwPicture(pPicture,p) dixSetPrivate(&(pPicture)->devPrivates, cwPictureKey, p)
 
-extern int  cwPictureIndex;
+extern DevPrivateKey cwPictureKey;
+extern DevPrivateKey cwWindowKey;
 
-extern int cwWindowIndex;
-
-#define cwWindowPrivate(pWindow)    ((pWindow)->devPrivates[cwWindowIndex].ptr)
+#define cwWindowPrivate(pWin) dixLookupPrivate(&(pWin)->devPrivates, cwWindowKey)
 #define getCwPixmap(pWindow)	    ((PixmapPtr) cwWindowPrivate(pWindow))
-#define setCwPixmap(pWindow,pPixmap) (cwWindowPrivate(pWindow) = (pointer) (pPixmap))
+#define setCwPixmap(pWindow,pPixmap) \
+    dixSetPrivate(&(pWindow)->devPrivates, cwWindowKey, pPixmap)
 
 #define cwDrawableIsRedirWindow(pDraw)					\
 	((pDraw)->type == DRAWABLE_WINDOW &&				\
@@ -112,10 +113,10 @@ typedef struct {
 #endif
 } cwScreenRec, *cwScreenPtr;
 
-extern int cwScreenIndex;
+extern DevPrivateKey cwScreenKey;
 
-#define getCwScreen(pScreen)	((cwScreenPtr)(pScreen)->devPrivates[cwScreenIndex].ptr)
-#define setCwScreen(pScreen,p)	((cwScreenPtr)(pScreen)->devPrivates[cwScreenIndex].ptr = (p))
+#define getCwScreen(pScreen) ((cwScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, cwScreenKey))
+#define setCwScreen(pScreen,p) dixSetPrivate(&(pScreen)->devPrivates, cwScreenKey, p)
 
 #define CW_OFFSET_XYPOINTS(ppt, npt) do { \
     DDXPointPtr _ppt = (DDXPointPtr)(ppt); \
diff --git a/miext/damage/damage.c b/miext/damage/damage.c
index 65314d8a9..b7f6fb550 100755
--- a/miext/damage/damage.c
+++ b/miext/damage/damage.c
@@ -65,16 +65,15 @@
 #define DAMAGE_DEBUG(x)
 #endif
 
-#define getPixmapDamageRef(pPixmap) \
-    ((DamagePtr *) &(pPixmap->devPrivates[damagePixPrivateIndex].ptr))
+#define getPixmapDamageRef(pPixmap) ((DamagePtr *) \
+    dixLookupPrivateAddr(&(pPixmap)->devPrivates, damagePixPrivateKey))
 
 #define pixmapDamage(pPixmap)		damagePixPriv(pPixmap)
 
-static int damageScrPrivateIndex;
-static int damagePixPrivateIndex;
-static int damageGCPrivateIndex;
-static int damageWinPrivateIndex;
-static int damageGeneration;
+static DevPrivateKey damageScrPrivateKey = &damageScrPrivateKey;
+static DevPrivateKey damagePixPrivateKey = &damagePixPrivateKey;
+static DevPrivateKey damageGCPrivateKey = &damageGCPrivateKey;
+static DevPrivateKey damageWinPrivateKey = &damageWinPrivateKey;
 
 static DamagePtr *
 getDrawableDamageRef (DrawablePtr pDrawable)
@@ -115,7 +114,7 @@ getDrawableDamageRef (DrawablePtr pDrawable)
 
 #define winDamageRef(pWindow) \
     DamagePtr	*pPrev = (DamagePtr *) \
-	    &(pWindow->devPrivates[damageWinPrivateIndex].ptr)
+	dixLookupPrivateAddr(&(pWindow)->devPrivates, damageWinPrivateKey)
 
 static void
 DamageReportDamage (DamagePtr pDamage, RegionPtr pDamageRegion)
@@ -1779,30 +1778,10 @@ DamageSetup (ScreenPtr pScreen)
     PictureScreenPtr	ps = GetPictureScreenIfSet(pScreen);
 #endif
 
-    if (damageGeneration != serverGeneration)
-    {
-	damageScrPrivateIndex = AllocateScreenPrivateIndex ();
-	if (damageScrPrivateIndex == -1)
-	    return FALSE;
-	damageGCPrivateIndex = AllocateGCPrivateIndex ();
-	if (damageGCPrivateIndex == -1)
-	    return FALSE;
-	damagePixPrivateIndex = AllocatePixmapPrivateIndex ();
-	if (damagePixPrivateIndex == -1)
-	    return FALSE;
-	damageWinPrivateIndex = AllocateWindowPrivateIndex ();
-	if (damageWinPrivateIndex == -1)
-	    return FALSE;
-	damageGeneration = serverGeneration;
-    }
-    if (pScreen->devPrivates[damageScrPrivateIndex].ptr)
+    if (dixLookupPrivate(&pScreen->devPrivates, damageScrPrivateKey))
 	return TRUE;
 
-    if (!AllocateGCPrivate (pScreen, damageGCPrivateIndex, sizeof (DamageGCPrivRec)))
-	return FALSE;
-    if (!AllocatePixmapPrivate (pScreen, damagePixPrivateIndex, 0))
-	return FALSE;
-    if (!AllocateWindowPrivate (pScreen, damageWinPrivateIndex, 0))
+    if (!dixRequestPrivate(damageGCPrivateKey, sizeof(DamageGCPrivRec)))
 	return FALSE;
 
     pScrPriv = (DamageScrPrivPtr) xalloc (sizeof (DamageScrPrivRec));
@@ -1827,7 +1806,7 @@ DamageSetup (ScreenPtr pScreen)
     }
 #endif
 
-    pScreen->devPrivates[damageScrPrivateIndex].ptr = (pointer) pScrPriv;
+    dixSetPrivate(&pScreen->devPrivates, damageScrPrivateKey, pScrPriv);
     return TRUE;
 }
 
diff --git a/miext/damage/damagestr.h b/miext/damage/damagestr.h
index 1e0efad4f..9f3dd6684 100755
--- a/miext/damage/damagestr.h
+++ b/miext/damage/damagestr.h
@@ -29,6 +29,7 @@
 
 #include "damage.h"
 #include "gcstruct.h"
+#include "privates.h"
 #ifdef RENDER
 # include "picturestr.h"
 #endif
@@ -80,31 +81,31 @@ typedef struct _damageGCPriv {
 } DamageGCPrivRec, *DamageGCPrivPtr;
 
 /* XXX should move these into damage.c, damageScrPrivateIndex is static */
-#define damageGetScrPriv(pScr) \
-    ((DamageScrPrivPtr) (pScr)->devPrivates[damageScrPrivateIndex].ptr)
+#define damageGetScrPriv(pScr) ((DamageScrPrivPtr) \
+    dixLookupPrivate(&(pScr)->devPrivates, damageScrPrivateKey))
 
 #define damageScrPriv(pScr) \
     DamageScrPrivPtr    pScrPriv = damageGetScrPriv(pScr)
 
 #define damageGetPixPriv(pPix) \
-    ((DamagePtr) (pPix)->devPrivates[damagePixPrivateIndex].ptr)
+    dixLookupPrivate(&(pPix)->devPrivates, damagePixPrivateKey)
 
 #define damgeSetPixPriv(pPix,v) \
-    ((pPix)->devPrivates[damagePixPrivateIndex].ptr = (pointer ) (v))
+    dixSetPrivate(&(pPix)->devPrivates, damagePixPrivateKey, v)
 
 #define damagePixPriv(pPix) \
     DamagePtr	    pDamage = damageGetPixPriv(pPix)
 
 #define damageGetGCPriv(pGC) \
-    ((DamageGCPrivPtr) (pGC)->devPrivates[damageGCPrivateIndex].ptr)
+    dixLookupPrivate(&(pGC)->devPrivates, damageGCPrivateKey)
 
 #define damageGCPriv(pGC) \
     DamageGCPrivPtr  pGCPriv = damageGetGCPriv(pGC)
 
 #define damageGetWinPriv(pWin) \
-    ((DamagePtr) (pWin)->devPrivates[damageWinPrivateIndex].ptr)
+    ((DamagePtr)dixLookupPrivate(&(pWin)->devPrivates, damageWinPrivateKey))
 
 #define damageSetWinPriv(pWin,d) \
-    ((pWin)->devPrivates[damageWinPrivateIndex].ptr = (d))
+    dixSetPrivate(&(pWin)->devPrivates, damageWinPrivateKey, d)
 
 #endif /* _DAMAGESTR_H_ */
diff --git a/miext/rootless/accel/rlAccel.c b/miext/rootless/accel/rlAccel.c
index d62bee740..a14412416 100644
--- a/miext/rootless/accel/rlAccel.c
+++ b/miext/rootless/accel/rlAccel.c
@@ -46,10 +46,10 @@ typedef struct _rlAccelScreenRec {
     CloseScreenProcPtr CloseScreen;
 } rlAccelScreenRec, *rlAccelScreenPtr;
 
-static int rlAccelScreenPrivateIndex = -1;
+static DevPrivateKey rlAccelScreenPrivateKey = &rlAccelScreenPrivateKey;
 
-#define RLACCELREC(pScreen) \
-   ((rlAccelScreenRec *)(pScreen)->devPrivates[rlAccelScreenPrivateIndex].ptr)
+#define RLACCELREC(pScreen) ((rlAccelScreenRec *) \
+    dixLookupPrivate(&(pScreen)->devPrivates, rlAccelScreenPrivateKey))
 
 /* This is mostly identical to fbGCOps. */
 static GCOps rlAccelOps = {
@@ -128,15 +128,8 @@ rlCloseScreen (int iScreen, ScreenPtr pScreen)
 Bool
 RootlessAccelInit(ScreenPtr pScreen)
 {
-    static unsigned long rlAccelGeneration = 0;
     rlAccelScreenRec *s;
 
-    if (rlAccelGeneration != serverGeneration) {
-        rlAccelScreenPrivateIndex = AllocateScreenPrivateIndex();
-        if (rlAccelScreenPrivateIndex == -1) return FALSE;
-        rlAccelGeneration = serverGeneration;
-    }
-
     s = xalloc(sizeof(rlAccelScreenRec));
     if (!s) return FALSE;
     RLACCELREC(pScreen) = s;
diff --git a/miext/rootless/rootlessCommon.h b/miext/rootless/rootlessCommon.h
index 3bf6af02f..5ebe35e63 100644
--- a/miext/rootless/rootlessCommon.h
+++ b/miext/rootless/rootlessCommon.h
@@ -52,9 +52,9 @@
 
 
 // Global variables
-extern int rootlessGCPrivateIndex;
-extern int rootlessScreenPrivateIndex;
-extern int rootlessWindowPrivateIndex;
+extern DevPrivateKey rootlessGCPrivateKey;
+extern DevPrivateKey rootlessScreenPrivateKey;
+extern DevPrivateKey rootlessWindowPrivateKey;
 
 
 // RootlessGCRec: private per-gc data
@@ -133,12 +133,17 @@ typedef struct _RootlessScreenRec {
 
 // Accessors for screen and window privates
 
-#define SCREENREC(pScreen) \
-   ((RootlessScreenRec *)(pScreen)->devPrivates[rootlessScreenPrivateIndex].ptr)
+#define SCREENREC(pScreen) ((RootlessScreenRec *) \
+    dixLookupPrivate(&(pScreen)->devPrivates, rootlessScreenPrivateKey))
 
-#define WINREC(pWin) \
-    ((RootlessWindowRec *)(pWin)->devPrivates[rootlessWindowPrivateIndex].ptr)
+#define SETSCREENREC(pScreen, v) \
+    dixSetPrivate(&(pScreen)->devPrivates, rootlessScreenPrivateKey, v)
 
+#define WINREC(pWin) ((RootlessWindowRec *) \
+    dixLookupPrivate(&(pWin)->devPrivates, rootlessWindowPrivateKey))
+
+#define SETWINREC(pWin, v) \
+    dixSetPrivate(&(pWin)->devPrivates, rootlessWindowPrivateKey, v)
 
 // Call a rootless implementation function.
 // Many rootless implementation functions are allowed to be NULL.
diff --git a/miext/rootless/rootlessGC.c b/miext/rootless/rootlessGC.c
index b26f52c54..bf129eadc 100644
--- a/miext/rootless/rootlessGC.c
+++ b/miext/rootless/rootlessGC.c
@@ -276,11 +276,11 @@ RootlessCreateGC(GCPtr pGC)
     Bool result;
 
     SCREEN_UNWRAP(pGC->pScreen, CreateGC);
-    s = (RootlessScreenRec *) pGC->pScreen->
-            devPrivates[rootlessScreenPrivateIndex].ptr;
+    s = SCREENREC(pGC->pScreen);
     result = s->CreateGC(pGC);
 
-    gcrec = (RootlessGCRec *) pGC->devPrivates[rootlessGCPrivateIndex].ptr;
+    gcrec = (RootlessGCRec *)
+	dixLookupPrivate(&pGC->devPrivates, rootlessGCPrivateKey);
     gcrec->originalOps = NULL; // don't wrap ops yet
     gcrec->originalFuncs = pGC->funcs;
     pGC->funcs = &rootlessGCFuncs;
@@ -302,7 +302,7 @@ RootlessCreateGC(GCPtr pGC)
 // does not assume ops have been wrapped
 #define GCFUNC_UNWRAP(pGC) \
     RootlessGCRec *gcrec = (RootlessGCRec *) \
-        (pGC)->devPrivates[rootlessGCPrivateIndex].ptr; \
+	dixLookupPrivate(&(pGC)->devPrivates, rootlessGCPrivateKey); \
     (pGC)->funcs = gcrec->originalFuncs; \
     if (gcrec->originalOps) { \
         (pGC)->ops = gcrec->originalOps; \
@@ -399,7 +399,7 @@ static void RootlessCopyClip(GCPtr pgcDst, GCPtr pgcSrc)
 // assumes both funcs and ops are wrapped
 #define GCOP_UNWRAP(pGC) \
     RootlessGCRec *gcrec = (RootlessGCRec *) \
-        (pGC)->devPrivates[rootlessGCPrivateIndex].ptr; \
+        dixLookupPrivate(&(pGC)->devPrivates, rootlessGCPrivateKey); \
     GCFuncs *saveFuncs = pGC->funcs; \
     (pGC)->funcs = gcrec->originalFuncs; \
     (pGC)->ops = gcrec->originalOps;
diff --git a/miext/rootless/rootlessScreen.c b/miext/rootless/rootlessScreen.c
index 700de6edc..f647893de 100644
--- a/miext/rootless/rootlessScreen.c
+++ b/miext/rootless/rootlessScreen.c
@@ -61,9 +61,9 @@ extern int RootlessMiValidateTree(WindowPtr pRoot, WindowPtr pChild,
 extern Bool RootlessCreateGC(GCPtr pGC);
 
 // Initialize globals
-int rootlessGCPrivateIndex = -1;
-int rootlessScreenPrivateIndex = -1;
-int rootlessWindowPrivateIndex = -1;
+DevPrivateKey rootlessGCPrivateKey = &rootlessGCPrivateKey;
+DevPrivateKey rootlessScreenPrivateKey = &rootlessScreenPrivateKey;
+DevPrivateKey rootlessWindowPrivateKey = &rootlessWindowPrivateKey;
 
 
 /*
@@ -547,28 +547,14 @@ static Bool
 RootlessAllocatePrivates(ScreenPtr pScreen)
 {
     RootlessScreenRec *s;
-    static unsigned long rootlessGeneration = 0;
-
-    if (rootlessGeneration != serverGeneration) {
-        rootlessScreenPrivateIndex = AllocateScreenPrivateIndex();
-        if (rootlessScreenPrivateIndex == -1) return FALSE;
-        rootlessGCPrivateIndex = AllocateGCPrivateIndex();
-        if (rootlessGCPrivateIndex == -1) return FALSE;
-        rootlessWindowPrivateIndex = AllocateWindowPrivateIndex();
-        if (rootlessWindowPrivateIndex == -1) return FALSE;
-        rootlessGeneration = serverGeneration;
-    }
 
     // no allocation needed for screen privates
-    if (!AllocateGCPrivate(pScreen, rootlessGCPrivateIndex,
-                           sizeof(RootlessGCRec)))
-        return FALSE;
-    if (!AllocateWindowPrivate(pScreen, rootlessWindowPrivateIndex, 0))
+    if (!dixRequestPrivate(rootlessGCPrivateKey, sizeof(RootlessGCRec)))
         return FALSE;
 
     s = xalloc(sizeof(RootlessScreenRec));
     if (! s) return FALSE;
-    SCREENREC(pScreen) = s;
+    SETSCREENREC(pScreen, s);
 
     s->pixmap_data = NULL;
     s->pixmap_data_size = 0;
@@ -583,8 +569,7 @@ RootlessAllocatePrivates(ScreenPtr pScreen)
 static void
 RootlessWrap(ScreenPtr pScreen)
 {
-    RootlessScreenRec *s = (RootlessScreenRec*)
-            pScreen->devPrivates[rootlessScreenPrivateIndex].ptr;
+    RootlessScreenRec *s = SCREENREC(pScreen);
 
 #define WRAP(a) \
     if (pScreen->a) { \
@@ -650,8 +635,7 @@ Bool RootlessInit(ScreenPtr pScreen, RootlessFrameProcsPtr procs)
     if (!RootlessAllocatePrivates(pScreen))
         return FALSE;
 
-    s = (RootlessScreenRec*)
-        pScreen->devPrivates[rootlessScreenPrivateIndex].ptr;
+    s = SCREENREC(pScreen);
 
     s->imp = procs;
 
diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c
index 30b7daaab..687748c2d 100644
--- a/miext/rootless/rootlessWindow.c
+++ b/miext/rootless/rootlessWindow.c
@@ -66,7 +66,7 @@ RootlessCreateWindow(WindowPtr pWin)
     Bool result;
     RegionRec saveRoot;
 
-    WINREC(pWin) = NULL;
+    SETWINREC(pWin, NULL);
 
     SCREEN_UNWRAP(pWin->drawable.pScreen, CreateWindow);
 
@@ -107,7 +107,7 @@ RootlessDestroyFrame(WindowPtr pWin, RootlessWindowPtr winRec)
 #endif
 
     xfree(winRec);
-    WINREC(pWin) = NULL;
+    SETWINREC(pWin, NULL);
 }
 
 
@@ -353,7 +353,7 @@ RootlessEnsureFrame(WindowPtr pWin)
     winRec->pixmap = NULL;
     winRec->wid = NULL;
 
-    WINREC(pWin) = winRec;
+    SETWINREC(pWin, winRec);
 
 #ifdef SHAPE
     // Set the frame's shape if the window is shaped
@@ -370,7 +370,7 @@ RootlessEnsureFrame(WindowPtr pWin)
     {
         RL_DEBUG_MSG("implementation failed to create frame!\n");
         xfree(winRec);
-        WINREC(pWin) = NULL;
+        SETWINREC(pWin, NULL);
         return NULL;
     }
 
@@ -1298,8 +1298,8 @@ RootlessReparentWindow(WindowPtr pWin, WindowPtr pPriorParent)
 
         /* Switch the frame record from one to the other. */
 
-        WINREC(pWin) = NULL;
-        WINREC(pTopWin) = winRec;
+        SETWINREC(pWin, NULL);
+        SETWINREC(pTopWin, winRec);
 
         RootlessInitializeFrame(pTopWin, winRec);
         RootlessReshapeFrame(pTopWin);
diff --git a/miext/shadow/shadow.c b/miext/shadow/shadow.c
index f624216db..74544b1a0 100644
--- a/miext/shadow/shadow.c
+++ b/miext/shadow/shadow.c
@@ -36,8 +36,7 @@
 #include    "gcstruct.h"
 #include    "shadow.h"
 
-int shadowScrPrivateIndex;
-int shadowGeneration;
+DevPrivateKey shadowScrPrivateKey = &shadowScrPrivateKey;
 
 #define wrap(priv, real, mem) {\
     priv->mem = real->mem; \
@@ -116,7 +115,8 @@ static void
 shadowReportFunc(DamagePtr pDamage, RegionPtr pRegion, void *closure)
 {
     ScreenPtr pScreen = closure;
-    shadowBufPtr pBuf = pScreen->devPrivates[shadowScrPrivateIndex].ptr;
+    shadowBufPtr pBuf = (shadowBufPtr)
+	dixLookupPrivate(&pScreen->devPrivates, shadowScrPrivateKey);
 
     /* Register the damaged region, use DamageReportNone below when we
      * want to break BC below... */
@@ -138,13 +138,6 @@ shadowSetup(ScreenPtr pScreen)
     if (!DamageSetup(pScreen))
 	return FALSE;
 
-    if (shadowGeneration != serverGeneration) {
-	shadowScrPrivateIndex = AllocateScreenPrivateIndex();
-	if (shadowScrPrivateIndex == -1)
-	    return FALSE;
-	shadowGeneration = serverGeneration;
-    }
-
     pBuf = (shadowBufPtr) xalloc(sizeof(shadowBufRec));
     if (!pBuf)
 	return FALSE;
@@ -175,7 +168,7 @@ shadowSetup(ScreenPtr pScreen)
     REGION_NULL(pScreen, &pBuf->damage); /* bc */
 #endif
 
-    pScreen->devPrivates[shadowScrPrivateIndex].ptr = (pointer) pBuf;
+    dixSetPrivate(&pScreen->devPrivates, shadowScrPrivateKey, pBuf);
     return TRUE;
 }
 
diff --git a/miext/shadow/shadow.h b/miext/shadow/shadow.h
index 8986809f4..2e45df2b5 100644
--- a/miext/shadow/shadow.h
+++ b/miext/shadow/shadow.h
@@ -74,9 +74,10 @@ typedef struct _shadowBuf {
 #define SHADOW_REFLECT_Y    32
 #define SHADOW_REFLECT_ALL  (SHADOW_REFLECT_X|SHADOW_REFLECT_Y)
 
-extern int shadowScrPrivateIndex;
+extern DevPrivateKey shadowScrPrivateKey;
 
-#define shadowGetBuf(pScr)  ((shadowBufPtr) (pScr)->devPrivates[shadowScrPrivateIndex].ptr)
+#define shadowGetBuf(pScr) ((shadowBufPtr) \
+    dixLookupPrivate(&(pScr)->devPrivates, shadowScrPrivateKey))
 #define shadowBuf(pScr)            shadowBufPtr pBuf = shadowGetBuf(pScr)
 #define shadowDamage(pBuf)  DamageRegion(pBuf->pDamage)    
 
diff --git a/randr/randr.c b/randr/randr.c
index 958f9c192..bc2b995d2 100644
--- a/randr/randr.c
+++ b/randr/randr.c
@@ -56,9 +56,9 @@ static int SProcRRDispatch (ClientPtr pClient);
 int	RREventBase;
 int	RRErrorBase;
 RESTYPE RRClientType, RREventType; /* resource types for event masks */
-int	RRClientPrivateIndex;
+DevPrivateKey RRClientPrivateKey = &RRClientPrivateKey;
 
-int	rrPrivIndex = -1;
+DevPrivateKey rrPrivKey = &rrPrivKey;
 
 static void
 RRClientCallback (CallbackListPtr	*list,
@@ -214,8 +214,6 @@ Bool RRInit (void)
     return TRUE;
 }
 
-static int RRScreenGeneration;
-
 Bool RRScreenInit(ScreenPtr pScreen)
 {
     rrScrPrivPtr   pScrPriv;
@@ -223,13 +221,6 @@ Bool RRScreenInit(ScreenPtr pScreen)
     if (!RRInit ())
 	return FALSE;
 
-    if (RRScreenGeneration != serverGeneration)
-    {
-	if ((rrPrivIndex = AllocateScreenPrivateIndex()) < 0)
-	    return FALSE;
-	RRScreenGeneration = serverGeneration;
-    }
-
     pScrPriv = (rrScrPrivPtr) xcalloc (1, sizeof (rrScrPrivRec));
     if (!pScrPriv)
 	return FALSE;
@@ -333,8 +324,7 @@ RRExtensionInit (void)
 
     if (RRNScreens == 0) return;
 
-    RRClientPrivateIndex = AllocateClientPrivateIndex ();
-    if (!AllocateClientPrivate (RRClientPrivateIndex,
+    if (!dixRequestPrivate(RRClientPrivateKey,
 				sizeof (RRClientRec) +
 				screenInfo.numScreens * sizeof (RRTimesRec)))
 	return;
diff --git a/randr/randrstr.h b/randr/randrstr.h
index bd19fe9d0..e8358bc0c 100644
--- a/randr/randrstr.h
+++ b/randr/randrstr.h
@@ -262,11 +262,11 @@ typedef struct _rrScrPriv {
 #endif
 } rrScrPrivRec, *rrScrPrivPtr;
 
-extern int rrPrivIndex;
+extern DevPrivateKey rrPrivKey;
 
-#define rrGetScrPriv(pScr)  ((rrScrPrivPtr) (pScr)->devPrivates[rrPrivIndex].ptr)
+#define rrGetScrPriv(pScr)  ((rrScrPrivPtr)dixLookupPrivate(&(pScr)->devPrivates, rrPrivKey))
 #define rrScrPriv(pScr)	rrScrPrivPtr    pScrPriv = rrGetScrPriv(pScr)
-#define SetRRScreen(s,p) ((s)->devPrivates[rrPrivIndex].ptr = (pointer) (p))
+#define SetRRScreen(s,p) dixSetPrivate(&(s)->devPrivates, rrPrivKey, p)
 
 /*
  * each window has a list of clients requesting
@@ -298,7 +298,7 @@ typedef struct _RRClient {
 } RRClientRec, *RRClientPtr;
 
 extern RESTYPE	RRClientType, RREventType; /* resource types for event masks */
-extern int	RRClientPrivateIndex;
+extern DevPrivateKey RRClientPrivateKey;
 extern RESTYPE	RRCrtcType, RRModeType, RROutputType;
 
 #define LookupOutput(client,id,a) ((RROutputPtr) \
@@ -311,7 +311,7 @@ extern RESTYPE	RRCrtcType, RRModeType, RROutputType;
 				 (SecurityLookupIDByType (client, id, \
 							  RRModeType, a)))
 
-#define GetRRClient(pClient)    ((RRClientPtr) (pClient)->devPrivates[RRClientPrivateIndex].ptr)
+#define GetRRClient(pClient)    ((RRClientPtr)dixLookupPrivate(&(pClient)->devPrivates, RRClientPrivateKey))
 #define rrClientPriv(pClient)	RRClientPtr pRRClient = GetRRClient(pClient)
 
 /* Initialize the extension */
diff --git a/record/record.c b/record/record.c
index 0ed8f84c2..2e65e677b 100644
--- a/record/record.c
+++ b/record/record.c
@@ -164,13 +164,13 @@ typedef struct {
     ProcFunctionPtr recordVector[256]; 
 } RecordClientPrivateRec, *RecordClientPrivatePtr;
 
-static int RecordClientPrivateIndex;
+static DevPrivateKey RecordClientPrivateKey = &RecordClientPrivateKey;
 
 /*  RecordClientPrivatePtr RecordClientPrivate(ClientPtr)
  *  gets the client private of the given client.  Syntactic sugar.
  */
 #define RecordClientPrivate(_pClient) (RecordClientPrivatePtr) \
-    ((_pClient)->devPrivates[RecordClientPrivateIndex].ptr)
+    dixLookupPrivate(&(_pClient)->devPrivates, RecordClientPrivateKey)
 
 
 /***************************************************************************/
@@ -982,8 +982,8 @@ RecordInstallHooks(RecordClientsAndProtocolPtr pRCAP, XID oneclient)
 		    memcpy(pClientPriv->recordVector, pClient->requestVector, 
 			   sizeof (pClientPriv->recordVector));
 		    pClientPriv->originalVector = pClient->requestVector;
-		    pClient->devPrivates[RecordClientPrivateIndex].ptr =
-			(pointer)pClientPriv;
+		    dixSetPrivate(&pClient->devPrivates,
+				  RecordClientPrivateKey, pClientPriv);
 		    pClient->requestVector = pClientPriv->recordVector;
 		}
 		while ((pIter = RecordIterateSet(pRCAP->pRequestMajorOpSet,
@@ -1096,7 +1096,8 @@ RecordUninstallHooks(RecordClientsAndProtocolPtr pRCAP, XID oneclient)
 		if (!otherRCAPwantsProcVector)
 		{ /* nobody needs it, so free it */
 		    pClient->requestVector = pClientPriv->originalVector;
-		    pClient->devPrivates[RecordClientPrivateIndex].ptr = NULL;
+		    dixSetPrivate(&pClient->devPrivates,
+				  RecordClientPrivateKey, NULL);
 		    xfree(pClientPriv);
 		}
 	    } /* end if this RCAP specifies any requests */
@@ -2948,10 +2949,6 @@ RecordExtensionInit(void)
     if (!RTContext)
 	return;
 
-    RecordClientPrivateIndex = AllocateClientPrivateIndex();
-    if (!AllocateClientPrivate(RecordClientPrivateIndex, 0))
-	return;
-
     ppAllContexts = NULL;
     numContexts = numEnabledContexts = numEnabledRCAPs = 0;
 
diff --git a/render/animcur.c b/render/animcur.c
index 1f25e79d0..444d70645 100644
--- a/render/animcur.c
+++ b/render/animcur.c
@@ -87,14 +87,14 @@ static CursorBits   animCursorBits = {
     empty, empty, 2, 1, 1, 0, 0, 1
 };
 
-static int AnimCurScreenPrivateIndex = -1;
 static int AnimCurGeneration;
+static DevPrivateKey AnimCurScreenPrivateKey = &AnimCurScreenPrivateKey;
 
 #define IsAnimCur(c)	    ((c)->bits == &animCursorBits)
 #define GetAnimCur(c)	    ((AnimCurPtr) ((c) + 1))
-#define GetAnimCurScreen(s) ((AnimCurScreenPtr) ((s)->devPrivates[AnimCurScreenPrivateIndex].ptr))
-#define GetAnimCurScreenIfSet(s) ((AnimCurScreenPrivateIndex != -1) ? GetAnimCurScreen(s) : NULL)
-#define SetAnimCurScreen(s,p) ((s)->devPrivates[AnimCurScreenPrivateIndex].ptr = (pointer) (p))
+#define GetAnimCurScreen(s) ((AnimCurScreenPtr)dixLookupPrivate(&(s)->devPrivates, AnimCurScreenPrivateKey))
+#define GetAnimCurScreenIfSet(s) GetAnimCurScreen(s)
+#define SetAnimCurScreen(s,p) dixSetPrivate(&(s)->devPrivates, AnimCurScreenPrivateKey, p)
 
 #define Wrap(as,s,elt,func) (((as)->elt = (s)->elt), (s)->elt = func)
 #define Unwrap(as,s,elt)    ((s)->elt = (as)->elt)
@@ -128,8 +128,6 @@ AnimCurCloseScreen (int index, ScreenPtr pScreen)
     SetAnimCurScreen(pScreen,0);
     ret = (*pScreen->CloseScreen) (index, pScreen);
     xfree (as);
-    if (index == 0)
-	AnimCurScreenPrivateIndex = -1;
     return ret;
 }
 
@@ -324,9 +322,6 @@ AnimCurInit (ScreenPtr pScreen)
 
     if (AnimCurGeneration != serverGeneration)
     {
-	AnimCurScreenPrivateIndex = AllocateScreenPrivateIndex ();
-	if (AnimCurScreenPrivateIndex < 0)
-	    return FALSE;
 	AnimCurGeneration = serverGeneration;
 	animCurState.pCursor = 0;
 	animCurState.pScreen = 0;
diff --git a/render/glyph.c b/render/glyph.c
index 583a52ba3..cb1534d6e 100644
--- a/render/glyph.c
+++ b/render/glyph.c
@@ -81,220 +81,18 @@ static const CARD8	glyphDepths[GlyphFormatNum] = { 1, 4, 8, 16, 32 };
 
 static GlyphHashRec	globalGlyphs[GlyphFormatNum];
 
-static int	globalTotalGlyphPrivateSize = 0;
-
-static int	glyphPrivateCount = 0;
-
-void
-ResetGlyphPrivates (void)
-{
-    glyphPrivateCount = 0;
-}
-
-int
-AllocateGlyphPrivateIndex (void)
-{
-    return glyphPrivateCount++;
-}
-
-Bool
-AllocateGlyphPrivate (ScreenPtr pScreen,
-		      int	index2,
-		      unsigned	amount)
-{
-    PictureScreenPtr ps;
-    unsigned	     oldamount;
-
-    ps = GetPictureScreenIfSet (pScreen);
-    if (!ps)
-	return FALSE;
-
-    /* Round up sizes for proper alignment */
-    amount = ((amount + (sizeof (DevUnion) - 1)) / sizeof (DevUnion)) *
-	sizeof (DevUnion);
-
-    if (index2 >= ps->glyphPrivateLen)
-    {
-	unsigned *nsizes;
-	nsizes = (unsigned *) xrealloc (ps->glyphPrivateSizes,
-					(index2 + 1) * sizeof (unsigned));
-	if (!nsizes)
-	    return FALSE;
-	
-	while (ps->glyphPrivateLen <= index2)
-	{
-	    nsizes[ps->glyphPrivateLen++] = 0;
-	    ps->totalGlyphPrivateSize += sizeof (DevUnion);
-	}
-	ps->glyphPrivateSizes = nsizes;
-    }
-    oldamount = ps->glyphPrivateSizes[index2];
-    if (amount > oldamount)
-    {
-	ps->glyphPrivateSizes[index2] = amount;
-	ps->totalGlyphPrivateSize += (amount - oldamount);
-    }
-    ps->totalGlyphPrivateSize = BitmapBytePad (ps->totalGlyphPrivateSize * 8);
-    
-    return TRUE;
-}
-
 static void
-SetGlyphScreenPrivateOffsets (void)
+FreeGlyphPrivates (GlyphPtr glyph)
 {
-    PictureScreenPtr ps;
-    int		     offset = 0;
-    int		     i;
+    ScreenPtr pScreen;
+    int i;
 
-    for (i = 0; i < screenInfo.numScreens; i++)
-    {
-	ps = GetPictureScreenIfSet (screenInfo.screens[i]);
-	if (ps && ps->totalGlyphPrivateSize)
-	{
-	    ps->glyphPrivateOffset = offset;
-	    offset += ps->totalGlyphPrivateSize / sizeof (DevUnion);
-	}
-    }
-}
-
-static void
-SetGlyphPrivatePointers (GlyphPtr glyph)
-{
-    PictureScreenPtr ps;
-    int		     i;
-    char	     *ptr;
-    DevUnion         *ppriv;
-    unsigned         *sizes;
-    unsigned         size;
-    int		     len;
-
-    for (i = 0; i < screenInfo.numScreens; i++)
-    {
-	ps = GetPictureScreenIfSet (screenInfo.screens[i]);
-	if (ps && ps->totalGlyphPrivateSize)
-	{
-	    ppriv = glyph->devPrivates + ps->glyphPrivateOffset;
-	    sizes = ps->glyphPrivateSizes;
-	    ptr = (char *) (ppriv + ps->glyphPrivateLen);
-	    for (len = ps->glyphPrivateLen; --len >= 0; ppriv++, sizes++)
-	    {
-		if ((size = *sizes) != 0)
-		{
-		    ppriv->ptr = (pointer) ptr;
-		    ptr += size;
-		}
-		else
-		    ppriv->ptr = (pointer) 0;
-	    }
-	}
-    }
-}
-
-static Bool
-ReallocGlobalGlyphPrivate (GlyphPtr glyph)
-{
-    PictureScreenPtr ps;
-    DevUnion         *devPrivates;
-    char	     *ptr;
-    int		     i;
-
-    devPrivates = xalloc (globalTotalGlyphPrivateSize);
-    if (!devPrivates)
-	return FALSE;
-
-    ptr = (char *) devPrivates;
-    for (i = 0; i < screenInfo.numScreens; i++)
-    {
-	ps = GetPictureScreenIfSet (screenInfo.screens[i]);
-	if (ps && ps->totalGlyphPrivateSize)
-	{
-	    if (ps->glyphPrivateOffset != -1)
-	    {
-		memcpy (ptr, glyph->devPrivates + ps->glyphPrivateOffset,
-			ps->totalGlyphPrivateSize);
-	    }
-	    else if (ps->totalGlyphPrivateSize)
-	    {
-		memset (ptr, 0, ps->totalGlyphPrivateSize);
-	    }
-	    
-	    ptr += ps->totalGlyphPrivateSize;
-	}
+    for (i = 0; i < screenInfo.numScreens; i++) {
+	pScreen = screenInfo.screens[i];
+	dixFreePrivates(*GetGlyphPrivatesForScreen(glyph, pScreen));
     }
 
-    if (glyph->devPrivates)
-	xfree (glyph->devPrivates);
-    
-    glyph->devPrivates = devPrivates;
-
-    return TRUE;
-}
-
-Bool
-GlyphInit (ScreenPtr pScreen)
-{
-    PictureScreenPtr ps = GetPictureScreen (pScreen);
-    
-    ps->totalGlyphPrivateSize = 0;
-    ps->glyphPrivateSizes = 0;
-    ps->glyphPrivateLen = 0;
-    ps->glyphPrivateOffset = -1;
-    
-    return TRUE;
-}
-
-Bool
-GlyphFinishInit (ScreenPtr pScreen)
-{
-    PictureScreenPtr ps = GetPictureScreen (pScreen);
-
-    if (ps->totalGlyphPrivateSize)
-    {
-	GlyphPtr glyph;
-	int	 fdepth, i;
-	
-	globalTotalGlyphPrivateSize += ps->totalGlyphPrivateSize;
-	
-	for (fdepth = 0; fdepth < GlyphFormatNum; fdepth++)
-	{
-	    if (!globalGlyphs[fdepth].hashSet)
-		continue;
-		
-	    for (i = 0; i < globalGlyphs[fdepth].hashSet->size; i++)
-	    {
-		glyph = globalGlyphs[fdepth].table[i].glyph;
-		if (glyph && glyph != DeletedGlyph)
-		{
-		    if (!ReallocGlobalGlyphPrivate (glyph))
-			return FALSE;
-		}
-	    }
-	}
-
-	SetGlyphScreenPrivateOffsets ();
-
-	for (fdepth = 0; fdepth < GlyphFormatNum; fdepth++)
-	{
-	    if (!globalGlyphs[fdepth].hashSet)
-		continue;
-		
-	    for (i = 0; i < globalGlyphs[fdepth].hashSet->size; i++)
-	    {
-		glyph = globalGlyphs[fdepth].table[i].glyph;
-		if (glyph && glyph != DeletedGlyph)
-		{
-		    SetGlyphPrivatePointers (glyph);
-			
-		    if (!(*ps->RealizeGlyph) (pScreen, glyph))
-			return FALSE;
-		}
-	    }
-	}
-    }
-    else
-	ps->glyphPrivateOffset = 0;
-    
-    return TRUE;
+    dixFreePrivates(glyph->devPrivates);
 }
 
 void
@@ -304,8 +102,6 @@ GlyphUninit (ScreenPtr pScreen)
     GlyphPtr	     glyph;
     int		     fdepth, i;
 
-    globalTotalGlyphPrivateSize -= ps->totalGlyphPrivateSize;
-
     for (fdepth = 0; fdepth < GlyphFormatNum; fdepth++)
     {
 	if (!globalGlyphs[fdepth].hashSet)
@@ -317,43 +113,20 @@ GlyphUninit (ScreenPtr pScreen)
 	    if (glyph && glyph != DeletedGlyph)
 	    {
 		(*ps->UnrealizeGlyph) (pScreen, glyph);
-		
-		if (globalTotalGlyphPrivateSize)
-		{
-		    if (!ReallocGlobalGlyphPrivate (glyph))
-			return;
-		}
-		else
-		{
-		    if (glyph->devPrivates)
-			xfree (glyph->devPrivates);
-		    glyph->devPrivates = NULL;
-		}
+		FreeGlyphPrivates(glyph);
+		glyph->devPrivates = NULL;
 	    }
 	}
     }
 
-    if (globalTotalGlyphPrivateSize)
-	SetGlyphScreenPrivateOffsets ();
-
     for (fdepth = 0; fdepth < GlyphFormatNum; fdepth++)
     {
 	if (!globalGlyphs[fdepth].hashSet)
 	    continue;
 	
 	for (i = 0; i < globalGlyphs[fdepth].hashSet->size; i++)
-	{
 	    glyph = globalGlyphs[fdepth].table[i].glyph;    
-	    if (glyph && glyph != DeletedGlyph)
-	    {
-		if (globalTotalGlyphPrivateSize)
-		    SetGlyphPrivatePointers (glyph);
-	    }
-	}
     }
-
-    if (ps->glyphPrivateSizes)
-	xfree (ps->glyphPrivateSizes);
 }
 
 GlyphHashSetPtr
@@ -367,50 +140,6 @@ FindGlyphHashSet (CARD32 filled)
     return 0;
 }
 
-static int _GlyphSetPrivateAllocateIndex = 0;
-
-int
-AllocateGlyphSetPrivateIndex (void)
-{
-    return _GlyphSetPrivateAllocateIndex++;
-}
-
-void
-ResetGlyphSetPrivateIndex (void)
-{
-    _GlyphSetPrivateAllocateIndex = 0;
-}
-
-Bool
-_GlyphSetSetNewPrivate (GlyphSetPtr glyphSet, int n, pointer ptr)
-{
-    pointer *new;
-
-    if (n > glyphSet->maxPrivate) {
-	if (glyphSet->devPrivates &&
-	    glyphSet->devPrivates != (pointer)(&glyphSet[1])) {
-	    new = (pointer *) xrealloc (glyphSet->devPrivates,
-					(n + 1) * sizeof (pointer));
-	    if (!new)
-		return FALSE;
-	} else {
-	    new = (pointer *) xalloc ((n + 1) * sizeof (pointer));
-	    if (!new)
-		return FALSE;
-	    if (glyphSet->devPrivates)
-		memcpy (new,
-			glyphSet->devPrivates,
-			(glyphSet->maxPrivate + 1) * sizeof (pointer));
-	}
-	glyphSet->devPrivates = new;
-	/* Zero out new, uninitialize privates */
-	while (++glyphSet->maxPrivate < n)
-	    glyphSet->devPrivates[glyphSet->maxPrivate] = (pointer)0;
-    }
-    glyphSet->devPrivates[n] = ptr;
-    return TRUE;
-}
-
 GlyphRefPtr
 FindGlyphRef (GlyphHashPtr hash, CARD32 signature, Bool match, GlyphPtr compare)
 {
@@ -539,8 +268,7 @@ FreeGlyph (GlyphPtr glyph, int format)
 		(*ps->UnrealizeGlyph) (screenInfo.screens[i], glyph);
 	}
 	
-	if (glyph->devPrivates)
-	    xfree (glyph->devPrivates);
+	FreeGlyphPrivates(glyph);
 	xfree (glyph);
     }
 }
@@ -566,8 +294,7 @@ AddGlyph (GlyphSetPtr glyphSet, GlyphPtr glyph, Glyph id)
 	    if (ps)
 		(*ps->UnrealizeGlyph) (screenInfo.screens[i], glyph);
 	}
-	if (glyph->devPrivates)
-	    xfree (glyph->devPrivates);
+	FreeGlyphPrivates(glyph);
 	xfree (glyph);
 	glyph = gr->glyph;
     }
@@ -634,16 +361,7 @@ AllocateGlyph (xGlyphInfo *gi, int fdepth)
     glyph->refcnt = 0;
     glyph->size = size + sizeof (xGlyphInfo);
     glyph->info = *gi;
-
-    if (globalTotalGlyphPrivateSize)
-    {
-	glyph->devPrivates = xalloc (globalTotalGlyphPrivateSize);
-	if (!glyph->devPrivates)
-	    return 0;
-
-	SetGlyphPrivatePointers (glyph);
-    } else
-	glyph->devPrivates = NULL;
+    glyph->devPrivates = NULL;
 
     for (i = 0; i < screenInfo.numScreens; i++)
     {
@@ -659,8 +377,7 @@ AllocateGlyph (xGlyphInfo *gi, int fdepth)
 			(*ps->UnrealizeGlyph) (screenInfo.screens[i], glyph);
 		}
 		
-		if (glyph->devPrivates)
-		    xfree (glyph->devPrivates);
+		FreeGlyphPrivates(glyph);
 		xfree (glyph);
 		return 0;
 	    }
@@ -744,15 +461,11 @@ AllocateGlyphSet (int fdepth, PictFormatPtr format)
 	    return FALSE;
     }
 
-    size = (sizeof (GlyphSetRec) +
-	    (sizeof (pointer) * _GlyphSetPrivateAllocateIndex));
+    size = sizeof (GlyphSetRec);
     glyphSet = xalloc (size);
     if (!glyphSet)
 	return FALSE;
     bzero((char *)glyphSet, size);
-    glyphSet->maxPrivate = _GlyphSetPrivateAllocateIndex - 1;
-    if (_GlyphSetPrivateAllocateIndex)
-	glyphSet->devPrivates = (pointer)(&glyphSet[1]);
 
     if (!AllocateGlyphHash (&glyphSet->hash, &glyphHashSets[0]))
     {
@@ -792,11 +505,7 @@ FreeGlyphSet (pointer	value,
 	else
 	    ResizeGlyphHash (&globalGlyphs[glyphSet->fdepth], 0, TRUE);
 	xfree (table);
-
-	if (glyphSet->devPrivates &&
-	    glyphSet->devPrivates != (pointer)(&glyphSet[1]))
-	    xfree(glyphSet->devPrivates);
-
+	dixFreePrivates(glyphSet->devPrivates);
 	xfree (glyphSet);
     }
     return Success;
diff --git a/render/glyphstr.h b/render/glyphstr.h
index 22150deee..e89f34e59 100644
--- a/render/glyphstr.h
+++ b/render/glyphstr.h
@@ -30,6 +30,7 @@
 #include "screenint.h"
 #include "regionstr.h"
 #include "miscstruct.h"
+#include "privates.h"
 
 #define GlyphFormat1	0
 #define GlyphFormat4	1
@@ -40,7 +41,7 @@
 
 typedef struct _Glyph {
     CARD32	refcnt;
-    DevUnion	*devPrivates;
+    PrivateRec	*devPrivates;
     CARD32	size;	/* info + bitmap */
     xGlyphInfo	info;
     /* bits follow */
@@ -71,18 +72,14 @@ typedef struct _GlyphSet {
     int		    fdepth;
     GlyphHashRec    hash;
     int             maxPrivate;
-    pointer         *devPrivates;
+    PrivateRec      *devPrivates;
 } GlyphSetRec, *GlyphSetPtr;
 
-#define GlyphSetGetPrivate(pGlyphSet,n)					\
-	((n) > (pGlyphSet)->maxPrivate ?				\
-	 (pointer) 0 :							\
-	 (pGlyphSet)->devPrivates[n])
+#define GlyphSetGetPrivate(pGlyphSet,k)					\
+    dixLookupPrivate(&(pGlyphSet)->devPrivates, k)
 
-#define GlyphSetSetPrivate(pGlyphSet,n,ptr)				\
-	((n) > (pGlyphSet)->maxPrivate ?				\
-	 _GlyphSetSetNewPrivate(pGlyphSet, n, ptr) :			\
-	 ((((pGlyphSet)->devPrivates[n] = (ptr)) != 0) || TRUE))
+#define GlyphSetSetPrivate(pGlyphSet,k,ptr)				\
+    dixSetPrivate(&(pGlyphSet)->devPrivates, k, ptr)
 
 typedef struct _GlyphList {
     INT16	    xOff;
@@ -94,32 +91,6 @@ typedef struct _GlyphList {
 GlyphHashSetPtr
 FindGlyphHashSet (CARD32 filled);
 
-int
-AllocateGlyphSetPrivateIndex (void);
-
-void
-ResetGlyphSetPrivateIndex (void);
-
-Bool
-_GlyphSetSetNewPrivate (GlyphSetPtr glyphSet, int n, pointer ptr);
-
-void
-ResetGlyphPrivates (void);
-
-int
-AllocateGlyphPrivateIndex (void);
-
-Bool
-AllocateGlyphPrivate (ScreenPtr pScreen,
-		      int	index2,
-		      unsigned	amount);
-
-Bool
-GlyphInit (ScreenPtr pScreen);
-
-Bool
-GlyphFinishInit (ScreenPtr pScreen);
-
 void
 GlyphUninit (ScreenPtr pScreen);
 
diff --git a/render/picture.c b/render/picture.c
index ede865f28..bc2c3b526 100644
--- a/render/picture.c
+++ b/render/picture.c
@@ -41,65 +41,14 @@
 #include "servermd.h"
 #include "picturestr.h"
 
-_X_EXPORT int	PictureScreenPrivateIndex = -1;
-int		PictureWindowPrivateIndex;
+_X_EXPORT DevPrivateKey PictureScreenPrivateKey = &PictureScreenPrivateKey;
+DevPrivateKey	PictureWindowPrivateKey = &PictureWindowPrivateKey;
 static int	PictureGeneration;
 RESTYPE		PictureType;
 RESTYPE		PictFormatType;
 RESTYPE		GlyphSetType;
 int		PictureCmapPolicy = PictureCmapPolicyDefault;
 
-/* Picture Private machinery */
-
-static int picturePrivateCount;
-
-void
-ResetPicturePrivateIndex (void)
-{
-    picturePrivateCount = 0;
-}
-
-int
-AllocatePicturePrivateIndex (void)
-{
-    return picturePrivateCount++;
-}
-
-Bool
-AllocatePicturePrivate (ScreenPtr pScreen, int index2, unsigned int amount)
-{
-    PictureScreenPtr	ps = GetPictureScreen(pScreen);
-    unsigned int	oldamount;
-
-    /* Round up sizes for proper alignment */
-    amount = ((amount + (sizeof(long) - 1)) / sizeof(long)) * sizeof(long);
-
-    if (index2 >= ps->PicturePrivateLen)
-    {
-	unsigned int *nsizes;
-
-	nsizes = (unsigned int *)xrealloc(ps->PicturePrivateSizes,
-					  (index2 + 1) * sizeof(unsigned int));
-	if (!nsizes)
-	    return FALSE;
-	while (ps->PicturePrivateLen <= index2)
-	{
-	    nsizes[ps->PicturePrivateLen++] = 0;
-	    ps->totalPictureSize += sizeof(DevUnion);
-	}
-	ps->PicturePrivateSizes = nsizes;
-    }
-    oldamount = ps->PicturePrivateSizes[index2];
-    if (amount > oldamount)
-    {
-	ps->PicturePrivateSizes[index2] = amount;
-	ps->totalPictureSize += (amount - oldamount);
-    }
-
-    return TRUE;
-}
-
-
 Bool
 PictureDestroyWindow (WindowPtr pWindow)
 {
@@ -137,8 +86,6 @@ PictureCloseScreen (int index, ScreenPtr pScreen)
 	    (*ps->CloseIndexed) (pScreen, &ps->formats[n]);
     GlyphUninit (pScreen);
     SetPictureScreen(pScreen, 0);
-    if (ps->PicturePrivateSizes)
-	xfree (ps->PicturePrivateSizes);
     xfree (ps->formats);
     xfree (ps);
     return ret;
@@ -497,8 +444,6 @@ PictureFinishInit (void)
 
     for (s = 0; s < screenInfo.numScreens; s++)
     {
-	if (!GlyphFinishInit (screenInfo.screens[s]))
-	    return FALSE;
 	if (!PictureInitIndexedFormats (screenInfo.screens[s]))
 	    return FALSE;
 	(void) AnimCurInit (screenInfo.screens[s]);
@@ -637,10 +582,6 @@ PictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats)
 	GlyphSetType = CreateNewResourceType (FreeGlyphSet);
 	if (!GlyphSetType)
 	    return FALSE;
-	PictureScreenPrivateIndex = AllocateScreenPrivateIndex();
-	if (PictureScreenPrivateIndex < 0)
-	    return FALSE;
-	PictureWindowPrivateIndex = AllocateWindowPrivateIndex();
 	PictureGeneration = serverGeneration;
 #ifdef XResExtension
 	RegisterResourceName (PictureType, "PICTURE");
@@ -648,9 +589,6 @@ PictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats)
 	RegisterResourceName (GlyphSetType, "GLYPHSET");
 #endif
     }
-    if (!AllocateWindowPrivate (pScreen, PictureWindowPrivateIndex, 0))
-	return FALSE;
-    
     if (!formats)
     {
 	formats = PictureCreateDefaultFormats (pScreen, &nformats);
@@ -697,18 +635,7 @@ PictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats)
 	return FALSE;
     }
     SetPictureScreen(pScreen, ps);
-    if (!GlyphInit (pScreen))
-    {
-	SetPictureScreen(pScreen, 0);
-	xfree (formats);
-	xfree (ps);
-	return FALSE;
-    }
 
-    ps->totalPictureSize = sizeof (PictureRec);
-    ps->PicturePrivateSizes = 0;
-    ps->PicturePrivateLen = 0;
-    
     ps->formats = formats;
     ps->fallback = formats;
     ps->nformats = nformats;
@@ -773,37 +700,6 @@ SetPictureToDefaults (PicturePtr    pPicture)
     pPicture->pSourcePict = 0;
 }
 
-PicturePtr
-AllocatePicture (ScreenPtr  pScreen)
-{
-    PictureScreenPtr	ps = GetPictureScreen(pScreen);
-    PicturePtr		pPicture;
-    char		*ptr;
-    DevUnion		*ppriv;
-    unsigned int    	*sizes;
-    unsigned int    	size;
-    int			i;
-
-    pPicture = (PicturePtr) xalloc (ps->totalPictureSize);
-    if (!pPicture)
-	return 0;
-    ppriv = (DevUnion *)(pPicture + 1);
-    pPicture->devPrivates = ppriv;
-    sizes = ps->PicturePrivateSizes;
-    ptr = (char *)(ppriv + ps->PicturePrivateLen);
-    for (i = ps->PicturePrivateLen; --i >= 0; ppriv++, sizes++)
-    {
-	if ( (size = *sizes) )
-	{
-	    ppriv->ptr = (pointer)ptr;
-	    ptr += size;
-	}
-	else
-	    ppriv->ptr = (pointer)NULL;
-    }
-    return pPicture;
-}
-
 PicturePtr
 CreatePicture (Picture		pid,
 	       DrawablePtr	pDrawable,
@@ -816,7 +712,7 @@ CreatePicture (Picture		pid,
     PicturePtr		pPicture;
     PictureScreenPtr	ps = GetPictureScreen(pDrawable->pScreen);
 
-    pPicture = AllocatePicture (pDrawable->pScreen);
+    pPicture = (PicturePtr)xalloc(sizeof(PictureRec));
     if (!pPicture)
     {
 	*error = BadAlloc;
@@ -827,6 +723,7 @@ CreatePicture (Picture		pid,
     pPicture->pDrawable = pDrawable;
     pPicture->pFormat = pFormat;
     pPicture->format = pFormat->format | (pDrawable->bitsPerPixel << 24);
+    pPicture->devPrivates = NULL;
     if (pDrawable->type == DRAWABLE_PIXMAP)
     {
 	++((PixmapPtr)pDrawable)->refcnt;
@@ -1607,7 +1504,8 @@ FreePicture (pointer	value,
                 WindowPtr	pWindow = (WindowPtr) pPicture->pDrawable;
                 PicturePtr	*pPrev;
 
-                for (pPrev = (PicturePtr *) &((pWindow)->devPrivates[PictureWindowPrivateIndex].ptr);
+                for (pPrev = (PicturePtr *)dixLookupPrivateAddr
+			 (&pWindow->devPrivates, PictureWindowPrivateKey);
                      *pPrev;
                      pPrev = &(*pPrev)->pNext)
                 {
@@ -1623,6 +1521,7 @@ FreePicture (pointer	value,
                 (*pScreen->DestroyPixmap) ((PixmapPtr)pPicture->pDrawable);
             }
         }
+	dixFreePrivates(pPicture->devPrivates);
 	xfree (pPicture);
     }
     return Success;
diff --git a/render/picturestr.h b/render/picturestr.h
index 005c58808..aafe4e80a 100644
--- a/render/picturestr.h
+++ b/render/picturestr.h
@@ -27,6 +27,7 @@
 #include "glyphstr.h"
 #include "scrnintstr.h"
 #include "resource.h"
+#include "privates.h"
 
 typedef struct _DirectFormat {
     CARD16	    red, redMask;
@@ -173,7 +174,7 @@ typedef struct _Picture {
 
     RegionPtr	    pCompositeClip;
 
-    DevUnion	    *devPrivates;
+    PrivateRec	    *devPrivates;
 
     PictTransform   *transform;
 
@@ -328,10 +329,6 @@ typedef void	(*UnrealizeGlyphProcPtr)    (ScreenPtr	    pScreen,
 					     GlyphPtr	    glyph);
 
 typedef struct _PictureScreen {
-    int				totalPictureSize;
-    unsigned int		*PicturePrivateSizes;
-    int				PicturePrivateLen;
-
     PictFormatPtr		formats;
     PictFormatPtr		fallback;
     int				nformats;
@@ -389,30 +386,25 @@ typedef struct _PictureScreen {
 
     AddTrapsProcPtr		AddTraps;
 
-    int			  	totalGlyphPrivateSize;
-    unsigned int	  	*glyphPrivateSizes;
-    int			  	glyphPrivateLen;
-    int			  	glyphPrivateOffset;
-
     RealizeGlyphProcPtr   	RealizeGlyph;
     UnrealizeGlyphProcPtr 	UnrealizeGlyph;
 
 } PictureScreenRec, *PictureScreenPtr;
 
-extern int		PictureScreenPrivateIndex;
-extern int		PictureWindowPrivateIndex;
+extern DevPrivateKey	PictureScreenPrivateKey;
+extern DevPrivateKey	PictureWindowPrivateKey;
 extern RESTYPE		PictureType;
 extern RESTYPE		PictFormatType;
 extern RESTYPE		GlyphSetType;
 
-#define GetPictureScreen(s) ((PictureScreenPtr) ((s)->devPrivates[PictureScreenPrivateIndex].ptr))
-#define GetPictureScreenIfSet(s) ((PictureScreenPrivateIndex != -1) ? GetPictureScreen(s) : NULL)
-#define SetPictureScreen(s,p) ((s)->devPrivates[PictureScreenPrivateIndex].ptr = (pointer) (p))
-#define GetPictureWindow(w) ((PicturePtr) ((w)->devPrivates[PictureWindowPrivateIndex].ptr))
-#define SetPictureWindow(w,p) ((w)->devPrivates[PictureWindowPrivateIndex].ptr = (pointer) (p))
+#define GetPictureScreen(s) ((PictureScreenPtr)dixLookupPrivate(&(s)->devPrivates, PictureScreenPrivateKey))
+#define GetPictureScreenIfSet(s) GetPictureScreen(s)
+#define SetPictureScreen(s,p) dixSetPrivate(&(s)->devPrivates, PictureScreenPrivateKey, p)
+#define GetPictureWindow(w) ((PicturePtr)dixLookupPrivate(&(w)->devPrivates, PictureWindowPrivateKey))
+#define SetPictureWindow(w,p) dixSetPrivate(&(w)->devPrivates, PictureWindowPrivateKey, p)
 
-#define GetGlyphPrivatesForScreen(glyph, s)				\
-    ((glyph)->devPrivates + (GetPictureScreen (s))->glyphPrivateOffset)
+#define GetGlyphPrivatesForScreen(glyph, s) \
+    ((PrivateRec **)dixLookupPrivateAddr(&(glyph)->devPrivates, s))
 
 #define VERIFY_PICTURE(pPicture, pid, client, mode, err) {\
     pPicture = SecurityLookupIDByType(client, pid, PictureType, mode);\
@@ -430,15 +422,6 @@ extern RESTYPE		GlyphSetType;
     } \
 } \
 
-void
-ResetPicturePrivateIndex (void);
-
-int
-AllocatePicturePrivateIndex (void);
-
-Bool
-AllocatePicturePrivate (ScreenPtr pScreen, int index2, unsigned int amount);
-
 Bool
 PictureDestroyWindow (WindowPtr pWindow);
 
@@ -501,9 +484,6 @@ PictureFinishInit (void);
 void
 SetPictureToDefaults (PicturePtr pPicture);
 
-PicturePtr
-AllocatePicture (ScreenPtr  pScreen);
-
 #if 0
 Bool
 miPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats);
diff --git a/render/render.c b/render/render.c
index e57ffb126..7b2745758 100644
--- a/render/render.c
+++ b/render/render.c
@@ -216,14 +216,14 @@ RenderResetProc (ExtensionEntry *extEntry);
 static CARD8	RenderReqCode;
 #endif
 int	RenderErrBase;
-int	RenderClientPrivateIndex;
+DevPrivateKey RenderClientPrivateKey;
 
 typedef struct _RenderClient {
     int	    major_version;
     int	    minor_version;
 } RenderClientRec, *RenderClientPtr;
 
-#define GetRenderClient(pClient)    ((RenderClientPtr) (pClient)->devPrivates[RenderClientPrivateIndex].ptr)
+#define GetRenderClient(pClient) ((RenderClientPtr)dixLookupPrivate(&(pClient)->devPrivates, RenderClientPrivateKey))
 
 static void
 RenderClientCallback (CallbackListPtr	*list,
@@ -247,9 +247,7 @@ RenderExtensionInit (void)
 	return;
     if (!PictureFinishInit ())
 	return;
-    RenderClientPrivateIndex = AllocateClientPrivateIndex ();
-    if (!AllocateClientPrivate (RenderClientPrivateIndex, 
-				sizeof (RenderClientRec)))
+    if (!dixRequestPrivate(RenderClientPrivateKey, sizeof(RenderClientRec)))
 	return;
     if (!AddCallback (&ClientStateCallback, RenderClientCallback, 0))
 	return;
@@ -268,8 +266,6 @@ RenderExtensionInit (void)
 static void
 RenderResetProc (ExtensionEntry *extEntry)
 {
-    ResetPicturePrivateIndex();
-    ResetGlyphSetPrivateIndex();
 }
 
 static int
diff --git a/xfixes/cursor.c b/xfixes/cursor.c
index 450f366f2..975ebc36d 100755
--- a/xfixes/cursor.c
+++ b/xfixes/cursor.c
@@ -55,8 +55,7 @@
 static RESTYPE		CursorClientType;
 static RESTYPE		CursorHideCountType;
 static RESTYPE		CursorWindowType;
-static int		CursorScreenPrivateIndex = -1;
-static int		CursorGeneration;
+static DevPrivateKey	CursorScreenPrivateKey = &CursorScreenPrivateKey;
 static CursorPtr	CursorCurrent;
 static CursorPtr        pInvisibleCursor = NULL;
 
@@ -113,9 +112,9 @@ typedef struct _CursorScreen {
     CursorHideCountPtr          pCursorHideCounts;
 } CursorScreenRec, *CursorScreenPtr;
 
-#define GetCursorScreen(s)	((CursorScreenPtr) ((s)->devPrivates[CursorScreenPrivateIndex].ptr))
-#define GetCursorScreenIfSet(s) ((CursorScreenPrivateIndex != -1) ? GetCursorScreen(s) : NULL)
-#define SetCursorScreen(s,p)	((s)->devPrivates[CursorScreenPrivateIndex].ptr = (pointer) (p))
+#define GetCursorScreen(s) ((CursorScreenPtr)dixLookupPrivate(&(s)->devPrivates, CursorScreenPrivateKey))
+#define GetCursorScreenIfSet(s) GetCursorScreen(s)
+#define SetCursorScreen(s,p) dixSetPrivate(&(s)->devPrivates, CursorScreenPrivateKey, p)
 #define Wrap(as,s,elt,func)	(((as)->elt = (s)->elt), (s)->elt = func)
 #define Unwrap(as,s,elt)	((s)->elt = (as)->elt)
 
@@ -171,8 +170,6 @@ CursorCloseScreen (int index, ScreenPtr pScreen)
     deleteCursorHideCountsForScreen(pScreen);
     ret = (*pScreen->CloseScreen) (index, pScreen);
     xfree (cs);
-    if (index == 0)
-	CursorScreenPrivateIndex = -1;
     return ret;
 }
 
@@ -1011,13 +1008,6 @@ XFixesCursorInit (void)
 {
     int	i;
     
-    if (CursorGeneration != serverGeneration)
-    {
-	CursorScreenPrivateIndex = AllocateScreenPrivateIndex ();
-	if (CursorScreenPrivateIndex < 0)
-	    return FALSE;
-	CursorGeneration = serverGeneration;
-    }
     for (i = 0; i < screenInfo.numScreens; i++)
     {
 	ScreenPtr	pScreen = screenInfo.screens[i];
diff --git a/xfixes/xfixes.c b/xfixes/xfixes.c
index 32dee8a18..0db49895e 100755
--- a/xfixes/xfixes.c
+++ b/xfixes/xfixes.c
@@ -56,7 +56,7 @@
 static unsigned char	XFixesReqCode;
 int		XFixesEventBase;
 int		XFixesErrorBase;
-static int	XFixesClientPrivateIndex;
+static DevPrivateKey XFixesClientPrivateKey = &XFixesClientPrivateKey;
 
 static int
 ProcXFixesQueryVersion(ClientPtr client)
@@ -239,9 +239,7 @@ XFixesExtensionInit(void)
 {
     ExtensionEntry *extEntry;
 
-    XFixesClientPrivateIndex = AllocateClientPrivateIndex ();
-    if (!AllocateClientPrivate (XFixesClientPrivateIndex, 
-				sizeof (XFixesClientRec)))
+    if (!dixRequestPrivate(XFixesClientPrivateKey, sizeof (XFixesClientRec)))
 	return;
     if (!AddCallback (&ClientStateCallback, XFixesClientCallback, 0))
 	return;
diff --git a/xfixes/xfixesint.h b/xfixes/xfixesint.h
index 48927ae0f..33a3205ed 100755
--- a/xfixes/xfixesint.h
+++ b/xfixes/xfixesint.h
@@ -66,7 +66,7 @@ typedef struct _XFixesClient {
     CARD32	minor_version;
 } XFixesClientRec, *XFixesClientPtr;
 
-#define GetXFixesClient(pClient)    ((XFixesClientPtr) (pClient)->devPrivates[XFixesClientPrivateIndex].ptr)
+#define GetXFixesClient(pClient) ((XFixesClientPtr)dixLookupPrivate(&(pClient)->devPrivates, XFixesClientPrivateKey))
 
 extern int	(*ProcXFixesVector[XFixesNumberRequests])(ClientPtr);
 
diff --git a/xkb/ddxFakeMtn.c b/xkb/ddxFakeMtn.c
index 1060afe99..320e0ca33 100644
--- a/xkb/ddxFakeMtn.c
+++ b/xkb/ddxFakeMtn.c
@@ -107,7 +107,7 @@ ScreenPtr	   pScreen, oldScreen;
 	     oldY=  y;
 	else oldY+= y;
 
-#define GetScreenPrivate(s) ((miPointerScreenPtr) ((s)->devPrivates[miPointerScreenIndex].ptr))	
+#define GetScreenPrivate(s) ((miPointerScreenPtr)dixLookupPrivate(&(s)->devPrivates, miPointerScreenKey))
 	(*(GetScreenPrivate(oldScreen))->screenFuncs->CursorOffScreen)
 	    (&pScreen, &oldX, &oldY);
     }
diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
index 2e0c89fc2..7f0f74db1 100644
--- a/xkb/xkbActions.c
+++ b/xkb/xkbActions.c
@@ -40,8 +40,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "xkb.h"
 #include <ctype.h>
 
-static unsigned int _xkbServerGeneration;
-static int xkbDevicePrivateIndex = -1;
+static DevPrivateKey xkbDevicePrivateKey = &xkbDevicePrivateKey;
 
 static void
 xkbUnwrapProc(DeviceIntPtr device, DeviceHandleProc proc,
@@ -64,20 +63,12 @@ XkbSetExtension(DeviceIntPtr device, ProcessInputProc proc)
 {
     xkbDeviceInfoPtr xkbPrivPtr;
 
-    if (serverGeneration != _xkbServerGeneration) {
-	if ((xkbDevicePrivateIndex = AllocateDevicePrivateIndex()) == -1)
-	    return;
-	_xkbServerGeneration = serverGeneration;
-    }
-    if (!AllocateDevicePrivate(device, xkbDevicePrivateIndex))
-	return;
-
     xkbPrivPtr = (xkbDeviceInfoPtr) xalloc(sizeof(xkbDeviceInfoRec));
     if (!xkbPrivPtr)
 	return;
     xkbPrivPtr->unwrapProc = NULL;
 
-    device->devPrivates[xkbDevicePrivateIndex].ptr = xkbPrivPtr;
+    dixSetPrivate(&device->devPrivates, xkbDevicePrivateKey, xkbPrivPtr);
     WRAP_PROCESS_INPUT_PROC(device,xkbPrivPtr,
 			    proc,xkbUnwrapProc);
 }

From 41355a53c29bbf879da0c6ea562294fcc7ef89ff Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 28 Aug 2007 15:10:20 -0400
Subject: [PATCH 094/552] xace: add hooks + new access codes: core protocol
 input requests

---
 Xext/xace.c    |   2 +-
 Xext/xacestr.h |   2 +-
 dix/devices.c  | 129 ++++++++++++++++++++++++++++++++++++-------------
 dix/events.c   | 124 ++++++++++++++++++++++++++++++-----------------
 dix/grabs.c    |  10 ++++
 5 files changed, 188 insertions(+), 79 deletions(-)

diff --git a/Xext/xace.c b/Xext/xace.c
index 54e910f82..4d34dc3d9 100644
--- a/Xext/xace.c
+++ b/Xext/xace.c
@@ -84,7 +84,7 @@ int XaceHook(int hook, ...)
 	    XaceDeviceAccessRec rec = {
 		va_arg(ap, ClientPtr),
 		va_arg(ap, DeviceIntPtr),
-		va_arg(ap, Bool),
+		va_arg(ap, Mask),
 		Success /* default allow */
 	    };
 	    calldata = &rec;
diff --git a/Xext/xacestr.h b/Xext/xacestr.h
index 10c625b18..c98be3d32 100644
--- a/Xext/xacestr.h
+++ b/Xext/xacestr.h
@@ -50,7 +50,7 @@ typedef struct {
 typedef struct {
     ClientPtr client;
     DeviceIntPtr dev;
-    Bool fromRequest;
+    Mask access_mode;
     int status;
 } XaceDeviceAccessRec;
 
diff --git a/dix/devices.c b/dix/devices.c
index a62ab6580..dfbd2bfd8 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -1271,10 +1271,10 @@ AllModifierKeysAreUp(dev, map1, per1, map2, per2)
 
 static int
 DoSetModifierMapping(ClientPtr client, KeyCode *inputMap,
-                     int numKeyPerModifier)
+                     int numKeyPerModifier, xSetModifierMappingReply *rep)
 {
     DeviceIntPtr pDev = NULL;
-    int i = 0, inputMapLen = numKeyPerModifier * 8;
+    int rc, i = 0, inputMapLen = numKeyPerModifier * 8;
 
     for (pDev = inputInfo.devices; pDev; pDev = pDev->next) {
         if ((pDev->coreEvents || pDev == inputInfo.keyboard) && pDev->key) {
@@ -1289,8 +1289,9 @@ DoSetModifierMapping(ClientPtr client, KeyCode *inputMap,
                 }
             }
 
-            if (XaceHook(XACE_DEVICE_ACCESS, client, pDev, TRUE) != Success)
-                return BadAccess;
+	    rc = XaceHook(XACE_DEVICE_ACCESS, client, pDev, DixSetAttrAccess);
+	    if (rc != Success)
+		return rc;
 
             /* None of the modifiers (old or new) may be down while we change
              * the map. */
@@ -1300,7 +1301,8 @@ DoSetModifierMapping(ClientPtr client, KeyCode *inputMap,
                 !AllModifierKeysAreUp(pDev, inputMap, numKeyPerModifier,
                                       pDev->key->modifierKeyMap,
                                       pDev->key->maxKeysPerModifier)) {
-                return MappingBusy;
+		rep->success = MappingBusy;
+                return Success;
             }
         }
     }
@@ -1337,6 +1339,7 @@ DoSetModifierMapping(ClientPtr client, KeyCode *inputMap,
         }
     }
 
+    rep->success = Success;
     return Success;
 }
 
@@ -1344,8 +1347,8 @@ int
 ProcSetModifierMapping(ClientPtr client)
 {
     xSetModifierMappingReply rep;
+    int rc;
     REQUEST(xSetModifierMappingReq);
-    
     REQUEST_AT_LEAST_SIZE(xSetModifierMappingReq);
 
     if (client->req_len != ((stuff->numKeyPerModifier << 1) +
@@ -1356,8 +1359,10 @@ ProcSetModifierMapping(ClientPtr client)
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
 
-    rep.success = DoSetModifierMapping(client, (KeyCode *)&stuff[1],
-                                       stuff->numKeyPerModifier);
+    rc = DoSetModifierMapping(client, (KeyCode *)&stuff[1],
+			      stuff->numKeyPerModifier, &rep);
+    if (rc != Success)
+	return rc;
 
     /* FIXME: Send mapping notifies for all the extended devices as well. */
     SendMappingNotify(MappingModifier, 0, 0, client);
@@ -1370,8 +1375,14 @@ ProcGetModifierMapping(ClientPtr client)
 {
     xGetModifierMappingReply rep;
     KeyClassPtr keyc = inputInfo.keyboard->key;
-
+    int rc;
     REQUEST_SIZE_MATCH(xReq);
+
+    rc = XaceHook(XACE_DEVICE_ACCESS, client, inputInfo.keyboard,
+		  DixGetAttrAccess);
+    if (rc != Success)
+	return rc;
+
     rep.type = X_Reply;
     rep.numKeyPerModifier = keyc->maxKeysPerModifier;
     rep.sequenceNumber = client->sequence;
@@ -1394,6 +1405,7 @@ ProcChangeKeyboardMapping(ClientPtr client)
     KeySymsRec keysyms;
     KeySymsPtr curKeySyms = &inputInfo.keyboard->key->curKeySyms;
     DeviceIntPtr pDev = NULL;
+    int rc;
     REQUEST_AT_LEAST_SIZE(xChangeKeyboardMappingReq);
 
     len = client->req_len - (sizeof(xChangeKeyboardMappingReq) >> 2);  
@@ -1414,8 +1426,9 @@ ProcChangeKeyboardMapping(ClientPtr client)
 
     for (pDev = inputInfo.devices; pDev; pDev = pDev->next) {
         if ((pDev->coreEvents || pDev == inputInfo.keyboard) && pDev->key) {
-            if (XaceHook(XACE_DEVICE_ACCESS, client, pDev, TRUE) != Success)
-                return BadAccess;
+            rc = XaceHook(XACE_DEVICE_ACCESS, client, pDev, DixSetAttrAccess);
+	    if (rc != Success)
+                return rc;
         }
     }
 
@@ -1437,14 +1450,22 @@ ProcChangeKeyboardMapping(ClientPtr client)
 }
 
 static int
-DoSetPointerMapping(DeviceIntPtr device, BYTE *map, int n)
+DoSetPointerMapping(ClientPtr client, DeviceIntPtr device, BYTE *map, int n)
 {
-    int i = 0;
+    int rc, i = 0;
     DeviceIntPtr dev = NULL;
 
     if (!device || !device->button)
         return BadDevice;
 
+    for (dev = inputInfo.devices; dev; dev = dev->next) {
+        if ((dev->coreEvents || dev == inputInfo.pointer) && dev->button) {
+	    rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixSetAttrAccess);
+	    if (rc != Success)
+		return rc;
+	}
+    }
+
     for (dev = inputInfo.devices; dev; dev = dev->next) {
         if ((dev->coreEvents || dev == inputInfo.pointer) && dev->button) {
             for (i = 0; i < n; i++) {
@@ -1469,12 +1490,12 @@ DoSetPointerMapping(DeviceIntPtr device, BYTE *map, int n)
 int
 ProcSetPointerMapping(ClientPtr client)
 {
-    REQUEST(xSetPointerMappingReq);
     BYTE *map;
     int ret;
     xSetPointerMappingReply rep;
-
+    REQUEST(xSetPointerMappingReq);
     REQUEST_AT_LEAST_SIZE(xSetPointerMappingReq);
+
     if (client->req_len != (sizeof(xSetPointerMappingReq)+stuff->nElts+3) >> 2)
 	return BadLength;
     rep.type = X_Reply;
@@ -1492,7 +1513,7 @@ ProcSetPointerMapping(ClientPtr client)
     if (BadDeviceMap(&map[0], (int)stuff->nElts, 1, 255, &client->errorValue))
 	return BadValue;
 
-    ret = DoSetPointerMapping(inputInfo.pointer, map, stuff->nElts);
+    ret = DoSetPointerMapping(client, inputInfo.pointer, map, stuff->nElts);
     if (ret != Success) {
         rep.success = ret;
         WriteReplyToClient(client, sizeof(xSetPointerMappingReply), &rep);
@@ -1509,11 +1530,16 @@ int
 ProcGetKeyboardMapping(ClientPtr client)
 {
     xGetKeyboardMappingReply rep;
-    REQUEST(xGetKeyboardMappingReq);
     KeySymsPtr curKeySyms = &inputInfo.keyboard->key->curKeySyms;
-
+    int rc;
+    REQUEST(xGetKeyboardMappingReq);
     REQUEST_SIZE_MATCH(xGetKeyboardMappingReq);
 
+    rc = XaceHook(XACE_DEVICE_ACCESS, client, inputInfo.keyboard,
+		  DixGetAttrAccess);
+    if (rc != Success)
+	return rc;
+
     if ((stuff->firstKeyCode < curKeySyms->minKeyCode) ||
         (stuff->firstKeyCode > curKeySyms->maxKeyCode)) {
 	client->errorValue = stuff->firstKeyCode;
@@ -1546,8 +1572,14 @@ ProcGetPointerMapping(ClientPtr client)
 {
     xGetPointerMappingReply rep;
     ButtonClassPtr butc = inputInfo.pointer->button;
-
+    int rc;
     REQUEST_SIZE_MATCH(xReq);
+
+    rc = XaceHook(XACE_DEVICE_ACCESS, client, inputInfo.pointer,
+		  DixGetAttrAccess);
+    if (rc != Success)
+	return rc;
+
     rep.type = X_Reply;
     rep.sequenceNumber = client->sequence;
     rep.nElts = butc->numButtons;
@@ -1766,8 +1798,9 @@ ProcChangeKeyboardControl (ClientPtr client)
     for (pDev = inputInfo.devices; pDev; pDev = pDev->next) {
         if ((pDev->coreEvents || pDev == inputInfo.keyboard) &&
             pDev->kbdfeed && pDev->kbdfeed->CtrlProc) {
-            if (XaceHook(XACE_DEVICE_ACCESS, client, pDev, TRUE) != Success)
-                return BadAccess;
+            ret = XaceHook(XACE_DEVICE_ACCESS, client, pDev, DixSetAttrAccess);
+	    if (ret != Success)
+                return ret;
         }
     }
 
@@ -1786,11 +1819,16 @@ ProcChangeKeyboardControl (ClientPtr client)
 int
 ProcGetKeyboardControl (ClientPtr client)
 {
-    int i;
+    int rc, i;
     KeybdCtrl *ctrl = &inputInfo.keyboard->kbdfeed->ctrl;
     xGetKeyboardControlReply rep;
-
     REQUEST_SIZE_MATCH(xReq);
+
+    rc = XaceHook(XACE_DEVICE_ACCESS, client, inputInfo.keyboard,
+		  DixGetAttrAccess);
+    if (rc != Success)
+	return rc;
+
     rep.type = X_Reply;
     rep.length = 5;
     rep.sequenceNumber = client->sequence;
@@ -1812,6 +1850,7 @@ ProcBell(ClientPtr client)
     DeviceIntPtr keybd = inputInfo.keyboard;
     int base = keybd->kbdfeed->ctrl.bell;
     int newpercent;
+    int rc;
     REQUEST(xBellReq);
     REQUEST_SIZE_MATCH(xBellReq);
 
@@ -1832,6 +1871,10 @@ ProcBell(ClientPtr client)
     for (keybd = inputInfo.devices; keybd; keybd = keybd->next) {
         if ((keybd->coreEvents || keybd == inputInfo.keyboard) &&
             keybd->kbdfeed && keybd->kbdfeed->BellProc) {
+
+	    rc = XaceHook(XACE_DEVICE_ACCESS, client, keybd, DixBellAccess);
+	    if (rc != Success)
+		return rc;
 #ifdef XKB
             if (!noXkbExtension)
                 XkbHandleBell(FALSE, FALSE, keybd, newpercent,
@@ -1851,8 +1894,8 @@ ProcChangePointerControl(ClientPtr client)
 {
     DeviceIntPtr mouse = inputInfo.pointer;
     PtrCtrl ctrl;		/* might get BadValue part way through */
+    int rc;
     REQUEST(xChangePointerControlReq);
-
     REQUEST_SIZE_MATCH(xChangePointerControlReq);
     
     if (!mouse->ptrfeed->CtrlProc)
@@ -1903,6 +1946,14 @@ ProcChangePointerControl(ClientPtr client)
         }
     }
 
+    for (mouse = inputInfo.devices; mouse; mouse = mouse->next) {
+        if ((mouse->coreEvents || mouse == inputInfo.pointer) &&
+            mouse->ptrfeed && mouse->ptrfeed->CtrlProc) {
+	    rc = XaceHook(XACE_DEVICE_ACCESS, client, mouse, DixSetAttrAccess);
+	    if (rc != Success)
+		return rc;
+	}
+    }
 
     for (mouse = inputInfo.devices; mouse; mouse = mouse->next) {
         if ((mouse->coreEvents || mouse == inputInfo.pointer) &&
@@ -1920,8 +1971,14 @@ ProcGetPointerControl(ClientPtr client)
 {
     PtrCtrl *ctrl = &inputInfo.pointer->ptrfeed->ctrl;
     xGetPointerControlReply rep;
-
+    int rc;
     REQUEST_SIZE_MATCH(xReq);
+
+    rc = XaceHook(XACE_DEVICE_ACCESS, client, inputInfo.pointer,
+		  DixGetAttrAccess);
+    if (rc != Success)
+	return rc;
+
     rep.type = X_Reply;
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
@@ -1959,11 +2016,15 @@ ProcGetMotionEvents(ClientPtr client)
     DeviceIntPtr mouse = inputInfo.pointer;
     TimeStamp start, stop;
     REQUEST(xGetMotionEventsReq);
-
     REQUEST_SIZE_MATCH(xGetMotionEventsReq);
-    rc = dixLookupWindow(&pWin, stuff->window, client, DixUnknownAccess);
+
+    rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
     if (rc != Success)
 	return rc;
+    rc = XaceHook(XACE_DEVICE_ACCESS, client, mouse, DixReadAccess);
+    if (rc != Success)
+	return rc;
+
     if (mouse->valuator->motionHintWindow)
 	MaybeStopHint(mouse, client);
     rep.type = X_Reply;
@@ -2019,7 +2080,7 @@ int
 ProcQueryKeymap(ClientPtr client)
 {
     xQueryKeymapReply rep;
-    int i;
+    int rc, i;
     CARD8 *down = inputInfo.keyboard->key->down;
 
     REQUEST_SIZE_MATCH(xReq);
@@ -2027,11 +2088,13 @@ ProcQueryKeymap(ClientPtr client)
     rep.sequenceNumber = client->sequence;
     rep.length = 2;
 
-    if (XaceHook(XACE_DEVICE_ACCESS, client, inputInfo.keyboard, TRUE))
-	bzero((char *)&rep.map[0], 32);
-    else
-	for (i = 0; i<32; i++)
-	    rep.map[i] = down[i];
+    rc = XaceHook(XACE_DEVICE_ACCESS, client, inputInfo.keyboard,
+		  DixReadAccess);
+    if (rc != Success)
+	return rc;
+
+    for (i = 0; i<32; i++)
+	rep.map[i] = down[i];
 
     WriteReplyToClient(client, sizeof(xQueryKeymapReply), &rep);
     return Success;
diff --git a/dix/events.c b/dix/events.c
index f109dad4d..deae4e340 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -2523,18 +2523,24 @@ ProcWarpPointer(ClientPtr client)
     WindowPtr	dest = NULL;
     int		x, y, rc;
     ScreenPtr	newScreen;
-
+    DeviceIntPtr dev;
     REQUEST(xWarpPointerReq);
-
     REQUEST_SIZE_MATCH(xWarpPointerReq);
 
+    for (dev = inputInfo.devices; dev; dev = dev->next) {
+        if ((dev->coreEvents || dev == inputInfo.pointer) && dev->button) {
+	    rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixWriteAccess);
+	    if (rc != Success)
+		return rc;
+	}
+    }
 #ifdef PANORAMIX
     if(!noPanoramiXExtension)
 	return XineramaWarpPointer(client);
 #endif
 
     if (stuff->dstWid != None) {
-	rc = dixLookupWindow(&dest, stuff->dstWid, client, DixReadAccess);
+	rc = dixLookupWindow(&dest, stuff->dstWid, client, DixGetAttrAccess);
 	if (rc != Success)
 	    return rc;
     }
@@ -2547,7 +2553,7 @@ ProcWarpPointer(ClientPtr client)
  	XID 	winID = stuff->srcWid;
         WindowPtr source;
 	
-	rc = dixLookupWindow(&source, winID, client, DixReadAccess);
+	rc = dixLookupWindow(&source, winID, client, DixGetAttrAccess);
 	if (rc != Success)
 	    return rc;
 
@@ -2689,8 +2695,6 @@ CheckPassiveGrabsOnWindow(
 	     (grab->confineTo->realized && 
 				BorderSizeNotEmpty(grab->confineTo))))
 	{
-	    if (XaceHook(XACE_DEVICE_ACCESS, wClient(pWin), device, FALSE))
-		return FALSE;
 #ifdef XKB
 	    if (!noXkbExtension) {
 		XE_KBPTR.state &= 0x1f00;
@@ -3546,10 +3550,10 @@ EnterLeaveEvent(
 	xKeymapEvent ke;
 	ClientPtr client = grab ? rClient(grab)
 				: clients[CLIENT_ID(pWin->drawable.id)];
-	if (XaceHook(XACE_DEVICE_ACCESS, client, keybd, FALSE) == Success)
-	    memmove((char *)&ke.map[0], (char *)&keybd->key->down[1], 31);
-	else
+	if (XaceHook(XACE_DEVICE_ACCESS, client, keybd, DixReadAccess))
 	    bzero((char *)&ke.map[0], 31);
+	else
+	    memmove((char *)&ke.map[0], (char *)&keybd->key->down[1], 31);
 
 	ke.type = KeymapNotify;
 	if (grab)
@@ -3653,10 +3657,10 @@ FocusEvent(DeviceIntPtr dev, int type, int mode, int detail, WindowPtr pWin)
     {
 	xKeymapEvent ke;
 	ClientPtr client = clients[CLIENT_ID(pWin->drawable.id)];
-	if (XaceHook(XACE_DEVICE_ACCESS, client, dev, FALSE) == Success)
-	    memmove((char *)&ke.map[0], (char *)&dev->key->down[1], 31);
-	else
+	if (XaceHook(XACE_DEVICE_ACCESS, client, dev, DixReadAccess))
 	    bzero((char *)&ke.map[0], 31);
+	else
+	    memmove((char *)&ke.map[0], (char *)&dev->key->down[1], 31);
 
 	ke.type = KeymapNotify;
 	(void)DeliverEventsToWindow(pWin, (xEvent *)&ke, 1,
@@ -3881,7 +3885,7 @@ SetInputFocus(
     else if ((focusID == FollowKeyboard) && followOK)
 	focusWin = inputInfo.keyboard->focus->win;
     else {
-	rc = dixLookupWindow(&focusWin, focusID, client, DixReadAccess);
+	rc = dixLookupWindow(&focusWin, focusID, client, DixSetAttrAccess);
 	if (rc != Success)
 	    return rc;
  	/* It is a match error to try to set the input focus to an 
@@ -3889,6 +3893,10 @@ SetInputFocus(
 	if(!focusWin->realized)
 	    return(BadMatch);
     }
+    rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixSetFocusAccess);
+    if (rc != Success)
+	return Success;
+
     focus = dev->focus;
     if ((CompareTimeStamps(time, currentTime) == LATER) ||
 	(CompareTimeStamps(time, focus->time) == EARLIER))
@@ -3941,9 +3949,6 @@ ProcSetInputFocus(client)
 
     REQUEST_SIZE_MATCH(xSetInputFocusReq);
 
-    if (XaceHook(XACE_DEVICE_ACCESS, client, inputInfo.keyboard, TRUE))
-	return Success;
-
     return SetInputFocus(client, inputInfo.keyboard, stuff->focus,
 			 stuff->revertTo, stuff->time, FALSE);
 }
@@ -3958,10 +3963,16 @@ int
 ProcGetInputFocus(ClientPtr client)
 {
     xGetInputFocusReply rep;
-    /* REQUEST(xReq); */
     FocusClassPtr focus = inputInfo.keyboard->focus;
-
+    int rc;
+    /* REQUEST(xReq); */
     REQUEST_SIZE_MATCH(xReq);
+
+    rc = XaceHook(XACE_DEVICE_ACCESS, client, inputInfo.keyboard,
+		  DixGetFocusAccess);
+    if (rc != Success)
+	return rc;
+
     rep.type = X_Reply;
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
@@ -3991,6 +4002,7 @@ ProcGrabPointer(ClientPtr client)
     CursorPtr cursor, oldCursor;
     REQUEST(xGrabPointerReq);
     TimeStamp time;
+    Mask access_mode = DixGrabAccess;
     int rc;
 
     REQUEST_SIZE_MATCH(xGrabPointerReq);
@@ -4017,7 +4029,7 @@ ProcGrabPointer(ClientPtr client)
 	client->errorValue = stuff->eventMask;
         return BadValue;
     }
-    rc = dixLookupWindow(&pWin, stuff->grabWindow, client, DixReadAccess);
+    rc = dixLookupWindow(&pWin, stuff->grabWindow, client, DixSetAttrAccess);
     if (rc != Success)
 	return rc;
     if (stuff->confineTo == None)
@@ -4025,7 +4037,7 @@ ProcGrabPointer(ClientPtr client)
     else 
     {
 	rc = dixLookupWindow(&confineTo, stuff->confineTo, client,
-			     DixReadAccess);
+			     DixSetAttrAccess);
 	if (rc != Success)
 	    return rc;
     }
@@ -4033,14 +4045,22 @@ ProcGrabPointer(ClientPtr client)
 	cursor = NullCursor;
     else
     {
-	cursor = (CursorPtr)SecurityLookupIDByType(client, stuff->cursor,
-						RT_CURSOR, DixReadAccess);
-	if (!cursor)
+	rc = dixLookupResource((pointer *)&cursor, stuff->cursor, RT_CURSOR,
+			       client, DixUseAccess);
+	if (rc != Success)
 	{
 	    client->errorValue = stuff->cursor;
-	    return BadCursor;
+	    return (rc == BadValue) ? BadCursor : rc;
 	}
+	access_mode |= DixForceAccess;
     }
+    if (stuff->pointerMode == GrabModeSync ||
+	stuff->keyboardMode == GrabModeSync)
+	access_mode |= DixFreezeAccess;
+    rc = XaceHook(XACE_DEVICE_ACCESS, client, device, access_mode);
+    if (rc != Success)
+	return rc;
+
 	/* at this point, some sort of reply is guaranteed. */
     time = ClientTimeToServerTime(stuff->time);
     rep.type = X_Reply;
@@ -4192,6 +4212,7 @@ GrabDevice(ClientPtr client, DeviceIntPtr dev,
     WindowPtr pWin;
     GrabPtr grab;
     TimeStamp time;
+    Mask access_mode = DixGrabAccess;
     int rc;
 
     UpdateCurrentTime();
@@ -4210,9 +4231,16 @@ GrabDevice(ClientPtr client, DeviceIntPtr dev,
 	client->errorValue = ownerEvents;
         return BadValue;
     }
-    rc = dixLookupWindow(&pWin, grabWindow, client, DixReadAccess);
+
+    rc = dixLookupWindow(&pWin, grabWindow, client, DixSetAttrAccess);
     if (rc != Success)
 	return rc;
+    if (this_mode == GrabModeSync || other_mode == GrabModeSync)
+	access_mode |= DixFreezeAccess;
+    rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, access_mode);
+    if (rc != Success)
+	return rc;
+
     time = ClientTimeToServerTime(ctime);
     grab = dev->grab;
     if (grab && !SameClient(grab, client))
@@ -4256,14 +4284,10 @@ ProcGrabKeyboard(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xGrabKeyboardReq);
 
-    if (XaceHook(XACE_DEVICE_ACCESS, client, inputInfo.keyboard, TRUE)) {
-	result = Success;
-	rep.status = AlreadyGrabbed;
-    } else
-        result = GrabDevice(client, inputInfo.keyboard, stuff->keyboardMode,
-			    stuff->pointerMode, stuff->grabWindow,
-			    stuff->ownerEvents, stuff->time,
-			    KeyPressMask | KeyReleaseMask, &rep.status);
+    result = GrabDevice(client, inputInfo.keyboard, stuff->keyboardMode,
+			stuff->pointerMode, stuff->grabWindow,
+			stuff->ownerEvents, stuff->time,
+			KeyPressMask | KeyReleaseMask, &rep.status);
 
     if (result != Success)
 	return result;
@@ -4308,14 +4332,18 @@ ProcQueryPointer(ClientPtr client)
 {
     xQueryPointerReply rep;
     WindowPtr pWin, t;
-    REQUEST(xResourceReq);
     DeviceIntPtr mouse = inputInfo.pointer;
     int rc;
-
+    REQUEST(xResourceReq);
     REQUEST_SIZE_MATCH(xResourceReq);
-    rc = dixLookupWindow(&pWin, stuff->id, client, DixReadAccess);
+
+    rc = dixLookupWindow(&pWin, stuff->id, client, DixGetAttrAccess);
     if (rc != Success)
 	return rc;
+    rc = XaceHook(XACE_DEVICE_ACCESS, client, mouse, DixReadAccess);
+    if (rc != Success)
+	return rc;
+
     if (mouse->valuator->motionHintWindow)
 	MaybeStopHint(mouse, client);
     rep.type = X_Reply;
@@ -4488,7 +4516,7 @@ ProcSendEvent(ClientPtr client)
 	    effectiveFocus = pWin = inputFocus;
     }
     else
-	dixLookupWindow(&pWin, stuff->destination, client, DixReadAccess);
+	dixLookupWindow(&pWin, stuff->destination, client, DixSendAccess);
 
     if (!pWin)
 	return BadWindow;
@@ -4612,7 +4640,7 @@ ProcGrabKey(ClientPtr client)
 	client->errorValue = stuff->modifiers;
 	return BadValue;
     }
-    rc = dixLookupWindow(&pWin, stuff->grabWindow, client, DixReadAccess);
+    rc = dixLookupWindow(&pWin, stuff->grabWindow, client, DixSetAttrAccess);
     if (rc != Success)
 	return rc;
 
@@ -4640,6 +4668,7 @@ ProcGrabButton(ClientPtr client)
     REQUEST(xGrabButtonReq);
     CursorPtr cursor;
     GrabPtr grab;
+    Mask access_mode = DixGrabAccess;
     int rc;
 
     REQUEST_SIZE_MATCH(xGrabButtonReq);
@@ -4671,14 +4700,14 @@ ProcGrabButton(ClientPtr client)
 	client->errorValue = stuff->eventMask;
         return BadValue;
     }
-    rc = dixLookupWindow(&pWin, stuff->grabWindow, client, DixReadAccess);
+    rc = dixLookupWindow(&pWin, stuff->grabWindow, client, DixSetAttrAccess);
     if (rc != Success)
 	return rc;
     if (stuff->confineTo == None)
        confineTo = NullWindow;
     else {
 	rc = dixLookupWindow(&confineTo, stuff->confineTo, client,
-			     DixReadAccess);
+			     DixSetAttrAccess);
 	if (rc != Success)
 	    return rc;
     }
@@ -4686,15 +4715,22 @@ ProcGrabButton(ClientPtr client)
 	cursor = NullCursor;
     else
     {
-	cursor = (CursorPtr)SecurityLookupIDByType(client, stuff->cursor,
-						RT_CURSOR, DixReadAccess);
+	rc = dixLookupResource((pointer *)&cursor, stuff->cursor, RT_CURSOR,
+			       client, DixUseAccess);
+	if (rc != Success)
 	if (!cursor)
 	{
 	    client->errorValue = stuff->cursor;
-	    return BadCursor;
+	    return (rc == BadValue) ? BadCursor : rc;
 	}
+	access_mode |= DixForceAccess;
     }
-
+    if (stuff->pointerMode == GrabModeSync ||
+	stuff->keyboardMode == GrabModeSync)
+	access_mode |= DixFreezeAccess;
+    rc = XaceHook(XACE_DEVICE_ACCESS, client, inputInfo.pointer, access_mode);
+    if (rc != Success)
+	return rc;
 
     grab = CreateGrab(client->index, inputInfo.pointer, pWin, 
         (Mask)stuff->eventMask, (Bool)stuff->ownerEvents,
diff --git a/dix/grabs.c b/dix/grabs.c
index 2210cd05e..b8d0df88d 100644
--- a/dix/grabs.c
+++ b/dix/grabs.c
@@ -58,6 +58,7 @@ SOFTWARE.
 #include "inputstr.h"
 #include "cursorstr.h"
 #include "dixgrabs.h"
+#include "xace.h"
 
 #define BITMASK(i) (((Mask)1) << ((i) & 31))
 #define MASKIDX(i) ((i) >> 5)
@@ -309,6 +310,8 @@ int
 AddPassiveGrabToList(GrabPtr pGrab)
 {
     GrabPtr grab;
+    Mask access_mode = DixGrabAccess;
+    int rc;
 
     for (grab = wPassiveGrabs(pGrab->window); grab; grab = grab->next)
     {
@@ -322,6 +325,13 @@ AddPassiveGrabToList(GrabPtr pGrab)
 	}
     }
 
+    if (grab->keyboardMode == GrabModeSync || grab->pointerMode == GrabModeSync)
+	access_mode |= DixFreezeAccess;
+    rc = XaceHook(XACE_DEVICE_ACCESS, clients[CLIENT_ID(grab->resource)],
+		  grab->device, access_mode);
+    if (rc != Success)
+	return rc;
+
     /* Remove all grabs that match the new one exactly */
     for (grab = wPassiveGrabs(pGrab->window); grab; grab = grab->next)
     {

From e39694789e31e221fc8dec44ace9c697daf7acad Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 29 Aug 2007 14:16:46 -0400
Subject: [PATCH 095/552] xace: drop map-window checking hook, add new hooks
 for controlling the delivery of events to windows and clients.

This is tentative.  It's likely that an additional last-resort hook will
be necessary for code that calls TryClientEvents or WriteEventsToClient
directly.  It's also possible that new xace machinery will be necessary
to classify events and pull useful resource ID's out of them.

The failure case also needs some thinking through.  Should event delivery
"succeed" or should it report undeliverable?

Finally, XKB appears to call WriteToClient to pass events.  Sigh.
---
 Xext/xace.c    | 19 +++++++++++++++++--
 Xext/xace.h    | 25 +++++++++++++------------
 Xext/xacestr.h | 16 ++++++++++++++--
 dix/events.c   | 35 ++++++++++++++++++++++++++++-------
 dix/window.c   |  5 +++--
 5 files changed, 75 insertions(+), 25 deletions(-)

diff --git a/Xext/xace.c b/Xext/xace.c
index 4d34dc3d9..3091ecd32 100644
--- a/Xext/xace.c
+++ b/Xext/xace.c
@@ -113,10 +113,25 @@ int XaceHook(int hook, ...)
 	    prv = &rec.status;
 	    break;
 	}
-	case XACE_MAP_ACCESS: {
-	    XaceMapAccessRec rec = {
+	case XACE_SEND_ACCESS: {
+	    XaceSendAccessRec rec = {
+		va_arg(ap, ClientPtr),
+		va_arg(ap, DeviceIntPtr),
+		va_arg(ap, WindowPtr),
+		va_arg(ap, xEventPtr),
+		va_arg(ap, int),
+		Success /* default allow */
+	    };
+	    calldata = &rec;
+	    prv = &rec.status;
+	    break;
+	}
+	case XACE_RECEIVE_ACCESS: {
+	    XaceReceiveAccessRec rec = {
 		va_arg(ap, ClientPtr),
 		va_arg(ap, WindowPtr),
+		va_arg(ap, xEventPtr),
+		va_arg(ap, int),
 		Success /* default allow */
 	    };
 	    calldata = &rec;
diff --git a/Xext/xace.h b/Xext/xace.h
index f1a6e9d8c..c1fc0714f 100644
--- a/Xext/xace.h
+++ b/Xext/xace.h
@@ -46,18 +46,19 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define XACE_DEVICE_ACCESS		3
 #define XACE_PROPERTY_ACCESS		4
 #define XACE_DRAWABLE_ACCESS		5
-#define XACE_MAP_ACCESS			6
-#define XACE_CLIENT_ACCESS		7
-#define XACE_EXT_ACCESS			8
-#define XACE_SERVER_ACCESS		9
-#define XACE_SELECTION_ACCESS		10
-#define XACE_SCREEN_ACCESS		11
-#define XACE_SCREENSAVER_ACCESS		12
-#define XACE_AUTH_AVAIL			13
-#define XACE_KEY_AVAIL			14
-#define XACE_AUDIT_BEGIN		15
-#define XACE_AUDIT_END			16
-#define XACE_NUM_HOOKS			17
+#define XACE_SEND_ACCESS		6
+#define XACE_RECEIVE_ACCESS		7
+#define XACE_CLIENT_ACCESS		8
+#define XACE_EXT_ACCESS			9
+#define XACE_SERVER_ACCESS		10
+#define XACE_SELECTION_ACCESS		11
+#define XACE_SCREEN_ACCESS		12
+#define XACE_SCREENSAVER_ACCESS		13
+#define XACE_AUTH_AVAIL			14
+#define XACE_KEY_AVAIL			15
+#define XACE_AUDIT_BEGIN		16
+#define XACE_AUDIT_END			17
+#define XACE_NUM_HOOKS			18
 
 extern CallbackListPtr XaceHooks[XACE_NUM_HOOKS];
 
diff --git a/Xext/xacestr.h b/Xext/xacestr.h
index c98be3d32..15d39b72e 100644
--- a/Xext/xacestr.h
+++ b/Xext/xacestr.h
@@ -70,12 +70,24 @@ typedef struct {
     int status;
 } XaceDrawableAccessRec;
 
-/* XACE_MAP_ACCESS */
+/* XACE_SEND_ACCESS */
+typedef struct {
+    ClientPtr client;
+    DeviceIntPtr dev;
+    WindowPtr pWin;
+    xEventPtr events;
+    int count;
+    int status;
+} XaceSendAccessRec;
+
+/* XACE_RECEIVE_ACCESS */
 typedef struct {
     ClientPtr client;
     WindowPtr pWin;
+    xEventPtr events;
+    int count;
     int status;
-} XaceMapAccessRec;
+} XaceReceiveAccessRec;
 
 /* XACE_CLIENT_ACCESS */
 typedef struct {
diff --git a/dix/events.c b/dix/events.c
index deae4e340..42c3ba195 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -1753,8 +1753,10 @@ DeliverEventsToWindow(WindowPtr pWin, xEvent *pEvents, int count,
 	if (filter != CantBeFiltered &&
 	    !((wOtherEventMasks(pWin)|pWin->eventMask) & filter))
 	    return 0;
-	if ( (attempt = TryClientEvents(wClient(pWin), pEvents, count,
-				      pWin->eventMask, filter, grab)) )
+	if (XaceHook(XACE_RECEIVE_ACCESS, wClient(pWin), pWin, pEvents, count))
+	    nondeliveries--;
+	else if ( (attempt = TryClientEvents(wClient(pWin), pEvents, count,
+					     pWin->eventMask, filter, grab)) )
 	{
 	    if (attempt > 0)
 	    {
@@ -1781,7 +1783,10 @@ DeliverEventsToWindow(WindowPtr pWin, xEvent *pEvents, int count,
 	    other = (InputClients *)wOtherClients(pWin);
 	for (; other; other = other->next)
 	{
-	    if ( (attempt = TryClientEvents(rClient(other), pEvents, count,
+	    if (XaceHook(XACE_RECEIVE_ACCESS, rClient(other), pWin, pEvents,
+			 count))
+		nondeliveries--;
+	    else if ( (attempt = TryClientEvents(rClient(other), pEvents, count,
 					  other->mask[mskidx], filter, grab)) )
 	    {
 		if (attempt > 0)
@@ -1878,6 +1883,8 @@ MaybeDeliverEventsToClient(WindowPtr pWin, xEvent *pEvents,
 	    return XineramaTryClientEventsResult(
 			wClient(pWin), NullGrab, pWin->eventMask, filter);
 #endif
+	if (XaceHook(XACE_RECEIVE_ACCESS, wClient(pWin), pWin, pEvents, count))
+	    return 0;
 	return TryClientEvents(wClient(pWin), pEvents, count,
 			       pWin->eventMask, filter, NullGrab);
     }
@@ -1892,6 +1899,9 @@ MaybeDeliverEventsToClient(WindowPtr pWin, xEvent *pEvents,
 	      return XineramaTryClientEventsResult(
 			rClient(other), NullGrab, other->mask, filter);
 #endif
+	    if (XaceHook(XACE_RECEIVE_ACCESS, rClient(other), pWin, pEvents,
+			 count))
+		return 0;
 	    return TryClientEvents(rClient(other), pEvents, count,
 				   other->mask, filter, NullGrab);
 	}
@@ -1986,6 +1996,9 @@ DeliverDeviceEvents(WindowPtr pWin, xEvent *xE, GrabPtr grab,
     Mask filter = filters[type];
     int deliveries = 0;
 
+    if (XaceHook(XACE_SEND_ACCESS, NULL, dev, pWin, xE, count))
+	return 0;
+
     if (type & EXTENSION_EVENT_BASE)
     {
 	OtherInputMasks *inputMasks;
@@ -2829,6 +2842,8 @@ DeliverFocusedEvent(DeviceIntPtr keybd, xEvent *xE, WindowPtr window, int count)
 	    return;
     }
     /* just deliver it to the focus window */
+    if (XaceHook(XACE_SEND_ACCESS, NULL, keybd, focus, xE, count))
+	return;
     FixUpEventFromWindow(xE, focus, None, FALSE);
     if (xE->u.u.type & EXTENSION_EVENT_BASE)
 	mskidx = keybd->id;
@@ -2877,9 +2892,12 @@ DeliverGrabbedEvent(xEvent *xE, DeviceIntPtr thisDev,
     if (!deliveries)
     {
 	FixUpEventFromWindow(xE, grab->window, None, TRUE);
-	deliveries = TryClientEvents(rClient(grab), xE, count,
-				     (Mask)grab->eventMask,
-				     filters[xE->u.u.type], grab);
+	if (!XaceHook(XACE_SEND_ACCESS, thisDev, grab->window, xE, count) &&
+	    !XaceHook(XACE_RECEIVE_ACCESS, rClient(grab), grab->window, xE,
+		      count))
+	    deliveries = TryClientEvents(rClient(grab), xE, count,
+					 (Mask)grab->eventMask,
+					 filters[xE->u.u.type], grab);
 	if (deliveries && (xE->u.u.type == MotionNotify
 #ifdef XINPUT
 			   || xE->u.u.type == DeviceMotionNotify
@@ -4530,6 +4548,9 @@ ProcSendEvent(ClientPtr client)
     {
 	for (;pWin; pWin = pWin->parent)
 	{
+	    if (XaceHook(XACE_SEND_ACCESS, client, NULL, pWin,
+			 &stuff->event, 1))
+		return Success;
 	    if (DeliverEventsToWindow(pWin, &stuff->event, 1, stuff->eventMask,
 				      NullGrab, 0))
 		return Success;
@@ -4540,7 +4561,7 @@ ProcSendEvent(ClientPtr client)
 		break;
 	}
     }
-    else
+    else if (!XaceHook(XACE_SEND_ACCESS, client, NULL, pWin, &stuff->event, 1))
 	(void)DeliverEventsToWindow(pWin, &stuff->event, 1, stuff->eventMask,
 				    NullGrab, 0);
     return Success;
diff --git a/dix/window.c b/dix/window.c
index 1a598faca..b6bbdd4cb 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -2744,8 +2744,9 @@ MapWindow(WindowPtr pWin, ClientPtr client)
 	return(Success);
 
     /*  general check for permission to map window */
-    if (XaceHook(XACE_MAP_ACCESS, client, pWin) != Success)
-	 return Success;
+    if (XaceHook(XACE_RESOURCE_ACCESS, client, pWin->drawable.id, RT_WINDOW,
+		 DixShowAccess, pWin) != Success)
+	return Success;
 
     pScreen = pWin->drawable.pScreen;
     if ( (pParent = pWin->parent) )

From 4795df62456b73c6790f271e0a20a83c60496490 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 29 Aug 2007 14:40:10 -0400
Subject: [PATCH 096/552] xace: add hooks + new access codes: TOG-CUP
 extension.

---
 Xext/cup.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Xext/cup.c b/Xext/cup.c
index 6bfa27837..b544a7517 100644
--- a/Xext/cup.c
+++ b/Xext/cup.c
@@ -224,12 +224,13 @@ int ProcStoreColors(
 {
     REQUEST (xXcupStoreColorsReq);
     ColormapPtr pcmp;
+    int rc;
 
     REQUEST_AT_LEAST_SIZE (xXcupStoreColorsReq);
-    pcmp = (ColormapPtr) SecurityLookupIDByType (client, stuff->cmap,
-						 RT_COLORMAP, DixWriteAccess);
+    rc = dixLookupResource((pointer *)&pcmp, stuff->cmap, RT_COLORMAP,
+			   client, DixAddAccess);
 
-    if (pcmp) {
+    if (rc == Success) {
 	int ncolors, n;
 	xXcupStoreColorsReply rep;
 	xColorItem* cptr;
@@ -273,7 +274,7 @@ int ProcStoreColors(
 	return client->noClientException;
     } else {
 	client->errorValue = stuff->cmap;
-	return BadColor;
+	return (rc == BadValue) ? BadColor : rc;
     }
 }
 

From 47ab4d648b31ea1d5800e0bc84cf5f25025bffe3 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 30 Aug 2007 11:40:39 -0400
Subject: [PATCH 097/552] devPrivates rework: convert CursorRec and CursorBits
 over to new interface.

---
 dix/cursor.c                               | 14 +++++++++++++-
 hw/darwin/iokit/xfIOKitCursor.c            | 20 ++++++++++----------
 hw/darwin/quartz/fullscreen/quartzCursor.c | 10 +++++-----
 hw/darwin/quartz/quartzCursor.c            | 10 +++++-----
 hw/dmx/dmxcursor.c                         |  8 ++++----
 hw/dmx/dmxcursor.h                         |  7 +++++--
 hw/xfree86/modes/xf86Cursors.c             |  5 +++--
 hw/xfree86/ramdac/xf86Cursor.c             |  6 +++---
 hw/xfree86/ramdac/xf86HWCurs.c             |  4 ++--
 hw/xgl/glx/xglx.c                          |  4 ++--
 hw/xnest/Cursor.c                          |  6 +++---
 hw/xnest/XNCursor.h                        |  9 ++++++---
 include/cursorstr.h                        |  6 ++++--
 mi/midispcur.c                             | 17 ++++++++++-------
 14 files changed, 75 insertions(+), 51 deletions(-)

diff --git a/dix/cursor.c b/dix/cursor.c
index b188e3f98..324faa169 100644
--- a/dix/cursor.c
+++ b/dix/cursor.c
@@ -99,6 +99,7 @@ FreeCursorBits(CursorBitsPtr bits)
 	    CloseFont(this->font, (Font)0);
 	    xfree(this);
 	}
+	dixFreePrivates(bits->devPrivates);
 	xfree(bits);
     }
 }
@@ -124,6 +125,7 @@ FreeCursor(pointer value, XID cid)
 	pscr = screenInfo.screens[nscr];
 	(void)( *pscr->UnrealizeCursor)( pscr, pCurs);
     }
+    dixFreePrivates(pCurs->devPrivates);
     FreeCursorBits(pCurs->bits);
     xfree( pCurs);
     return(Success);
@@ -192,9 +194,9 @@ AllocARGBCursor(unsigned char *psrcbits, unsigned char *pmaskbits,
     bits->height = cm->height;
     bits->xhot = cm->xhot;
     bits->yhot = cm->yhot;
+    bits->devPrivates = NULL;
     bits->refcnt = -1;
     CheckForEmptyMask(bits);
-
     pCurs->bits = bits;
     pCurs->refcnt = 1;		
 #ifdef XFIXES
@@ -210,10 +212,14 @@ AllocARGBCursor(unsigned char *psrcbits, unsigned char *pmaskbits,
     pCurs->backGreen = backGreen;
     pCurs->backBlue = backBlue;
 
+    pCurs->devPrivates = NULL;
+    pCurs->id = cid;
+
     /* security creation/labeling check */
     rc = XaceHook(XACE_RESOURCE_ACCESS, client, cid, RT_CURSOR,
 		  DixCreateAccess, pCurs);
     if (rc != Success) {
+	dixFreePrivates(pCurs->devPrivates);
 	FreeCursorBits(bits);
 	xfree(pCurs);
 	return rc;
@@ -232,6 +238,7 @@ AllocARGBCursor(unsigned char *psrcbits, unsigned char *pmaskbits,
 		pscr = screenInfo.screens[nscr];
 		( *pscr->UnrealizeCursor)( pscr, pCurs);
 	    }
+	    dixFreePrivates(pCurs->devPrivates);
 	    FreeCursorBits(bits);
 	    xfree(pCurs);
 	    return BadAlloc;
@@ -394,10 +401,14 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar,
     pCurs->backGreen = backGreen;
     pCurs->backBlue = backBlue;
 
+    pCurs->id = cid;
+    pCurs->devPrivates = NULL;
+
     /* security creation/labeling check */
     rc = XaceHook(XACE_RESOURCE_ACCESS, client, cid, RT_CURSOR,
 		  DixCreateAccess, pCurs);
     if (rc != Success) {
+	dixFreePrivates(pCurs->devPrivates);
 	FreeCursorBits(bits);
 	xfree(pCurs);
 	return rc;
@@ -416,6 +427,7 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar,
 		pscr = screenInfo.screens[nscr];
 		( *pscr->UnrealizeCursor)( pscr, pCurs);
 	    }
+	    dixFreePrivates(pCurs->devPrivates);
 	    FreeCursorBits(pCurs->bits);
 	    xfree(pCurs);
 	    return BadAlloc;
diff --git a/hw/darwin/iokit/xfIOKitCursor.c b/hw/darwin/iokit/xfIOKitCursor.c
index 224710114..3101a8932 100644
--- a/hw/darwin/iokit/xfIOKitCursor.c
+++ b/hw/darwin/iokit/xfIOKitCursor.c
@@ -202,7 +202,7 @@ XFIOKitRealizeCursor8(
     }
 
     // save the result
-    pCursor->devPriv[pScreen->myNum] = (pointer) newCursor;
+    dixSetPrivate(&pCursor->devPrivates, pScreen, newCursor);
     return TRUE;
 }
 
@@ -285,7 +285,7 @@ XFIOKitRealizeCursor15(
 #endif
 
     // save the result
-    pCursor->devPriv[pScreen->myNum] = (pointer) newCursor;
+    dixSetPrivate(&pCursor->devPrivates, pScreen, newCursor);
     return TRUE;
 }
 
@@ -369,7 +369,7 @@ XFIOKitRealizeCursor24(
 #endif
 
     // save the result
-    pCursor->devPriv[pScreen->myNum] = (pointer) newCursor;
+    dixSetPrivate(&pCursor->devPrivates, pScreen, newCursor);
     return TRUE;
 }
 
@@ -422,7 +422,7 @@ XFIOKitUnrealizeCursor(
         !ScreenPriv->canHWCursor) {
         result = (*ScreenPriv->spriteFuncs->UnrealizeCursor)(pScreen, pCursor);
     } else {
-        xfree( pCursor->devPriv[pScreen->myNum] );
+        xfree(dixLookupPrivate(&pCursor->devPrivates, pScreen));
         result = TRUE;
     }
 
@@ -476,20 +476,20 @@ XFIOKitSetCursor(
 
         // change the cursor image in shared memory
         if (dfb->bitsPerPixel == 8) {
-            cursorPrivPtr newCursor =
-                    (cursorPrivPtr) pCursor->devPriv[pScreen->myNum];
+            cursorPrivPtr newCursor = dixLookupPrivate(&pCursor->devPrivates,
+						       pScreen);
             memcpy(cshmem->cursor.bw8.image[0], newCursor->image,
                         CURSORWIDTH*CURSORHEIGHT);
             memcpy(cshmem->cursor.bw8.mask[0], newCursor->mask,
                         CURSORWIDTH*CURSORHEIGHT);
         } else if (dfb->bitsPerPixel == 16) {
-            unsigned short *newCursor =
-                    (unsigned short *) pCursor->devPriv[pScreen->myNum];
+            unsigned short *newCursor = dixLookupPrivate(&pCursor->devPrivates,
+							 pScreen);
             memcpy(cshmem->cursor.rgb.image[0], newCursor,
                         2*CURSORWIDTH*CURSORHEIGHT);
         } else {
-            unsigned int *newCursor =
-                    (unsigned int *) pCursor->devPriv[pScreen->myNum];
+            unsigned int *newCursor = dixLookupPrivate(&pCursor->devPrivates,
+						       pScreen);
             memcpy(cshmem->cursor.rgb24.image[0], newCursor,
                         4*CURSORWIDTH*CURSORHEIGHT);
         }
diff --git a/hw/darwin/quartz/fullscreen/quartzCursor.c b/hw/darwin/quartz/fullscreen/quartzCursor.c
index bee83b875..797149ef9 100644
--- a/hw/darwin/quartz/fullscreen/quartzCursor.c
+++ b/hw/darwin/quartz/fullscreen/quartzCursor.c
@@ -318,7 +318,7 @@ QuartzRealizeCursor(
     if (!qdCursor) return FALSE;
 
     // save the result
-    pCursor->devPriv[pScreen->myNum] = (pointer) qdCursor;
+    dixSetPrivate(&pCursor->devPrivates, pScreen, qdCursor);
 
     return TRUE;
 }
@@ -345,13 +345,13 @@ QuartzUnrealizeCursor(
                         (pScreen, pCursor);
         }
     } else {
-        CCrsrHandle oldCursor = (CCrsrHandle) pCursor->devPriv[pScreen->myNum];
-
+        CCrsrHandle oldCursor = dixLookupPrivate(&pCursor->devPrivates,
+						 pScreen);
         if (currentCursor != oldCursor) {
             // This should only fail when quitting, in which case we just leak.
             FreeQDCursor(oldCursor);
         }
-        pCursor->devPriv[pScreen->myNum] = NULL;
+	dixSetPrivate(&pCursor->devPrivates, pScreen, NULL);
         return TRUE;
     }
 }
@@ -391,7 +391,7 @@ QuartzSetCursor(
             (*ScreenPriv->spriteFuncs->SetCursor)(pScreen, 0, x, y);
         ScreenPriv->qdCursorMode = TRUE;
 
-        CHANGE_QD_CURSOR(pCursor->devPriv[pScreen->myNum]);
+        CHANGE_QD_CURSOR(dixLookupPrivate(&pCursor->devPrivates, pScreen));
         SHOW_QD_CURSOR(pScreen, ScreenPriv->qdCursorVisible);
     }
     else if (quartzRootless) {
diff --git a/hw/darwin/quartz/quartzCursor.c b/hw/darwin/quartz/quartzCursor.c
index a121ce17c..aa7ce2295 100644
--- a/hw/darwin/quartz/quartzCursor.c
+++ b/hw/darwin/quartz/quartzCursor.c
@@ -321,7 +321,7 @@ QuartzRealizeCursor(
     if (!qdCursor) return FALSE;
 
     // save the result
-    pCursor->devPriv[pScreen->myNum] = (pointer) qdCursor;
+    dixSetPrivate(&pCursor->devPrivates, pScreen, qdCursor);
 
     return TRUE;
 }
@@ -348,13 +348,13 @@ QuartzUnrealizeCursor(
                         (pScreen, pCursor);
         }
     } else {
-        CCrsrHandle oldCursor = (CCrsrHandle) pCursor->devPriv[pScreen->myNum];
-
+        CCrsrHandle oldCursor = dixLookupPrivate(&pCursor->devPrivates,
+						 pScreen);
         if (currentCursor != oldCursor) {
             // This should only fail when quitting, in which case we just leak.
             FreeQDCursor(oldCursor);
         }
-        pCursor->devPriv[pScreen->myNum] = NULL;
+	dixSetPrivate(&pCursor->devPrivates, pScreen, NULL);
         return TRUE;
     }
 }
@@ -394,7 +394,7 @@ QuartzSetCursor(
             (*ScreenPriv->spriteFuncs->SetCursor)(pScreen, 0, x, y);
         ScreenPriv->qdCursorMode = TRUE;
 
-        CHANGE_QD_CURSOR(pCursor->devPriv[pScreen->myNum]);
+        CHANGE_QD_CURSOR(dixLookupPrivate(&pCursor->devPrivates, pScreen));
         SHOW_QD_CURSOR(pScreen, ScreenPriv->qdCursorVisible);
     }
     else if (quartzRootless) {
diff --git a/hw/dmx/dmxcursor.c b/hw/dmx/dmxcursor.c
index 1ad199d58..8a801169c 100644
--- a/hw/dmx/dmxcursor.c
+++ b/hw/dmx/dmxcursor.c
@@ -662,8 +662,8 @@ static Bool _dmxRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor)
 
     DMXDBG2("_dmxRealizeCursor(%d,%p)\n", pScreen->myNum, pCursor);
 
-    pCursor->devPriv[pScreen->myNum] = xalloc(sizeof(*pCursorPriv));
-    if (!pCursor->devPriv[pScreen->myNum])
+    DMX_SET_CURSOR_PRIV(pCursor, pScreen, xalloc(sizeof(*pCursorPriv)));
+    if (!DMX_GET_CURSOR_PRIV(pCursor, pScreen))
 	return FALSE;
 
     pCursorPriv = DMX_GET_CURSOR_PRIV(pCursor, pScreen);
@@ -700,9 +700,9 @@ static Bool _dmxUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor)
 
     if (dmxScreen->beDisplay) {
 	if (dmxBEFreeCursor(pScreen, pCursor))
-	    xfree(pCursor->devPriv[pScreen->myNum]);
+	    xfree(DMX_GET_CURSOR_PRIV(pCursor, pScreen));
     }
-    pCursor->devPriv[pScreen->myNum] = NULL;
+    DMX_SET_CURSOR_PRIV(pCursor, pScreen, NULL);
 
     return TRUE;
 }
diff --git a/hw/dmx/dmxcursor.h b/hw/dmx/dmxcursor.h
index 7b70c6250..d909bd01e 100644
--- a/hw/dmx/dmxcursor.h
+++ b/hw/dmx/dmxcursor.h
@@ -63,7 +63,10 @@ extern void dmxHideCursor(DMXScreenInfo *dmxScreen);
 extern void dmxBECreateCursor(ScreenPtr pScreen, CursorPtr pCursor);
 extern Bool dmxBEFreeCursor(ScreenPtr pScreen, CursorPtr pCursor);
 
-#define DMX_GET_CURSOR_PRIV(_pCursor, _pScreen)				\
-    (dmxCursorPrivPtr)(_pCursor)->devPriv[(_pScreen)->myNum]
+#define DMX_GET_CURSOR_PRIV(_pCursor, _pScreen) \
+    ((dmxCursorPrivPtr)dixLookupPrivate(&(_pCursor)->devPrivates, _pScreen))
+
+#define DMX_SET_CURSOR_PRIV(_pCursor, _pScreen, v) \
+    dixSetPrivate(&(_pCursor)->devPrivates, _pScreen, v)
 
 #endif /* DMXCURSOR_H */
diff --git a/hw/xfree86/modes/xf86Cursors.c b/hw/xfree86/modes/xf86Cursors.c
index b5101642b..acf34c1d1 100644
--- a/hw/xfree86/modes/xf86Cursors.c
+++ b/hw/xfree86/modes/xf86Cursors.c
@@ -226,7 +226,8 @@ xf86_set_cursor_colors (ScrnInfoPtr scrn, int bg, int fg)
     xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
     CursorPtr		cursor = xf86_config->cursor;
     int			c;
-    CARD8		*bits = cursor ? cursor->devPriv[screen->myNum] : NULL;
+    CARD8		*bits = cursor ? dixLookupPrivate(&cursor->devPrivates,
+							  screen) : NULL;
 
     /* Save ARGB versions of these colors */
     xf86_config->cursor_fg = (CARD32) fg | 0xff000000;
@@ -612,7 +613,7 @@ xf86_reload_cursors (ScreenPtr screen)
 	else
 #endif
 	    (*cursor_info->LoadCursorImage)(cursor_info->pScrn,
-					    cursor->devPriv[screen->myNum]);
+			dixLookupPrivate(&cursor->devPrivates, screen));
 
 	(*cursor_info->SetCursorPosition)(cursor_info->pScrn, x, y);
 	(*cursor_info->ShowCursor)(cursor_info->pScrn);
diff --git a/hw/xfree86/ramdac/xf86Cursor.c b/hw/xfree86/ramdac/xf86Cursor.c
index 1c2d6a869..5b1ce5e1f 100644
--- a/hw/xfree86/ramdac/xf86Cursor.c
+++ b/hw/xfree86/ramdac/xf86Cursor.c
@@ -251,7 +251,7 @@ xf86CursorRealizeCursor(ScreenPtr pScreen, CursorPtr pCurs)
 	&pScreen->devPrivates, xf86CursorScreenKey);
 
     if (pCurs->refcnt <= 1)
-	pCurs->devPriv[pScreen->myNum] = NULL;
+	dixSetPrivate(&pCurs->devPrivates, pScreen, NULL);
 
     return (*ScreenPriv->spriteFuncs->RealizeCursor)(pScreen, pCurs);
 }
@@ -263,8 +263,8 @@ xf86CursorUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCurs)
 	&pScreen->devPrivates, xf86CursorScreenKey);
 
     if (pCurs->refcnt <= 1) {
-	xfree(pCurs->devPriv[pScreen->myNum]);
-	pCurs->devPriv[pScreen->myNum] = NULL;
+	xfree(dixLookupPrivate(&pCurs->devPrivates, pScreen));
+	dixSetPrivate(&pCurs->devPrivates, pScreen, NULL);
     }
 
     return (*ScreenPriv->spriteFuncs->UnrealizeCursor)(pScreen, pCurs);
diff --git a/hw/xfree86/ramdac/xf86HWCurs.c b/hw/xfree86/ramdac/xf86HWCurs.c
index 0a753be3f..d10e283d7 100644
--- a/hw/xfree86/ramdac/xf86HWCurs.c
+++ b/hw/xfree86/ramdac/xf86HWCurs.c
@@ -123,7 +123,7 @@ xf86SetCursor(ScreenPtr pScreen, CursorPtr pCurs, int x, int y)
 	return;
     }
 
-    bits = pCurs->devPriv[pScreen->myNum];
+    bits = (unsigned char *)dixLookupPrivate(&pCurs->devPrivates, pScreen);
 
     x -= infoPtr->pScrn->frameX0 + ScreenPriv->HotX;
     y -= infoPtr->pScrn->frameY0 + ScreenPriv->HotY;
@@ -133,7 +133,7 @@ xf86SetCursor(ScreenPtr pScreen, CursorPtr pCurs, int x, int y)
 #endif
     if (!bits) {
 	bits = (*infoPtr->RealizeCursor)(infoPtr, pCurs);
-	pCurs->devPriv[pScreen->myNum] = bits;
+	dixSetPrivate(&pCurs->devPrivates, pScreen, bits);
     }
 
     if (!(infoPtr->Flags & HARDWARE_CURSOR_UPDATE_UNHIDDEN))
diff --git a/hw/xgl/glx/xglx.c b/hw/xgl/glx/xglx.c
index 657afc075..d7f0ed3f9 100644
--- a/hw/xgl/glx/xglx.c
+++ b/hw/xgl/glx/xglx.c
@@ -121,10 +121,10 @@ typedef struct _xglxCursor {
 } xglxCursorRec, *xglxCursorPtr;
 
 #define XGLX_GET_CURSOR_PRIV(pCursor, pScreen)		   \
-    ((xglxCursorPtr) (pCursor)->devPriv[(pScreen)->myNum])
+    ((xglxCursorPtr)dixLookupPrivate(&(pCursor)->devPrivates, pScreen))
 
 #define XGLX_SET_CURSOR_PRIV(pCursor, pScreen, v)	 \
-    ((pCursor)->devPriv[(pScreen)->myNum] = (pointer) v)
+    dixSetPrivate(&(pCursor)->devPrivates, pScreen, v)
 
 #define XGLX_CURSOR_PRIV(pCursor, pScreen)			        \
     xglxCursorPtr pCursorPriv = XGLX_GET_CURSOR_PRIV (pCursor, pScreen)
diff --git a/hw/xnest/Cursor.c b/hw/xnest/Cursor.c
index 134276e7b..138698068 100644
--- a/hw/xnest/Cursor.c
+++ b/hw/xnest/Cursor.c
@@ -104,8 +104,8 @@ xnestRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor)
   bg_color.green = pCursor->backGreen;
   bg_color.blue = pCursor->backBlue;
 
-  pCursor->devPriv[pScreen->myNum] = (pointer)xalloc(sizeof(xnestPrivCursor));
-  xnestCursorPriv(pCursor, pScreen)->cursor = 
+  xnestSetCursorPriv(pCursor, pScreen, xalloc(sizeof(xnestPrivCursor)));
+  xnestCursor(pCursor, pScreen) = 
     XCreatePixmapCursor(xnestDisplay, source, mask, &fg_color, &bg_color,
 			pCursor->bits->xhot, pCursor->bits->yhot);
   
@@ -119,7 +119,7 @@ Bool
 xnestUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor)
 {
   XFreeCursor(xnestDisplay, xnestCursor(pCursor, pScreen));
-  xfree(xnestCursorPriv(pCursor, pScreen));
+  xfree(xnestGetCursorPriv(pCursor, pScreen));
   return True;
 }
 
diff --git a/hw/xnest/XNCursor.h b/hw/xnest/XNCursor.h
index ffec9eb0a..9705f6bea 100644
--- a/hw/xnest/XNCursor.h
+++ b/hw/xnest/XNCursor.h
@@ -19,11 +19,14 @@ typedef struct {
   Cursor cursor;
 } xnestPrivCursor;
 
-#define xnestCursorPriv(pCursor, pScreen) \
-  ((xnestPrivCursor *)((pCursor)->devPriv[pScreen->myNum]))
+#define xnestGetCursorPriv(pCursor, pScreen) \
+    ((xnestPrivCursor *)dixLookupPrivate(&(pCursor)->devPrivates, pScreen))
+
+#define xnestSetCursorPriv(pCursor, pScreen, v) \
+    dixSetPrivate(&(pCursor)->devPrivates, pScreen, v)
 
 #define xnestCursor(pCursor, pScreen) \
-  (xnestCursorPriv(pCursor, pScreen)->cursor)
+  (xnestGetCursorPriv(pCursor, pScreen)->cursor)
 
 Bool xnestRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor);
 Bool xnestUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor);
diff --git a/include/cursorstr.h b/include/cursorstr.h
index b7beaa0c5..bca35969b 100644
--- a/include/cursorstr.h
+++ b/include/cursorstr.h
@@ -49,6 +49,7 @@ SOFTWARE.
 #define CURSORSTRUCT_H 
 
 #include "cursor.h"
+#include "privates.h"
 /* 
  * device-independent cursor storage
  */
@@ -63,7 +64,7 @@ typedef struct _CursorBits {
     Bool emptyMask;				/* all zeros mask */
     unsigned short width, height, xhot, yhot;	/* metrics */
     int refcnt;					/* can be shared */
-    pointer devPriv[MAXSCREENS];		/* set by pScr->RealizeCursor*/
+    PrivateRec *devPrivates;			/* set by pScr->RealizeCursor*/
 #ifdef ARGB_CURSOR
     CARD32 *argb;				/* full-color alpha blended */
 #endif
@@ -74,7 +75,8 @@ typedef struct _Cursor {
     unsigned short foreRed, foreGreen, foreBlue; /* device-independent color */
     unsigned short backRed, backGreen, backBlue; /* device-independent color */
     int refcnt;
-    pointer devPriv[MAXSCREENS];		/* set by pScr->RealizeCursor*/
+    PrivateRec *devPrivates;			/* set by pScr->RealizeCursor*/
+    XID id;
 #ifdef XFIXES
     CARD32 serialNumber;
     Atom name;
diff --git a/mi/midispcur.c b/mi/midispcur.c
index 8b782925a..f974c0845 100644
--- a/mi/midispcur.c
+++ b/mi/midispcur.c
@@ -190,7 +190,7 @@ miDCRealizeCursor (pScreen, pCursor)
     CursorPtr	pCursor;
 {
     if (pCursor->bits->refcnt <= 1)
-	pCursor->bits->devPriv[pScreen->myNum] = (pointer)NULL;
+	dixSetPrivate(&pCursor->bits->devPrivates, pScreen, NULL);
     return TRUE;
 }
 
@@ -290,7 +290,7 @@ miDCRealize (
 	    xfree ((pointer) pPriv);
 	    return (miDCCursorPtr)NULL;
 	}
-	pCursor->bits->devPriv[pScreen->myNum] = (pointer) pPriv;
+	dixSetPrivate(&pCursor->bits->devPrivates, pScreen, pPriv);
 	return pPriv;
     }
     pPriv->pPicture = 0;
@@ -308,7 +308,7 @@ miDCRealize (
 	xfree ((pointer) pPriv);
 	return (miDCCursorPtr)NULL;
     }
-    pCursor->bits->devPriv[pScreen->myNum] = (pointer) pPriv;
+    dixSetPrivate(&pCursor->bits->devPrivates, pScreen, pPriv);
 
     /* create the two sets of bits, clipping as appropriate */
 
@@ -354,7 +354,8 @@ miDCUnrealizeCursor (pScreen, pCursor)
 {
     miDCCursorPtr   pPriv;
 
-    pPriv = (miDCCursorPtr) pCursor->bits->devPriv[pScreen->myNum];
+    pPriv = (miDCCursorPtr)dixLookupPrivate(&pCursor->bits->devPrivates,
+					    pScreen);
     if (pPriv && (pCursor->bits->refcnt <= 1))
     {
 	if (pPriv->sourceBits)
@@ -366,7 +367,7 @@ miDCUnrealizeCursor (pScreen, pCursor)
 	    FreePicture (pPriv->pPicture, 0);
 #endif
 	xfree ((pointer) pPriv);
-	pCursor->bits->devPriv[pScreen->myNum] = (pointer)NULL;
+	dixSetPrivate(&pCursor->bits->devPrivates, pScreen, NULL);
     }
     return TRUE;
 }
@@ -461,7 +462,8 @@ miDCPutUpCursor (pScreen, pCursor, x, y, source, mask)
     miDCCursorPtr   pPriv;
     WindowPtr	    pWin;
 
-    pPriv = (miDCCursorPtr) pCursor->bits->devPriv[pScreen->myNum];
+    pPriv = (miDCCursorPtr)dixLookupPrivate(&pCursor->bits->devPrivates,
+					    pScreen);
     if (!pPriv)
     {
 	pPriv = miDCRealize(pScreen, pCursor);
@@ -711,7 +713,8 @@ miDCMoveCursor (pScreen, pCursor, x, y, w, h, dx, dy, source, mask)
     XID		    gcval = FALSE;
     PixmapPtr	    pTemp;
 
-    pPriv = (miDCCursorPtr) pCursor->bits->devPriv[pScreen->myNum];
+    pPriv = (miDCCursorPtr)dixLookupPrivate(&pCursor->bits->devPrivates,
+					    pScreen);
     if (!pPriv)
     {
 	pPriv = miDCRealize(pScreen, pCursor);

From cda92bbf12107865e93c03c71b901ef51466dc31 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 30 Aug 2007 11:48:45 -0400
Subject: [PATCH 098/552] xace: add hooks + new access codes: XFixes extension.

Required a new name argument to the selection access hook to handle
XFixesSelectSelectionInput.
---
 Xext/xace.c      |  1 +
 Xext/xacestr.h   |  1 +
 dix/dispatch.c   | 32 ++++++++++++++++------------
 xfixes/cursor.c  | 55 ++++++++++++++++++++++++++++++++++--------------
 xfixes/region.c  | 34 +++++++++++++++++-------------
 xfixes/saveset.c |  2 +-
 xfixes/select.c  |  9 +++++++-
 7 files changed, 87 insertions(+), 47 deletions(-)

diff --git a/Xext/xace.c b/Xext/xace.c
index 3091ecd32..cc689864b 100644
--- a/Xext/xace.c
+++ b/Xext/xace.c
@@ -173,6 +173,7 @@ int XaceHook(int hook, ...)
 	case XACE_SELECTION_ACCESS: {
 	    XaceSelectionAccessRec rec = {
 		va_arg(ap, ClientPtr),
+		va_arg(ap, Atom),
 		va_arg(ap, Selection*),
 		va_arg(ap, Mask),
 		Success /* default allow */
diff --git a/Xext/xacestr.h b/Xext/xacestr.h
index 15d39b72e..0957f0da1 100644
--- a/Xext/xacestr.h
+++ b/Xext/xacestr.h
@@ -115,6 +115,7 @@ typedef struct {
 /* XACE_SELECTION_ACCESS */
 typedef struct {
     ClientPtr client;
+    Atom name;
     Selection *selection;
     Mask access_mode;
     int status;
diff --git a/dix/dispatch.c b/dix/dispatch.c
index 1ad3c9437..7adfe02be 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -1013,10 +1013,6 @@ ProcSetSelectionOwner(ClientPtr client)
         {        
 	    xEvent event;
 
-	    rc = XaceHook(XACE_SELECTION_ACCESS, client, CurrentSelections[i],
-			  DixSetAttrAccess);
-	    if (rc != Success)
-		return rc;
 	    /* If the timestamp in client's request is in the past relative
 		to the time stamp indicating the last time the owner of the
 		selection was set, do not set the selection, just return 
@@ -1024,6 +1020,12 @@ ProcSetSelectionOwner(ClientPtr client)
             if (CompareTimeStamps(time, CurrentSelections[i].lastTimeChanged)
 		== EARLIER)
 		return Success;
+
+	    rc = XaceHook(XACE_SELECTION_ACCESS, client, stuff->selection,
+			  CurrentSelections[i], DixSetAttrAccess);
+	    if (rc != Success)
+		return rc;
+
 	    if (CurrentSelections[i].client &&
 		(!pWin || (CurrentSelections[i].client != client)))
 	    {
@@ -1054,19 +1056,17 @@ ProcSetSelectionOwner(ClientPtr client)
 	    CurrentSelections = newsels;
 	    CurrentSelections[i].selection = stuff->selection;
 	    CurrentSelections[i].devPrivates = NULL;
-	    rc = XaceHook(XACE_SELECTION_ACCESS, CurrentSelections[i],
-			  DixSetAttrAccess);
+	    rc = XaceHook(XACE_SELECTION_ACCESS, stuff->selection,
+			  CurrentSelections[i], DixSetAttrAccess);
 	    if (rc != Success)
 		return rc;
 	}
-	dixFreePrivates(CurrentSelections[i].devPrivates);
         CurrentSelections[i].lastTimeChanged = time;
 	CurrentSelections[i].window = stuff->window;
 	CurrentSelections[i].destwindow = stuff->window;
 	CurrentSelections[i].pWin = pWin;
 	CurrentSelections[i].client = (pWin ? client : NullClient);
 	CurrentSelections[i].destclient = (pWin ? client : NullClient);
-	CurrentSelections[i].devPrivates = NULL;
 	if (SelectionCallback)
 	{
 	    SelectionInfoRec	info;
@@ -1092,7 +1092,7 @@ ProcGetSelectionOwner(ClientPtr client)
     REQUEST_SIZE_MATCH(xResourceReq);
     if (ValidAtom(stuff->id))
     {
-	int i;
+	int rc, i;
         xGetSelectionOwnerReply reply;
 
 	i = 0;
@@ -1101,12 +1101,16 @@ ProcGetSelectionOwner(ClientPtr client)
         reply.type = X_Reply;
 	reply.length = 0;
 	reply.sequenceNumber = client->sequence;
-        if (i < NumCurrentSelections &&
-	    XaceHook(XACE_SELECTION_ACCESS, client, &CurrentSelections[i],
-		     DixGetAttrAccess) == Success)
+        if (i < NumCurrentSelections)
             reply.owner = CurrentSelections[i].destwindow;
         else
             reply.owner = None;
+
+	rc = XaceHook(XACE_SELECTION_ACCESS, client, stuff->id, NULL,
+		      DixGetAttrAccess);
+	if (rc != Success)
+	    return rc;
+
         WriteReplyToClient(client, sizeof(xGetSelectionOwnerReply), &reply);
         return(client->noClientException);
     }
@@ -1143,8 +1147,8 @@ ProcConvertSelection(ClientPtr client)
 	       CurrentSelections[i].selection != stuff->selection) i++;
 	if ((i < NumCurrentSelections) &&
 	    (CurrentSelections[i].window != None) &&
-	    XaceHook(XACE_SELECTION_ACCESS, client, &CurrentSelections[i],
-		     DixReadAccess) == Success)
+	    XaceHook(XACE_SELECTION_ACCESS, client, stuff->selection,
+		     &CurrentSelections[i], DixReadAccess) == Success)
 	{        
 	    event.u.u.type = SelectionRequest;
 	    event.u.selectionRequest.time = stuff->time;
diff --git a/xfixes/cursor.c b/xfixes/cursor.c
index 975ebc36d..91f149e1a 100755
--- a/xfixes/cursor.c
+++ b/xfixes/cursor.c
@@ -51,6 +51,7 @@
 #include "servermd.h"
 #include "inputstr.h"
 #include "windowstr.h"
+#include "xace.h"
 
 static RESTYPE		CursorClientType;
 static RESTYPE		CursorHideCountType;
@@ -238,7 +239,7 @@ ProcXFixesSelectCursorInput (ClientPtr client)
     int		rc;
 
     REQUEST_SIZE_MATCH (xXFixesSelectCursorInputReq);
-    rc = dixLookupWindow(&pWin, stuff->window, client, DixReadAccess);
+    rc = dixLookupWindow(&pWin, stuff->window, client, DixSetAttrAccess);
     if (rc != Success)
         return rc;
     if (stuff->eventMask & ~CursorAllEvents)
@@ -343,14 +344,16 @@ ProcXFixesGetCursorImage (ClientPtr client)
     xXFixesGetCursorImageReply	*rep;
     CursorPtr			pCursor;
     CARD32			*image;
-    int				npixels;
-    int				width, height;
-    int				x, y;
+    int				npixels, width, height, rc, x, y;
 
     REQUEST_SIZE_MATCH(xXFixesGetCursorImageReq);
     pCursor = CursorCurrent;
     if (!pCursor)
 	return BadCursor;
+    rc = XaceHook(XACE_RESOURCE_ACCESS, client, pCursor->id, RT_CURSOR,
+		  DixReadAccess, pCursor);
+    if (rc != Success)
+	return rc;
     GetSpritePosition (&x, &y);
     width = pCursor->bits->width;
     height = pCursor->bits->height;
@@ -411,7 +414,7 @@ ProcXFixesSetCursorName (ClientPtr client)
     Atom atom;
 
     REQUEST_AT_LEAST_SIZE(xXFixesSetCursorNameReq);
-    VERIFY_CURSOR(pCursor, stuff->cursor, client, DixWriteAccess);
+    VERIFY_CURSOR(pCursor, stuff->cursor, client, DixSetAttrAccess);
     tchar = (char *) &stuff[1];
     atom = MakeAtom (tchar, stuff->nbytes, TRUE);
     if (atom == BAD_RESOURCE)
@@ -444,7 +447,7 @@ ProcXFixesGetCursorName (ClientPtr client)
     int len;
 
     REQUEST_SIZE_MATCH(xXFixesGetCursorNameReq);
-    VERIFY_CURSOR(pCursor, stuff->cursor, client, DixReadAccess);
+    VERIFY_CURSOR(pCursor, stuff->cursor, client, DixGetAttrAccess);
     if (pCursor->name)
 	str = NameForAtom (pCursor->name);
     else
@@ -493,12 +496,16 @@ ProcXFixesGetCursorImageAndName (ClientPtr client)
     char			*name;
     int				nbytes, nbytesRound;
     int				width, height;
-    int				x, y;
+    int				rc, x, y;
 
     REQUEST_SIZE_MATCH(xXFixesGetCursorImageAndNameReq);
     pCursor = CursorCurrent;
     if (!pCursor)
 	return BadCursor;
+    rc = XaceHook(XACE_RESOURCE_ACCESS, client, pCursor->id, RT_CURSOR,
+		  DixReadAccess|DixGetAttrAccess, pCursor);
+    if (rc != Success)
+	return rc;
     GetSpritePosition (&x, &y);
     width = pCursor->bits->width;
     height = pCursor->bits->height;
@@ -675,8 +682,10 @@ ProcXFixesChangeCursor (ClientPtr client)
     REQUEST(xXFixesChangeCursorReq);
 
     REQUEST_SIZE_MATCH(xXFixesChangeCursorReq);
-    VERIFY_CURSOR (pSource, stuff->source, client, DixReadAccess);
-    VERIFY_CURSOR (pDestination, stuff->destination, client, DixWriteAccess);
+    VERIFY_CURSOR (pSource, stuff->source, client,
+		   DixReadAccess|DixGetAttrAccess);
+    VERIFY_CURSOR (pDestination, stuff->destination, client,
+		   DixWriteAccess|DixSetAttrAccess);
 
     ReplaceCursor (pSource, TestForCursor, (pointer) pDestination);
     return (client->noClientException);
@@ -710,7 +719,8 @@ ProcXFixesChangeCursorByName (ClientPtr client)
     REQUEST(xXFixesChangeCursorByNameReq);
 
     REQUEST_FIXED_SIZE(xXFixesChangeCursorByNameReq, stuff->nbytes);
-    VERIFY_CURSOR(pSource, stuff->source, client, DixReadAccess);
+    VERIFY_CURSOR(pSource, stuff->source, client,
+		  DixReadAccess|DixGetAttrAccess);
     tchar = (char *) &stuff[1];
     name = MakeAtom (tchar, stuff->nbytes, FALSE);
     if (name)
@@ -838,10 +848,11 @@ ProcXFixesHideCursor (ClientPtr client)
 
     REQUEST_SIZE_MATCH (xXFixesHideCursorReq);
 
-    pWin = (WindowPtr) LookupIDByType (stuff->window, RT_WINDOW);
-    if (!pWin) {
+    ret = dixLookupResource((pointer *)&pWin, stuff->window, RT_WINDOW,
+			    client, DixGetAttrAccess);
+    if (ret != Success) {
 	client->errorValue = stuff->window;
-	return BadWindow;
+	return (ret == BadValue) ? BadWindow : ret;
     }
 
     /* 
@@ -859,6 +870,11 @@ ProcXFixesHideCursor (ClientPtr client)
      * This is the first time this client has hid the cursor 
      * for this screen.
      */
+    ret = XaceHook(XACE_SCREEN_ACCESS, client, pWin->drawable.pScreen,
+		   DixHideAccess);
+    if (ret != Success)
+	return ret;
+
     ret = createCursorHideCount(client, pWin->drawable.pScreen);
 
     if (ret == Success) {
@@ -885,14 +901,16 @@ ProcXFixesShowCursor (ClientPtr client)
 {
     WindowPtr pWin;
     CursorHideCountPtr pChc;
+    int rc;
     REQUEST(xXFixesShowCursorReq);
 
     REQUEST_SIZE_MATCH (xXFixesShowCursorReq);
 
-    pWin = (WindowPtr) LookupIDByType (stuff->window, RT_WINDOW);
-    if (!pWin) {
+    rc = dixLookupResource((pointer *)&pWin, stuff->window, RT_WINDOW,
+			   client, DixGetAttrAccess);
+    if (rc != Success) {
 	client->errorValue = stuff->window;
-	return BadWindow;
+	return (rc == BadValue) ? BadWindow : rc;
     }
 
     /* 
@@ -904,6 +922,11 @@ ProcXFixesShowCursor (ClientPtr client)
 	return BadMatch;
     }
 
+    rc = XaceHook(XACE_SCREEN_ACCESS, client, pWin->drawable.pScreen,
+		  DixShowAccess);
+    if (rc != Success)
+	return rc;
+
     pChc->hideCount--;
     if (pChc->hideCount <= 0) {
 	FreeResource(pChc->resource, 0);
diff --git a/xfixes/region.c b/xfixes/region.c
index d4316be78..d90b1e0ff 100755
--- a/xfixes/region.c
+++ b/xfixes/region.c
@@ -109,18 +109,18 @@ ProcXFixesCreateRegionFromBitmap (ClientPtr client)
 {
     RegionPtr	pRegion;
     PixmapPtr	pPixmap;
+    int rc;
     REQUEST (xXFixesCreateRegionFromBitmapReq);
 
     REQUEST_SIZE_MATCH (xXFixesCreateRegionFromBitmapReq);
     LEGAL_NEW_RESOURCE (stuff->region, client);
 
-    pPixmap = (PixmapPtr) SecurityLookupIDByType (client, stuff->bitmap,
-						  RT_PIXMAP,
-						  DixReadAccess);
-    if (!pPixmap)
+    rc = dixLookupResource((pointer *)&pPixmap, stuff->bitmap, RT_PIXMAP,
+			   client, DixReadAccess);
+    if (rc != Success)
     {
 	client->errorValue = stuff->bitmap;
-	return BadPixmap;
+	return (rc == BadValue) ? BadPixmap : rc;
     }
     if (pPixmap->drawable.depth != 1)
 	return BadMatch;
@@ -155,15 +155,17 @@ ProcXFixesCreateRegionFromWindow (ClientPtr client)
     RegionPtr	pRegion;
     Bool	copy = TRUE;
     WindowPtr	pWin;
+    int rc;
     REQUEST (xXFixesCreateRegionFromWindowReq);
     
     REQUEST_SIZE_MATCH (xXFixesCreateRegionFromWindowReq);
     LEGAL_NEW_RESOURCE (stuff->region, client);
-    pWin = (WindowPtr) LookupIDByType (stuff->window, RT_WINDOW);
-    if (!pWin)
+    rc = dixLookupResource((pointer *)&pWin, stuff->window, RT_WINDOW,
+			   client, DixGetAttrAccess);
+    if (rc != Success)
     {
 	client->errorValue = stuff->window;
-	return BadWindow;
+	return (rc == BadValue) ? BadWindow : rc;
     }
     switch (stuff->kind) {
     case WindowRegionBounding:
@@ -224,7 +226,7 @@ ProcXFixesCreateRegionFromGC (ClientPtr client)
     REQUEST_SIZE_MATCH (xXFixesCreateRegionFromGCReq);
     LEGAL_NEW_RESOURCE (stuff->region, client);
 
-    rc = dixLookupGC(&pGC, stuff->gc, client, DixReadAccess);
+    rc = dixLookupGC(&pGC, stuff->gc, client, DixGetAttrAccess);
     if (rc != Success)
 	return rc;
     
@@ -274,7 +276,7 @@ ProcXFixesCreateRegionFromPicture (ClientPtr client)
     REQUEST_SIZE_MATCH (xXFixesCreateRegionFromPictureReq);
     LEGAL_NEW_RESOURCE (stuff->region, client);
 
-    VERIFY_PICTURE(pPicture, stuff->picture, client, DixReadAccess,
+    VERIFY_PICTURE(pPicture, stuff->picture, client, DixGetAttrAccess,
 		   RenderErrBase + BadPicture);
     
     switch (pPicture->clientClipType) {
@@ -635,7 +637,7 @@ ProcXFixesSetGCClipRegion (ClientPtr client)
     REQUEST(xXFixesSetGCClipRegionReq);
     REQUEST_SIZE_MATCH(xXFixesSetGCClipRegionReq);
 
-    rc = dixLookupGC(&pGC, stuff->gc, client, DixWriteAccess);
+    rc = dixLookupGC(&pGC, stuff->gc, client, DixSetAttrAccess);
     if (rc != Success)
 	return rc;
 
@@ -681,14 +683,16 @@ ProcXFixesSetWindowShapeRegion (ClientPtr client)
     ScreenPtr	    pScreen;
     RegionPtr	    pRegion;
     RegionPtr	    *pDestRegion;
+    int rc;
     REQUEST(xXFixesSetWindowShapeRegionReq);
 
     REQUEST_SIZE_MATCH(xXFixesSetWindowShapeRegionReq);
-    pWin = (WindowPtr) LookupIDByType (stuff->dest, RT_WINDOW);
-    if (!pWin)
+    rc = dixLookupResource((pointer *)&pWin, stuff->dest, RT_WINDOW,
+			   client, DixSetAttrAccess);
+    if (rc != Success)
     {
 	client->errorValue = stuff->dest;
-	return BadWindow;
+	return (rc == BadValue) ? BadWindow : rc;
     }
     VERIFY_REGION_OR_NONE(pRegion, stuff->region, client, DixWriteAccess);
     pScreen = pWin->drawable.pScreen;
@@ -780,7 +784,7 @@ ProcXFixesSetPictureClipRegion (ClientPtr client)
     REQUEST(xXFixesSetPictureClipRegionReq);
     
     REQUEST_SIZE_MATCH (xXFixesSetPictureClipRegionReq);
-    VERIFY_PICTURE(pPicture, stuff->picture, client, DixWriteAccess,
+    VERIFY_PICTURE(pPicture, stuff->picture, client, DixSetAttrAccess,
 		   RenderErrBase + BadPicture);
     pScreen = pPicture->pDrawable->pScreen;
     ps = GetPictureScreen (pScreen);
diff --git a/xfixes/saveset.c b/xfixes/saveset.c
index 8d66843d9..e6e297638 100755
--- a/xfixes/saveset.c
+++ b/xfixes/saveset.c
@@ -35,7 +35,7 @@ ProcXFixesChangeSaveSet(ClientPtr client)
     REQUEST(xXFixesChangeSaveSetReq);
 		  
     REQUEST_SIZE_MATCH(xXFixesChangeSaveSetReq);
-    result = dixLookupWindow(&pWin, stuff->window, client, DixReadAccess);
+    result = dixLookupWindow(&pWin, stuff->window, client, DixManageAccess);
     if (result != Success)
         return result;
     if (client->clientAsMask == (CLIENT_BITS(pWin->drawable.id)))
diff --git a/xfixes/select.c b/xfixes/select.c
index c0076801d..9de152f29 100755
--- a/xfixes/select.c
+++ b/xfixes/select.c
@@ -25,6 +25,7 @@
 #endif
 
 #include "xfixesint.h"
+#include "xace.h"
 
 static RESTYPE		SelectionClientType, SelectionWindowType;
 static Bool		SelectionCallbackRegistered = FALSE;
@@ -131,8 +132,14 @@ XFixesSelectSelectionInput (ClientPtr	pClient,
 			    WindowPtr	pWindow,
 			    CARD32	eventMask)
 {
+    int rc;
     SelectionEventPtr	*prev, e;
 
+    rc = XaceHook(XACE_SELECTION_ACCESS, pClient, selection, NULL,
+		  DixGetAttrAccess);
+    if (rc != Success)
+	return rc;
+
     for (prev = &selectionEvents; (e = *prev); prev = &e->next)
     {
 	if (e->selection == selection &&
@@ -196,7 +203,7 @@ ProcXFixesSelectSelectionInput (ClientPtr client)
     int		rc;
 
     REQUEST_SIZE_MATCH (xXFixesSelectSelectionInputReq);
-    rc = dixLookupWindow(&pWin, stuff->window, client, DixReadAccess);
+    rc = dixLookupWindow(&pWin, stuff->window, client, DixSetAttrAccess);
     if (rc != Success)
         return rc;
     if (stuff->eventMask & ~SelectionAllEvents)

From 766c693ef3637ee6fc402df594060ed2c1346761 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 30 Aug 2007 13:06:28 -0400
Subject: [PATCH 099/552] xace: add hooks + new access codes: MIT-SCREEN-SAVER
 extension

---
 Xext/saver.c | 51 +++++++++++++++++++++++++++++++++++----------------
 1 file changed, 35 insertions(+), 16 deletions(-)

diff --git a/Xext/saver.c b/Xext/saver.c
index 004258382..d282173f8 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -48,6 +48,7 @@ in this Software without prior written authorization from the X Consortium.
 #include "gcstruct.h"
 #include "cursorstr.h"
 #include "colormapst.h"
+#include "xace.h"
 #ifdef PANORAMIX
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
@@ -789,7 +790,11 @@ ProcScreenSaverQueryInfo (client)
 
     REQUEST_SIZE_MATCH (xScreenSaverQueryInfoReq);
     rc = dixLookupDrawable(&pDraw, stuff->drawable, client, 0,
-			   DixUnknownAccess);
+			   DixGetAttrAccess);
+    if (rc != Success)
+	return rc;
+    rc = XaceHook(XACE_SCREENSAVER_ACCESS, client, pDraw->pScreen,
+		  DixGetAttrAccess);
     if (rc != Success)
 	return rc;
 
@@ -858,9 +863,15 @@ ProcScreenSaverSelectInput (client)
 
     REQUEST_SIZE_MATCH (xScreenSaverSelectInputReq);
     rc = dixLookupDrawable (&pDraw, stuff->drawable, client, 0,
-			    DixUnknownAccess);
+			    DixGetAttrAccess);
     if (rc != Success)
 	return rc;
+
+    rc = XaceHook(XACE_SCREENSAVER_ACCESS, client, pDraw->pScreen,
+		  DixSetAttrAccess);
+    if (rc != Success)
+	return rc;
+
     if (!setEventMask (pDraw->pScreen, client, stuff->eventMask))
 	return BadAlloc;
     return Success;
@@ -894,12 +905,16 @@ ScreenSaverSetAttributes (ClientPtr client)
 
     REQUEST_AT_LEAST_SIZE (xScreenSaverSetAttributesReq);
     ret = dixLookupDrawable(&pDraw, stuff->drawable, client, 0,
-			    DixUnknownAccess);
+			    DixGetAttrAccess);
     if (ret != Success)
 	return ret;
     pScreen = pDraw->pScreen;
     pParent = WindowTable[pScreen->myNum];
 
+    ret = XaceHook(XACE_SCREENSAVER_ACCESS, client, pScreen, DixSetAttrAccess);
+    if (ret != Success)
+	return ret;
+
     len = stuff->length -  (sizeof(xScreenSaverSetAttributesReq) >> 2);
     if (Ones(stuff->mask) != len)
         return BadLength;
@@ -1055,8 +1070,9 @@ ScreenSaverSetAttributes (ClientPtr client)
 	    }
             else
 	    {	
-                pPixmap = (PixmapPtr)LookupIDByType(pixID, RT_PIXMAP);
-                if (pPixmap != (PixmapPtr) NULL)
+		ret = dixLookupResource((pointer *)&pPixmap, pixID, RT_PIXMAP,
+					client, DixReadAccess);
+		if (ret == Success)
 		{
                     if  ((pPixmap->drawable.depth != depth) ||
 			 (pPixmap->drawable.pScreen != pScreen))
@@ -1070,7 +1086,7 @@ ScreenSaverSetAttributes (ClientPtr client)
 		}
 	        else
 		{
-		    ret = BadPixmap;
+		    ret = (ret == BadValue) ? BadPixmap : ret;
 		    client->errorValue = pixID;
 		    goto PatchUp;
 		}
@@ -1092,8 +1108,9 @@ ScreenSaverSetAttributes (ClientPtr client)
 	    }
 	    else
 	    {	
-		pPixmap = (PixmapPtr)LookupIDByType(pixID, RT_PIXMAP);
-		if (pPixmap)
+		ret = dixLookupResource((pointer *)&pPixmap, pixID, RT_PIXMAP,
+					client, DixReadAccess);
+		if (ret == Success)
 		{
                     if  ((pPixmap->drawable.depth != depth) ||
 			 (pPixmap->drawable.pScreen != pScreen))
@@ -1107,7 +1124,7 @@ ScreenSaverSetAttributes (ClientPtr client)
 		}
     	        else
 		{
-		    ret = BadPixmap;
+		    ret = (ret == BadValue) ? BadPixmap : ret;
 		    client->errorValue = pixID;
 		    goto PatchUp;
 		}
@@ -1185,10 +1202,11 @@ ScreenSaverSetAttributes (ClientPtr client)
 	    break;
 	case CWColormap:
 	    cmap = (Colormap) *pVlist;
-	    pCmap = (ColormapPtr)LookupIDByType(cmap, RT_COLORMAP);
-	    if (!pCmap)
+	    ret = dixLookupResource((pointer *)&pCmap, cmap, RT_COLORMAP,
+				    client, DixUseAccess);
+	    if (ret != Success)
 	    {
-		ret = BadColor;
+		ret = (ret == BadValue) ? BadColor : ret;
 		client->errorValue = cmap;
 		goto PatchUp;
 	    }
@@ -1208,10 +1226,11 @@ ScreenSaverSetAttributes (ClientPtr client)
 	    }
 	    else
 	    {
-	    	pCursor = (CursorPtr)LookupIDByType(cursorID, RT_CURSOR);
-	    	if (!pCursor)
+		ret = dixLookupResource((pointer *)&pCursor, cursorID,
+					RT_CURSOR, client, DixUseAccess);
+	    	if (ret != Success)
 	    	{
-		    ret = BadCursor;
+		    ret = (ret == BadValue) ? BadCursor : ret;
 		    client->errorValue = cursorID;
 		    goto PatchUp;
 	    	}
@@ -1253,7 +1272,7 @@ ScreenSaverUnsetAttributes (ClientPtr client)
 
     REQUEST_SIZE_MATCH (xScreenSaverUnsetAttributesReq);
     rc = dixLookupDrawable(&pDraw, stuff->drawable, client, 0,
-			   DixUnknownAccess);
+			   DixGetAttrAccess);
     if (rc != Success)
 	return rc;
     pPriv = GetScreenPrivate (pDraw->pScreen);

From 53f346b158fa8e10de5a8777fa6d8d86f918878b Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 30 Aug 2007 13:20:04 -0400
Subject: [PATCH 100/552] xace: add hooks + new access codes: SHAPE extension

---
 Xext/shape.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/Xext/shape.c b/Xext/shape.c
index 928eeee31..0f49f7332 100644
--- a/Xext/shape.c
+++ b/Xext/shape.c
@@ -323,7 +323,7 @@ ProcShapeRectangles (client)
 
     REQUEST_AT_LEAST_SIZE (xShapeRectanglesReq);
     UpdateCurrentTime();
-    rc = dixLookupWindow(&pWin, stuff->dest, client, DixUnknownAccess);
+    rc = dixLookupWindow(&pWin, stuff->dest, client, DixSetAttrAccess);
     if (rc != Success)
 	return rc;
     switch (stuff->destKind) {
@@ -423,7 +423,7 @@ ProcShapeMask (client)
 
     REQUEST_SIZE_MATCH (xShapeMaskReq);
     UpdateCurrentTime();
-    rc = dixLookupWindow(&pWin, stuff->dest, client, DixWriteAccess);
+    rc = dixLookupWindow(&pWin, stuff->dest, client, DixSetAttrAccess);
     if (rc != Success)
 	return rc;
     switch (stuff->destKind) {
@@ -444,10 +444,10 @@ ProcShapeMask (client)
     if (stuff->src == None)
 	srcRgn = 0;
     else {
-        pPixmap = (PixmapPtr) SecurityLookupIDByType(client, stuff->src,
-						RT_PIXMAP, DixReadAccess);
-        if (!pPixmap)
-	    return BadPixmap;
+	rc = dixLookupResource((pointer *)&pPixmap, stuff->src, RT_PIXMAP,
+			       client, DixReadAccess);
+        if (rc != Success)
+	    return (rc == BadValue) ? BadPixmap : rc;
 	if (pPixmap->drawable.pScreen != pScreen ||
 	    pPixmap->drawable.depth != 1)
 	    return BadMatch;
@@ -531,7 +531,7 @@ ProcShapeCombine (client)
 
     REQUEST_SIZE_MATCH (xShapeCombineReq);
     UpdateCurrentTime();
-    rc = dixLookupWindow(&pDestWin, stuff->dest, client, DixUnknownAccess);
+    rc = dixLookupWindow(&pDestWin, stuff->dest, client, DixSetAttrAccess);
     if (rc != Success)
 	return rc;
     if (!pDestWin->optional)
@@ -552,7 +552,7 @@ ProcShapeCombine (client)
     }
     pScreen = pDestWin->drawable.pScreen;
 
-    rc = dixLookupWindow(&pSrcWin, stuff->src, client, DixUnknownAccess);
+    rc = dixLookupWindow(&pSrcWin, stuff->src, client, DixGetAttrAccess);
     if (rc != Success)
 	return rc;
     switch (stuff->srcKind) {
@@ -651,7 +651,7 @@ ProcShapeOffset (client)
 
     REQUEST_SIZE_MATCH (xShapeOffsetReq);
     UpdateCurrentTime();
-    rc = dixLookupWindow(&pWin, stuff->dest, client, DixUnknownAccess);
+    rc = dixLookupWindow(&pWin, stuff->dest, client, DixSetAttrAccess);
     if (rc != Success)
 	return rc;
     switch (stuff->destKind) {
@@ -716,7 +716,7 @@ ProcShapeQueryExtents (client)
     RegionPtr		region;
 
     REQUEST_SIZE_MATCH (xShapeQueryExtentsReq);
-    rc = dixLookupWindow(&pWin, stuff->window, client, DixUnknownAccess);
+    rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
     if (rc != Success)
 	return rc;
     rep.type = X_Reply;
@@ -826,7 +826,7 @@ ProcShapeSelectInput (client)
     int			rc;
 
     REQUEST_SIZE_MATCH (xShapeSelectInputReq);
-    rc = dixLookupWindow(&pWin, stuff->window, client, DixWriteAccess);
+    rc = dixLookupWindow(&pWin, stuff->window, client, DixReceiveAccess);
     if (rc != Success)
 	return rc;
     pHead = (ShapeEventPtr *)SecurityLookupIDByType(client,
@@ -999,7 +999,7 @@ ProcShapeInputSelected (client)
     register int		n;
 
     REQUEST_SIZE_MATCH (xShapeInputSelectedReq);
-    rc = dixLookupWindow(&pWin, stuff->window, client, DixUnknownAccess);
+    rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
     if (rc != Success)
 	return rc;
     pHead = (ShapeEventPtr *) SecurityLookupIDByType(client,
@@ -1041,7 +1041,7 @@ ProcShapeGetRectangles (client)
     register int		n;
 
     REQUEST_SIZE_MATCH(xShapeGetRectanglesReq);
-    rc = dixLookupWindow(&pWin, stuff->window, client, DixUnknownAccess);
+    rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
     if (rc != Success)
 	return rc;
     switch (stuff->kind) {

From 1005b29cc6939851b40397cc9cd0de9476ad3046 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 30 Aug 2007 14:48:24 -0400
Subject: [PATCH 101/552] xace: Correct some access modes.

---
 dix/window.c    | 2 +-
 xfixes/cursor.c | 2 +-
 xfixes/select.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dix/window.c b/dix/window.c
index b6bbdd4cb..70ce2ad9e 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -1396,7 +1396,7 @@ ChangeWindowAttributes(WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client)
 	    else
 	    {
 		rc = dixLookupResource((pointer *)&pCursor, cursorID,
-				       RT_CURSOR, client, DixReadAccess);
+				       RT_CURSOR, client, DixUseAccess);
 		if (rc != Success)
 		{
 		    error = (rc == BadValue) ? BadCursor : rc;
diff --git a/xfixes/cursor.c b/xfixes/cursor.c
index 91f149e1a..52f483e03 100755
--- a/xfixes/cursor.c
+++ b/xfixes/cursor.c
@@ -239,7 +239,7 @@ ProcXFixesSelectCursorInput (ClientPtr client)
     int		rc;
 
     REQUEST_SIZE_MATCH (xXFixesSelectCursorInputReq);
-    rc = dixLookupWindow(&pWin, stuff->window, client, DixSetAttrAccess);
+    rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
     if (rc != Success)
         return rc;
     if (stuff->eventMask & ~CursorAllEvents)
diff --git a/xfixes/select.c b/xfixes/select.c
index 9de152f29..2321212ce 100755
--- a/xfixes/select.c
+++ b/xfixes/select.c
@@ -203,7 +203,7 @@ ProcXFixesSelectSelectionInput (ClientPtr client)
     int		rc;
 
     REQUEST_SIZE_MATCH (xXFixesSelectSelectionInputReq);
-    rc = dixLookupWindow(&pWin, stuff->window, client, DixSetAttrAccess);
+    rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
     if (rc != Success)
         return rc;
     if (stuff->eventMask & ~SelectionAllEvents)

From fd04b983db6a70bf747abe02ca07c1fbbaae6343 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 31 Aug 2007 09:55:27 -0400
Subject: [PATCH 102/552] xace: add hooks + new access codes: Render extension

---
 render/animcur.c    | 19 +++++++--
 render/picture.c    | 31 +++++++++------
 render/picturestr.h |  2 +-
 render/render.c     | 94 ++++++++++++++++++++++++++++-----------------
 4 files changed, 94 insertions(+), 52 deletions(-)

diff --git a/render/animcur.c b/render/animcur.c
index 444d70645..da3d4a02d 100644
--- a/render/animcur.c
+++ b/render/animcur.c
@@ -44,6 +44,7 @@
 #include "dixfontstr.h"
 #include "opaque.h"
 #include "picturestr.h"
+#include "xace.h"
 
 typedef struct _AnimCurElt {
     CursorPtr	pCursor;    /* cursor to show */
@@ -346,10 +347,10 @@ AnimCurInit (ScreenPtr pScreen)
 }
 
 int
-AnimCursorCreate (CursorPtr *cursors, CARD32 *deltas, int ncursor, CursorPtr *ppCursor)
+AnimCursorCreate (CursorPtr *cursors, CARD32 *deltas, int ncursor, CursorPtr *ppCursor, ClientPtr client, XID cid)
 {
     CursorPtr	pCursor;
-    int		i;
+    int		rc, i;
     AnimCurPtr	ac;
 
     for (i = 0; i < screenInfo.numScreens; i++)
@@ -366,7 +367,6 @@ AnimCursorCreate (CursorPtr *cursors, CARD32 *deltas, int ncursor, CursorPtr *pp
     if (!pCursor)
 	return BadAlloc;
     pCursor->bits = &animCursorBits;
-    animCursorBits.refcnt++;
     pCursor->refcnt = 1;
     
     pCursor->foreRed = cursors[0]->foreRed;
@@ -377,9 +377,22 @@ AnimCursorCreate (CursorPtr *cursors, CARD32 *deltas, int ncursor, CursorPtr *pp
     pCursor->backGreen = cursors[0]->backGreen;
     pCursor->backBlue = cursors[0]->backBlue;
 
+    pCursor->devPrivates = NULL;
+    pCursor->id = cid;
+
+    /* security creation/labeling check */
+    rc = XaceHook(XACE_RESOURCE_ACCESS, client, cid, RT_CURSOR,
+		  DixCreateAccess, pCursor);
+    if (rc != Success) {
+	dixFreePrivates(pCursor->devPrivates);
+	xfree(pCursor);
+	return rc;
+    }
+	
     /*
      * Fill in the AnimCurRec
      */
+    animCursorBits.refcnt++;
     ac = GetAnimCur (pCursor);
     ac->nelt = ncursor;
     ac->elts = (AnimCurElt *) (ac + 1);
diff --git a/render/picture.c b/render/picture.c
index bc2c3b526..7b200ee41 100644
--- a/render/picture.c
+++ b/render/picture.c
@@ -40,6 +40,7 @@
 #include "gcstruct.h"
 #include "servermd.h"
 #include "picturestr.h"
+#include "xace.h"
 
 _X_EXPORT DevPrivateKey PictureScreenPrivateKey = &PictureScreenPrivateKey;
 DevPrivateKey	PictureWindowPrivateKey = &PictureWindowPrivateKey;
@@ -724,6 +725,13 @@ CreatePicture (Picture		pid,
     pPicture->pFormat = pFormat;
     pPicture->format = pFormat->format | (pDrawable->bitsPerPixel << 24);
     pPicture->devPrivates = NULL;
+
+    /* security creation/labeling check */
+    *error = XaceHook(XACE_RESOURCE_ACCESS, client, pid, PictureType,
+		      DixCreateAccess|DixSetAttrAccess, pPicture);
+    if (*error != Success)
+	goto out;
+
     if (pDrawable->type == DRAWABLE_PIXMAP)
     {
 	++((PixmapPtr)pDrawable)->refcnt;
@@ -743,6 +751,7 @@ CreatePicture (Picture		pid,
 	*error = Success;
     if (*error == Success)
 	*error = (*ps->CreatePicture) (pPicture);
+out:
     if (*error != Success)
     {
 	FreePicture (pPicture, (XID) 0);
@@ -1060,14 +1069,13 @@ ChangePicture (PicturePtr	pPicture,
 			pAlpha = 0;
 		    else
 		    {
-			pAlpha = (PicturePtr) SecurityLookupIDByType(client,
-								     pid, 
-								     PictureType, 
-								     DixWriteAccess|DixReadAccess);
-			if (!pAlpha)
+			error = dixLookupResource((pointer *)&pAlpha, pid,
+						  PictureType, client,
+						  DixReadAccess);
+			if (error != Success)
 			{
 			    client->errorValue = pid;
-			    error = BadPixmap;
+			    error = (error == BadValue) ? BadPixmap : error;
 			    break;
 			}
 			if (pAlpha->pDrawable == NULL ||
@@ -1122,14 +1130,13 @@ ChangePicture (PicturePtr	pPicture,
 		    else
 		    {
 			clipType = CT_PIXMAP;
-			pPixmap = (PixmapPtr)SecurityLookupIDByType(client,
-								    pid, 
-								    RT_PIXMAP,
-								    DixReadAccess);
-			if (!pPixmap)
+			error = dixLookupResource((pointer *)&pPixmap, pid,
+						  RT_PIXMAP, client,
+						  DixReadAccess);
+			if (error != Success)
 			{
 			    client->errorValue = pid;
-			    error = BadPixmap;
+			    error = (error == BadValue) ? BadPixmap : error;
 			    break;
 			}
 		    }
diff --git a/render/picturestr.h b/render/picturestr.h
index aafe4e80a..fad974168 100644
--- a/render/picturestr.h
+++ b/render/picturestr.h
@@ -630,7 +630,7 @@ Bool
 AnimCurInit (ScreenPtr pScreen);
 
 int
-AnimCursorCreate (CursorPtr *cursors, CARD32 *deltas, int ncursor, CursorPtr *ppCursor);
+AnimCursorCreate (CursorPtr *cursors, CARD32 *deltas, int ncursor, CursorPtr *ppCursor, ClientPtr client, XID cid);
 
 void
 AddTraps (PicturePtr	pPicture,
diff --git a/render/render.c b/render/render.c
index 7b2745758..37d2d620e 100644
--- a/render/render.c
+++ b/render/render.c
@@ -46,6 +46,7 @@
 #include "glyphstr.h"
 #include <X11/Xfuncproto.h>
 #include "cursorstr.h"
+#include "xace.h"
 
 #if HAVE_STDINT_H
 #include <stdint.h>
@@ -623,7 +624,7 @@ ProcRenderCreatePicture (ClientPtr client)
 
     LEGAL_NEW_RESOURCE(stuff->pid, client);
     rc = dixLookupDrawable(&pDrawable, stuff->drawable, client, 0,
-			   DixWriteAccess);
+			   DixReadAccess|DixAddAccess);
     if (rc != Success)
 	return rc;
 
@@ -664,7 +665,7 @@ ProcRenderChangePicture (ClientPtr client)
     int len;
 
     REQUEST_AT_LEAST_SIZE(xRenderChangePictureReq);
-    VERIFY_PICTURE (pPicture, stuff->picture, client, DixWriteAccess,
+    VERIFY_PICTURE (pPicture, stuff->picture, client, DixSetAttrAccess,
 		    RenderErrBase + BadPicture);
 
     len = client->req_len - (sizeof(xRenderChangePictureReq) >> 2);
@@ -684,7 +685,7 @@ ProcRenderSetPictureClipRectangles (ClientPtr client)
     int		    result;
 
     REQUEST_AT_LEAST_SIZE(xRenderSetPictureClipRectanglesReq);
-    VERIFY_PICTURE (pPicture, stuff->picture, client, DixWriteAccess,
+    VERIFY_PICTURE (pPicture, stuff->picture, client, DixSetAttrAccess,
 		    RenderErrBase + BadPicture);
     if (!pPicture->pDrawable)
         return BadDrawable;
@@ -983,7 +984,7 @@ ProcRenderCreateGlyphSet (ClientPtr client)
 {
     GlyphSetPtr	    glyphSet;
     PictFormatPtr   format;
-    int		    f;
+    int		    rc, f;
     REQUEST(xRenderCreateGlyphSetReq);
 
     REQUEST_SIZE_MATCH(xRenderCreateGlyphSetReq);
@@ -1022,6 +1023,11 @@ ProcRenderCreateGlyphSet (ClientPtr client)
     glyphSet = AllocateGlyphSet (f, format);
     if (!glyphSet)
 	return BadAlloc;
+    /* security creation/labeling check */
+    rc = XaceHook(XACE_RESOURCE_ACCESS, client, stuff->gsid, GlyphSetType,
+		  DixCreateAccess, glyphSet);
+    if (rc != Success)
+	return rc;
     if (!AddResource (stuff->gsid, GlyphSetType, (pointer)glyphSet))
 	return BadAlloc;
     return Success;
@@ -1031,20 +1037,19 @@ static int
 ProcRenderReferenceGlyphSet (ClientPtr client)
 {
     GlyphSetPtr     glyphSet;
+    int rc;
     REQUEST(xRenderReferenceGlyphSetReq);
 
     REQUEST_SIZE_MATCH(xRenderReferenceGlyphSetReq);
 
     LEGAL_NEW_RESOURCE(stuff->gsid, client);
 
-    glyphSet = (GlyphSetPtr) SecurityLookupIDByType (client,
-						     stuff->existing,
-						     GlyphSetType,
-						     DixWriteAccess);
-    if (!glyphSet)
+    rc = dixLookupResource((pointer *)&glyphSet, stuff->existing, GlyphSetType,
+			   client, DixGetAttrAccess);
+    if (rc != Success)
     {
 	client->errorValue = stuff->existing;
-	return RenderErrBase + BadGlyphSet;
+	return (rc == BadValue) ? RenderErrBase + BadGlyphSet : rc;
     }
     glyphSet->refcnt++;
     if (!AddResource (stuff->gsid, GlyphSetType, (pointer)glyphSet))
@@ -1059,17 +1064,16 @@ static int
 ProcRenderFreeGlyphSet (ClientPtr client)
 {
     GlyphSetPtr     glyphSet;
+    int rc;
     REQUEST(xRenderFreeGlyphSetReq);
 
     REQUEST_SIZE_MATCH(xRenderFreeGlyphSetReq);
-    glyphSet = (GlyphSetPtr) SecurityLookupIDByType (client,
-						     stuff->glyphset,
-						     GlyphSetType,
-						     DixDestroyAccess);
-    if (!glyphSet)
+    rc = dixLookupResource((pointer *)&glyphSet, stuff->glyphset, GlyphSetType,
+			   client, DixDestroyAccess);
+    if (rc != Success)
     {
 	client->errorValue = stuff->glyphset;
-	return RenderErrBase + BadGlyphSet;
+	return (rc == BadValue) ? RenderErrBase + BadGlyphSet : rc;
     }
     FreeResource (stuff->glyphset, RT_NONE);
     return client->noClientException;
@@ -1093,19 +1097,18 @@ ProcRenderAddGlyphs (ClientPtr client)
     xGlyphInfo	    *gi;
     CARD8	    *bits;
     int		    size;
-    int		    err = BadAlloc;
+    int		    err;
 
     REQUEST_AT_LEAST_SIZE(xRenderAddGlyphsReq);
-    glyphSet = (GlyphSetPtr) SecurityLookupIDByType (client,
-						     stuff->glyphset,
-						     GlyphSetType,
-						     DixWriteAccess);
-    if (!glyphSet)
+    err = dixLookupResource((pointer *)&glyphSet, stuff->glyphset, GlyphSetType,
+			    client, DixAddAccess);
+    if (err != Success)
     {
 	client->errorValue = stuff->glyphset;
-	return RenderErrBase + BadGlyphSet;
+	return (err == BadValue) ? RenderErrBase + BadGlyphSet : err;
     }
 
+    err = BadAlloc;
     nglyphs = stuff->nglyphs;
     if (nglyphs > UINT32_MAX / sizeof(GlyphNewRec))
 	    return BadAlloc;
@@ -1195,19 +1198,17 @@ ProcRenderFreeGlyphs (ClientPtr client)
 {
     REQUEST(xRenderFreeGlyphsReq);
     GlyphSetPtr     glyphSet;
-    int		    nglyph;
+    int		    rc, nglyph;
     CARD32	    *gids;
     CARD32	    glyph;
 
     REQUEST_AT_LEAST_SIZE(xRenderFreeGlyphsReq);
-    glyphSet = (GlyphSetPtr) SecurityLookupIDByType (client,
-						     stuff->glyphset,
-						     GlyphSetType,
-						     DixWriteAccess);
-    if (!glyphSet)
+    rc = dixLookupResource((pointer *)&glyphSet, stuff->glyphset, GlyphSetType,
+			   client, DixRemoveAccess);
+    if (rc != Success)
     {
 	client->errorValue = stuff->glyphset;
-	return RenderErrBase + BadGlyphSet;
+	return (rc == BadValue) ? RenderErrBase + BadGlyphSet : rc;
     }
     nglyph = ((client->req_len << 2) - sizeof (xRenderFreeGlyphsReq)) >> 2;
     gids = (CARD32 *) (stuff + 1);
@@ -1284,7 +1285,7 @@ ProcRenderCompositeGlyphs (ClientPtr client)
     glyphSet = (GlyphSetPtr) SecurityLookupIDByType (client,
 						     stuff->glyphset,
 						     GlyphSetType,
-						     DixReadAccess);
+						     DixUseAccess);
     if (!glyphSet)
     {
 	client->errorValue = stuff->glyphset;
@@ -1346,7 +1347,7 @@ ProcRenderCompositeGlyphs (ClientPtr client)
 		glyphSet = (GlyphSetPtr) SecurityLookupIDByType (client,
 								 gs,
 								 GlyphSetType,
-								 DixReadAccess);
+								 DixUseAccess);
 		if (!glyphSet)
 		{
 		    client->errorValue = gs;
@@ -1679,7 +1680,7 @@ ProcRenderSetPictureTransform (ClientPtr client)
     int		result;
 
     REQUEST_SIZE_MATCH(xRenderSetPictureTransformReq);
-    VERIFY_PICTURE (pPicture, stuff->picture, client, DixWriteAccess,
+    VERIFY_PICTURE (pPicture, stuff->picture, client, DixSetAttrAccess,
 		    RenderErrBase + BadPicture);
     result = SetPictureTransform (pPicture, (PictTransform *) &stuff->transform);
     if (client->noClientException != Success)
@@ -1704,7 +1705,7 @@ ProcRenderQueryFilters (ClientPtr client)
 
     REQUEST_SIZE_MATCH(xRenderQueryFiltersReq);
     rc = dixLookupDrawable(&pDrawable, stuff->drawable, client, 0,
-			   DixReadAccess);
+			   DixGetAttrAccess);
     if (rc != Success)
 	return rc;
     
@@ -1809,7 +1810,7 @@ ProcRenderSetPictureFilter (ClientPtr client)
     char	*name;
     
     REQUEST_AT_LEAST_SIZE (xRenderSetPictureFilterReq);
-    VERIFY_PICTURE (pPicture, stuff->picture, client, DixWriteAccess,
+    VERIFY_PICTURE (pPicture, stuff->picture, client, DixSetAttrAccess,
 		    RenderErrBase + BadPicture);
     name = (char *) (stuff + 1);
     params = (xFixed *) (name + ((stuff->nbytes + 3) & ~3));
@@ -1853,7 +1854,8 @@ ProcRenderCreateAnimCursor (ClientPtr client)
 	deltas[i] = elt->delay;
 	elt++;
     }
-    ret = AnimCursorCreate (cursors, deltas, ncursor, &pCursor);
+    ret = AnimCursorCreate (cursors, deltas, ncursor, &pCursor, client,
+			    stuff->cid);
     xfree (cursors);
     if (ret != Success)
 	return ret;
@@ -1899,6 +1901,11 @@ static int ProcRenderCreateSolidFill(ClientPtr client)
     pPicture = CreateSolidPicture(stuff->pid, &stuff->color, &error);
     if (!pPicture)
 	return error;
+    /* security creation/labeling check */
+    error = XaceHook(XACE_RESOURCE_ACCESS, client, stuff->pid, PictureType,
+		  DixCreateAccess, pPicture);
+    if (error != Success)
+	return error;
     if (!AddResource (stuff->pid, PictureType, (pointer)pPicture))
 	return BadAlloc;
     return Success;
@@ -1928,6 +1935,11 @@ static int ProcRenderCreateLinearGradient (ClientPtr client)
                                             stuff->nStops, stops, colors, &error);
     if (!pPicture)
 	return error;
+    /* security creation/labeling check */
+    error = XaceHook(XACE_RESOURCE_ACCESS, client, stuff->pid, PictureType,
+		  DixCreateAccess, pPicture);
+    if (error != Success)
+	return error;
     if (!AddResource (stuff->pid, PictureType, (pointer)pPicture))
 	return BadAlloc;
     return Success;
@@ -1958,6 +1970,11 @@ static int ProcRenderCreateRadialGradient (ClientPtr client)
                                             stuff->nStops, stops, colors, &error);
     if (!pPicture)
 	return error;
+    /* security creation/labeling check */
+    error = XaceHook(XACE_RESOURCE_ACCESS, client, stuff->pid, PictureType,
+		  DixCreateAccess, pPicture);
+    if (error != Success)
+	return error;
     if (!AddResource (stuff->pid, PictureType, (pointer)pPicture))
 	return BadAlloc;
     return Success;
@@ -1987,6 +2004,11 @@ static int ProcRenderCreateConicalGradient (ClientPtr client)
                                              stuff->nStops, stops, colors, &error);
     if (!pPicture)
 	return error;
+    /* security creation/labeling check */
+    error = XaceHook(XACE_RESOURCE_ACCESS, client, stuff->pid, PictureType,
+		  DixCreateAccess, pPicture);
+    if (error != Success)
+	return error;
     if (!AddResource (stuff->pid, PictureType, (pointer)pPicture))
 	return BadAlloc;
     return Success;

From c9ceb4878063ca22487c708d9d1f86e367f2cec8 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 31 Aug 2007 11:03:54 -0400
Subject: [PATCH 103/552] xace: add hooks + new access codes: Composite
 extension

---
 composite/compext.c | 47 ++++++++++++++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 15 deletions(-)

diff --git a/composite/compext.c b/composite/compext.c
index 8d2a2d790..b32967960 100644
--- a/composite/compext.c
+++ b/composite/compext.c
@@ -45,6 +45,7 @@
 #endif
 
 #include "compint.h"
+#include "xace.h"
 
 #define SERVER_COMPOSITE_MAJOR	0
 #define SERVER_COMPOSITE_MINOR	4
@@ -157,14 +158,16 @@ static int
 ProcCompositeRedirectWindow (ClientPtr client)
 {
     WindowPtr	pWin;
+    int rc;
     REQUEST(xCompositeRedirectWindowReq);
 
     REQUEST_SIZE_MATCH(xCompositeRedirectWindowReq);
-    pWin = (WindowPtr) LookupIDByType (stuff->window, RT_WINDOW);
-    if (!pWin)
+    rc = dixLookupResource((pointer *)&pWin, stuff->window, RT_WINDOW, client,
+			   DixSetAttrAccess|DixManageAccess|DixBlendAccess);
+    if (rc != Success)
     {
 	client->errorValue = stuff->window;
-	return BadWindow;
+	return (rc == BadValue) ? BadWindow : rc;
     }
     return compRedirectWindow (client, pWin, stuff->update);
 }
@@ -173,14 +176,16 @@ static int
 ProcCompositeRedirectSubwindows (ClientPtr client)
 {
     WindowPtr	pWin;
+    int rc;
     REQUEST(xCompositeRedirectSubwindowsReq);
 
     REQUEST_SIZE_MATCH(xCompositeRedirectSubwindowsReq);
-    pWin = (WindowPtr) LookupIDByType (stuff->window, RT_WINDOW);
-    if (!pWin)
+    rc = dixLookupResource((pointer *)&pWin, stuff->window, RT_WINDOW, client,
+			   DixSetAttrAccess|DixManageAccess|DixBlendAccess);
+    if (rc != Success)
     {
 	client->errorValue = stuff->window;
-	return BadWindow;
+	return (rc == BadValue) ? BadWindow : rc;
     }
     return compRedirectSubwindows (client, pWin, stuff->update);
 }
@@ -223,14 +228,16 @@ ProcCompositeCreateRegionFromBorderClip (ClientPtr client)
     WindowPtr	    pWin;
     CompWindowPtr   cw;
     RegionPtr	    pBorderClip, pRegion;
+    int rc;
     REQUEST(xCompositeCreateRegionFromBorderClipReq);
 
     REQUEST_SIZE_MATCH(xCompositeCreateRegionFromBorderClipReq);
-    pWin = (WindowPtr) LookupIDByType (stuff->window, RT_WINDOW);
-    if (!pWin)
+    rc = dixLookupResource((pointer *)&pWin, stuff->window, RT_WINDOW, client,
+			   DixGetAttrAccess);
+    if (rc != Success)
     {
 	client->errorValue = stuff->window;
-	return BadWindow;
+	return (rc == BadValue) ? BadWindow : rc;
     }
     
     LEGAL_NEW_RESOURCE (stuff->region, client);
@@ -257,14 +264,16 @@ ProcCompositeNameWindowPixmap (ClientPtr client)
     WindowPtr	    pWin;
     CompWindowPtr   cw;
     PixmapPtr	    pPixmap;
+    int rc;
     REQUEST(xCompositeNameWindowPixmapReq);
 
     REQUEST_SIZE_MATCH(xCompositeNameWindowPixmapReq);
-    pWin = (WindowPtr) LookupIDByType (stuff->window, RT_WINDOW);
-    if (!pWin)
+    rc = dixLookupResource((pointer *)&pWin, stuff->window, RT_WINDOW, client,
+			   DixGetAttrAccess);
+    if (rc != Success)
     {
 	client->errorValue = stuff->window;
-	return BadWindow;
+	return (rc == BadValue) ? BadWindow : rc;
     }
 
     if (!pWin->viewable)
@@ -429,13 +438,15 @@ ProcCompositeGetOverlayWindow (ClientPtr client)
     ScreenPtr pScreen;
     CompScreenPtr cs;
     CompOverlayClientPtr pOc;
+    int rc;
 
     REQUEST_SIZE_MATCH(xCompositeGetOverlayWindowReq);
-    pWin = (WindowPtr) LookupIDByType (stuff->window, RT_WINDOW);
-    if (!pWin)
+    rc = dixLookupResource((pointer *)&pWin, stuff->window, RT_WINDOW, client,
+			   DixGetAttrAccess);
+    if (rc != Success)
     {
 	client->errorValue = stuff->window;
-	return BadWindow;
+	return (rc == BadValue) ? BadWindow : rc;
     }
     pScreen = pWin->drawable.pScreen;
 
@@ -446,6 +457,12 @@ ProcCompositeGetOverlayWindow (ClientPtr client)
 	    return BadAlloc;
 	}
     }
+
+    rc = XaceHook(XACE_RESOURCE_ACCESS, client, cs->pOverlayWin->drawable.id,
+		  RT_WINDOW, DixGetAttrAccess, cs->pOverlayWin);
+    if (rc != Success)
+	return rc;
+
     MapWindow(cs->pOverlayWin, serverClient);
 
     /* Record that client is using this overlay window */

From ce9e83d913511fe619da42f805d7bcd1a2a60d90 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 4 Sep 2007 14:01:55 -0400
Subject: [PATCH 104/552] xace: add hooks + new access codes: Damage extension

---
 damageext/damageext.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/damageext/damageext.c b/damageext/damageext.c
index 159746536..517c72dac 100755
--- a/damageext/damageext.c
+++ b/damageext/damageext.c
@@ -185,7 +185,7 @@ ProcDamageCreate (ClientPtr client)
     REQUEST_SIZE_MATCH(xDamageCreateReq);
     LEGAL_NEW_RESOURCE(stuff->damage, client);
     rc = dixLookupDrawable(&pDrawable, stuff->drawable, client, 0,
-			   DixReadAccess);
+			   DixGetAttrAccess|DixReadAccess);
     if (rc != Success)
 	return rc;
 
@@ -295,7 +295,7 @@ ProcDamageAdd (ClientPtr client)
     REQUEST_SIZE_MATCH(xDamageAddReq);
     VERIFY_REGION(pRegion, stuff->region, client, DixWriteAccess);
     rc = dixLookupDrawable(&pDrawable, stuff->drawable, client, 0,
-			   DixReadAccess);
+			   DixWriteAccess);
     if (rc != Success)
 	return rc;
 

From 0003ccfcdfae1b473aa024342304b84256d378b9 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 5 Sep 2007 11:18:36 -0400
Subject: [PATCH 105/552] xace: add new fields to resource access hook to allow
 parent resource objects to be passed in at create time.  Also added a missing
 devPrivates initializer.

---
 Xext/xace.c         |  4 +++-
 Xext/xacestr.h      |  4 +++-
 composite/compext.c |  2 +-
 dix/colormap.c      |  2 +-
 dix/cursor.c        |  7 ++++---
 dix/dispatch.c      |  2 +-
 dix/gc.c            |  4 ++--
 dix/resource.c      |  2 +-
 dix/window.c        | 10 +++++-----
 render/animcur.c    |  6 +++---
 render/picture.c    |  4 ++--
 render/render.c     | 10 +++++-----
 xfixes/cursor.c     |  4 ++--
 13 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/Xext/xace.c b/Xext/xace.c
index cc689864b..92f0e4048 100644
--- a/Xext/xace.c
+++ b/Xext/xace.c
@@ -72,8 +72,10 @@ int XaceHook(int hook, ...)
 		va_arg(ap, ClientPtr),
 		va_arg(ap, XID),
 		va_arg(ap, RESTYPE),
-		va_arg(ap, Mask),
 		va_arg(ap, pointer),
+		va_arg(ap, RESTYPE),
+		va_arg(ap, pointer),
+		va_arg(ap, Mask),
 		Success /* default allow */
 	    };
 	    calldata = &rec;
diff --git a/Xext/xacestr.h b/Xext/xacestr.h
index 0957f0da1..e12a52c9a 100644
--- a/Xext/xacestr.h
+++ b/Xext/xacestr.h
@@ -41,8 +41,10 @@ typedef struct {
     ClientPtr client;
     XID id;
     RESTYPE rtype;
-    Mask access_mode;
     pointer res;
+    RESTYPE ptype;
+    pointer parent;
+    Mask access_mode;
     int status;
 } XaceResourceAccessRec;
 
diff --git a/composite/compext.c b/composite/compext.c
index b32967960..2d3bafadb 100644
--- a/composite/compext.c
+++ b/composite/compext.c
@@ -459,7 +459,7 @@ ProcCompositeGetOverlayWindow (ClientPtr client)
     }
 
     rc = XaceHook(XACE_RESOURCE_ACCESS, client, cs->pOverlayWin->drawable.id,
-		  RT_WINDOW, DixGetAttrAccess, cs->pOverlayWin);
+		  RT_WINDOW, cs->pOverlayWin, RT_NONE, NULL, DixGetAttrAccess);
     if (rc != Success)
 	return rc;
 
diff --git a/dix/colormap.c b/dix/colormap.c
index 98f2f1b22..d07cff7db 100644
--- a/dix/colormap.c
+++ b/dix/colormap.c
@@ -397,7 +397,7 @@ CreateColormap (Colormap mid, ScreenPtr pScreen, VisualPtr pVisual,
      * Security creation/labeling check
      */
     i = XaceHook(XACE_RESOURCE_ACCESS, clients[client], mid, RT_COLORMAP,
-		 DixCreateAccess, pmap);
+		 pmap, RT_NONE, NULL, DixCreateAccess);
     if (i != Success) {
 	FreeResource(mid, RT_NONE);
 	return i;
diff --git a/dix/cursor.c b/dix/cursor.c
index 324faa169..0ddf9d791 100644
--- a/dix/cursor.c
+++ b/dix/cursor.c
@@ -212,12 +212,12 @@ AllocARGBCursor(unsigned char *psrcbits, unsigned char *pmaskbits,
     pCurs->backGreen = backGreen;
     pCurs->backBlue = backBlue;
 
-    pCurs->devPrivates = NULL;
     pCurs->id = cid;
+    pCurs->devPrivates = NULL;
 
     /* security creation/labeling check */
     rc = XaceHook(XACE_RESOURCE_ACCESS, client, cid, RT_CURSOR,
-		  DixCreateAccess, pCurs);
+		  pCurs, RT_NONE, NULL, DixCreateAccess);
     if (rc != Success) {
 	dixFreePrivates(pCurs->devPrivates);
 	FreeCursorBits(bits);
@@ -365,6 +365,7 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar,
 	bits->height = cm.height;
 	bits->xhot = cm.xhot;
 	bits->yhot = cm.yhot;
+	bits->devPrivates = NULL;
 	if (sourcefont != maskfont)
 	    bits->refcnt = -1;
 	else
@@ -406,7 +407,7 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar,
 
     /* security creation/labeling check */
     rc = XaceHook(XACE_RESOURCE_ACCESS, client, cid, RT_CURSOR,
-		  DixCreateAccess, pCurs);
+		  pCurs, RT_NONE, NULL, DixCreateAccess);
     if (rc != Success) {
 	dixFreePrivates(pCurs->devPrivates);
 	FreeCursorBits(bits);
diff --git a/dix/dispatch.c b/dix/dispatch.c
index 7adfe02be..507854ee6 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -1558,7 +1558,7 @@ CreatePmap:
 	pMap->drawable.id = stuff->pid;
 	/* security creation/labeling check */
 	rc = XaceHook(XACE_RESOURCE_ACCESS, client, stuff->pid, RT_PIXMAP,
-		      DixCreateAccess, pMap);
+		      pMap, RT_NONE, NULL, DixCreateAccess);
 	if (rc != Success) {
 	    (*pDraw->pScreen->DestroyPixmap)(pMap);
 	    return rc;
diff --git a/dix/gc.c b/dix/gc.c
index d77932c9e..443f6c686 100644
--- a/dix/gc.c
+++ b/dix/gc.c
@@ -638,8 +638,8 @@ CreateGC(DrawablePtr pDrawable, BITS32 mask, XID *pval, int *pStatus,
     pGC->stipple->refcnt++;
 
     /* security creation/labeling check */
-    *pStatus = XaceHook(XACE_RESOURCE_ACCESS, client, gcid, RT_GC,
-			DixCreateAccess|DixSetAttrAccess, pGC);
+    *pStatus = XaceHook(XACE_RESOURCE_ACCESS, client, gcid, RT_GC, pGC,
+			RT_NONE, NULL, DixCreateAccess|DixSetAttrAccess);
     if (*pStatus != Success)
 	goto out;
 
diff --git a/dix/resource.c b/dix/resource.c
index 844d12ec0..a557ba4c3 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -901,7 +901,7 @@ dixLookupResource(pointer *result, XID id, RESTYPE rtype,
     if (client) {
 	client->errorValue = id;
 	cid = XaceHook(XACE_RESOURCE_ACCESS, client, id, res->type,
-		       mode, res->value);
+		       res->value, RT_NONE, NULL, mode);
 	if (cid != Success)
 	    return cid;
     }
diff --git a/dix/window.c b/dix/window.c
index 70ce2ad9e..6c6531958 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -698,8 +698,8 @@ CreateWindow(Window wid, WindowPtr pParent, int x, int y, unsigned w,
 
     /*  security creation/labeling check
      */
-    *error = XaceHook(XACE_RESOURCE_ACCESS, client, wid, RT_WINDOW,
-		      DixCreateAccess|DixSetAttrAccess, pWin);
+    *error = XaceHook(XACE_RESOURCE_ACCESS, client, wid, RT_WINDOW, pWin,
+		RT_WINDOW, pWin->parent, DixCreateAccess|DixSetAttrAccess);
     if (*error != Success) {
 	xfree(pWin);
 	return NullWindow;
@@ -955,7 +955,7 @@ DestroySubwindows(WindowPtr pWin, ClientPtr client)
     while (pWin->lastChild) {
 	int rc = XaceHook(XACE_RESOURCE_ACCESS, client,
 			  pWin->lastChild->drawable.id, RT_WINDOW,
-			  DixDestroyAccess, pWin->lastChild);
+			  pWin->lastChild, RT_NONE, NULL, DixDestroyAccess);
 	if (rc != Success)
 	    return rc;
 	FreeResource(pWin->lastChild->drawable.id, RT_NONE);
@@ -1275,7 +1275,7 @@ ChangeWindowAttributes(WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client)
 	    }
 	    if (val == xTrue) {
 		rc = XaceHook(XACE_RESOURCE_ACCESS, client, pWin->drawable.id,
-			      RT_WINDOW, DixGrabAccess, pWin);
+			      RT_WINDOW, pWin, RT_NONE, NULL, DixGrabAccess);
 		if (rc != Success) {
 		    error = rc;
 		    client->errorValue = pWin->drawable.id;
@@ -2745,7 +2745,7 @@ MapWindow(WindowPtr pWin, ClientPtr client)
 
     /*  general check for permission to map window */
     if (XaceHook(XACE_RESOURCE_ACCESS, client, pWin->drawable.id, RT_WINDOW,
-		 DixShowAccess, pWin) != Success)
+		 pWin, RT_NONE, NULL, DixShowAccess) != Success)
 	return Success;
 
     pScreen = pWin->drawable.pScreen;
diff --git a/render/animcur.c b/render/animcur.c
index da3d4a02d..125928931 100644
--- a/render/animcur.c
+++ b/render/animcur.c
@@ -377,12 +377,12 @@ AnimCursorCreate (CursorPtr *cursors, CARD32 *deltas, int ncursor, CursorPtr *pp
     pCursor->backGreen = cursors[0]->backGreen;
     pCursor->backBlue = cursors[0]->backBlue;
 
-    pCursor->devPrivates = NULL;
     pCursor->id = cid;
+    pCursor->devPrivates = NULL;
 
     /* security creation/labeling check */
-    rc = XaceHook(XACE_RESOURCE_ACCESS, client, cid, RT_CURSOR,
-		  DixCreateAccess, pCursor);
+    rc = XaceHook(XACE_RESOURCE_ACCESS, client, cid, RT_CURSOR, pCursor,
+		  RT_NONE, NULL, DixCreateAccess);
     if (rc != Success) {
 	dixFreePrivates(pCursor->devPrivates);
 	xfree(pCursor);
diff --git a/render/picture.c b/render/picture.c
index 7b200ee41..660ef12ad 100644
--- a/render/picture.c
+++ b/render/picture.c
@@ -727,8 +727,8 @@ CreatePicture (Picture		pid,
     pPicture->devPrivates = NULL;
 
     /* security creation/labeling check */
-    *error = XaceHook(XACE_RESOURCE_ACCESS, client, pid, PictureType,
-		      DixCreateAccess|DixSetAttrAccess, pPicture);
+    *error = XaceHook(XACE_RESOURCE_ACCESS, client, pid, PictureType, pPicture,
+		      RC_DRAWABLE, pDrawable, DixCreateAccess|DixSetAttrAccess);
     if (*error != Success)
 	goto out;
 
diff --git a/render/render.c b/render/render.c
index 37d2d620e..40d5add05 100644
--- a/render/render.c
+++ b/render/render.c
@@ -1025,7 +1025,7 @@ ProcRenderCreateGlyphSet (ClientPtr client)
 	return BadAlloc;
     /* security creation/labeling check */
     rc = XaceHook(XACE_RESOURCE_ACCESS, client, stuff->gsid, GlyphSetType,
-		  DixCreateAccess, glyphSet);
+		  glyphSet, RT_NONE, NULL, DixCreateAccess);
     if (rc != Success)
 	return rc;
     if (!AddResource (stuff->gsid, GlyphSetType, (pointer)glyphSet))
@@ -1903,7 +1903,7 @@ static int ProcRenderCreateSolidFill(ClientPtr client)
 	return error;
     /* security creation/labeling check */
     error = XaceHook(XACE_RESOURCE_ACCESS, client, stuff->pid, PictureType,
-		  DixCreateAccess, pPicture);
+		     pPicture, RT_NONE, NULL, DixCreateAccess);
     if (error != Success)
 	return error;
     if (!AddResource (stuff->pid, PictureType, (pointer)pPicture))
@@ -1937,7 +1937,7 @@ static int ProcRenderCreateLinearGradient (ClientPtr client)
 	return error;
     /* security creation/labeling check */
     error = XaceHook(XACE_RESOURCE_ACCESS, client, stuff->pid, PictureType,
-		  DixCreateAccess, pPicture);
+		     pPicture, RT_NONE, NULL, DixCreateAccess);
     if (error != Success)
 	return error;
     if (!AddResource (stuff->pid, PictureType, (pointer)pPicture))
@@ -1972,7 +1972,7 @@ static int ProcRenderCreateRadialGradient (ClientPtr client)
 	return error;
     /* security creation/labeling check */
     error = XaceHook(XACE_RESOURCE_ACCESS, client, stuff->pid, PictureType,
-		  DixCreateAccess, pPicture);
+		     pPicture, RT_NONE, NULL, DixCreateAccess);
     if (error != Success)
 	return error;
     if (!AddResource (stuff->pid, PictureType, (pointer)pPicture))
@@ -2006,7 +2006,7 @@ static int ProcRenderCreateConicalGradient (ClientPtr client)
 	return error;
     /* security creation/labeling check */
     error = XaceHook(XACE_RESOURCE_ACCESS, client, stuff->pid, PictureType,
-		  DixCreateAccess, pPicture);
+		     pPicture, RT_NONE, NULL, DixCreateAccess);
     if (error != Success)
 	return error;
     if (!AddResource (stuff->pid, PictureType, (pointer)pPicture))
diff --git a/xfixes/cursor.c b/xfixes/cursor.c
index 52f483e03..1d122faea 100755
--- a/xfixes/cursor.c
+++ b/xfixes/cursor.c
@@ -351,7 +351,7 @@ ProcXFixesGetCursorImage (ClientPtr client)
     if (!pCursor)
 	return BadCursor;
     rc = XaceHook(XACE_RESOURCE_ACCESS, client, pCursor->id, RT_CURSOR,
-		  DixReadAccess, pCursor);
+		  pCursor, RT_NONE, NULL, DixReadAccess);
     if (rc != Success)
 	return rc;
     GetSpritePosition (&x, &y);
@@ -503,7 +503,7 @@ ProcXFixesGetCursorImageAndName (ClientPtr client)
     if (!pCursor)
 	return BadCursor;
     rc = XaceHook(XACE_RESOURCE_ACCESS, client, pCursor->id, RT_CURSOR,
-		  DixReadAccess|DixGetAttrAccess, pCursor);
+		  pCursor, RT_NONE, NULL, DixReadAccess|DixGetAttrAccess);
     if (rc != Success)
 	return rc;
     GetSpritePosition (&x, &y);

From 57907e0943da0c3fd3bf6c128d210b544629ce72 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 6 Sep 2007 16:55:51 -0400
Subject: [PATCH 106/552] devPrivates rework: register an offset for every
 resource type, use signed values so -1 actually works correctly, and provide
 a macro for adding an offset to a pointer.

---
 dix/privates.c     | 42 +++++++++++++++++++++++-------------------
 dix/resource.c     |  2 ++
 include/privates.h |  9 ++++++++-
 3 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/dix/privates.c b/dix/privates.c
index 38c552360..e04da41b1 100644
--- a/dix/privates.c
+++ b/dix/privates.c
@@ -35,6 +35,7 @@ from The Open Group.
 #include "resource.h"
 #include "privates.h"
 #include "gcstruct.h"
+#include "cursorstr.h"
 #include "colormapst.h"
 #include "inputstr.h"
 
@@ -174,21 +175,34 @@ dixRegisterPrivateDeleteFunc(const DevPrivateKey key,
 }
 
 /* Table of devPrivates offsets */
-static unsigned *offsets = NULL;
-static unsigned offsetsSize = 0;
+static const int offsetDefaults[] = {
+    -1,					/* RT_NONE */
+    offsetof(WindowRec, devPrivates),	/* RT_WINDOW */
+    offsetof(PixmapRec, devPrivates),	/* RT_PIXMAP */
+    offsetof(GC, devPrivates),		/* RT_GC */
+    -1,		    			/* RT_FONT */
+    offsetof(CursorRec, devPrivates),	/* RT_CURSOR */
+    offsetof(ColormapRec, devPrivates),	/* RT_COLORMAP */
+    -1,			  		/* RT_CMAPENTRY */
+    -1,					/* RT_OTHERCLIENT */
+    -1					/* RT_PASSIVEGRAB */
+};
+    
+static int *offsets = NULL;
+static int offsetsSize = 0;
 
 /*
  * Specify where the devPrivates field is located in a structure type
  */
 _X_EXPORT int
-dixRegisterPrivateOffset(RESTYPE type, unsigned offset)
+dixRegisterPrivateOffset(RESTYPE type, int offset)
 {
     type = type & TypeMask;
 
     /* resize offsets table if necessary */
     while (type >= offsetsSize) {
 	unsigned i = offsetsSize * 2 * sizeof(int);
-	offsets = (unsigned *)xrealloc(offsets, i);
+	offsets = (int *)xrealloc(offsets, i);
 	if (!offsets) {
 	    offsetsSize = 0;
 	    return FALSE;
@@ -214,7 +228,6 @@ int
 dixResetPrivates(void)
 {
     PrivateDescRec *next;
-    unsigned i;
 
     /* reset internal structures */
     while (items) {
@@ -224,20 +237,11 @@ dixResetPrivates(void)
     }
     if (offsets)
 	xfree(offsets);
-    offsetsSize = 16;
-    offsets = (unsigned *)xalloc(offsetsSize * sizeof(unsigned));
+    offsetsSize = sizeof(offsetDefaults);
+    offsets = (int *)xalloc(offsetsSize);
+    offsetsSize /= sizeof(int);
     if (!offsets)
 	return FALSE;
-    for (i=0; i < offsetsSize; i++)
-	offsets[i] = -1;
-
-    /* register basic resource offsets */
-    return dixRegisterPrivateOffset(RT_WINDOW,
-				    offsetof(WindowRec, devPrivates)) &&
-	dixRegisterPrivateOffset(RT_PIXMAP,
-				 offsetof(PixmapRec, devPrivates)) &&
-	dixRegisterPrivateOffset(RT_GC,
-				 offsetof(GC, devPrivates)) &&
-	dixRegisterPrivateOffset(RT_COLORMAP,
-				 offsetof(ColormapRec, devPrivates));
+    memcpy(offsets, offsetDefaults, sizeof(offsetDefaults));
+    return TRUE;
 }
diff --git a/dix/resource.c b/dix/resource.c
index a557ba4c3..c892cf96b 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -225,6 +225,8 @@ CreateNewResourceType(DeleteType deleteFunc)
 				   (next + 1) * sizeof(DeleteType));
     if (!funcs)
 	return 0;
+    if (!dixRegisterPrivateOffset(next, -1))
+	return 0;
 
 #ifdef XResExtension
     {
diff --git a/include/privates.h b/include/privates.h
index 9539a2912..8d59b728f 100644
--- a/include/privates.h
+++ b/include/privates.h
@@ -143,8 +143,15 @@ dixLookupPrivateOffset(RESTYPE type);
 
 /*
  * Specifies the offset where the devPrivates field is located.
+ * A negative value indicates no devPrivates field is available.
  */
 extern int
-dixRegisterPrivateOffset(RESTYPE type, unsigned offset);
+dixRegisterPrivateOffset(RESTYPE type, int offset);
+
+/*
+ * Convenience macro for adding an offset to an object pointer
+ * when making a call to one of the devPrivates functions
+ */
+#define DEVPRIV_AT(ptr, offset) ((PrivateRec **)((char *)ptr + offset))
 
 #endif /* PRIVATES_H */

From 963e69b8efc39369915e7f0c6f370ac0d5d2b60f Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 19 Sep 2007 11:11:41 -0400
Subject: [PATCH 107/552] xace: add special-case for just setting the event
 mask on a window, this should only check "receive" permission, not "setattr"
 permission.

---
 dix/dispatch.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dix/dispatch.c b/dix/dispatch.c
index 507854ee6..8c68e5567 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -570,11 +570,13 @@ ProcChangeWindowAttributes(ClientPtr client)
 {
     WindowPtr pWin;
     REQUEST(xChangeWindowAttributesReq);
-    int result;
-    int len, rc;
+    int result, len, rc;
+    Mask access_mode = DixSetAttrAccess;
 
     REQUEST_AT_LEAST_SIZE(xChangeWindowAttributesReq);
-    rc = dixLookupWindow(&pWin, stuff->window, client, DixSetAttrAccess);
+    if (stuff->valueMask == CWEventMask)
+	access_mode = DixReceiveAccess;
+    rc = dixLookupWindow(&pWin, stuff->window, client, access_mode);
     if (rc != Success)
         return rc;
     len = client->req_len - (sizeof(xChangeWindowAttributesReq) >> 2);

From 5b36b64192517e2470766ce7ff1d4dc04c936fad Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 19 Sep 2007 11:11:54 -0400
Subject: [PATCH 108/552] xace: add missing argument to hook call.

---
 dix/events.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dix/events.c b/dix/events.c
index 42c3ba195..0d82d19f3 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -2892,7 +2892,7 @@ DeliverGrabbedEvent(xEvent *xE, DeviceIntPtr thisDev,
     if (!deliveries)
     {
 	FixUpEventFromWindow(xE, grab->window, None, TRUE);
-	if (!XaceHook(XACE_SEND_ACCESS, thisDev, grab->window, xE, count) &&
+	if (!XaceHook(XACE_SEND_ACCESS, 0, thisDev, grab->window, xE, count) &&
 	    !XaceHook(XACE_RECEIVE_ACCESS, rClient(grab), grab->window, xE,
 		      count))
 	    deliveries = TryClientEvents(rClient(grab), xE, count,

From 082c0f7fb34458ebb303cf875d1d75686eca25e6 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 19 Sep 2007 13:59:35 -0400
Subject: [PATCH 109/552] devPrivates rework: move devPrivates field in
 drawable structure types to just below the DrawableRec.  Wish there were a
 better way to do this but it has to be in the same place for all drawable
 types.

---
 include/pixmapstr.h | 2 +-
 include/windowstr.h | 2 +-
 render/picture.c    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/pixmapstr.h b/include/pixmapstr.h
index 4162c667e..5f0e0c508 100644
--- a/include/pixmapstr.h
+++ b/include/pixmapstr.h
@@ -72,10 +72,10 @@ typedef struct _Drawable {
 
 typedef struct _Pixmap {
     DrawableRec		drawable;
+    PrivateRec		*devPrivates;
     int			refcnt;
     int			devKind;
     DevUnion		devPrivate;
-    PrivateRec		*devPrivates;
 #ifdef COMPOSITE
     short		screen_x;
     short		screen_y;
diff --git a/include/windowstr.h b/include/windowstr.h
index ca212ad99..4359481cd 100644
--- a/include/windowstr.h
+++ b/include/windowstr.h
@@ -124,6 +124,7 @@ typedef struct _WindowOpt {
 
 typedef struct _Window {
     DrawableRec		drawable;
+    PrivateRec		*devPrivates;
     WindowPtr		parent;		/* ancestor chain */
     WindowPtr		nextSib;	/* next lower sibling */
     WindowPtr		prevSib;	/* next higher sibling */
@@ -160,7 +161,6 @@ typedef struct _Window {
 #ifdef COMPOSITE
     unsigned		redirectDraw:2;	/* rendering is redirected from here */
 #endif
-    PrivateRec		*devPrivates;
 } WindowRec;
 
 /*
diff --git a/render/picture.c b/render/picture.c
index 660ef12ad..184edb48b 100644
--- a/render/picture.c
+++ b/render/picture.c
@@ -728,7 +728,7 @@ CreatePicture (Picture		pid,
 
     /* security creation/labeling check */
     *error = XaceHook(XACE_RESOURCE_ACCESS, client, pid, PictureType, pPicture,
-		      RC_DRAWABLE, pDrawable, DixCreateAccess|DixSetAttrAccess);
+		      RT_PIXMAP, pDrawable, DixCreateAccess|DixSetAttrAccess);
     if (*error != Success)
 	goto out;
 

From e93cff52fed9074aa007c2e6ec6b578f69aef3cb Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 19 Sep 2007 14:48:20 -0400
Subject: [PATCH 110/552] xace: add hooks + new access codes: DOUBLE-BUFFER
 extension

---
 dbe/dbe.c   | 16 +++++++++++-----
 dbe/midbe.c | 12 +++++++++---
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/dbe/dbe.c b/dbe/dbe.c
index 223b0c983..8175a352f 100644
--- a/dbe/dbe.c
+++ b/dbe/dbe.c
@@ -54,6 +54,7 @@
 #define NEED_DBE_PROTOCOL
 #include "dbestruct.h"
 #include "midbe.h"
+#include "xace.h"
 
 /* GLOBALS */
 
@@ -233,7 +234,7 @@ ProcDbeAllocateBackBufferName(ClientPtr client)
     REQUEST_SIZE_MATCH(xDbeAllocateBackBufferNameReq);
 
     /* The window must be valid. */
-    status = dixLookupWindow(&pWin, stuff->window, client, DixWriteAccess);
+    status = dixLookupWindow(&pWin, stuff->window, client, DixManageAccess);
     if (status != Success)
 	return status;
 
@@ -720,7 +721,7 @@ ProcDbeGetVisualInfo(ClientPtr client)
         for (i = 0; i < stuff->n; i++)
         {
 	    rc = dixLookupDrawable(pDrawables+i, drawables[i], client, 0,
-				   DixReadAccess);
+				   DixGetAttrAccess);
 	    if (rc != Success) {
                 Xfree(pDrawables);
                 return rc;
@@ -748,7 +749,9 @@ ProcDbeGetVisualInfo(ClientPtr client)
                                     pDrawables[i]->pScreen;
         pDbeScreenPriv = DBE_SCREEN_PRIV(pScreen);
 
-        if (!(*pDbeScreenPriv->GetVisualInfo)(pScreen, &pScrVisInfo[i]))
+	rc = XaceHook(XACE_SCREEN_ACCESS, client, pScreen, DixGetAttrAccess);
+	if ((rc != Success) ||
+	    !(*pDbeScreenPriv->GetVisualInfo)(pScreen, &pScrVisInfo[i]))
         {
             /* We failed to alloc pScrVisInfo[i].visinfo. */
 
@@ -764,7 +767,7 @@ ProcDbeGetVisualInfo(ClientPtr client)
                 Xfree(pDrawables);
             }
 
-            return(BadAlloc);
+            return (rc == Success) ? BadAlloc : rc;
         }
 
         /* Account for n, number of xDbeVisInfo items in list. */
@@ -877,7 +880,7 @@ ProcDbeGetBackBufferAttributes(ClientPtr client)
     REQUEST_SIZE_MATCH(xDbeGetBackBufferAttributesReq);
 
     if (!(pDbeWindowPriv = (DbeWindowPrivPtr)SecurityLookupIDByType(client,
-		stuff->buffer, dbeWindowPrivResType, DixReadAccess)))
+		stuff->buffer, dbeWindowPrivResType, DixGetAttrAccess)))
     {
         rep.attributes = None;
     }
@@ -1615,6 +1618,9 @@ DbeExtensionInit(void)
         CreateNewResourceType(DbeDrawableDelete) | RC_DRAWABLE;
     dbeWindowPrivResType =
         CreateNewResourceType(DbeWindowPrivDelete);
+    if (!dixRegisterPrivateOffset(dbeDrawableResType,
+				  offsetof(PixmapRec, devPrivates)))
+	return;
 
     for (i = 0; i < screenInfo.numScreens; i++)
     {
diff --git a/dbe/midbe.c b/dbe/midbe.c
index f26a09c6d..e1c7f8d7d 100644
--- a/dbe/midbe.c
+++ b/dbe/midbe.c
@@ -56,6 +56,7 @@
 #include "gcstruct.h"
 #include "inputstr.h"
 #include "midbe.h"
+#include "xace.h"
 
 #include <stdio.h>
 
@@ -153,6 +154,7 @@ miDbeAllocBackBufferName(WindowPtr pWin, XID bufId, int swapAction)
     DbeScreenPrivPtr		pDbeScreenPriv;
     GCPtr			pGC;
     xRectangle			clearRect;
+    int				rc;
 
 
     pScreen = pWin->drawable.pScreen;
@@ -191,14 +193,18 @@ miDbeAllocBackBufferName(WindowPtr pWin, XID bufId, int swapAction)
             return(BadAlloc);
         }
 
+	/* Security creation/labeling check. */
+	rc = XaceHook(XACE_RESOURCE_ACCESS, serverClient, bufId,
+		      dbeDrawableResType, pDbeWindowPrivPriv->pBackBuffer,
+		      RT_WINDOW, pWin, DixCreateAccess);
 
         /* Make the back pixmap a DBE drawable resource. */
-        if (!AddResource(bufId, dbeDrawableResType,
-            (pointer)pDbeWindowPrivPriv->pBackBuffer))
+        if (rc != Success || !AddResource(bufId, dbeDrawableResType,
+					  pDbeWindowPrivPriv->pBackBuffer))
         {
             /* free the buffer and the drawable resource */
             FreeResource(bufId, RT_NONE);
-            return(BadAlloc);
+            return (rc == Success) ? BadAlloc : rc;
         }
 
 

From 90bacdef723e1e49c72775144916750758d3568c Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 20 Sep 2007 06:53:51 -0400
Subject: [PATCH 111/552] xace: add hooks + new access codes: MIT-SHM extension

---
 Xext/shm.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/Xext/shm.c b/Xext/shm.c
index 8fa584275..2afe055bc 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -58,6 +58,7 @@ in this Software without prior written authorization from The Open Group.
 #include "extnsionst.h"
 #include "servermd.h"
 #include "shmint.h"
+#include "xace.h"
 #define _XSHM_SERVER_
 #include <X11/extensions/shmstr.h>
 #include <X11/Xfuncproto.h>
@@ -907,7 +908,7 @@ ProcShmGetImage(client)
         return(BadValue);
     }
     rc = dixLookupDrawable(&pDraw, stuff->drawable, client, 0,
-			   DixUnknownAccess);
+			   DixReadAccess);
     if (rc != Success)
 	return rc;
     VERIFY_SHMPTR(stuff->shmseg, stuff->offset, TRUE, shmdesc, client);
@@ -1039,7 +1040,7 @@ ProcShmCreatePixmap(client)
 	return BadImplementation;
     LEGAL_NEW_RESOURCE(stuff->pid, client);
     rc = dixLookupDrawable(&pDraw, stuff->drawable, client, M_ANY,
-			   DixUnknownAccess);
+			   DixGetAttrAccess);
     if (rc != Success)
 	return rc;
 
@@ -1068,6 +1069,12 @@ CreatePmap:
 			    shmdesc->addr + stuff->offset);
     if (pMap)
     {
+	rc = XaceHook(XACE_RESOURCE_ACCESS, client, stuff->pid, RT_PIXMAP,
+		      pMap, RT_NONE, NULL, DixCreateAccess);
+	if (rc != Success) {
+	    pDraw->pScreen->DestroyPixmap(pMap);
+	    return rc;
+	}
 	dixSetPrivate(&pMap->devPrivates, shmPixmapPrivate, shmdesc);
 	shmdesc->refcnt++;
 	pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
@@ -1076,6 +1083,7 @@ CreatePmap:
 	{
 	    return(client->noClientException);
 	}
+	pDraw->pScreen->DestroyPixmap(pMap);
     }
     return (BadAlloc);
 }

From 661b1328cf992d8855552677a94d60de1d8ce942 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 20 Sep 2007 08:41:26 -0400
Subject: [PATCH 112/552] xace: add hooks + new access codes: SYNC extension

May need to revisit this extension in the future, depending on observed use.
---
 Xext/sync.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Xext/sync.c b/Xext/sync.c
index d9b6a9f06..81b0cc4aa 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -433,18 +433,18 @@ SyncInitTrigger(client, pTrigger, counter, changes)
     Mask	     changes;
 {
     SyncCounter *pCounter = pTrigger->pCounter;
-    int		status;
+    int		rc;
     Bool	newcounter = FALSE;
 
     if (changes & XSyncCACounter)
     {
 	if (counter == None)
 	    pCounter = NULL;
-	else if (!(pCounter = (SyncCounter *)SecurityLookupIDByType(
-			client, counter, RTCounter, DixReadAccess)))
+	else if (Success != (rc = dixLookupResource((pointer *)&pCounter,
+				counter, RTCounter, client, DixReadAccess)))
 	{
 	    client->errorValue = counter;
-	    return SyncErrorBase + XSyncBadCounter;
+	    return (rc == BadValue) ? SyncErrorBase + XSyncBadCounter : rc;
 	}
 	if (pCounter != pTrigger->pCounter)
 	{ /* new counter for trigger */
@@ -526,8 +526,8 @@ SyncInitTrigger(client, pTrigger, counter, changes)
      */
     if (newcounter)
     {
-	if ((status = SyncAddTriggerToCounter(pTrigger)) != Success)
-	    return status;
+	if ((rc = SyncAddTriggerToCounter(pTrigger)) != Success)
+	    return rc;
     }
     else if (IsSystemCounter(pCounter))
     {
@@ -1465,7 +1465,7 @@ ProcSyncSetPriority(client)
 	priorityclient = client;
     else {
 	rc = dixLookupClient(&priorityclient, stuff->id, client,
-			     DixUnknownAccess);
+			     DixSetAttrAccess);
 	if (rc != Success)
 	    return rc;
     }
@@ -1502,7 +1502,7 @@ ProcSyncGetPriority(client)
 	priorityclient = client;
     else {
 	rc = dixLookupClient(&priorityclient, stuff->id, client,
-			     DixUnknownAccess);
+			     DixGetAttrAccess);
 	if (rc != Success)
 	    return rc;
     }

From 82f7195a628cc7ec94abc0cfe5bae2be8af443bc Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 20 Sep 2007 09:17:09 -0400
Subject: [PATCH 113/552] xace: modifications to ChangeWindowAttributes special
 case: separate Receive and SetAttr.  Refer to
 963e69b8efc39369915e7f0c6f370ac0d5d2b60f

---
 dix/dispatch.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dix/dispatch.c b/dix/dispatch.c
index 8c68e5567..952ef6004 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -571,11 +571,11 @@ ProcChangeWindowAttributes(ClientPtr client)
     WindowPtr pWin;
     REQUEST(xChangeWindowAttributesReq);
     int result, len, rc;
-    Mask access_mode = DixSetAttrAccess;
+    Mask access_mode = 0;
 
     REQUEST_AT_LEAST_SIZE(xChangeWindowAttributesReq);
-    if (stuff->valueMask == CWEventMask)
-	access_mode = DixReceiveAccess;
+    access_mode |= (stuff->valueMask & CWEventMask) ? DixReceiveAccess : 0;
+    access_mode |= (stuff->valueMask & ~CWEventMask) ? DixSetAttrAccess : 0;
     rc = dixLookupWindow(&pWin, stuff->window, client, access_mode);
     if (rc != Success)
         return rc;

From f6532a81eec5f096e27285687964b77c17987f72 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 20 Sep 2007 12:17:17 -0400
Subject: [PATCH 114/552] xace: add hooks + new access codes: APPGROUP
 extension

---
 Xext/appgroup.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Xext/appgroup.c b/Xext/appgroup.c
index 7bd205587..c40782df5 100644
--- a/Xext/appgroup.c
+++ b/Xext/appgroup.c
@@ -345,7 +345,7 @@ int AttrValidate(
     ColormapPtr pColormap;
 
     rc = dixLookupWindow(&pWin, pAppGrp->default_root, client,
-			 DixUnknownAccess);
+			 DixGetAttrAccess);
     if (rc != Success)
 	return rc;
     pScreen = pWin->drawable.pScreen;
@@ -367,8 +367,10 @@ int AttrValidate(
     }
     if (pAppGrp->default_colormap) {
 
-	pColormap = (ColormapPtr)LookupIDByType (pAppGrp->default_colormap, RT_COLORMAP);
-	/* XXX check that pColormap is not NULL */
+	rc = dixLookupResource((pointer *)&pColormap, pAppGrp->default_colormap,
+			       RT_COLORMAP, client, DixUseAccess);
+	if (rc != Success)
+	    return rc;
 	if (pColormap->pScreen != pScreen)
 	    return BadColor;
 	if (pColormap->pVisual->vid != (pAppGrp->root_visual ? pAppGrp->root_visual : pScreen->rootVisual))
@@ -470,7 +472,7 @@ int ProcXagQuery(
     int n, rc;
 
     REQUEST_SIZE_MATCH (xXagQueryReq);
-    rc = dixLookupClient(&pClient, stuff->resource, client, DixUnknownAccess);
+    rc = dixLookupClient(&pClient, stuff->resource, client, DixGetAttrAccess);
     if (rc != Success)
 	return rc;
 

From a247886b082cea93fa8f8980616a9c388ba70111 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 20 Sep 2007 13:06:38 -0400
Subject: [PATCH 115/552] xace: add hooks + new access codes: XF86-Bigfont
 extension

---
 Xext/xf86bigfont.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c
index c2f891a7e..29f07a63e 100644
--- a/Xext/xf86bigfont.c
+++ b/Xext/xf86bigfont.c
@@ -445,10 +445,10 @@ ProcXF86BigfontQueryFont(
 #endif
     client->errorValue = stuff->id;		/* EITHER font or gc */
     pFont = (FontPtr)SecurityLookupIDByType(client, stuff->id, RT_FONT,
-					    DixReadAccess);
+					    DixGetAttrAccess);
     if (!pFont) {
 	GC *pGC = (GC *) SecurityLookupIDByType(client, stuff->id, RT_GC,
-						DixReadAccess);
+						DixGetAttrAccess);
         if (!pGC) {
 	    client->errorValue = stuff->id;
             return BadFont;    /* procotol spec says only error is BadFont */

From 9bd04055a2175ec16756d3bf73ae03b5e163a28a Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 25 Sep 2007 09:33:51 -0400
Subject: [PATCH 116/552] xace: change prototype of VALIDATE_DRAWABLE_AND_GC
 macro to allow access mode to be passed to dixLookupDrawable.

---
 Xext/panoramiXprocs.c |  8 ++++----
 Xext/shm.c            |  2 +-
 Xext/xvdisp.c         | 12 ++++++------
 dix/dispatch.c        | 28 ++++++++++++++--------------
 include/dix.h         |  6 ++----
 5 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c
index 1c53a1e1a..5933c02bc 100644
--- a/Xext/panoramiXprocs.c
+++ b/Xext/panoramiXprocs.c
@@ -1049,8 +1049,7 @@ int PanoramiXCopyArea(ClientPtr client)
 
 	FOR_NSCREENS_BACKWARD(j) {
 	    stuff->gc = gc->info[j].id;
-	    VALIDATE_DRAWABLE_AND_GC(dst->info[j].id, pDst, pGC, client);
-
+	    VALIDATE_DRAWABLE_AND_GC(dst->info[j].id, pDst, DixWriteAccess);
 	    if(drawables[0]->depth != pDst->depth) {
 		client->errorValue = stuff->dstDrawable;
 		xfree(data);
@@ -1086,7 +1085,8 @@ int PanoramiXCopyArea(ClientPtr client)
 		stuff->dstY = dsty - panoramiXdataPtr[j].y;
 	    }
 
-	    VALIDATE_DRAWABLE_AND_GC(stuff->dstDrawable, pDst, pGC, client); 
+	    VALIDATE_DRAWABLE_AND_GC(stuff->dstDrawable, pDst, DixWriteAccess);
+
 	    if (stuff->dstDrawable != stuff->srcDrawable) {
 		rc = dixLookupDrawable(&pSrc, stuff->srcDrawable, client, 0,
 				       DixReadAccess);
@@ -1195,7 +1195,7 @@ int PanoramiXCopyPlane(ClientPtr client)
 	    stuff->dstY = dsty - panoramiXdataPtr[j].y;
 	}
 
-	VALIDATE_DRAWABLE_AND_GC(stuff->dstDrawable, pdstDraw, pGC, client);
+	VALIDATE_DRAWABLE_AND_GC(stuff->dstDrawable, pdstDraw, DixWriteAccess);
 	if (stuff->dstDrawable != stuff->srcDrawable) {
 	    rc = dixLookupDrawable(&psrcDraw, stuff->srcDrawable, client, 0,
 				   DixReadAccess);
diff --git a/Xext/shm.c b/Xext/shm.c
index 2afe055bc..ee4c34035 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -795,7 +795,7 @@ ProcShmPutImage(client)
     REQUEST(xShmPutImageReq);
 
     REQUEST_SIZE_MATCH(xShmPutImageReq);
-    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, pGC, client);
+    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);
     VERIFY_SHMPTR(stuff->shmseg, stuff->offset, FALSE, shmdesc, client);
     if ((stuff->sendEvent != xTrue) && (stuff->sendEvent != xFalse))
 	return BadValue;
diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c
index af2e09b82..a2dac7584 100644
--- a/Xext/xvdisp.c
+++ b/Xext/xvdisp.c
@@ -535,7 +535,7 @@ ProcXvPutVideo(ClientPtr client)
   REQUEST(xvPutVideoReq);
   REQUEST_SIZE_MATCH(xvPutVideoReq);
 
-  VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, pGC, client);
+  VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);
 
   if(!(pPort = LOOKUP_PORT(stuff->port, client) ))
     {
@@ -581,7 +581,7 @@ ProcXvPutStill(ClientPtr client)
   REQUEST(xvPutStillReq);
   REQUEST_SIZE_MATCH(xvPutStillReq);
 
-  VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, pGC, client);
+  VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);
 
   if(!(pPort = LOOKUP_PORT(stuff->port, client) ))
     {
@@ -628,7 +628,7 @@ ProcXvGetVideo(ClientPtr client)
   REQUEST(xvGetVideoReq);
   REQUEST_SIZE_MATCH(xvGetVideoReq);
 
-  VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, pGC, client);
+  VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixReadAccess);
 
   if(!(pPort = LOOKUP_PORT(stuff->port, client) ))
     {
@@ -675,7 +675,7 @@ ProcXvGetStill(ClientPtr client)
   REQUEST(xvGetStillReq);
   REQUEST_SIZE_MATCH(xvGetStillReq);
 
-  VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, pGC, client);
+  VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixReadAccess);
 
   if(!(pPort = LOOKUP_PORT(stuff->port, client) ))
     {
@@ -1036,7 +1036,7 @@ ProcXvPutImage(ClientPtr client)
   REQUEST(xvPutImageReq);
   REQUEST_AT_LEAST_SIZE(xvPutImageReq);
 
-  VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, pGC, client);
+  VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);
 
   if(!(pPort = LOOKUP_PORT(stuff->port, client) ))
     {
@@ -1124,7 +1124,7 @@ ProcXvShmPutImage(ClientPtr client)
   REQUEST(xvShmPutImageReq);
   REQUEST_SIZE_MATCH(xvShmPutImageReq);
 
-  VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, pGC, client);
+  VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);
 
   if(!(pPort = LOOKUP_PORT(stuff->port, client) ))
     {
diff --git a/dix/dispatch.c b/dix/dispatch.c
index 952ef6004..65eb8cc41 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -1791,7 +1791,7 @@ ProcCopyArea(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xCopyAreaReq);
 
-    VALIDATE_DRAWABLE_AND_GC(stuff->dstDrawable, pDst, pGC, client); 
+    VALIDATE_DRAWABLE_AND_GC(stuff->dstDrawable, pDst, DixWriteAccess); 
     if (stuff->dstDrawable != stuff->srcDrawable)
     {
 	rc = dixLookupDrawable(&pSrc, stuff->srcDrawable, client, 0,
@@ -1832,7 +1832,7 @@ ProcCopyPlane(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xCopyPlaneReq);
 
-    VALIDATE_DRAWABLE_AND_GC(stuff->dstDrawable, pdstDraw, pGC, client);
+    VALIDATE_DRAWABLE_AND_GC(stuff->dstDrawable, pdstDraw, DixWriteAccess);
     if (stuff->dstDrawable != stuff->srcDrawable)
     {
 	rc = dixLookupDrawable(&psrcDraw, stuff->srcDrawable, client, 0,
@@ -1885,7 +1885,7 @@ ProcPolyPoint(ClientPtr client)
 	client->errorValue = stuff->coordMode;
         return BadValue;
     }
-    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, pGC, client); 
+    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess); 
     npoint = ((client->req_len << 2) - sizeof(xPolyPointReq)) >> 2;
     if (npoint)
         (*pGC->ops->PolyPoint)(pDraw, pGC, stuff->coordMode, npoint,
@@ -1908,7 +1908,7 @@ ProcPolyLine(ClientPtr client)
 	client->errorValue = stuff->coordMode;
         return BadValue;
     }
-    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, pGC, client);
+    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);
     npoint = ((client->req_len << 2) - sizeof(xPolyLineReq)) >> 2;
     if (npoint > 1)
 	(*pGC->ops->Polylines)(pDraw, pGC, stuff->coordMode, npoint, 
@@ -1925,7 +1925,7 @@ ProcPolySegment(ClientPtr client)
     REQUEST(xPolySegmentReq);
 
     REQUEST_AT_LEAST_SIZE(xPolySegmentReq);
-    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, pGC, client);
+    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);
     nsegs = (client->req_len << 2) - sizeof(xPolySegmentReq);
     if (nsegs & 4)
 	return(BadLength);
@@ -1944,7 +1944,7 @@ ProcPolyRectangle (ClientPtr client)
     REQUEST(xPolyRectangleReq);
 
     REQUEST_AT_LEAST_SIZE(xPolyRectangleReq);
-    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, pGC, client);
+    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);
     nrects = (client->req_len << 2) - sizeof(xPolyRectangleReq);
     if (nrects & 4)
 	return(BadLength);
@@ -1964,7 +1964,7 @@ ProcPolyArc(ClientPtr client)
     REQUEST(xPolyArcReq);
 
     REQUEST_AT_LEAST_SIZE(xPolyArcReq);
-    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, pGC, client);
+    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);
     narcs = (client->req_len << 2) - sizeof(xPolyArcReq);
     if (narcs % sizeof(xArc))
 	return(BadLength);
@@ -1996,7 +1996,7 @@ ProcFillPoly(ClientPtr client)
         return BadValue;
     }
 
-    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, pGC, client);
+    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);
     things = ((client->req_len << 2) - sizeof(xFillPolyReq)) >> 2;
     if (things)
         (*pGC->ops->FillPolygon) (pDraw, pGC, stuff->shape,
@@ -2014,7 +2014,7 @@ ProcPolyFillRectangle(ClientPtr client)
     REQUEST(xPolyFillRectangleReq);
 
     REQUEST_AT_LEAST_SIZE(xPolyFillRectangleReq);
-    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, pGC, client);
+    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);
     things = (client->req_len << 2) - sizeof(xPolyFillRectangleReq);
     if (things & 4)
 	return(BadLength);
@@ -2035,7 +2035,7 @@ ProcPolyFillArc(ClientPtr client)
     REQUEST(xPolyFillArcReq);
 
     REQUEST_AT_LEAST_SIZE(xPolyFillArcReq);
-    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, pGC, client);
+    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);
     narcs = (client->req_len << 2) - sizeof(xPolyFillArcReq);
     if (narcs % sizeof(xArc))
 	return(BadLength);
@@ -2110,7 +2110,7 @@ ProcPutImage(ClientPtr client)
     REQUEST(xPutImageReq);
 
     REQUEST_AT_LEAST_SIZE(xPutImageReq);
-    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, pGC, client);
+    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);
     if (stuff->format == XYBitmap)
     {
         if ((stuff->depth != 1) ||
@@ -2396,7 +2396,7 @@ ProcPolyText(ClientPtr client)
     GC *pGC;
 
     REQUEST_AT_LEAST_SIZE(xPolyTextReq);
-    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, pGC, client);
+    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);
 
     err = PolyText(client,
 		   pDraw,
@@ -2426,7 +2426,7 @@ ProcImageText8(ClientPtr client)
     REQUEST(xImageTextReq);
 
     REQUEST_FIXED_SIZE(xImageTextReq, stuff->nChars);
-    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, pGC, client);
+    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);
 
     err = ImageText(client,
 		    pDraw,
@@ -2456,7 +2456,7 @@ ProcImageText16(ClientPtr client)
     REQUEST(xImageTextReq);
 
     REQUEST_FIXED_SIZE(xImageTextReq, stuff->nChars << 1);
-    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, pGC, client);
+    VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess);
 
     err = ImageText(client,
 		    pDraw,
diff --git a/include/dix.h b/include/dix.h
index 54629cd14..59533bae7 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -81,11 +81,9 @@ SOFTWARE.
         return(BadIDChoice);\
     }
 
-#define VALIDATE_DRAWABLE_AND_GC(drawID, pDraw, pGC, client)\
+#define VALIDATE_DRAWABLE_AND_GC(drawID, pDraw, mode)\
     {\
-	int rc;\
-	rc = dixLookupDrawable(&(pDraw), drawID, client, M_ANY,\
-			       DixWriteAccess);\
+	int rc = dixLookupDrawable(&(pDraw), drawID, client, M_ANY, mode);\
 	if (rc != Success)\
 	    return rc;\
 	rc = dixLookupGC(&(pGC), stuff->gc, client, DixUseAccess);\

From b61461425eb15fcff2a58330d74fe5a5a1f226fc Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 25 Sep 2007 09:56:00 -0400
Subject: [PATCH 117/552] xace: add hooks + new access codes: XV extension.

May need to revisit this extension in the future, depending on observed use.
---
 Xext/xvdisp.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c
index a2dac7584..f6130dfe1 100644
--- a/Xext/xvdisp.c
+++ b/Xext/xvdisp.c
@@ -383,7 +383,7 @@ ProcXvQueryAdaptors(ClientPtr client)
   REQUEST(xvQueryAdaptorsReq);
   REQUEST_SIZE_MATCH(xvQueryAdaptorsReq);
 
-  rc = dixLookupWindow(&pWin, stuff->window, client, DixUnknownAccess);
+  rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
   if (rc != Success)
       return rc;
 
@@ -718,7 +718,7 @@ ProcXvSelectVideoNotify(ClientPtr client)
   REQUEST(xvSelectVideoNotifyReq);
   REQUEST_SIZE_MATCH(xvSelectVideoNotifyReq);
 
-  rc = dixLookupDrawable(&pDraw, stuff->drawable, client, 0, DixUnknownAccess);
+  rc = dixLookupDrawable(&pDraw, stuff->drawable, client, 0, DixReceiveAccess);
   if (rc != Success)
     return rc;
 
@@ -835,7 +835,7 @@ ProcXvStopVideo(ClientPtr client)
       return (status);
     }
 
-  rc = dixLookupDrawable(&pDraw, stuff->drawable, client, 0, DixUnknownAccess);
+  rc = dixLookupDrawable(&pDraw, stuff->drawable, client, 0, DixWriteAccess);
   if (rc != Success)
     return rc;
 

From 5c03d131815cfe2f78792277ab8352e69e830196 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 28 Sep 2007 08:02:00 -0400
Subject: [PATCH 118/552] xace: add new hooks + access controls: XInput
 extension.

Introduces new dix API to lookup a device, dixLookupDevice(), which
replaces LookupDeviceIntRec and LookupDevice.
---
 Xext/xtest.c                   |  8 ++++----
 Xi/allowev.c                   |  8 ++++----
 Xi/chgdctl.c                   |  7 ++-----
 Xi/chgfctl.c                   |  8 ++++----
 Xi/chgkmap.c                   |  7 +++----
 Xi/chgprop.c                   |  3 +--
 Xi/chgptr.c                    |  2 --
 Xi/closedev.c                  |  9 ++++-----
 Xi/devbell.c                   |  9 ++++-----
 Xi/exevents.c                  | 37 +++++++++++++++++++++++++---------
 Xi/extinit.c                   | 23 ---------------------
 Xi/getbmap.c                   |  8 ++++----
 Xi/getdctl.c                   |  9 ++++-----
 Xi/getfctl.c                   |  9 ++++-----
 Xi/getfocus.c                  |  8 +++++---
 Xi/getkmap.c                   |  8 ++++----
 Xi/getmmap.c                   |  8 ++++----
 Xi/getprop.c                   |  3 +--
 Xi/getselev.c                  |  3 +--
 Xi/getvers.c                   |  1 -
 Xi/grabdev.c                   | 15 +++++++-------
 Xi/grabdevb.c                  | 14 ++++++-------
 Xi/grabdevk.c                  | 14 ++++++-------
 Xi/gtmotion.c                  |  9 ++++-----
 Xi/listdev.c                   | 10 +++++++--
 Xi/opendev.c                   |  7 ++++---
 Xi/queryst.c                   |  9 ++++-----
 Xi/selectev.c                  |  3 +--
 Xi/sendexev.c                  |  8 ++++----
 Xi/setbmap.c                   |  7 +++----
 Xi/setdval.c                   |  8 ++++----
 Xi/setfocus.c                  |  7 ++++---
 Xi/setmmap.c                   |  7 +++----
 Xi/setmode.c                   |  8 ++++----
 Xi/stubs.c                     |  2 ++
 Xi/ungrdev.c                   |  8 ++++----
 Xi/ungrdevb.c                  | 14 ++++++-------
 Xi/ungrdevk.c                  | 14 ++++++-------
 config/dbus.c                  |  2 +-
 dix/devices.c                  | 18 ++++++++++++-----
 hw/dmx/input/dmxeq.c           |  4 ++--
 hw/xfree86/common/xf86Xinput.c |  1 -
 include/extinit.h              |  5 -----
 include/input.h                | 10 ++++-----
 xkb/xkbUtils.c                 |  2 +-
 45 files changed, 187 insertions(+), 197 deletions(-)

diff --git a/Xext/xtest.c b/Xext/xtest.c
index 8d879c7df..42cf8178f 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -49,7 +49,6 @@ from The Open Group.
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
 #define EXTENSION_EVENT_BASE	64
-#include "extinit.h"		/* LookupDeviceIntRec */
 #endif /* XINPUT */
 
 #include "modinit.h"
@@ -286,11 +285,12 @@ ProcXTestFakeInput(client)
 #ifdef XINPUT
     if (extension)
     {
-	dev = LookupDeviceIntRec(stuff->deviceid & 0177);
-	if (!dev)
+	rc = dixLookupDevice(&dev, stuff->deviceid & 0177, client,
+			     DixWriteAccess);
+	if (rc != Success)
 	{
 	    client->errorValue = stuff->deviceid & 0177;
-	    return BadValue;
+	    return rc;
 	}
 	if (nev > 1)
 	{
diff --git a/Xi/allowev.c b/Xi/allowev.c
index cf075e112..0043cb138 100644
--- a/Xi/allowev.c
+++ b/Xi/allowev.c
@@ -60,7 +60,6 @@ SOFTWARE.
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
 
-#include "extinit.h"	/* LookupDeviceIntRec */
 #include "exglobals.h"
 
 #include "allowev.h"
@@ -95,13 +94,14 @@ ProcXAllowDeviceEvents(ClientPtr client)
 {
     TimeStamp time;
     DeviceIntPtr thisdev;
+    int rc;
 
     REQUEST(xAllowDeviceEventsReq);
     REQUEST_SIZE_MATCH(xAllowDeviceEventsReq);
 
-    thisdev = LookupDeviceIntRec(stuff->deviceid);
-    if (thisdev == NULL)
-	return BadDevice;
+    rc = dixLookupDevice(&thisdev, stuff->deviceid, client, DixGetAttrAccess);
+    if (rc != Success)
+	return rc;
     time = ClientTimeToServerTime(stuff->time);
 
     switch (stuff->mode) {
diff --git a/Xi/chgdctl.c b/Xi/chgdctl.c
index 055f459d0..e7d04a781 100644
--- a/Xi/chgdctl.c
+++ b/Xi/chgdctl.c
@@ -61,7 +61,6 @@ SOFTWARE.
 #include <X11/extensions/XIproto.h>	/* control constants */
 #include "XIstubs.h"
 
-#include "extinit.h"	/* LookupDeviceIntRec */
 #include "exglobals.h"
 #include "exevents.h"
 
@@ -112,11 +111,9 @@ ProcXChangeDeviceControl(ClientPtr client)
     REQUEST_AT_LEAST_SIZE(xChangeDeviceControlReq);
 
     len = stuff->length - (sizeof(xChangeDeviceControlReq) >> 2);
-    dev = LookupDeviceIntRec(stuff->deviceid);
-    if (dev == NULL) {
-        ret = BadDevice;
+    ret = dixLookupDevice(&dev, stuff->deviceid, client, DixSetAttrAccess);
+    if (ret != Success)
         goto out;
-    }
 
     rep.repType = X_Reply;
     rep.RepType = X_ChangeDeviceControl;
diff --git a/Xi/chgfctl.c b/Xi/chgfctl.c
index 46bb8e78f..8fc24d5ff 100644
--- a/Xi/chgfctl.c
+++ b/Xi/chgfctl.c
@@ -60,7 +60,6 @@ SOFTWARE.
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>	/* control constants */
 
-#include "extinit.h"	/* LookupDeviceIntRec */
 #include "exglobals.h"
 
 #include "chgfctl.h"
@@ -444,14 +443,15 @@ ProcXChangeFeedbackControl(ClientPtr client)
     StringFeedbackPtr s;
     BellFeedbackPtr b;
     LedFeedbackPtr l;
+    int rc;
 
     REQUEST(xChangeFeedbackControlReq);
     REQUEST_AT_LEAST_SIZE(xChangeFeedbackControlReq);
 
     len = stuff->length - (sizeof(xChangeFeedbackControlReq) >> 2);
-    dev = LookupDeviceIntRec(stuff->deviceid);
-    if (dev == NULL)
-	return BadDevice;
+    rc = dixLookupDevice(&dev, stuff->deviceid, client, DixSetAttrAccess);
+    if (rc != Success)
+	return rc;
 
     switch (stuff->feedbackid) {
     case KbdFeedbackClass:
diff --git a/Xi/chgkmap.c b/Xi/chgkmap.c
index bfdc1cedc..3361e9801 100644
--- a/Xi/chgkmap.c
+++ b/Xi/chgkmap.c
@@ -59,7 +59,6 @@ SOFTWARE.
 #include "inputstr.h"	/* DeviceIntPtr      */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
-#include "extinit.h"	/* LookupDeviceIntRec */
 #include "exevents.h"
 #include "exglobals.h"
 
@@ -107,9 +106,9 @@ ProcXChangeDeviceKeyMapping(ClientPtr client)
     REQUEST(xChangeDeviceKeyMappingReq);
     REQUEST_AT_LEAST_SIZE(xChangeDeviceKeyMappingReq);
 
-    dev = LookupDeviceIntRec(stuff->deviceid);
-    if (dev == NULL)
-	return BadDevice;
+    ret = dixLookupDevice(&dev, stuff->deviceid, client, DixSetAttrAccess);
+    if (ret != Success)
+	return ret;
     len = stuff->length - (sizeof(xChangeDeviceKeyMappingReq) >> 2);
 
     ret = ChangeKeyMapping(client, dev, len, DeviceMappingNotify,
diff --git a/Xi/chgprop.c b/Xi/chgprop.c
index 13463dd1c..58db88620 100644
--- a/Xi/chgprop.c
+++ b/Xi/chgprop.c
@@ -60,7 +60,6 @@ SOFTWARE.
 #include "windowstr.h"
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
-#include "extinit.h"	/* LookupDeviceIntRec */
 
 #include "exevents.h"
 #include "exglobals.h"
@@ -115,7 +114,7 @@ ProcXChangeDeviceDontPropagateList(ClientPtr client)
 	stuff->count)
 	return BadLength;
 
-    rc = dixLookupWindow(&pWin, stuff->window, client, DixUnknownAccess);
+    rc = dixLookupWindow(&pWin, stuff->window, client, DixSetAttrAccess);
     if (rc != Success)
 	return rc;
 
diff --git a/Xi/chgptr.c b/Xi/chgptr.c
index 2ce81d1d6..28950918f 100644
--- a/Xi/chgptr.c
+++ b/Xi/chgptr.c
@@ -63,8 +63,6 @@ SOFTWARE.
 #include "windowstr.h"	/* window structure  */
 #include "scrnintstr.h"	/* screen structure  */
 
-#include "extinit.h"	/* LookupDeviceIntRec */
-
 #include "dixevents.h"
 #include "exevents.h"
 #include "exglobals.h"
diff --git a/Xi/closedev.c b/Xi/closedev.c
index 1ec3fa163..b2b5f69a6 100644
--- a/Xi/closedev.c
+++ b/Xi/closedev.c
@@ -62,7 +62,6 @@ SOFTWARE.
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
 #include "XIstubs.h"
-#include "extinit.h"	/* LookupDeviceIntRec */
 #include "exglobals.h"
 
 #include "closedev.h"
@@ -140,16 +139,16 @@ DeleteEventsFromChildren(DeviceIntPtr dev, WindowPtr p1, ClientPtr client)
 int
 ProcXCloseDevice(ClientPtr client)
 {
-    int i;
+    int rc, i;
     WindowPtr pWin, p1;
     DeviceIntPtr d;
 
     REQUEST(xCloseDeviceReq);
     REQUEST_SIZE_MATCH(xCloseDeviceReq);
 
-    d = LookupDeviceIntRec(stuff->deviceid);
-    if (d == NULL)
-	return BadDevice;
+    rc = dixLookupDevice(&d, stuff->deviceid, client, DixGetAttrAccess);
+    if (rc != Success)
+	return rc;
 
     if (d->grab && SameClient(d->grab, client))
 	(*d->DeactivateGrab) (d);	/* release active grab */
diff --git a/Xi/devbell.c b/Xi/devbell.c
index 83e844d93..264f64800 100644
--- a/Xi/devbell.c
+++ b/Xi/devbell.c
@@ -59,7 +59,6 @@ SOFTWARE.
 #include "inputstr.h"	/* DeviceIntPtr      */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
-#include "extinit.h"	/* LookupDeviceIntRec */
 #include "exglobals.h"
 
 #include "devbell.h"
@@ -93,7 +92,7 @@ ProcXDeviceBell(ClientPtr client)
     DeviceIntPtr dev;
     KbdFeedbackPtr k;
     BellFeedbackPtr b;
-    int base;
+    int rc, base;
     int newpercent;
     CARD8 class;
     pointer ctrl;
@@ -102,10 +101,10 @@ ProcXDeviceBell(ClientPtr client)
     REQUEST(xDeviceBellReq);
     REQUEST_SIZE_MATCH(xDeviceBellReq);
 
-    dev = LookupDeviceIntRec(stuff->deviceid);
-    if (dev == NULL) {
+    rc = dixLookupDevice(&dev, stuff->deviceid, client, DixBellAccess);
+    if (rc != Success) {
 	client->errorValue = stuff->deviceid;
-	return BadDevice;
+	return rc;
     }
 
     if (stuff->percent < -100 || stuff->percent > 100) {
diff --git a/Xi/exevents.c b/Xi/exevents.c
index 377311ec9..9a179500b 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -67,11 +67,11 @@ SOFTWARE.
 #include "region.h"
 #include "exevents.h"
 #include "extnsionst.h"
-#include "extinit.h"	/* LookupDeviceIntRec */
 #include "exglobals.h"
 #include "dixevents.h"	/* DeliverFocusedEvent */
 #include "dixgrabs.h"	/* CreateGrab() */
 #include "scrnintstr.h"
+#include "xace.h"
 
 #ifdef XKB
 #include "xkbsrv.h"
@@ -511,6 +511,7 @@ GrabButton(ClientPtr client, DeviceIntPtr dev, BYTE this_device_mode,
     WindowPtr pWin, confineTo;
     CursorPtr cursor;
     GrabPtr grab;
+    Mask access_mode = DixGrabAccess;
     int rc;
 
     if ((this_device_mode != GrabModeSync) &&
@@ -531,25 +532,33 @@ GrabButton(ClientPtr client, DeviceIntPtr dev, BYTE this_device_mode,
 	client->errorValue = ownerEvents;
 	return BadValue;
     }
-    rc = dixLookupWindow(&pWin, grabWindow, client, DixUnknownAccess);
+    rc = dixLookupWindow(&pWin, grabWindow, client, DixSetAttrAccess);
     if (rc != Success)
 	return rc;
     if (rconfineTo == None)
 	confineTo = NullWindow;
     else {
-	rc = dixLookupWindow(&confineTo, rconfineTo, client, DixUnknownAccess);
+	rc = dixLookupWindow(&confineTo, rconfineTo, client, DixSetAttrAccess);
 	if (rc != Success)
 	    return rc;
     }
     if (rcursor == None)
 	cursor = NullCursor;
     else {
-	cursor = (CursorPtr) LookupIDByType(rcursor, RT_CURSOR);
-	if (!cursor) {
+	rc = dixLookupResource((pointer *)&cursor, rcursor, RT_CURSOR,
+			       client, DixUseAccess);
+	if (rc != Success)
+	{
 	    client->errorValue = rcursor;
-	    return BadCursor;
+	    return (rc == BadValue) ? BadCursor : rc;
 	}
+	access_mode |= DixForceAccess;
     }
+    if (this_device_mode == GrabModeSync || other_devices_mode == GrabModeSync)
+	access_mode |= DixFreezeAccess;
+    rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, access_mode);
+    if (rc != Success)
+	return rc;
 
     grab = CreateGrab(client->index, dev, pWin, eventMask,
 		      (Bool) ownerEvents, (Bool) this_device_mode,
@@ -569,6 +578,7 @@ GrabKey(ClientPtr client, DeviceIntPtr dev, BYTE this_device_mode,
     WindowPtr pWin;
     GrabPtr grab;
     KeyClassPtr k = dev->key;
+    Mask access_mode = DixGrabAccess;
     int rc;
 
     if (k == NULL)
@@ -596,7 +606,12 @@ GrabKey(ClientPtr client, DeviceIntPtr dev, BYTE this_device_mode,
 	client->errorValue = ownerEvents;
 	return BadValue;
     }
-    rc = dixLookupWindow(&pWin, grabWindow, client, DixUnknownAccess);
+    rc = dixLookupWindow(&pWin, grabWindow, client, DixSetAttrAccess);
+    if (rc != Success)
+	return rc;
+    if (this_device_mode == GrabModeSync || other_devices_mode == GrabModeSync)
+	access_mode |= DixFreezeAccess;
+    rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, access_mode);
     if (rc != Success)
 	return rc;
 
@@ -837,7 +852,7 @@ SendEvent(ClientPtr client, DeviceIntPtr d, Window dest, Bool propagate,
 	    if (!mask)
 		break;
 	}
-    } else
+    } else if (!XaceHook(XACE_SEND_ACCESS, client, NULL, pWin, ev, count))
 	(void)(DeliverEventsToWindow(pWin, ev, count, mask, NullGrab, d->id));
     return Success;
 }
@@ -1101,7 +1116,8 @@ MaybeSendDeviceMotionNotifyHint(deviceKeyButtonPointer * pEvents, Mask mask)
 {
     DeviceIntPtr dev;
 
-    dev = LookupDeviceIntRec(pEvents->deviceid & DEVICE_BITS);
+    dixLookupDevice(&dev, pEvents->deviceid & DEVICE_BITS, serverClient,
+		    DixReadAccess);
     if (!dev)
         return 0;
 
@@ -1125,7 +1141,8 @@ CheckDeviceGrabAndHintWindow(WindowPtr pWin, int type,
 {
     DeviceIntPtr dev;
 
-    dev = LookupDeviceIntRec(xE->deviceid & DEVICE_BITS);
+    dixLookupDevice(&dev, xE->deviceid & DEVICE_BITS, serverClient,
+		    DixReadAccess);
     if (!dev)
         return;
 
diff --git a/Xi/extinit.c b/Xi/extinit.c
index 73bae5e85..1a435edad 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -856,29 +856,6 @@ MakeDeviceTypeAtoms(void)
 	    MakeAtom(dev_type[i].name, strlen(dev_type[i].name), 1);
 }
 
-/**************************************************************************
- * Return a DeviceIntPtr corresponding to a specified device id.
- *
- */
-
-DeviceIntPtr
-LookupDeviceIntRec(CARD8 id)
-{
-    DeviceIntPtr dev;
-
-    for (dev = inputInfo.devices; dev; dev = dev->next) {
-	if (dev->id == id)
-	    return dev;
-    }
-
-    for (dev = inputInfo.off_devices; dev; dev = dev->next) {
-	if (dev->id == id)
-	    return dev;
-    }
-
-    return NULL;
-}
-
 /*****************************************************************************
  *
  *	SEventIDispatch
diff --git a/Xi/getbmap.c b/Xi/getbmap.c
index ebb0613af..9f93b06ef 100644
--- a/Xi/getbmap.c
+++ b/Xi/getbmap.c
@@ -59,7 +59,6 @@ SOFTWARE.
 #include "inputstr.h"	/* DeviceIntPtr      */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
-#include "extinit.h"	/* LookupDeviceIntRec */
 #include "exglobals.h"
 
 #include "getbmap.h"
@@ -92,6 +91,7 @@ ProcXGetDeviceButtonMapping(ClientPtr client)
     DeviceIntPtr dev;
     xGetDeviceButtonMappingReply rep;
     ButtonClassPtr b;
+    int rc;
 
     REQUEST(xGetDeviceButtonMappingReq);
     REQUEST_SIZE_MATCH(xGetDeviceButtonMappingReq);
@@ -102,9 +102,9 @@ ProcXGetDeviceButtonMapping(ClientPtr client)
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
 
-    dev = LookupDeviceIntRec(stuff->deviceid);
-    if (dev == NULL)
-	return BadDevice;
+    rc = dixLookupDevice(&dev, stuff->deviceid, client, DixGetAttrAccess);
+    if (rc != Success)
+	return rc;
 
     b = dev->button;
     if (b == NULL)
diff --git a/Xi/getdctl.c b/Xi/getdctl.c
index 8a84e91bc..3f2bb29ae 100644
--- a/Xi/getdctl.c
+++ b/Xi/getdctl.c
@@ -59,7 +59,6 @@ SOFTWARE.
 #include "inputstr.h"	/* DeviceIntPtr      */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
-#include "extinit.h"	/* LookupDeviceIntRec */
 #include "exglobals.h"
 
 #include "getdctl.h"
@@ -238,7 +237,7 @@ SRepXGetDeviceControl(ClientPtr client, int size, xGetDeviceControlReply * rep)
 int
 ProcXGetDeviceControl(ClientPtr client)
 {
-    int total_length = 0;
+    int rc, total_length = 0;
     char *buf, *savbuf;
     DeviceIntPtr dev;
     xGetDeviceControlReply rep;
@@ -246,9 +245,9 @@ ProcXGetDeviceControl(ClientPtr client)
     REQUEST(xGetDeviceControlReq);
     REQUEST_SIZE_MATCH(xGetDeviceControlReq);
 
-    dev = LookupDeviceIntRec(stuff->deviceid);
-    if (dev == NULL)
-	return BadDevice;
+    rc = dixLookupDevice(&dev, stuff->deviceid, client, DixGetAttrAccess);
+    if (rc != Success)
+	return rc;
 
     rep.repType = X_Reply;
     rep.RepType = X_GetDeviceControl;
diff --git a/Xi/getfctl.c b/Xi/getfctl.c
index 7dff32f4f..1b1e594a2 100644
--- a/Xi/getfctl.c
+++ b/Xi/getfctl.c
@@ -59,7 +59,6 @@ SOFTWARE.
 #include "inputstr.h"	/* DeviceIntPtr      */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
-#include "extinit.h"	/* LookupDeviceIntRec */
 #include "exglobals.h"
 
 #include "getfctl.h"
@@ -290,7 +289,7 @@ SRepXGetFeedbackControl(ClientPtr client, int size,
 int
 ProcXGetFeedbackControl(ClientPtr client)
 {
-    int total_length = 0;
+    int rc, total_length = 0;
     char *buf, *savbuf;
     DeviceIntPtr dev;
     KbdFeedbackPtr k;
@@ -304,9 +303,9 @@ ProcXGetFeedbackControl(ClientPtr client)
     REQUEST(xGetFeedbackControlReq);
     REQUEST_SIZE_MATCH(xGetFeedbackControlReq);
 
-    dev = LookupDeviceIntRec(stuff->deviceid);
-    if (dev == NULL)
-	return BadDevice;
+    rc = dixLookupDevice(&dev, stuff->deviceid, client, DixGetAttrAccess);
+    if (rc != Success)
+	return rc;
 
     rep.repType = X_Reply;
     rep.RepType = X_GetFeedbackControl;
diff --git a/Xi/getfocus.c b/Xi/getfocus.c
index 073913bf2..dfef22fb7 100644
--- a/Xi/getfocus.c
+++ b/Xi/getfocus.c
@@ -60,7 +60,6 @@ SOFTWARE.
 #include "inputstr.h"	/* DeviceIntPtr      */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
-#include "extinit.h"	/* LookupDeviceIntRec */
 #include "exglobals.h"
 
 #include "getfocus.h"
@@ -93,12 +92,15 @@ ProcXGetDeviceFocus(ClientPtr client)
     DeviceIntPtr dev;
     FocusClassPtr focus;
     xGetDeviceFocusReply rep;
+    int rc;
 
     REQUEST(xGetDeviceFocusReq);
     REQUEST_SIZE_MATCH(xGetDeviceFocusReq);
 
-    dev = LookupDeviceIntRec(stuff->deviceid);
-    if (dev == NULL || !dev->focus)
+    rc = dixLookupDevice(&dev, stuff->deviceid, client, DixGetFocusAccess);
+    if (rc != Success)
+	return rc;
+    if (!dev->focus)
 	return BadDevice;
 
     rep.repType = X_Reply;
diff --git a/Xi/getkmap.c b/Xi/getkmap.c
index eaa0cffcc..0eec1d8df 100644
--- a/Xi/getkmap.c
+++ b/Xi/getkmap.c
@@ -59,7 +59,6 @@ SOFTWARE.
 #include "inputstr.h"	/* DeviceIntPtr      */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
-#include "extinit.h"	/* LookupDeviceIntRec */
 #include "exglobals.h"
 #include "swaprep.h"
 
@@ -94,13 +93,14 @@ ProcXGetDeviceKeyMapping(ClientPtr client)
     xGetDeviceKeyMappingReply rep;
     DeviceIntPtr dev;
     KeySymsPtr k;
+    int rc;
 
     REQUEST(xGetDeviceKeyMappingReq);
     REQUEST_SIZE_MATCH(xGetDeviceKeyMappingReq);
 
-    dev = LookupDeviceIntRec(stuff->deviceid);
-    if (dev == NULL)
-	return BadDevice;
+    rc = dixLookupDevice(&dev, stuff->deviceid, client, DixGetAttrAccess);
+    if (rc != Success)
+	return rc;
     if (dev->key == NULL)
 	return BadMatch;
     k = &dev->key->curKeySyms;
diff --git a/Xi/getmmap.c b/Xi/getmmap.c
index 8a99d63ed..c6c9c3362 100644
--- a/Xi/getmmap.c
+++ b/Xi/getmmap.c
@@ -59,7 +59,6 @@ SOFTWARE.
 #include "inputstr.h"	/* DeviceIntPtr      */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>	/* Request macro     */
-#include "extinit.h"	/* LookupDeviceIntRec */
 #include "exglobals.h"
 
 #include "getmmap.h"
@@ -94,13 +93,14 @@ ProcXGetDeviceModifierMapping(ClientPtr client)
     DeviceIntPtr dev;
     xGetDeviceModifierMappingReply rep;
     KeyClassPtr kp;
+    int rc;
 
     REQUEST(xGetDeviceModifierMappingReq);
     REQUEST_SIZE_MATCH(xGetDeviceModifierMappingReq);
 
-    dev = LookupDeviceIntRec(stuff->deviceid);
-    if (dev == NULL)
-	return BadDevice;
+    rc = dixLookupDevice(&dev, stuff->deviceid, client, DixGetAttrAccess);
+    if (rc != Success)
+	return rc;
 
     kp = dev->key;
     if (kp == NULL)
diff --git a/Xi/getprop.c b/Xi/getprop.c
index 531e65f27..188f549e5 100644
--- a/Xi/getprop.c
+++ b/Xi/getprop.c
@@ -60,7 +60,6 @@ SOFTWARE.
 #include "windowstr.h"	/* window structs    */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
-#include "extinit.h"	/* LookupDeviceIntRec */
 #include "exglobals.h"
 #include "swaprep.h"
 
@@ -112,7 +111,7 @@ ProcXGetDeviceDontPropagateList(ClientPtr client)
     rep.length = 0;
     rep.count = 0;
 
-    rc = dixLookupWindow(&pWin, stuff->window, client, DixUnknownAccess);
+    rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
     if (rc != Success)
 	return rc;
 
diff --git a/Xi/getselev.c b/Xi/getselev.c
index 819b2dbd0..caa376fcb 100644
--- a/Xi/getselev.c
+++ b/Xi/getselev.c
@@ -60,7 +60,6 @@ SOFTWARE.
 #include <X11/extensions/XIproto.h>
 #include "inputstr.h"	/* DeviceIntPtr      */
 #include "windowstr.h"	/* window struct     */
-#include "extinit.h"	/* LookupDeviceIntRec */
 #include "exglobals.h"
 #include "swaprep.h"
 
@@ -114,7 +113,7 @@ ProcXGetSelectedExtensionEvents(ClientPtr client)
     rep.this_client_count = 0;
     rep.all_clients_count = 0;
 
-    rc = dixLookupWindow(&pWin, stuff->window, client, DixUnknownAccess);
+    rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
     if (rc != Success)
 	return rc;
 
diff --git a/Xi/getvers.c b/Xi/getvers.c
index a223a5d1e..a4afe808f 100644
--- a/Xi/getvers.c
+++ b/Xi/getvers.c
@@ -59,7 +59,6 @@ SOFTWARE.
 #include "inputstr.h"	/* DeviceIntPtr      */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
-#include "extinit.h"	/* LookupDeviceIntRec */
 #include "exglobals.h"
 
 #include "getvers.h"
diff --git a/Xi/grabdev.c b/Xi/grabdev.c
index b303695fd..110fc6b5f 100644
--- a/Xi/grabdev.c
+++ b/Xi/grabdev.c
@@ -60,7 +60,6 @@ SOFTWARE.
 #include "windowstr.h"	/* window structure  */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
-#include "extinit.h"	/* LookupDeviceIntRec */
 #include "exglobals.h"
 #include "dixevents.h"	/* GrabDevice */
 
@@ -122,9 +121,9 @@ ProcXGrabDevice(ClientPtr client)
     rep.sequenceNumber = client->sequence;
     rep.length = 0;
 
-    dev = LookupDeviceIntRec(stuff->deviceid);
-    if (dev == NULL)
-	return BadDevice;
+    rc = dixLookupDevice(&dev, stuff->deviceid, client, DixGrabAccess);
+    if (rc != Success)
+	return rc;
 
     if ((rc = CreateMaskFromList(client, (XEventClass *) & stuff[1],
 				 stuff->event_count, tmp, dev,
@@ -153,7 +152,7 @@ int
 CreateMaskFromList(ClientPtr client, XEventClass * list, int count,
 		   struct tmask *mask, DeviceIntPtr dev, int req)
 {
-    int i, j;
+    int rc, i, j;
     int device;
     DeviceIntPtr tdev;
 
@@ -167,8 +166,10 @@ CreateMaskFromList(ClientPtr client, XEventClass * list, int count,
 	if (device > 255)
 	    return BadClass;
 
-	tdev = LookupDeviceIntRec(device);
-	if (tdev == NULL || (dev != NULL && tdev != dev))
+	rc = dixLookupDevice(&tdev, device, client, DixReadAccess);
+	if (rc != BadDevice && rc != Success)
+	    return rc;
+	if (rc == BadDevice || (dev != NULL && tdev != dev))
 	    return BadClass;
 
 	for (j = 0; j < ExtEventIndex; j++)
diff --git a/Xi/grabdevb.c b/Xi/grabdevb.c
index 21e46fceb..7eb542232 100644
--- a/Xi/grabdevb.c
+++ b/Xi/grabdevb.c
@@ -61,7 +61,6 @@ SOFTWARE.
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
 #include "exevents.h"
-#include "extinit.h"	/* LookupDeviceIntRec */
 #include "exglobals.h"
 
 #include "grabdev.h"
@@ -117,14 +116,15 @@ ProcXGrabDeviceButton(ClientPtr client)
 	(sizeof(xGrabDeviceButtonReq) >> 2) + stuff->event_count)
 	return BadLength;
 
-    dev = LookupDeviceIntRec(stuff->grabbed_device);
-    if (dev == NULL)
-	return BadDevice;
+    ret = dixLookupDevice(&dev, stuff->grabbed_device, client, DixGrabAccess);
+    if (ret != Success)
+	return ret;
 
     if (stuff->modifier_device != UseXKeyboard) {
-	mdev = LookupDeviceIntRec(stuff->modifier_device);
-	if (mdev == NULL)
-	    return BadDevice;
+	ret = dixLookupDevice(&mdev, stuff->modifier_device, client,
+			      DixReadAccess);
+	if (ret != Success)
+	    return ret;
 	if (mdev->key == NULL)
 	    return BadMatch;
     } else
diff --git a/Xi/grabdevk.c b/Xi/grabdevk.c
index 8da36ba8f..e187a4f7b 100644
--- a/Xi/grabdevk.c
+++ b/Xi/grabdevk.c
@@ -61,7 +61,6 @@ SOFTWARE.
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
 #include "exevents.h"
-#include "extinit.h"	/* LookupDeviceIntRec */
 #include "exglobals.h"
 
 #include "grabdev.h"
@@ -115,14 +114,15 @@ ProcXGrabDeviceKey(ClientPtr client)
     if (stuff->length != (sizeof(xGrabDeviceKeyReq) >> 2) + stuff->event_count)
 	return BadLength;
 
-    dev = LookupDeviceIntRec(stuff->grabbed_device);
-    if (dev == NULL)
-	return BadDevice;
+    ret = dixLookupDevice(&dev, stuff->grabbed_device, client, DixGrabAccess);
+    if (ret != Success)
+	return ret;
 
     if (stuff->modifier_device != UseXKeyboard) {
-	mdev = LookupDeviceIntRec(stuff->modifier_device);
-	if (mdev == NULL)
-	    return BadDevice;
+	ret = dixLookupDevice(&mdev, stuff->modifier_device, client,
+			      DixReadAccess);
+	if (ret != Success)
+	    return ret;
 	if (mdev->key == NULL)
 	    return BadMatch;
     } else
diff --git a/Xi/gtmotion.c b/Xi/gtmotion.c
index 51d4248cd..de22d0484 100644
--- a/Xi/gtmotion.c
+++ b/Xi/gtmotion.c
@@ -59,7 +59,6 @@ SOFTWARE.
 #include "inputstr.h"	/* DeviceIntPtr      */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
-#include "extinit.h"	/* LookupDeviceIntRec */
 #include "exevents.h"
 #include "exglobals.h"
 
@@ -96,7 +95,7 @@ ProcXGetDeviceMotionEvents(ClientPtr client)
     INT32 *coords = NULL, *bufptr;
     xGetDeviceMotionEventsReply rep;
     unsigned long i;
-    int num_events, axes, size = 0, tsize;
+    int rc, num_events, axes, size = 0, tsize;
     unsigned long nEvents;
     DeviceIntPtr dev;
     TimeStamp start, stop;
@@ -106,9 +105,9 @@ ProcXGetDeviceMotionEvents(ClientPtr client)
     REQUEST(xGetDeviceMotionEventsReq);
 
     REQUEST_SIZE_MATCH(xGetDeviceMotionEventsReq);
-    dev = LookupDeviceIntRec(stuff->deviceid);
-    if (dev == NULL)
-	return BadDevice;
+    rc = dixLookupDevice(&dev, stuff->deviceid, client, DixReadAccess);
+    if (rc != Success)
+	return rc;
     v = dev->valuator;
     if (v == NULL || v->numAxes == 0)
 	return BadMatch;
diff --git a/Xi/listdev.c b/Xi/listdev.c
index 160ad02fb..041de7635 100644
--- a/Xi/listdev.c
+++ b/Xi/listdev.c
@@ -63,8 +63,8 @@ SOFTWARE.
 #include <X11/extensions/XIproto.h>
 #include "XIstubs.h"
 #include "extnsionst.h"
-#include "extinit.h"	/* LookupDeviceIntRec */
 #include "exglobals.h"	/* FIXME */
+#include "xace.h"
 
 #include "listdev.h"
 
@@ -310,7 +310,7 @@ ProcXListInputDevices(ClientPtr client)
     xListInputDevicesReply rep;
     int numdevs = 0;
     int namesize = 1;	/* need 1 extra byte for strcpy */
-    int size = 0;
+    int rc, size = 0;
     int total_length;
     char *devbuf;
     char *classbuf;
@@ -329,10 +329,16 @@ ProcXListInputDevices(ClientPtr client)
     AddOtherInputDevices();
 
     for (d = inputInfo.devices; d; d = d->next) {
+	rc = XaceHook(XACE_DEVICE_ACCESS, client, d, DixGetAttrAccess);
+	if (rc != Success)
+	    return rc;
 	SizeDeviceInfo(d, &namesize, &size);
         numdevs++;
     }
     for (d = inputInfo.off_devices; d; d = d->next) {
+	rc = XaceHook(XACE_DEVICE_ACCESS, client, d, DixGetAttrAccess);
+	if (rc != Success)
+	    return rc;
 	SizeDeviceInfo(d, &namesize, &size);
         numdevs++;
     }
diff --git a/Xi/opendev.c b/Xi/opendev.c
index dfefe055c..128b1bd9c 100644
--- a/Xi/opendev.c
+++ b/Xi/opendev.c
@@ -61,7 +61,6 @@ SOFTWARE.
 #include <X11/extensions/XIproto.h>
 #include "XIstubs.h"
 #include "windowstr.h"	/* window structure  */
-#include "extinit.h"	/* LookupDeviceIntRec */
 #include "exglobals.h"
 
 #include "opendev.h"
@@ -107,13 +106,15 @@ ProcXOpenDevice(ClientPtr client)
 	stuff->deviceid == inputInfo.keyboard->id)
 	return BadDevice;
 
-    if ((dev = LookupDeviceIntRec(stuff->deviceid)) == NULL) {	/* not open */
+    status = dixLookupDevice(&dev, stuff->deviceid, client, DixReadAccess);
+    if (status == BadDevice) {  /* not open */
 	for (dev = inputInfo.off_devices; dev; dev = dev->next)
 	    if (dev->id == stuff->deviceid)
 		break;
 	if (dev == NULL)
 	    return BadDevice;
-    }
+    } else if (status != Success)
+	return status;
 
     OpenInputDevice(dev, client, &status);
     if (status != Success)
diff --git a/Xi/queryst.c b/Xi/queryst.c
index 2b66b7eb2..71ab79be8 100644
--- a/Xi/queryst.c
+++ b/Xi/queryst.c
@@ -42,7 +42,6 @@ from The Open Group.
 #include "windowstr.h"	/* window structure  */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
-#include "extinit.h"	/* LookupDeviceIntRec */
 #include "exevents.h"
 #include "exglobals.h"
 
@@ -74,7 +73,7 @@ int
 ProcXQueryDeviceState(ClientPtr client)
 {
     char n;
-    int i;
+    int rc, i;
     int num_classes = 0;
     int total_length = 0;
     char *buf, *savbuf;
@@ -96,9 +95,9 @@ ProcXQueryDeviceState(ClientPtr client)
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
 
-    dev = LookupDeviceIntRec(stuff->deviceid);
-    if (dev == NULL)
-	return BadDevice;
+    rc = dixLookupDevice(&dev, stuff->deviceid, client, DixReadAccess);
+    if (rc != Success)
+	return rc;
 
     v = dev->valuator;
     if (v != NULL && v->motionHintWindow != NULL)
diff --git a/Xi/selectev.c b/Xi/selectev.c
index a5cf56754..b93618ace 100644
--- a/Xi/selectev.c
+++ b/Xi/selectev.c
@@ -61,7 +61,6 @@ SOFTWARE.
 #include "windowstr.h"	/* window structure  */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
-#include "extinit.h"	/* LookupDeviceIntRec */
 #include "exevents.h"
 #include "exglobals.h"
 
@@ -164,7 +163,7 @@ ProcXSelectExtensionEvent(ClientPtr client)
     if (stuff->length != (sizeof(xSelectExtensionEventReq) >> 2) + stuff->count)
 	return BadLength;
 
-    ret = dixLookupWindow(&pWin, stuff->window, client, DixUnknownAccess);
+    ret = dixLookupWindow(&pWin, stuff->window, client, DixReceiveAccess);
     if (ret != Success)
 	return ret;
 
diff --git a/Xi/sendexev.c b/Xi/sendexev.c
index 20b415a1f..e4e38d790 100644
--- a/Xi/sendexev.c
+++ b/Xi/sendexev.c
@@ -59,9 +59,9 @@ SOFTWARE.
 
 #include "inputstr.h"	/* DeviceIntPtr      */
 #include "windowstr.h"	/* Window            */
+#include "extnsionst.h" /* EventSwapPtr      */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
-#include "extinit.h"	/* LookupDeviceIntRec */
 #include "exevents.h"
 #include "exglobals.h"
 
@@ -131,9 +131,9 @@ ProcXSendExtensionEvent(ClientPtr client)
 	(stuff->num_events * (sizeof(xEvent) >> 2)))
 	return BadLength;
 
-    dev = LookupDeviceIntRec(stuff->deviceid);
-    if (dev == NULL)
-	return BadDevice;
+    ret = dixLookupDevice(&dev, stuff->deviceid, client, DixWriteAccess);
+    if (ret != Success)
+	return ret;
 
     /* The client's event type must be one defined by an extension. */
 
diff --git a/Xi/setbmap.c b/Xi/setbmap.c
index 40f0f9a99..3035c649e 100644
--- a/Xi/setbmap.c
+++ b/Xi/setbmap.c
@@ -63,7 +63,6 @@ SOFTWARE.
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
 #include "exevents.h"
-#include "extinit.h"	/* LookupDeviceIntRec */
 #include "exglobals.h"
 
 #include "setbmap.h"
@@ -110,9 +109,9 @@ ProcXSetDeviceButtonMapping(ClientPtr client)
     rep.sequenceNumber = client->sequence;
     rep.status = MappingSuccess;
 
-    dev = LookupDeviceIntRec(stuff->deviceid);
-    if (dev == NULL)
-	return BadDevice;
+    ret = dixLookupDevice(&dev, stuff->deviceid, client, DixSetAttrAccess);
+    if (ret != Success)
+	return ret;
 
     ret = SetButtonMapping(client, dev, stuff->map_length, (BYTE *) & stuff[1]);
 
diff --git a/Xi/setdval.c b/Xi/setdval.c
index cb35b9157..b1e22fc21 100644
--- a/Xi/setdval.c
+++ b/Xi/setdval.c
@@ -60,7 +60,6 @@ SOFTWARE.
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
 #include "XIstubs.h"
-#include "extinit.h"	/* LookupDeviceIntRec */
 #include "exglobals.h"
 
 #include "setdval.h"
@@ -92,6 +91,7 @@ ProcXSetDeviceValuators(ClientPtr client)
 {
     DeviceIntPtr dev;
     xSetDeviceValuatorsReply rep;
+    int rc;
 
     REQUEST(xSetDeviceValuatorsReq);
     REQUEST_AT_LEAST_SIZE(xSetDeviceValuatorsReq);
@@ -106,9 +106,9 @@ ProcXSetDeviceValuators(ClientPtr client)
 	stuff->num_valuators)
 	return BadLength;
 
-    dev = LookupDeviceIntRec(stuff->deviceid);
-    if (dev == NULL)
-	return BadDevice;
+    rc = dixLookupDevice(&dev, stuff->deviceid, client, DixSetAttrAccess);
+    if (rc != Success)
+	return rc;
     if (dev->valuator == NULL)
 	return BadMatch;
 
diff --git a/Xi/setfocus.c b/Xi/setfocus.c
index 74de17e97..c6edbc2e5 100644
--- a/Xi/setfocus.c
+++ b/Xi/setfocus.c
@@ -63,7 +63,6 @@ SOFTWARE.
 
 #include "dixevents.h"
 
-#include "extinit.h"	/* LookupDeviceIntRec */
 #include "exglobals.h"
 
 #include "setfocus.h"
@@ -102,8 +101,10 @@ ProcXSetDeviceFocus(ClientPtr client)
     REQUEST(xSetDeviceFocusReq);
     REQUEST_SIZE_MATCH(xSetDeviceFocusReq);
 
-    dev = LookupDeviceIntRec(stuff->device);
-    if (dev == NULL || !dev->focus)
+    ret = dixLookupDevice(&dev, stuff->device, client, DixSetFocusAccess);
+    if (ret != Success)
+	return ret;
+    if (!dev->focus)
 	return BadDevice;
 
     ret = SetInputFocus(client, dev, stuff->focus, stuff->revertTo,
diff --git a/Xi/setmmap.c b/Xi/setmmap.c
index 19ec71bbe..be3d3cb6c 100644
--- a/Xi/setmmap.c
+++ b/Xi/setmmap.c
@@ -60,7 +60,6 @@ SOFTWARE.
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
 #include "exevents.h"
-#include "extinit.h"	/* LookupDeviceIntRec */
 #include "exglobals.h"
 
 #include "setmmap.h"
@@ -99,9 +98,9 @@ ProcXSetDeviceModifierMapping(ClientPtr client)
     REQUEST(xSetDeviceModifierMappingReq);
     REQUEST_AT_LEAST_SIZE(xSetDeviceModifierMappingReq);
 
-    dev = LookupDeviceIntRec(stuff->deviceid);
-    if (dev == NULL)
-	return BadDevice;
+    ret = dixLookupDevice(&dev, stuff->deviceid, client, DixSetAttrAccess);
+    if (ret != Success)
+	return ret;
 
     rep.repType = X_Reply;
     rep.RepType = X_SetDeviceModifierMapping;
diff --git a/Xi/setmode.c b/Xi/setmode.c
index 957721c66..8b6003ad0 100644
--- a/Xi/setmode.c
+++ b/Xi/setmode.c
@@ -60,7 +60,6 @@ SOFTWARE.
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
 #include "XIstubs.h"
-#include "extinit.h"	/* LookupDeviceIntRec */
 #include "exglobals.h"
 
 #include "setmode.h"
@@ -92,6 +91,7 @@ ProcXSetDeviceMode(ClientPtr client)
 {
     DeviceIntPtr dev;
     xSetDeviceModeReply rep;
+    int rc;
 
     REQUEST(xSetDeviceModeReq);
     REQUEST_SIZE_MATCH(xSetDeviceModeReq);
@@ -101,9 +101,9 @@ ProcXSetDeviceMode(ClientPtr client)
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
 
-    dev = LookupDeviceIntRec(stuff->deviceid);
-    if (dev == NULL)
-	return BadDevice;
+    rc = dixLookupDevice(&dev, stuff->deviceid, client, DixSetAttrAccess);
+    if (rc != Success)
+	return rc;
     if (dev->valuator == NULL)
 	return BadMatch;
     if ((dev->grab) && !SameClient(dev->grab, client))
diff --git a/Xi/stubs.c b/Xi/stubs.c
index 40cd02fe1..80ddd73c0 100644
--- a/Xi/stubs.c
+++ b/Xi/stubs.c
@@ -65,6 +65,7 @@ SOFTWARE.
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
 #include "XIstubs.h"
+#include "xace.h"
 
 /***********************************************************************
  *
@@ -153,6 +154,7 @@ AddOtherInputDevices(void)
 void
 OpenInputDevice(DeviceIntPtr dev, ClientPtr client, int *status)
 {
+    *status = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixReadAccess);
 }
 
 /****************************************************************************
diff --git a/Xi/ungrdev.c b/Xi/ungrdev.c
index 505d6690f..7abb1d061 100644
--- a/Xi/ungrdev.c
+++ b/Xi/ungrdev.c
@@ -59,7 +59,6 @@ SOFTWARE.
 #include "inputstr.h"	/* DeviceIntPtr      */
 #include "windowstr.h"	/* window structure  */
 #include <X11/extensions/XIproto.h>
-#include "extinit.h"	/* LookupDeviceIntRec */
 #include "exglobals.h"
 
 #include "ungrdev.h"
@@ -94,13 +93,14 @@ ProcXUngrabDevice(ClientPtr client)
     DeviceIntPtr dev;
     GrabPtr grab;
     TimeStamp time;
+    int rc;
 
     REQUEST(xUngrabDeviceReq);
     REQUEST_SIZE_MATCH(xUngrabDeviceReq);
 
-    dev = LookupDeviceIntRec(stuff->deviceid);
-    if (dev == NULL)
-	return BadDevice;
+    rc = dixLookupDevice(&dev, stuff->deviceid, client, DixGetAttrAccess);
+    if (rc != Success)
+	return rc;
     grab = dev->grab;
 
     time = ClientTimeToServerTime(stuff->time);
diff --git a/Xi/ungrdevb.c b/Xi/ungrdevb.c
index 0dfe805b7..85ca5c6ce 100644
--- a/Xi/ungrdevb.c
+++ b/Xi/ungrdevb.c
@@ -60,7 +60,6 @@ SOFTWARE.
 #include "windowstr.h"	/* window structure  */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
-#include "extinit.h"	/* LookupDeviceIntRec */
 #include "exglobals.h"
 #include "dixgrabs.h"
 
@@ -107,22 +106,23 @@ ProcXUngrabDeviceButton(ClientPtr client)
     REQUEST(xUngrabDeviceButtonReq);
     REQUEST_SIZE_MATCH(xUngrabDeviceButtonReq);
 
-    dev = LookupDeviceIntRec(stuff->grabbed_device);
-    if (dev == NULL)
-	return BadDevice;
+    rc = dixLookupDevice(&dev, stuff->grabbed_device, client, DixGrabAccess);
+    if (rc != Success)
+	return rc;
     if (dev->button == NULL)
 	return BadMatch;
 
     if (stuff->modifier_device != UseXKeyboard) {
-	mdev = LookupDeviceIntRec(stuff->modifier_device);
-	if (mdev == NULL)
+	rc = dixLookupDevice(&mdev, stuff->modifier_device, client,
+			     DixReadAccess);
+	if (rc != Success)
 	    return BadDevice;
 	if (mdev->key == NULL)
 	    return BadMatch;
     } else
 	mdev = (DeviceIntPtr) LookupKeyboardDevice();
 
-    rc = dixLookupWindow(&pWin, stuff->grabWindow, client, DixUnknownAccess);
+    rc = dixLookupWindow(&pWin, stuff->grabWindow, client, DixSetAttrAccess);
     if (rc != Success)
 	return rc;
 
diff --git a/Xi/ungrdevk.c b/Xi/ungrdevk.c
index e6307af01..ac4003569 100644
--- a/Xi/ungrdevk.c
+++ b/Xi/ungrdevk.c
@@ -60,7 +60,6 @@ SOFTWARE.
 #include "windowstr.h"	/* window structure  */
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
-#include "extinit.h"	/* LookupDeviceIntRec */
 #include "exglobals.h"
 #include "dixgrabs.h"
 
@@ -107,22 +106,23 @@ ProcXUngrabDeviceKey(ClientPtr client)
     REQUEST(xUngrabDeviceKeyReq);
     REQUEST_SIZE_MATCH(xUngrabDeviceKeyReq);
 
-    dev = LookupDeviceIntRec(stuff->grabbed_device);
-    if (dev == NULL)
-	return BadDevice;
+    rc = dixLookupDevice(&dev, stuff->grabbed_device, client, DixGrabAccess);
+    if (rc != Success)
+	return rc;
     if (dev->key == NULL)
 	return BadMatch;
 
     if (stuff->modifier_device != UseXKeyboard) {
-	mdev = LookupDeviceIntRec(stuff->modifier_device);
-	if (mdev == NULL)
+	rc = dixLookupDevice(&mdev, stuff->modifier_device, client,
+			     DixReadAccess);
+	if (rc != Success)
 	    return BadDevice;
 	if (mdev->key == NULL)
 	    return BadMatch;
     } else
 	mdev = (DeviceIntPtr) LookupKeyboardDevice();
 
-    rc = dixLookupWindow(&pWin, stuff->grabWindow, client, DixUnknownAccess);
+    rc = dixLookupWindow(&pWin, stuff->grabWindow, client, DixSetAttrAccess);
     if (rc != Success)
 	return rc;
 
diff --git a/config/dbus.c b/config/dbus.c
index c8675120f..e564c90fc 100644
--- a/config/dbus.c
+++ b/config/dbus.c
@@ -213,7 +213,7 @@ remove_device(DBusMessage *message, DBusMessage *reply, DBusError *error)
         MALFORMED_MESSAGE_ERROR();
     }
 
-    dev = LookupDeviceIntRec(deviceid);
+    dixLookupDevice(&dev, deviceid, serverClient, DixUnknownAccess);
     if (!dev) {
         DebugF("[config/dbus] bogus device id %d given\n", deviceid);
         ret = BadMatch;
diff --git a/dix/devices.c b/dix/devices.c
index 3f4a33d6e..bd1bef722 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -717,20 +717,28 @@ LookupPointerDevice(void)
     return inputInfo.pointer ? &inputInfo.pointer->public : NULL;
 }
 
-DevicePtr
-LookupDevice(int id)
+int
+dixLookupDevice(DeviceIntPtr *pDev, int id, ClientPtr client, Mask access_mode)
 {
     DeviceIntPtr dev;
+    int rc;
+    *pDev = NULL;
 
     for (dev=inputInfo.devices; dev; dev=dev->next) {
         if (dev->id == (CARD8)id)
-            return (DevicePtr)dev;
+            goto found;
     }
     for (dev=inputInfo.off_devices; dev; dev=dev->next) {
         if (dev->id == (CARD8)id)
-            return (DevicePtr)dev;
+	    goto found;
     }
-    return NULL;
+    return BadDevice;
+
+found:
+    rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, access_mode);
+    if (rc == Success)
+	*pDev = dev;
+    return rc;
 }
 
 void
diff --git a/hw/dmx/input/dmxeq.c b/hw/dmx/input/dmxeq.c
index 3e98fb799..dff0b4423 100644
--- a/hw/dmx/input/dmxeq.c
+++ b/hw/dmx/input/dmxeq.c
@@ -82,7 +82,6 @@
 #ifdef XINPUT
 #include <X11/extensions/XIproto.h>
 #define EXTENSION_PROC_ARGS void *
-#include "extinit.h"            /* For LookupDeviceIntRec */
 #endif
 
 #if DMX_EQ_DEBUG
@@ -217,8 +216,9 @@ static void dmxeqProcessXInputEvent(xEvent *xe, EventRec *e)
 {
     deviceKeyButtonPointer *ev     = (deviceKeyButtonPointer *)xe;
     int                    id      = ev->deviceid & DEVICE_BITS;
-    DeviceIntPtr           pDevice = LookupDeviceIntRec(id);
+    DeviceIntPtr           pDevice;
     
+    dixLookupDevice(&pDevice, id, serverClient, DixUnknownAccess);
     if (!pDevice) {
         dmxLog(dmxError, "dmxeqProcessInputEvents: id %d not found\n", id);
         return;
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index e45d44c02..b694b7303 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -77,7 +77,6 @@
 
 #define EXTENSION_PROC_ARGS void *
 #include "extnsionst.h"
-#include "extinit.h"	/* LookupDeviceIntRec */
 
 #include "windowstr.h"	/* screenIsSaved */
 
diff --git a/include/extinit.h b/include/extinit.h
index e616b6d93..df9773caf 100644
--- a/include/extinit.h
+++ b/include/extinit.h
@@ -44,9 +44,4 @@ AssignTypeAndName (
 	char *                 /* name */
 	);
 
-DeviceIntPtr
-LookupDeviceIntRec (
-	CARD8                  /* id */
-	);
-
 #endif /* EXTINIT_H */
diff --git a/include/input.h b/include/input.h
index 4f9164a19..d8a9fe852 100644
--- a/include/input.h
+++ b/include/input.h
@@ -201,8 +201,11 @@ extern DevicePtr LookupKeyboardDevice(void);
 
 extern DevicePtr LookupPointerDevice(void);
 
-extern DevicePtr LookupDevice(
-    int /* id */);
+extern int dixLookupDevice(
+    DeviceIntPtr *         /* dev */,
+    int                    /* id */,
+    ClientPtr              /* client */,
+    Mask                   /* access_mode */);
 
 extern void QueryMinMaxKeyCodes(
     KeyCode* /*minCode*/,
@@ -436,9 +439,6 @@ extern int GetMotionHistory(
 extern void SwitchCoreKeyboard(DeviceIntPtr pDev);
 extern void SwitchCorePointer(DeviceIntPtr pDev);
 
-extern DeviceIntPtr LookupDeviceIntRec(
-    CARD8 deviceid);
-
 /* Implemented by the DDX. */
 extern int NewInputDeviceRequest(
     InputOption *options,
diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
index c7f9a2681..877d4d242 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -65,7 +65,7 @@ DeviceIntPtr dev = NULL;
     if (id&(~0xff))
 	 dev = NULL;
 
-    dev= (DeviceIntPtr)LookupDevice(id);
+    dixLookupDevice(&dev, id, serverClient, DixUnknownAccess);
     if (dev!=NULL) 
 	return dev;
     if ((!dev)&&(why_rtrn))

From 8b548657204000e18c7a38706a0071ae2f93159f Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 28 Sep 2007 13:34:18 -0400
Subject: [PATCH 119/552] xace: add hooks + new access codes: XKB extension.

Removes "LookupKeyboardDevice" and "LookupPointerDevice" in favor of
inputInfo.keyboard and inputInfo.pointer, respectively; all use cases
are non-XI compliant anyway.
---
 XTrap/xtrapddmi.c          |   6 +-
 XTrap/xtrapdi.c            |   6 +-
 Xext/xtest.c               |   6 +-
 Xi/grabdevb.c              |   9 ++-
 Xi/grabdevk.c              |   9 ++-
 Xi/ungrdevb.c              |   2 +-
 Xi/ungrdevk.c              |   2 +-
 dix/devices.c              |  12 ----
 hw/kdrive/ephyr/ephyr.c    |   2 +-
 hw/kdrive/vxworks/vxkbd.c  |   2 +-
 hw/xfree86/loader/dixsym.c |   2 -
 hw/xgl/egl/kinput.c        |   2 +-
 hw/xgl/glx/xglx.c          |   2 +-
 hw/xgl/xglinput.c          |   2 +-
 include/input.h            |   4 --
 include/xkbsrv.h           |  46 ++++++++----
 xkb/ddxDevBtn.c            |   2 +-
 xkb/ddxFakeBtn.c           |   2 +-
 xkb/xkb.c                  | 101 ++++++++++++++------------
 xkb/xkbAccessX.c           |   2 +-
 xkb/xkbActions.c           |  10 +--
 xkb/xkbEvents.c            |   2 +-
 xkb/xkbLEDs.c              |  10 +--
 xkb/xkbPrOtherEv.c         |   2 +-
 xkb/xkbUtils.c             | 143 +++++++++++++++++++++----------------
 25 files changed, 215 insertions(+), 173 deletions(-)

diff --git a/XTrap/xtrapddmi.c b/XTrap/xtrapddmi.c
index 73a20c1f6..3f1a72ab8 100644
--- a/XTrap/xtrapddmi.c
+++ b/XTrap/xtrapddmi.c
@@ -52,7 +52,7 @@ SOFTWARE.
 #define NEED_REPLIES
 #define NEED_EVENTS
 #include <X11/X.h>        /* From library include environment */
-#include "input.h"    /* From server include env. (must be before Xlib.h!) */
+#include "inputstr.h"    /* From server include env. (must be before Xlib.h!) */
 #ifdef PC
 # include "scrintst.h"          /* Screen struct */
 # include "extnsist.h"
@@ -96,8 +96,8 @@ int XETrapSimulateXEvent(register xXTrapInputReq *request,
     xEvent xev;
     register int x = request->input.x;
     register int y = request->input.y;
-    DevicePtr keydev = LookupKeyboardDevice();
-    DevicePtr ptrdev = LookupPointerDevice();
+    DevicePtr keydev = (DevicePtr)inputInfo.keyboard;
+    DevicePtr ptrdev = (DevicePtr)inputInfo.pointer;
 
     if (request->input.screen < screenInfo.numScreens)
     {
diff --git a/XTrap/xtrapdi.c b/XTrap/xtrapdi.c
index 23d3bde7f..efad36f7a 100644
--- a/XTrap/xtrapdi.c
+++ b/XTrap/xtrapdi.c
@@ -58,7 +58,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/Xos.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
-#include "input.h"              /* Server DevicePtr definitions */
+#include "inputstr.h"           /* Server DevicePtr definitions */
 #include "misc.h"               /* Server swapping macros */
 #include "dixstruct.h"          /* Server ClientRec definitions */
 #include "resource.h"           /* Used with the MakeAtom call */
@@ -277,7 +277,7 @@ Bool XETrapRedirectDevices()
     /* Do we need to redirect the keyboard device? */
     if (XETrapKbdDev == NULL)
     {
-        if ((XETrapKbdDev = LookupKeyboardDevice()) == NULL)
+        if ((XETrapKbdDev = (DevicePtr)inputInfo.keyboard) == NULL)
         {
             retval = False;
         }
@@ -302,7 +302,7 @@ Bool XETrapRedirectDevices()
 #ifndef VECTORED_EVENTS
     if (XETrapPtrDev == NULL)
     {
-        if ((XETrapPtrDev = LookupPointerDevice()) == 0L)
+        if ((XETrapPtrDev = (DevicePtr)inputInfo.pointer) == 0L)
         {
             retval = False;
         }
diff --git a/Xext/xtest.c b/Xext/xtest.c
index 42cf8178f..add996655 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -316,7 +316,7 @@ ProcXTestFakeInput(client)
 #ifdef XINPUT
 	if (!extension)
 #endif /* XINPUT */
-	    dev = (DeviceIntPtr)LookupKeyboardDevice();
+	    dev = inputInfo.keyboard;
 	if (ev->u.u.detail < dev->key->curKeySyms.minKeyCode ||
 	    ev->u.u.detail > dev->key->curKeySyms.maxKeyCode)
 	{
@@ -360,7 +360,7 @@ ProcXTestFakeInput(client)
 	    break;
 	}
 #endif /* XINPUT */
-	dev = (DeviceIntPtr)LookupPointerDevice();
+	dev = inputInfo.pointer;
 	if (ev->u.keyButtonPointer.root == None)
 	    root = GetCurrentRootWindow();
 	else
@@ -449,7 +449,7 @@ ProcXTestFakeInput(client)
 #ifdef XINPUT
 	if (!extension)
 #endif /* XINPUT */
-	    dev = (DeviceIntPtr)LookupPointerDevice();
+	    dev = inputInfo.pointer;
 	if (!ev->u.u.detail || ev->u.u.detail > dev->button->numButtons)
 	{
 	    client->errorValue = ev->u.u.detail;
diff --git a/Xi/grabdevb.c b/Xi/grabdevb.c
index 7eb542232..c2661e85b 100644
--- a/Xi/grabdevb.c
+++ b/Xi/grabdevb.c
@@ -62,6 +62,7 @@ SOFTWARE.
 #include <X11/extensions/XIproto.h>
 #include "exevents.h"
 #include "exglobals.h"
+#include "xace.h"
 
 #include "grabdev.h"
 #include "grabdevb.h"
@@ -127,8 +128,12 @@ ProcXGrabDeviceButton(ClientPtr client)
 	    return ret;
 	if (mdev->key == NULL)
 	    return BadMatch;
-    } else
-	mdev = (DeviceIntPtr) LookupKeyboardDevice();
+    } else {
+	mdev = inputInfo.keyboard;
+	ret = XaceHook(XACE_DEVICE_ACCESS, client, mdev, DixReadAccess);
+	if (ret != Success)
+	    return ret;
+    }
 
     class = (XEventClass *) (&stuff[1]);	/* first word of values */
 
diff --git a/Xi/grabdevk.c b/Xi/grabdevk.c
index e187a4f7b..43b19280d 100644
--- a/Xi/grabdevk.c
+++ b/Xi/grabdevk.c
@@ -62,6 +62,7 @@ SOFTWARE.
 #include <X11/extensions/XIproto.h>
 #include "exevents.h"
 #include "exglobals.h"
+#include "xace.h"
 
 #include "grabdev.h"
 #include "grabdevk.h"
@@ -125,8 +126,12 @@ ProcXGrabDeviceKey(ClientPtr client)
 	    return ret;
 	if (mdev->key == NULL)
 	    return BadMatch;
-    } else
-	mdev = (DeviceIntPtr) LookupKeyboardDevice();
+    } else {
+	mdev = inputInfo.keyboard;
+	ret = XaceHook(XACE_DEVICE_ACCESS, client, mdev, DixReadAccess);
+	if (ret != Success)
+	    return ret;
+    }
 
     class = (XEventClass *) (&stuff[1]);	/* first word of values */
 
diff --git a/Xi/ungrdevb.c b/Xi/ungrdevb.c
index 85ca5c6ce..590699f05 100644
--- a/Xi/ungrdevb.c
+++ b/Xi/ungrdevb.c
@@ -120,7 +120,7 @@ ProcXUngrabDeviceButton(ClientPtr client)
 	if (mdev->key == NULL)
 	    return BadMatch;
     } else
-	mdev = (DeviceIntPtr) LookupKeyboardDevice();
+	mdev = inputInfo.keyboard;
 
     rc = dixLookupWindow(&pWin, stuff->grabWindow, client, DixSetAttrAccess);
     if (rc != Success)
diff --git a/Xi/ungrdevk.c b/Xi/ungrdevk.c
index ac4003569..521765ea3 100644
--- a/Xi/ungrdevk.c
+++ b/Xi/ungrdevk.c
@@ -120,7 +120,7 @@ ProcXUngrabDeviceKey(ClientPtr client)
 	if (mdev->key == NULL)
 	    return BadMatch;
     } else
-	mdev = (DeviceIntPtr) LookupKeyboardDevice();
+	mdev = inputInfo.keyboard;
 
     rc = dixLookupWindow(&pWin, stuff->grabWindow, client, DixSetAttrAccess);
     if (rc != Success)
diff --git a/dix/devices.c b/dix/devices.c
index bd1bef722..b6cb4a5c0 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -705,18 +705,6 @@ RegisterKeyboardDevice(DeviceIntPtr device)
     RegisterOtherDevice(device);
 }
 
-_X_EXPORT DevicePtr
-LookupKeyboardDevice(void)
-{
-    return inputInfo.keyboard ? &inputInfo.keyboard->public : NULL;
-}
-
-_X_EXPORT DevicePtr
-LookupPointerDevice(void)
-{
-    return inputInfo.pointer ? &inputInfo.pointer->public : NULL;
-}
-
 int
 dixLookupDevice(DeviceIntPtr *pDev, int id, ClientPtr client, Mask access_mode)
 {
diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c
index e8001df73..2e0c00491 100644
--- a/hw/kdrive/ephyr/ephyr.c
+++ b/hw/kdrive/ephyr/ephyr.c
@@ -691,7 +691,7 @@ ephyrUpdateModifierState(unsigned int state)
   int          i;
   CARD8        mask;
 
-  pkeydev = (DeviceIntPtr)LookupKeyboardDevice();
+  pkeydev = inputInfo.keyboard;
 
   if (!pkeydev)
     return;
diff --git a/hw/kdrive/vxworks/vxkbd.c b/hw/kdrive/vxworks/vxkbd.c
index be528c78a..ac83ef729 100644
--- a/hw/kdrive/vxworks/vxkbd.c
+++ b/hw/kdrive/vxworks/vxkbd.c
@@ -232,7 +232,7 @@ VxWorksKeyboardRead (int fd)
 void
 VxWorksKeyboardLeds (int leds)
 {
-    DeviceIntPtr	pKeyboard = (DeviceIntPtr) LookupKeyboardDevice ();
+    DeviceIntPtr	pKeyboard = inputInfo.keyboard;
     KeyboardCtrl		*ctrl = &pKeyboard->kbdfeed->ctrl;
     led_ioctl_info	led_info;
     int			i;
diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c
index 4b3b66a89..0eaa2d3a6 100644
--- a/hw/xfree86/loader/dixsym.c
+++ b/hw/xfree86/loader/dixsym.c
@@ -139,8 +139,6 @@ _X_HIDDEN void *dixLookupTab[] = {
     SYMFUNC(InitKeyboardDeviceStruct)
     SYMFUNC(SendMappingNotify)
     SYMFUNC(InitPointerDeviceStruct)
-    SYMFUNC(LookupKeyboardDevice)
-    SYMFUNC(LookupPointerDevice)
     /* dispatch.c */
     SYMFUNC(SetInputCheck)
     SYMFUNC(SendErrorToClient)
diff --git a/hw/xgl/egl/kinput.c b/hw/xgl/egl/kinput.c
index 981cffcfa..774e00eb5 100644
--- a/hw/xgl/egl/kinput.c
+++ b/hw/xgl/egl/kinput.c
@@ -439,7 +439,7 @@ KdKeybdProc(DeviceIntPtr pDevice, int onoff)
     switch (onoff)
     {
     case DEVICE_INIT:
-	if (pDev != LookupKeyboardDevice())
+	if (pDev != (DevicePtr)inputInfo.keyboard)
 	{
 	    return !Success;
 	}
diff --git a/hw/xgl/glx/xglx.c b/hw/xgl/glx/xglx.c
index 89bd72e41..33b276b74 100644
--- a/hw/xgl/glx/xglx.c
+++ b/hw/xgl/glx/xglx.c
@@ -1100,7 +1100,7 @@ xglxKeybdProc (DeviceIntPtr pDevice,
       int	      xkbOp, xkbEvent, xkbError, xkbMajor, xkbMinor;
 #endif
 
-      if (pDev != LookupKeyboardDevice ())
+      if (pDev != (DevicePtr)inputInfo.keyboard)
 	  return !Success;
 
       xmodMap = XGetModifierMapping (xdisplay);
diff --git a/hw/xgl/xglinput.c b/hw/xgl/xglinput.c
index cda21ad49..9499fcf1f 100644
--- a/hw/xgl/xglinput.c
+++ b/hw/xgl/xglinput.c
@@ -224,7 +224,7 @@ xglKeybdProc (DeviceIntPtr pDevice,
 
     switch (onoff) {
     case DEVICE_INIT:
-	if (pDev != LookupKeyboardDevice ())
+	if (pDev != (DevicePtr)inputInfo.keyboard)
 	    return !Success;
 
 	ret = InitKeyboardDeviceStruct (pDev,
diff --git a/include/input.h b/include/input.h
index d8a9fe852..ca67cfac5 100644
--- a/include/input.h
+++ b/include/input.h
@@ -197,10 +197,6 @@ extern void RegisterPointerDevice(
 extern void RegisterKeyboardDevice(
     DeviceIntPtr /*device*/);
 
-extern DevicePtr LookupKeyboardDevice(void);
-
-extern DevicePtr LookupPointerDevice(void);
-
 extern int dixLookupDevice(
     DeviceIntPtr *         /* dev */,
     int                    /* id */,
diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 71ea115e6..e4a1db3c5 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -262,6 +262,7 @@ typedef struct
 extern int	XkbReqCode;
 extern int	XkbEventBase;
 extern int	XkbDisableLockActions;
+extern int	XkbKeyboardErrorCode;
 extern char *	XkbBaseDirectory;
 extern char *	XkbBinDirectory;
 extern char *	XkbInitialMap;
@@ -352,29 +353,44 @@ extern	void XkbFreeNames(
 	Bool			/* freeMap */
 );
 
-extern DeviceIntPtr _XkbLookupAnyDevice(
-    int			/* id */,
-    int *		/* why_rtrn */
+extern int _XkbLookupAnyDevice(
+    DeviceIntPtr *pDev,
+    int id,
+    ClientPtr client,
+    Mask access_mode,
+    int *xkb_err
 );
 
-extern DeviceIntPtr _XkbLookupKeyboard(
-    int			/* id */,
-    int *		/* why_rtrn */
+extern int _XkbLookupKeyboard(
+    DeviceIntPtr *pDev,
+    int id,
+    ClientPtr client,
+    Mask access_mode,
+    int *xkb_err
 );
 
-extern DeviceIntPtr _XkbLookupBellDevice(
-    int			/* id */,
-    int *		/* why_rtrn */
+extern int _XkbLookupBellDevice(
+    DeviceIntPtr *pDev,
+    int id,
+    ClientPtr client,
+    Mask access_mode,
+    int *xkb_err
 );
 
-extern DeviceIntPtr _XkbLookupLedDevice(
-    int			/* id */,
-    int *		/* why_rtrn */
+extern int _XkbLookupLedDevice(
+    DeviceIntPtr *pDev,
+    int id,
+    ClientPtr client,
+    Mask access_mode,
+    int *xkb_err
 );
 
-extern DeviceIntPtr _XkbLookupButtonDevice(
-    int			/* id */,
-    int *		/* why_rtrn */
+extern int _XkbLookupButtonDevice(
+    DeviceIntPtr *pDev,
+    int id,
+    ClientPtr client,
+    Mask access_mode,
+    int *xkb_err
 );
 
 extern	XkbDescPtr XkbAllocKeyboard(
diff --git a/xkb/ddxDevBtn.c b/xkb/ddxDevBtn.c
index 7e27c5189..5313a1ec5 100644
--- a/xkb/ddxDevBtn.c
+++ b/xkb/ddxDevBtn.c
@@ -53,7 +53,7 @@ deviceValuator *	val;
 int			x,y;
 int			nAxes, i, count;
 
-    if ((dev==(DeviceIntPtr)LookupPointerDevice())||(!dev->public.on))
+    if (dev == inputInfo.pointer || !dev->public.on)
 	return;
 
     nAxes = (dev->valuator?dev->valuator->numAxes:0);
diff --git a/xkb/ddxFakeBtn.c b/xkb/ddxFakeBtn.c
index 8144fd2c5..2dad54fea 100644
--- a/xkb/ddxFakeBtn.c
+++ b/xkb/ddxFakeBtn.c
@@ -46,7 +46,7 @@ xEvent	ev;
 int	x,y;
 DevicePtr ptr;
 
-    if ((ptr = LookupPointerDevice())==NULL)
+    if ((ptr = (DevicePtr)inputInfo.pointer)==NULL)
 	return;
     GetSpritePosition(&x,&y);
     ev.u.u.type = event;
diff --git a/xkb/xkb.c b/xkb/xkb.c
index cf4243070..9efdfb6b5 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -38,6 +38,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define	XKBSRV_NEED_FILE_FUNCS
 #include <xkbsrv.h>
 #include "extnsionst.h"
+#include "xace.h"
 #include "xkb.h"
 
 #include <X11/extensions/XI.h>
@@ -45,7 +46,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 	int	XkbEventBase;
 static	int	XkbErrorBase;
 	int	XkbReqCode;
-static  int	XkbKeyboardErrorCode;
+	int	XkbKeyboardErrorCode;
 CARD32	xkbDebugFlags = 0;
 static CARD32	xkbDebugCtrls = 0;
 
@@ -53,19 +54,23 @@ static RESTYPE	RT_XKBCLIENT;
 
 /***====================================================================***/
 
-#define	CHK_DEVICE(d,sp,lf) {\
+#define	CHK_DEVICE(dev, id, client, access_mode, lf) {\
     int why;\
-    d = (DeviceIntPtr)lf((sp),&why);\
-    if  (!dev) {\
-	client->errorValue = _XkbErrCode2(why,(sp));\
-	return XkbKeyboardErrorCode;\
+    int rc = lf(&(dev), id, client, access_mode, &why);\
+    if (rc != Success) {\
+	client->errorValue = _XkbErrCode2(why, id);\
+	return rc;\
     }\
 }
 
-#define	CHK_KBD_DEVICE(d,sp) 	CHK_DEVICE(d,sp,_XkbLookupKeyboard)
-#define	CHK_LED_DEVICE(d,sp) 	CHK_DEVICE(d,sp,_XkbLookupLedDevice)
-#define	CHK_BELL_DEVICE(d,sp) 	CHK_DEVICE(d,sp,_XkbLookupBellDevice)
-#define	CHK_ANY_DEVICE(d,sp) 	CHK_DEVICE(d,sp,_XkbLookupAnyDevice)
+#define	CHK_KBD_DEVICE(dev, id, client, mode) \
+    CHK_DEVICE(dev, id, client, mode, _XkbLookupKeyboard)
+#define	CHK_LED_DEVICE(dev, id, client, mode) \
+    CHK_DEVICE(dev, id, client, mode, _XkbLookupLedDevice)
+#define	CHK_BELL_DEVICE(dev, id, client, mode) \
+    CHK_DEVICE(dev, id, client, mode, _XkbLookupBellDevice)
+#define	CHK_ANY_DEVICE(dev, id, client, mode) \
+    CHK_DEVICE(dev, id, client, mode, _XkbLookupAnyDevice)
 
 #define	CHK_ATOM_ONLY2(a,ev,er) {\
 	if (((a)==None)||(!ValidAtom((a)))) {\
@@ -206,7 +211,7 @@ ProcXkbSelectEvents(ClientPtr client)
     if (!(client->xkbClientFlags&_XkbClientInitialized))
 	return BadAccess;
 
-    CHK_ANY_DEVICE(dev,stuff->deviceSpec);
+    CHK_ANY_DEVICE(dev, stuff->deviceSpec, client, DixReadAccess);
 
     if (((stuff->affectWhich&XkbMapNotifyMask)!=0)&&(stuff->affectMap)) {
 	client->mapNotifyMask&= ~stuff->affectMap;
@@ -351,7 +356,7 @@ ProcXkbBell(ClientPtr client)
     REQUEST(xkbBellReq);
     DeviceIntPtr dev;
     WindowPtr	 pWin;
-    int base;
+    int rc, base;
     int newPercent,oldPitch,oldDuration;
     pointer ctrl;
 
@@ -360,7 +365,7 @@ ProcXkbBell(ClientPtr client)
     if (!(client->xkbClientFlags&_XkbClientInitialized))
 	return BadAccess;
 
-    CHK_BELL_DEVICE(dev,stuff->deviceSpec);
+    CHK_BELL_DEVICE(dev, stuff->deviceSpec, client, DixBellAccess);
     CHK_ATOM_OR_NONE(stuff->name);
 
     if ((stuff->forceSound)&&(stuff->eventOnly)) {
@@ -448,10 +453,10 @@ ProcXkbBell(ClientPtr client)
 	return BadValue;
     }
     if (stuff->window!=None) {
-	pWin= (WindowPtr)LookupIDByType(stuff->window,RT_WINDOW);
-	if (pWin==NULL) {
+	rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
+	if (rc != Success) {
 	    client->errorValue= stuff->window;
-	    return BadValue;
+	    return rc;
 	}
     }
     else pWin= NULL;
@@ -499,7 +504,7 @@ ProcXkbGetState(ClientPtr client)
     if (!(client->xkbClientFlags&_XkbClientInitialized))
 	return BadAccess;
 
-    CHK_KBD_DEVICE(dev,stuff->deviceSpec);
+    CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixReadAccess);
 
     xkb= &dev->key->xkbInfo->state;
     bzero(&rep,sizeof(xkbGetStateReply));
@@ -544,7 +549,7 @@ ProcXkbLatchLockState(ClientPtr client)
     if (!(client->xkbClientFlags & _XkbClientInitialized))
 	return BadAccess;
 
-    CHK_KBD_DEVICE(dev, stuff->deviceSpec);
+    CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixSetAttrAccess);
     CHK_MASK_MATCH(0x01, stuff->affectModLocks, stuff->modLocks);
     CHK_MASK_MATCH(0x01, stuff->affectModLatches, stuff->modLatches);
 
@@ -612,7 +617,7 @@ ProcXkbGetControls(ClientPtr client)
     if (!(client->xkbClientFlags&_XkbClientInitialized))
 	return BadAccess;
 
-    CHK_KBD_DEVICE(dev,stuff->deviceSpec);
+    CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixGetAttrAccess);
     
     xkb = dev->key->xkbInfo->desc->ctrls;
     rep.type = X_Reply;
@@ -689,7 +694,7 @@ ProcXkbSetControls(ClientPtr client)
     if (!(client->xkbClientFlags & _XkbClientInitialized))
 	return BadAccess;
 
-    CHK_KBD_DEVICE(dev, stuff->deviceSpec);
+    CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixSetAttrAccess);
     CHK_MASK_LEGAL(0x01, stuff->changeCtrls, XkbAllControlsMask);
 
     for (tmpd = inputInfo.keyboard; tmpd; tmpd = tmpd->next) {
@@ -1370,7 +1375,7 @@ ProcXkbGetMap(ClientPtr client)
     if (!(client->xkbClientFlags&_XkbClientInitialized))
 	return BadAccess;
 
-    CHK_KBD_DEVICE(dev,stuff->deviceSpec);
+    CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixGetAttrAccess);
     CHK_MASK_OVERLAP(0x01,stuff->full,stuff->partial);
     CHK_MASK_LEGAL(0x02,stuff->full,XkbAllMapComponentsMask);
     CHK_MASK_LEGAL(0x03,stuff->partial,XkbAllMapComponentsMask);
@@ -2299,7 +2304,7 @@ ProcXkbSetMap(ClientPtr client)
     if (!(client->xkbClientFlags&_XkbClientInitialized))
 	return BadAccess;
 
-    CHK_KBD_DEVICE(dev,stuff->deviceSpec);
+    CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixSetAttrAccess);
     CHK_MASK_LEGAL(0x01,stuff->present,XkbAllMapComponentsMask);
 
     XkbSetCauseXkbReq(&cause,X_kbSetMap,client);
@@ -2569,7 +2574,7 @@ ProcXkbGetCompatMap(ClientPtr client)
     if (!(client->xkbClientFlags&_XkbClientInitialized))
 	return BadAccess;
 
-    CHK_KBD_DEVICE(dev,stuff->deviceSpec);
+    CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixGetAttrAccess);
 
     xkb = dev->key->xkbInfo->desc;
     compat= xkb->compat;
@@ -2613,7 +2618,7 @@ ProcXkbSetCompatMap(ClientPtr client)
     if (!(client->xkbClientFlags&_XkbClientInitialized))
 	return BadAccess;
 
-    CHK_KBD_DEVICE(dev,stuff->deviceSpec);
+    CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixSetAttrAccess);
 
     data = (char *)&stuff[1];
     xkbi = dev->key->xkbInfo;
@@ -2748,7 +2753,7 @@ ProcXkbGetIndicatorState(ClientPtr client)
     if (!(client->xkbClientFlags&_XkbClientInitialized))
 	return BadAccess;
 
-    CHK_KBD_DEVICE(dev,stuff->deviceSpec);
+    CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixReadAccess);
 
     sli= XkbFindSrvLedInfo(dev,XkbDfltXIClass,XkbDfltXIId,
 						XkbXI_IndicatorStateMask);
@@ -2859,7 +2864,7 @@ XkbIndicatorPtr		leds;
     if (!(client->xkbClientFlags&_XkbClientInitialized))
 	return BadAccess;
 
-    CHK_KBD_DEVICE(dev,stuff->deviceSpec);
+    CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixGetAttrAccess);
 
     xkb= dev->key->xkbInfo->desc;
     leds= xkb->indicators;
@@ -2878,7 +2883,7 @@ int
 ProcXkbSetIndicatorMap(ClientPtr client)
 {
     register int 	i,bit;
-    int			nIndicators,why;
+    int			nIndicators;
     DeviceIntPtr 	dev;
     XkbSrvInfoPtr	xkbi;
     xkbIndicatorMapWireDesc *from;
@@ -2891,11 +2896,8 @@ ProcXkbSetIndicatorMap(ClientPtr client)
     if (!(client->xkbClientFlags&_XkbClientInitialized))
 	return BadAccess;
 
-    dev = _XkbLookupKeyboard(stuff->deviceSpec,&why);
-    if (!dev) {
-	client->errorValue = _XkbErrCode2(why,stuff->deviceSpec);
-	return XkbKeyboardErrorCode;
-    }
+    CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixSetAttrAccess);
+
     xkbi= dev->key->xkbInfo;
 
     if (stuff->which==0)
@@ -2971,7 +2973,7 @@ ProcXkbGetNamedIndicator(ClientPtr client)
     if (!(client->xkbClientFlags&_XkbClientInitialized))
 	return BadAccess;
 
-    CHK_LED_DEVICE(dev,stuff->deviceSpec);
+    CHK_LED_DEVICE(dev, stuff->deviceSpec, client, DixReadAccess);
     CHK_ATOM_ONLY(stuff->indicator);
 
     sli= XkbFindSrvLedInfo(dev,stuff->ledClass,stuff->ledID,0);
@@ -3057,7 +3059,7 @@ ProcXkbSetNamedIndicator(ClientPtr client)
     if (!(client->xkbClientFlags&_XkbClientInitialized))
 	return BadAccess;
 
-    CHK_LED_DEVICE(dev,stuff->deviceSpec);
+    CHK_LED_DEVICE(dev, stuff->deviceSpec, client, DixSetAttrAccess);
     CHK_ATOM_ONLY(stuff->indicator);
     CHK_MASK_LEGAL(0x10,stuff->whichGroups,XkbIM_UseAnyGroup);
     CHK_MASK_LEGAL(0x11,stuff->whichMods,XkbIM_UseAnyMods);
@@ -3125,7 +3127,7 @@ ProcXkbSetNamedIndicator(ClientPtr client)
 
     kbd= dev;
     if ((sli->flags&XkbSLI_HasOwnState)==0)
-	kbd= (DeviceIntPtr)LookupKeyboardDevice();
+	kbd = inputInfo.keyboard;
     XkbFlushLedEvents(dev,kbd,sli,&ed,&changes,&cause);
     return client->noClientException;
 }
@@ -3433,7 +3435,7 @@ ProcXkbGetNames(ClientPtr client)
     if (!(client->xkbClientFlags&_XkbClientInitialized))
 	return BadAccess;
 
-    CHK_KBD_DEVICE(dev,stuff->deviceSpec);
+    CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixGetAttrAccess);
     CHK_MASK_LEGAL(0x01,stuff->which,XkbAllNamesMask);
 
     xkb = dev->key->xkbInfo->desc;
@@ -3543,7 +3545,7 @@ ProcXkbSetNames(ClientPtr client)
     if (!(client->xkbClientFlags&_XkbClientInitialized))
 	return BadAccess;
 
-    CHK_KBD_DEVICE(dev,stuff->deviceSpec);
+    CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixUnknownAccess);
     CHK_MASK_LEGAL(0x01,stuff->which,XkbAllNamesMask);
 
     xkb = dev->key->xkbInfo->desc;
@@ -4379,7 +4381,7 @@ ProcXkbGetGeometry(ClientPtr client)
     if (!(client->xkbClientFlags&_XkbClientInitialized))
 	return BadAccess;
 
-    CHK_KBD_DEVICE(dev,stuff->deviceSpec);
+    CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixGetAttrAccess);
     CHK_ATOM_OR_NONE(stuff->name);
 
     geom= XkbLookupNamedGeometry(dev,stuff->name,&shouldFree);
@@ -4842,7 +4844,7 @@ ProcXkbSetGeometry(ClientPtr client)
     if (!(client->xkbClientFlags&_XkbClientInitialized))
 	return BadAccess;
 
-    CHK_KBD_DEVICE(dev,stuff->deviceSpec);
+    CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixSetAttrAccess);
     CHK_ATOM_OR_NONE(stuff->name);
 
     xkb= dev->key->xkbInfo->desc;
@@ -4897,6 +4899,7 @@ ProcXkbPerClientFlags(ClientPtr client)
     DeviceIntPtr 		dev;
     xkbPerClientFlagsReply 	rep;
     XkbInterestPtr		interest;
+    Mask access_mode = DixGetAttrAccess | DixSetAttrAccess;
 
     REQUEST(xkbPerClientFlagsReq);
     REQUEST_SIZE_MATCH(xkbPerClientFlagsReq);
@@ -4904,7 +4907,7 @@ ProcXkbPerClientFlags(ClientPtr client)
     if (!(client->xkbClientFlags&_XkbClientInitialized))
 	return BadAccess;
 
-    CHK_KBD_DEVICE(dev,stuff->deviceSpec);
+    CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, access_mode);
     CHK_MASK_LEGAL(0x01,stuff->change,XkbPCF_AllFlagsMask);
     CHK_MASK_MATCH(0x02,stuff->change,stuff->value);
 
@@ -5040,7 +5043,7 @@ ProcXkbListComponents(ClientPtr client)
     if (!(client->xkbClientFlags&_XkbClientInitialized))
 	return BadAccess;
 
-    CHK_KBD_DEVICE(dev,stuff->deviceSpec);
+    CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixGetAttrAccess);
 
     status= Success;
     str= (unsigned char *)&stuff[1];
@@ -5123,6 +5126,7 @@ ProcXkbGetKbdByName(ClientPtr client)
     Bool			geom_changed;
     XkbSrvLedInfoPtr            old_sli;
     XkbSrvLedInfoPtr            sli;
+    Mask access_mode = DixGetAttrAccess | DixSetAttrAccess;
 
     REQUEST(xkbGetKbdByNameReq);
     REQUEST_AT_LEAST_SIZE(xkbGetKbdByNameReq);
@@ -5130,7 +5134,7 @@ ProcXkbGetKbdByName(ClientPtr client)
     if (!(client->xkbClientFlags&_XkbClientInitialized))
 	return BadAccess;
 
-    CHK_KBD_DEVICE(dev,stuff->deviceSpec);
+    CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, access_mode);
 
     xkb = dev->key->xkbInfo->desc;
     status= Success;
@@ -5664,7 +5668,7 @@ char *			str;
 
     wanted= stuff->wanted;
 
-    CHK_ANY_DEVICE(dev,stuff->deviceSpec);
+    CHK_ANY_DEVICE(dev, stuff->deviceSpec, client, DixGetAttrAccess);
     CHK_MASK_LEGAL(0x01,wanted,XkbXI_AllDeviceFeaturesMask);
 
     if ((!dev->button)||((stuff->nBtns<1)&&(!stuff->allBtns)))
@@ -5968,7 +5972,7 @@ DeviceIntPtr			kbd;
 
 	kbd= dev;
 	if ((sli->flags&XkbSLI_HasOwnState)==0)
-	    kbd= (DeviceIntPtr)LookupKeyboardDevice();
+	    kbd = inputInfo.keyboard;
 
 	XkbFlushLedEvents(dev,kbd,sli,&ed,&changes,&cause);
 	ledWire= (xkbDeviceLedsWireDesc *)mapWire;
@@ -5993,7 +5997,7 @@ xkbExtensionDeviceNotify ed;
 
     change= stuff->change;
 
-    CHK_ANY_DEVICE(dev,stuff->deviceSpec);
+    CHK_ANY_DEVICE(dev, stuff->deviceSpec, client, DixSetAttrAccess);
     CHK_MASK_LEGAL(0x01,change,XkbXI_AllFeaturesMask);
 
     wire= (char *)&stuff[1];
@@ -6043,7 +6047,7 @@ xkbExtensionDeviceNotify ed;
 	ed.nBtns=	stuff->nBtns;
 
 	if (dev->key)	kbd= dev;
-	else		kbd= (DeviceIntPtr)LookupKeyboardDevice();
+	else		kbd= inputInfo.keyboard;
 	acts= &dev->button->xkb_acts[stuff->firstBtn];
 	for (i=0;i<stuff->nBtns;i++,acts++) {
 	    if (acts->type!=XkbSA_NoAction)
@@ -6069,10 +6073,15 @@ ProcXkbSetDebuggingFlags(ClientPtr client)
 {
 CARD32 				newFlags,newCtrls,extraLength;
 xkbSetDebuggingFlagsReply 	rep;
+int rc;
 
     REQUEST(xkbSetDebuggingFlagsReq);
     REQUEST_AT_LEAST_SIZE(xkbSetDebuggingFlagsReq);
 
+    rc = XaceHook(XACE_SERVER_ACCESS, client, DixDebugAccess);
+    if (rc != Success)
+	return rc;
+
     newFlags=  xkbDebugFlags&(~stuff->affectFlags);
     newFlags|= (stuff->flags&stuff->affectFlags);
     newCtrls=  xkbDebugCtrls&(~stuff->affectCtrls);
diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c
index 2954a0c0e..fbd281536 100644
--- a/xkb/xkbAccessX.c
+++ b/xkb/xkbAccessX.c
@@ -689,7 +689,7 @@ ProcessPointerEvent(	register xEvent  *	xE,
 			register DeviceIntPtr	mouse, 
 			int		        count)
 {
-DeviceIntPtr	dev = (DeviceIntPtr)LookupKeyboardDevice();
+DeviceIntPtr	dev = inputInfo.keyboard;
 XkbSrvInfoPtr	xkbi = dev->key->xkbInfo;
 unsigned 	changed = 0;
 
diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
index 7f0f74db1..822afffcb 100644
--- a/xkb/xkbActions.c
+++ b/xkb/xkbActions.c
@@ -1026,8 +1026,9 @@ DeviceIntPtr	dev;
 int		button;
 
     if (filter->keycode==0) {		/* initial press */
-	dev= _XkbLookupButtonDevice(pAction->devbtn.device,NULL);
-	if ((!dev)||(!dev->public.on)||(&dev->public==LookupPointerDevice()))
+	_XkbLookupButtonDevice(&dev, pAction->devbtn.device, serverClient,
+			       DixUnknownAccess, &button);
+	if (!dev || !dev->public.on || dev == inputInfo.pointer)
 	    return 1;
 
 	button= pAction->devbtn.button;
@@ -1066,8 +1067,9 @@ int		button;
 	int	button;
 
 	filter->active= 0;
-	dev= _XkbLookupButtonDevice(filter->upAction.devbtn.device,NULL);
-	if ((!dev)||(!dev->public.on)||(&dev->public==LookupPointerDevice()))
+	_XkbLookupButtonDevice(&dev, filter->upAction.devbtn.device,
+			       serverClient, DixUnknownAccess, &button);
+	if (!dev || !dev->public.on || dev == inputInfo.pointer)
 	    return 1;
 
 	button= filter->upAction.btn.button;
diff --git a/xkb/xkbEvents.c b/xkb/xkbEvents.c
index 11dc17ad3..15b4949e5 100644
--- a/xkb/xkbEvents.c
+++ b/xkb/xkbEvents.c
@@ -806,7 +806,7 @@ Bool
 XkbFilterEvents(ClientPtr pClient,int nEvents,xEvent *xE)
 {
 int	i, button_mask;
-DeviceIntPtr pXDev = (DeviceIntPtr)LookupKeyboardDevice();
+DeviceIntPtr pXDev = inputInfo.keyboard;
 XkbSrvInfoPtr	xkbi;
 
     xkbi= pXDev->key->xkbInfo;
diff --git a/xkb/xkbLEDs.c b/xkb/xkbLEDs.c
index d607d9066..2877af0c4 100644
--- a/xkb/xkbLEDs.c
+++ b/xkb/xkbLEDs.c
@@ -239,7 +239,7 @@ unsigned			oldState;
 
     if (dev->key && dev->key->xkbInfo)
 	 kbd= dev;
-    else kbd= (DeviceIntPtr)LookupKeyboardDevice();
+    else kbd= inputInfo.keyboard;
 
     state= &kbd->key->xkbInfo->state;
     ctrls= kbd->key->xkbInfo->desc->ctrls;
@@ -444,7 +444,7 @@ XkbIndicatorMapPtr	map;
 XkbDescPtr		xkb;
 
     if ((sli->flags&XkbSLI_HasOwnState)==0)
-	dev= (DeviceIntPtr)LookupKeyboardDevice();
+	dev= inputInfo.keyboard;
 
     sli->usesBase&=	 ~which;
     sli->usesLatched&=	 ~which;
@@ -731,7 +731,7 @@ xkbExtensionDeviceNotify	my_ed;
 	return;
     if (dev->key && dev->key->xkbInfo)
 	 kbd= dev;
-    else kbd= (DeviceIntPtr)LookupKeyboardDevice();
+    else kbd= inputInfo.keyboard;
 
     if (ed==NULL) {
 	ed= &my_ed;
@@ -808,7 +808,7 @@ xkbExtensionDeviceNotify	my_ed;
 	return;
     if (dev->key && dev->key->xkbInfo)
 	 kbd= dev;
-    else kbd= (DeviceIntPtr)LookupKeyboardDevice();
+    else kbd= inputInfo.keyboard;
 
     if (ed==NULL) {
 	ed= &my_ed;
@@ -869,7 +869,7 @@ Bool				kb_changed;
 	return;
     if (dev->key && dev->key->xkbInfo)
 	 kbd= dev;
-    else kbd= (DeviceIntPtr)LookupKeyboardDevice();
+    else kbd= inputInfo.keyboard;
     xkbi= kbd->key->xkbInfo;
 
     if (changes==NULL) {
diff --git a/xkb/xkbPrOtherEv.c b/xkb/xkbPrOtherEv.c
index a2ea0909a..d65107cdc 100644
--- a/xkb/xkbPrOtherEv.c
+++ b/xkb/xkbPrOtherEv.c
@@ -71,7 +71,7 @@ Bool	xkbCares,isBtn;
 	if ((!isBtn)||((dev->button)&&(dev->button->xkb_acts))) {
 	   DeviceIntPtr	kbd;
 	   if (dev->key)	kbd= dev;
-	   else		kbd= (DeviceIntPtr)LookupKeyboardDevice();
+	   else		kbd= inputInfo.keyboard;
 	   XkbHandleActions(dev,kbd,xE,count);
 	   return;
 	}
diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
index 877d4d242..31c1a9fa9 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -49,92 +49,115 @@ int	XkbDisableLockActions = 0;
 
 /***====================================================================***/
 
-DeviceIntPtr
-_XkbLookupAnyDevice(int id,int *why_rtrn)
+int
+_XkbLookupAnyDevice(DeviceIntPtr *pDev, int id, ClientPtr client,
+		    Mask access_mode, int *xkb_err)
 {
-DeviceIntPtr dev = NULL;
+    int rc = XkbKeyboardErrorCode;
 
-    dev= (DeviceIntPtr)LookupKeyboardDevice();
-    if ((id==XkbUseCoreKbd)||(dev->id==id))
-	return dev;
-
-    dev= (DeviceIntPtr)LookupPointerDevice();
-    if ((id==XkbUseCorePtr)||(dev->id==id))
-	return dev;
-
-    if (id&(~0xff))
-	 dev = NULL;
-
-    dixLookupDevice(&dev, id, serverClient, DixUnknownAccess);
-    if (dev!=NULL) 
-	return dev;
-    if ((!dev)&&(why_rtrn))
-	*why_rtrn= XkbErr_BadDevice;
-    return dev;
+    if (id == XkbUseCoreKbd) {
+	if (inputInfo.keyboard)
+	    id = inputInfo.keyboard->id;
+	else
+	    goto out;
+    }
+    if (id == XkbUseCorePtr) {
+	if (inputInfo.pointer)
+	    id = inputInfo.pointer->id;
+	else
+	    goto out;
+    }
+    rc = dixLookupDevice(pDev, id, client, access_mode);
+out:
+    if (rc != Success)
+	*xkb_err = XkbErr_BadDevice;
+    return rc;
 }
 
-DeviceIntPtr
-_XkbLookupKeyboard(int id,int *why_rtrn)
+int
+_XkbLookupKeyboard(DeviceIntPtr *pDev, int id, ClientPtr client,
+		   Mask access_mode, int *xkb_err)
 {
-DeviceIntPtr dev = NULL;
+    DeviceIntPtr dev;
+    int rc;
 
     if (id == XkbDfltXIId)
         id = XkbUseCoreKbd;
-    if ((dev= _XkbLookupAnyDevice(id,why_rtrn))==NULL)
-	return NULL;
-    else if ((!dev->key)||(!dev->key->xkbInfo)) {
-	if (why_rtrn)
-	   *why_rtrn= XkbErr_BadClass;
-	return NULL;
+
+    rc = _XkbLookupAnyDevice(pDev, id, client, access_mode, xkb_err);
+    if (rc != Success)
+	return rc;
+
+    dev = *pDev;
+    if (!dev->key || !dev->key->xkbInfo) {
+	*pDev = NULL;
+	*xkb_err= XkbErr_BadClass;
+	return XkbKeyboardErrorCode;
     }
-    return dev;
+    return Success;
 }
 
-DeviceIntPtr
-_XkbLookupBellDevice(int id,int *why_rtrn)
+int
+_XkbLookupBellDevice(DeviceIntPtr *pDev, int id, ClientPtr client,
+		     Mask access_mode, int *xkb_err)
 {
-DeviceIntPtr dev = NULL;
+    DeviceIntPtr dev;
+    int rc;
 
-    if ((dev= _XkbLookupAnyDevice(id,why_rtrn))==NULL)
-	return NULL;
-    else if ((!dev->kbdfeed)&&(!dev->bell)) {
-	if (why_rtrn)
-	   *why_rtrn= XkbErr_BadClass;
-	return NULL;
+    rc = _XkbLookupAnyDevice(pDev, id, client, access_mode, xkb_err);
+    if (rc != Success)
+	return rc;
+
+    dev = *pDev;
+    if (!dev->kbdfeed && !dev->bell) {
+	*pDev = NULL;
+	*xkb_err= XkbErr_BadClass;
+	return XkbKeyboardErrorCode;
     }
-    return dev;
+    return Success;
 }
 
-DeviceIntPtr
-_XkbLookupLedDevice(int id,int *why_rtrn)
+int
+_XkbLookupLedDevice(DeviceIntPtr *pDev, int id, ClientPtr client,
+		    Mask access_mode, int *xkb_err)
 {
-DeviceIntPtr dev = NULL;
+    DeviceIntPtr dev;
+    int rc;
 
     if (id == XkbDfltXIId)
         id = XkbUseCorePtr;
-    if ((dev= _XkbLookupAnyDevice(id,why_rtrn))==NULL)
-	return NULL;
-    else if ((!dev->kbdfeed)&&(!dev->leds)) {
-	if (why_rtrn)
-	   *why_rtrn= XkbErr_BadClass;
-	return NULL;
+
+    rc = _XkbLookupAnyDevice(pDev, id, client, access_mode, xkb_err);
+    if (rc != Success)
+	return rc;
+
+    dev = *pDev;
+    if (!dev->kbdfeed && !dev->leds) {
+	*pDev = NULL;
+	*xkb_err= XkbErr_BadClass;
+	return XkbKeyboardErrorCode;
     }
-    return dev;
+    return Success;
 }
 
-DeviceIntPtr
-_XkbLookupButtonDevice(int id,int *why_rtrn)
+int
+_XkbLookupButtonDevice(DeviceIntPtr *pDev, int id, ClientPtr client,
+		       Mask access_mode, int *xkb_err)
 {
-DeviceIntPtr dev = NULL;
+    DeviceIntPtr dev;
+    int rc;
 
-    if ((dev= _XkbLookupAnyDevice(id,why_rtrn))==NULL)
-	return NULL;
-    else if (!dev->button) {
-	if (why_rtrn)
-	   *why_rtrn= XkbErr_BadClass;
-	return NULL;
+    rc = _XkbLookupAnyDevice(pDev, id, client, access_mode, xkb_err);
+    if (rc != Success)
+	return rc;
+
+    dev = *pDev;
+    if (!dev->button) {
+	*pDev = NULL;
+	*xkb_err= XkbErr_BadClass;
+	return XkbKeyboardErrorCode;
     }
-    return dev;
+    return Success;
 }
 
 void

From 50551ec693f40b91652fe4814e9fe2e1f9ab6517 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 28 Sep 2007 15:04:33 -0400
Subject: [PATCH 120/552] xace: remove obsoleted DRAWABLE_ACCESS hook.

---
 Xext/security.c |  1 -
 Xext/xace.c     | 10 ----------
 Xext/xace.h     | 27 +++++++++++++--------------
 Xext/xacestr.h  |  7 -------
 Xext/xselinux.c |  1 -
 dix/dispatch.c  |  3 +--
 6 files changed, 14 insertions(+), 35 deletions(-)

diff --git a/Xext/security.c b/Xext/security.c
index fe1e48a14..ec414a0c3 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -1836,7 +1836,6 @@ SecurityExtensionInit(INITARGS)
     XaceRC(XACE_RESOURCE_ACCESS, SecurityCheckResourceIDAccess, NULL);
     XaceRC(XACE_DEVICE_ACCESS, SecurityCheckDeviceAccess, NULL);
     XaceRC(XACE_PROPERTY_ACCESS, SecurityCheckPropertyAccess, NULL);
-    XaceRC(XACE_DRAWABLE_ACCESS, SecurityCheckDrawableAccess, NULL);
     XaceRC(XACE_MAP_ACCESS, SecurityCheckMapAccess, NULL);
     XaceRC(XACE_EXT_DISPATCH, SecurityCheckExtAccess, NULL);
     XaceRC(XACE_EXT_ACCESS, SecurityCheckExtAccess, NULL);
diff --git a/Xext/xace.c b/Xext/xace.c
index 92f0e4048..3de259f71 100644
--- a/Xext/xace.c
+++ b/Xext/xace.c
@@ -105,16 +105,6 @@ int XaceHook(int hook, ...)
 	    prv = &rec.status;
 	    break;
 	}
-	case XACE_DRAWABLE_ACCESS: {
-	    XaceDrawableAccessRec rec = {
-		va_arg(ap, ClientPtr),
-		va_arg(ap, DrawablePtr),
-		Success /* default allow */
-	    };
-	    calldata = &rec;
-	    prv = &rec.status;
-	    break;
-	}
 	case XACE_SEND_ACCESS: {
 	    XaceSendAccessRec rec = {
 		va_arg(ap, ClientPtr),
diff --git a/Xext/xace.h b/Xext/xace.h
index c1fc0714f..e9fe9f31b 100644
--- a/Xext/xace.h
+++ b/Xext/xace.h
@@ -45,20 +45,19 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define XACE_RESOURCE_ACCESS		2
 #define XACE_DEVICE_ACCESS		3
 #define XACE_PROPERTY_ACCESS		4
-#define XACE_DRAWABLE_ACCESS		5
-#define XACE_SEND_ACCESS		6
-#define XACE_RECEIVE_ACCESS		7
-#define XACE_CLIENT_ACCESS		8
-#define XACE_EXT_ACCESS			9
-#define XACE_SERVER_ACCESS		10
-#define XACE_SELECTION_ACCESS		11
-#define XACE_SCREEN_ACCESS		12
-#define XACE_SCREENSAVER_ACCESS		13
-#define XACE_AUTH_AVAIL			14
-#define XACE_KEY_AVAIL			15
-#define XACE_AUDIT_BEGIN		16
-#define XACE_AUDIT_END			17
-#define XACE_NUM_HOOKS			18
+#define XACE_SEND_ACCESS		5
+#define XACE_RECEIVE_ACCESS		6
+#define XACE_CLIENT_ACCESS		7
+#define XACE_EXT_ACCESS			8
+#define XACE_SERVER_ACCESS		9
+#define XACE_SELECTION_ACCESS		10
+#define XACE_SCREEN_ACCESS		11
+#define XACE_SCREENSAVER_ACCESS		12
+#define XACE_AUTH_AVAIL			13
+#define XACE_KEY_AVAIL			14
+#define XACE_AUDIT_BEGIN		15
+#define XACE_AUDIT_END			16
+#define XACE_NUM_HOOKS			17
 
 extern CallbackListPtr XaceHooks[XACE_NUM_HOOKS];
 
diff --git a/Xext/xacestr.h b/Xext/xacestr.h
index e12a52c9a..1dae4d6b5 100644
--- a/Xext/xacestr.h
+++ b/Xext/xacestr.h
@@ -65,13 +65,6 @@ typedef struct {
     int status;
 } XacePropertyAccessRec;
 
-/* XACE_DRAWABLE_ACCESS */
-typedef struct {
-    ClientPtr client;
-    DrawablePtr pDraw;
-    int status;
-} XaceDrawableAccessRec;
-
 /* XACE_SEND_ACCESS */
 typedef struct {
     ClientPtr client;
diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 1ffd79d79..bc86a3294 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -1389,7 +1389,6 @@ XSELinuxExtensionInit(INITARGS)
     XaceRegisterCallback(XACE_RESOURCE_ACCESS, XSELinuxResLookup, NULL);
     XaceRegisterCallback(XACE_MAP_ACCESS, XSELinuxMap, NULL);
     XaceRegisterCallback(XACE_SERVER_ACCESS, XSELinuxServer, NULL);
-    XaceRegisterCallback(XACE_DRAWABLE_ACCESS, XSELinuxDrawable, NULL);
     XaceRegisterCallback(XACE_PROPERTY_ACCESS, XSELinuxProperty, NULL);
     /* XaceRegisterCallback(XACE_DECLARE_EXT_SECURE, XSELinuxDeclare, NULL);
     XaceRegisterCallback(XACE_DEVICE_ACCESS, XSELinuxDevice, NULL); */
diff --git a/dix/dispatch.c b/dix/dispatch.c
index 65eb8cc41..50384db30 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -2273,8 +2273,7 @@ DoGetImage(ClientPtr client, int format, Drawable drawable,
 	WriteReplyToClient(client, sizeof (xGetImageReply), &xgi);
     }
 
-    if (pDraw->type == DRAWABLE_WINDOW &&
-	XaceHook(XACE_DRAWABLE_ACCESS, client, pDraw) != Success)
+    if (pDraw->type == DRAWABLE_WINDOW)
     {
 	pVisibleRegion = NotClippedByChildren((WindowPtr)pDraw);
 	if (pVisibleRegion)

From b77d272d7555c1e0f176ee74b8717030a6d6c7b0 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 2 Oct 2007 13:21:53 -0400
Subject: [PATCH 121/552] xace: add hooks + new access codes: XTEST extension

---
 Xext/xtest.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Xext/xtest.c b/Xext/xtest.c
index add996655..79c53b426 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -141,7 +141,7 @@ ProcXTestCompareCursor(client)
     register int n, rc;
 
     REQUEST_SIZE_MATCH(xXTestCompareCursorReq);
-    rc = dixLookupWindow(&pWin, stuff->window, client, DixUnknownAccess);
+    rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
     if (rc != Success)
         return rc;
     if (stuff->cursor == None)
@@ -149,11 +149,12 @@ ProcXTestCompareCursor(client)
     else if (stuff->cursor == XTestCurrentCursor)
 	pCursor = GetSpriteCursor();
     else {
-	pCursor = (CursorPtr)LookupIDByType(stuff->cursor, RT_CURSOR);
-	if (!pCursor) 
+	rc = dixLookupResource((pointer *)&pCursor, stuff->cursor, RT_CURSOR,
+			       client, DixReadAccess);
+	if (rc != Success) 
 	{
 	    client->errorValue = stuff->cursor;
-	    return (BadCursor);
+	    return (rc == BadValue) ? BadCursor : rc;
 	}
     }
     rep.type = X_Reply;
@@ -366,7 +367,7 @@ ProcXTestFakeInput(client)
 	else
 	{
 	    rc = dixLookupWindow(&root, ev->u.keyButtonPointer.root, client,
-				 DixUnknownAccess);
+				 DixGetAttrAccess);
 	    if (rc != Success)
 		return rc;
 	    if (root->parent)

From 59cebcd2e9302d15a52588ecafbbc2d2c5ae3a6c Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 2 Oct 2007 13:39:25 -0400
Subject: [PATCH 122/552] xace: add creation hook for new input devices.

Unfortunately, more information is needed to properly label the device.
This will come from the configuration file, the hotplug messages, etc.
It will either have to be passed into this function,
or this hook moved down into the callers.
---
 dix/devices.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/dix/devices.c b/dix/devices.c
index b6cb4a5c0..3395cd33d 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -119,7 +119,6 @@ AddInputDevice(DeviceProc deviceProc, Bool autoStart)
     dev->name = (char *)NULL;
     dev->type = 0;
     dev->id = devid;
-    inputInfo.numDevices++;
     dev->public.on = FALSE;
     dev->public.processInputProc = (ProcessInputProc)NoopDDA;
     dev->public.realInputProc = (ProcessInputProc)NoopDDA;
@@ -156,6 +155,15 @@ AddInputDevice(DeviceProc deviceProc, Bool autoStart)
     dev->inited = FALSE;
     dev->enabled = FALSE;
 
+    /*  security creation/labeling check
+     */
+    if (XaceHook(XACE_DEVICE_ACCESS, serverClient, dev, DixCreateAccess)) {
+	xfree(dev);
+	return NULL;
+    }
+
+    inputInfo.numDevices++;
+
     for (prev = &inputInfo.off_devices; *prev; prev = &(*prev)->next)
         ;
     *prev = dev;

From 7e9e01a4a34fa45521067d43c5bbff942dd5d51a Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 10 Oct 2007 17:40:22 -0400
Subject: [PATCH 123/552] dix: pass a valid ClientPtr to SetFontPath in all
 cases.

---
 dix/main.c       | 6 +++---
 hw/dmx/dmxfont.c | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dix/main.c b/dix/main.c
index 03e0013e8..119828bd7 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -388,9 +388,9 @@ main(int argc, char *argv[], char *envp[])
 	    FatalError("failed to initialize core devices");
 
 	InitFonts();
-	if (loadableFonts) {
-	    SetFontPath(0, 0, (unsigned char *)defaultFontPath, &error);
-	}
+	if (loadableFonts)
+	    SetFontPath(serverClient, 0, (unsigned char *)defaultFontPath,
+			&error);
         else {
 	    if (SetDefaultFontPath(defaultFontPath) != Success)
 		ErrorF("failed to set default font path '%s'",
diff --git a/hw/dmx/dmxfont.c b/hw/dmx/dmxfont.c
index e5f86350a..b70f7d2df 100644
--- a/hw/dmx/dmxfont.c
+++ b/hw/dmx/dmxfont.c
@@ -361,7 +361,8 @@ Bool dmxBELoadFont(ScreenPtr pScreen, FontPtr pFont)
 		}
 	    }
 
-	    if (SetFontPath(NULL, newnpaths, (unsigned char *)newfp, &error)) {
+	    if (SetFontPath(serverClient, newnpaths, (unsigned char *)newfp,
+			    &error)) {
 		/* Note that this should never happen since all of the
 		 * FPEs were previously valid. */
 		dmxLog(dmxError, "Cannot reset the default font path.\n");

From 473bc6ec4c59e1a962b0b897c449a69aa5064ab0 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 10 Oct 2007 19:43:12 -0400
Subject: [PATCH 124/552] xace: remove the special-cased "ignore" functionality
 from the property code.

There will be no more faking of Success to hide things.  XACE does not
provide polyinstantiation.
---
 Xext/xace.h    |  5 -----
 dix/property.c | 11 +++++------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/Xext/xace.h b/Xext/xace.h
index e9fe9f31b..fc96458a9 100644
--- a/Xext/xace.h
+++ b/Xext/xace.h
@@ -20,11 +20,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef _XACE_H
 #define _XACE_H
 
-/* Special value used for ignore operation.  This is a deprecated feature
- * only for Security extension support.  Do not use in new code.
- */
-#define XaceIgnoreError BadRequest
-
 #ifdef XACE
 
 #define XACE_EXTENSION_NAME		"XAccessControlExtension"
diff --git a/dix/property.c b/dix/property.c
index 5f12dec3c..cff51d894 100644
--- a/dix/property.c
+++ b/dix/property.c
@@ -161,7 +161,7 @@ ProcRotateProperties(ClientPtr client)
 	if (rc != Success) {
             DEALLOCATE_LOCAL(props);
 	    client->errorValue = atoms[i];
-            return (rc == XaceIgnoreError) ? Success : rc;
+            return rc;
 	}
         props[i] = pProp;
     }
@@ -282,7 +282,7 @@ dixChangeWindowProperty(ClientPtr pClient, WindowPtr pWin, Atom property,
 	    xfree(data);
 	    xfree(pProp);
 	    pClient->errorValue = property;
-	    return (rc == XaceIgnoreError) ? Success : rc;
+	    return rc;
 	}
         pProp->next = pWin->optional->userProps;
         pWin->optional->userProps = pProp;
@@ -293,7 +293,7 @@ dixChangeWindowProperty(ClientPtr pClient, WindowPtr pWin, Atom property,
 		      DixWriteAccess);
 	if (rc != Success) {
 	    pClient->errorValue = property;
-	    return (rc == XaceIgnoreError) ? Success : rc;
+	    return rc;
 	}
 	/* To append or prepend to a property the request format and type
 		must match those of the already defined property.  The
@@ -499,8 +499,7 @@ ProcGetProperty(ClientPtr client)
     rc = XaceHook(XACE_PROPERTY_ACCESS, client, pWin, pProp, access_mode);
     if (rc != Success) {
 	client->errorValue = stuff->property;
-	return (rc == XaceIgnoreError) ? 
-	    NullPropertyReply(client, pProp->type, pProp->format, &reply) : rc;
+	return rc;
     }
 
     /* If the request type and actual type don't match. Return the
@@ -641,7 +640,7 @@ ProcDeleteProperty(ClientPtr client)
 		      FindProperty(pWin, stuff->property), DixDestroyAccess);
     if (result != Success) {
 	client->errorValue = stuff->property;
-	return (result == XaceIgnoreError) ? Success : result;
+	return result;
     }
 
     result = DeleteProperty(pWin, stuff->property);

From 8f23d40068151ad85cde239d07031284f0b2c4dc Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 10 Oct 2007 19:56:03 -0400
Subject: [PATCH 125/552] xace: move the property deletion hook inside the
 DeleteProperty function.

---
 dix/property.c                  | 17 ++++++++---------
 hw/darwin/quartz/xpr/xprFrame.c |  2 +-
 hw/xwin/winwin32rootless.c      |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/dix/property.c b/dix/property.c
index cff51d894..713507a09 100644
--- a/dix/property.c
+++ b/dix/property.c
@@ -365,9 +365,10 @@ ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format,
 }
 
 int
-DeleteProperty(WindowPtr pWin, Atom propName)
+DeleteProperty(ClientPtr client, WindowPtr pWin, Atom propName)
 {
     PropertyPtr pProp, prevProp;
+    int rc;
 
     if (!(pProp = wUserProps (pWin)))
 	return(Success);
@@ -381,6 +382,11 @@ DeleteProperty(WindowPtr pWin, Atom propName)
     }
     if (pProp) 
     {		    
+	rc = XaceHook(XACE_PROPERTY_ACCESS, client, pWin, pProp,
+		      DixDestroyAccess);
+	if (rc != Success)
+	    return rc;
+
         if (prevProp == (PropertyPtr)NULL)      /* takes care of head */
         {
             if (!(pWin->optional->userProps = pProp->next))
@@ -636,14 +642,7 @@ ProcDeleteProperty(ClientPtr client)
 	return (BadAtom);
     }
 
-    result = XaceHook(XACE_PROPERTY_ACCESS, client, pWin,
-		      FindProperty(pWin, stuff->property), DixDestroyAccess);
-    if (result != Success) {
-	client->errorValue = stuff->property;
-	return result;
-    }
-
-    result = DeleteProperty(pWin, stuff->property);
+    result = DeleteProperty(client, pWin, stuff->property);
     if (client->noClientException != Success)
 	return(client->noClientException);
     else
diff --git a/hw/darwin/quartz/xpr/xprFrame.c b/hw/darwin/quartz/xpr/xprFrame.c
index 76c719ec0..c5b84f08b 100644
--- a/hw/darwin/quartz/xpr/xprFrame.c
+++ b/hw/darwin/quartz/xpr/xprFrame.c
@@ -337,7 +337,7 @@ xprDamageRects(RootlessFrameID wid, int nrects, const BoxRec *rects,
 void
 xprSwitchWindow(RootlessWindowPtr pFrame, WindowPtr oldWin)
 {
-    DeleteProperty(oldWin, xa_native_window_id());
+    DeleteProperty(serverClient, oldWin, xa_native_window_id());
 
     xprSetNativeProperty(pFrame);
 }
diff --git a/hw/xwin/winwin32rootless.c b/hw/xwin/winwin32rootless.c
index 832e36d44..4b4cd3ded 100755
--- a/hw/xwin/winwin32rootless.c
+++ b/hw/xwin/winwin32rootless.c
@@ -971,7 +971,7 @@ winMWExtWMRootlessSwitchWindow (RootlessWindowPtr pFrame, WindowPtr oldWin)
   SetWindowLongPtr (pRLWinPriv->hWnd, GWL_STYLE,
 		    WS_POPUP | WS_CLIPCHILDREN);
 
-  DeleteProperty (oldWin, AtmWindowsWmNativeHwnd ());
+  DeleteProperty (serverClient, oldWin, AtmWindowsWmNativeHwnd ());
   winMWExtWMSetNativeProperty (pFrame);
 #if CYGMULTIWINDOW_DEBUG
 #if 0

From 6adeba17301a309be2f34cd51eca84a13d5503fd Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 11 Oct 2007 14:17:17 -0400
Subject: [PATCH 126/552] dix: Add a new "registry" mechanism for registering
 string names of things. Supports protocol requests, events, and errors, and
 resource names. Modify XRES extension to use it.

---
 Xext/xres.c                |  21 +--
 configure.ac               |   5 +
 dix/Makefile.am            |   1 +
 dix/main.c                 |   2 +
 dix/registry.c             | 375 +++++++++++++++++++++++++++++++++++++
 dix/resource.c             |  33 +---
 hw/xfree86/loader/dixsym.c |   8 +-
 include/Makefile.am        |   1 +
 include/dix-config.h.in    |   3 +
 include/registry.h         |  65 +++++++
 include/resource.h         |   5 -
 randr/rrcrtc.c             |   4 +-
 randr/rrmode.c             |   2 -
 randr/rroutput.c           |   4 +-
 render/picture.c           |   2 -
 15 files changed, 469 insertions(+), 62 deletions(-)
 create mode 100644 dix/registry.c
 create mode 100644 include/registry.h

diff --git a/Xext/xres.c b/Xext/xres.c
index 1617337bf..3660260c2 100644
--- a/Xext/xres.c
+++ b/Xext/xres.c
@@ -22,6 +22,7 @@
 #include "windowstr.h"
 #include "gcstruct.h"
 #include "modinit.h"
+#include "registry.h"
 
 static int
 ProcXResQueryVersion (ClientPtr client)
@@ -161,17 +162,20 @@ ProcXResQueryClientResources (ClientPtr client)
 
     if(num_types) {
         xXResType scratch;
+	char *name;
 
         for(i = 0; i < lastResourceType; i++) {
             if(!counts[i]) continue;
 
-            if(!ResourceNames[i + 1]) {
+	    name = (char *)LookupResourceName(i + 1);
+            if (strcmp(name, XREGISTRY_UNKNOWN))
+		scratch.resource_type = MakeAtom(name, strlen(name), TRUE);
+	    else {
                 char buf[40];
                 snprintf(buf, sizeof(buf), "Unregistered resource %i", i + 1);
-                RegisterResourceName(i + 1, buf);
+		scratch.resource_type = MakeAtom(buf, strlen(buf), TRUE);
             }
 
-            scratch.resource_type = ResourceNames[i + 1];
             scratch.count = counts[i];
 
             if(client->swapped) {
@@ -387,15 +391,4 @@ ResExtensionInit(INITARGS)
     (void) AddExtension(XRES_NAME, 0, 0,
                             ProcResDispatch, SProcResDispatch,
                             ResResetProc, StandardMinorOpcode);
-
-    RegisterResourceName(RT_NONE, "NONE");
-    RegisterResourceName(RT_WINDOW, "WINDOW");
-    RegisterResourceName(RT_PIXMAP, "PIXMAP");
-    RegisterResourceName(RT_GC, "GC");
-    RegisterResourceName(RT_FONT, "FONT");
-    RegisterResourceName(RT_CURSOR, "CURSOR");
-    RegisterResourceName(RT_COLORMAP, "COLORMAP");
-    RegisterResourceName(RT_CMAPENTRY, "COLORMAP ENTRY");
-    RegisterResourceName(RT_OTHERCLIENT, "OTHER CLIENT");
-    RegisterResourceName(RT_PASSIVEGRAB, "PASSIVE GRAB");
 }
diff --git a/configure.ac b/configure.ac
index ca8fcc227..e73e250bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -493,6 +493,7 @@ AC_ARG_ENABLE(glx-tls,        AS_HELP_STRING([--enable-glx-tls], [Build GLX with
                                 [GLX_USE_TLS=no])
 
 dnl Extensions.
+AC_ARG_ENABLE(registry,       AS_HELP_STRING([--disable-registry], [Build string registry module (default: enabled)]), [XREGISTRY=$enableval], [XREGISTRY=yes])
 AC_ARG_ENABLE(composite,      AS_HELP_STRING([--disable-composite], [Build Composite extension (default: enabled)]), [COMPOSITE=$enableval], [COMPOSITE=yes])
 AC_ARG_ENABLE(mitshm,         AS_HELP_STRING([--disable-shm], [Build SHM extension (default: enabled)]), [MITSHM=$enableval], [MITSHM=yes])
 AC_ARG_ENABLE(xres,           AS_HELP_STRING([--disable-xres], [Build XRes extension (default: enabled)]), [RES=$enableval], [RES=yes])
@@ -733,6 +734,10 @@ if test "x$XVMC" = xyes; then
 	AC_DEFINE(XvMCExtension, 1, [Build XvMC extension])
 fi
 
+AM_CONDITIONAL(XREGISTRY, [test "x$XREGISTRY" = xyes])
+if test "x$XREGISTRY" = xyes; then
+	AC_DEFINE(XREGISTRY, 1, [Build registry module])
+fi
 
 AM_CONDITIONAL(COMPOSITE, [test "x$COMPOSITE" = xyes])
 if test "x$COMPOSITE" = xyes; then
diff --git a/dix/Makefile.am b/dix/Makefile.am
index 827243a71..65c387c31 100644
--- a/dix/Makefile.am
+++ b/dix/Makefile.am
@@ -27,6 +27,7 @@ libdix_la_SOURCES = 	\
 	pixmap.c	\
 	privates.c	\
 	property.c	\
+	registry.c	\
 	resource.c	\
 	swaprep.c	\
 	swapreq.c	\
diff --git a/dix/main.c b/dix/main.c
index 119828bd7..ca0028a39 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -102,6 +102,7 @@ Equipment Corporation.
 #include "dixfont.h"
 #include "extnsionst.h"
 #include "privates.h"
+#include "registry.h"
 #ifdef XPRINT
 #include "DiPrint.h"
 #endif
@@ -354,6 +355,7 @@ main(int argc, char *argv[], char *envp[])
 	InitGlyphCaching();
 	if (!dixResetPrivates())
 	    FatalError("couldn't init private data storage");
+	dixResetRegistry();
 	ResetFontPrivateIndex();
 	InitCallbackManager();
 	InitVisualWrap();
diff --git a/dix/registry.c b/dix/registry.c
new file mode 100644
index 000000000..7b521b55d
--- /dev/null
+++ b/dix/registry.c
@@ -0,0 +1,375 @@
+/************************************************************
+
+Author: Eamon Walsh <ewalsh@epoch.ncsc.mil>
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+this permission notice appear in supporting documentation.  This permission
+notice shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+********************************************************/
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#ifdef XREGISTRY
+
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include "resource.h"
+#include "registry.h"
+
+#define BASE_SIZE 16
+
+static const char ***requests, **events, **errors, **resources;
+static unsigned nmajor, *nminor, nevent, nerror, nresource;
+
+static int double_size(void *p, unsigned n, unsigned size)
+{
+    char **ptr = (char **)p;
+    unsigned s, f;
+
+    if (n) {
+	s = n * size;
+	n *= 2 * size;
+	f = n;
+    } else {
+	s = 0;
+	n = f = BASE_SIZE * size;
+    }
+
+    *ptr = xrealloc(*ptr, n);
+    if (!*ptr) {
+	dixResetRegistry();
+	return FALSE;
+    }
+    memset(*ptr + s, 0, f - s);
+    return TRUE;
+}       
+
+/*
+ * Registration functions
+ */
+
+void
+RegisterRequestName(unsigned major, unsigned minor, const char *name)
+{
+    while (major >= nmajor) {
+	if (!double_size(&requests, nmajor, sizeof(const 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 *)))
+	    return;
+	nminor[major] = nminor[major] ? nminor[major] * 2 : BASE_SIZE;
+    }
+
+    requests[major][minor] = name;
+}
+
+void
+RegisterEventName(unsigned event, const char *name) {
+    while (event >= nevent) {
+	if (!double_size(&events, nevent, sizeof(const char *)))
+	    return;
+	nevent = nevent ? nevent * 2 : BASE_SIZE;
+    }
+
+    events[event] = name;
+}
+
+void
+RegisterErrorName(unsigned error, const char *name) {
+    while (error >= nerror) {
+	if (!double_size(&errors, nerror, sizeof(const char *)))
+	    return;
+	nerror = nerror ? nerror * 2 : BASE_SIZE;
+    }
+
+    errors[error] = name;
+}
+
+void
+RegisterResourceName(RESTYPE resource, const char *name)
+{
+    resource &= TypeMask;
+
+    while (resource >= nresource) {
+	if (!double_size(&resources, nresource, sizeof(const char *)))
+	    return;
+	nresource = nresource ? nresource * 2 : BASE_SIZE;
+    }
+
+    resources[resource] = name;
+}
+
+/*
+ * Lookup functions
+ */
+
+const char *
+LookupRequestName(int major, int minor)
+{
+    if (major >= nmajor)
+	return XREGISTRY_UNKNOWN;
+    if (minor >= nminor[major])
+	return XREGISTRY_UNKNOWN;
+
+    return requests[major][minor] ? requests[major][minor] : XREGISTRY_UNKNOWN;
+}
+
+const char *
+LookupEventName(int event)
+{
+    if (event >= nevent)
+	return XREGISTRY_UNKNOWN;
+
+    return events[event] ? events[event] : XREGISTRY_UNKNOWN;
+}
+
+const char *
+LookupErrorName(int error)
+{
+    if (error >= nerror)
+	return XREGISTRY_UNKNOWN;
+
+    return errors[error] ? errors[error] : XREGISTRY_UNKNOWN;
+}
+
+const char *
+LookupResourceName(RESTYPE resource)
+{
+    resource &= TypeMask;
+
+    if (resource >= nresource)
+	return XREGISTRY_UNKNOWN;
+
+    return resources[resource] ? resources[resource] : XREGISTRY_UNKNOWN;
+}
+
+/*
+ * Setup and teardown
+ */
+void
+dixResetRegistry(void)
+{
+    /* Free all memory */
+    while (nmajor)
+	xfree(requests[--nmajor]);
+    xfree(requests);
+    xfree(nminor);
+    xfree(events);
+    xfree(errors);
+    xfree(resources);
+
+    requests = NULL;
+    nminor = NULL;
+    events = NULL;
+    errors = NULL;
+    resources = NULL;
+
+    nmajor = nevent = nerror = nresource = 0;
+
+    /* Add built-in resources */
+    RegisterResourceName(RT_NONE, "NONE");
+    RegisterResourceName(RT_WINDOW, "WINDOW");
+    RegisterResourceName(RT_PIXMAP, "PIXMAP");
+    RegisterResourceName(RT_GC, "GC");
+    RegisterResourceName(RT_FONT, "FONT");
+    RegisterResourceName(RT_CURSOR, "CURSOR");
+    RegisterResourceName(RT_COLORMAP, "COLORMAP");
+    RegisterResourceName(RT_CMAPENTRY, "COLORMAP ENTRY");
+    RegisterResourceName(RT_OTHERCLIENT, "OTHER CLIENT");
+    RegisterResourceName(RT_PASSIVEGRAB, "PASSIVE GRAB");
+
+    /* Add the core protocol */
+    RegisterRequestName(X_CreateWindow, 0, "CreateWindow");
+    RegisterRequestName(X_ChangeWindowAttributes, 0, "ChangeWindowAttributes");
+    RegisterRequestName(X_GetWindowAttributes, 0, "GetWindowAttributes");
+    RegisterRequestName(X_DestroyWindow, 0, "DestroyWindow");
+    RegisterRequestName(X_DestroySubwindows, 0, "DestroySubwindows");
+    RegisterRequestName(X_ChangeSaveSet, 0, "ChangeSaveSet");
+    RegisterRequestName(X_ReparentWindow, 0, "ReparentWindow");
+    RegisterRequestName(X_MapWindow, 0, "MapWindow");
+    RegisterRequestName(X_MapSubwindows, 0, "MapSubwindows");
+    RegisterRequestName(X_UnmapWindow, 0, "UnmapWindow");
+    RegisterRequestName(X_UnmapSubwindows, 0, "UnmapSubwindows");
+    RegisterRequestName(X_ConfigureWindow, 0, "ConfigureWindow");
+    RegisterRequestName(X_CirculateWindow, 0, "CirculateWindow");
+    RegisterRequestName(X_GetGeometry, 0, "GetGeometry");
+    RegisterRequestName(X_QueryTree, 0, "QueryTree");
+    RegisterRequestName(X_InternAtom, 0, "InternAtom");
+    RegisterRequestName(X_GetAtomName, 0, "GetAtomName");
+    RegisterRequestName(X_ChangeProperty, 0, "ChangeProperty");
+    RegisterRequestName(X_DeleteProperty, 0, "DeleteProperty");
+    RegisterRequestName(X_GetProperty, 0, "GetProperty");
+    RegisterRequestName(X_ListProperties, 0, "ListProperties");
+    RegisterRequestName(X_SetSelectionOwner, 0, "SetSelectionOwner");
+    RegisterRequestName(X_GetSelectionOwner, 0, "GetSelectionOwner");
+    RegisterRequestName(X_ConvertSelection, 0, "ConvertSelection");
+    RegisterRequestName(X_SendEvent, 0, "SendEvent");
+    RegisterRequestName(X_GrabPointer, 0, "GrabPointer");
+    RegisterRequestName(X_UngrabPointer, 0, "UngrabPointer");
+    RegisterRequestName(X_GrabButton, 0, "GrabButton");
+    RegisterRequestName(X_UngrabButton, 0, "UngrabButton");
+    RegisterRequestName(X_ChangeActivePointerGrab, 0, "ChangeActivePointerGrab");
+    RegisterRequestName(X_GrabKeyboard, 0, "GrabKeyboard");
+    RegisterRequestName(X_UngrabKeyboard, 0, "UngrabKeyboard");
+    RegisterRequestName(X_GrabKey, 0, "GrabKey");
+    RegisterRequestName(X_UngrabKey, 0, "UngrabKey");
+    RegisterRequestName(X_AllowEvents, 0, "AllowEvents");
+    RegisterRequestName(X_GrabServer, 0, "GrabServer");
+    RegisterRequestName(X_UngrabServer, 0, "UngrabServer");
+    RegisterRequestName(X_QueryPointer, 0, "QueryPointer");
+    RegisterRequestName(X_GetMotionEvents, 0, "GetMotionEvents");
+    RegisterRequestName(X_TranslateCoords, 0, "TranslateCoords");
+    RegisterRequestName(X_WarpPointer, 0, "WarpPointer");
+    RegisterRequestName(X_SetInputFocus, 0, "SetInputFocus");
+    RegisterRequestName(X_GetInputFocus, 0, "GetInputFocus");
+    RegisterRequestName(X_QueryKeymap, 0, "QueryKeymap");
+    RegisterRequestName(X_OpenFont, 0, "OpenFont");
+    RegisterRequestName(X_CloseFont, 0, "CloseFont");
+    RegisterRequestName(X_QueryFont, 0, "QueryFont");
+    RegisterRequestName(X_QueryTextExtents, 0, "QueryTextExtents");
+    RegisterRequestName(X_ListFonts, 0, "ListFonts");
+    RegisterRequestName(X_ListFontsWithInfo, 0, "ListFontsWithInfo");
+    RegisterRequestName(X_SetFontPath, 0, "SetFontPath");
+    RegisterRequestName(X_GetFontPath, 0, "GetFontPath");
+    RegisterRequestName(X_CreatePixmap, 0, "CreatePixmap");
+    RegisterRequestName(X_FreePixmap, 0, "FreePixmap");
+    RegisterRequestName(X_CreateGC, 0, "CreateGC");
+    RegisterRequestName(X_ChangeGC, 0, "ChangeGC");
+    RegisterRequestName(X_CopyGC, 0, "CopyGC");
+    RegisterRequestName(X_SetDashes, 0, "SetDashes");
+    RegisterRequestName(X_SetClipRectangles, 0, "SetClipRectangles");
+    RegisterRequestName(X_FreeGC, 0, "FreeGC");
+    RegisterRequestName(X_ClearArea, 0, "ClearArea");
+    RegisterRequestName(X_CopyArea, 0, "CopyArea");
+    RegisterRequestName(X_CopyPlane, 0, "CopyPlane");
+    RegisterRequestName(X_PolyPoint, 0, "PolyPoint");
+    RegisterRequestName(X_PolyLine, 0, "PolyLine");
+    RegisterRequestName(X_PolySegment, 0, "PolySegment");
+    RegisterRequestName(X_PolyRectangle, 0, "PolyRectangle");
+    RegisterRequestName(X_PolyArc, 0, "PolyArc");
+    RegisterRequestName(X_FillPoly, 0, "FillPoly");
+    RegisterRequestName(X_PolyFillRectangle, 0, "PolyFillRectangle");
+    RegisterRequestName(X_PolyFillArc, 0, "PolyFillArc");
+    RegisterRequestName(X_PutImage, 0, "PutImage");
+    RegisterRequestName(X_GetImage, 0, "GetImage");
+    RegisterRequestName(X_PolyText8, 0, "PolyText8");
+    RegisterRequestName(X_PolyText16, 0, "PolyText16");
+    RegisterRequestName(X_ImageText8, 0, "ImageText8");
+    RegisterRequestName(X_ImageText16, 0, "ImageText16");
+    RegisterRequestName(X_CreateColormap, 0, "CreateColormap");
+    RegisterRequestName(X_FreeColormap, 0, "FreeColormap");
+    RegisterRequestName(X_CopyColormapAndFree, 0, "CopyColormapAndFree");
+    RegisterRequestName(X_InstallColormap, 0, "InstallColormap");
+    RegisterRequestName(X_UninstallColormap, 0, "UninstallColormap");
+    RegisterRequestName(X_ListInstalledColormaps, 0, "ListInstalledColormaps");
+    RegisterRequestName(X_AllocColor, 0, "AllocColor");
+    RegisterRequestName(X_AllocNamedColor, 0, "AllocNamedColor");
+    RegisterRequestName(X_AllocColorCells, 0, "AllocColorCells");
+    RegisterRequestName(X_AllocColorPlanes, 0, "AllocColorPlanes");
+    RegisterRequestName(X_FreeColors, 0, "FreeColors");
+    RegisterRequestName(X_StoreColors, 0, "StoreColors");
+    RegisterRequestName(X_StoreNamedColor, 0, "StoreNamedColor");
+    RegisterRequestName(X_QueryColors, 0, "QueryColors");
+    RegisterRequestName(X_LookupColor, 0, "LookupColor");
+    RegisterRequestName(X_CreateCursor, 0, "CreateCursor");
+    RegisterRequestName(X_CreateGlyphCursor, 0, "CreateGlyphCursor");
+    RegisterRequestName(X_FreeCursor, 0, "FreeCursor");
+    RegisterRequestName(X_RecolorCursor, 0, "RecolorCursor");
+    RegisterRequestName(X_QueryBestSize, 0, "QueryBestSize");
+    RegisterRequestName(X_QueryExtension, 0, "QueryExtension");
+    RegisterRequestName(X_ListExtensions, 0, "ListExtensions");
+    RegisterRequestName(X_ChangeKeyboardMapping, 0, "ChangeKeyboardMapping");
+    RegisterRequestName(X_GetKeyboardMapping, 0, "GetKeyboardMapping");
+    RegisterRequestName(X_ChangeKeyboardControl, 0, "ChangeKeyboardControl");
+    RegisterRequestName(X_GetKeyboardControl, 0, "GetKeyboardControl");
+    RegisterRequestName(X_Bell, 0, "Bell");
+    RegisterRequestName(X_ChangePointerControl, 0, "ChangePointerControl");
+    RegisterRequestName(X_GetPointerControl, 0, "GetPointerControl");
+    RegisterRequestName(X_SetScreenSaver, 0, "SetScreenSaver");
+    RegisterRequestName(X_GetScreenSaver, 0, "GetScreenSaver");
+    RegisterRequestName(X_ChangeHosts, 0, "ChangeHosts");
+    RegisterRequestName(X_ListHosts, 0, "ListHosts");
+    RegisterRequestName(X_SetAccessControl, 0, "SetAccessControl");
+    RegisterRequestName(X_SetCloseDownMode, 0, "SetCloseDownMode");
+    RegisterRequestName(X_KillClient, 0, "KillClient");
+    RegisterRequestName(X_RotateProperties, 0, "RotateProperties");
+    RegisterRequestName(X_ForceScreenSaver, 0, "ForceScreenSaver");
+    RegisterRequestName(X_SetPointerMapping, 0, "SetPointerMapping");
+    RegisterRequestName(X_GetPointerMapping, 0, "GetPointerMapping");
+    RegisterRequestName(X_SetModifierMapping, 0, "SetModifierMapping");
+    RegisterRequestName(X_GetModifierMapping, 0, "GetModifierMapping");
+    RegisterRequestName(X_NoOperation, 0, "NoOperation");
+
+    RegisterErrorName(Success, "Success");
+    RegisterErrorName(BadRequest, "BadRequest");
+    RegisterErrorName(BadValue, "BadValue");
+    RegisterErrorName(BadWindow, "BadWindow");
+    RegisterErrorName(BadPixmap, "BadPixmap");
+    RegisterErrorName(BadAtom, "BadAtom");
+    RegisterErrorName(BadCursor, "BadCursor");
+    RegisterErrorName(BadFont, "BadFont");
+    RegisterErrorName(BadMatch, "BadMatch");
+    RegisterErrorName(BadDrawable, "BadDrawable");
+    RegisterErrorName(BadAccess, "BadAccess");
+    RegisterErrorName(BadAlloc, "BadAlloc");
+    RegisterErrorName(BadColor, "BadColor");
+    RegisterErrorName(BadGC, "BadGC");
+    RegisterErrorName(BadIDChoice, "BadIDChoice");
+    RegisterErrorName(BadName, "BadName");
+    RegisterErrorName(BadLength, "BadLength");
+    RegisterErrorName(BadImplementation, "BadImplementation");
+
+    RegisterEventName(X_Error, "Error");
+    RegisterEventName(X_Reply, "Reply");
+    RegisterEventName(KeyPress, "KeyPress");
+    RegisterEventName(KeyRelease, "KeyRelease");
+    RegisterEventName(ButtonPress, "ButtonPress");
+    RegisterEventName(ButtonRelease, "ButtonRelease");
+    RegisterEventName(MotionNotify, "MotionNotify");
+    RegisterEventName(EnterNotify, "EnterNotify");
+    RegisterEventName(LeaveNotify, "LeaveNotify");
+    RegisterEventName(FocusIn, "FocusIn");
+    RegisterEventName(FocusOut, "FocusOut");
+    RegisterEventName(KeymapNotify, "KeymapNotify");
+    RegisterEventName(Expose, "Expose");
+    RegisterEventName(GraphicsExpose, "GraphicsExpose");
+    RegisterEventName(NoExpose, "NoExpose");
+    RegisterEventName(VisibilityNotify, "VisibilityNotify");
+    RegisterEventName(CreateNotify, "CreateNotify");
+    RegisterEventName(DestroyNotify, "DestroyNotify");
+    RegisterEventName(UnmapNotify, "UnmapNotify");
+    RegisterEventName(MapNotify, "MapNotify");
+    RegisterEventName(MapRequest, "MapRequest");
+    RegisterEventName(ReparentNotify, "ReparentNotify");
+    RegisterEventName(ConfigureNotify, "ConfigureNotify");
+    RegisterEventName(ConfigureRequest, "ConfigureRequest");
+    RegisterEventName(GravityNotify, "GravityNotify");
+    RegisterEventName(ResizeRequest, "ResizeRequest");
+    RegisterEventName(CirculateNotify, "CirculateNotify");
+    RegisterEventName(CirculateRequest, "CirculateRequest");
+    RegisterEventName(PropertyNotify, "PropertyNotify");
+    RegisterEventName(SelectionClear, "SelectionClear");
+    RegisterEventName(SelectionRequest, "SelectionRequest");
+    RegisterEventName(SelectionNotify, "SelectionNotify");
+    RegisterEventName(ColormapNotify, "ColormapNotify");
+    RegisterEventName(ClientMessage, "ClientMessage");
+    RegisterEventName(MappingNotify, "MappingNotify");
+}
+
+#endif /* XREGISTRY */
diff --git a/dix/resource.c b/dix/resource.c
index c892cf96b..857776dc5 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -151,10 +151,11 @@ Equipment Corporation.
 
 #ifdef XSERVER_DTRACE
 #include <sys/types.h>
+#include "registry.h"
 typedef const char *string;
 #include "Xserver-dtrace.h"
 
-#define TypeNameString(t) NameForAtom(ResourceNames[t & TypeMask])
+#define TypeNameString(t) LookupResourceName(t)
 #endif
 
 static void RebuildTable(
@@ -202,17 +203,6 @@ CallResourceStateCallback(ResourceState state, ResourceRec *res)
     }
 }
 
-#ifdef XResExtension
-
-_X_EXPORT Atom * ResourceNames = NULL;
-
-_X_EXPORT void RegisterResourceName (RESTYPE type, char *name)
-{
-    ResourceNames[type & TypeMask] =  MakeAtom(name, strlen(name), TRUE);
-}
-
-#endif
-
 _X_EXPORT RESTYPE
 CreateNewResourceType(DeleteType deleteFunc)
 {
@@ -228,17 +218,6 @@ CreateNewResourceType(DeleteType deleteFunc)
     if (!dixRegisterPrivateOffset(next, -1))
 	return 0;
 
-#ifdef XResExtension
-    {
-       Atom *newnames;
-       newnames = xrealloc(ResourceNames, (next + 1) * sizeof(Atom));
-       if(!newnames)
-           return 0;
-       ResourceNames = newnames;
-       ResourceNames[next] = 0;
-    }
-#endif
-
     lastResourceType = next;
     DeleteFuncs = funcs;
     DeleteFuncs[next] = deleteFunc;
@@ -291,14 +270,6 @@ InitClientResources(ClientPtr client)
 	DeleteFuncs[RT_CMAPENTRY & TypeMask] = FreeClientPixels;
 	DeleteFuncs[RT_OTHERCLIENT & TypeMask] = OtherClientGone;
 	DeleteFuncs[RT_PASSIVEGRAB & TypeMask] = DeletePassiveGrab;
-
-#ifdef XResExtension
-        if(ResourceNames)
-            xfree(ResourceNames);
-        ResourceNames = xalloc((lastResourceType + 1) * sizeof(Atom));
-        if(!ResourceNames)
-           return FALSE;
-#endif
     }
     clientTable[i = client->index].resources =
 	(ResourcePtr *)xalloc(INITBUCKETS*sizeof(ResourcePtr));
diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c
index 0eaa2d3a6..139e23c6e 100644
--- a/hw/xfree86/loader/dixsym.c
+++ b/hw/xfree86/loader/dixsym.c
@@ -65,6 +65,7 @@
 #include "osdep.h"
 #include "privates.h"
 #include "resource.h"
+#include "registry.h"
 #include "servermd.h"
 #include "scrnintstr.h"
 #include "windowstr.h"
@@ -285,9 +286,12 @@ _X_HIDDEN void *dixLookupTab[] = {
     SYMVAR(lastResourceType)
     SYMVAR(TypeMask)
     SYMVAR(ResourceStateCallback)
-#ifdef RES
+    /* registry.c */
+#ifdef XREGISTRY
+    SYMFUNC(RegisterRequestName)
+    SYMFUNC(RegisterEventName)
+    SYMFUNC(RegisterErrorName)
     SYMFUNC(RegisterResourceName)
-    SYMVAR(ResourceNames)
 #endif
     /* swaprep.c */
     SYMFUNC(CopySwap32Write)
diff --git a/include/Makefile.am b/include/Makefile.am
index ef39836be..0654b5788 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -37,6 +37,7 @@ sdk_HEADERS =		\
 	propertyst.h	\
 	region.h	\
 	regionstr.h	\
+	registry.h	\
 	resource.h	\
 	rgb.h		\
 	screenint.h	\
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index 8d4d7318e..a091527f1 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -329,6 +329,9 @@
 /* unaligned word accesses behave as expected */
 #undef WORKING_UNALIGNED_INT
 
+/* Build X string registry */
+#undef XREGISTRY
+
 /* Build X-ACE extension */
 #undef XACE
 
diff --git a/include/registry.h b/include/registry.h
new file mode 100644
index 000000000..d57f32d2d
--- /dev/null
+++ b/include/registry.h
@@ -0,0 +1,65 @@
+/***********************************************************
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+******************************************************************/
+
+#ifndef DIX_REGISTRY_H
+#define DIX_REGISTRY_H
+
+#ifdef XREGISTRY
+
+#include "resource.h"
+
+/* Internal string registry - for auditing, debugging, security, etc. */
+
+/*
+ * 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);
+
+/*
+ * Lookup functions.  The returned string must not be modified.
+ */
+const char *LookupRequestName(int major, int minor);
+const char *LookupEventName(int event);
+const char *LookupErrorName(int error);
+const char *LookupResourceName(RESTYPE rtype);
+
+/*
+ * Result returned from any unsuccessful lookup
+ */
+#define XREGISTRY_UNKNOWN "<unknown>"
+
+/*
+ * Setup and teardown
+ */
+void dixResetRegistry(void);
+
+#else /* XREGISTRY */
+
+/* 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 LookupRequestName(a, b) XREGISTRY_UNKNOWN
+#define LookupEventName(a) XREGISTRY_UNKNOWN
+#define LookupErrorName(a) XREGISTRY_UNKNOWN
+#define LookupResourceName(a) XREGISTRY_UNKNOWN
+
+#define dixResetRegistry() { ; }
+
+#endif /* XREGISTRY */
+#endif /* DIX_REGISTRY_H */
diff --git a/include/resource.h b/include/resource.h
index 087d62c09..4a3380488 100644
--- a/include/resource.h
+++ b/include/resource.h
@@ -239,11 +239,6 @@ extern unsigned int GetXIDList(
 extern RESTYPE lastResourceType;
 extern RESTYPE TypeMask;
 
-#ifdef XResExtension
-extern Atom *ResourceNames;
-void RegisterResourceName(RESTYPE type, char* name);
-#endif
-
 /*
  * These are deprecated compatibility functions and will be removed soon!
  * Please use the noted replacements instead.
diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c
index db5007e28..6384857c3 100644
--- a/randr/rrcrtc.c
+++ b/randr/rrcrtc.c
@@ -500,9 +500,7 @@ RRCrtcInit (void)
     RRCrtcType = CreateNewResourceType (RRCrtcDestroyResource);
     if (!RRCrtcType)
 	return FALSE;
-#ifdef XResExtension
-	RegisterResourceName (RRCrtcType, "CRTC");
-#endif
+    RegisterResourceName (RRCrtcType, "CRTC");
     return TRUE;
 }
 
diff --git a/randr/rrmode.c b/randr/rrmode.c
index 11175810c..d7cc916ea 100644
--- a/randr/rrmode.c
+++ b/randr/rrmode.c
@@ -266,9 +266,7 @@ RRModeInit (void)
     RRModeType = CreateNewResourceType (RRModeDestroyResource);
     if (!RRModeType)
 	return FALSE;
-#ifdef XResExtension
     RegisterResourceName (RRModeType, "MODE");
-#endif
     return TRUE;
 }
 
diff --git a/randr/rroutput.c b/randr/rroutput.c
index c1e971ddc..fea87978f 100644
--- a/randr/rroutput.c
+++ b/randr/rroutput.c
@@ -420,9 +420,7 @@ RROutputInit (void)
     RROutputType = CreateNewResourceType (RROutputDestroyResource);
     if (!RROutputType)
 	return FALSE;
-#ifdef XResExtension
-	RegisterResourceName (RROutputType, "OUTPUT");
-#endif
+    RegisterResourceName (RROutputType, "OUTPUT");
     return TRUE;
 }
 
diff --git a/render/picture.c b/render/picture.c
index 184edb48b..dd4221f1a 100644
--- a/render/picture.c
+++ b/render/picture.c
@@ -584,11 +584,9 @@ PictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats)
 	if (!GlyphSetType)
 	    return FALSE;
 	PictureGeneration = serverGeneration;
-#ifdef XResExtension
 	RegisterResourceName (PictureType, "PICTURE");
 	RegisterResourceName (PictFormatType, "PICTFORMAT");
 	RegisterResourceName (GlyphSetType, "GLYPHSET");
-#endif
     }
     if (!formats)
     {

From 526f40434c86548830c4f72940462b6253fe9790 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 12 Oct 2007 18:18:00 -0400
Subject: [PATCH 127/552] NULL is not a valid argument to CreatePicture, please
 use serverClient as the client argument if no real client is creating the
 object.

---
 hw/xgl/xglscreen.c | 3 ++-
 render/mirect.c    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/hw/xgl/xglscreen.c b/hw/xgl/xglscreen.c
index 9b7297b91..6bd91b72a 100644
--- a/hw/xgl/xglscreen.c
+++ b/hw/xgl/xglscreen.c
@@ -463,7 +463,8 @@ xglCreateSolidAlphaPicture (ScreenPtr pScreen)
 
     tmpval[0] = xTrue;
     pScreenPriv->pSolidAlpha = CreatePicture (0, &pPixmap->drawable, pFormat,
-					      CPRepeat, tmpval, 0, &error);
+					      CPRepeat, tmpval,
+					      serverClient, &error);
     (*pScreen->DestroyPixmap) (pPixmap);
 
     if (pScreenPriv->pSolidAlpha)
diff --git a/render/mirect.c b/render/mirect.c
index 87767a76c..fa9dab80b 100644
--- a/render/mirect.c
+++ b/render/mirect.c
@@ -158,7 +158,7 @@ miCompositeRects (CARD8		op,
 	
 	tmpval[0] = xTrue;
 	pSrc = CreatePicture (0, &pPixmap->drawable, rgbaFormat,
-			      CPRepeat, tmpval, 0, &error);
+			      CPRepeat, tmpval, serverClient, &error);
 			      
 	if (!pSrc)
 	    goto bail4;

From 5277a6ff589b5ddb475b90e1aaf5dbd9172d9711 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 13:38:35 -0400
Subject: [PATCH 128/552] registry: Register Input extension protocol names.

---
 Xi/extinit.c | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 117 insertions(+)

diff --git a/Xi/extinit.c b/Xi/extinit.c
index 1a435edad..bf5ebd221 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -69,6 +69,7 @@ SOFTWARE.
 #include "extinit.h"
 #include "exglobals.h"
 #include "swaprep.h"
+#include "registry.h"
 
 /* modules local to Xi */
 #include "allowev.h"
@@ -936,6 +937,7 @@ XInputExtensionInit(void)
 	AllExtensionVersions[IReqCode - 128] = thisversion;
 	MakeDeviceTypeAtoms();
 	RT_INPUTCLIENT = CreateNewResourceType((DeleteType) InputClientGone);
+	RegisterResourceName(RT_INPUTCLIENT, "INPUTCLIENT");
 	FixExtensionEvents(extEntry);
 	ReplySwapVector[IReqCode] = (ReplySwapPtr) SReplyIDispatch;
 	EventSwapVector[DeviceValuator] = SEventIDispatch;
@@ -957,4 +959,119 @@ 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");
 }

From a5cf3f21f712e46dbf9bca289e67be75f2b531d3 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 14:27:32 -0400
Subject: [PATCH 129/552] registry: Register XKB extension protocol names.

---
 xkb/xkb.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 59 insertions(+), 4 deletions(-)

diff --git a/xkb/xkb.c b/xkb/xkb.c
index 9efdfb6b5..63576c220 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -35,6 +35,7 @@ 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"
@@ -6226,8 +6227,62 @@ XkbExtensionInit(void)
 	XkbErrorBase = (unsigned char)extEntry->errorBase;
 	XkbKeyboardErrorCode = XkbErrorBase+XkbKeyboard;
 	RT_XKBCLIENT = CreateNewResourceType(XkbClientGone);
-    }
-    return;
+    } 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");
 }
-
-

From 166ef972febc00c665e1d5aeb68e75d7bbcf9879 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 15:22:02 -0400
Subject: [PATCH 130/552] registry: Register composite extension protocol
 names.

---
 composite/compext.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/composite/compext.c b/composite/compext.c
index 2918556f8..98adabbaa 100644
--- a/composite/compext.c
+++ b/composite/compext.c
@@ -46,6 +46,7 @@
 
 #include "compint.h"
 #include "xace.h"
+#include "registry.h"
 
 #define SERVER_COMPOSITE_MAJOR	0
 #define SERVER_COMPOSITE_MINOR	4
@@ -754,4 +755,23 @@ 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");
 }

From 32f3f5a1e7654f8bb43ea16b9227b3994e616739 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 15:32:17 -0400
Subject: [PATCH 131/552] registry: Register DMX extension protocol names.

---
 hw/dmx/dmx.c | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/hw/dmx/dmx.c b/hw/dmx/dmx.c
index 24d1620b8..a4d6beb08 100644
--- a/hw/dmx/dmx.c
+++ b/hw/dmx/dmx.c
@@ -54,6 +54,7 @@
 #define EXTENSION_PROC_ARGS void *
 #include "extnsionst.h"
 #include "opaque.h"
+#include "registry.h"
 
 #include "dmxextension.h"
 #include <X11/extensions/dmxproto.h>
@@ -126,6 +127,45 @@ 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,

From 3464b419230c6d17e940d967b567c5d2cb22d232 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 15:45:12 -0400
Subject: [PATCH 132/552] registry: Register APPLEDRI extension protocol names.

---
 hw/darwin/quartz/xpr/appledri.c | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/hw/darwin/quartz/xpr/appledri.c b/hw/darwin/quartz/xpr/appledri.c
index 70b740077..d9690fdb1 100644
--- a/hw/darwin/quartz/xpr/appledri.c
+++ b/hw/darwin/quartz/xpr/appledri.c
@@ -53,6 +53,7 @@ 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;
 
@@ -92,7 +93,33 @@ 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*/

From b9f5ab98c8dea36dcce1ad15fd2e059a77e77c39 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 16:18:37 -0400
Subject: [PATCH 133/552] registry: Register XINERAMA extension protocol names.

---
 Xext/panoramiX.c               | 14 ++++++++++++++
 hw/darwin/quartz/pseudoramiX.c | 14 ++++++++++++++
 randr/rrxinerama.c             | 26 +++++++++++++++++++++-----
 3 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index 26c280990..1ba0c4dd2 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -53,6 +53,7 @@ Equipment Corporation.
 #include "globals.h"
 #include "servermd.h"
 #include "resource.h"
+#include "registry.h"
 #ifdef RENDER
 #include "picturestr.h"
 #endif
@@ -589,6 +590,19 @@ 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 787601b5d..cdd4fffff 100644
--- a/hw/darwin/quartz/pseudoramiX.c
+++ b/hw/darwin/quartz/pseudoramiX.c
@@ -42,6 +42,7 @@ Equipment Corporation.
 #include "window.h"
 #include <X11/extensions/panoramiXproto.h>
 #include "globals.h"
+#include "registry.h"
 
 extern int noPseudoramiXExtension;
 extern int noPanoramiXExtension;
@@ -147,6 +148,19 @@ 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 896f61fb5..c49980256 100644
--- a/randr/rrxinerama.c
+++ b/randr/rrxinerama.c
@@ -71,6 +71,7 @@
 #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
@@ -423,6 +424,8 @@ RRXineramaResetProc(ExtensionEntry* extEntry)
 void
 RRXineramaExtensionInit(void)
 {
+    ExtensionEntry *extEntry;
+
 #ifdef PANORAMIX
     if(!noPanoramiXExtension)
 	return;
@@ -436,9 +439,22 @@ RRXineramaExtensionInit(void)
     if (screenInfo.numScreens > 1)
 	return;
 
-    (void) AddExtension(PANORAMIX_PROTOCOL_NAME, 0,0,
-			ProcRRXineramaDispatch,
-			SProcRRXineramaDispatch,
-			RRXineramaResetProc,
-			StandardMinorOpcode);
+    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");
 }

From eee46b4681ec55297604b0425705f2b18381f7ca Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 17:06:22 -0400
Subject: [PATCH 134/552] registry: Register APPLEWM extension protocol names.

---
 hw/darwin/quartz/applewm.c | 41 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/hw/darwin/quartz/applewm.c b/hw/darwin/quartz/applewm.c
index d3c26ed28..8b9f1ee81 100644
--- a/hw/darwin/quartz/applewm.c
+++ b/hw/darwin/quartz/applewm.c
@@ -42,6 +42,7 @@ 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_
@@ -127,7 +128,45 @@ 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*/

From b7786724080fd3928ef7b8c294346661d7ffd90b Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 17:15:34 -0400
Subject: [PATCH 135/552] registry: Register XF86DRI extension protocol names.

---
 hw/xfree86/dri/xf86dri.c | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/hw/xfree86/dri/xf86dri.c b/hw/xfree86/dri/xf86dri.c
index fdf0e9983..c658421e8 100644
--- a/hw/xfree86/dri/xf86dri.c
+++ b/hw/xfree86/dri/xf86dri.c
@@ -53,6 +53,7 @@ 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"
@@ -112,7 +113,42 @@ 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*/

From 960677e876c068400fb45e1764bb5470cd8c389f Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 17:30:00 -0400
Subject: [PATCH 136/552] registry: Register XF86VidMode extension protocol
 names.

---
 hw/xfree86/dixmods/extmod/xf86vmode.c | 67 ++++++++++++++++++++++++++-
 1 file changed, 66 insertions(+), 1 deletion(-)

diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c
index fa3284839..2ad681c90 100644
--- a/hw/xfree86/dixmods/extmod/xf86vmode.c
+++ b/hw/xfree86/dixmods/extmod/xf86vmode.c
@@ -43,6 +43,7 @@ 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"
@@ -209,7 +210,71 @@ 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*/

From 2cd1b32b77e0ceeaccb3f01c4ac13a97c557668c Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 17:37:58 -0400
Subject: [PATCH 137/552] registry: Register XF86Misc extension protocol names.

---
 hw/xfree86/dixmods/extmod/xf86misc.c | 46 +++++++++++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/hw/xfree86/dixmods/extmod/xf86misc.c b/hw/xfree86/dixmods/extmod/xf86misc.c
index 66278a298..274b1d3f1 100644
--- a/hw/xfree86/dixmods/extmod/xf86misc.c
+++ b/hw/xfree86/dixmods/extmod/xf86misc.c
@@ -19,6 +19,7 @@
 #include "scrnintstr.h"
 #include "inputstr.h"
 #include "servermd.h"
+#include "registry.h"
 #define _XF86MISC_SERVER_
 #undef _XF86MISC_SAVER_COMPAT_
 #include <X11/extensions/xf86mscstr.h>
@@ -137,7 +138,50 @@ 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*/

From 3815284e899b61731b6a63c4ba14c5d773e24eb6 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 17:57:59 -0400
Subject: [PATCH 138/552] registry: Register XF86DGA extension protocol names.

---
 hw/xfree86/dixmods/extmod/xf86dga2.c | 68 +++++++++++++++++++++++++++-
 1 file changed, 67 insertions(+), 1 deletion(-)

diff --git a/hw/xfree86/dixmods/extmod/xf86dga2.c b/hw/xfree86/dixmods/extmod/xf86dga2.c
index 295e05e9e..3b866c798 100644
--- a/hw/xfree86/dixmods/extmod/xf86dga2.c
+++ b/hw/xfree86/dixmods/extmod/xf86dga2.c
@@ -22,6 +22,7 @@
 #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>
@@ -99,7 +100,72 @@ 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");
 }
 
 

From 4c3285c883cc50a91bc5262bbc9d073d816f860a Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 18:04:47 -0400
Subject: [PATCH 139/552] registry: Register WINDOWSWM extension protocol
 names.

---
 hw/xwin/winwindowswm.c | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/hw/xwin/winwindowswm.c b/hw/xwin/winwindowswm.c
index e1994de84..1356465d9 100755
--- a/hw/xwin/winwindowswm.c
+++ b/hw/xwin/winwindowswm.c
@@ -41,6 +41,7 @@ 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"
 
@@ -105,7 +106,35 @@ 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*/

From 2e1e5be1d9067816525aa13a1d818e8ca6899599 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 18:18:57 -0400
Subject: [PATCH 140/552] registry: Register DBE extension protocol names.

---
 dbe/dbe.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/dbe/dbe.c b/dbe/dbe.c
index 8175a352f..a872544e7 100644
--- a/dbe/dbe.c
+++ b/dbe/dbe.c
@@ -51,6 +51,7 @@
 #include "extnsionst.h"
 #include "gcstruct.h"
 #include "dixstruct.h"
+#include "registry.h"
 #define NEED_DBE_PROTOCOL
 #include "dbestruct.h"
 #include "midbe.h"
@@ -1747,5 +1748,25 @@ 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() */
 

From ea09c9acc8f0d5577f54c864ff88b7f03d93b2f4 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 18:25:12 -0400
Subject: [PATCH 141/552] registry: Register Record extension protocol names.

---
 record/record.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/record/record.c b/record/record.c
index 2e65e677b..5772baf46 100644
--- a/record/record.c
+++ b/record/record.c
@@ -43,6 +43,7 @@ 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>
@@ -2965,5 +2966,24 @@ 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 */
 

From 106758893b68033f14f69c4ee6591fb6a149ba37 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 18:31:40 -0400
Subject: [PATCH 142/552] registry: Register XFixes extension protocol names.

---
 xfixes/xfixes.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 77 insertions(+), 1 deletion(-)

diff --git a/xfixes/xfixes.c b/xfixes/xfixes.c
index 0db49895e..ccce7b9fd 100755
--- a/xfixes/xfixes.c
+++ b/xfixes/xfixes.c
@@ -45,6 +45,7 @@
 #endif
 
 #include "xfixesint.h"
+#include "registry.h"
 
 /*
  * Must use these instead of the constants from xfixeswire.h.  They advertise
@@ -257,5 +258,80 @@ 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");
 }

From b38a91993364aa80cfd99721e319e1458d9fb760 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 18:50:06 -0400
Subject: [PATCH 143/552] registry: Register XTrap extension protocol names.

---
 XTrap/xtrapdi.c | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/XTrap/xtrapdi.c b/XTrap/xtrapdi.c
index efad36f7a..734922ceb 100644
--- a/XTrap/xtrapdi.c
+++ b/XTrap/xtrapdi.c
@@ -62,6 +62,7 @@ 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"
@@ -463,6 +464,41 @@ 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;
 }
 

From 20db50b4c44a14f7eeac2b1de17ada68482521da Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 18:56:59 -0400
Subject: [PATCH 144/552] registry: Register DAMAGE extension protocol names.

---
 damageext/damageext.c | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/damageext/damageext.c b/damageext/damageext.c
index 517c72dac..ac2198b0b 100755
--- a/damageext/damageext.c
+++ b/damageext/damageext.c
@@ -25,6 +25,7 @@
 #endif
 
 #include "damageextint.h"
+#include "registry.h"
 
 static unsigned char	DamageReqCode;
 static int		DamageEventBase;
@@ -526,5 +527,23 @@ 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");
 }

From c827db57e4d9ca14c82b099dcfc9b7a0c0b5ba0a Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 19:06:01 -0400
Subject: [PATCH 145/552] registry: Register RANDR extension protocol names.

---
 randr/randr.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/randr/randr.c b/randr/randr.c
index bc2b995d2..d5b9819f1 100644
--- a/randr/randr.c
+++ b/randr/randr.c
@@ -32,6 +32,7 @@
 #endif
 
 #include "randrstr.h"
+#include "registry.h"
 
 /* From render.h */
 #ifndef SubPixelUnknown
@@ -351,6 +352,73 @@ 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

From 8964c6d8e14ae47798762191e359b2bf138ca32e Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 19:10:51 -0400
Subject: [PATCH 146/552] registry: Register RENDER extension protocol names.

---
 render/render.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 90 insertions(+)

diff --git a/render/render.c b/render/render.c
index 40d5add05..fe50dd28e 100644
--- a/render/render.c
+++ b/render/render.c
@@ -40,6 +40,7 @@
 #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"
@@ -262,6 +263,95 @@ 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

From 2c9646ad4e65bb061d910c9e2b1a8a978f21fa17 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 19:18:03 -0400
Subject: [PATCH 147/552] registry: Register SHM extension protocol names.

---
 Xext/shm.c | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/Xext/shm.c b/Xext/shm.c
index ee4c34035..56a944be1 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -59,6 +59,7 @@ 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>
@@ -246,7 +247,27 @@ 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*/

From 48891d5696f56711f23743cb03be39cf6b26c522 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 19:32:01 -0400
Subject: [PATCH 148/552] registry: Register EVIE extension protocol names.

---
 Xext/xevie.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/Xext/xevie.c b/Xext/xevie.c
index 7dd67bbf6..8dc167814 100644
--- a/Xext/xevie.c
+++ b/Xext/xevie.c
@@ -45,6 +45,7 @@ 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>
@@ -146,9 +147,21 @@ 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*/

From 5c8b1a91726817816d20faefad21c7a68ab634cc Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 19:35:04 -0400
Subject: [PATCH 149/552] registry: Register Resource extension protocol names.

---
 Xext/xres.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/Xext/xres.c b/Xext/xres.c
index 3660260c2..e78176e41 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"
@@ -388,7 +389,18 @@ SProcResDispatch (ClientPtr client)
 void
 ResExtensionInit(INITARGS)
 {
-    (void) AddExtension(XRES_NAME, 0, 0,
+    ExtensionEntry *extEntry;
+
+    extEntry = 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");
 }

From f077578e42eee424b0e534774574c84af9d6f85b Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 19:43:02 -0400
Subject: [PATCH 150/552] registry: Register XPrint extension protocol names.

---
 Xext/xprint.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/Xext/xprint.c b/Xext/xprint.c
index ef5111837..48559dd44 100644
--- a/Xext/xprint.c
+++ b/Xext/xprint.c
@@ -80,6 +80,7 @@ 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>
@@ -310,6 +311,69 @@ 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

From 16764a2d299c7c0c98002aadd52ab4a1a36758c3 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 20:29:23 -0400
Subject: [PATCH 151/552] registry: Register DPMS extension protocol names.

---
 Xext/dpms.c | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/Xext/dpms.c b/Xext/dpms.c
index 97622cb96..613493aae 100644
--- a/Xext/dpms.c
+++ b/Xext/dpms.c
@@ -44,15 +44,13 @@ 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>
 #include "dpmsproc.h"
 #include "modinit.h"
 
-#if 0
-static unsigned char DPMSCode;
-#endif
 static DISPATCH_PROC(ProcDPMSDispatch);
 static DISPATCH_PROC(SProcDPMSDispatch);
 static DISPATCH_PROC(ProcDPMSGetVersion);
@@ -76,18 +74,29 @@ static void DPMSResetProc(ExtensionEntry* extEntry);
 void
 DPMSExtensionInit(INITARGS)
 {
-#if 0
     ExtensionEntry *extEntry;
     
-    if ((extEntry = AddExtension(DPMSExtensionName, 0, 0,
-				ProcDPMSDispatch, SProcDPMSDispatch,
-				DPMSResetProc, StandardMinorOpcode)))
-	DPMSCode = (unsigned char)extEntry->base;
-#else
-    (void) AddExtension(DPMSExtensionName, 0, 0,
-			ProcDPMSDispatch, SProcDPMSDispatch,
-			DPMSResetProc, StandardMinorOpcode);
-#endif
+    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");
 }
 
 /*ARGSUSED*/

From 3877faf7d9fe00ed634077e38a198ae4b91a2bb4 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 20:35:13 -0400
Subject: [PATCH 152/552] registry: Register Multibuffer extension protocol
 names.

---
 Xext/mbuf.c | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/Xext/mbuf.c b/Xext/mbuf.c
index ee2ef6405..701af66a4 100644
--- a/Xext/mbuf.c
+++ b/Xext/mbuf.c
@@ -43,6 +43,7 @@ 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>
 
@@ -254,7 +255,39 @@ 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*/

From 32fe282d5b8306514d641e15bc6d9fd4ab360977 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 20:45:18 -0400
Subject: [PATCH 153/552] registry: Register XTest extension protocol names.

---
 Xext/xtest.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/Xext/xtest.c b/Xext/xtest.c
index 79c53b426..3895a0073 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -42,6 +42,7 @@ 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>
@@ -53,10 +54,6 @@ from The Open Group.
 
 #include "modinit.h"
 
-#if 0
-static unsigned char XTestReqCode;
-#endif
-
 #ifdef XINPUT
 extern int DeviceValuator;
 #endif /* XINPUT */
@@ -88,18 +85,21 @@ static DISPATCH_PROC(SProcXTestGrabControl);
 void
 XTestExtensionInit(INITARGS)
 {
-#if 0
     ExtensionEntry *extEntry;
 
-    if ((extEntry = AddExtension(XTestExtensionName, 0, 0,
-				 ProcXTestDispatch, SProcXTestDispatch,
-				 XTestResetProc, StandardMinorOpcode)) != 0)
-	XTestReqCode = (unsigned char)extEntry->base;
-#else
-    (void) AddExtension(XTestExtensionName, 0, 0,
-			ProcXTestDispatch, SProcXTestDispatch,
-			XTestResetProc, StandardMinorOpcode);
-#endif
+    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");
 }
 
 /*ARGSUSED*/

From 35ae03871af88b2f420dd83448011a077852d7a0 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 20:50:26 -0400
Subject: [PATCH 154/552] registry: Register XC-MISC extension protocol names.

---
 Xext/xcmisc.c | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c
index d9a7f100d..ba0402c76 100644
--- a/Xext/xcmisc.c
+++ b/Xext/xcmisc.c
@@ -39,6 +39,7 @@ from The Open Group.
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "swaprep.h"
+#include "registry.h"
 #include <X11/extensions/xcmiscstr.h>
 #include "modinit.h"
 
@@ -48,10 +49,6 @@ from The Open Group.
 #define UINT32_MAX 0xffffffffU
 #endif
 
-#if 0
-static unsigned char XCMiscCode;
-#endif
-
 static void XCMiscResetProc(
     ExtensionEntry * /* extEntry */
 );
@@ -68,18 +65,19 @@ static DISPATCH_PROC(SProcXCMiscGetXIDRange);
 void
 XCMiscExtensionInit(INITARGS)
 {
-#if 0
     ExtensionEntry *extEntry;
 
-    if ((extEntry = AddExtension(XCMiscExtensionName, 0, 0,
+    if (!(extEntry = AddExtension(XCMiscExtensionName, 0, 0,
 				ProcXCMiscDispatch, SProcXCMiscDispatch,
-				XCMiscResetProc, StandardMinorOpcode)) != 0)
-	XCMiscCode = (unsigned char)extEntry->base;
-#else
-    (void) AddExtension(XCMiscExtensionName, 0, 0,
-			ProcXCMiscDispatch, SProcXCMiscDispatch,
-			XCMiscResetProc, StandardMinorOpcode);
-#endif
+				XCMiscResetProc, StandardMinorOpcode)))
+	return;
+
+    RegisterRequestName(extEntry->base, X_XCMiscGetVersion,
+			XCMiscExtensionName ":GetVersion");
+    RegisterRequestName(extEntry->base, X_XCMiscGetXIDRange,
+			XCMiscExtensionName ":GetXIDRange");
+    RegisterRequestName(extEntry->base, X_XCMiscGetXIDList,
+			XCMiscExtensionName ":GetXIDList");
 }
 
 /*ARGSUSED*/

From 12766c5b5ffdab95255a63b2c8421ee773fd43b5 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 21:00:46 -0400
Subject: [PATCH 155/552] registry: Register Xv extension protocol names.

---
 Xext/xvmain.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/Xext/xvmain.c b/Xext/xvmain.c
index a2fc10802..b3449b4a5 100644
--- a/Xext/xvmain.c
+++ b/Xext/xvmain.c
@@ -92,6 +92,7 @@ SOFTWARE.
 #include "resource.h"
 #include "opaque.h"
 #include "input.h"
+#include "registry.h"
 
 #define GLOBAL
 
@@ -195,6 +196,58 @@ 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");
     }
 }
 

From 32f6171862461d17ebea58a2fb6ddd16ac71358c Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 21:10:14 -0400
Subject: [PATCH 156/552] registry: Register XF86Bigfont extension protocol
 names.

---
 Xext/xf86bigfont.c | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c
index 29f07a63e..a8af43d09 100644
--- a/Xext/xf86bigfont.c
+++ b/Xext/xf86bigfont.c
@@ -71,6 +71,7 @@
 #include "gcstruct.h"
 #include "dixfontstr.h"
 #include "extnsionst.h"
+#include "registry.h"
 
 #define _XF86BIGFONT_SERVER_
 #include <X11/extensions/xf86bigfstr.h>
@@ -86,10 +87,6 @@ static DISPATCH_PROC(SProcXF86BigfontDispatch);
 static DISPATCH_PROC(SProcXF86BigfontQueryVersion);
 static DISPATCH_PROC(SProcXF86BigfontQueryFont);
 
-#if 0
-static unsigned char XF86BigfontReqCode;
-#endif
-
 #ifdef HAS_SHM
 
 /* A random signature, transmitted to the clients so they can verify that the
@@ -149,7 +146,6 @@ CheckForShmSyscall(void)
 void
 XFree86BigfontExtensionInit()
 {
-#if 0
     ExtensionEntry* extEntry;
 
     if ((extEntry = AddExtension(XF86BIGFONTNAME,
@@ -159,16 +155,6 @@ XFree86BigfontExtensionInit()
 				 SProcXF86BigfontDispatch,
 				 XF86BigfontResetProc,
 				 StandardMinorOpcode))) {
-	XF86BigfontReqCode = (unsigned char) extEntry->base;
-#else
-    if (AddExtension(XF86BIGFONTNAME,
-		     XF86BigfontNumberEvents,
-		     XF86BigfontNumberErrors,
-		     ProcXF86BigfontDispatch,
-		     SProcXF86BigfontDispatch,
-		     XF86BigfontResetProc,
-		     StandardMinorOpcode)) {
-#endif
 #ifdef HAS_SHM
 #ifdef MUST_CHECK_FOR_SHM_SYSCALL
 	/*
@@ -200,7 +186,13 @@ XFree86BigfontExtensionInit()
 # endif
 #endif
 #endif
-    }
+    } else
+	return;
+
+    RegisterRequestName(extEntry->base, X_XF86BigfontQueryVersion,
+			XF86BIGFONTNAME ":QueryVersion");
+    RegisterRequestName(extEntry->base, X_XF86BigfontQueryFont,
+			XF86BIGFONTNAME ":QueryFont");
 }
 
 

From 7e182a5d89d618e20dcc77850131690733322d39 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 21:13:39 -0400
Subject: [PATCH 157/552] registry: Register MIT-MISC extension protocol names.

---
 Xext/mitmisc.c | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/Xext/mitmisc.c b/Xext/mitmisc.c
index 924b88063..0b231529b 100644
--- a/Xext/mitmisc.c
+++ b/Xext/mitmisc.c
@@ -38,14 +38,11 @@ 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"
 
-#if 0
-static unsigned char MITReqCode;
-#endif
-
 static void MITResetProc(
     ExtensionEntry * /* extEntry */
 );
@@ -60,18 +57,17 @@ static DISPATCH_PROC(SProcMITSetBugMode);
 void
 MITMiscExtensionInit(INITARGS)
 {
-#if 0
     ExtensionEntry *extEntry;
 
-    if ((extEntry = AddExtension(MITMISCNAME, 0, 0,
-				 ProcMITDispatch, SProcMITDispatch,
-				 MITResetProc, StandardMinorOpcode)) != 0)
-	MITReqCode = (unsigned char)extEntry->base;
-#else
-    (void) AddExtension(MITMISCNAME, 0, 0,
-			ProcMITDispatch, SProcMITDispatch,
-			MITResetProc, StandardMinorOpcode);
-#endif
+    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");
 }
 
 /*ARGSUSED*/

From f6226d3bfe1515058e2092e8662ae87825501209 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 21:35:12 -0400
Subject: [PATCH 158/552] registry: Register TOG-CUP extension protocol names.

---
 Xext/cup.c | 41 ++++++++++++++++-------------------------
 1 file changed, 16 insertions(+), 25 deletions(-)

diff --git a/Xext/cup.c b/Xext/cup.c
index b544a7517..4adfc6116 100644
--- a/Xext/cup.c
+++ b/Xext/cup.c
@@ -39,6 +39,7 @@ 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>
@@ -51,11 +52,6 @@ static int		ProcDispatch(ClientPtr client);
 static int              SProcDispatch(ClientPtr client);
 static void		ResetProc(ExtensionEntry* extEntry);
 
-#if 0
-static unsigned char	ReqCode = 0;
-static int		ErrorBase;
-#endif
-
 #if defined(WIN32) || defined(TESTWIN32)
 #define HAVE_SPECIAL_DESKTOP_COLORS
 #endif
@@ -128,30 +124,25 @@ static xColorItem citems[] = {
 void
 XcupExtensionInit (INITARGS)
 {
-#if 0
     ExtensionEntry* extEntry;
 
-    if ((extEntry = AddExtension (XCUPNAME,
-				0,
-				XcupNumberErrors,
-				ProcDispatch,
-				SProcDispatch,
-				ResetProc,
-				StandardMinorOpcode))) {
-	ReqCode = (unsigned char)extEntry->base;
-	ErrorBase = extEntry->errorBase;
-    }
-#else
-    (void) AddExtension (XCUPNAME,
-			0,
-			XcupNumberErrors,
-			ProcDispatch,
-			SProcDispatch,
-			ResetProc,
-			StandardMinorOpcode);
-#endif
+    if (!(extEntry = AddExtension (XCUPNAME,
+				   0,
+				   XcupNumberErrors,
+				   ProcDispatch,
+				   SProcDispatch,
+				   ResetProc,
+				   StandardMinorOpcode)))
+	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*/

From e987648cf2c21dcbd77dd9a71793090a48e4f521 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 21:38:56 -0400
Subject: [PATCH 159/552] registry: Register EVI extension protocol names.

---
 Xext/EVI.c | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/Xext/EVI.c b/Xext/EVI.c
index 8fe3481d4..b6752c083 100644
--- a/Xext/EVI.c
+++ b/Xext/EVI.c
@@ -30,14 +30,12 @@ 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"
 #include "modinit.h"
 
-#if 0
-static unsigned char XEVIReqCode = 0;
-#endif
 static EviPrivPtr eviPriv;
 
 static int
@@ -182,19 +180,18 @@ EVIResetProc(ExtensionEntry *extEntry)
 void
 EVIExtensionInit(INITARGS)
 {
-#if 0
     ExtensionEntry *extEntry;
 
-    if ((extEntry = AddExtension(EVINAME, 0, 0,
-				ProcEVIDispatch,
-				SProcEVIDispatch,
-				EVIResetProc, StandardMinorOpcode))) {
-	XEVIReqCode = (unsigned char)extEntry->base;
-#else
-    if (AddExtension(EVINAME, 0, 0,
-		     ProcEVIDispatch, SProcEVIDispatch,
-		     EVIResetProc, StandardMinorOpcode)) {
-#endif
-	eviPriv = eviDDXInit();
-    }
+    if (!(extEntry = AddExtension(EVINAME, 0, 0,
+				  ProcEVIDispatch,
+				  SProcEVIDispatch,
+				  EVIResetProc, StandardMinorOpcode)))
+	return;
+
+    eviPriv = eviDDXInit();
+
+    RegisterRequestName(extEntry->base, X_EVIQueryVersion,
+			EVINAME ":QueryVersion");
+    RegisterRequestName(extEntry->base, X_EVIGetVisualInfo,
+			EVINAME ":GetVisualInfo");
 }

From 1254cc399c53eadcc32eeabf69990ed2526c7ae0 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 21:43:06 -0400
Subject: [PATCH 160/552] registry: Register Fontcache extension protocol
 names.

---
 Xext/fontcache.c | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/Xext/fontcache.c b/Xext/fontcache.c
index c54340b61..9fae2d70b 100644
--- a/Xext/fontcache.c
+++ b/Xext/fontcache.c
@@ -42,6 +42,7 @@
 #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>
@@ -67,28 +68,34 @@ static DISPATCH_PROC(SProcFontCacheGetCacheStatistics);
 static DISPATCH_PROC(SProcFontCacheQueryVersion);
 static DISPATCH_PROC(SProcFontCacheChangeCacheSettings);
 
-#if 0
-static unsigned char FontCacheReqCode = 0;
-#endif
-
 void
 FontCacheExtensionInit(INITARGS)
 {
     ExtensionEntry* extEntry;
 
-    if (
+    if (!
 	(extEntry = AddExtension(FONTCACHENAME,
 				FontCacheNumberEvents,
 				FontCacheNumberErrors,
 				ProcFontCacheDispatch,
 				SProcFontCacheDispatch,
 				FontCacheResetProc,
-				StandardMinorOpcode))) {
-#if 0
-	FontCacheReqCode = (unsigned char)extEntry->base;
-#endif
-	miscErrorBase = extEntry->errorBase;
-    }
+				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");
 }
 
 /*ARGSUSED*/

From 6ec35a8cf539c900b334dd6df146b394f54e3706 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 21:46:56 -0400
Subject: [PATCH 161/552] registry: Register BigRequests extension protocol
 names.

---
 Xext/bigreq.c | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/Xext/bigreq.c b/Xext/bigreq.c
index d38879079..6303f388e 100644
--- a/Xext/bigreq.c
+++ b/Xext/bigreq.c
@@ -37,14 +37,11 @@ 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"
 
-#if 0
-static unsigned char XBigReqCode;
-#endif
-
 static void BigReqResetProc(
     ExtensionEntry * /* extEntry */
 );
@@ -54,18 +51,15 @@ static DISPATCH_PROC(ProcBigReqDispatch);
 void
 BigReqExtensionInit(INITARGS)
 {
-#if 0
     ExtensionEntry *extEntry;
 
-    if ((extEntry = AddExtension(XBigReqExtensionName, 0, 0,
-				 ProcBigReqDispatch, ProcBigReqDispatch,
-				 BigReqResetProc, StandardMinorOpcode)) != 0)
-	XBigReqCode = (unsigned char)extEntry->base;
-#else
-    (void) AddExtension(XBigReqExtensionName, 0, 0,
-			ProcBigReqDispatch, ProcBigReqDispatch,
-			BigReqResetProc, StandardMinorOpcode);
-#endif
+    if (!(extEntry = AddExtension(XBigReqExtensionName, 0, 0,
+				  ProcBigReqDispatch, ProcBigReqDispatch,
+				  BigReqResetProc, StandardMinorOpcode)))
+	return;
+
+    RegisterRequestName(extEntry->base, X_BigReqEnable,
+			XBigReqExtensionName ":Enable");
 }
 
 /*ARGSUSED*/

From b504678ba5407a6fd8d47d051305f7c3d5606dfe Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 21:54:25 -0400
Subject: [PATCH 162/552] registry: Register APPGROUP extension protocol names.

---
 Xext/appgroup.c | 38 ++++++++++++++++++++++++++++++--------
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/Xext/appgroup.c b/Xext/appgroup.c
index c40782df5..4fb402066 100644
--- a/Xext/appgroup.c
+++ b/Xext/appgroup.c
@@ -39,6 +39,7 @@ 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"
@@ -762,14 +763,35 @@ static void XagCallClientStateChange(
 void
 XagExtensionInit(INITARGS)
 {
-    if (AddExtension (XAGNAME,
-		      0,
-		      XagNumberErrors,
-		      ProcXagDispatch,
-		      SProcXagDispatch,
-		      XagResetProc,
-		      StandardMinorOpcode)) {
+    ExtensionEntry *extEntry;
+
+    if ((extEntry = 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");
 }

From 9f597f6c87e0b14cc382d8e5929e42f822db4329 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 22:01:20 -0400
Subject: [PATCH 163/552] registry: Register SYNC extension protocol names.

---
 Xext/sync.c | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/Xext/sync.c b/Xext/sync.c
index 81b0cc4aa..750e0db94 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -67,6 +67,7 @@ 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>
@@ -2411,6 +2412,45 @@ 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");
 }
 
 

From 4e274e90e16b1d954391e1af3e2074fb10f70ee7 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 22:04:20 -0400
Subject: [PATCH 164/552] registry: Register SHAPE extension protocol names.

---
 Xext/shape.c | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/Xext/shape.c b/Xext/shape.c
index 0f49f7332..12ab53a05 100644
--- a/Xext/shape.c
+++ b/Xext/shape.c
@@ -43,6 +43,7 @@ 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"
@@ -111,9 +112,6 @@ 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 */
 
@@ -154,12 +152,32 @@ 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*/

From 58c3240fcbec23aad122e1c340f6bb6d3b18f779 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 22:09:47 -0400
Subject: [PATCH 165/552] registry: Register MIT-SCREEN-SAVER extension
 protocol names.

---
 Xext/saver.c | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/Xext/saver.c b/Xext/saver.c
index d282173f8..eff932573 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -49,6 +49,7 @@ 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"
@@ -62,9 +63,6 @@ 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);
@@ -274,12 +272,26 @@ 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*/

From 853ea337bdad17f8f6ec7d940de14ce2cbbbf93e Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 22:13:02 -0400
Subject: [PATCH 166/552] registry: Register XvMC extension protocol names.

---
 Xext/xvmc.c | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/Xext/xvmc.c b/Xext/xvmc.c
index 7ae8cc0da..a1e0ed186 100644
--- a/Xext/xvmc.c
+++ b/Xext/xvmc.c
@@ -16,6 +16,7 @@
 #include "scrnintstr.h"
 #include "extnsionst.h"
 #include "servermd.h"
+#include "registry.h"
 #include <X11/Xfuncproto.h>
 #include "xvdix.h"
 #include <X11/extensions/XvMC.h>
@@ -700,6 +701,34 @@ 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

From fe97f7c54a1b42acd542696b6cdc9e83e89548f3 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 15 Oct 2007 22:46:08 -0400
Subject: [PATCH 167/552] registry: Add some missing #include's.

---
 randr/rrcrtc.c   | 1 +
 randr/rrmode.c   | 1 +
 randr/rroutput.c | 1 +
 render/picture.c | 1 +
 4 files changed, 4 insertions(+)

diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c
index 6384857c3..43486cddb 100644
--- a/randr/rrcrtc.c
+++ b/randr/rrcrtc.c
@@ -22,6 +22,7 @@
 
 #include "randrstr.h"
 #include "swaprep.h"
+#include "registry.h"
 
 RESTYPE	RRCrtcType;
 
diff --git a/randr/rrmode.c b/randr/rrmode.c
index d7cc916ea..63a67dad0 100644
--- a/randr/rrmode.c
+++ b/randr/rrmode.c
@@ -21,6 +21,7 @@
  */
 
 #include "randrstr.h"
+#include "registry.h"
 
 RESTYPE	RRModeType;
 
diff --git a/randr/rroutput.c b/randr/rroutput.c
index fea87978f..1ecde31a2 100644
--- a/randr/rroutput.c
+++ b/randr/rroutput.c
@@ -21,6 +21,7 @@
  */
 
 #include "randrstr.h"
+#include "registry.h"
 
 RESTYPE	RROutputType;
 
diff --git a/render/picture.c b/render/picture.c
index dd4221f1a..049274e9f 100644
--- a/render/picture.c
+++ b/render/picture.c
@@ -41,6 +41,7 @@
 #include "servermd.h"
 #include "picturestr.h"
 #include "xace.h"
+#include "registry.h"
 
 _X_EXPORT DevPrivateKey PictureScreenPrivateKey = &PictureScreenPrivateKey;
 DevPrivateKey	PictureWindowPrivateKey = &PictureWindowPrivateKey;

From 773f6491c1cc8819038e753d08c32ba213f80f8f Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 16 Oct 2007 19:11:36 -0400
Subject: [PATCH 168/552] xace: update the DeleteProperty prototype to include
 the client argument. This should have been part of
 8f23d40068151ad85cde239d07031284f0b2c4dc.

---
 include/property.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/property.h b/include/property.h
index 77536aa4d..ba7d226cd 100644
--- a/include/property.h
+++ b/include/property.h
@@ -74,6 +74,7 @@ extern int ChangeWindowProperty(
     Bool /*sendevent*/);
 
 extern int DeleteProperty(
+    ClientPtr /*client*/,
     WindowPtr /*pWin*/,
     Atom /*propName*/);
 

From e3a8cbe523bae8b771ad3c8ad497f4444f6d05d5 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 17 Oct 2007 13:48:44 -0400
Subject: [PATCH 169/552] xace: add creation/labeling hook to
 CreateRootWindow().

---
 dix/window.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dix/window.c b/dix/window.c
index 597ad2ef3..17ab2a7a3 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -434,6 +434,12 @@ CreateRootWindow(ScreenPtr pScreen)
     pWin->border.pixel = pScreen->blackPixel;
     pWin->borderWidth = 0;
 
+    /*  security creation/labeling check
+     */
+    if (XaceHook(XACE_RESOURCE_ACCESS, serverClient, pWin->drawable.id,
+		 RT_WINDOW, pWin, RT_NONE, NULL, DixCreateAccess))
+	return FALSE;
+
     if (!AddResource(pWin->drawable.id, RT_WINDOW, (pointer)pWin))
 	return FALSE;
 

From db66e66dbf26b91c655f1659859c022cc31f0db6 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 17 Oct 2007 13:51:11 -0400
Subject: [PATCH 170/552] xace: Add an access_mode field to the extension
 structure. This allows the same callback to be used for both extension hooks.

---
 Xext/xace.c    | 15 +++++++++++++--
 Xext/xacestr.h |  1 +
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Xext/xace.c b/Xext/xace.c
index 3de259f71..b12666159 100644
--- a/Xext/xace.c
+++ b/Xext/xace.c
@@ -67,6 +67,17 @@ int XaceHook(int hook, ...)
 	    prv = &rec.status;
 	    break;
 	}
+	case XACE_EXT_DISPATCH: {
+	    XaceExtAccessRec rec = {
+		va_arg(ap, ClientPtr),
+		va_arg(ap, ExtensionEntry*),
+		DixUseAccess,
+		Success /* default allow */
+	    };
+	    calldata = &rec;
+	    prv = &rec.status;
+	    break;
+	}
 	case XACE_RESOURCE_ACCESS: {
 	    XaceResourceAccessRec rec = {
 		va_arg(ap, ClientPtr),
@@ -141,11 +152,11 @@ int XaceHook(int hook, ...)
 	    prv = &rec.status;
 	    break;
 	}
-	case XACE_EXT_DISPATCH:
 	case XACE_EXT_ACCESS: {
 	    XaceExtAccessRec rec = {
 		va_arg(ap, ClientPtr),
 		va_arg(ap, ExtensionEntry*),
+		DixGetAttrAccess,
 		Success /* default allow */
 	    };
 	    calldata = &rec;
@@ -228,7 +239,7 @@ int XaceHook(int hook, ...)
  
     /* call callbacks and return result, if any. */
     CallCallbacks(&XaceHooks[hook], calldata);
-    return prv ? *prv : 0;
+    return prv ? *prv : Success;
 }
 
 static int
diff --git a/Xext/xacestr.h b/Xext/xacestr.h
index 1dae4d6b5..1c615433b 100644
--- a/Xext/xacestr.h
+++ b/Xext/xacestr.h
@@ -97,6 +97,7 @@ typedef struct {
 typedef struct {
     ClientPtr client;
     ExtensionEntry *ext;
+    Mask access_mode;
     int status;
 } XaceExtAccessRec;
 

From baabae623b3658196b67a710dc72663c2105bf31 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 17 Oct 2007 13:54:56 -0400
Subject: [PATCH 171/552] xselinux: Started reworking extension using new XACE
 hooks.

---
 Xext/xselinux.c                     | 1749 +++++++++------------------
 Xext/xselinux.h                     |  105 +-
 configure.ac                        |    2 +-
 hw/xfree86/dixmods/extmod/modinit.h |    1 -
 mi/miinitext.c                      |    6 +-
 5 files changed, 564 insertions(+), 1299 deletions(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index bc86a3294..9ff055484 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -32,13 +32,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/X.h>
 #include <X11/Xatom.h>
-#include <X11/Xproto.h>
-#include <X11/Xfuncproto.h>
+#include "resource.h"
+#include "privates.h"
+#include "registry.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
-#include "resource.h"
+#include "scrnintstr.h"
 #include "selection.h"
 #include "xacestr.h"
 #include "xselinux.h"
@@ -50,14 +50,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <stdarg.h>
 #include "modinit.h"
 
-#ifndef XSELINUXCONFIGFILE
-#warning "XSELinux Policy file is not defined"
-#define XSELINUXCONFIGFILE  NULL
-#endif
+/* private state record */
+static DevPrivateKey stateKey = &stateKey;
 
-/* devPrivates in client and extension */
-static int clientPrivateIndex;
-static int extnsnPrivateIndex;
+/* This is what we store for security state */
+typedef struct {
+    security_id_t sid;
+    struct avc_entry_ref aeref;
+    char *client_path;
+} SELinuxStateRec;
 
 /* audit file descriptor */
 static int audit_fd;
@@ -65,1337 +66,681 @@ static int audit_fd;
 /* structure passed to auditing callback */
 typedef struct {
     ClientPtr client;	/* client */
-    char *property;	/* property name, if any */
+    char *client_path;	/* client's executable path */
+    unsigned id;	/* resource id, if any */
+    int restype;	/* resource type, if any */
+    Atom property;	/* property name, if any */
     char *extension;	/* extension name, if any */
-} XSELinuxAuditRec;
+} SELinuxAuditRec;
 
 /* labeling handle */
 static struct selabel_handle *label_hnd;
 
-/* Atoms for SELinux window labeling properties */
-Atom atom_ctx;
-Atom atom_client_ctx;
+/* whether AVC is active */
+static int avc_active;
 
-/* Selection stuff from dix */
-extern Selection *CurrentSelections;
-extern int NumCurrentSelections;
+/* atoms for window label properties */
+static Atom atom_ctx;
+static Atom atom_client_ctx;
 
-/* Dynamically allocated security classes and permissions */
+/* The unlabeled SID */
+static security_id_t unlabeled_sid;
+
+/* Array of object classes indexed by resource type */
+static security_class_t *knownTypes;
+static unsigned numKnownTypes;
+
+/* dynamically allocated security classes and permissions */
 static struct security_class_mapping map[] = {
-    { "drawable",
-      { "create", "destroy", "draw", "copy", "getattr", NULL }},
-    { "window",
-      { "addchild", "create", "destroy", "map", "unmap", "chstack",
-	"chproplist", "chprop", "listprop", "getattr", "setattr", "setfocus",
-	"move", "chselection", "chparent", "ctrllife", "enumerate",
-	"transparent", "mousemotion", "clientcomevent", "inputevent",
-	"drawevent", "windowchangeevent", "windowchangerequest",
-	"serverchangeevent", "extensionevent", NULL }},
-    { "gc",
-      { "create", "free", "getattr", "setattr", NULL }},
-    { "font",
-      { "load", "free", "getattr", "use", NULL }},
-    { "colormap",
-      { "create", "free", "install", "uninstall", "list", "read", "store",
-	"getattr", "setattr", NULL }},
-    { "property",
-      { "create", "free", "read", "write", NULL }},
-    { "cursor",
-      { "create", "createglyph", "free", "assign", "setattr", NULL }},
-    { "xclient",
-      { "kill", NULL }},
-    { "xinput",
-      { "lookup", "getattr", "setattr", "setfocus", "warppointer",
-	"activegrab", "passivegrab", "ungrab", "bell", "mousemotion",
-	"relabelinput", NULL }},
-    { "xserver",
-      { "screensaver", "gethostlist", "sethostlist", "getfontpath",
-	"setfontpath", "getattr", "grab", "ungrab", NULL }},
-    { "xextension",
-      { "query", "use", NULL }},
+    { "x_drawable", { "read", "write", "destroy", "create", "getattr", "setattr", "list_property", "get_property", "set_property", "", "", "list_child", "add_child", "remove_child", "hide", "show", "blend", "override", "", "", "", "", "send", "receive", "", "manage", NULL }},
+    { "x_screen", { "", "", "", "", "getattr", "setattr", "saver_getattr", "saver_setattr", "", "", "", "", "", "", "hide_cursor", "show_cursor", "saver_hide", "saver_show", NULL }},
+    { "x_gc", { "", "", "destroy", "create", "getattr", "setattr", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "use", NULL }},
+    { "x_font", { "", "", "destroy", "create", "getattr", "", "", "", "", "", "", "", "add_glyph", "remove_glyph", "", "", "", "", "", "", "", "", "", "", "use", NULL }},
+    { "x_colormap", { "read", "write", "destroy", "create", "getattr", "", "", "", "", "", "", "", "add_color", "remove_color", "", "", "", "", "", "", "install", "uninstall", "", "", "use", NULL }},
+    { "x_property", { "read", "write", "destroy", "create", NULL }},
+    { "x_selection", { "read", "", "", "", "getattr", "setattr", NULL }},
+    { "x_cursor", { "read", "write", "destroy", "create", "getattr", "setattr", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "use", NULL }},
+    { "x_client", { "", "", "destroy", "", "getattr", "setattr", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "manage", NULL }},
+    { "x_device", { "read", "write", "", "", "getattr", "setattr", "", "", "", "getfocus", "setfocus", "", "", "", "", "", "", "grab", "freeze", "force_cursor", "", "", "", "", "", "manage", "", "bell", NULL }},
+    { "x_server", { "record", "", "", "", "getattr", "setattr", "", "", "", "", "", "", "", "", "", "", "", "grab", "", "", "", "", "", "", "", "manage", "debug", NULL }},
+    { "x_extension", { "", "", "", "", "query", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "use", NULL }},
+    { "x_resource", { "read", "write", "write", "write", "read", "write", "read", "read", "write", "read", "write", "read", "write", "write", "write", "read", "read", "write", "write", "write", "write", "write", "write", "read", "read", "write", "read", "write", NULL }},
     { NULL }
 };
 
 /*
- * list of classes corresponding to SIDs in the
- * rsid array of the security state structure (below).
- *
- * XXX SIDs should be stored in their native objects, not all
- * bunched together in the client structure.  However, this will
- * require modification to the resource manager.
+ * Returns the object class corresponding to the given resource type.
  */
-static security_class_t sClasses[] = {
-    SECCLASS_WINDOW,
-    SECCLASS_DRAWABLE,
-    SECCLASS_GC,
-    SECCLASS_CURSOR,
-    SECCLASS_FONT,
-    SECCLASS_COLORMAP,
-    SECCLASS_PROPERTY,
-    SECCLASS_XCLIENT,
-    SECCLASS_XINPUT,
-    SECCLASS_XSERVER
-};
-#define NRES (sizeof(sClasses)/sizeof(sClasses[0]))
-
-/* This is what we store for client security state */
-typedef struct {
-    int haveState;
-    security_id_t sid;
-    security_id_t rsid[NRES];
-    struct avc_entry_ref aeref;
-} XSELinuxClientStateRec;
-
-/* Convenience macros for accessing security state fields */
-#define STATEPTR(client) \
-    ((client)->devPrivates[clientPrivateIndex].ptr)
-#define HAVESTATE(client) \
-    (((XSELinuxClientStateRec*)STATEPTR(client))->haveState)
-#define SID(client) \
-    (((XSELinuxClientStateRec*)STATEPTR(client))->sid)
-#define RSID(client,n) \
-    (((XSELinuxClientStateRec*)STATEPTR(client))->rsid[n])
-#define AEREF(client) \
-    (((XSELinuxClientStateRec*)STATEPTR(client))->aeref)
-#define EXTENSIONSID(ext) \
-    ((ext)->devPrivates[extnsnPrivateIndex].ptr)
-
-/*
- * Returns the index into the rsid array where the SID for the
- * given class is stored.
- */
-static int
-IndexByClass(security_class_t class)
+static security_class_t
+SELinuxTypeToClass(RESTYPE type)
 {
-    int i;
-    for (i=0; i<NRES; i++)
-	if (class == sClasses[i])
-	    return i;
-    return 0;
-}
+    RESTYPE fulltype = type;
+    type &= TypeMask;
 
-/*
- * Does sanity checking on a resource ID.  This can be removed after
- * testing.
- */
-static void
-CheckXID(XID id)
-{
-    /*
-    XID c = CLIENT_ID(id);
-
-    if (c > 10)
-	ErrorF("Warning: possibly mangled ID %x\n", id);
-
-    c = id & RESOURCE_ID_MASK;
-    if (c > 100)
-	ErrorF("Warning: possibly mangled ID %x\n", id);
-        */
-}
-
-/*
- * Byte-swap a CARD32 id if necessary.
- */
-static XID
-SwapXID(ClientPtr client, XID id)
-{
-    register char n;
-    if (client->swapped)
-	swapl(&id, n);
-    return id;
-}
-
-/*
- * ServerPerm - check access permissions on a server-owned object.
- *
- * Arguments:
- * client: Client doing the request.
- * class: Security class of the server object being accessed.
- * perm: Permissions required on the object.
- *
- * Returns: X status code.
- */
-static int
-ServerPerm(ClientPtr client,
-	   security_class_t class,
-	   access_vector_t perm)
-{
-    int idx = IndexByClass(class);
-    if (HAVESTATE(client))
-    {
-	XSELinuxAuditRec auditdata;
-	auditdata.client = client;
-	auditdata.property = NULL;
-	auditdata.extension = NULL;
-	errno = 0;
-        if (avc_has_perm(SID(client), RSID(serverClient,idx), class,
-                         perm, &AEREF(client), &auditdata) < 0)
-        {
-            if (errno == EACCES)
-		return BadAccess;
-	    ErrorF("ServerPerm: unexpected error %d\n", errno);
-	    return BadValue;
-        }
-    }
-    else
-    {
-	ErrorF("No client state in server-perm check!\n");
-        return Success;
+    if (type >= numKnownTypes) {
+	/* Need to increase size of classes array */
+	unsigned size = sizeof(security_class_t);
+	knownTypes = xrealloc(knownTypes, (type + 1) * size);
+	if (!knownTypes)
+	    return 0;
+	memset(knownTypes + numKnownTypes, 0,
+	       (type - numKnownTypes + 1) * size);
     }
 
-    return Success;
+    if (!knownTypes[type]) {
+	const char *str;
+	knownTypes[type] = SECCLASS_X_RESOURCE;
+
+	if (fulltype & RC_DRAWABLE)
+	    knownTypes[type] = SECCLASS_X_DRAWABLE;
+	if (fulltype == RT_GC)
+	    knownTypes[type] = SECCLASS_X_GC;
+	if (fulltype == RT_FONT)
+	    knownTypes[type] = SECCLASS_X_FONT;
+	if (fulltype == RT_CURSOR)
+	    knownTypes[type] = SECCLASS_X_CURSOR;
+	if (fulltype == RT_COLORMAP)
+	    knownTypes[type] = SECCLASS_X_COLORMAP;
+	
+	/* Need to do a string lookup */
+	str = LookupResourceName(fulltype);
+	if (!strcmp(str, "PICTURE"))
+	    knownTypes[type] = SECCLASS_X_DRAWABLE;
+	if (!strcmp(str, "GLYPHSET"))
+	    knownTypes[type] = SECCLASS_X_FONT;
+    }
+
+//    ErrorF("Returning a class of %d for a type of %d\n", knownTypes[type], type);
+    return knownTypes[type];
 }
 
 /*
- * IDPerm - check access permissions on a resource.
- *
- * Arguments:
- * client: Client doing the request.
- * id: resource id of the resource being accessed.
- * class: Security class of the resource being accessed.
- * perm: Permissions required on the resource.
- *
- * Returns: X status code.
+ * Performs an SELinux permission check.
  */
 static int
-IDPerm(ClientPtr sclient,
-	 XID id,
-	 security_class_t class,
-	 access_vector_t perm)
+SELinuxDoCheck(ClientPtr client, SELinuxStateRec *obj, security_class_t class,
+	       Mask access_mode, SELinuxAuditRec *auditdata)
 {
-    ClientPtr tclient;
-    int idx = IndexByClass(class);
-    XSELinuxAuditRec auditdata;
+    SELinuxStateRec *subj;
 
-    if (id == None)
+//    ErrorF("SuperCheck: client=%d, class=%d, access_mode=%x\n", client->index, class, access_mode);
+
+    /* serverClient requests OK */
+    if (client->index == 0)
 	return Success;
 
-    CheckXID(id);
-    tclient = clients[CLIENT_ID(id)];
-
-    /*
-     * This happens in the case where a client has
-     * disconnected.  XXX might want to make the server
-     * own orphaned resources...
-     */
-    if (!tclient || !HAVESTATE(tclient) || !HAVESTATE(sclient))
-    {
-	return Success;
-    }
-
-    auditdata.client = sclient;
-    auditdata.property = NULL;
-    auditdata.extension = NULL;
+    subj = dixLookupPrivate(&client->devPrivates, stateKey);
+    auditdata->client = client;
+    auditdata->client_path = subj->client_path;
     errno = 0;
-    if (avc_has_perm(SID(sclient), RSID(tclient,idx), class,
-		     perm, &AEREF(sclient), &auditdata) < 0)
-    {
+
+    if (avc_has_perm(subj->sid, obj->sid, class, access_mode, &subj->aeref,
+		     auditdata) < 0) {
 	if (errno == EACCES)
 	    return BadAccess;
-	ErrorF("IDPerm: unexpected error %d\n", errno);
+	ErrorF("ServerPerm: unexpected error %d\n", errno);
 	return BadValue;
     }
 
     return Success;
 }
 
-/*
- * GetPropertySID - compute SID for a property object.
- *
- * Arguments:
- * basecontext: context of client owning the property.
- * name: name of the property.
- *
- * Returns: proper SID for the object or NULL on error.
- */
-static security_id_t
-GetPropertySID(security_context_t base, const char *name)
-{
-    security_context_t con, result;
-    security_id_t sid = NULL;
-
-    /* look in the mappings of names to types */
-    if (selabel_lookup(label_hnd, &con, name, SELABEL_X_PROP) < 0)
-	goto out;
-
-    /* perform a transition to obtain the final context */
-    if (security_compute_create(base, con, SECCLASS_PROPERTY, &result) < 0)
-	goto out2;
-
-    /* get a SID for the context */
-    avc_context_to_sid(result, &sid);
-    freecon(result);
-  out2:
-    freecon(con);
-  out:
-    return sid;
-}
-
-/*
- * GetExtensionSID - compute SID for an extension object.
- *
- * Arguments:
- * name: name of the extension.
- *
- * Returns: proper SID for the object or NULL on error.
- */
-static security_id_t
-GetExtensionSID(const char *name)
-{
-    security_context_t base, con, result;
-    security_id_t sid = NULL;
-
-    /* get server context */
-    if (getcon(&base) < 0)
-	goto out;
-
-    /* look in the mappings of names to types */
-    if (selabel_lookup(label_hnd, &con, name, SELABEL_X_EXT) < 0)
-	goto out2;
-
-    /* perform a transition to obtain the final context */
-    if (security_compute_create(base, con, SECCLASS_XEXTENSION, &result) < 0)
-	goto out3;
-
-    /* get a SID for the context */
-    avc_context_to_sid(result, &sid);
-    freecon(result);
-  out3:
-    freecon(con);
-  out2:
-    freecon(base);
-  out:
-    return sid;
-}
-
-/*
- * AssignServerState - set up server security state.
- *
- * Arguments:
- */
-static void
-AssignServerState(void)
-{
-    int i;
-    security_context_t basectx, objctx;
-    XSELinuxClientStateRec *state;
-
-    state = (XSELinuxClientStateRec*)STATEPTR(serverClient);
-    avc_entry_ref_init(&state->aeref);
-
-    /* use the context of the X server process for the serverClient */
-    if (getcon(&basectx) < 0)
-	FatalError("Couldn't get context of X server process\n");
-
-    /* get a SID from the context */
-    if (avc_context_to_sid(basectx, &state->sid) < 0)
-	FatalError("Client %d: context_to_sid(%s) failed\n", 0, basectx);
-
-    /* get contexts and then SIDs for each resource type */
-    for (i=0; i<NRES; i++) {
-	if (security_compute_create(basectx, basectx, sClasses[i],
-				    &objctx) < 0)
-	    FatalError("Client %d: compute_create(base=%s, cls=%d) failed\n",
-		       0, basectx, sClasses[i]);
-
-	if (avc_context_to_sid(objctx, &state->rsid[i]) < 0)
-	    FatalError("Client %d: context_to_sid(%s) failed\n",
-		       0, objctx);
-
-	freecon(objctx);
-    }
-
-    /* mark as set up, free base context, and return */
-    state->haveState = TRUE;
-    freecon(basectx);
-}
-
-/*
- * AssignClientState - set up client security state.
- *
- * Arguments:
- * client: client to set up (can be serverClient).
- */
-static void
-AssignClientState(ClientPtr client)
-{
-    int i;
-    security_context_t basectx, objctx;
-    XSELinuxClientStateRec *state;
-
-    state = (XSELinuxClientStateRec*)STATEPTR(client);
-    avc_entry_ref_init(&state->aeref);
-
-    XtransConnInfo ci = ((OsCommPtr)client->osPrivate)->trans_conn;
-    if (_XSERVTransIsLocal(ci)) {
-	/* for local clients, can get context from the socket */
-	int fd = _XSERVTransGetConnectionNumber(ci);
-	if (getpeercon(fd, &basectx) < 0)
-	    FatalError("Client %d: couldn't get context from socket\n",
-		       client->index);
-    }
-    else
-	/* for remote clients, need to use a default context */
-	if (selabel_lookup(label_hnd, &basectx, NULL, SELABEL_X_CLIENT) < 0)
-	    FatalError("Client %d: couldn't get default remote connection context\n",
-		       client->index);
-
-    /* get a SID from the context */
-    if (avc_context_to_sid(basectx, &state->sid) < 0)
-	FatalError("Client %d: context_to_sid(%s) failed\n",
-		   client->index, basectx);
-
-    /* get contexts and then SIDs for each resource type */
-    for (i=0; i<NRES; i++) {
-	if (security_compute_create(basectx, basectx, sClasses[i],
-				    &objctx) < 0)
-	    FatalError("Client %d: compute_create(base=%s, cls=%d) failed\n",
-		       client->index, basectx, sClasses[i]);
-
-	if (avc_context_to_sid(objctx, &state->rsid[i]) < 0)
-	    FatalError("Client %d: context_to_sid(%s) failed\n",
-		       client->index, objctx);
-
-	freecon(objctx);
-    }
-
-    /* mark as set up, free base context, and return */
-    state->haveState = TRUE;
-    freecon(basectx);
-}
-
-/*
- * FreeClientState - tear down client security state.
- *
- * Arguments:
- * client: client to release (can be serverClient).
- */
-static void
-FreeClientState(ClientPtr client)
-{
-    int i;
-    XSELinuxClientStateRec *state = (XSELinuxClientStateRec*)STATEPTR(client);
-
-    /* client state may not be set up if its auth was rejected */
-    if (state->haveState) {
-	state = (XSELinuxClientStateRec*)STATEPTR(client);
-	sidput(state->sid);
-	for (i=0; i<NRES; i++)
-	    sidput(state->rsid[i]);
-	state->haveState = FALSE;
-    }
-}
-
-#define REQUEST_SIZE_CHECK(client, req) \
-    (client->req_len >= (sizeof(req) >> 2))
-#define IDPERM(client, req, field, class, perm) \
-    (REQUEST_SIZE_CHECK(client,req) ? \
-     IDPerm(client, SwapXID(client,((req*)stuff)->field), class, perm) : \
-     BadLength)
-
-static int
-CheckSendEventPerms(ClientPtr client)
-{
-    register char n;
-    access_vector_t perm = 0;
-    REQUEST(xSendEventReq);
-
-    /* might need type bounds checking here */
-    if (!REQUEST_SIZE_CHECK(client, xSendEventReq))
-	return BadLength;
-
-    switch (stuff->event.u.u.type) {
-	case SelectionClear:
-	case SelectionNotify:
-	case SelectionRequest:
-	case ClientMessage:
-	case PropertyNotify:
-	    perm = WINDOW__CLIENTCOMEVENT;
-	    break;
-	case ButtonPress:
-	case ButtonRelease:
-	case KeyPress:
-	case KeyRelease:
-	case KeymapNotify:
-	case MotionNotify:
-	case EnterNotify:
-	case LeaveNotify:
-	case FocusIn:
-	case FocusOut:
-	    perm = WINDOW__INPUTEVENT;
-	    break;
-	case Expose:
-	case GraphicsExpose:
-	case NoExpose:
-	case VisibilityNotify:
-	    perm = WINDOW__DRAWEVENT;
-	    break;
-	case CirculateNotify:
-	case ConfigureNotify:
-	case CreateNotify:
-	case DestroyNotify:
-	case MapNotify:
-	case UnmapNotify:
-	case GravityNotify:
-	case ReparentNotify:
-	    perm = WINDOW__WINDOWCHANGEEVENT;
-	    break;
-	case CirculateRequest:
-	case ConfigureRequest:
-	case MapRequest:
-	case ResizeRequest:
-	    perm = WINDOW__WINDOWCHANGEREQUEST;
-	    break;
-	case ColormapNotify:
-	case MappingNotify:
-	    perm = WINDOW__SERVERCHANGEEVENT;
-	    break;
-	default:
-	    perm = WINDOW__EXTENSIONEVENT;
-	    break;
-    }
-    if (client->swapped)
-	swapl(&stuff->destination, n);
-    return IDPerm(client, stuff->destination, SECCLASS_WINDOW, perm);
-}
-
-static int
-CheckConvertSelectionPerms(ClientPtr client)
-{
-    register char n;
-    int rval = Success;
-    REQUEST(xConvertSelectionReq);
-
-    if (!REQUEST_SIZE_CHECK(client, xConvertSelectionReq))
-	return BadLength;
-
-    if (client->swapped)
-    {
-	swapl(&stuff->selection, n);
-	swapl(&stuff->requestor, n);
-    }
-
-    if (ValidAtom(stuff->selection))
-    {
-	int i = 0;
-	while ((i < NumCurrentSelections) &&
-	       CurrentSelections[i].selection != stuff->selection) i++;
-	if (i < NumCurrentSelections) {
-	    rval = IDPerm(client, CurrentSelections[i].window,
-			  SECCLASS_WINDOW, WINDOW__CLIENTCOMEVENT);
-	    if (rval != Success)
-		return rval;
-	}
-    }
-    return IDPerm(client, stuff->requestor,
-		  SECCLASS_WINDOW, WINDOW__CLIENTCOMEVENT);
-}
-
-static int
-CheckSetSelectionOwnerPerms(ClientPtr client)
-{
-    register char n;
-    int rval = Success;
-    REQUEST(xSetSelectionOwnerReq);
-
-    if (!REQUEST_SIZE_CHECK(client, xSetSelectionOwnerReq))
-	return BadLength;
-
-    if (client->swapped)
-    {
-	swapl(&stuff->selection, n);
-	swapl(&stuff->window, n);
-    }
-
-    if (ValidAtom(stuff->selection))
-    {
-	int i = 0;
-	while ((i < NumCurrentSelections) &&
-	       CurrentSelections[i].selection != stuff->selection) i++;
-	if (i < NumCurrentSelections) {
-	    rval = IDPerm(client, CurrentSelections[i].window,
-			  SECCLASS_WINDOW, WINDOW__CHSELECTION);
-	    if (rval != Success)
-		return rval;
-	}
-    }
-    return IDPerm(client, stuff->window,
-			  SECCLASS_WINDOW, WINDOW__CHSELECTION);
-}
+//static void
+//SELinuxSelection(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+//{
+//    XaceSelectionAccessRec *rec = calldata;
+//}
 
 static void
-XSELinuxCoreDispatch(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+SELinuxExtension(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
-    XaceCoreDispatchRec *rec = (XaceCoreDispatchRec*)calldata;
-    ClientPtr client = rec->client;
-    REQUEST(xReq);
-    int rval = Success, rval2 = Success, rval3 = Success;
+    XaceExtAccessRec *rec = calldata;
+    SELinuxStateRec *subj, *obj, *serv;
+    SELinuxAuditRec auditdata = { NULL, NULL, 0, 0, 0, NULL };
+    int rc;
 
-    switch(stuff->reqType) {
-    /* Drawable class control requirements */
-    case X_ClearArea:
-	rval = IDPERM(client, xClearAreaReq, window,
-		      SECCLASS_DRAWABLE, DRAWABLE__DRAW);
-	break;
-    case X_PolySegment:
-    case X_PolyRectangle:
-    case X_PolyArc:
-    case X_PolyFillRectangle:
-    case X_PolyFillArc:
-	rval = IDPERM(client, xPolySegmentReq, drawable,
-		      SECCLASS_DRAWABLE, DRAWABLE__DRAW);
-	break;
-    case X_PolyPoint:
-    case X_PolyLine:
-	rval = IDPERM(client, xPolyPointReq, drawable,
-		      SECCLASS_DRAWABLE, DRAWABLE__DRAW);
-	break;
-    case X_FillPoly:
-	rval = IDPERM(client, xFillPolyReq, drawable,
-		      SECCLASS_DRAWABLE, DRAWABLE__DRAW);
-	break;
-    case X_PutImage:
-	rval = IDPERM(client, xPutImageReq, drawable,
-		      SECCLASS_DRAWABLE, DRAWABLE__DRAW);
-	break;
-    case X_CopyArea:
-    case X_CopyPlane:
-	rval = IDPERM(client, xCopyAreaReq, srcDrawable,
-		      SECCLASS_DRAWABLE, DRAWABLE__COPY);
-	rval2 = IDPERM(client, xCopyAreaReq, dstDrawable,
-		       SECCLASS_DRAWABLE, DRAWABLE__DRAW);
-	break;
-    case X_GetImage:
-	rval = IDPERM(client, xGetImageReq, drawable,
-		      SECCLASS_DRAWABLE, DRAWABLE__COPY);
-	break;
-    case X_GetGeometry:
-	rval = IDPERM(client, xResourceReq, id,
-		      SECCLASS_DRAWABLE, DRAWABLE__GETATTR);
-	break;
-
-    /* Window class control requirements */
-    case X_ChangeProperty:
-	rval = IDPERM(client, xChangePropertyReq, window,
-		      SECCLASS_WINDOW,
-		      WINDOW__CHPROPLIST | WINDOW__CHPROP |
-		      WINDOW__LISTPROP);
-	break;
-    case X_ChangeSaveSet:
-	rval = IDPERM(client, xChangeSaveSetReq, window,
-		      SECCLASS_WINDOW,
-		      WINDOW__CTRLLIFE | WINDOW__CHPARENT);
-	break;
-    case X_ChangeWindowAttributes:
-	rval = IDPERM(client, xChangeWindowAttributesReq, window,
-		      SECCLASS_WINDOW, WINDOW__SETATTR);
-	break;
-    case X_CirculateWindow:
-	rval = IDPERM(client, xCirculateWindowReq, window,
-		      SECCLASS_WINDOW, WINDOW__CHSTACK);
-	break;
-    case X_ConfigureWindow:
-	rval = IDPERM(client, xConfigureWindowReq, window,
-		      SECCLASS_WINDOW,
-		      WINDOW__SETATTR | WINDOW__MOVE | WINDOW__CHSTACK);
-	break;
-    case X_ConvertSelection:
-	rval = CheckConvertSelectionPerms(client);
-	break;
-    case X_CreateWindow:
-	rval = IDPERM(client, xCreateWindowReq, wid,
-		      SECCLASS_WINDOW,
-		      WINDOW__CREATE | WINDOW__SETATTR | WINDOW__MOVE);
-	rval2 = IDPERM(client, xCreateWindowReq, parent,
-		       SECCLASS_WINDOW,
-		       WINDOW__CHSTACK | WINDOW__ADDCHILD);
-	rval3 = IDPERM(client, xCreateWindowReq, wid,
-		       SECCLASS_DRAWABLE, DRAWABLE__CREATE);
-	break;
-    case X_DeleteProperty:
-	rval = IDPERM(client, xDeletePropertyReq, window,
-		      SECCLASS_WINDOW,
-		      WINDOW__CHPROP | WINDOW__CHPROPLIST);
-	break;
-    case X_DestroyWindow:
-    case X_DestroySubwindows:
-	rval = IDPERM(client, xResourceReq, id,
-		      SECCLASS_WINDOW,
-		      WINDOW__ENUMERATE | WINDOW__UNMAP | WINDOW__DESTROY);
-	rval2 = IDPERM(client, xResourceReq, id,
-		       SECCLASS_DRAWABLE, DRAWABLE__DESTROY);
-	break;
-    case X_GetMotionEvents:
-	rval = IDPERM(client, xGetMotionEventsReq, window,
-		      SECCLASS_WINDOW, WINDOW__MOUSEMOTION);
-	break;
-    case X_GetProperty:
-	rval = IDPERM(client, xGetPropertyReq, window,
-		      SECCLASS_WINDOW, WINDOW__LISTPROP);
-	break;
-    case X_GetWindowAttributes:
-	rval = IDPERM(client, xResourceReq, id,
-		      SECCLASS_WINDOW, WINDOW__GETATTR);
-	break;
-    case X_KillClient:
-	rval = IDPERM(client, xResourceReq, id,
-		      SECCLASS_XCLIENT, XCLIENT__KILL);
-	break;
-    case X_ListProperties:
-	rval = IDPERM(client, xResourceReq, id,
-		      SECCLASS_WINDOW, WINDOW__LISTPROP);
-	break;
-    case X_MapWindow:
-    case X_MapSubwindows:
-	rval = IDPERM(client, xResourceReq, id,
-		      SECCLASS_WINDOW,
-		      WINDOW__ENUMERATE | WINDOW__GETATTR | WINDOW__MAP);
-	break;
-    case X_QueryTree:
-	rval = IDPERM(client, xResourceReq, id,
-		      SECCLASS_WINDOW, WINDOW__ENUMERATE | WINDOW__GETATTR);
-	break;
-    case X_RotateProperties:
-	rval = IDPERM(client, xRotatePropertiesReq, window,
-		      SECCLASS_WINDOW, WINDOW__CHPROP | WINDOW__CHPROPLIST);
-	break;
-    case X_ReparentWindow:
-	rval = IDPERM(client, xReparentWindowReq, window,
-		      SECCLASS_WINDOW, WINDOW__CHPARENT | WINDOW__MOVE);
-	rval2 = IDPERM(client, xReparentWindowReq, parent,
-		       SECCLASS_WINDOW, WINDOW__CHSTACK | WINDOW__ADDCHILD);
-	break;
-    case X_SendEvent:
-	rval = CheckSendEventPerms(client);
-	break;
-    case X_SetInputFocus:
-	rval = IDPERM(client, xSetInputFocusReq, focus,
-		      SECCLASS_WINDOW, WINDOW__SETFOCUS);
-	rval2 = ServerPerm(client, SECCLASS_XINPUT, XINPUT__SETFOCUS);
-	break;
-    case X_SetSelectionOwner:
-	rval = CheckSetSelectionOwnerPerms(client);
-	break;
-    case X_TranslateCoords:
-	rval = IDPERM(client, xTranslateCoordsReq, srcWid,
-		      SECCLASS_WINDOW, WINDOW__GETATTR);
-	rval2 = IDPERM(client, xTranslateCoordsReq, dstWid,
-		       SECCLASS_WINDOW, WINDOW__GETATTR);
-	break;
-    case X_UnmapWindow:
-    case X_UnmapSubwindows:
-	rval = IDPERM(client, xResourceReq, id,
-		      SECCLASS_WINDOW,
-		      WINDOW__ENUMERATE | WINDOW__GETATTR |
-		      WINDOW__UNMAP);
-	break;
-    case X_WarpPointer:
-	rval = IDPERM(client, xWarpPointerReq, srcWid,
-		      SECCLASS_WINDOW, WINDOW__GETATTR);
-	rval2 = IDPERM(client, xWarpPointerReq, dstWid,
-		       SECCLASS_WINDOW, WINDOW__GETATTR);
-	rval3 = ServerPerm(client, SECCLASS_XINPUT, XINPUT__WARPPOINTER);
-	break;
-
-    /* Input class control requirements */
-    case X_GrabButton:
-    case X_GrabKey:
-	rval = ServerPerm(client, SECCLASS_XINPUT, XINPUT__PASSIVEGRAB);
-	break;
-    case X_GrabKeyboard:
-    case X_GrabPointer:
-    case X_ChangeActivePointerGrab:
-	rval = ServerPerm(client, SECCLASS_XINPUT, XINPUT__ACTIVEGRAB);
-	break;
-    case X_AllowEvents:
-    case X_UngrabButton:
-    case X_UngrabKey:
-    case X_UngrabKeyboard:
-    case X_UngrabPointer:
-	rval = ServerPerm(client, SECCLASS_XINPUT, XINPUT__UNGRAB);
-	break;
-    case X_GetKeyboardControl:
-    case X_GetKeyboardMapping:
-    case X_GetPointerControl:
-    case X_GetPointerMapping:
-    case X_GetModifierMapping:
-    case X_QueryKeymap:
-    case X_QueryPointer:
-	rval = ServerPerm(client, SECCLASS_XINPUT, XINPUT__GETATTR);
-	break;
-    case X_ChangeKeyboardControl:
-    case X_ChangePointerControl:
-    case X_ChangeKeyboardMapping:
-    case X_SetModifierMapping:
-    case X_SetPointerMapping:
-	rval = ServerPerm(client, SECCLASS_XINPUT, XINPUT__SETATTR);
-	break;
-    case X_Bell:
-	rval = ServerPerm(client, SECCLASS_XINPUT, XINPUT__BELL);
-	break;
-
-    /* Colormap class control requirements */
-    case X_AllocColor:
-    case X_AllocColorCells:
-    case X_AllocColorPlanes:
-    case X_AllocNamedColor:
-	rval = IDPERM(client, xResourceReq, id,
-		      SECCLASS_COLORMAP,
-		      COLORMAP__READ | COLORMAP__STORE);
-	break;
-    case X_CopyColormapAndFree:
-	rval = IDPERM(client, xCopyColormapAndFreeReq, mid,
-		      SECCLASS_COLORMAP, COLORMAP__CREATE);
-	rval2 = IDPERM(client, xCopyColormapAndFreeReq, srcCmap,
-		       SECCLASS_COLORMAP,
-		       COLORMAP__READ | COLORMAP__FREE);
-	break;
-    case X_CreateColormap:
-	rval = IDPERM(client, xCreateColormapReq, mid,
-		      SECCLASS_COLORMAP, COLORMAP__CREATE);
-	rval2 = IDPERM(client, xCreateColormapReq, window,
-		       SECCLASS_DRAWABLE, DRAWABLE__DRAW);
-	break;
-    case X_FreeColormap:
-	rval = IDPERM(client, xResourceReq, id,
-		      SECCLASS_COLORMAP, COLORMAP__FREE);
-	break;
-    case X_FreeColors:
-	rval = IDPERM(client, xFreeColorsReq, cmap,
-		      SECCLASS_COLORMAP, COLORMAP__STORE);
-	break;
-    case X_InstallColormap:
-	rval = IDPERM(client, xResourceReq, id,
-		      SECCLASS_COLORMAP, COLORMAP__INSTALL);
-	rval2 = ServerPerm(client, SECCLASS_COLORMAP, COLORMAP__INSTALL);
-	break;
-    case X_ListInstalledColormaps:
-	rval = ServerPerm(client, SECCLASS_COLORMAP, COLORMAP__LIST);
-	break;
-    case X_LookupColor:
-    case X_QueryColors:
-	rval = IDPERM(client, xResourceReq, id,
-		      SECCLASS_COLORMAP, COLORMAP__READ);
-	break;
-    case X_StoreColors:
-    case X_StoreNamedColor:
-	rval = IDPERM(client, xResourceReq, id,
-		      SECCLASS_COLORMAP, COLORMAP__STORE);
-	break;
-    case X_UninstallColormap:
-	rval = IDPERM(client, xResourceReq, id,
-		      SECCLASS_COLORMAP, COLORMAP__UNINSTALL);
-	rval2 = ServerPerm(client, SECCLASS_COLORMAP, COLORMAP__UNINSTALL);
-	break;
-
-    /* Font class control requirements */
-    case X_CloseFont:
-	rval = IDPERM(client, xResourceReq, id,
-		      SECCLASS_FONT, FONT__FREE);
-	break;
-    case X_ImageText8:
-    case X_ImageText16:
-	/* Font accesses checked through the resource manager */
-	rval = IDPERM(client, xImageTextReq, drawable,
-		      SECCLASS_DRAWABLE, DRAWABLE__DRAW);
-	break;
-    case X_OpenFont:
-	rval = ServerPerm(client, SECCLASS_FONT, FONT__LOAD);
-	rval2 = IDPERM(client, xOpenFontReq, fid,
-		       SECCLASS_FONT, FONT__USE);
-	break;
-    case X_PolyText8:
-    case X_PolyText16:
-	/* Font accesses checked through the resource manager */
-	rval = ServerPerm(client, SECCLASS_FONT, FONT__LOAD);
-	rval2 = IDPERM(client, xPolyTextReq, gc,
-		       SECCLASS_GC, GC__SETATTR);
-	rval3 = IDPERM(client, xPolyTextReq, drawable,
-		       SECCLASS_DRAWABLE, DRAWABLE__DRAW);
-	break;
-
-    /* Pixmap class control requirements */
-    case X_CreatePixmap:
-	rval = IDPERM(client, xCreatePixmapReq, pid,
-		      SECCLASS_DRAWABLE, DRAWABLE__CREATE);
-	break;
-    case X_FreePixmap:
-	rval = IDPERM(client, xResourceReq, id,
-		      SECCLASS_DRAWABLE, DRAWABLE__DESTROY);
-	break;
-
-    /* Cursor class control requirements */
-    case X_CreateCursor:
-	rval = IDPERM(client, xCreateCursorReq, cid,
-		      SECCLASS_CURSOR, CURSOR__CREATE);
-	rval2 = IDPERM(client, xCreateCursorReq, source,
-		       SECCLASS_DRAWABLE, DRAWABLE__DRAW);
-	rval3 = IDPERM(client, xCreateCursorReq, mask,
-		       SECCLASS_DRAWABLE, DRAWABLE__COPY);
-	break;
-    case X_CreateGlyphCursor:
-	rval = IDPERM(client, xCreateGlyphCursorReq, cid,
-		      SECCLASS_CURSOR, CURSOR__CREATEGLYPH);
-	rval2 = IDPERM(client, xCreateGlyphCursorReq, source,
-		       SECCLASS_FONT, FONT__USE);
-	rval3 = IDPERM(client, xCreateGlyphCursorReq, mask,
-		       SECCLASS_FONT, FONT__USE);
-	break;
-    case X_RecolorCursor:
-	rval = IDPERM(client, xRecolorCursorReq, cursor,
-		      SECCLASS_CURSOR, CURSOR__SETATTR);
-	break;
-    case X_FreeCursor:
-	rval = IDPERM(client, xResourceReq, id,
-		      SECCLASS_CURSOR, CURSOR__FREE);
-	break;
-
-    /* GC class control requirements */
-    case X_CreateGC:
-	rval = IDPERM(client, xCreateGCReq, gc,
-		      SECCLASS_GC, GC__CREATE | GC__SETATTR);
-	break;
-    case X_ChangeGC:
-    case X_SetDashes:
-    case X_SetClipRectangles:
-	rval = IDPERM(client, xResourceReq, id,
-		      SECCLASS_GC, GC__SETATTR);
-	break;
-    case X_CopyGC:
-	rval = IDPERM(client, xCopyGCReq, srcGC,
-		      SECCLASS_GC, GC__GETATTR);
-	rval2 = IDPERM(client, xCopyGCReq, dstGC,
-		       SECCLASS_GC, GC__SETATTR);
-	break;
-    case X_FreeGC:
-	rval = IDPERM(client, xResourceReq, id,
-		      SECCLASS_GC, GC__FREE);
-	break;
-
-    /* Server class control requirements */
-    case X_GrabServer:
-	rval = ServerPerm(client, SECCLASS_XSERVER, XSERVER__GRAB);
-	break;
-    case X_UngrabServer:
-	rval = ServerPerm(client, SECCLASS_XSERVER, XSERVER__UNGRAB);
-	break;
-    case X_ForceScreenSaver:
-    case X_GetScreenSaver:
-    case X_SetScreenSaver:
-	rval = ServerPerm(client, SECCLASS_XSERVER, XSERVER__SCREENSAVER);
-	break;
-    case X_ListHosts:
-	rval = ServerPerm(client, SECCLASS_XSERVER, XSERVER__GETHOSTLIST);
-	break;
-    case X_ChangeHosts:
-    case X_SetAccessControl:
-	rval = ServerPerm(client, SECCLASS_XSERVER, XSERVER__SETHOSTLIST);
-	break;
-    case X_GetFontPath:
-	rval = ServerPerm(client, SECCLASS_XSERVER, XSERVER__GETFONTPATH);
-	break;
-    case X_SetFontPath:
-	rval = ServerPerm(client, SECCLASS_XSERVER, XSERVER__SETFONTPATH);
-	break;
-    case X_QueryBestSize:
-	rval = ServerPerm(client, SECCLASS_XSERVER, XSERVER__GETATTR);
-	break;
-
-    default:
-	break;
-    }
-    if (rval != Success)
-	rec->status = rval;
-    if (rval2 != Success)
-	rec->status = rval2;
-    if (rval != Success)
-	rec->status = rval3;
-}
-
-static void
-XSELinuxExtDispatch(CallbackListPtr *pcbl, pointer unused, pointer calldata)
-{
-    XaceExtAccessRec *rec = (XaceExtAccessRec*)calldata;
-    ClientPtr client = rec->client;
-    ExtensionEntry *ext = rec->ext;
-    security_id_t extsid;
-    access_vector_t perm;
-    REQUEST(xReq);
+    subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
+    obj = dixLookupPrivate(&rec->ext->devPrivates, stateKey);
 
+    /* If this is a new object that needs labeling, do it now */
     /* XXX there should be a separate callback for this */
-    if (!EXTENSIONSID(ext))
-    {
-	extsid = GetExtensionSID(ext->name);
-	if (!extsid)
+    if (obj->sid == unlabeled_sid) {
+	const char *name = rec->ext->name;
+	security_context_t con;
+	security_id_t sid;
+
+	serv = dixLookupPrivate(&serverClient->devPrivates, stateKey);
+
+	/* Look in the mappings of property names to contexts */
+	if (selabel_lookup(label_hnd, &con, name, SELABEL_X_EXT) < 0) {
+	    ErrorF("XSELinux: a property label lookup failed!\n");
+	    rec->status = BadValue;
 	    return;
-	EXTENSIONSID(ext) = extsid;
+	}
+	/* Get a SID for context */
+	if (avc_context_to_sid(con, &sid) < 0) {
+	    ErrorF("XSELinux: a context_to_SID call failed!\n");
+	    rec->status = BadAlloc;
+	    return;
+	}
+
+	sidput(obj->sid);
+
+	/* Perform a transition to obtain the final SID */
+	if (avc_compute_create(serv->sid, sid, SECCLASS_X_EXTENSION,
+			       &obj->sid) < 0) {
+	    ErrorF("XSELinux: a SID transition call failed!\n");
+	    freecon(con);
+	    rec->status = BadValue;
+	    return;
+	}
+	freecon(con);
     }
 
-    extsid = (security_id_t)EXTENSIONSID(ext);
-    perm = ((stuff->reqType == X_QueryExtension) ||
-	    (stuff->reqType == X_ListExtensions)) ?
-	XEXTENSION__QUERY : XEXTENSION__USE;
-
-    if (HAVESTATE(client))
-    {
-	XSELinuxAuditRec auditdata;
-	auditdata.client = client;
-	auditdata.property = NULL;
-	auditdata.extension = ext->name;
-	errno = 0;
-	if (avc_has_perm(SID(client), extsid, SECCLASS_XEXTENSION,
-			 perm, &AEREF(client), &auditdata) < 0)
-	{
-	    if (errno == EACCES)
-		rec->status = BadAccess;
-	    ErrorF("ExtDispatch: unexpected error %d\n", errno);
-	    rec->status = BadValue;
-	}
-    } else
-	ErrorF("No client state in extension dispatcher!\n");
-} /* XSELinuxExtDispatch */
+    /* Perform the security check */
+    auditdata.extension = rec->ext->name;
+    rc = SELinuxDoCheck(rec->client, obj, SECCLASS_X_EXTENSION,
+			rec->access_mode, &auditdata);
+    if (rc != Success)
+	rec->status = rc;
+}
 
 static void
-XSELinuxProperty(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+SELinuxProperty(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
-    XacePropertyAccessRec *rec = (XacePropertyAccessRec*)calldata;
-    WindowPtr pWin = rec->pWin;
-    ClientPtr client = rec->client;
-    ClientPtr tclient;
-    access_vector_t perm = 0;
-    security_id_t propsid;
-    char *propname = NameForAtom(rec->pProp->propertyName);
+    XacePropertyAccessRec *rec = calldata;
+    SELinuxStateRec *subj, *obj;
+    SELinuxAuditRec auditdata = { NULL, NULL, 0, 0, 0, NULL };
+    int rc;
 
-    tclient = wClient(pWin);
-    if (!tclient || !HAVESTATE(tclient))
-        return;
+    subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
+    obj = dixLookupPrivate(&rec->pProp->devPrivates, stateKey);
 
-    propsid = GetPropertySID(SID(tclient)->ctx, propname);
-    if (!propsid)
-	return;
+    /* If this is a new object that needs labeling, do it now */
+    if (rec->access_mode & DixCreateAccess) {
+	const char *name = NameForAtom(rec->pProp->propertyName);
+	security_context_t con;
+	security_id_t sid;
 
-    if (rec->access_mode & DixReadAccess)
-	perm |= PROPERTY__READ;
-    if (rec->access_mode & DixWriteAccess)
-	perm |= PROPERTY__WRITE;
-    if (rec->access_mode & DixDestroyAccess)
-	perm |= PROPERTY__FREE;
-    if (!rec->access_mode)
-	perm = PROPERTY__READ | PROPERTY__WRITE | PROPERTY__FREE;
-
-    if (HAVESTATE(client))
-    {
-	XSELinuxAuditRec auditdata;
-	auditdata.client = client;
-	auditdata.property = propname;
-	auditdata.extension = NULL;
-	errno = 0;
-	if (avc_has_perm(SID(client), propsid, SECCLASS_PROPERTY,
-			 perm, &AEREF(client), &auditdata) < 0)
-	{
-	    if (errno == EACCES)
-		rec->status = BadAccess;
-	    ErrorF("Property: unexpected error %d\n", errno);
+	/* Look in the mappings of property names to contexts */
+	if (selabel_lookup(label_hnd, &con, name, SELABEL_X_PROP) < 0) {
+	    ErrorF("XSELinux: a property label lookup failed!\n");
 	    rec->status = BadValue;
+	    return;
 	}
-    } else
-	ErrorF("No client state in property callback!\n");
-
-    /* XXX this should be saved in the property structure */
-    sidput(propsid);
-} /* XSELinuxProperty */
-
-static void
-XSELinuxResLookup(CallbackListPtr *pcbl, pointer unused, pointer calldata)
-{
-    XaceResourceAccessRec *rec = (XaceResourceAccessRec*)calldata;
-    ClientPtr client = rec->client;
-    REQUEST(xReq);
-    access_vector_t perm = 0;
-    int rval = Success;
-
-    /* serverClient requests OK */
-    if (client->index == 0)
-	return;
-
-    switch(rec->rtype) {
-	case RT_FONT: {
-	    switch(stuff->reqType) {
-		case X_ImageText8:
-		case X_ImageText16:
-		case X_PolyText8:
-		case X_PolyText16:
-		    perm = FONT__USE;
-		    break;
-		case X_ListFonts:
-		case X_ListFontsWithInfo:
-		case X_QueryFont:
-		case X_QueryTextExtents:
-		    perm = FONT__GETATTR;
-		    break;
-		default:
-		    break;
-	    }
-	    if (perm)
-		rval = IDPerm(client, rec->id, SECCLASS_FONT, perm);
-	    break;
+	/* Get a SID for context */
+	if (avc_context_to_sid(con, &sid) < 0) {
+	    ErrorF("XSELinux: a context_to_SID call failed!\n");
+	    rec->status = BadAlloc;
+	    return;
 	}
-	default:
-	    break;
+
+	sidput(obj->sid);
+
+	/* Perform a transition to obtain the final SID */
+	if (avc_compute_create(subj->sid, sid, SECCLASS_X_PROPERTY,
+			       &obj->sid) < 0) {
+	    ErrorF("XSELinux: a SID transition call failed!\n");
+	    freecon(con);
+	    rec->status = BadValue;
+	    return;
+	}
+	freecon(con);
+	avc_entry_ref_init(&obj->aeref);
     }
-    if (rval != Success)
-	rec->status = rval;
-} /* XSELinuxResLookup */
+
+    /* Perform the security check */
+    auditdata.property = rec->pProp->propertyName;
+    rc = SELinuxDoCheck(rec->client, obj, SECCLASS_X_PROPERTY,
+			rec->access_mode, &auditdata);
+    if (rc != Success)
+	rec->status = rc;
+}
 
 static void
-XSELinuxMap(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+SELinuxResource(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
-    XaceMapAccessRec *rec = (XaceMapAccessRec*)calldata;
-    if (IDPerm(rec->client, rec->pWin->drawable.id,
-               SECCLASS_WINDOW, WINDOW__MAP) != Success)
-	rec->status = BadAccess;
-} /* XSELinuxMap */
+    XaceResourceAccessRec *rec = calldata;
+    SELinuxStateRec *subj, *obj, *pobj;
+    SELinuxAuditRec auditdata = { NULL, NULL, 0, 0, 0, NULL };
+    PrivateRec **privatePtr;
+    security_class_t class;
+    int rc, offset;
+
+    subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
+
+    /* Determine if the resource object has a devPrivates field */
+    offset = dixLookupPrivateOffset(rec->rtype);
+    if (offset < 0) {
+	/* No: use the SID of the owning client */
+	class = SECCLASS_X_RESOURCE;
+	privatePtr = &clients[CLIENT_ID(rec->id)]->devPrivates;
+	obj = dixLookupPrivate(privatePtr, stateKey);
+    } else {
+	/* Yes: use the SID from the resource object itself */
+	class = SELinuxTypeToClass(rec->rtype);
+	privatePtr = DEVPRIV_AT(rec->res, offset);
+	obj = dixLookupPrivate(privatePtr, stateKey);
+    }
+
+    /* If this is a new object that needs labeling, do it now */
+    if (rec->access_mode & DixCreateAccess && offset >= 0) {
+	if (rec->parent)
+	    offset = dixLookupPrivateOffset(rec->ptype);
+	if (rec->parent && offset >= 0)
+	    /* Use the SID of the parent object in the labeling operation */
+	    pobj = dixLookupPrivate(DEVPRIV_AT(rec->parent, offset), stateKey);
+	else
+	    /* Use the SID of the subject */
+	    pobj = subj;
+
+	sidput(obj->sid);
+
+	/* Perform a transition to obtain the final SID */
+	if (avc_compute_create(subj->sid, pobj->sid, class, &obj->sid) < 0) {
+	    ErrorF("XSELinux: a compute_create call failed!\n");
+	    rec->status = BadValue;
+	    return;
+	}
+    }
+
+    /* Perform the security check */
+    auditdata.restype = rec->rtype;
+    auditdata.id = rec->id;
+    rc = SELinuxDoCheck(rec->client, obj, class, rec->access_mode, &auditdata);
+    if (rc != Success)
+	rec->status = rc;
+}
 
 static void
-XSELinuxDrawable(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+SELinuxScreen(CallbackListPtr *pcbl, pointer is_saver, pointer calldata)
 {
-    XaceDrawableAccessRec *rec = (XaceDrawableAccessRec*)calldata;
-    if (IDPerm(rec->client, rec->pDraw->id,
-               SECCLASS_DRAWABLE, DRAWABLE__COPY) != Success)
-	rec->status = BadAccess;
-} /* XSELinuxDrawable */
+    XaceScreenAccessRec *rec = calldata;
+    SELinuxStateRec *subj, *obj;
+    SELinuxAuditRec auditdata = { NULL, NULL, 0, 0, 0, NULL };
+    Mask access_mode = rec->access_mode;
+    int rc;
+
+    subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
+    obj = dixLookupPrivate(&rec->screen->devPrivates, stateKey);
+
+    /* If this is a new object that needs labeling, do it now */
+    if (access_mode & DixCreateAccess) {
+	sidput(obj->sid);
+
+	/* Perform a transition to obtain the final SID */
+	if (avc_compute_create(subj->sid, subj->sid, SECCLASS_X_SCREEN,
+			       &obj->sid) < 0) {
+	    ErrorF("XSELinux: a compute_create call failed!\n");
+	    rec->status = BadValue;
+	    return;
+	}
+    }
+
+    if (is_saver)
+	access_mode <<= 2;
+
+    rc = SELinuxDoCheck(rec->client, obj, SECCLASS_X_SCREEN,
+			access_mode, &auditdata);
+    if (rc != Success)
+	rec->status = rc;
+}
 
 static void
-XSELinuxServer(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+SELinuxClient(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
-    XaceServerAccessRec *rec = (XaceServerAccessRec*)calldata;
-    access_vector_t perm = (rec->access_mode == DixReadAccess) ?
-	XSERVER__GETHOSTLIST : XSERVER__SETHOSTLIST;
+    XaceClientAccessRec *rec = calldata;
+    SELinuxStateRec *obj;
+    SELinuxAuditRec auditdata = { NULL, NULL, 0, 0, 0, NULL };
+    int rc;
 
-    if (ServerPerm(rec->client, SECCLASS_XSERVER, perm) != Success)
-	rec->status = BadAccess;
-} /* XSELinuxServer */
+    obj = dixLookupPrivate(&rec->target->devPrivates, stateKey);
+
+    rc = SELinuxDoCheck(rec->client, obj, SECCLASS_X_CLIENT,
+			rec->access_mode, &auditdata);
+    if (rc != Success)
+	rec->status = rc;
+}
+
+static void
+SELinuxServer(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+{
+    XaceServerAccessRec *rec = calldata;
+    SELinuxStateRec *obj;
+    SELinuxAuditRec auditdata = { NULL, NULL, 0, 0, 0, NULL };
+    int rc;
+
+    obj = dixLookupPrivate(&serverClient->devPrivates, stateKey);
+
+    rc = SELinuxDoCheck(rec->client, obj, SECCLASS_X_SERVER,
+			rec->access_mode, &auditdata);
+    if (rc != Success)
+	rec->status = rc;
+}
 
 /* Extension callbacks */
 static void
-XSELinuxClientState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+SELinuxStateInit(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
-    NewClientInfoRec *pci = (NewClientInfoRec *)calldata;
+    PrivateCallbackRec *rec = calldata;
+    SELinuxStateRec *state = *rec->value;
+
+    sidget(unlabeled_sid);
+    state->sid = unlabeled_sid;
+
+    avc_entry_ref_init(&state->aeref);
+}
+
+static void
+SELinuxStateFree(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+{
+    PrivateCallbackRec *rec = calldata;
+    SELinuxStateRec *state = *rec->value;
+
+    xfree(state->client_path);
+
+    if (avc_active)
+	sidput(state->sid);
+}
+
+static void
+SELinuxClientState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+{
+    NewClientInfoRec *pci = calldata;
     ClientPtr client = pci->client;
+    XtransConnInfo ci = ((OsCommPtr)client->osPrivate)->trans_conn;
+    SELinuxStateRec *state;
+    security_context_t ctx;
 
-    switch(client->clientState)
-    {
-    case ClientStateInitial:
-	AssignServerState();
-	break;
+    if (client->clientState != ClientStateInitial)
+	return;
 
-	case ClientStateRunning:
-	{
-	    AssignClientState(client);
-	    break;
-	}
-	case ClientStateGone:
-	case ClientStateRetained:
-	{
-	    FreeClientState(client);
-	    break;
-	}
-	default: break;
-    }
-} /* XSELinuxClientState */
+    state = dixLookupPrivate(&client->devPrivates, stateKey);
+    sidput(state->sid);
+
+    if (_XSERVTransIsLocal(ci)) {
+	int fd = _XSERVTransGetConnectionNumber(ci);
+	struct ucred creds;
+	socklen_t len = sizeof(creds);
+	char path[PATH_MAX + 1];
+	size_t bytes;
+
+	/* For local clients, can get context from the socket */
+	if (getpeercon(fd, &ctx) < 0)
+	    FatalError("Client %d: couldn't get context from socket\n",
+		       client->index);
+
+	/* Try and determine the client's executable name */
+	memset(&creds, 0, sizeof(creds));
+	if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &creds, &len) < 0)
+	    goto finish;
+
+	snprintf(path, PATH_MAX + 1, "/proc/%d/cmdline", creds.pid);
+	fd = open(path, O_RDONLY);
+	if (fd < 0)
+	    goto finish;
+
+	bytes = read(fd, path, PATH_MAX + 1);
+	close(fd);
+	if (bytes <= 0)
+	    goto finish;
+
+	state->client_path = xalloc(bytes);
+	if (!state->client_path)
+	    goto finish;
+
+	memcpy(state->client_path, path, bytes);
+	state->client_path[bytes - 1] = 0;
+    } else
+	/* For remote clients, need to use a default context */
+	if (selabel_lookup(label_hnd, &ctx, NULL, SELABEL_X_CLIENT) < 0)
+	    FatalError("Client %d: couldn't get default remote context\n",
+		       client->index);
+
+finish:
+    /* Get a SID from the context */
+    if (avc_context_to_sid(ctx, &state->sid) < 0)
+	FatalError("Client %d: context_to_sid(%s) failed\n",
+		   client->index, ctx);
+
+    freecon(ctx);
+}
 
 /* Labeling callbacks */
 static void
-XSELinuxResourceState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+SELinuxResourceState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
-    ResourceStateInfoRec *rec = (ResourceStateInfoRec *)calldata;
+    ResourceStateInfoRec *rec = calldata;
+    SELinuxStateRec *state;
     WindowPtr pWin;
-    ClientPtr client;
-    security_context_t ctx;
-    int rc;
 
     if (rec->type != RT_WINDOW)
 	return;
 
     pWin = (WindowPtr)rec->value;
-    client = wClient(pWin);
+    state = dixLookupPrivate(&wClient(pWin)->devPrivates, stateKey);
 
-    if (HAVESTATE(client)) {
-	rc = avc_sid_to_context(SID(client), &ctx);
+    if (state->sid) {
+	security_context_t ctx;
+	int rc = avc_sid_to_context(state->sid, &ctx);
 	if (rc < 0)
 	    FatalError("XSELinux: Failed to get security context!\n");
 	rc = dixChangeWindowProperty(serverClient,
 				     pWin, atom_client_ctx, XA_STRING, 8,
 				     PropModeReplace, strlen(ctx), ctx, FALSE);
+	if (rc != Success)
+	    FatalError("XSELinux: Failed to set label property on window!\n");
 	freecon(ctx);
     }
     else
+	FatalError("XSELinux: Unexpected unlabeled client found\n");
+
+    state = dixLookupPrivate(&pWin->devPrivates, stateKey);
+
+    if (state->sid) {
+	security_context_t ctx;
+	int rc = avc_sid_to_context(state->sid, &ctx);
+	if (rc < 0)
+	    FatalError("XSELinux: Failed to get security context!\n");
 	rc = dixChangeWindowProperty(serverClient,
-				     pWin, atom_client_ctx, XA_STRING, 8,
-				     PropModeReplace, 10, "UNLABELED!", FALSE);
-    if (rc != Success)
-	FatalError("XSELinux: Failed to set context property on window!\n");
-} /* XSELinuxResourceState */
-
-static Bool
-XSELinuxLoadConfigFile(void)
-{
-    struct selinux_opt options[] = {
-	{ SELABEL_OPT_PATH, XSELINUXCONFIGFILE },
-	{ SELABEL_OPT_VALIDATE, (char *)1 },
-    };
-
-    if (!XSELINUXCONFIGFILE)
-        return FALSE;
-
-    label_hnd = selabel_open(SELABEL_CTX_X, options, 2);
-    return !!label_hnd;
-} /* XSELinuxLoadConfigFile */
-
-static void
-XSELinuxFreeConfigData(void)
-{
-    selabel_close(label_hnd);
-    label_hnd = NULL;
-} /* XSELinuxFreeConfigData */
+				     pWin, atom_ctx, XA_STRING, 8,
+				     PropModeReplace, strlen(ctx), ctx, FALSE);
+	if (rc != Success)
+	    FatalError("XSELinux: Failed to set label property on window!\n");
+	freecon(ctx);
+    }
+    else
+	FatalError("XSELinux: Unexpected unlabeled window found\n");
+}
 
 /* Extension dispatch functions */
 static int
-ProcXSELinuxDispatch(ClientPtr client)
+ProcSELinuxDispatch(ClientPtr client)
 {
     return BadRequest;
-} /* ProcXSELinuxDispatch */
+}
 
 static void
-XSELinuxResetProc(ExtensionEntry *extEntry)
+SELinuxResetProc(ExtensionEntry *extEntry)
 {
-    FreeClientState(serverClient);
+    /* XXX unregister all callbacks here */
 
-    XSELinuxFreeConfigData();
+    selabel_close(label_hnd);
+    label_hnd = NULL;
 
     audit_close(audit_fd);
 
     avc_destroy();
-} /* XSELinuxResetProc */
+    avc_active = 0;
 
-static void
-XSELinuxAVCAudit(void *auditdata,
-		 security_class_t class,
-		 char *msgbuf,
-		 size_t msgbufsize)
-{
-    XSELinuxAuditRec *audit = (XSELinuxAuditRec*)auditdata;
-    ClientPtr client = audit->client;
-    char requestNum[8];
-    REQUEST(xReq);
-
-    if (stuff)
-	snprintf(requestNum, 8, "%d", stuff->reqType);
-
-    snprintf(msgbuf, msgbufsize, "%s%s%s%s%s%s",
-	     stuff ? "request=" : "",
-	     stuff ? requestNum : "",
-	     audit->property ? " property=" : "",
-	     audit->property ? audit->property : "",
-	     audit->extension ? " extension=" : "",
-	     audit->extension ? audit->extension : "");
+    xfree(knownTypes);
+    knownTypes = NULL;
+    numKnownTypes = 0;
 }
 
-static void
-XSELinuxAVCLog(const char *fmt, ...)
+static int
+SELinuxAudit(void *auditdata,
+	     security_class_t class,
+	     char *msgbuf,
+	     size_t msgbufsize)
+{
+    SELinuxAuditRec *audit = auditdata;
+    ClientPtr client = audit->client;
+    char idNum[16], *propertyName;
+    int major = 0, minor = 0;
+    REQUEST(xReq);
+
+    if (audit->id)
+	snprintf(idNum, 16, "%x", audit->id);
+    if (stuff) {
+	major = stuff->reqType;
+	minor = (major < 128) ? 0 : MinorOpcodeOfRequest(client);
+    }
+
+    propertyName = audit->property ? NameForAtom(audit->property) : NULL;
+
+    return snprintf(msgbuf, msgbufsize, "%s%s%s%s%s%s%s%s%s%s%s%s",
+		    stuff ? "request=" : "",
+		    stuff ? LookupRequestName(major, minor) : "",
+		    audit->client_path ? " client=" : "",
+		    audit->client_path ? audit->client_path : "",
+		    audit->id ? " resid=" : "",
+		    audit->id ? idNum : "",
+		    audit->restype ? " restype=" : "",
+		    audit->restype ? LookupResourceName(audit->restype) : "",
+		    audit->property ? " property=" : "",
+		    audit->property ? propertyName : "",
+		    audit->extension ? " extension=" : "",
+		    audit->extension ? audit->extension : "");
+}
+
+static int
+SELinuxLog(int type, const char *fmt, ...)
 {
     va_list ap;
     va_start(ap, fmt);
     VErrorF(fmt, ap);
     va_end(ap);
+    return 0;
 }
 
-/* XSELinuxExtensionSetup
- *
- * Set up the XSELinux Extension (pre-init)
- */
-void
-XSELinuxExtensionSetup(INITARGS)
+static void
+SELinuxFixupLabels(void)
 {
-    /* Allocate the client private index */
-    clientPrivateIndex = AllocateClientPrivateIndex();
-    if (!AllocateClientPrivate(clientPrivateIndex,
-			       sizeof (XSELinuxClientStateRec)))
-	FatalError("XSELinux: Failed to allocate client private.\n");
+    int i;
+    XaceScreenAccessRec srec;
+    SELinuxStateRec *state;
+    security_context_t ctx;
+    pointer unused;
 
-    /* Allocate the extension private index */
-    extnsnPrivateIndex = AllocateExtensionPrivateIndex();
-    if (!AllocateExtensionPrivate(extnsnPrivateIndex, 0))
-	FatalError("XSELinux: Failed to allocate extension private.\n");
+    /* Do the serverClient */
+    state = dixLookupPrivate(&serverClient->devPrivates, stateKey);
+    sidput(state->sid);
+
+    /* Use the context of the X server process for the serverClient */
+    if (getcon(&ctx) < 0)
+	FatalError("Couldn't get context of X server process\n");
+
+    /* Get a SID from the context */
+    if (avc_context_to_sid(ctx, &state->sid) < 0)
+	FatalError("serverClient: context_to_sid(%s) failed\n", ctx);
+
+    freecon(ctx);
+
+    srec.client = serverClient;
+    srec.access_mode = DixCreateAccess;
+    srec.status = Success;
+
+    for (i = 0; i < screenInfo.numScreens; i++) {
+	/* Do the screen object */
+	srec.screen = screenInfo.screens[i];
+	SELinuxScreen(NULL, NULL, &srec);
+
+	/* Do the default colormap */
+	dixLookupResource(&unused, screenInfo.screens[i]->defColormap,
+			  RT_COLORMAP, serverClient, DixCreateAccess);
+    }
 }
 
-/* XSELinuxExtensionInit
- *
- * Initialize the XSELinux Extension
- */
 void
 XSELinuxExtensionInit(INITARGS)
 {
-    ExtensionEntry	*extEntry;
-    struct avc_log_callback alc = {XSELinuxAVCLog, XSELinuxAVCAudit};
+    ExtensionEntry *extEntry;
+    struct selinux_opt options[] = { { SELABEL_OPT_VALIDATE, (char *)1 } };
+    security_context_t con;
+    int ret = TRUE;
 
-    if (!is_selinux_enabled())
-    {
+    /* Setup SELinux stuff */
+    if (!is_selinux_enabled()) {
         ErrorF("XSELinux: Extension failed to load: SELinux not enabled\n");
         return;
     }
 
-    if (selinux_set_mapping(map) < 0) {
+    selinux_set_callback(SELINUX_CB_LOG, (union selinux_callback)SELinuxLog);
+    selinux_set_callback(SELINUX_CB_AUDIT, (union selinux_callback)SELinuxAudit);
+
+    if (selinux_set_mapping(map) < 0)
 	FatalError("XSELinux: Failed to set up security class mapping\n");
-    }
 
-    if (avc_init("xserver", NULL, &alc, NULL, NULL) < 0)
-    {
+    if (avc_open(NULL, 0) < 0)
 	FatalError("XSELinux: Couldn't initialize SELinux userspace AVC\n");
-    }
+    avc_active = 1;
 
-    if (!AddCallback(&ClientStateCallback, XSELinuxClientState, NULL))
-	return;
-    if (!AddCallback(&ResourceStateCallback, XSELinuxResourceState, NULL))
-	return;
+    label_hnd = selabel_open(SELABEL_CTX_X, options, 1);
+    if (!label_hnd)
+	FatalError("XSELinux: Failed to open x_contexts mapping in policy\n");
+
+    if (security_get_initial_context("unlabeled", &con) < 0)
+	FatalError("XSELinux: Failed to look up unlabeled context\n");
+    if (avc_context_to_sid(con, &unlabeled_sid) < 0)
+	FatalError("XSELinux: a context_to_SID call failed!\n");
+    freecon(con);
+
+    /* Prepare for auditing */
+    audit_fd = audit_open();
+    if (audit_fd < 0)
+        FatalError("XSELinux: Failed to open the system audit log\n");
+
+    /* Allocate private storage */
+    if (!dixRequestPrivate(stateKey, sizeof(SELinuxStateRec)))
+	FatalError("XSELinux: Failed to allocate private storage.\n");
 
     /* Create atoms for doing window labeling */
-    atom_ctx = MakeAtom("_SELINUX_CONTEXT", 16, 1);
+    atom_ctx = MakeAtom("_SELINUX_CONTEXT", 16, TRUE);
     if (atom_ctx == BAD_RESOURCE)
 	FatalError("XSELinux: Failed to create atom\n");
-    atom_client_ctx = MakeAtom("_SELINUX_CLIENT_CONTEXT", 23, 1);
+    atom_client_ctx = MakeAtom("_SELINUX_CLIENT_CONTEXT", 23, TRUE);
     if (atom_client_ctx == BAD_RESOURCE)
 	FatalError("XSELinux: Failed to create atom\n");
 
-    /* Load the config file.  If this fails, shut down the server,
-     * since an unknown security status is worse than no security.
-     */
-    if (XSELinuxLoadConfigFile() != TRUE)
-    {
-	FatalError("XSELinux: Failed to load security policy\n");
-    }
+    /* Register callbacks */
+    ret &= dixRegisterPrivateInitFunc(stateKey, SELinuxStateInit, NULL);
+    ret &= dixRegisterPrivateDeleteFunc(stateKey, SELinuxStateFree, NULL);
 
-    /* prepare for auditing */
-    audit_fd = audit_open();
-    if (audit_fd < 0)
-    {
-        FatalError("XSELinux: Failed to open the system audit log\n");
-    }
+    ret &= AddCallback(&ClientStateCallback, SELinuxClientState, 0);
+    ret &= AddCallback(&ResourceStateCallback, SELinuxResourceState, 0);
 
-    /* register security callbacks */
-    XaceRegisterCallback(XACE_CORE_DISPATCH, XSELinuxCoreDispatch, NULL);
-    XaceRegisterCallback(XACE_EXT_ACCESS, XSELinuxExtDispatch, NULL);
-    XaceRegisterCallback(XACE_EXT_DISPATCH, XSELinuxExtDispatch, NULL);
-    XaceRegisterCallback(XACE_RESOURCE_ACCESS, XSELinuxResLookup, NULL);
-    XaceRegisterCallback(XACE_MAP_ACCESS, XSELinuxMap, NULL);
-    XaceRegisterCallback(XACE_SERVER_ACCESS, XSELinuxServer, NULL);
-    XaceRegisterCallback(XACE_PROPERTY_ACCESS, XSELinuxProperty, NULL);
-    /* XaceRegisterCallback(XACE_DECLARE_EXT_SECURE, XSELinuxDeclare, NULL);
-    XaceRegisterCallback(XACE_DEVICE_ACCESS, XSELinuxDevice, NULL); */
+    ret &= XaceRegisterCallback(XACE_EXT_DISPATCH, SELinuxExtension, 0);
+    ret &= XaceRegisterCallback(XACE_RESOURCE_ACCESS, SELinuxResource, 0);
+//    ret &= XaceRegisterCallback(XACE_DEVICE_ACCESS, SELinuxDevice, 0);
+    ret &= XaceRegisterCallback(XACE_PROPERTY_ACCESS, SELinuxProperty, 0);
+//    ret &= XaceRegisterCallback(XACE_SEND_ACCESS, SELinuxSend, 0);
+//    ret &= XaceRegisterCallback(XACE_RECEIVE_ACCESS, SELinuxReceive, 0);
+    ret &= XaceRegisterCallback(XACE_CLIENT_ACCESS, SELinuxClient, 0);
+    ret &= XaceRegisterCallback(XACE_EXT_ACCESS, SELinuxExtension, 0);
+    ret &= XaceRegisterCallback(XACE_SERVER_ACCESS, SELinuxServer, 0);
+//    ret &= XaceRegisterCallback(XACE_SELECTION_ACCESS, SELinuxSelection, 0);
+    ret &= XaceRegisterCallback(XACE_SCREEN_ACCESS, SELinuxScreen, 0);
+    ret &= XaceRegisterCallback(XACE_SCREENSAVER_ACCESS, SELinuxScreen, &ret);
+    if (!ret)
+	FatalError("XSELinux: Failed to register one or more callbacks\n");
 
-    /* register extension with server */
+    /* Add extension to server */
     extEntry = AddExtension(XSELINUX_EXTENSION_NAME,
 			    XSELinuxNumberEvents, XSELinuxNumberErrors,
-			    ProcXSELinuxDispatch, ProcXSELinuxDispatch,
-			    XSELinuxResetProc, StandardMinorOpcode);
+			    ProcSELinuxDispatch, ProcSELinuxDispatch,
+			    SELinuxResetProc, StandardMinorOpcode);
+
+    /* Label objects that were created before we could register ourself */
+    SELinuxFixupLabels();
 }
diff --git a/Xext/xselinux.h b/Xext/xselinux.h
index 57fcbb20f..02ec86bf3 100644
--- a/Xext/xselinux.h
+++ b/Xext/xselinux.h
@@ -20,6 +20,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef _XSELINUX_H
 #define _XSELINUX_H
 
+#include "dixaccess.h"
+
 /* Extension info */
 #define XSELINUX_EXTENSION_NAME		"SELinux"
 #define XSELINUX_MAJOR_VERSION		1
@@ -28,95 +30,18 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define XSELinuxNumberErrors		0
 
 /* Private Flask definitions */
-#define SECCLASS_DRAWABLE		1
-#define DRAWABLE__CREATE		0x00000001UL
-#define DRAWABLE__DESTROY		0x00000002UL
-#define DRAWABLE__DRAW			0x00000004UL
-#define DRAWABLE__COPY			0x00000008UL
-#define DRAWABLE__GETATTR		0x00000010UL
-#define SECCLASS_WINDOW			2
-#define WINDOW__ADDCHILD		0x00000001UL
-#define WINDOW__CREATE			0x00000002UL
-#define WINDOW__DESTROY			0x00000004UL
-#define WINDOW__MAP			0x00000008UL
-#define WINDOW__UNMAP			0x00000010UL
-#define WINDOW__CHSTACK			0x00000020UL
-#define WINDOW__CHPROPLIST		0x00000040UL
-#define WINDOW__CHPROP			0x00000080UL
-#define WINDOW__LISTPROP		0x00000100UL
-#define WINDOW__GETATTR			0x00000200UL
-#define WINDOW__SETATTR			0x00000400UL
-#define WINDOW__SETFOCUS		0x00000800UL
-#define WINDOW__MOVE			0x00001000UL
-#define WINDOW__CHSELECTION		0x00002000UL
-#define WINDOW__CHPARENT		0x00004000UL
-#define WINDOW__CTRLLIFE		0x00008000UL
-#define WINDOW__ENUMERATE		0x00010000UL
-#define WINDOW__TRANSPARENT		0x00020000UL
-#define WINDOW__MOUSEMOTION		0x00040000UL
-#define WINDOW__CLIENTCOMEVENT		0x00080000UL
-#define WINDOW__INPUTEVENT		0x00100000UL
-#define WINDOW__DRAWEVENT		0x00200000UL
-#define WINDOW__WINDOWCHANGEEVENT	0x00400000UL
-#define WINDOW__WINDOWCHANGEREQUEST	0x00800000UL
-#define WINDOW__SERVERCHANGEEVENT	0x01000000UL
-#define WINDOW__EXTENSIONEVENT		0x02000000UL
-#define SECCLASS_GC			3
-#define GC__CREATE			0x00000001UL
-#define GC__FREE			0x00000002UL
-#define GC__GETATTR			0x00000004UL
-#define GC__SETATTR			0x00000008UL
-#define SECCLASS_FONT			4
-#define FONT__LOAD			0x00000001UL
-#define FONT__FREE			0x00000002UL
-#define FONT__GETATTR			0x00000004UL
-#define FONT__USE			0x00000008UL
-#define SECCLASS_COLORMAP		5
-#define COLORMAP__CREATE		0x00000001UL
-#define COLORMAP__FREE			0x00000002UL
-#define COLORMAP__INSTALL		0x00000004UL
-#define COLORMAP__UNINSTALL		0x00000008UL
-#define COLORMAP__LIST			0x00000010UL
-#define COLORMAP__READ			0x00000020UL
-#define COLORMAP__STORE			0x00000040UL
-#define COLORMAP__GETATTR		0x00000080UL
-#define COLORMAP__SETATTR		0x00000100UL
-#define SECCLASS_PROPERTY		6
-#define PROPERTY__CREATE		0x00000001UL
-#define PROPERTY__FREE			0x00000002UL
-#define PROPERTY__READ			0x00000004UL
-#define PROPERTY__WRITE			0x00000008UL
-#define SECCLASS_CURSOR			7
-#define CURSOR__CREATE			0x00000001UL
-#define CURSOR__CREATEGLYPH		0x00000002UL
-#define CURSOR__FREE			0x00000004UL
-#define CURSOR__ASSIGN			0x00000008UL
-#define CURSOR__SETATTR			0x00000010UL
-#define SECCLASS_XCLIENT		8
-#define XCLIENT__KILL			0x00000001UL
-#define SECCLASS_XINPUT			9
-#define XINPUT__LOOKUP			0x00000001UL
-#define XINPUT__GETATTR			0x00000002UL
-#define XINPUT__SETATTR			0x00000004UL
-#define XINPUT__SETFOCUS		0x00000008UL
-#define XINPUT__WARPPOINTER		0x00000010UL
-#define XINPUT__ACTIVEGRAB		0x00000020UL
-#define XINPUT__PASSIVEGRAB		0x00000040UL
-#define XINPUT__UNGRAB			0x00000080UL
-#define XINPUT__BELL			0x00000100UL
-#define XINPUT__MOUSEMOTION		0x00000200UL
-#define XINPUT__RELABELINPUT		0x00000400UL
-#define SECCLASS_XSERVER		10
-#define XSERVER__SCREENSAVER		0x00000001UL
-#define XSERVER__GETHOSTLIST		0x00000002UL
-#define XSERVER__SETHOSTLIST		0x00000004UL
-#define XSERVER__GETFONTPATH		0x00000008UL
-#define XSERVER__SETFONTPATH		0x00000010UL
-#define XSERVER__GETATTR		0x00000020UL
-#define XSERVER__GRAB			0x00000040UL
-#define XSERVER__UNGRAB			0x00000080UL
-#define SECCLASS_XEXTENSION		11
-#define XEXTENSION__QUERY		0x00000001UL
-#define XEXTENSION__USE			0x00000002UL
+#define SECCLASS_X_DRAWABLE		1
+#define SECCLASS_X_SCREEN		2
+#define SECCLASS_X_GC			3
+#define SECCLASS_X_FONT			4
+#define SECCLASS_X_COLORMAP		5
+#define SECCLASS_X_PROPERTY		6
+#define SECCLASS_X_SELECTION		7
+#define SECCLASS_X_CURSOR		8
+#define SECCLASS_X_CLIENT		9
+#define SECCLASS_X_DEVICE		10
+#define SECCLASS_X_SERVER		11
+#define SECCLASS_X_EXTENSION		12
+#define SECCLASS_X_RESOURCE		13
 
 #endif /* _XSELINUX_H */
diff --git a/configure.ac b/configure.ac
index e73e250bd..8901faec3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -511,7 +511,7 @@ AC_ARG_ENABLE(xinerama,	      AS_HELP_STRING([--disable-xinerama], [Build Xinera
 AC_ARG_ENABLE(xf86vidmode,    AS_HELP_STRING([--disable-xf86vidmode], [Build XF86VidMode extension (default: auto)]), [XF86VIDMODE=$enableval], [XF86VIDMODE=auto])
 AC_ARG_ENABLE(xf86misc,       AS_HELP_STRING([--disable-xf86misc], [Build XF86Misc extension (default: auto)]), [XF86MISC=$enableval], [XF86MISC=auto])
 AC_ARG_ENABLE(xace,           AS_HELP_STRING([--disable-xace], [Build X-ACE extension (default: enabled)]), [XACE=$enableval], [XACE=yes])
-AC_ARG_ENABLE(xselinux,       AS_HELP_STRING([--disable-xselinux], [Build SELinux extension (TEMPORARILY DISABLED)]), [XSELINUX=no], [XSELINUX=no])
+AC_ARG_ENABLE(xselinux,       AS_HELP_STRING([--disable-xselinux], [Build SELinux extension (default: disabled)]), [XSELINUX=$enableval], [XSELINUX=no])
 AC_ARG_ENABLE(xcsecurity,     AS_HELP_STRING([--disable-xcsecurity], [Build Security extension (TEMPORARILY DISABLED)]), [XCSECURITY=no], [XCSECURITY=no])
 AC_ARG_ENABLE(appgroup,       AS_HELP_STRING([--disable-appgroup], [Build XC-APPGROUP extension (default: enabled)]), [APPGROUP=$enableval], [APPGROUP=$XCSECURITY])
 AC_ARG_ENABLE(xcalibrate,     AS_HELP_STRING([--enable-xcalibrate], [Build XCalibrate extension (default: disabled)]), [XCALIBRATE=$enableval], [XCALIBRATE=no])
diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h
index fb75092c7..191b3ef89 100644
--- a/hw/xfree86/dixmods/extmod/modinit.h
+++ b/hw/xfree86/dixmods/extmod/modinit.h
@@ -130,7 +130,6 @@ extern void XaceExtensionInit(INITARGS);
 #endif
 
 #ifdef XSELINUX
-extern void XSELinuxExtensionSetup(INITARGS);
 extern void XSELinuxExtensionInit(INITARGS);
 #endif
 
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 964ef3e0e..2540975ac 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -324,7 +324,6 @@ extern void XaceExtensionInit(INITARGS);
 extern void SecurityExtensionInit(INITARGS);
 #endif
 #ifdef XSELINUX
-extern void XSELinuxExtensionSetup(INITARGS);
 extern void XSELinuxExtensionInit(INITARGS);
 #endif
 #ifdef XPRINT
@@ -537,9 +536,6 @@ InitExtensions(argc, argv)
     int		argc;
     char	*argv[];
 {
-#ifdef XSELINUX
-    XSELinuxExtensionSetup();
-#endif
 #ifdef PANORAMIX
 # if !defined(PRINT_ONLY_SERVER) && !defined(NO_PANORAMIX)
   if (!noPanoramiXExtension) PanoramiXExtensionInit();
@@ -718,7 +714,7 @@ static ExtensionModule staticExtensions[] = {
     { SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension, NULL, NULL },
 #endif
 #ifdef XSELINUX
-    { XSELinuxExtensionInit, XSELINUX_EXTENSION_NAME, NULL, XSELinuxExtensionSetup, NULL },
+    { XSELinuxExtensionInit, XSELINUX_EXTENSION_NAME, NULL, NULL, NULL },
 #endif
 #ifdef XPRINT
     { XpExtensionInit, XP_PRINTNAME, NULL, NULL, NULL },

From af4dde0ac19ecec1d0ad988eb25b15401e7c6b36 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 17 Oct 2007 14:13:02 -0400
Subject: [PATCH 172/552] xselinux: Remove config file, this has been moved to
 the policy.

---
 Xext/Makefile.am    |   3 -
 Xext/XSELinuxConfig | 133 --------------------------------------------
 2 files changed, 136 deletions(-)
 delete mode 100644 Xext/XSELinuxConfig

diff --git a/Xext/Makefile.am b/Xext/Makefile.am
index 2423c8396..6fe1c3488 100644
--- a/Xext/Makefile.am
+++ b/Xext/Makefile.am
@@ -80,9 +80,6 @@ endif
 XSELINUX_SRCS = xselinux.c xselinux.h
 if XSELINUX
 BUILTIN_SRCS += $(XSELINUX_SRCS)
-
-SERVERCONFIG_DATA += XSELinuxConfig
-AM_CFLAGS += -DXSELINUXCONFIGFILE=\"$(SERVERCONFIGdir)/XSELinuxConfig\"
 endif
 
 # Security extension: multi-level security to protect clients from each other
diff --git a/Xext/XSELinuxConfig b/Xext/XSELinuxConfig
deleted file mode 100644
index 66f93c56d..000000000
--- a/Xext/XSELinuxConfig
+++ /dev/null
@@ -1,133 +0,0 @@
-#
-# Config file for XSELinux extension
-#
-
-#
-# The default client rule defines a context to be used for all clients
-# connecting to the server from a remote host.
-#
-client	*				system_u:object_r:remote_xclient_t:s0
-
-#
-# Property rules map a property name to a context.  A default property
-# rule indicated by an asterisk should follow all other property rules.
-#
-# Properties set by typical clients: WM, _NET_WM, etc.
-property WM_NAME			system_u:object_r:client_xproperty_t:s0
-property WM_CLASS			system_u:object_r:client_xproperty_t:s0
-property WM_ICON_NAME			system_u:object_r:client_xproperty_t:s0
-property WM_HINTS			system_u:object_r:client_xproperty_t:s0
-property WM_NORMAL_HINTS		system_u:object_r:client_xproperty_t:s0
-property WM_COMMAND			system_u:object_r:client_xproperty_t:s0
-property WM_CLIENT_MACHINE		system_u:object_r:client_xproperty_t:s0
-property WM_LOCALE_NAME			system_u:object_r:client_xproperty_t:s0
-property WM_CLIENT_LEADER		system_u:object_r:client_xproperty_t:s0
-property WM_STATE			system_u:object_r:client_xproperty_t:s0
-property WM_PROTOCOLS			system_u:object_r:client_xproperty_t:s0
-property WM_WINDOW_ROLE			system_u:object_r:client_xproperty_t:s0
-property WM_TRANSIENT_FOR		system_u:object_r:client_xproperty_t:s0
-property _NET_WM_NAME			system_u:object_r:client_xproperty_t:s0
-property _NET_WM_ICON			system_u:object_r:client_xproperty_t:s0
-property _NET_WM_ICON_NAME		system_u:object_r:client_xproperty_t:s0
-property _NET_WM_PID			system_u:object_r:client_xproperty_t:s0
-property _NET_WM_STATE			system_u:object_r:client_xproperty_t:s0
-property _NET_WM_DESKTOP		system_u:object_r:client_xproperty_t:s0
-property _NET_WM_SYNC_REQUEST_COUNTER	system_u:object_r:client_xproperty_t:s0
-property _NET_WM_WINDOW_TYPE		system_u:object_r:client_xproperty_t:s0
-property _NET_WM_USER_TIME		system_u:object_r:client_xproperty_t:s0
-property _MOTIF_DRAG_RECEIVER_INFO	system_u:object_r:client_xproperty_t:s0
-property XdndAware			system_u:object_r:client_xproperty_t:s0
-
-# Properties written by xrdb
-property RESOURCE_MANAGER		system_u:object_r:rm_xproperty_t:s0
-property SCREEN_RESOURCES		system_u:object_r:rm_xproperty_t:s0
-
-# Properties written by window managers
-property _MIT_PRIORITY_COLORS		system_u:object_r:wm_xproperty_t:s0
-
-# Properties used for security labeling
-property _SELINUX_CLIENT_CONTEXT	system_u:object_r:seclabel_xproperty_t:s0
-
-# Properties used to communicate screen information
-property XFree86_VT			system_u:object_r:info_xproperty_t:s0
-property XFree86_DDC_EDID1_RAWDATA	system_u:object_r:info_xproperty_t:s0
-
-# Clipboard and selection properties
-property CUT_BUFFER0			system_u:object_r:clipboard_xproperty_t:s0
-property CUT_BUFFER1			system_u:object_r:clipboard_xproperty_t:s0
-property CUT_BUFFER2			system_u:object_r:clipboard_xproperty_t:s0
-property CUT_BUFFER3			system_u:object_r:clipboard_xproperty_t:s0
-property CUT_BUFFER4			system_u:object_r:clipboard_xproperty_t:s0
-property CUT_BUFFER5			system_u:object_r:clipboard_xproperty_t:s0
-property CUT_BUFFER6			system_u:object_r:clipboard_xproperty_t:s0
-property CUT_BUFFER7			system_u:object_r:clipboard_xproperty_t:s0
-property _XT_SELECTION_0		system_u:object_r:clipboard_xproperty_t:s0
-
-# Default fallback type
-property *	   			system_u:object_r:unknown_xproperty_t:s0
-
-#
-# Extension rules map an extension name to a context.  A default extension
-# rule indicated by an asterisk should follow all other extension rules.
-#
-# Standard extensions
-extension BIG-REQUESTS			system_u:object_r:std_xext_t:s0
-extension DOUBLE-BUFFER			system_u:object_r:std_xext_t:s0
-extension Extended-Visual-Information	system_u:object_r:std_xext_t:s0
-extension MIT-SUNDRY-NONSTANDARD	system_u:object_r:std_xext_t:s0
-extension SHAPE				system_u:object_r:std_xext_t:s0
-extension SYNC				system_u:object_r:std_xext_t:s0
-extension XC-MISC			system_u:object_r:std_xext_t:s0
-extension XFIXES			system_u:object_r:std_xext_t:s0
-extension XFree86-Misc			system_u:object_r:std_xext_t:s0
-extension XpExtension                   system_u:object_r:std_xext_t:s0
-
-# Screen management and multihead extensions
-extension RANDR				system_u:object_r:output_xext_t:s0
-extension XINERAMA			system_u:object_r:std_xext_t:s0
-
-# Input extensions
-extension XInputExtension		system_u:object_r:input_xext_t:s0
-extension XKEYBOARD			system_u:object_r:input_xext_t:s0
-
-# Screensaver, power management extensions
-extension DPMS				system_u:object_r:screensaver_xext_t:s0
-extension MIT-SCREEN-SAVER		system_u:object_r:screensaver_xext_t:s0
-
-# Fonting extensions
-extension FontCache			system_u:object_r:font_xext_t:s0
-extension XFree86-Bigfont		system_u:object_r:font_xext_t:s0
-
-# Shared memory extensions
-extension MIT-SHM			system_u:object_r:shmem_xext_t:s0
-
-# Accelerated graphics, OpenGL, direct rendering extensions
-extension DAMAGE			system_u:object_r:accelgraphics_xext_t:s0
-extension GLX				system_u:object_r:accelgraphics_xext_t:s0
-extension NV-CONTROL			system_u:object_r:accelgraphics_xext_t:s0
-extension NV-GLX			system_u:object_r:accelgraphics_xext_t:s0
-extension NVIDIA-GLX			system_u:object_r:accelgraphics_xext_t:s0
-extension RENDER			system_u:object_r:std_xext_t:s0
-extension XFree86-DGA			system_u:object_r:accelgraphics_xext_t:s0
-
-# Debugging, testing, and recording extensions
-extension RECORD			system_u:object_r:debug_xext_t:s0
-extension X-Resource			system_u:object_r:debug_xext_t:s0
-extension XTEST				system_u:object_r:debug_xext_t:s0
-
-# Extensions just for window managers
-extension TOG-CUP			system_u:object_r:windowmgr_xext_t:s0
-
-# Security-related extensions
-extension SECURITY			system_u:object_r:security_xext_t:s0
-extension SELinux			system_u:object_r:security_xext_t:s0
-extension XAccessControlExtension	system_u:object_r:security_xext_t:s0
-extension XC-APPGROUP			system_u:object_r:security_xext_t:s0
-
-# Video extensions
-extension XFree86-VidModeExtension	system_u:object_r:video_xext_t:s0
-extension XVideo			system_u:object_r:video_xext_t:s0
-extension XVideo-MotionCompensation	system_u:object_r:video_xext_t:s0
-
-# Default fallback type
-extension *	   			system_u:object_r:unknown_xext_t:s0

From 50b27e1ad2a98d36728dc8157492ef5c59c132cd Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 17 Oct 2007 16:09:40 -0400
Subject: [PATCH 173/552] devPrivates rework: update new GL/glxext code.

Need to merge so this type of thing stops happening.
---
 GL/glx/glxext.c     |  9 ++++-----
 GL/glx/glxscreens.c | 20 +++++---------------
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/GL/glx/glxext.c b/GL/glx/glxext.c
index 4d6bfd7c6..55463c7cf 100644
--- a/GL/glx/glxext.c
+++ b/GL/glx/glxext.c
@@ -27,6 +27,7 @@
 #include "glxserver.h"
 #include <windowstr.h>
 #include <propertyst.h>
+#include "privates.h"
 #include <os.h>
 #include "g_disptab.h"
 #include "unpack.h"
@@ -53,7 +54,7 @@ RESTYPE __glXSwapBarrierRes;
 */
 xGLXSingleReply __glXReply;
 
-static int glxClientPrivateIndex;
+static DevPrivateKey glxClientPrivateKey = &glxClientPrivateKey;
 
 /*
 ** Client that called into GLX dispatch.
@@ -218,7 +219,7 @@ int __glXError(int error)
 __GLXclientState *
 glxGetClient(ClientPtr pClient)
 {
-    return (__GLXclientState *) pClient->devPrivates[glxClientPrivateIndex].ptr;
+    return dixLookupPrivate(&pClient->devPrivates, glxClientPrivateKey);
 }
 
 static void
@@ -288,9 +289,7 @@ void GlxExtensionInit(void)
     __glXDrawableRes = CreateNewResourceType((DeleteType)DrawableGone);
     __glXSwapBarrierRes = CreateNewResourceType((DeleteType)SwapBarrierGone);
 
-    glxClientPrivateIndex = AllocateClientPrivateIndex ();
-    if (!AllocateClientPrivate (glxClientPrivateIndex,
-				sizeof (__GLXclientState)))
+    if (!dixRequestPrivate(glxClientPrivateKey, sizeof (__GLXclientState)))
 	return;
     if (!AddCallback (&ClientStateCallback, glxClientCallback, 0))
 	return;
diff --git a/GL/glx/glxscreens.c b/GL/glx/glxscreens.c
index c6f060b3d..6e4d497f5 100644
--- a/GL/glx/glxscreens.c
+++ b/GL/glx/glxscreens.c
@@ -41,11 +41,12 @@
 #include <windowstr.h>
 #include <os.h>
 
+#include "privates.h"
 #include "glxserver.h"
 #include "glxutil.h"
 #include "glxext.h"
 
-static int glxScreenPrivateIndex;
+static DevPrivateKey glxScreenPrivateKey = &glxScreenPrivateKey;
 
 const char GLServerVersion[] = "1.4";
 static const char GLServerExtensions[] = 
@@ -278,22 +279,11 @@ glxCloseScreen (int index, ScreenPtr pScreen)
 __GLXscreen *
 glxGetScreen(ScreenPtr pScreen)
 {
-    return (__GLXscreen *) pScreen->devPrivates[glxScreenPrivateIndex].ptr;
+    return dixLookupPrivate(&pScreen->devPrivates, glxScreenPrivateKey);
 }
 
 void __glXScreenInit(__GLXscreen *glxScreen, ScreenPtr pScreen)
 {
-    static int glxGeneration;
-
-    if (glxGeneration != serverGeneration)
-    {
-	glxScreenPrivateIndex = AllocateScreenPrivateIndex ();
-	if (glxScreenPrivateIndex == -1)
-	    return;
-
-	glxGeneration = serverGeneration;
-    }
-
     glxScreen->pScreen       = pScreen;
     glxScreen->GLextensions  = xstrdup(GLServerExtensions);
     glxScreen->GLXvendor     = xstrdup(GLXServerVendorName);
@@ -308,9 +298,9 @@ void __glXScreenInit(__GLXscreen *glxScreen, ScreenPtr pScreen)
 
     __glXScreenInitVisuals(glxScreen);
 
-    pScreen->devPrivates[glxScreenPrivateIndex].ptr = (pointer) glxScreen;
+    dixSetPrivate(&pScreen->devPrivates, glxScreenPrivateKey, glxScreen);
 }
- 
+
 void __glXScreenDestroy(__GLXscreen *screen)
 {
     xfree(screen->GLXvendor);

From 503f918f55d0cb29585d83b022bbb8dc29f446c5 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 17 Oct 2007 19:14:15 -0400
Subject: [PATCH 174/552] xselinux: Move functions around; add some more
 comments.

---
 Xext/xselinux.c | 267 +++++++++++++++++++++++++++---------------------
 1 file changed, 150 insertions(+), 117 deletions(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 9ff055484..fc91ae384 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -50,6 +50,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <stdarg.h>
 #include "modinit.h"
 
+
+/*
+ * Globals
+ */
+
 /* private state record */
 static DevPrivateKey stateKey = &stateKey;
 
@@ -108,6 +113,14 @@ static struct security_class_mapping map[] = {
     { NULL }
 };
 
+/* forward declarations */
+static void SELinuxScreen(CallbackListPtr *, pointer, pointer);
+
+
+/*
+ * Support Routines
+ */
+
 /*
  * Returns the object class corresponding to the given resource type.
  */
@@ -150,7 +163,6 @@ SELinuxTypeToClass(RESTYPE type)
 	    knownTypes[type] = SECCLASS_X_FONT;
     }
 
-//    ErrorF("Returning a class of %d for a type of %d\n", knownTypes[type], type);
     return knownTypes[type];
 }
 
@@ -163,8 +175,6 @@ SELinuxDoCheck(ClientPtr client, SELinuxStateRec *obj, security_class_t class,
 {
     SELinuxStateRec *subj;
 
-//    ErrorF("SuperCheck: client=%d, class=%d, access_mode=%x\n", client->index, class, access_mode);
-
     /* serverClient requests OK */
     if (client->index == 0)
 	return Success;
@@ -185,11 +195,101 @@ SELinuxDoCheck(ClientPtr client, SELinuxStateRec *obj, security_class_t class,
     return Success;
 }
 
-//static void
-//SELinuxSelection(CallbackListPtr *pcbl, pointer unused, pointer calldata)
-//{
-//    XaceSelectionAccessRec *rec = calldata;
-//}
+/*
+ * Labels initial server objects.
+ */
+static void
+SELinuxFixupLabels(void)
+{
+    int i;
+    XaceScreenAccessRec srec;
+    SELinuxStateRec *state;
+    security_context_t ctx;
+    pointer unused;
+
+    /* Do the serverClient */
+    state = dixLookupPrivate(&serverClient->devPrivates, stateKey);
+    sidput(state->sid);
+
+    /* Use the context of the X server process for the serverClient */
+    if (getcon(&ctx) < 0)
+	FatalError("Couldn't get context of X server process\n");
+
+    /* Get a SID from the context */
+    if (avc_context_to_sid(ctx, &state->sid) < 0)
+	FatalError("serverClient: context_to_sid(%s) failed\n", ctx);
+
+    freecon(ctx);
+
+    srec.client = serverClient;
+    srec.access_mode = DixCreateAccess;
+    srec.status = Success;
+
+    for (i = 0; i < screenInfo.numScreens; i++) {
+	/* Do the screen object */
+	srec.screen = screenInfo.screens[i];
+	SELinuxScreen(NULL, NULL, &srec);
+
+	/* Do the default colormap */
+	dixLookupResource(&unused, screenInfo.screens[i]->defColormap,
+			  RT_COLORMAP, serverClient, DixCreateAccess);
+    }
+}
+
+
+/*
+ * Libselinux Callbacks
+ */
+
+static int
+SELinuxAudit(void *auditdata,
+	     security_class_t class,
+	     char *msgbuf,
+	     size_t msgbufsize)
+{
+    SELinuxAuditRec *audit = auditdata;
+    ClientPtr client = audit->client;
+    char idNum[16], *propertyName;
+    int major = 0, minor = 0;
+    REQUEST(xReq);
+
+    if (audit->id)
+	snprintf(idNum, 16, "%x", audit->id);
+    if (stuff) {
+	major = stuff->reqType;
+	minor = (major < 128) ? 0 : MinorOpcodeOfRequest(client);
+    }
+
+    propertyName = audit->property ? NameForAtom(audit->property) : NULL;
+
+    return snprintf(msgbuf, msgbufsize, "%s%s%s%s%s%s%s%s%s%s%s%s",
+		    stuff ? "request=" : "",
+		    stuff ? LookupRequestName(major, minor) : "",
+		    audit->client_path ? " comm=" : "",
+		    audit->client_path ? audit->client_path : "",
+		    audit->id ? " resid=" : "",
+		    audit->id ? idNum : "",
+		    audit->restype ? " restype=" : "",
+		    audit->restype ? LookupResourceName(audit->restype) : "",
+		    audit->property ? " property=" : "",
+		    audit->property ? propertyName : "",
+		    audit->extension ? " extension=" : "",
+		    audit->extension ? audit->extension : "");
+}
+
+static int
+SELinuxLog(int type, const char *fmt, ...)
+{
+    va_list ap;
+    va_start(ap, fmt);
+    VErrorF(fmt, ap);
+    va_end(ap);
+    return 0;
+}
+
+/*
+ * XACE Callbacks
+ */
 
 static void
 SELinuxExtension(CallbackListPtr *pcbl, pointer unused, pointer calldata)
@@ -418,30 +518,10 @@ SELinuxServer(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	rec->status = rc;
 }
 
-/* Extension callbacks */
-static void
-SELinuxStateInit(CallbackListPtr *pcbl, pointer unused, pointer calldata)
-{
-    PrivateCallbackRec *rec = calldata;
-    SELinuxStateRec *state = *rec->value;
 
-    sidget(unlabeled_sid);
-    state->sid = unlabeled_sid;
-
-    avc_entry_ref_init(&state->aeref);
-}
-
-static void
-SELinuxStateFree(CallbackListPtr *pcbl, pointer unused, pointer calldata)
-{
-    PrivateCallbackRec *rec = calldata;
-    SELinuxStateRec *state = *rec->value;
-
-    xfree(state->client_path);
-
-    if (avc_active)
-	sidput(state->sid);
-}
+/*
+ * DIX Callbacks
+ */
 
 static void
 SELinuxClientState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
@@ -506,7 +586,6 @@ finish:
     freecon(ctx);
 }
 
-/* Labeling callbacks */
 static void
 SELinuxResourceState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
@@ -553,13 +632,51 @@ SELinuxResourceState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	FatalError("XSELinux: Unexpected unlabeled window found\n");
 }
 
-/* Extension dispatch functions */
+
+/*
+ * DevPrivates Callbacks
+ */
+
+static void
+SELinuxStateInit(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+{
+    PrivateCallbackRec *rec = calldata;
+    SELinuxStateRec *state = *rec->value;
+
+    sidget(unlabeled_sid);
+    state->sid = unlabeled_sid;
+
+    avc_entry_ref_init(&state->aeref);
+}
+
+static void
+SELinuxStateFree(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+{
+    PrivateCallbackRec *rec = calldata;
+    SELinuxStateRec *state = *rec->value;
+
+    xfree(state->client_path);
+
+    if (avc_active)
+	sidput(state->sid);
+}
+
+
+/*
+ * Extension Dispatch
+ */
+
 static int
 ProcSELinuxDispatch(ClientPtr client)
 {
     return BadRequest;
 }
 
+
+/*
+ * Extension Setup / Teardown
+ */
+
 static void
 SELinuxResetProc(ExtensionEntry *extEntry)
 {
@@ -578,90 +695,6 @@ SELinuxResetProc(ExtensionEntry *extEntry)
     numKnownTypes = 0;
 }
 
-static int
-SELinuxAudit(void *auditdata,
-	     security_class_t class,
-	     char *msgbuf,
-	     size_t msgbufsize)
-{
-    SELinuxAuditRec *audit = auditdata;
-    ClientPtr client = audit->client;
-    char idNum[16], *propertyName;
-    int major = 0, minor = 0;
-    REQUEST(xReq);
-
-    if (audit->id)
-	snprintf(idNum, 16, "%x", audit->id);
-    if (stuff) {
-	major = stuff->reqType;
-	minor = (major < 128) ? 0 : MinorOpcodeOfRequest(client);
-    }
-
-    propertyName = audit->property ? NameForAtom(audit->property) : NULL;
-
-    return snprintf(msgbuf, msgbufsize, "%s%s%s%s%s%s%s%s%s%s%s%s",
-		    stuff ? "request=" : "",
-		    stuff ? LookupRequestName(major, minor) : "",
-		    audit->client_path ? " client=" : "",
-		    audit->client_path ? audit->client_path : "",
-		    audit->id ? " resid=" : "",
-		    audit->id ? idNum : "",
-		    audit->restype ? " restype=" : "",
-		    audit->restype ? LookupResourceName(audit->restype) : "",
-		    audit->property ? " property=" : "",
-		    audit->property ? propertyName : "",
-		    audit->extension ? " extension=" : "",
-		    audit->extension ? audit->extension : "");
-}
-
-static int
-SELinuxLog(int type, const char *fmt, ...)
-{
-    va_list ap;
-    va_start(ap, fmt);
-    VErrorF(fmt, ap);
-    va_end(ap);
-    return 0;
-}
-
-static void
-SELinuxFixupLabels(void)
-{
-    int i;
-    XaceScreenAccessRec srec;
-    SELinuxStateRec *state;
-    security_context_t ctx;
-    pointer unused;
-
-    /* Do the serverClient */
-    state = dixLookupPrivate(&serverClient->devPrivates, stateKey);
-    sidput(state->sid);
-
-    /* Use the context of the X server process for the serverClient */
-    if (getcon(&ctx) < 0)
-	FatalError("Couldn't get context of X server process\n");
-
-    /* Get a SID from the context */
-    if (avc_context_to_sid(ctx, &state->sid) < 0)
-	FatalError("serverClient: context_to_sid(%s) failed\n", ctx);
-
-    freecon(ctx);
-
-    srec.client = serverClient;
-    srec.access_mode = DixCreateAccess;
-    srec.status = Success;
-
-    for (i = 0; i < screenInfo.numScreens; i++) {
-	/* Do the screen object */
-	srec.screen = screenInfo.screens[i];
-	SELinuxScreen(NULL, NULL, &srec);
-
-	/* Do the default colormap */
-	dixLookupResource(&unused, screenInfo.screens[i]->defColormap,
-			  RT_COLORMAP, serverClient, DixCreateAccess);
-    }
-}
-
 void
 XSELinuxExtensionInit(INITARGS)
 {

From aa340b2c7cbe9ddab53cff08c8ba165558209187 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 17 Oct 2007 19:27:16 -0400
Subject: [PATCH 175/552] xselinux: add hook for device acceses.

---
 Xext/xselinux.c | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index fc91ae384..8bafa1fec 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -291,6 +291,36 @@ SELinuxLog(int type, const char *fmt, ...)
  * XACE Callbacks
  */
 
+static void
+SELinuxDevice(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+{
+    XaceDeviceAccessRec *rec = calldata;
+    SELinuxStateRec *subj, *obj;
+    SELinuxAuditRec auditdata = { NULL, NULL, 0, 0, 0, NULL };
+    int rc;
+
+    subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
+    obj = dixLookupPrivate(&rec->dev->devPrivates, stateKey);
+
+    /* If this is a new object that needs labeling, do it now */
+    if (rec->access_mode & DixCreateAccess) {
+	sidput(obj->sid);
+
+	/* Perform a transition to obtain the final SID */
+	if (avc_compute_create(subj->sid, subj->sid, SECCLASS_X_DEVICE,
+			       &obj->sid) < 0) {
+	    ErrorF("XSELinux: a compute_create call failed!\n");
+	    rec->status = BadValue;
+	    return;
+	}
+    }
+
+    rc = SELinuxDoCheck(rec->client, obj, SECCLASS_X_DEVICE,
+			rec->access_mode, &auditdata);
+    if (rc != Success)
+	rec->status = rc;
+}
+
 static void
 SELinuxExtension(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
@@ -755,7 +785,7 @@ XSELinuxExtensionInit(INITARGS)
 
     ret &= XaceRegisterCallback(XACE_EXT_DISPATCH, SELinuxExtension, 0);
     ret &= XaceRegisterCallback(XACE_RESOURCE_ACCESS, SELinuxResource, 0);
-//    ret &= XaceRegisterCallback(XACE_DEVICE_ACCESS, SELinuxDevice, 0);
+    ret &= XaceRegisterCallback(XACE_DEVICE_ACCESS, SELinuxDevice, 0);
     ret &= XaceRegisterCallback(XACE_PROPERTY_ACCESS, SELinuxProperty, 0);
 //    ret &= XaceRegisterCallback(XACE_SEND_ACCESS, SELinuxSend, 0);
 //    ret &= XaceRegisterCallback(XACE_RECEIVE_ACCESS, SELinuxReceive, 0);

From e3fd90ae9c3ddfc5d78e62614e311b73505d7ead Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 18 Oct 2007 10:29:10 -0400
Subject: [PATCH 176/552] registry: Add "X11:" prefix to core protocol names.

---
 dix/registry.c | 347 +++++++++++++++++++++++++------------------------
 1 file changed, 174 insertions(+), 173 deletions(-)

diff --git a/dix/registry.c b/dix/registry.c
index 7b521b55d..48e1b5dae 100644
--- a/dix/registry.c
+++ b/dix/registry.c
@@ -29,6 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "registry.h"
 
 #define BASE_SIZE 16
+#define CORE "X11:"
 
 static const char ***requests, **events, **errors, **resources;
 static unsigned nmajor, *nminor, nevent, nerror, nresource;
@@ -195,181 +196,181 @@ dixResetRegistry(void)
     RegisterResourceName(RT_PASSIVEGRAB, "PASSIVE GRAB");
 
     /* Add the core protocol */
-    RegisterRequestName(X_CreateWindow, 0, "CreateWindow");
-    RegisterRequestName(X_ChangeWindowAttributes, 0, "ChangeWindowAttributes");
-    RegisterRequestName(X_GetWindowAttributes, 0, "GetWindowAttributes");
-    RegisterRequestName(X_DestroyWindow, 0, "DestroyWindow");
-    RegisterRequestName(X_DestroySubwindows, 0, "DestroySubwindows");
-    RegisterRequestName(X_ChangeSaveSet, 0, "ChangeSaveSet");
-    RegisterRequestName(X_ReparentWindow, 0, "ReparentWindow");
-    RegisterRequestName(X_MapWindow, 0, "MapWindow");
-    RegisterRequestName(X_MapSubwindows, 0, "MapSubwindows");
-    RegisterRequestName(X_UnmapWindow, 0, "UnmapWindow");
-    RegisterRequestName(X_UnmapSubwindows, 0, "UnmapSubwindows");
-    RegisterRequestName(X_ConfigureWindow, 0, "ConfigureWindow");
-    RegisterRequestName(X_CirculateWindow, 0, "CirculateWindow");
-    RegisterRequestName(X_GetGeometry, 0, "GetGeometry");
-    RegisterRequestName(X_QueryTree, 0, "QueryTree");
-    RegisterRequestName(X_InternAtom, 0, "InternAtom");
-    RegisterRequestName(X_GetAtomName, 0, "GetAtomName");
-    RegisterRequestName(X_ChangeProperty, 0, "ChangeProperty");
-    RegisterRequestName(X_DeleteProperty, 0, "DeleteProperty");
-    RegisterRequestName(X_GetProperty, 0, "GetProperty");
-    RegisterRequestName(X_ListProperties, 0, "ListProperties");
-    RegisterRequestName(X_SetSelectionOwner, 0, "SetSelectionOwner");
-    RegisterRequestName(X_GetSelectionOwner, 0, "GetSelectionOwner");
-    RegisterRequestName(X_ConvertSelection, 0, "ConvertSelection");
-    RegisterRequestName(X_SendEvent, 0, "SendEvent");
-    RegisterRequestName(X_GrabPointer, 0, "GrabPointer");
-    RegisterRequestName(X_UngrabPointer, 0, "UngrabPointer");
-    RegisterRequestName(X_GrabButton, 0, "GrabButton");
-    RegisterRequestName(X_UngrabButton, 0, "UngrabButton");
-    RegisterRequestName(X_ChangeActivePointerGrab, 0, "ChangeActivePointerGrab");
-    RegisterRequestName(X_GrabKeyboard, 0, "GrabKeyboard");
-    RegisterRequestName(X_UngrabKeyboard, 0, "UngrabKeyboard");
-    RegisterRequestName(X_GrabKey, 0, "GrabKey");
-    RegisterRequestName(X_UngrabKey, 0, "UngrabKey");
-    RegisterRequestName(X_AllowEvents, 0, "AllowEvents");
-    RegisterRequestName(X_GrabServer, 0, "GrabServer");
-    RegisterRequestName(X_UngrabServer, 0, "UngrabServer");
-    RegisterRequestName(X_QueryPointer, 0, "QueryPointer");
-    RegisterRequestName(X_GetMotionEvents, 0, "GetMotionEvents");
-    RegisterRequestName(X_TranslateCoords, 0, "TranslateCoords");
-    RegisterRequestName(X_WarpPointer, 0, "WarpPointer");
-    RegisterRequestName(X_SetInputFocus, 0, "SetInputFocus");
-    RegisterRequestName(X_GetInputFocus, 0, "GetInputFocus");
-    RegisterRequestName(X_QueryKeymap, 0, "QueryKeymap");
-    RegisterRequestName(X_OpenFont, 0, "OpenFont");
-    RegisterRequestName(X_CloseFont, 0, "CloseFont");
-    RegisterRequestName(X_QueryFont, 0, "QueryFont");
-    RegisterRequestName(X_QueryTextExtents, 0, "QueryTextExtents");
-    RegisterRequestName(X_ListFonts, 0, "ListFonts");
-    RegisterRequestName(X_ListFontsWithInfo, 0, "ListFontsWithInfo");
-    RegisterRequestName(X_SetFontPath, 0, "SetFontPath");
-    RegisterRequestName(X_GetFontPath, 0, "GetFontPath");
-    RegisterRequestName(X_CreatePixmap, 0, "CreatePixmap");
-    RegisterRequestName(X_FreePixmap, 0, "FreePixmap");
-    RegisterRequestName(X_CreateGC, 0, "CreateGC");
-    RegisterRequestName(X_ChangeGC, 0, "ChangeGC");
-    RegisterRequestName(X_CopyGC, 0, "CopyGC");
-    RegisterRequestName(X_SetDashes, 0, "SetDashes");
-    RegisterRequestName(X_SetClipRectangles, 0, "SetClipRectangles");
-    RegisterRequestName(X_FreeGC, 0, "FreeGC");
-    RegisterRequestName(X_ClearArea, 0, "ClearArea");
-    RegisterRequestName(X_CopyArea, 0, "CopyArea");
-    RegisterRequestName(X_CopyPlane, 0, "CopyPlane");
-    RegisterRequestName(X_PolyPoint, 0, "PolyPoint");
-    RegisterRequestName(X_PolyLine, 0, "PolyLine");
-    RegisterRequestName(X_PolySegment, 0, "PolySegment");
-    RegisterRequestName(X_PolyRectangle, 0, "PolyRectangle");
-    RegisterRequestName(X_PolyArc, 0, "PolyArc");
-    RegisterRequestName(X_FillPoly, 0, "FillPoly");
-    RegisterRequestName(X_PolyFillRectangle, 0, "PolyFillRectangle");
-    RegisterRequestName(X_PolyFillArc, 0, "PolyFillArc");
-    RegisterRequestName(X_PutImage, 0, "PutImage");
-    RegisterRequestName(X_GetImage, 0, "GetImage");
-    RegisterRequestName(X_PolyText8, 0, "PolyText8");
-    RegisterRequestName(X_PolyText16, 0, "PolyText16");
-    RegisterRequestName(X_ImageText8, 0, "ImageText8");
-    RegisterRequestName(X_ImageText16, 0, "ImageText16");
-    RegisterRequestName(X_CreateColormap, 0, "CreateColormap");
-    RegisterRequestName(X_FreeColormap, 0, "FreeColormap");
-    RegisterRequestName(X_CopyColormapAndFree, 0, "CopyColormapAndFree");
-    RegisterRequestName(X_InstallColormap, 0, "InstallColormap");
-    RegisterRequestName(X_UninstallColormap, 0, "UninstallColormap");
-    RegisterRequestName(X_ListInstalledColormaps, 0, "ListInstalledColormaps");
-    RegisterRequestName(X_AllocColor, 0, "AllocColor");
-    RegisterRequestName(X_AllocNamedColor, 0, "AllocNamedColor");
-    RegisterRequestName(X_AllocColorCells, 0, "AllocColorCells");
-    RegisterRequestName(X_AllocColorPlanes, 0, "AllocColorPlanes");
-    RegisterRequestName(X_FreeColors, 0, "FreeColors");
-    RegisterRequestName(X_StoreColors, 0, "StoreColors");
-    RegisterRequestName(X_StoreNamedColor, 0, "StoreNamedColor");
-    RegisterRequestName(X_QueryColors, 0, "QueryColors");
-    RegisterRequestName(X_LookupColor, 0, "LookupColor");
-    RegisterRequestName(X_CreateCursor, 0, "CreateCursor");
-    RegisterRequestName(X_CreateGlyphCursor, 0, "CreateGlyphCursor");
-    RegisterRequestName(X_FreeCursor, 0, "FreeCursor");
-    RegisterRequestName(X_RecolorCursor, 0, "RecolorCursor");
-    RegisterRequestName(X_QueryBestSize, 0, "QueryBestSize");
-    RegisterRequestName(X_QueryExtension, 0, "QueryExtension");
-    RegisterRequestName(X_ListExtensions, 0, "ListExtensions");
-    RegisterRequestName(X_ChangeKeyboardMapping, 0, "ChangeKeyboardMapping");
-    RegisterRequestName(X_GetKeyboardMapping, 0, "GetKeyboardMapping");
-    RegisterRequestName(X_ChangeKeyboardControl, 0, "ChangeKeyboardControl");
-    RegisterRequestName(X_GetKeyboardControl, 0, "GetKeyboardControl");
-    RegisterRequestName(X_Bell, 0, "Bell");
-    RegisterRequestName(X_ChangePointerControl, 0, "ChangePointerControl");
-    RegisterRequestName(X_GetPointerControl, 0, "GetPointerControl");
-    RegisterRequestName(X_SetScreenSaver, 0, "SetScreenSaver");
-    RegisterRequestName(X_GetScreenSaver, 0, "GetScreenSaver");
-    RegisterRequestName(X_ChangeHosts, 0, "ChangeHosts");
-    RegisterRequestName(X_ListHosts, 0, "ListHosts");
-    RegisterRequestName(X_SetAccessControl, 0, "SetAccessControl");
-    RegisterRequestName(X_SetCloseDownMode, 0, "SetCloseDownMode");
-    RegisterRequestName(X_KillClient, 0, "KillClient");
-    RegisterRequestName(X_RotateProperties, 0, "RotateProperties");
-    RegisterRequestName(X_ForceScreenSaver, 0, "ForceScreenSaver");
-    RegisterRequestName(X_SetPointerMapping, 0, "SetPointerMapping");
-    RegisterRequestName(X_GetPointerMapping, 0, "GetPointerMapping");
-    RegisterRequestName(X_SetModifierMapping, 0, "SetModifierMapping");
-    RegisterRequestName(X_GetModifierMapping, 0, "GetModifierMapping");
-    RegisterRequestName(X_NoOperation, 0, "NoOperation");
+    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, "Success");
-    RegisterErrorName(BadRequest, "BadRequest");
-    RegisterErrorName(BadValue, "BadValue");
-    RegisterErrorName(BadWindow, "BadWindow");
-    RegisterErrorName(BadPixmap, "BadPixmap");
-    RegisterErrorName(BadAtom, "BadAtom");
-    RegisterErrorName(BadCursor, "BadCursor");
-    RegisterErrorName(BadFont, "BadFont");
-    RegisterErrorName(BadMatch, "BadMatch");
-    RegisterErrorName(BadDrawable, "BadDrawable");
-    RegisterErrorName(BadAccess, "BadAccess");
-    RegisterErrorName(BadAlloc, "BadAlloc");
-    RegisterErrorName(BadColor, "BadColor");
-    RegisterErrorName(BadGC, "BadGC");
-    RegisterErrorName(BadIDChoice, "BadIDChoice");
-    RegisterErrorName(BadName, "BadName");
-    RegisterErrorName(BadLength, "BadLength");
-    RegisterErrorName(BadImplementation, "BadImplementation");
+    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, "Error");
-    RegisterEventName(X_Reply, "Reply");
-    RegisterEventName(KeyPress, "KeyPress");
-    RegisterEventName(KeyRelease, "KeyRelease");
-    RegisterEventName(ButtonPress, "ButtonPress");
-    RegisterEventName(ButtonRelease, "ButtonRelease");
-    RegisterEventName(MotionNotify, "MotionNotify");
-    RegisterEventName(EnterNotify, "EnterNotify");
-    RegisterEventName(LeaveNotify, "LeaveNotify");
-    RegisterEventName(FocusIn, "FocusIn");
-    RegisterEventName(FocusOut, "FocusOut");
-    RegisterEventName(KeymapNotify, "KeymapNotify");
-    RegisterEventName(Expose, "Expose");
-    RegisterEventName(GraphicsExpose, "GraphicsExpose");
-    RegisterEventName(NoExpose, "NoExpose");
-    RegisterEventName(VisibilityNotify, "VisibilityNotify");
-    RegisterEventName(CreateNotify, "CreateNotify");
-    RegisterEventName(DestroyNotify, "DestroyNotify");
-    RegisterEventName(UnmapNotify, "UnmapNotify");
-    RegisterEventName(MapNotify, "MapNotify");
-    RegisterEventName(MapRequest, "MapRequest");
-    RegisterEventName(ReparentNotify, "ReparentNotify");
-    RegisterEventName(ConfigureNotify, "ConfigureNotify");
-    RegisterEventName(ConfigureRequest, "ConfigureRequest");
-    RegisterEventName(GravityNotify, "GravityNotify");
-    RegisterEventName(ResizeRequest, "ResizeRequest");
-    RegisterEventName(CirculateNotify, "CirculateNotify");
-    RegisterEventName(CirculateRequest, "CirculateRequest");
-    RegisterEventName(PropertyNotify, "PropertyNotify");
-    RegisterEventName(SelectionClear, "SelectionClear");
-    RegisterEventName(SelectionRequest, "SelectionRequest");
-    RegisterEventName(SelectionNotify, "SelectionNotify");
-    RegisterEventName(ColormapNotify, "ColormapNotify");
-    RegisterEventName(ClientMessage, "ClientMessage");
-    RegisterEventName(MappingNotify, "MappingNotify");
+    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");
 }
 
 #endif /* XREGISTRY */

From 31110d6837ee52fd654729d9e5c4b0c5395abab0 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 18 Oct 2007 10:30:44 -0400
Subject: [PATCH 177/552] registry: special case minor number when looking up
 core requests.

---
 dix/registry.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dix/registry.c b/dix/registry.c
index 48e1b5dae..01818582e 100644
--- a/dix/registry.c
+++ b/dix/registry.c
@@ -123,6 +123,8 @@ RegisterResourceName(RESTYPE resource, const char *name)
 const char *
 LookupRequestName(int major, int minor)
 {
+    if (major < 128)
+	minor = 0;
     if (major >= nmajor)
 	return XREGISTRY_UNKNOWN;
     if (minor >= nminor[major])

From 6107a245035366fe762756b6aa05ac0e3a5482bb Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 18 Oct 2007 12:24:55 -0400
Subject: [PATCH 178/552] dix: Add client parameter to AddPassiveGrabsToList().

---
 Xi/exevents.c      | 4 ++--
 dix/events.c       | 4 ++--
 dix/grabs.c        | 5 ++---
 include/dixgrabs.h | 1 +
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Xi/exevents.c b/Xi/exevents.c
index 9a179500b..7a54c08d2 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -566,7 +566,7 @@ GrabButton(ClientPtr client, DeviceIntPtr dev, BYTE this_device_mode,
 		      DeviceButtonPress, button, confineTo, cursor);
     if (!grab)
 	return BadAlloc;
-    return AddPassiveGrabToList(grab);
+    return AddPassiveGrabToList(client, grab);
 }
 
 int
@@ -621,7 +621,7 @@ GrabKey(ClientPtr client, DeviceIntPtr dev, BYTE this_device_mode,
 		      NullWindow, NullCursor);
     if (!grab)
 	return BadAlloc;
-    return AddPassiveGrabToList(grab);
+    return AddPassiveGrabToList(client, grab);
 }
 
 int
diff --git a/dix/events.c b/dix/events.c
index bb5b9507b..246220f59 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -4727,7 +4727,7 @@ ProcGrabKey(ClientPtr client)
 	NullWindow, NullCursor);
     if (!grab)
 	return BadAlloc;
-    return AddPassiveGrabToList(grab);
+    return AddPassiveGrabToList(client, grab);
 }
 
 
@@ -4815,7 +4815,7 @@ ProcGrabButton(ClientPtr client)
         stuff->button, confineTo, cursor);
     if (!grab)
 	return BadAlloc;
-    return AddPassiveGrabToList(grab);
+    return AddPassiveGrabToList(client, grab);
 }
 
 /**
diff --git a/dix/grabs.c b/dix/grabs.c
index b8d0df88d..229329699 100644
--- a/dix/grabs.c
+++ b/dix/grabs.c
@@ -307,7 +307,7 @@ GrabsAreIdentical(GrabPtr pFirstGrab, GrabPtr pSecondGrab)
  * @return Success or X error code on failure.
  */
 int
-AddPassiveGrabToList(GrabPtr pGrab)
+AddPassiveGrabToList(ClientPtr client, GrabPtr pGrab)
 {
     GrabPtr grab;
     Mask access_mode = DixGrabAccess;
@@ -327,8 +327,7 @@ AddPassiveGrabToList(GrabPtr pGrab)
 
     if (grab->keyboardMode == GrabModeSync || grab->pointerMode == GrabModeSync)
 	access_mode |= DixFreezeAccess;
-    rc = XaceHook(XACE_DEVICE_ACCESS, clients[CLIENT_ID(grab->resource)],
-		  grab->device, access_mode);
+    rc = XaceHook(XACE_DEVICE_ACCESS, client, grab->device, access_mode);
     if (rc != Success)
 	return rc;
 
diff --git a/include/dixgrabs.h b/include/dixgrabs.h
index 2d66d6ba1..f93e99957 100644
--- a/include/dixgrabs.h
+++ b/include/dixgrabs.h
@@ -50,6 +50,7 @@ extern Bool GrabMatchesSecond(
 	GrabPtr /* pSecondGrab */);
 
 extern int AddPassiveGrabToList(
+	ClientPtr /* client */,
 	GrabPtr /* pGrab */);
 
 extern Bool DeletePassiveGrabFromList(

From 06eb830169afd0631a31e8846c7d2533c49ea378 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 18 Oct 2007 12:31:14 -0400
Subject: [PATCH 179/552] xace: Fix bug in AddPassiveGrabToList(), was using
 wrong GrabPtr.

---
 dix/grabs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dix/grabs.c b/dix/grabs.c
index 229329699..a42a46f10 100644
--- a/dix/grabs.c
+++ b/dix/grabs.c
@@ -325,9 +325,9 @@ AddPassiveGrabToList(ClientPtr client, GrabPtr pGrab)
 	}
     }
 
-    if (grab->keyboardMode == GrabModeSync || grab->pointerMode == GrabModeSync)
+    if (pGrab->keyboardMode == GrabModeSync||pGrab->pointerMode == GrabModeSync)
 	access_mode |= DixFreezeAccess;
-    rc = XaceHook(XACE_DEVICE_ACCESS, client, grab->device, access_mode);
+    rc = XaceHook(XACE_DEVICE_ACCESS, client, pGrab->device, access_mode);
     if (rc != Success)
 	return rc;
 

From e974bc1233608ec09fbd40b12217925e4d2205aa Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 18 Oct 2007 12:33:39 -0400
Subject: [PATCH 180/552] xselinux: add hooks for send and receive access.

---
 Xext/xselinux.c | 130 ++++++++++++++++++++++++++++++++----------------
 1 file changed, 86 insertions(+), 44 deletions(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 8bafa1fec..2e36622b2 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -62,7 +62,7 @@ static DevPrivateKey stateKey = &stateKey;
 typedef struct {
     security_id_t sid;
     struct avc_entry_ref aeref;
-    char *client_path;
+    char *command;
 } SELinuxStateRec;
 
 /* audit file descriptor */
@@ -71,7 +71,7 @@ static int audit_fd;
 /* structure passed to auditing callback */
 typedef struct {
     ClientPtr client;	/* client */
-    char *client_path;	/* client's executable path */
+    char *command;	/* client's executable path */
     unsigned id;	/* resource id, if any */
     int restype;	/* resource type, if any */
     Atom property;	/* property name, if any */
@@ -170,21 +170,17 @@ SELinuxTypeToClass(RESTYPE type)
  * Performs an SELinux permission check.
  */
 static int
-SELinuxDoCheck(ClientPtr client, SELinuxStateRec *obj, security_class_t class,
-	       Mask access_mode, SELinuxAuditRec *auditdata)
+SELinuxDoCheck(int clientIndex, SELinuxStateRec *subj, SELinuxStateRec *obj,
+	       security_class_t class, Mask mode, SELinuxAuditRec *auditdata)
 {
-    SELinuxStateRec *subj;
-
     /* serverClient requests OK */
-    if (client->index == 0)
+    if (clientIndex == 0)
 	return Success;
 
-    subj = dixLookupPrivate(&client->devPrivates, stateKey);
-    auditdata->client = client;
-    auditdata->client_path = subj->client_path;
+    auditdata->command = subj->command;
     errno = 0;
 
-    if (avc_has_perm(subj->sid, obj->sid, class, access_mode, &subj->aeref,
+    if (avc_has_perm(subj->sid, obj->sid, class, mode, &subj->aeref,
 		     auditdata) < 0) {
 	if (errno == EACCES)
 	    return BadAccess;
@@ -250,23 +246,25 @@ SELinuxAudit(void *auditdata,
     SELinuxAuditRec *audit = auditdata;
     ClientPtr client = audit->client;
     char idNum[16], *propertyName;
-    int major = 0, minor = 0;
-    REQUEST(xReq);
+    int major = -1, minor = -1;
 
+    if (client) {
+	REQUEST(xReq);
+	if (stuff) {
+	    major = stuff->reqType;
+	    minor = MinorOpcodeOfRequest(client);
+	}
+    }
     if (audit->id)
 	snprintf(idNum, 16, "%x", audit->id);
-    if (stuff) {
-	major = stuff->reqType;
-	minor = (major < 128) ? 0 : MinorOpcodeOfRequest(client);
-    }
 
     propertyName = audit->property ? NameForAtom(audit->property) : NULL;
 
     return snprintf(msgbuf, msgbufsize, "%s%s%s%s%s%s%s%s%s%s%s%s",
-		    stuff ? "request=" : "",
-		    stuff ? LookupRequestName(major, minor) : "",
-		    audit->client_path ? " comm=" : "",
-		    audit->client_path ? audit->client_path : "",
+		    (major >= 0) ? "request=" : "",
+		    (major >= 0) ? LookupRequestName(major, minor) : "",
+		    audit->command ? " comm=" : "",
+		    audit->command ? audit->command : "",
 		    audit->id ? " resid=" : "",
 		    audit->id ? idNum : "",
 		    audit->restype ? " restype=" : "",
@@ -296,7 +294,7 @@ SELinuxDevice(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     XaceDeviceAccessRec *rec = calldata;
     SELinuxStateRec *subj, *obj;
-    SELinuxAuditRec auditdata = { NULL, NULL, 0, 0, 0, NULL };
+    SELinuxAuditRec auditdata = { rec->client, NULL, 0, 0, 0, NULL };
     int rc;
 
     subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
@@ -315,18 +313,59 @@ SELinuxDevice(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	}
     }
 
-    rc = SELinuxDoCheck(rec->client, obj, SECCLASS_X_DEVICE,
+    rc = SELinuxDoCheck(rec->client->index, subj, obj, SECCLASS_X_DEVICE,
 			rec->access_mode, &auditdata);
     if (rc != Success)
 	rec->status = rc;
 }
 
+static void
+SELinuxSend(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+{
+    XaceSendAccessRec *rec = calldata;
+    SELinuxStateRec *subj, *obj;
+    SELinuxAuditRec auditdata = { rec->client, NULL, 0, 0, 0, NULL };
+    int clientIndex, rc;
+
+    if (rec->dev) {
+	subj = dixLookupPrivate(&rec->dev->devPrivates, stateKey);
+	clientIndex = -1; /* some nonzero value */
+    } else {
+	subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
+	clientIndex = rec->client->index;
+    }
+
+    obj = dixLookupPrivate(&rec->pWin->devPrivates, stateKey);
+
+    rc = SELinuxDoCheck(clientIndex, subj, obj, SECCLASS_X_DRAWABLE,
+			DixSendAccess, &auditdata);
+    if (rc != Success)
+	rec->status = rc;
+}
+
+static void
+SELinuxReceive(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+{
+    XaceReceiveAccessRec *rec = calldata;
+    SELinuxStateRec *subj, *obj;
+    SELinuxAuditRec auditdata = { rec->client, NULL, 0, 0, 0, NULL };
+    int rc;
+
+    subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
+    obj = dixLookupPrivate(&rec->pWin->devPrivates, stateKey);
+
+    rc = SELinuxDoCheck(rec->client->index, subj, obj, SECCLASS_X_DRAWABLE,
+			DixReceiveAccess, &auditdata);
+    if (rc != Success)
+	rec->status = rc;
+}
+
 static void
 SELinuxExtension(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     XaceExtAccessRec *rec = calldata;
     SELinuxStateRec *subj, *obj, *serv;
-    SELinuxAuditRec auditdata = { NULL, NULL, 0, 0, 0, NULL };
+    SELinuxAuditRec auditdata = { rec->client, NULL, 0, 0, 0, NULL };
     int rc;
 
     subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
@@ -369,7 +408,7 @@ SELinuxExtension(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 
     /* Perform the security check */
     auditdata.extension = rec->ext->name;
-    rc = SELinuxDoCheck(rec->client, obj, SECCLASS_X_EXTENSION,
+    rc = SELinuxDoCheck(rec->client->index, subj, obj, SECCLASS_X_EXTENSION,
 			rec->access_mode, &auditdata);
     if (rc != Success)
 	rec->status = rc;
@@ -380,7 +419,7 @@ SELinuxProperty(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     XacePropertyAccessRec *rec = calldata;
     SELinuxStateRec *subj, *obj;
-    SELinuxAuditRec auditdata = { NULL, NULL, 0, 0, 0, NULL };
+    SELinuxAuditRec auditdata = { rec->client, NULL, 0, 0, 0, NULL };
     int rc;
 
     subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
@@ -421,7 +460,7 @@ SELinuxProperty(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 
     /* Perform the security check */
     auditdata.property = rec->pProp->propertyName;
-    rc = SELinuxDoCheck(rec->client, obj, SECCLASS_X_PROPERTY,
+    rc = SELinuxDoCheck(rec->client->index, subj, obj, SECCLASS_X_PROPERTY,
 			rec->access_mode, &auditdata);
     if (rc != Success)
 	rec->status = rc;
@@ -432,7 +471,7 @@ SELinuxResource(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     XaceResourceAccessRec *rec = calldata;
     SELinuxStateRec *subj, *obj, *pobj;
-    SELinuxAuditRec auditdata = { NULL, NULL, 0, 0, 0, NULL };
+    SELinuxAuditRec auditdata = { rec->client, NULL, 0, 0, 0, NULL };
     PrivateRec **privatePtr;
     security_class_t class;
     int rc, offset;
@@ -477,7 +516,8 @@ SELinuxResource(CallbackListPtr *pcbl, pointer unused, pointer calldata)
     /* Perform the security check */
     auditdata.restype = rec->rtype;
     auditdata.id = rec->id;
-    rc = SELinuxDoCheck(rec->client, obj, class, rec->access_mode, &auditdata);
+    rc = SELinuxDoCheck(rec->client->index, subj, obj, class,
+			rec->access_mode, &auditdata);
     if (rc != Success)
 	rec->status = rc;
 }
@@ -487,7 +527,7 @@ SELinuxScreen(CallbackListPtr *pcbl, pointer is_saver, pointer calldata)
 {
     XaceScreenAccessRec *rec = calldata;
     SELinuxStateRec *subj, *obj;
-    SELinuxAuditRec auditdata = { NULL, NULL, 0, 0, 0, NULL };
+    SELinuxAuditRec auditdata = { rec->client, NULL, 0, 0, 0, NULL };
     Mask access_mode = rec->access_mode;
     int rc;
 
@@ -510,7 +550,7 @@ SELinuxScreen(CallbackListPtr *pcbl, pointer is_saver, pointer calldata)
     if (is_saver)
 	access_mode <<= 2;
 
-    rc = SELinuxDoCheck(rec->client, obj, SECCLASS_X_SCREEN,
+    rc = SELinuxDoCheck(rec->client->index, subj, obj, SECCLASS_X_SCREEN,
 			access_mode, &auditdata);
     if (rc != Success)
 	rec->status = rc;
@@ -520,13 +560,14 @@ static void
 SELinuxClient(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     XaceClientAccessRec *rec = calldata;
-    SELinuxStateRec *obj;
-    SELinuxAuditRec auditdata = { NULL, NULL, 0, 0, 0, NULL };
+    SELinuxStateRec *subj, *obj;
+    SELinuxAuditRec auditdata = { rec->client, NULL, 0, 0, 0, NULL };
     int rc;
 
+    subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
     obj = dixLookupPrivate(&rec->target->devPrivates, stateKey);
 
-    rc = SELinuxDoCheck(rec->client, obj, SECCLASS_X_CLIENT,
+    rc = SELinuxDoCheck(rec->client->index, subj, obj, SECCLASS_X_CLIENT,
 			rec->access_mode, &auditdata);
     if (rc != Success)
 	rec->status = rc;
@@ -536,13 +577,14 @@ static void
 SELinuxServer(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     XaceServerAccessRec *rec = calldata;
-    SELinuxStateRec *obj;
-    SELinuxAuditRec auditdata = { NULL, NULL, 0, 0, 0, NULL };
+    SELinuxStateRec *subj, *obj;
+    SELinuxAuditRec auditdata = { rec->client, NULL, 0, 0, 0, NULL };
     int rc;
 
+    subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
     obj = dixLookupPrivate(&serverClient->devPrivates, stateKey);
 
-    rc = SELinuxDoCheck(rec->client, obj, SECCLASS_X_SERVER,
+    rc = SELinuxDoCheck(rec->client->index, subj, obj, SECCLASS_X_SERVER,
 			rec->access_mode, &auditdata);
     if (rc != Success)
 	rec->status = rc;
@@ -595,12 +637,12 @@ SELinuxClientState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	if (bytes <= 0)
 	    goto finish;
 
-	state->client_path = xalloc(bytes);
-	if (!state->client_path)
+	state->command = xalloc(bytes);
+	if (!state->command)
 	    goto finish;
 
-	memcpy(state->client_path, path, bytes);
-	state->client_path[bytes - 1] = 0;
+	memcpy(state->command, path, bytes);
+	state->command[bytes - 1] = 0;
     } else
 	/* For remote clients, need to use a default context */
 	if (selabel_lookup(label_hnd, &ctx, NULL, SELABEL_X_CLIENT) < 0)
@@ -685,7 +727,7 @@ SELinuxStateFree(CallbackListPtr *pcbl, pointer unused, pointer calldata)
     PrivateCallbackRec *rec = calldata;
     SELinuxStateRec *state = *rec->value;
 
-    xfree(state->client_path);
+    xfree(state->command);
 
     if (avc_active)
 	sidput(state->sid);
@@ -787,8 +829,8 @@ XSELinuxExtensionInit(INITARGS)
     ret &= XaceRegisterCallback(XACE_RESOURCE_ACCESS, SELinuxResource, 0);
     ret &= XaceRegisterCallback(XACE_DEVICE_ACCESS, SELinuxDevice, 0);
     ret &= XaceRegisterCallback(XACE_PROPERTY_ACCESS, SELinuxProperty, 0);
-//    ret &= XaceRegisterCallback(XACE_SEND_ACCESS, SELinuxSend, 0);
-//    ret &= XaceRegisterCallback(XACE_RECEIVE_ACCESS, SELinuxReceive, 0);
+    ret &= XaceRegisterCallback(XACE_SEND_ACCESS, SELinuxSend, 0);
+    ret &= XaceRegisterCallback(XACE_RECEIVE_ACCESS, SELinuxReceive, 0);
     ret &= XaceRegisterCallback(XACE_CLIENT_ACCESS, SELinuxClient, 0);
     ret &= XaceRegisterCallback(XACE_EXT_ACCESS, SELinuxExtension, 0);
     ret &= XaceRegisterCallback(XACE_SERVER_ACCESS, SELinuxServer, 0);

From 55a96aa6b0995fda6660b7e78c85b955a62b9735 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 18 Oct 2007 14:11:11 -0400
Subject: [PATCH 181/552] xselinux: add basic event labeling.

---
 Xext/xselinux.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++---
 Xext/xselinux.h |  3 +-
 2 files changed, 88 insertions(+), 5 deletions(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 2e36622b2..8b1898dac 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -95,6 +95,10 @@ static security_id_t unlabeled_sid;
 static security_class_t *knownTypes;
 static unsigned numKnownTypes;
 
+/* Array of event SIDs indexed by event type */
+static security_id_t *knownEvents;
+static unsigned numKnownEvents;
+
 /* dynamically allocated security classes and permissions */
 static struct security_class_mapping map[] = {
     { "x_drawable", { "read", "write", "destroy", "create", "getattr", "setattr", "list_property", "get_property", "set_property", "", "", "list_child", "add_child", "remove_child", "hide", "show", "blend", "override", "", "", "", "", "send", "receive", "", "manage", NULL }},
@@ -109,6 +113,7 @@ static struct security_class_mapping map[] = {
     { "x_device", { "read", "write", "", "", "getattr", "setattr", "", "", "", "getfocus", "setfocus", "", "", "", "", "", "", "grab", "freeze", "force_cursor", "", "", "", "", "", "manage", "", "bell", NULL }},
     { "x_server", { "record", "", "", "", "getattr", "setattr", "", "", "", "", "", "", "", "", "", "", "", "grab", "", "", "", "", "", "", "", "manage", "debug", NULL }},
     { "x_extension", { "", "", "", "", "query", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "use", NULL }},
+    { "x_event", { "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "send", "receive", NULL }},
     { "x_resource", { "read", "write", "write", "write", "read", "write", "read", "read", "write", "read", "write", "read", "write", "write", "write", "read", "read", "write", "write", "write", "write", "write", "write", "read", "read", "write", "read", "write", NULL }},
     { NULL }
 };
@@ -121,6 +126,43 @@ static void SELinuxScreen(CallbackListPtr *, pointer, pointer);
  * Support Routines
  */
 
+/*
+ * Looks up the SID corresponding to the given event type
+ */
+static int
+SELinuxEventToSID(int type, SELinuxStateRec *sid_return)
+{
+    const char *name = LookupEventName(type);
+    security_context_t con;
+
+    if (type >= numKnownEvents) {
+	/* Need to increase size of classes array */
+	unsigned size = sizeof(security_id_t);
+	knownEvents = xrealloc(knownEvents, (type + 1) * size);
+	if (!knownEvents)
+	    return BadAlloc;
+	memset(knownEvents + numKnownEvents, 0,
+	       (type - numKnownEvents + 1) * size);
+    }
+
+    if (!knownEvents[type]) {
+	/* Look in the mappings of property names to contexts */
+	if (selabel_lookup(label_hnd, &con, name, SELABEL_X_EVENT) < 0) {
+	    ErrorF("XSELinux: an event label lookup failed!\n");
+	    return BadValue;
+	}
+	/* Get a SID for context */
+	if (avc_context_to_sid(con, knownEvents + type) < 0) {
+	    ErrorF("XSELinux: a context_to_SID call failed!\n");
+	    return BadAlloc;
+	}
+	freecon(con);
+    }
+
+    sid_return->sid = knownEvents[type];
+    return Success;
+}
+
 /*
  * Returns the object class corresponding to the given resource type.
  */
@@ -325,7 +367,7 @@ SELinuxSend(CallbackListPtr *pcbl, pointer unused, pointer calldata)
     XaceSendAccessRec *rec = calldata;
     SELinuxStateRec *subj, *obj;
     SELinuxAuditRec auditdata = { rec->client, NULL, 0, 0, 0, NULL };
-    int clientIndex, rc;
+    int rc, i, clientIndex;
 
     if (rec->dev) {
 	subj = dixLookupPrivate(&rec->dev->devPrivates, stateKey);
@@ -337,10 +379,28 @@ SELinuxSend(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 
     obj = dixLookupPrivate(&rec->pWin->devPrivates, stateKey);
 
+    /* Check send permission on window */
     rc = SELinuxDoCheck(clientIndex, subj, obj, SECCLASS_X_DRAWABLE,
 			DixSendAccess, &auditdata);
     if (rc != Success)
-	rec->status = rc;
+	goto err;
+
+    /* Check send permission on specific event types */
+    for (i = 0; i < rec->count; i++) {
+	SELinuxStateRec ev_sid;
+
+	rc = SELinuxEventToSID(rec->events[i].u.u.type, &ev_sid);
+	if (rc != Success)
+	    goto err;
+
+	rc = SELinuxDoCheck(clientIndex, subj, &ev_sid, SECCLASS_X_EVENT,
+			    DixSendAccess, &auditdata);
+	if (rc != Success)
+	    goto err;
+    }
+    return;
+err:
+    rec->status = rc;
 }
 
 static void
@@ -349,15 +409,33 @@ SELinuxReceive(CallbackListPtr *pcbl, pointer unused, pointer calldata)
     XaceReceiveAccessRec *rec = calldata;
     SELinuxStateRec *subj, *obj;
     SELinuxAuditRec auditdata = { rec->client, NULL, 0, 0, 0, NULL };
-    int rc;
+    int rc, i;
 
     subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
     obj = dixLookupPrivate(&rec->pWin->devPrivates, stateKey);
 
+    /* Check receive permission on window */
     rc = SELinuxDoCheck(rec->client->index, subj, obj, SECCLASS_X_DRAWABLE,
 			DixReceiveAccess, &auditdata);
     if (rc != Success)
-	rec->status = rc;
+	goto err;
+
+    /* Check receive permission on specific event types */
+    for (i = 0; i < rec->count; i++) {
+	SELinuxStateRec ev_sid;
+
+	rc = SELinuxEventToSID(rec->events[i].u.u.type, &ev_sid);
+	if (rc != Success)
+	    goto err;
+
+	rc = SELinuxDoCheck(rec->client->index, subj, &ev_sid, SECCLASS_X_EVENT,
+			    DixReceiveAccess, &auditdata);
+	if (rc != Success)
+	    goto err;
+    }
+    return;
+err:
+    rec->status = rc;
 }
 
 static void
@@ -762,6 +840,10 @@ SELinuxResetProc(ExtensionEntry *extEntry)
     avc_destroy();
     avc_active = 0;
 
+    xfree(knownEvents);
+    knownEvents = NULL;
+    numKnownEvents = 0;
+
     xfree(knownTypes);
     knownTypes = NULL;
     numKnownTypes = 0;
diff --git a/Xext/xselinux.h b/Xext/xselinux.h
index 02ec86bf3..407b81f93 100644
--- a/Xext/xselinux.h
+++ b/Xext/xselinux.h
@@ -42,6 +42,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define SECCLASS_X_DEVICE		10
 #define SECCLASS_X_SERVER		11
 #define SECCLASS_X_EXTENSION		12
-#define SECCLASS_X_RESOURCE		13
+#define SECCLASS_X_EVENT		13
+#define SECCLASS_X_RESOURCE		14
 
 #endif /* _XSELINUX_H */

From 12e889d202ac9849f534c51167cbfed91c32027a Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 19 Oct 2007 18:43:38 -0400
Subject: [PATCH 182/552] xace: Bug fixes, name changes to selection access
 hooks and fields.

---
 dix/dispatch.c      | 25 ++++++++++++-------------
 include/selection.h |  4 ++--
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/dix/dispatch.c b/dix/dispatch.c
index 50384db30..2cfeb2df9 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -1024,7 +1024,7 @@ ProcSetSelectionOwner(ClientPtr client)
 		return Success;
 
 	    rc = XaceHook(XACE_SELECTION_ACCESS, client, stuff->selection,
-			  CurrentSelections[i], DixSetAttrAccess);
+			  CurrentSelections + i, DixSetAttrAccess);
 	    if (rc != Success)
 		return rc;
 
@@ -1058,17 +1058,15 @@ ProcSetSelectionOwner(ClientPtr client)
 	    CurrentSelections = newsels;
 	    CurrentSelections[i].selection = stuff->selection;
 	    CurrentSelections[i].devPrivates = NULL;
-	    rc = XaceHook(XACE_SELECTION_ACCESS, stuff->selection,
-			  CurrentSelections[i], DixSetAttrAccess);
+	    rc = XaceHook(XACE_SELECTION_ACCESS, client, stuff->selection,
+			  CurrentSelections + i, DixSetAttrAccess);
 	    if (rc != Success)
 		return rc;
 	}
         CurrentSelections[i].lastTimeChanged = time;
 	CurrentSelections[i].window = stuff->window;
-	CurrentSelections[i].destwindow = stuff->window;
 	CurrentSelections[i].pWin = pWin;
 	CurrentSelections[i].client = (pWin ? client : NullClient);
-	CurrentSelections[i].destclient = (pWin ? client : NullClient);
 	if (SelectionCallback)
 	{
 	    SelectionInfoRec	info;
@@ -1100,19 +1098,20 @@ ProcGetSelectionOwner(ClientPtr client)
 	i = 0;
         while ((i < NumCurrentSelections) && 
 	       CurrentSelections[i].selection != stuff->id) i++;
+
+	rc = XaceHook(XACE_SELECTION_ACCESS, client, stuff->id,
+		      CurrentSelections + i, DixGetAttrAccess);
+	if (rc != Success)
+	    return rc;
+
         reply.type = X_Reply;
 	reply.length = 0;
 	reply.sequenceNumber = client->sequence;
         if (i < NumCurrentSelections)
-            reply.owner = CurrentSelections[i].destwindow;
+            reply.owner = CurrentSelections[i].window;
         else
             reply.owner = None;
 
-	rc = XaceHook(XACE_SELECTION_ACCESS, client, stuff->id, NULL,
-		      DixGetAttrAccess);
-	if (rc != Success)
-	    return rc;
-
         WriteReplyToClient(client, sizeof(xGetSelectionOwnerReply), &reply);
         return(client->noClientException);
     }
@@ -1150,7 +1149,7 @@ ProcConvertSelection(ClientPtr client)
 	if ((i < NumCurrentSelections) &&
 	    (CurrentSelections[i].window != None) &&
 	    XaceHook(XACE_SELECTION_ACCESS, client, stuff->selection,
-		     &CurrentSelections[i], DixReadAccess) == Success)
+		     CurrentSelections + i, DixReadAccess) == Success)
 	{        
 	    event.u.u.type = SelectionRequest;
 	    event.u.selectionRequest.time = stuff->time;
@@ -1160,7 +1159,7 @@ ProcConvertSelection(ClientPtr client)
 	    event.u.selectionRequest.target = stuff->target;
 	    event.u.selectionRequest.property = stuff->property;
 	    if (TryClientEvents(
-		CurrentSelections[i].destclient, &event, 1, NoEventMask,
+		CurrentSelections[i].client, &event, 1, NoEventMask,
 		NoEventMask /* CantBeFiltered */, NullGrab))
 		return (client->noClientException);
 	}
diff --git a/include/selection.h b/include/selection.h
index 93473767a..859b6a3b5 100644
--- a/include/selection.h
+++ b/include/selection.h
@@ -62,8 +62,8 @@ typedef struct _Selection {
     Window window;
     WindowPtr pWin;
     ClientPtr client;
-    ClientPtr destclient; /* support for redirection */
-    Window destwindow;    /* support for redirection */
+    ClientPtr alt_client; /* support for redirection */
+    Window alt_window;    /* support for redirection */
     PrivateRec *devPrivates;
 } Selection;
 

From ce7f6fe1268fef4f89aa21c7b44d73ecd98efe24 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 19 Oct 2007 19:40:04 -0400
Subject: [PATCH 183/552] xselinux: properly update sizes when dynamic arrays
 are resized...

---
 Xext/xselinux.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 8b1898dac..14a2270e2 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -143,6 +143,7 @@ SELinuxEventToSID(int type, SELinuxStateRec *sid_return)
 	    return BadAlloc;
 	memset(knownEvents + numKnownEvents, 0,
 	       (type - numKnownEvents + 1) * size);
+	numKnownEvents = type + 1;
     }
 
     if (!knownEvents[type]) {
@@ -180,6 +181,7 @@ SELinuxTypeToClass(RESTYPE type)
 	    return 0;
 	memset(knownTypes + numKnownTypes, 0,
 	       (type - numKnownTypes + 1) * size);
+	numKnownTypes = type + 1;
     }
 
     if (!knownTypes[type]) {

From 9e0a468af19d8e46330bcff37c9adc5e11d3aee7 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 23 Oct 2007 13:35:30 -0400
Subject: [PATCH 184/552] xace: try to pretend events were sent when a denial
 occurs.

Probably need to redo the error return paths in these functions
at some point.
---
 dix/events.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/dix/events.c b/dix/events.c
index 246220f59..24de94767 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -1754,7 +1754,7 @@ DeliverEventsToWindow(WindowPtr pWin, xEvent *pEvents, int count,
 	    !((wOtherEventMasks(pWin)|pWin->eventMask) & filter))
 	    return 0;
 	if (XaceHook(XACE_RECEIVE_ACCESS, wClient(pWin), pWin, pEvents, count))
-	    nondeliveries--;
+	    /* do nothing */;
 	else if ( (attempt = TryClientEvents(wClient(pWin), pEvents, count,
 					     pWin->eventMask, filter, grab)) )
 	{
@@ -1785,7 +1785,7 @@ DeliverEventsToWindow(WindowPtr pWin, xEvent *pEvents, int count,
 	{
 	    if (XaceHook(XACE_RECEIVE_ACCESS, rClient(other), pWin, pEvents,
 			 count))
-		nondeliveries--;
+		/* do nothing */;
 	    else if ( (attempt = TryClientEvents(rClient(other), pEvents, count,
 					  other->mask[mskidx], filter, grab)) )
 	    {
@@ -1884,7 +1884,7 @@ MaybeDeliverEventsToClient(WindowPtr pWin, xEvent *pEvents,
 			wClient(pWin), NullGrab, pWin->eventMask, filter);
 #endif
 	if (XaceHook(XACE_RECEIVE_ACCESS, wClient(pWin), pWin, pEvents, count))
-	    return 0;
+	    return 1; /* don't send, but pretend we did */
 	return TryClientEvents(wClient(pWin), pEvents, count,
 			       pWin->eventMask, filter, NullGrab);
     }
@@ -1901,7 +1901,7 @@ MaybeDeliverEventsToClient(WindowPtr pWin, xEvent *pEvents,
 #endif
 	    if (XaceHook(XACE_RECEIVE_ACCESS, rClient(other), pWin, pEvents,
 			 count))
-		return 0;
+		return 1; /* don't send, but pretend we did */
 	    return TryClientEvents(rClient(other), pEvents, count,
 				   other->mask, filter, NullGrab);
 	}
@@ -2896,9 +2896,9 @@ DeliverFocusedEvent(DeviceIntPtr keybd, xEvent *xE, WindowPtr window, int count)
 	if (DeliverDeviceEvents(window, xE, NullGrab, focus, keybd, count))
 	    return;
     }
-    /* just deliver it to the focus window */
     if (XaceHook(XACE_SEND_ACCESS, NULL, keybd, focus, xE, count))
 	return;
+    /* just deliver it to the focus window */
     FixUpEventFromWindow(xE, focus, None, FALSE);
     if (xE->u.u.type & EXTENSION_EVENT_BASE)
 	mskidx = keybd->id;
@@ -2947,9 +2947,11 @@ DeliverGrabbedEvent(xEvent *xE, DeviceIntPtr thisDev,
     if (!deliveries)
     {
 	FixUpEventFromWindow(xE, grab->window, None, TRUE);
-	if (!XaceHook(XACE_SEND_ACCESS, 0, thisDev, grab->window, xE, count) &&
-	    !XaceHook(XACE_RECEIVE_ACCESS, rClient(grab), grab->window, xE,
-		      count))
+	if (XaceHook(XACE_SEND_ACCESS, 0, thisDev, grab->window, xE, count) ||
+	    XaceHook(XACE_RECEIVE_ACCESS, rClient(grab), grab->window, xE,
+		     count))
+	    deliveries = 1; /* don't send, but pretend we did */
+	else
 	    deliveries = TryClientEvents(rClient(grab), xE, count,
 					 (Mask)grab->eventMask,
 					 filters[xE->u.u.type], grab);

From d7db549db41a27aef28cff9bfb7973bc741f88b2 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 23 Oct 2007 14:08:54 -0400
Subject: [PATCH 185/552] xselinux: Unregister callbacks on server reset.

---
 Xext/xselinux.c | 50 ++++++++++++++++++++++++++++++++++---------------
 1 file changed, 35 insertions(+), 15 deletions(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 14a2270e2..183a047dc 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -121,6 +121,9 @@ static struct security_class_mapping map[] = {
 /* forward declarations */
 static void SELinuxScreen(CallbackListPtr *, pointer, pointer);
 
+/* "true" pointer value for use as callback data */
+static pointer truep = (pointer)1;
+
 
 /*
  * Support Routines
@@ -832,8 +835,24 @@ ProcSELinuxDispatch(ClientPtr client)
 static void
 SELinuxResetProc(ExtensionEntry *extEntry)
 {
-    /* XXX unregister all callbacks here */
+    /* Unregister callbacks */
+    DeleteCallback(&ClientStateCallback, SELinuxClientState, NULL);
+    DeleteCallback(&ResourceStateCallback, SELinuxResourceState, NULL);
 
+    XaceDeleteCallback(XACE_EXT_DISPATCH, SELinuxExtension, NULL);
+    XaceDeleteCallback(XACE_RESOURCE_ACCESS, SELinuxResource, NULL);
+    XaceDeleteCallback(XACE_DEVICE_ACCESS, SELinuxDevice, NULL);
+    XaceDeleteCallback(XACE_PROPERTY_ACCESS, SELinuxProperty, NULL);
+    XaceDeleteCallback(XACE_SEND_ACCESS, SELinuxSend, NULL);
+    XaceDeleteCallback(XACE_RECEIVE_ACCESS, SELinuxReceive, NULL);
+    XaceDeleteCallback(XACE_CLIENT_ACCESS, SELinuxClient, NULL);
+    XaceDeleteCallback(XACE_EXT_ACCESS, SELinuxExtension, NULL);
+    XaceDeleteCallback(XACE_SERVER_ACCESS, SELinuxServer, NULL);
+//    XaceDeleteCallback(XACE_SELECTION_ACCESS, SELinuxSelection, NULL);
+    XaceDeleteCallback(XACE_SCREEN_ACCESS, SELinuxScreen, NULL);
+    XaceDeleteCallback(XACE_SCREENSAVER_ACCESS, SELinuxScreen, truep);
+
+    /* Tear down SELinux stuff */
     selabel_close(label_hnd);
     label_hnd = NULL;
 
@@ -842,6 +861,7 @@ SELinuxResetProc(ExtensionEntry *extEntry)
     avc_destroy();
     avc_active = 0;
 
+    /* Free local state */
     xfree(knownEvents);
     knownEvents = NULL;
     numKnownEvents = 0;
@@ -906,21 +926,21 @@ XSELinuxExtensionInit(INITARGS)
     ret &= dixRegisterPrivateInitFunc(stateKey, SELinuxStateInit, NULL);
     ret &= dixRegisterPrivateDeleteFunc(stateKey, SELinuxStateFree, NULL);
 
-    ret &= AddCallback(&ClientStateCallback, SELinuxClientState, 0);
-    ret &= AddCallback(&ResourceStateCallback, SELinuxResourceState, 0);
+    ret &= AddCallback(&ClientStateCallback, SELinuxClientState, NULL);
+    ret &= AddCallback(&ResourceStateCallback, SELinuxResourceState, NULL);
 
-    ret &= XaceRegisterCallback(XACE_EXT_DISPATCH, SELinuxExtension, 0);
-    ret &= XaceRegisterCallback(XACE_RESOURCE_ACCESS, SELinuxResource, 0);
-    ret &= XaceRegisterCallback(XACE_DEVICE_ACCESS, SELinuxDevice, 0);
-    ret &= XaceRegisterCallback(XACE_PROPERTY_ACCESS, SELinuxProperty, 0);
-    ret &= XaceRegisterCallback(XACE_SEND_ACCESS, SELinuxSend, 0);
-    ret &= XaceRegisterCallback(XACE_RECEIVE_ACCESS, SELinuxReceive, 0);
-    ret &= XaceRegisterCallback(XACE_CLIENT_ACCESS, SELinuxClient, 0);
-    ret &= XaceRegisterCallback(XACE_EXT_ACCESS, SELinuxExtension, 0);
-    ret &= XaceRegisterCallback(XACE_SERVER_ACCESS, SELinuxServer, 0);
-//    ret &= XaceRegisterCallback(XACE_SELECTION_ACCESS, SELinuxSelection, 0);
-    ret &= XaceRegisterCallback(XACE_SCREEN_ACCESS, SELinuxScreen, 0);
-    ret &= XaceRegisterCallback(XACE_SCREENSAVER_ACCESS, SELinuxScreen, &ret);
+    ret &= XaceRegisterCallback(XACE_EXT_DISPATCH, SELinuxExtension, NULL);
+    ret &= XaceRegisterCallback(XACE_RESOURCE_ACCESS, SELinuxResource, NULL);
+    ret &= XaceRegisterCallback(XACE_DEVICE_ACCESS, SELinuxDevice, NULL);
+    ret &= XaceRegisterCallback(XACE_PROPERTY_ACCESS, SELinuxProperty, NULL);
+    ret &= XaceRegisterCallback(XACE_SEND_ACCESS, SELinuxSend, NULL);
+    ret &= XaceRegisterCallback(XACE_RECEIVE_ACCESS, SELinuxReceive, NULL);
+    ret &= XaceRegisterCallback(XACE_CLIENT_ACCESS, SELinuxClient, NULL);
+    ret &= XaceRegisterCallback(XACE_EXT_ACCESS, SELinuxExtension, NULL);
+    ret &= XaceRegisterCallback(XACE_SERVER_ACCESS, SELinuxServer, NULL);
+//    ret &= XaceRegisterCallback(XACE_SELECTION_ACCESS, SELinuxSelection, NULL);
+    ret &= XaceRegisterCallback(XACE_SCREEN_ACCESS, SELinuxScreen, NULL);
+    ret &= XaceRegisterCallback(XACE_SCREENSAVER_ACCESS, SELinuxScreen, truep);
     if (!ret)
 	FatalError("XSELinux: Failed to register one or more callbacks\n");
 

From 660557593ea961948722298ea8ffba83891c9914 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 23 Oct 2007 14:46:37 -0400
Subject: [PATCH 186/552] xselinux: Remove synthetic bit when looking up event
 type.

---
 Xext/xselinux.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 183a047dc..ef5be571f 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -133,10 +133,11 @@ static pointer truep = (pointer)1;
  * Looks up the SID corresponding to the given event type
  */
 static int
-SELinuxEventToSID(int type, SELinuxStateRec *sid_return)
+SELinuxEventToSID(unsigned type, SELinuxStateRec *sid_return)
 {
     const char *name = LookupEventName(type);
     security_context_t con;
+    type &= 127;
 
     if (type >= numKnownEvents) {
 	/* Need to increase size of classes array */

From 825f09dffd94cfcd0562a01c5181998503851461 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 23 Oct 2007 17:12:57 -0400
Subject: [PATCH 187/552] xace: Still more changes to selection code.  Removed
 the SelectionPtr from the hook - the hook only needs the Atom to control
 access to the selection object.  Upgraded the SelectionCallback to take a
 client argument and additional type codes so that it can be used for
 redirection.

---
 Xext/xace.c    |  1 -
 Xext/xacestr.h |  1 -
 dix/dispatch.c | 58 +++++++++++++++++++++++++++++---------------------
 include/dix.h  |  3 +++
 4 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/Xext/xace.c b/Xext/xace.c
index b12666159..7b27ecd6a 100644
--- a/Xext/xace.c
+++ b/Xext/xace.c
@@ -177,7 +177,6 @@ int XaceHook(int hook, ...)
 	    XaceSelectionAccessRec rec = {
 		va_arg(ap, ClientPtr),
 		va_arg(ap, Atom),
-		va_arg(ap, Selection*),
 		va_arg(ap, Mask),
 		Success /* default allow */
 	    };
diff --git a/Xext/xacestr.h b/Xext/xacestr.h
index 1c615433b..045f8364f 100644
--- a/Xext/xacestr.h
+++ b/Xext/xacestr.h
@@ -112,7 +112,6 @@ typedef struct {
 typedef struct {
     ClientPtr client;
     Atom name;
-    Selection *selection;
     Mask access_mode;
     int status;
 } XaceSelectionAccessRec;
diff --git a/dix/dispatch.c b/dix/dispatch.c
index 2cfeb2df9..814c2a853 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -1005,6 +1005,11 @@ ProcSetSelectionOwner(ClientPtr client)
     {
 	int i = 0;
 
+	rc = XaceHook(XACE_SELECTION_ACCESS, client, stuff->selection,
+		      DixSetAttrAccess);
+	if (rc != Success)
+	    return rc;
+
 	/*
 	 * First, see if the selection is already set... 
 	 */
@@ -1022,12 +1027,6 @@ ProcSetSelectionOwner(ClientPtr client)
             if (CompareTimeStamps(time, CurrentSelections[i].lastTimeChanged)
 		== EARLIER)
 		return Success;
-
-	    rc = XaceHook(XACE_SELECTION_ACCESS, client, stuff->selection,
-			  CurrentSelections + i, DixSetAttrAccess);
-	    if (rc != Success)
-		return rc;
-
 	    if (CurrentSelections[i].client &&
 		(!pWin || (CurrentSelections[i].client != client)))
 	    {
@@ -1058,10 +1057,6 @@ ProcSetSelectionOwner(ClientPtr client)
 	    CurrentSelections = newsels;
 	    CurrentSelections[i].selection = stuff->selection;
 	    CurrentSelections[i].devPrivates = NULL;
-	    rc = XaceHook(XACE_SELECTION_ACCESS, client, stuff->selection,
-			  CurrentSelections + i, DixSetAttrAccess);
-	    if (rc != Success)
-		return rc;
 	}
         CurrentSelections[i].lastTimeChanged = time;
 	CurrentSelections[i].window = stuff->window;
@@ -1072,6 +1067,7 @@ ProcSetSelectionOwner(ClientPtr client)
 	    SelectionInfoRec	info;
 
 	    info.selection = &CurrentSelections[i];
+	    info.client = client;
 	    info.kind= SelectionSetOwner;
 	    CallCallbacks(&SelectionCallback, &info);
 	}
@@ -1095,23 +1091,29 @@ ProcGetSelectionOwner(ClientPtr client)
 	int rc, i;
         xGetSelectionOwnerReply reply;
 
-	i = 0;
-        while ((i < NumCurrentSelections) && 
-	       CurrentSelections[i].selection != stuff->id) i++;
-
 	rc = XaceHook(XACE_SELECTION_ACCESS, client, stuff->id,
-		      CurrentSelections + i, DixGetAttrAccess);
+		      DixGetAttrAccess);
 	if (rc != Success)
 	    return rc;
 
+	i = 0;
+        while ((i < NumCurrentSelections) && 
+	       CurrentSelections[i].selection != stuff->id) i++;
         reply.type = X_Reply;
 	reply.length = 0;
 	reply.sequenceNumber = client->sequence;
-        if (i < NumCurrentSelections)
-            reply.owner = CurrentSelections[i].window;
-        else
-            reply.owner = None;
+	if (i < NumCurrentSelections) {
+	    if (SelectionCallback) {
+		SelectionInfoRec info;
 
+		info.selection = &CurrentSelections[i];
+		info.client = client;
+		info.kind= SelectionGetOwner;
+		CallCallbacks(&SelectionCallback, &info);
+	    }
+            reply.owner = CurrentSelections[i].window;
+	} else
+            reply.owner = None;
         WriteReplyToClient(client, sizeof(xGetSelectionOwnerReply), &reply);
         return(client->noClientException);
     }
@@ -1135,6 +1137,10 @@ ProcConvertSelection(ClientPtr client)
     rc = dixLookupWindow(&pWin, stuff->requestor, client, DixSetAttrAccess);
     if (rc != Success)
         return rc;
+    rc = XaceHook(XACE_SELECTION_ACCESS, client, stuff->selection,
+		  DixReadAccess);
+    if (rc != Success)
+	return rc;
 
     paramsOkay = (ValidAtom(stuff->selection) && ValidAtom(stuff->target));
     if (stuff->property != None)
@@ -1146,11 +1152,15 @@ ProcConvertSelection(ClientPtr client)
 	i = 0;
 	while ((i < NumCurrentSelections) && 
 	       CurrentSelections[i].selection != stuff->selection) i++;
-	if ((i < NumCurrentSelections) &&
-	    (CurrentSelections[i].window != None) &&
-	    XaceHook(XACE_SELECTION_ACCESS, client, stuff->selection,
-		     CurrentSelections + i, DixReadAccess) == Success)
-	{        
+	if (i < NumCurrentSelections && CurrentSelections[i].window != None) {
+	    if (SelectionCallback) {
+		SelectionInfoRec info;
+
+		info.selection = &CurrentSelections[i];
+		info.client = client;
+		info.kind= SelectionConvertSelection;
+		CallCallbacks(&SelectionCallback, &info);
+	    }
 	    event.u.u.type = SelectionRequest;
 	    event.u.selectionRequest.time = stuff->time;
 	    event.u.selectionRequest.owner = CurrentSelections[i].window;
diff --git a/include/dix.h b/include/dix.h
index 09ed6d944..30fdc45b1 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -594,12 +594,15 @@ extern CallbackListPtr SelectionCallback;
 
 typedef enum {
     SelectionSetOwner,
+    SelectionGetOwner,
+    SelectionConvertSelection,
     SelectionWindowDestroy,
     SelectionClientClose
 } SelectionCallbackKind;
 
 typedef struct {
     struct _Selection	    *selection;
+    ClientPtr		    client;
     SelectionCallbackKind   kind;
 } SelectionInfoRec;
 

From 46521f529841e032e198e5df87974088548a68de Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 23 Oct 2007 20:58:48 -0400
Subject: [PATCH 188/552] xselinux: Add basic support for selection access
 control and redirection.

Probably not fully baked yet.  It's difficult to test since so few apps
actually follow the ICCCM with respect to cut & paste.
---
 Xext/xselinux.c | 371 ++++++++++++++++++++++++++++++++++++++++--------
 Xext/xselinux.h |  37 +++++
 2 files changed, 348 insertions(+), 60 deletions(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index ef5be571f..f11bc1aaa 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -65,6 +65,15 @@ typedef struct {
     char *command;
 } SELinuxStateRec;
 
+/* selection manager */
+typedef struct {
+    Atom selection;
+    security_id_t sid;
+} SELinuxSelectionRec;
+
+static ClientPtr selectionManager;
+static Window selectionWindow;
+
 /* audit file descriptor */
 static int audit_fd;
 
@@ -99,6 +108,10 @@ static unsigned numKnownTypes;
 static security_id_t *knownEvents;
 static unsigned numKnownEvents;
 
+/* Array of selection SID structures */
+static SELinuxSelectionRec *knownSelections;
+static unsigned numKnownSelections;
+
 /* dynamically allocated security classes and permissions */
 static struct security_class_mapping map[] = {
     { "x_drawable", { "read", "write", "destroy", "create", "getattr", "setattr", "list_property", "get_property", "set_property", "", "", "list_child", "add_child", "remove_child", "hide", "show", "blend", "override", "", "", "", "", "send", "receive", "", "manage", NULL }},
@@ -129,6 +142,52 @@ static pointer truep = (pointer)1;
  * Support Routines
  */
 
+/*
+ * Looks up the SID corresponding to the given selection atom
+ */
+static int
+SELinuxSelectionToSID(Atom selection, SELinuxStateRec *sid_return)
+{
+    const char *name;
+    unsigned i, size;
+
+    for (i = 0; i < numKnownSelections; i++)
+	if (knownSelections[i].selection == selection) {
+	    sid_return->sid = knownSelections[i].sid;
+	    return Success;
+	}
+
+    /* Need to increase size of array */
+    i = numKnownSelections;
+    size = (i + 1) * sizeof(SELinuxSelectionRec);
+    knownSelections = xrealloc(knownSelections, size);
+    if (!knownSelections)
+	return BadAlloc;
+    knownSelections[i].selection = selection;
+
+    /* Look in the mappings of selection names to contexts */
+    name = NameForAtom(selection);
+    if (name) {
+	security_context_t con;
+	security_id_t sid;
+
+	if (selabel_lookup(label_hnd, &con, name, SELABEL_X_SELN) < 0) {
+	    ErrorF("XSELinux: a selection label lookup failed!\n");
+	    return BadValue;
+	}
+	/* Get a SID for context */
+	if (avc_context_to_sid(con, &sid) < 0) {
+	    ErrorF("XSELinux: a context_to_SID call failed!\n");
+	    return BadAlloc;
+	}
+	freecon(con);
+	knownSelections[i].sid = sid_return->sid = sid;
+    } else
+	knownSelections[i].sid = sid_return->sid = unlabeled_sid;
+
+    return Success;
+}
+
 /*
  * Looks up the SID corresponding to the given event type
  */
@@ -239,11 +298,72 @@ SELinuxDoCheck(int clientIndex, SELinuxStateRec *subj, SELinuxStateRec *obj,
     return Success;
 }
 
+/*
+ * Labels a newly connected client.
+ */
+static void
+SELinuxLabelClient(ClientPtr client)
+{
+    XtransConnInfo ci = ((OsCommPtr)client->osPrivate)->trans_conn;
+    SELinuxStateRec *state;
+    security_context_t ctx;
+
+    state = dixLookupPrivate(&client->devPrivates, stateKey);
+    sidput(state->sid);
+
+    if (_XSERVTransIsLocal(ci)) {
+	int fd = _XSERVTransGetConnectionNumber(ci);
+	struct ucred creds;
+	socklen_t len = sizeof(creds);
+	char path[PATH_MAX + 1];
+	size_t bytes;
+
+	/* For local clients, can get context from the socket */
+	if (getpeercon(fd, &ctx) < 0)
+	    FatalError("Client %d: couldn't get context from socket\n",
+		       client->index);
+
+	/* Try and determine the client's executable name */
+	memset(&creds, 0, sizeof(creds));
+	if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &creds, &len) < 0)
+	    goto finish;
+
+	snprintf(path, PATH_MAX + 1, "/proc/%d/cmdline", creds.pid);
+	fd = open(path, O_RDONLY);
+	if (fd < 0)
+	    goto finish;
+
+	bytes = read(fd, path, PATH_MAX + 1);
+	close(fd);
+	if (bytes <= 0)
+	    goto finish;
+
+	state->command = xalloc(bytes);
+	if (!state->command)
+	    goto finish;
+
+	memcpy(state->command, path, bytes);
+	state->command[bytes - 1] = 0;
+    } else
+	/* For remote clients, need to use a default context */
+	if (selabel_lookup(label_hnd, &ctx, NULL, SELABEL_X_CLIENT) < 0)
+	    FatalError("Client %d: couldn't get default remote context\n",
+		       client->index);
+
+finish:
+    /* Get a SID from the context */
+    if (avc_context_to_sid(ctx, &state->sid) < 0)
+	FatalError("Client %d: context_to_sid(%s) failed\n",
+		   client->index, ctx);
+
+    freecon(ctx);
+}
+
 /*
  * Labels initial server objects.
  */
 static void
-SELinuxFixupLabels(void)
+SELinuxLabelInitial(void)
 {
     int i;
     XaceScreenAccessRec srec;
@@ -674,6 +794,28 @@ SELinuxServer(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	rec->status = rc;
 }
 
+static void
+SELinuxSelection(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+{
+    XaceSelectionAccessRec *rec = (XaceSelectionAccessRec *)calldata;
+    SELinuxStateRec *subj, sel_sid;
+    SELinuxAuditRec auditdata = { rec->client, NULL, 0, 0, 0, NULL };
+    int rc;
+
+    subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
+
+    rc = SELinuxSelectionToSID(rec->name, &sel_sid);
+    if (rc != Success) {
+	rec->status = rc;
+	return;
+    }
+
+    rc = SELinuxDoCheck(rec->client->index, subj, &sel_sid,
+			SECCLASS_X_SELECTION, rec->access_mode, &auditdata);
+    if (rc != Success)
+	rec->status = rc;
+}
+
 
 /*
  * DIX Callbacks
@@ -683,63 +825,23 @@ static void
 SELinuxClientState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     NewClientInfoRec *pci = calldata;
-    ClientPtr client = pci->client;
-    XtransConnInfo ci = ((OsCommPtr)client->osPrivate)->trans_conn;
-    SELinuxStateRec *state;
-    security_context_t ctx;
 
-    if (client->clientState != ClientStateInitial)
-	return;
+    switch (pci->client->clientState) {
+    case ClientStateInitial:
+	SELinuxLabelClient(pci->client);
+	break;
 
-    state = dixLookupPrivate(&client->devPrivates, stateKey);
-    sidput(state->sid);
+    case ClientStateRetained:
+    case ClientStateGone:
+	if (pci->client == selectionManager) {
+	    selectionManager = NULL;
+	    selectionWindow = 0;
+	}
+	break;
 
-    if (_XSERVTransIsLocal(ci)) {
-	int fd = _XSERVTransGetConnectionNumber(ci);
-	struct ucred creds;
-	socklen_t len = sizeof(creds);
-	char path[PATH_MAX + 1];
-	size_t bytes;
-
-	/* For local clients, can get context from the socket */
-	if (getpeercon(fd, &ctx) < 0)
-	    FatalError("Client %d: couldn't get context from socket\n",
-		       client->index);
-
-	/* Try and determine the client's executable name */
-	memset(&creds, 0, sizeof(creds));
-	if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &creds, &len) < 0)
-	    goto finish;
-
-	snprintf(path, PATH_MAX + 1, "/proc/%d/cmdline", creds.pid);
-	fd = open(path, O_RDONLY);
-	if (fd < 0)
-	    goto finish;
-
-	bytes = read(fd, path, PATH_MAX + 1);
-	close(fd);
-	if (bytes <= 0)
-	    goto finish;
-
-	state->command = xalloc(bytes);
-	if (!state->command)
-	    goto finish;
-
-	memcpy(state->command, path, bytes);
-	state->command[bytes - 1] = 0;
-    } else
-	/* For remote clients, need to use a default context */
-	if (selabel_lookup(label_hnd, &ctx, NULL, SELABEL_X_CLIENT) < 0)
-	    FatalError("Client %d: couldn't get default remote context\n",
-		       client->index);
-
-finish:
-    /* Get a SID from the context */
-    if (avc_context_to_sid(ctx, &state->sid) < 0)
-	FatalError("Client %d: context_to_sid(%s) failed\n",
-		   client->index, ctx);
-
-    freecon(ctx);
+    default:
+	break;
+    }
 }
 
 static void
@@ -788,6 +890,50 @@ SELinuxResourceState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	FatalError("XSELinux: Unexpected unlabeled window found\n");
 }
 
+static void
+SELinuxSelectionState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+{
+    SelectionInfoRec *rec = calldata;
+    SELinuxStateRec *subj, *obj;
+
+    switch (rec->kind) {
+    case SelectionSetOwner:
+	/* save off the "real" owner of the selection */
+	rec->selection->alt_client = rec->selection->client;
+	rec->selection->alt_window = rec->selection->window;
+
+	/* figure out the new label for the content */
+	subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
+	obj = dixLookupPrivate(&rec->selection->devPrivates, stateKey);
+	sidput(obj->sid);
+
+	if (avc_compute_create(subj->sid, subj->sid, SECCLASS_X_SELECTION,
+			       &obj->sid) < 0) {
+	    ErrorF("XSELinux: a compute_create call failed!\n");
+	    obj->sid = unlabeled_sid;
+	}
+	break;
+
+    case SelectionGetOwner:
+	/* restore the real owner */
+	rec->selection->window = rec->selection->alt_window;
+	break;
+
+    case SelectionConvertSelection:
+	/* redirect the convert request if necessary */
+	if (selectionManager && selectionManager != rec->client) {
+	    rec->selection->client = selectionManager;
+	    rec->selection->window = selectionWindow;
+	} else {
+	    rec->selection->client = rec->selection->alt_client;
+	    rec->selection->window = rec->selection->alt_window;
+	}
+	break;
+    default:
+	break;
+    }
+}
+
 
 /*
  * DevPrivates Callbacks
@@ -822,10 +968,109 @@ SELinuxStateFree(CallbackListPtr *pcbl, pointer unused, pointer calldata)
  * Extension Dispatch
  */
 
+static int
+ProcSELinuxQueryVersion(ClientPtr client)
+{
+    SELinuxQueryVersionReply rep;
+    /*
+      REQUEST(SELinuxQueryVersionReq);
+      REQUEST_SIZE_MATCH (SELinuxQueryVersionReq);
+    */
+
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+    rep.server_major = XSELINUX_MAJOR_VERSION;
+    rep.server_minor = XSELINUX_MINOR_VERSION;
+    if (client->swapped) {
+	int n;
+	swaps(&rep.sequenceNumber, n);
+	swapl(&rep.length, n);
+	swaps(&rep.server_major, n);
+	swaps(&rep.server_minor, n);
+    }
+    WriteToClient(client, sizeof(rep), (char *)&rep);
+    return (client->noClientException);
+}
+
+static int
+ProcSELinuxSetSelectionManager(ClientPtr client)
+{
+    REQUEST(SELinuxSetSelectionManagerReq);
+    WindowPtr pWin;
+    int rc;
+
+    REQUEST_SIZE_MATCH(SELinuxSetSelectionManagerReq);
+
+    if (stuff->window == None) {
+	selectionManager = NULL;
+	selectionWindow = None;
+    } else {
+	rc = dixLookupResource((pointer *)&pWin, stuff->window, RT_WINDOW,
+			       client, DixGetAttrAccess);
+	if (rc != Success)
+	    return rc;
+
+	selectionManager = client;
+	selectionWindow = stuff->window;
+    }
+
+    return Success;
+}
+
 static int
 ProcSELinuxDispatch(ClientPtr client)
 {
-    return BadRequest;
+    REQUEST(xReq);
+    switch (stuff->data) {
+    case X_SELinuxQueryVersion:
+        return ProcSELinuxQueryVersion(client);
+    case X_SELinuxSetSelectionManager:
+	return ProcSELinuxSetSelectionManager(client);
+    default:
+	return BadRequest;
+    }
+}
+
+static int
+SProcSELinuxQueryVersion(ClientPtr client)
+{
+    REQUEST(SELinuxQueryVersionReq);
+    int n;
+
+    REQUEST_SIZE_MATCH (SELinuxQueryVersionReq);
+    swaps(&stuff->client_major,n);
+    swaps(&stuff->client_minor,n);
+    return ProcSELinuxQueryVersion(client);
+}
+
+static int
+SProcSELinuxSetSelectionManager(ClientPtr client)
+{
+    REQUEST(SELinuxSetSelectionManagerReq);
+    int n;
+
+    REQUEST_SIZE_MATCH (SELinuxSetSelectionManagerReq);
+    swapl(&stuff->window,n);
+    return ProcSELinuxSetSelectionManager(client);
+}
+
+static int
+SProcSELinuxDispatch(ClientPtr client)
+{
+    REQUEST(xReq);
+    int n;
+
+    swaps(&stuff->length, n);
+
+    switch (stuff->data) {
+    case X_SELinuxQueryVersion:
+        return SProcSELinuxQueryVersion(client);
+    case X_SELinuxSetSelectionManager:
+        return SProcSELinuxSetSelectionManager(client);
+    default:
+	return BadRequest;
+    }
 }
 
 
@@ -839,6 +1084,7 @@ SELinuxResetProc(ExtensionEntry *extEntry)
     /* Unregister callbacks */
     DeleteCallback(&ClientStateCallback, SELinuxClientState, NULL);
     DeleteCallback(&ResourceStateCallback, SELinuxResourceState, NULL);
+    DeleteCallback(&SelectionCallback, SELinuxSelectionState, NULL);
 
     XaceDeleteCallback(XACE_EXT_DISPATCH, SELinuxExtension, NULL);
     XaceDeleteCallback(XACE_RESOURCE_ACCESS, SELinuxResource, NULL);
@@ -849,7 +1095,7 @@ SELinuxResetProc(ExtensionEntry *extEntry)
     XaceDeleteCallback(XACE_CLIENT_ACCESS, SELinuxClient, NULL);
     XaceDeleteCallback(XACE_EXT_ACCESS, SELinuxExtension, NULL);
     XaceDeleteCallback(XACE_SERVER_ACCESS, SELinuxServer, NULL);
-//    XaceDeleteCallback(XACE_SELECTION_ACCESS, SELinuxSelection, NULL);
+    XaceDeleteCallback(XACE_SELECTION_ACCESS, SELinuxSelection, NULL);
     XaceDeleteCallback(XACE_SCREEN_ACCESS, SELinuxScreen, NULL);
     XaceDeleteCallback(XACE_SCREENSAVER_ACCESS, SELinuxScreen, truep);
 
@@ -863,6 +1109,10 @@ SELinuxResetProc(ExtensionEntry *extEntry)
     avc_active = 0;
 
     /* Free local state */
+    xfree(knownSelections);
+    knownSelections = NULL;
+    numKnownSelections = 0;
+
     xfree(knownEvents);
     knownEvents = NULL;
     numKnownEvents = 0;
@@ -929,6 +1179,7 @@ XSELinuxExtensionInit(INITARGS)
 
     ret &= AddCallback(&ClientStateCallback, SELinuxClientState, NULL);
     ret &= AddCallback(&ResourceStateCallback, SELinuxResourceState, NULL);
+    ret &= AddCallback(&SelectionCallback, SELinuxSelectionState, NULL);
 
     ret &= XaceRegisterCallback(XACE_EXT_DISPATCH, SELinuxExtension, NULL);
     ret &= XaceRegisterCallback(XACE_RESOURCE_ACCESS, SELinuxResource, NULL);
@@ -939,7 +1190,7 @@ XSELinuxExtensionInit(INITARGS)
     ret &= XaceRegisterCallback(XACE_CLIENT_ACCESS, SELinuxClient, NULL);
     ret &= XaceRegisterCallback(XACE_EXT_ACCESS, SELinuxExtension, NULL);
     ret &= XaceRegisterCallback(XACE_SERVER_ACCESS, SELinuxServer, NULL);
-//    ret &= XaceRegisterCallback(XACE_SELECTION_ACCESS, SELinuxSelection, NULL);
+    ret &= XaceRegisterCallback(XACE_SELECTION_ACCESS, SELinuxSelection, NULL);
     ret &= XaceRegisterCallback(XACE_SCREEN_ACCESS, SELinuxScreen, NULL);
     ret &= XaceRegisterCallback(XACE_SCREENSAVER_ACCESS, SELinuxScreen, truep);
     if (!ret)
@@ -948,9 +1199,9 @@ XSELinuxExtensionInit(INITARGS)
     /* Add extension to server */
     extEntry = AddExtension(XSELINUX_EXTENSION_NAME,
 			    XSELinuxNumberEvents, XSELinuxNumberErrors,
-			    ProcSELinuxDispatch, ProcSELinuxDispatch,
+			    ProcSELinuxDispatch, SProcSELinuxDispatch,
 			    SELinuxResetProc, StandardMinorOpcode);
 
     /* Label objects that were created before we could register ourself */
-    SELinuxFixupLabels();
+    SELinuxLabelInitial();
 }
diff --git a/Xext/xselinux.h b/Xext/xselinux.h
index 407b81f93..691154d1d 100644
--- a/Xext/xselinux.h
+++ b/Xext/xselinux.h
@@ -29,6 +29,43 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define XSELinuxNumberEvents		0
 #define XSELinuxNumberErrors		0
 
+/* Extension protocol */
+#define X_SELinuxQueryVersion		0
+#define X_SELinuxSetSelectionManager	1
+
+typedef struct _SELinuxQueryVersion {
+    CARD8   reqType;
+    CARD8   SELinuxReqType;
+    CARD16  length;
+    CARD8   client_major;
+    CARD8   client_minor;
+    CARD16  unused;
+} SELinuxQueryVersionReq;
+#define sz_SELinuxQueryVersionReq 8
+
+typedef struct {
+    CARD8   type;
+    CARD8   pad1;
+    CARD16  sequenceNumber;
+    CARD32  length;
+    CARD16  server_major;
+    CARD16  server_minor;
+    CARD32  pad2;
+    CARD32  pad3;
+    CARD32  pad4;
+    CARD32  pad5;
+    CARD32  pad6; 
+} SELinuxQueryVersionReply;
+#define sz_SELinuxQueryVersionReply  32
+
+typedef struct _SELinuxSetSelectionManager {
+    CARD8   reqType;
+    CARD8   SELinuxReqType;
+    CARD16  length;
+    CARD32  window;
+} SELinuxSetSelectionManagerReq;
+#define sz_SELinuxSetSelectionManagerReq 8
+
 /* Private Flask definitions */
 #define SECCLASS_X_DRAWABLE		1
 #define SECCLASS_X_SCREEN		2

From 0388a59a6ef212c497cc3f64d677b1ca5b410982 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 23 Oct 2007 20:59:21 -0400
Subject: [PATCH 189/552] Revert "registry: special case minor number when
 looking up core requests."

This reverts commit 31110d6837ee52fd654729d9e5c4b0c5395abab0.

This is handled properly by StandardMinorOpcode().
---
 dix/registry.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dix/registry.c b/dix/registry.c
index 01818582e..48e1b5dae 100644
--- a/dix/registry.c
+++ b/dix/registry.c
@@ -123,8 +123,6 @@ RegisterResourceName(RESTYPE resource, const char *name)
 const char *
 LookupRequestName(int major, int minor)
 {
-    if (major < 128)
-	minor = 0;
     if (major >= nmajor)
 	return XREGISTRY_UNKNOWN;
     if (minor >= nminor[major])

From 0d2ef187e77b12713d2a9661932fa01dba58a945 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 24 Oct 2007 18:23:31 -0400
Subject: [PATCH 190/552] xselinux: Add audit message fields for selection and
 event names.

---
 Xext/xselinux.c | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index f11bc1aaa..83610119a 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -83,7 +83,9 @@ typedef struct {
     char *command;	/* client's executable path */
     unsigned id;	/* resource id, if any */
     int restype;	/* resource type, if any */
+    int event;		/* event type, if any */
     Atom property;	/* property name, if any */
+    Atom selection;	/* selection name, if any */
     char *extension;	/* extension name, if any */
 } SELinuxAuditRec;
 
@@ -413,7 +415,7 @@ SELinuxAudit(void *auditdata,
 {
     SELinuxAuditRec *audit = auditdata;
     ClientPtr client = audit->client;
-    char idNum[16], *propertyName;
+    char idNum[16], *propertyName, *selectionName;
     int major = -1, minor = -1;
 
     if (client) {
@@ -427,8 +429,9 @@ SELinuxAudit(void *auditdata,
 	snprintf(idNum, 16, "%x", audit->id);
 
     propertyName = audit->property ? NameForAtom(audit->property) : NULL;
+    selectionName = audit->selection ? NameForAtom(audit->selection) : NULL;
 
-    return snprintf(msgbuf, msgbufsize, "%s%s%s%s%s%s%s%s%s%s%s%s",
+    return snprintf(msgbuf, msgbufsize, "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
 		    (major >= 0) ? "request=" : "",
 		    (major >= 0) ? LookupRequestName(major, minor) : "",
 		    audit->command ? " comm=" : "",
@@ -437,8 +440,12 @@ SELinuxAudit(void *auditdata,
 		    audit->id ? idNum : "",
 		    audit->restype ? " restype=" : "",
 		    audit->restype ? LookupResourceName(audit->restype) : "",
+		    audit->event ? " event=" : "",
+		    audit->event ? LookupEventName(audit->event & 127) : "",
 		    audit->property ? " property=" : "",
 		    audit->property ? propertyName : "",
+		    audit->selection ? " selection=" : "",
+		    audit->selection ? selectionName : "",
 		    audit->extension ? " extension=" : "",
 		    audit->extension ? audit->extension : "");
 }
@@ -462,7 +469,7 @@ SELinuxDevice(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     XaceDeviceAccessRec *rec = calldata;
     SELinuxStateRec *subj, *obj;
-    SELinuxAuditRec auditdata = { rec->client, NULL, 0, 0, 0, NULL };
+    SELinuxAuditRec auditdata = { .client = rec->client };
     int rc;
 
     subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
@@ -492,7 +499,7 @@ SELinuxSend(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     XaceSendAccessRec *rec = calldata;
     SELinuxStateRec *subj, *obj;
-    SELinuxAuditRec auditdata = { rec->client, NULL, 0, 0, 0, NULL };
+    SELinuxAuditRec auditdata = { .client = rec->client };
     int rc, i, clientIndex;
 
     if (rec->dev) {
@@ -519,6 +526,7 @@ SELinuxSend(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	if (rc != Success)
 	    goto err;
 
+	auditdata.event = rec->events[i].u.u.type;
 	rc = SELinuxDoCheck(clientIndex, subj, &ev_sid, SECCLASS_X_EVENT,
 			    DixSendAccess, &auditdata);
 	if (rc != Success)
@@ -534,7 +542,7 @@ SELinuxReceive(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     XaceReceiveAccessRec *rec = calldata;
     SELinuxStateRec *subj, *obj;
-    SELinuxAuditRec auditdata = { rec->client, NULL, 0, 0, 0, NULL };
+    SELinuxAuditRec auditdata = { .client = rec->client };
     int rc, i;
 
     subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
@@ -554,6 +562,7 @@ SELinuxReceive(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	if (rc != Success)
 	    goto err;
 
+	auditdata.event = rec->events[i].u.u.type;
 	rc = SELinuxDoCheck(rec->client->index, subj, &ev_sid, SECCLASS_X_EVENT,
 			    DixReceiveAccess, &auditdata);
 	if (rc != Success)
@@ -569,7 +578,7 @@ SELinuxExtension(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     XaceExtAccessRec *rec = calldata;
     SELinuxStateRec *subj, *obj, *serv;
-    SELinuxAuditRec auditdata = { rec->client, NULL, 0, 0, 0, NULL };
+    SELinuxAuditRec auditdata = { .client = rec->client };
     int rc;
 
     subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
@@ -623,7 +632,7 @@ SELinuxProperty(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     XacePropertyAccessRec *rec = calldata;
     SELinuxStateRec *subj, *obj;
-    SELinuxAuditRec auditdata = { rec->client, NULL, 0, 0, 0, NULL };
+    SELinuxAuditRec auditdata = { .client = rec->client };
     int rc;
 
     subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
@@ -675,7 +684,7 @@ SELinuxResource(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     XaceResourceAccessRec *rec = calldata;
     SELinuxStateRec *subj, *obj, *pobj;
-    SELinuxAuditRec auditdata = { rec->client, NULL, 0, 0, 0, NULL };
+    SELinuxAuditRec auditdata = { .client = rec->client };
     PrivateRec **privatePtr;
     security_class_t class;
     int rc, offset;
@@ -731,7 +740,7 @@ SELinuxScreen(CallbackListPtr *pcbl, pointer is_saver, pointer calldata)
 {
     XaceScreenAccessRec *rec = calldata;
     SELinuxStateRec *subj, *obj;
-    SELinuxAuditRec auditdata = { rec->client, NULL, 0, 0, 0, NULL };
+    SELinuxAuditRec auditdata = { .client = rec->client };
     Mask access_mode = rec->access_mode;
     int rc;
 
@@ -765,7 +774,7 @@ SELinuxClient(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     XaceClientAccessRec *rec = calldata;
     SELinuxStateRec *subj, *obj;
-    SELinuxAuditRec auditdata = { rec->client, NULL, 0, 0, 0, NULL };
+    SELinuxAuditRec auditdata = { .client = rec->client };
     int rc;
 
     subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
@@ -782,7 +791,7 @@ SELinuxServer(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     XaceServerAccessRec *rec = calldata;
     SELinuxStateRec *subj, *obj;
-    SELinuxAuditRec auditdata = { rec->client, NULL, 0, 0, 0, NULL };
+    SELinuxAuditRec auditdata = { .client = rec->client };
     int rc;
 
     subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
@@ -799,7 +808,7 @@ SELinuxSelection(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     XaceSelectionAccessRec *rec = (XaceSelectionAccessRec *)calldata;
     SELinuxStateRec *subj, sel_sid;
-    SELinuxAuditRec auditdata = { rec->client, NULL, 0, 0, 0, NULL };
+    SELinuxAuditRec auditdata = { .client = rec->client };
     int rc;
 
     subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
@@ -810,6 +819,7 @@ SELinuxSelection(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	return;
     }
 
+    auditdata.selection = rec->name;
     rc = SELinuxDoCheck(rec->client->index, subj, &sel_sid,
 			SECCLASS_X_SELECTION, rec->access_mode, &auditdata);
     if (rc != Success)

From 4b05f19cb9e42d8c8eff5ca4e463f5bc2a05433d Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 24 Oct 2007 19:59:58 -0400
Subject: [PATCH 191/552] xselinux: Introduce a type transition when labeling
 events.

---
 Xext/xselinux.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 83610119a..cb62cb941 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -194,7 +194,8 @@ SELinuxSelectionToSID(Atom selection, SELinuxStateRec *sid_return)
  * Looks up the SID corresponding to the given event type
  */
 static int
-SELinuxEventToSID(unsigned type, SELinuxStateRec *sid_return)
+SELinuxEventToSID(unsigned type, security_id_t sid_of_window,
+		  SELinuxStateRec *sid_return)
 {
     const char *name = LookupEventName(type);
     security_context_t con;
@@ -212,7 +213,7 @@ SELinuxEventToSID(unsigned type, SELinuxStateRec *sid_return)
     }
 
     if (!knownEvents[type]) {
-	/* Look in the mappings of property names to contexts */
+	/* Look in the mappings of event names to contexts */
 	if (selabel_lookup(label_hnd, &con, name, SELABEL_X_EVENT) < 0) {
 	    ErrorF("XSELinux: an event label lookup failed!\n");
 	    return BadValue;
@@ -225,7 +226,13 @@ SELinuxEventToSID(unsigned type, SELinuxStateRec *sid_return)
 	freecon(con);
     }
 
-    sid_return->sid = knownEvents[type];
+    /* Perform a transition to obtain the final SID */
+    if (avc_compute_create(sid_of_window, knownEvents[type], SECCLASS_X_EVENT,
+			   &sid_return->sid) < 0) {
+	ErrorF("XSELinux: a compute_create call failed!\n");
+	return BadValue;
+    }
+
     return Success;
 }
 
@@ -522,7 +529,7 @@ SELinuxSend(CallbackListPtr *pcbl, pointer unused, pointer calldata)
     for (i = 0; i < rec->count; i++) {
 	SELinuxStateRec ev_sid;
 
-	rc = SELinuxEventToSID(rec->events[i].u.u.type, &ev_sid);
+	rc = SELinuxEventToSID(rec->events[i].u.u.type, obj->sid, &ev_sid);
 	if (rc != Success)
 	    goto err;
 
@@ -558,7 +565,7 @@ SELinuxReceive(CallbackListPtr *pcbl, pointer unused, pointer calldata)
     for (i = 0; i < rec->count; i++) {
 	SELinuxStateRec ev_sid;
 
-	rc = SELinuxEventToSID(rec->events[i].u.u.type, &ev_sid);
+	rc = SELinuxEventToSID(rec->events[i].u.u.type, obj->sid, &ev_sid);
 	if (rc != Success)
 	    goto err;
 

From 40de9fcf18930811dd5ae355c83275af887a9f83 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 25 Oct 2007 12:35:01 -0400
Subject: [PATCH 192/552] xselinux: Label the default device directly with the
 process context.

---
 Xext/xselinux.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index cb62cb941..b78017090 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -486,13 +486,9 @@ SELinuxDevice(CallbackListPtr *pcbl, pointer unused, pointer calldata)
     if (rec->access_mode & DixCreateAccess) {
 	sidput(obj->sid);
 
-	/* Perform a transition to obtain the final SID */
-	if (avc_compute_create(subj->sid, subj->sid, SECCLASS_X_DEVICE,
-			       &obj->sid) < 0) {
-	    ErrorF("XSELinux: a compute_create call failed!\n");
-	    rec->status = BadValue;
-	    return;
-	}
+	/* Label the device directly with the process SID */
+	sidget(subj->sid);
+	obj->sid = subj->sid;
     }
 
     rc = SELinuxDoCheck(rec->client->index, subj, obj, SECCLASS_X_DEVICE,

From 7d14ca59c5b942c09feaa2429c394cde9d8d3fd1 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 25 Oct 2007 19:00:50 -0400
Subject: [PATCH 193/552] xselinux: Don't include the client in the receive
 hook audit messages.

---
 Xext/xselinux.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index b78017090..bacbe6ef5 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -545,7 +545,7 @@ SELinuxReceive(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     XaceReceiveAccessRec *rec = calldata;
     SELinuxStateRec *subj, *obj;
-    SELinuxAuditRec auditdata = { .client = rec->client };
+    SELinuxAuditRec auditdata = { .client = NULL };
     int rc, i;
 
     subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);

From 8c6923018c7d71cd15d9cf4ef9e8528ef5ec7c2e Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 25 Oct 2007 19:01:29 -0400
Subject: [PATCH 194/552] xace: Add a "manage" access check when setting the
 Redirect event bits.

---
 dix/events.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/dix/events.c b/dix/events.c
index 24de94767..e13e290f4 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -3330,6 +3330,8 @@ ProcessPointerEvent (xEvent *xE, DeviceIntPtr mouse, int count)
 
 #define AtMostOneClient \
 	(SubstructureRedirectMask | ResizeRedirectMask | ButtonPressMask)
+#define ManagerMask \
+	(SubstructureRedirectMask | ResizeRedirectMask)
 
 /**
  * Recalculate which events may be deliverable for the given window.
@@ -3418,12 +3420,20 @@ EventSelectForWindow(WindowPtr pWin, ClientPtr client, Mask mask)
 {
     Mask check;
     OtherClients * others;
+    int rc;
 
     if (mask & ~AllEventMasks)
     {
 	client->errorValue = mask;
 	return BadValue;
     }
+    check = (mask & ManagerMask);
+    if (check) {
+	rc = XaceHook(XACE_RESOURCE_ACCESS, client, pWin->drawable.id,
+		      RT_WINDOW, pWin, RT_NONE, NULL, DixManageAccess);
+	if (rc != Success)
+	    return rc;
+    }
     check = (mask & AtMostOneClient);
     if (check & (pWin->eventMask|wOtherEventMasks(pWin)))
     {				       /* It is illegal for two different

From 5f9095f0d29bac0190d82c87a09cf32d6a34c17c Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 25 Oct 2007 19:02:03 -0400
Subject: [PATCH 195/552] registry: Remove synthetic bit from event types in
 lookup function.

---
 dix/registry.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dix/registry.c b/dix/registry.c
index 48e1b5dae..1cf7fa59e 100644
--- a/dix/registry.c
+++ b/dix/registry.c
@@ -134,6 +134,7 @@ LookupRequestName(int major, int minor)
 const char *
 LookupEventName(int event)
 {
+    event &= 127;
     if (event >= nevent)
 	return XREGISTRY_UNKNOWN;
 
@@ -153,7 +154,6 @@ const char *
 LookupResourceName(RESTYPE resource)
 {
     resource &= TypeMask;
-
     if (resource >= nresource)
 	return XREGISTRY_UNKNOWN;
 

From 3b7af72fe315c7c26c89838c0c5dacbe58765d0f Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 26 Oct 2007 20:32:10 -0400
Subject: [PATCH 196/552] xselinux: Add a SetDeviceContext request and stubs
 for more requests.

---
 Xext/xselinux.c | 190 ++++++++++++++++++++++++++++++++++++++++++++++--
 Xext/xselinux.h | 121 ++++++++++++++++++++++++++++--
 2 files changed, 298 insertions(+), 13 deletions(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index bacbe6ef5..946e5b944 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -985,10 +985,6 @@ static int
 ProcSELinuxQueryVersion(ClientPtr client)
 {
     SELinuxQueryVersionReply rep;
-    /*
-      REQUEST(SELinuxQueryVersionReq);
-      REQUEST_SIZE_MATCH (SELinuxQueryVersionReq);
-    */
 
     rep.type = X_Reply;
     rep.length = 0;
@@ -1009,10 +1005,10 @@ ProcSELinuxQueryVersion(ClientPtr client)
 static int
 ProcSELinuxSetSelectionManager(ClientPtr client)
 {
-    REQUEST(SELinuxSetSelectionManagerReq);
     WindowPtr pWin;
     int rc;
 
+    REQUEST(SELinuxSetSelectionManagerReq);
     REQUEST_SIZE_MATCH(SELinuxSetSelectionManagerReq);
 
     if (stuff->window == None) {
@@ -1031,6 +1027,98 @@ ProcSELinuxSetSelectionManager(ClientPtr client)
     return Success;
 }
 
+static int
+ProcSELinuxGetSelectionManager(ClientPtr client)
+{
+    SELinuxGetSelectionManagerReply rep;
+
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+    rep.window = selectionWindow;
+    if (client->swapped) {
+	int n;
+	swaps(&rep.sequenceNumber, n);
+	swapl(&rep.length, n);
+	swapl(&rep.window, n);
+    }
+    WriteToClient(client, sizeof(rep), (char *)&rep);
+    return (client->noClientException);
+}
+
+static int
+ProcSELinuxSetDeviceContext(ClientPtr client)
+{
+    char *ctx;
+    security_id_t sid;
+    DeviceIntPtr dev;
+    SELinuxStateRec *state;
+    int rc;
+
+    REQUEST(SELinuxSetContextReq);
+    REQUEST_FIXED_SIZE(SELinuxSetContextReq, stuff->context_len);
+
+    ctx = (char *)(stuff + 1);
+    if (ctx[stuff->context_len - 1])
+	return BadLength;
+
+    rc = dixLookupDevice(&dev, stuff->id, client, DixManageAccess);
+    if (rc != Success)
+	return rc;
+
+    rc = avc_context_to_sid(ctx, &sid);
+    if (rc != Success)
+	return BadValue;
+
+    state = dixLookupPrivate(&dev->devPrivates, stateKey);
+    sidput(state->sid);
+    state->sid = sid;
+    ErrorF("I really, actually did relabel a device to %s\n", ctx);
+    return Success;
+}
+
+static int
+ProcSELinuxGetDeviceContext(ClientPtr client)
+{
+    return Success;
+}
+
+static int
+ProcSELinuxSetPropertyCreateContext(ClientPtr client)
+{
+    return Success;
+}
+
+static int
+ProcSELinuxGetPropertyCreateContext(ClientPtr client)
+{
+    return Success;
+}
+
+static int
+ProcSELinuxGetPropertyContext(ClientPtr client)
+{
+    return Success;
+}
+
+static int
+ProcSELinuxSetWindowCreateContext(ClientPtr client)
+{
+    return Success;
+}
+
+static int
+ProcSELinuxGetWindowCreateContext(ClientPtr client)
+{
+    return Success;
+}
+
+static int
+ProcSELinuxGetWindowContext(ClientPtr client)
+{
+    return Success;
+}
+
 static int
 ProcSELinuxDispatch(ClientPtr client)
 {
@@ -1040,6 +1128,24 @@ ProcSELinuxDispatch(ClientPtr client)
         return ProcSELinuxQueryVersion(client);
     case X_SELinuxSetSelectionManager:
 	return ProcSELinuxSetSelectionManager(client);
+    case X_SELinuxGetSelectionManager:
+    	return ProcSELinuxGetSelectionManager(client);
+    case X_SELinuxSetDeviceContext:
+    	return ProcSELinuxSetDeviceContext(client);
+    case X_SELinuxGetDeviceContext:
+    	return ProcSELinuxGetDeviceContext(client);
+    case X_SELinuxSetPropertyCreateContext:
+    	return ProcSELinuxSetPropertyCreateContext(client);
+    case X_SELinuxGetPropertyCreateContext:
+    	return ProcSELinuxGetPropertyCreateContext(client);
+    case X_SELinuxGetPropertyContext:
+    	return ProcSELinuxGetPropertyContext(client);
+    case X_SELinuxSetWindowCreateContext:
+    	return ProcSELinuxSetWindowCreateContext(client);
+    case X_SELinuxGetWindowCreateContext:
+    	return ProcSELinuxGetWindowCreateContext(client);
+    case X_SELinuxGetWindowContext:
+    	return ProcSELinuxGetWindowContext(client);
     default:
 	return BadRequest;
     }
@@ -1068,6 +1174,60 @@ SProcSELinuxSetSelectionManager(ClientPtr client)
     return ProcSELinuxSetSelectionManager(client);
 }
 
+static int
+SProcSELinuxGetSelectionManager(ClientPtr client)
+{
+    return ProcSELinuxGetSelectionManager(client);
+}
+
+static int
+SProcSELinuxSetDeviceContext(ClientPtr client)
+{
+    return ProcSELinuxSetDeviceContext(client);
+}
+
+static int
+SProcSELinuxGetDeviceContext(ClientPtr client)
+{
+    return ProcSELinuxGetDeviceContext(client);
+}
+
+static int
+SProcSELinuxSetPropertyCreateContext(ClientPtr client)
+{
+    return ProcSELinuxSetPropertyCreateContext(client);
+}
+
+static int
+SProcSELinuxGetPropertyCreateContext(ClientPtr client)
+{
+    return ProcSELinuxGetPropertyCreateContext(client);
+}
+
+static int
+SProcSELinuxGetPropertyContext(ClientPtr client)
+{
+    return ProcSELinuxGetPropertyContext(client);
+}
+
+static int
+SProcSELinuxSetWindowCreateContext(ClientPtr client)
+{
+    return ProcSELinuxSetWindowCreateContext(client);
+}
+
+static int
+SProcSELinuxGetWindowCreateContext(ClientPtr client)
+{
+    return ProcSELinuxGetWindowCreateContext(client);
+}
+
+static int
+SProcSELinuxGetWindowContext(ClientPtr client)
+{
+    return ProcSELinuxGetWindowContext(client);
+}
+
 static int
 SProcSELinuxDispatch(ClientPtr client)
 {
@@ -1080,7 +1240,25 @@ SProcSELinuxDispatch(ClientPtr client)
     case X_SELinuxQueryVersion:
         return SProcSELinuxQueryVersion(client);
     case X_SELinuxSetSelectionManager:
-        return SProcSELinuxSetSelectionManager(client);
+	return SProcSELinuxSetSelectionManager(client);
+    case X_SELinuxGetSelectionManager:
+    	return SProcSELinuxGetSelectionManager(client);
+    case X_SELinuxSetDeviceContext:
+    	return SProcSELinuxSetDeviceContext(client);
+    case X_SELinuxGetDeviceContext:
+    	return SProcSELinuxGetDeviceContext(client);
+    case X_SELinuxSetPropertyCreateContext:
+    	return SProcSELinuxSetPropertyCreateContext(client);
+    case X_SELinuxGetPropertyCreateContext:
+    	return SProcSELinuxGetPropertyCreateContext(client);
+    case X_SELinuxGetPropertyContext:
+    	return SProcSELinuxGetPropertyContext(client);
+    case X_SELinuxSetWindowCreateContext:
+    	return SProcSELinuxSetWindowCreateContext(client);
+    case X_SELinuxGetWindowCreateContext:
+    	return SProcSELinuxGetWindowCreateContext(client);
+    case X_SELinuxGetWindowContext:
+    	return SProcSELinuxGetWindowContext(client);
     default:
 	return BadRequest;
     }
diff --git a/Xext/xselinux.h b/Xext/xselinux.h
index 691154d1d..50838d754 100644
--- a/Xext/xselinux.h
+++ b/Xext/xselinux.h
@@ -30,10 +30,19 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define XSELinuxNumberErrors		0
 
 /* Extension protocol */
-#define X_SELinuxQueryVersion		0
-#define X_SELinuxSetSelectionManager	1
+#define X_SELinuxQueryVersion			0
+#define X_SELinuxSetSelectionManager		1
+#define X_SELinuxGetSelectionManager		2
+#define X_SELinuxSetDeviceContext		3
+#define X_SELinuxGetDeviceContext		4
+#define X_SELinuxSetPropertyCreateContext	5
+#define X_SELinuxGetPropertyCreateContext	6
+#define X_SELinuxGetPropertyContext		7
+#define X_SELinuxSetWindowCreateContext		8
+#define X_SELinuxGetWindowCreateContext		9
+#define X_SELinuxGetWindowContext		10
 
-typedef struct _SELinuxQueryVersion {
+typedef struct {
     CARD8   reqType;
     CARD8   SELinuxReqType;
     CARD16  length;
@@ -41,7 +50,6 @@ typedef struct _SELinuxQueryVersion {
     CARD8   client_minor;
     CARD16  unused;
 } SELinuxQueryVersionReq;
-#define sz_SELinuxQueryVersionReq 8
 
 typedef struct {
     CARD8   type;
@@ -56,15 +64,114 @@ typedef struct {
     CARD32  pad5;
     CARD32  pad6; 
 } SELinuxQueryVersionReply;
-#define sz_SELinuxQueryVersionReply  32
 
-typedef struct _SELinuxSetSelectionManager {
+typedef struct {
     CARD8   reqType;
     CARD8   SELinuxReqType;
     CARD16  length;
     CARD32  window;
 } SELinuxSetSelectionManagerReq;
-#define sz_SELinuxSetSelectionManagerReq 8
+
+typedef struct {
+    CARD8   reqType;
+    CARD8   SELinuxReqType;
+    CARD16  length;
+} SELinuxGetSelectionManagerReq;
+
+typedef struct {
+    CARD8   type;
+    CARD8   pad1;
+    CARD16  sequenceNumber;
+    CARD32  length;
+    CARD32  window;
+    CARD32  pad2;
+    CARD32  pad3;
+    CARD32  pad4;
+    CARD32  pad5;
+    CARD32  pad6;
+} SELinuxGetSelectionManagerReply;
+
+typedef struct {
+    CARD8   reqType;
+    CARD8   SELinuxReqType;
+    CARD16  length;
+    CARD8   permanent;
+    CARD8   unused;
+    CARD16  context_len;
+} SELinuxSetCreateContextReq;
+
+typedef struct {
+    CARD8   reqType;
+    CARD8   SELinuxReqType;
+    CARD16  length;
+} SELinuxGetCreateContextReq;
+
+typedef struct {
+    CARD8   type;
+    CARD8   permanent;
+    CARD16  sequenceNumber;
+    CARD32  length;
+    CARD16  context_len;
+    CARD16  pad1;
+    CARD32  pad2;
+    CARD32  pad3;
+    CARD32  pad4;
+    CARD32  pad5;
+    CARD32  pad6;
+} SELinuxGetCreateContextReply;
+
+typedef struct {
+    CARD8   reqType;
+    CARD8   SELinuxReqType;
+    CARD16  length;
+    CARD32  id;
+    CARD16  unused;
+    CARD16  context_len;
+} SELinuxSetContextReq;
+
+typedef struct {
+    CARD8   reqType;
+    CARD8   SELinuxReqType;
+    CARD16  length;
+    CARD32  id;
+} SELinuxGetContextReq;
+
+typedef struct {
+    CARD8   type;
+    CARD8   pad1;
+    CARD16  sequenceNumber;
+    CARD32  length;
+    CARD16  context_len;
+    CARD16  pad2;
+    CARD32  pad3;
+    CARD32  pad4;
+    CARD32  pad5;
+    CARD32  pad6;
+    CARD32  pad7;
+} SELinuxGetContextReply;
+
+typedef struct {
+    CARD8   reqType;
+    CARD8   SELinuxReqType;
+    CARD16  length;
+    CARD32  window;
+    CARD32  property;
+} SELinuxGetPropertyContextReq;
+
+typedef struct {
+    CARD8   type;
+    CARD8   pad1;
+    CARD16  sequenceNumber;
+    CARD32  length;
+    CARD16  context_len;
+    CARD16  pad2;
+    CARD32  pad3;
+    CARD32  pad4;
+    CARD32  pad5;
+    CARD32  pad6;
+    CARD32  pad7;
+} SELinuxGetPropertyContextReply;
+
 
 /* Private Flask definitions */
 #define SECCLASS_X_DRAWABLE		1

From c7e18beb3c87eb1ada9b21c4ffacd11c1939c087 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 5 Nov 2007 15:01:13 -0500
Subject: [PATCH 197/552] xselinux: Register SELinux extension protocol names.

---
 Xext/xselinux.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 946e5b944..f6d1dcd4b 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -1395,4 +1395,28 @@ XSELinuxExtensionInit(INITARGS)
 
     /* Label objects that were created before we could register ourself */
     SELinuxLabelInitial();
+
+    /* Add names to registry */
+    RegisterRequestName(X_SELinuxQueryVersion, 0,
+			XSELINUX_EXTENSION_NAME ":SELinuxQueryVersion");
+    RegisterRequestName(X_SELinuxSetSelectionManager, 0,
+			XSELINUX_EXTENSION_NAME ":SELinuxSetSelectionManager");
+    RegisterRequestName(X_SELinuxGetSelectionManager, 0,
+			XSELINUX_EXTENSION_NAME ":SELinuxGetSelectionManager");
+    RegisterRequestName(X_SELinuxSetDeviceContext, 0,
+			XSELINUX_EXTENSION_NAME ":SELinuxSetDeviceContext");
+    RegisterRequestName(X_SELinuxGetDeviceContext, 0,
+			XSELINUX_EXTENSION_NAME ":SELinuxGetDeviceContext");
+    RegisterRequestName(X_SELinuxSetPropertyCreateContext, 0,
+			XSELINUX_EXTENSION_NAME ":SELinuxSetPropertyCreateContext");
+    RegisterRequestName(X_SELinuxGetPropertyCreateContext, 0,
+			XSELINUX_EXTENSION_NAME ":SELinuxGetPropertyCreateContext");
+    RegisterRequestName(X_SELinuxGetPropertyContext, 0,
+			XSELINUX_EXTENSION_NAME ":SELinuxGetPropertyContext");
+    RegisterRequestName(X_SELinuxSetWindowCreateContext, 0,
+			XSELINUX_EXTENSION_NAME ":SELinuxSetWindowCreateContext");
+    RegisterRequestName(X_SELinuxGetWindowCreateContext, 0,
+			XSELINUX_EXTENSION_NAME ":SELinuxGetWindowCreateContext");
+    RegisterRequestName(X_SELinuxGetWindowContext, 0,
+			XSELINUX_EXTENSION_NAME ":SELinuxGetWindowContext");
 }

From 8b5d21cc1d1f4e9d20e5d5eca44cb1e60a419763 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 8 Nov 2007 16:32:42 -0500
Subject: [PATCH 198/552] Rework of the XC-SECURITY extension.  The gen-auth
 protocol has not changed, but the XC-QUERY-SECURITY-1 authorization method
 and the SecurityPolicy configuration file have been removed.  The semantics
 of the trusted vs. untrusted split have been changed.  This will be
 documented in a future commit.

---
 Xext/security.c    | 1350 ++++++++++----------------------------------
 Xext/securitysrv.h |    4 -
 os/utils.c         |   12 -
 3 files changed, 312 insertions(+), 1054 deletions(-)

diff --git a/Xext/security.c b/Xext/security.c
index ec414a0c3..6aab3a342 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -31,53 +31,47 @@ in this Software without prior written authorization from The Open Group.
 #include "scrnintstr.h"
 #include "colormapst.h"
 #include "privates.h"
+#include "registry.h"
 #include "xacestr.h"
 #include "securitysrv.h"
 #include <X11/extensions/securstr.h>
-#include <assert.h>
-#include <stdarg.h>
 #ifdef XAPPGROUP
 #include "appgroup.h"
 #endif
-#include <stdio.h>  /* for file reading operations */
-#include <X11/Xatom.h>  /* for XA_STRING */
-
-#ifndef DEFAULTPOLICYFILE
-# define DEFAULTPOLICYFILE NULL
-#endif
-#if defined(WIN32) || defined(__CYGWIN__)
-#include <X11/Xos.h>
-#undef index
-#endif
-
 #include "modinit.h"
 
+/* Extension stuff */
 static int SecurityErrorBase;  /* first Security error number */
 static int SecurityEventBase;  /* first Security event number */
-static const DevPrivateKey stateKey = &stateKey;
 
-/* this is what we store as client security state */
+RESTYPE SecurityAuthorizationResType; /* resource type for authorizations */
+static RESTYPE RTEventClient;
+
+static CallbackListPtr SecurityValidateGroupCallback = NULL;
+
+/* Private state record */
+static DevPrivateKey stateKey = &stateKey;
+
+/* This is what we store as client security state */
 typedef struct {
     int haveState;
     unsigned int trustLevel;
     XID authId;
-} SecurityClientStateRec;
+} SecurityStateRec;
 
-#define HAVESTATE(client) (((SecurityClientStateRec *) \
-    dixLookupPrivate(DEVPRIV_PTR(client), stateKey))->haveState)
-#define TRUSTLEVEL(client) (((SecurityClientStateRec *) \
-    dixLookupPrivate(DEVPRIV_PTR(client), stateKey))->trustLevel)
-#define AUTHID(client)(((SecurityClientStateRec *) \
-    dixLookupPrivate(DEVPRIV_PTR(client), stateKey))->authId)
+/* Extensions that untrusted clients shouldn't have access to */
+static char *SecurityUntrustedExtensions[] = {
+    "RandR",
+    "SECURITY",
+    "XFree86-DGA",
+    NULL
+};
 
-static CallbackListPtr SecurityValidateGroupCallback = NULL;
+/* Access modes that untrusted clients can do to trusted stuff */
+static const Mask SecurityAllowedMask =
+    DixGetAttrAccess | DixListPropAccess | DixGetPropAccess |
+    DixGetFocusAccess | DixListAccess | DixReceiveAccess;
 
-static char **SecurityTrustedExtensions = NULL;
-static int nSecurityTrustedExtensions = 0;
-
-RESTYPE SecurityAuthorizationResType; /* resource type for authorizations */
-
-static RESTYPE RTEventClient;
 
 /* SecurityAudit
  *
@@ -103,6 +97,51 @@ SecurityAudit(char *format, ...)
     va_end(args);
 } /* SecurityAudit */
 
+/*
+ * Performs a Security permission check.
+ */
+static int
+SecurityDoCheck(SecurityStateRec *subj, SecurityStateRec *obj,
+		Mask requested, Mask allowed)
+{
+    if (!subj->haveState || !obj->haveState)
+	return Success;
+    if (subj->trustLevel == XSecurityClientTrusted)
+	return Success;
+    if (obj->trustLevel != XSecurityClientTrusted)
+	return Success;
+    if ((requested | allowed) == allowed)
+	return Success;
+
+    return BadAccess;
+}
+
+/*
+ * Labels initial server objects.
+ */
+static void
+SecurityLabelInitial(void)
+{
+    SecurityStateRec *state;
+
+    /* Do the serverClient */
+    state = dixLookupPrivate(&serverClient->devPrivates, stateKey);
+    state->trustLevel = XSecurityClientTrusted;
+    state->haveState = TRUE;
+}
+
+/*
+ * Looks up a request name
+ */
+static _X_INLINE const char *
+SecurityLookupRequestName(ClientPtr client)
+{
+    int major = ((xReq *)client->requestBuffer)->reqType;
+    int minor = MinorOpcodeOfRequest(client);
+    return LookupRequestName(major, minor);
+}
+
+
 #define rClient(obj) (clients[CLIENT_ID((obj)->resource)])
 
 /* SecurityDeleteAuthorization
@@ -163,10 +202,12 @@ SecurityDeleteAuthorization(
     /* kill all clients using this auth */
 
     for (i = 1; i<currentMaxClients; i++)
-    {
-	if (clients[i] && (AUTHID(clients[i]) == pAuth->id))
-	    CloseDownClient(clients[i]);
-    }
+	if (clients[i]) {
+	    SecurityStateRec *state;
+	    state = dixLookupPrivate(&clients[i]->devPrivates, stateKey);
+	    if (state->haveState && state->authId == pAuth->id)
+		CloseDownClient(clients[i]);
+	}
 
     SecurityAudit("revoked authorization ID %d\n", pAuth->id);
     xfree(pAuth);
@@ -315,12 +356,6 @@ ProcSecurityQueryVersion(
     /* REQUEST(xSecurityQueryVersionReq); */
     xSecurityQueryVersionReply 	rep;
 
-    /* paranoia: this "can't happen" because this extension is hidden
-     * from untrusted clients, but just in case...
-     */
-    if (TRUSTLEVEL(client) != XSecurityClientTrusted)
-	return BadRequest;
-
     REQUEST_SIZE_MATCH(xSecurityQueryVersionReq);
     rep.type        	= X_Reply;
     rep.sequenceNumber 	= client->sequence;
@@ -401,12 +436,6 @@ ProcSecurityGenerateAuthorization(
     char *pAuthdata;		/* generated auth data */
     Mask eventMask;		/* what events on this auth does client want */
 
-    /* paranoia: this "can't happen" because this extension is hidden
-     * from untrusted clients, but just in case...
-     */
-    if (TRUSTLEVEL(client) != XSecurityClientTrusted)
-	return BadRequest;
-
     /* check request length */
 
     REQUEST_AT_LEAST_SIZE(xSecurityGenerateAuthorizationReq);
@@ -584,12 +613,6 @@ ProcSecurityRevokeAuthorization(
     REQUEST(xSecurityRevokeAuthorizationReq);
     SecurityAuthorizationPtr pAuth;
 
-    /* paranoia: this "can't happen" because this extension is hidden
-     * from untrusted clients, but just in case...
-     */
-    if (TRUSTLEVEL(client) != XSecurityClientTrusted)
-	return BadRequest;
-
     REQUEST_SIZE_MATCH(xSecurityRevokeAuthorizationReq);
 
     pAuth = (SecurityAuthorizationPtr)SecurityLookupIDByType(client,
@@ -703,59 +726,6 @@ SwapSecurityAuthorizationRevokedEvent(
     cpswapl(from->authId, to->authId);
 }
 
-/* SecurityDetermineEventPropogationLimits
- *
- * This is a helper function for SecurityCheckDeviceAccess.
- *
- * Arguments:
- *	dev is the device for which the starting and stopping windows for
- *	event propogation should be determined.
- *	The values pointed to by ppWin and ppStopWin are not used.
- *
- * Returns:
- *	ppWin is filled in with a pointer to the window at which event
- *	propogation for the given device should start given the current
- *	state of the server (pointer position, window layout, etc.)
- *	ppStopWin is filled in with the window at which event propogation
- *	should stop; events should not go to ppStopWin.
- *
- * Side Effects: none.
- */
-
-static void
-SecurityDetermineEventPropogationLimits(
-    DeviceIntPtr dev,
-    WindowPtr *ppWin,
-    WindowPtr *ppStopWin)
-{
-    WindowPtr pFocusWin = dev->focus ? dev->focus->win : NoneWin;
-
-    if (pFocusWin == NoneWin)
-    { /* no focus -- events don't go anywhere */
-	*ppWin = *ppStopWin = NULL;
-	return;
-    }
-
-    if (pFocusWin == PointerRootWin)
-    { /* focus follows the pointer */
-	*ppWin = GetSpriteWindow();
-	*ppStopWin = NULL; /* propogate all the way to the root */
-    }
-    else
-    { /* a real window is set for the focus */
-	WindowPtr pSpriteWin = GetSpriteWindow();
-	*ppStopWin = pFocusWin->parent; /* don't go past the focus window */
-
-	/* if the pointer is in a subwindow of the focus window, start
-	 * at that subwindow, else start at the focus window itself
-	 */
-	if (IsParent(pFocusWin, pSpriteWin))
-	     *ppWin = pSpriteWin;
-	else *ppWin = pFocusWin;
-    }
-} /* SecurityDetermineEventPropogationLimits */
-
-
 /* SecurityCheckDeviceAccess
  *
  * Arguments:
@@ -773,163 +743,25 @@ SecurityDetermineEventPropogationLimits(
  */
 
 static void
-SecurityCheckDeviceAccess(CallbackListPtr *pcbl, pointer unused,
-			  pointer calldata)
+SecurityDevice(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
-    XaceDeviceAccessRec *rec = (XaceDeviceAccessRec*)calldata;
-    ClientPtr client = rec->client;
-    DeviceIntPtr dev = rec->dev;
-    Bool fromRequest = rec->fromRequest;
-    WindowPtr pWin, pStopWin;
-    Bool untrusted_got_event;
-    Bool found_event_window;
-    Mask eventmask;
-    int reqtype = 0;
+    XaceDeviceAccessRec *rec = calldata;
+    SecurityStateRec *subj, *obj;
+    Mask requested = rec->access_mode;
+    Mask allowed = SecurityAllowedMask;
 
-    /* trusted clients always allowed to do anything */
-    if (TRUSTLEVEL(client) == XSecurityClientTrusted)
-	return;
+    subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
+    obj = dixLookupPrivate(&serverClient->devPrivates, stateKey);
 
-    /* device security other than keyboard is not implemented yet */
-    if (dev != inputInfo.keyboard)
-	return;
-
-    /* some untrusted client wants access */
-
-    if (fromRequest)
-    {
-	reqtype = ((xReq *)client->requestBuffer)->reqType;
-	switch (reqtype)
-	{
-	    /* never allow these */
-	    case X_ChangeKeyboardMapping:
-	    case X_ChangeKeyboardControl:
-	    case X_SetModifierMapping:
-		SecurityAudit("client %d attempted request %d\n",
-			      client->index, reqtype);
-		rec->status = BadAccess;
-		return;
-	    default:
-		break;
-	}
-    }
-
-    untrusted_got_event = FALSE;
-    found_event_window = FALSE;
-
-    if (dev->grab)
-    {
-	untrusted_got_event =
-	    (TRUSTLEVEL(rClient(dev->grab)) != XSecurityClientTrusted);
-    }
-    else
-    {
-	SecurityDetermineEventPropogationLimits(dev, &pWin, &pStopWin);
-
-	eventmask = KeyPressMask | KeyReleaseMask;
-	while ( (pWin != pStopWin) && !found_event_window)
-	{
-	    OtherClients *other;
-
-	    if (pWin->eventMask & eventmask)
-	    {
-		found_event_window = TRUE;
-		client = wClient(pWin);
-		if (TRUSTLEVEL(client) != XSecurityClientTrusted)
-		{
-		    untrusted_got_event = TRUE;
-		}
-	    }
-	    if (wOtherEventMasks(pWin) & eventmask)
-	    {
-		found_event_window = TRUE;
-		for (other = wOtherClients(pWin); other; other = other->next)
-		{
-		    if (other->mask & eventmask)
-		    {
-			client = rClient(other);
-			if (TRUSTLEVEL(client) != XSecurityClientTrusted)
-			{
-			    untrusted_got_event = TRUE;
-			    break;
-			}
-		    }
-		}
-	    }
-	    if (wDontPropagateMask(pWin) & eventmask)
-		break;
-	    pWin = pWin->parent;
-	} /* while propogating the event */
-    }
-
-    /* allow access by untrusted clients only if an event would have gone 
-     * to an untrusted client
-     */
-    
-    if (!untrusted_got_event)
-    {
-	char *devname = dev->name;
-	if (!devname) devname = "unnamed";
-	if (fromRequest)
-	    SecurityAudit("client %d attempted request %d device %d (%s)\n",
-			  client->index, reqtype, dev->id, devname);
-	else
-	    SecurityAudit("client %d attempted to access device %d (%s)\n",
-			  client->index, dev->id, devname);
+    if (SecurityDoCheck(subj, obj, requested, allowed) != Success) {
+	SecurityAudit("Security denied client %d keyboard access on request "
+		      "%s\n", rec->client->index,
+		      SecurityLookupRequestName(rec->client));
 	rec->status = BadAccess;
     }
-    return;
-} /* SecurityCheckDeviceAccess */
+}
 
-
-
-/* SecurityAuditResourceIDAccess
- *
- * Arguments:
- *	client is the client doing the resource access.
- *	id is the resource id.
- *
- * Returns: NULL
- *
- * Side Effects:
- *	An audit message is generated with details of the denied
- *	resource access.
- */
-
-static pointer
-SecurityAuditResourceIDAccess(
-    ClientPtr client,
-    XID id)
-{
-    int cid = CLIENT_ID(id);
-    int reqtype = ((xReq *)client->requestBuffer)->reqType;
-    switch (reqtype)
-    {
-	case X_ChangeProperty:
-	case X_DeleteProperty:
-	case X_GetProperty:
-	{
-	    xChangePropertyReq *req =
-		(xChangePropertyReq *)client->requestBuffer;
-	    int propertyatom = req->property;
-	    char *propertyname = NameForAtom(propertyatom);
-
-	    SecurityAudit("client %d attempted request %d with window 0x%x property %s of client %d\n",
-		   client->index, reqtype, id, propertyname, cid);
-	    break;
-	}
-	default:
-	{
-	    SecurityAudit("client %d attempted request %d with resource 0x%x of client %d\n",
-		   client->index, reqtype, id, cid);
-	    break;
-	}   
-    }
-    return NULL;
-} /* SecurityAuditResourceIDAccess */
-
-
-/* SecurityCheckResourceIDAccess
+/* SecurityResource
  *
  * This function gets plugged into client->CheckAccess and is called from
  * SecurityLookupIDByType/Class to determine if the client can access the
@@ -951,144 +783,174 @@ SecurityAuditResourceIDAccess(
  */
 
 static void
-SecurityCheckResourceIDAccess(CallbackListPtr *pcbl, pointer unused,
-			      pointer calldata)
+SecurityResource(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
-    XaceResourceAccessRec *rec = (XaceResourceAccessRec*)calldata;
-    ClientPtr client = rec->client;
-    XID id = rec->id;
-    RESTYPE rtype = rec->rtype;
-    Mask access_mode = rec->access_mode;
-    pointer rval = rec->res;
-    int cid, reqtype;
+    XaceResourceAccessRec *rec = calldata;
+    SecurityStateRec *subj, *obj;
+    int cid = CLIENT_ID(rec->id);
+    Mask requested = rec->access_mode;
+    Mask allowed = SecurityAllowedMask;
 
-    if (TRUSTLEVEL(client) == XSecurityClientTrusted ||
-	DixUnknownAccess == access_mode)
-	return;       /* for compatibility, we have to allow access */
+    subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
+    obj = dixLookupPrivate(&clients[cid]->devPrivates, stateKey);
 
-    cid = CLIENT_ID(id);
-    reqtype = ((xReq *)client->requestBuffer)->reqType;
-    switch (reqtype)
-    { /* these are always allowed */
-	case X_QueryTree:
-        case X_TranslateCoords:
-        case X_GetGeometry:
-	/* property access is controlled in SecurityCheckPropertyAccess */
-	case X_GetProperty:
-	case X_ChangeProperty:
-	case X_DeleteProperty:
-	case X_RotateProperties:
-        case X_ListProperties:
-	    return;
-	default:
-	    break;
+    /* special checks for server-owned resources */
+    if (cid == 0) {
+	if (rec->rtype & RC_DRAWABLE)
+	    /* additional operations allowed on root windows */
+	    allowed |= DixReadAccess|DixSendAccess;
+
+	else if (rec->rtype == RT_COLORMAP)
+	    /* allow access to default colormaps */
+	    allowed = requested;
     }
 
-    if (cid != 0)
-    { /* not a server-owned resource */
-     /*
-      * The following 'if' restricts clients to only access resources at
-      * the same trustLevel.  Since there are currently only two trust levels,
-      * and trusted clients never call this function, this degenerates into
-      * saying that untrusted clients can only access resources of other
-      * untrusted clients.  One way to add the notion of groups would be to
-      * allow values other than Trusted (0) and Untrusted (1) for this field.
-      * Clients at the same trust level would be able to use each other's
-      * resources, but not those of clients at other trust levels.  I haven't
-      * tried it, but this probably mostly works already.  The obvious
-      * competing alternative for grouping clients for security purposes is to
-      * use app groups.  dpw
-      */
-	if (TRUSTLEVEL(client) == TRUSTLEVEL(clients[cid])
+    if (SecurityDoCheck(subj, obj, requested, allowed) == Success)
+	return;
+
 #ifdef XAPPGROUP
-	    || (RT_COLORMAP == rtype && 
-		XagDefaultColormap (client) == (Colormap) id)
+    if (rec->id == XagDefaultColormap(rec->client))
+	return;
 #endif
-	)
-	    return;
-	else
-	    goto deny;
-    }
-    else /* server-owned resource - probably a default colormap or root window */
-    {
-	if (RT_WINDOW == rtype || RC_DRAWABLE == rtype)
-	{
-	    switch (reqtype)
-	    {   /* the following operations are allowed on root windows */
-	        case X_CreatePixmap:
-	        case X_CreateGC:
-	        case X_CreateWindow:
-	        case X_CreateColormap:
-		case X_ListProperties:
-		case X_GrabPointer:
-	        case X_UngrabButton:
-		case X_QueryBestSize:
-		case X_GetWindowAttributes:
-		    break;
-		case X_SendEvent:
-		{ /* see if it is an event specified by the ICCCM */
-		    xSendEventReq *req = (xSendEventReq *)
-						(client->requestBuffer);
-		    if (req->propagate == xTrue
-			||
-			  (req->eventMask != ColormapChangeMask &&
-			   req->eventMask != StructureNotifyMask &&
-			   req->eventMask !=
-			      (SubstructureRedirectMask|SubstructureNotifyMask)
-			  )
-			||
-			  (req->event.u.u.type != UnmapNotify &&
-			   req->event.u.u.type != ConfigureRequest &&
-			   req->event.u.u.type != ClientMessage
-			  )
-		       )
-		    { /* not an ICCCM event */
-			goto deny;
-		    }
-		    break;
-		} /* case X_SendEvent on root */
 
-		case X_ChangeWindowAttributes:
-		{ /* Allow selection of PropertyNotify and StructureNotify
-		   * events on the root.
-		   */
-		    xChangeWindowAttributesReq *req =
-			(xChangeWindowAttributesReq *)(client->requestBuffer);
-		    if (req->valueMask == CWEventMask)
-		    {
-			CARD32 value = *((CARD32 *)(req + 1));
-			if ( (value &
-			      ~(PropertyChangeMask|StructureNotifyMask)) == 0)
-			    break;
-		    }
-		    goto deny;
-		} /* case X_ChangeWindowAttributes on root */
-
-		default:
-		{
-		    /* others not allowed */
-		    goto deny;
-		}
-	    }
-	} /* end server-owned window or drawable */
-	else if (SecurityAuthorizationResType == rtype)
-	{
-	    SecurityAuthorizationPtr pAuth = (SecurityAuthorizationPtr)rval;
-	    if (pAuth->trustLevel != TRUSTLEVEL(client))
-		goto deny;
-	}
-	else if (RT_COLORMAP != rtype)
-	{ /* don't allow anything else besides colormaps */
-	    goto deny;
-	}
-    }
-    return;
-  deny:
-    SecurityAuditResourceIDAccess(client, id);
+    SecurityAudit("Security: denied client %d access to resource 0x%x "
+		  "of client %d on request %s\n", rec->client->index, rec->id,
+		  cid, SecurityLookupRequestName(rec->client));
     rec->status = BadAccess; /* deny access */
-} /* SecurityCheckResourceIDAccess */
+}
 
 
+static void
+SecurityExtension(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+{
+    XaceExtAccessRec *rec = calldata;
+    SecurityStateRec *subj;
+    int i = 0;
+
+    subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
+
+    if (subj->haveState && subj->trustLevel != XSecurityClientTrusted)
+	while (SecurityUntrustedExtensions[i])
+	    if (!strcmp(SecurityUntrustedExtensions[i++], rec->ext->name)) {
+		SecurityAudit("Security: denied client %d access to extension "
+			      "%s on request %s\n",
+			      rec->client->index, rec->ext->name,
+			      SecurityLookupRequestName(rec->client));
+		rec->status = BadAccess;
+		return;
+	    }
+}
+
+static void
+SecurityServer(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+{
+    XaceServerAccessRec *rec = calldata;
+    SecurityStateRec *subj, *obj;
+    Mask requested = rec->access_mode;
+    Mask allowed = SecurityAllowedMask;
+
+    subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
+    obj = dixLookupPrivate(&serverClient->devPrivates, stateKey);
+ 
+    if (SecurityDoCheck(subj, obj, requested, allowed) != Success) {
+	SecurityAudit("Security: denied client %d access to server "
+		      "configuration request %s\n", rec->client->index,
+		      SecurityLookupRequestName(rec->client));
+	rec->status = BadAccess;
+    }
+}
+
+static void
+SecurityClient(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+{
+    XaceClientAccessRec *rec = calldata;
+    SecurityStateRec *subj, *obj;
+    Mask requested = rec->access_mode;
+    Mask allowed = SecurityAllowedMask;
+
+    subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
+    obj = dixLookupPrivate(&rec->target->devPrivates, stateKey);
+
+    if (SecurityDoCheck(subj, obj, requested, allowed) != Success) {
+	SecurityAudit("Security: denied client %d access to client %d on "
+		      "request %s\n", rec->client->index, rec->target->index,
+		      SecurityLookupRequestName(rec->client));
+	rec->status = BadAccess;
+    }
+}
+
+static void
+SecurityProperty(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+{    
+    XacePropertyAccessRec *rec = calldata;
+    SecurityStateRec *subj, *obj;
+    ATOM name = rec->pProp->propertyName;
+    Mask requested = rec->access_mode;
+    Mask allowed = SecurityAllowedMask | DixReadAccess;
+
+    subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
+    obj = dixLookupPrivate(&wClient(rec->pWin)->devPrivates, stateKey);
+
+    if (SecurityDoCheck(subj, obj, requested, allowed) != Success) {
+	SecurityAudit("Security: denied client %d access to property %s "
+		      "(atom 0x%x) window 0x%x of client %d on request %s\n",
+		      rec->client->index, NameForAtom(name), name,
+		      rec->pWin->drawable.id, wClient(rec->pWin)->index,
+		      SecurityLookupRequestName(rec->client));
+	rec->status = BadAccess;
+    }
+}
+
+static void
+SecuritySend(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+{
+    XaceSendAccessRec *rec = calldata;
+    SecurityStateRec *subj, *obj;
+
+    if (rec->client) {
+	int i;
+
+	subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
+	obj = dixLookupPrivate(&wClient(rec->pWin)->devPrivates, stateKey);
+
+	if (SecurityDoCheck(subj, obj, DixSendAccess, 0) == Success)
+	    return;
+
+	for (i = 0; i < rec->count; i++)
+	    if (rec->events[i].u.u.type != UnmapNotify &&
+		rec->events[i].u.u.type != ConfigureRequest &&
+		rec->events[i].u.u.type != ClientMessage) {
+
+		SecurityAudit("Security: denied client %d from sending event "
+			      "of type %s to window 0x%x of client %d\n",
+			      rec->client->index, rec->pWin->drawable.id,
+			      wClient(rec->pWin)->index,
+			      LookupEventName(rec->events[i].u.u.type));
+		rec->status = BadAccess;
+		return;
+	    }
+    }
+}
+
+static void
+SecurityReceive(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+{
+    XaceReceiveAccessRec *rec = calldata;
+    SecurityStateRec *subj, *obj;
+
+    subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
+    obj = dixLookupPrivate(&wClient(rec->pWin)->devPrivates, stateKey);
+
+    if (SecurityDoCheck(subj, obj, DixReceiveAccess, 0) == Success)
+	return;
+
+    SecurityAudit("Security: denied client %d from receiving an event "
+		  "sent to window 0x%x of client %d\n",
+		  rec->client->index, rec->pWin->drawable.id,
+		  wClient(rec->pWin)->index);
+    rec->status = BadAccess;
+}
+
 /* SecurityClientStateCallback
  *
  * Arguments:
@@ -1112,643 +974,55 @@ SecurityCheckResourceIDAccess(CallbackListPtr *pcbl, pointer unused,
  */
 
 static void
-SecurityClientStateCallback(CallbackListPtr *pcbl, pointer unused,
-			    pointer calldata)
+SecurityClientState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
-    NewClientInfoRec *pci = (NewClientInfoRec *)calldata;
-    ClientPtr client = pci->client;
+    NewClientInfoRec *pci = calldata;
+    SecurityStateRec *state;
+    SecurityAuthorizationPtr pAuth;
+    int rc;
 
-    switch (client->clientState)
-    {
+    state = dixLookupPrivate(&pci->client->devPrivates, stateKey);
+
+    switch (pci->client->clientState) {
     case ClientStateInitial:
-	TRUSTLEVEL(client) = XSecurityClientTrusted;
-	AUTHID(client) = None;
+	state->trustLevel = XSecurityClientTrusted;
+	state->authId = None;
+	state->haveState = TRUE;
 	break;
 
     case ClientStateRunning:
-	{ 
-	    XID authId = AuthorizationIDOfClient(client);
-	    SecurityAuthorizationPtr pAuth;
+	state->authId = AuthorizationIDOfClient(pci->client);
+	rc = dixLookupResource((pointer *)&pAuth, state->authId,
+			       SecurityAuthorizationResType, serverClient,
+			       DixGetAttrAccess);
+	if (rc == Success) {
+	    /* it is a generated authorization */
+	    pAuth->refcnt++;
+	    if (pAuth->refcnt == 1 && pAuth->timer)
+		TimerCancel(pAuth->timer);
 
-	    TRUSTLEVEL(client) = XSecurityClientTrusted;
-	    AUTHID(client) = authId;
-	    pAuth = (SecurityAuthorizationPtr)LookupIDByType(authId,
-						SecurityAuthorizationResType);
-	    if (pAuth)
-	    { /* it is a generated authorization */
-		pAuth->refcnt++;
-		if (pAuth->refcnt == 1)
-		{
-		    if (pAuth->timer) TimerCancel(pAuth->timer);
-		}
-		TRUSTLEVEL(client) = pAuth->trustLevel;
-	    }
-	    break;
+	    state->trustLevel = pAuth->trustLevel;
 	}
+	break;
+
     case ClientStateGone:
-    case ClientStateRetained: /* client disconnected */
-	{
-	    SecurityAuthorizationPtr pAuth;
-
-	    /* client may not have any state (bad authorization) */
-	    if (!HAVESTATE(client))
-		break;
-
-	    pAuth = (SecurityAuthorizationPtr)LookupIDByType(AUTHID(client),
-						SecurityAuthorizationResType);
-	    if (pAuth)
-	    { /* it is a generated authorization */
-		pAuth->refcnt--;
-		if (pAuth->refcnt == 0)
-		{
-		    SecurityStartAuthorizationTimer(pAuth);
-		}
-	    }	    
-	    break;
+    case ClientStateRetained:
+	rc = dixLookupResource((pointer *)&pAuth, state->authId,
+			       SecurityAuthorizationResType, serverClient,
+			       DixGetAttrAccess);
+	if (rc == Success) {
+	    /* it is a generated authorization */
+	    pAuth->refcnt--;
+	    if (pAuth->refcnt == 0)
+		SecurityStartAuthorizationTimer(pAuth);
 	}
-    default: break; 
-    }
-} /* SecurityClientStateCallback */
+	break;
 
-static void
-SecurityCheckDrawableAccess(CallbackListPtr *pcbl, pointer unused,
-			    pointer calldata)
-{
-    XaceDrawableAccessRec *rec = (XaceDrawableAccessRec*)calldata;
-
-    if (TRUSTLEVEL(rec->client) != XSecurityClientTrusted)
-	rec->status = BadAccess;
-}
-
-static void
-SecurityCheckMapAccess(CallbackListPtr *pcbl, pointer unused,
-		       pointer calldata)
-{
-    XaceMapAccessRec *rec = (XaceMapAccessRec*)calldata;
-    WindowPtr pWin = rec->pWin;
-
-    if (HAVESTATE(rec->client) &&
-	(TRUSTLEVEL(rec->client) != XSecurityClientTrusted) &&
-	(pWin->drawable.class == InputOnly) &&
-	pWin->parent && pWin->parent->parent &&
-	(TRUSTLEVEL(wClient(pWin->parent)) == XSecurityClientTrusted))
-
-	rec->status = BadAccess;
-}
-
-static void
-SecurityCheckExtAccess(CallbackListPtr *pcbl, pointer unused,
-		       pointer calldata)
-{
-    XaceExtAccessRec *rec = (XaceExtAccessRec*)calldata;
-    int i, trusted = 0;
-
-    for (i = 0; i < nSecurityTrustedExtensions; i++)
-	if (!strcmp(SecurityTrustedExtensions[i], rec->ext->name))
-	    trusted = 1;
-
-    if ((TRUSTLEVEL(rec->client) != XSecurityClientTrusted) && !trusted)
-	rec->status = BadAccess;
-}
-
-static void
-SecurityCheckServerAccess(CallbackListPtr *pcbl, pointer unused,
-			  pointer calldata)
-{
-    XaceServerAccessRec *rec = (XaceServerAccessRec*)calldata;
- 
-    if (TRUSTLEVEL(rec->client) != XSecurityClientTrusted)
-    {
-	rec->status = BadAccess;
-	if (rec->access_mode == DixWriteAccess)
-	    SecurityAudit("client %d attempted to change host access\n",
-			  rec->client->index);
-	else
-	    SecurityAudit("client %d attempted to list hosts\n",
-			  rec->client->index);
+    default:
+	break; 
     }
 }
 
-/**********************************************************************/
-
-typedef struct _PropertyAccessRec {
-    ATOM name;
-    ATOM mustHaveProperty;
-    char *mustHaveValue;
-    char windowRestriction;
-#define SecurityAnyWindow          0
-#define SecurityRootWindow         1
-#define SecurityWindowWithProperty 2
-    int readAction;
-    int writeAction;
-    int destroyAction;
-    struct _PropertyAccessRec *next;
-} PropertyAccessRec, *PropertyAccessPtr;
-
-static PropertyAccessPtr PropertyAccessList = NULL;
-static int SecurityDefaultAction = BadAtom;
-static char *SecurityPolicyFile = DEFAULTPOLICYFILE;
-static ATOM SecurityMaxPropertyName = 0;
-
-static char *SecurityKeywords[] = {
-#define SecurityKeywordComment 0
-    "#",
-#define SecurityKeywordProperty 1
-    "property",
-#define SecurityKeywordSitePolicy 2
-    "sitepolicy",
-#define SecurityKeywordRoot 3
-    "root",
-#define SecurityKeywordAny 4
-    "any",
-#define SecurityKeywordExtension 5
-    "trust extension",
-};
-
-#define NUMKEYWORDS (sizeof(SecurityKeywords) / sizeof(char *))
-
-static void
-SecurityFreePropertyAccessList(void)
-{
-    while (PropertyAccessList)
-    {
-	PropertyAccessPtr freeit = PropertyAccessList;
-	PropertyAccessList = PropertyAccessList->next;
-	xfree(freeit);
-    }
-} /* SecurityFreePropertyAccessList */
-
-#define SecurityIsWhitespace(c) ( (c == ' ') || (c == '\t') || (c == '\n') )
-
-static char *
-SecuritySkipWhitespace(
-    char *p)
-{
-    while (SecurityIsWhitespace(*p))
-	p++;
-    return p;
-} /* SecuritySkipWhitespace */
-
-
-static char *
-SecurityParseString(
-    char **rest)
-{
-    char *startOfString;
-    char *s = *rest;
-    char endChar = 0;
-
-    s = SecuritySkipWhitespace(s);
-
-    if (*s == '"' || *s == '\'')
-    {
-	endChar = *s++;
-	startOfString = s;
-	while (*s && (*s != endChar))
-	    s++;
-    }
-    else
-    {
-	startOfString = s;
-	while (*s && !SecurityIsWhitespace(*s))
-	    s++;
-    }
-    if (*s)
-    {
-	*s = '\0';
-	*rest = s + 1;
-	return startOfString;
-    }
-    else
-    {
-	*rest = s;
-	return (endChar) ? NULL : startOfString;
-    }
-} /* SecurityParseString */
-
-
-static int
-SecurityParseKeyword(
-    char **p)
-{
-    int i;
-    char *s = *p;
-    s = SecuritySkipWhitespace(s);
-    for (i = 0; i < NUMKEYWORDS; i++)
-    {
-	int len = strlen(SecurityKeywords[i]);
-	if (strncmp(s, SecurityKeywords[i], len) == 0)
-	{
-	    *p = s + len;
-	    return (i);
-	}
-    }
-    *p = s;
-    return -1;
-} /* SecurityParseKeyword */
-
-
-static Bool
-SecurityParsePropertyAccessRule(
-    char *p)
-{
-    char *propname;
-    char c;
-    int action = SecurityDefaultAction;
-    int readAction, writeAction, destroyAction;
-    PropertyAccessPtr pacl, prev, cur;
-    char *mustHaveProperty = NULL;
-    char *mustHaveValue = NULL;
-    Bool invalid;
-    char windowRestriction;
-    int size;
-    int keyword;
-
-    /* get property name */
-    propname = SecurityParseString(&p);
-    if (!propname || (strlen(propname) == 0))
-	return FALSE;
-
-    /* get window on which property must reside for rule to apply */
-
-    keyword = SecurityParseKeyword(&p);
-    if (keyword == SecurityKeywordRoot)
-	windowRestriction = SecurityRootWindow;
-    else if (keyword == SecurityKeywordAny) 
-	windowRestriction = SecurityAnyWindow;
-    else /* not root or any, must be a property name */
-    {
-	mustHaveProperty = SecurityParseString(&p);
-	if (!mustHaveProperty || (strlen(mustHaveProperty) == 0))
-	    return FALSE;
-	windowRestriction = SecurityWindowWithProperty;
-	p = SecuritySkipWhitespace(p);
-	if (*p == '=')
-	{ /* property value is specified too */
-	    p++; /* skip over '=' */
-	    mustHaveValue = SecurityParseString(&p);
-	    if (!mustHaveValue)
-		return FALSE;
-	}
-    }
-
-    /* get operations and actions */
-
-    invalid = FALSE;
-    readAction = writeAction = destroyAction = SecurityDefaultAction;
-    while ( (c = *p++) && !invalid)
-    {
-	switch (c)
-	{
-	    case 'i': action = XaceIgnoreError; break;
-	    case 'a': action = Success;  break;
-	    case 'e': action = BadAtom;  break;
-
-	    case 'r': readAction    = action; break;
-	    case 'w': writeAction   = action; break;
-	    case 'd': destroyAction = action; break;
-
-	    default :
-		if (!SecurityIsWhitespace(c))
-		    invalid = TRUE;
-	    break;
-	}
-    }
-    if (invalid)
-	return FALSE;
-
-    /* We've successfully collected all the information needed for this
-     * property access rule.  Now record it in a PropertyAccessRec.
-     */
-    size = sizeof(PropertyAccessRec);
-
-    /* If there is a property value string, allocate space for it 
-     * right after the PropertyAccessRec.
-     */
-    if (mustHaveValue)
-	size += strlen(mustHaveValue) + 1;
-    pacl = (PropertyAccessPtr)Xalloc(size);
-    if (!pacl)
-	return FALSE;
-
-    pacl->name = MakeAtom(propname, strlen(propname), TRUE);
-    if (pacl->name == BAD_RESOURCE)
-    {
-	Xfree(pacl);
-	return FALSE;
-    }
-    if (mustHaveProperty)
-    {
-	pacl->mustHaveProperty = MakeAtom(mustHaveProperty,
-					  strlen(mustHaveProperty), TRUE);
-	if (pacl->mustHaveProperty == BAD_RESOURCE)
-	{
-	    Xfree(pacl);
-	    return FALSE;
-	}
-    }
-    else
-	pacl->mustHaveProperty = 0;
-
-    if (mustHaveValue)
-    {
-	pacl->mustHaveValue = (char *)(pacl + 1);
-	strcpy(pacl->mustHaveValue, mustHaveValue);
-    }
-    else
-	pacl->mustHaveValue = NULL;
-
-    SecurityMaxPropertyName = max(SecurityMaxPropertyName, pacl->name);
-
-    pacl->windowRestriction = windowRestriction;
-    pacl->readAction  = readAction;
-    pacl->writeAction = writeAction;
-    pacl->destroyAction = destroyAction;
-
-    /* link the new rule into the list of rules in order of increasing
-     * property name (atom) value to make searching easier
-     */
-
-    for (prev = NULL,  cur = PropertyAccessList;
-	 cur && cur->name <= pacl->name;
-	 prev = cur, cur = cur->next)
-	;
-    if (!prev)
-    {
-	pacl->next = cur;
-	PropertyAccessList = pacl;
-    }
-    else
-    {
-	prev->next = pacl;
-	pacl->next = cur;
-    }
-    return TRUE;
-} /* SecurityParsePropertyAccessRule */
-
-static Bool
-SecurityParseExtensionRule(
-    char *p)
-{
-    char *extName = SecurityParseString(&p);
-    char *copyExtName;
-    char **newStrings;
-
-    if (!extName)
-	return FALSE;
-
-    copyExtName = (char *)Xalloc(strlen(extName) + 1);
-    if (!copyExtName)
-	return TRUE;
-    strcpy(copyExtName, extName);
-    newStrings = (char **)Xrealloc(SecurityTrustedExtensions,
-			  sizeof (char *) * (nSecurityTrustedExtensions + 1));
-    if (!newStrings)
-    {
-	Xfree(copyExtName);
-	return TRUE;
-    }
-
-    SecurityTrustedExtensions = newStrings;
-    SecurityTrustedExtensions[nSecurityTrustedExtensions++] = copyExtName;
-
-    return TRUE;
-
-} /* SecurityParseExtensionRule */
-
-static void
-SecurityFreeTrustedExtensionStrings(void)
-{
-    if (SecurityTrustedExtensions)
-    {
-	assert(nSecurityTrustedExtensions);
-	while (nSecurityTrustedExtensions--)
-	{
-	    Xfree(SecurityTrustedExtensions[nSecurityTrustedExtensions]);
-	}
-	Xfree(SecurityTrustedExtensions);
-	SecurityTrustedExtensions = NULL;
-	nSecurityTrustedExtensions = 0;
-    }
-} /* SecurityFreeSiteTrustedExtensions */
-
-static void
-SecurityLoadPropertyAccessList(void)
-{
-    FILE *f;
-    int lineNumber = 0;
-
-    SecurityMaxPropertyName = 0;
-
-    if (!SecurityPolicyFile)
-	return;
-
-    f = fopen(SecurityPolicyFile, "r");
-    if (!f)
-    {
-	ErrorF("error opening security policy file %s\n",
-	       SecurityPolicyFile);
-	return;
-    }
-
-    while (!feof(f))
-    {
-	char buf[200];
-	Bool validLine;
-	char *p;
-
-	if (!(p = fgets(buf, sizeof(buf), f)))
-	    break;
-	lineNumber++;
-
-	/* if first line, check version number */
-	if (lineNumber == 1)
-	{
-	    char *v = SecurityParseString(&p);
-	    if (strcmp(v, SECURITY_POLICY_FILE_VERSION) != 0)
-	    {
-		ErrorF("%s: invalid security policy file version, ignoring file\n",
-		       SecurityPolicyFile);
-		break;
-	    }
-	    validLine = TRUE;
-	}
-	else
-	{
-	    switch (SecurityParseKeyword(&p))
-	    {
-		case SecurityKeywordComment:
-		case SecurityKeywordSitePolicy:
-		    validLine = TRUE;
-		break;
-
-		case SecurityKeywordProperty:
-		    validLine = SecurityParsePropertyAccessRule(p);
-		break;
-
-		case SecurityKeywordExtension:
-		    validLine = SecurityParseExtensionRule(p);
-		break;
-
-		default:
-		    validLine = (*p == '\0'); /* blank lines OK, others not */
-		break;
-	    }
-	}
-
-	if (!validLine)
-	    ErrorF("Line %d of %s invalid, ignoring\n",
-		   lineNumber, SecurityPolicyFile);
-    } /* end while more input */
-
-    fclose(f);
-} /* SecurityLoadPropertyAccessList */
-
-
-static Bool
-SecurityMatchString(
-    char *ws,
-    char *cs)
-{
-    while (*ws && *cs)
-    {
-	if (*ws == '*')
-	{
-	    Bool match = FALSE;
-	    ws++;
-	    while (!(match = SecurityMatchString(ws, cs)) && *cs)
-	    {
-		cs++;
-	    }
-	    return match;
-	}
-	else if (*ws == *cs)
-	{
-	    ws++;
-	    cs++;
-	}
-	else break;
-    }
-    return ( ( (*ws == '\0') || ((*ws == '*') && *(ws+1) == '\0') )
-	     && (*cs == '\0') );
-} /* SecurityMatchString */
-
-
-static void
-SecurityCheckPropertyAccess(CallbackListPtr *pcbl, pointer unused,
-			    pointer calldata)
-{    
-    XacePropertyAccessRec *rec = (XacePropertyAccessRec*)calldata;
-    ClientPtr client = rec->client;
-    WindowPtr pWin = rec->pWin;
-    ATOM propertyName = rec->pProp->propertyName;
-    Mask access_mode = rec->access_mode;
-    PropertyAccessPtr pacl;
-    int action = SecurityDefaultAction;
-
-    /* if client trusted or window untrusted, allow operation */
-
-    if ((TRUSTLEVEL(client) == XSecurityClientTrusted) ||
-	 (TRUSTLEVEL(wClient(pWin)) != XSecurityClientTrusted) )
-	return;
-
-    /* If the property atom is bigger than any atoms on the list, 
-     * we know we won't find it, so don't even bother looking.
-     */
-    if (propertyName <= SecurityMaxPropertyName)
-    {
-	/* untrusted client operating on trusted window; see if it's allowed */
-
-	for (pacl = PropertyAccessList; pacl; pacl = pacl->next)
-	{
-	    if (pacl->name < propertyName)
-		continue;
-	    if (pacl->name > propertyName)
-		break;
-
-	    /* pacl->name == propertyName, so see if it applies to this window */
-
-	    switch (pacl->windowRestriction)
-	    {
-		case SecurityAnyWindow: /* always applies */
-		    break;
-
-		case SecurityRootWindow:
-		{
-		    /* if not a root window, this rule doesn't apply */
-		    if (pWin->parent)
-			continue;
-		}
-		break;
-
-		case SecurityWindowWithProperty:
-		{
-		    PropertyPtr pProp = wUserProps (pWin);
-		    Bool match = FALSE;
-		    char *p;
-		    char *pEndData;
-
-		    while (pProp)
-		    {
-			if (pProp->propertyName == pacl->mustHaveProperty)
-			    break;
-			pProp = pProp->next;
-		    }
-		    if (!pProp)
-			continue;
-		    if (!pacl->mustHaveValue)
-			break;
-		    if (pProp->type != XA_STRING || pProp->format != 8)
-			continue;
-
-		    p = pProp->data;
-		    pEndData = ((char *)pProp->data) + pProp->size;
-		    while (!match && p < pEndData)
-		    {
-			 if (SecurityMatchString(pacl->mustHaveValue, p))
-			     match = TRUE;
-			 else
-			 { /* skip to the next string */
-			     while (*p++ && p < pEndData)
-				 ;
-			 }
-		    }
-		    if (!match)
-			continue;
-		}
-		break; /* end case SecurityWindowWithProperty */
-	    } /* end switch on windowRestriction */
-
-	    /* If we get here, the property access rule pacl applies.
-	     * If pacl doesn't apply, something above should have
-	     * executed a continue, which will skip the follwing code.
-	     */
-	    action = Success;
-	    if (access_mode & DixReadAccess)
-		action = max(action, pacl->readAction);
-	    if (access_mode & DixWriteAccess)
-		action = max(action, pacl->writeAction);
-	    if (access_mode & DixDestroyAccess)
-		action = max(action, pacl->destroyAction);
-	    break;
-	} /* end for each pacl */
-    } /* end if propertyName <= SecurityMaxPropertyName */
-
-    if (action != Success)
-    { /* audit the access violation */
-	int cid = CLIENT_ID(pWin->drawable.id);
-	int reqtype = ((xReq *)client->requestBuffer)->reqType;
-	char *actionstr = (XaceIgnoreError == action) ? "ignored" : "error";
-	SecurityAudit("client %d attempted request %d with window 0x%x property %s (atom 0x%x) of client %d, %s\n",
-		client->index, reqtype, pWin->drawable.id,
-		      NameForAtom(propertyName), propertyName, cid, actionstr);
-    }
-    /* return codes increase with strictness */
-    if (action != Success)
-        rec->status = action;
-} /* SecurityCheckPropertyAccess */
-
-
 /* SecurityResetProc
  *
  * Arguments:
@@ -1764,25 +1038,19 @@ static void
 SecurityResetProc(
     ExtensionEntry *extEntry)
 {
-    SecurityFreePropertyAccessList();
-    SecurityFreeTrustedExtensionStrings();
-} /* SecurityResetProc */
+    /* Unregister callbacks */
+    DeleteCallback(&ClientStateCallback, SecurityClientState, NULL);
 
-
-int
-XSecurityOptions(argc, argv, i)
-    int argc;
-    char **argv;
-    int i;
-{
-    if (strcmp(argv[i], "-sp") == 0)
-    {
-	if (i < argc)
-	    SecurityPolicyFile = argv[++i];
-	return (i + 1);
-    }
-    return (i);
-} /* XSecurityOptions */
+    XaceDeleteCallback(XACE_EXT_DISPATCH, SecurityExtension, NULL);
+    XaceDeleteCallback(XACE_RESOURCE_ACCESS, SecurityResource, NULL);
+    XaceDeleteCallback(XACE_DEVICE_ACCESS, SecurityDevice, NULL);
+    XaceDeleteCallback(XACE_PROPERTY_ACCESS, SecurityProperty, NULL);
+    XaceDeleteCallback(XACE_SEND_ACCESS, SecuritySend, NULL);
+    XaceDeleteCallback(XACE_RECEIVE_ACCESS, SecurityReceive, NULL);
+    XaceDeleteCallback(XACE_CLIENT_ACCESS, SecurityClient, NULL);
+    XaceDeleteCallback(XACE_EXT_ACCESS, SecurityExtension, NULL);
+    XaceDeleteCallback(XACE_SERVER_ACCESS, SecurityServer, NULL);
+}
 
 
 /* SecurityExtensionInit
@@ -1799,6 +1067,7 @@ void
 SecurityExtensionInit(INITARGS)
 {
     ExtensionEntry	*extEntry;
+    int ret = TRUE;
 
     SecurityAuthorizationResType =
 	CreateNewResourceType(SecurityDeleteAuthorization);
@@ -1812,12 +1081,26 @@ SecurityExtensionInit(INITARGS)
     RTEventClient |= RC_NEVERRETAIN;
 
     /* Allocate the private storage */
-    if (!dixRequestPrivate(stateKey, sizeof(SecurityClientStateRec)))
+    if (!dixRequestPrivate(stateKey, sizeof(SecurityStateRec)))
 	FatalError("SecurityExtensionSetup: Can't allocate client private.\n");
 
-    if (!AddCallback(&ClientStateCallback, SecurityClientStateCallback, NULL))
-	return;
+    /* Register callbacks */
+    ret &= AddCallback(&ClientStateCallback, SecurityClientState, NULL);
 
+    ret &= XaceRegisterCallback(XACE_EXT_DISPATCH, SecurityExtension, NULL);
+    ret &= XaceRegisterCallback(XACE_RESOURCE_ACCESS, SecurityResource, NULL);
+    ret &= XaceRegisterCallback(XACE_DEVICE_ACCESS, SecurityDevice, NULL);
+    ret &= XaceRegisterCallback(XACE_PROPERTY_ACCESS, SecurityProperty, NULL);
+    ret &= XaceRegisterCallback(XACE_SEND_ACCESS, SecuritySend, NULL);
+    ret &= XaceRegisterCallback(XACE_RECEIVE_ACCESS, SecurityReceive, NULL);
+    ret &= XaceRegisterCallback(XACE_CLIENT_ACCESS, SecurityClient, NULL);
+    ret &= XaceRegisterCallback(XACE_EXT_ACCESS, SecurityExtension, NULL);
+    ret &= XaceRegisterCallback(XACE_SERVER_ACCESS, SecurityServer, NULL);
+
+    if (!ret)
+	FatalError("SecurityExtensionSetup: Failed to register callbacks\n");
+
+    /* Add extension to server */
     extEntry = AddExtension(SECURITY_EXTENSION_NAME,
 			    XSecurityNumberEvents, XSecurityNumberErrors,
 			    ProcSecurityDispatch, SProcSecurityDispatch,
@@ -1829,15 +1112,6 @@ SecurityExtensionInit(INITARGS)
     EventSwapVector[SecurityEventBase + XSecurityAuthorizationRevoked] =
 	(EventSwapPtr)SwapSecurityAuthorizationRevokedEvent;
 
-    SecurityLoadPropertyAccessList();
-
-    /* register callbacks */
-#define XaceRC XaceRegisterCallback
-    XaceRC(XACE_RESOURCE_ACCESS, SecurityCheckResourceIDAccess, NULL);
-    XaceRC(XACE_DEVICE_ACCESS, SecurityCheckDeviceAccess, NULL);
-    XaceRC(XACE_PROPERTY_ACCESS, SecurityCheckPropertyAccess, NULL);
-    XaceRC(XACE_MAP_ACCESS, SecurityCheckMapAccess, NULL);
-    XaceRC(XACE_EXT_DISPATCH, SecurityCheckExtAccess, NULL);
-    XaceRC(XACE_EXT_ACCESS, SecurityCheckExtAccess, NULL);
-    XaceRC(XACE_SERVER_ACCESS, SecurityCheckServerAccess, NULL);
-} /* SecurityExtensionInit */
+    /* Label objects that were created before we could register ourself */
+    SecurityLabelInitial();
+}
diff --git a/Xext/securitysrv.h b/Xext/securitysrv.h
index 7320ab7da..f4f3e32ae 100644
--- a/Xext/securitysrv.h
+++ b/Xext/securitysrv.h
@@ -77,11 +77,7 @@ typedef struct {
     Bool valid; /* did anyone recognize it? if so, set to TRUE */
 } SecurityValidateGroupInfoRec;
 
-extern int XSecurityOptions(int argc, char **argv, int i);
-
 /* Give this value or higher to the -audit option to get security messages */
 #define SECURITY_AUDIT_LEVEL 4
 
-#define SECURITY_POLICY_FILE_VERSION "version-1"
-
 #endif /* _SECURITY_SRV_H */
diff --git a/os/utils.c b/os/utils.c
index 322814669..d69936df7 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -123,9 +123,6 @@ OR PERFORMANCE OF THIS SOFTWARE.
 #ifdef XKB
 #include <xkbsrv.h>
 #endif
-#ifdef XCSECURITY
-#include "securitysrv.h"
-#endif
 
 #ifdef RENDER
 #include "picture.h"
@@ -621,9 +618,6 @@ void UseMsg(void)
     ErrorF("-render [default|mono|gray|color] set render color alloc policy\n");
 #endif
     ErrorF("-s #                   screen-saver timeout (minutes)\n");
-#ifdef XCSECURITY
-    ErrorF("-sp file               security policy file\n");
-#endif
 #ifdef XPRINT
     PrinterUseMsg();
 #endif
@@ -1040,12 +1034,6 @@ ProcessCommandLine(int argc, char *argv[])
 	    i = skip - 1;
 	}
 #endif
-#ifdef XCSECURITY
-	else if ((skip = XSecurityOptions(argc, argv, i)) != i)
-	{
-	    i = skip - 1;
-	}
-#endif
 #ifdef AIXV3
         else if ( strcmp( argv[i], "-timeout") == 0)
         {

From 9d03cad1446c27b397c198cf6247e71e46bc9e6d Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 8 Nov 2007 16:41:47 -0500
Subject: [PATCH 199/552] Remove SecurityPolicy file and associated references
 in the manpages.

---
 .gitignore                 |   2 -
 Xext/Makefile.am           |   7 -
 Xext/SecurityPolicy        |  86 -------------
 doc/Makefile.am            |   2 +-
 doc/SecurityPolicy.man.pre | 258 -------------------------------------
 doc/Xserver.man.pre        |  13 --
 6 files changed, 1 insertion(+), 367 deletions(-)
 delete mode 100644 Xext/SecurityPolicy
 delete mode 100644 doc/SecurityPolicy.man.pre

diff --git a/.gitignore b/.gitignore
index 27132c0f9..1213d9993 100644
--- a/.gitignore
+++ b/.gitignore
@@ -92,8 +92,6 @@ cfb32/cfbzerarcG.c
 cfb32/cfbzerarcX.c
 doc/Xserver.1x
 doc/Xserver.man
-doc/SecurityPolicy.5
-doc/SecurityPolicy.man
 hw/dmx/Xdmx
 hw/dmx/Xdmx.1x
 hw/dmx/config/dmxtodmx
diff --git a/Xext/Makefile.am b/Xext/Makefile.am
index 6fe1c3488..f57e59910 100644
--- a/Xext/Makefile.am
+++ b/Xext/Makefile.am
@@ -33,9 +33,6 @@ MODULE_SRCS =			\
 	sync.c			\
 	xcmisc.c
 
-# Extra configuration files ship with some extensions
-SERVERCONFIG_DATA =
-
 # Optional sources included if extension enabled by configure.ac rules
 
 # MIT Shared Memory extension
@@ -86,9 +83,6 @@ endif
 XCSECURITY_SRCS = security.c securitysrv.h
 if XCSECURITY   
 BUILTIN_SRCS += $(XCSECURITY_SRCS)
-
-SERVERCONFIG_DATA += SecurityPolicy
-AM_CFLAGS += -DDEFAULTPOLICYFILE=\"$(SERVERCONFIGdir)/SecurityPolicy\"
 endif
 
 XCALIBRATE_SRCS = xcalibrate.c
@@ -166,7 +160,6 @@ libXextmodule_la_SOURCES =	$(MODULE_SRCS)
 endif
 
 EXTRA_DIST = \
-	$(SERVERCONFIG_DATA) \
 	$(MITSHM_SRCS) \
 	$(XV_SRCS) \
 	$(RES_SRCS) \
diff --git a/Xext/SecurityPolicy b/Xext/SecurityPolicy
deleted file mode 100644
index 04dfb0e6b..000000000
--- a/Xext/SecurityPolicy
+++ /dev/null
@@ -1,86 +0,0 @@
-version-1 
-
-# $Xorg: SecurityPolicy,v 1.3 2000/08/17 19:47:56 cpqbld Exp $
-
-# Property access rules:
-# property <property> <window> <permissions>
-# <window> ::= any | root | <propertyselector>
-# <propertyselector> ::= <property> | <property>=<value>
-# <permissions> :== [ <operation> | <action> | <space> ]*
-# <operation> :== r | w | d
-#	r	read
-#	w	write
-#	d	delete
-# <action> :== a | i | e
-#	a	allow
-#	i	ignore
-#	e	error
-
-# Allow reading of application resources, but not writing.
-property RESOURCE_MANAGER	root	ar iw
-property SCREEN_RESOURCES	root	ar iw
-
-# Ignore attempts to use cut buffers.  Giving errors causes apps to crash,
-# and allowing access may give away too much information.
-property CUT_BUFFER0	root	irw
-property CUT_BUFFER1	root	irw
-property CUT_BUFFER2	root	irw
-property CUT_BUFFER3	root	irw
-property CUT_BUFFER4	root	irw
-property CUT_BUFFER5	root	irw
-property CUT_BUFFER6	root	irw
-property CUT_BUFFER7	root	irw
-
-# If you are using Motif, you probably want these.
-property _MOTIF_DEFAULT_BINDINGS	root	ar iw
-property _MOTIF_DRAG_WINDOW	root	ar iw
-property _MOTIF_DRAG_TARGETS	any 	ar iw
-property _MOTIF_DRAG_ATOMS	any 	ar iw
-property _MOTIF_DRAG_ATOM_PAIRS	any 	ar iw
-
-# If you are running CDE you also need these
-property _MOTIF_WM_INFO		root	arw
-property TT_SESSION		root	irw
-property WM_ICON_SIZE		root	irw
-property "SDT Pixel Set"	any	irw
-
-# The next two rules let xwininfo -tree work when untrusted.
-property WM_NAME	any	ar
-
-# Allow read of WM_CLASS, but only for windows with WM_NAME.
-# This might be more restrictive than necessary, but demonstrates
-# the <required property> facility, and is also an attempt to
-# say "top level windows only."
-property WM_CLASS	WM_NAME	ar
-
-# These next three let xlsclients work untrusted.  Think carefully
-# before including these; giving away the client machine name and command
-# may be exposing too much.
-property WM_STATE	WM_NAME	ar
-property WM_CLIENT_MACHINE	WM_NAME	ar
-property WM_COMMAND	WM_NAME	ar
-
-# To let untrusted clients use the standard colormaps created by
-# xstdcmap, include these lines.
-property RGB_DEFAULT_MAP	root	ar
-property RGB_BEST_MAP	root	ar
-property RGB_RED_MAP	root	ar
-property RGB_GREEN_MAP	root	ar
-property RGB_BLUE_MAP	root	ar
-property RGB_GRAY_MAP	root	ar
-
-# To let untrusted clients use the color management database created
-# by xcmsdb, include these lines.
-property XDCCC_LINEAR_RGB_CORRECTION	root	ar
-property XDCCC_LINEAR_RGB_MATRICES	root	ar
-property XDCCC_GRAY_SCREENWHITEPOINT	root	ar
-property XDCCC_GRAY_CORRECTION	root	ar
-
-# To let untrusted clients use the overlay visuals that many vendors
-# support, include this line.
-property SERVER_OVERLAY_VISUALS	root	ar
-
-# Only trusted extensions can be used by untrusted clients
-trust extension XC-MISC
-trust extension BIG-REQUESTS
-trust extension XpExtension
diff --git a/doc/Makefile.am b/doc/Makefile.am
index ce1979d4f..d3911c9bf 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -5,7 +5,7 @@ filemandir = $(FILE_MAN_DIR)
 # (i.e. those handled in the os/utils.c options processing instead of in
 #  the DDX-level options processing)
 appman_PRE = Xserver.man.pre
-fileman_PRE = SecurityPolicy.man.pre
+fileman_PRE =
 
 appman_PROCESSED = $(appman_PRE:man.pre=man)
 fileman_PROCESSED = $(fileman_PRE:man.pre=man)
diff --git a/doc/SecurityPolicy.man.pre b/doc/SecurityPolicy.man.pre
deleted file mode 100644
index f5aff0c6c..000000000
--- a/doc/SecurityPolicy.man.pre
+++ /dev/null
@@ -1,258 +0,0 @@
-.\" Split out of Xserver.man, which was covered by this notice:
-.\" Copyright 1984 - 1991, 1993, 1994, 1998  The Open Group
-.\"
-.\" Permission to use, copy, modify, distribute, and sell this software and its
-.\" documentation for any purpose is hereby granted without fee, provided that
-.\" the above copyright notice appear in all copies and that both that
-.\" copyright notice and this permission notice appear in supporting
-.\" documentation.
-.\"
-.\" The above copyright notice and this permission notice shall be included
-.\" in all copies or substantial portions of the Software.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-.\" IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-.\" OTHER DEALINGS IN THE SOFTWARE.
-.\"
-.\" Except as contained in this notice, the name of The Open Group shall
-.\" not be used in advertising or otherwise to promote the sale, use or
-.\" other dealings in this Software without prior written authorization
-.\" from The Open Group.
-.\" $XFree86: xc/programs/Xserver/Xserver.man,v 3.31 2004/01/10 22:27:46 dawes Exp $
-.\" shorthand for double quote that works everywhere.
-.ds q \N'34'
-.TH SecurityPolicy __filemansuffix__ __xorgversion__
-.SH NAME
-SecurityPolicy \- X Window System SECURITY Extension Policy file format
-.SH DESCRIPTION
-The SECURITY extension to the X Window System uses a policy file to determine
-which operations should be allowed or denied.   The default location for this
-file is
-.IR __projectroot__/lib/xserver/SecurityPolicy .
-.PP
-The syntax of the security policy file is as follows.
-Notation: "*" means zero or more occurrences of the preceding element,
-and "+" means one or more occurrences.  To interpret <foo/bar>, ignore
-the text after the /; it is used to distinguish between instances of
-<foo> in the next section.
-.PP
-.nf
-<policy file> ::= <version line> <other line>*
-
-<version line> ::= <string/v> '\en'
-
-<other line > ::= <comment> | <access rule> | <site policy> | <blank line>
-
-<comment> ::= # <not newline>* '\en'
-
-<blank line> ::= <space> '\en'
-
-<site policy> ::= sitepolicy <string/sp> '\en'
-
-<access rule> ::= property <property/ar> <window> <perms> '\en'
-
-<property> ::= <string>
-
-<window> ::= any | root | <required property>
-
-<required property> ::= <property/rp> | <property with value>
-
-<property with value> ::= <property/rpv> = <string/rv>
-
-<perms> ::= [ <operation> | <action> | <space> ]*
-
-<operation> ::= r | w | d
-
-<action> ::= a | i | e
-
-<string> ::= <dbl quoted string> | <single quoted string> | <unquoted string>
-
-<dbl quoted string> ::= <space> " <not dquote>* " <space>
-
-<single quoted string> ::= <space> ' <not squote>* ' <space>
-
-<unquoted string> ::= <space> <not space>+ <space>
-
-<space> ::= [ ' ' | '\et' ]*
-
-Character sets:
-
-<not newline> ::= any character except '\en'
-<not dquote>  ::= any character except "
-<not squote>  ::= any character except '
-<not space>   ::= any character except those in <space>
-.fi
-.PP
-The semantics associated with the above syntax are as follows.
-.PP
-<version line>, the first line in the file, specifies the file format
-version.  If the server does not recognize the version <string/v>, it
-ignores the rest of the file.  The version string for the file format
-described here is "version-1" .
-.PP
-Once past the <version line>, lines that do not match the above syntax
-are ignored.
-.PP
-<comment> lines are ignored.
-.PP
-<sitepolicy> lines are currently ignored.  They are intended to
-specify the site policies used by the XC-QUERY-SECURITY-1
-authorization method.
-.PP
-<access rule> lines specify how the server should react to untrusted
-client requests that affect the X Window property named <property/ar>.
-The rest of this section describes the interpretation of an
-<access rule>.
-.PP
-For an <access rule> to apply to a given instance of <property/ar>,
-<property/ar> must be on a window that is in the set of windows
-specified by <window>.  If <window> is any, the rule applies to
-<property/ar> on any window.  If <window> is root, the rule applies to
-<property/ar> only on root windows.
-.PP
-If <window> is <required property>, the following apply.  If <required
-property> is a <property/rp>, the rule applies when the window also
-has that <property/rp>, regardless of its value.  If <required
-property> is a <property with value>, <property/rpv> must also have
-the value specified by <string/rv>.  In this case, the property must
-have type STRING and format 8, and should contain one or more
-null-terminated strings.  If any of the strings match <string/rv>, the
-rule applies.
-.PP
-The definition of string matching is simple case-sensitive string
-comparison with one elaboration: the occurrence of the character '*' in
-<string/rv> is a wildcard meaning "any string."  A <string/rv> can
-contain multiple wildcards anywhere in the string.  For example, "x*"
-matches strings that begin with x, "*x" matches strings that end with
-x, "*x*" matches strings containing x, and "x*y*" matches strings that
-start with x and subsequently contain y.
-.PP
-There may be multiple <access rule> lines for a given <property/ar>.
-The rules are tested in the order that they appear in the file.  The
-first rule that applies is used.
-.PP
-<perms> specify operations that untrusted clients may attempt, and
-the actions that the server should take in response to those operations.
-.PP
-<operation> can be r (read), w (write), or d (delete).  The following
-table shows how X Protocol property requests map to these operations
-in the X.Org server implementation.
-.PP
-.nf
-GetProperty	r, or r and d if delete = True
-ChangeProperty	w
-RotateProperties	r and w
-DeleteProperty	d
-ListProperties	none, untrusted clients can always list all properties
-.fi
-.PP
-<action> can be a (allow), i (ignore), or e (error).  Allow means
-execute the request as if it had been issued by a trusted client.
-Ignore means treat the request as a no-op.  In the case of
-GetProperty, ignore means return an empty property value if the
-property exists, regardless of its actual value.  Error means do not
-execute the request and return a BadAtom error with the atom set to
-the property name.  Error is the default action for all properties,
-including those not listed in the security policy file.
-.PP
-An <action> applies to all <operation>s that follow it, until the next
-<action> is encountered.  Thus, irwad  means ignore read and write,
-allow delete.
-.PP
-GetProperty and RotateProperties may do multiple operations (r and d,
-or r and w).  If different actions apply to the operations, the most
-severe action is applied to the whole request; there is no partial
-request execution.  The severity ordering is: allow < ignore < error.
-Thus, if the <perms> for a property are ired (ignore read, error
-delete), and an untrusted client attempts GetProperty on that property
-with delete = True, an error is returned, but the property value is
-not.  Similarly, if any of the properties in a RotateProperties do not
-allow both read and write, an error is returned without changing any
-property values.
-.PP
-Here is an example security policy file.
-.PP
-.ta 3i 4i
-.nf
-version-1
-
-XCOMM Allow reading of application resources, but not writing.
-property RESOURCE_MANAGER	root	ar iw
-property SCREEN_RESOURCES	root	ar iw
-
-XCOMM Ignore attempts to use cut buffers.  Giving errors causes apps to crash,
-XCOMM and allowing access may give away too much information.
-property CUT_BUFFER0	root	irw
-property CUT_BUFFER1	root	irw
-property CUT_BUFFER2	root	irw
-property CUT_BUFFER3	root	irw
-property CUT_BUFFER4	root	irw
-property CUT_BUFFER5	root	irw
-property CUT_BUFFER6	root	irw
-property CUT_BUFFER7	root	irw
-
-XCOMM If you are using Motif, you probably want these.
-property _MOTIF_DEFAULT_BINDINGS	root	ar iw
-property _MOTIF_DRAG_WINDOW	root	ar iw
-property _MOTIF_DRAG_TARGETS	any 	ar iw
-property _MOTIF_DRAG_ATOMS	any 	ar iw
-property _MOTIF_DRAG_ATOM_PAIRS	any 	ar iw
-
-XCOMM The next two rules let xwininfo -tree work when untrusted.
-property WM_NAME	any	ar
-
-XCOMM Allow read of WM_CLASS, but only for windows with WM_NAME.
-XCOMM This might be more restrictive than necessary, but demonstrates
-XCOMM the <required property> facility, and is also an attempt to
-XCOMM say "top level windows only."
-property WM_CLASS	WM_NAME	ar
-
-XCOMM These next three let xlsclients work untrusted.  Think carefully
-XCOMM before including these; giving away the client machine name and command
-XCOMM may be exposing too much.
-property WM_STATE	WM_NAME	ar
-property WM_CLIENT_MACHINE	WM_NAME	ar
-property WM_COMMAND	WM_NAME	ar
-
-XCOMM To let untrusted clients use the standard colormaps created by
-XCOMM xstdcmap, include these lines.
-property RGB_DEFAULT_MAP	root	ar
-property RGB_BEST_MAP	root	ar
-property RGB_RED_MAP	root	ar
-property RGB_GREEN_MAP	root	ar
-property RGB_BLUE_MAP	root	ar
-property RGB_GRAY_MAP	root	ar
-
-XCOMM To let untrusted clients use the color management database created
-XCOMM by xcmsdb, include these lines.
-property XDCCC_LINEAR_RGB_CORRECTION	root	ar
-property XDCCC_LINEAR_RGB_MATRICES	root	ar
-property XDCCC_GRAY_SCREENWHITEPOINT	root	ar
-property XDCCC_GRAY_CORRECTION	root	ar
-
-XCOMM To let untrusted clients use the overlay visuals that many vendors
-XCOMM support, include this line.
-property SERVER_OVERLAY_VISUALS	root	ar
-
-XCOMM Dumb examples to show other capabilities.
-
-XCOMM oddball property names and explicit specification of error conditions
-property "property with spaces"	'property with "'	aw er ed
-
-XCOMM Allow deletion of Woo-Hoo if window also has property OhBoy with value
-XCOMM ending in "son".  Reads and writes will cause an error.
-property Woo-Hoo	OhBoy = "*son"	ad
-
-.fi
-.SH FILES
-.TP 30
-.I __projectroot__/lib/xserver/SecurityPolicy
-Default X server security policy
-.SH "SEE ALSO"
-.PP
-\fIXserver\fp(__appmansuffix__),
-.I "Security Extension Specification"
diff --git a/doc/Xserver.man.pre b/doc/Xserver.man.pre
index c9ee019c6..c47a3966b 100644
--- a/doc/Xserver.man.pre
+++ b/doc/Xserver.man.pre
@@ -407,15 +407,6 @@ elapse between autorepeat-generated keystrokes).
 .TP 8
 .B \-xkbmap \fIfilename\fP
 loads keyboard description in \fIfilename\fP on server startup.
-.SH SECURITY EXTENSION OPTIONS
-X servers that support the SECURITY extension accept the following option:
-.TP 8
-.B \-sp \fIfilename\fP
-causes the server to attempt to read and interpret filename as a security
-policy file with the format described below.  The file is read at server
-startup and reread at each server reset.
-The syntax of the security policy file is described in 
-\fISecurityPolicy\fP(__filemansuffix__).
 .SH "NETWORK CONNECTIONS"
 The X server supports client connections via a platform-dependent subset of
 the following transport types: TCP\/IP, Unix Domain sockets, DECnet,
@@ -580,9 +571,6 @@ Error log file for display number \fBn\fP if run from \fIinit\fP(__adminmansuffi
 .TP 30
 .I __projectroot__/lib/X11/xdm/xdm-errors
 Default error log file if the server is run from \fIxdm\fP(1)
-.TP 30
-.I __projectroot__/lib/xserver/SecurityPolicy
-Default X server security policy
 .SH "SEE ALSO"
 General information: \fIX\fP(__miscmansuffix__)
 .PP
@@ -597,7 +585,6 @@ Fonts: \fIbdftopcf\fP(1), \fImkfontdir\fP(1), \fImkfontscale\fP(1),
 .PP
 Security: \fIXsecurity\fP(__miscmansuffix__), \fIxauth\fP(1), \fIXau\fP(1), 
 \fIxdm\fP(1), \fIxhost\fP(1), \fIxfwp\fP(1),
-\fISecurityPolicy\fP(__filemansuffix__),
 .I "Security Extension Specification"
 .PP
 Starting the server: \fIxdm\fP(1), \fIxinit\fP(1)

From 1c6cb353f77747c101ce47716ff1fa055fbf85a4 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 8 Nov 2007 16:46:49 -0500
Subject: [PATCH 200/552] Restore the XC-SECURITY option in configure.ac, but
 disabled by default.

---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 278dcacd4..84b24cf1f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -514,8 +514,8 @@ AC_ARG_ENABLE(xf86vidmode,    AS_HELP_STRING([--disable-xf86vidmode], [Build XF8
 AC_ARG_ENABLE(xf86misc,       AS_HELP_STRING([--disable-xf86misc], [Build XF86Misc extension (default: auto)]), [XF86MISC=$enableval], [XF86MISC=auto])
 AC_ARG_ENABLE(xace,           AS_HELP_STRING([--disable-xace], [Build X-ACE extension (default: enabled)]), [XACE=$enableval], [XACE=yes])
 AC_ARG_ENABLE(xselinux,       AS_HELP_STRING([--disable-xselinux], [Build SELinux extension (default: disabled)]), [XSELINUX=$enableval], [XSELINUX=no])
-AC_ARG_ENABLE(xcsecurity,     AS_HELP_STRING([--disable-xcsecurity], [Build Security extension (TEMPORARILY DISABLED)]), [XCSECURITY=no], [XCSECURITY=no])
-AC_ARG_ENABLE(appgroup,       AS_HELP_STRING([--disable-appgroup], [Build XC-APPGROUP extension (default: enabled)]), [APPGROUP=$enableval], [APPGROUP=$XCSECURITY])
+AC_ARG_ENABLE(xcsecurity,     AS_HELP_STRING([--disable-xcsecurity], [Build Security extension (default: disabled)]), [XCSECURITY=$enableval], [XCSECURITY=no])
+AC_ARG_ENABLE(appgroup,       AS_HELP_STRING([--disable-appgroup], [Build XC-APPGROUP extension (default: disabled)]), [APPGROUP=$enableval], [APPGROUP=$XCSECURITY])
 AC_ARG_ENABLE(xcalibrate,     AS_HELP_STRING([--enable-xcalibrate], [Build XCalibrate extension (default: disabled)]), [XCALIBRATE=$enableval], [XCALIBRATE=no])
 AC_ARG_ENABLE(tslib,          AS_HELP_STRING([--enable-tslib], [Build kdrive tslib touchscreen support (default: disabled)]), [TSLIB=$enableval], [TSLIB=no])
 AC_ARG_ENABLE(xevie,          AS_HELP_STRING([--disable-xevie], [Build XEvIE extension (default: enabled)]), [XEVIE=$enableval], [XEVIE=yes])

From b092856baba5bd43b23950f23236b5cc3ce78c1e Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 9 Nov 2007 14:45:02 -0500
Subject: [PATCH 201/552] registry: Register XC-SECURITY extension protocol
 names.

---
 Xext/security.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/Xext/security.c b/Xext/security.c
index 6aab3a342..eef4f693c 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -1114,4 +1114,20 @@ 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");
 }

From 45f884d79c0eebaa1eb24d7db76c1177f6b710c9 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 9 Nov 2007 14:45:27 -0500
Subject: [PATCH 202/552] xselinux: add new synthetic_event security class, and
 fix registry code.

---
 Xext/xselinux.c | 36 +++++++++++++++++++-----------------
 Xext/xselinux.h |  3 ++-
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index f6d1dcd4b..eed78f4fe 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -129,6 +129,7 @@ static struct security_class_mapping map[] = {
     { "x_server", { "record", "", "", "", "getattr", "setattr", "", "", "", "", "", "", "", "", "", "", "", "grab", "", "", "", "", "", "", "", "manage", "debug", NULL }},
     { "x_extension", { "", "", "", "", "query", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "use", NULL }},
     { "x_event", { "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "send", "receive", NULL }},
+    { "x_synthetic_event", { "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "send", "receive", NULL }},
     { "x_resource", { "read", "write", "write", "write", "read", "write", "read", "read", "write", "read", "write", "read", "write", "write", "write", "read", "read", "write", "write", "write", "write", "write", "write", "read", "read", "write", "read", "write", NULL }},
     { NULL }
 };
@@ -501,9 +502,10 @@ static void
 SELinuxSend(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     XaceSendAccessRec *rec = calldata;
-    SELinuxStateRec *subj, *obj;
+    SELinuxStateRec *subj, *obj, ev_sid;
     SELinuxAuditRec auditdata = { .client = rec->client };
-    int rc, i, clientIndex;
+    security_class_t class;
+    int rc, i, type, clientIndex;
 
     if (rec->dev) {
 	subj = dixLookupPrivate(&rec->dev->devPrivates, stateKey);
@@ -523,14 +525,15 @@ SELinuxSend(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 
     /* Check send permission on specific event types */
     for (i = 0; i < rec->count; i++) {
-	SELinuxStateRec ev_sid;
+	type = rec->events[i].u.u.type;
+	class = (type & 128) ? SECCLASS_X_FAKEEVENT : SECCLASS_X_EVENT;
 
-	rc = SELinuxEventToSID(rec->events[i].u.u.type, obj->sid, &ev_sid);
+	rc = SELinuxEventToSID(type, obj->sid, &ev_sid);
 	if (rc != Success)
 	    goto err;
 
 	auditdata.event = rec->events[i].u.u.type;
-	rc = SELinuxDoCheck(clientIndex, subj, &ev_sid, SECCLASS_X_EVENT,
+	rc = SELinuxDoCheck(clientIndex, subj, &ev_sid, class,
 			    DixSendAccess, &auditdata);
 	if (rc != Success)
 	    goto err;
@@ -1073,7 +1076,6 @@ ProcSELinuxSetDeviceContext(ClientPtr client)
     state = dixLookupPrivate(&dev->devPrivates, stateKey);
     sidput(state->sid);
     state->sid = sid;
-    ErrorF("I really, actually did relabel a device to %s\n", ctx);
     return Success;
 }
 
@@ -1397,26 +1399,26 @@ XSELinuxExtensionInit(INITARGS)
     SELinuxLabelInitial();
 
     /* Add names to registry */
-    RegisterRequestName(X_SELinuxQueryVersion, 0,
+    RegisterRequestName(extEntry->base, X_SELinuxQueryVersion,
 			XSELINUX_EXTENSION_NAME ":SELinuxQueryVersion");
-    RegisterRequestName(X_SELinuxSetSelectionManager, 0,
+    RegisterRequestName(extEntry->base, X_SELinuxSetSelectionManager,
 			XSELINUX_EXTENSION_NAME ":SELinuxSetSelectionManager");
-    RegisterRequestName(X_SELinuxGetSelectionManager, 0,
+    RegisterRequestName(extEntry->base, X_SELinuxGetSelectionManager,
 			XSELINUX_EXTENSION_NAME ":SELinuxGetSelectionManager");
-    RegisterRequestName(X_SELinuxSetDeviceContext, 0,
+    RegisterRequestName(extEntry->base, X_SELinuxSetDeviceContext,
 			XSELINUX_EXTENSION_NAME ":SELinuxSetDeviceContext");
-    RegisterRequestName(X_SELinuxGetDeviceContext, 0,
+    RegisterRequestName(extEntry->base, X_SELinuxGetDeviceContext,
 			XSELINUX_EXTENSION_NAME ":SELinuxGetDeviceContext");
-    RegisterRequestName(X_SELinuxSetPropertyCreateContext, 0,
+    RegisterRequestName(extEntry->base, X_SELinuxSetPropertyCreateContext,
 			XSELINUX_EXTENSION_NAME ":SELinuxSetPropertyCreateContext");
-    RegisterRequestName(X_SELinuxGetPropertyCreateContext, 0,
+    RegisterRequestName(extEntry->base, X_SELinuxGetPropertyCreateContext,
 			XSELINUX_EXTENSION_NAME ":SELinuxGetPropertyCreateContext");
-    RegisterRequestName(X_SELinuxGetPropertyContext, 0,
+    RegisterRequestName(extEntry->base, X_SELinuxGetPropertyContext,
 			XSELINUX_EXTENSION_NAME ":SELinuxGetPropertyContext");
-    RegisterRequestName(X_SELinuxSetWindowCreateContext, 0,
+    RegisterRequestName(extEntry->base, X_SELinuxSetWindowCreateContext,
 			XSELINUX_EXTENSION_NAME ":SELinuxSetWindowCreateContext");
-    RegisterRequestName(X_SELinuxGetWindowCreateContext, 0,
+    RegisterRequestName(extEntry->base, X_SELinuxGetWindowCreateContext,
 			XSELINUX_EXTENSION_NAME ":SELinuxGetWindowCreateContext");
-    RegisterRequestName(X_SELinuxGetWindowContext, 0,
+    RegisterRequestName(extEntry->base, X_SELinuxGetWindowContext,
 			XSELINUX_EXTENSION_NAME ":SELinuxGetWindowContext");
 }
diff --git a/Xext/xselinux.h b/Xext/xselinux.h
index 50838d754..ea8d9e440 100644
--- a/Xext/xselinux.h
+++ b/Xext/xselinux.h
@@ -187,6 +187,7 @@ typedef struct {
 #define SECCLASS_X_SERVER		11
 #define SECCLASS_X_EXTENSION		12
 #define SECCLASS_X_EVENT		13
-#define SECCLASS_X_RESOURCE		14
+#define SECCLASS_X_FAKEEVENT		14
+#define SECCLASS_X_RESOURCE		15
 
 #endif /* _XSELINUX_H */

From f207e69d62bc04c7f254347b03e6d8fa8b569d66 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 14 Nov 2007 12:23:29 -0500
Subject: [PATCH 203/552] xselinux: adjust receive hook to use new
 synthetic_event class.

---
 Xext/xselinux.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index eed78f4fe..cefde9d37 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -532,7 +532,7 @@ SELinuxSend(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	if (rc != Success)
 	    goto err;
 
-	auditdata.event = rec->events[i].u.u.type;
+	auditdata.event = type;
 	rc = SELinuxDoCheck(clientIndex, subj, &ev_sid, class,
 			    DixSendAccess, &auditdata);
 	if (rc != Success)
@@ -547,9 +547,10 @@ static void
 SELinuxReceive(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     XaceReceiveAccessRec *rec = calldata;
-    SELinuxStateRec *subj, *obj;
+    SELinuxStateRec *subj, *obj, ev_sid;
     SELinuxAuditRec auditdata = { .client = NULL };
-    int rc, i;
+    security_class_t class;
+    int rc, i, type;
 
     subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
     obj = dixLookupPrivate(&rec->pWin->devPrivates, stateKey);
@@ -562,14 +563,15 @@ SELinuxReceive(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 
     /* Check receive permission on specific event types */
     for (i = 0; i < rec->count; i++) {
-	SELinuxStateRec ev_sid;
+	type = rec->events[i].u.u.type;
+	class = (type & 128) ? SECCLASS_X_FAKEEVENT : SECCLASS_X_EVENT;
 
-	rc = SELinuxEventToSID(rec->events[i].u.u.type, obj->sid, &ev_sid);
+	rc = SELinuxEventToSID(type, obj->sid, &ev_sid);
 	if (rc != Success)
 	    goto err;
 
-	auditdata.event = rec->events[i].u.u.type;
-	rc = SELinuxDoCheck(rec->client->index, subj, &ev_sid, SECCLASS_X_EVENT,
+	auditdata.event = type;
+	rc = SELinuxDoCheck(rec->client->index, subj, &ev_sid, class,
 			    DixReceiveAccess, &auditdata);
 	if (rc != Success)
 	    goto err;

From a95bb52b4366d85fc049130c60af5c9e727c565b Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 19 Nov 2007 16:34:38 -0500
Subject: [PATCH 204/552] devPrivates rework: add missing include of
 dix/privates.h

---
 mi/miline.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mi/miline.h b/mi/miline.h
index ffa4b2743..036c2b5df 100644
--- a/mi/miline.h
+++ b/mi/miline.h
@@ -28,6 +28,7 @@ in this Software without prior written authorization from The Open Group.
 #ifndef MILINE_H
 
 #include "screenint.h"
+#include "privates.h"
 
 /*
  * Public definitions used for configuring basic pixelization aspects

From 60be452c2e88342f92a76ba5ec7d90b5b0211aaf Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 19 Nov 2007 16:55:09 -0500
Subject: [PATCH 205/552] xace: restore the old SaveScreens function and
 introduce new API, since the old version is called from drivers...

---
 Xext/saver.c                   | 4 ++--
 Xext/xtest.c                   | 2 +-
 dix/dispatch.c                 | 2 +-
 dix/main.c                     | 4 ++--
 dix/window.c                   | 8 +++++++-
 hw/darwin/darwinEvents.c       | 2 +-
 hw/dmx/dmxdpms.c               | 2 +-
 hw/xfree86/common/xf86DPMS.c   | 2 +-
 hw/xfree86/common/xf86Events.c | 4 ++--
 hw/xfree86/common/xf86PM.c     | 2 +-
 hw/xfree86/loader/dixsym.c     | 1 +
 include/window.h               | 6 +++++-
 mi/mieq.c                      | 2 +-
 os/WaitFor.c                   | 2 +-
 14 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/Xext/saver.c b/Xext/saver.c
index 6905fc678..43dd3e2de 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -468,8 +468,8 @@ ScreenSaverFreeAttr (value, id)
     pPriv->attr = NULL;
     if (pPriv->hasWindow)
     {
-	SaveScreens (serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
-	SaveScreens (serverClient, SCREEN_SAVER_FORCER, ScreenSaverActive);
+	dixSaveScreens (serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
+	dixSaveScreens (serverClient, SCREEN_SAVER_FORCER, ScreenSaverActive);
     }
     CheckScreenPrivate (pScreen);
     return TRUE;
diff --git a/Xext/xtest.c b/Xext/xtest.c
index 3895a0073..effa3b904 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -459,7 +459,7 @@ ProcXTestFakeInput(client)
 	break;
     }
     if (screenIsSaved == SCREEN_SAVER_ON)
-	SaveScreens(serverClient, SCREEN_SAVER_OFF, ScreenSaverReset);
+	dixSaveScreens(serverClient, SCREEN_SAVER_OFF, ScreenSaverReset);
     ev->u.keyButtonPointer.time = currentTime.milliseconds;
     (*dev->public.processInputProc)(ev, dev, nev);
     return client->noClientException;
diff --git a/dix/dispatch.c b/dix/dispatch.c
index f7196fde7..0c8e6b133 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -3582,7 +3582,7 @@ int ProcForceScreenSaver(ClientPtr client)
 	client->errorValue = stuff->mode;
         return BadValue;
     }
-    rc = SaveScreens(client, SCREEN_SAVER_FORCER, (int)stuff->mode);
+    rc = dixSaveScreens(client, SCREEN_SAVER_FORCER, (int)stuff->mode);
     if (rc != Success)
 	return rc;
     return client->noClientException;
diff --git a/dix/main.c b/dix/main.c
index 543e94c86..bc00ac5e5 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -425,7 +425,7 @@ main(int argc, char *argv[], char *envp[])
 	for (i = 0; i < screenInfo.numScreens; i++)
 	    InitRootWindow(WindowTable[i]);
 	DefineInitialRootWindow(WindowTable[0]);
-	SaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
+	dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
 
 #ifdef PANORAMIX
 	if (!noPanoramiXExtension) {
@@ -446,7 +446,7 @@ main(int argc, char *argv[], char *envp[])
 
 	/* Now free up whatever must be freed */
 	if (screenIsSaved == SCREEN_SAVER_ON)
-	    SaveScreens(serverClient, SCREEN_SAVER_OFF, ScreenSaverReset);
+	    dixSaveScreens(serverClient, SCREEN_SAVER_OFF, ScreenSaverReset);
 	FreeScreenSaverTimer();
 	CloseDownExtensions();
 
diff --git a/dix/window.c b/dix/window.c
index f183aa3b7..f12c82b08 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -3337,7 +3337,7 @@ static void DrawLogo(
 #endif
 
 _X_EXPORT int
-SaveScreens(ClientPtr client, int on, int mode)
+dixSaveScreens(ClientPtr client, int on, int mode)
 {
     int rc, i, what, type;
 
@@ -3455,6 +3455,12 @@ SaveScreens(ClientPtr client, int on, int mode)
     return Success;
 }
 
+_X_EXPORT int
+SaveScreens(int on, int mode)
+{
+    return dixSaveScreens(serverClient, on, mode);
+}
+
 static Bool
 TileScreenSaver(int i, int kind)
 {
diff --git a/hw/darwin/darwinEvents.c b/hw/darwin/darwinEvents.c
index 97ad8577e..4980cf271 100644
--- a/hw/darwin/darwinEvents.c
+++ b/hw/darwin/darwinEvents.c
@@ -276,7 +276,7 @@ void ProcessInputEvents(void) {
     while (darwinEventQueue.head != darwinEventQueue.tail)
     {
         if (screenIsSaved == SCREEN_SAVER_ON)
-            SaveScreens(serverClient, SCREEN_SAVER_OFF, ScreenSaverReset);
+            dixSaveScreens(serverClient, SCREEN_SAVER_OFF, ScreenSaverReset);
 
         e = &darwinEventQueue.events[darwinEventQueue.head];
         xe = e->event;
diff --git a/hw/dmx/dmxdpms.c b/hw/dmx/dmxdpms.c
index 8c745a6aa..2af160556 100644
--- a/hw/dmx/dmxdpms.c
+++ b/hw/dmx/dmxdpms.c
@@ -175,7 +175,7 @@ void dmxDPMSTerm(DMXScreenInfo *dmxScreen)
 void dmxDPMSWakeup(void)
 {
     if (screenIsSaved == SCREEN_SAVER_ON)
-        SaveScreens(serverClient, SCREEN_SAVER_OFF, ScreenSaverReset);
+        dixSaveScreens(serverClient, SCREEN_SAVER_OFF, ScreenSaverReset);
 #ifdef DPMSExtension
     if (DPMSPowerLevel) DPMSSet(serverClient, 0);
 #endif
diff --git a/hw/xfree86/common/xf86DPMS.c b/hw/xfree86/common/xf86DPMS.c
index 536d38e8f..43efb8ed4 100644
--- a/hw/xfree86/common/xf86DPMS.c
+++ b/hw/xfree86/common/xf86DPMS.c
@@ -153,7 +153,7 @@ DPMSSet(ClientPtr client, int level)
 	return Success;
 
     if (level != DPMSModeOn) {
-	rc = SaveScreens(client, SCREEN_SAVER_FORCER, ScreenSaverActive);
+	rc = dixSaveScreens(client, SCREEN_SAVER_FORCER, ScreenSaverActive);
 	if (rc != Success)
 	    return rc;
     }
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index bc2fe0912..2b7cb121d 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -906,7 +906,7 @@ xf86VTSwitch()
 	    (*xf86Screens[i]->EnableDisableFBAccess) (i, TRUE);
 	}
       }
-      SaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
+      dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
 
       pInfo = xf86InputDevs;
       while (pInfo) {
@@ -970,7 +970,7 @@ xf86VTSwitch()
     }
 
     /* Turn screen saver off when switching back */
-    SaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
+    dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
 
     pInfo = xf86InputDevs;
     while (pInfo) {
diff --git a/hw/xfree86/common/xf86PM.c b/hw/xfree86/common/xf86PM.c
index 278a51474..7c8320dee 100644
--- a/hw/xfree86/common/xf86PM.c
+++ b/hw/xfree86/common/xf86PM.c
@@ -116,7 +116,7 @@ resume(pmEvent event, Bool undo)
 	if (xf86Screens[i]->EnableDisableFBAccess)
 	    (*xf86Screens[i]->EnableDisableFBAccess) (i, TRUE);
     }
-    SaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
+    dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
     pInfo = xf86InputDevs;
     while (pInfo) {
 	EnableDevice(pInfo->dev);
diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c
index 139e23c6e..1a259f5e8 100644
--- a/hw/xfree86/loader/dixsym.c
+++ b/hw/xfree86/loader/dixsym.c
@@ -319,6 +319,7 @@ _X_HIDDEN void *dixLookupTab[] = {
     SYMFUNC(NotClippedByChildren)
     SYMFUNC(ResizeChildrenWinSize)
     SYMFUNC(SaveScreens)
+    SYMFUNC(dixSaveScreens)
     SYMFUNC(SendVisibilityNotify)
     SYMFUNC(SetWinSize)
     SYMFUNC(SetBorderSize)
diff --git a/include/window.h b/include/window.h
index f85eceb2d..9943f903c 100644
--- a/include/window.h
+++ b/include/window.h
@@ -204,11 +204,15 @@ extern RegionPtr NotClippedByChildren(
 extern void SendVisibilityNotify(
     WindowPtr /*pWin*/);
 
-extern int SaveScreens(
+extern int dixSaveScreens(
     ClientPtr client,
     int on,
     int mode);
 
+extern int SaveScreens(
+    int on,
+    int mode);
+
 extern WindowPtr FindWindowWithOptional(
     WindowPtr /*w*/);
 
diff --git a/mi/mieq.c b/mi/mieq.c
index 5093023c7..d946e7d04 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -200,7 +200,7 @@ mieqProcessInputEvents(void)
 
     while (miEventQueue.head != miEventQueue.tail) {
         if (screenIsSaved == SCREEN_SAVER_ON)
-            SaveScreens (serverClient, SCREEN_SAVER_OFF, ScreenSaverReset);
+            dixSaveScreens (serverClient, SCREEN_SAVER_OFF, ScreenSaverReset);
 #ifdef DPMSExtension
         else if (DPMSPowerLevel != DPMSModeOn)
             SetScreenSaverTimer();
diff --git a/os/WaitFor.c b/os/WaitFor.c
index 9281ba8ea..cfba251b0 100644
--- a/os/WaitFor.c
+++ b/os/WaitFor.c
@@ -647,7 +647,7 @@ ScreenSaverTimeoutExpire(OsTimerPtr timer,CARD32 now,pointer arg)
     }
 
     ResetOsBuffers(); /* not ideal, but better than nothing */
-    SaveScreens(serverClient, SCREEN_SAVER_ON, ScreenSaverActive);
+    dixSaveScreens(serverClient, SCREEN_SAVER_ON, ScreenSaverActive);
 
     if (ScreenSaverInterval > 0)
     {

From 5b0dfb73ca4699cc4b33720f10416de7440081b7 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 19 Nov 2007 21:01:22 -0500
Subject: [PATCH 206/552] devPrivates rework: put back a comment that was
 mistakenly removed 	during merge conflict resolution.

---
 cfb/cfb.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cfb/cfb.h b/cfb/cfb.h
index e80a427ec..aece13341 100644
--- a/cfb/cfb.h
+++ b/cfb/cfb.h
@@ -81,6 +81,8 @@ typedef struct {
     CfbBits	xor, and;
 } cfbRRopRec, *cfbRRopPtr;
 
+/* cfb8bit.c */
+
 extern int cfbSetStipple(
     int /*alu*/,
     CfbBits /*fg*/,

From 709c1a70c8c6a9e132bf0d92f78a12be72beee51 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 15:18:02 -0500
Subject: [PATCH 207/552] Remove some duplicate include statements.

---
 Xext/xres.c | 1 -
 dix/main.c  | 1 -
 fb/fb.h     | 1 -
 3 files changed, 3 deletions(-)

diff --git a/Xext/xres.c b/Xext/xres.c
index 281ba20cd..efa6c49c7 100644
--- a/Xext/xres.c
+++ b/Xext/xres.c
@@ -23,7 +23,6 @@
 #include "windowstr.h"
 #include "gcstruct.h"
 #include "modinit.h"
-#include "registry.h"
 
 static int
 ProcXResQueryVersion (ClientPtr client)
diff --git a/dix/main.c b/dix/main.c
index bc00ac5e5..335706b70 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -87,7 +87,6 @@ Equipment Corporation.
 #include "os.h"
 #include "windowstr.h"
 #include "resource.h"
-#include "privates.h"
 #include "dixstruct.h"
 #include "gcstruct.h"
 #include "extension.h"
diff --git a/fb/fb.h b/fb/fb.h
index af2b4a1f0..5b56d96a2 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -41,7 +41,6 @@
 #include "mi.h"
 #include "migc.h"
 #include "mibstore.h"
-#include "privates.h"
 #ifdef RENDER
 #include "picturestr.h"
 #else

From fae39db7957c0ebdc7af36f8d8f484473beb6d38 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 15:21:31 -0500
Subject: [PATCH 208/552] devPrivates rework: put back some changes that were
 mistakenly removed 	during merge conflict resolution.

---
 mfb/mfbbitblt.c | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/mfb/mfbbitblt.c b/mfb/mfbbitblt.c
index 0c23ba750..344c655ee 100644
--- a/mfb/mfbbitblt.c
+++ b/mfb/mfbbitblt.c
@@ -399,22 +399,20 @@ int dstx, dsty;
 
 static DevPrivateKey copyPlaneScreenKey = &copyPlaneScreenKey;
 
-typedef RegionPtr (*CopyPlaneFuncPtr)(
-    DrawablePtr         /* pSrcDrawable */,
-    DrawablePtr         /* pDstDrawable */,
-    GCPtr               /* pGC */,
-    int                 /* srcx */,
-    int                 /* srcy */,
-    int                 /* width */,
-    int                 /* height */,
-    int                 /* dstx */,
-    int                 /* dsty */,
-    unsigned long       /* bitPlane */);
-
 Bool
 mfbRegisterCopyPlaneProc (pScreen, proc)
     ScreenPtr	pScreen;
-    CopyPlaneFuncPtr proc;
+    RegionPtr	(*proc)(
+        DrawablePtr         /* pSrcDrawable */,
+        DrawablePtr         /* pDstDrawable */,
+        GCPtr               /* pGC */,
+        int                 /* srcx */,
+        int                 /* srcy */,
+        int                 /* width */,
+        int                 /* height */,
+        int                 /* dstx */,
+        int                 /* dsty */,
+        unsigned long       /* bitPlane */);
 {
     dixSetPrivate(&pScreen->devPrivates, copyPlaneScreenKey, proc);
     return TRUE;
@@ -461,10 +459,8 @@ unsigned long plane;
 
     if (pSrcDrawable->depth != 1)
     {
-	if ((copyPlane = (CopyPlaneFuncPtr)
-	     dixLookupPrivate(&pSrcDrawable->pScreen->devPrivates,
-			      copyPlaneScreenKey))
-	    )
+	if ((copyPlane = dixLookupPrivate(&pSrcDrawable->pScreen->devPrivates,
+					  copyPlaneScreenKey)))
 	{
 	    return (*copyPlane) (pSrcDrawable, pDstDrawable,
 			   pGC, srcx, srcy, width, height, dstx, dsty, plane);

From 26586a7ad5e999b34996d147fb43998deea89178 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 17:27:37 -0500
Subject: [PATCH 209/552] Revert "registry: Register composite extension
 protocol names."

This reverts commit 166ef972febc00c665e1d5aeb68e75d7bbcf9879.

Moving all the names into dix/registry.c
---
 composite/compext.c | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/composite/compext.c b/composite/compext.c
index 98adabbaa..2918556f8 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");
 }

From b9ab6f300a46aa8879b11eac51857357cc379c2f Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 17:31:00 -0500
Subject: [PATCH 210/552] Revert "registry: Register DAMAGE extension protocol
 names."

This reverts commit 20db50b4c44a14f7eeac2b1de17ada68482521da.

Moving all the names into dix/registry.c
---
 damageext/damageext.c | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/damageext/damageext.c b/damageext/damageext.c
index ac2198b0b..517c72dac 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");
+    }
 }

From c934e1af27189571c1e7dd838872e380c3580eeb Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 17:32:35 -0500
Subject: [PATCH 211/552] Revert "registry: Register DBE extension protocol
 names."

This reverts commit 2e1e5be1d9067816525aa13a1d818e8ca6899599.

Moving all the names into dix/registry.c
---
 dbe/dbe.c | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/dbe/dbe.c b/dbe/dbe.c
index a872544e7..8175a352f 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() */
 

From fd2d83d5bf5b35c8a2b05f725486be166783921e Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 17:34:48 -0500
Subject: [PATCH 212/552] Revert "registry: Register APPLEWM extension protocol
 names."

This reverts commit eee46b4681ec55297604b0425705f2b18381f7ca.

Moving all the names into dix/registry.c
---
 hw/darwin/quartz/applewm.c | 41 +-------------------------------------
 1 file changed, 1 insertion(+), 40 deletions(-)

diff --git a/hw/darwin/quartz/applewm.c b/hw/darwin/quartz/applewm.c
index fecafe8fb..308c51074 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*/

From 546d46224e355d4f00232da5538548e3c8853e40 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 17:37:48 -0500
Subject: [PATCH 213/552] Revert "registry: Register XINERAMA extension
 protocol names."

This reverts commit b9f5ab98c8dea36dcce1ad15fd2e059a77e77c39.

Moving all the names into dix/registry.c
---
 Xext/panoramiX.c               | 14 --------------
 hw/darwin/quartz/pseudoramiX.c | 14 --------------
 randr/rrxinerama.c             | 26 +++++---------------------
 3 files changed, 5 insertions(+), 49 deletions(-)

diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index 1ba0c4dd2..26c280990 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 cdd4fffff..787601b5d 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 c49980256..896f61fb5 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);
 }

From 2d3e0cdf4bd7ab069bad7244ede7c2d489e92b17 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 17:39:56 -0500
Subject: [PATCH 214/552] Revert "registry: Register APPLEDRI extension
 protocol names."

This reverts commit 3464b419230c6d17e940d967b567c5d2cb22d232.

Moving all the names into dix/registry.c
---
 hw/darwin/quartz/xpr/appledri.c | 29 +----------------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

diff --git a/hw/darwin/quartz/xpr/appledri.c b/hw/darwin/quartz/xpr/appledri.c
index d9690fdb1..70b740077 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*/

From de93c1e9df14577e158b6dc3ccec7ee48f592386 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 17:40:57 -0500
Subject: [PATCH 215/552] Revert "registry: Register DMX extension protocol
 names."

This reverts commit 32f3f5a1e7654f8bb43ea16b9227b3994e616739.

Moving all the names into dix/registry.c
---
 hw/dmx/dmx.c | 40 ----------------------------------------
 1 file changed, 40 deletions(-)

diff --git a/hw/dmx/dmx.c b/hw/dmx/dmx.c
index 840356f02..5f1fc0546 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,

From 0356153a58cef87d655bccacd8e2cf03d577bd19 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 17:43:18 -0500
Subject: [PATCH 216/552] Revert "registry: Register XF86DGA extension protocol
 names."

This reverts commit 3815284e899b61731b6a63c4ba14c5d773e24eb6.

Moving all the names into dix/registry.c
---
 hw/xfree86/dixmods/extmod/xf86dga2.c | 68 +---------------------------
 1 file changed, 1 insertion(+), 67 deletions(-)

diff --git a/hw/xfree86/dixmods/extmod/xf86dga2.c b/hw/xfree86/dixmods/extmod/xf86dga2.c
index 3b866c798..295e05e9e 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");
+    }
 }
 
 

From 8e2cd7a804664bbd2d03789dcd5c93223122e929 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 17:45:30 -0500
Subject: [PATCH 217/552] Revert "registry: Register XF86Misc extension
 protocol names."

This reverts commit 2cd1b32b77e0ceeaccb3f01c4ac13a97c557668c.

Moving all the names into dix/registry.c
---
 hw/xfree86/dixmods/extmod/xf86misc.c | 46 +---------------------------
 1 file changed, 1 insertion(+), 45 deletions(-)

diff --git a/hw/xfree86/dixmods/extmod/xf86misc.c b/hw/xfree86/dixmods/extmod/xf86misc.c
index 274b1d3f1..66278a298 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*/

From 6b73c215c9d612534af290230b2e914d42d819cd Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 17:47:30 -0500
Subject: [PATCH 218/552] Revert "registry: Register XF86VidMode extension
 protocol names."

This reverts commit 960677e876c068400fb45e1764bb5470cd8c389f.

Moving all the names into dix/registry.c
---
 hw/xfree86/dixmods/extmod/xf86vmode.c | 67 +--------------------------
 1 file changed, 1 insertion(+), 66 deletions(-)

diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c
index 17ba44aba..718d40fbd 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*/

From 993595430bd0580ab4d936be6b70fb91b8bb1d16 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 17:48:46 -0500
Subject: [PATCH 219/552] Revert "registry: Register XF86DRI extension protocol
 names."

This reverts commit b7786724080fd3928ef7b8c294346661d7ffd90b.

Moving all the names into dix/registry.c
---
 hw/xfree86/dri/xf86dri.c | 38 +-------------------------------------
 1 file changed, 1 insertion(+), 37 deletions(-)

diff --git a/hw/xfree86/dri/xf86dri.c b/hw/xfree86/dri/xf86dri.c
index d16910f33..ea11b38ee 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*/

From a541e826c9310d3051e53834833c6c3a08654148 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 17:50:26 -0500
Subject: [PATCH 220/552] Revert "registry: Register WINDOWSWM extension
 protocol names."

This reverts commit 4c3285c883cc50a91bc5262bbc9d073d816f860a.

Moving all the names into dix/registry.c
---
 hw/xwin/winwindowswm.c | 31 +------------------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

diff --git a/hw/xwin/winwindowswm.c b/hw/xwin/winwindowswm.c
index 1356465d9..e1994de84 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*/

From d4577e485367468227e031eb434b739eff7b5e9a Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 17:51:27 -0500
Subject: [PATCH 221/552] Revert "registry: Register RANDR extension protocol
 names."

This reverts commit c827db57e4d9ca14c82b099dcfc9b7a0c0b5ba0a.

Moving all the names into dix/registry.c
---
 randr/randr.c | 68 ---------------------------------------------------
 1 file changed, 68 deletions(-)

diff --git a/randr/randr.c b/randr/randr.c
index d5b9819f1..bc2b995d2 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

From e585a2ddb495b50a53e15cccc368ca0858fc9d23 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 17:55:47 -0500
Subject: [PATCH 222/552] Revert "registry: Register Record extension protocol
 names."

This reverts commit ea09c9acc8f0d5577f54c864ff88b7f03d93b2f4.

Moving all the names into dix/registry.c
---
 record/record.c | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/record/record.c b/record/record.c
index 2ca37822b..debe3c472 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 */
 

From 5aff37d1d69be493727856a29628bd782d50b90f Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 17:57:06 -0500
Subject: [PATCH 223/552] Revert "registry: Register RENDER extension protocol
 names."

This reverts commit 8964c6d8e14ae47798762191e359b2bf138ca32e.

Moving all the names into dix/registry.c
---
 render/render.c | 90 -------------------------------------------------
 1 file changed, 90 deletions(-)

diff --git a/render/render.c b/render/render.c
index 5fc91a948..db9168ba2 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

From 0756d1271209e6ae14cc641dddca095271b43150 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 17:59:40 -0500
Subject: [PATCH 224/552] Revert "registry: Register APPGROUP extension
 protocol names."

This reverts commit b504678ba5407a6fd8d47d051305f7c3d5606dfe.

Moving all the names into dix/registry.c
---
 Xext/appgroup.c | 38 ++++++++------------------------------
 1 file changed, 8 insertions(+), 30 deletions(-)

diff --git a/Xext/appgroup.c b/Xext/appgroup.c
index 4fb402066..c40782df5 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");
+    }
 }

From ce93c5772da52ab88faef7e5b661b681d5b60b1e Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 18:03:57 -0500
Subject: [PATCH 225/552] registry: Remove registry code from BigRequests
 extension.

Moving all the names into dix/registry.c
---
 Xext/bigreq.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/Xext/bigreq.c b/Xext/bigreq.c
index 6303f388e..fd8bcb89b 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*/

From 76e89d45b497d4afa4e60e1d0ec50b62f54f6b88 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 18:06:40 -0500
Subject: [PATCH 226/552] registry: Remove registry code from TOG-CUP
 extension.

Moving all the names into dix/registry.c
---
 Xext/cup.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/Xext/cup.c b/Xext/cup.c
index 4adfc6116..44c96643d 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*/

From 460c43032f05aad3f0f552901a52d199f61c7f4f Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 18:08:18 -0500
Subject: [PATCH 227/552] registry: Remove registry code from DPMS extension.

Moving all the names into dix/registry.c
---
 Xext/dpms.c | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/Xext/dpms.c b/Xext/dpms.c
index 613493aae..d518a16cc 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*/

From 46412baf60ed639ddc1d5fb601f73a75e39737f7 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 18:11:06 -0500
Subject: [PATCH 228/552] registry: Remove registry code from EVI extension.

Moving all the names into dix/registry.c
---
 Xext/EVI.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Xext/EVI.c b/Xext/EVI.c
index b6752c083..6abd50824 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");
 }

From 40a0da044e911ea51de003f3621331ffbe2842bc Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 18:13:43 -0500
Subject: [PATCH 229/552] registry: Remove registry code from Fontcache
 extension.

Moving all the names into dix/registry.c
---
 Xext/fontcache.c | 29 +++--------------------------
 1 file changed, 3 insertions(+), 26 deletions(-)

diff --git a/Xext/fontcache.c b/Xext/fontcache.c
index 9fae2d70b..06b0c854b 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*/

From 816e6e612e4bc3cea1e67e7ea79d5b640458011f Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 18:15:37 -0500
Subject: [PATCH 230/552] Revert "registry: Register Multibuffer extension
 protocol names."

This reverts commit 3877faf7d9fe00ed634077e38a198ae4b91a2bb4.

Moving all the names into dix/registry.c
---
 Xext/mbuf.c | 35 +----------------------------------
 1 file changed, 1 insertion(+), 34 deletions(-)

diff --git a/Xext/mbuf.c b/Xext/mbuf.c
index ba99f3fbc..9f17c86e3 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*/

From 36ef45928c783292cef18acfdd83ae057826c989 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 18:18:01 -0500
Subject: [PATCH 231/552] registry: Remove registry code from MIT-MISC
 extension.

Moving all the names to dix/registry.c
---
 Xext/mitmisc.c | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/Xext/mitmisc.c b/Xext/mitmisc.c
index 0b231529b..a5f3b0f6d 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*/

From 55744d8e5d7bf1ff27cd25de54e14e799dd1a70a Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 18:19:44 -0500
Subject: [PATCH 232/552] Revert "registry: Register MIT-SCREEN-SAVER extension
 protocol names."

This reverts commit 58c3240fcbec23aad122e1c340f6bb6d3b18f779.

Moving all the names into dix/registry.c
---
 Xext/saver.c | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/Xext/saver.c b/Xext/saver.c
index 43dd3e2de..20dbc924d 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*/

From 8583bf78ad056ffe2d83b54e5c9a0a217e425a7b Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 18:21:09 -0500
Subject: [PATCH 233/552] registry: Remove registry code from XC-SECURITY
 extension.

Moving all the names to dix/registry.c
---
 Xext/security.c | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/Xext/security.c b/Xext/security.c
index eef4f693c..6aab3a342 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");
 }

From 67e82e306f67a215c6c89868cc1d3649747bd93d Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 18:22:59 -0500
Subject: [PATCH 234/552] Revert "registry: Register SHAPE extension protocol
 names."

This reverts commit 4e274e90e16b1d954391e1af3e2074fb10f70ee7.

Moving all the names to dix/registry.c
---
 Xext/shape.c | 32 +++++++-------------------------
 1 file changed, 7 insertions(+), 25 deletions(-)

diff --git a/Xext/shape.c b/Xext/shape.c
index 567737c13..e84eb34da 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*/

From 4c7cf5aa4c802dcde895c723879a80a87620c0f7 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 18:23:57 -0500
Subject: [PATCH 235/552] Revert "registry: Register SHM extension protocol
 names."

This reverts commit 2c9646ad4e65bb061d910c9e2b1a8a978f21fa17.

Moving all the names to dix/registry.c
---
 Xext/shm.c | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/Xext/shm.c b/Xext/shm.c
index dfe759fbe..e3d7a23ff 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*/

From 4b0274e8f712e51b18618a2a0bdbe03b17b9736b Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 18:25:15 -0500
Subject: [PATCH 236/552] Revert "registry: Register SYNC extension protocol
 names."

This reverts commit 9f597f6c87e0b14cc382d8e5929e42f822db4329.

Moving all the names into dix/registry.c
---
 Xext/sync.c | 40 ----------------------------------------
 1 file changed, 40 deletions(-)

diff --git a/Xext/sync.c b/Xext/sync.c
index 729014721..10d448106 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");
 }
 
 

From 687427179420b18a55a1a02b8a9f2a32ea8eac8d Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 18:32:54 -0500
Subject: [PATCH 237/552] registry: Remove registry code from XC-MISC
 extension.

Moving all the names into dix/registry.c
---
 Xext/xcmisc.c | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c
index ba0402c76..44d2b19a6 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*/

From bf27edd365ffd275e5453f44d130eeacbfe0ecd9 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 18:34:14 -0500
Subject: [PATCH 238/552] Revert "registry: Register EVIE extension protocol
 names."

This reverts commit 48891d5696f56711f23743cb03be39cf6b26c522.

Moving all the names into dix/registry.c
---
 Xext/xevie.c | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/Xext/xevie.c b/Xext/xevie.c
index 8dc167814..7dd67bbf6 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*/

From 277345fb7065d74c3b0d076382affb78cbe67569 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 18:35:57 -0500
Subject: [PATCH 239/552] registry: Remove registry code from XF86Bigfont
 extension.

Moving all the names into dix/registry.c
---
 Xext/xf86bigfont.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c
index e2f589040..33627421d 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");
+    }
 }
 
 

From e6023e0208fae8f19c566f9df1a8aa20494f40ab Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 18:36:49 -0500
Subject: [PATCH 240/552] Revert "registry: Register XPrint extension protocol
 names."

This reverts commit f077578e42eee424b0e534774574c84af9d6f85b.

Moving all the names into dix/registry.c
---
 Xext/xprint.c | 64 ---------------------------------------------------
 1 file changed, 64 deletions(-)

diff --git a/Xext/xprint.c b/Xext/xprint.c
index 48559dd44..ef5111837 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

From 9a8af33718d085656a672e4c27df200485c84154 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 18:38:24 -0500
Subject: [PATCH 241/552] Revert "registry: Register Resource extension
 protocol names."

This reverts commit 5c8b1a91726817816d20faefad21c7a68ab634cc.

Moving all the names into dix/registry.c
---
 Xext/xres.c | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/Xext/xres.c b/Xext/xres.c
index efa6c49c7..243460c12 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");
 }

From 5fea1ed50f37691a5273bf2897479781de808ff5 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 18:39:48 -0500
Subject: [PATCH 242/552] registry: Remove registry code from SELinux
 extension.

Moving all the names into dix/registry.c
---
 Xext/xselinux.c | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index cefde9d37..8f52c1e7d 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");
 }

From edcf490cdb965e2a5bfc0169c01732d2924da3ae Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 18:41:10 -0500
Subject: [PATCH 243/552] registry: Remove registry code from XTest extension.

Moving all the names into dix/registry.c
---
 Xext/xtest.c | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/Xext/xtest.c b/Xext/xtest.c
index effa3b904..8e1732cd2 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*/

From 03a86c8d5e20a6e47f3c294f0087f205cf2a72dd Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 18:42:19 -0500
Subject: [PATCH 244/552] Revert "registry: Register Xv extension protocol
 names."

This reverts commit 12766c5b5ffdab95255a63b2c8421ee773fd43b5.

Moving all the names into dix/registry.c
---
 Xext/xvmain.c | 53 ---------------------------------------------------
 1 file changed, 53 deletions(-)

diff --git a/Xext/xvmain.c b/Xext/xvmain.c
index b3449b4a5..a2fc10802 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");
     }
 }
 

From 5269da2bde3cf4feb12fa2bd87bff6ee6d8730a1 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 18:43:38 -0500
Subject: [PATCH 245/552] Revert "registry: Register XvMC extension protocol
 names."

This reverts commit 853ea337bdad17f8f6ec7d940de14ce2cbbbf93e.

Moving all the names into dix/registry.c
---
 Xext/xvmc.c | 29 -----------------------------
 1 file changed, 29 deletions(-)

diff --git a/Xext/xvmc.c b/Xext/xvmc.c
index a1e0ed186..7ae8cc0da 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

From e86852aff62a861823b8e419434e0401b8cdc8e0 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 18:44:56 -0500
Subject: [PATCH 246/552] Revert "registry: Register XFixes extension protocol
 names."

This reverts commit 106758893b68033f14f69c4ee6591fb6a149ba37.

Moving all the names into dix/registry.c
---
 xfixes/xfixes.c | 78 +------------------------------------------------
 1 file changed, 1 insertion(+), 77 deletions(-)

diff --git a/xfixes/xfixes.c b/xfixes/xfixes.c
index ccce7b9fd..0db49895e 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");
+    }
 }

From 17b0c729b553e2f0f8f82497698b282a47db3326 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 18:46:43 -0500
Subject: [PATCH 247/552] registry: Remove registry code from XInput extension.

Moving all the names into dix/registry.c
---
 Xi/extinit.c | 115 ---------------------------------------------------
 1 file changed, 115 deletions(-)

diff --git a/Xi/extinit.c b/Xi/extinit.c
index bf5ebd221..2ffdafbc1 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");
 }

From ed8a39c48ab9dac085fcf58b9641364b5608f3f4 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 18:47:52 -0500
Subject: [PATCH 248/552] Revert "registry: Register XKB extension protocol
 names."

This reverts commit a5cf3f21f712e46dbf9bca289e67be75f2b531d3.

Moving all the names into dix/registry.c
---
 xkb/xkb.c | 63 ++++---------------------------------------------------
 1 file changed, 4 insertions(+), 59 deletions(-)

diff --git a/xkb/xkb.c b/xkb/xkb.c
index 49c63faa6..23e1dc76f 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;
 }
+
+

From 140a4660aca1c283613d5b62f51668b44b45baf6 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 18:49:30 -0500
Subject: [PATCH 249/552] Revert "registry: Register XTrap extension protocol
 names."

This reverts commit b38a91993364aa80cfd99721e319e1458d9fb760.

Moving all the names into dix/registry.c
---
 XTrap/xtrapdi.c | 36 ------------------------------------
 1 file changed, 36 deletions(-)

diff --git a/XTrap/xtrapdi.c b/XTrap/xtrapdi.c
index 15a38eafc..7dd9584a0 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;
 }
 

From 4363d70c6b420648b501126d1fbdebfafc7ae09f Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 20 Nov 2007 18:58:55 -0500
Subject: [PATCH 250/552] registry: Fix some mistakes in the reversion of prior
 commits.

---
 Xext/bigreq.c    | 2 +-
 Xext/dpms.c      | 2 +-
 Xext/fontcache.c | 2 +-
 Xext/mitmisc.c   | 2 +-
 Xext/xcmisc.c    | 2 +-
 Xext/xres.c      | 1 +
 Xext/xtest.c     | 2 +-
 7 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Xext/bigreq.c b/Xext/bigreq.c
index fd8bcb89b..4f0724bc1 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 d518a16cc..6f01fa348 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 06b0c854b..eca730965 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 a5f3b0f6d..e793d4dc1 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 44d2b19a6..a42d2e210 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 243460c12..feadad27e 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 8e1732cd2..db6d54543 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*/

From c0f9e204baf0218466973868c5ea6ed0f78e6b8b Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 26 Nov 2007 15:24:15 -0500
Subject: [PATCH 251/552] registry: rename the SERVERCONFIGdir and relocate it
 to /usr/lib/xorg by default.

---
 configure.ac            | 7 ++++---
 include/dix-config.h.in | 3 +++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 477058cfb..d78bc1c33 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 8ceeb8ddc..c4429628e 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
 

From 9b0e72c8d960d056276f5fa93f3cc2872825711e Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 26 Nov 2007 15:26:04 -0500
Subject: [PATCH 252/552] 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.

---
 dix/Makefile.am  |    4 +
 dix/protocol.txt | 1054 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 1058 insertions(+)
 create mode 100644 dix/protocol.txt

diff --git a/dix/Makefile.am b/dix/Makefile.am
index 65c387c31..2cf90142f 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 000000000..f4cdf7bbb
--- /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

From decd5a7c605e42c99b6a4523c8e1833b859d9b24 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 26 Nov 2007 15:26:49 -0500
Subject: [PATCH 253/552] registry: Rebase registry to use the server config
 file of protocol names.

---
 dix/extension.c            |   2 +
 dix/registry.c             | 323 +++++++++++++++----------------------
 hw/xfree86/loader/dixsym.c |   3 -
 include/registry.h         |  13 +-
 4 files changed, 135 insertions(+), 206 deletions(-)

diff --git a/dix/extension.c b/dix/extension.c
index 0e97976db..42fdc125f 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 1cf7fa59e..02b42d46a 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 1a259f5e8..79cc6e79e 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 d57f32d2d..90c3de367 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

From 54cb729ecc2d366c1af836cb3d2ffc8e864e9b79 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 26 Nov 2007 15:59:01 -0500
Subject: [PATCH 254/552] registry: Add a call for DTRACE compatibility.

---
 dix/registry.c             | 19 +++++++++++++++++++
 hw/xfree86/loader/dixsym.c |  5 +++++
 include/registry.h         |  2 ++
 3 files changed, 26 insertions(+)

diff --git a/dix/registry.c b/dix/registry.c
index 02b42d46a..10fa21f84 100644
--- a/dix/registry.c
+++ b/dix/registry.c
@@ -217,6 +217,25 @@ LookupRequestName(int major, int minor)
     return requests[major][minor] ? requests[major][minor] : XREGISTRY_UNKNOWN;
 }
 
+const char *
+LookupMajorName(int major)
+{
+    if (major < 128) {
+	const char *retval;
+
+	if (major >= nmajor)
+	    return XREGISTRY_UNKNOWN;
+	if (0 >= nminor[major])
+	    return XREGISTRY_UNKNOWN;
+
+	retval = requests[major][0];
+	return retval ? retval + sizeof(CORE) : XREGISTRY_UNKNOWN;
+    } else {
+	ExtensionEntry *extEntry = GetExtensionEntry(major);
+	return extEntry ? extEntry->name : XREGISTRY_UNKNOWN;
+    }
+}
+
 const char *
 LookupEventName(int event)
 {
diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c
index 79cc6e79e..49c7d271b 100644
--- a/hw/xfree86/loader/dixsym.c
+++ b/hw/xfree86/loader/dixsym.c
@@ -289,6 +289,11 @@ _X_HIDDEN void *dixLookupTab[] = {
     /* registry.c */
 #ifdef XREGISTRY
     SYMFUNC(RegisterResourceName)
+    SYMFUNC(LookupMajorName)
+    SYMFUNC(LookupRequestName)
+    SYMFUNC(LookupEventName)
+    SYMFUNC(LookupErrorName)
+    SYMFUNC(LookupResourceName)
 #endif
     /* swaprep.c */
     SYMFUNC(CopySwap32Write)
diff --git a/include/registry.h b/include/registry.h
index 90c3de367..edd6ef9a7 100644
--- a/include/registry.h
+++ b/include/registry.h
@@ -29,6 +29,7 @@ void RegisterExtensionNames(ExtensionEntry *ext);
 /*
  * Lookup functions.  The returned string must not be modified or freed.
  */
+const char *LookupMajorName(int major);
 const char *LookupRequestName(int major, int minor);
 const char *LookupEventName(int event);
 const char *LookupErrorName(int error);
@@ -51,6 +52,7 @@ void dixResetRegistry(void);
 #define RegisterResourceName(a, b) { ; }
 #define RegisterExtensionNames(a) { ; }
 
+#define LookupMajorName(a) XREGISTRY_UNKNOWN
 #define LookupRequestName(a, b) XREGISTRY_UNKNOWN
 #define LookupEventName(a) XREGISTRY_UNKNOWN
 #define LookupErrorName(a) XREGISTRY_UNKNOWN

From 996b621bec1bbc4fb21970c75eaec62053bc6ccb Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 26 Nov 2007 15:59:44 -0500
Subject: [PATCH 255/552] registry: swap out the DTRACE XErrorDB stuff for the
 new registry call.

---
 configure.ac            |  7 ----
 dix/dispatch.c          | 75 ++---------------------------------------
 dix/extension.c         | 14 --------
 include/dix-config.h.in |  3 --
 4 files changed, 2 insertions(+), 97 deletions(-)

diff --git a/configure.ac b/configure.ac
index d78bc1c33..042cfdd4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,13 +90,6 @@ if test "x$WDTRACE" != "xno" ; then
 fi
 AM_CONDITIONAL(XSERVER_DTRACE, [test "x$WDTRACE" != "xno"])
 
-# DTrace support uses XErrorDB to get request names
-AC_ARG_WITH(xerrordb,
-            AS_HELP_STRING([--with-xerrordb=PATH], [Path to XErrorDB file (default: ${datadir}/X11/XErrorDB)]),
-	    [ XERRORDB_PATH="$withval" ],
-	    [ XERRORDB_PATH="${datadir}/X11/XErrorDB" ])
-AC_DEFINE_DIR(XERRORDB_PATH, XERRORDB_PATH, [Path to XErrorDB file])
-
 AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_CHECK_HEADERS([fcntl.h stdlib.h string.h unistd.h])
diff --git a/dix/dispatch.c b/dix/dispatch.c
index dcd4b530f..919bcda50 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -148,14 +148,7 @@ int ProcInitialConnection();
 #endif
 
 #ifdef XSERVER_DTRACE
-#include <sys/types.h>
-typedef const char *string;
 #include "Xserver-dtrace.h"
-
-char *RequestNames[256];
-static void LoadRequestNames(void);
-static void FreeRequestNames(void);
-#define GetRequestName(i) (RequestNames[i])
 #endif
 
 #define mskcnt ((MAXCLIENTS + 31) / 32)
@@ -383,10 +376,6 @@ Dispatch(void)
     if (!clientReady)
 	return;
 
-#ifdef XSERVER_DTRACE
-    LoadRequestNames();
-#endif
-
     while (!dispatchException)
     {
         if (*icheck[0] != *icheck[1])
@@ -464,7 +453,7 @@ Dispatch(void)
 		client->requestLogIndex++;
 #endif
 #ifdef XSERVER_DTRACE
-		XSERVER_REQUEST_START(GetRequestName(MAJOROP), MAJOROP,
+		XSERVER_REQUEST_START(LookupMajorName(MAJOROP), MAJOROP,
 			      ((xReq *)client->requestBuffer)->length,
 			      client->index, client->requestBuffer);
 #endif
@@ -476,7 +465,7 @@ Dispatch(void)
 		    XaceHookAuditEnd(client, result);
 		}
 #ifdef XSERVER_DTRACE
-		XSERVER_REQUEST_DONE(GetRequestName(MAJOROP), MAJOROP,
+		XSERVER_REQUEST_DONE(LookupMajorName(MAJOROP), MAJOROP,
 			      client->sequence, client->index, result);
 #endif
 
@@ -510,9 +499,6 @@ Dispatch(void)
     KillAllClients();
     xfree(clientReady);
     dispatchException &= ~DE_RESET;
-#ifdef XSERVER_DTRACE
-    FreeRequestNames();
-#endif
 }
 
 #undef MAJOROP
@@ -4045,60 +4031,3 @@ MarkClientException(ClientPtr client)
 {
     client->noClientException = -1;
 }
-
-#ifdef XSERVER_DTRACE
-#include <ctype.h>
-
-/* Load table of request names for dtrace probes */
-static void LoadRequestNames(void)
-{
-    int i;
-    FILE *xedb;
-    extern void LoadExtensionNames(char **RequestNames);
-
-    bzero(RequestNames, 256 * sizeof(char *));
-
-    xedb = fopen(XERRORDB_PATH, "r");
-    if (xedb != NULL) {
-	char buf[256];
-	while (fgets(buf, sizeof(buf), xedb)) {
-	    if ((strncmp("XRequest.", buf, 9) == 0) && (isdigit(buf[9]))) {
-		char *name;
-		i = strtol(buf + 9, &name, 10);
-		if (RequestNames[i] == 0) {
-		    char *end = strchr(name, '\n');
-		    if (end) { *end = '\0'; }
-		    RequestNames[i] = strdup(name + 1);
-		}
-	    }
-	}
-	fclose(xedb);
-    }
-
-    LoadExtensionNames(RequestNames);
-
-    for (i = 0; i < 256; i++) {
-	if (RequestNames[i] == 0) {
-#define RN_SIZE 12 /* "Request#' + up to 3 digits + \0 */
-	    RequestNames[i] = xalloc(RN_SIZE);
-	    if (RequestNames[i]) {
-		snprintf(RequestNames[i], RN_SIZE, "Request#%d", i);
-	    }
-	}
-	/* fprintf(stderr, "%d: %s\n", i, RequestNames[i]); */
-    }
-}
-
-static void FreeRequestNames(void)
-{
-    int i;
-
-    for (i = 0; i < 256; i++) {
-	if (RequestNames[i] != 0) {
-	    free(RequestNames[i]);
-	    RequestNames[i] = 0;
-	}
-    }
-}
-
-#endif
diff --git a/dix/extension.c b/dix/extension.c
index 42fdc125f..9740c1b50 100644
--- a/dix/extension.c
+++ b/dix/extension.c
@@ -354,17 +354,3 @@ ProcListExtensions(ClientPtr client)
     }
     return(client->noClientException);
 }
-
-#ifdef XSERVER_DTRACE
-void LoadExtensionNames(char **RequestNames) {
-    int i;
-
-    for (i=0; i<NumExtensions; i++) {
-	int r = extensions[i]->base;
-
-	if (RequestNames[r] == NULL) {
-	    RequestNames[r] = strdup(extensions[i]->name);
-	}
-    }
-}
-#endif
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index c4429628e..2af994f4f 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -500,9 +500,6 @@
 /* Define to 1 if the DTrace Xserver provider probes should be built in */
 #undef XSERVER_DTRACE
 
-/* Path to XErrorDB file */
-#undef XERRORDB_PATH
-
 /* Define to 16-bit byteswap macro */
 #undef bswap_16
 

From 8503072e1c2b89dca786d4afb72aa60a170d2fbd Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 26 Nov 2007 16:52:41 -0500
Subject: [PATCH 256/552] registry: add missing include statement.

---
 dix/dispatch.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dix/dispatch.c b/dix/dispatch.c
index 919bcda50..577e17cf0 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -148,6 +148,7 @@ int ProcInitialConnection();
 #endif
 
 #ifdef XSERVER_DTRACE
+#include "registry.h"
 #include "Xserver-dtrace.h"
 #endif
 

From b84f2833a681585162b8dabfb02ff62e7e0ef4d6 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon, 3 Dec 2007 14:52:17 -0800
Subject: [PATCH 257/552] xf86getpagesize() -> getpagesize() in
 os-support/solaris/sun_bios.c

---
 hw/xfree86/os-support/solaris/sun_bios.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/xfree86/os-support/solaris/sun_bios.c b/hw/xfree86/os-support/solaris/sun_bios.c
index 1fae9759c..a27a5a5a7 100644
--- a/hw/xfree86/os-support/solaris/sun_bios.c
+++ b/hw/xfree86/os-support/solaris/sun_bios.c
@@ -62,7 +62,7 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
 	 *
 	 *	Use /dev/xsvc for everything.
 	 */
-	psize = xf86getpagesize();
+	psize = getpagesize();
 	Offset += Base & (psize - 1);
 	Base &= ~(psize - 1);
 	mlen = (Offset + Len + psize - 1) & ~(psize - 1);

From fe25f897c62bb324660217e15dbd3091c808dbba Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Mon, 3 Dec 2007 18:34:40 -0500
Subject: [PATCH 258/552] xf86getpagesize -> getpagesize elsewhere in
 os-support/

---
 hw/xfree86/os-support/bsd/alpha_video.c  | 2 +-
 hw/xfree86/os-support/bsd/arm_video.c    | 2 +-
 hw/xfree86/os-support/bsd/i386_video.c   | 2 +-
 hw/xfree86/os-support/bus/Sbus.c         | 2 +-
 hw/xfree86/os-support/bus/sparcPci.c     | 2 +-
 hw/xfree86/os-support/bus/zx1PCI.c       | 2 +-
 hw/xfree86/os-support/shared/bios_mmap.c | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/hw/xfree86/os-support/bsd/alpha_video.c b/hw/xfree86/os-support/bsd/alpha_video.c
index a1b19d0f6..523c4488e 100644
--- a/hw/xfree86/os-support/bsd/alpha_video.c
+++ b/hw/xfree86/os-support/bsd/alpha_video.c
@@ -368,7 +368,7 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
 	    return(-1);
 	}
 
-	psize = xf86getpagesize();
+	psize = getpagesize();
 	Offset += Base & (psize - 1);
 	Base &= ~(psize - 1);
 	mlen = (Offset + Len + psize - 1) & ~(psize - 1);
diff --git a/hw/xfree86/os-support/bsd/arm_video.c b/hw/xfree86/os-support/bsd/arm_video.c
index b556563d3..23948b5d6 100644
--- a/hw/xfree86/os-support/bsd/arm_video.c
+++ b/hw/xfree86/os-support/bsd/arm_video.c
@@ -246,7 +246,7 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
 	    return(-1);
 	}
 
-	psize = xf86getpagesize();
+	psize = getpagesize();
 	Offset += Base & (psize - 1);
 	Base &= ~(psize - 1);
 	mlen = (Offset + Len + psize - 1) & ~(psize - 1);
diff --git a/hw/xfree86/os-support/bsd/i386_video.c b/hw/xfree86/os-support/bsd/i386_video.c
index e7db6c10e..42b905483 100644
--- a/hw/xfree86/os-support/bsd/i386_video.c
+++ b/hw/xfree86/os-support/bsd/i386_video.c
@@ -301,7 +301,7 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
 	    return(-1);
 	}
 
-	psize = xf86getpagesize();
+	psize = getpagesize();
 	Offset += Base & (psize - 1);
 	Base &= ~(psize - 1);
 	mlen = (Offset + Len + psize - 1) & ~(psize - 1);
diff --git a/hw/xfree86/os-support/bus/Sbus.c b/hw/xfree86/os-support/bus/Sbus.c
index c864e3385..2f0043f4c 100644
--- a/hw/xfree86/os-support/bus/Sbus.c
+++ b/hw/xfree86/os-support/bus/Sbus.c
@@ -559,7 +559,7 @@ _X_EXPORT pointer
 xf86MapSbusMem(sbusDevicePtr psdp, unsigned long offset, unsigned long size)
 {
     pointer ret;
-    unsigned long pagemask = xf86getpagesize() - 1;
+    unsigned long pagemask = getpagesize() - 1;
     unsigned long off = offset & ~pagemask;
     unsigned long len = ((offset + size + pagemask) & ~pagemask) - off;
 
diff --git a/hw/xfree86/os-support/bus/sparcPci.c b/hw/xfree86/os-support/bus/sparcPci.c
index 6f7113f15..2d8039c29 100644
--- a/hw/xfree86/os-support/bus/sparcPci.c
+++ b/hw/xfree86/os-support/bus/sparcPci.c
@@ -270,7 +270,7 @@ sparcPciInit(void)
     }
 
     sparcPromInit();
-    pagemask = xf86getpagesize() - 1;
+    pagemask = getpagesize() - 1;
 
     for (node = promGetChild(promRootNode);
 	 node;
diff --git a/hw/xfree86/os-support/bus/zx1PCI.c b/hw/xfree86/os-support/bus/zx1PCI.c
index 561fbd9f7..d78e0c434 100644
--- a/hw/xfree86/os-support/bus/zx1PCI.c
+++ b/hw/xfree86/os-support/bus/zx1PCI.c
@@ -469,7 +469,7 @@ void
 xf86PreScanZX1(void)
 {
     resRange range;
-    unsigned long mapSize = xf86getpagesize();
+    unsigned long mapSize = getpagesize();
     unsigned long tmp, base, ioaaddr;
     unsigned long flagsd, based, lastd, maskd, routed;
     unsigned long flags0, base0, last0, mask0, route0;
diff --git a/hw/xfree86/os-support/shared/bios_mmap.c b/hw/xfree86/os-support/shared/bios_mmap.c
index 51d429948..8bac87ebe 100644
--- a/hw/xfree86/os-support/shared/bios_mmap.c
+++ b/hw/xfree86/os-support/shared/bios_mmap.c
@@ -137,7 +137,7 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
 		return(-1);
 	}
 
-	psize = xf86getpagesize();
+	psize = getpagesize();
 	Offset += Base & (psize - 1);
 	Base &= ~(psize - 1);
 	mlen = (Offset + Len + psize - 1) & ~(psize - 1);

From a9df4bb555fd91707a68794c2dce24fb06e6cf64 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 4 Dec 2007 12:17:29 +1100
Subject: [PATCH 259/552] xf86Crtc: pass correct parameter.

quite how this has worked I've no idea.
---
 hw/xfree86/modes/xf86Crtc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index fc80f5202..a237a4c24 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -2186,7 +2186,7 @@ xf86OutputGetEDID (xf86OutputPtr output, I2CBusPtr pDDCBus)
     xf86MonPtr mon;
 
     mon = xf86DoEDID_DDC2 (scrn->scrnIndex, pDDCBus);
-    xf86DDCApplyQuirks (scrn->scrnIndex, pDDCBus);
+    xf86DDCApplyQuirks (scrn->scrnIndex, mon);
 
     return mon;
 }

From 678f786715d76e972f8a77807c9caf3e90c24418 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 4 Dec 2007 12:24:47 +1100
Subject: [PATCH 260/552] xf86crtc: oh mon could be NULL, so check before
 quirks

---
 hw/xfree86/modes/xf86Crtc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index a237a4c24..e00fdf3f3 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -2186,7 +2186,8 @@ xf86OutputGetEDID (xf86OutputPtr output, I2CBusPtr pDDCBus)
     xf86MonPtr mon;
 
     mon = xf86DoEDID_DDC2 (scrn->scrnIndex, pDDCBus);
-    xf86DDCApplyQuirks (scrn->scrnIndex, mon);
+    if (mon)
+        xf86DDCApplyQuirks (scrn->scrnIndex, mon);
 
     return mon;
 }

From f8d7729df388c142624def36ba6d8c3b15922018 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Mon, 3 Dec 2007 20:20:05 -0800
Subject: [PATCH 261/552] Darwin: Combine launcher and server X11.app This
 should hopefully eliminate confusion some people have over which X11.app is
 which. Now BOTH are in /A/U/X11.app and we intelligently determine whether to
 execute our app_to_run or launch the server.  If arguments are given, we
 launch the server.  Otherwise if we can connect to an X DISPLAY, we execute
 app_to_run.  Otherwise, we launch the server.

(cherry picked from commit e7026216ccaa8e4fb073800ba947c9909d4faada)
---
 configure.ac                                  |   1 -
 hw/darwin/Makefile.am                         |   2 +-
 hw/darwin/apple/Makefile.am                   |   7 +-
 hw/darwin/apple/X11.xcodeproj/project.pbxproj |   9 +-
 hw/darwin/apple/bundle-main.c                 | 922 +-----------------
 .../bundle-main.c => apple/launcher-main.c}   |   2 +-
 hw/darwin/apple/org.x.X11.plist               |  25 +
 hw/darwin/apple/server-main.c                 | 904 +++++++++++++++++
 hw/darwin/launcher/Info.plist                 |  30 -
 hw/darwin/launcher/Makefile.am                |  18 -
 hw/darwin/launcher/X11.icns                   | Bin 65908 -> 0 bytes
 .../launcher/X11.xcodeproj/project.pbxproj    | 290 ------
 12 files changed, 995 insertions(+), 1215 deletions(-)
 rename hw/darwin/{launcher/bundle-main.c => apple/launcher-main.c} (98%)
 create mode 100644 hw/darwin/apple/org.x.X11.plist
 create mode 100644 hw/darwin/apple/server-main.c
 delete mode 100644 hw/darwin/launcher/Info.plist
 delete mode 100644 hw/darwin/launcher/Makefile.am
 delete mode 100644 hw/darwin/launcher/X11.icns
 delete mode 100644 hw/darwin/launcher/X11.xcodeproj/project.pbxproj

diff --git a/configure.ac b/configure.ac
index 618a9c4ed..5b21e69da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2172,7 +2172,6 @@ hw/xnest/Makefile
 hw/xwin/Makefile
 hw/darwin/Makefile
 hw/darwin/apple/Makefile
-hw/darwin/launcher/Makefile
 hw/darwin/quartz/Makefile
 hw/darwin/quartz/xpr/Makefile
 hw/kdrive/Makefile
diff --git a/hw/darwin/Makefile.am b/hw/darwin/Makefile.am
index 1faedcbef..136c41a0a 100644
--- a/hw/darwin/Makefile.am
+++ b/hw/darwin/Makefile.am
@@ -6,7 +6,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/miext/rootless
 
 if X11APP
-X11APP_SUBDIRS = apple launcher
+X11APP_SUBDIRS = apple
 endif
 
 SUBDIRS = quartz utils $(X11APP_SUBDIRS)
diff --git a/hw/darwin/apple/Makefile.am b/hw/darwin/apple/Makefile.am
index 02a2c25b1..a6e2dfbf9 100644
--- a/hw/darwin/apple/Makefile.am
+++ b/hw/darwin/apple/Makefile.am
@@ -6,15 +6,20 @@ x11app:
 	xcodebuild CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ARCHS="$(X11APP_ARCHS)"
 
 install-data-hook:
-	xcodebuild install DSTROOT=$(DESTDIR) INSTALL_PATH=$(prefix) DEPLOYMENT_LOCATION=YES SKIP_INSTALL=NO ARCHS="$(X11APP_ARCHS)"
+	xcodebuild install DSTROOT="/$(DESTDIR)" INSTALL_PATH="$(APPLE_APPLICATIONS_DIR)" DEPLOYMENT_LOCATION=YES SKIP_INSTALL=NO ARCHS="$(X11APP_ARCHS)"
+	$(MKDIR_P) "$(DESTDIR)/System/Library/LaunchAgents/"
+	$(INSTALL) org.x.X11.plist "$(DESTDIR)/System/Library/LaunchAgents/"
 
 clean-local:
 	rm -rf build
 
 EXTRA_DIST = \
+	org.x.X11.plist \
 	Info.plist \
 	X11.icns \
 	bundle-main.c \
+	launcher-main.c \
+	server-main.c \
 	English.lproj/InfoPlist.strings \
 	English.lproj/Localizable.strings \
 	English.lproj/main.nib/classes.nib \
diff --git a/hw/darwin/apple/X11.xcodeproj/project.pbxproj b/hw/darwin/apple/X11.xcodeproj/project.pbxproj
index 217f07e52..225f371c5 100644
--- a/hw/darwin/apple/X11.xcodeproj/project.pbxproj
+++ b/hw/darwin/apple/X11.xcodeproj/project.pbxproj
@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		3F5E1BE00D04BF110020CA24 /* launcher-main.c in Sources */ = {isa = PBXBuildFile; fileRef = 3F5E1BDE0D04BF110020CA24 /* launcher-main.c */; };
+		3F5E1BE10D04BF110020CA24 /* server-main.c in Sources */ = {isa = PBXBuildFile; fileRef = 3F5E1BDF0D04BF110020CA24 /* server-main.c */; };
 		527F24190B5D938C007840A7 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 0867D6AAFE840B52C02AAC07 /* InfoPlist.strings */; };
 		527F241A0B5D938C007840A7 /* main.nib in Resources */ = {isa = PBXBuildFile; fileRef = 02345980000FD03B11CA0E72 /* main.nib */; };
 		527F241B0B5D938C007840A7 /* X11.icns in Resources */ = {isa = PBXBuildFile; fileRef = 50459C5F038587C60ECA21EC /* X11.icns */; };
@@ -20,6 +22,8 @@
 /* Begin PBXFileReference section */
 		0867D6ABFE840B52C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		1870340FFE93FCAF11CA0CD7 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/main.nib; sourceTree = "<group>"; };
+		3F5E1BDE0D04BF110020CA24 /* launcher-main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "launcher-main.c"; sourceTree = "<group>"; };
+		3F5E1BDF0D04BF110020CA24 /* server-main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "server-main.c"; sourceTree = "<group>"; };
 		50459C5F038587C60ECA21EC /* X11.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = X11.icns; sourceTree = "<group>"; };
 		50EE2AB703849F0B0ECA21EC /* bundle-main.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = "bundle-main.c"; sourceTree = "<group>"; };
 		50F4F0A7039D6ACA0E82C0CB /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
@@ -65,6 +69,8 @@
 		20286C2AFDCF999611CA2CEA /* Sources */ = {
 			isa = PBXGroup;
 			children = (
+				3F5E1BDE0D04BF110020CA24 /* launcher-main.c */,
+				3F5E1BDF0D04BF110020CA24 /* server-main.c */,
 				50EE2AB703849F0B0ECA21EC /* bundle-main.c */,
 			);
 			name = Sources;
@@ -133,7 +139,6 @@
 			mainGroup = 20286C29FDCF999611CA2CEA /* X11 */;
 			projectDirPath = "";
 			projectRoot = "";
-			shouldCheckCompatibility = 1;
 			targets = (
 				527F24160B5D938C007840A7 /* X11 */,
 			);
@@ -171,6 +176,8 @@
 			buildActionMask = 2147483647;
 			files = (
 				527F241D0B5D938C007840A7 /* bundle-main.c in Sources */,
+				3F5E1BE00D04BF110020CA24 /* launcher-main.c in Sources */,
+				3F5E1BE10D04BF110020CA24 /* server-main.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/hw/darwin/apple/bundle-main.c b/hw/darwin/apple/bundle-main.c
index 10d2f2041..c436d51bb 100644
--- a/hw/darwin/apple/bundle-main.c
+++ b/hw/darwin/apple/bundle-main.c
@@ -1,6 +1,7 @@
-/* bundle-main.c -- X server launcher
+/* main.c -- X application launcher
  
- Copyright (c) 2002-2007 Apple Inc. All rights reserved.
+ Copyright (c) 2007 Jeremy Huddleston
+ Copyright (c) 2007 Apple Inc
  
  Permission is hereby granted, free of charge, to any person
  obtaining a copy of this software and associated documentation files
@@ -25,880 +26,57 @@
  Except as contained in this notice, the name(s) of the above
  copyright holders shall not be used in advertising or otherwise to
  promote the sale, use or other dealings in this Software without
- prior written authorization.
- 
- Parts of this file are derived from xdm, which has this copyright:
- 
- Copyright 1988, 1998  The Open Group
- 
- Permission to use, copy, modify, distribute, and sell this software
- and its documentation for any purpose is hereby granted without fee,
- provided that the above copyright notice appear in all copies and
- that both that copyright notice and this permission notice appear in
- supporting documentation.
- 
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
- 
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY
- CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- 
- Except as contained in this notice, the name of The Open Group shall
- not be used in advertising or otherwise to promote the sale, use or
- other dealings in this Software without prior written authorization
- from The Open Group. */
-
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <sys/socket.h>
-#include <sys/utsname.h>
-#include <ifaddrs.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <time.h>
-#include <sys/wait.h>
-#include <setjmp.h>
-#include <sys/ioctl.h>
+ prior written authorization. */
 
 #include <X11/Xlib.h>
-#include <X11/Xauth.h>
-#include <xcb/xcb.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <string.h>
 
-#include <CoreFoundation/CoreFoundation.h>
-#include <SystemConfiguration/SystemConfiguration.h>
+int launcher_main(int argc, char **argv);
+int server_main(int argc, char **argv);
 
-#define X_SERVER "/usr/X11/bin/Xquartz"
-#define XTERM_PATH "/usr/X11/bin/xterm"
-#define WM_PATH "/usr/bin/quartz-wm"
-#define DEFAULT_XINITRC "/usr/X11/lib/X11/xinit/xinitrc"
-#define DEFAULT_PATH "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/X11/bin"
-
-/* what xinit does */
-#ifndef SHELL
-# define SHELL "sh"
-#endif
-
-#undef FALSE
-#define FALSE 0
-#undef TRUE
-#define TRUE 1
-
-#define MAX_DISPLAYS 64
-
-static int server_pid = -1, client_pid = -1;
-static int xinit_kills_server = FALSE;
-static jmp_buf exit_continuation;
-static const char *server_name = NULL;
-static Display *server_dpy;
-
-static char *auth_file;
-
-typedef struct addr_list_struct addr_list;
-
-struct addr_list_struct {
-    addr_list *next;
-    Xauth auth;
-};
-
-static addr_list *addresses;
-
-
-/* Utility functions. */
-
-/* Return the current host name. Matches what Xlib does. */
-static char *
-host_name (void)
-{
-#ifdef NEED_UTSNAME
-    static struct utsname name;
-	
-    uname(&name);
-	
-    return name.nodename;
-#else
-    static char buf[100];
-	
-    gethostname(buf, sizeof(buf));
-	
-    return buf;
-#endif
-}
-
-static int
-read_boolean_pref (CFStringRef name, int default_)
-{
-    int value;
-    Boolean ok;
-	
-    value = CFPreferencesGetAppBooleanValue (name,
-											 CFSTR ("com.apple.x11"), &ok);
-    return ok ? value : default_;
-}
-
-static inline int
-binary_equal (const void *a, const void *b, int length)
-{
-    return memcmp (a, b, length) == 0;
-}
-
-static inline void *
-binary_dup (const void *a, int length)
-{
-    void *b = malloc (length);
-    if (b != NULL)
-		memcpy (b, a, length);
-    return b;
-}
-
-static inline void
-binary_free (void *data, int length)
-{
-    if (data != NULL)
-		free (data);
-}
-
-
-/* Functions for managing the authentication entries. */
-
-/* Returns true if something matching AUTH is in our list of auth items */
-static int
-check_auth_item (Xauth *auth)
-{
-    addr_list *a;
-	
-    for (a = addresses; a != NULL; a = a->next)
-    {
-		if (a->auth.family == auth->family
-			&& a->auth.address_length == auth->address_length
-			&& binary_equal (a->auth.address, auth->address, auth->address_length)
-			&& a->auth.number_length == auth->number_length
-			&& binary_equal (a->auth.number, auth->number, auth->number_length)
-			&& a->auth.name_length == auth->name_length
-			&& binary_equal (a->auth.name, auth->name, auth->name_length))
-		{
-			return TRUE;
-		}
+int main(int argc, char **argv) {
+    Display *display;
+  
+    fprintf(stderr, "X11.app: main(): argc=%d\n", argc);
+    int i;
+    for(i=0; i < argc; i++) {
+        fprintf(stderr, "\targv[%d] = %s\n", i, argv[i]);
     }
-	
-    return FALSE;
-}
-
-/* Add one item to our list of auth items. */
-static void
-add_auth_item (Xauth *auth)
-{
-    addr_list *a = malloc (sizeof (addr_list));
-	
-    a->auth.family = auth->family;
-    a->auth.address_length = auth->address_length;
-    a->auth.address = binary_dup (auth->address, auth->address_length);
-    a->auth.number_length = auth->number_length;
-    a->auth.number = binary_dup (auth->number, auth->number_length);
-    a->auth.name_length = auth->name_length;
-    a->auth.name = binary_dup (auth->name, auth->name_length);
-    a->auth.data_length = auth->data_length;
-    a->auth.data = binary_dup (auth->data, auth->data_length);
-	
-    a->next = addresses;
-    addresses = a;
-}
-
-/* Free all allocated auth items. */
-static void
-free_auth_items (void)
-{
-    addr_list *a;
-	
-    while ((a = addresses) != NULL)
-    {
-		addresses = a->next;
-		
-		binary_free (a->auth.address, a->auth.address_length);
-		binary_free (a->auth.number, a->auth.number_length);
-		binary_free (a->auth.name, a->auth.name_length);
-		binary_free (a->auth.data, a->auth.data_length);
-		free (a);
-    }
-}
-
-/* Add the unix domain auth item. */
-static void
-define_local (Xauth *auth)
-{
-    char *host = host_name ();
-	
-#ifdef DEBUG
-    fprintf (stderr, "x11: hostname is %s\n", host);
-#endif
-	
-    auth->family = FamilyLocal;
-    auth->address_length = strlen (host);
-    auth->address = host;
-	
-    add_auth_item (auth);
-}
-
-/* Add the tcp auth item. */
-static void
-define_named (Xauth *auth, const char *name)
-{
-    struct ifaddrs *addrs, *ptr;
-	
-    if (getifaddrs (&addrs) != 0)
-		return;
-	
-    for (ptr = addrs; ptr != NULL; ptr = ptr->ifa_next)
-    {
-		if (ptr->ifa_addr->sa_family != AF_INET)
-			continue;
-		
-		auth->family = FamilyInternet;
-		auth->address_length = sizeof (struct in_addr);
-		auth->address = (char *) &(((struct sockaddr_in *) ptr->ifa_addr)->sin_addr);
-		
-#ifdef DEBUG
-		fprintf (stderr, "x11: ipaddr is %d.%d.%d.%d\n",
-				 (unsigned char) auth->address[0],
-				 (unsigned char) auth->address[1],
-				 (unsigned char) auth->address[2],
-				 (unsigned char) auth->address[3]);
-#endif
-		
-		add_auth_item (auth);
-    }
-	
-    freeifaddrs (addrs);
-}
-
-/* Parse the display number from NAME and add it to AUTH. */
-static void
-set_auth_number (Xauth *auth, const char *name)
-{
-    char *colon;
-    char *dot, *number;
-	
-    colon = strrchr(name, ':');
-    if (colon != NULL)
-    {
-		colon++;
-		dot = strchr(colon, '.');
-		
-		if (dot != NULL)
-			auth->number_length = dot - colon;
-		else
-			auth->number_length = strlen (colon);
-		
-		number = malloc (auth->number_length + 1);
-		if (number != NULL)
-		{
-			strncpy (number, colon, auth->number_length);
-			number[auth->number_length] = '\0';
-		}
-		else
-		{
-			auth->number_length = 0;
-		}
-		
-		auth->number = number;
-    }
-}
-
-/* Put 128 bits of random data into DATA. If possible, it will be "high
- quality" */
-static int
-generate_mit_magic_cookie (char data[16])
-{
-    int fd, ret, i;
-    long *ldata = (long *) data;
-	
-    fd = open ("/dev/random", O_RDONLY);
-    if (fd > 0) {
-		ret = read (fd, data, 16);
-		close (fd);
-		if (ret == 16) return TRUE;
-    }
-	
-    /* fall back to the usual crappy rng */
-	
-    srand48 (getpid () ^ time (NULL));
-	
-    for (i = 0; i < 4; i++)
-		ldata[i] = lrand48 ();
-	
-    return TRUE;
-}
-
-/* Create the keys we'll be using for the display named NAME. */
-static int
-make_auth_keys (const char *name)
-{
-    Xauth auth;
-    char key[16];
-	
-    if (auth_file == NULL)
-		return FALSE;
-	
-    auth.name = "MIT-MAGIC-COOKIE-1";
-    auth.name_length = strlen (auth.name);
-	
-    if (!generate_mit_magic_cookie (key))
-    {
-		auth_file = NULL;
-		return FALSE;
-    }
-	
-    auth.data = key;
-    auth.data_length = 16;
-	
-    set_auth_number (&auth, name);
-	
-    define_named (&auth, host_name ());
-    define_local (&auth);
-	
-    free (auth.number);
-	
-    return TRUE;
-}
-
-/* If ADD-ENTRIES is true, merge our auth entries into the existing
- Xauthority file. If ADD-ENTRIES is false, remove our entries. */
-static int
-write_auth_file (int add_entries)
-{
-    char *home, newname[1024];
-    int fd, ret;
-    FILE *new_fh, *old_fh;
-    addr_list *addr;
-    Xauth *auth;
-	
-    if (auth_file == NULL)
-		return FALSE;
-	
-    home = getenv ("HOME");
-    if (home == NULL)
-    {
-		auth_file = NULL;
-		return FALSE;
-    }
-	
-    snprintf (newname, sizeof (newname), "%s/.XauthorityXXXXXX", home);
-    mktemp (newname);
-	
-    if (XauLockAuth (auth_file, 1, 2, 10) != LOCK_SUCCESS)
-    {
-		/* FIXME: do something here? */
-		
-		auth_file = NULL;
-		return FALSE;
-    }
-	
-    fd = open (newname, O_WRONLY | O_CREAT | O_TRUNC, 0600);
-    if (fd >= 0)
-    {
-		new_fh = fdopen (fd, "w");
-		if (new_fh != NULL)
-		{
-			if (add_entries)
-			{
-				for (addr = addresses; addr != NULL; addr = addr->next)
-				{
-					XauWriteAuth (new_fh, &addr->auth);
-				}
-			}
-			
-			old_fh = fopen (auth_file, "r");
-			if (old_fh != NULL)
-			{
-				while ((auth = XauReadAuth (old_fh)) != NULL)
-				{
-					if (!check_auth_item (auth))
-						XauWriteAuth (new_fh, auth);
-					XauDisposeAuth (auth);
-				}
-				fclose (old_fh);
-			}
-			
-			fclose (new_fh);
-			unlink (auth_file);
-			
-			ret = rename (newname, auth_file);
-			
-			if (ret != 0)
-				auth_file = NULL;
-			
-			XauUnlockAuth (auth_file);
-			return ret == 0;
-		}
-		
-		close (fd);
-    }
-	
-    XauUnlockAuth (auth_file);
-    auth_file = NULL;
-    return FALSE;
-}
-
-
-/* Subprocess management functions. */
-
-static int
-start_server (char **xargv)
-{
-    int child;
-	
-    child = fork ();
-	
-    switch (child)
-    {
-    case -1:				/* error */
-		perror ("fork");
-		return FALSE;
-		
-    case 0:				/* child */
-		execv (X_SERVER, xargv);
-		perror ("Couldn't exec " X_SERVER);
-		_exit (1);
-		
-    default:				/* parent */
-		server_pid = child;
-		return TRUE;
-    }
-}
-
-static int
-wait_for_server (void)
-{
-    int count = 100;
-	
-    while (count-- > 0)
-    {
-		int status;
-		
-		server_dpy = XOpenDisplay (server_name);
-		if (server_dpy != NULL)
-			return TRUE;
-		
-		if (waitpid (server_pid, &status, WNOHANG) == server_pid)
-			return FALSE;
-		
-		sleep (1);
-    }
-	
-    return FALSE;
-}
-
-static int
-start_client (void)
-{
-    int child;
-	
-    child = fork();
-	
-    switch (child) {
-		char *temp, buf[1024];		
-
-	case -1:				/* error */
-		perror("fork");
-		return FALSE;
-
-	case 0:					/* child */
-		/* Setup environment */
-		temp = getenv("DISPLAY");
-		if (temp != NULL && temp[0] != 0)
-			setenv("DISPLAY", server_name, TRUE);
-
-		temp = getenv("PATH");
-		if (temp == NULL || temp[0] == 0) 
-			setenv ("PATH", DEFAULT_PATH, TRUE);
-		else if (strnstr(temp, "/usr/X11/bin", sizeof(temp)) == NULL) {
-			snprintf(buf, sizeof(buf), "%s:/usr/X11/bin", temp);		
-			setenv("PATH", buf, TRUE);	
-		}
-		
-		/* First try value of $XINITRC, if set. */
-		temp = getenv("XINITRC");
-		if (temp != NULL && temp[0] != 0 && access(temp, R_OK) == 0)
-			execlp (SHELL, SHELL, temp, NULL);
-
-		/* Then look for .xinitrc in user's home directory. */
-		temp = getenv("HOME");
-		if (temp != NULL && temp[0] != 0) {
-			chdir(temp);
-			snprintf (buf, sizeof (buf), "%s/.xinitrc", temp);
-			if (access(buf, R_OK) == 0)
-				execlp(SHELL, SHELL, buf, NULL);
-		}
-		
-		/* Then try the default xinitrc in the lib directory. */
-		
-		if (access(DEFAULT_XINITRC, R_OK) == 0)
-			execlp(SHELL, SHELL, DEFAULT_XINITRC, NULL);
-		
-		/* Then fallback to hardcoding an xterm and the window manager. */
-		
-		//		system(XTERM_PATH " &");
-		execl(WM_PATH, WM_PATH, NULL);
-		
-		perror("exec");
-		_exit(1);
-		
-    default:				/* parent */
-		client_pid = child;
-		return TRUE;
-    }
-}
-
-static void
-sigchld_handler (int sig)
-{
-    int pid, status;
-	
-	again:
-    pid = waitpid (WAIT_ANY, &status, WNOHANG);
-	
-    if (pid > 0)
-    {
-		if (pid == server_pid)
-		{
-			server_pid = -1;
-			
-			if (client_pid >= 0)
-				kill (client_pid, SIGTERM);
-		}
-		else if (pid == client_pid)
-		{
-			client_pid = -1;
-			
-			if (server_pid >= 0 && xinit_kills_server)
-				kill (server_pid, SIGTERM);
-		}
-		goto again;
-    }
-	
-    if (server_pid == -1 && client_pid == -1)
-		longjmp (exit_continuation, 1);
-	
-    signal (SIGCHLD, sigchld_handler);
-}
-
-
-/* Server utilities. */
-
-static Boolean
-display_exists_p (int number)
-{
-    char buf[64];
-    xcb_connection_t *conn;
-    char *fullname = NULL;
-    int idisplay, iscreen;
-    char *conn_auth_name, *conn_auth_data;
-    int conn_auth_namelen, conn_auth_datalen;
     
-    //    extern void *_X11TransConnectDisplay ();
-    //    extern void _XDisconnectDisplay ();
-	
-    /* Since connecting to the display waits for a few seconds if the
-	 display doesn't exist, check for trivial non-existence - if the
-	 socket in /tmp exists or not.. (note: if the socket exists, the
-	 server may still not, so we need to try to connect in that case..) */
-	
-    sprintf (buf, "/tmp/.X11-unix/X%d", number);
-    if (access (buf, F_OK) != 0)
-		return FALSE;
-    
-    sprintf (buf, ":%d", number);
-    conn = xcb_connect(buf, NULL);
-    if (xcb_connection_has_error(conn)) return FALSE;
-	
-    xcb_disconnect(conn);
-    return TRUE;
-}
-
-
-/* Monitoring when the system's ip addresses change. */
-
-static Boolean pending_timer;
-
-static void
-timer_callback (CFRunLoopTimerRef timer, void *info)
-{
-    pending_timer = FALSE;
-	
-    /* Update authentication names. Need to write .Xauthority file first
-	 without the existing entries, then again with the new entries.. */
-	
-    write_auth_file (FALSE);
-	
-    free_auth_items ();
-    make_auth_keys (server_name);
-	
-    write_auth_file (TRUE);
-}
-
-/* This function is called when the system's ip addresses may have changed. */
-static void
-ipaddr_callback (SCDynamicStoreRef store, CFArrayRef changed_keys, void *info)
-{
-#if DEBUG
-    if (changed_keys != NULL) {
-		fprintf (stderr, "x11: changed sc keys: ");
-		CFShow (changed_keys);
-    }
-#endif
-
-    if (auth_file != NULL && !pending_timer)
-    {
-		CFRunLoopTimerRef timer;
-		
-		timer = CFRunLoopTimerCreate (NULL, CFAbsoluteTimeGetCurrent () + 1.0,
-									  0.0, 0, 0, timer_callback, NULL);
-		CFRunLoopAddTimer (CFRunLoopGetCurrent (), timer,
-						   kCFRunLoopDefaultMode);
-		CFRelease (timer);
-		
-		pending_timer = TRUE;
-    }
-}
-
-/* This code adapted from "Living in a Dynamic TCP/IP Environment" technote. */
-static Boolean
-install_ipaddr_source (void)
-{
-    CFRunLoopSourceRef source = NULL;
-	
-    SCDynamicStoreContext context = {0};
-    SCDynamicStoreRef ref;
-	
-    ref = SCDynamicStoreCreate (NULL,
-								CFSTR ("AddIPAddressListChangeCallbackSCF"),
-								ipaddr_callback, &context);
-	
-    if (ref != NULL)
-    {
-		const void *keys[4], *patterns[2];
-		int i;
-		
-		keys[0] = SCDynamicStoreKeyCreateNetworkGlobalEntity (NULL, kSCDynamicStoreDomainState, kSCEntNetIPv4);
-		keys[1] = SCDynamicStoreKeyCreateNetworkGlobalEntity (NULL, kSCDynamicStoreDomainState, kSCEntNetIPv6);
-		keys[2] = SCDynamicStoreKeyCreateComputerName (NULL);
-		keys[3] = SCDynamicStoreKeyCreateHostNames (NULL);
-		
-		patterns[0] = SCDynamicStoreKeyCreateNetworkInterfaceEntity (NULL, kSCDynamicStoreDomainState, kSCCompAnyRegex, kSCEntNetIPv4);
-		patterns[1] = SCDynamicStoreKeyCreateNetworkInterfaceEntity (NULL, kSCDynamicStoreDomainState, kSCCompAnyRegex, kSCEntNetIPv6);
-		
-		if (keys[0] != NULL && keys[1] != NULL && keys[2] != NULL
-			&& keys[3] != NULL && patterns[0] != NULL && patterns[1] != NULL)
-		{
-			CFArrayRef key_array, pattern_array;
-			
-			key_array = CFArrayCreate (NULL, keys, 4, &kCFTypeArrayCallBacks);
-			pattern_array = CFArrayCreate (NULL, patterns, 2, &kCFTypeArrayCallBacks);
-			
-			if (key_array != NULL || pattern_array != NULL)
-			{
-				SCDynamicStoreSetNotificationKeys (ref, key_array, pattern_array);
-				source = SCDynamicStoreCreateRunLoopSource (NULL, ref, 0);
-			}
-			
-			if (key_array != NULL)
-				CFRelease (key_array);
-			if (pattern_array != NULL)
-				CFRelease (pattern_array);
-		}
-		
-		
-		for (i = 0; i < 4; i++)
-			if (keys[i] != NULL)
-			CFRelease (keys[i]);
-		for (i = 0; i < 2; i++)
-			if (patterns[i] != NULL)
-			CFRelease (patterns[i]);
-		
-		CFRelease (ref); 
-    }
-	
-    if (source != NULL)
-    {
-		CFRunLoopAddSource (CFRunLoopGetCurrent (),
-							source, kCFRunLoopDefaultMode);
-		CFRelease (source);
-    }
-	
-    return source != NULL;
-}
-
-
-/* Entrypoint. */
-
-void
-termination_signal_handler (int unused_sig)
-{
-    signal (SIGTERM, SIG_DFL);
-    signal (SIGHUP, SIG_DFL);
-    signal (SIGINT, SIG_DFL);
-    signal (SIGQUIT, SIG_DFL);
-
-    longjmp (exit_continuation, 1);
-}
-
-int
-main (int argc, char **argv)
-{
-    char **xargv;
-    int i, j;
-    int fd;
-	
-    xargv = alloca (sizeof (char *) * (argc + 32));
-	
-    if (!read_boolean_pref (CFSTR ("no_auth"), FALSE))
-		auth_file = XauFileName ();
-	
-    /* The standard X11 behaviour is for the server to quit when the first
-	 client exits. But it can be useful for debugging (and to mimic our
-	 behaviour in the beta releases) to not do that. */
-	
-    xinit_kills_server = read_boolean_pref (CFSTR ("xinit_kills_server"), TRUE);
-	
-    for (i = 1; i < argc; i++)
-    {
-		if (argv[i][0] == ':')
-			server_name = argv[i];
-    }
-	
-    if (server_name == NULL)
-    {
-		static char name[8];
-		
-		/* No display number specified, so search for the first unused.
-		 
-		 There's a big old race condition here if two servers start at
-		 the same time, but that's fairly unlikely. We could create
-		 lockfiles or something, but that's seems more likely to cause
-		 problems than the race condition itself.. */
-		
-		for (i = 0; i < MAX_DISPLAYS; i++)
-		{
-			if (!display_exists_p (i))
-				break;
-		}
-		
-		if (i == MAX_DISPLAYS)
-		{
-			fprintf (stderr, "%s: couldn't allocate a display number", argv[0]);
-			exit (1);
-		}
-		
-		sprintf (name, ":%d", i);
-		server_name = name;
-    }
-	
-    if (auth_file != NULL)
-    {
-		/* Create new Xauth keys and add them to the .Xauthority file */
-		
-		make_auth_keys (server_name);
-		write_auth_file (TRUE);
-    }
-	
-    /* Construct our new argv */
-	
-    i = j = 0;
-	
-    xargv[i++] = argv[j++];
-	
-    if (auth_file != NULL)
-    {
-		xargv[i++] = "-auth";
-		xargv[i++] = auth_file;
-    }
-	
-    /* By default, don't listen on tcp sockets if Xauth is disabled. */
-	
-    if (read_boolean_pref (CFSTR ("nolisten_tcp"), auth_file == NULL))
-    {
-		xargv[i++] = "-nolisten";
-		xargv[i++] = "tcp";
-    }
-	
-    while (j < argc)
-    {
-		if (argv[j++][0] != ':')
-			xargv[i++] = argv[j-1];
-    }
-	
-    xargv[i++] = (char *) server_name;
-    xargv[i++] = NULL;
-	
-    /* Detach from any controlling terminal and connect stdin to /dev/null */
-	
-#ifdef TIOCNOTTY
-    fd = open ("/dev/tty", O_RDONLY);
-    if (fd != -1)
-    {
-		ioctl (fd, TIOCNOTTY, 0);
-		close (fd);
-    }
-#endif
-	
-    fd = open ("/dev/null", O_RDWR, 0);
-    if (fd >= 0)
-    {
-		dup2 (fd, 0);
-		if (fd > 0)
-			close (fd);
-    }
-	
-    if (!start_server (xargv))
-		return 1;
-	
-    if (!wait_for_server ())
-    {
-		kill (server_pid, SIGTERM);
-		return 1;
-    }
-	
-    if (!start_client ())
-    {
-		kill (server_pid, SIGTERM);
-		return 1;
-    }
-	
-    signal (SIGCHLD, sigchld_handler);
-	
-    signal (SIGTERM, termination_signal_handler);
-    signal (SIGHUP, termination_signal_handler);
-    signal (SIGINT, termination_signal_handler);
-    signal (SIGQUIT, termination_signal_handler);
-
-    if (setjmp (exit_continuation) == 0)
-    {
-		if (install_ipaddr_source ())
-			CFRunLoopRun ();
-		else
-			while (1) pause ();
-    }
-	
-    signal (SIGCHLD, SIG_IGN);
-
-    if (client_pid >= 0) kill (client_pid, SIGTERM);
-    if (server_pid >= 0) kill (server_pid, SIGTERM);
-	
-    if (auth_file != NULL)
-    {
-		/* Remove our Xauth keys */
-		
-		write_auth_file (FALSE);
-    }
-	
-    free_auth_items ();
-	
-    return 0;
+    /* First check if launchd started us */
+    if(argc == 2 && !strncmp(argv[1], "--launchd", 9)) {
+        argc--;
+        argv[1] = argv[0];
+        argv++;
+        fprintf(stderr, "X11.app: main(): launchd called us, running server_main()");
+        return server_main(argc, argv);
+    }
+
+    /* If we have a process serial number and it's our only arg, act as if
+     * the user double clicked the app bundle: launch app_to_run if possible
+     */
+    if(argc == 1 || (argc == 2 && !strncmp(argv[1], "-psn_", 5))) {
+        /* Now, try to open a display, if so, run the launcher */
+        display = XOpenDisplay(NULL);
+        if(display) {
+            fprintf(stderr, "X11.app: main(): closing the display");
+            /* Could open the display, start the launcher */
+            XCloseDisplay(display);
+
+            /* Give 2 seconds for the server to start... 
+             * TODO: *Really* fix this race condition
+             */
+            usleep(2000);
+            fprintf(stderr, "X11.app: main(): running launcher_main()");
+            return launcher_main(argc, argv);
+        }
+    }
+
+    /* Couldn't open the display or we were called with arguments,
+     * just want to start a server.
+     */
+    fprintf(stderr, "X11.app: main(): running server_main()");
+    return server_main(argc, argv);
 }
diff --git a/hw/darwin/launcher/bundle-main.c b/hw/darwin/apple/launcher-main.c
similarity index 98%
rename from hw/darwin/launcher/bundle-main.c
rename to hw/darwin/apple/launcher-main.c
index ca6255307..60a1624b9 100644
--- a/hw/darwin/launcher/bundle-main.c
+++ b/hw/darwin/apple/launcher-main.c
@@ -35,7 +35,7 @@
 
 #define DEFAULT_APP "/usr/X11/bin/xterm"
 
-int main (int argc, char **argv) {
+int launcher_main (int argc, char **argv) {
   char *command = DEFAULT_APP;
   const char *newargv[7];
   int child;
diff --git a/hw/darwin/apple/org.x.X11.plist b/hw/darwin/apple/org.x.X11.plist
new file mode 100644
index 000000000..6c6be91ab
--- /dev/null
+++ b/hw/darwin/apple/org.x.X11.plist
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Label</key>
+		<string>org.x.X11</string>
+	<key>Program</key>
+		<string>/Applications/Utilities/X11.app/Contents/MacOS/X11</string>
+	<key>ProgramArguments</key>
+		<array>
+		<string>/Applications/Utilities/X11.app/Contents/MacOS/X11</string>
+		<string>--launchd</string>
+		</array>
+	<key>Sockets</key>
+		<dict>
+		<key>:0</key>
+			<dict>
+			<key>SecureSocketWithKey</key>
+				<string>DISPLAY</string>
+			</dict>
+		</dict>
+	<key>ServiceIPC</key>
+		<true/>
+</dict>
+</plist>
diff --git a/hw/darwin/apple/server-main.c b/hw/darwin/apple/server-main.c
new file mode 100644
index 000000000..26fcbb0ab
--- /dev/null
+++ b/hw/darwin/apple/server-main.c
@@ -0,0 +1,904 @@
+/* bundle-main.c -- X server launcher
+ 
+ Copyright (c) 2002-2007 Apple Inc. All rights reserved.
+ 
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation files
+ (the "Software"), to deal in the Software without restriction,
+ including without limitation the rights to use, copy, modify, merge,
+ publish, distribute, sublicense, and/or sell copies of the Software,
+ and to permit persons to whom the Software is furnished to do so,
+ subject to the following conditions:
+ 
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT.  IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
+ HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+ 
+ Except as contained in this notice, the name(s) of the above
+ copyright holders shall not be used in advertising or otherwise to
+ promote the sale, use or other dealings in this Software without
+ prior written authorization.
+ 
+ Parts of this file are derived from xdm, which has this copyright:
+ 
+ Copyright 1988, 1998  The Open Group
+ 
+ Permission to use, copy, modify, distribute, and sell this software
+ and its documentation for any purpose is hereby granted without fee,
+ provided that the above copyright notice appear in all copies and
+ that both that copyright notice and this permission notice appear in
+ supporting documentation.
+ 
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
+ Except as contained in this notice, the name of The Open Group shall
+ not be used in advertising or otherwise to promote the sale, use or
+ other dealings in this Software without prior written authorization
+ from The Open Group. */
+
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <sys/socket.h>
+#include <sys/utsname.h>
+#include <ifaddrs.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <time.h>
+#include <sys/wait.h>
+#include <setjmp.h>
+#include <sys/ioctl.h>
+
+#include <X11/Xlib.h>
+#include <X11/Xauth.h>
+#include <xcb/xcb.h>
+
+#include <CoreFoundation/CoreFoundation.h>
+#include <SystemConfiguration/SystemConfiguration.h>
+
+#define X_SERVER "/usr/X11/bin/Xquartz"
+#define XTERM_PATH "/usr/X11/bin/xterm"
+#define WM_PATH "/usr/bin/quartz-wm"
+#define DEFAULT_XINITRC "/usr/X11/lib/X11/xinit/xinitrc"
+#define DEFAULT_PATH "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/X11/bin"
+
+/* what xinit does */
+#ifndef SHELL
+# define SHELL "sh"
+#endif
+
+#undef FALSE
+#define FALSE 0
+#undef TRUE
+#define TRUE 1
+
+#define MAX_DISPLAYS 64
+
+static int server_pid = -1, client_pid = -1;
+static int xinit_kills_server = FALSE;
+static jmp_buf exit_continuation;
+static const char *server_name = NULL;
+static Display *server_dpy;
+
+static char *auth_file;
+
+typedef struct addr_list_struct addr_list;
+
+struct addr_list_struct {
+    addr_list *next;
+    Xauth auth;
+};
+
+static addr_list *addresses;
+
+
+/* Utility functions. */
+
+/* Return the current host name. Matches what Xlib does. */
+static char *
+host_name (void)
+{
+#ifdef NEED_UTSNAME
+    static struct utsname name;
+	
+    uname(&name);
+	
+    return name.nodename;
+#else
+    static char buf[100];
+	
+    gethostname(buf, sizeof(buf));
+	
+    return buf;
+#endif
+}
+
+static int
+read_boolean_pref (CFStringRef name, int default_)
+{
+    int value;
+    Boolean ok;
+	
+    value = CFPreferencesGetAppBooleanValue (name,
+											 CFSTR ("com.apple.x11"), &ok);
+    return ok ? value : default_;
+}
+
+static inline int
+binary_equal (const void *a, const void *b, int length)
+{
+    return memcmp (a, b, length) == 0;
+}
+
+static inline void *
+binary_dup (const void *a, int length)
+{
+    void *b = malloc (length);
+    if (b != NULL)
+		memcpy (b, a, length);
+    return b;
+}
+
+static inline void
+binary_free (void *data, int length)
+{
+    if (data != NULL)
+		free (data);
+}
+
+
+/* Functions for managing the authentication entries. */
+
+/* Returns true if something matching AUTH is in our list of auth items */
+static int
+check_auth_item (Xauth *auth)
+{
+    addr_list *a;
+	
+    for (a = addresses; a != NULL; a = a->next)
+    {
+		if (a->auth.family == auth->family
+			&& a->auth.address_length == auth->address_length
+			&& binary_equal (a->auth.address, auth->address, auth->address_length)
+			&& a->auth.number_length == auth->number_length
+			&& binary_equal (a->auth.number, auth->number, auth->number_length)
+			&& a->auth.name_length == auth->name_length
+			&& binary_equal (a->auth.name, auth->name, auth->name_length))
+		{
+			return TRUE;
+		}
+    }
+	
+    return FALSE;
+}
+
+/* Add one item to our list of auth items. */
+static void
+add_auth_item (Xauth *auth)
+{
+    addr_list *a = malloc (sizeof (addr_list));
+	
+    a->auth.family = auth->family;
+    a->auth.address_length = auth->address_length;
+    a->auth.address = binary_dup (auth->address, auth->address_length);
+    a->auth.number_length = auth->number_length;
+    a->auth.number = binary_dup (auth->number, auth->number_length);
+    a->auth.name_length = auth->name_length;
+    a->auth.name = binary_dup (auth->name, auth->name_length);
+    a->auth.data_length = auth->data_length;
+    a->auth.data = binary_dup (auth->data, auth->data_length);
+	
+    a->next = addresses;
+    addresses = a;
+}
+
+/* Free all allocated auth items. */
+static void
+free_auth_items (void)
+{
+    addr_list *a;
+	
+    while ((a = addresses) != NULL)
+    {
+		addresses = a->next;
+		
+		binary_free (a->auth.address, a->auth.address_length);
+		binary_free (a->auth.number, a->auth.number_length);
+		binary_free (a->auth.name, a->auth.name_length);
+		binary_free (a->auth.data, a->auth.data_length);
+		free (a);
+    }
+}
+
+/* Add the unix domain auth item. */
+static void
+define_local (Xauth *auth)
+{
+    char *host = host_name ();
+	
+#ifdef DEBUG
+    fprintf (stderr, "x11: hostname is %s\n", host);
+#endif
+	
+    auth->family = FamilyLocal;
+    auth->address_length = strlen (host);
+    auth->address = host;
+	
+    add_auth_item (auth);
+}
+
+/* Add the tcp auth item. */
+static void
+define_named (Xauth *auth, const char *name)
+{
+    struct ifaddrs *addrs, *ptr;
+	
+    if (getifaddrs (&addrs) != 0)
+		return;
+	
+    for (ptr = addrs; ptr != NULL; ptr = ptr->ifa_next)
+    {
+		if (ptr->ifa_addr->sa_family != AF_INET)
+			continue;
+		
+		auth->family = FamilyInternet;
+		auth->address_length = sizeof (struct in_addr);
+		auth->address = (char *) &(((struct sockaddr_in *) ptr->ifa_addr)->sin_addr);
+		
+#ifdef DEBUG
+		fprintf (stderr, "x11: ipaddr is %d.%d.%d.%d\n",
+				 (unsigned char) auth->address[0],
+				 (unsigned char) auth->address[1],
+				 (unsigned char) auth->address[2],
+				 (unsigned char) auth->address[3]);
+#endif
+		
+		add_auth_item (auth);
+    }
+	
+    freeifaddrs (addrs);
+}
+
+/* Parse the display number from NAME and add it to AUTH. */
+static void
+set_auth_number (Xauth *auth, const char *name)
+{
+    char *colon;
+    char *dot, *number;
+	
+    colon = strrchr(name, ':');
+    if (colon != NULL)
+    {
+		colon++;
+		dot = strchr(colon, '.');
+		
+		if (dot != NULL)
+			auth->number_length = dot - colon;
+		else
+			auth->number_length = strlen (colon);
+		
+		number = malloc (auth->number_length + 1);
+		if (number != NULL)
+		{
+			strncpy (number, colon, auth->number_length);
+			number[auth->number_length] = '\0';
+		}
+		else
+		{
+			auth->number_length = 0;
+		}
+		
+		auth->number = number;
+    }
+}
+
+/* Put 128 bits of random data into DATA. If possible, it will be "high
+ quality" */
+static int
+generate_mit_magic_cookie (char data[16])
+{
+    int fd, ret, i;
+    long *ldata = (long *) data;
+	
+    fd = open ("/dev/random", O_RDONLY);
+    if (fd > 0) {
+		ret = read (fd, data, 16);
+		close (fd);
+		if (ret == 16) return TRUE;
+    }
+	
+    /* fall back to the usual crappy rng */
+	
+    srand48 (getpid () ^ time (NULL));
+	
+    for (i = 0; i < 4; i++)
+		ldata[i] = lrand48 ();
+	
+    return TRUE;
+}
+
+/* Create the keys we'll be using for the display named NAME. */
+static int
+make_auth_keys (const char *name)
+{
+    Xauth auth;
+    char key[16];
+	
+    if (auth_file == NULL)
+		return FALSE;
+	
+    auth.name = "MIT-MAGIC-COOKIE-1";
+    auth.name_length = strlen (auth.name);
+	
+    if (!generate_mit_magic_cookie (key))
+    {
+		auth_file = NULL;
+		return FALSE;
+    }
+	
+    auth.data = key;
+    auth.data_length = 16;
+	
+    set_auth_number (&auth, name);
+	
+    define_named (&auth, host_name ());
+    define_local (&auth);
+	
+    free (auth.number);
+	
+    return TRUE;
+}
+
+/* If ADD-ENTRIES is true, merge our auth entries into the existing
+ Xauthority file. If ADD-ENTRIES is false, remove our entries. */
+static int
+write_auth_file (int add_entries)
+{
+    char *home, newname[1024];
+    int fd, ret;
+    FILE *new_fh, *old_fh;
+    addr_list *addr;
+    Xauth *auth;
+	
+    if (auth_file == NULL)
+		return FALSE;
+	
+    home = getenv ("HOME");
+    if (home == NULL)
+    {
+		auth_file = NULL;
+		return FALSE;
+    }
+	
+    snprintf (newname, sizeof (newname), "%s/.XauthorityXXXXXX", home);
+    mktemp (newname);
+	
+    if (XauLockAuth (auth_file, 1, 2, 10) != LOCK_SUCCESS)
+    {
+		/* FIXME: do something here? */
+		
+		auth_file = NULL;
+		return FALSE;
+    }
+	
+    fd = open (newname, O_WRONLY | O_CREAT | O_TRUNC, 0600);
+    if (fd >= 0)
+    {
+		new_fh = fdopen (fd, "w");
+		if (new_fh != NULL)
+		{
+			if (add_entries)
+			{
+				for (addr = addresses; addr != NULL; addr = addr->next)
+				{
+					XauWriteAuth (new_fh, &addr->auth);
+				}
+			}
+			
+			old_fh = fopen (auth_file, "r");
+			if (old_fh != NULL)
+			{
+				while ((auth = XauReadAuth (old_fh)) != NULL)
+				{
+					if (!check_auth_item (auth))
+						XauWriteAuth (new_fh, auth);
+					XauDisposeAuth (auth);
+				}
+				fclose (old_fh);
+			}
+			
+			fclose (new_fh);
+			unlink (auth_file);
+			
+			ret = rename (newname, auth_file);
+			
+			if (ret != 0)
+				auth_file = NULL;
+			
+			XauUnlockAuth (auth_file);
+			return ret == 0;
+		}
+		
+		close (fd);
+    }
+	
+    XauUnlockAuth (auth_file);
+    auth_file = NULL;
+    return FALSE;
+}
+
+
+/* Subprocess management functions. */
+
+static int
+start_server (char **xargv)
+{
+    int child;
+	
+    child = fork ();
+	
+    switch (child)
+    {
+    case -1:				/* error */
+		perror ("fork");
+		return FALSE;
+		
+    case 0:				/* child */
+		execv (X_SERVER, xargv);
+		perror ("Couldn't exec " X_SERVER);
+		_exit (1);
+		
+    default:				/* parent */
+		server_pid = child;
+		return TRUE;
+    }
+}
+
+static int
+wait_for_server (void)
+{
+    int count = 100;
+	
+    while (count-- > 0)
+    {
+		int status;
+		
+		server_dpy = XOpenDisplay (server_name);
+		if (server_dpy != NULL)
+			return TRUE;
+		
+		if (waitpid (server_pid, &status, WNOHANG) == server_pid)
+			return FALSE;
+		
+		sleep (1);
+    }
+	
+    return FALSE;
+}
+
+static int
+start_client (void)
+{
+    int child;
+	
+    child = fork();
+	
+    switch (child) {
+		char *temp, buf[1024];		
+
+	case -1:				/* error */
+		perror("fork");
+		return FALSE;
+
+	case 0:					/* child */
+		/* Setup environment */
+		temp = getenv("DISPLAY");
+//		if (temp == NULL && temp[0] != 0)
+			setenv("DISPLAY", server_name, TRUE);
+
+		temp = getenv("PATH");
+		if (temp == NULL || temp[0] == 0) 
+			setenv ("PATH", DEFAULT_PATH, TRUE);
+		else if (strnstr(temp, "/usr/X11/bin", sizeof(temp)) == NULL) {
+			snprintf(buf, sizeof(buf), "%s:/usr/X11/bin", temp);		
+			setenv("PATH", buf, TRUE);	
+		}
+		
+		/* First try value of $XINITRC, if set. */
+		temp = getenv("XINITRC");
+		if (temp != NULL && temp[0] != 0 && access(temp, R_OK) == 0)
+			execlp (SHELL, SHELL, temp, NULL);
+
+		/* Then look for .xinitrc in user's home directory. */
+		temp = getenv("HOME");
+		if (temp != NULL && temp[0] != 0) {
+			chdir(temp);
+			snprintf (buf, sizeof (buf), "%s/.xinitrc", temp);
+			if (access(buf, R_OK) == 0)
+				execlp(SHELL, SHELL, buf, NULL);
+		}
+		
+		/* Then try the default xinitrc in the lib directory. */
+		
+		if (access(DEFAULT_XINITRC, R_OK) == 0)
+			execlp(SHELL, SHELL, DEFAULT_XINITRC, NULL);
+		
+		/* Then fallback to hardcoding an xterm and the window manager. */
+		
+		//		system(XTERM_PATH " &");
+		execl(WM_PATH, WM_PATH, NULL);
+		
+		perror("exec");
+		_exit(1);
+		
+    default:				/* parent */
+		client_pid = child;
+		return TRUE;
+    }
+}
+
+static void
+sigchld_handler (int sig)
+{
+    int pid, status;
+	
+	again:
+    pid = waitpid (WAIT_ANY, &status, WNOHANG);
+	
+    if (pid > 0)
+    {
+		if (pid == server_pid)
+		{
+			server_pid = -1;
+			
+			if (client_pid >= 0)
+				kill (client_pid, SIGTERM);
+		}
+		else if (pid == client_pid)
+		{
+			client_pid = -1;
+			
+			if (server_pid >= 0 && xinit_kills_server)
+				kill (server_pid, SIGTERM);
+		}
+		goto again;
+    }
+	
+    if (server_pid == -1 && client_pid == -1)
+		longjmp (exit_continuation, 1);
+	
+    signal (SIGCHLD, sigchld_handler);
+}
+
+
+/* Server utilities. */
+
+static Boolean
+display_exists_p (int number)
+{
+    char buf[64];
+    xcb_connection_t *conn;
+    char *fullname = NULL;
+    int idisplay, iscreen;
+    char *conn_auth_name, *conn_auth_data;
+    int conn_auth_namelen, conn_auth_datalen;
+    
+    //    extern void *_X11TransConnectDisplay ();
+    //    extern void _XDisconnectDisplay ();
+	
+    /* Since connecting to the display waits for a few seconds if the
+	 display doesn't exist, check for trivial non-existence - if the
+	 socket in /tmp exists or not.. (note: if the socket exists, the
+	 server may still not, so we need to try to connect in that case..) */
+	
+    sprintf (buf, "/tmp/.X11-unix/X%d", number);
+    if (access (buf, F_OK) != 0)
+		return FALSE;
+    
+    sprintf (buf, ":%d", number);
+    conn = xcb_connect(buf, NULL);
+    if (xcb_connection_has_error(conn)) return FALSE;
+	
+    xcb_disconnect(conn);
+    return TRUE;
+}
+
+
+/* Monitoring when the system's ip addresses change. */
+
+static Boolean pending_timer;
+
+static void
+timer_callback (CFRunLoopTimerRef timer, void *info)
+{
+    pending_timer = FALSE;
+	
+    /* Update authentication names. Need to write .Xauthority file first
+	 without the existing entries, then again with the new entries.. */
+	
+    write_auth_file (FALSE);
+	
+    free_auth_items ();
+    make_auth_keys (server_name);
+	
+    write_auth_file (TRUE);
+}
+
+/* This function is called when the system's ip addresses may have changed. */
+static void
+ipaddr_callback (SCDynamicStoreRef store, CFArrayRef changed_keys, void *info)
+{
+#if DEBUG
+    if (changed_keys != NULL) {
+		fprintf (stderr, "x11: changed sc keys: ");
+		CFShow (changed_keys);
+    }
+#endif
+
+    if (auth_file != NULL && !pending_timer)
+    {
+		CFRunLoopTimerRef timer;
+		
+		timer = CFRunLoopTimerCreate (NULL, CFAbsoluteTimeGetCurrent () + 1.0,
+									  0.0, 0, 0, timer_callback, NULL);
+		CFRunLoopAddTimer (CFRunLoopGetCurrent (), timer,
+						   kCFRunLoopDefaultMode);
+		CFRelease (timer);
+		
+		pending_timer = TRUE;
+    }
+}
+
+/* This code adapted from "Living in a Dynamic TCP/IP Environment" technote. */
+static Boolean
+install_ipaddr_source (void)
+{
+    CFRunLoopSourceRef source = NULL;
+	
+    SCDynamicStoreContext context = {0};
+    SCDynamicStoreRef ref;
+	
+    ref = SCDynamicStoreCreate (NULL,
+								CFSTR ("AddIPAddressListChangeCallbackSCF"),
+								ipaddr_callback, &context);
+	
+    if (ref != NULL)
+    {
+		const void *keys[4], *patterns[2];
+		int i;
+		
+		keys[0] = SCDynamicStoreKeyCreateNetworkGlobalEntity (NULL, kSCDynamicStoreDomainState, kSCEntNetIPv4);
+		keys[1] = SCDynamicStoreKeyCreateNetworkGlobalEntity (NULL, kSCDynamicStoreDomainState, kSCEntNetIPv6);
+		keys[2] = SCDynamicStoreKeyCreateComputerName (NULL);
+		keys[3] = SCDynamicStoreKeyCreateHostNames (NULL);
+		
+		patterns[0] = SCDynamicStoreKeyCreateNetworkInterfaceEntity (NULL, kSCDynamicStoreDomainState, kSCCompAnyRegex, kSCEntNetIPv4);
+		patterns[1] = SCDynamicStoreKeyCreateNetworkInterfaceEntity (NULL, kSCDynamicStoreDomainState, kSCCompAnyRegex, kSCEntNetIPv6);
+		
+		if (keys[0] != NULL && keys[1] != NULL && keys[2] != NULL
+			&& keys[3] != NULL && patterns[0] != NULL && patterns[1] != NULL)
+		{
+			CFArrayRef key_array, pattern_array;
+			
+			key_array = CFArrayCreate (NULL, keys, 4, &kCFTypeArrayCallBacks);
+			pattern_array = CFArrayCreate (NULL, patterns, 2, &kCFTypeArrayCallBacks);
+			
+			if (key_array != NULL || pattern_array != NULL)
+			{
+				SCDynamicStoreSetNotificationKeys (ref, key_array, pattern_array);
+				source = SCDynamicStoreCreateRunLoopSource (NULL, ref, 0);
+			}
+			
+			if (key_array != NULL)
+				CFRelease (key_array);
+			if (pattern_array != NULL)
+				CFRelease (pattern_array);
+		}
+		
+		
+		for (i = 0; i < 4; i++)
+			if (keys[i] != NULL)
+			CFRelease (keys[i]);
+		for (i = 0; i < 2; i++)
+			if (patterns[i] != NULL)
+			CFRelease (patterns[i]);
+		
+		CFRelease (ref); 
+    }
+	
+    if (source != NULL)
+    {
+		CFRunLoopAddSource (CFRunLoopGetCurrent (),
+							source, kCFRunLoopDefaultMode);
+		CFRelease (source);
+    }
+	
+    return source != NULL;
+}
+
+
+/* Entrypoint. */
+
+void
+termination_signal_handler (int unused_sig)
+{
+    signal (SIGTERM, SIG_DFL);
+    signal (SIGHUP, SIG_DFL);
+    signal (SIGINT, SIG_DFL);
+    signal (SIGQUIT, SIG_DFL);
+
+    longjmp (exit_continuation, 1);
+}
+
+int
+server_main (int argc, char **argv)
+{
+    char **xargv;
+    int i, j;
+    int fd;
+	
+    xargv = alloca (sizeof (char *) * (argc + 32));
+	
+    if (!read_boolean_pref (CFSTR ("no_auth"), FALSE))
+		auth_file = XauFileName ();
+	
+    /* The standard X11 behaviour is for the server to quit when the first
+	 client exits. But it can be useful for debugging (and to mimic our
+	 behaviour in the beta releases) to not do that. */
+	
+    xinit_kills_server = read_boolean_pref (CFSTR ("xinit_kills_server"), TRUE);
+	
+    for (i = 1; i < argc; i++)
+    {
+		if (argv[i][0] == ':')
+			server_name = argv[i];
+    }
+	
+    if (server_name == NULL)
+    {
+		static char name[8];
+		
+		/* No display number specified, so search for the first unused.
+		 
+		 There's a big old race condition here if two servers start at
+		 the same time, but that's fairly unlikely. We could create
+		 lockfiles or something, but that's seems more likely to cause
+		 problems than the race condition itself.. */
+		
+		for (i = 0; i < MAX_DISPLAYS; i++)
+		{
+			if (!display_exists_p (i))
+				break;
+		}
+		
+		if (i == MAX_DISPLAYS)
+		{
+			fprintf (stderr, "%s: couldn't allocate a display number", argv[0]);
+			exit (1);
+		}
+		
+		sprintf (name, ":%d", i);
+		server_name = name;
+    }
+	
+    if (auth_file != NULL)
+    {
+		/* Create new Xauth keys and add them to the .Xauthority file */
+		
+		make_auth_keys (server_name);
+		write_auth_file (TRUE);
+    }
+	
+    /* Construct our new argv */
+	
+    i = j = 0;
+	
+    xargv[i++] = argv[j++];
+	
+    if (auth_file != NULL)
+    {
+		xargv[i++] = "-auth";
+		xargv[i++] = auth_file;
+    }
+	
+    /* By default, don't listen on tcp sockets if Xauth is disabled. */
+	
+    if (read_boolean_pref (CFSTR ("nolisten_tcp"), auth_file == NULL))
+    {
+		xargv[i++] = "-nolisten";
+		xargv[i++] = "tcp";
+    }
+	
+    while (j < argc)
+    {
+		if (argv[j++][0] != ':')
+			xargv[i++] = argv[j-1];
+    }
+	
+    xargv[i++] = (char *) server_name;
+    xargv[i++] = NULL;
+	
+    /* Detach from any controlling terminal and connect stdin to /dev/null */
+	
+#ifdef TIOCNOTTY
+    fd = open ("/dev/tty", O_RDONLY);
+    if (fd != -1)
+    {
+		ioctl (fd, TIOCNOTTY, 0);
+		close (fd);
+    }
+#endif
+	
+    fd = open ("/dev/null", O_RDWR, 0);
+    if (fd >= 0)
+    {
+		dup2 (fd, 0);
+		if (fd > 0)
+			close (fd);
+    }
+	
+    if (!start_server (xargv))
+		return 1;
+	
+    if (!wait_for_server ())
+    {
+		kill (server_pid, SIGTERM);
+		return 1;
+    }
+	
+    if (!start_client ())
+    {
+		kill (server_pid, SIGTERM);
+		return 1;
+    }
+	
+    signal (SIGCHLD, sigchld_handler);
+	
+    signal (SIGTERM, termination_signal_handler);
+    signal (SIGHUP, termination_signal_handler);
+    signal (SIGINT, termination_signal_handler);
+    signal (SIGQUIT, termination_signal_handler);
+
+    if (setjmp (exit_continuation) == 0)
+    {
+		if (install_ipaddr_source ())
+			CFRunLoopRun ();
+		else
+			while (1) pause ();
+    }
+	
+    signal (SIGCHLD, SIG_IGN);
+
+    if (client_pid >= 0) kill (client_pid, SIGTERM);
+    if (server_pid >= 0) kill (server_pid, SIGTERM);
+	
+    if (auth_file != NULL)
+    {
+		/* Remove our Xauth keys */
+		
+		write_auth_file (FALSE);
+    }
+	
+    free_auth_items ();
+	
+    return 0;
+}
diff --git a/hw/darwin/launcher/Info.plist b/hw/darwin/launcher/Info.plist
deleted file mode 100644
index b5385b61a..000000000
--- a/hw/darwin/launcher/Info.plist
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>X11</string>
-	<key>CFBundleGetInfoString</key>
-	<string>2.0, Copyright © 2003-2007, Apple Inc.</string>
-	<key>CFBundleIconFile</key>
-	<string>X11.icns</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.x.X11_launcher</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>X11</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>2.0</string>
-	<key>CFBundleSignature</key>
-	<string>x11l</string>
-	<key>LSUIElement</key>
-	<string>1</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2007, Apple Inc.</string>
-</dict>
-</plist>
diff --git a/hw/darwin/launcher/Makefile.am b/hw/darwin/launcher/Makefile.am
deleted file mode 100644
index c291731d1..000000000
--- a/hw/darwin/launcher/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-bin_SCRIPTS = x11launcher
-
-.PHONY: x11launcher
-
-x11launcher:
-	xcodebuild CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ARCHS="$(X11APP_ARCHS)"
-
-install-data-hook:
-	xcodebuild install DSTROOT=$(DESTDIR) INSTALL_PATH=$(APPLE_APPLICATIONS_DIR) DEPLOYMENT_LOCATION=YES SKIP_INSTALL=NO ARCHS="$(X11APP_ARCHS)"
-
-clean-local:
-	rm -rf build
-
-EXTRA_DIST = \
-	bundle-main.c \
-	Info.plist \
-	X11.icns \
-	X11.xcodeproj/project.pbxproj
diff --git a/hw/darwin/launcher/X11.icns b/hw/darwin/launcher/X11.icns
deleted file mode 100644
index d770e617ddb455d8a499550e712f93a06a69f871..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 65908
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
E014<25dZ)H

diff --git a/hw/darwin/launcher/X11.xcodeproj/project.pbxproj b/hw/darwin/launcher/X11.xcodeproj/project.pbxproj
deleted file mode 100644
index 34b76dafb..000000000
--- a/hw/darwin/launcher/X11.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,290 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 42;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		527F241B0B5D938C007840A7 /* X11.icns in Resources */ = {isa = PBXBuildFile; fileRef = 50459C5F038587C60ECA21EC /* X11.icns */; };
-		527F241D0B5D938C007840A7 /* bundle-main.c in Sources */ = {isa = PBXBuildFile; fileRef = 50EE2AB703849F0B0ECA21EC /* bundle-main.c */; };
-		527F241F0B5D938C007840A7 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50F4F0A7039D6ACA0E82C0CB /* CoreFoundation.framework */; };
-		527F24370B5D9D89007840A7 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 527F24260B5D938C007840A7 /* Info.plist */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXFileReference section */
-		50459C5F038587C60ECA21EC /* X11.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = X11.icns; sourceTree = "<group>"; };
-		50EE2AB703849F0B0ECA21EC /* bundle-main.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = "bundle-main.c"; sourceTree = "<group>"; };
-		50F4F0A7039D6ACA0E82C0CB /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
-		527F24260B5D938C007840A7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; };
-		527F24270B5D938C007840A7 /* X11.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = X11.app; sourceTree = BUILT_PRODUCTS_DIR; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		527F241E0B5D938C007840A7 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				527F241F0B5D938C007840A7 /* CoreFoundation.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		195DF8CFFE9D517E11CA2CBB /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				527F24270B5D938C007840A7 /* X11.app */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		20286C29FDCF999611CA2CEA /* X11 */ = {
-			isa = PBXGroup;
-			children = (
-				20286C2AFDCF999611CA2CEA /* Sources */,
-				20286C2CFDCF999611CA2CEA /* Resources */,
-				20286C32FDCF999611CA2CEA /* External Frameworks and Libraries */,
-				195DF8CFFE9D517E11CA2CBB /* Products */,
-				527F24260B5D938C007840A7 /* Info.plist */,
-			);
-			name = X11;
-			sourceTree = "<group>";
-		};
-		20286C2AFDCF999611CA2CEA /* Sources */ = {
-			isa = PBXGroup;
-			children = (
-				50EE2AB703849F0B0ECA21EC /* bundle-main.c */,
-			);
-			name = Sources;
-			sourceTree = "<group>";
-		};
-		20286C2CFDCF999611CA2CEA /* Resources */ = {
-			isa = PBXGroup;
-			children = (
-				50459C5F038587C60ECA21EC /* X11.icns */,
-			);
-			name = Resources;
-			sourceTree = "<group>";
-		};
-		20286C32FDCF999611CA2CEA /* External Frameworks and Libraries */ = {
-			isa = PBXGroup;
-			children = (
-				50F4F0A7039D6ACA0E82C0CB /* CoreFoundation.framework */,
-			);
-			name = "External Frameworks and Libraries";
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXHeadersBuildPhase section */
-		527F24170B5D938C007840A7 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXHeadersBuildPhase section */
-
-/* Begin PBXNativeTarget section */
-		527F24160B5D938C007840A7 /* X11 */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 527F24220B5D938C007840A7 /* Build configuration list for PBXNativeTarget "X11" */;
-			buildPhases = (
-				527F24170B5D938C007840A7 /* Headers */,
-				527F24180B5D938C007840A7 /* Resources */,
-				527F241C0B5D938C007840A7 /* Sources */,
-				527F241E0B5D938C007840A7 /* Frameworks */,
-				527F24210B5D938C007840A7 /* Rez */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = X11;
-			productName = X11;
-			productReference = 527F24270B5D938C007840A7 /* X11.app */;
-			productType = "com.apple.product-type.application";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		20286C28FDCF999611CA2CEA /* Project object */ = {
-			isa = PBXProject;
-			buildConfigurationList = 527F24080B5D8FFC007840A7 /* Build configuration list for PBXProject "X11" */;
-			compatibilityVersion = "Xcode 2.4";
-			hasScannedForEncodings = 1;
-			mainGroup = 20286C29FDCF999611CA2CEA /* X11 */;
-			projectDirPath = "";
-			projectRoot = "";
-			shouldCheckCompatibility = 1;
-			targets = (
-				527F24160B5D938C007840A7 /* X11 */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-		527F24180B5D938C007840A7 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				527F24370B5D9D89007840A7 /* Info.plist in Resources */,
-				527F241B0B5D938C007840A7 /* X11.icns in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXRezBuildPhase section */
-		527F24210B5D938C007840A7 /* Rez */ = {
-			isa = PBXRezBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXRezBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		527F241C0B5D938C007840A7 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				527F241D0B5D938C007840A7 /* bundle-main.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin XCBuildConfiguration section */
-		527F24090B5D8FFC007840A7 /* Development */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				INSTALL_MODE_FLAG = "a+rX";
-			};
-			name = Development;
-		};
-		527F240A0B5D8FFC007840A7 /* Deployment */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				INSTALL_MODE_FLAG = "a+rX";
-			};
-			name = Deployment;
-		};
-		527F240B0B5D8FFC007840A7 /* Default */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				INSTALL_MODE_FLAG = "a+rX";
-			};
-			name = Default;
-		};
-		527F24230B5D938C007840A7 /* Development */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				FRAMEWORK_SEARCH_PATHS = "";
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				HEADER_SEARCH_PATHS = /usr/X11/include;
-				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = $DSTROOT/Applications/Utilties;
-				LIBRARY_SEARCH_PATHS = /usr/X11/lib;
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-lXau",
-					"-lxcb",
-					"-lX11",
-				);
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = X11;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
-			name = Development;
-		};
-		527F24240B5D938C007840A7 /* Deployment */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-				FRAMEWORK_SEARCH_PATHS = "";
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				HEADER_SEARCH_PATHS = /usr/X11/include;
-				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = /Applications/Utilties;
-				LIBRARY_SEARCH_PATHS = /usr/X11/lib;
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "";
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = X11;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
-			name = Deployment;
-		};
-		527F24250B5D938C007840A7 /* Default */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "";
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				HEADER_SEARCH_PATHS = /usr/X11/include;
-				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = /Applications/Utilties;
-				LIBRARY_SEARCH_PATHS = /usr/X11/lib;
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-lXau",
-					"-lxcb",
-					"-lX11",
-				);
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = X11;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-				WRAPPER_EXTENSION = app;
-			};
-			name = Default;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		527F24080B5D8FFC007840A7 /* Build configuration list for PBXProject "X11" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				527F24090B5D8FFC007840A7 /* Development */,
-				527F240A0B5D8FFC007840A7 /* Deployment */,
-				527F240B0B5D8FFC007840A7 /* Default */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Default;
-		};
-		527F24220B5D938C007840A7 /* Build configuration list for PBXNativeTarget "X11" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				527F24230B5D938C007840A7 /* Development */,
-				527F24240B5D938C007840A7 /* Deployment */,
-				527F24250B5D938C007840A7 /* Default */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Default;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 20286C28FDCF999611CA2CEA /* Project object */;
-}

From 13af2d1efcc83d1412a4c727afddd97577b00f32 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Tue, 4 Dec 2007 17:36:21 -0500
Subject: [PATCH 262/552] Restore xf86getsecs() as not having an ANSI
 equivalent.

---
 hw/xfree86/common/xf86.h       |  1 +
 hw/xfree86/common/xf86Helper.c | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index 064107428..64449482f 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -339,6 +339,7 @@ Bool xf86IsUnblank(int mode);
 
 void xf86AddModuleInfo(ModuleInfoPtr info, pointer module);
 void xf86DeleteModuleInfo(int idx);
+void xf86getsecs(long *, long *);
 
 /* xf86Debug.c */
 #ifdef BUILDDEBUG
diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index d37875c35..ec524e63c 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -2957,3 +2957,17 @@ xf86GetMotionEvents(DeviceIntPtr pDev, xTimecoord *buff, unsigned long start,
 {
     return GetMotionHistory(pDev, buff, start, stop, pScreen);
 }
+
+_X_EXPORT void
+xf86getsecs(long * secs, long * usecs)
+{
+    struct timeval tv;
+
+    X_GETTIMEOFDAY(&tv);
+    if (secs)
+	*secs = tv.tv_sec;
+    if (usecs)
+	*usecs= tv.tv_usec;
+
+    return;
+}

From cc98a8e2415f12c7a90fd846d1ec858068e8c796 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Mon, 3 Dec 2007 23:59:19 -0800
Subject: [PATCH 263/552] Darwin: RIP dumpkeymap, cr, and fullscreen Taking out
 the trash. We don't need dumpkeymap since we'll be getting keymaps straight
 from the OS. .Xmodmap should be sufficient for any user-needed changes.  If
 this is not the case, please let us know, so we can address any problems you
 have. fullscreen never worked AFAIK cr isn't being used and xpr is much
 better. (cherry picked from commit e41af2967e885466c4d194fa4c3b358e6be37c30)

---
 hw/darwin/Makefile.am                      |    4 +-
 hw/darwin/quartz/cr/XView.h                |   41 -
 hw/darwin/quartz/cr/XView.m                |   77 --
 hw/darwin/quartz/cr/cr.h                   |   60 -
 hw/darwin/quartz/cr/crAppleWM.m            |  159 ---
 hw/darwin/quartz/cr/crFrame.m              |  440 ------
 hw/darwin/quartz/cr/crScreen.m             |  382 -----
 hw/darwin/quartz/fullscreen/fullscreen.c   |  571 --------
 hw/darwin/quartz/fullscreen/quartzCursor.c |  654 ---------
 hw/darwin/quartz/fullscreen/quartzCursor.h |   42 -
 hw/darwin/utils/Makefile.am                |   11 -
 hw/darwin/utils/README.txt                 |  107 --
 hw/darwin/utils/dumpkeymap.c               | 1453 --------------------
 hw/darwin/utils/dumpkeymap.man             | 1002 --------------
 14 files changed, 2 insertions(+), 5001 deletions(-)
 delete mode 100644 hw/darwin/quartz/cr/XView.h
 delete mode 100644 hw/darwin/quartz/cr/XView.m
 delete mode 100644 hw/darwin/quartz/cr/cr.h
 delete mode 100644 hw/darwin/quartz/cr/crAppleWM.m
 delete mode 100644 hw/darwin/quartz/cr/crFrame.m
 delete mode 100644 hw/darwin/quartz/cr/crScreen.m
 delete mode 100644 hw/darwin/quartz/fullscreen/fullscreen.c
 delete mode 100644 hw/darwin/quartz/fullscreen/quartzCursor.c
 delete mode 100644 hw/darwin/quartz/fullscreen/quartzCursor.h
 delete mode 100644 hw/darwin/utils/Makefile.am
 delete mode 100644 hw/darwin/utils/README.txt
 delete mode 100644 hw/darwin/utils/dumpkeymap.c
 delete mode 100644 hw/darwin/utils/dumpkeymap.man

diff --git a/hw/darwin/Makefile.am b/hw/darwin/Makefile.am
index 136c41a0a..f5b9e752d 100644
--- a/hw/darwin/Makefile.am
+++ b/hw/darwin/Makefile.am
@@ -9,8 +9,8 @@ if X11APP
 X11APP_SUBDIRS = apple
 endif
 
-SUBDIRS = quartz utils $(X11APP_SUBDIRS)
-DIST_SUBDIRS = quartz utils apple launcher
+SUBDIRS = quartz $(X11APP_SUBDIRS)
+DIST_SUBDIRS = quartz apple
 
 bin_PROGRAMS = Xquartz
 man1_MANS = Xquartz.man
diff --git a/hw/darwin/quartz/cr/XView.h b/hw/darwin/quartz/cr/XView.h
deleted file mode 100644
index 26f789da2..000000000
--- a/hw/darwin/quartz/cr/XView.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * NSView subclass for Mac OS X rootless X server
- *
- * Copyright (c) 2001 Greg Parker. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name(s) of the above copyright
- * holders shall not be used in advertising or otherwise to promote the sale,
- * use or other dealings in this Software without prior written authorization.
- */
-
-#import <Cocoa/Cocoa.h>
-
-@interface XView : NSQuickDrawView
-
-- (BOOL)isFlipped;
-- (BOOL)isOpaque;
-- (BOOL)acceptsFirstResponder;
-- (BOOL)acceptsFirstMouse:(NSEvent *)theEvent;
-- (BOOL)shouldDelayWindowOrderingForEvent:(NSEvent *)theEvent;
-
-- (void)mouseDown:(NSEvent *)anEvent;
-
-@end
diff --git a/hw/darwin/quartz/cr/XView.m b/hw/darwin/quartz/cr/XView.m
deleted file mode 100644
index 130b15f59..000000000
--- a/hw/darwin/quartz/cr/XView.m
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * NSView subclass for Mac OS X rootless X server
- *
- * Each rootless window contains an instance of this class.
- * This class handles events while drawing is handled by Carbon
- * code in the rootless Aqua implementation.
- *
- * Copyright (c) 2001 Greg Parker. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name(s) of the above copyright
- * holders shall not be used in advertising or otherwise to promote the sale,
- * use or other dealings in this Software without prior written authorization.
- */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#import "XView.h"
-
-
-@implementation XView
-
-- (BOOL)isFlipped
-{
-    return NO;
-}
-
-- (BOOL)isOpaque
-{
-    return YES;
-}
-
-- (BOOL)acceptsFirstResponder
-{
-    return YES;
-}
-
-- (BOOL)acceptsFirstMouse:(NSEvent *)theEvent
-{
-    return YES;
-}
-
-- (BOOL)shouldDelayWindowOrderingForEvent:(NSEvent *)theEvent
-{
-    return YES;
-}
-
-- (void)mouseDown:(NSEvent *)anEvent
-{
-    // Only X is allowed to restack windows.
-    [NSApp preventWindowOrdering];
-    if (! [NSApp isActive]) {
-        [NSApp activateIgnoringOtherApps:YES];
-    }
-    [[self nextResponder] mouseDown:anEvent];
-}
-
-@end
diff --git a/hw/darwin/quartz/cr/cr.h b/hw/darwin/quartz/cr/cr.h
deleted file mode 100644
index 0ebad5da0..000000000
--- a/hw/darwin/quartz/cr/cr.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Internal definitions of the Cocoa rootless implementation
- *
- * Copyright (c) 2003 Torrey T. Lyons. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name(s) of the above copyright
- * holders shall not be used in advertising or otherwise to promote the sale,
- * use or other dealings in this Software without prior written authorization.
- */
-
-#ifndef _CR_H
-#define _CR_H
-
-#ifdef __OBJC__
-#import <Cocoa/Cocoa.h>
-#import "XView.h"
-#else
-typedef struct OpaqueNSWindow NSWindow;
-typedef struct OpaqueXView XView;
-#endif
-
-#undef BOOL
-#define BOOL xBOOL
-#include "screenint.h"
-#include "window.h"
-#undef BOOL
-
-// Predefined style for the window which is about to be framed
-extern WindowPtr nextWindowToFrame;
-extern unsigned int nextWindowStyle;
-
-typedef struct {
-    NSWindow *window;
-    XView *view;
-    GrafPtr port;
-    CGContextRef context;
-} CRWindowRec, *CRWindowPtr;
-
-Bool CRInit(ScreenPtr pScreen);
-void CRAppleWMInit(void);
-
-#endif /* _CR_H */
diff --git a/hw/darwin/quartz/cr/crAppleWM.m b/hw/darwin/quartz/cr/crAppleWM.m
deleted file mode 100644
index 246f52170..000000000
--- a/hw/darwin/quartz/cr/crAppleWM.m
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Cocoa rootless implementation functions for AppleWM extension
- *
- * Copyright (c) 2003 Torrey T. Lyons. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name(s) of the above copyright
- * holders shall not be used in advertising or otherwise to promote the sale,
- * use or other dealings in this Software without prior written authorization.
- */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include "quartz/quartzCommon.h"
-#include "quartz/cr/cr.h"
-
-#undef BOOL
-#define BOOL xBOOL
-#include "rootless.h"
-#include "X11/X.h"
-#define _APPLEWM_SERVER_
-#include "X11/extensions/applewm.h"
-#include "quartz/applewmExt.h"
-#undef BOOL
-
-#define StdDocumentStyleMask (NSTitledWindowMask | \
-                              NSClosableWindowMask | \
-                              NSMiniaturizableWindowMask | \
-                              NSResizableWindowMask)
-
-static int
-CRDisableUpdate(void)
-{
-    return Success;
-}
-
-
-static int
-CREnableUpdate(void)
-{
-    return Success;
-}
-
-
-static int CRSetWindowLevel(
-    WindowPtr pWin,
-    int level)
-{
-    CRWindowPtr crWinPtr;
-
-    crWinPtr = (CRWindowPtr) RootlessFrameForWindow(pWin, TRUE);
-    if (crWinPtr == 0)
-        return BadWindow;
-
-    RootlessStopDrawing(pWin, FALSE);
-
-    [crWinPtr->window setLevel:level];
-
-    return Success;
-}
-
-
-static int CRFrameGetRect(
-    int type,
-    int class,
-    const BoxRec *outer,
-    const BoxRec *inner,
-    BoxRec *ret)
-{
-    return Success;
-}
-
-
-static int CRFrameHitTest(
-    int class,
-    int x,
-    int y,
-    const BoxRec *outer,
-    const BoxRec *inner,
-    int *ret)
-{
-    return 0;
-}
-
-
-static int CRFrameDraw(
-    WindowPtr pWin,
-    int class,
-    unsigned int attr,
-    const BoxRec *outer,
-    const BoxRec *inner,
-    unsigned int title_len,
-    const unsigned char *title_bytes)
-{
-    CRWindowPtr crWinPtr;
-    NSWindow *window;
-    Bool hasResizeIndicator;
-
-    /* We assume the window has not yet been framed so
-       RootlessFrameForWindow() will cause it to be. Record the window
-       style so that the appropriate one will be used when it is framed.
-       If the window is already framed, we can't change the window
-       style and the following will have no effect. */
-
-    nextWindowToFrame = pWin;
-    if (class == AppleWMFrameClassDocument)
-        nextWindowStyle = StdDocumentStyleMask;
-    else
-        nextWindowStyle = NSBorderlessWindowMask;
-
-    crWinPtr = (CRWindowPtr) RootlessFrameForWindow(pWin, TRUE);
-    if (crWinPtr == 0)
-        return BadWindow;
-
-    window = crWinPtr->window;
-
-    [window setTitle:[NSString stringWithCString:title_bytes
-                               length:title_len]];
-
-    hasResizeIndicator = (attr & AppleWMFrameGrowBox) ? YES : NO;
-    [window setShowsResizeIndicator:hasResizeIndicator];
-
-    return Success;
-}
-
-
-static AppleWMProcsRec crAppleWMProcs = {
-    CRDisableUpdate,
-    CREnableUpdate,
-    CRSetWindowLevel,
-    CRFrameGetRect,
-    CRFrameHitTest,
-    CRFrameDraw
-};
-
-
-void CRAppleWMInit(void)
-{
-    AppleWMExtensionInit(&crAppleWMProcs);
-}
diff --git a/hw/darwin/quartz/cr/crFrame.m b/hw/darwin/quartz/cr/crFrame.m
deleted file mode 100644
index 86c75d2e4..000000000
--- a/hw/darwin/quartz/cr/crFrame.m
+++ /dev/null
@@ -1,440 +0,0 @@
-/*
- * Cocoa rootless implementation frame functions
- *
- * Copyright (c) 2001 Greg Parker. All Rights Reserved.
- * Copyright (c) 2002-2003 Torrey T. Lyons. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name(s) of the above copyright
- * holders shall not be used in advertising or otherwise to promote the sale,
- * use or other dealings in this Software without prior written authorization.
- */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include "quartz/quartzCommon.h"
-#include "quartz/cr/cr.h"
-
-#undef BOOL
-#define BOOL xBOOL
-#include "rootless.h"
-#include "quartz/applewmExt.h"
-#include "windowstr.h"
-#undef BOOL
-
-WindowPtr nextWindowToFrame = NULL;
-unsigned int nextWindowStyle = 0;
-
-static void CRReshapeFrame(RootlessFrameID wid, RegionPtr pShape);
-
-
-/*
- * CRCreateFrame
- *  Create a new physical window.
- *  Rootless windows must not autodisplay! Autodisplay can cause a deadlock.
- *    Event thread - autodisplay: locks view hierarchy, then window
- *    X Server thread - window resize: locks window, then view hierarchy
- *  Deadlock occurs if each thread gets one lock and waits for the other.
- */
-static Bool
-CRCreateFrame(RootlessWindowPtr pFrame, ScreenPtr pScreen,
-              int newX, int newY, RegionPtr pShape)
-{
-    CRWindowPtr crWinPtr;
-    NSRect bounds;
-    NSWindow *theWindow;
-    XView *theView;
-    unsigned int theStyleMask = NSBorderlessWindowMask;
-
-    crWinPtr = (CRWindowPtr) xalloc(sizeof(CRWindowRec));
-
-    bounds = NSMakeRect(newX,
-                        NSHeight([[NSScreen mainScreen] frame]) -
-                        newY - pFrame->height,
-                        pFrame->width, pFrame->height);
-
-    // Check if AppleWM has specified a style for this window
-    if (pFrame->win == nextWindowToFrame) {
-        theStyleMask = nextWindowStyle;
-    }
-    nextWindowToFrame = NULL;
-
-    // Create an NSWindow for the new X11 window
-    theWindow = [[NSWindow alloc] initWithContentRect:bounds
-                                  styleMask:theStyleMask
-                                  backing:NSBackingStoreBuffered
-#ifdef DEFER_NSWINDOW
-                                  defer:YES];
-#else
-                                  defer:NO];
-#endif
-
-    if (!theWindow) return FALSE;
-
-    [theWindow setBackgroundColor:[NSColor clearColor]];  // erase transparent
-    [theWindow setAlphaValue:1.0];       // draw opaque
-    [theWindow setOpaque:YES];           // changed when window is shaped
-
-    [theWindow useOptimizedDrawing:YES]; // Has no overlapping sub-views
-    [theWindow setAutodisplay:NO];       // See comment above
-    [theWindow disableFlushWindow];      // We do all the flushing manually
-    [theWindow setHasShadow:YES];        // All windows have shadows
-    [theWindow setReleasedWhenClosed:YES]; // Default, but we want to be sure
-
-    theView = [[XView alloc] initWithFrame:bounds];
-    [theWindow setContentView:theView];
-    [theWindow setInitialFirstResponder:theView];
-
-#ifdef DEFER_NSWINDOW
-    // We need the NSWindow to actually be created now.
-    // If we had to defer creating it, we have to order it
-    // onto the screen to force it to be created.
-
-    if (pFrame->win->prevSib) {
-        CRWindowPtr crWinPtr = (CRWindowPtr) RootlessFrameForWindow(
-                                                pFrame->win->prevSib, FALSE);
-        int upperNum = [crWinPtr->window windowNumber];
-        [theWindow orderWindow:NSWindowBelow relativeTo:upperNum];
-    } else {
-        [theWindow orderFront:nil];
-    }
-#endif
-
-    [theWindow setAcceptsMouseMovedEvents:YES];
-
-    crWinPtr->window = theWindow;
-    crWinPtr->view = theView;
-
-    [theView lockFocus];
-    // Fill the window with white to make sure alpha channel is set
-    NSEraseRect(bounds);
-    crWinPtr->port = [theView qdPort];
-    crWinPtr->context = [[NSGraphicsContext currentContext] graphicsPort];
-    // CreateCGContextForPort(crWinPtr->port, &crWinPtr->context);
-    [theView unlockFocus];
-
-    // Store the implementation private frame ID
-    pFrame->wid = (RootlessFrameID) crWinPtr;
-
-    // Reshape the frame if it was created shaped.
-    if (pShape != NULL)
-        CRReshapeFrame(pFrame->wid, pShape);
-
-    return TRUE;
-}
-
-
-/*
- * CRDestroyFrame
- *  Destroy a frame.
- */
-static void
-CRDestroyFrame(RootlessFrameID wid)
-{
-    CRWindowPtr crWinPtr = (CRWindowPtr) wid;
-
-    [crWinPtr->window orderOut:nil];
-    [crWinPtr->window close];
-    [crWinPtr->view release];
-    free(crWinPtr);
-}
-
-
-/*
- * CRMoveFrame
- *  Move a frame on screen.
- */
-static void
-CRMoveFrame(RootlessFrameID wid, ScreenPtr pScreen, int newX, int newY)
-{
-    CRWindowPtr crWinPtr = (CRWindowPtr) wid;
-    NSPoint topLeft;
-
-    topLeft = NSMakePoint(newX,
-                          NSHeight([[NSScreen mainScreen] frame]) - newY);
-
-    [crWinPtr->window setFrameTopLeftPoint:topLeft];
-}
-
-
-/*
- * CRResizeFrame
- *  Move and resize a frame.
- */
-static void
-CRResizeFrame(RootlessFrameID wid, ScreenPtr pScreen,
-              int newX, int newY, unsigned int newW, unsigned int newH,
-              unsigned int gravity)
-{
-    CRWindowPtr crWinPtr = (CRWindowPtr) wid;
-    NSRect bounds = NSMakeRect(newX, NSHeight([[NSScreen mainScreen] frame]) -
-                               newY - newH, newW, newH);
-
-    [crWinPtr->window setFrame:bounds display:NO];
-}
-
-
-/*
- * CRRestackFrame
- *  Change the frame order. Put the frame behind nextWid or on top if
- *  it is NULL. Unmapped frames are mapped by restacking them.
- */
-static void
-CRRestackFrame(RootlessFrameID wid, RootlessFrameID nextWid)
-{
-    CRWindowPtr crWinPtr = (CRWindowPtr) wid;
-    CRWindowPtr crNextWinPtr = (CRWindowPtr) nextWid;
-
-    if (crNextWinPtr) {
-        int upperNum = [crNextWinPtr->window windowNumber];
-
-        [crWinPtr->window orderWindow:NSWindowBelow relativeTo:upperNum];
-    } else {
-        [crWinPtr->window makeKeyAndOrderFront:nil];
-    }
-}
-
-
-/*
- * CRReshapeFrame
- *  Set the shape of a frame.
- */
-static void
-CRReshapeFrame(RootlessFrameID wid, RegionPtr pShape)
-{
-    CRWindowPtr crWinPtr = (CRWindowPtr) wid;
-    NSRect bounds = [crWinPtr->view frame];
-    int winHeight = NSHeight(bounds);
-    BoxRec localBox = {0, 0, NSWidth(bounds), winHeight};
-
-    [crWinPtr->view lockFocus];
-
-    if (pShape != NULL) {
-        // Calculate the region outside the new shape.
-        miInverse(pShape, pShape, &localBox);
-    }
-
-    // If window is currently shaped we need to undo the previous shape.
-    if (![crWinPtr->window isOpaque]) {
-        [[NSColor whiteColor] set];
-        NSRectFillUsingOperation(bounds, NSCompositeDestinationAtop);
-    }
-
-    if (pShape != NULL) {
-        int count = REGION_NUM_RECTS(pShape);
-        BoxRec *extRects = REGION_RECTS(pShape);
-        BoxRec *rects, *end;
-
-        // Make transparent if window is now shaped.
-        [crWinPtr->window setOpaque:NO];
-
-        // Clear the areas outside the window shape
-        [[NSColor clearColor] set];
-        for (rects = extRects, end = extRects+count; rects < end; rects++) {
-            int rectHeight = rects->y2 - rects->y1;
-            NSRectFill( NSMakeRect(rects->x1,
-                                   winHeight - rects->y1 - rectHeight,
-                                   rects->x2 - rects->x1, rectHeight) );
-        }
-        [[NSGraphicsContext currentContext] flushGraphics];
-
-        // force update of window shadow
-        [crWinPtr->window setHasShadow:NO];
-        [crWinPtr->window setHasShadow:YES];
-
-    } else {
-        [crWinPtr->window setOpaque:YES];
-        [[NSGraphicsContext currentContext] flushGraphics];
-    }
-
-    [crWinPtr->view unlockFocus];
-}
-
-
-/*
- * CRUnmapFrame
- *  Unmap a frame.
- */
-static void
-CRUnmapFrame(RootlessFrameID wid)
-{
-    CRWindowPtr crWinPtr = (CRWindowPtr) wid;
-
-    [crWinPtr->window orderOut:nil];
-}
-
-
-/*
- * CRStartDrawing
- *  When a window's buffer is not being drawn to, the CoreGraphics
- *  window server may compress or move it. Call this routine
- *  to lock down the buffer during direct drawing. It returns
- *  a pointer to the backing buffer.
- */
-static void
-CRStartDrawing(RootlessFrameID wid, char **pixelData, int *bytesPerRow)
-{
-    CRWindowPtr crWinPtr = (CRWindowPtr) wid;
-    PixMapHandle pix;
-
-    [crWinPtr->view lockFocus];
-    crWinPtr->port = [crWinPtr->view qdPort];
-    LockPortBits(crWinPtr->port);
-    [crWinPtr->view unlockFocus];
-    pix = GetPortPixMap(crWinPtr->port);
-
-    *pixelData = GetPixBaseAddr(pix);
-    *bytesPerRow = GetPixRowBytes(pix) & 0x3fff; // fixme is mask needed?
-}
-
-
-/*
- * CRStopDrawing
- *  When direct access to a window's buffer is no longer needed, this
- *  routine should be called to allow CoreGraphics to compress or
- *  move it.
- */
-static void
-CRStopDrawing(RootlessFrameID wid, Bool flush)
-{
-    CRWindowPtr crWinPtr = (CRWindowPtr) wid;
-
-    UnlockPortBits(crWinPtr->port);
-
-    if (flush) {
-        QDFlushPortBuffer(crWinPtr->port, NULL);
-    }
-}
-
-
-/*
- * CRUpdateRegion
- *  Flush a region from a window's backing buffer to the screen.
- */
-static void
-CRUpdateRegion(RootlessFrameID wid, RegionPtr pDamage)
-{
-    CRWindowPtr crWinPtr = (CRWindowPtr) wid;
-
-#ifdef ROOTLESS_TRACK_DAMAGE
-    int count = REGION_NUM_RECTS(pDamage);
-    BoxRec *rects = REGION_RECTS(pDamage);
-    BoxRec *end;
-
-    static RgnHandle rgn = NULL;
-    static RgnHandle box = NULL;
-
-    if (!rgn) rgn = NewRgn();
-    if (!box) box = NewRgn();
-
-    for (end = rects+count; rects < end; rects++) {
-        Rect qdRect;
-        qdRect.left = rects->x1;
-        qdRect.top = rects->y1;
-        qdRect.right = rects->x2;
-        qdRect.bottom = rects->y2;
-
-        RectRgn(box, &qdRect);
-        UnionRgn(rgn, box, rgn);
-    }
-
-    QDFlushPortBuffer(crWinPtr->port, rgn);
-
-    SetEmptyRgn(rgn);
-    SetEmptyRgn(box);
-
-#else	/* !ROOTLESS_TRACK_DAMAGE */
-    QDFlushPortBuffer(crWinPtr->port, NULL);
-#endif
-}
-
-
-/*
- * CRDamageRects
- *  Mark damaged rectangles as requiring redisplay to screen.
- */
-static void
-CRDamageRects(RootlessFrameID wid, int count, const BoxRec *rects,
-               int shift_x, int shift_y)
-{
-    CRWindowPtr crWinPtr = (CRWindowPtr) wid;
-    const BoxRec *end;
-
-    for (end = rects + count; rects < end; rects++) {
-        Rect qdRect;
-        qdRect.left = rects->x1 + shift_x;
-        qdRect.top = rects->y1 + shift_y;
-        qdRect.right = rects->x2 + shift_x;
-        qdRect.bottom = rects->y2 + shift_y;
-
-        QDAddRectToDirtyRegion(crWinPtr->port, &qdRect);
-    }
-}
-
-
-/*
- * Called to check if the frame should be reordered when it is restacked.
- */
-Bool CRDoReorderWindow(RootlessWindowPtr pFrame)
-{
-    WindowPtr pWin = pFrame->win;
-
-    return AppleWMDoReorderWindow(pWin);
-}
-
-
-static RootlessFrameProcsRec CRRootlessProcs = {
-    CRCreateFrame,
-    CRDestroyFrame,
-    CRMoveFrame,
-    CRResizeFrame,
-    CRRestackFrame,
-    CRReshapeFrame,
-    CRUnmapFrame,
-    CRStartDrawing,
-    CRStopDrawing,
-    CRUpdateRegion,
-    CRDamageRects,
-    NULL,
-    CRDoReorderWindow,
-    NULL,
-    NULL,
-    NULL,
-    NULL
-};
-
-
-/*
- * Initialize CR implementation
- */
-Bool
-CRInit(ScreenPtr pScreen)
-{
-    RootlessInit(pScreen, &CRRootlessProcs);
-
-    rootless_CopyBytes_threshold = 0;
-    rootless_FillBytes_threshold = 0;
-    rootless_CompositePixels_threshold = 0;
-    rootless_CopyWindow_threshold = 0;
-
-    return TRUE;
-}
diff --git a/hw/darwin/quartz/cr/crScreen.m b/hw/darwin/quartz/cr/crScreen.m
deleted file mode 100644
index cc82afbd1..000000000
--- a/hw/darwin/quartz/cr/crScreen.m
+++ /dev/null
@@ -1,382 +0,0 @@
-/*
- * Cocoa rootless implementation initialization
- *
- * Copyright (c) 2001 Greg Parker. All Rights Reserved.
- * Copyright (c) 2002-2004 Torrey T. Lyons. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name(s) of the above copyright
- * holders shall not be used in advertising or otherwise to promote the sale,
- * use or other dealings in this Software without prior written authorization.
- */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include "quartz/quartzCommon.h"
-#include "quartz/cr/cr.h"
-
-#undef BOOL
-#define BOOL xBOOL
-#include "darwin.h"
-#include "quartz/quartz.h"
-#include "quartz/quartzCursor.h"
-#include "rootless.h"
-#include "safeAlpha/safeAlpha.h"
-#include "quartz/pseudoramiX.h"
-#include "quartz/applewmExt.h"
-
-#include "regionstr.h"
-#include "scrnintstr.h"
-#include "picturestr.h"
-#include "globals.h"
-#ifdef DAMAGE
-# include "damage.h"
-#endif
-#undef BOOL
-
-// Name of GLX bundle using AGL framework
-static const char *crOpenGLBundle = "glxAGL.bundle";
-
-static Class classXView = nil;
-
-
-/*
- * CRDisplayInit
- *  Find all screens.
- *
- *  Multihead note: When rootless mode uses PseudoramiX, the
- *  X server only sees one screen; only PseudoramiX itself knows
- *  about all of the screens.
- */
-static void
-CRDisplayInit(void)
-{
-    ErrorF("Display mode: Rootless Quartz -- Cocoa implementation\n");
-
-    if (noPseudoramiXExtension) {
-        darwinScreensFound = [[NSScreen screens] count];
-    } else {
-        darwinScreensFound = 1; // only PseudoramiX knows about the rest
-    }
-
-    CRAppleWMInit();
-}
-
-
-/*
- * CRAddPseudoramiXScreens
- *  Add a single virtual screen encompassing all the physical screens
- *  with PseudoramiX.
- */
-static void
-CRAddPseudoramiXScreens(int *x, int *y, int *width, int *height)
-{
-    int i;
-    NSRect unionRect = NSMakeRect(0, 0, 0, 0);
-    NSArray *screens = [NSScreen screens];
-
-    // Get the union of all screens (minus the menu bar on main screen)
-    for (i = 0; i < [screens count]; i++) {
-        NSScreen *screen = [screens objectAtIndex:i];
-        NSRect frame = [screen frame];
-        frame.origin.y = [[NSScreen mainScreen] frame].size.height -
-                         frame.size.height - frame.origin.y;
-        if (NSEqualRects([screen frame], [[NSScreen mainScreen] frame])) {
-            frame.origin.y    += aquaMenuBarHeight;
-            frame.size.height -= aquaMenuBarHeight;
-        }
-        unionRect = NSUnionRect(unionRect, frame);
-    }
-
-    // Use unionRect as the screen size for the X server.
-    *x = unionRect.origin.x;
-    *y = unionRect.origin.y;
-    *width = unionRect.size.width;
-    *height = unionRect.size.height;
-
-    // Tell PseudoramiX about the real screens.
-    // InitOutput() will move the big screen to (0,0),
-    // so compensate for that here.
-    for (i = 0; i < [screens count]; i++) {
-        NSScreen *screen = [screens objectAtIndex:i];
-        NSRect frame = [screen frame];
-        int j;
-
-        // Skip this screen if it's a mirrored copy of an earlier screen.
-        for (j = 0; j < i; j++) {
-            if (NSEqualRects(frame, [[screens objectAtIndex:j] frame])) {
-                ErrorF("PseudoramiX screen %d is a mirror of screen %d.\n",
-                       i, j);
-                break;
-            }
-        }
-        if (j < i) continue; // this screen is a mirrored copy
-
-        frame.origin.y = [[NSScreen mainScreen] frame].size.height -
-                         frame.size.height - frame.origin.y;
-
-        if (NSEqualRects([screen frame], [[NSScreen mainScreen] frame])) {
-            frame.origin.y    += aquaMenuBarHeight;
-            frame.size.height -= aquaMenuBarHeight;
-        }
-
-        ErrorF("PseudoramiX screen %d added: %dx%d @ (%d,%d).\n", i,
-               (int)frame.size.width, (int)frame.size.height,
-               (int)frame.origin.x, (int)frame.origin.y);
-
-        frame.origin.x -= unionRect.origin.x;
-        frame.origin.y -= unionRect.origin.y;
-
-        ErrorF("PseudoramiX screen %d placed at X11 coordinate (%d,%d).\n",
-               i, (int)frame.origin.x, (int)frame.origin.y);
-
-        PseudoramiXAddScreen(frame.origin.x, frame.origin.y,
-                             frame.size.width, frame.size.height);
-    }
-}
-
-
-/*
- * CRScreenParams
- *  Set the basic screen parameters.
- */
-static void
-CRScreenParams(int index, DarwinFramebufferPtr dfb)
-{
-    dfb->bitsPerComponent = CGDisplayBitsPerSample(kCGDirectMainDisplay);
-    dfb->bitsPerPixel = CGDisplayBitsPerPixel(kCGDirectMainDisplay);
-    dfb->colorBitsPerPixel = 3 * dfb->bitsPerComponent;
-
-    if (noPseudoramiXExtension) {
-        NSScreen *screen = [[NSScreen screens] objectAtIndex:index];
-        NSRect frame = [screen frame];
-
-        // set x, y so (0,0) is top left of main screen
-        dfb->x = NSMinX(frame);
-        dfb->y = NSHeight([[NSScreen mainScreen] frame]) -
-                 NSHeight(frame) - NSMinY(frame);
-
-        dfb->width =  NSWidth(frame);
-        dfb->height = NSHeight(frame);
-
-        // Shift the usable part of main screen down to avoid the menu bar.
-        if (NSEqualRects(frame, [[NSScreen mainScreen] frame])) {
-            dfb->y      += aquaMenuBarHeight;
-            dfb->height -= aquaMenuBarHeight;
-        }
-
-    } else {
-        CRAddPseudoramiXScreens(&dfb->x, &dfb->y, &dfb->width, &dfb->height);
-    }
-}
-
-
-/*
- * CRAddScreen
- *  Init the framebuffer and record pixmap parameters for the screen.
- */
-static Bool
-CRAddScreen(int index, ScreenPtr pScreen)
-{
-    DarwinFramebufferPtr dfb = SCREEN_PRIV(pScreen);
-    QuartzScreenPtr displayInfo = QUARTZ_PRIV(pScreen);
-    CGRect cgRect;
-    CGDisplayCount numDisplays;
-    CGDisplayCount allocatedDisplays = 0;
-    CGDirectDisplayID *displays = NULL;
-    CGDisplayErr cgErr;
-
-    CRScreenParams(index, dfb);
-
-    dfb->colorType = TrueColor;
-
-    /* Passing zero width (pitch) makes miCreateScreenResources set the
-       screen pixmap to the framebuffer pointer, i.e. NULL. The generic
-       rootless code takes care of making this work. */
-    dfb->pitch = 0;
-    dfb->framebuffer = NULL;
-
-    // Get all CoreGraphics displays covered by this X11 display.
-    cgRect = CGRectMake(dfb->x, dfb->y, dfb->width, dfb->height);
-    do {
-        cgErr = CGGetDisplaysWithRect(cgRect, 0, NULL, &numDisplays);
-        if (cgErr) break;
-        allocatedDisplays = numDisplays;
-        displays = xrealloc(displays,
-                            numDisplays * sizeof(CGDirectDisplayID));
-        cgErr = CGGetDisplaysWithRect(cgRect, allocatedDisplays, displays,
-                                      &numDisplays);
-        if (cgErr != CGDisplayNoErr) break;
-    } while (numDisplays > allocatedDisplays);
-
-    if (cgErr != CGDisplayNoErr || numDisplays == 0) {
-        ErrorF("Could not find CGDirectDisplayID(s) for X11 screen %d: %dx%d @ %d,%d.\n",
-               index, dfb->width, dfb->height, dfb->x, dfb->y);
-        return FALSE;
-    }
-
-    // This X11 screen covers all CoreGraphics displays we just found.
-    // If there's more than one CG display, then video mirroring is on
-    // or PseudoramiX is on.
-    displayInfo->displayCount = allocatedDisplays;
-    displayInfo->displayIDs = displays;
-
-    return TRUE;
-}
-
-
-/*
- * CRSetupScreen
- *  Setup the screen for rootless access.
- */
-static Bool
-CRSetupScreen(int index, ScreenPtr pScreen)
-{
-    // Add alpha protecting replacements for fb screen functions
-    pScreen->PaintWindowBackground = SafeAlphaPaintWindow;
-    pScreen->PaintWindowBorder = SafeAlphaPaintWindow;
-
-#ifdef RENDER
-    {
-        PictureScreenPtr ps = GetPictureScreen(pScreen);
-        ps->Composite = SafeAlphaComposite;
-    }
-#endif /* RENDER */
-
-    // Initialize accelerated rootless drawing
-    // Note that this must be done before DamageSetup().
-    RootlessAccelInit(pScreen);
-
-#ifdef DAMAGE
-    // The Damage extension needs to wrap underneath the
-    // generic rootless layer, so do it now.
-    if (!DamageSetup(pScreen))
-        return FALSE;
-#endif
-
-    // Initialize generic rootless code
-    return CRInit(pScreen);
-}
-
-
-/*
- * CRScreenChanged
- *  Configuration of displays has changed.
- */
-static void
-CRScreenChanged(void)
-{
-    QuartzMessageServerThread(kXDarwinDisplayChanged, 0);
-}
-
-
-/*
- * CRUpdateScreen
- *  Update screen after configuation change.
- */
-static void
-CRUpdateScreen(ScreenPtr pScreen)
-{
-    rootlessGlobalOffsetX = darwinMainScreenX;
-    rootlessGlobalOffsetY = darwinMainScreenY;
-
-    AppleWMSetScreenOrigin(WindowTable[pScreen->myNum]);
-
-    RootlessRepositionWindows(pScreen);
-    RootlessUpdateScreenPixmap(pScreen);
-}
-
-
-/*
- * CRInitInput
- *  Finalize CR specific setup.
- */
-static void
-CRInitInput(int argc, char **argv)
-{
-    int i;
-
-    rootlessGlobalOffsetX = darwinMainScreenX;
-    rootlessGlobalOffsetY = darwinMainScreenY;
-
-    for (i = 0; i < screenInfo.numScreens; i++)
-        AppleWMSetScreenOrigin(WindowTable[i]);
-}
-
-
-/*
- * CRIsX11Window
- *  Returns TRUE if cr is displaying this window.
- */
-static Bool
-CRIsX11Window(void *nsWindow, int windowNumber)
-{
-    NSWindow *theWindow = nsWindow;
-
-    if (!theWindow)
-        return FALSE;
-
-    if ([[theWindow contentView] isKindOfClass:classXView])
-        return TRUE;
-    else
-        return FALSE;
-}
-
-
-/*
- * Quartz display mode function list.
- */
-static QuartzModeProcsRec crModeProcs = {
-    CRDisplayInit,
-    CRAddScreen,
-    CRSetupScreen,
-    CRInitInput,
-    QuartzInitCursor,
-    QuartzReallySetCursor,
-    QuartzSuspendXCursor,
-    QuartzResumeXCursor,
-    NULL,               // No capture or release in rootless mode
-    NULL,
-    CRScreenChanged,
-    CRAddPseudoramiXScreens,
-    CRUpdateScreen,
-    CRIsX11Window,
-    NULL,               // Cocoa NSWindows hide themselves
-    RootlessFrameForWindow,
-    TopLevelParent,
-    NULL,               // No support for DRI surfaces
-    NULL
-};
-
-
-/*
- * QuartzModeBundleInit
- *  Initialize the display mode bundle after loading.
- */
-Bool
-QuartzModeBundleInit(void)
-{
-    quartzProcs = &crModeProcs;
-    quartzOpenGLBundle = crOpenGLBundle;
-    classXView = [XView class];
-    return TRUE;
-}
diff --git a/hw/darwin/quartz/fullscreen/fullscreen.c b/hw/darwin/quartz/fullscreen/fullscreen.c
deleted file mode 100644
index c4a049f8f..000000000
--- a/hw/darwin/quartz/fullscreen/fullscreen.c
+++ /dev/null
@@ -1,571 +0,0 @@
-/*
- * Screen routines for full screen Quartz mode
- *
- * Copyright (c) 2002-2003 Torrey T. Lyons. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * TORREY T. LYONS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Except as contained in this notice, the name(s) of the above copyright
- * holders shall not be used in advertising or otherwise to promote the sale,
- * use or other dealings in this Software without prior written authorization.
- */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include "quartz/quartzCommon.h"
-#include "darwin.h"
-#include "quartz/quartz.h"
-#include "quartz/quartzCursor.h"
-#include "colormapst.h"
-#include "scrnintstr.h"
-#include "micmap.h"
-#include "shadow.h"
-
-// Full screen specific per screen storage structure
-typedef struct {
-    CGDirectDisplayID   displayID;
-    CFDictionaryRef     xDisplayMode;
-    CFDictionaryRef     aquaDisplayMode;
-    CGDirectPaletteRef  xPalette;
-    CGDirectPaletteRef  aquaPalette;
-    unsigned char      *framebuffer;
-    unsigned char      *shadowPtr;
-} FSScreenRec, *FSScreenPtr;
-
-#define FULLSCREEN_PRIV(pScreen) \
-    ((FSScreenPtr)pScreen->devPrivates[fsScreenIndex].ptr)
-
-static int                  fsScreenIndex;
-static CGDirectDisplayID   *quartzDisplayList = NULL;
-static int                  quartzNumScreens = 0;
-static FSScreenPtr          quartzScreens[MAXSCREENS];
-
-static int                  darwinCmapPrivateIndex = -1;
-static unsigned long        darwinCmapGeneration = 0;
-
-#define CMAP_PRIV(pCmap) \
-    ((CGDirectPaletteRef) (pCmap)->devPrivates[darwinCmapPrivateIndex].ptr)
-
-/*
- =============================================================================
-
- Colormap handling
-
- =============================================================================
-*/
-
-/*
- * FSInitCmapPrivates
- *  Colormap privates may be allocated after the default colormap has
- *  already been created for some screens.  This initialization procedure
- *  is called for each default colormap that is found.
- */
-static Bool
-FSInitCmapPrivates(
-    ColormapPtr         pCmap)
-{
-    return TRUE;
-}
-
-
-/*
- * FSCreateColormap
- *  This is a callback from X after a new colormap is created.
- *  We allocate a new CoreGraphics pallete for each colormap.
- */
-static Bool
-FSCreateColormap(
-    ColormapPtr         pCmap)
-{
-    CGDirectPaletteRef  pallete;
-
-    // Allocate private storage for the hardware dependent colormap info.
-    if (darwinCmapGeneration != serverGeneration) {
-        if ((darwinCmapPrivateIndex =
-                AllocateColormapPrivateIndex(FSInitCmapPrivates)) < 0)
-        {
-            return FALSE;
-        }
-        darwinCmapGeneration = serverGeneration;
-    }
-
-    pallete = CGPaletteCreateDefaultColorPalette();
-    if (!pallete) return FALSE;
-
-    CMAP_PRIV(pCmap) = pallete;
-    return TRUE;
-}
-
-
-/*
- * FSDestroyColormap
- *  This is called by DIX FreeColormap after it has uninstalled a colormap
- *  and notified all interested parties. We deallocated the corresponding
- *  CoreGraphics pallete.
- */
-static void
-FSDestroyColormap(
-    ColormapPtr         pCmap)
-{
-    CGPaletteRelease( CMAP_PRIV(pCmap) );
-}
-
-
-/*
- * FSInstallColormap
- *  Set the current CoreGraphics pallete to the pallete corresponding
- *  to the provided colormap.
- */
-static void
-FSInstallColormap(
-    ColormapPtr         pCmap)
-{
-    CGDirectPaletteRef  palette = CMAP_PRIV(pCmap);
-    ScreenPtr           pScreen = pCmap->pScreen;
-    FSScreenPtr         fsDisplayInfo = FULLSCREEN_PRIV(pScreen);
-
-    // Inform all interested parties that the map is being changed.
-    miInstallColormap(pCmap);
-
-    if (quartzServerVisible)
-        CGDisplaySetPalette(fsDisplayInfo->displayID, palette);
-
-    fsDisplayInfo->xPalette = palette;
-}
-
-
-/*
- * FSStoreColors
- *  This is a callback from X to change the hardware colormap
- *  when using PsuedoColor in full screen mode.
- */
-static void
-FSStoreColors(
-    ColormapPtr         pCmap,
-    int                 numEntries,
-    xColorItem          *pdefs)
-{
-    CGDirectPaletteRef  palette = CMAP_PRIV(pCmap);
-    ScreenPtr           pScreen = pCmap->pScreen;
-    FSScreenPtr         fsDisplayInfo = FULLSCREEN_PRIV(pScreen);
-    CGDeviceColor       color;
-    int                 i;
-
-    if (! palette)
-        return;
-
-    for (i = 0; i < numEntries; i++) {
-        color.red   = pdefs[i].red   / 65535.0;
-        color.green = pdefs[i].green / 65535.0;
-        color.blue  = pdefs[i].blue  / 65535.0;
-        CGPaletteSetColorAtIndex(palette, color, pdefs[i].pixel);
-    }
-
-    // Update hardware colormap
-    if (quartzServerVisible)
-        CGDisplaySetPalette(fsDisplayInfo->displayID, palette);
-}
-
-
-/*
- =============================================================================
-
- Switching between Aqua and X
-
- =============================================================================
-*/
-
-/*
- * FSCapture
- *  Capture the screen so we can draw. Called directly from the main thread
- *  to synchronize with hiding the menubar.
- */
-static void FSCapture(void)
-{
-    int i;
-
-    if (quartzRootless) return;
-
-    for (i = 0; i < quartzNumScreens; i++) {
-        FSScreenPtr fsDisplayInfo = quartzScreens[i];
-        CGDirectDisplayID cgID = fsDisplayInfo->displayID;
-
-        if (!CGDisplayIsCaptured(cgID)) {
-            CGDisplayCapture(cgID);
-            fsDisplayInfo->aquaDisplayMode = CGDisplayCurrentMode(cgID);
-            if (fsDisplayInfo->xDisplayMode != fsDisplayInfo->aquaDisplayMode)
-                CGDisplaySwitchToMode(cgID, fsDisplayInfo->xDisplayMode);
-            if (fsDisplayInfo->xPalette)
-                CGDisplaySetPalette(cgID, fsDisplayInfo->xPalette);
-        }
-    }
-}
-
-
-/*
- * FSRelease
- *  Release the screen so others can draw.
- */
-static void FSRelease(void)
-{
-    int i;
-
-    if (quartzRootless) return;
-
-    for (i = 0; i < quartzNumScreens; i++) {
-        FSScreenPtr fsDisplayInfo = quartzScreens[i];
-        CGDirectDisplayID cgID = fsDisplayInfo->displayID;
-
-        if (CGDisplayIsCaptured(cgID)) {
-            if (fsDisplayInfo->xDisplayMode != fsDisplayInfo->aquaDisplayMode)
-                CGDisplaySwitchToMode(cgID, fsDisplayInfo->aquaDisplayMode);
-            if (fsDisplayInfo->aquaPalette)
-                CGDisplaySetPalette(cgID, fsDisplayInfo->aquaPalette);
-            CGDisplayRelease(cgID);
-        }
-    }
-}
-
-
-/*
- * FSSuspendScreen
- *  Suspend X11 cursor and drawing to the screen.
- */
-static void FSSuspendScreen(
-    ScreenPtr pScreen)
-{
-    QuartzSuspendXCursor(pScreen);
-    xf86SetRootClip(pScreen, FALSE);
-}
-
-
-/*
- * FSResumeScreen
- *  Resume X11 cursor and drawing to the screen.
- */
-static void FSResumeScreen(
-    ScreenPtr pScreen,
-    int x,              // cursor location
-    int y )
-{
-    QuartzResumeXCursor(pScreen, x, y);
-    xf86SetRootClip(pScreen, TRUE);
-}
-
-
-/*
- =============================================================================
-
- Screen initialization
-
- =============================================================================
-*/
-
-/*
- * FSDisplayInit
- *  Full screen specific initialization called from InitOutput.
- */
-static void FSDisplayInit(void)
-{
-    static unsigned long generation = 0;
-    CGDisplayCount quartzDisplayCount = 0;
-
-    ErrorF("Display mode: Full screen Quartz -- Direct Display\n");
-
-    // Allocate private storage for each screen's mode specific info
-    if (generation != serverGeneration) {
-        fsScreenIndex = AllocateScreenPrivateIndex();
-        generation = serverGeneration;
-    }
-
-    // Find all the CoreGraphics displays
-    CGGetActiveDisplayList(0, NULL, &quartzDisplayCount);
-    quartzDisplayList = xalloc(quartzDisplayCount * sizeof(CGDirectDisplayID));
-    CGGetActiveDisplayList(quartzDisplayCount, quartzDisplayList,
-                           &quartzDisplayCount);
-
-    darwinScreensFound = quartzDisplayCount;
-    atexit(FSRelease);
-}
-
-
-/*
- * FSFindDisplayMode
- *  Find the appropriate display mode to use in full screen mode.
- *  If display mode is not the same as the current Aqua mode, switch
- *  to the new mode.
- */
-static Bool FSFindDisplayMode(
-    FSScreenPtr fsDisplayInfo)
-{
-    CGDirectDisplayID cgID = fsDisplayInfo->displayID;
-    size_t height, width, bpp;
-    boolean_t exactMatch;
-
-    fsDisplayInfo->aquaDisplayMode = CGDisplayCurrentMode(cgID);
-
-    // If no user options, use current display mode
-    if (darwinDesiredWidth == 0 && darwinDesiredDepth == -1 &&
-        darwinDesiredRefresh == -1)
-    {
-        fsDisplayInfo->xDisplayMode = fsDisplayInfo->aquaDisplayMode;
-        return TRUE;
-    }
-
-    // If the user has no choice for size, use current
-    if (darwinDesiredWidth == 0) {
-        width = CGDisplayPixelsWide(cgID);
-        height = CGDisplayPixelsHigh(cgID);
-    } else {
-        width = darwinDesiredWidth;
-        height = darwinDesiredHeight;
-    }
-
-    switch (darwinDesiredDepth) {
-        case 0:
-            bpp = 8;
-            break;
-        case 1:
-            bpp = 16;
-            break;
-        case 2:
-            bpp = 32;
-            break;
-        default:
-            bpp = CGDisplayBitsPerPixel(cgID);
-    }
-
-    if (darwinDesiredRefresh == -1) {
-        fsDisplayInfo->xDisplayMode =
-                CGDisplayBestModeForParameters(cgID, bpp, width, height,
-                        &exactMatch);
-    } else {
-        fsDisplayInfo->xDisplayMode =
-                CGDisplayBestModeForParametersAndRefreshRate(cgID, bpp,
-                        width, height, darwinDesiredRefresh, &exactMatch);
-    }
-    if (!exactMatch) {
-        fsDisplayInfo->xDisplayMode = fsDisplayInfo->aquaDisplayMode;
-        return FALSE;
-    }
-
-    // Switch to the new display mode
-    CGDisplaySwitchToMode(cgID, fsDisplayInfo->xDisplayMode);
-    return TRUE;
-}
-
-
-/*
- * FSAddScreen
- *  Do initialization of each screen for Quartz in full screen mode.
- */
-static Bool FSAddScreen(
-    int index,
-    ScreenPtr pScreen)
-{
-    DarwinFramebufferPtr dfb = SCREEN_PRIV(pScreen);
-    QuartzScreenPtr displayInfo = QUARTZ_PRIV(pScreen);
-    CGDirectDisplayID cgID = quartzDisplayList[index];
-    CGRect bounds;
-    FSScreenPtr fsDisplayInfo;
-
-    // Allocate space for private per screen fullscreen specific storage.
-    fsDisplayInfo = xalloc(sizeof(FSScreenRec));
-    FULLSCREEN_PRIV(pScreen) = fsDisplayInfo;
-
-    displayInfo->displayCount = 1;
-    displayInfo->displayIDs = xrealloc(displayInfo->displayIDs,
-                                      1 * sizeof(CGDirectDisplayID));
-    displayInfo->displayIDs[0] = cgID;
-
-    fsDisplayInfo->displayID = cgID;
-    fsDisplayInfo->xDisplayMode = 0;
-    fsDisplayInfo->aquaDisplayMode = 0;
-    fsDisplayInfo->xPalette = 0;
-    fsDisplayInfo->aquaPalette = 0;
-
-    // Capture full screen because X doesn't like read-only framebuffer.
-    // We need to do this before we (potentially) switch the display mode.
-    CGDisplayCapture(cgID);
-
-    if (! FSFindDisplayMode(fsDisplayInfo)) {
-        ErrorF("Could not support specified display mode on screen %i.\n",
-               index);
-        xfree(fsDisplayInfo);
-        return FALSE;
-    }
-
-    // Don't need to flip y-coordinate as CoreGraphics treats (0, 0)
-    // as the top left of main screen.
-    bounds = CGDisplayBounds(cgID);
-    dfb->x = bounds.origin.x;
-    dfb->y = bounds.origin.y;
-    dfb->width  = bounds.size.width;
-    dfb->height = bounds.size.height;
-    dfb->pitch = CGDisplayBytesPerRow(cgID);
-    dfb->bitsPerPixel = CGDisplayBitsPerPixel(cgID);
-
-    if (dfb->bitsPerPixel == 8) {
-        if (CGDisplayCanSetPalette(cgID)) {
-            dfb->colorType = PseudoColor;
-        } else {
-            dfb->colorType = StaticColor;
-        }
-        dfb->bitsPerComponent = 8;
-        dfb->colorBitsPerPixel = 8;
-    } else {
-        dfb->colorType = TrueColor;
-        dfb->bitsPerComponent = CGDisplayBitsPerSample(cgID);
-        dfb->colorBitsPerPixel = CGDisplaySamplesPerPixel(cgID) *
-                                 dfb->bitsPerComponent;
-    }
-
-    fsDisplayInfo->framebuffer = CGDisplayBaseAddress(cgID);
-
-    // allocate shadow framebuffer
-    fsDisplayInfo->shadowPtr = xalloc(dfb->pitch * dfb->height);
-    dfb->framebuffer = fsDisplayInfo->shadowPtr;
-
-    return TRUE;
-}
-
-
-/*
- * FSShadowUpdate
- *  Update the damaged regions of the shadow framebuffer on the display.
- */
-static void FSShadowUpdate(
-    ScreenPtr pScreen,
-    shadowBufPtr pBuf)
-{
-    DarwinFramebufferPtr dfb = SCREEN_PRIV(pScreen);
-    FSScreenPtr fsDisplayInfo = FULLSCREEN_PRIV(pScreen);
-    RegionPtr damage = &pBuf->damage;
-    int numBox = REGION_NUM_RECTS(damage);
-    BoxPtr pBox = REGION_RECTS(damage);
-    int pitch = dfb->pitch;
-    int bpp = dfb->bitsPerPixel/8;
-
-    // Don't update if the X server is not visible
-    if (!quartzServerVisible)
-        return;
-
-    // Loop through all the damaged boxes
-    while (numBox--) {
-        int width, height, offset;
-        unsigned char *src, *dst;
-
-        width = (pBox->x2 - pBox->x1) * bpp;
-        height = pBox->y2 - pBox->y1;
-        offset = (pBox->y1 * pitch) + (pBox->x1 * bpp);
-        src = fsDisplayInfo->shadowPtr + offset;
-        dst = fsDisplayInfo->framebuffer + offset;
-
-        while (height--) {
-            memcpy(dst, src, width);
-            dst += pitch;
-            src += pitch;
-        }
-
-        // Get the next box
-        pBox++;
-    }
-}
-
-
-/*
- * FSSetupScreen
- *  Finalize full screen specific setup of each screen.
- */
-static Bool FSSetupScreen(
-    int index,
-    ScreenPtr pScreen)
-{
-    DarwinFramebufferPtr dfb = SCREEN_PRIV(pScreen);
-    FSScreenPtr fsDisplayInfo = FULLSCREEN_PRIV(pScreen);
-    CGDirectDisplayID cgID = fsDisplayInfo->displayID;
-
-    // Initialize shadow framebuffer support
-    if (! shadowInit(pScreen, FSShadowUpdate, NULL)) {
-        ErrorF("Failed to initalize shadow framebuffer for screen %i.\n",
-               index);
-        return FALSE;
-    }
-
-    if (dfb->colorType == PseudoColor) {
-        // Initialize colormap handling
-        size_t aquaBpp;
-
-        // If Aqua is using 8 bits we need to keep track of its pallete.
-        CFNumberGetValue(CFDictionaryGetValue(fsDisplayInfo->aquaDisplayMode,
-                         kCGDisplayBitsPerPixel), kCFNumberLongType, &aquaBpp);
-        if (aquaBpp <= 8)
-            fsDisplayInfo->aquaPalette = CGPaletteCreateWithDisplay(cgID);
-
-        pScreen->CreateColormap = FSCreateColormap;
-        pScreen->DestroyColormap = FSDestroyColormap;
-        pScreen->InstallColormap = FSInstallColormap;
-        pScreen->StoreColors = FSStoreColors;
-
-    }
-
-    quartzScreens[quartzNumScreens++] = fsDisplayInfo;
-    return TRUE;
-}
-
-
-/*
- * Quartz display mode function list.
- */
-static QuartzModeProcsRec fsModeProcs = {
-    FSDisplayInit,
-    FSAddScreen,
-    FSSetupScreen,
-    NULL,                   // Not needed
-    QuartzInitCursor,
-    QuartzReallySetCursor,
-    FSSuspendScreen,
-    FSResumeScreen,
-    FSCapture,
-    FSRelease,
-    NULL,                   // No dynamic screen change support
-    NULL,
-    NULL,
-    NULL,                   // No rootless code in fullscreen
-    NULL,
-    NULL,
-    NULL,
-    NULL,                   // No support for DRI surfaces
-    NULL
-};
-
-
-/*
- * QuartzModeBundleInit
- *  Initialize the display mode bundle after loading.
- */
-Bool
-QuartzModeBundleInit(void)
-{
-    quartzProcs = &fsModeProcs;
-    quartzOpenGLBundle = NULL;  // Only Mesa support for now
-    return TRUE;
-}
diff --git a/hw/darwin/quartz/fullscreen/quartzCursor.c b/hw/darwin/quartz/fullscreen/quartzCursor.c
deleted file mode 100644
index 3ffa1c3d8..000000000
--- a/hw/darwin/quartz/fullscreen/quartzCursor.c
+++ /dev/null
@@ -1,654 +0,0 @@
-/**************************************************************
- *
- * Support for using the Quartz Window Manager cursor
- *
- * Copyright (c) 2001-2003 Torrey T. Lyons and Greg Parker.
- *                 All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name(s) of the above copyright
- * holders shall not be used in advertising or otherwise to promote the sale,
- * use or other dealings in this Software without prior written authorization.
- */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include "quartz/quartzCommon.h"
-#include "quartz/quartzCursor.h"
-#include "darwin.h"
-
-#include <pthread.h>
-
-#include "mi.h"
-#include "scrnintstr.h"
-#include "cursorstr.h"
-#include "mipointrst.h"
-#include "globals.h"
-
-// Size of the QuickDraw cursor
-#define CURSORWIDTH 16
-#define CURSORHEIGHT 16
-
-typedef struct {
-    int                     qdCursorMode;
-    int                     qdCursorVisible;
-    int                     useQDCursor;
-    QueryBestSizeProcPtr    QueryBestSize;
-    miPointerSpriteFuncPtr  spriteFuncs;
-} QuartzCursorScreenRec, *QuartzCursorScreenPtr;
-
-static int darwinCursorScreenIndex = -1;
-static unsigned long darwinCursorGeneration = 0;
-static CursorPtr quartzLatentCursor = NULL;
-static QD_Cursor gQDArrow; // QuickDraw arrow cursor
-
-// Cursor for the main thread to set (NULL = arrow cursor).
-static CCrsrHandle currentCursor = NULL;
-static pthread_mutex_t cursorMutex;
-static pthread_cond_t cursorCondition;
-
-#define CURSOR_PRIV(pScreen) \
-    ((QuartzCursorScreenPtr)pScreen->devPrivates[darwinCursorScreenIndex].ptr)
-
-#define HIDE_QD_CURSOR(pScreen, visible)                                \
-    if (visible) {                                                      \
-        int ix;                                                         \
-        for (ix = 0; ix < QUARTZ_PRIV(pScreen)->displayCount; ix++) {   \
-            CGDisplayHideCursor(QUARTZ_PRIV(pScreen)->displayIDs[ix]);  \
-        }                                                               \
-        visible = FALSE;                                                \
-    } ((void)0)
-
-#define SHOW_QD_CURSOR(pScreen, visible)                                \
-    {                                                                   \
-        int ix;                                                         \
-        for (ix = 0; ix < QUARTZ_PRIV(pScreen)->displayCount; ix++) {   \
-            CGDisplayShowCursor(QUARTZ_PRIV(pScreen)->displayIDs[ix]);  \
-        }                                                               \
-        visible = TRUE;                                                 \
-    } ((void)0)
-
-#define CHANGE_QD_CURSOR(cursorH)                                       \
-    if (!quartzServerQuitting) {                                        \
-        /* Acquire lock and tell the main thread to change cursor */    \
-        pthread_mutex_lock(&cursorMutex);                               \
-        currentCursor = (CCrsrHandle) (cursorH);                        \
-        QuartzMessageMainThread(kQuartzCursorUpdate, NULL, 0);          \
-                                                                        \
-        /* Wait for the main thread to change the cursor */             \
-        pthread_cond_wait(&cursorCondition, &cursorMutex);              \
-        pthread_mutex_unlock(&cursorMutex);                             \
-    } ((void)0)
-
-
-/*
- * MakeQDCursor helpers: CTAB_ENTER, interleave
- */
-
-// Add a color entry to a ctab
-#define CTAB_ENTER(ctab, index, r, g, b)                                \
-    ctab->ctTable[index].value = index;                                 \
-    ctab->ctTable[index].rgb.red = r;                                   \
-    ctab->ctTable[index].rgb.green = g;                                 \
-    ctab->ctTable[index].rgb.blue = b
-
-// Make an unsigned short by interleaving the bits of bytes c1 and c2.
-// High bit of c1 is first; low bit of c2 is last.
-// Interleave is a built-in INTERCAL operator.
-static unsigned short
-interleave(
-    unsigned char c1,
-    unsigned char c2 )
-{
-    return
-        ((c1 & 0x80) << 8) | ((c2 & 0x80) << 7) |
-        ((c1 & 0x40) << 7) | ((c2 & 0x40) << 6) |
-        ((c1 & 0x20) << 6) | ((c2 & 0x20) << 5) |
-        ((c1 & 0x10) << 5) | ((c2 & 0x10) << 4) |
-        ((c1 & 0x08) << 4) | ((c2 & 0x08) << 3) |
-        ((c1 & 0x04) << 3) | ((c2 & 0x04) << 2) |
-        ((c1 & 0x02) << 2) | ((c2 & 0x02) << 1) |
-        ((c1 & 0x01) << 1) | ((c2 & 0x01) << 0) ;
-}
-
-/*
- * MakeQDCursor
- * Make a QuickDraw color cursor from the given X11 cursor.
- * Warning: This code is nasty. Color cursors were meant to be read
- * from resources; constructing the structures programmatically is messy.
- */
-/*
-    QuickDraw cursor representation:
-    Our color cursor is a 2 bit per pixel pixmap.
-    Each pixel's bits are (source<<1 | mask) from the original X cursor pixel.
-    The cursor's color table maps the colors like this:
-    (2-bit value | X result    | colortable | Mac result)
-             00  | transparent | white      | transparent (white outside mask)
-             01  | back color  | back color | back color
-             10  | undefined   | black      | invert background (just for fun)
-             11  | fore color  | fore color | fore color
-*/
-static CCrsrHandle
-MakeQDCursor(
-    CursorPtr pCursor )
-{
-    CCrsrHandle result;
-    CCrsrPtr curs;
-    int i, w, h;
-    unsigned short rowMask;
-    PixMap *pix;
-    ColorTable *ctab;
-    unsigned short *image;
-
-    result = (CCrsrHandle) NewHandleClear(sizeof(CCrsr));
-    if (!result) return NULL;
-    HLock((Handle)result);
-    curs = *result;
-
-    // Initialize CCrsr
-    curs->crsrType = 0x8001;     // 0x8000 = b&w, 0x8001 = color
-    curs->crsrMap = (PixMapHandle) NewHandleClear(sizeof(PixMap));
-    if (!curs->crsrMap) goto pixAllocFailed;
-    HLock((Handle)curs->crsrMap);
-    pix = *curs->crsrMap;
-    curs->crsrData = NULL;       // raw cursor image data (set below)
-    curs->crsrXData = NULL;      // QD's processed data
-    curs->crsrXValid = 0;        // zero means QD must re-process cursor data
-    curs->crsrXHandle = NULL;    // reserved
-    memset(curs->crsr1Data, 0, CURSORWIDTH*CURSORHEIGHT/8); // b&w data
-    memset(curs->crsrMask,  0, CURSORWIDTH*CURSORHEIGHT/8); // b&w & color mask
-    curs->crsrHotSpot.h = min(CURSORWIDTH,  pCursor->bits->xhot); // hot spot
-    curs->crsrHotSpot.v = min(CURSORHEIGHT, pCursor->bits->yhot); // hot spot
-    curs->crsrXTable = 0;        // reserved
-    curs->crsrID = GetCTSeed();  // unique ID from Color Manager
-
-    // Set the b&w data and mask
-    w = min(pCursor->bits->width,  CURSORWIDTH);
-    h = min(pCursor->bits->height, CURSORHEIGHT);
-    rowMask = ~((1 << (CURSORWIDTH - w)) - 1);
-    for (i = 0; i < h; i++) {
-        curs->crsr1Data[i] = rowMask &
-        ((pCursor->bits->source[i*4]<<8) | pCursor->bits->source[i*4+1]);
-        curs->crsrMask[i] = rowMask &
-        ((pCursor->bits->mask[i*4]<<8)   | pCursor->bits->mask[i*4+1]);
-    }
-
-    // Set the color data and mask
-    // crsrMap: defines bit depth and size and colortable only
-    pix->rowBytes = (CURSORWIDTH * 2 / 8) | 0x8000; // last bit on means PixMap
-    SetRect(&pix->bounds, 0, 0, CURSORWIDTH, CURSORHEIGHT); // see TN 1020
-    pix->pixelSize = 2;
-    pix->cmpCount = 1;
-    pix->cmpSize = 2;
-    // pix->pmTable set below
-
-    // crsrData is the pixel data. crsrMap's baseAddr is not used.
-    curs->crsrData = NewHandleClear(CURSORWIDTH*CURSORHEIGHT * 2 / 8);
-    if (!curs->crsrData) goto imageAllocFailed;
-    HLock((Handle)curs->crsrData);
-    image = (unsigned short *) *curs->crsrData;
-    // Pixel data is just 1-bit data and mask interleaved (see above)
-    for (i = 0; i < h; i++) {
-        unsigned char s, m;
-        s = pCursor->bits->source[i*4] & (rowMask >> 8);
-        m = pCursor->bits->mask[i*4] & (rowMask >> 8);
-        image[2*i] = interleave(s, m);
-        s = pCursor->bits->source[i*4+1] & (rowMask & 0x00ff);
-        m = pCursor->bits->mask[i*4+1] & (rowMask & 0x00ff);
-        image[2*i+1] = interleave(s, m);
-    }
-
-    // Build the color table (entries described above)
-    // NewPixMap allocates a color table handle.
-    pix->pmTable = (CTabHandle) NewHandleClear(sizeof(ColorTable) + 3
-                    * sizeof(ColorSpec));
-    if (!pix->pmTable) goto ctabAllocFailed;
-    HLock((Handle)pix->pmTable);
-    ctab = *pix->pmTable;
-    ctab->ctSeed = GetCTSeed();
-    ctab->ctFlags = 0;
-    ctab->ctSize = 3; // color count - 1
-    CTAB_ENTER(ctab, 0, 0xffff, 0xffff, 0xffff);
-    CTAB_ENTER(ctab, 1, pCursor->backRed, pCursor->backGreen,
-               pCursor->backBlue);
-    CTAB_ENTER(ctab, 2, 0x0000, 0x0000, 0x0000);
-    CTAB_ENTER(ctab, 3, pCursor->foreRed, pCursor->foreGreen,
-               pCursor->foreBlue);
-
-    HUnlock((Handle)pix->pmTable); // ctab
-    HUnlock((Handle)curs->crsrData); // image data
-    HUnlock((Handle)curs->crsrMap); // pix
-    HUnlock((Handle)result); // cursor
-
-    return result;
-
-    // "What we have here is a failure to allocate"
-ctabAllocFailed:
-    HUnlock((Handle)curs->crsrData);
-    DisposeHandle((Handle)curs->crsrData);
-imageAllocFailed:
-    HUnlock((Handle)curs->crsrMap);
-    DisposeHandle((Handle)curs->crsrMap);
-pixAllocFailed:
-    HUnlock((Handle)result);
-    DisposeHandle((Handle)result);
-    return NULL;
-}
-
-
-/*
- * FreeQDCursor
- * Destroy a QuickDraw color cursor created with MakeQDCursor().
- * The cursor must not currently be on screen.
- */
-static void FreeQDCursor(CCrsrHandle cursHandle)
-{
-    CCrsrPtr curs;
-    PixMap *pix;
-
-    HLock((Handle)cursHandle);
-    curs = *cursHandle;
-    HLock((Handle)curs->crsrMap);
-    pix = *curs->crsrMap;
-    DisposeHandle((Handle)pix->pmTable);
-    HUnlock((Handle)curs->crsrMap);
-    DisposeHandle((Handle)curs->crsrMap);
-    DisposeHandle((Handle)curs->crsrData);
-    HUnlock((Handle)cursHandle);
-    DisposeHandle((Handle)cursHandle);
-}
-
-
-/*
-===========================================================================
-
- Pointer sprite functions
-
-===========================================================================
-*/
-
-/*
- * QuartzRealizeCursor
- * Convert the X cursor representation to QuickDraw format if possible.
- */
-Bool
-QuartzRealizeCursor(
-    ScreenPtr pScreen,
-    CursorPtr pCursor )
-{
-    CCrsrHandle qdCursor;
-    QuartzCursorScreenPtr ScreenPriv = CURSOR_PRIV(pScreen);
-
-    if(!pCursor || !pCursor->bits)
-        return FALSE;
-
-    // if the cursor is too big we use a software cursor
-    if ((pCursor->bits->height > CURSORHEIGHT) ||
-        (pCursor->bits->width > CURSORWIDTH) || !ScreenPriv->useQDCursor)
-    {
-        if (quartzRootless) {
-            // rootless can't use a software cursor
-            return TRUE;
-        } else {
-            return (*ScreenPriv->spriteFuncs->RealizeCursor)
-                        (pScreen, pCursor);
-        }
-    }
-
-    // make new cursor image
-    qdCursor = MakeQDCursor(pCursor);
-    if (!qdCursor) return FALSE;
-
-    // save the result
-    pCursor->devPriv[pScreen->myNum] = (pointer) qdCursor;
-
-    return TRUE;
-}
-
-
-/*
- * QuartzUnrealizeCursor
- * Free the storage space associated with a realized cursor.
- */
-Bool
-QuartzUnrealizeCursor(
-    ScreenPtr pScreen,
-    CursorPtr pCursor )
-{
-    QuartzCursorScreenPtr ScreenPriv = CURSOR_PRIV(pScreen);
-
-    if ((pCursor->bits->height > CURSORHEIGHT) ||
-        (pCursor->bits->width > CURSORWIDTH) || !ScreenPriv->useQDCursor)
-    {
-        if (quartzRootless) {
-            return TRUE;
-        } else {
-            return (*ScreenPriv->spriteFuncs->UnrealizeCursor)
-                        (pScreen, pCursor);
-        }
-    } else {
-        CCrsrHandle oldCursor = (CCrsrHandle) pCursor->devPriv[pScreen->myNum];
-
-        if (currentCursor != oldCursor) {
-            // This should only fail when quitting, in which case we just leak.
-            FreeQDCursor(oldCursor);
-        }
-        pCursor->devPriv[pScreen->myNum] = NULL;
-        return TRUE;
-    }
-}
-
-
-/*
- * QuartzSetCursor
- * Set the cursor sprite and position.
- * Use QuickDraw cursor if possible.
- */
-static void
-QuartzSetCursor(
-    ScreenPtr       pScreen,
-    CursorPtr       pCursor,
-    int             x,
-    int             y)
-{
-    QuartzCursorScreenPtr ScreenPriv = CURSOR_PRIV(pScreen);
-
-    quartzLatentCursor = pCursor;
-
-    // Don't touch Mac OS cursor if X is hidden!
-    if (!quartzServerVisible)
-        return;
-
-    if (!pCursor) {
-        // Remove the cursor completely.
-        HIDE_QD_CURSOR(pScreen, ScreenPriv->qdCursorVisible);
-        if (! ScreenPriv->qdCursorMode)
-            (*ScreenPriv->spriteFuncs->SetCursor)(pScreen, 0, x, y);
-    }
-    else if ((pCursor->bits->height <= CURSORHEIGHT) &&
-             (pCursor->bits->width <= CURSORWIDTH) && ScreenPriv->useQDCursor)
-    {
-        // Cursor is small enough to use QuickDraw directly.
-        if (! ScreenPriv->qdCursorMode)    // remove the X cursor
-            (*ScreenPriv->spriteFuncs->SetCursor)(pScreen, 0, x, y);
-        ScreenPriv->qdCursorMode = TRUE;
-
-        CHANGE_QD_CURSOR(pCursor->devPriv[pScreen->myNum]);
-        SHOW_QD_CURSOR(pScreen, ScreenPriv->qdCursorVisible);
-    }
-    else if (quartzRootless) {
-        // Rootless can't use a software cursor, so we just use Mac OS arrow.
-        CHANGE_QD_CURSOR(NULL);
-        SHOW_QD_CURSOR(pScreen, ScreenPriv->qdCursorVisible);
-    }
-    else {
-        // Cursor is too big for QuickDraw. Use X software cursor.
-        HIDE_QD_CURSOR(pScreen, ScreenPriv->qdCursorVisible);
-        ScreenPriv->qdCursorMode = FALSE;
-        (*ScreenPriv->spriteFuncs->SetCursor)(pScreen, pCursor, x, y);
-    }
-}
-
-
-/*
- * QuartzReallySetCursor
- * Set the QuickDraw cursor. Called from the main thread since changing the
- * cursor with QuickDraw is not thread safe on dual processor machines.
- */
-void
-QuartzReallySetCursor()
-{
-    pthread_mutex_lock(&cursorMutex);
-
-    if (currentCursor) {
-        SetCCursor(currentCursor);
-    } else {
-        SetCursor(&gQDArrow);
-    }
-
-    pthread_cond_signal(&cursorCondition);
-    pthread_mutex_unlock(&cursorMutex);
-}
-
-
-/*
- * QuartzMoveCursor
- * Move the cursor. This is a noop for QuickDraw.
- */
-static void
-QuartzMoveCursor(
-    ScreenPtr   pScreen,
-    int         x,
-    int         y)
-{
-    QuartzCursorScreenPtr ScreenPriv = CURSOR_PRIV(pScreen);
-
-    // only the X cursor needs to be explicitly moved
-    if (!ScreenPriv->qdCursorMode)
-        (*ScreenPriv->spriteFuncs->MoveCursor)(pScreen, x, y);
-}
-
-
-static miPointerSpriteFuncRec quartzSpriteFuncsRec = {
-    QuartzRealizeCursor,
-    QuartzUnrealizeCursor,
-    QuartzSetCursor,
-    QuartzMoveCursor
-};
-
-
-/*
-===========================================================================
-
- Pointer screen functions
-
-===========================================================================
-*/
-
-/*
- * QuartzCursorOffScreen
- */
-static Bool QuartzCursorOffScreen(ScreenPtr *pScreen, int *x, int *y)
-{
-    return FALSE;
-}
-
-
-/*
- * QuartzCrossScreen
- */
-static void QuartzCrossScreen(ScreenPtr pScreen, Bool entering)
-{
-    return;
-}
-
-
-/*
- * QuartzWarpCursor
- *  Change the cursor position without generating an event or motion history.
- *  The input coordinates (x,y) are in pScreen-local X11 coordinates.
- *
- */
-static void
-QuartzWarpCursor(
-    ScreenPtr               pScreen,
-    int                     x,
-    int                     y)
-{
-    static int              neverMoved = TRUE;
-
-    if (neverMoved) {
-        // Don't move the cursor the first time. This is the jump-to-center
-        // initialization, and it's annoying because we may still be in MacOS.
-        neverMoved = FALSE;
-        return;
-    }
-
-    if (quartzServerVisible) {
-        CGDisplayErr        cgErr;
-        CGPoint             cgPoint;
-        // Only need to do this for one display. Any display will do.
-        CGDirectDisplayID   cgID = QUARTZ_PRIV(pScreen)->displayIDs[0];
-        CGRect              cgRect = CGDisplayBounds(cgID);
-
-        // Convert (x,y) to CoreGraphics screen-local CG coordinates.
-        // This is necessary because the X11 screen and CG screen may not
-        // coincide. (e.g. X11 screen may be moved to dodge the menu bar)
-
-        // Make point in X11 global coordinates
-        cgPoint = CGPointMake(x + dixScreenOrigins[pScreen->myNum].x,
-                              y + dixScreenOrigins[pScreen->myNum].y);
-        // Shift to CoreGraphics global screen coordinates
-        cgPoint.x += darwinMainScreenX;
-        cgPoint.y += darwinMainScreenY;
-        // Shift to CoreGraphics screen-local coordinates
-        cgPoint.x -= cgRect.origin.x;
-        cgPoint.y -= cgRect.origin.y;
-
-        cgErr = CGDisplayMoveCursorToPoint(cgID, cgPoint);
-        if (cgErr != CGDisplayNoErr) {
-            ErrorF("Could not set cursor position with error code 0x%x.\n",
-                    cgErr);
-        }
-    }
-
-    miPointerWarpCursor(pScreen, x, y);
-    miPointerUpdate();
-}
-
-
-static miPointerScreenFuncRec quartzScreenFuncsRec = {
-    QuartzCursorOffScreen,
-    QuartzCrossScreen,
-    QuartzWarpCursor,
-    DarwinEQPointerPost,
-    DarwinEQSwitchScreen
-};
-
-
-/*
-===========================================================================
-
- Other screen functions
-
-===========================================================================
-*/
-
-/*
- * QuartzCursorQueryBestSize
- * Handle queries for best cursor size
- */
-static void
-QuartzCursorQueryBestSize(
-   int              class,
-   unsigned short   *width,
-   unsigned short   *height,
-   ScreenPtr        pScreen)
-{
-    QuartzCursorScreenPtr ScreenPriv = CURSOR_PRIV(pScreen);
-
-    if (class == CursorShape) {
-        *width = CURSORWIDTH;
-        *height = CURSORHEIGHT;
-    } else {
-        (*ScreenPriv->QueryBestSize)(class, width, height, pScreen);
-    }
-}
-
-
-/*
- * QuartzInitCursor
- * Initialize cursor support
- */
-Bool
-QuartzInitCursor(
-    ScreenPtr   pScreen )
-{
-    QuartzCursorScreenPtr   ScreenPriv;
-    miPointerScreenPtr      PointPriv;
-    DarwinFramebufferPtr    dfb = SCREEN_PRIV(pScreen);
-
-    // initialize software cursor handling (always needed as backup)
-    if (!miDCInitialize(pScreen, &quartzScreenFuncsRec)) {
-        return FALSE;
-    }
-
-    // allocate private storage for this screen's QuickDraw cursor info
-    if (darwinCursorGeneration != serverGeneration) {
-        if ((darwinCursorScreenIndex = AllocateScreenPrivateIndex()) < 0)
-            return FALSE;
-        darwinCursorGeneration = serverGeneration;
-    }
-
-    ScreenPriv = xcalloc( 1, sizeof(QuartzCursorScreenRec) );
-    if (!ScreenPriv) return FALSE;
-
-    CURSOR_PRIV(pScreen) = ScreenPriv;
-
-    // override some screen procedures
-    ScreenPriv->QueryBestSize = pScreen->QueryBestSize;
-    pScreen->QueryBestSize = QuartzCursorQueryBestSize;
-
-    // initialize QuickDraw cursor handling
-    GetQDGlobalsArrow(&gQDArrow);
-    PointPriv = (miPointerScreenPtr)
-                    pScreen->devPrivates[miPointerScreenIndex].ptr;
-
-    ScreenPriv->spriteFuncs = PointPriv->spriteFuncs;
-    PointPriv->spriteFuncs = &quartzSpriteFuncsRec;
-
-    if (!quartzRootless)
-        ScreenPriv->useQDCursor = QuartzFSUseQDCursor(dfb->colorBitsPerPixel);
-    else
-        ScreenPriv->useQDCursor = TRUE;
-    ScreenPriv->qdCursorMode = TRUE;
-    ScreenPriv->qdCursorVisible = TRUE;
-
-    // initialize cursor mutex lock
-    pthread_mutex_init(&cursorMutex, NULL);
-
-    // initialize condition for waiting
-    pthread_cond_init(&cursorCondition, NULL);
-
-    return TRUE;
-}
-
-
-// X server is hiding. Restore the Aqua cursor.
-void QuartzSuspendXCursor(
-    ScreenPtr pScreen )
-{
-    QuartzCursorScreenPtr ScreenPriv = CURSOR_PRIV(pScreen);
-
-    CHANGE_QD_CURSOR(NULL);
-    SHOW_QD_CURSOR(pScreen, ScreenPriv->qdCursorVisible);
-}
-
-
-// X server is showing. Restore the X cursor.
-void QuartzResumeXCursor(
-    ScreenPtr pScreen,
-    int x,
-    int y )
-{
-    QuartzSetCursor(pScreen, quartzLatentCursor, x, y);
-}
diff --git a/hw/darwin/quartz/fullscreen/quartzCursor.h b/hw/darwin/quartz/fullscreen/quartzCursor.h
deleted file mode 100644
index 56a02098d..000000000
--- a/hw/darwin/quartz/fullscreen/quartzCursor.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * quartzCursor.h
- *
- * External interface for Quartz hardware cursor
- *
- * Copyright (c) 2001 Torrey T. Lyons and Greg Parker.
- *                 All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name(s) of the above copyright
- * holders shall not be used in advertising or otherwise to promote the sale,
- * use or other dealings in this Software without prior written authorization.
- */
-
-#ifndef QUARTZCURSOR_H
-#define QUARTZCURSOR_H
-
-#include "screenint.h"
-
-Bool QuartzInitCursor(ScreenPtr pScreen);
-void QuartzReallySetCursor(void);
-void QuartzSuspendXCursor(ScreenPtr pScreen);
-void QuartzResumeXCursor(ScreenPtr pScreen, int x, int y);
-
-#endif
diff --git a/hw/darwin/utils/Makefile.am b/hw/darwin/utils/Makefile.am
deleted file mode 100644
index 911e14d53..000000000
--- a/hw/darwin/utils/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-bin_PROGRAMS = dumpkeymap
-
-dumpkeymap_SOURCES = dumpkeymap.c
-
-dumpkeymap_LDFLAGS = -Wl,-framework,IOKit
-
-man1_MANS = dumpkeymap.man
-
-EXTRA_DIST = \
-	     README.txt \
-	     dumpkeymap.man
diff --git a/hw/darwin/utils/README.txt b/hw/darwin/utils/README.txt
deleted file mode 100644
index 1dd64794e..000000000
--- a/hw/darwin/utils/README.txt
+++ /dev/null
@@ -1,107 +0,0 @@
-dumpkeymap - Diagnostic dump and detailed description of .keymapping files
-Version 4
-
-Copyright (C)1999,2000 by Eric Sunshine <sunshine@sunshineco.com>
-Eric Sunshine, 1 December 2000
-
-OVERVIEW
-========
-This package contains the diagnostic utility dumpkeymap, as well as highly
-detailed documentation describing the internal layout of the Apple/NeXT
-.keymapping file.
-
-The dumpkeymap utility displays detailed information about each .keymapping
-file mentioned on the command-line.  On Apple and NeXT platforms, if no
-.keymapping files are mentioned on the command-line, then it will instead
-dissect the key mapping currently in use by the WindowServer and AppKit.
-
-Documentation includes a thorough and detailed description of the internal
-layout of the .keymapping file, as well as an explanation of how to interpret
-the output of dumpkeymap.
-
-The complete set of documentation is available for perusal via dumpkeymap's
-manual page (dumpkeymap.1), as well as via the command-line options described
-below.
-
-    --help
-	Usage summary.
-    --help-keymapping
-	Detailed discussion of the internal format of a .keymapping file.
-    --help-output
-	Explanation of dumpkeymap's output.
-    --help-files
-	List of key mapping-related files and directories.
-    --help-diagnostics
-	Explanation of diagnostic messages.
-
-Once the manual page is been installed, documentation can also be accessed
-with the Unix `man' command:
-
-    % man dumpkeymap
-
-
-COMPILATION
-===========
-MacOS/X, Darwin
-
-    cc -Wall -o dumpkeymap dumpkeymap.c -framework IOKit
-
-MacOS/X DP4 (Developer Preview 4)
-
-    cc -Wall -o dumpkeymap dumpkeymap.c -FKernel -framework IOKit
-
-MacOS/X Server, OpenStep, NextStep
-
-    cc -Wall -o dumpkeymap dumpkeymap.c
-
-By default, dumpkeymap is configured to interface with the HID driver (Apple)
-or event-status driver (NeXT), thus allowing it to dump the key mapping which
-is currently in use by the WindowServer and AppKit.  However, these facilities
-are specific to Apple/NeXT.  In order to build dumpkeymap for non-Apple/NeXT
-platforms, you must define the DUMPKEYMAP_FILE_ONLY flag when compiling the
-program.  This flag inhibits use of the HID and event-status drivers and
-configures dumpkeymap to work strictly with raw key mapping files.
-
-For example, to compile for Linux:
-
-    gcc -Wall -DDUMPKEYMAP_FILE_ONLY -o dumpkeymap dumpkeymap.c
-
-
-INSTALLATION
-============
-Install the dumpkeymap executable image in a location mentioned in the PATH
-environment variable.  Typicall locations for executable files are:
-
-    /usr/local/bin
-    $(HOME)/bin
-
-Install the manual page, dumpkeymap.1, in the `man1' subdirectory one of the
-standard manual page locations or in any other location mentioned by the
-MANPATH environment variable.
-
-Typical locations for manual pages on most Unix platforms are:
-
-    /usr/local/man/man1
-
-Typical locations for manual pages on MacOS/X, Darwin, and MacOS/X Server are:
-
-    /usr/local/man/man1
-    /Local/Documentation/ManPages/man1
-    /Network/Documentation/ManPages/man1
-
-Typical locations for manual pages on OpenStep and NextStep are:
-
-    /usr/local/man/man1
-    /LocalLibrary/Documentation/ManPages/man1
-    /LocalDeveloper/Documentation/ManPages/man1
-
-
-CONCLUSION
-==========
-This program and its accompanying documentation were written by Eric Sunshine
-and are copyright (C)1999,2000 by Eric Sunshine <sunshine@sunshineco.com>.
-
-The implementation of dumpkeymap is based upon information gathered on
-September 3, 1997 by Eric Sunshine <sunshine@sunshineco.com> and Paul S.
-McCarthy <zarnuk@zarnuk.com> during an effort to reverse engineer the format
-of the NeXT .keymapping file.
diff --git a/hw/darwin/utils/dumpkeymap.c b/hw/darwin/utils/dumpkeymap.c
deleted file mode 100644
index 0c8bdcd01..000000000
--- a/hw/darwin/utils/dumpkeymap.c
+++ /dev/null
@@ -1,1453 +0,0 @@
-//=============================================================================
-//
-// Copyright (C) 1999,2000 by Eric Sunshine <sunshine@sunshineco.com>
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-//   1. Redistributions of source code must retain the above copyright
-//      notice, this list of conditions and the following disclaimer.
-//   2. Redistributions in binary form must reproduce the above copyright
-//      notice, this list of conditions and the following disclaimer in the
-//      documentation and/or other materials provided with the distribution.
-//   3. The name of the author may not be used to endorse or promote products
-//      derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-// IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-// OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
-// NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-// TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-//=============================================================================
-//-----------------------------------------------------------------------------
-// dumpkeymap.c
-//
-//	Prints a textual representation of each Apple/NeXT .keymapping file
-//	mentioned on the command-line.  If no files are mentioned and if the
-//	local machine is an Apple or NeXT installation, then the key mapping
-//	currently in use by the WindowServer and the AppKit is printed
-//	instead.
-//
-//	Invoke dumpkeymap with one of the options listed below in order to
-//	view detailed documentation about .keymapping files and the use of
-//	this program.
-//
-//	--help: Usage summary.
-//	--help-keymapping: Detailed discussion of the internal format of a
-//	    .keymapping file.
-//	--help-output: Explanation of dumpkeymap's output.
-//	--help-files: List of key mapping-related files and directories.
-//	--help-diagnostics: Explanation of diagnostic messages.
-//
-// COMPILATION INSTRUCTIONS
-//
-//	MacOS/X, Darwin
-//	cc -Wall -o dumpkeymap dumpkeymap.c -framework IOKit
-//
-//	MacOS/X DP4 (Developer Preview 4)
-//	cc -Wall -o dumpkeymap dumpkeymap.c -FKernel -framework IOKit
-//
-//	MacOS/X Server, OpenStep, NextStep
-//	cc -Wall -o dumpkeymap dumpkeymap.c
-//
-//	By default, dumpkeymap is configured to interface with the HID driver
-//	(Apple) or event-status driver (NeXT), thus allowing it to dump the
-//	key mapping which is currently in use by the WindowServer and AppKit.
-//	However, these facilities are specific to Apple/NeXT.  In order to
-//	build dumpkeymap for non-Apple/NeXT platforms, you must define the
-//	DUMPKEYMAP_FILE_ONLY flag when compiling the program.  This flag
-//	inhibits use of the HID and event-status drivers and configures
-//	dumpkeymap to work strictly with raw key mapping files.
-//
-//	For example, to compile for Linux:
-//	gcc -Wall -DDUMPKEYMAP_FILE_ONLY -o dumpkeymap dumpkeymap.c
-//
-// CONCLUSION
-//
-//	This program and its accompanying documentation were written by Eric
-//	Sunshine and are copyright (C)1999,2000 by Eric Sunshine
-//	<sunshine@sunshineco.com>.
-//
-//	The implementation of dumpkeymap is based upon information gathered
-//	on September 3, 1997 by Eric Sunshine <sunshine@sunshineco.com> and
-//	Paul S. McCarthy <zarnuk@zarnuk.com> during an effort to reverse
-//	engineer the format of the NeXT .keymapping file.
-//
-// HISTORY
-//
-//	v4 2000/12/01 Eric Sunshine <sunshine@sunshineco.com>
-//	    Updated manual page to work with `rman', the `man' to `HTML'
-//		translator.  Unfortunately, however, rman is missing important
-//		roff features such as diversions, indentation, and tab stops,
-//		and is also hideously buggy, so getting the manual to work with
-//		rman required quite a few work-arounds.
-//	    The manual page has now been tested with nroff (plain text), troff
-//		(PostScript, etc.), groff (PostScript), and rman (HTML, etc.)
-//
-//	v3 2000/11/28 Eric Sunshine <sunshine@sunshineco.com>
-//	    Considerably expanded the documentation.
-//	    Augmented the existing description of .keymapping internals.
-//	    Added these new documentation topics:
-//		- Output: Very important section describing how to interpret
-//		  the output of dumpkeymap.
-//		- Files: Lists files and directories related to key mappings.
-//		- Diagnostics: Explains diagnostic messages issued by
-//		  dumpkeymap.
-//	    Created a manual page (dumpkeymap.1) which contains the complete
-//		set of documentation for key mapping files and dumpkeymap.
-//	    Added command-line options (--help, --help-keymapping,
-//		--help-output, --help-files, --help-diagnostics) which allow
-//		access to all key mapping documentation.  Previously the
-//		description of the internal layout of a .keymapping file was
-//		only available as source code comments.
-//	    Added --version option.
-//	    Ported to non-Apple/NeXT platforms.  Defining the pre-processor
-//		flag DUMPKEYMAP_FILE_ONLY at compilation time inhibits use of
-//		Apple/NeXT-specific API.
-//	    Added a README file.
-//
-//	v2 2000/11/13 Eric Sunshine <sunshine@sunshineco.com>
-//	    Converted from C++ to plain-C.
-//	    Now parses and takes into account the "number-size" flag stored
-//		with each key map.  This flag indicates the size, in bytes, of
-//		all remaining numeric values in the mapping.  Updated all code
-//		to respect this flag.  (Previously, the purpose of this field
-//		was unknown, and it was thus denoted as
-//		`KeyMapping::fill[2]'.)
-//	    Updated all documentation; especially the "KEY MAPPING
-//		DESCRIPTION" section.  Added discussion of the "number-size"
-//		flag and revamped all structure definitions to use the generic
-//		data type `number' instead of `uchar' or 'byte'.  Clarified
-//		several sections of the documentation and added missing
-//		discussions about type definitions and the relationship of
-//		`interface' and `handler_id' to .keymapping and .keyboard
-//		files.
-//	    Updated compilation instructions to include directions for all
-//		platforms on which this program might be built.
-//	    Now published under the formal BSD license rather than a
-//		home-grown license.
-//
-//	v1 1999/09/08 Eric Sunshine <sunshine@sunshineco.com>
-//	    Created.
-//-----------------------------------------------------------------------------
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#if !defined(DUMPKEYMAP_FILE_ONLY)
-#include <IOKit/hidsystem/event_status_driver.h>
-#endif
-
-#define PROG_NAME "dumpkeymap"
-#define PROG_VERSION "4"
-#define AUTHOR_NAME "Eric Sunshine"
-#define AUTHOR_EMAIL "sunshine@sunshineco.com"
-#define AUTHOR_INFO AUTHOR_NAME " <" AUTHOR_EMAIL ">"
-#define COPYRIGHT "Copyright (C) 1999,2000 by " AUTHOR_INFO
-
-typedef unsigned char byte;
-typedef unsigned short word;
-typedef unsigned int natural;
-typedef unsigned long dword;
-typedef dword number;
-
-#define ASCII_SET 0x00
-#define BIND_FUNCTION 0xfe
-#define BIND_SPECIAL 0xff
-
-#define OPT_SWITCH(X) { char const* switched_str__=(X); if (0) {
-#define OPT_CASE(X,Y) } else if (strcmp(switched_str__,(#X)) == 0 || \
-    strcmp(switched_str__,(#Y)) == 0) {
-#define OPT_DEFAULT } else {
-#define OPT_SWITCH_END }}
-
-//-----------------------------------------------------------------------------
-// Translation Tables
-//-----------------------------------------------------------------------------
-static char const* const SPECIAL_CODE[] =
-    {
-    "sound-up",
-    "sound-down",
-    "brightness-up",
-    "brightness-down",
-    "alpha-lock",
-    "help",
-    "power",
-    "secondary-up-arrow",
-    "secondary-down-arrow"
-    };
-#define N_SPECIAL_CODE (sizeof(SPECIAL_CODE) / sizeof(SPECIAL_CODE[0]))
-
-static char const* const MODIFIER_CODE[] =
-    {
-    "alpha-lock",
-    "shift",
-    "control",
-    "alternate",
-    "command",
-    "keypad",
-    "help"
-    };
-#define N_MODIFIER_CODE (sizeof(MODIFIER_CODE) / sizeof(MODIFIER_CODE[0]))
-
-static char const* const MODIFIER_MASK[] =
-    {
-    "-----",	// R = carriage-return
-    "----L",	// A = alternate
-    "---S-",	// C = control
-    "---SL",	// S = shift
-    "--C--",	// L = alpha-lock
-    "--C-L",
-    "--CS-",
-    "--CSL",
-    "-A---",
-    "-A--L",
-    "-A-S-",
-    "-A-SL",
-    "-AC--",
-    "-AC-L",
-    "-ACS-",
-    "-ACSL",
-    "R----",
-    "R---L",
-    "R--S-",
-    "R--SL",
-    "R-C--",
-    "R-C-L",
-    "R-CS-",
-    "R-CSL",
-    "RA---",
-    "RA--L",
-    "RA-S-",
-    "RA-SL",
-    "RAC--",
-    "RAC-L",
-    "RACS-",
-    "RACSL",
-    };
-#define N_MODIFIER_MASK (sizeof(MODIFIER_MASK) / sizeof(MODIFIER_MASK[0]))
-
-#define FUNCTION_KEY_FIRST 0x20
-static char const* const FUNCTION_KEY[] =
-    {
-    "F1",			// 0x20
-    "F2",			// 0x21
-    "F3",			// 0x22
-    "F4",			// 0x23
-    "F5",			// 0x24
-    "F6",			// 0x25
-    "F7",			// 0x26
-    "F8",			// 0x27
-    "F9",			// 0x28
-    "F10",			// 0x29
-    "F11",			// 0x2a
-    "F12",			// 0x2b
-    "insert",			// 0x2c
-    "delete",			// 0x2d
-    "home",			// 0x2e
-    "end",			// 0x2f
-    "page up",			// 0x30
-    "page down",		// 0x31
-    "print screen",		// 0x32
-    "scroll lock",		// 0x33
-    "pause",			// 0x34
-    "sys-request",		// 0x35
-    "break",			// 0x36
-    "reset (HIL)",		// 0x37
-    "stop (HIL)",		// 0x38
-    "menu (HIL)",		// 0x39
-    "user (HIL)",		// 0x3a
-    "system (HIL)",		// 0x3b
-    "print (HIL)",		// 0x3c
-    "clear line (HIL)",		// 0x3d
-    "clear display (HIL)",	// 0x3e
-    "insert line (HIL)",	// 0x3f
-    "delete line (HIL)",	// 0x40
-    "insert char (HIL)",	// 0x41
-    "delete char (HIL)",	// 0x42
-    "prev (HIL)",		// 0x43
-    "next (HIL)",		// 0x44
-    "select (HIL)",		// 0x45
-    };
-#define N_FUNCTION_KEY (sizeof(FUNCTION_KEY) / sizeof(FUNCTION_KEY[0]))
-
-
-//-----------------------------------------------------------------------------
-// Data Stream Object
-//	Can be configured to treat embedded "numbers" as being composed of
-//	either 1, 2, or 4 bytes, apiece.
-//-----------------------------------------------------------------------------
-typedef struct _DataStream
-    {
-    byte const* data;
-    byte const* data_end;
-    natural number_size; // Size in bytes of a "number" in the stream.
-    } DataStream;
-
-static DataStream* new_data_stream( byte const* data, int size )
-    {
-    DataStream* s = (DataStream*)malloc( sizeof(DataStream) );
-    s->data = data;
-    s->data_end = data + size;
-    s->number_size = 1; // Default to byte-sized numbers.
-    return s;
-    }
-
-static void destroy_data_stream( DataStream* s )
-    {
-    free(s);
-    }
-
-static int end_of_stream( DataStream* s )
-    {
-    return (s->data >= s->data_end);
-    }
-
-static void expect_nbytes( DataStream* s, int nbytes )
-    {
-    if (s->data + nbytes > s->data_end)
-	{
-	fputs( "Insufficient data in keymapping data stream.\n", stderr );
-	exit(-1);
-	}
-    }
-
-static byte get_byte( DataStream* s )
-    {
-    expect_nbytes( s, 1 );
-    return *s->data++;
-    }
-
-static word get_word( DataStream* s )
-    {
-    word hi, lo;
-    expect_nbytes( s, 2 );
-    hi = *s->data++;
-    lo = *s->data++;
-    return ((hi << 8) | lo);
-    }
-
-static dword get_dword( DataStream* s )
-    {
-    dword b1, b2, b3, b4;
-    expect_nbytes( s, 4 );
-    b4 = *s->data++;
-    b3 = *s->data++;
-    b2 = *s->data++;
-    b1 = *s->data++;
-    return ((b4 << 24) | (b3 << 16) | (b2 << 8) | b1);
-    }
-
-static number get_number( DataStream* s )
-    {
-    switch (s->number_size)
-	{
-	case 4:  return get_dword(s);
-	case 2:  return get_word(s);
-	default: return get_byte(s);
-	}
-    }
-
-
-//-----------------------------------------------------------------------------
-// Translation Utility Functions
-//-----------------------------------------------------------------------------
-static char const* special_code_desc( number n )
-    {
-    if (n < N_SPECIAL_CODE)
-	return SPECIAL_CODE[n];
-    else
-	return "invalid";
-    }
-
-static char const* modifier_code_desc( number n )
-    {
-    if (n < N_MODIFIER_CODE)
-	return MODIFIER_CODE[n];
-    else
-	return "invalid";
-    }
-
-static char const* modifier_mask_desc( number n )
-    {
-    if (n < N_MODIFIER_MASK)
-	return MODIFIER_MASK[n];
-    else
-	return "?????";
-    }
-
-static char const* function_key_desc( number n )
-    {
-    if (n >= FUNCTION_KEY_FIRST && n < N_FUNCTION_KEY + FUNCTION_KEY_FIRST)
-	return FUNCTION_KEY[ n - FUNCTION_KEY_FIRST ];
-    else
-	return "unknown";
-    }
-
-static number bits_set( number mask )
-    {
-    number n = 0;
-    for ( ; mask != 0; mask >>= 1)
-	if ((mask & 0x01) != 0)
-	    n++;
-    return n;
-    }
-
-
-//-----------------------------------------------------------------------------
-// Unparse a list of Modifier records.
-//-----------------------------------------------------------------------------
-static void unparse_modifiers( DataStream* s )
-    {
-    number nmod = get_number(s); // Modifier count
-    printf( "MODIFIERS [%lu]\n", nmod );
-    while (nmod-- > 0)
-	{
-	number nscan;
-	number const code = get_number(s);
-	printf( "%s:", modifier_code_desc(code) );
-	nscan = get_number(s);
-	while (nscan-- > 0)
-	    printf( " 0x%02x", (natural)get_number(s) );
-	putchar( '\n' );
-	}
-    putchar( '\n' );
-    }
-
-
-//-----------------------------------------------------------------------------
-// Unparse a list of Character records.
-//-----------------------------------------------------------------------------
-typedef void (*UnparseSpecialFunc)( number code );
-
-static void unparse_char_codes(
-    DataStream* s, number ncodes, UnparseSpecialFunc unparse_special )
-    {
-    if (ncodes != 0)
-	{
-	while (ncodes-- > 0)
-	    {
-	    number const char_set = get_number(s);
-	    number const code = get_number(s);
-	    putchar(' ');
-	    switch (char_set)
-		{
-		case ASCII_SET:
-		    {
-		    int const c = (int)code;
-		    if (isprint(c))
-			printf( "\"%c\"", c );
-		    else if (code < ' ')
-			printf( "\"^%c\"", c + '@' );
-		    else
-			printf( "%02x", c );
-		    break;
-		    }
-		case BIND_FUNCTION:
-		    printf( "[%s]", function_key_desc(code) );
-		    break;
-		case BIND_SPECIAL:
-		    unparse_special( code );
-		    break;
-		default:
-		    printf( "%02x/%02x", (natural)char_set, (natural)code );
-		    break;
-		}
-	    }
-	}
-    }
-
-
-//-----------------------------------------------------------------------------
-// Unparse a list of scan code bindings.
-//-----------------------------------------------------------------------------
-static void unparse_key_special( number code )
-    {
-    printf( "{seq#%lu}", code );
-    }
-
-static void unparse_characters( DataStream* s )
-    {
-    number const NOT_BOUND = 0xff;
-    number const nscans = get_number(s);
-    number scan;
-    printf( "CHARACTERS [%lu]\n", nscans );
-    for (scan = 0; scan < nscans; scan++)
-	{
-	number const mask = get_number(s);
-	printf( "scan 0x%02x: ", (natural)scan );
-	if (mask == NOT_BOUND)
-	    fputs( "not-bound\n", stdout );
-	else
-	    {
-	    number const bits = bits_set( mask );
-	    number const codes = 1 << bits;
-	    printf( "%s ", modifier_mask_desc(mask) );
-	    unparse_char_codes( s, codes, unparse_key_special );
-	    putchar( '\n' );
-	    }
-	}
-    putchar( '\n' );
-    }
-
-
-//-----------------------------------------------------------------------------
-// Unparse a list of key sequences.
-//-----------------------------------------------------------------------------
-static void unparse_sequence_special( number code )
-    {
-    printf( "{%s}", (code == 0 ? "unmodify" : modifier_code_desc(code)) );
-    }
-
-static void unparse_sequences( DataStream* s )
-    {
-    number const nseqs = get_number(s);
-    number seq;
-    printf( "SEQUENCES [%lu]\n", nseqs );
-    for (seq = 0; seq < nseqs; seq++)
-	{
-	number const nchars = get_number(s);
-	printf( "sequence %lu:", seq );
-	unparse_char_codes( s, nchars, unparse_sequence_special );
-	putchar( '\n' );
-	}
-    putchar( '\n' );
-    }
-
-
-//-----------------------------------------------------------------------------
-// Unparse a list of special keys.
-//-----------------------------------------------------------------------------
-static void unparse_specials( DataStream* s )
-    {
-    number nspecials = get_number(s);
-    printf( "SPECIALS [%lu]\n", nspecials );
-    while (nspecials-- > 0)
-	{
-	number const special = get_number(s);
-	number const scan = get_number(s);
-	printf( "%s: 0x%02x\n", special_code_desc(special), (natural)scan );
-	}
-    putchar( '\n' );
-    }
-
-
-//-----------------------------------------------------------------------------
-// Unparse the number-size flag.
-//-----------------------------------------------------------------------------
-static void unparse_numeric_size( DataStream* s )
-    {
-    word const numbers_are_shorts = get_word(s);
-    s->number_size = numbers_are_shorts ? 2 : 1;
-    }
-
-
-//-----------------------------------------------------------------------------
-// Unparse an entire key map.
-//-----------------------------------------------------------------------------
-static void unparse_keymap_data( DataStream* s )
-    {
-    unparse_numeric_size(s);
-    unparse_modifiers(s);
-    unparse_characters(s);
-    unparse_sequences(s);
-    unparse_specials(s);
-    }
-
-
-//-----------------------------------------------------------------------------
-// Unparse the active key map.
-//-----------------------------------------------------------------------------
-#if !defined(DUMPKEYMAP_FILE_ONLY)
-static int unparse_active_keymap( void )
-    {
-    int rc = 1;
-    NXEventHandle const h = NXOpenEventStatus();
-    if (h == 0)
-	fputs( "Unable to open event status driver.\n", stderr );
-    else
-	{
-	NXKeyMapping km;
-	km.size = NXKeyMappingLength(h);
-	if (km.size <= 0)
-	    fprintf( stderr, "Bad key mapping length (%d).\n", km.size );
-	else
-	    {
-	    km.mapping = (char*)malloc( km.size );
-	    if (NXGetKeyMapping( h, &km ) == 0)
-		fputs( "Unable to get current key mapping.\n", stderr );
-	    else
-		{
-		DataStream* stream =
-		    new_data_stream( (byte const*)km.mapping, km.size );
-		fputs( "=============\nACTIVE KEYMAP\n=============\n\n",
-		    stdout);
-		unparse_keymap_data( stream );
-		destroy_data_stream( stream );
-		rc = 0;
-		}
-	    free( km.mapping );
-	    }
-	NXCloseEventStatus(h);
-	}
-    return rc;
-    }
-#endif
-
-
-//-----------------------------------------------------------------------------
-// Unparse one key map from a keymapping file.
-//-----------------------------------------------------------------------------
-static void unparse_keymap( DataStream* s )
-    {
-    dword const interface = get_dword(s);
-    dword const handler_id = get_dword(s);
-    dword const map_size = get_dword(s);
-    printf( "interface: 0x%02lx\nhandler_id: 0x%02lx\nmap_size: %lu bytes\n\n",
-	interface, handler_id, map_size );
-    unparse_keymap_data(s);
-    }
-
-
-//-----------------------------------------------------------------------------
-// Check the magic number of a keymapping file.
-//-----------------------------------------------------------------------------
-static int check_magic_number( DataStream* s )
-    {
-    return (get_byte(s) == 'K' &&
-	    get_byte(s) == 'Y' &&
-	    get_byte(s) == 'M' &&
-	    get_byte(s) == '1');
-    }
-
-
-//-----------------------------------------------------------------------------
-// Unparse all key maps within a keymapping file.
-//-----------------------------------------------------------------------------
-static int unparse_keymaps( DataStream* s )
-    {
-    int rc = 0;
-    if (check_magic_number(s))
-	{
-	int n = 1;
-	while (!end_of_stream(s))
-	    {
-	    printf( "---------\nKEYMAP #%d\n---------\n", n++ );
-	    unparse_keymap(s);
-	    }
-	}
-    else
-	{
-	fputs( "Bad magic number.\n", stderr );
-	rc = 1;
-	}
-    return rc;
-    }
-
-
-//-----------------------------------------------------------------------------
-// Unparse a keymapping file.
-//-----------------------------------------------------------------------------
-static int unparse_keymap_file( char const* const path )
-    {
-    int rc = 1;
-    FILE* file;
-    printf( "===========\nKEYMAP FILE\n===========\n%s\n\n", path );
-    file = fopen( path, "rb" );
-    if (file == 0)
-	perror( "Unable to open key mapping file" );
-    else
-	{
-	struct stat st;
-	if (fstat( fileno(file), &st ) != 0)
-	    perror( "Unable to determine key mapping file size" );
-	else
-	    {
-	    byte* buffer = (byte*)malloc( st.st_size );
-	    if (fread( buffer, st.st_size, 1, file ) != 1)
-		perror( "Unable to read key mapping file" );
-	    else
-		{
-		DataStream* stream = new_data_stream(buffer, (int)st.st_size);
-		fclose( file ); file = 0;
-		rc = unparse_keymaps( stream );
-		destroy_data_stream( stream );
-		}
-	    free( buffer );
-	    }
-	if (file != 0)
-	    fclose( file );
-	}
-    return rc;
-    }
-
-
-//-----------------------------------------------------------------------------
-// Handle the case when no documents are mentioned on the command-line.  For
-// Apple/NeXT platforms, dump the currently active key mapping; else display
-// an error message.
-//-----------------------------------------------------------------------------
-static int handle_empty_document_list( void )
-    {
-#if !defined(DUMPKEYMAP_FILE_ONLY)
-    return unparse_active_keymap();
-#else
-    fputs( "ERROR: Must specify at least one .keymapping file.\n\n", stderr );
-    return 1;
-#endif
-    }
-
-
-//-----------------------------------------------------------------------------
-// Print a detailed description of the internal layout of a key mapping.
-//-----------------------------------------------------------------------------
-static void print_internal_layout_info( FILE* f )
-    {
-    fputs(
-"What follows is a detailed descriptions of the internal layout of an\n"
-"Apple/NeXT .keymapping file.\n"
-"\n"
-"Types and Data\n"
-"--------------\n"
-"The following type definitions are employed throughout this discussion:\n"
-"\n"
-"    typedef unsigned char  byte;\n"
-"    typedef unsigned short word;\n"
-"    typedef unsigned long  dword;\n"
-"\n"
-"Additionally, the type definition `number' is used generically to indicate\n"
-"a numeric value.  The actual size of the `number' type may be one or two\n"
-"bytes depending upon how the data is stored in the key map.  Although most\n"
-"key maps use byte-sized numeric values, word-sized values are also allowed.\n"
-"\n"
-"Multi-byte values in a key mapping file are stored in big-endian byte\n"
-"order.\n"
-"\n"
-"Key Mapping File and Device Mapping\n"
-"-----------------------------------\n"
-"A key mapping file begins with a magic-number and continues with a variable\n"
-"number of device-specific key mappings.\n"
-"\n"
-"    struct KeyMappingFile {\n"
-"        char magic_number[4];    // `KYM1'\n"
-"        DeviceMapping maps[...]; // Variable number of maps\n"
-"    };\n"
-"\n"
-"    struct DeviceMapping {\n"
-"        dword interface;  // Interface type\n"
-"        dword handler_id; // Interface subtype\n"
-"        dword map_size;   // Byte count of `map' (below)\n"
-"        KeyMapping map;\n"
-"    };\n"
-"\n"
-"The value of `interface' represents a family of keyboard device types\n"
-"(such as Intel PC, ADB, NeXT, Sun Type5, etc.), and is generally\n"
-"specified as one of the constant values NX_EVS_DEVICE_INTERFACE_ADB,\n"
-"NX_EVS_DEVICE_INTERFACE_ACE, etc., which are are defined in IOHIDTypes.h on\n"
-"MacOS/X and Darwin, and in ev_types.h on MacOS/X Server, OpenStep, and\n"
-"NextStep.\n"
-"\n"
-"The value of `handler_id' represents a specific keyboard layout within the\n"
-"much broader `interface' family.  For instance, for a 101-key Intel PC\n"
-"keyboard (of type NX_EVS_DEVICE_INTERFACE_ACE) the `handler_id' is '0',\n"
-"whereas for a 102-key keyboard it is `1'.\n"
-"\n"
-"Together, `interface' and `handler_id' identify the exact keyboard hardware\n"
-"to which this mapping applies.  Programs which display a visual\n"
-"representation of a keyboard layout, match `interface' and `handler_id'\n"
-"from the .keymapping file against the `interface' and `handler_id' values\n"
-"found in each .keyboard file.\n"
-"\n"
-"Key Mapping\n"
-"-----------\n"
-"A key mapping completely defines the relationship of all scan codes with\n"
-"their associated functionality.  A KeyMapping structure is embedded within\n"
-"the DeviceMapping structure in a KeyMappingFile.  The key mapping currently\n"
-"in use by the WindowServer and AppKit is also represented by a KeyMapping\n"
-"structure, and can be referred to directly by calling NXGetKeyMapping() and\n"
-"accessing the `mapping' data member of the returned NXKeyMapping structure.\n"
-"\n"
-"    struct KeyMapping {\n"
-"        word number_size;                   // 0=1 byte, non-zero=2 bytes\n"
-"        number num_modifier_groups;         // Modifier groups\n"
-"        ModifierGroup modifier_groups[...];\n"
-"        number num_scan_codes;              // Scan groups\n"
-"        ScanGroup scan_table[...];\n"
-"        number num_sequence_lists;          // Sequence lists\n"
-"        Sequence sequence_lists[...];\n"
-"        number num_special_keys;            // Special keys\n"
-"        SpecialKey special_key[...];\n"
-"    };\n"
-"\n"
-"The `number_size' flag determines the size, in bytes, of all remaining\n"
-"numeric values (denoted by the type definition `number') within the key\n"
-"mapping.  If its value is zero, then numbers are represented by a single\n"
-"byte.  If it is non-zero, then numbers are represented by a word (two\n"
-"bytes).\n"
-"\n"
-"Modifier Group\n"
-"--------------\n"
-"A modifier group defines all scan codes which map to a particular type of\n"
-"modifier, such as `shift', `control', etc.\n"
-"\n"
-"    enum Modifier {\n"
-"        ALPHALOCK = 0,\n"
-"        SHIFT,\n"
-"        CONTROL,\n"
-"        ALTERNATE,\n"
-"        COMMAND,\n"
-"        KEYPAD,\n"
-"        HELP\n"
-"    };\n"
-"\n"
-"    struct ModifierGroup {\n"
-"        number modifier;        // A Modifier constant\n"
-"        number num_scan_codes;\n"
-"        number scan_codes[...]; // Variable number of scan codes\n"
-"    };\n"
-"\n"
-"The scan_codes[] array contains a list of all scan codes which map to the\n"
-"specified modifier.  The `shift', `command', and `alternate' modifiers are\n"
-"frequently mapped to two different scan codes, apiece, since these\n"
-"modifiers often appear on both the left and right sides of the keyboard.\n"
-"\n"
-"Scan Group\n"
-"----------\n"
-"There is one ScanGroup for each scan code generated by the given keyboard.\n"
-"This number is given by KeyMapping::num_scan_codes.  The first scan group\n"
-"represents hardware scan code 0, the second represents scan code 1, etc.\n"
-"\n"
-"    enum ModifierMask {\n"
-"        ALPHALOCK_MASK       = 1 << 0,\n"
-"        SHIFT_MASK           = 1 << 1,\n"
-"        CONTROL_MASK         = 1 << 2,\n"
-"        ALTERNATE_MASK       = 1 << 3,\n"
-"        CARRIAGE_RETURN_MASK = 1 << 4\n"
-"    };\n"
-"    #define NOT_BOUND 0xff\n"
-"\n"
-"    struct ScanGroup {\n"
-"        number mask;\n"
-"        Character characters[...];\n"
-"    };\n"
-"\n"
-"For each scan code, `mask' defines which modifier combinations generate\n"
-"characters.  If `mask' is NOT_BOUND (0xff) then then this scan code does\n"
-"not generate any characters ever, and its characters[] array is zero\n"
-"length.  Otherwise, the characters[] array contains one Character record\n"
-"for each modifier combination.\n"
-"\n"
-"The number of records in characters[] is determined by computing (1 <<\n"
-"bits_set_in_mask).  In other words, if mask is zero, then zero bits are\n"
-"set, so characters[] contains only one record.  If `mask' is (SHIFT_MASK |\n"
-"CONTROL_MASK), then two bits are set, so characters[] contains four\n"
-"records.\n"
-"\n"
-"The first record always represents the character which is generated by that\n"
-"key when no modifiers are active.  The remaining records represent\n"
-"characters generated by the various modifier combinations.  Using the\n"
-"example with the `shift' and `control' masks set, record two would\n"
-"represent the character with the `shift' modifier active; record three, the\n"
-"`control' modifier active; and record four, both the `shift' and `control'\n"
-"modifiers active.\n"
-"\n"
-"As a special case, ALPHALOCK_MASK implies SHIFT_MASK, though only\n"
-"ALPHALOCK_MASK appears in `mask'.  In this case the same character is\n"
-"generated for both the `shift' and `alpha-lock' modifiers, but only needs\n"
-"to appear once in the characters[] array.\n"
-"\n"
-"CARRIAGE_RETURN_MASK does not actually refer to a modifier key.  Instead,\n"
-"it is used to distinguish the scan code which is given the special\n"
-"pseudo-designation of `carriage return' key.  Typically, this mask appears\n"
-"solo in a ScanGroup record and only the two Character records for control-M\n"
-"and control-C follow.  This flag may be a throwback to an earlier time or\n"
-"may be specially interpreted by the low-level keyboard driver, but its\n"
-"purpose is otherwise enigmatic.\n"
-"Character\n"
-"---------\n"
-"Each Character record indicates the character generated when this key is\n"
-"pressed, as well as the character set which contains the character.  Well\n"
-"known character sets are `ASCII' and `Symbol'.  The character set can also\n"
-"be one of the meta values FUNCTION_KEY or KEY_SEQUENCE.  If it is\n"
-"FUNCTION_KEY then `char_code' represents a generally well-known function\n"
-"key such as those enumerated by FunctionKey.  If the character set is\n"
-"KEY_SEQUENCE then `char_code' represents a zero-base index into\n"
-"KeyMapping::sequence_lists[].\n"
-"\n"
-"    enum CharacterSet {\n"
-"        ASCII        = 0x00,\n"
-"        SYMBOL       = 0x01,\n"
-"        ...\n"
-"        FUNCTION_KEY = 0xfe,\n"
-"        KEY_SEQUENCE = 0xff\n"
-"    };\n"
-"\n"
-"    struct Character {\n"
-"        number set;       // CharacterSet of generated character\n"
-"        number char_code; // Actual character generated\n"
-"    };\n"
-"\n"
-"    enum FunctionKey {\n"
-"        F1 = 0x20, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12,\n"
-"        INSERT, DELETE, HOME, END, PAGE_UP, PAGE_DOWN, PRINT_SCREEN,\n"
-"        SCROLL_LOCK, PAUSE, SYS_REQUEST, BREAK, RESET, STOP, MENU, USER,\n"
-"        SYSTEM, PRINT, CLEAR_LINE, CLEAR_DISPLAY, INSERT_LINE,\n"
-"        DELETE_LINE, INSERT_CHAR, DELETE_CHAR, PREV, NEXT, SELECT\n"
-"    };\n"
-"\n"
-"Sequence\n"
-"--------\n"
-"When Character::set contains the meta value KEY_SEQUENCE, the scan code is\n"
-"bound to a sequence of keys rather than a single character.  A sequence is\n"
-"a series of modifiers and characters which are automatically generated when\n"
-"the associated key is depressed.\n"
-"\n"
-"    #define MODIFIER_KEY 0xff\n"
-"\n"
-"    struct Sequence {\n"
-"        number num_chars;\n"
-"        Character characters[...];\n"
-"    };\n"
-"\n"
-"Each generated Character is represented as previously described, with the\n"
-"exception that MODIFIER_KEY may appear in place of KEY_SEQUENCE.  When the\n"
-"value of Character::set is MODIFIER_KEY then Character::char_code\n"
-"represents a modifier key rather than an actual character.  If the modifier\n"
-"represented by `char_code' is non-zero, then it indicates that the\n"
-"associated modifier key has been depressed.  In this case, the value is one\n"
-"of the constants enumerated by Modifier (SHIFT, CONTROL, ALTERNATE, etc.).\n"
-"If the value is zero then it means that the modifier keys have been\n"
-"released.\n"
-"\n"
-"Special Key\n"
-"-----------\n"
-"A special key is one which is scanned directly by the Mach kernel rather\n"
-"than by the WindowServer.  In general, events are not generated for special\n"
-"keys.\n"
-"\n"
-"    enum SpecialKeyType {\n"
-"        VOLUME_UP = 0,\n"
-"        VOLUME_DOWN,\n"
-"        BRIGHTNESS_UP,\n"
-"        BRIGHTNESS_DOWN,\n"
-"        ALPHA_LOCK,\n"
-"        HELP,\n"
-"        POWER,\n"
-"        SECONDARY_ARROW_UP,\n"
-"        SECONDARY_ARROW_DOWN\n"
-"    };\n"
-"\n"
-"    struct SpecialKey {\n"
-"        number type;      // A SpecialKeyType constant\n"
-"        number scan_code; // Actual scan code\n"
-"    };\n"
-"\n", f );
-    }
-
-
-//-----------------------------------------------------------------------------
-// Print an explanation of the output generated by this program.
-//-----------------------------------------------------------------------------
-static void print_output_info( FILE* f )
-    {
-    fputs(
-"What follows is an explanation and description of the various pieces of\n"
-"information emitted by dumpkeymap.\n"
-"\n"
-"For a more thorough discussion of any particular piece of information\n"
-"described here, refer to the detailed description of the internal layout of\n"
-"a key mapping given by the --help-layout option.\n"
-"\n"
-"Conventions\n"
-"-----------\n"
-"Depending upon context, some numeric values are displayed in decimal\n"
-"notation, whereas others are displayed in hexadecimal notation.\n"
-"Hexadecimal numbers are denoted by a `0x' prefix (for instance, `0x7b'),\n"
-"except when explicitly noted otherwise.\n"
-"\n"
-"Key Mapping Source\n"
-"------------------\n"
-"The first piece of information presented about a particular key mapping is\n"
-"the source from which the data was gleaned.  For a .keymapping file, the\n"
-"title `KEYMAP FILE' is emitted along with the path and name of the file in\n"
-"question.  For the key mapping currently in use by the WindowServer and\n"
-"AppKit, the title `ACTIVE KEYMAP' is emitted instead.\n"
-"\n"
-"Device Information\n"
-"------------------\n"
-"Each .keymapping file may contain one or more raw key mappings.  For\n"
-"example, a file which maps keys to a Dvorak-style layout might contain raw\n"
-"mappings for Intel PC, ADB, NeXT, and Sun Type5 keyboards.\n"
-"\n"
-"For each raw mapping, the following information is emitted:\n"
-"\n"
-"    o The title `KEYMAP' along with the mapping's relative position in the\n"
-"      .keymapping file.\n"
-"    o The `interface' identifier.\n"
-"    o The `handler_id' sub-identifier.\n"
-"    o The size of the raw mapping resource counted in bytes.\n"
-"\n"
-"The `interface' and `handler_id' values, taken together, define a specific\n"
-"keyboard device.  A .keyboard file, which describes the visual layout of a\n"
-"keyboard, also contains `interface' and `handler_id' identifiers.  The\n"
-".keyboard file corresponding to a particular key mapping can be found by\n"
-"matching the `interface' and `handler_id' values from each resource.\n"
-"\n"
-"Modifiers\n"
-"---------\n"
-"Each mapping may contain zero or more modifier records which associate\n"
-"hardware scan codes with modifier descriptions such as `shift', `control',\n"
-"`alternate', etc.  The title `MODIFIERS' is printed along with the count of\n"
-"modifier records which follow.  For each modifier record, the modifier's\n"
-"name is printed along with a list of scan codes, in hexadecimal format,\n"
-"which generate that modifier value.  For example:\n"
-"\n"
-"    MODIFIERS [4]\n"
-"    alternate: 0x1d 0x60\n"
-"    control: 0x3a\n"
-"    keypad: 0x52 0x53 ... 0x63 0x62\n"
-"    shift: 0x2a 0x36\n"
-"\n"
-"Characters\n"
-"----------\n"
-"Each mapping may contain zero or more character records which associate\n"
-"hardware scan codes with the actual characters generated by those scan\n"
-"codes in the presence or absence of various modifier combinations.  The\n"
-"title `CHARACTERS' is printed along with the count of character records\n"
-"which follow.  Here is a highly abbreviated example:\n"
-"\n"
-"    CHARACTERS [9]\n"
-"    scan 0x00: -AC-L  \"a\" \"A\" \"^A\" \"^A\" ca c7 \"^A\" \"^A\"\n"
-"    scan 0x07: -AC-L  \"x\" \"X\" \"^X\" \"^X\" 01/b4 01/ce \"^X\" \"^X\"\n"
-"    scan 0x0a: ---S-  \"<\" \">\"\n"
-"    scan 0x13: -ACS-  \"2\" \"@\" \"^@\" \"^@\" b2 b3 \"^@\" \"^@\"\n"
-"    scan 0x24: R----  \"^M\" \"^C\"\n"
-"    scan 0x3e: -----  [F4]\n"
-"    scan 0x4a: -----  [page up]\n"
-"    scan 0x60: -----  {seq#3}\n"
-"    scan 0x68: not-bound\n"
-"\n"
-"For each record, the hexadecimal value of the hardware scan code is\n"
-"printed, followed by a list of modifier flag combinations and the actual\n"
-"characters generated by this scan code with and without modifiers applied.\n"
-"\n"
-"The modifier flags field is composed of a combination of single letter\n"
-"representations of the various modifier types.  The letters stand for:\n"
-"\n"
-"    L - alpha-lock\n"
-"    S - shift\n"
-"    C - control\n"
-"    A - alternate\n"
-"    R - carriage-return\n"
-"\n"
-"As a special case, the `alpha-lock' flag also implies the `shift' flag, so\n"
-"these two flags never appear together in the same record.\n"
-"\n"
-"The combination of modifier flags determines the meaning and number of\n"
-"fields which follow.  The first field after the modifier flags always\n"
-"represents the character that will be generated if no modifier keys are\n"
-"depressed.  The remaining fields represent characters generated by the\n"
-"various modifier combinations.  The order of the fields follows this\n"
-"general pattern:\n"
-"\n"
-"    o The character generated by this scan code when no modifiers are in\n"
-"      effect is listed first.\n"
-"\n"
-"    o If the `L' or `S' flag is active, then the shifted character\n"
-"      generated by this scan code is listed next.\n"
-"\n"
-"    o If the `C' flag is active, then the control-character generated by\n"
-"      this scan code is listed next.  Furthermore, if the `L' or `S' flag\n"
-"      is also active, then the shifted control-character is listed after\n"
-"      that.\n"
-"\n"
-"    o If the `A' flag is active, then the alternate-character generated by\n"
-"      this scan code is listed next.  Furthermore, if the `L' or `S' flag\n"
-"      is active, then the shifted alternate-character is listed after that.\n"
-"      If the `C' flag is also active, then the alternate-control-character\n"
-"      is listed next.  Finally, if the `C' and `L' or `C' and `S' flags are\n"
-"      also active, then the shifted alternate-control-character is listed.\n"
-"\n"
-"The `R' flag does not actually refer to a modifier key.  Instead, it is\n"
-"used to distinguish the scan code which is given the special\n"
-"pseudo-designation of `carriage return' key.  Typically, this mask appears\n"
-"solo and only the two fields for control-M and control-C follow.  This flag\n"
-"may be a throwback to an earlier time or may be specially interpreted by\n"
-"the low-level keyboard driver, but its purpose is otherwise enigmatic.\n"
-"\n"
-"Recalling the example from above, the following fields can be identified:\n"
-"\n"
-"    scan 0x00: -AC-L  \"a\" \"A\" \"^A\" \"^A\" ca c7 \"^A\" \"^A\"\n"
-"\n"
-"    o Lower-case `a' is generated when no modifiers are active.\n"
-"    o Upper-case `A' is generated when `shift' or `alpha-lock' are active.\n"
-"    o Control-A is generated when `control' is active.\n"
-"    o Control-A is generated when `control' and `shift' are active.\n"
-"    o The character represented by the hexadecimal code 0xca is generated\n"
-"      when `alternate' is active.\n"
-"    o The character represented by 0xc7 is generated when `alternate' and\n"
-"      `shift' (or `alpha-lock') are active.\n"
-"    o Control-A is generated when `alternate' and `control' are active.\n"
-"    o Control-A is generated when `alternate', `control' and `shift' (or\n"
-"      `alpha-lock') are active.\n"
-"\n"
-"The notation used to represent a particular generated character varies.\n"
-"\n"
-"    o Printable ASCII characters are quoted, as in \"x\" or \"X\".\n"
-"\n"
-"    o Control-characters are quoted and prefixed with `^', as in \"^X\".\n"
-"\n"
-"    o Characters with values greater than 127 (0x7f) are displayed as\n"
-"      hexadecimal values without the `0x' prefix.\n"
-"\n"
-"    o Characters in a non-ASCII character set (such as `Symbol') are\n"
-"      displayed as two hexadecimal numbers separated by a slash, as in\n"
-"      `01/4a'.  The first number is the character set's identification code\n"
-"      (such as `01' for the `Symbol' set), and the second number is the\n"
-"      value of the generated character.\n"
-"\n"
-"    o Non-printing special function characters are displayed with the\n"
-"      function's common name enclosed in brackets, as in `[page up]' or\n"
-"      `[F4]'.\n"
-"\n"
-"    o If the binding represents a key sequence rather than a single\n"
-"      character, then the sequence's identification number is enclosed in\n"
-"      braces, as in `{seq#3}'.\n"
-"\n"
-"Recalling a few examples from above, the following interpretations can be\n"
-"made:\n"
-"\n"
-"    scan 0x07: -AC-L  \"x\" \"X\" \"^X\" \"^X\" 01/b4 01/ce \"^X\" \"^X\"\n"
-"    scan 0x3e: -----  [F4]\n"
-"    scan 0x4a: -----  [page up]\n"
-"    scan 0x60: -----  {seq#3}\n"
-"\n"
-"    o \"x\" and \"X\" are printable ASCII characters.\n"
-"    o \"^X\" is a control-character.\n"
-"    o `01/b4' and `01/ce' represent the character codes 0xb4 and 0xce in\n"
-"      the `Symbol' character set.\n"
-"    o Scan code 0x3e generates function-key `F4', and scan code 0x4a\n"
-"      generates function-key `page up'.\n"
-"    o Scan code 0x60 is bound to key sequence #3.\n"
-"\n"
-"Finally, if a scan code is not bound to any characters, then it is\n"
-"annotated with the label `not-bound', as with example scan code 0x68 from\n"
-"above.\n"
-"\n"
-"Sequences\n"
-"---------\n"
-"A scan code (modified and unmodified) can be bound to a key sequence rather\n"
-"than generating a single character or acting as a modifier.  When it is\n"
-"bound to a key sequence, a series of character invocations and modifier\n"
-"actions are automatically generated rather than a single keystroke.\n"
-"\n"
-"Each mapping may contain zero or more key sequence records.  The title\n"
-"`SEQUENCES' is printed along with the count of sequence records which\n"
-"follow.  For example:\n"
-"\n"
-"    SEQUENCES [3]\n"
-"    sequence 0: \"f\" \"o\" \"o\"\n"
-"    sequence 1: {alternate} \"b\" \"a\" \"r\" {unmodify}\n"
-"    sequence 2: [home] \"b\" \"a\" \"z\"\n"
-"\n"
-"The notation used to represent the sequence of generated characters is\n"
-"identical to the notation already described in the `Characters' section\n"
-"above, with the exception that modifier actions may be interposed between\n"
-"generated characters.  Such modifier actions are represented by the\n"
-"modifier's name enclosed in braces.  The special name `{unmodify}'\n"
-"indicates the release of the modifier keys.\n"
-"\n"
-"Thus, the sequences in the above example can be interpreted as follows:\n"
-"\n"
-"    o Sequence #0 generates `foo'.\n"
-"    o Sequence #1 invokes the `alternate' modifier, generates `bar', and\n"
-"      then releases `alternate'.\n"
-"    o Sequence #2 invokes the `home' key and then generates `baz'.  In a\n"
-"      text editor, this would probably result in `baz' being prepended to\n"
-"      the line of text on which the cursor resides.\n"
-"\n"
-"Special Keys\n"
-"------------\n"
-"Certain keyboards feature keys which perform some type of special purpose\n"
-"function rather than generating a character or acting as a modifier.  For\n"
-"instance, Apple keyboards often contain a `power' key, and NeXT keyboards\n"
-"have historically featured screen brightness and volume control keys.\n"
-"\n"
-"Each mapping may contain zero or more special-key records which associate\n"
-"hardware scan codes with such special purpose functions.  The title\n"
-"`SPECIALS' is printed along with the count of records which follow.  For\n"
-"each record, the special function's name is printed along with a list of\n"
-"scan codes, in hexadecimal format, which are bound to that function.  For\n"
-"example:\n"
-"\n"
-"    SPECIALS [6]\n"
-"    alpha-lock: 0x39\n"
-"    brightness-down: 0x79\n"
-"    brightness-up: 0x74\n"
-"    power: 0x7f\n"
-"    sound-down: 0x77\n"
-"    sound-up: 0x73\n"
-"\n", f );
-    }
-
-
-//-----------------------------------------------------------------------------
-// Print a summary of the various files and directories which are related to
-// key mappings.
-//-----------------------------------------------------------------------------
-static void print_files_info( FILE* f )
-    {
-    fputs(
-"This is a summary of the various files and directories which are related to\n"
-"key mappings.\n"
-"\n"
-"*.keymapping\n"
-"    A key mapping file which precisely defines the relationship of all\n"
-"    hardware-specific keyboard scan-codes with their associated\n"
-"    functionality.\n"
-"\n"
-"*.keyboard\n"
-"    A file describing the physical layout of keys on a particular type of\n"
-"    keyboard.  Each `key' token in this file defines the position and shape\n"
-"    of the key on the keyboard, as well as the associated scan code which\n"
-"    that key generates.  A .keymapping file, on the other hand, defines the\n"
-"    characters which are generated by a particular scan code depending upon\n"
-"    the state of the various modifier keys (such as shift, control, etc.).\n"
-"    The `interface' and `handler_id' values from a .keymapping file are\n"
-"    matched against those in each .keyboard file in order to associate a\n"
-"    particular .keyboard file with a key mapping.  Various GUI programs use\n"
-"    the .keyboard file to display a visual representation of a keyboard for\n"
-"    the user.  Since these files are just plain text, they can be easily\n"
-"    viewed and interpreted without the aid of a specialized program, thus\n"
-"    dumpkeymap leaves these files alone.\n"
-"\n"
-"/System/Library/Keyboards\n"
-"/Network/Library/Keyboards\n"
-"/Local/Library/Keyboards\n"
-"/Library/Keyboards\n"
-"    Repositories for .keymapping and .keyboard files for MacOS/X, Darwin,\n"
-"    and MacOS/X Server.\n"
-"\n"
-"/NextLibrary/Keyboards\n"
-"/LocalLibrary/Keyboards\n"
-"    Repositories for .keymapping and .keyboard files for OpenStep and\n"
-"    NextStep.\n"
-"\n"
-"$(HOME)/Library/Keyboards\n"
-"    Repository for personal .keymapping and .keyboard files.\n"
-"\n", f );
-    }
-
-
-//-----------------------------------------------------------------------------
-// Print a list of the various diagnostic messages which may be emitted.
-//-----------------------------------------------------------------------------
-static void print_diagnostics_info( FILE* f )
-    {
-    fputs(
-"The following diagnostic messages may be issued to the standard error\n"
-"stream.\n"
-"\n"
-"Unrecognized option.\n"
-"    An unrecognized option was specified on the command-line.  Invoke\n"
-"    dumpkeymap with the --help option to view a list of valid options.\n"
-"\n"
-"Insufficient data in keymapping data stream.\n"
-"    The key mapping file or data stream is corrupt.  Either the file has\n"
-"    been incorrectly truncated or a field, such as those which indicates\n"
-"    the number of variable records which follow, contains a corrupt value.\n"
-"\n"
-"The following diagnostic messages have significance only when trying to\n"
-"print .keymapping files mentioned on the command-line.\n"
-"\n"
-"Bad magic number.\n"
-"    The mentioned file is not a .keymapping file.  The file's content does\n"
-"    not start with the string `KYM1'.\n"
-"\n"
-"Unable to open key mapping file.\n"
-"    The call to fopen() failed; probably because the specified path is\n"
-"    invalid or dumpkeymap does not have permission to read the file.\n"
-"\n"
-"Unable to determine key mapping file size.\n"
-"    The call to fstat() failed, thus memory can not be allocated for\n"
-"    loading the file.\n"
-"\n"
-"Unable to read key mapping file.\n"
-"    The call to fread() failed.\n"
-"\n"
-"The following diagnostic messages have significance only when trying to\n"
-"print the currently active key mapping when no .keymapping files have been\n"
-"mentioned on the command-line.\n"
-"\n"
-"Unable to open event status driver.\n"
-"    The call to NXOpenEventStatus() failed.\n"
-"\n"
-"Bad key mapping length.\n"
-"    The call to NXKeyMappingLength() returned a bogus value.\n"
-"\n"
-"Unable to get current key mapping.\n"
-"    The call to NXGetKeyMapping() failed.\n"
-"\n"
-"The following diagnostic messages have significance only when using\n"
-"dumpkeymap on a non-Apple/NeXT platform.\n"
-"\n"
-"Must specify at least one .keymapping file.\n"
-"    No .keymapping files were mentioned on the command-line.  On\n"
-"    non-Apple/NeXT platforms, there is no concept of a currently active\n"
-"    .keymapping file, so at least one file must be mentioned on the\n"
-"    command-line.\n"
-"\n", f );
-    }
-
-
-//-----------------------------------------------------------------------------
-// Print warranty.
-//-----------------------------------------------------------------------------
-static void print_warranty( FILE* f )
-    {
-    fputs(
-"This software is provided by the author `AS IS' and any express or implied\n"
-"WARRANTIES, including, but not limited to, the implied warranties of\n"
-"MERCHANTABILITY and FITNESS FOR A PARTICULAR PURPOSE are DISCLAIMED.  In NO\n"
-"EVENT shall the author be LIABLE for any DIRECT, INDIRECT, INCIDENTAL,\n"
-"SPECIAL, EXEMPLARY, or CONSEQUENTIAL damages (including, but not limited\n"
-"to, procurement of substitute goods or services; loss of use, data, or\n"
-"profits; or business interruption) however caused and on any theory of\n"
-"liability, whether in contract, strict liability, or tort (including\n"
-"negligence or otherwise) arising in any way out of the use of this\n"
-"software, even if advised of the possibility of such damage.\n"
-"\n", f );
-    }
-
-
-//-----------------------------------------------------------------------------
-// Print this program's version number.
-//-----------------------------------------------------------------------------
-static void print_version( FILE* f )
-    {
-    fputs( "Version " PROG_VERSION " (built " __DATE__ ")\n\n", f );
-    }
-
-
-//-----------------------------------------------------------------------------
-// Print a usage summary.
-//-----------------------------------------------------------------------------
-static void print_usage( FILE* f )
-    {
-    fputs(
-"Usage: dumpkeymap [options] [-] [file ...]\n"
-"\n"
-"Prints a textual representation of each Apple/NeXT .keymapping file\n"
-"mentioned on the command-line.  If no files are mentioned and if the local\n"
-"machine is an Apple or NeXT installation, then the key mapping currently in\n"
-"use by the WindowServer and the AppKit is printed instead.\n"
-"\n"
-"Options:\n"
-"    -h --help\n"
-"        Display general program instructions and option summary.\n"
-"\n"
-"    -k --help-keymapping\n"
-"        Display a detailed description of the internal layout of a\n"
-"        .keymapping file.\n"
-"\n"
-"    -o --help-output\n"
-"        Display an explanation of the output generated by dumpkeymap when\n"
-"        dissecting a .keymapping file.\n"
-"\n"
-"    -f --help-files\n"
-"        Display a summary of the various files and directories which are\n"
-"        related to key mappings.\n"
-"\n"
-"    -d --help-diagnostics\n"
-"        Display a list of the various diagnostic messages which may be\n"
-"        emitted by dumpkeymap.\n"
-"\n"
-"    -v --version\n"
-"        Display the dumpkeymap version number and warranty information.\n"
-"\n"
-"    - --\n"
-"        Inhibit processing of options at this point in the argument list.\n"
-"        An occurrence of `-' or `--' in the argument list causes all\n"
-"        following arguments to be treated as file names even if an argument\n"
-"        begins with a `-' character.\n"
-"\n", f );
-    }
-
-
-//-----------------------------------------------------------------------------
-// Print an informational banner.
-//-----------------------------------------------------------------------------
-static void print_banner( FILE* f )
-    {
-    fputs( "\n" PROG_NAME " v" PROG_VERSION " by " AUTHOR_INFO "\n"
-	COPYRIGHT "\n\n", f );
-    }
-
-
-//-----------------------------------------------------------------------------
-// Process command-line arguments.  Examine options first; collecting files
-// along the way.  If all is well, process collected file list.
-//-----------------------------------------------------------------------------
-int main( int const argc, char const* const argv[] )
-    {
-    int rc = 0, i, nfiles = 0, more_options = 1, process_files = 1;
-    int* files = (int*)calloc( argc - 1, sizeof(int) );
-    print_banner( stdout );
-
-    for (i = 1; i < argc; i++)
-	{
-	char const* const s = argv[i];
-	if (!more_options || *s != '-')
-	    files[ nfiles++ ] = i;
-	else
-	    {
-	    OPT_SWITCH(s)
-		OPT_CASE(-,--)
-		    more_options = 0;
-		OPT_CASE(-h,--help)
-		    print_usage( stdout );
-		    process_files = 0;
-		OPT_CASE(-k,--help-keymapping)
-		    print_internal_layout_info( stdout );
-		    process_files = 0;
-		OPT_CASE(-o,--help-output)
-		    print_output_info( stdout );
-		    process_files = 0;
-		OPT_CASE(-f,--help-files)
-		    print_files_info( stdout );
-		    process_files = 0;
-		OPT_CASE(-d,--help-diagnostics)
-		    print_diagnostics_info( stdout );
-		    process_files = 0;
-		OPT_CASE(-v,--version)
-		    print_version( stdout );
-		    print_warranty( stdout );
-		    process_files = 0;
-		OPT_DEFAULT
-		    fprintf( stderr, "ERROR: Unrecognized option: %s\n\n", s );
-		    process_files = 0;
-		    rc = 1;
-	    OPT_SWITCH_END
-	    }
-	}
-
-    if (process_files)
-	{
-	if (nfiles == 0)
-	    rc = handle_empty_document_list();
-	else
-	    for (i = 0; i < nfiles; i++)
-		rc |= unparse_keymap_file( argv[files[i]] );
-	}
-
-    free( files );
-    return rc;
-    }
diff --git a/hw/darwin/utils/dumpkeymap.man b/hw/darwin/utils/dumpkeymap.man
deleted file mode 100644
index 02b09e6ca..000000000
--- a/hw/darwin/utils/dumpkeymap.man
+++ /dev/null
@@ -1,1002 +0,0 @@
-.ig
-//=============================================================================
-//
-// Manual page for `dumpkeymap'.
-//
-// Copyright (C) 1999,2000 by Eric Sunshine <sunshine@sunshineco.com>
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-//   1. Redistributions of source code must retain the above copyright
-//      notice, this list of conditions and the following disclaimer.
-//   2. Redistributions in binary form must reproduce the above copyright
-//      notice, this list of conditions and the following disclaimer in the
-//      documentation and/or other materials provided with the distribution.
-//   3. The name of the author may not be used to endorse or promote products
-//      derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-//=============================================================================
-//
-..
-.ig
-//-----------------------------------------------------------------------------
-// Local identification information.
-//-----------------------------------------------------------------------------
-..
-.nr VE 4 \" Version number
-.TH DUMPKEYMAP 1 "v\n(VE \-\- 1 December 2000" "Version \n(VE"
-.de UP
-1 December 2000
-..
-.ig
-//-----------------------------------------------------------------------------
-// Annotation Macros
-// -----------------
-//	Facilitate creation of annotated, non-filled blocks of text.  An
-//	annotated block is initiated with the `AS' macro.  Each annotated,
-//	non-filled line within the block must be introduced with the `AN' macro
-//	which takes three arguments.  The first argument is the detail text to
-//	be annotated.  The second is a string of spaces used to align the
-//	annotations by certain (broken) roff interpreters which fail to
-//	implement the proper set of roff commands (such as diversions,
-//	indentation, and tab stops).  It is assumed that the spaces will be
-//	used with fixed-point font.  The third argument is the annotation
-//	itself.  The block should be terminated with the `AE' macro.  For all
-//	roff interpreters which properly implement diversions, indentation, and
-//	tab stops, all annotations within the block are automatically aligned at
-//	the same horizontal position.  This position is guaranteed to be just
-//	to the right of the widest `AN' detail line.  For broken roff
-//	interpreters, such as `rman', the string of spaces from the second
-//	argument are used to align the annotations.  Finally, the `AZ' macro,
-//	which takes a single argument, can be used to to insert a non-annotated
-//	line into the block which does not play a part in the calculation of
-//	the horizontal annotation alignment.
-//
-// Implementation Notes
-// --------------------
-// *1*	These macros utilize a diversion (named `AD').  Since the prevailing
-//	indentation is stored along with the diverted text, we must muck with
-//	the indentation level in order to prevent the indentation from being
-//	applied to the text a second time when `AD' is finally emitted.
-//
-// *2*	Unfortunately, `.if' strips leading whitespace from following text, so
-//	`AN' uses \& to preserve the whitespace.
-//
-// *3*	This manual page has been tested for proper formatting with troff,
-//	groff, nroff and rman (the `man' to `HTML' converter).  Unfortunately,
-//	rman fails to implement many useful features such as diversions,
-//	indentation, and tab stops, and is also hideously buggy.  Furthermore
-//	it identifies itself as nroff and fails to provide any further
-//	identification, so there is no way to create macros which specifically
-//	work around its limitations.  Following is a list of several bugs in
-//	rman which the implementation of these macros must avoid:
-//	    o Fails with multi-line conditionals within macros.
-//	    o Fails on macro definition within multi-line conditionals.
-//	    o Fails when macro arguments are not delimited by exactly 1 space.
-//	    o String definition `.ds' ignores the value; uses empty "" instead.
-//	As a consequence of these problems, the following macros are written
-//	using a series of ugly single-line `.if' conditionals rather than the
-//	more natural multi-line `.if' and `.ie' conditionals.  Also, rman fails
-//	to understand the common idiom of `.\"' to introduce a comment, which
-//	is why all comments in this file are wrapped in ignore `.ig' blocks.
-//-----------------------------------------------------------------------------
-..
-.de AS
-.if t .nr AW 0
-.if t .nr AI \\n(.i
-.if t .in -\\n(AI
-.nf
-..
-.de AN
-.if t .if \w'\\$1'>\\n(AW .nr AW \w'\\$1'
-.if t .da AD
-.if t \\&\\$1\\t\\$3
-.if t .da
-.if n \\&\\$1 \\$2\\$3
-..
-.de AZ
-.if t .da AD
-\\$1
-.if t .da
-..
-.de AE
-.if t .in +\\n(AIu
-.if t .if \\n(AW .ta \\n(AWu+\w'\\(em'u
-.if t .AD
-.if t .DT
-.if t .rm AD
-.if t .rm AW
-.fi
-..
-.ig
-//-----------------------------------------------------------------------------
-// Bulleted list macros -- `BG' begins a bulleted list; `BU' delimits
-//	bulleted entries; `BE' ends a bulleted list.
-//-----------------------------------------------------------------------------
-..
-.de BG
-.PP
-.RS
-..
-.de BU
-.HP
-\\(bu\\ \\c
-..
-.de BE
-.RE
-.PP
-..
-.ig
-//-----------------------------------------------------------------------------
-// Indented paragraph with stylized hanging tag macro.  `TG' takes a single
-//	argument and treats it as the hanging tag of the indented paragraph.
-//	The tag is italicized in troff but not in nroff.
-//-----------------------------------------------------------------------------
-..
-.de TG
-.TP
-.ie t .I "\\$1"
-.el \\$1
-..
-.ig
-//-----------------------------------------------------------------------------
-// Manual page for `dumpkeymap'.
-//-----------------------------------------------------------------------------
-..
-.SH NAME
-dumpkeymap \- Dianostic dump of a .keymapping file
-.SH SYNOPSIS
-.B dumpkeymap
-.RI [ options "] [-] [" file "...]"
-.SH DESCRIPTION
-.I dumpkeymap
-prints a textual representation of each Apple/\c
-.SM NeXT
-.I .keymapping
-file mentioned on the command-line.  If no files are mentioned and if the
-local machine is an Apple or
-.SM NeXT
-installation, then the key mapping currently in use by the WindowServer and the
-AppKit is printed instead.
-.SH OPTIONS
-.TP
-.B "\-h \-\^\-help"
-Display general program instructions and option summary.
-.TP
-.B "\-k \-\^\-help\-keymapping"
-Display a detailed description of the internal layout of a
-.I .keymapping
-file.  This is the same information as that presented in the
-.I "Key Mapping Description"
-section of this document.
-.TP
-.B "\-o \-\^\-help\-output"
-Display an explanation of the output generated by
-.I dumpkeymap
-when dissecting a
-.I .keymapping
-file.  This is the same information as that presented in the
-.I "Output Description"
-section of this document.
-.TP
-.B "\-f \-\^\-help\-files"
-Display a summary of the various files and directories which are related to
-key mappings.  This is the same information as that presented in the
-.I "Files"
-section of this document.
-.TP
-.B "\-d \-\^\-help\-diagnostics"
-Display a list of the various diagnostic messages which may be emitted by
-.I dumpkeymap.
-This is the same information as that presented in the
-.I "Diagnostics"
-section of this document.
-.TP
-.B "\-v \-\^\-version"
-Display the
-.I dumpkeymap
-version number and warranty information.
-.TP
-.B "\- \-\^\-"
-Inhibit processing of options at this point in the argument list.  An
-occurrence of `\-' or `\-\^\-' in the argument list causes all following
-arguments to be treated as file names even if an argument begins with a `\-'
-character.
-.SH "KEY MAPPING DESCRIPTION"
-The following sections describe, in complete detail, the format of a raw key
-mapping resource, as well as the format of the
-.I .keymapping
-file which encapsulates one or more raw mappings.
-.SH "Types and Data"
-The following type definitions are employed throughout this discussion:
-.PP
-.RS
-.AS
-.AZ "typedef unsigned char byte;"
-.AZ "typedef unsigned short word;"
-.AZ "typedef unsigned long dword;"
-.AE
-.RE
-.PP
-Additionally, the type definition
-.RI ` number '
-is used generically to
-indicate a numeric value.  The actual size of the
-.RI ` number '
-type may be one or two bytes depending upon how the data is stored in the key
-map.  Although most key maps use byte-sized numeric values, word-sized values
-are also allowed.
-.PP
-Multi-byte values in a key mapping file are stored in big-endian byte order.
-.SH "Key Mapping File and Device Mapping"
-A key mapping file begins with a magic-number and continues with a
-variable number of device-specific key mappings.
-.PP
-.RS
-.AS
-.AZ "struct KeyMappingFile {"
-.AN "    char magic_number[4];" "   " "// `KYM1'"
-.AN "    DeviceMapping maps[...];" "" "// Variable number of maps"
-.AZ };
-.AE
-.PP
-.AS
-.AZ "struct DeviceMapping {"
-.AN "    dword interface;" " " "// Interface type"
-.AN "    dword handler_id;" "" "// Interface subtype"
-.AN "    dword map_size;" "  " "// Byte count of `map' (below)"
-.AN "    KeyMapping map;"
-.AZ };
-.AE
-.RE
-.PP
-The value of `interface' represents a family of keyboard device types
-(such as Intel
-.SM "PC, ADB, NeXT,"
-Sun Type5, etc.), and is generally specified as one of the constant values
-.SM "NX_EVS_DEVICE_INTERFACE_ADB, NX_EVS_DEVICE_INTERFACE_ACE,"
-etc., which are are defined in IOHIDTypes.h on MacOS/X and Darwin, and in
-ev_types.h on MacOS/X Server, OpenStep, and NextStep.
-.PP
-The value of `handler_id' represents a specific keyboard layout within the
-much broader `interface' family.  For instance, for a 101-key Intel
-.SM PC
-keyboard (of type
-.SM NX_EVS_DEVICE_INTERFACE_ACE\c
-) the `handler_id' is '0', whereas for a 102-key keyboard it is `1'.
-.PP
-Together, `interface' and `handler_id' identify the exact keyboard hardware to
-which this mapping applies.  Programs which display a visual representation of
-a keyboard layout, match `interface' and `handler_id' from the
-.I .keymapping
-file against the `interface' and `handler_id' values found in each
-.I .keyboard
-file.
-.SH "Key Mapping"
-A key mapping completely defines the relationship of all scan codes with their
-associated functionality.  A
-.I KeyMapping
-structure is embedded within the
-.I DeviceMapping
-structure in a
-.IR KeyMappingFile .
-The key mapping currently in use by the WindowServer and AppKit is also
-represented by a
-.I KeyMapping
-structure, and can be referred to directly by calling NXGetKeyMapping() and
-accessing the `mapping' data member of the returned
-.I NXKeyMapping
-structure.
-.PP
-.RS
-.AS
-.AZ "struct KeyMapping {"
-.AN "    word number_size;" "          " "// 0=1 byte, non-zero=2 bytes"
-.AN "    number num_modifier_groups;" "" "// Modifier groups"
-.AZ "    ModifierGroup modifier_groups[...];"
-.AN "    number num_scan_codes;" "     " "// Scan groups"
-.AN "    ScanGroup scan_table[...];"
-.AN "    number num_sequence_lists;" " " "// Sequence lists"
-.AN "    Sequence sequence_lists[...];"
-.AN "    number num_special_keys;" "   " "// Special keys"
-.AN "    SpecialKey special_key[...];"
-.AZ };
-.AE
-.RE
-.PP
-The `number_size' flag determines the size, in bytes, of all remaining numeric
-values (denoted by the type definition
-.RI ` number ')
-within the
-key mapping.  If its value is zero, then numbers are represented by a single
-byte.  If it is non-zero, then numbers are represented by a word (two bytes).
-.SH "Modifier Group"
-A modifier group defines all scan codes which map to a particular type of
-modifier, such as
-.IR shift ,
-.IR control ,
-etc.
-.PP
-.RS
-.AS
-.AZ "enum Modifier {"
-.AZ "    ALPHALOCK = 0,"
-.AZ "    SHIFT,"
-.AZ "    CONTROL,"
-.AZ "    ALTERNATE,"
-.AZ "    COMMAND,"
-.AZ "    KEYPAD,"
-.AZ "    HELP"
-.AZ };
-.AE
-.PP
-.AS
-.AZ "struct ModifierGroup {"
-.AN "    number modifier;" "       " "// A Modifier constant"
-.AN "    number num_scan_codes;"
-.AN "    number scan_codes[...];" "" "// Variable number of scan codes"
-.AZ };
-.AE
-.RE
-.PP
-The scan_codes[] array contains a list of all scan codes which map to the
-specified modifier.  The
-.IR shift ", " command ", and " alternate
-modifiers are frequently mapped to two different scan codes, apiece,
-since these modifiers often appear on both the left and right sides of
-the keyboard.
-.SH "Scan Group"
-There is one
-.I ScanGroup
-for each scan code generated by the given keyboard.  This number is given by
-KeyMapping::num_scan_codes.  The first scan group represents hardware scan
-code 0, the second represents scan code 1, etc.
-.PP
-.RS
-.AS
-.AZ "enum ModifierMask {"
-.AN "    ALPHALOCK_MASK" "      " "= 1 << 0,"
-.AN "    SHIFT_MASK" "          " "= 1 << 1,"
-.AN "    CONTROL_MASK" "        " "= 1 << 2,"
-.AN "    ALTERNATE_MASK" "      " "= 1 << 3,"
-.AN "    CARRIAGE_RETURN_MASK" "" "= 1 << 4"
-.AZ };
-.AZ "#define NOT_BOUND 0xff"
-.AE
-.PP
-.AS
-.AZ "struct ScanGroup {"
-.AN "    number mask;"
-.AN "    Character characters[...];"
-.AZ };
-.AE
-.RE
-.PP
-For each scan code, `mask' defines which modifier combinations generate
-characters.  If `mask' is
-.SM NOT_BOUND
-(0xff) then then this scan code does not generate any characters ever, and its
-characters[] array is zero length.  Otherwise, the characters[] array contains
-one
-.I Character
-record for each modifier combination.
-.PP
-The number of records in characters[] is determined by computing (1 <<
-bits_set_in_mask).  In other words, if mask is zero, then zero bits are set,
-so characters[] contains only one record.  If `mask' is
-.SM "(SHIFT_MASK | CONTROL_MASK),"
-then two bits are set, so characters[] contains four records.
-.PP
-The first record always represents the character which is generated by that
-key when no modifiers are active.  The remaining records represent characters
-generated by the various modifier combinations.  Using the example with the
-.I shift
-and
-.I control
-masks set, record two would represent the character with the
-.I shift
-modifier active; record three, the
-.I control
-modifier active; and record four, both the
-.I shift
-and
-.I control
-modifiers active.
-.PP
-As a special case,
-.SM ALPHALOCK_MASK
-implies
-.SM SHIFT_MASK,
-though only
-.SM ALPHALOCK_MASK
-appears in `mask'.  In this case the same character is generated for both the
-.I shift
-and
-.I alpha-lock
-modifiers, but only needs to appear once in the characters[] array.
-.PP
-.SM CARRIAGE_RETURN_MASK
-does not actually refer to a modifier key.  Instead, it is used to
-distinguish the scan code which is given the special pseudo-designation of
-.I "carriage return"
-key.  Typically, this mask appears solo in a
-.I ScanGroup
-record and only the two
-.I Character
-records for control-M and control-C follow.  This flag may be a throwback to
-an earlier time or may be specially interpreted by the low-level keyboard
-driver, but its purpose is otherwise enigmatic.
-.SH Character
-Each
-.I Character
-record indicates the character generated when this key is pressed, as well as
-the character set which contains the character.  Well known character sets are
-.SM `ASCII'
-and `Symbol'.  The character set can also be one of the meta values
-.SM FUNCTION_KEY
-or
-.SM KEY_SEQUENCE.
-If it is
-.SM FUNCTION_KEY
-then `char_code' represents a generally well-known function key such as those
-enumerated by
-.I FunctionKey.
-If the character set is
-.SM KEY_SEQUENCE
-then `char_code' represents is a zero-base index into
-KeyMapping::sequence_lists[].
-.PP
-.RS
-.AS
-.AZ "enum CharacterSet {"
-.AN "    ASCII" "       " "= 0x00,"
-.AN "    SYMBOL" "      " "= 0x01,"
-.AN "    ..."
-.AN "    FUNCTION_KEY" "" "= 0xfe,"
-.AN "    KEY_SEQUENCE" "" "= 0xff"
-.AZ };
-.AE
-.PP
-.AS
-.AZ "struct Character {"
-.AN "    number set;" "      " "// CharacterSet of generated character"
-.AN "    number char_code;" "" "// Actual character generated"
-.AZ };
-.AE
-.PP
-.AS
-.AZ "enum FunctionKey {"
-.AZ "    F1 = 0x20, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12,"
-.AZ "    INSERT, DELETE, HOME, END, PAGE_UP, PAGE_DOWN, PRINT_SCREEN,"
-.AZ "    SCROLL_LOCK, PAUSE, SYS_REQUEST, BREAK, RESET, STOP, MENU,"
-.AZ "    USER, SYSTEM, PRINT, CLEAR_LINE, CLEAR_DISPLAY, INSERT_LINE,"
-.AZ "    DELETE_LINE, INSERT_CHAR, DELETE_CHAR, PREV, NEXT, SELECT"
-.AZ };
-.AE
-.RE
-.SH Sequence
-When Character::set contains the meta value
-.SM KEY_SEQUENCE,
-the scan code is bound to a sequence of keys rather than a single character.
-A sequence is a series of modifiers and characters which are automatically
-generated when the associated key is depressed.
-.PP
-.RS
-.AS
-.AZ "#define MODIFIER_KEY 0xff"
-.AE
-.PP
-.AS
-.AZ "struct Sequence {"
-.AN "    number num_chars;"
-.AN "    Character characters[...];"
-.AZ };
-.AE
-.RE
-.PP
-Each generated
-.I Character
-is represented as previously described, with the exception that
-.SM MODIFIER_KEY
-may appear in place of
-.SM KEY_SEQUENCE.
-When the value of Character::set is
-.SM MODIFIER_KEY
-then Character::char_code represents a modifier key rather than an actual
-character.  If the modifier represented by `char_code' is non-zero, then it
-indicates that the associated modifier key has been depressed.  In this case,
-the value is one of the constants enumerated by
-.I Modifier
-(\c
-.SM "SHIFT, CONTROL, ALTERNATE,"
-etc.).  If the value is zero then it means that the modifier keys have been
-released.
-.SH "Special Key"
-A special key is one which is scanned directly by the Mach kernel rather than
-by the WindowServer.  In general, events are not generated for special keys.
-.PP
-.RS
-.AS
-.AZ "enum SpecialKeyType {"
-.AZ "    VOLUME_UP = 0,"
-.AZ "    VOLUME_DOWN,"
-.AZ "    BRIGHTNESS_UP,"
-.AZ "    BRIGHTNESS_DOWN,"
-.AZ "    ALPHA_LOCK,"
-.AZ "    HELP,"
-.AZ "    POWER,"
-.AZ "    SECONDARY_ARROW_UP,"
-.AZ "    SECONDARY_ARROW_DOWN"
-.AZ };
-.AE
-.PP
-.AS
-.AZ "struct SpecialKey {"
-.AN "    number type;" "     " "// A SpecialKeyType constant"
-.AN "    number scan_code;" "" "// Actual scan code"
-.AZ };
-.AE
-.RE
-.SH OUTPUT
-What follows is an explanation and description of the various pieces of
-information emitted by
-.I dumpkeymap.
-.PP
-For a more thorough discussion of any particular piece of information described
-here, refer to the detailed description of the internal layout of a key mapping
-provided by the
-.I "Key Mapping Description"
-section above.
-.SH Conventions
-Depending upon context, some numeric values are displayed in decimal
-notation, whereas others are displayed in hexadecimal notation.
-Hexadecimal numbers are denoted by a `0x' prefix (for instance, `0x7b'),
-except when explicitly noted otherwise.
-.SH "Key Mapping Source"
-The first piece of information presented about a particular key mapping is the
-source from which the data was gleaned.  For a
-.I .keymapping
-file, the title
-.SM "`KEYMAP FILE'"
-is emitted along with the path and name of the file in question.  For the key
-mapping currently in use by the WindowServer and AppKit, the title
-.SM "`ACTIVE KEYMAP'"
-is emitted instead.
-.SH "Device Information"
-Each
-.I .keymapping
-file may contain one or more raw key mappings.  For example, a file which maps
-keys to a Dvorak-style layout might contain raw mappings for Intel
-.SM "PC, ADB, NeXT,"
-and Sun Type5 keyboards.
-.PP
-For each raw mapping, the following information is emitted:
-.BG
-.BU
-The title
-.SM `KEYMAP'
-along with the mapping's relative position in the
-.I .keymapping
-file.
-.BU
-The `interface' identifier.
-.BU
-The `handler_id' sub-identifier.
-.BU
-The size of the raw mapping resource counted in bytes.
-.BE
-The `interface' and `handler_id' values, taken together, define a specific
-keyboard device.  A
-.I .keyboard
-file, which describes the visual layout of a keyboard, also contains
-`interface' and `handler_id' identifiers.  The
-.I .keyboard
-file corresponding to a particular key mapping can be found by matching the
-`interface' and `handler_id' values from each resource.
-.SH Modifiers
-Each mapping may contain zero or more modifier records which associate hardware
-scan codes with modifier descriptions such as
-.I "shift, control, alternate,"
-etc.  The title
-.SM `MODIFIERS'
-is printed along with the count of modifier records which follow.  For each
-modifier record, the modifier's name is printed along with a list of scan
-codes, in hexadecimal format, which generate that modifier value.  For example:
-.PP
-.RS
-.nf
-MODIFIERS [4]
-alternate: 0x1d 0x60
-control: 0x3a
-keypad: 0x52 0x53 ... 0x63 0x62
-shift: 0x2a 0x36
-.fi
-.RE
-.SH Characters
-Each mapping may contain zero or more character records which associate
-hardware scan codes with the actual characters generated by those scan
-codes in the presence or absence of various modifier combinations.  The
-title
-.SM `CHARACTERS'
-is printed along with the count of character records which follow.  Here is a
-highly abbreviated example:
-.PP
-.RS
-.nf
-CHARACTERS [9]
-scan 0x00: -AC-L  "a" "A" "^A" "^A" ca c7 "^A" "^A"
-scan 0x07: -AC-L  "x" "X" "^X" "^X" 01/b4 01/ce "^X" "^X"
-scan 0x0a: ---S-  "<" ">"
-scan 0x13: -ACS-  "2" "@" "^@" "^@" b2 b3 "^@" "^@"
-scan 0x24: R----  "^M" "^C"
-scan 0x3e: -----  [F4]
-scan 0x4a: -----  [page up]
-scan 0x60: -----  {seq#3}
-scan 0x68: not-bound
-.fi
-.RE
-.PP
-For each record, the hexadecimal value of the hardware scan code is printed,
-followed by a list of modifier flag combinations and the actual characters
-generated by this scan code with and without modifiers applied.
-.PP
-The modifier flags field is composed of a combination of single letter
-representations of the various modifier types.  The letters stand for:
-.PP
-.RS
-.nf
-L \- alpha-lock
-S \- shift
-C \- control
-A \- alternate
-R \- carriage-return
-.fi
-.RE
-.PP
-As a special case, the
-.I alpha-lock
-flag also implies the
-.I shift
-flag, so these two flags never appear together in the same record.
-.PP
-The combination of modifier flags determines the meaning and number of fields
-which follow.  The first field after the modifier flags always represents the
-character that will be generated if no modifier keys are depressed.  The
-remaining fields represent characters generated by the various modifier
-combinations.  The order of the fields follows this general pattern:
-.BG
-.BU
-The character generated by this scan code when no modifiers are in effect is
-listed first.
-.BU
-If the `L' or `S' flag is active, then the shifted character generated by this
-scan code is listed next.
-.BU
-If the `C' flag is active, then the control-character generated by this scan
-code is listed next.  Furthermore, if the `L' or `S' flag is also active, then
-the shifted control-character is listed after that.
-.BU
-If the `A' flag is active, then the alternate-character generated by this scan
-code is listed next.  Furthermore, if the `L' or `S' flag is active, then the
-shifted alternate-character is listed after that.  If the `C' flag is also
-active, then the alternate-control-character is listed next.  Finally, if the
-`C' and `L' or `C' and `S' flags are also active, then the shifted
-alternate-control-character is listed.
-.BE
-The `R' flag does not actually refer to a modifier key.  Instead, it is used to
-distinguish the scan code which is given the special pseudo-designation of
-.I "carriage return"
-key.  Typically, this mask appears solo and only the two fields for control-M
-and control-C follow.  This flag may be a throwback to an earlier time or may
-be specially interpreted by the low-level keyboard driver, but its purpose is
-otherwise enigmatic.
-.PP
-Recalling the example from above, the following fields can be identified:
-.PP
-.RS
-.nf
-scan 0x00: -AC-L  "a" "A" "^A" "^A" ca c7 "^A" "^A"
-.fi
-.RE
-.BG
-.BU
-Lower-case `a' is generated when no modifiers are active.
-.BU
-Upper-case `A' is generated when
-.IR shift " or " alpha-lock
-are active.
-.BU
-Control-A is generated when
-.I control
-is active.
-.BU
-Control-A is generated when
-.IR control " and " shift
-are active.
-.BU
-The character represented by the hexadecimal code 0xca is generated when
-.I alternate
-is active.
-.BU
-The character represented by 0xc7 is generated when
-.IR alternate " and " shift " (or " alpha-lock ") are active."
-.BU
-Control-A is generated when
-.IR alternate " and " control
-are active.
-.BU
-Control-A is generated when
-.IR "alternate, control" " and " shift " (or " alpha-lock ") are active."
-.BE
-The notation used to represent a particular generated character varies.
-.BG
-.BU
-Printable
-.SM ASCII
-characters are quoted, as in "x" or "X".
-.BU
-Control-characters are quoted and prefixed with `^', as in "^X".
-.BU
-Characters with values greater than 127 (0x7f) are displayed as hexadecimal
-values without the `0x' prefix.
-.BU
-Characters in a non-\c
-.SM ASCII
-character set (such as `Symbol') are displayed as two hexadecimal numbers
-separated by a slash, as in `01/4a'.  The first number is the character set's
-identification code (such as `01' for the `Symbol' set), and the second number
-is the value of the generated character.
-.BU
-Non-printing special function characters are displayed with the function's
-common name enclosed in brackets, as in `[page up]' or `[F4]'.
-.BU
-If the binding represents a key sequence rather than a single character, then
-the sequence's identification number is enclosed in braces, as in `{seq#3}'.
-.BE
-Recalling a few examples from above, the following interpretations can be made:
-.PP
-.RS
-.nf
-scan 0x07: -AC-L  "x" "X" "^X" "^X" 01/b4 01/ce "^X" "^X"
-scan 0x3e: -----  [F4]
-scan 0x4a: -----  [page up]
-scan 0x60: -----  {seq#3}
-.fi
-.RE
-.BG
-.BU
-"x" and "X" are printable
-.SM ASCII
-characters.
-.BU
-"^X" is a control-character.
-.BU
-`01/b4' and `01/ce' represent the character codes 0xb4 and 0xce in the `Symbol'
-character set.
-.BU
-Scan code 0x3e generates function-key `F4', and scan code 0x4a generates
-function-key `page up'.
-.BU
-Scan code 0x60 is bound to key sequence #3.
-.BE
-Finally, if a scan code is not bound to any characters, then it is annotated
-with the label `not-bound', as with example scan code 0x68 from above.
-.SH Sequences
-A scan code (modified and unmodified) can be bound to a key sequence rather
-than generating a single character or acting as a modifier.  When it is bound
-to a key sequence, a series of character invocations and modifier actions are
-automatically generated rather than a single keystroke.
-.PP
-Each mapping may contain zero or more key sequence records.  The title
-.SM `SEQUENCES'
-is printed along with the count of sequence records which follow.  For example:
-.PP
-.RS
-.nf
-SEQUENCES [3]
-sequence 0: "f" "o" "o"
-sequence 1: {alternate} "b" "a" "r" {unmodify}
-sequence 2: [home] "b" "a" "z"
-.fi
-.RE
-.PP
-The notation used to represent the sequence of generated characters is
-identical to the notation already described in the
-.I Characters
-section above, with the exception that modifier actions may be interposed
-between generated characters.  Such modifier actions are represented by the
-modifier's name enclosed in braces.  The special name `{unmodify}' indicates
-the release of the modifier keys.
-.PP
-Thus, the sequences in the above example can be interpreted as follows:
-.BG
-.BU
-Sequence\ #0 generates `foo'.
-.BU
-Sequence\ #1 invokes the
-.I alternate
-modifier, generates `bar', and then releases
-.I alternate.
-.BU
-Sequence\ #2 invokes the
-.I home
-key and then generates `baz'.  In a text editor, this would probably result in
-`baz' being prepended to the line of text on which the cursor resides.
-.BE
-.SH Special Keys
-Certain keyboards feature keys which perform some type of special purpose
-function rather than generating a character or acting as a modifier.  For
-instance, Apple keyboards often contain a
-.I power
-key, and
-.SM NeXT
-keyboards have historically featured screen brightness and volume control keys.
-.PP
-Each mapping may contain zero or more special-key records which associate
-hardware scan codes with such special purpose functions.  The title
-.SM `SPECIALS'
-is printed along with the count of records which follow.  For each record, the
-special function's name is printed along with a list of scan codes, in
-hexadecimal format, which are bound to that function.  For example:
-.PP
-.RS
-.nf
-SPECIALS [6]
-alpha-lock: 0x39
-brightness-down: 0x79
-brightness-up: 0x74
-power: 0x7f
-sound-down: 0x77
-sound-up: 0x73
-.fi
-.RE
-.SH FILES
-.IP *.keymapping
-A key mapping file which precisely defines the relationship of all
-hardware-specific keyboard scan-codes with their associated functionality.
-.IP *.keyboard
-A file describing the physical layout of keys on a particular type of
-keyboard.  Each `key' token in this file defines the position and shape of the
-key on the keyboard, as well as the associated scan code which that key
-generates.  A
-.I .keymapping
-file, on the other hand, defines the characters which are generated by a
-particular scan code depending upon the state of the various modifier keys
-(such as
-.I shift,
-.I control,
-etc.).  The `interface' and `handler_id' values from a
-.I .keymapping
-file are matched against those in each
-.I .keyboard
-file in order to associate a particular
-.I .keyboard
-file with a key mapping.  Various
-.SM GUI
-programs use the
-.I .keyboard
-file to display a visual representation of a keyboard for the user.  Since
-these files are just plain text, they can be easily viewed and interpreted
-without the aid of a specialized program, thus
-.I dumpkeymap
-leaves these files alone.
-.PP
-/System/Library/Keyboards
-.br
-/Network/Library/Keyboards
-.br
-/Local/Library/Keyboards
-.br
-/Library/Keyboards
-.RS
-Repositories for
-.I .keymapping
-and
-.I .keyboard
-files for MacOS/X, Darwin, and MacOS/X Server.
-.RE
-.PP
-/NextLibrary/Keyboards
-.br
-/LocalLibrary/Keyboards
-.RS
-Repositories for
-.I .keymapping
-and
-.I .keyboard
-files for OpenStep and NextStep.
-.RE
-.IP $(HOME)/Library/Keyboards
-Repository for personal
-.I .keymapping
-and
-.I .keyboard
-files.
-.SH DIGANOSTICS
-The following diagnostic messages may be issued to the standard error stream.
-.TG "Unrecognized option."
-An unrecognized option was specified on the command-line.  Invoke
-.I dumpkeymap
-with the
-.B "\-\^\-help"
-option to view a list of valid options.
-.TG "Insufficient data in keymapping data stream."
-The key mapping file or data stream is corrupt.  Either the file has been
-incorrectly truncated or a field, such as those which indicates the number of
-variable records which follow, contains a corrupt value.
-.PP
-The following diagnostic messages have significance only when trying to print
-.I .keymapping
-files mentioned on the command-line.
-.TG "Bad magic number."
-The mentioned file is not a
-.I .keymapping
-file.  The file's content does not start with the string `KYM1'.
-.TG "Unable to open key mapping file."
-The call to fopen() failed; probably because the specified path is invalid or
-.I dumpkeymap
-does not have permission to read the file.
-.TG "Unable to determine key mapping file size."
-The call to fstat() failed, thus memory can not be allocated for loading the
-file.
-.TG "Unable to read key mapping file."
-The call to fread() failed.
-.PP
-The following diagnostic messages have significance only when trying to print
-the currently active key mapping when no
-.I .keymapping
-files have been mentioned on the command-line.
-.TG "Unable to open event status driver."
-The call to NXOpenEventStatus() failed.
-.TG "Bad key mapping length."
-The call to NXKeyMappingLength() returned a bogus value.
-.TG "Unable to get current key mapping."
-The call to NXGetKeyMapping() failed.
-.PP
-The following diagnostic messages have significance only when using
-.I dumpkeymap
-on a non-Apple/\c
-.SM NeXT
-platform.
-.TG "Must specify at least one .keymapping file."
-No
-.I .keymapping
-files were mentioned on the command-line.  On non-Apple/\c
-.SM NeXT
-platforms, there is no concept of a currently active
-.I .keymapping
-file, so at least one file must be mentioned on the command-line.
-.SH AUTHOR
-Eric Sunshine <sunshine@sunshineco.com> wrote
-.I dumpkeymap
-and this document, the
-.I "dumpkeymap user's manual."
-Both
-.I dumpkeymap
-and this document are copyright \(co1999,2000 by Eric Sunshine
-<sunshine@sunshineco.com>.  All rights reserved.
-.PP
-The implementation of
-.I dumpkeymap
-is based upon information gathered on September 3, 1997 by Eric Sunshine
-<sunshine@sunshineco.com> and Paul S. McCarthy <zarnuk@zarnuk.com> during an
-effort to reverse engineer the format of the
-.SM NeXT
-.I .keymapping
-file.
-.if n .PP
-.if n Version \n(VE \-\-
-.if n .UP

From 8d0efe4c2a48047680af40e5f6d639f426902e07 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Tue, 4 Dec 2007 17:59:13 -0800
Subject: [PATCH 264/552] Darwin: Rework build system to more accurately reveal
 code infrastructure and facilitate future modularity. (cherry picked from
 commit e8399fd4d66a2b77b770c277e2fa424229a721b2)

---
 configure.ac                                  |   2 +-
 hw/darwin/Makefile.am                         |  58 ++----------------
 hw/darwin/quartz/Makefile.am                  |  13 +++-
 hw/darwin/quartz/X11Application.m             |   3 +-
 .../apple/English.lproj/InfoPlist.strings     | Bin
 .../apple/English.lproj/Localizable.strings   | Bin
 .../apple/English.lproj/main.nib/classes.nib  |   0
 .../apple/English.lproj/main.nib/info.nib     |   0
 .../English.lproj/main.nib/keyedobjects.nib   | Bin
 hw/darwin/{ => quartz}/apple/Info.plist       |   0
 hw/darwin/{ => quartz}/apple/Makefile.am      |   0
 hw/darwin/{ => quartz}/apple/X11.icns         | Bin
 .../apple/X11.xcodeproj/project.pbxproj       |   0
 hw/darwin/{ => quartz}/apple/bundle-main.c    |   0
 hw/darwin/{ => quartz}/apple/launcher-main.c  |   0
 hw/darwin/{ => quartz}/apple/org.x.X11.plist  |   0
 hw/darwin/{ => quartz}/apple/server-main.c    |   0
 hw/darwin/quartz/xpr/Makefile.am              |  54 ++++++++++++++--
 hw/darwin/{ => quartz/xpr}/Xquartz.man        |   0
 19 files changed, 64 insertions(+), 66 deletions(-)
 rename hw/darwin/{ => quartz}/apple/English.lproj/InfoPlist.strings (100%)
 rename hw/darwin/{ => quartz}/apple/English.lproj/Localizable.strings (100%)
 rename hw/darwin/{ => quartz}/apple/English.lproj/main.nib/classes.nib (100%)
 rename hw/darwin/{ => quartz}/apple/English.lproj/main.nib/info.nib (100%)
 rename hw/darwin/{ => quartz}/apple/English.lproj/main.nib/keyedobjects.nib (100%)
 rename hw/darwin/{ => quartz}/apple/Info.plist (100%)
 rename hw/darwin/{ => quartz}/apple/Makefile.am (100%)
 rename hw/darwin/{ => quartz}/apple/X11.icns (100%)
 rename hw/darwin/{ => quartz}/apple/X11.xcodeproj/project.pbxproj (100%)
 rename hw/darwin/{ => quartz}/apple/bundle-main.c (100%)
 rename hw/darwin/{ => quartz}/apple/launcher-main.c (100%)
 rename hw/darwin/{ => quartz}/apple/org.x.X11.plist (100%)
 rename hw/darwin/{ => quartz}/apple/server-main.c (100%)
 rename hw/darwin/{ => quartz/xpr}/Xquartz.man (100%)

diff --git a/configure.ac b/configure.ac
index 5b21e69da..04ce6f4c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2171,8 +2171,8 @@ hw/xgl/glxext/module/Makefile
 hw/xnest/Makefile
 hw/xwin/Makefile
 hw/darwin/Makefile
-hw/darwin/apple/Makefile
 hw/darwin/quartz/Makefile
+hw/darwin/quartz/apple/Makefile
 hw/darwin/quartz/xpr/Makefile
 hw/kdrive/Makefile
 hw/kdrive/ati/Makefile
diff --git a/hw/darwin/Makefile.am b/hw/darwin/Makefile.am
index f5b9e752d..3f29a8174 100644
--- a/hw/darwin/Makefile.am
+++ b/hw/darwin/Makefile.am
@@ -1,21 +1,13 @@
+noinst_LTLIBRARIES = libXdarwin.la
 AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
 AM_CPPFLAGS = \
 	-DINXQUARTZ \
 	-DUSE_NEW_CLUT \
-	-DXFree86Server \
-	-I$(top_srcdir)/miext/rootless
+	-DXFree86Server
 
-if X11APP
-X11APP_SUBDIRS = apple
-endif
+SUBDIRS = . quartz
 
-SUBDIRS = quartz $(X11APP_SUBDIRS)
-DIST_SUBDIRS = quartz apple
-
-bin_PROGRAMS = Xquartz
-man1_MANS = Xquartz.man
-
-Xquartz_SOURCES = \
+libXdarwin_la_SOURCES = \
 	darwin.c \
 	darwinEvents.c \
 	darwinKeyboard.c \
@@ -23,49 +15,7 @@ Xquartz_SOURCES = \
 	$(top_srcdir)/fb/fbcmap_mi.c \
 	$(top_srcdir)/mi/miinitext.c
 
-#		We should probably add these once they're working, or are these obsolete and to be removed?
-#		./quartz/cr/libcr.a
-#		./quartz/fullscreen/libfullscreen.a
-
-Xquartz_LDADD = \
-	./quartz/libXquartz.a \
-	./quartz/xpr/libxpr.a \
-	$(top_builddir)/dix/dixfonts.lo \
-	$(top_builddir)/dix/libdix.la \
-	$(top_builddir)/os/libos.la \
-	$(top_builddir)/dix/libxpstubs.la \
-	$(top_builddir)/miext/shadow/libshadow.la \
-	$(top_builddir)/fb/libfb.la \
-	$(top_builddir)/mi/libmi.la \
-	$(top_builddir)/composite/libcomposite.la \
-	$(top_builddir)/damageext/libdamageext.la \
-	$(top_builddir)/miext/damage/libdamage.la \
-	$(top_builddir)/xfixes/libxfixes.la \
-	$(top_builddir)/miext/cw/libcw.la \
-	$(top_builddir)/Xext/libXext.la \
-	$(top_builddir)/xkb/libxkb.la \
-	$(top_builddir)/xkb/libxkbstubs.la \
-	$(top_builddir)/Xi/libXi.la \
-	$(top_builddir)/dbe/libdbe.la \
-	$(top_builddir)/record/librecord.la \
-	$(top_builddir)/XTrap/libxtrap.la \
-	$(top_builddir)/miext/rootless/librootless.la \
-	$(top_builddir)/miext/rootless/safeAlpha/libsafeAlpha.la \
-	$(top_builddir)/miext/rootless/accel/librlAccel.la \
-	$(DARWIN_LIBS) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lXplugin
-
-Xquartz_LDFLAGS =  \
-	-XCClinker -Objc \
-	-Wl,-u,_miDCInitialize \
-	-Wl,-framework,Carbon \
-	-L/System/Library/Frameworks/OpenGL.framework/Libraries -lGL \
-	-Wl,-framework,OpenGL \
-	-Wl,-framework,Cocoa \
-	-Wl,-framework,CoreAudio \
-	-Wl,-framework,IOKit
-
 EXTRA_DIST = \
-	Xquartz.man \
 	darwinClut8.h \
 	darwin.h \
 	darwinKeyboard.h
diff --git a/hw/darwin/quartz/Makefile.am b/hw/darwin/quartz/Makefile.am
index f5199dfa2..38f48d0e2 100644
--- a/hw/darwin/quartz/Makefile.am
+++ b/hw/darwin/quartz/Makefile.am
@@ -1,14 +1,21 @@
-noinst_LIBRARIES = libXQuartz.a
+noinst_LTLIBRARIES = libXQuartz.la
 
 AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
 AM_OBJCFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
+
+# TODO: This should not pull in rootless... rootless should all be in xpr
 AM_CPPFLAGS = \
 	-I$(srcdir) -I$(srcdir)/.. \
 	-I$(top_srcdir)/miext/rootless
 
-SUBDIRS = xpr
+if X11APP
+X11APP_SUBDIRS = apple
+endif
 
-libXQuartz_a_SOURCES = \
+SUBDIRS = . xpr $(X11APP_SUBDIRS)
+DIST_SUBDIRS = xpr apple
+
+libXQuartz_la_SOURCES = \
 	X11Application.m \
 	X11Controller.m \
 	applewm.c \
diff --git a/hw/darwin/quartz/X11Application.m b/hw/darwin/quartz/X11Application.m
index aef06990d..3e37dd436 100644
--- a/hw/darwin/quartz/X11Application.m
+++ b/hw/darwin/quartz/X11Application.m
@@ -59,8 +59,7 @@ int X11EnableKeyEquivalents = TRUE;
 int quartzHasRoot = FALSE, quartzEnableRootless = TRUE;
 
 extern int darwinFakeButtons, input_check_flag;
-// extern Bool enable_stereo; 
-Bool enable_stereo;  //<-- this needs to go back to being an extern once glxCGL is fixed
+extern Bool enable_stereo; 
 
 extern xEvent *darwinEvents;
 
diff --git a/hw/darwin/apple/English.lproj/InfoPlist.strings b/hw/darwin/quartz/apple/English.lproj/InfoPlist.strings
similarity index 100%
rename from hw/darwin/apple/English.lproj/InfoPlist.strings
rename to hw/darwin/quartz/apple/English.lproj/InfoPlist.strings
diff --git a/hw/darwin/apple/English.lproj/Localizable.strings b/hw/darwin/quartz/apple/English.lproj/Localizable.strings
similarity index 100%
rename from hw/darwin/apple/English.lproj/Localizable.strings
rename to hw/darwin/quartz/apple/English.lproj/Localizable.strings
diff --git a/hw/darwin/apple/English.lproj/main.nib/classes.nib b/hw/darwin/quartz/apple/English.lproj/main.nib/classes.nib
similarity index 100%
rename from hw/darwin/apple/English.lproj/main.nib/classes.nib
rename to hw/darwin/quartz/apple/English.lproj/main.nib/classes.nib
diff --git a/hw/darwin/apple/English.lproj/main.nib/info.nib b/hw/darwin/quartz/apple/English.lproj/main.nib/info.nib
similarity index 100%
rename from hw/darwin/apple/English.lproj/main.nib/info.nib
rename to hw/darwin/quartz/apple/English.lproj/main.nib/info.nib
diff --git a/hw/darwin/apple/English.lproj/main.nib/keyedobjects.nib b/hw/darwin/quartz/apple/English.lproj/main.nib/keyedobjects.nib
similarity index 100%
rename from hw/darwin/apple/English.lproj/main.nib/keyedobjects.nib
rename to hw/darwin/quartz/apple/English.lproj/main.nib/keyedobjects.nib
diff --git a/hw/darwin/apple/Info.plist b/hw/darwin/quartz/apple/Info.plist
similarity index 100%
rename from hw/darwin/apple/Info.plist
rename to hw/darwin/quartz/apple/Info.plist
diff --git a/hw/darwin/apple/Makefile.am b/hw/darwin/quartz/apple/Makefile.am
similarity index 100%
rename from hw/darwin/apple/Makefile.am
rename to hw/darwin/quartz/apple/Makefile.am
diff --git a/hw/darwin/apple/X11.icns b/hw/darwin/quartz/apple/X11.icns
similarity index 100%
rename from hw/darwin/apple/X11.icns
rename to hw/darwin/quartz/apple/X11.icns
diff --git a/hw/darwin/apple/X11.xcodeproj/project.pbxproj b/hw/darwin/quartz/apple/X11.xcodeproj/project.pbxproj
similarity index 100%
rename from hw/darwin/apple/X11.xcodeproj/project.pbxproj
rename to hw/darwin/quartz/apple/X11.xcodeproj/project.pbxproj
diff --git a/hw/darwin/apple/bundle-main.c b/hw/darwin/quartz/apple/bundle-main.c
similarity index 100%
rename from hw/darwin/apple/bundle-main.c
rename to hw/darwin/quartz/apple/bundle-main.c
diff --git a/hw/darwin/apple/launcher-main.c b/hw/darwin/quartz/apple/launcher-main.c
similarity index 100%
rename from hw/darwin/apple/launcher-main.c
rename to hw/darwin/quartz/apple/launcher-main.c
diff --git a/hw/darwin/apple/org.x.X11.plist b/hw/darwin/quartz/apple/org.x.X11.plist
similarity index 100%
rename from hw/darwin/apple/org.x.X11.plist
rename to hw/darwin/quartz/apple/org.x.X11.plist
diff --git a/hw/darwin/apple/server-main.c b/hw/darwin/quartz/apple/server-main.c
similarity index 100%
rename from hw/darwin/apple/server-main.c
rename to hw/darwin/quartz/apple/server-main.c
diff --git a/hw/darwin/quartz/xpr/Makefile.am b/hw/darwin/quartz/xpr/Makefile.am
index 8980ad7d3..769662276 100644
--- a/hw/darwin/quartz/xpr/Makefile.am
+++ b/hw/darwin/quartz/xpr/Makefile.am
@@ -1,12 +1,16 @@
-noinst_LIBRARIES = libxpr.a
+bin_PROGRAMS = Xquartz
+
+# TODO: This man page needs sed magic and cleanup
+man1_MANS = Xquartz.man
+
 AM_CFLAGS =  $(XSERVER_CFLAGS) $(DIX_CFLAGS)
 AM_CPPFLAGS = \
-	   -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. \
-	   -I$(top_srcdir)/miext \
-	   -I$(top_srcdir)/miext/rootless \
-	   -I$(top_srcdir)/miext/rootless/safeAlpha
+	-I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. \
+	-I$(top_srcdir)/miext \
+	-I$(top_srcdir)/miext/rootless \
+	-I$(top_srcdir)/miext/rootless/safeAlpha
 
-libxpr_a_SOURCES = \
+Xquartz_SOURCES = \
 	appledri.c \
 	dri.c \
 	xprAppleWM.c \
@@ -17,7 +21,45 @@ libxpr_a_SOURCES = \
 	x-hook.c \
 	x-list.c
 
+Xquartz_LDADD = \
+	$(top_builddir)/hw/darwin/quartz/libXquartz.la \
+	$(top_builddir)/hw/darwin/libXdarwin.la \
+	$(top_builddir)/dix/dixfonts.lo \
+	$(top_builddir)/dix/libdix.la \
+	$(top_builddir)/os/libos.la \
+	$(top_builddir)/dix/libxpstubs.la \
+	$(top_builddir)/miext/shadow/libshadow.la \
+	$(top_builddir)/fb/libfb.la \
+	$(top_builddir)/mi/libmi.la \
+	$(top_builddir)/composite/libcomposite.la \
+	$(top_builddir)/damageext/libdamageext.la \
+	$(top_builddir)/miext/damage/libdamage.la \
+	$(top_builddir)/xfixes/libxfixes.la \
+	$(top_builddir)/miext/cw/libcw.la \
+	$(top_builddir)/Xext/libXext.la \
+	$(top_builddir)/xkb/libxkb.la \
+	$(top_builddir)/xkb/libxkbstubs.la \
+	$(top_builddir)/Xi/libXi.la \
+	$(top_builddir)/dbe/libdbe.la \
+	$(top_builddir)/record/librecord.la \
+	$(top_builddir)/XTrap/libxtrap.la \
+	$(top_builddir)/miext/rootless/librootless.la \
+	$(top_builddir)/miext/rootless/safeAlpha/libsafeAlpha.la \
+	$(top_builddir)/miext/rootless/accel/librlAccel.la \
+	$(DARWIN_LIBS) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lXplugin
+
+Xquartz_LDFLAGS =  \
+	-XCClinker -Objc \
+	-Wl,-u,_miDCInitialize \
+	-Wl,-framework,Carbon \
+	-L/System/Library/Frameworks/OpenGL.framework/Libraries -lGL \
+	-Wl,-framework,OpenGL \
+	-Wl,-framework,Cocoa \
+	-Wl,-framework,CoreAudio \
+	-Wl,-framework,IOKit
+
 EXTRA_DIST = \
+	Xquartz.man \
 	dri.h \
 	dristruct.h \
 	appledri.h \
diff --git a/hw/darwin/Xquartz.man b/hw/darwin/quartz/xpr/Xquartz.man
similarity index 100%
rename from hw/darwin/Xquartz.man
rename to hw/darwin/quartz/xpr/Xquartz.man

From c6cfcd408df3e44d0094946c0a7d2fa944b4d2d1 Mon Sep 17 00:00:00 2001
From: Hong Liu <hong.liu@intel.com>
Date: Wed, 5 Dec 2007 17:48:28 +0100
Subject: [PATCH 265/552] Bug 13308: Verify and reject obviously broken modes.

---
 hw/xfree86/modes/xf86EdidModes.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c
index 777ef7e44..a125d8c82 100644
--- a/hw/xfree86/modes/xf86EdidModes.c
+++ b/hw/xfree86/modes/xf86EdidModes.c
@@ -328,6 +328,12 @@ DDCModeFromDetailedTiming(int scrnIndex, struct detailed_timings *timing,
     Mode->VSyncEnd = Mode->VSyncStart + timing->v_sync_width;
     Mode->VTotal = timing->v_active + timing->v_blanking;
 
+    /* perform basic check on the detail timing */
+    if (Mode->HSyncEnd > Mode->HTotal || Mode->VSyncEnd > Mode->VTotal) {
+	xfree(Mode);
+	return NULL;
+    }
+
     xf86SetModeDefaultName(Mode);
 
     /* We ignore h/v_size and h/v_border for now. */

From 0fccb24aa978b838cf0fb008e9695837e612c529 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Fri, 30 Nov 2007 20:35:26 +0200
Subject: [PATCH 266/552] ProcessOtherEvent: Don't do double translation of
 button events

We already deal with the button mapping in GetPointerEvents, so don't
do the remapping again in ProcessOtherEvent.
---
 Xi/exevents.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Xi/exevents.c b/Xi/exevents.c
index 377311ec9..7cf0c50a5 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -244,7 +244,7 @@ ProcessOtherEvent(xEventPtr xE, DeviceIntPtr other, int count)
 	    other->valuator->motionHintWindow = NullWindow;
 	b->buttonsDown++;
 	b->motionMask = DeviceButtonMotionMask;
-	xE->u.u.detail = b->map[key];
+	xE->u.u.detail = key;
 	if (xE->u.u.detail == 0)
 	    return;
 	if (xE->u.u.detail <= 5)
@@ -266,7 +266,7 @@ ProcessOtherEvent(xEventPtr xE, DeviceIntPtr other, int count)
 	    other->valuator->motionHintWindow = NullWindow;
         if (b->buttonsDown >= 1 && !--b->buttonsDown)
 	    b->motionMask = 0;
-	xE->u.u.detail = b->map[key];
+	xE->u.u.detail = key;
 	if (xE->u.u.detail == 0)
 	    return;
 	if (xE->u.u.detail <= 5)

From 2d723bbd0d36f6d7763b4df3298d40720f97fdd0 Mon Sep 17 00:00:00 2001
From: Peter Harris <peter.harris@hummingbird.com>
Date: Mon, 29 Oct 2007 18:05:19 -0400
Subject: [PATCH 267/552] Add missing swaps in panoramiXSwap.c

---
 Xext/panoramiXSwap.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Xext/panoramiXSwap.c b/Xext/panoramiXSwap.c
index cc9f61442..b13c286dd 100644
--- a/Xext/panoramiXSwap.c
+++ b/Xext/panoramiXSwap.c
@@ -66,6 +66,7 @@ SProcPanoramiXGetState(ClientPtr client)
 
  	swaps (&stuff->length, n);	
 	REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
+	swapl (&stuff->window, n);
 	return ProcPanoramiXGetState(client);
 }
 
@@ -77,6 +78,7 @@ SProcPanoramiXGetScreenCount(ClientPtr client)
 
 	swaps (&stuff->length, n);
 	REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
+	swapl (&stuff->window, n);
 	return ProcPanoramiXGetScreenCount(client);
 }
 
@@ -88,6 +90,8 @@ SProcPanoramiXGetScreenSize(ClientPtr client)
 
 	swaps (&stuff->length, n);
 	REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
+	swapl (&stuff->window, n);
+	swapl (&stuff->screen, n);
 	return ProcPanoramiXGetScreenSize(client);
 }
 

From a8e27a108abeba73b2888da4e0604008f4b02045 Mon Sep 17 00:00:00 2001
From: Kanru Chen <koster@debian.org.tw>
Date: Mon, 3 Dec 2007 12:46:45 +0000
Subject: [PATCH 268/552] Config: HAL: Fix XKB option parsing

Actually combine the XKB options into a string, rather than just repeatedly
writing a comma.
---
 config/hal.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/config/hal.c b/config/hal.c
index 6bb449d5a..4427deb39 100644
--- a/config/hal.c
+++ b/config/hal.c
@@ -134,10 +134,11 @@ get_prop_string_array(LibHalContext *hal_ctx, const char *udi, const char *prop)
 
         str = ret;
         for (i = 0; props[i]; i++) {
-            str = strcpy(str, props[i]);
+            strcpy(str, props[i]);
+            str += strlen(props[i]);
             *str++ = ',';
         }
-        *str = '\0';
+        *(str-1) = '\0';
 
         libhal_free_string_array(props);
     }

From d8b2cad3771a09860e7be1726f67e684cf7caeec Mon Sep 17 00:00:00 2001
From: Rich Coe <Richard.Coe@med.ge.com>
Date: Wed, 5 Dec 2007 19:31:07 +0000
Subject: [PATCH 269/552] OS: Connection: Don't shut down disappeared clients
 (bug #7876)

If a client disappears in the middle of CheckConnections (presumably
because its appgroup leader disappears), then don't attempt to shut it down
a second time, when it's already vanished.
---
 os/connection.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/os/connection.c b/os/connection.c
index 860404f6c..6012a8e81 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -1059,7 +1059,8 @@ CheckConnections(void)
             FD_SET(curclient, &tmask);
             r = Select (curclient + 1, &tmask, NULL, NULL, &notime);
             if (r < 0)
-		CloseDownClient(clients[ConnectionTranslation[curclient]]);
+                if (ConnectionTranslation[curclient] > 0)
+                    CloseDownClient(clients[ConnectionTranslation[curclient]]);
 	    mask &= ~((fd_mask)1 << curoff);
 	}
     }	

From b7f3618f3933a810778093fd47564a1e3bf3fde6 Mon Sep 17 00:00:00 2001
From: Rich Coe <Richard.Coe@med.ge.com>
Date: Wed, 5 Dec 2007 19:36:37 +0000
Subject: [PATCH 270/552] OS: Connection: Keep trying select while it gets
 interrupted (bug #9240)

If we got interrupted (EINTR or EAGAIN) during select, just try again, rather
than shutting clients down on either of these errors.
---
 os/connection.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/os/connection.c b/os/connection.c
index 6012a8e81..be7521f3d 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -1057,7 +1057,9 @@ CheckConnections(void)
 	    curclient = curoff + (i * (sizeof(fd_mask)*8));
             FD_ZERO(&tmask);
             FD_SET(curclient, &tmask);
-            r = Select (curclient + 1, &tmask, NULL, NULL, &notime);
+            do {
+                r = Select (curclient + 1, &tmask, NULL, NULL, &notime);
+            } while (r < 0 && (errno == EINTR || errno == EAGAIN));
             if (r < 0)
                 if (ConnectionTranslation[curclient] > 0)
                     CloseDownClient(clients[ConnectionTranslation[curclient]]);
@@ -1071,9 +1073,12 @@ CheckConnections(void)
 	curclient = XFD_FD(&savedAllClients, i);
 	FD_ZERO(&tmask);
 	FD_SET(curclient, &tmask);
-	r = Select (curclient + 1, &tmask, NULL, NULL, &notime);
-	if (r < 0 && GetConnectionTranslation(curclient) > 0)
-	    CloseDownClient(clients[GetConnectionTranslation(curclient)]);
+        do {
+            r = Select (curclient + 1, &tmask, NULL, NULL, &notime);
+        } while (r < 0 && (errno == EINTR || errno == EAGAIN));
+	if (r < 0)
+            if (GetConnectionTranslation(curclient) > 0)
+                CloseDownClient(clients[GetConnectionTranslation(curclient)]);
     }	
 #endif
 }

From 85dd8efac1bc0715f03c99d261b1c5d0980623e1 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Wed, 5 Dec 2007 19:36:59 +0000
Subject: [PATCH 271/552] WaitForSomething: Ignore EAGAIN

If select ever returns EAGAIN, don't bother complaining.
---
 os/WaitFor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/os/WaitFor.c b/os/WaitFor.c
index 71ca53438..e6d45e68e 100644
--- a/os/WaitFor.c
+++ b/os/WaitFor.c
@@ -257,7 +257,7 @@ WaitForSomething(int *pClientsReady)
 		    FatalError("WaitForSomething(): select: errno=%d\n",
 			selecterr);
             }
-		else if (selecterr != EINTR)
+		else if (selecterr != EINTR && selecterr != EAGAIN)
 		{
 		    ErrorF("WaitForSomething(): select: errno=%d\n",
 			selecterr);

From 320abd7d1d906807448fa01ad3377daf707f46cc Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Wed, 5 Dec 2007 19:37:48 +0000
Subject: [PATCH 272/552] XKB: Actions: Don't run certain actions on the core
 keyboard

Don't run VT switches, terminations, or anything, on the core keyboard: only
run actions which affect the keyboard state.  If we get an action such as VT
switch, just swallow the event.
---
 hw/xfree86/dixmods/xkbKillSrv.c |  4 +++-
 xkb/ddxKillSrv.c                |  4 +++-
 xkb/xkbActions.c                | 19 +++++++++++++++++--
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/hw/xfree86/dixmods/xkbKillSrv.c b/hw/xfree86/dixmods/xkbKillSrv.c
index b3399db4a..9074fd390 100644
--- a/hw/xfree86/dixmods/xkbKillSrv.c
+++ b/hw/xfree86/dixmods/xkbKillSrv.c
@@ -48,6 +48,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 int
 XkbDDXTerminateServer(DeviceIntPtr dev,KeyCode key,XkbAction *act)
 {
-    xf86ProcessActionEvent(ACTION_TERMINATE, NULL);
+    if (dev != inputInfo.keyboard)
+        xf86ProcessActionEvent(ACTION_TERMINATE, NULL);
+
     return 0;
 }
diff --git a/xkb/ddxKillSrv.c b/xkb/ddxKillSrv.c
index a573ecbd8..3b5fd5353 100644
--- a/xkb/ddxKillSrv.c
+++ b/xkb/ddxKillSrv.c
@@ -41,6 +41,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 int
 XkbDDXTerminateServer(DeviceIntPtr dev,KeyCode key,XkbAction *act)
 {
-    GiveUp(1);
+    if (dev != inputInfo.keyboard)
+        GiveUp(1);
+
     return 0;
 }
diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
index 8ddbdba3d..6edac292e 100644
--- a/xkb/xkbActions.c
+++ b/xkb/xkbActions.c
@@ -561,6 +561,9 @@ _XkbFilterPointerMove(	XkbSrvInfoPtr	xkbi,
 int	x,y;
 Bool	accel;
 
+    if (xkbi->device == inputInfo.keyboard)
+        return 0;
+
     if (filter->keycode==0) {		/* initial press */
 	filter->keycode = keycode;
 	filter->active = 1;
@@ -601,6 +604,9 @@ _XkbFilterPointerBtn(	XkbSrvInfoPtr	xkbi,
 			unsigned	keycode,
 			XkbAction *	pAction)
 {
+    if (xkbi->device == inputInfo.keyboard)
+        return 0;
+
     if (filter->keycode==0) {		/* initial press */
 	int	button= pAction->btn.button;
 
@@ -980,8 +986,11 @@ _XkbFilterSwitchScreen(	XkbSrvInfoPtr	xkbi,
 			unsigned	keycode,
 			XkbAction *	pAction)
 {
+    DeviceIntPtr dev = xkbi->device;
+    if (dev == inputInfo.keyboard)
+        return 0;
+
     if (filter->keycode==0) {		/* initial press */
-        DeviceIntPtr	dev = xkbi->device;
 	filter->keycode = keycode;
 	filter->active = 1;
 	filter->filterOthers = 0;
@@ -1003,8 +1012,11 @@ _XkbFilterXF86Private(	XkbSrvInfoPtr	xkbi,
 			unsigned	keycode,
 			XkbAction *	pAction)
 {
+    DeviceIntPtr dev = xkbi->device;
+    if (dev == inputInfo.keyboard)
+        return 0;
+
     if (filter->keycode==0) {		/* initial press */
-        DeviceIntPtr	dev = xkbi->device;
 	filter->keycode = keycode;
 	filter->active = 1;
 	filter->filterOthers = 0;
@@ -1029,6 +1041,9 @@ _XkbFilterDeviceBtn(	XkbSrvInfoPtr	xkbi,
 DeviceIntPtr	dev;
 int		button;
 
+    if (dev == inputInfo.keyboard)
+        return 0;
+
     if (filter->keycode==0) {		/* initial press */
 	dev= _XkbLookupButtonDevice(pAction->devbtn.device,NULL);
 	if ((!dev)||(!dev->public.on)||(&dev->public==LookupPointerDevice()))

From cb44b6121c4b7b9dd7ff4ff52aaab914c82ff013 Mon Sep 17 00:00:00 2001
From: Andrew Oakley <andrew@ado.is-a-geek.net>
Date: Wed, 5 Dec 2007 20:23:05 -0500
Subject: [PATCH 273/552] =?UTF-8?q?Fix=20commit=20aa0dfb3f42f19bb351ca7f1a?=
 =?UTF-8?q?9507ff5ec4590e96=20From=20bugzilla=20bug=2013467=C2=B9:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently the xserver fails to build without this (now deleted) file, as the
Makefile tries to distribute it.  The patch simply removes the reference to
modeline2c.pl.

1] http://bugs.freedesktop.org/show_bug.cgi?id=13467

Signed-off-by: James Cloos <cloos@jhcloos.com>
---
 hw/xfree86/common/Makefile.am | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
index 5499b694e..2f23776a0 100644
--- a/hw/xfree86/common/Makefile.am
+++ b/hw/xfree86/common/Makefile.am
@@ -87,7 +87,6 @@ EXTRA_DIST = \
 	xf86Date.h \
 	xf86DefModes.c \
 	$(MODEDEFSOURCES) \
-	modeline2c.pl \
         $(DISTKBDSOURCES)
 
 if LNXACPI

From e00f7061b22001989edf5bd38c2d0cc1566fdd19 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Tue, 4 Dec 2007 23:18:37 -0800
Subject: [PATCH 274/552] Darwin: Cleaned up keyboard interface headers (cherry
 picked from commit 141f69dc3d8d6e7d8ff65607f43700ac11243041)

---
 hw/darwin/darwin.h                   |  9 ---
 hw/darwin/darwinKeyboard.c           | 93 ++++++++++------------------
 hw/darwin/darwinKeyboard.h           | 30 ++++-----
 hw/darwin/darwinKeyboard_interface.h | 52 ++++++++++++++++
 hw/darwin/quartz/quartzKeyboard.c    | 18 ++----
 5 files changed, 101 insertions(+), 101 deletions(-)
 create mode 100644 hw/darwin/darwinKeyboard_interface.h

diff --git a/hw/darwin/darwin.h b/hw/darwin/darwin.h
index d7d2af44f..0f5f492b6 100644
--- a/hw/darwin/darwin.h
+++ b/hw/darwin/darwin.h
@@ -46,7 +46,6 @@ typedef struct {
     int                 bitsPerComponent;
 } DarwinFramebufferRec, *DarwinFramebufferPtr;
 
-
 // From darwin.c
 void DarwinPrintBanner(void);
 int DarwinParseModifierList(const char *constmodifiers);
@@ -63,14 +62,6 @@ void DarwinSendPointerEvents(int ev_type, int ev_button, int pointer_x, int poin
 void DarwinSendKeyboardEvents(int ev_type, int keycode);
 void DarwinSendScrollEvents(float count, int pointer_x, int pointer_y);
 
-// From darwinKeyboard.c
-int DarwinModifierNXKeyToNXKeycode(int key, int side);
-void DarwinKeyboardInit(DeviceIntPtr pDev);
-int DarwinModifierNXKeycodeToNXKey(unsigned char keycode, int *outSide);
-int DarwinModifierNXKeyToNXMask(int key);
-int DarwinModifierNXMaskToNXKey(int mask);
-int DarwinModifierStringToNXKey(const char *string);
-
 // Mode specific functions
 Bool DarwinModeAddScreen(int index, ScreenPtr pScreen);
 Bool DarwinModeSetupScreen(int index, ScreenPtr pScreen);
diff --git a/hw/darwin/darwinKeyboard.c b/hw/darwin/darwinKeyboard.c
index 851a10f11..1c83cbce4 100644
--- a/hw/darwin/darwinKeyboard.c
+++ b/hw/darwin/darwinKeyboard.c
@@ -179,7 +179,7 @@ static KeySym const next_to_x[256] = {
 static KeySym const symbol_to_x[] = {
     XK_Left,        XK_Up,          XK_Right,      XK_Down
   };
-int const NUM_SYMBOL = sizeof(symbol_to_x) / sizeof(symbol_to_x[0]);
+static int const NUM_SYMBOL = sizeof(symbol_to_x) / sizeof(symbol_to_x[0]);
 
 #define MIN_FUNCKEY     0x20
 static KeySym const funckey_to_x[] = {
@@ -190,7 +190,7 @@ static KeySym const funckey_to_x[] = {
     XK_Page_Up,     XK_Page_Down,   XK_F13,         XK_F14,
     XK_F15
   };
-int const NUM_FUNCKEY = sizeof(funckey_to_x) / sizeof(funckey_to_x[0]);
+static int const NUM_FUNCKEY = sizeof(funckey_to_x) / sizeof(funckey_to_x[0]);
 
 typedef struct {
     KeySym      normalSym;
@@ -216,7 +216,7 @@ static darwinKeyPad_t const normal_to_keypad[] = {
     { XK_period,    XK_KP_Decimal },
     { XK_slash,     XK_KP_Divide }
 };
-int const NUM_KEYPAD = sizeof(normal_to_keypad) / sizeof(normal_to_keypad[0]);
+static int const NUM_KEYPAD = sizeof(normal_to_keypad) / sizeof(normal_to_keypad[0]);
 
 static void DarwinChangeKeyboardControl( DeviceIntPtr device, KeybdCtrl *ctrl )
 {
@@ -232,35 +232,32 @@ static char *inBuffer = NULL;
 //      Can be configured to treat embedded "numbers" as being composed of
 //      either 1, 2, or 4 bytes, apiece.
 //-----------------------------------------------------------------------------
-typedef struct _DataStream
-{
+typedef struct _DataStream {
     unsigned char const *data;
     unsigned char const *data_end;
     short number_size;  // Size in bytes of a "number" in the stream.
 } DataStream;
 
-static DataStream* new_data_stream( unsigned char const* data, int size )
-{
+static DataStream* new_data_stream(unsigned char const* data, int size) {
     DataStream* s = (DataStream*)xalloc( sizeof(DataStream) );
-    s->data = data;
-    s->data_end = data + size;
-    s->number_size = 1; // Default to byte-sized numbers.
+    if(s) {
+        s->data = data;
+        s->data_end = data + size;
+        s->number_size = 1; // Default to byte-sized numbers.
+    }
     return s;
 }
 
-static void destroy_data_stream( DataStream* s )
-{
+static void destroy_data_stream(DataStream* s) {
     xfree(s);
 }
 
-static unsigned char get_byte( DataStream* s )
-{
+static unsigned char get_byte(DataStream* s) {
     assert(s->data + 1 <= s->data_end);
     return *s->data++;
 }
 
-static short get_word( DataStream* s )
-{
+static short get_word(DataStream* s) {
     short hi, lo;
     assert(s->data + 2 <= s->data_end);
     hi = *s->data++;
@@ -268,8 +265,7 @@ static short get_word( DataStream* s )
     return ((hi << 8) | lo);
 }
 
-static int get_dword( DataStream* s )
-{
+static int get_dword(DataStream* s) {
     int b1, b2, b3, b4;
     assert(s->data + 4 <= s->data_end);
     b4 = *s->data++;
@@ -279,8 +275,7 @@ static int get_dword( DataStream* s )
     return ((b4 << 24) | (b3 << 16) | (b2 << 8) | b1);
 }
 
-static int get_number( DataStream* s )
-{
+static int get_number(DataStream* s) {
     switch (s->number_size) {
         case 4:  return get_dword(s);
         case 2:  return get_word(s);
@@ -296,8 +291,7 @@ static int get_number( DataStream* s )
  * bits_set
  *      Calculate number of bits set in the modifier mask.
  */
-static short bits_set( short mask )
-{
+static short bits_set(short mask) {
     short n = 0;
 
     for ( ; mask != 0; mask >>= 1)
@@ -311,10 +305,7 @@ static short bits_set( short mask )
  *      Read the next character code from the Darwin keymapping
  *      and write it to the X keymap.
  */
-static void parse_next_char_code(
-    DataStream  *s,
-    KeySym      *k )
-{
+static void parse_next_char_code(DataStream *s, KeySym *k) {
     const short charSet = get_number(s);
     const short charCode = get_number(s);
 
@@ -337,9 +328,7 @@ static void parse_next_char_code(
  * DarwinReadKeymapFile
  *      Read the appropriate keymapping from a keymapping file.
  */
-Bool DarwinReadKeymapFile(
-    NXKeyMapping        *keyMap)
-{
+Bool DarwinReadKeymapFile(NXKeyMapping *keyMap) {
     struct stat         st;
     NXEventSystemDevice info[20];
     int                 interface = 0, handler_id = 0;
@@ -448,9 +437,7 @@ Bool DarwinReadKeymapFile(
 /*
  * DarwinParseNXKeyMapping
  */
-Bool DarwinParseNXKeyMapping(
-    darwinKeyboardInfo  *info)
-{
+Bool DarwinParseNXKeyMapping(darwinKeyboardInfo  *info) {
     KeySym              *k;
     int                 i;
     short               numMods, numKeys, numPadKeys = 0;
@@ -649,8 +636,7 @@ Bool DarwinParseNXKeyMapping(
  *      Use the keyMap field of keyboard info structure to populate
  *      the modMap and modifierKeycodes fields.
  */
-static void
-DarwinBuildModifierMaps(darwinKeyboardInfo *info) {
+static void DarwinBuildModifierMaps(darwinKeyboardInfo *info) {
     int i;
     KeySym *k;
 
@@ -743,12 +729,7 @@ DarwinBuildModifierMaps(darwinKeyboardInfo *info) {
  *  Load the keyboard map from a file or system and convert
  *  it to an equivalent X keyboard map and modifier map.
  */
-static void
-DarwinLoadKeyboardMapping(KeySymsRec *keySyms)
-{
-    int i;
-    KeySym *k;
-
+static void DarwinLoadKeyboardMapping(KeySymsRec *keySyms) {
     memset(keyInfo.keyMap, 0, sizeof(keyInfo.keyMap));
 
     /* TODO: Clean this up
@@ -765,6 +746,8 @@ DarwinLoadKeyboardMapping(KeySymsRec *keySyms)
     DarwinBuildModifierMaps(&keyInfo);
 
 #ifdef DUMP_DARWIN_KEYMAP
+    int i;
+    KeySym *k;
     DEBUG_LOG("Darwin -> X converted keyboard map\n");
     for (i = 0, k = keyInfo.keyMap; i < NX_NUMKEYCODES;
          i++, k += GLYPHS_PER_KEY)
@@ -793,9 +776,7 @@ DarwinLoadKeyboardMapping(KeySymsRec *keySyms)
  *      X keyboard map and modifier map. Set the new keyboard
  *      device structure.
  */
-void DarwinKeyboardInit(
-    DeviceIntPtr        pDev )
-{
+void DarwinKeyboardInit(DeviceIntPtr pDev) {
     KeySymsRec          keySyms;
 
     // Open a shared connection to the HID System.
@@ -816,9 +797,7 @@ void DarwinKeyboardInit(
 
 
 /* Borrowed from dix/devices.c */
-static Bool
-InitModMap(register KeyClassPtr keyc)
-{
+static Bool InitModMap(register KeyClassPtr keyc) {
     int i, j;
     CARD8 keysPerModifier[8];
     CARD8 mask;
@@ -863,9 +842,7 @@ InitModMap(register KeyClassPtr keyc)
 }
 
 
-void
-DarwinKeyboardReload(DeviceIntPtr pDev)
-{
+void DarwinKeyboardReload(DeviceIntPtr pDev) {
     KeySymsRec keySyms;
 
     DarwinLoadKeyboardMapping(&keySyms);
@@ -898,8 +875,7 @@ DarwinKeyboardReload(DeviceIntPtr pDev)
  *      side = 0 for left or 1 for right.
  *      Returns 0 if key+side is not a known modifier.
  */
-int DarwinModifierNXKeyToNXKeycode(int key, int side)
-{
+int DarwinModifierNXKeyToNXKeycode(int key, int side) {
     return keyInfo.modifierKeycodes[key][side];
 }
 
@@ -908,8 +884,7 @@ int DarwinModifierNXKeyToNXKeycode(int key, int side)
  *      Returns -1 if keycode+side is not a modifier key
  *      outSide may be NULL, else it gets 0 for left and 1 for right.
  */
-int DarwinModifierNXKeycodeToNXKey(unsigned char keycode, int *outSide)
-{
+int DarwinModifierNXKeycodeToNXKey(unsigned char keycode, int *outSide) {
     int key, side;
 
     keycode += MIN_KEYCODE;
@@ -928,8 +903,7 @@ int DarwinModifierNXKeycodeToNXKey(unsigned char keycode, int *outSide)
  * DarwinModifierNXMaskToNXKey
  *      Returns -1 if mask is not a known modifier mask.
  */
-int DarwinModifierNXMaskToNXKey(int mask)
-{
+int DarwinModifierNXMaskToNXKey(int mask) {
     switch (mask) {
         case NX_ALPHASHIFTMASK:       return NX_MODIFIERKEY_ALPHALOCK;
         case NX_SHIFTMASK:            return NX_MODIFIERKEY_SHIFT;
@@ -959,8 +933,7 @@ int DarwinModifierNXMaskToNXKey(int mask)
     return -1;
 }
 
-const char *DarwinModifierNXMaskTostring(int mask)
-{
+const char *DarwinModifierNXMaskTostring(int mask) {
     switch (mask) {
         case NX_ALPHASHIFTMASK:      return "NX_ALPHASHIFTMASK";
         case NX_SHIFTMASK:           return "NX_SHIFTMASK";
@@ -986,8 +959,7 @@ const char *DarwinModifierNXMaskTostring(int mask)
  * DarwinModifierNXKeyToNXMask
  *      Returns 0 if key is not a known modifier key.
  */
-int DarwinModifierNXKeyToNXMask(int key)
-{
+int DarwinModifierNXKeyToNXMask(int key) {
     switch (key) {
         case NX_MODIFIERKEY_ALPHALOCK:   return NX_ALPHASHIFTMASK;
         case NX_MODIFIERKEY_SHIFT:       return NX_SHIFTMASK;
@@ -1017,8 +989,7 @@ int DarwinModifierNXKeyToNXMask(int key)
  * DarwinModifierStringToNXKey
  *      Returns -1 if string is not a known modifier.
  */
-int DarwinModifierStringToNXKey(const char *str)
-{
+int DarwinModifierStringToNXKey(const char *str) {
     if      (!strcasecmp(str, "shift"))   return NX_MODIFIERKEY_SHIFT;
     else if (!strcasecmp(str, "control")) return NX_MODIFIERKEY_CONTROL;
     else if (!strcasecmp(str, "option"))  return NX_MODIFIERKEY_ALTERNATE;
diff --git a/hw/darwin/darwinKeyboard.h b/hw/darwin/darwinKeyboard.h
index 368aee954..12104418e 100644
--- a/hw/darwin/darwinKeyboard.h
+++ b/hw/darwin/darwinKeyboard.h
@@ -27,25 +27,19 @@
 #ifndef DARWIN_KEYBOARD_H
 #define DARWIN_KEYBOARD_H 1
 
-#define XK_TECHNICAL		// needed to get XK_Escape
-#define XK_PUBLISHING
-#include "X11/keysym.h"
-#include "inputstr.h"
-
-// Each key can generate 4 glyphs. They are, in order:
-// unshifted, shifted, modeswitch unshifted, modeswitch shifted
-#define GLYPHS_PER_KEY  4
-#define NUM_KEYCODES    248	// NX_NUMKEYCODES might be better
-#define MAX_KEYCODE     NUM_KEYCODES + MIN_KEYCODE - 1
-
-typedef struct darwinKeyboardInfo_struct {
-    CARD8 modMap[MAP_LENGTH];
-    KeySym keyMap[MAP_LENGTH * GLYPHS_PER_KEY];
-    unsigned char modifierKeycodes[32][2];
-} darwinKeyboardInfo;
+#include "darwinKeyboard_interface.h"
 
+/* Provided for darwinEvents.c */
+extern darwinKeyboardInfo keyInfo;
 void DarwinKeyboardReload(DeviceIntPtr pDev);
-unsigned int DarwinModeSystemKeymapSeed(void);
-Bool DarwinModeReadSystemKeymap(darwinKeyboardInfo *info);
+void DarwinKeyboardInit(DeviceIntPtr pDev);
+int DarwinModifierNXKeycodeToNXKey(unsigned char keycode, int *outSide);
+int DarwinModifierNXKeyToNXKeycode(int key, int side);
+int DarwinModifierNXKeyToNXMask(int key);
+int DarwinModifierNXMaskToNXKey(int mask);
+int DarwinModifierStringToNXKey(const char *string);
+
+/* Provided for darwin.c */
+void DarwinKeyboardInit(DeviceIntPtr pDev);
 
 #endif /* DARWIN_KEYBOARD_H */
diff --git a/hw/darwin/darwinKeyboard_interface.h b/hw/darwin/darwinKeyboard_interface.h
new file mode 100644
index 000000000..f41f46318
--- /dev/null
+++ b/hw/darwin/darwinKeyboard_interface.h
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2003-2004 Torrey T. Lyons. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+
+#ifndef DARWIN_KEYBOARD_INTERFACE_H
+#define DARWIN_KEYBOARD_INTERFACE_H 1
+
+#define XK_TECHNICAL		// needed to get XK_Escape
+#define XK_PUBLISHING
+#include "X11/keysym.h"
+#include "inputstr.h"
+
+// Each key can generate 4 glyphs. They are, in order:
+// unshifted, shifted, modeswitch unshifted, modeswitch shifted
+#define GLYPHS_PER_KEY  4
+#define NUM_KEYCODES    248	// NX_NUMKEYCODES might be better
+#define MAX_KEYCODE     NUM_KEYCODES + MIN_KEYCODE - 1
+
+typedef struct darwinKeyboardInfo_struct {
+    CARD8 modMap[MAP_LENGTH];
+    KeySym keyMap[MAP_LENGTH * GLYPHS_PER_KEY];
+    unsigned char modifierKeycodes[32][2];
+} darwinKeyboardInfo;
+
+/* These functions need to be implemented by XQuartz, XDarwin, etc. */
+void DarwinKeyboardReload(DeviceIntPtr pDev);
+Bool DarwinModeReadSystemKeymap(darwinKeyboardInfo *info);
+unsigned int DarwinModeSystemKeymapSeed(void);
+
+#endif /* DARWIN_KEYBOARD_INTERFACE_H */
diff --git a/hw/darwin/quartz/quartzKeyboard.c b/hw/darwin/quartz/quartzKeyboard.c
index ee485b8c5..c69fb9f96 100644
--- a/hw/darwin/quartz/quartzKeyboard.c
+++ b/hw/darwin/quartz/quartzKeyboard.c
@@ -40,7 +40,7 @@
 #include <CoreServices/CoreServices.h>
 #include <Carbon/Carbon.h>
 
-#include "darwinKeyboard.h"
+#include "darwinKeyboard_interface.h"
 #include "X11/keysym.h"
 #include "keysym2ucs.h"
 
@@ -146,9 +146,7 @@ const static struct {
     {UKEYSYM (0x31b), XK_dead_horn},		/* COMBINING HORN */
 };
 
-unsigned int
-DarwinModeSystemKeymapSeed (void)
-{
+unsigned int DarwinModeSystemKeymapSeed(void) {
     static unsigned int seed;
     static KeyboardLayoutRef last_key_layout;
     KeyboardLayoutRef key_layout;
@@ -160,9 +158,7 @@ DarwinModeSystemKeymapSeed (void)
     return seed;
 }
 
-static inline UniChar
-macroman2ucs (unsigned char c)
-{
+static inline UniChar macroman2ucs(unsigned char c) {
     /* Precalculated table mapping MacRoman-128 to Unicode. Generated
        by creating single element CFStringRefs then extracting the
        first character. */
@@ -190,9 +186,7 @@ macroman2ucs (unsigned char c)
     else         return table[c - 128];
 }
 
-static KeySym
-make_dead_key (KeySym in)
-{
+static KeySym make_dead_key(KeySym in) {
     int i;
 
     for (i = 0; i < sizeof (dead_keys) / sizeof (dead_keys[0]); i++)
@@ -201,9 +195,7 @@ make_dead_key (KeySym in)
     return in;
 }
 
-Bool
-DarwinModeReadSystemKeymap (darwinKeyboardInfo *info)
-{
+Bool DarwinModeReadSystemKeymap(darwinKeyboardInfo *info) {
     KeyboardLayoutRef key_layout;
     const void *chr_data = NULL;
     int num_keycodes = NUM_KEYCODES;

From bc65a243930e4b02f06a861495420b0a120eae8c Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Wed, 5 Dec 2007 19:43:49 -0800
Subject: [PATCH 275/552] Darwin: Flattened quartz into darwin, renamed darwin
 xquartz Leaving xpr unflattened since we want modularity to replace that with
 xpc (XPluginComposite) at some point (cherry picked from commit
 48e6a75fbdd0fee86e364f02ace83f20b312a2b2)

---
 configure.ac                                  |   7 ++---
 hw/Makefile.am                                |   4 +--
 hw/darwin/Makefile.am                         |  21 --------------
 hw/{darwin/quartz => xquartz}/Makefile.am     |  26 ++++++++++++------
 .../quartz => xquartz}/X11Application.h       |   0
 .../quartz => xquartz}/X11Application.m       |   0
 hw/{darwin/quartz => xquartz}/X11Controller.h |   0
 hw/{darwin/quartz => xquartz}/X11Controller.m |   0
 hw/{darwin/quartz => xquartz}/applewm.c       |   0
 hw/{darwin/quartz => xquartz}/applewmExt.h    |   0
 .../bundle}/English.lproj/InfoPlist.strings   | Bin
 .../bundle}/English.lproj/Localizable.strings | Bin
 .../English.lproj/main.nib/classes.nib        |   0
 .../bundle}/English.lproj/main.nib/info.nib   |   0
 .../English.lproj/main.nib/keyedobjects.nib   | Bin
 .../apple => xquartz/bundle}/Info.plist       |   0
 .../apple => xquartz/bundle}/Makefile.am      |   0
 .../quartz/apple => xquartz/bundle}/X11.icns  | Bin
 .../bundle}/X11.xcodeproj/project.pbxproj     |   0
 .../apple => xquartz/bundle}/bundle-main.c    |   0
 .../apple => xquartz/bundle}/launcher-main.c  |   0
 .../apple => xquartz/bundle}/org.x.X11.plist  |   0
 .../apple => xquartz/bundle}/server-main.c    |   0
 hw/{darwin => xquartz}/darwin.c               |   0
 hw/{darwin => xquartz}/darwin.h               |   0
 hw/{darwin => xquartz}/darwinClut8.h          |   0
 hw/{darwin => xquartz}/darwinEvents.c         |   0
 hw/{darwin => xquartz}/darwinKeyboard.c       |   0
 hw/{darwin => xquartz}/darwinKeyboard.h       |   2 +-
 hw/{darwin => xquartz}/darwinXinput.c         |   0
 hw/{darwin/quartz => xquartz}/keysym2ucs.c    |   0
 hw/{darwin/quartz => xquartz}/keysym2ucs.h    |   0
 hw/{darwin/quartz => xquartz}/pseudoramiX.c   |   0
 hw/{darwin/quartz => xquartz}/pseudoramiX.h   |   0
 hw/{darwin/quartz => xquartz}/quartz.c        |   0
 hw/{darwin/quartz => xquartz}/quartz.h        |   0
 hw/{darwin/quartz => xquartz}/quartzAudio.c   |   0
 hw/{darwin/quartz => xquartz}/quartzAudio.h   |   0
 hw/{darwin/quartz => xquartz}/quartzCocoa.m   |   0
 hw/{darwin/quartz => xquartz}/quartzCommon.h  |   0
 hw/{darwin/quartz => xquartz}/quartzCursor.c  |   0
 hw/{darwin/quartz => xquartz}/quartzCursor.h  |   0
 .../quartz => xquartz}/quartzKeyboard.c       |   2 +-
 .../quartzKeyboard.h}                         |   6 ++--
 .../quartz => xquartz}/quartzPasteboard.c     |   0
 .../quartz => xquartz}/quartzPasteboard.h     |   0
 hw/{darwin/quartz => xquartz}/quartzStartup.c |   0
 hw/{darwin/quartz => xquartz}/xpr/Makefile.am |   5 ++--
 hw/{darwin/quartz => xquartz}/xpr/Xplugin.h   |   0
 hw/{darwin/quartz => xquartz}/xpr/Xquartz.man |   0
 hw/{darwin/quartz => xquartz}/xpr/appledri.c  |   0
 hw/{darwin/quartz => xquartz}/xpr/appledri.h  |   0
 .../quartz => xquartz}/xpr/appledristr.h      |   0
 hw/{darwin/quartz => xquartz}/xpr/dri.c       |   0
 hw/{darwin/quartz => xquartz}/xpr/dri.h       |   0
 hw/{darwin/quartz => xquartz}/xpr/dristruct.h |   0
 hw/{darwin/quartz => xquartz}/xpr/x-hash.c    |   0
 hw/{darwin/quartz => xquartz}/xpr/x-hash.h    |   0
 hw/{darwin/quartz => xquartz}/xpr/x-hook.c    |   0
 hw/{darwin/quartz => xquartz}/xpr/x-hook.h    |   0
 hw/{darwin/quartz => xquartz}/xpr/x-list.c    |   0
 hw/{darwin/quartz => xquartz}/xpr/x-list.h    |   0
 hw/{darwin/quartz => xquartz}/xpr/xpr.h       |   0
 .../quartz => xquartz}/xpr/xprAppleWM.c       |   2 +-
 hw/{darwin/quartz => xquartz}/xpr/xprCursor.c |   2 +-
 hw/{darwin/quartz => xquartz}/xpr/xprFrame.c  |   2 +-
 hw/{darwin/quartz => xquartz}/xpr/xprScreen.c |   8 +++---
 67 files changed, 36 insertions(+), 51 deletions(-)
 delete mode 100644 hw/darwin/Makefile.am
 rename hw/{darwin/quartz => xquartz}/Makefile.am (59%)
 rename hw/{darwin/quartz => xquartz}/X11Application.h (100%)
 rename hw/{darwin/quartz => xquartz}/X11Application.m (100%)
 rename hw/{darwin/quartz => xquartz}/X11Controller.h (100%)
 rename hw/{darwin/quartz => xquartz}/X11Controller.m (100%)
 rename hw/{darwin/quartz => xquartz}/applewm.c (100%)
 rename hw/{darwin/quartz => xquartz}/applewmExt.h (100%)
 rename hw/{darwin/quartz/apple => xquartz/bundle}/English.lproj/InfoPlist.strings (100%)
 rename hw/{darwin/quartz/apple => xquartz/bundle}/English.lproj/Localizable.strings (100%)
 rename hw/{darwin/quartz/apple => xquartz/bundle}/English.lproj/main.nib/classes.nib (100%)
 rename hw/{darwin/quartz/apple => xquartz/bundle}/English.lproj/main.nib/info.nib (100%)
 rename hw/{darwin/quartz/apple => xquartz/bundle}/English.lproj/main.nib/keyedobjects.nib (100%)
 rename hw/{darwin/quartz/apple => xquartz/bundle}/Info.plist (100%)
 rename hw/{darwin/quartz/apple => xquartz/bundle}/Makefile.am (100%)
 rename hw/{darwin/quartz/apple => xquartz/bundle}/X11.icns (100%)
 rename hw/{darwin/quartz/apple => xquartz/bundle}/X11.xcodeproj/project.pbxproj (100%)
 rename hw/{darwin/quartz/apple => xquartz/bundle}/bundle-main.c (100%)
 rename hw/{darwin/quartz/apple => xquartz/bundle}/launcher-main.c (100%)
 rename hw/{darwin/quartz/apple => xquartz/bundle}/org.x.X11.plist (100%)
 rename hw/{darwin/quartz/apple => xquartz/bundle}/server-main.c (100%)
 rename hw/{darwin => xquartz}/darwin.c (100%)
 rename hw/{darwin => xquartz}/darwin.h (100%)
 rename hw/{darwin => xquartz}/darwinClut8.h (100%)
 rename hw/{darwin => xquartz}/darwinEvents.c (100%)
 rename hw/{darwin => xquartz}/darwinKeyboard.c (100%)
 rename hw/{darwin => xquartz}/darwinKeyboard.h (98%)
 rename hw/{darwin => xquartz}/darwinXinput.c (100%)
 rename hw/{darwin/quartz => xquartz}/keysym2ucs.c (100%)
 rename hw/{darwin/quartz => xquartz}/keysym2ucs.h (100%)
 rename hw/{darwin/quartz => xquartz}/pseudoramiX.c (100%)
 rename hw/{darwin/quartz => xquartz}/pseudoramiX.h (100%)
 rename hw/{darwin/quartz => xquartz}/quartz.c (100%)
 rename hw/{darwin/quartz => xquartz}/quartz.h (100%)
 rename hw/{darwin/quartz => xquartz}/quartzAudio.c (100%)
 rename hw/{darwin/quartz => xquartz}/quartzAudio.h (100%)
 rename hw/{darwin/quartz => xquartz}/quartzCocoa.m (100%)
 rename hw/{darwin/quartz => xquartz}/quartzCommon.h (100%)
 rename hw/{darwin/quartz => xquartz}/quartzCursor.c (100%)
 rename hw/{darwin/quartz => xquartz}/quartzCursor.h (100%)
 rename hw/{darwin/quartz => xquartz}/quartzKeyboard.c (99%)
 rename hw/{darwin/darwinKeyboard_interface.h => xquartz/quartzKeyboard.h} (94%)
 rename hw/{darwin/quartz => xquartz}/quartzPasteboard.c (100%)
 rename hw/{darwin/quartz => xquartz}/quartzPasteboard.h (100%)
 rename hw/{darwin/quartz => xquartz}/quartzStartup.c (100%)
 rename hw/{darwin/quartz => xquartz}/xpr/Makefile.am (92%)
 rename hw/{darwin/quartz => xquartz}/xpr/Xplugin.h (100%)
 rename hw/{darwin/quartz => xquartz}/xpr/Xquartz.man (100%)
 rename hw/{darwin/quartz => xquartz}/xpr/appledri.c (100%)
 rename hw/{darwin/quartz => xquartz}/xpr/appledri.h (100%)
 rename hw/{darwin/quartz => xquartz}/xpr/appledristr.h (100%)
 rename hw/{darwin/quartz => xquartz}/xpr/dri.c (100%)
 rename hw/{darwin/quartz => xquartz}/xpr/dri.h (100%)
 rename hw/{darwin/quartz => xquartz}/xpr/dristruct.h (100%)
 rename hw/{darwin/quartz => xquartz}/xpr/x-hash.c (100%)
 rename hw/{darwin/quartz => xquartz}/xpr/x-hash.h (100%)
 rename hw/{darwin/quartz => xquartz}/xpr/x-hook.c (100%)
 rename hw/{darwin/quartz => xquartz}/xpr/x-hook.h (100%)
 rename hw/{darwin/quartz => xquartz}/xpr/x-list.c (100%)
 rename hw/{darwin/quartz => xquartz}/xpr/x-list.h (100%)
 rename hw/{darwin/quartz => xquartz}/xpr/xpr.h (100%)
 rename hw/{darwin/quartz => xquartz}/xpr/xprAppleWM.c (98%)
 rename hw/{darwin/quartz => xquartz}/xpr/xprCursor.c (99%)
 rename hw/{darwin/quartz => xquartz}/xpr/xprFrame.c (99%)
 rename hw/{darwin/quartz => xquartz}/xpr/xprScreen.c (98%)

diff --git a/configure.ac b/configure.ac
index 04ce6f4c7..5bc3d8032 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2170,10 +2170,9 @@ hw/xgl/glxext/Makefile
 hw/xgl/glxext/module/Makefile
 hw/xnest/Makefile
 hw/xwin/Makefile
-hw/darwin/Makefile
-hw/darwin/quartz/Makefile
-hw/darwin/quartz/apple/Makefile
-hw/darwin/quartz/xpr/Makefile
+hw/xquartz/Makefile
+hw/xquartz/bundle/Makefile
+hw/xquartz/xpr/Makefile
 hw/kdrive/Makefile
 hw/kdrive/ati/Makefile
 hw/kdrive/chips/Makefile
diff --git a/hw/Makefile.am b/hw/Makefile.am
index 0e65f7106..abdeabb01 100644
--- a/hw/Makefile.am
+++ b/hw/Makefile.am
@@ -31,7 +31,7 @@ XPRINT_SUBDIRS = xprint
 endif
 
 if XQUARTZ
-XQUARTZ_SUBDIRS = darwin
+XQUARTZ_SUBDIRS = xquartz
 endif
 
 SUBDIRS =			\
@@ -45,7 +45,7 @@ SUBDIRS =			\
 	$(KDRIVE_SUBDIRS)	\
 	$(XPRINT_SUBDIRS)
 
-DIST_SUBDIRS = dmx xfree86 vfb xnest xwin darwin kdrive xgl xprint
+DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xgl xprint
 
 relink:
 	for i in $(SUBDIRS) ; do $(MAKE) -C $$i relink ; done
diff --git a/hw/darwin/Makefile.am b/hw/darwin/Makefile.am
deleted file mode 100644
index 3f29a8174..000000000
--- a/hw/darwin/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-noinst_LTLIBRARIES = libXdarwin.la
-AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
-AM_CPPFLAGS = \
-	-DINXQUARTZ \
-	-DUSE_NEW_CLUT \
-	-DXFree86Server
-
-SUBDIRS = . quartz
-
-libXdarwin_la_SOURCES = \
-	darwin.c \
-	darwinEvents.c \
-	darwinKeyboard.c \
-	darwinXinput.c \
-	$(top_srcdir)/fb/fbcmap_mi.c \
-	$(top_srcdir)/mi/miinitext.c
-
-EXTRA_DIST = \
-	darwinClut8.h \
-	darwin.h \
-	darwinKeyboard.h
diff --git a/hw/darwin/quartz/Makefile.am b/hw/xquartz/Makefile.am
similarity index 59%
rename from hw/darwin/quartz/Makefile.am
rename to hw/xquartz/Makefile.am
index 38f48d0e2..725d20f6c 100644
--- a/hw/darwin/quartz/Makefile.am
+++ b/hw/xquartz/Makefile.am
@@ -1,24 +1,29 @@
-noinst_LTLIBRARIES = libXQuartz.la
-
+noinst_LTLIBRARIES = libXquartz.la
 AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
-AM_OBJCFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
-
-# TODO: This should not pull in rootless... rootless should all be in xpr
 AM_CPPFLAGS = \
-	-I$(srcdir) -I$(srcdir)/.. \
+	-DBUILD_DATE=\"$(BUILD_DATE)\" \
+	-DINXQUARTZ \
+	-DUSE_NEW_CLUT \
+	-DXFree86Server \
 	-I$(top_srcdir)/miext/rootless
 
 if X11APP
-X11APP_SUBDIRS = apple
+X11APP_SUBDIRS = bundle
 endif
 
 SUBDIRS = . xpr $(X11APP_SUBDIRS)
-DIST_SUBDIRS = xpr apple
+DIST_SUBDIRS = xpr bundle
 
-libXQuartz_la_SOURCES = \
+libXquartz_la_SOURCES = \
+	$(top_srcdir)/fb/fbcmap.c \
+	$(top_srcdir)/mi/miinitext.c \
 	X11Application.m \
 	X11Controller.m \
 	applewm.c \
+	darwin.c \
+	darwinEvents.c \
+	darwinKeyboard.c \
+	darwinXinput.c \
 	keysym2ucs.c \
 	pseudoramiX.c \
 	quartz.c \
@@ -32,6 +37,9 @@ EXTRA_DIST = \
 	X11Application.h \
 	X11Controller.h \
 	applewmExt.h \
+	darwinClut8.h \
+	darwin.h \
+	darwinKeyboard.h \
 	keysym2ucs.h \
 	pseudoramiX.h \
 	quartzAudio.h \
diff --git a/hw/darwin/quartz/X11Application.h b/hw/xquartz/X11Application.h
similarity index 100%
rename from hw/darwin/quartz/X11Application.h
rename to hw/xquartz/X11Application.h
diff --git a/hw/darwin/quartz/X11Application.m b/hw/xquartz/X11Application.m
similarity index 100%
rename from hw/darwin/quartz/X11Application.m
rename to hw/xquartz/X11Application.m
diff --git a/hw/darwin/quartz/X11Controller.h b/hw/xquartz/X11Controller.h
similarity index 100%
rename from hw/darwin/quartz/X11Controller.h
rename to hw/xquartz/X11Controller.h
diff --git a/hw/darwin/quartz/X11Controller.m b/hw/xquartz/X11Controller.m
similarity index 100%
rename from hw/darwin/quartz/X11Controller.m
rename to hw/xquartz/X11Controller.m
diff --git a/hw/darwin/quartz/applewm.c b/hw/xquartz/applewm.c
similarity index 100%
rename from hw/darwin/quartz/applewm.c
rename to hw/xquartz/applewm.c
diff --git a/hw/darwin/quartz/applewmExt.h b/hw/xquartz/applewmExt.h
similarity index 100%
rename from hw/darwin/quartz/applewmExt.h
rename to hw/xquartz/applewmExt.h
diff --git a/hw/darwin/quartz/apple/English.lproj/InfoPlist.strings b/hw/xquartz/bundle/English.lproj/InfoPlist.strings
similarity index 100%
rename from hw/darwin/quartz/apple/English.lproj/InfoPlist.strings
rename to hw/xquartz/bundle/English.lproj/InfoPlist.strings
diff --git a/hw/darwin/quartz/apple/English.lproj/Localizable.strings b/hw/xquartz/bundle/English.lproj/Localizable.strings
similarity index 100%
rename from hw/darwin/quartz/apple/English.lproj/Localizable.strings
rename to hw/xquartz/bundle/English.lproj/Localizable.strings
diff --git a/hw/darwin/quartz/apple/English.lproj/main.nib/classes.nib b/hw/xquartz/bundle/English.lproj/main.nib/classes.nib
similarity index 100%
rename from hw/darwin/quartz/apple/English.lproj/main.nib/classes.nib
rename to hw/xquartz/bundle/English.lproj/main.nib/classes.nib
diff --git a/hw/darwin/quartz/apple/English.lproj/main.nib/info.nib b/hw/xquartz/bundle/English.lproj/main.nib/info.nib
similarity index 100%
rename from hw/darwin/quartz/apple/English.lproj/main.nib/info.nib
rename to hw/xquartz/bundle/English.lproj/main.nib/info.nib
diff --git a/hw/darwin/quartz/apple/English.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/English.lproj/main.nib/keyedobjects.nib
similarity index 100%
rename from hw/darwin/quartz/apple/English.lproj/main.nib/keyedobjects.nib
rename to hw/xquartz/bundle/English.lproj/main.nib/keyedobjects.nib
diff --git a/hw/darwin/quartz/apple/Info.plist b/hw/xquartz/bundle/Info.plist
similarity index 100%
rename from hw/darwin/quartz/apple/Info.plist
rename to hw/xquartz/bundle/Info.plist
diff --git a/hw/darwin/quartz/apple/Makefile.am b/hw/xquartz/bundle/Makefile.am
similarity index 100%
rename from hw/darwin/quartz/apple/Makefile.am
rename to hw/xquartz/bundle/Makefile.am
diff --git a/hw/darwin/quartz/apple/X11.icns b/hw/xquartz/bundle/X11.icns
similarity index 100%
rename from hw/darwin/quartz/apple/X11.icns
rename to hw/xquartz/bundle/X11.icns
diff --git a/hw/darwin/quartz/apple/X11.xcodeproj/project.pbxproj b/hw/xquartz/bundle/X11.xcodeproj/project.pbxproj
similarity index 100%
rename from hw/darwin/quartz/apple/X11.xcodeproj/project.pbxproj
rename to hw/xquartz/bundle/X11.xcodeproj/project.pbxproj
diff --git a/hw/darwin/quartz/apple/bundle-main.c b/hw/xquartz/bundle/bundle-main.c
similarity index 100%
rename from hw/darwin/quartz/apple/bundle-main.c
rename to hw/xquartz/bundle/bundle-main.c
diff --git a/hw/darwin/quartz/apple/launcher-main.c b/hw/xquartz/bundle/launcher-main.c
similarity index 100%
rename from hw/darwin/quartz/apple/launcher-main.c
rename to hw/xquartz/bundle/launcher-main.c
diff --git a/hw/darwin/quartz/apple/org.x.X11.plist b/hw/xquartz/bundle/org.x.X11.plist
similarity index 100%
rename from hw/darwin/quartz/apple/org.x.X11.plist
rename to hw/xquartz/bundle/org.x.X11.plist
diff --git a/hw/darwin/quartz/apple/server-main.c b/hw/xquartz/bundle/server-main.c
similarity index 100%
rename from hw/darwin/quartz/apple/server-main.c
rename to hw/xquartz/bundle/server-main.c
diff --git a/hw/darwin/darwin.c b/hw/xquartz/darwin.c
similarity index 100%
rename from hw/darwin/darwin.c
rename to hw/xquartz/darwin.c
diff --git a/hw/darwin/darwin.h b/hw/xquartz/darwin.h
similarity index 100%
rename from hw/darwin/darwin.h
rename to hw/xquartz/darwin.h
diff --git a/hw/darwin/darwinClut8.h b/hw/xquartz/darwinClut8.h
similarity index 100%
rename from hw/darwin/darwinClut8.h
rename to hw/xquartz/darwinClut8.h
diff --git a/hw/darwin/darwinEvents.c b/hw/xquartz/darwinEvents.c
similarity index 100%
rename from hw/darwin/darwinEvents.c
rename to hw/xquartz/darwinEvents.c
diff --git a/hw/darwin/darwinKeyboard.c b/hw/xquartz/darwinKeyboard.c
similarity index 100%
rename from hw/darwin/darwinKeyboard.c
rename to hw/xquartz/darwinKeyboard.c
diff --git a/hw/darwin/darwinKeyboard.h b/hw/xquartz/darwinKeyboard.h
similarity index 98%
rename from hw/darwin/darwinKeyboard.h
rename to hw/xquartz/darwinKeyboard.h
index 12104418e..5cf64c7d1 100644
--- a/hw/darwin/darwinKeyboard.h
+++ b/hw/xquartz/darwinKeyboard.h
@@ -27,7 +27,7 @@
 #ifndef DARWIN_KEYBOARD_H
 #define DARWIN_KEYBOARD_H 1
 
-#include "darwinKeyboard_interface.h"
+#include "quartzKeyboard.h"
 
 /* Provided for darwinEvents.c */
 extern darwinKeyboardInfo keyInfo;
diff --git a/hw/darwin/darwinXinput.c b/hw/xquartz/darwinXinput.c
similarity index 100%
rename from hw/darwin/darwinXinput.c
rename to hw/xquartz/darwinXinput.c
diff --git a/hw/darwin/quartz/keysym2ucs.c b/hw/xquartz/keysym2ucs.c
similarity index 100%
rename from hw/darwin/quartz/keysym2ucs.c
rename to hw/xquartz/keysym2ucs.c
diff --git a/hw/darwin/quartz/keysym2ucs.h b/hw/xquartz/keysym2ucs.h
similarity index 100%
rename from hw/darwin/quartz/keysym2ucs.h
rename to hw/xquartz/keysym2ucs.h
diff --git a/hw/darwin/quartz/pseudoramiX.c b/hw/xquartz/pseudoramiX.c
similarity index 100%
rename from hw/darwin/quartz/pseudoramiX.c
rename to hw/xquartz/pseudoramiX.c
diff --git a/hw/darwin/quartz/pseudoramiX.h b/hw/xquartz/pseudoramiX.h
similarity index 100%
rename from hw/darwin/quartz/pseudoramiX.h
rename to hw/xquartz/pseudoramiX.h
diff --git a/hw/darwin/quartz/quartz.c b/hw/xquartz/quartz.c
similarity index 100%
rename from hw/darwin/quartz/quartz.c
rename to hw/xquartz/quartz.c
diff --git a/hw/darwin/quartz/quartz.h b/hw/xquartz/quartz.h
similarity index 100%
rename from hw/darwin/quartz/quartz.h
rename to hw/xquartz/quartz.h
diff --git a/hw/darwin/quartz/quartzAudio.c b/hw/xquartz/quartzAudio.c
similarity index 100%
rename from hw/darwin/quartz/quartzAudio.c
rename to hw/xquartz/quartzAudio.c
diff --git a/hw/darwin/quartz/quartzAudio.h b/hw/xquartz/quartzAudio.h
similarity index 100%
rename from hw/darwin/quartz/quartzAudio.h
rename to hw/xquartz/quartzAudio.h
diff --git a/hw/darwin/quartz/quartzCocoa.m b/hw/xquartz/quartzCocoa.m
similarity index 100%
rename from hw/darwin/quartz/quartzCocoa.m
rename to hw/xquartz/quartzCocoa.m
diff --git a/hw/darwin/quartz/quartzCommon.h b/hw/xquartz/quartzCommon.h
similarity index 100%
rename from hw/darwin/quartz/quartzCommon.h
rename to hw/xquartz/quartzCommon.h
diff --git a/hw/darwin/quartz/quartzCursor.c b/hw/xquartz/quartzCursor.c
similarity index 100%
rename from hw/darwin/quartz/quartzCursor.c
rename to hw/xquartz/quartzCursor.c
diff --git a/hw/darwin/quartz/quartzCursor.h b/hw/xquartz/quartzCursor.h
similarity index 100%
rename from hw/darwin/quartz/quartzCursor.h
rename to hw/xquartz/quartzCursor.h
diff --git a/hw/darwin/quartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c
similarity index 99%
rename from hw/darwin/quartz/quartzKeyboard.c
rename to hw/xquartz/quartzKeyboard.c
index c69fb9f96..0a50d06ac 100644
--- a/hw/darwin/quartz/quartzKeyboard.c
+++ b/hw/xquartz/quartzKeyboard.c
@@ -40,7 +40,7 @@
 #include <CoreServices/CoreServices.h>
 #include <Carbon/Carbon.h>
 
-#include "darwinKeyboard_interface.h"
+#include "quartzKeyboard.h"
 #include "X11/keysym.h"
 #include "keysym2ucs.h"
 
diff --git a/hw/darwin/darwinKeyboard_interface.h b/hw/xquartz/quartzKeyboard.h
similarity index 94%
rename from hw/darwin/darwinKeyboard_interface.h
rename to hw/xquartz/quartzKeyboard.h
index f41f46318..f27fcdeac 100644
--- a/hw/darwin/darwinKeyboard_interface.h
+++ b/hw/xquartz/quartzKeyboard.h
@@ -24,8 +24,8 @@
  * use or other dealings in this Software without prior written authorization.
  */
 
-#ifndef DARWIN_KEYBOARD_INTERFACE_H
-#define DARWIN_KEYBOARD_INTERFACE_H 1
+#ifndef QUARTZ_KEYBOARD_H
+#define QUARTZ_KEYBOARD_H 1
 
 #define XK_TECHNICAL		// needed to get XK_Escape
 #define XK_PUBLISHING
@@ -49,4 +49,4 @@ void DarwinKeyboardReload(DeviceIntPtr pDev);
 Bool DarwinModeReadSystemKeymap(darwinKeyboardInfo *info);
 unsigned int DarwinModeSystemKeymapSeed(void);
 
-#endif /* DARWIN_KEYBOARD_INTERFACE_H */
+#endif /* QUARTZ_KEYBOARD_H */
diff --git a/hw/darwin/quartz/quartzPasteboard.c b/hw/xquartz/quartzPasteboard.c
similarity index 100%
rename from hw/darwin/quartz/quartzPasteboard.c
rename to hw/xquartz/quartzPasteboard.c
diff --git a/hw/darwin/quartz/quartzPasteboard.h b/hw/xquartz/quartzPasteboard.h
similarity index 100%
rename from hw/darwin/quartz/quartzPasteboard.h
rename to hw/xquartz/quartzPasteboard.h
diff --git a/hw/darwin/quartz/quartzStartup.c b/hw/xquartz/quartzStartup.c
similarity index 100%
rename from hw/darwin/quartz/quartzStartup.c
rename to hw/xquartz/quartzStartup.c
diff --git a/hw/darwin/quartz/xpr/Makefile.am b/hw/xquartz/xpr/Makefile.am
similarity index 92%
rename from hw/darwin/quartz/xpr/Makefile.am
rename to hw/xquartz/xpr/Makefile.am
index 769662276..3cc2aba12 100644
--- a/hw/darwin/quartz/xpr/Makefile.am
+++ b/hw/xquartz/xpr/Makefile.am
@@ -5,7 +5,7 @@ man1_MANS = Xquartz.man
 
 AM_CFLAGS =  $(XSERVER_CFLAGS) $(DIX_CFLAGS)
 AM_CPPFLAGS = \
-	-I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. \
+	-I$(srcdir) -I$(srcdir)/.. \
 	-I$(top_srcdir)/miext \
 	-I$(top_srcdir)/miext/rootless \
 	-I$(top_srcdir)/miext/rootless/safeAlpha
@@ -22,8 +22,7 @@ Xquartz_SOURCES = \
 	x-list.c
 
 Xquartz_LDADD = \
-	$(top_builddir)/hw/darwin/quartz/libXquartz.la \
-	$(top_builddir)/hw/darwin/libXdarwin.la \
+	$(top_builddir)/hw/xquartz/libXquartz.la \
 	$(top_builddir)/dix/dixfonts.lo \
 	$(top_builddir)/dix/libdix.la \
 	$(top_builddir)/os/libos.la \
diff --git a/hw/darwin/quartz/xpr/Xplugin.h b/hw/xquartz/xpr/Xplugin.h
similarity index 100%
rename from hw/darwin/quartz/xpr/Xplugin.h
rename to hw/xquartz/xpr/Xplugin.h
diff --git a/hw/darwin/quartz/xpr/Xquartz.man b/hw/xquartz/xpr/Xquartz.man
similarity index 100%
rename from hw/darwin/quartz/xpr/Xquartz.man
rename to hw/xquartz/xpr/Xquartz.man
diff --git a/hw/darwin/quartz/xpr/appledri.c b/hw/xquartz/xpr/appledri.c
similarity index 100%
rename from hw/darwin/quartz/xpr/appledri.c
rename to hw/xquartz/xpr/appledri.c
diff --git a/hw/darwin/quartz/xpr/appledri.h b/hw/xquartz/xpr/appledri.h
similarity index 100%
rename from hw/darwin/quartz/xpr/appledri.h
rename to hw/xquartz/xpr/appledri.h
diff --git a/hw/darwin/quartz/xpr/appledristr.h b/hw/xquartz/xpr/appledristr.h
similarity index 100%
rename from hw/darwin/quartz/xpr/appledristr.h
rename to hw/xquartz/xpr/appledristr.h
diff --git a/hw/darwin/quartz/xpr/dri.c b/hw/xquartz/xpr/dri.c
similarity index 100%
rename from hw/darwin/quartz/xpr/dri.c
rename to hw/xquartz/xpr/dri.c
diff --git a/hw/darwin/quartz/xpr/dri.h b/hw/xquartz/xpr/dri.h
similarity index 100%
rename from hw/darwin/quartz/xpr/dri.h
rename to hw/xquartz/xpr/dri.h
diff --git a/hw/darwin/quartz/xpr/dristruct.h b/hw/xquartz/xpr/dristruct.h
similarity index 100%
rename from hw/darwin/quartz/xpr/dristruct.h
rename to hw/xquartz/xpr/dristruct.h
diff --git a/hw/darwin/quartz/xpr/x-hash.c b/hw/xquartz/xpr/x-hash.c
similarity index 100%
rename from hw/darwin/quartz/xpr/x-hash.c
rename to hw/xquartz/xpr/x-hash.c
diff --git a/hw/darwin/quartz/xpr/x-hash.h b/hw/xquartz/xpr/x-hash.h
similarity index 100%
rename from hw/darwin/quartz/xpr/x-hash.h
rename to hw/xquartz/xpr/x-hash.h
diff --git a/hw/darwin/quartz/xpr/x-hook.c b/hw/xquartz/xpr/x-hook.c
similarity index 100%
rename from hw/darwin/quartz/xpr/x-hook.c
rename to hw/xquartz/xpr/x-hook.c
diff --git a/hw/darwin/quartz/xpr/x-hook.h b/hw/xquartz/xpr/x-hook.h
similarity index 100%
rename from hw/darwin/quartz/xpr/x-hook.h
rename to hw/xquartz/xpr/x-hook.h
diff --git a/hw/darwin/quartz/xpr/x-list.c b/hw/xquartz/xpr/x-list.c
similarity index 100%
rename from hw/darwin/quartz/xpr/x-list.c
rename to hw/xquartz/xpr/x-list.c
diff --git a/hw/darwin/quartz/xpr/x-list.h b/hw/xquartz/xpr/x-list.h
similarity index 100%
rename from hw/darwin/quartz/xpr/x-list.h
rename to hw/xquartz/xpr/x-list.h
diff --git a/hw/darwin/quartz/xpr/xpr.h b/hw/xquartz/xpr/xpr.h
similarity index 100%
rename from hw/darwin/quartz/xpr/xpr.h
rename to hw/xquartz/xpr/xpr.h
diff --git a/hw/darwin/quartz/xpr/xprAppleWM.c b/hw/xquartz/xpr/xprAppleWM.c
similarity index 98%
rename from hw/darwin/quartz/xpr/xprAppleWM.c
rename to hw/xquartz/xpr/xprAppleWM.c
index 5539c51cc..bd82df03c 100644
--- a/hw/darwin/quartz/xpr/xprAppleWM.c
+++ b/hw/xquartz/xpr/xprAppleWM.c
@@ -32,7 +32,7 @@
 #endif
 
 #include "xpr.h"
-#include "quartz/applewmExt.h"
+#include "applewmExt.h"
 #include "rootless.h"
 #include "Xplugin.h"
 #include <X11/X.h>
diff --git a/hw/darwin/quartz/xpr/xprCursor.c b/hw/xquartz/xpr/xprCursor.c
similarity index 99%
rename from hw/darwin/quartz/xpr/xprCursor.c
rename to hw/xquartz/xpr/xprCursor.c
index 160b5d908..db195a8ec 100644
--- a/hw/darwin/quartz/xpr/xprCursor.c
+++ b/hw/xquartz/xpr/xprCursor.c
@@ -33,7 +33,7 @@
 #include <dix-config.h>
 #endif
 
-#include "quartz/quartzCommon.h"
+#include "quartzCommon.h"
 #include "xpr.h"
 #include "darwin.h"
 #include "Xplugin.h"
diff --git a/hw/darwin/quartz/xpr/xprFrame.c b/hw/xquartz/xpr/xprFrame.c
similarity index 99%
rename from hw/darwin/quartz/xpr/xprFrame.c
rename to hw/xquartz/xpr/xprFrame.c
index 1b0ba9102..2d97f2754 100644
--- a/hw/darwin/quartz/xpr/xprFrame.c
+++ b/hw/xquartz/xpr/xprFrame.c
@@ -36,7 +36,7 @@
 #include "Xplugin.h"
 #include "x-hash.h"
 #include "x-list.h"
-#include "quartz/applewmExt.h"
+#include "applewmExt.h"
 
 #include "propertyst.h"
 #include "dix.h"
diff --git a/hw/darwin/quartz/xpr/xprScreen.c b/hw/xquartz/xpr/xprScreen.c
similarity index 98%
rename from hw/darwin/quartz/xpr/xprScreen.c
rename to hw/xquartz/xpr/xprScreen.c
index 28ed159fe..068b7b177 100644
--- a/hw/darwin/quartz/xpr/xprScreen.c
+++ b/hw/xquartz/xpr/xprScreen.c
@@ -31,17 +31,17 @@
 #include <dix-config.h>
 #endif
 
-#include "quartz/quartzCommon.h"
-#include "quartz/quartz.h"
+#include "quartzCommon.h"
+#include "quartz.h"
 #include "xpr.h"
-#include "quartz/pseudoramiX.h"
+#include "pseudoramiX.h"
 #include "darwin.h"
 #include "rootless.h"
 #include "safeAlpha/safeAlpha.h"
 #include "dri.h"
 #include "globals.h"
 #include "Xplugin.h"
-#include "quartz/applewmExt.h"
+#include "applewmExt.h"
 
 // From xprFrame.c
 WindowPtr xprGetXWindow(xp_window_id wid);

From 540439a966cce3fc68a7e4bffdb5bcab1b20725f Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Wed, 5 Dec 2007 20:55:06 -0800
Subject: [PATCH 276/552] .gitignore: Added Xcode user files

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 6abca3b1a..2e60d58b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,8 @@ Makefile.in
 *.o
 *~
 .*.swp
+*.pbxuser
+*.mode1v3
 obj*
 build*
 aclocal.m4

From 8a8239f2e21795602fcff5281833b350e6b2a286 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Wed, 5 Dec 2007 21:23:36 -0800
Subject: [PATCH 277/552] Darwin: Renamed DarwinModeBlah to QuartzBlah (cherry
 picked from commit 08ebf86d379b1ddfb08df65d29aea5df66de4327)

---
 hw/xquartz/X11Application.m |  1 +
 hw/xquartz/darwin.c         | 13 ++++++++-----
 hw/xquartz/darwin.h         | 24 -----------------------
 hw/xquartz/darwinEvents.c   |  3 ++-
 hw/xquartz/darwinEvents.h   | 39 +++++++++++++++++++++++++++++++++++++
 hw/xquartz/darwinKeyboard.c |  4 +++-
 hw/xquartz/quartz.c         | 37 ++++++++++++++++++-----------------
 hw/xquartz/quartz.h         |  7 +++++++
 hw/xquartz/quartzAudio.c    |  4 ++--
 hw/xquartz/quartzKeyboard.h |  1 +
 hw/xquartz/xpr/xprCursor.c  |  1 +
 11 files changed, 83 insertions(+), 51 deletions(-)
 create mode 100644 hw/xquartz/darwinEvents.h

diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index 3e37dd436..8d4076a0a 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -39,6 +39,7 @@
 /* ouch! */
 #define BOOL X_BOOL
 # include "darwin.h"
+# include "darwinEvents.h"
 # include "quartz.h"
 # define _APPLEWM_SERVER_
 # include "X11/extensions/applewm.h"
diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index b46b7687e..e091f25ba 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -75,6 +75,9 @@
 #endif
 
 #include "darwin.h"
+#include "darwinEvents.h"
+#include "darwinKeyboard.h"
+#include "quartz.h"
 #include "darwinClut8.h"
 
 #ifdef ENABLE_DEBUG_LOG
@@ -195,7 +198,7 @@ static Bool DarwinAddScreen(
     pScreen->devPrivates[darwinScreenIndex].ptr = dfb;
 
     // setup hardware/mode specific details
-    ret = DarwinModeAddScreen(foundIndex, pScreen);
+    ret = QuartzAddScreen(foundIndex, pScreen);
     foundIndex++;
     if (! ret)
         return FALSE;
@@ -274,7 +277,7 @@ static Bool DarwinAddScreen(
     pScreen->SaveScreen = DarwinSaveScreen;
 
     // finish mode dependent screen setup including cursor support
-    if (!DarwinModeSetupScreen(index, pScreen)) {
+    if (!QuartzSetupScreen(index, pScreen)) {
         return FALSE;
     }
 
@@ -539,7 +542,7 @@ void InitInput( int argc, char **argv )
 
     DarwinEQInit( (DevicePtr)darwinKeyboard, (DevicePtr)darwinPointer );
 
-    DarwinModeInitInput(argc, argv);
+    QuartzInitInput(argc, argv);
 }
 
 
@@ -629,7 +632,7 @@ void InitOutput( ScreenInfo *pScreenInfo, int argc, char **argv )
     }
 
     // Discover screens and do mode specific initialization
-    DarwinModeInitOutput(argc, argv);
+    QuartzInitOutput(argc, argv);
 
     // Add screens
     for (i = 0; i < darwinScreensFound; i++) {
@@ -895,7 +898,7 @@ void ddxGiveUp( void )
 {
     ErrorF( "Quitting XQuartz...\n" );
 
-    DarwinModeGiveUp();
+    QuartzGiveUp();
 }
 
 
diff --git a/hw/xquartz/darwin.h b/hw/xquartz/darwin.h
index 0f5f492b6..a332229be 100644
--- a/hw/xquartz/darwin.h
+++ b/hw/xquartz/darwin.h
@@ -52,26 +52,6 @@ int DarwinParseModifierList(const char *constmodifiers);
 void DarwinAdjustScreenOrigins(ScreenInfo *pScreenInfo);
 void xf86SetRootClip (ScreenPtr pScreen, BOOL enable);
 
-// From darwinEvents.c
-Bool DarwinEQInit(DevicePtr pKbd, DevicePtr pPtr);
-void DarwinEQEnqueue(const xEvent *e);
-void DarwinEQPointerPost(xEvent *e);
-void DarwinEQSwitchScreen(ScreenPtr pScreen, Bool fromDIX);
-void DarwinPokeEQ(void);
-void DarwinSendPointerEvents(int ev_type, int ev_button, int pointer_x, int pointer_y);
-void DarwinSendKeyboardEvents(int ev_type, int keycode);
-void DarwinSendScrollEvents(float count, int pointer_x, int pointer_y);
-
-// Mode specific functions
-Bool DarwinModeAddScreen(int index, ScreenPtr pScreen);
-Bool DarwinModeSetupScreen(int index, ScreenPtr pScreen);
-void DarwinModeInitOutput(int argc,char **argv);
-void DarwinModeInitInput(int argc, char **argv);
-void DarwinModeProcessEvent(xEvent *xe);
-void DarwinModeGiveUp(void);
-void DarwinModeBell(int volume, DeviceIntPtr pDevice, pointer ctrl, int class);
-
-
 #undef assert
 #define assert(x) { if ((x) == 0) \
     FatalError("assert failed on line %d of %s!\n", __LINE__, __FILE__); }
@@ -81,10 +61,6 @@ void DarwinModeBell(int volume, DeviceIntPtr pDevice, pointer ctrl, int class);
 #define SCREEN_PRIV(pScreen) \
     ((DarwinFramebufferPtr)pScreen->devPrivates[darwinScreenIndex].ptr)
 
-
-#define MIN_KEYCODE XkbMinLegalKeyCode     // unfortunately, this isn't 0...
-
-
 /*
  * Global variables from darwin.c
  */
diff --git a/hw/xquartz/darwinEvents.c b/hw/xquartz/darwinEvents.c
index 629fb2c9d..ae82f5b14 100644
--- a/hw/xquartz/darwinEvents.c
+++ b/hw/xquartz/darwinEvents.c
@@ -43,6 +43,7 @@ in this Software without prior written authorization from The Open Group.
 #include   "mipointer.h"
 
 #include "darwin.h"
+#include "quartz.h"
 #include "darwinKeyboard.h"
 
 #include <sys/types.h>
@@ -361,7 +362,7 @@ void ProcessInputEvents(void) {
 				// fall through
             default:
                 // Check for mode specific event
-                DarwinModeProcessEvent(&xe);
+                QuartzProcessEvent(&xe);
             }
         }
     }
diff --git a/hw/xquartz/darwinEvents.h b/hw/xquartz/darwinEvents.h
new file mode 100644
index 000000000..d6cab2e6c
--- /dev/null
+++ b/hw/xquartz/darwinEvents.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2001-2004 Torrey T. Lyons. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+
+#ifndef _DARWIN_EVENTS_H
+#define _DARWIN_EVENTS_H
+
+Bool DarwinEQInit(DevicePtr pKbd, DevicePtr pPtr);
+void DarwinEQEnqueue(const xEvent *e);
+void DarwinEQPointerPost(xEvent *e);
+void DarwinEQSwitchScreen(ScreenPtr pScreen, Bool fromDIX);
+void DarwinPokeEQ(void);
+void DarwinSendPointerEvents(int ev_type, int ev_button, int pointer_x, int pointer_y);
+void DarwinSendKeyboardEvents(int ev_type, int keycode);
+void DarwinSendScrollEvents(float count, int pointer_x, int pointer_y);
+
+#endif  /* _DARWIN_EVENTS_H */
diff --git a/hw/xquartz/darwinKeyboard.c b/hw/xquartz/darwinKeyboard.c
index 1c83cbce4..f6dcfb34a 100644
--- a/hw/xquartz/darwinKeyboard.c
+++ b/hw/xquartz/darwinKeyboard.c
@@ -73,6 +73,8 @@
 #include <architecture/byte_order.h>  // For the NXSwap*
 #include "darwin.h"
 #include "darwinKeyboard.h"
+#include "quartzKeyboard.h"
+#include "quartzAudio.h"
 
 #ifdef NDEBUG
 #undef NDEBUG
@@ -791,7 +793,7 @@ void DarwinKeyboardInit(DeviceIntPtr pDev) {
     DarwinModeSystemKeymapSeed();
 
     assert( InitKeyboardDeviceStruct( (DevicePtr)pDev, &keySyms,
-                                      keyInfo.modMap, DarwinModeBell,
+                                      keyInfo.modMap, QuartzBell,
                                       DarwinChangeKeyboardControl ));
 }
 
diff --git a/hw/xquartz/quartz.c b/hw/xquartz/quartz.c
index 2483d12d7..7be91ec6d 100644
--- a/hw/xquartz/quartz.c
+++ b/hw/xquartz/quartz.c
@@ -35,6 +35,7 @@
 #include "quartzCommon.h"
 #include "quartz.h"
 #include "darwin.h"
+#include "darwinEvents.h"
 #include "quartzAudio.h"
 #include "pseudoramiX.h"
 #define _APPLEWM_SERVER_
@@ -74,25 +75,25 @@ QuartzModeProcsPtr      quartzProcs = NULL;
 const char             *quartzOpenGLBundle = NULL;
 
 #if defined(RANDR) && !defined(FAKE_RANDR)
-Bool DarwinModeRandRGetInfo (ScreenPtr pScreen, Rotation *rotations) {
+Bool QuartzRandRGetInfo (ScreenPtr pScreen, Rotation *rotations) {
   return FALSE;
 }
 
-Bool DarwinModeRandRSetConfig (ScreenPtr           pScreen,
+Bool QuartzRandRSetConfig (ScreenPtr           pScreen,
 			       Rotation            randr,
 			       int                 rate,
 			       RRScreenSizePtr     pSize) {
   return FALSE;
 }
 
-Bool DarwinModeRandRInit (ScreenPtr pScreen) {
+Bool QuartzRandRInit (ScreenPtr pScreen) {
   rrScrPrivPtr    pScrPriv;
     
   if (!RRScreenInit (pScreen)) return FALSE;
 
   pScrPriv = rrGetScrPriv(pScreen);
-  pScrPriv->rrGetInfo = DarwinModeRandRGetInfo;
-  pScrPriv->rrSetConfig = DarwinModeRandRSetConfig;
+  pScrPriv->rrGetInfo = QuartzRandRGetInfo;
+  pScrPriv->rrSetConfig = QuartzRandRSetConfig;
   return TRUE;
 }
 #endif
@@ -106,10 +107,10 @@ Bool DarwinModeRandRInit (ScreenPtr pScreen) {
 */
 
 /*
- * DarwinModeAddScreen
+ * QuartzAddScreen
  *  Do mode dependent initialization of each screen for Quartz.
  */
-Bool DarwinModeAddScreen(
+Bool QuartzAddScreen(
     int index,
     ScreenPtr pScreen)
 {
@@ -125,10 +126,10 @@ Bool DarwinModeAddScreen(
 
 
 /*
- * DarwinModeSetupScreen
+ * QuartzSetupScreen
  *  Finalize mode specific setup of each screen.
  */
-Bool DarwinModeSetupScreen(
+Bool QuartzSetupScreen(
     int index,
     ScreenPtr pScreen)
 {
@@ -145,10 +146,10 @@ Bool DarwinModeSetupScreen(
 
 
 /*
- * DarwinModeInitOutput
+ * QuartzInitOutput
  *  Quartz display initialization.
  */
-void DarwinModeInitOutput(
+void QuartzInitOutput(
     int argc,
     char **argv )
 {
@@ -184,10 +185,10 @@ void DarwinModeInitOutput(
 
 
 /*
- * DarwinModeInitInput
+ * QuartzInitInput
  *  Inform the main thread the X server is ready to handle events.
  */
-void DarwinModeInitInput(
+void QuartzInitInput(
     int argc,
     char **argv )
 {
@@ -279,7 +280,7 @@ static void QuartzUpdateScreens(void)
     pScreen->height = height;
     
 #ifndef FAKE_RANDR
-    if(!DarwinModeRandRInit(pScreen))
+    if(!QuartzRandRInit(pScreen))
       FatalError("Failed to init RandR extension.\n");
 #endif
 
@@ -412,10 +413,10 @@ QuartzMessageServerThread(
 
 
 /*
- * DarwinModeProcessEvent
+ * QuartzProcessEvent
  *  Process Quartz specific events.
  */
-void DarwinModeProcessEvent(
+void QuartzProcessEvent(
     xEvent *xe)
 {
     switch (xe->u.u.type) {
@@ -516,11 +517,11 @@ void DarwinModeProcessEvent(
 
 
 /*
- * DarwinModeGiveUp
+ * QuartzGiveUp
  *  Cleanup before X server shutdown
  *  Release the screen and restore the Aqua cursor.
  */
-void DarwinModeGiveUp(void)
+void QuartzGiveUp(void)
 {
 #if 0
 // Trying to switch cursors when quitting causes deadlock
diff --git a/hw/xquartz/quartz.h b/hw/xquartz/quartz.h
index e74a1082b..fbe308a92 100644
--- a/hw/xquartz/quartz.h
+++ b/hw/xquartz/quartz.h
@@ -124,4 +124,11 @@ typedef struct _QuartzModeProcs {
 extern QuartzModeProcsPtr quartzProcs;
 extern int quartzHasRoot, quartzEnableRootless;
 
+Bool QuartzAddScreen(int index, ScreenPtr pScreen);
+Bool QuartzSetupScreen(int index, ScreenPtr pScreen);
+void QuartzInitOutput(int argc,char **argv);
+void QuartzInitInput(int argc, char **argv);
+void QuartzGiveUp(void);
+void QuartzProcessEvent(xEvent *xe);
+
 #endif
diff --git a/hw/xquartz/quartzAudio.c b/hw/xquartz/quartzAudio.c
index 1eb099ba6..86bb20015 100644
--- a/hw/xquartz/quartzAudio.c
+++ b/hw/xquartz/quartzAudio.c
@@ -246,10 +246,10 @@ static void QuartzCoreAudioBell(
 
 
 /*
- * DarwinModeBell
+ * QuartzBell
  *  Ring the bell
  */
-void DarwinModeBell(
+void QuartzBell(
     int volume,             // volume in percent of max
     DeviceIntPtr pDevice,
     pointer ctrl,
diff --git a/hw/xquartz/quartzKeyboard.h b/hw/xquartz/quartzKeyboard.h
index f27fcdeac..c5f22bf14 100644
--- a/hw/xquartz/quartzKeyboard.h
+++ b/hw/xquartz/quartzKeyboard.h
@@ -36,6 +36,7 @@
 // unshifted, shifted, modeswitch unshifted, modeswitch shifted
 #define GLYPHS_PER_KEY  4
 #define NUM_KEYCODES    248	// NX_NUMKEYCODES might be better
+#define MIN_KEYCODE     XkbMinLegalKeyCode     // unfortunately, this isn't 0...
 #define MAX_KEYCODE     NUM_KEYCODES + MIN_KEYCODE - 1
 
 typedef struct darwinKeyboardInfo_struct {
diff --git a/hw/xquartz/xpr/xprCursor.c b/hw/xquartz/xpr/xprCursor.c
index db195a8ec..dc7a73eab 100644
--- a/hw/xquartz/xpr/xprCursor.c
+++ b/hw/xquartz/xpr/xprCursor.c
@@ -36,6 +36,7 @@
 #include "quartzCommon.h"
 #include "xpr.h"
 #include "darwin.h"
+#include "darwinEvents.h"
 #include "Xplugin.h"
 
 #include "mi.h"

From c238ef06a270c0c1d48cdb9175b6d5815c7c2a49 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Wed, 5 Dec 2007 21:36:34 -0800
Subject: [PATCH 278/552] Darwin: Dead coded removal Kill off assert macro
 (cherry picked from commit d6493abedb2caf03b2bc3a6440b637df67eff081)

---
 hw/xquartz/darwin.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/hw/xquartz/darwin.h b/hw/xquartz/darwin.h
index a332229be..f835ae01e 100644
--- a/hw/xquartz/darwin.h
+++ b/hw/xquartz/darwin.h
@@ -52,12 +52,6 @@ int DarwinParseModifierList(const char *constmodifiers);
 void DarwinAdjustScreenOrigins(ScreenInfo *pScreenInfo);
 void xf86SetRootClip (ScreenPtr pScreen, BOOL enable);
 
-#undef assert
-#define assert(x) { if ((x) == 0) \
-    FatalError("assert failed on line %d of %s!\n", __LINE__, __FILE__); }
-#define kern_assert(x) { if ((x) != KERN_SUCCESS) \
-    FatalError("assert failed on line %d of %s with kernel return 0x%x!\n", \
-                __LINE__, __FILE__, x); }
 #define SCREEN_PRIV(pScreen) \
     ((DarwinFramebufferPtr)pScreen->devPrivates[darwinScreenIndex].ptr)
 

From 56f5066d477836a975122f4e5748c0f4fb790175 Mon Sep 17 00:00:00 2001
From: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu, 6 Dec 2007 20:51:32 -0800
Subject: [PATCH 279/552] ALLOCATE_LOCAL is dangerous on Darwin due to memory
 layout differences from Linux, so let's define NO_ALLOCA. (cherry picked from
 commit 7caf51d1a5a86ae884e0087795636222c082962c)

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 5bc3d8032..13fe51a52 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1705,7 +1705,7 @@ if test "x$XQUARTZ" = xyes; then
 	       AC_SUBST([DARWIN_LIBS])
                AC_CHECK_LIB([Xplugin],[xp_init],[:])
                AC_SUBST([APPLE_APPLICATIONS_DIR])
-               CFLAGS="${CFLAGS} -D__DARWIN__ -DROOTLESS_WORKAROUND"
+               CFLAGS="${CFLAGS} -D__DARWIN__ -DROOTLESS_WORKAROUND -DNO_ALLOCA"
                PLIST_VERSION_STRING=$PACKAGE_VERSION
                AC_SUBST([PLIST_VERSION_STRING])
                PLIST_VENDOR_WEB=$VENDOR_WEB

From 67907904f094c803d5faf6fa2ce23c01f9a5a521 Mon Sep 17 00:00:00 2001
From: Ben Byer <bbyer@bbyer.local>
Date: Fri, 7 Dec 2007 01:51:53 -0800
Subject: [PATCH 280/552] fixed pathname in GL/apple/Makefile.am (cherry picked
 from commit b6357cec6d837226009c0d2b69026027da36656e)

---
 GL/apple/Makefile.am | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/GL/apple/Makefile.am b/GL/apple/Makefile.am
index d3c05ccc7..33ad15714 100644
--- a/GL/apple/Makefile.am
+++ b/GL/apple/Makefile.am
@@ -4,8 +4,8 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/GL/glx \
 	-I$(top_srcdir)/GL/include \
 	-I$(top_srcdir)/GL/mesa/glapi \
-	-I$(top_srcdir)/hw/darwin/quartz \
-	-I$(top_srcdir)/hw/darwin/quartz/cr \
+	-I$(top_srcdir)/hw/xquartz \
+	-I$(top_srcdir)/hw/xquartz/xpr \
 	-I$(top_srcdir)/miext/damage
 
 if HAVE_AGL_FRAMEWORK
@@ -17,3 +17,8 @@ libAGLcore_a_SOURCES = aglGlx.c \
 		       $(top_srcdir)/hw/darwin/quartz/xpr/x-hash.h \
 		       $(top_srcdir)/hw/dmx/glxProxy/compsize.c
 endif
+
+#noinst_LIBRARIES = libCGLcore.a 
+#libCGLcore_a_SOURCES = \
+#	indirect.c \
+#	$(top_srcdir)/hw/dmx/glxProxy/compsize.c

From 4fc288a13f825db942c9dcd64f4abd0265652faf Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri, 7 Dec 2007 17:28:37 -0800
Subject: [PATCH 281/552] Check for <sys/sdt.h> as well when determining to
 enable dtrace probes

Avoids auto-detecting dtrace is present on systems with the ISDN trace tool
named dtrace installed, but not the dynamic tracing facility named dtrace
---
 configure.ac | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/configure.ac b/configure.ac
index 13fe51a52..d30d3c402 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,6 +66,8 @@ AC_SYS_LARGEFILE
 XORG_PROG_RAWCPP
 
 dnl Check for dtrace program (needed to build Xserver dtrace probes)
+dnl Also checks for <sys/sdt.h>, since some Linux distros have an 
+dnl ISDN trace program named dtrace
 AC_ARG_WITH(dtrace, AS_HELP_STRING([--with-dtrace=PATH],
 	     [Enable dtrace probes (default: enabled if dtrace found)]),
 	     [WDTRACE=$withval], [WDTRACE=auto])
@@ -82,6 +84,11 @@ if test "x$WDTRACE" = "xyes" -o "x$WDTRACE" = "xauto" ; then
 			AC_MSG_FAILURE([dtrace requested but not found])
 		fi
 		WDTRACE="no"
+	else
+		AC_CHECK_HEADER(sys/sdt.h, [HAS_SDT_H="yes"], [HAS_SDT_H="no"])
+		if test "x$WDTRACE" = "xauto" -a "x$HAS_SDT_H" = "xno" ; then
+			WDTRACE="no"
+		fi
 	fi
 fi
 if test "x$WDTRACE" != "xno" ; then

From 85ed0bb44011312dfaa9f2dc31642a0f89ec0bd3 Mon Sep 17 00:00:00 2001
From: Brice Goglin <bgoglin@debian.org>
Date: Sat, 8 Dec 2007 02:53:27 +0100
Subject: [PATCH 282/552] Add a missing linebreak after LoadModule: "foo"

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=454742
---
 hw/xfree86/loader/loadmod.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c
index 1b5c717fd..584cabfd1 100644
--- a/hw/xfree86/loader/loadmod.c
+++ b/hw/xfree86/loader/loadmod.c
@@ -859,7 +859,7 @@ doLoadModule(const char *module, const char *path, const char **subdirlist,
     char *m = NULL;
     const char **cim;
 
-    xf86MsgVerb(X_INFO, 3, "LoadModule: \"%s\"", module);
+    xf86MsgVerb(X_INFO, 3, "LoadModule: \"%s\"\n", module);
 
     for (cim = compiled_in_modules; *cim; cim++)
 	if (!strcmp (module, *cim))

From 0ad1c359c5b0be63748f5c630c97be88a8cc92ce Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@dhcp-38-248.EECS.Berkeley.EDU>
Date: Fri, 7 Dec 2007 18:54:58 -0800
Subject: [PATCH 283/552] Darwin: Use __APPLE__ instead of __DARWIN__ (cherry
 picked from commit 54654815fa5e59b25cfd1fa72610120b72c10175)

---
 GL/glx/glxscreens.c             | 2 +-
 configure.ac                    | 2 +-
 hw/Makefile.am                  | 4 ++--
 hw/vfb/InitOutput.c             | 2 +-
 hw/xnest/Init.c                 | 2 +-
 hw/xprint/attributes.c          | 2 +-
 hw/xprint/ddxInit.c             | 2 +-
 include/cursor.h                | 2 +-
 include/dixfont.h               | 2 +-
 include/resource.h              | 2 +-
 include/window.h                | 4 ++--
 miext/rootless/rootlessConfig.h | 4 ++--
 12 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/GL/glx/glxscreens.c b/GL/glx/glxscreens.c
index d6002532d..d57b3a912 100644
--- a/GL/glx/glxscreens.c
+++ b/GL/glx/glxscreens.c
@@ -174,7 +174,7 @@ static char GLXServerExtensions[] =
                         "GLX_EXT_texture_from_pixmap "
 			"GLX_OML_swap_method "
 			"GLX_SGI_make_current_read "
-#ifndef __DARWIN__
+#ifndef __APPLE__
 			"GLX_SGIS_multisample "
                         "GLX_SGIX_hyperpipe "
                         "GLX_SGIX_swap_barrier "
diff --git a/configure.ac b/configure.ac
index d30d3c402..5a507afbe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1712,7 +1712,7 @@ if test "x$XQUARTZ" = xyes; then
 	       AC_SUBST([DARWIN_LIBS])
                AC_CHECK_LIB([Xplugin],[xp_init],[:])
                AC_SUBST([APPLE_APPLICATIONS_DIR])
-               CFLAGS="${CFLAGS} -D__DARWIN__ -DROOTLESS_WORKAROUND -DNO_ALLOCA"
+               CFLAGS="${CFLAGS} -DROOTLESS_WORKAROUND -DNO_ALLOCA"
                PLIST_VERSION_STRING=$PACKAGE_VERSION
                AC_SUBST([PLIST_VERSION_STRING])
                PLIST_VENDOR_WEB=$VENDOR_WEB
diff --git a/hw/Makefile.am b/hw/Makefile.am
index abdeabb01..c2b9571b9 100644
--- a/hw/Makefile.am
+++ b/hw/Makefile.am
@@ -38,11 +38,11 @@ SUBDIRS =			\
 	$(XORG_SUBDIRS)		\
 	$(XGL_SUBDIRS)		\
 	$(XWIN_SUBDIRS)		\
-	$(XQUARTZ_SUBDIRS)	\
 	$(XVFB_SUBDIRS)		\
 	$(XNEST_SUBDIRS)	\
-	$(DMX_SUBDIRS)          \
+	$(DMX_SUBDIRS)		\
 	$(KDRIVE_SUBDIRS)	\
+	$(XQUARTZ_SUBDIRS)	\
 	$(XPRINT_SUBDIRS)
 
 DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xgl xprint
diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
index 0d4ca57fe..a00f7a5bb 100644
--- a/hw/vfb/InitOutput.c
+++ b/hw/vfb/InitOutput.c
@@ -220,7 +220,7 @@ AbortDDX()
     ddxGiveUp();
 }
 
-#ifdef __DARWIN__
+#ifdef __APPLE__
 void
 DarwinHandleGUI(int argc, char *argv[])
 {
diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c
index 4699111b9..d1fd75732 100644
--- a/hw/xnest/Init.c
+++ b/hw/xnest/Init.c
@@ -124,7 +124,7 @@ void ddxGiveUp()
   AbortDDX();
 }
 
-#ifdef __DARWIN__
+#ifdef __APPLE__
 void
 DarwinHandleGUI(int argc, char *argv[])
 {
diff --git a/hw/xprint/attributes.c b/hw/xprint/attributes.c
index d8ee5adf8..4c6ad46a9 100644
--- a/hw/xprint/attributes.c
+++ b/hw/xprint/attributes.c
@@ -1378,7 +1378,7 @@ ReplaceAllKeywords(
     defined(ISC) || \
     defined(Lynx) || \
     defined(__QNX__) || \
-    defined(__DARWIN__)
+    defined(__APPLE__)
 #define iswspace(c) (isascii(c) && isspace(toascii(c)))
 #endif
 
diff --git a/hw/xprint/ddxInit.c b/hw/xprint/ddxInit.c
index 1e7652e60..d744121aa 100644
--- a/hw/xprint/ddxInit.c
+++ b/hw/xprint/ddxInit.c
@@ -205,7 +205,7 @@ ProcessInputEvents(void)
 {
 }
 
-#ifdef __DARWIN__
+#ifdef __APPLE__
 #include "micmap.h"
 
 void GlxExtensionInit(void);
diff --git a/include/cursor.h b/include/cursor.h
index bdf4fd301..dc0810cd1 100644
--- a/include/cursor.h
+++ b/include/cursor.h
@@ -70,7 +70,7 @@ extern int FreeCursor(
 
 /* Quartz support on Mac OS X pulls in the QuickDraw
    framework whose AllocCursor function conflicts here. */ 
-#ifdef __DARWIN__
+#ifdef __APPLE__
 #define AllocCursor Darwin_X_AllocCursor
 #endif
 extern CursorPtr AllocCursor(
diff --git a/include/dixfont.h b/include/dixfont.h
index 709da6272..d6d13b40a 100644
--- a/include/dixfont.h
+++ b/include/dixfont.h
@@ -118,7 +118,7 @@ extern void DeleteClientFontStuff(ClientPtr /*client*/);
 
 /* Quartz support on Mac OS X pulls in the QuickDraw
    framework whose InitFonts function conflicts here. */
-#ifdef __DARWIN__
+#ifdef __APPLE__
 #define InitFonts Darwin_X_InitFonts
 #endif
 extern void InitFonts(void);
diff --git a/include/resource.h b/include/resource.h
index 3231e8cd9..6c0d5dc7f 100644
--- a/include/resource.h
+++ b/include/resource.h
@@ -153,7 +153,7 @@ extern XID FakeClientID(
 
 /* Quartz support on Mac OS X uses the CarbonCore
    framework whose AddResource function conflicts here. */
-#ifdef __DARWIN__
+#ifdef __APPLE__
 #define AddResource Darwin_X_AddResource
 #endif
 extern Bool AddResource(
diff --git a/include/window.h b/include/window.h
index 312b75e88..58e2c49b5 100644
--- a/include/window.h
+++ b/include/window.h
@@ -125,7 +125,7 @@ extern void DestroySubwindows(
 
 /* Quartz support on Mac OS X uses the HIToolbox
    framework whose ChangeWindowAttributes function conflicts here. */
-#ifdef __DARWIN__
+#ifdef __APPLE__
 #define ChangeWindowAttributes Darwin_X_ChangeWindowAttributes
 #endif
 extern int ChangeWindowAttributes(
@@ -136,7 +136,7 @@ extern int ChangeWindowAttributes(
 
 /* Quartz support on Mac OS X uses the HIToolbox
    framework whose GetWindowAttributes function conflicts here. */
-#ifdef __DARWIN__
+#ifdef __APPLE__
 #define GetWindowAttributes(w,c,x) Darwin_X_GetWindowAttributes(w,c,x)
 extern void Darwin_X_GetWindowAttributes(
 #else
diff --git a/miext/rootless/rootlessConfig.h b/miext/rootless/rootlessConfig.h
index 3e326bf06..ab0187e83 100644
--- a/miext/rootless/rootlessConfig.h
+++ b/miext/rootless/rootlessConfig.h
@@ -34,7 +34,7 @@
 #ifndef _ROOTLESSCONFIG_H
 #define _ROOTLESSCONFIG_H
 
-#ifdef __DARWIN__
+#ifdef __APPLE__
 
 # define ROOTLESS_ACCEL TRUE
 # define ROOTLESS_GLOBAL_COORDS TRUE
@@ -48,7 +48,7 @@
    alpha for 16bpp. */
 # define RootlessAlphaMask(bpp) ((bpp) == 32 ? 0xFF000000 : 0)
 
-#endif /* __DARWIN__ */
+#endif /* __APPLE__ */
 
 #if defined(__CYGWIN__) || defined(WIN32)
 

From 1157cfcc5a4e2a7299a4c48df04a1cc8d5093906 Mon Sep 17 00:00:00 2001
From: Ben Byer <bbyer@bbyer.local>
Date: Fri, 7 Dec 2007 21:55:42 -0800
Subject: [PATCH 284/552] Just a couple of small uninitialized pointer fixes
 (cherry picked from commit d12b650362da100ceaecb7e859cd4ef1908d4407)

---
 miext/rootless/rootlessScreen.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/miext/rootless/rootlessScreen.c b/miext/rootless/rootlessScreen.c
index 538b698c8..19dba6e5e 100644
--- a/miext/rootless/rootlessScreen.c
+++ b/miext/rootless/rootlessScreen.c
@@ -722,6 +722,8 @@ Bool RootlessInit(ScreenPtr pScreen, RootlessFrameProcsPtr procs)
         pScreen->devPrivates[rootlessScreenPrivateIndex].ptr;
 
     s->imp = procs;
+    s->colormap = NULL;
+    s->redisplay_expired = FALSE;
 
     RootlessWrap(pScreen);
 

From a1b0346853720e98963910b82603c5cda72bb7f9 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Fri, 7 Dec 2007 23:26:11 -0800
Subject: [PATCH 285/552] XQuartz: Cleaned up configure, X11.app path in
 launchd script Don't hardcode X11.app's path in the launchd plist. Only
 install the launchd plist if we --enable-launchd. (cherry picked from commit
 6b74c535dc331d1d621b2541492a3336f69d70a2)

---
 configure.ac                                  | 130 +++++++++---------
 hw/xquartz/bundle/Makefile.am                 |   2 +
 hw/xquartz/bundle/bundle-main.c               |   2 +-
 .../{org.x.X11.plist => org.x.X11.plist.in}   |   6 +-
 4 files changed, 69 insertions(+), 71 deletions(-)
 rename hw/xquartz/bundle/{org.x.X11.plist => org.x.X11.plist.in} (74%)

diff --git a/configure.ac b/configure.ac
index 5a507afbe..b56c11583 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1694,75 +1694,43 @@ fi
 if test "x$XQUARTZ" = xyes; then
 	AC_DEFINE([XQUARTZ],[1],[Have Quartz])
 
-#	       glxAGL / glxCGL don't work yet
-#               AC_CACHE_CHECK([for AGL framework],xorg_cv_AGL_framework,[
-#               save_LDFLAGS=$LDFLAGS
-#               LDFLAGS="$LDFLAGS -framework AGL"
-#               AC_LINK_IFELSE([char aglEnable();
-#int main() {
-#aglEnable();
-#return 0;}
-#               ],[xorg_cv_AGL_framework=yes],
-#               [xorg_cv_AGL_framework=no])
-#               LDFLAGS=$save_LDFLAGS
-#               ])
-               xorg_cv_AGL_framework=no
-               DARWIN_GLX_LIBS='$(top_builddir)/GL/apple/indirect.o $(top_builddir)/GL/glx/libglx.la'
-	       DARWIN_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB"
-	       AC_SUBST([DARWIN_LIBS])
-               AC_CHECK_LIB([Xplugin],[xp_init],[:])
-               AC_SUBST([APPLE_APPLICATIONS_DIR])
-               CFLAGS="${CFLAGS} -DROOTLESS_WORKAROUND -DNO_ALLOCA"
-               PLIST_VERSION_STRING=$PACKAGE_VERSION
-               AC_SUBST([PLIST_VERSION_STRING])
-               PLIST_VENDOR_WEB=$VENDOR_WEB
-               AC_SUBST([PLIST_VENDOR_WEB])
-               if test "x$XF86MISC" = xyes || test "x$XF86MISC" = xauto; then
-                       AC_MSG_NOTICE([Disabling XF86Misc extension])
-                       XF86MISC=no
-               fi
-               if test "x$XF86VIDMODE" = xyes || test "x$XF86VIDMODE" = xauto; then
-                       AC_MSG_NOTICE([Disabling XF86VidMode extension])
-                       XF86VIDMODE=no
-               fi
-               if test "x$XF86BIGFONT" = xyes || test "x$XF86BIGFONT" = xauto; then
-                       AC_MSG_NOTICE([Disabling XF86BigFont extension])
-                       XF86BIGFONT=no
-               fi
-               if test "x$DGA" = xyes || test "x$DGA" = xauto; then
-                       AC_MSG_NOTICE([Disabling DGA extension])
-                       DGA=no
-               fi
-               if test "x$DMX" = xyes || test "x$DMX" = xauto; then
-                       AC_MSG_NOTICE([Disabling DMX DDX])
-                       DMX=no
-               fi
-fi
-
-if test "x$X11APP" = xauto; then
-	AC_MSG_CHECKING([whether to build X11.app])
-	if test "x$XQUARTZ" = xyes ; then
-		X11APP=yes
-	else
-		X11APP=no
+#glxAGL / glxCGL don't work yet
+#	AC_CACHE_CHECK([for AGL framework],xorg_cv_AGL_framework,[
+#		save_LDFLAGS=$LDFLAGS
+#		LDFLAGS="$LDFLAGS -framework AGL"
+#		AC_LINK_IFELSE(
+#			[char aglEnable(); int main() { aglEnable(); return 0;}],
+#			[xorg_cv_AGL_framework=yes],
+#			[xorg_cv_AGL_framework=no])
+#		LDFLAGS=$save_LDFLAGS
+#	])
+	xorg_cv_AGL_framework=no
+	DARWIN_GLX_LIBS='$(top_builddir)/GL/apple/indirect.o $(top_builddir)/GL/glx/libglx.la'
+	DARWIN_LIBS="$MI_LIB $OS_LIB $DIX_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB"
+	AC_SUBST([DARWIN_LIBS])
+	AC_CHECK_LIB([Xplugin],[xp_init],[:])
+	AC_SUBST([APPLE_APPLICATIONS_DIR])
+	CFLAGS="${CFLAGS} -DROOTLESS_WORKAROUND -DNO_ALLOCA"
+	if test "x$XF86MISC" = xyes || test "x$XF86MISC" = xauto; then
+		AC_MSG_NOTICE([Disabling XF86Misc extension])
+		XF86MISC=no
 	fi
-	AC_MSG_RESULT([$X11APP])
-fi
-
-if test "x$LAUNCHD" = xauto; then
-	# Do we want to have this default to on for Xquartz builds only or any time we have launchd (like Xnest or Xvfb on OS-X)
-	#AC_CHECK_PROG(LAUNCHD, [launchd], [yes], [no])
-	AC_MSG_CHECKING([whether to support launchd])
-	if test "x$XQUARTZ" = xyes ; then
-		LAUNCHD=yes
-	else
-		LAUNCHD=no
+	if test "x$XF86VIDMODE" = xyes || test "x$XF86VIDMODE" = xauto; then
+		AC_MSG_NOTICE([Disabling XF86VidMode extension])
+		XF86VIDMODE=no
+	fi
+	if test "x$XF86BIGFONT" = xyes || test "x$XF86BIGFONT" = xauto; then
+		AC_MSG_NOTICE([Disabling XF86BigFont extension])
+		XF86BIGFONT=no
+	fi
+	if test "x$DGA" = xyes || test "x$DGA" = xauto; then
+		AC_MSG_NOTICE([Disabling DGA extension])
+		DGA=no
+	fi
+	if test "x$DMX" = xyes || test "x$DMX" = xauto; then
+		AC_MSG_NOTICE([Disabling DMX DDX])
+		DMX=no
 	fi
-	AC_MSG_RESULT([$LAUNCHD])
-fi
-
-if test "x$LAUNCHD" = xyes ; then
-	AC_DEFINE(HAVE_LAUNCHD, 1, [launchd support available])
 fi
 
 # Support for objc in autotools is minimal and not documented.
@@ -1779,8 +1747,31 @@ _AM_DEPENDENCIES([OBJC])
 AM_CONDITIONAL(HAVE_XPLUGIN, [test "x$ac_cv_lib_Xplugin_xp_init" = xyes])
 AM_CONDITIONAL(HAVE_AGL_FRAMEWORK, [test "x$xorg_cv_AGL_framework" = xyes])
 AM_CONDITIONAL(XQUARTZ, [test "x$XQUARTZ" = xyes])
+
+if test "x$X11APP" = xauto; then
+	AC_MSG_CHECKING([whether to build X11.app])
+	if test "x$XQUARTZ" = xyes ; then
+		X11APP=yes
+	else
+		X11APP=no
+	fi
+	AC_MSG_RESULT([$X11APP])
+fi
 AM_CONDITIONAL(X11APP,[test "X$X11APP" = Xyes]) 
 
+if test "x$LAUNCHD" = xauto; then
+	# Do we want to have this default to on for Xquartz builds only or any time we have launchd (like Xnest or Xvfb on OS-X)
+	#AC_CHECK_PROG(LAUNCHD, [launchd], [yes], [no])
+	AC_MSG_CHECKING([whether to support launchd])
+	if test "x$XQUARTZ" = xyes ; then
+		LAUNCHD=yes
+	else
+		LAUNCHD=no
+	fi
+	AC_MSG_RESULT([$LAUNCHD])
+fi
+AM_CONDITIONAL(LAUNCHD, [test "x$LAUNCHD" = xyes])
+
 dnl DMX DDX
 
 AC_MSG_CHECKING([whether to build Xdmx DDX])
@@ -1831,6 +1822,10 @@ dnl Linux sources in DMX require <linux/keyboard.h>
 fi
 AM_CONDITIONAL([DMX_BUILD_LNX], [test "x$DMX_BUILD_LNX" = xyes])
 AM_CONDITIONAL([DMX_BUILD_USB], [test "x$DMX_BUILD_USB" = xyes])
+if test "x$LAUNCHD" = xyes ; then
+	AC_DEFINE(HAVE_LAUNCHD, 1, [launchd support available])
+fi
+AM_CONDITIONAL(LAUNCHD, [test "x$LAUNCHD" = xyes])
 
 dnl kdrive DDX
 
@@ -2179,6 +2174,7 @@ hw/xnest/Makefile
 hw/xwin/Makefile
 hw/xquartz/Makefile
 hw/xquartz/bundle/Makefile
+hw/xquartz/bundle/org.x.X11.plist
 hw/xquartz/xpr/Makefile
 hw/kdrive/Makefile
 hw/kdrive/ati/Makefile
diff --git a/hw/xquartz/bundle/Makefile.am b/hw/xquartz/bundle/Makefile.am
index a6e2dfbf9..e8d5167b7 100644
--- a/hw/xquartz/bundle/Makefile.am
+++ b/hw/xquartz/bundle/Makefile.am
@@ -7,8 +7,10 @@ x11app:
 
 install-data-hook:
 	xcodebuild install DSTROOT="/$(DESTDIR)" INSTALL_PATH="$(APPLE_APPLICATIONS_DIR)" DEPLOYMENT_LOCATION=YES SKIP_INSTALL=NO ARCHS="$(X11APP_ARCHS)"
+if LAUNCHD
 	$(MKDIR_P) "$(DESTDIR)/System/Library/LaunchAgents/"
 	$(INSTALL) org.x.X11.plist "$(DESTDIR)/System/Library/LaunchAgents/"
+endif
 
 clean-local:
 	rm -rf build
diff --git a/hw/xquartz/bundle/bundle-main.c b/hw/xquartz/bundle/bundle-main.c
index c436d51bb..6f9744c2e 100644
--- a/hw/xquartz/bundle/bundle-main.c
+++ b/hw/xquartz/bundle/bundle-main.c
@@ -46,7 +46,7 @@ int main(int argc, char **argv) {
     }
     
     /* First check if launchd started us */
-    if(argc == 2 && !strncmp(argv[1], "--launchd", 9)) {
+    if(argc == 2 && !strncmp(argv[1], "-launchd", 8)) {
         argc--;
         argv[1] = argv[0];
         argv++;
diff --git a/hw/xquartz/bundle/org.x.X11.plist b/hw/xquartz/bundle/org.x.X11.plist.in
similarity index 74%
rename from hw/xquartz/bundle/org.x.X11.plist
rename to hw/xquartz/bundle/org.x.X11.plist.in
index 6c6be91ab..36849cf60 100644
--- a/hw/xquartz/bundle/org.x.X11.plist
+++ b/hw/xquartz/bundle/org.x.X11.plist.in
@@ -5,11 +5,11 @@
 	<key>Label</key>
 		<string>org.x.X11</string>
 	<key>Program</key>
-		<string>/Applications/Utilities/X11.app/Contents/MacOS/X11</string>
+		<string>@APPLE_APPLICATIONS_DIR@/X11.app/Contents/MacOS/X11</string>
 	<key>ProgramArguments</key>
 		<array>
-		<string>/Applications/Utilities/X11.app/Contents/MacOS/X11</string>
-		<string>--launchd</string>
+		<string>@APPLE_APPLICATIONS_DIR@/X11.app/Contents/MacOS/X11</string>
+		<string>-launchd</string>
 		</array>
 	<key>Sockets</key>
 		<dict>

From 41a0aeaae9b7b2f8cc2468fd1f3ee11287d34828 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sat, 8 Dec 2007 00:13:47 -0800
Subject: [PATCH 286/552] XQuartz: Fixed "Multiple Dock Icons" BAM! (cherry
 picked from commit d0dca8a88506f50b51f41f99a2f1feb6954c8a31) (cherry picked
 from commit 0502955a2af487b51bf22916ac02e497c2d96aba)

---
 hw/xquartz/Makefile.am          |  2 ++
 hw/xquartz/bundle/Info.plist    | 34 ++++++++++++++++++---------------
 hw/xquartz/bundle/bundle-main.c | 34 ++++++++++++---------------------
 hw/xquartz/darwin.c             |  5 +++++
 hw/xquartz/quartzStartup.c      |  3 +++
 5 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/hw/xquartz/Makefile.am b/hw/xquartz/Makefile.am
index 725d20f6c..5814eb79f 100644
--- a/hw/xquartz/Makefile.am
+++ b/hw/xquartz/Makefile.am
@@ -29,6 +29,7 @@ libXquartz_la_SOURCES = \
 	quartz.c \
 	quartzAudio.c \
 	quartzCocoa.m \
+	quartzForeground.c \
 	quartzKeyboard.c \
 	quartzPasteboard.c \
 	quartzStartup.c
@@ -46,5 +47,6 @@ EXTRA_DIST = \
 	quartzCommon.h \
 	quartzCursor.c \
 	quartzCursor.h \
+	quartzForeground.h \
 	quartz.h \
 	quartzPasteboard.h
diff --git a/hw/xquartz/bundle/Info.plist b/hw/xquartz/bundle/Info.plist
index 66f1f6be1..fce8c964d 100644
--- a/hw/xquartz/bundle/Info.plist
+++ b/hw/xquartz/bundle/Info.plist
@@ -3,33 +3,37 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
+		<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>X11</string>
+		<string>X11</string>
 	<key>CFBundleGetInfoString</key>
-	<string>X11</string>
+		<string>X11</string>
 	<key>CFBundleIconFile</key>
-	<string>X11.icns</string>
+		<string>X11.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.x.X11</string>
+		<string>org.x.X11</string>
 	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
+		<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>X11</string>
+		<string>X11</string>
 	<key>CFBundlePackageType</key>
-	<string>APPL</string>
+		<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0</string>
+		<string>2.2.0</string>
 	<key>CFBundleSignature</key>
-	<string>x11a</string>
+		<string>x11a</string>
 	<key>CSResourcesFileMapped</key>
-	<true/>
+		<true/>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2003-2007, Apple Inc.
-Copyright © 2003, XFree86 Project, Inc.</string>
+		<string>Copyright © 2003-2007, Apple Inc.
+Copyright © 2003, XFree86 Project, Inc.
+Copyright © 2003-2007, X.org Project, Inc.
+</string>
 	<key>NSMainNibFile</key>
-	<string>main</string>
+		<string>main</string>
 	<key>NSPrincipalClass</key>
-	<string>X11Application</string>
+		<string>X11Application</string>
+	<key>LSBackgroundOnly</key>
+		<true/>
 </dict>
 </plist>
diff --git a/hw/xquartz/bundle/bundle-main.c b/hw/xquartz/bundle/bundle-main.c
index 6f9744c2e..53f60a3e2 100644
--- a/hw/xquartz/bundle/bundle-main.c
+++ b/hw/xquartz/bundle/bundle-main.c
@@ -38,22 +38,13 @@ int server_main(int argc, char **argv);
 
 int main(int argc, char **argv) {
     Display *display;
-  
-    fprintf(stderr, "X11.app: main(): argc=%d\n", argc);
-    int i;
-    for(i=0; i < argc; i++) {
-        fprintf(stderr, "\targv[%d] = %s\n", i, argv[i]);
-    }
-    
-    /* First check if launchd started us */
-    if(argc == 2 && !strncmp(argv[1], "-launchd", 8)) {
-        argc--;
-        argv[1] = argv[0];
-        argv++;
-        fprintf(stderr, "X11.app: main(): launchd called us, running server_main()");
-        return server_main(argc, argv);
-    }
 
+    //size_t i;
+    //fprintf(stderr, "X11.app: main(): argc=%d\n", argc);
+    //for(i=0; i < argc; i++) {
+    //    fprintf(stderr, "\targv[%u] = %s\n", (unsigned)i, argv[i]);
+    //}
+    
     /* If we have a process serial number and it's our only arg, act as if
      * the user double clicked the app bundle: launch app_to_run if possible
      */
@@ -64,19 +55,18 @@ int main(int argc, char **argv) {
             fprintf(stderr, "X11.app: main(): closing the display");
             /* Could open the display, start the launcher */
             XCloseDisplay(display);
-
+            
             /* Give 2 seconds for the server to start... 
              * TODO: *Really* fix this race condition
              */
             usleep(2000);
-            fprintf(stderr, "X11.app: main(): running launcher_main()");
+            //fprintf(stderr, "X11.app: main(): running launcher_main()");
             return launcher_main(argc, argv);
         }
     }
-
-    /* Couldn't open the display or we were called with arguments,
-     * just want to start a server.
-     */
-    fprintf(stderr, "X11.app: main(): running server_main()");
+    
+    /* Start the server */
+    //fprintf(stderr, "X11.app: main(): running server_main()");
     return server_main(argc, argv);
 }
+
diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index e091f25ba..299d9838d 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -707,6 +707,11 @@ void ddxInitGlobals(void)
  */
 int ddxProcessArgument( int argc, char *argv[], int i )
 {
+    if( !strcmp( argv[i], "-launchd" ) ) {
+        ErrorF( "Launchd command line argument noticed.\n" );
+        return 1;
+    }
+
     if ( !strcmp( argv[i], "-fullscreen" ) ) {
         ErrorF( "Running full screen in parallel with Mac OS X Quartz window server.\n" );
         return 1;
diff --git a/hw/xquartz/quartzStartup.c b/hw/xquartz/quartzStartup.c
index e20c16b7a..87bcadac8 100644
--- a/hw/xquartz/quartzStartup.c
+++ b/hw/xquartz/quartzStartup.c
@@ -34,6 +34,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <CoreFoundation/CoreFoundation.h>
+#include "quartzForeground.h"
 #include "quartzCommon.h"
 #include "darwin.h"
 #include "quartz.h"
@@ -76,6 +77,8 @@ void DarwinHandleGUI(
     int         i;
     int         fd[2];
 
+    QuartzMoveToForeground();
+    
     if (been_here) {
         return;
     }

From 740cc54f081393d4ffe1a3e91c9e504dfaee3fe9 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sat, 8 Dec 2007 01:24:58 -0800
Subject: [PATCH 287/552] Xquartz: Use org.x.X11 instead of com.apple.X11 for
 preferences Fixed inconsistency so preferences get read from the correct
 source. (cherry picked from commit a74c38bd9f28735acd602d359d7ca6357aed1e93)

---
 hw/xquartz/bundle/server-main.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/hw/xquartz/bundle/server-main.c b/hw/xquartz/bundle/server-main.c
index 26fcbb0ab..205e87c89 100644
--- a/hw/xquartz/bundle/server-main.c
+++ b/hw/xquartz/bundle/server-main.c
@@ -138,8 +138,7 @@ read_boolean_pref (CFStringRef name, int default_)
     int value;
     Boolean ok;
 	
-    value = CFPreferencesGetAppBooleanValue (name,
-											 CFSTR ("com.apple.x11"), &ok);
+    value = CFPreferencesGetAppBooleanValue (name, CFSTR ("org.x.x11"), &ok);
     return ok ? value : default_;
 }
 

From 02df03667052fa6a4e0405b91a005dc48e9b39c4 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sat, 8 Dec 2007 01:28:26 -0800
Subject: [PATCH 288/552] Xquartz: Actually, it should be org.x.X11 for
 case-sensitive FS (cherry picked from commit
 c5ccb98d5d461c8a22fc0f3942a607ac90e1e37e)

---
 hw/xquartz/bundle/server-main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/xquartz/bundle/server-main.c b/hw/xquartz/bundle/server-main.c
index 205e87c89..7e1bd7025 100644
--- a/hw/xquartz/bundle/server-main.c
+++ b/hw/xquartz/bundle/server-main.c
@@ -138,7 +138,7 @@ read_boolean_pref (CFStringRef name, int default_)
     int value;
     Boolean ok;
 	
-    value = CFPreferencesGetAppBooleanValue (name, CFSTR ("org.x.x11"), &ok);
+    value = CFPreferencesGetAppBooleanValue (name, CFSTR ("org.x.X11"), &ok);
     return ok ? value : default_;
 }
 

From 6bb5dacc1710cdbededb9b28ba89a184ecd0931c Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sat, 8 Dec 2007 01:41:37 -0800
Subject: [PATCH 289/552] Xquartz: Actually add quartzForeground.[hc] Sorry for
 the commit spam... I'm tired and was overly quick to commit... forgot to
 include a neccessary file. (cherry picked from commit
 e564b7aeaab63e4c943445275af680b3b5898a94)

---
 hw/xquartz/quartzForeground.c | 45 +++++++++++++++++++++++++++++++++++
 hw/xquartz/quartzForeground.h | 37 ++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+)
 create mode 100644 hw/xquartz/quartzForeground.c
 create mode 100644 hw/xquartz/quartzForeground.h

diff --git a/hw/xquartz/quartzForeground.c b/hw/xquartz/quartzForeground.c
new file mode 100644
index 000000000..bfea642d1
--- /dev/null
+++ b/hw/xquartz/quartzForeground.c
@@ -0,0 +1,45 @@
+/* foreground.c - Push the current process into the foreground.
+
+ This is in a separate file because of Quartz/X type conflicts.
+
+ Copyright (c) 2007 Jeremy Huddleston
+ 
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation files
+ (the "Software"), to deal in the Software without restriction,
+ including without limitation the rights to use, copy, modify, merge,
+ publish, distribute, sublicense, and/or sell copies of the Software,
+ and to permit persons to whom the Software is furnished to do so,
+ subject to the following conditions:
+ 
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT.  IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
+ HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+ 
+ Except as contained in this notice, the name(s) of the above
+ copyright holders shall not be used in advertising or otherwise to
+ promote the sale, use or other dealings in this Software without
+ prior written authorization. */
+
+#include <ApplicationServices/ApplicationServices.h>
+#include <stdio.h>
+
+int QuartzMoveToForeground() {
+   ProcessSerialNumber psn = { 0, kCurrentProcess };
+   OSStatus returnCode = TransformProcessType(& psn, kProcessTransformToForegroundApplication);
+   if( returnCode == 0) {
+       fprintf(stderr, "TransformProcessType: Success\n");
+       SetFrontProcess(&psn);
+   } else {
+       fprintf(stderr, "TransformProcessType: Failure\n");
+   }
+   return (int)returnCode;
+}
diff --git a/hw/xquartz/quartzForeground.h b/hw/xquartz/quartzForeground.h
new file mode 100644
index 000000000..4fc21c72f
--- /dev/null
+++ b/hw/xquartz/quartzForeground.h
@@ -0,0 +1,37 @@
+/* foreground.h - Push the current process into the foreground.
+ 
+ This is in a separate file because of Quartz/X type conflicts.
+ 
+ Copyright (c) 2007 Jeremy Huddleston
+ 
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation files
+ (the "Software"), to deal in the Software without restriction,
+ including without limitation the rights to use, copy, modify, merge,
+ publish, distribute, sublicense, and/or sell copies of the Software,
+ and to permit persons to whom the Software is furnished to do so,
+ subject to the following conditions:
+ 
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT.  IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
+ HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+ 
+ Except as contained in this notice, the name(s) of the above
+ copyright holders shall not be used in advertising or otherwise to
+ promote the sale, use or other dealings in this Software without
+ prior written authorization. */
+
+#ifndef _QUARTZ_FOREGROUND_H_
+#define _QUARTZ_FOREGROUND_H_
+
+int QuartzMoveToForeground();
+
+#endif /* _QUARTZ_FOREGROUND_H_ */

From 5e016fa9b2bf28971ed1794f4706c6538b1d411c Mon Sep 17 00:00:00 2001
From: Ben Byer <bbyer@bbyer.local>
Date: Sat, 8 Dec 2007 06:12:46 -0800
Subject: [PATCH 290/552] Added darwinEvents.h to EXTRA_DIST (cherry picked
 from commit 45e5247564c423a2bf02cfec1993155858c91a14)

---
 hw/xquartz/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/xquartz/Makefile.am b/hw/xquartz/Makefile.am
index 5814eb79f..1876e8611 100644
--- a/hw/xquartz/Makefile.am
+++ b/hw/xquartz/Makefile.am
@@ -40,6 +40,7 @@ EXTRA_DIST = \
 	applewmExt.h \
 	darwinClut8.h \
 	darwin.h \
+	darwinEvents.h \
 	darwinKeyboard.h \
 	keysym2ucs.h \
 	pseudoramiX.h \

From 020b0e92b039d6ddaea0bbdb890b6a01037bf9b6 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sat, 8 Dec 2007 11:49:37 -0800
Subject: [PATCH 291/552] Xquartz Added quartzKeyboard.h to EXTRA_DIST (cherry
 picked from commit 37c9781fdb672229ceab101b080762e15512943f)

---
 hw/xquartz/Makefile.am | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hw/xquartz/Makefile.am b/hw/xquartz/Makefile.am
index 1876e8611..831ba49f4 100644
--- a/hw/xquartz/Makefile.am
+++ b/hw/xquartz/Makefile.am
@@ -44,10 +44,11 @@ EXTRA_DIST = \
 	darwinKeyboard.h \
 	keysym2ucs.h \
 	pseudoramiX.h \
+	quartz.h \
 	quartzAudio.h \
 	quartzCommon.h \
 	quartzCursor.c \
 	quartzCursor.h \
 	quartzForeground.h \
-	quartz.h \
+	quartzKeyboard.h \
 	quartzPasteboard.h

From cd13c4ba5b7a1bdfb419cb492a96a72dccf2681e Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sat, 8 Dec 2007 13:18:17 -0800
Subject: [PATCH 292/552] .gitignore: added hw/xquartz/bundle/org.x.X11.plist

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 2e60d58b1..37f35f46f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -275,6 +275,7 @@ hw/xprint/doc/Xprt.1x
 hw/xprint/doc/Xprt.man
 hw/xprint/dpmsstubs-wrapper.c
 hw/xprint/miinitext-wrapper.c
+hw/xquartz/bundle/org.x.X11.plist
 include/dix-config.h
 include/kdrive-config.h
 include/xgl-config.h

From 7b573ed43672b1fac7b4e6df85a657942ab4cba6 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sun, 9 Dec 2007 12:02:04 -0800
Subject: [PATCH 293/552] Xquartz: Added missing link to libconfig.a (cherry
 picked from commit 14ec1cf1cb7ebc183c05e13f9c2b4b4eed679ff3)

---
 hw/xquartz/xpr/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/xquartz/xpr/Makefile.am b/hw/xquartz/xpr/Makefile.am
index 3cc2aba12..c2419cae6 100644
--- a/hw/xquartz/xpr/Makefile.am
+++ b/hw/xquartz/xpr/Makefile.am
@@ -24,6 +24,7 @@ Xquartz_SOURCES = \
 Xquartz_LDADD = \
 	$(top_builddir)/hw/xquartz/libXquartz.la \
 	$(top_builddir)/dix/dixfonts.lo \
+	$(top_builddir)/config/libconfig.a \
 	$(top_builddir)/dix/libdix.la \
 	$(top_builddir)/os/libos.la \
 	$(top_builddir)/dix/libxpstubs.la \

From 8f2eff643bf421bc4233fbaa2409b75d9f80d147 Mon Sep 17 00:00:00 2001
From: Ben Byer <bbyer@bbyer.local>
Date: Sat, 8 Dec 2007 23:34:40 -0800
Subject: [PATCH 294/552] remove Xplugin.h, because we should use the one in
 /usr/include (cherry picked from commit
 3e881032f35f774ff9638678d7e3f77c81f62976)

---
 hw/xquartz/xpr/Xplugin.h | 589 ---------------------------------------
 1 file changed, 589 deletions(-)
 delete mode 100644 hw/xquartz/xpr/Xplugin.h

diff --git a/hw/xquartz/xpr/Xplugin.h b/hw/xquartz/xpr/Xplugin.h
deleted file mode 100644
index a10b1b8e1..000000000
--- a/hw/xquartz/xpr/Xplugin.h
+++ /dev/null
@@ -1,589 +0,0 @@
-/* Xplugin.h -- windowing API for rootless X11 server
-
-   Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-
-   Permission is hereby granted, free of charge, to any person
-   obtaining a copy of this software and associated documentation files
-   (the "Software"), to deal in the Software without restriction,
-   including without limitation the rights to use, copy, modify, merge,
-   publish, distribute, sublicense, and/or sell copies of the Software,
-   and to permit persons to whom the Software is furnished to do so,
-   subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be
-   included in all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-   NONINFRINGEMENT.  IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
-   HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-   DEALINGS IN THE SOFTWARE.
-
-   Except as contained in this notice, the name(s) of the above
-   copyright holders shall not be used in advertising or otherwise to
-   promote the sale, use or other dealings in this Software without
-   prior written authorization.
-
-   Note that these interfaces are provided solely for the use of the
-   X11 server. Any other uses are unsupported and strongly discouraged. */
-
-#ifndef XPLUGIN_H
-#define XPLUGIN_H 1
-
-#include <stdint.h>
-
-/* By default we use the X server definition of BoxRec to define xp_box,
-   so that the compiler can silently convert between the two. But if
-   XP_NO_X_HEADERS is defined, we'll define it ourselves. */
-
-#ifndef XP_NO_X_HEADERS
-# include "miscstruct.h"
-  typedef BoxRec xp_box;
-#else
-  struct xp_box_struct {
-      short x1, y1, x2, y2;
-  };
-  typedef struct xp_box_struct xp_box;
-#endif
-
-typedef unsigned int xp_resource_id;
-typedef xp_resource_id xp_window_id;
-typedef xp_resource_id xp_surface_id;
-typedef unsigned int xp_client_id;
-typedef unsigned int xp_request_type;
-typedef int xp_error;
-typedef int xp_bool;
-
-
-/* Error codes that the functions declared here may return. They all
-   numerically match their X equivalents, i.e. the XP_ can be dropped
-   if <X11/X.h> has been included. */
-
-enum xp_error_enum {
-    XP_Success			= 0,
-    XP_BadRequest		= 1,
-    XP_BadValue			= 2,
-    XP_BadWindow		= 3,
-    XP_BadMatch			= 8,
-    XP_BadAccess		= 10,
-    XP_BadImplementation	= 17,
-};    
-
-
-/* Event types generated by the plugin. */
-
-enum xp_event_type_enum {
-    /* The global display configuration changed somehow. */
-    XP_EVENT_DISPLAY_CHANGED	= 1 << 0,
-
-    /* A window changed state. Argument is xp_window_state_event */
-    XP_EVENT_WINDOW_STATE_CHANGED = 1 << 1,
-
-    /* An async request encountered an error. Argument is of type
-       xp_async_error_event */
-    XP_EVENT_ASYNC_ERROR	= 1 << 2,
-
-    /* Sent when a surface is destroyed as a side effect of destroying
-       a window. Arg is of type xp_surface_id. */
-    XP_EVENT_SURFACE_DESTROYED	= 1 << 3,
-
-    /* Sent when any GL contexts pointing at the given surface need to
-       call xp_update_gl_context () to refresh their state (because the
-       window moved or was resized. Arg is of type xp_surface_id. */
-    XP_EVENT_SURFACE_CHANGED	= 1 << 4,
-
-    /* Sent when a window has been moved. Arg is of type xp_window_id. */
-    XP_EVENT_WINDOW_MOVED	= 1 << 5,
-};
-
-/* Function type used to receive events. */
-
-typedef void (xp_event_fun) (unsigned int type, const void *arg,
-			     unsigned int arg_size, void *user_data);
-
-
-/* Operation types. Used when reporting errors asynchronously. */
-
-enum xp_request_type_enum {
-    XP_REQUEST_NIL = 0,
-    XP_REQUEST_DESTROY_WINDOW = 1,
-    XP_REQUEST_CONFIGURE_WINDOW = 2,
-    XP_REQUEST_FLUSH_WINDOW = 3,
-    XP_REQUEST_COPY_WINDOW = 4,
-    XP_REQUEST_UNLOCK_WINDOW = 5,
-    XP_REQUEST_DISABLE_UPDATE = 6,
-    XP_REQUEST_REENABLE_UPDATE = 7,
-    XP_REQUEST_HIDE_CURSOR = 8,
-    XP_REQUEST_SHOW_CURSOR = 9,
-    XP_REQUEST_FRAME_DRAW = 10,
-};
-
-/* Structure used to report an error asynchronously. Passed as the "arg"
-   of an XP_EVENT_ASYNC_ERROR event. */
-
-struct xp_async_error_event_struct {
-    xp_request_type request_type;
-    xp_resource_id id;
-    xp_error error;
-};
-
-typedef struct xp_async_error_event_struct xp_async_error_event;
-
-
-/* Possible window states. */
-
-enum xp_window_state_enum {
-    /* The window is not in the global list of possibly-visible windows. */
-    XP_WINDOW_STATE_OFFSCREEN	= 1 << 0,
-
-    /* Parts of the window may be obscured by other windows. */
-    XP_WINDOW_STATE_OBSCURED	= 1 << 1,
-};
-
-/* Structure passed as argument of an XP_EVENT_WINDOW_STATE_CHANGED event. */
-
-struct xp_window_state_event_struct {
-    xp_window_id id;
-    unsigned int state;
-};
-
-typedef struct xp_window_state_event_struct xp_window_state_event;
-
-
-/* Function type used to supply a colormap for indexed drawables. */
-
-typedef xp_error (xp_colormap_fun) (void *data, int first_color,
-				    int n_colors, uint32_t *colors);
-
-
-/* Window attributes structure. Used when creating and configuring windows.
-   Also used when configuring surfaces attached to windows. Functions that
-   take one of these structures also take a bit mask defining which
-   fields are set to meaningful values. */
-
-enum xp_window_changes_enum {
-    XP_ORIGIN			= 1 << 0,
-    XP_SIZE			= 1 << 1,
-    XP_BOUNDS			= XP_ORIGIN | XP_SIZE,
-    XP_SHAPE			= 1 << 2,
-    XP_STACKING			= 1 << 3,
-    XP_DEPTH			= 1 << 4,
-    XP_COLORMAP			= 1 << 5,
-    XP_WINDOW_LEVEL		= 1 << 6,
-};
-
-struct xp_window_changes_struct {
-    /* XP_ORIGIN */
-    int x, y;
-
-    /* XP_SIZE */
-    unsigned int width, height;
-    int bit_gravity;			/* how to resize the backing store */
-
-    /* XP_SHAPE */
-    int shape_nrects;			/* -1 = remove shape */
-    xp_box *shape_rects;
-    int shape_tx, shape_ty;		/* translation for shape */
-
-    /* XP_STACKING */
-    int stack_mode;
-    xp_window_id sibling;		/* may be zero; in ABOVE/BELOW modes
-					   it may specify a relative window */
-    /* XP_DEPTH, window-only */
-    unsigned int depth;
-
-    /* XP_COLORMAP, window-only */
-    xp_colormap_fun *colormap;
-    void *colormap_data;
-
-    /* XP_WINDOW_LEVEL, window-only */
-    int window_level;
-};
-
-typedef struct xp_window_changes_struct xp_window_changes;
-
-/* Values for bit_gravity field */
-
-enum xp_bit_gravity_enum {
-    XP_GRAVITY_NONE		= 0,	/* no gravity, fill everything */
-    XP_GRAVITY_NORTH_WEST	= 1,	/* anchor to top-left corner */
-    XP_GRAVITY_NORTH_EAST	= 2,	/* anchor to top-right corner */
-    XP_GRAVITY_SOUTH_EAST	= 3,	/* anchor to bottom-right corner */
-    XP_GRAVITY_SOUTH_WEST	= 4,	/* anchor to bottom-left corner */
-};
-
-/* Values for stack_mode field */
-
-enum xp_window_stack_mode_enum {
-    XP_UNMAPPED			= 0,	/* remove the window */
-    XP_MAPPED_ABOVE		= 1,	/* display the window on top */
-    XP_MAPPED_BELOW		= 2,	/* display the window at bottom */
-};
-
-/* Data formats for depth field and composite functions */
-
-enum xp_depth_enum {
-    XP_DEPTH_NIL = 0,			/* null source when compositing */
-    XP_DEPTH_ARGB8888,
-    XP_DEPTH_RGB555,
-    XP_DEPTH_A8,			/* for masks when compositing */
-    XP_DEPTH_INDEX8,
-};
-
-/* Options that may be passed to the xp_init () function. */
-
-enum xp_init_options_enum {
-    /* Don't mark that this process can be in the foreground. */
-    XP_IN_BACKGROUND		= 1 << 0,
-
-    /* Deliver background pointer events to this process. */
-    XP_BACKGROUND_EVENTS	= 1 << 1,
-};
-
-
-
-/* Miscellaneous functions */
-
-/* Initialize the plugin library. Only the copy/fill/composite functions
-   may be called without having previously called xp_init () */
-
-extern xp_error xp_init (unsigned int options);
-
-/* Sets the current set of requested notifications to MASK. When any of
-   these arrive, CALLBACK will be invoked with CALLBACK-DATA. Note that
-   calling this function cancels any previously requested notifications
-   that aren't set in MASK. */
-
-extern xp_error xp_select_events (unsigned int mask,
-				  xp_event_fun *callback,
-				  void *callback_data);
-
-/* Waits for all initiated operations to complete. */
-
-extern xp_error xp_synchronize (void);
-
-/* Causes any display update initiated through the plugin libary to be
-   queued until update is reenabled. Note that calls to these functions
-   nest. */
-  
-extern xp_error xp_disable_update (void);
-extern xp_error xp_reenable_update (void);
-
-
-
-/* Cursor functions. */
-
-/* Installs the specified cursor. ARGB-DATA should point to 32-bit
-   premultiplied big-endian ARGB data. The HOT-X,HOT-Y parameters
-   specify the offset to the cursor's hot spot from its top-left
-   corner. */
-
-extern xp_error xp_set_cursor (unsigned int width, unsigned int height,
-			       unsigned int hot_x, unsigned int hot_y,
-			       const uint32_t *argb_data,
-			       unsigned int rowbytes);
-
-/* Hide and show the cursor if it's owned by the current process. Calls
-   to these functions nest. */
-
-extern xp_error xp_hide_cursor (void);
-extern xp_error xp_show_cursor (void);
-
-
-
-/* Window functions. */
-
-/* Create a new window as defined by MASK and VALUES. MASK must contain
-   XP_BOUNDS or an error is raised. The id of the newly created window
-   is stored in *RET-ID if this function returns XP_Success. */
-
-extern xp_error xp_create_window (unsigned int mask,
-				  const xp_window_changes *values,
-				  xp_window_id *ret_id);
-
-/* Destroys the window identified by ID. */
-
-extern xp_error xp_destroy_window (xp_window_id id);
-
-/* Reconfigures the given window according to MASK and VALUES. */
-
-extern xp_error xp_configure_window (xp_window_id id, unsigned int mask,
-				     const xp_window_changes *values);
-
-
-/* Returns true if NATIVE-ID is a window created by the plugin library.
-   If so and RET-ID is non-null, stores the id of the window in *RET-ID. */
-
-extern xp_bool xp_lookup_native_window (unsigned int native_id,
-					xp_window_id *ret_id);
-
-/* If ID names a window created by the plugin library, stores it's native
-   window id in *RET-NATIVE-ID. */
-
-extern xp_error xp_get_native_window (xp_window_id id,
-				      unsigned int *ret_native_id);
-
-
-/* Locks the rectangle IN-RECT (or, if null, the entire window) of the
-   given window's backing store. Any other non-null parameters are filled
-   in as follows:
-
-   DEPTH = format of returned data. Currently either XP_DEPTH_ARGB8888
-   or XP_DEPTH_RGB565 (possibly with 8 bit planar alpha). Data is
-   always stored in native byte order.
-
-   BITS[0] = pointer to top-left pixel of locked color data
-   BITS[1] = pointer to top-left of locked alpha data, or null if window
-   has no alpha. If the alpha data is meshed, then BITS[1] = BITS[0].
-
-   ROWBYTES[0,1] = size in bytes of each row of color,alpha data
-
-   OUT-RECT = rectangle specifying the current position and size of the
-   locked region relative to the window origin.
-
-   Note that an error is raised when trying to lock an already locked
-   window. While the window is locked, the only operations that may
-   be performed on it are to modify, access or flush its marked region. */
-
-extern xp_error xp_lock_window (xp_window_id id,
-				const xp_box *in_rect,
-				unsigned int *depth,
-				void *bits[2],
-				unsigned int rowbytes[2],
-				xp_box *out_rect);
-
-/* Mark that the region specified by SHAPE-NRECTS, SHAPE-RECTS,
-   SHAPE-TX, and SHAPE-TY in the specified window has been updated, and
-   will need to subsequently be redisplayed. */
-
-extern xp_error xp_mark_window (xp_window_id id, int shape_nrects,
-				const xp_box *shape_rects,
-				int shape_tx, int shape_ty);
-
-/* Unlocks the specified window. If FLUSH is true, then any marked
-   regions are immediately redisplayed. Note that it's an error to
-   unlock an already unlocked window. */
-
-extern xp_error xp_unlock_window (xp_window_id id, xp_bool flush);
-
-/* If anything is marked in the given window for redisplay, do it now. */
-
-extern xp_error xp_flush_window (xp_window_id id);
-
-/* Moves the contents of the region DX,DY pixels away from that specified
-   by DST_RECTS and DST_NRECTS in the window with SRC-ID to the
-   destination region in the window DST-ID. Note that currently source
-   and destination windows must be the same. */
-
-extern xp_error xp_copy_window (xp_window_id src_id, xp_window_id dst_id,
-				int dst_nrects, const xp_box *dst_rects,
-				int dx, int dy);
-
-/* Returns true if the given window has any regions marked for
-   redisplay. */
-
-extern xp_bool xp_is_window_marked (xp_window_id id);
-
-/* If successful returns a superset of the region marked for update in
-   the given window. Use xp_free_region () to release the returned data. */
-
-extern xp_error xp_get_marked_shape (xp_window_id id,
-				     int *ret_nrects, xp_box **ret_rects);
-
-extern void xp_free_shape (int nrects, xp_box *rects);
-
-/* Searches for the first window below ABOVE-ID containing the point X,Y,
-   and returns it's window id in *RET-ID. If no window is found, *RET-ID
-   is set to zero. If ABOVE-ID is zero, finds the topmost window
-   containing the given point. */
-
-extern xp_error xp_find_window (int x, int y, xp_window_id above_id,
-				xp_window_id *ret_id);
-
-/* Returns the current origin and size of the window ID in *BOUNDS-RET if
-   successful. */
-extern xp_error xp_get_window_bounds (xp_window_id id, xp_box *bounds_ret);
-
-
-
-/* Window surface functions. */
-
-/* Create a new VRAM surface on the specified window. If successful,
-   returns the identifier of the new surface in *RET-SID. */
-
-extern xp_error xp_create_surface (xp_window_id id, xp_surface_id *ret_sid);
-
-/* Destroys the specified surface. */
-
-extern xp_error xp_destroy_surface (xp_surface_id sid);
-
-/* Reconfigures the specified surface as defined by MASK and VALUES.
-   Note that specifying XP_DEPTH is an error. */
-
-extern xp_error xp_configure_surface (xp_surface_id sid, unsigned int mask,
-				      const xp_window_changes *values);
-
-/* If successful, places the client identifier of the current process
-   in *RET-CLIENT. */
-
-extern xp_error xp_get_client_id (xp_client_id *ret_client);
-
-/* Given a valid window,surface combination created by the current
-   process, attempts to allow the specified external client access
-   to that surface. If successful, returns two integers in RET-KEY
-   which the client can use to import the surface into their process. */
-
-extern xp_error xp_export_surface (xp_window_id wid, xp_surface_id sid,
-				   xp_client_id client,
-				   unsigned int ret_key[2]);
-
-/* Given a two integer key returned from xp_export_surface (), tries
-   to import the surface into the current process. If successful the
-   local surface identifier is stored in *SID-RET. */
-
-extern xp_error xp_import_surface (const unsigned int key[2],
-				   xp_surface_id *sid_ret);
-
-/* If successful, stores the number of surfaces attached to the
-   specified window in *RET. */
-
-extern xp_error xp_get_window_surface_count (xp_window_id id,
-					     unsigned int *ret);
-
-/* Attaches the CGLContextObj CGL-CTX to the specified surface. */
-
-extern xp_error xp_attach_gl_context (void *cgl_ctx, xp_surface_id sid);
-
-/* Updates the CGLContextObj CGL-CTX to reflect any recent changes to
-   the surface it's attached to. */
-
-extern xp_error xp_update_gl_context (void *cgl_ctx);
-
-
-
-/* Window frame functions. */
-
-/* Possible arguments to xp_frame_get_rect (). */
-
-enum xp_frame_rect_enum {
-    XP_FRAME_RECT_TITLEBAR		= 1,
-    XP_FRAME_RECT_TRACKING		= 2,
-    XP_FRAME_RECT_GROWBOX		= 3,
-};
-
-/* Classes of window frame. */
-
-enum xp_frame_class_enum {
-    XP_FRAME_CLASS_DOCUMENT		= 1 << 0,
-    XP_FRAME_CLASS_DIALOG		= 1 << 1,
-    XP_FRAME_CLASS_MODAL_DIALOG		= 1 << 2,
-    XP_FRAME_CLASS_SYSTEM_MODAL_DIALOG	= 1 << 3,
-    XP_FRAME_CLASS_UTILITY		= 1 << 4,
-    XP_FRAME_CLASS_TOOLBAR		= 1 << 5,
-    XP_FRAME_CLASS_MENU			= 1 << 6,
-    XP_FRAME_CLASS_SPLASH		= 1 << 7,
-    XP_FRAME_CLASS_BORDERLESS		= 1 << 8,
-};
-
-/* Attributes of window frames. */
-
-enum xp_frame_attr_enum {
-    XP_FRAME_ACTIVE			= 0x0001,
-    XP_FRAME_URGENT			= 0x0002,
-    XP_FRAME_TITLE			= 0x0004,
-    XP_FRAME_PRELIGHT			= 0x0008,
-    XP_FRAME_SHADED			= 0x0010,
-    XP_FRAME_CLOSE_BOX			= 0x0100,
-    XP_FRAME_COLLAPSE			= 0x0200,
-    XP_FRAME_ZOOM			= 0x0400,
-    XP_FRAME_ANY_BUTTON			= 0x0700,
-    XP_FRAME_CLOSE_BOX_CLICKED		= 0x0800,
-    XP_FRAME_COLLAPSE_BOX_CLICKED	= 0x1000,
-    XP_FRAME_ZOOM_BOX_CLICKED		= 0x2000,
-    XP_FRAME_ANY_CLICKED		= 0x3800,
-    XP_FRAME_GROW_BOX			= 0x4000,
-};
-
-#define XP_FRAME_ATTR_IS_SET(a,b)	(((a) & (b)) == (b))
-#define XP_FRAME_ATTR_IS_CLICKED(a,m)	((a) & ((m) << 3))
-#define XP_FRAME_ATTR_SET_CLICKED(a,m)	((a) |= ((m) << 3))
-#define XP_FRAME_ATTR_UNSET_CLICKED(a,m) ((a) &= ~((m) << 3))
-
-#define XP_FRAME_POINTER_ATTRS		(XP_FRAME_PRELIGHT		\
-					 | XP_FRAME_ANY_BUTTON		\
-					 | XP_FRAME_ANY_CLICKED)
-
-extern xp_error xp_frame_get_rect (int type, int class, const xp_box *outer,
-				   const xp_box *inner, xp_box *ret);
-extern xp_error xp_frame_hit_test (int class, int x, int y,
-				   const xp_box *outer,
-				   const xp_box *inner, int *ret);
-extern xp_error xp_frame_draw (xp_window_id wid, int class, unsigned int attr,
-			       const xp_box *outer, const xp_box *inner,
-			       unsigned int title_len,
-			       const unsigned char *title_bytes);
-
-
-
-/* Memory manipulation functions. */
-
-enum xp_composite_op_enum {
-    XP_COMPOSITE_SRC = 0,
-    XP_COMPOSITE_OVER,
-};
-
-#define XP_COMPOSITE_FUNCTION(op, src_depth, mask_depth, dest_depth) \
-    (((op) << 24) | ((src_depth) << 16) \
-     | ((mask_depth) << 8) | ((dest_depth) << 0))
-
-#define XP_COMPOSITE_FUNCTION_OP(f)         (((f) >> 24) & 255)
-#define XP_COMPOSITE_FUNCTION_SRC_DEPTH(f)  (((f) >> 16) & 255)
-#define XP_COMPOSITE_FUNCTION_MASK_DEPTH(f) (((f) >>  8) & 255)
-#define XP_COMPOSITE_FUNCTION_DEST_DEPTH(f) (((f) >>  0) & 255)
-
-/* Composite WIDTH by HEIGHT pixels from source and mask to destination
-   using a specified function (if source and destination overlap,
-   undefined behavior results).
-
-   For SRC and DEST, the first element of the array is the color data. If
-   the second element is non-null it implies that there is alpha data
-   (which may be meshed or planar). Data without alpha is assumed to be
-   opaque.
-
-   Passing a null SRC-ROWBYTES pointer implies that the data SRC points
-   to is a single element.
-
-   Operations that are not supported will return XP_BadImplementation. */
-
-extern xp_error xp_composite_pixels (unsigned int width, unsigned int height,
-				     unsigned int function,
-				     void *src[2], unsigned int src_rowbytes[2],
-				     void *mask, unsigned int mask_rowbytes,
-				     void *dest[2], unsigned int dest_rowbytes[2]);
-
-/* Fill HEIGHT rows of data starting at DST. Each row will have WIDTH
-   bytes filled with the 32-bit pattern VALUE. Each row is DST-ROWBYTES
-   wide in total. */
-
-extern void xp_fill_bytes (unsigned int width,
-			   unsigned int height, uint32_t value,
-			   void *dst, unsigned int dst_rowbytes);
-
-/* Copy HEIGHT rows of bytes from SRC to DST. Each row will have WIDTH
-   bytes copied. SRC and DST may overlap, and the right thing will happen. */
-
-extern void xp_copy_bytes (unsigned int width, unsigned int height,
-			   const void *src, unsigned int src_rowbytes,
-			   void *dst, unsigned int dst_rowbytes);
-
-/* Suggestions for the minimum number of bytes or pixels for which it
-   makes sense to use some of the xp_ functions */
-
-extern unsigned int xp_fill_bytes_threshold, xp_copy_bytes_threshold,
-    xp_composite_area_threshold, xp_scroll_area_threshold;
-
-
-#endif /* XPLUGIN_H */

From 7d61893b49569a72bccb63f1ae8c9ce4ef4e354f Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Mon, 10 Dec 2007 20:33:30 -0800
Subject: [PATCH 295/552] Xquartz: Removed Xplugin.h from EXTRA_DIST (cherry
 picked from commit a746383eca77c9b9ea2cba0cf1c8fc39c0f7d536)

---
 hw/xquartz/bundle/Makefile.am        |  3 +++
 hw/xquartz/bundle/Xquartz.plist      | 27 +++++++++++++++++++++++++++
 hw/xquartz/bundle/org.x.X11.plist.in |  2 --
 hw/xquartz/xpr/Makefile.am           |  1 -
 4 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 hw/xquartz/bundle/Xquartz.plist

diff --git a/hw/xquartz/bundle/Makefile.am b/hw/xquartz/bundle/Makefile.am
index e8d5167b7..573443497 100644
--- a/hw/xquartz/bundle/Makefile.am
+++ b/hw/xquartz/bundle/Makefile.am
@@ -15,6 +15,9 @@ endif
 clean-local:
 	rm -rf build
 
+resourcedir=$(libdir)/X11/xserver
+resource_DATA = Xquartz.plist
+
 EXTRA_DIST = \
 	org.x.X11.plist \
 	Info.plist \
diff --git a/hw/xquartz/bundle/Xquartz.plist b/hw/xquartz/bundle/Xquartz.plist
new file mode 100644
index 000000000..e15704516
--- /dev/null
+++ b/hw/xquartz/bundle/Xquartz.plist
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+
+<!-- This file contains system-wide defaults for the Apple X11 server -->
+
+<plist version="1.0">
+<dict>
+	<key>apps_menu</key>
+	<array>
+		<array>
+			<string>Terminal</string>
+			<string>xterm</string>
+			<string>n</string>
+		</array>
+		<array>
+			<string>xman</string>
+			<string>xman</string>
+			<string></string>
+		</array>
+		<array>
+			<string>xlogo</string>
+			<string>xlogo</string>
+			<string></string>
+		</array>
+	</array>
+</dict>
+</plist>
diff --git a/hw/xquartz/bundle/org.x.X11.plist.in b/hw/xquartz/bundle/org.x.X11.plist.in
index 36849cf60..26eca968a 100644
--- a/hw/xquartz/bundle/org.x.X11.plist.in
+++ b/hw/xquartz/bundle/org.x.X11.plist.in
@@ -4,8 +4,6 @@
 <dict>
 	<key>Label</key>
 		<string>org.x.X11</string>
-	<key>Program</key>
-		<string>@APPLE_APPLICATIONS_DIR@/X11.app/Contents/MacOS/X11</string>
 	<key>ProgramArguments</key>
 		<array>
 		<string>@APPLE_APPLICATIONS_DIR@/X11.app/Contents/MacOS/X11</string>
diff --git a/hw/xquartz/xpr/Makefile.am b/hw/xquartz/xpr/Makefile.am
index c2419cae6..87ed195e1 100644
--- a/hw/xquartz/xpr/Makefile.am
+++ b/hw/xquartz/xpr/Makefile.am
@@ -67,5 +67,4 @@ EXTRA_DIST = \
 	x-hash.h \
 	x-hook.h \
 	x-list.h \
-	Xplugin.h \
 	xpr.h

From 1ff945a8e43e622b39b360ee49efd6ae3b77be67 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Mon, 10 Dec 2007 20:47:48 -0800
Subject: [PATCH 296/552] Xquartz: Make Alt work with Xmodmap again (cherry
 picked from commit 0e017177dcca7185716ca760dcce9ddedc7bfef9)

---
 hw/xquartz/darwinEvents.c   |  2 +-
 hw/xquartz/darwinKeyboard.c | 20 +++++++++-----------
 hw/xquartz/quartzKeyboard.c |  8 ++++----
 hw/xquartz/quartzKeyboard.h |  4 ++--
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/hw/xquartz/darwinEvents.c b/hw/xquartz/darwinEvents.c
index ae82f5b14..1d09e0941 100644
--- a/hw/xquartz/darwinEvents.c
+++ b/hw/xquartz/darwinEvents.c
@@ -424,7 +424,7 @@ void DarwinSendKeyboardEvents(int ev_type, int keycode) {
     static unsigned int last_seed;
     unsigned int this_seed;
 
-    this_seed = DarwinModeSystemKeymapSeed();
+    this_seed = QuartzSystemKeymapSeed();
     if (this_seed != last_seed) {
       last_seed = this_seed;
       DarwinKeyboardReload(darwinKeyboard);
diff --git a/hw/xquartz/darwinKeyboard.c b/hw/xquartz/darwinKeyboard.c
index f6dcfb34a..f1b90b76a 100644
--- a/hw/xquartz/darwinKeyboard.c
+++ b/hw/xquartz/darwinKeyboard.c
@@ -507,8 +507,9 @@ Bool DarwinParseNXKeyMapping(darwinKeyboardInfo  *info) {
                                 (left ? XK_Control_L : XK_Control_R);
                         break;
                     case NX_MODIFIERKEY_ALTERNATE:
-                        info->keyMap[keyCode * GLYPHS_PER_KEY] = XK_Mode_switch;
-                                // (left ? XK_Alt_L : XK_Alt_R);
+                        // info->keyMap[keyCode * GLYPHS_PER_KEY] = XK_Mode_switch;
+                        info->keyMap[keyCode * GLYPHS_PER_KEY] =
+                                (left ? XK_Alt_L : XK_Alt_R);
                         break;
                     case NX_MODIFIERKEY_COMMAND:
                         info->keyMap[keyCode * GLYPHS_PER_KEY] =
@@ -685,6 +686,7 @@ static void DarwinBuildModifierMaps(darwinKeyboardInfo *info) {
             case XK_Alt_L:
                 info->modifierKeycodes[NX_MODIFIERKEY_ALTERNATE][0] = i;
                 info->modMap[MIN_KEYCODE + i] = Mod1Mask;
+                *k = XK_Mode_switch; // Yes, this is ugly.  This needs to be cleaned up when we integrate quartzKeyboard with this code and refactor.
                 break;
 
             case XK_Alt_R:
@@ -693,15 +695,11 @@ static void DarwinBuildModifierMaps(darwinKeyboardInfo *info) {
 #else
                 info->modifierKeycodes[NX_MODIFIERKEY_ALTERNATE][0] = i;
 #endif
+                *k = XK_Mode_switch; // Yes, this is ugly.  This needs to be cleaned up when we integrate quartzKeyboard with this code and refactor.
                 info->modMap[MIN_KEYCODE + i] = Mod1Mask;
                 break;
 
             case XK_Mode_switch:
-                // Yes, this is ugly.  This needs to be cleaned up when we integrate quartzKeyboard with this code and refactor.
-#ifdef NX_MODIFIERKEY_RALTERNATE
-                info->modifierKeycodes[NX_MODIFIERKEY_RALTERNATE][0] = i;
-#endif
-                info->modifierKeycodes[NX_MODIFIERKEY_ALTERNATE][0] = i;
                 info->modMap[MIN_KEYCODE + i] = Mod1Mask;
                 break;
 
@@ -735,12 +733,12 @@ static void DarwinLoadKeyboardMapping(KeySymsRec *keySyms) {
     memset(keyInfo.keyMap, 0, sizeof(keyInfo.keyMap));
 
     /* TODO: Clean this up
-     * DarwinModeReadSystemKeymap is in quartz/quartzKeyboard.c
+     * QuartzReadSystemKeymap is in quartz/quartzKeyboard.c
      * DarwinParseNXKeyMapping is here
      */
     if (!DarwinParseNXKeyMapping(&keyInfo)) {
-        DEBUG_LOG("DarwinParseNXKeyMapping returned 0... running DarwinModeReadSystemKeymap().\n");
-        if (!DarwinModeReadSystemKeymap(&keyInfo)) {
+        DEBUG_LOG("DarwinParseNXKeyMapping returned 0... running QuartzReadSystemKeymap().\n");
+        if (!QuartzReadSystemKeymap(&keyInfo)) {
             FatalError("Could not build a valid keymap.");
         }
     }
@@ -790,7 +788,7 @@ void DarwinKeyboardInit(DeviceIntPtr pDev) {
     //    DarwinKeyboardReload(pDev);
     /* Initialize the seed, so we don't reload the keymap unnecessarily
        (and possibly overwrite xinitrc changes) */
-    DarwinModeSystemKeymapSeed();
+    QuartzSystemKeymapSeed();
 
     assert( InitKeyboardDeviceStruct( (DevicePtr)pDev, &keySyms,
                                       keyInfo.modMap, QuartzBell,
diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c
index 0a50d06ac..9b899ca67 100644
--- a/hw/xquartz/quartzKeyboard.c
+++ b/hw/xquartz/quartzKeyboard.c
@@ -66,11 +66,11 @@ const static struct {
     {55,  XK_Meta_L},
     {56,  XK_Shift_L},
     {57,  XK_Caps_Lock},
-    {58,  XK_Mode_switch},
+    {58,  XK_Alt_L},
     {59,  XK_Control_L},
 
     {60,  XK_Shift_R},
-    {61,  XK_Mode_switch},
+    {61,  XK_Alt_R},
     {62,  XK_Control_R},
     {63,  XK_Meta_R},
 
@@ -146,7 +146,7 @@ const static struct {
     {UKEYSYM (0x31b), XK_dead_horn},		/* COMBINING HORN */
 };
 
-unsigned int DarwinModeSystemKeymapSeed(void) {
+unsigned int QuartzSystemKeymapSeed(void) {
     static unsigned int seed;
     static KeyboardLayoutRef last_key_layout;
     KeyboardLayoutRef key_layout;
@@ -195,7 +195,7 @@ static KeySym make_dead_key(KeySym in) {
     return in;
 }
 
-Bool DarwinModeReadSystemKeymap(darwinKeyboardInfo *info) {
+Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
     KeyboardLayoutRef key_layout;
     const void *chr_data = NULL;
     int num_keycodes = NUM_KEYCODES;
diff --git a/hw/xquartz/quartzKeyboard.h b/hw/xquartz/quartzKeyboard.h
index c5f22bf14..0c7e70e48 100644
--- a/hw/xquartz/quartzKeyboard.h
+++ b/hw/xquartz/quartzKeyboard.h
@@ -47,7 +47,7 @@ typedef struct darwinKeyboardInfo_struct {
 
 /* These functions need to be implemented by XQuartz, XDarwin, etc. */
 void DarwinKeyboardReload(DeviceIntPtr pDev);
-Bool DarwinModeReadSystemKeymap(darwinKeyboardInfo *info);
-unsigned int DarwinModeSystemKeymapSeed(void);
+Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info);
+unsigned int QuartzSystemKeymapSeed(void);
 
 #endif /* QUARTZ_KEYBOARD_H */

From eab0c4e49015fe96f6d985316f9c5fa28a7eb1fe Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Mon, 10 Dec 2007 20:57:24 -0800
Subject: [PATCH 297/552] Xquartz: Pre-process Xquartz man page (cherry picked
 from commit dec2633c41dd0adf73264afdf251a6522d6ae76a)

---
 hw/xquartz/xpr/Makefile.am                    | 16 ++++++++---
 .../xpr/{Xquartz.man => Xquartz.man.pre}      | 28 +++++++++----------
 2 files changed, 26 insertions(+), 18 deletions(-)
 rename hw/xquartz/xpr/{Xquartz.man => Xquartz.man.pre} (85%)

diff --git a/hw/xquartz/xpr/Makefile.am b/hw/xquartz/xpr/Makefile.am
index 87ed195e1..ae1b19297 100644
--- a/hw/xquartz/xpr/Makefile.am
+++ b/hw/xquartz/xpr/Makefile.am
@@ -1,8 +1,5 @@
 bin_PROGRAMS = Xquartz
 
-# TODO: This man page needs sed magic and cleanup
-man1_MANS = Xquartz.man
-
 AM_CFLAGS =  $(XSERVER_CFLAGS) $(DIX_CFLAGS)
 AM_CPPFLAGS = \
 	-I$(srcdir) -I$(srcdir)/.. \
@@ -58,8 +55,19 @@ Xquartz_LDFLAGS =  \
 	-Wl,-framework,CoreAudio \
 	-Wl,-framework,IOKit
 
+appmandir = $(APP_MAN_DIR)
+appman_PRE = Xquartz.man.pre
+appman_PROCESSED = $(appman_PRE:man.pre=man)
+appman_DATA = $(appman_PRE:man.pre=@APP_MAN_SUFFIX@)
+
+CLEANFILES = $(appman_PROCESSED) $(appman_DATA)
+
+include $(top_srcdir)/cpprules.in
+
+.man.$(APP_MAN_SUFFIX):
+	cp $< $@
+
 EXTRA_DIST = \
-	Xquartz.man \
 	dri.h \
 	dristruct.h \
 	appledri.h \
diff --git a/hw/xquartz/xpr/Xquartz.man b/hw/xquartz/xpr/Xquartz.man.pre
similarity index 85%
rename from hw/xquartz/xpr/Xquartz.man
rename to hw/xquartz/xpr/Xquartz.man.pre
index 37a7f1a26..315db1ca4 100644
--- a/hw/xquartz/xpr/Xquartz.man
+++ b/hw/xquartz/xpr/Xquartz.man.pre
@@ -65,48 +65,48 @@ of the main display.
 .SH CUSTOMIZATION
 \fIXquartz\fP can also be customized using the defaults(1) command. The available options are:
 .TP 8
-.B defaults write com.apple.x11 enable_fake_buttons -boolean true
+.B defaults write org.x.X11 enable_fake_buttons -boolean true
 Equivalent to the \fB-fakebuttons\fP command line option.
 .TP 8
-.B defaults write com.apple.x11 fake_button2 \fImodifiers\fP
+.B defaults write org.x.X11 fake_button2 \fImodifiers\fP
 Equivalent to the \fB-fakemouse2\fP option.
 .TP 8
-.B defaults write com.apple.x11 fake_button3 \fImodifiers\fP
+.B defaults write org.x.X11 fake_button3 \fImodifiers\fP
 Equivalent to the \fB-fakemouse3\fP option.
 .TP 8
-.B defaults write com.apple.x11 swap_alt_meta -boolean true
+.B defaults write org.x.X11 swap_alt_meta -boolean true
 Equivalent to the \fB-swapAltMeta\fP option.
 .TP 8
-.B defaults write com.apple.x11 keymap_file \fIfilename\fP
+.B defaults write org.x.X11 keymap_file \fIfilename\fP
 Equivalent to the \fB-keymap\fP option.
 .TP 8
-.B defaults write com.apple.x11 no_quit_alert -boolean true
+.B defaults write org.x.X11 no_quit_alert -boolean true
 Disables the alert dialog displayed when attempting to quit X11.
 .TP 8
-.B defaults write com.apple.x11 no_auth -boolean true
+.B defaults write org.x.X11 no_auth -boolean true
 Stops the X server requiring that clients authenticate themselves when
 connecting. See Xsecurity(__miscmansuffix__).
 .TP 8
-.B defaults write com.apple.x11 nolisten_tcp -boolean true
+.B defaults write org.x.X11 nolisten_tcp -boolean true
 Prevents the X server accepting remote connections.
 .TP 8
-.B defaults write com.apple.x11 xinit_kills_server -boolean false
+.B defaults write org.x.X11 xinit_kills_server -boolean false
 Stops the X server exiting when the xinitrc script terminates.
 .TP 8
-.B defaults write com.apple.x11 fullscreen_hotkeys -boolean false
+.B defaults write org.x.X11 fullscreen_hotkeys -boolean false
 Allows system hotkeys to be handled while in X11 fullscreen mode.
 .TP 8
-.B defaults write com.apple.x11 enable_system_beep -boolean false
+.B defaults write org.x.X11 enable_system_beep -boolean false
 Don't use the standard system beep effect for X11 alerts.
 .TP 8
-.B defaults write com.apple.x11 enable_key_equivalents -boolean false
+.B defaults write org.x.X11 enable_key_equivalents -boolean false
 Disable menu keyboard equivalents while X11 windows are focused.
 .TP 8
-.B defaults write com.apple.x11 depth \fIdepth\fP
+.B defaults write org.x.X11 depth \fIdepth\fP
 Equivalent to the \fB-depth\fP option.
 .SH "SEE ALSO"
 .PP
-X(__miscmansuffix__), XFree86(1), Xserver(1), xdm(1), xinit(1)
+X(__miscmansuffix__), Xserver(1), xdm(1), xinit(1)
 .PP
 .SH AUTHORS
 XFree86 was originally ported to Mac OS X Server by John Carmack. Dave

From 671592343701d8174a70f1ffb9c818784ea3af7a Mon Sep 17 00:00:00 2001
From: Aaron Plattner <aplattner@nvidia.com>
Date: Wed, 12 Dec 2007 10:59:15 -0800
Subject: [PATCH 298/552] Get rid of xf86DefModes.c.

It's out of date and not included in the build.  Instead, xf86DefModeSet.c is
built from vesamodes and extramodes using modeline2c.awk and *that's* what gets
built.
---
 hw/xfree86/common/Makefile.am    |   1 -
 hw/xfree86/common/modeline2c.awk |   2 +-
 hw/xfree86/common/xf86DefModes.c | 155 -------------------------------
 3 files changed, 1 insertion(+), 157 deletions(-)
 delete mode 100644 hw/xfree86/common/xf86DefModes.c

diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
index 2f23776a0..a29101bd5 100644
--- a/hw/xfree86/common/Makefile.am
+++ b/hw/xfree86/common/Makefile.am
@@ -85,7 +85,6 @@ EXTRA_DIST = \
 	xf86Version.h \
 	xorgVersion.h \
 	xf86Date.h \
-	xf86DefModes.c \
 	$(MODEDEFSOURCES) \
         $(DISTKBDSOURCES)
 
diff --git a/hw/xfree86/common/modeline2c.awk b/hw/xfree86/common/modeline2c.awk
index 7a893300c..d4b9649c8 100644
--- a/hw/xfree86/common/modeline2c.awk
+++ b/hw/xfree86/common/modeline2c.awk
@@ -29,7 +29,7 @@
 # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# Usage: modeline2c.awk < modefile > xf86DefModes.c
+# Usage: modeline2c.awk < modefile > xf86DefModeSet.c
 #
 
 BEGIN {
diff --git a/hw/xfree86/common/xf86DefModes.c b/hw/xfree86/common/xf86DefModes.c
deleted file mode 100644
index bdb64fe8e..000000000
--- a/hw/xfree86/common/xf86DefModes.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/* THIS FILE IS AUTOMATICALLY GENERATED -- DO NOT EDIT -- LOOK at
- * modeline2c.pl */
-
-/*
- * Copyright 1999-2003 by The XFree86 Project, Inc.
- *
- * Author: Dirk Hohndel <hohndel@XFree86.Org>
- */
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include "xf86.h"
-#include "xf86Config.h"
-#include "xf86Priv.h"
-#include "xf86_OSlib.h"
-
-#include "globals.h"
-
-#define MODEPREFIX(name) NULL, NULL, name, MODE_OK, M_T_DEFAULT
-#define MODESUFFIX       0,0, 0,0,0,0,0,0,0, 0,0,0,0,0,0,FALSE,FALSE,0,NULL,0,0.0,0.0
-
-DisplayModeRec xf86DefaultModes [] = {
-/* 640x350 @ 85Hz (VESA) hsync: 37.9kHz */
-	{MODEPREFIX("640x350"),31500, 640,672,736,832,0, 350,382,385,445,0, V_PHSYNC | V_NVSYNC, MODESUFFIX},
-	{MODEPREFIX("320x175"),15750, 320,336,368,416,0, 175,191,192,222,0, V_PHSYNC | V_NVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 640x400 @ 85Hz (VESA) hsync: 37.9kHz */
-	{MODEPREFIX("640x400"),31500, 640,672,736,832,0, 400,401,404,445,0, V_NHSYNC | V_PVSYNC, MODESUFFIX},
-	{MODEPREFIX("320x200"),15750, 320,336,368,416,0, 200,200,202,222,0, V_NHSYNC | V_PVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 720x400 @ 85Hz (VESA) hsync: 37.9kHz */
-	{MODEPREFIX("720x400"),35500, 720,756,828,936,0, 400,401,404,446,0, V_NHSYNC | V_PVSYNC, MODESUFFIX},
-	{MODEPREFIX("360x200"),17750, 360,378,414,468,0, 200,200,202,223,0, V_NHSYNC | V_PVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz */
-	{MODEPREFIX("640x480"),25200, 640,656,752,800,0, 480,490,492,525,0, V_NHSYNC | V_NVSYNC, MODESUFFIX},
-	{MODEPREFIX("320x240"),12600, 320,328,376,400,0, 240,245,246,262,0, V_NHSYNC | V_NVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 640x480 @ 72Hz (VESA) hsync: 37.9kHz */
-	{MODEPREFIX("640x480"),31500, 640,664,704,832,0, 480,489,491,520,0, V_NHSYNC | V_NVSYNC, MODESUFFIX},
-	{MODEPREFIX("320x240"),15750, 320,332,352,416,0, 240,244,245,260,0, V_NHSYNC | V_NVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 640x480 @ 75Hz (VESA) hsync: 37.5kHz */
-	{MODEPREFIX("640x480"),31500, 640,656,720,840,0, 480,481,484,500,0, V_NHSYNC | V_NVSYNC, MODESUFFIX},
-	{MODEPREFIX("320x240"),15750, 320,328,360,420,0, 240,240,242,250,0, V_NHSYNC | V_NVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 640x480 @ 85Hz (VESA) hsync: 43.3kHz */
-	{MODEPREFIX("640x480"),36000, 640,696,752,832,0, 480,481,484,509,0, V_NHSYNC | V_NVSYNC, MODESUFFIX},
-	{MODEPREFIX("320x240"),18000, 320,348,376,416,0, 240,240,242,254,0, V_NHSYNC | V_NVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 800x600 @ 56Hz (VESA) hsync: 35.2kHz */
-	{MODEPREFIX("800x600"),36000, 800,824,896,1024,0, 600,601,603,625,0, V_PHSYNC | V_PVSYNC, MODESUFFIX},
-	{MODEPREFIX("400x300"),18000, 400,412,448,512,0, 300,300,301,312,0, V_PHSYNC | V_PVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 800x600 @ 60Hz (VESA) hsync: 37.9kHz */
-	{MODEPREFIX("800x600"),40000, 800,840,968,1056,0, 600,601,605,628,0, V_PHSYNC | V_PVSYNC, MODESUFFIX},
-	{MODEPREFIX("400x300"),20000, 400,420,484,528,0, 300,300,302,314,0, V_PHSYNC | V_PVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 800x600 @ 72Hz (VESA) hsync: 48.1kHz */
-	{MODEPREFIX("800x600"),50000, 800,856,976,1040,0, 600,637,643,666,0, V_PHSYNC | V_PVSYNC, MODESUFFIX},
-	{MODEPREFIX("400x300"),25000, 400,428,488,520,0, 300,318,321,333,0, V_PHSYNC | V_PVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 800x600 @ 75Hz (VESA) hsync: 46.9kHz */
-	{MODEPREFIX("800x600"),49500, 800,816,896,1056,0, 600,601,604,625,0, V_PHSYNC | V_PVSYNC, MODESUFFIX},
-	{MODEPREFIX("400x300"),24750, 400,408,448,528,0, 300,300,302,312,0, V_PHSYNC | V_PVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 800x600 @ 85Hz (VESA) hsync: 53.7kHz */
-	{MODEPREFIX("800x600"),56300, 800,832,896,1048,0, 600,601,604,631,0, V_PHSYNC | V_PVSYNC, MODESUFFIX},
-	{MODEPREFIX("400x300"),28150, 400,416,448,524,0, 300,300,302,315,0, V_PHSYNC | V_PVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 1024x768i @ 43Hz (industry standard) hsync: 35.5kHz */
-	{MODEPREFIX("1024x768"),44900, 1024,1032,1208,1264,0, 768,768,776,817,0, V_PHSYNC | V_PVSYNC | V_INTERLACE, MODESUFFIX},
-	{MODEPREFIX("512x384"),22450, 512,516,604,632,0, 384,384,388,408,0, V_PHSYNC | V_PVSYNC | V_INTERLACE | V_DBLSCAN, MODESUFFIX},
-/* 1024x768 @ 60Hz (VESA) hsync: 48.4kHz */
-	{MODEPREFIX("1024x768"),65000, 1024,1048,1184,1344,0, 768,771,777,806,0, V_NHSYNC | V_NVSYNC, MODESUFFIX},
-	{MODEPREFIX("512x384"),32500, 512,524,592,672,0, 384,385,388,403,0, V_NHSYNC | V_NVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 1024x768 @ 70Hz (VESA) hsync: 56.5kHz */
-	{MODEPREFIX("1024x768"),75000, 1024,1048,1184,1328,0, 768,771,777,806,0, V_NHSYNC | V_NVSYNC, MODESUFFIX},
-	{MODEPREFIX("512x384"),37500, 512,524,592,664,0, 384,385,388,403,0, V_NHSYNC | V_NVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 1024x768 @ 75Hz (VESA) hsync: 60.0kHz */
-	{MODEPREFIX("1024x768"),78800, 1024,1040,1136,1312,0, 768,769,772,800,0, V_PHSYNC | V_PVSYNC, MODESUFFIX},
-	{MODEPREFIX("512x384"),39400, 512,520,568,656,0, 384,384,386,400,0, V_PHSYNC | V_PVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 1024x768 @ 85Hz (VESA) hsync: 68.7kHz */
-	{MODEPREFIX("1024x768"),94500, 1024,1072,1168,1376,0, 768,769,772,808,0, V_PHSYNC | V_PVSYNC, MODESUFFIX},
-	{MODEPREFIX("512x384"),47250, 512,536,584,688,0, 384,384,386,404,0, V_PHSYNC | V_PVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 1152x864 @ 75Hz (VESA) hsync: 67.5kHz */
-	{MODEPREFIX("1152x864"),108000, 1152,1216,1344,1600,0, 864,865,868,900,0, V_PHSYNC | V_PVSYNC, MODESUFFIX},
-	{MODEPREFIX("576x432"),54000, 576,608,672,800,0, 432,432,434,450,0, V_PHSYNC | V_PVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 1280x960 @ 60Hz (VESA) hsync: 60.0kHz */
-	{MODEPREFIX("1280x960"),108000, 1280,1376,1488,1800,0, 960,961,964,1000,0, V_PHSYNC | V_PVSYNC, MODESUFFIX},
-	{MODEPREFIX("640x480"),54000, 640,688,744,900,0, 480,480,482,500,0, V_PHSYNC | V_PVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 1280x960 @ 85Hz (VESA) hsync: 85.9kHz */
-	{MODEPREFIX("1280x960"),148500, 1280,1344,1504,1728,0, 960,961,964,1011,0, V_PHSYNC | V_PVSYNC, MODESUFFIX},
-	{MODEPREFIX("640x480"),74250, 640,672,752,864,0, 480,480,482,505,0, V_PHSYNC | V_PVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 1280x1024 @ 60Hz (VESA) hsync: 64.0kHz */
-	{MODEPREFIX("1280x1024"),108000, 1280,1328,1440,1688,0, 1024,1025,1028,1066,0, V_PHSYNC | V_PVSYNC, MODESUFFIX},
-	{MODEPREFIX("640x512"),54000, 640,664,720,844,0, 512,512,514,533,0, V_PHSYNC | V_PVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 1280x1024 @ 75Hz (VESA) hsync: 80.0kHz */
-	{MODEPREFIX("1280x1024"),135000, 1280,1296,1440,1688,0, 1024,1025,1028,1066,0, V_PHSYNC | V_PVSYNC, MODESUFFIX},
-	{MODEPREFIX("640x512"),67500, 640,648,720,844,0, 512,512,514,533,0, V_PHSYNC | V_PVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 1280x1024 @ 85Hz (VESA) hsync: 91.1kHz */
-	{MODEPREFIX("1280x1024"),157500, 1280,1344,1504,1728,0, 1024,1025,1028,1072,0, V_PHSYNC | V_PVSYNC, MODESUFFIX},
-	{MODEPREFIX("640x512"),78750, 640,672,752,864,0, 512,512,514,536,0, V_PHSYNC | V_PVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 1600x1200 @ 60Hz (VESA) hsync: 75.0kHz */
-	{MODEPREFIX("1600x1200"),162000, 1600,1664,1856,2160,0, 1200,1201,1204,1250,0, V_PHSYNC | V_PVSYNC, MODESUFFIX},
-	{MODEPREFIX("800x600"),81000, 800,832,928,1080,0, 600,600,602,625,0, V_PHSYNC | V_PVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 1600x1200 @ 65Hz (VESA) hsync: 81.3kHz */
-	{MODEPREFIX("1600x1200"),175500, 1600,1664,1856,2160,0, 1200,1201,1204,1250,0, V_PHSYNC | V_PVSYNC, MODESUFFIX},
-	{MODEPREFIX("800x600"),87750, 800,832,928,1080,0, 600,600,602,625,0, V_PHSYNC | V_PVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 1600x1200 @ 70Hz (VESA) hsync: 87.5kHz */
-	{MODEPREFIX("1600x1200"),189000, 1600,1664,1856,2160,0, 1200,1201,1204,1250,0, V_PHSYNC | V_PVSYNC, MODESUFFIX},
-	{MODEPREFIX("800x600"),94500, 800,832,928,1080,0, 600,600,602,625,0, V_PHSYNC | V_PVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 1600x1200 @ 75Hz (VESA) hsync: 93.8kHz */
-	{MODEPREFIX("1600x1200"),202500, 1600,1664,1856,2160,0, 1200,1201,1204,1250,0, V_PHSYNC | V_PVSYNC, MODESUFFIX},
-	{MODEPREFIX("800x600"),101250, 800,832,928,1080,0, 600,600,602,625,0, V_PHSYNC | V_PVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 1600x1200 @ 85Hz (VESA) hsync: 106.3kHz */
-	{MODEPREFIX("1600x1200"),229500, 1600,1664,1856,2160,0, 1200,1201,1204,1250,0, V_PHSYNC | V_PVSYNC, MODESUFFIX},
-	{MODEPREFIX("800x600"),114750, 800,832,928,1080,0, 600,600,602,625,0, V_PHSYNC | V_PVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 1792x1344 @ 60Hz (VESA) hsync: 83.6kHz */
-	{MODEPREFIX("1792x1344"),204800, 1792,1920,2120,2448,0, 1344,1345,1348,1394,0, V_NHSYNC | V_PVSYNC, MODESUFFIX},
-	{MODEPREFIX("896x672"),102400, 896,960,1060,1224,0, 672,672,674,697,0, V_NHSYNC | V_PVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 1792x1344 @ 75Hz (VESA) hsync: 106.3kHz */
-	{MODEPREFIX("1792x1344"),261000, 1792,1888,2104,2456,0, 1344,1345,1348,1417,0, V_NHSYNC | V_PVSYNC, MODESUFFIX},
-	{MODEPREFIX("896x672"),130500, 896,944,1052,1228,0, 672,672,674,708,0, V_NHSYNC | V_PVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 1856x1392 @ 60Hz (VESA) hsync: 86.3kHz */
-	{MODEPREFIX("1856x1392"),218300, 1856,1952,2176,2528,0, 1392,1393,1396,1439,0, V_NHSYNC | V_PVSYNC, MODESUFFIX},
-	{MODEPREFIX("928x696"),109150, 928,976,1088,1264,0, 696,696,698,719,0, V_NHSYNC | V_PVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 1856x1392 @ 75Hz (VESA) hsync: 112.5kHz */
-	{MODEPREFIX("1856x1392"),288000, 1856,1984,2208,2560,0, 1392,1393,1396,1500,0, V_NHSYNC | V_PVSYNC, MODESUFFIX},
-	{MODEPREFIX("928x696"),144000, 928,992,1104,1280,0, 696,696,698,750,0, V_NHSYNC | V_PVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 1920x1440 @ 60Hz (VESA) hsync: 90.0kHz */
-	{MODEPREFIX("1920x1440"),234000, 1920,2048,2256,2600,0, 1440,1441,1444,1500,0, V_NHSYNC | V_PVSYNC, MODESUFFIX},
-	{MODEPREFIX("960x720"),117000, 960,1024,1128,1300,0, 720,720,722,750,0, V_NHSYNC | V_PVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 1920x1440 @ 75Hz (VESA) hsync: 112.5kHz */
-	{MODEPREFIX("1920x1440"),297000, 1920,2064,2288,2640,0, 1440,1441,1444,1500,0, V_NHSYNC | V_PVSYNC, MODESUFFIX},
-	{MODEPREFIX("960x720"),148500, 960,1032,1144,1320,0, 720,720,722,750,0, V_NHSYNC | V_PVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 832x624 @ 75Hz (74.55Hz) (fix if the official/Apple spec is different) hsync: 49.725kHz */
-	{MODEPREFIX("832x624"),57284, 832,864,928,1152,0, 624,625,628,667,0, V_NHSYNC | V_NVSYNC, MODESUFFIX},
-	{MODEPREFIX("416x312"),28642, 416,432,464,576,0, 312,312,314,333,0, V_NHSYNC | V_NVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 1152x768 @ 54.8Hz (Titanium PowerBook) hsync: 44.2kHz */
-	{MODEPREFIX("1152x768"),64995, 1152,1178,1314,1472,0, 768,771,777,806,0, V_PHSYNC | V_PVSYNC, MODESUFFIX},
-	{MODEPREFIX("576x384"),32497, 576,589,657,736,0, 384,385,388,403,0, V_PHSYNC | V_PVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 1400x1050 @ 60Hz (VESA GTF) hsync: 65.5kHz */
-	{MODEPREFIX("1400x1050"),122000, 1400,1488,1640,1880,0, 1050,1052,1064,1082,0, V_PHSYNC | V_PVSYNC, MODESUFFIX},
-	{MODEPREFIX("700x525"),61000, 700,744,820,940,0, 525,526,532,541,0, V_PHSYNC | V_PVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 1400x1050 @ 75Hz (VESA GTF) hsync: 82.2kHz */
-	{MODEPREFIX("1400x1050"),155800, 1400,1464,1784,1912,0, 1050,1052,1064,1090,0, V_PHSYNC | V_PVSYNC, MODESUFFIX},
-	{MODEPREFIX("700x525"),77900, 700,732,892,956,0, 525,526,532,545,0, V_PHSYNC | V_PVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 1600x1024 @ 60Hz (SGI 1600SW) hsync: 64.0kHz */
-	{MODEPREFIX("1600x1024"),106910, 1600,1620,1640,1670,0, 1024,1027,1030,1067,0, V_NHSYNC | V_NVSYNC, MODESUFFIX},
-	{MODEPREFIX("800x512"),53455, 800,810,820,835,0, 512,513,515,533,0, V_NHSYNC | V_NVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 1920x1440 @ 85Hz (VESA GTF) hsync: 128.5kHz */
-	{MODEPREFIX("1920x1440"),341350, 1920,2072,2288,2656,0, 1440,1441,1444,1512,0, V_NHSYNC | V_PVSYNC, MODESUFFIX},
-	{MODEPREFIX("960x720"),170675, 960,1036,1144,1328,0, 720,720,722,756,0, V_NHSYNC | V_PVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 2048x1536 @ 60Hz (VESA GTF) hsync: 95.3kHz */
-	{MODEPREFIX("2048x1536"),266950, 2048,2200,2424,2800,0, 1536,1537,1540,1589,0, V_NHSYNC | V_PVSYNC, MODESUFFIX},
-	{MODEPREFIX("1024x768"),133475, 1024,1100,1212,1400,0, 768,768,770,794,0, V_NHSYNC | V_PVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 2048x1536 @ 75Hz (VESA GTF) hsync: 120.2kHz */
-	{MODEPREFIX("2048x1536"),340480, 2048,2216,2440,2832,0, 1536,1537,1540,1603,0, V_NHSYNC | V_PVSYNC, MODESUFFIX},
-	{MODEPREFIX("1024x768"),170240, 1024,1108,1220,1416,0, 768,768,770,801,0, V_NHSYNC | V_PVSYNC | V_DBLSCAN, MODESUFFIX},
-/* 2048x1536 @ 85Hz (VESA GTF) hsync: 137.0kHz */
-	{MODEPREFIX("2048x1536"),388040, 2048,2216,2440,2832,0, 1536,1537,1540,1612,0, V_NHSYNC | V_PVSYNC, MODESUFFIX},
-	{MODEPREFIX("1024x768"),194020, 1024,1108,1220,1416,0, 768,768,770,806,0, V_NHSYNC | V_PVSYNC | V_DBLSCAN, MODESUFFIX},
-	{MODEPREFIX(NULL),0,0,0,0,0,0,0,0,0,0,0,0,MODESUFFIX}
-};

From a125ce4a84f5fb5934fefebd7cfb22a83180874d Mon Sep 17 00:00:00 2001
From: Aaron Plattner <aplattner@nvidia.com>
Date: Wed, 12 Dec 2007 12:20:54 -0800
Subject: [PATCH 299/552] Fix dist by including modeline2c.awk.

This was broken by commit cb44b6121c4b7b9dd7ff4ff52aaab914c82ff013, which
removed modeline2c.pl from EXTRA_DIST without adding modeline2c.awk.
---
 hw/xfree86/common/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
index a29101bd5..c060b73f0 100644
--- a/hw/xfree86/common/Makefile.am
+++ b/hw/xfree86/common/Makefile.am
@@ -86,6 +86,7 @@ EXTRA_DIST = \
 	xorgVersion.h \
 	xf86Date.h \
 	$(MODEDEFSOURCES) \
+	modeline2c.awk \
         $(DISTKBDSOURCES)
 
 if LNXACPI

From 9a7ce573636e349ee2967991c7cc1407e80ae524 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 12 Dec 2007 20:44:59 -0500
Subject: [PATCH 300/552] xselinux: Add new protocol for setting device create
 context.

---
 Xext/xselinux.c | 32 ++++++++++++++++++++++++++++++++
 Xext/xselinux.h | 18 ++++++++++--------
 2 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 8f52c1e7d..bbae483a8 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -1051,6 +1051,18 @@ ProcSELinuxGetSelectionManager(ClientPtr client)
     return (client->noClientException);
 }
 
+static int
+ProcSELinuxSetDeviceCreateContext(ClientPtr client)
+{
+    return Success;
+}
+
+static int
+ProcSELinuxGetDeviceCreateContext(ClientPtr client)
+{
+    return Success;
+}
+
 static int
 ProcSELinuxSetDeviceContext(ClientPtr client)
 {
@@ -1134,6 +1146,10 @@ ProcSELinuxDispatch(ClientPtr client)
 	return ProcSELinuxSetSelectionManager(client);
     case X_SELinuxGetSelectionManager:
     	return ProcSELinuxGetSelectionManager(client);
+    case X_SELinuxSetDeviceCreateContext:
+    	return ProcSELinuxSetDeviceCreateContext(client);
+    case X_SELinuxGetDeviceCreateContext:
+    	return ProcSELinuxGetDeviceCreateContext(client);
     case X_SELinuxSetDeviceContext:
     	return ProcSELinuxSetDeviceContext(client);
     case X_SELinuxGetDeviceContext:
@@ -1184,6 +1200,18 @@ SProcSELinuxGetSelectionManager(ClientPtr client)
     return ProcSELinuxGetSelectionManager(client);
 }
 
+static int
+SProcSELinuxSetDeviceCreateContext(ClientPtr client)
+{
+    return ProcSELinuxSetDeviceCreateContext(client);
+}
+
+static int
+SProcSELinuxGetDeviceCreateContext(ClientPtr client)
+{
+    return ProcSELinuxGetDeviceCreateContext(client);
+}
+
 static int
 SProcSELinuxSetDeviceContext(ClientPtr client)
 {
@@ -1247,6 +1275,10 @@ SProcSELinuxDispatch(ClientPtr client)
 	return SProcSELinuxSetSelectionManager(client);
     case X_SELinuxGetSelectionManager:
     	return SProcSELinuxGetSelectionManager(client);
+    case X_SELinuxSetDeviceCreateContext:
+    	return SProcSELinuxSetDeviceCreateContext(client);
+    case X_SELinuxGetDeviceCreateContext:
+    	return SProcSELinuxGetDeviceCreateContext(client);
     case X_SELinuxSetDeviceContext:
     	return SProcSELinuxSetDeviceContext(client);
     case X_SELinuxGetDeviceContext:
diff --git a/Xext/xselinux.h b/Xext/xselinux.h
index ea8d9e440..ebcc4aae0 100644
--- a/Xext/xselinux.h
+++ b/Xext/xselinux.h
@@ -33,14 +33,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define X_SELinuxQueryVersion			0
 #define X_SELinuxSetSelectionManager		1
 #define X_SELinuxGetSelectionManager		2
-#define X_SELinuxSetDeviceContext		3
-#define X_SELinuxGetDeviceContext		4
-#define X_SELinuxSetPropertyCreateContext	5
-#define X_SELinuxGetPropertyCreateContext	6
-#define X_SELinuxGetPropertyContext		7
-#define X_SELinuxSetWindowCreateContext		8
-#define X_SELinuxGetWindowCreateContext		9
-#define X_SELinuxGetWindowContext		10
+#define X_SELinuxSetDeviceCreateContext		3
+#define X_SELinuxGetDeviceCreateContext		4
+#define X_SELinuxSetDeviceContext		5
+#define X_SELinuxGetDeviceContext		6
+#define X_SELinuxSetPropertyCreateContext	7
+#define X_SELinuxGetPropertyCreateContext	8
+#define X_SELinuxGetPropertyContext		9
+#define X_SELinuxSetWindowCreateContext		10
+#define X_SELinuxGetWindowCreateContext		11
+#define X_SELinuxGetWindowContext		12
 
 typedef struct {
     CARD8   reqType;

From 8cedbb0a53d47b12f03edb726db9d5879c8a63a4 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Thu, 13 Dec 2007 10:57:35 -0500
Subject: [PATCH 301/552] Clean up some #if 0.

---
 hw/xfree86/common/xf86Mode.c | 46 ------------------------------------
 1 file changed, 46 deletions(-)

diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c
index 7fcce10b1..544276bdf 100644
--- a/hw/xfree86/common/xf86Mode.c
+++ b/hw/xfree86/common/xf86Mode.c
@@ -368,52 +368,6 @@ xf86HandleBuiltinMode(ScrnInfoPtr scrp,
     return MODE_OK;
 }
 
-#if 0
-/** Calculates the horizontal sync rate of a mode */
-_X_EXPORT double
-xf86ModeHSync(DisplayModePtr mode)
-{
-    double hsync = 0.0;
-    
-    if (mode->HSync > 0.0)
-	    hsync = mode->HSync;
-    else if (mode->HTotal > 0)
-	    hsync = (float)mode->Clock / (float)mode->HTotal;
-
-    return hsync;
-}
-
-/** Calculates the vertical refresh rate of a mode */
-_X_EXPORT double
-xf86ModeVRefresh(DisplayModePtr mode)
-{
-    double refresh = 0.0;
-
-    if (mode->VRefresh > 0.0)
-	refresh = mode->VRefresh;
-    else if (mode->HTotal > 0 && mode->VTotal > 0) {
-	refresh = mode->Clock * 1000.0 / mode->HTotal / mode->VTotal;
-	if (mode->Flags & V_INTERLACE)
-	    refresh *= 2.0;
-	if (mode->Flags & V_DBLSCAN)
-	    refresh /= 2.0;
-	if (mode->VScan > 1)
-	    refresh /= (float)(mode->VScan);
-    }
-    return refresh;
-}
-
-/** Sets a default mode name of <width>x<height> on a mode. */
-_X_EXPORT void
-xf86SetModeDefaultName(DisplayModePtr mode)
-{
-    if (mode->name != NULL)
-	xfree(mode->name);
-
-    mode->name = XNFprintf("%dx%d", mode->HDisplay, mode->VDisplay);
-}
-#endif
-
 /*
  * xf86LookupMode
  *

From 4359193aaa522599c502d012b9c163e993c01d79 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Thu, 13 Dec 2007 10:59:48 -0500
Subject: [PATCH 302/552] Explain a confusing #ifdef.

---
 hw/xfree86/modes/xf86Modes.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/hw/xfree86/modes/xf86Modes.c b/hw/xfree86/modes/xf86Modes.c
index 3879b9103..12ee6e05b 100644
--- a/hw/xfree86/modes/xf86Modes.c
+++ b/hw/xfree86/modes/xf86Modes.c
@@ -38,12 +38,14 @@
 
 extern XF86ConfigPtr xf86configptr;
 
-/**
- * @file this file contains symbols from xf86Mode.c and friends that are static
- * there but we still want to use.  We need to come up with better API here.
+/*
+ * This is the version number where we epoched.  These files get copied
+ * into drivers that want to use this setup infrastructure on pre-1.3
+ * servers, so when that happens they need to define these symbols
+ * themselves.  However, _in_ the server, we basically always define them now.
  */
-
 #if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,2,99,2,0)
+
 /**
  * Calculates the horizontal sync rate of a mode.
  *

From 1768af38c737f4c14d32f587b51a8ec3d3d6ed5f Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Thu, 13 Dec 2007 15:06:18 -0500
Subject: [PATCH 303/552] Add infrastructure for validating modes by memory
 bandwidth.

---
 hw/xfree86/common/xf86Mode.c |  2 ++
 hw/xfree86/common/xf86str.h  |  1 +
 hw/xfree86/modes/xf86Modes.c | 37 ++++++++++++++++++++++++++++++++++++
 hw/xfree86/modes/xf86Modes.h |  5 +++++
 4 files changed, 45 insertions(+)

diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c
index 544276bdf..782f08b8d 100644
--- a/hw/xfree86/common/xf86Mode.c
+++ b/hw/xfree86/common/xf86Mode.c
@@ -183,6 +183,8 @@ xf86ModeStatusToString(ModeStatus status)
         return "all modes must have the same resolution";
     case MODE_NO_REDUCED:
         return "monitor doesn't support reduced blanking";
+    case MODE_BANDWIDTH:
+	return "mode requires too much memory bandwidth";
     case MODE_BAD:
 	return "unknown reason";
     case MODE_ERROR:
diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
index af98b4fd5..2e0213597 100644
--- a/hw/xfree86/common/xf86str.h
+++ b/hw/xfree86/common/xf86str.h
@@ -125,6 +125,7 @@ typedef enum {
     MODE_ONE_HEIGHT,    /* only one height is supported */
     MODE_ONE_SIZE,      /* only one resolution is supported */
     MODE_NO_REDUCED,    /* monitor doesn't accept reduced blanking */
+    MODE_BANDWIDTH,	/* mode requires too much memory bandwidth */
     MODE_BAD = -2,	/* unspecified reason */
     MODE_ERROR	= -1	/* error condition */
 } ModeStatus;
diff --git a/hw/xfree86/modes/xf86Modes.c b/hw/xfree86/modes/xf86Modes.c
index 12ee6e05b..3febd3759 100644
--- a/hw/xfree86/modes/xf86Modes.c
+++ b/hw/xfree86/modes/xf86Modes.c
@@ -118,6 +118,24 @@ xf86ModeHeight (DisplayModePtr mode, Rotation rotation)
     }
 }
 
+/** Calculates the memory bandwidth (in MiB/sec) of a mode. */
+_X_EXPORT unsigned int
+xf86ModeBandwidth(DisplayModePtr mode, int depth)
+{
+    float a_active, a_total, active_percent, pixels_per_second;
+    int bytes_per_pixel = (depth + 7) / 8;
+
+    if (!mode->HTotal || !mode->VTotal || !mode->Clock)
+	return 0;
+
+    a_active = mode->HDisplay * mode->VDisplay;
+    a_total = mode->HTotal * mode->VTotal;
+    active_percent = a_active / a_total;
+    pixels_per_second = active_percent * mode->Clock * 1000.0;
+
+    return (unsigned int)(pixels_per_second * bytes_per_pixel / (1024 * 1024));
+}
+
 /** Sets a default mode name of <width>x<height> on a mode. */
 _X_EXPORT void
 xf86SetModeDefaultName(DisplayModePtr mode)
@@ -485,6 +503,25 @@ xf86ValidateModesUserConfig(ScrnInfoPtr pScrn, DisplayModePtr modeList)
 }
 
 
+/**
+ * Marks as bad any modes exceeding the given bandwidth.
+ *
+ * \param modeList doubly-linked or circular list of modes.
+ * \param bandwidth bandwidth in MHz.
+ * \param depth color depth.
+ */
+_X_EXPORT void
+xf86ValidateModesBandwidth(ScrnInfoPtr pScrn, DisplayModePtr modeList,
+			   unsigned int bandwidth, int depth)
+{
+    DisplayModePtr mode;
+
+    for (mode = modeList; mode != NULL; mode = mode->next) {
+	if (xf86ModeBandwidth(mode, depth) > bandwidth)
+	    mode->status = MODE_BANDWIDTH;
+    }
+}
+
 /**
  * Frees any modes from the list with a status other than MODE_OK.
  *
diff --git a/hw/xfree86/modes/xf86Modes.h b/hw/xfree86/modes/xf86Modes.h
index 3722d25a0..9ad5ee653 100644
--- a/hw/xfree86/modes/xf86Modes.h
+++ b/hw/xfree86/modes/xf86Modes.h
@@ -42,6 +42,7 @@
 
 double xf86ModeHSync(DisplayModePtr mode);
 double xf86ModeVRefresh(DisplayModePtr mode);
+unsigned int xf86ModeBandwidth(DisplayModePtr mode, int depth);
 
 int
 xf86ModeWidth (DisplayModePtr mode, Rotation rotation);
@@ -78,6 +79,10 @@ void
 xf86ValidateModesSync(ScrnInfoPtr pScrn, DisplayModePtr modeList,
 		      MonPtr mon);
 
+void
+xf86ValidateModesBandwidth(ScrnInfoPtr pScrn, DisplayModePtr modeList,
+			   unsigned int bandwidth, int depth);
+
 void
 xf86PruneInvalidModes(ScrnInfoPtr pScrn, DisplayModePtr *modeList,
 		      Bool verbose);

From efcdc0d7010f4e6ec833842cb010a07068edf7ab Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Thu, 13 Dec 2007 15:38:41 -0500
Subject: [PATCH 304/552] Correct the documentation comments in xf86Modes.c

Most of those functions do not, in fact, work with circular mode lists,
and by this point the API isn't really "proposed" anymore.
---
 hw/xfree86/modes/xf86Modes.c | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/hw/xfree86/modes/xf86Modes.c b/hw/xfree86/modes/xf86Modes.c
index 3febd3759..3d222cc73 100644
--- a/hw/xfree86/modes/xf86Modes.c
+++ b/hw/xfree86/modes/xf86Modes.c
@@ -339,12 +339,10 @@ xf86PrintModeline(int scrnIndex,DisplayModePtr mode)
 /**
  * Marks as bad any modes with unsupported flags.
  *
- * \param modeList doubly-linked or circular list of modes.
+ * \param modeList doubly-linked list of modes.
  * \param flags flags supported by the driver.
  *
  * \bug only V_INTERLACE and V_DBLSCAN are supported.  Is that enough?
- *
- * This is not in xf86Modes.c, but would be part of the proposed new API.
  */
 _X_EXPORT void
 xf86ValidateModesFlags(ScrnInfoPtr pScrn, DisplayModePtr modeList,
@@ -363,9 +361,7 @@ xf86ValidateModesFlags(ScrnInfoPtr pScrn, DisplayModePtr modeList,
 /**
  * Marks as bad any modes extending beyond the given max X, Y, or pitch.
  *
- * \param modeList doubly-linked or circular list of modes.
- *
- * This is not in xf86Modes.c, but would be part of the proposed new API.
+ * \param modeList doubly-linked list of modes.
  */
 _X_EXPORT void
 xf86ValidateModesSize(ScrnInfoPtr pScrn, DisplayModePtr modeList,
@@ -392,9 +388,7 @@ xf86ValidateModesSize(ScrnInfoPtr pScrn, DisplayModePtr modeList,
  * Marks as bad any modes that aren't supported by the given monitor's
  * hsync and vrefresh ranges.
  *
- * \param modeList doubly-linked or circular list of modes.
- *
- * This is not in xf86Modes.c, but would be part of the proposed new API.
+ * \param modeList doubly-linked list of modes.
  */
 _X_EXPORT void
 xf86ValidateModesSync(ScrnInfoPtr pScrn, DisplayModePtr modeList,
@@ -436,12 +430,10 @@ xf86ValidateModesSync(ScrnInfoPtr pScrn, DisplayModePtr modeList,
 /**
  * Marks as bad any modes extending beyond outside of the given clock ranges.
  *
- * \param modeList doubly-linked or circular list of modes.
+ * \param modeList doubly-linked list of modes.
  * \param min pointer to minimums of clock ranges
  * \param max pointer to maximums of clock ranges
  * \param n_ranges number of ranges.
- *
- * This is not in xf86Modes.c, but would be part of the proposed new API.
  */
 _X_EXPORT void
 xf86ValidateModesClocks(ScrnInfoPtr pScrn, DisplayModePtr modeList,
@@ -474,9 +466,7 @@ xf86ValidateModesClocks(ScrnInfoPtr pScrn, DisplayModePtr modeList,
  *
  * MODE_BAD is used as the rejection flag, for lack of a better flag.
  *
- * \param modeList doubly-linked or circular list of modes.
- *
- * This is not in xf86Modes.c, but would be part of the proposed new API.
+ * \param modeList doubly-linked list of modes.
  */
 _X_EXPORT void
 xf86ValidateModesUserConfig(ScrnInfoPtr pScrn, DisplayModePtr modeList)
@@ -506,7 +496,7 @@ xf86ValidateModesUserConfig(ScrnInfoPtr pScrn, DisplayModePtr modeList)
 /**
  * Marks as bad any modes exceeding the given bandwidth.
  *
- * \param modeList doubly-linked or circular list of modes.
+ * \param modeList doubly-linked list of modes.
  * \param bandwidth bandwidth in MHz.
  * \param depth color depth.
  */
@@ -528,8 +518,6 @@ xf86ValidateModesBandwidth(ScrnInfoPtr pScrn, DisplayModePtr modeList,
  * \param modeList pointer to a doubly-linked or circular list of modes.
  * \param verbose determines whether the reason for mode invalidation is
  *	  printed.
- *
- * This is not in xf86Modes.c, but would be part of the proposed new API.
  */
 _X_EXPORT void
 xf86PruneInvalidModes(ScrnInfoPtr pScrn, DisplayModePtr *modeList,

From 1a5910588a60af0c136595e2457d897d9e54ac88 Mon Sep 17 00:00:00 2001
From: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu, 13 Dec 2007 15:55:28 -0800
Subject: [PATCH 305/552] created x11-exec wrapper, which uses LaunchServices
 to find (and then exec) X11.app (cherry picked from commit
 fc04c9759b30d062111d4a7f3f411ed0f18cbde4)

---
 hw/xquartz/Makefile.am |  4 +++
 hw/xquartz/x11-exec.c  | 74 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+)
 create mode 100644 hw/xquartz/x11-exec.c

diff --git a/hw/xquartz/Makefile.am b/hw/xquartz/Makefile.am
index 831ba49f4..612a7d81f 100644
--- a/hw/xquartz/Makefile.am
+++ b/hw/xquartz/Makefile.am
@@ -1,3 +1,7 @@
+libexec_PROGRAMS = x11-exec
+
+x11_exec_LDFLAGS = -framework ApplicationServices
+
 noinst_LTLIBRARIES = libXquartz.la
 AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
 AM_CPPFLAGS = \
diff --git a/hw/xquartz/x11-exec.c b/hw/xquartz/x11-exec.c
new file mode 100644
index 000000000..d0b5c491a
--- /dev/null
+++ b/hw/xquartz/x11-exec.c
@@ -0,0 +1,74 @@
+/* x11-exec.c -- Find X11.app by bundle-id and exec it.  This is so launchd
+   can correctly find X11.app, even if the user moved it.
+
+ Copyright (c) 2007 Apple, Inc.
+ 
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation files
+ (the "Software"), to deal in the Software without restriction,
+ including without limitation the rights to use, copy, modify, merge,
+ publish, distribute, sublicense, and/or sell copies of the Software,
+ and to permit persons to whom the Software is furnished to do so,
+ subject to the following conditions:
+ 
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT.  IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
+ HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+ 
+ Except as contained in this notice, the name(s) of the above
+ copyright holders shall not be used in advertising or otherwise to
+ promote the sale, use or other dealings in this Software without
+ prior written authorization. */
+
+#include <ApplicationServices/ApplicationServices.h>
+#include <stdio.h>
+
+#define kX11AppBundleId "org.x.X11"
+#define kX11AppBundlePath "/Contents/MacOS/X11"
+
+int main(int argc, char **argv) {
+  char x11_path[PATH_MAX];
+  CFURLRef appURL = NULL;
+  OSStatus osstatus = 
+    LSFindApplicationForInfo(kLSUnknownCreator, CFSTR(kX11AppBundleId), 
+			     nil, nil, &appURL);
+  
+  switch (osstatus) {
+  case noErr:
+    if (appURL == NULL) {
+      fprintf(stderr, "%s: Invalid response from LSFindApplicationForInfo(%s)\n", 
+	      argv[0], kX11AppBundleId);
+      exit(1);
+    }
+    if (!CFURLGetFileSystemRepresentation(appURL, true, (unsigned char *)x11_path, sizeof(x11_path))) {
+      fprintf(stderr, "%s: Error resolving URL for %s\n", argv[0], kX11AppBundleId);
+      exit(2);
+    }
+    strlcpy(argv[0], "X11", strlen(argv[0])+1);
+    strlcat(x11_path, kX11AppBundlePath, sizeof(x11_path));
+//  fprintf(stderr, "X11.app = %s\n", x11_path);
+    execv(x11_path, argv);
+    fprintf(stderr, "Error executing X11.app (%s):", x11_path);
+    perror(NULL);
+    exit(3);
+    break;
+  case kLSApplicationNotFoundErr:
+    fprintf(stderr, "%s: Unable to find application for %s\n", argv[0], kX11AppBundleId);
+    exit(4);
+  default:
+    fprintf(stderr, "%s: Unable to find application for %s, error code = %d\n", 
+	    argv[0], kX11AppBundleId, osstatus);
+    exit(5);
+  }
+  /* not reached */
+}
+
+    

From 82e1aff9fbc1d15e3451707e3ccbf4b13eedda94 Mon Sep 17 00:00:00 2001
From: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu, 13 Dec 2007 15:57:39 -0800
Subject: [PATCH 306/552] Modified X11 plist to use x11-exec (cherry picked
 from commit 7d9a11329e476f45e4d9f9aebcb43469321347c7)

---
 .gitignore                                                | 1 -
 hw/xquartz/bundle/{org.x.X11.plist.in => org.x.X11.plist} | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
 rename hw/xquartz/bundle/{org.x.X11.plist.in => org.x.X11.plist} (87%)

diff --git a/.gitignore b/.gitignore
index 37f35f46f..2e60d58b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -275,7 +275,6 @@ hw/xprint/doc/Xprt.1x
 hw/xprint/doc/Xprt.man
 hw/xprint/dpmsstubs-wrapper.c
 hw/xprint/miinitext-wrapper.c
-hw/xquartz/bundle/org.x.X11.plist
 include/dix-config.h
 include/kdrive-config.h
 include/xgl-config.h
diff --git a/hw/xquartz/bundle/org.x.X11.plist.in b/hw/xquartz/bundle/org.x.X11.plist
similarity index 87%
rename from hw/xquartz/bundle/org.x.X11.plist.in
rename to hw/xquartz/bundle/org.x.X11.plist
index 26eca968a..1e646ac63 100644
--- a/hw/xquartz/bundle/org.x.X11.plist.in
+++ b/hw/xquartz/bundle/org.x.X11.plist
@@ -6,7 +6,7 @@
 		<string>org.x.X11</string>
 	<key>ProgramArguments</key>
 		<array>
-		<string>@APPLE_APPLICATIONS_DIR@/X11.app/Contents/MacOS/X11</string>
+		<string>/usr/libexec/x11-exec</string>
 		<string>-launchd</string>
 		</array>
 	<key>Sockets</key>

From c39212fd7353fc1a07a30bade90f78356c748e2d Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Thu, 13 Dec 2007 15:56:31 -0800
Subject: [PATCH 307/552] Xquartz: Don't hardcode LaunchAgents dir (cherry
 picked from commit 07a12d71fefd78c380078efa835700f2868ab204)

---
 configure.ac                  | 78 +++++------------------------------
 hw/xquartz/bundle/Makefile.am |  4 +-
 2 files changed, 13 insertions(+), 69 deletions(-)

diff --git a/configure.ac b/configure.ac
index b56c11583..cb3152486 100644
--- a/configure.ac
+++ b/configure.ac
@@ -478,17 +478,15 @@ AC_ARG_WITH(xkb-output,       AS_HELP_STRING([--with-xkb-output=PATH], [Path to
 AC_ARG_WITH(serverconfig-path, AS_HELP_STRING([--with-serverconfig-path=PATH], [Path to server config (default: ${libdir}/xserver)]),
 				[ SERVERCONFIG="$withval" ],
 				[ SERVERCONFIG="${libdir}/xserver" ])
-APPLE_APPLICATIONS_DIR="/Applications/Utilities"
 AC_ARG_WITH(apple-applications-dir,AS_HELP_STRING([--with-apple-applications-dir=PATH], [Path to the Applications directory (default: /Applications/Utilities)]),
-				[ APPLE_APPLICATIONS_DIR="${withval}" ].
+				[ APPLE_APPLICATIONS_DIR="${withval}" ],
 				[ APPLE_APPLICATIONS_DIR="/Applications/Utilities" ])
-
+AC_SUBST([APPLE_APPLICATIONS_DIR])
 AC_ARG_WITH(launchd,          AS_HELP_STRING([--with-launchd], [Build with support for Apple's launchd (default: auto)]), [LAUNCHD=$withval], [LAUNCHD=auto])
-
-AC_ARG_WITH(pci-txt-ids-dir, AS_HELP_STRING([--with-pci-txt-ids-dir=PATH],
-[Path to pci id directory (default: ${datadir}/X11/pci)]),
-				[ PCI_TXT_IDS_DIR="$withval" ],
-				[ PCI_TXT_IDS_DIR="${datadir}/X11/pci" ])
+AC_ARG_WITH(launchagents-dir,AS_HELP_STRING([--with-launchagents-dir=PATH], [Path to launchd's LaunchAgents directory (default: /Library/LaunchAgents)]),
+				[ launchagentsdir="${withval}" ],
+				[ launchagentsdir="/Library/LaunchAgents" ])
+AC_SUBST([launchagentsdir])
 AC_ARG_ENABLE(builddocs,      AS_HELP_STRING([--enable-builddocs], [Build docs (default: disabled)]),
                                 [BUILDDOCS=$enableval],
                                 [BUILDDOCS=no])
@@ -1709,7 +1707,6 @@ if test "x$XQUARTZ" = xyes; then
 	DARWIN_LIBS="$MI_LIB $OS_LIB $DIX_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB"
 	AC_SUBST([DARWIN_LIBS])
 	AC_CHECK_LIB([Xplugin],[xp_init],[:])
-	AC_SUBST([APPLE_APPLICATIONS_DIR])
 	CFLAGS="${CFLAGS} -DROOTLESS_WORKAROUND -DNO_ALLOCA"
 	if test "x$XF86MISC" = xyes || test "x$XF86MISC" = xauto; then
 		AC_MSG_NOTICE([Disabling XF86Misc extension])
@@ -1759,73 +1756,20 @@ if test "x$X11APP" = xauto; then
 fi
 AM_CONDITIONAL(X11APP,[test "X$X11APP" = Xyes]) 
 
-if test "x$LAUNCHD" = xauto; then
-	# Do we want to have this default to on for Xquartz builds only or any time we have launchd (like Xnest or Xvfb on OS-X)
-	#AC_CHECK_PROG(LAUNCHD, [launchd], [yes], [no])
-	AC_MSG_CHECKING([whether to support launchd])
-	if test "x$XQUARTZ" = xyes ; then
+if test "x$LAUNCHD" = "xauto"; then
+	if test "x$XQUARTZ" = "xyes" ; then
 		LAUNCHD=yes
 	else
-		LAUNCHD=no
+		AC_CHECK_PROG(LAUNCHD, [launchd], [yes], [no])
 	fi
-	AC_MSG_RESULT([$LAUNCHD])
-fi
-AM_CONDITIONAL(LAUNCHD, [test "x$LAUNCHD" = xyes])
-
-dnl DMX DDX
-
-AC_MSG_CHECKING([whether to build Xdmx DDX])
-PKG_CHECK_MODULES([DMXMODULES], [xmuu xext x11 xrender xfixes xfont xi dmxproto xau $XDMCP_MODULES], [have_dmx=yes], [have_dmx=no])
-if test "x$DMX" = xauto; then
-	DMX="$have_dmx"
 fi
 AC_MSG_RESULT([$DMX])
 AM_CONDITIONAL(DMX, [test "x$DMX" = xyes])
 
-if test "x$DMX" = xyes; then
-	if test "x$have_dmx" = xno; then
-		AC_MSG_ERROR([Xdmx build explicitly requested, but required
-		              modules not found.])
-	fi
-	DMX_INCLUDES="$XEXT_INC $RENDER_INC $XTRAP_INC $RECORD_INC"
-	XDMX_CFLAGS="$DMXMODULES_CFLAGS"
-	XDMX_LIBS="$XEXT_LIB $FB_LIB $CONFIG_LIB $RENDER_LIB $XTRAP_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_SHADOW_LIB $MIEXT_DAMAGE_LIB"
-	XDMX_SYS_LIBS="$DMXMODULES_LIBS"
-	AC_SUBST([XDMX_CFLAGS])
-	AC_SUBST([XDMX_LIBS])
-	AC_SUBST([XDMX_SYS_LIBS])
-
-dnl USB sources in DMX require <linux/input.h>
-	AC_CHECK_HEADER([linux/input.h], DMX_BUILD_USB="yes",
-			DMX_BUILD_USB="no")
-dnl Linux sources in DMX require <linux/keyboard.h>
-	AC_CHECK_HEADER([linux/keyboard.h], DMX_BUILD_LNX="yes",
-			DMX_BUILD_LNX="no")
-	if test "x$GLX" = xyes; then
-		PKG_CHECK_MODULES([GL], [glproto])
-	fi
-	PKG_CHECK_MODULES([XDMXCONFIG_DEP], [xaw7 xmu xt xpm x11])
-	AC_SUBST(XDMXCONFIG_DEP_CFLAGS)
-	AC_SUBST(XDMXCONFIG_DEP_LIBS)
-	PKG_CHECK_MODULES([DMXEXAMPLES_DEP], [dmx xext x11])
-	AC_SUBST(DMXEXAMPLES_DEP_LIBS)
-	PKG_CHECK_MODULES([DMXXMUEXAMPLES_DEP], [dmx xmu xext x11])
-	AC_SUBST(DMXXMUEXAMPLES_DEP_LIBS)
-	PKG_CHECK_MODULES([DMXXIEXAMPLES_DEP], [dmx xi xext x11])
-	AC_SUBST(DMXXIEXAMPLES_DEP_LIBS)
-	PKG_CHECK_MODULES([XTSTEXAMPLES_DEP], [xtst xext x11])
-	AC_SUBST(XTSTEXAMPLES_DEP_LIBS)
-	PKG_CHECK_MODULES([XRESEXAMPLES_DEP], [xres xext x11])
-	AC_SUBST(XRESEXAMPLES_DEP_LIBS)
-	PKG_CHECK_MODULES([X11EXAMPLES_DEP], [xext x11])
-	AC_SUBST(X11EXAMPLES_DEP_LIBS)
-fi
-AM_CONDITIONAL([DMX_BUILD_LNX], [test "x$DMX_BUILD_LNX" = xyes])
-AM_CONDITIONAL([DMX_BUILD_USB], [test "x$DMX_BUILD_USB" = xyes])
-if test "x$LAUNCHD" = xyes ; then
+if test "x$LAUNCHD" = "xyes" ; then
 	AC_DEFINE(HAVE_LAUNCHD, 1, [launchd support available])
 fi
-AM_CONDITIONAL(LAUNCHD, [test "x$LAUNCHD" = xyes])
+AM_CONDITIONAL(LAUNCHD, [test "x$LAUNCHD" = "xyes"])
 
 dnl kdrive DDX
 
diff --git a/hw/xquartz/bundle/Makefile.am b/hw/xquartz/bundle/Makefile.am
index 573443497..8aa23575f 100644
--- a/hw/xquartz/bundle/Makefile.am
+++ b/hw/xquartz/bundle/Makefile.am
@@ -7,9 +7,9 @@ x11app:
 
 install-data-hook:
 	xcodebuild install DSTROOT="/$(DESTDIR)" INSTALL_PATH="$(APPLE_APPLICATIONS_DIR)" DEPLOYMENT_LOCATION=YES SKIP_INSTALL=NO ARCHS="$(X11APP_ARCHS)"
+
 if LAUNCHD
-	$(MKDIR_P) "$(DESTDIR)/System/Library/LaunchAgents/"
-	$(INSTALL) org.x.X11.plist "$(DESTDIR)/System/Library/LaunchAgents/"
+launchagents_DATA = org.x.X11.plist
 endif
 
 clean-local:

From cb0d7e2c2692a332e2bd5495478ebf9a6cd601d0 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Thu, 13 Dec 2007 16:23:46 -0800
Subject: [PATCH 308/552] Xquartz: Don't hardcode libexec dir (cherry picked
 from commit 67b479ef80cb740a24981335eb8d596744168a62)

---
 configure.ac                                           |  1 -
 hw/xquartz/Makefile.am                                 | 10 ++++++----
 hw/xquartz/bundle/Makefile.am                          |  9 ++++++++-
 .../bundle/{org.x.X11.plist => org.x.X11.plist.pre}    |  2 +-
 4 files changed, 15 insertions(+), 7 deletions(-)
 rename hw/xquartz/bundle/{org.x.X11.plist => org.x.X11.plist.pre} (91%)

diff --git a/configure.ac b/configure.ac
index cb3152486..090a0f5cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2118,7 +2118,6 @@ hw/xnest/Makefile
 hw/xwin/Makefile
 hw/xquartz/Makefile
 hw/xquartz/bundle/Makefile
-hw/xquartz/bundle/org.x.X11.plist
 hw/xquartz/xpr/Makefile
 hw/kdrive/Makefile
 hw/kdrive/ati/Makefile
diff --git a/hw/xquartz/Makefile.am b/hw/xquartz/Makefile.am
index 612a7d81f..97b8c94e0 100644
--- a/hw/xquartz/Makefile.am
+++ b/hw/xquartz/Makefile.am
@@ -1,7 +1,3 @@
-libexec_PROGRAMS = x11-exec
-
-x11_exec_LDFLAGS = -framework ApplicationServices
-
 noinst_LTLIBRARIES = libXquartz.la
 AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
 AM_CPPFLAGS = \
@@ -13,6 +9,12 @@ AM_CPPFLAGS = \
 
 if X11APP
 X11APP_SUBDIRS = bundle
+
+if LAUNCHD
+libexec_PROGRAMS = x11-exec
+x11_exec_LDFLAGS = -framework ApplicationServices
+endif
+
 endif
 
 SUBDIRS = . xpr $(X11APP_SUBDIRS)
diff --git a/hw/xquartz/bundle/Makefile.am b/hw/xquartz/bundle/Makefile.am
index 8aa23575f..775e1aad0 100644
--- a/hw/xquartz/bundle/Makefile.am
+++ b/hw/xquartz/bundle/Makefile.am
@@ -9,7 +9,14 @@ install-data-hook:
 	xcodebuild install DSTROOT="/$(DESTDIR)" INSTALL_PATH="$(APPLE_APPLICATIONS_DIR)" DEPLOYMENT_LOCATION=YES SKIP_INSTALL=NO ARCHS="$(X11APP_ARCHS)"
 
 if LAUNCHD
-launchagents_DATA = org.x.X11.plist
+launchagents_PRE = org.x.X11.plist.pre
+launchagents_DATA = $(launchagents_PRE:plist.pre=plist)
+
+CPP_FILES_FLAGS = -D__libexecdir__="${libexecdir}"
+
+CLEANFILES = $(launchagents_DATA)
+
+include $(top_srcdir)/cpprules.in
 endif
 
 clean-local:
diff --git a/hw/xquartz/bundle/org.x.X11.plist b/hw/xquartz/bundle/org.x.X11.plist.pre
similarity index 91%
rename from hw/xquartz/bundle/org.x.X11.plist
rename to hw/xquartz/bundle/org.x.X11.plist.pre
index 1e646ac63..83d8b2f31 100644
--- a/hw/xquartz/bundle/org.x.X11.plist
+++ b/hw/xquartz/bundle/org.x.X11.plist.pre
@@ -6,7 +6,7 @@
 		<string>org.x.X11</string>
 	<key>ProgramArguments</key>
 		<array>
-		<string>/usr/libexec/x11-exec</string>
+		<string>__libexecdir__/x11-exec</string>
 		<string>-launchd</string>
 		</array>
 	<key>Sockets</key>

From 1c1a4bc970be061484bb8dcccf945eb08144c656 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 13 Dec 2007 19:51:40 -0500
Subject: [PATCH 309/552] devPrivates rework: more cleanup from previous merge
 operation.

---
 hw/kdrive/ephyr/ephyrdriext.c | 43 +++++++++--------------------------
 hw/kdrive/src/kdrive.c        | 15 ++++++------
 hw/kdrive/src/kxv.c           | 10 +++++---
 hw/xquartz/darwin.c           |  9 +-------
 4 files changed, 26 insertions(+), 51 deletions(-)

diff --git a/hw/kdrive/ephyr/ephyrdriext.c b/hw/kdrive/ephyr/ephyrdriext.c
index e3d0cfbb4..b6be47f5e 100644
--- a/hw/kdrive/ephyr/ephyrdriext.c
+++ b/hw/kdrive/ephyr/ephyrdriext.c
@@ -44,6 +44,7 @@
 #include <X11/dri/xf86dri.h>
 #include <X11/dri/xf86dristr.h>
 #include "misc.h"
+#include "privates.h"
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "colormapst.h"
@@ -118,14 +119,13 @@ static Bool findWindowPairFromLocal (WindowPtr a_local,
 
 static unsigned char DRIReqCode = 0;
 
-static int ephyrDRIGeneration=-1 ;
-static int ephyrDRIWindowIndex=-1 ;
-static int ephyrDRIScreenIndex=-1 ;
+static DevPrivateKey ephyrDRIWindowKey = &ephyrDRIWindowKey;
+static DevPrivateKey ephyrDRIScreenKey = &ephyrDRIScreenKey;
 
-#define GET_EPHYR_DRI_WINDOW_PRIV(win) \
-    ((EphyrDRIWindowPrivPtr)((win)->devPrivates[ephyrDRIWindowIndex].ptr))
-#define GET_EPHYR_DRI_SCREEN_PRIV(screen) \
-    ((EphyrDRIScreenPrivPtr)((screen)->devPrivates[ephyrDRIScreenIndex].ptr))
+#define GET_EPHYR_DRI_WINDOW_PRIV(win) ((EphyrDRIWindowPrivPtr) \
+    dixLookupPrivate(&(win)->devPrivates, ephyrDRIWindowKey))
+#define GET_EPHYR_DRI_SCREEN_PRIV(screen) ((EphyrDRIScreenPrivPtr) \
+    dixLookupPrivate(&(screen)->devPrivates, ephyrDRIScreenKey))
 
 
 Bool
@@ -164,28 +164,18 @@ ephyrDRIExtensionInit (ScreenPtr a_screen)
         EPHYR_LOG_ERROR ("failed to register DRI extension\n") ;
         goto out ;
     }
-    if (ephyrDRIGeneration != serverGeneration) {
-        ephyrDRIScreenIndex = AllocateScreenPrivateIndex () ;
-        if (ephyrDRIScreenIndex < 0) {
-            EPHYR_LOG_ERROR ("failed to allocate screen priv index\n") ;
-            goto out ;
-        }
-    }
     screen_priv = xcalloc (1, sizeof (EphyrDRIScreenPrivRec)) ;
     if (!screen_priv) {
         EPHYR_LOG_ERROR ("failed to allocate screen_priv\n") ;
         goto out ;
     }
-    a_screen->devPrivates[ephyrDRIScreenIndex].ptr = screen_priv;
+    dixSetPrivate(&a_screen->devPrivates, ephyrDRIScreenKey, screen_priv);
 
     if (!ephyrDRIScreenInit (a_screen)) {
         EPHYR_LOG_ERROR ("ephyrDRIScreenInit() failed\n") ;
         goto out ;
     }
     EphyrMirrorHostVisuals (a_screen) ;
-    if (ephyrDRIGeneration != serverGeneration) {
-        ephyrDRIGeneration = serverGeneration ;
-    }
     is_ok=TRUE ;
 out:
     EPHYR_LOG ("leave\n") ;
@@ -203,17 +193,6 @@ ephyrDRIScreenInit (ScreenPtr a_screen)
     screen_priv=GET_EPHYR_DRI_SCREEN_PRIV (a_screen) ;
     EPHYR_RETURN_VAL_IF_FAIL (screen_priv, FALSE) ;
 
-    if (ephyrDRIGeneration != serverGeneration) {
-        ephyrDRIWindowIndex = AllocateWindowPrivateIndex () ;
-        if (ephyrDRIWindowIndex < 0) {
-            EPHYR_LOG_ERROR ("failed to allocate window priv index\n") ;
-            goto out ;
-        }
-    }
-    if (!AllocateWindowPrivate (a_screen, ephyrDRIWindowIndex, 0)) {
-        EPHYR_LOG_ERROR ("failed to allocate window privates\n") ;
-        goto out ;
-    }
     screen_priv->CreateWindow = a_screen->CreateWindow ;
     screen_priv->DestroyWindow = a_screen->DestroyWindow ;
     screen_priv->MoveWindow = a_screen->MoveWindow ;
@@ -254,7 +233,7 @@ ephyrDRICreateWindow (WindowPtr a_win)
     screen->CreateWindow = ephyrDRICreateWindow ;
 
     if (is_ok) {
-        a_win->devPrivates[ephyrDRIWindowIndex].ptr = NULL ;
+	dixSetPrivate(&a_win->devPrivates, ephyrDRIWindowKey, NULL);
     }
     return is_ok ;
 }
@@ -285,7 +264,7 @@ ephyrDRIDestroyWindow (WindowPtr a_win)
         if (win_priv) {
             destroyHostPeerWindow (a_win) ;
             xfree (win_priv) ;
-            a_win->devPrivates[ephyrDRIWindowIndex].ptr = NULL ;
+	    dixSetPrivate(&a_win->devPrivates, ephyrDRIWindowKey, NULL);
             EPHYR_LOG ("destroyed the remote peer window\n") ;
         }
     }
@@ -1088,7 +1067,7 @@ ProcXF86DRICreateDrawable (ClientPtr client)
             EPHYR_LOG_ERROR ("failed to allocate window private\n") ;
             return BadAlloc ;
         }
-        window->devPrivates[ephyrDRIWindowIndex].ptr = win_priv ;
+	dixSetPrivate(&window->devPrivates, ephyrDRIWindowKey, win_priv);
         EPHYR_LOG ("paired window '%#x' with remote '%d'\n",
                    (unsigned int)window, remote_win) ;
     }
diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c
index 5376f19db..50148c49c 100644
--- a/hw/kdrive/src/kdrive.c
+++ b/hw/kdrive/src/kdrive.c
@@ -29,6 +29,7 @@
 #endif
 #include <mivalidate.h>
 #include <dixstruct.h>
+#include "privates.h"
 #ifdef RANDR
 #include <randrstr.h>
 #endif
@@ -66,8 +67,8 @@ KdDepths    kdDepths[] = {
 
 #define KD_DEFAULT_BUTTONS 5
 
-int                 kdScreenPrivateIndex;
-unsigned long       kdGeneration;
+DevPrivateKey       kdScreenPrivateKey = &kdScreenPrivateKey;
+unsigned long	    kdGeneration;
 
 Bool                kdVideoTest;
 unsigned long       kdVideoTestTime;
@@ -751,10 +752,8 @@ KdAllocatePrivates (ScreenPtr pScreen)
     KdPrivScreenPtr	pScreenPriv;
     
     if (kdGeneration != serverGeneration)
-    {
-	kdScreenPrivateIndex = AllocateScreenPrivateIndex();
-	kdGeneration         = serverGeneration;
-    }
+	kdGeneration = serverGeneration;
+
     pScreenPriv = (KdPrivScreenPtr) xalloc(sizeof (*pScreenPriv));
     if (!pScreenPriv)
 	return FALSE;
@@ -1401,8 +1400,8 @@ KdInitOutput (ScreenInfo    *pScreenInfo,
 }
 
 #ifdef DPMSExtension
-void
-DPMSSet(int level)
+int
+DPMSSet(ClientPtr client, int level)
 {
 }
 
diff --git a/hw/kdrive/src/kxv.c b/hw/kdrive/src/kxv.c
index b6ff4f831..0b8d1c4e0 100644
--- a/hw/kdrive/src/kxv.c
+++ b/hw/kdrive/src/kxv.c
@@ -106,9 +106,10 @@ static Bool KdXVInitAdaptors(ScreenPtr, KdVideoAdaptorPtr*, int);
 
 DevPrivateKey KdXVWindowKey = &KdXVWindowKey;
 DevPrivateKey KdXvScreenKey = &KdXvScreenKey;
+static unsigned long KdXVGeneration = 0;
 static unsigned long PortResource = 0;
 
-int (*XvGetScreenKeyProc)(void) = XvGetScreenKey;
+DevPrivateKey (*XvGetScreenKeyProc)(void) = XvGetScreenKey;
 unsigned long (*XvGetRTPortProc)(void) = XvGetRTPort;
 int (*XvScreenInitProc)(ScreenPtr) = XvScreenInit;
 
@@ -191,12 +192,15 @@ KdXVScreenInit(
 
 /*   fprintf(stderr,"KdXVScreenInit initializing %d adaptors\n",num); */
 
+  if (KdXVGeneration != serverGeneration)
+      KdXVGeneration = serverGeneration;
+
   if(!XvGetScreenKeyProc || !XvGetRTPortProc || !XvScreenInitProc)
 	return FALSE;  
 
   if(Success != (*XvScreenInitProc)(pScreen)) return FALSE;
 
-  KdXvScreenIndex = (*XvGetScreenKeyProc)();
+  KdXvScreenKey = (*XvGetScreenKeyProc)();
   PortResource = (*XvGetRTPortProc)();
 
   pxvs = GET_XV_SCREEN(pScreen);
@@ -1106,7 +1110,7 @@ KdXVClipNotify(WindowPtr pWin, int dx, int dy)
 	    pPriv->pDraw = NULL;
 
 	    if(!pPrev) 
-		dixSetPrivate(&pWin->devPrivates, KdXVWindowKey, winPriv->next);
+		dixSetPrivate(&pWin->devPrivates, KdXVWindowKey, WinPriv->next);
 	    else
 	       pPrev->next = WinPriv->next;
 	    tmp = WinPriv;
diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index ab4dc0dfd..d932bcd74 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -88,7 +88,7 @@ FILE *debug_log_fp = NULL;
  * X server shared global variables
  */
 int                     darwinScreensFound = 0;
-int                     darwinScreenIndex = 0;
+DevPrivateKey           darwinScreenKey = &darwinScreenKey;
 io_connect_t            darwinParamConnect = 0;
 int                     darwinEventReadFD = -1;
 int                     darwinEventWriteFD = -1;
@@ -613,7 +613,6 @@ DarwinAdjustScreenOrigins(ScreenInfo *pScreenInfo)
 void InitOutput( ScreenInfo *pScreenInfo, int argc, char **argv )
 {
     int i;
-    static unsigned long generation = 0;
 
     pScreenInfo->imageByteOrder = IMAGE_BYTE_ORDER;
     pScreenInfo->bitmapScanlineUnit = BITMAP_SCANLINE_UNIT;
@@ -625,12 +624,6 @@ void InitOutput( ScreenInfo *pScreenInfo, int argc, char **argv )
     for (i = 0; i < NUMFORMATS; i++)
         pScreenInfo->formats[i] = formats[i];
 
-    // Allocate private storage for each screen's Darwin specific info
-    if (generation != serverGeneration) {
-        darwinScreenIndex = AllocateScreenPrivateIndex();
-        generation = serverGeneration;
-    }
-
     // Discover screens and do mode specific initialization
     QuartzInitOutput(argc, argv);
 

From a2df51f8e95a814c54b806814020155ac8bd177d Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 14 Dec 2007 00:53:54 -0500
Subject: [PATCH 310/552] Bump video driver ABI and extension ABI for
 devPrivates rework.

---
 hw/xfree86/common/xf86Module.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index 852e51f43..240155ca7 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -83,9 +83,9 @@ typedef enum {
  * mask is 0xFFFF0000.
  */
 #define ABI_ANSIC_VERSION	SET_ABI_VERSION(0, 3)
-#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(3, 0)
+#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(4, 0)
 #define ABI_XINPUT_VERSION	SET_ABI_VERSION(2, 0)
-#define ABI_EXTENSION_VERSION	SET_ABI_VERSION(0, 3)
+#define ABI_EXTENSION_VERSION	SET_ABI_VERSION(1, 0)
 #define ABI_FONT_VERSION	SET_ABI_VERSION(0, 5)
 
 #define MODINFOSTRING1	0xef23fdc5

From a14a143832be844b4b890b0160ccb9fc8293c28c Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 14 Dec 2007 00:57:16 -0500
Subject: [PATCH 311/552] Bump server version for devPrivates rework / XACE.

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 49d57d7df..1d8aa60ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.4.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.4.99.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE

From 5b02a6ca5b31db69d08f2f452494c0f93a6260d9 Mon Sep 17 00:00:00 2001
From: Bartosz Fabianowski <freebsd@chillt.de>
Date: Fri, 7 Dec 2007 02:38:14 +0000
Subject: [PATCH 312/552] Input: Fix proximity events with valuators

Initialise num_events to 1, so we always send a proximity event, and then
optionally valuator events.  Also make sure mieq can deal with valuator
events sent after proximity events.
---
 dix/getevents.c | 2 +-
 mi/mieq.c       | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dix/getevents.c b/dix/getevents.c
index 08744ae03..40fc7f2a9 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -707,7 +707,7 @@ _X_EXPORT int
 GetProximityEvents(xEvent *events, DeviceIntPtr pDev, int type,
                    int first_valuator, int num_valuators, int *valuators)
 {
-    int num_events = 0;
+    int num_events = 1;
     deviceKeyButtonPointer *kbp = (deviceKeyButtonPointer *) events;
 
     /* Sanity checks. */
diff --git a/mi/mieq.c b/mi/mieq.c
index d946e7d04..c2f687a6b 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -128,7 +128,9 @@ mieqEnqueue(DeviceIntPtr pDev, xEvent *e)
         if (oldtail == miEventQueue.head ||
             !(lastkbp->type == DeviceMotionNotify ||
               lastkbp->type == DeviceButtonPress ||
-              lastkbp->type == DeviceButtonRelease) ||
+              lastkbp->type == DeviceButtonRelease ||
+              lastkbp->type == ProximityIn ||
+              lastkbp->type == ProximityOut) ||
             ((lastkbp->deviceid & DEVICE_BITS) !=
              (v->deviceid & DEVICE_BITS))) {
             ErrorF("mieqEnequeue: out-of-order valuator event; dropping.\n");

From ca59d3f7bdb5f3724ff45ea57912c0b1098a73d6 Mon Sep 17 00:00:00 2001
From: Arkadiusz Miskiewicz <arekm@maven.pl>
Date: Thu, 13 Dec 2007 00:09:08 +0200
Subject: [PATCH 313/552] Xprint: Clean up generated files

Remember to clean generated wrapper files.
---
 hw/xprint/Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hw/xprint/Makefile.am b/hw/xprint/Makefile.am
index c440473a0..1b8004841 100644
--- a/hw/xprint/Makefile.am
+++ b/hw/xprint/Makefile.am
@@ -53,3 +53,5 @@ Xprt_SOURCES =			\
         $(top_srcdir)/fb/fbcmap_mi.c
 
 EXTRA_DIST = ValTree.c
+
+CLEANFILES = miinitext-wrapper.c dpmsstubs-wrapper.c

From 863ba390e9fdf0d37cdf03bf5eebe7fdfe6288f5 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 14 Dec 2007 00:03:13 -0200
Subject: [PATCH 314/552] kdrive/fbdev: use operating system input devices

---
 hw/kdrive/fbdev/fbinit.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/hw/kdrive/fbdev/fbinit.c b/hw/kdrive/fbdev/fbinit.c
index 5e1c88b2c..de80c79aa 100644
--- a/hw/kdrive/fbdev/fbinit.c
+++ b/hw/kdrive/fbdev/fbinit.c
@@ -42,17 +42,7 @@ InitOutput (ScreenInfo *pScreenInfo, int argc, char **argv)
 void
 InitInput (int argc, char **argv)
 {
-    KdKeyboardInfo *ki;
-
-    KdAddKeyboardDriver (&LinuxKeyboardDriver);
-    KdAddPointerDriver (&LinuxMouseDriver);
-#ifdef TSLIB
-    KdAddPointerDriver (&TsDriver);
-#endif
-
-    ki = KdParseKeyboard ("keybd");
-    KdAddKeyboard(ki);
-
+    KdOsAddInputDrivers ();
     KdInitInput ();
 }
 

From e110255501e2f699709e6978f5e52d3be96333c8 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 14 Dec 2007 08:45:09 -0200
Subject: [PATCH 315/552] kdrive/vesa: use operating system input devices

---
 hw/kdrive/vesa/vesainit.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/hw/kdrive/vesa/vesainit.c b/hw/kdrive/vesa/vesainit.c
index 90b168108..a5e216cfd 100644
--- a/hw/kdrive/vesa/vesainit.c
+++ b/hw/kdrive/vesa/vesainit.c
@@ -70,15 +70,7 @@ InitOutput (ScreenInfo *pScreenInfo, int argc, char **argv)
 void
 InitInput (int argc, char **argv)
 {
-    KdKeyboardInfo *ki = NULL;
-        
-    KdAddPointerDriver(&LinuxMouseDriver);
-    KdAddKeyboardDriver(&LinuxKeyboardDriver);
-    ki = KdNewKeyboard();
-    if (ki) {
-        ki->driver = &LinuxKeyboardDriver;
-        KdAddKeyboard(ki);
-    }
+    KdOsAddInputDrivers();
     KdInitInput();
 }
 

From 86730337001ba4db6d77fe42406695e32784b157 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 14 Dec 2007 08:46:35 -0200
Subject: [PATCH 316/552] kdrive/ati: use operating system input devices

---
 hw/kdrive/ati/ati_stub.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/hw/kdrive/ati/ati_stub.c b/hw/kdrive/ati/ati_stub.c
index 3669fd743..f881b7f7b 100644
--- a/hw/kdrive/ati/ati_stub.c
+++ b/hw/kdrive/ati/ati_stub.c
@@ -50,14 +50,7 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
 void
 InitInput(int argc, char **argv)
 {
-        KdKeyboardInfo *ki = NULL;
-        
-        KdAddPointerDriver(&LinuxMouseDriver);
-        ki = KdNewKeyboard();
-        if (ki) {
-            ki->driver = &LinuxKeyboardDriver;
-            KdAddKeyboard(ki);
-        }
+	KdOsAddInputDrivers();
 	KdInitInput();
 }
 

From 95c02adea80a14e18bb51876bc1418eccdade31d Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Fri, 14 Dec 2007 15:21:40 -0800
Subject: [PATCH 317/552] Xquartz: Fixed cpprules include

---
 hw/xquartz/bundle/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/xquartz/bundle/Makefile.am b/hw/xquartz/bundle/Makefile.am
index 775e1aad0..da297e92e 100644
--- a/hw/xquartz/bundle/Makefile.am
+++ b/hw/xquartz/bundle/Makefile.am
@@ -15,9 +15,9 @@ launchagents_DATA = $(launchagents_PRE:plist.pre=plist)
 CPP_FILES_FLAGS = -D__libexecdir__="${libexecdir}"
 
 CLEANFILES = $(launchagents_DATA)
+endif
 
 include $(top_srcdir)/cpprules.in
-endif
 
 clean-local:
 	rm -rf build

From 062d9234e233fc4c1c617f59093da973c9d3e2ce Mon Sep 17 00:00:00 2001
From: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu, 13 Dec 2007 20:40:27 -0800
Subject: [PATCH 318/552] fixed bug in x11-exec that prevent icon from showing
 up (cherry picked from commit e1f4a0c20d3a52d98954c4b28d0ec4d44564bc32)

---
 hw/xquartz/x11-exec.c | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/hw/xquartz/x11-exec.c b/hw/xquartz/x11-exec.c
index d0b5c491a..105fd7202 100644
--- a/hw/xquartz/x11-exec.c
+++ b/hw/xquartz/x11-exec.c
@@ -28,7 +28,7 @@
  promote the sale, use or other dealings in this Software without
  prior written authorization. */
 
-#include <ApplicationServices/ApplicationServices.h>
+#include <CoreServices/CoreServices.h>
 #include <stdio.h>
 
 #define kX11AppBundleId "org.x.X11"
@@ -36,10 +36,10 @@
 
 int main(int argc, char **argv) {
   char x11_path[PATH_MAX];
+  char** args = NULL;
   CFURLRef appURL = NULL;
-  OSStatus osstatus = 
-    LSFindApplicationForInfo(kLSUnknownCreator, CFSTR(kX11AppBundleId), 
-			     nil, nil, &appURL);
+  OSStatus osstatus = LSFindApplicationForInfo(kLSUnknownCreator, CFSTR(kX11AppBundleId), 
+					       nil, nil, &appURL);
   
   switch (osstatus) {
   case noErr:
@@ -52,10 +52,20 @@ int main(int argc, char **argv) {
       fprintf(stderr, "%s: Error resolving URL for %s\n", argv[0], kX11AppBundleId);
       exit(2);
     }
-    strlcpy(argv[0], "X11", strlen(argv[0])+1);
+    
+    args = (char**)malloc(sizeof (char*) * (argc + 1));
     strlcat(x11_path, kX11AppBundlePath, sizeof(x11_path));
-//  fprintf(stderr, "X11.app = %s\n", x11_path);
-    execv(x11_path, argv);
+    if (args) {
+      int i;
+      args[0] = x11_path;
+      for (i = 1; i < argc; ++i) {
+        args[i] = argv[i];
+      }
+      args[i] = NULL;
+    }
+    
+    fprintf(stderr, "X11.app = %s\n", x11_path);
+    execv(x11_path, args);
     fprintf(stderr, "Error executing X11.app (%s):", x11_path);
     perror(NULL);
     exit(3);

From e0e59b3bbc4d8e7ac3934a6f6a9e4a15b328c475 Mon Sep 17 00:00:00 2001
From: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu, 13 Dec 2007 20:44:33 -0800
Subject: [PATCH 319/552] we need to link against CoreServices, not
 ApplicationServices (cherry picked from commit
 ba4d2096e7953ef5b971682f0e28535da968acb1)

---
 hw/xquartz/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/xquartz/Makefile.am b/hw/xquartz/Makefile.am
index 97b8c94e0..0326f784f 100644
--- a/hw/xquartz/Makefile.am
+++ b/hw/xquartz/Makefile.am
@@ -12,7 +12,7 @@ X11APP_SUBDIRS = bundle
 
 if LAUNCHD
 libexec_PROGRAMS = x11-exec
-x11_exec_LDFLAGS = -framework ApplicationServices
+x11_exec_LDFLAGS = -framework CoreServices
 endif
 
 endif

From a3f7f7b60e391e6106f5db40b3fe5fbc67ccd836 Mon Sep 17 00:00:00 2001
From: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu, 13 Dec 2007 20:45:14 -0800
Subject: [PATCH 320/552] clarified debug message to indicate that we're
 sleeping (in case we get reports about slow launch times, this will help
 clarify what's happening) (cherry picked from commit
 2eea3483cf893f8f81bacd434b31408dfb38cb06)

---
 hw/xquartz/bundle/bundle-main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/xquartz/bundle/bundle-main.c b/hw/xquartz/bundle/bundle-main.c
index 53f60a3e2..681e1a8cc 100644
--- a/hw/xquartz/bundle/bundle-main.c
+++ b/hw/xquartz/bundle/bundle-main.c
@@ -52,7 +52,7 @@ int main(int argc, char **argv) {
         /* Now, try to open a display, if so, run the launcher */
         display = XOpenDisplay(NULL);
         if(display) {
-            fprintf(stderr, "X11.app: main(): closing the display");
+            fprintf(stderr, "X11.app: main(): closing the display and sleeping");
             /* Could open the display, start the launcher */
             XCloseDisplay(display);
             

From ff5abc72fcc459d7eac663e5f8e4d40b28749841 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 14 Dec 2007 17:59:29 -0200
Subject: [PATCH 321/552] registry: XREGISTRY_UNKNOWN needs to be defined even
 if XREGISTRY isn't enabled

In case XREGISTRY isn't enabled, XREGISTRY_UNKNOWN is used but it's
not being available. It's now always available.
---
 include/registry.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/registry.h b/include/registry.h
index edd6ef9a7..29e5fdfd3 100644
--- a/include/registry.h
+++ b/include/registry.h
@@ -12,6 +12,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef DIX_REGISTRY_H
 #define DIX_REGISTRY_H
 
+/*
+ * Result returned from any unsuccessful lookup
+ */
+#define XREGISTRY_UNKNOWN "<unknown>"
+
 #ifdef XREGISTRY
 
 #include "resource.h"
@@ -35,11 +40,6 @@ const char *LookupEventName(int event);
 const char *LookupErrorName(int error);
 const char *LookupResourceName(RESTYPE rtype);
 
-/*
- * Result returned from any unsuccessful lookup
- */
-#define XREGISTRY_UNKNOWN "<unknown>"
-
 /*
  * Setup and teardown
  */

From b4ef8885e1697b83a0dcc9f7fe79155f19241798 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sat, 15 Dec 2007 14:00:19 -0800
Subject: [PATCH 322/552] Xquartz: Fixed launchd detection

---
 configure.ac | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1d8aa60ae..86338e080 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1120,10 +1120,6 @@ XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS} ${LIBCRYPTO}"
 AC_SUBST([XSERVER_LIBS])
 AC_SUBST([XSERVER_SYS_LIBS])
 
-if test "x$HAVE_LAUNCHD" = xyes; then
-   XSERVER_CFLAGS="$XSERVER_CFLAGS -DHAVE_LAUNCHD"
-fi
-
 # The Xorg binary needs to export symbols so that they can be used from modules
 # Some platforms require extra flags to do this.   gcc should set these flags
 # when -rdynamic is passed to it, other compilers/linkers may need to be added
@@ -1772,17 +1768,19 @@ if test "x$LAUNCHD" = "xauto"; then
 	if test "x$XQUARTZ" = "xyes" ; then
 		LAUNCHD=yes
 	else
+		unset LAUNCHD
 		AC_CHECK_PROG(LAUNCHD, [launchd], [yes], [no])
 	fi
 fi
-AC_MSG_RESULT([$DMX])
-AM_CONDITIONAL(DMX, [test "x$DMX" = xyes])
 
 if test "x$LAUNCHD" = "xyes" ; then
 	AC_DEFINE(HAVE_LAUNCHD, 1, [launchd support available])
 fi
 AM_CONDITIONAL(LAUNCHD, [test "x$LAUNCHD" = "xyes"])
 
+AC_MSG_RESULT([$DMX])
+AM_CONDITIONAL(DMX, [test "x$DMX" = xyes])
+
 dnl kdrive DDX
 
 XEPHYR_LIBS=

From 58c2898b62fbf0d8e0f175de7cc208dc29d93788 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun, 16 Dec 2007 01:21:45 +0100
Subject: [PATCH 323/552] xfree86: permit access to io port 0xffff on the hurd

---
 hw/xfree86/os-support/hurd/hurd_video.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/xfree86/os-support/hurd/hurd_video.c b/hw/xfree86/os-support/hurd/hurd_video.c
index 8e6ae8d36..04763ada7 100644
--- a/hw/xfree86/os-support/hurd/hurd_video.c
+++ b/hw/xfree86/os-support/hurd/hurd_video.c
@@ -126,7 +126,7 @@ extern int ioperm(unsigned long __from, unsigned long __num, int __turn_on);
 Bool
 xf86EnableIO()
 {
-    if (ioperm(0, 0xffff, 1)) {
+    if (ioperm(0, 0x10000, 1)) {
 	FatalError("xf86EnableIO: ioperm() failed (%s)\n", strerror(errno));
 	return FALSE;
     }
@@ -138,7 +138,7 @@ xf86EnableIO()
 void
 xf86DisableIO()
 {
-    ioperm(0,0xffff,0);
+    ioperm(0,0x10000,0);
     return;
 }
 

From bf20c4374aeb5160a0dc372df9b49f1bbc05f078 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sun, 16 Dec 2007 01:14:32 -0800
Subject: [PATCH 324/552] Xquartz: Removed launchd plist and x11-exec.  The
 relevant code is now in xinit. (cherry picked from commit
 767b4c9d9daa5d0ea59ac1f0d70146798da631cb)

---
 hw/xquartz/Makefile.am                |  6 --
 hw/xquartz/bundle/Makefile.am         | 12 ----
 hw/xquartz/bundle/org.x.X11.plist.pre | 23 --------
 hw/xquartz/x11-exec.c                 | 84 ---------------------------
 4 files changed, 125 deletions(-)
 delete mode 100644 hw/xquartz/bundle/org.x.X11.plist.pre
 delete mode 100644 hw/xquartz/x11-exec.c

diff --git a/hw/xquartz/Makefile.am b/hw/xquartz/Makefile.am
index 0326f784f..831ba49f4 100644
--- a/hw/xquartz/Makefile.am
+++ b/hw/xquartz/Makefile.am
@@ -9,12 +9,6 @@ AM_CPPFLAGS = \
 
 if X11APP
 X11APP_SUBDIRS = bundle
-
-if LAUNCHD
-libexec_PROGRAMS = x11-exec
-x11_exec_LDFLAGS = -framework CoreServices
-endif
-
 endif
 
 SUBDIRS = . xpr $(X11APP_SUBDIRS)
diff --git a/hw/xquartz/bundle/Makefile.am b/hw/xquartz/bundle/Makefile.am
index da297e92e..951167002 100644
--- a/hw/xquartz/bundle/Makefile.am
+++ b/hw/xquartz/bundle/Makefile.am
@@ -8,17 +8,6 @@ x11app:
 install-data-hook:
 	xcodebuild install DSTROOT="/$(DESTDIR)" INSTALL_PATH="$(APPLE_APPLICATIONS_DIR)" DEPLOYMENT_LOCATION=YES SKIP_INSTALL=NO ARCHS="$(X11APP_ARCHS)"
 
-if LAUNCHD
-launchagents_PRE = org.x.X11.plist.pre
-launchagents_DATA = $(launchagents_PRE:plist.pre=plist)
-
-CPP_FILES_FLAGS = -D__libexecdir__="${libexecdir}"
-
-CLEANFILES = $(launchagents_DATA)
-endif
-
-include $(top_srcdir)/cpprules.in
-
 clean-local:
 	rm -rf build
 
@@ -26,7 +15,6 @@ resourcedir=$(libdir)/X11/xserver
 resource_DATA = Xquartz.plist
 
 EXTRA_DIST = \
-	org.x.X11.plist \
 	Info.plist \
 	X11.icns \
 	bundle-main.c \
diff --git a/hw/xquartz/bundle/org.x.X11.plist.pre b/hw/xquartz/bundle/org.x.X11.plist.pre
deleted file mode 100644
index 83d8b2f31..000000000
--- a/hw/xquartz/bundle/org.x.X11.plist.pre
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>Label</key>
-		<string>org.x.X11</string>
-	<key>ProgramArguments</key>
-		<array>
-		<string>__libexecdir__/x11-exec</string>
-		<string>-launchd</string>
-		</array>
-	<key>Sockets</key>
-		<dict>
-		<key>:0</key>
-			<dict>
-			<key>SecureSocketWithKey</key>
-				<string>DISPLAY</string>
-			</dict>
-		</dict>
-	<key>ServiceIPC</key>
-		<true/>
-</dict>
-</plist>
diff --git a/hw/xquartz/x11-exec.c b/hw/xquartz/x11-exec.c
deleted file mode 100644
index 105fd7202..000000000
--- a/hw/xquartz/x11-exec.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* x11-exec.c -- Find X11.app by bundle-id and exec it.  This is so launchd
-   can correctly find X11.app, even if the user moved it.
-
- Copyright (c) 2007 Apple, Inc.
- 
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation files
- (the "Software"), to deal in the Software without restriction,
- including without limitation the rights to use, copy, modify, merge,
- publish, distribute, sublicense, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
- 
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
- 
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT.  IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
- HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
- 
- Except as contained in this notice, the name(s) of the above
- copyright holders shall not be used in advertising or otherwise to
- promote the sale, use or other dealings in this Software without
- prior written authorization. */
-
-#include <CoreServices/CoreServices.h>
-#include <stdio.h>
-
-#define kX11AppBundleId "org.x.X11"
-#define kX11AppBundlePath "/Contents/MacOS/X11"
-
-int main(int argc, char **argv) {
-  char x11_path[PATH_MAX];
-  char** args = NULL;
-  CFURLRef appURL = NULL;
-  OSStatus osstatus = LSFindApplicationForInfo(kLSUnknownCreator, CFSTR(kX11AppBundleId), 
-					       nil, nil, &appURL);
-  
-  switch (osstatus) {
-  case noErr:
-    if (appURL == NULL) {
-      fprintf(stderr, "%s: Invalid response from LSFindApplicationForInfo(%s)\n", 
-	      argv[0], kX11AppBundleId);
-      exit(1);
-    }
-    if (!CFURLGetFileSystemRepresentation(appURL, true, (unsigned char *)x11_path, sizeof(x11_path))) {
-      fprintf(stderr, "%s: Error resolving URL for %s\n", argv[0], kX11AppBundleId);
-      exit(2);
-    }
-    
-    args = (char**)malloc(sizeof (char*) * (argc + 1));
-    strlcat(x11_path, kX11AppBundlePath, sizeof(x11_path));
-    if (args) {
-      int i;
-      args[0] = x11_path;
-      for (i = 1; i < argc; ++i) {
-        args[i] = argv[i];
-      }
-      args[i] = NULL;
-    }
-    
-    fprintf(stderr, "X11.app = %s\n", x11_path);
-    execv(x11_path, args);
-    fprintf(stderr, "Error executing X11.app (%s):", x11_path);
-    perror(NULL);
-    exit(3);
-    break;
-  case kLSApplicationNotFoundErr:
-    fprintf(stderr, "%s: Unable to find application for %s\n", argv[0], kX11AppBundleId);
-    exit(4);
-  default:
-    fprintf(stderr, "%s: Unable to find application for %s, error code = %d\n", 
-	    argv[0], kX11AppBundleId, osstatus);
-    exit(5);
-  }
-  /* not reached */
-}
-
-    

From d096bbd01bf7c7e15b5a2c582718f3333e063ddc Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 17 Dec 2007 13:45:15 +1000
Subject: [PATCH 325/552] Xquartz ate my DMX - thanks

---
 configure.ac | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/configure.ac b/configure.ac
index 86338e080..082ab8671 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1778,9 +1778,55 @@ if test "x$LAUNCHD" = "xyes" ; then
 fi
 AM_CONDITIONAL(LAUNCHD, [test "x$LAUNCHD" = "xyes"])
 
+AC_MSG_CHECKING([whether to build Xdmx DDX])
+PKG_CHECK_MODULES([DMXMODULES], [xmuu xext x11 xrender xfixes xfont xi dmxproto
+if test "x$DMX" = xauto; then
+       DMX="$have_dmx"
+fi
 AC_MSG_RESULT([$DMX])
 AM_CONDITIONAL(DMX, [test "x$DMX" = xyes])
 
+if test "x$DMX" = xyes; then
+       if test "x$have_dmx" = xno; then
+               AC_MSG_ERROR([Xdmx build explicitly requested, but required
+                             modules not found.])
+       fi
+       DMX_INCLUDES="$XEXT_INC $RENDER_INC $XTRAP_INC $RECORD_INC"
+       XDMX_CFLAGS="$DMXMODULES_CFLAGS"
+       XDMX_LIBS="$XEXT_LIB $FB_LIB $CONFIG_LIB $RENDER_LIB $XTRAP_LIB $RECORD_
+       XDMX_SYS_LIBS="$DMXMODULES_LIBS"
+       AC_SUBST([XDMX_CFLAGS])
+       AC_SUBST([XDMX_LIBS])
+       AC_SUBST([XDMX_SYS_LIBS])
+
+dnl USB sources in DMX require <linux/input.h>
+       AC_CHECK_HEADER([linux/input.h], DMX_BUILD_USB="yes",
+                       DMX_BUILD_USB="no")
+dnl Linux sources in DMX require <linux/keyboard.h>
+       AC_CHECK_HEADER([linux/keyboard.h], DMX_BUILD_LNX="yes",
+                       DMX_BUILD_LNX="no")
+       if test "x$GLX" = xyes; then
+               PKG_CHECK_MODULES([GL], [glproto])
+       fi
+       PKG_CHECK_MODULES([XDMXCONFIG_DEP], [xaw7 xmu xt xpm x11])
+       AC_SUBST(XDMXCONFIG_DEP_CFLAGS)
+       AC_SUBST(XDMXCONFIG_DEP_LIBS)
+       PKG_CHECK_MODULES([DMXEXAMPLES_DEP], [dmx xext x11])
+       AC_SUBST(DMXEXAMPLES_DEP_LIBS)
+       PKG_CHECK_MODULES([DMXXMUEXAMPLES_DEP], [dmx xmu xext x11])
+       AC_SUBST(DMXXMUEXAMPLES_DEP_LIBS)
+       PKG_CHECK_MODULES([DMXXIEXAMPLES_DEP], [dmx xi xext x11])
+       AC_SUBST(DMXXIEXAMPLES_DEP_LIBS)
+       PKG_CHECK_MODULES([XTSTEXAMPLES_DEP], [xtst xext x11])
+       AC_SUBST(XTSTEXAMPLES_DEP_LIBS)
+       PKG_CHECK_MODULES([XRESEXAMPLES_DEP], [xres xext x11])
+       AC_SUBST(XRESEXAMPLES_DEP_LIBS)
+       PKG_CHECK_MODULES([X11EXAMPLES_DEP], [xext x11])
+       AC_SUBST(X11EXAMPLES_DEP_LIBS)
+fi
+AM_CONDITIONAL([DMX_BUILD_LNX], [test "x$DMX_BUILD_LNX" = xyes])
+AM_CONDITIONAL([DMX_BUILD_USB], [test "x$DMX_BUILD_USB" = xyes])
+
 dnl kdrive DDX
 
 XEPHYR_LIBS=

From a18d28a5efbe6021d6c800506cece28a73545aad Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 17 Dec 2007 13:49:16 +1000
Subject: [PATCH 326/552] damn then my cut-n-paste ate my end of lines...

---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 082ab8671..0b718c9f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1779,7 +1779,7 @@ fi
 AM_CONDITIONAL(LAUNCHD, [test "x$LAUNCHD" = "xyes"])
 
 AC_MSG_CHECKING([whether to build Xdmx DDX])
-PKG_CHECK_MODULES([DMXMODULES], [xmuu xext x11 xrender xfixes xfont xi dmxproto
+PKG_CHECK_MODULES([DMXMODULES], [xmuu xext x11 xrender xfixes xfont xi dmxproto xau $XDMCP_MODULES], [have_dmx=yes], [have_dmx=no])
 if test "x$DMX" = xauto; then
        DMX="$have_dmx"
 fi
@@ -1793,7 +1793,7 @@ if test "x$DMX" = xyes; then
        fi
        DMX_INCLUDES="$XEXT_INC $RENDER_INC $XTRAP_INC $RECORD_INC"
        XDMX_CFLAGS="$DMXMODULES_CFLAGS"
-       XDMX_LIBS="$XEXT_LIB $FB_LIB $CONFIG_LIB $RENDER_LIB $XTRAP_LIB $RECORD_
+       XDMX_LIBS="$XEXT_LIB $FB_LIB $CONFIG_LIB $RENDER_LIB $XTRAP_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_SHADOW_LIB $MIEXT_DAMAGE_LIB"
        XDMX_SYS_LIBS="$DMXMODULES_LIBS"
        AC_SUBST([XDMX_CFLAGS])
        AC_SUBST([XDMX_LIBS])

From 6a5c3e04fa43b98ccffd69ad86dd781602f88d0b Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 17 Dec 2007 14:59:12 +1000
Subject: [PATCH 327/552] mi: set the private key to a unique non-zero value

---
 mi/miscrinit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mi/miscrinit.c b/mi/miscrinit.c
index a1fb2e2f6..7ca5f5df1 100644
--- a/mi/miscrinit.c
+++ b/mi/miscrinit.c
@@ -301,7 +301,7 @@ miAllocateGCPrivateIndex()
     return privateKey;
 }
 
-_X_EXPORT DevPrivateKey miZeroLineScreenKey;
+_X_EXPORT DevPrivateKey miZeroLineScreenKey = &miZeroLineScreenKey;
 
 _X_EXPORT void
 miSetZeroLineBias(pScreen, bias)

From 97c82ce0510808ea9d8a37a0a121e750f6dd8158 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 17 Dec 2007 23:11:29 -0500
Subject: [PATCH 328/552] XACE: Restore the old background None behavior in
 response to bug #13683.

From the X11 protocol spec:

"If background None is specified, the window has no defined background."

This means that toolkits and apps cannot rely on the "transparent" nature
of the current implementation!  At some point before the next release,
XACE will switch back to a solid background as the default.
---
 Xext/xace.h  | 6 ++++++
 dix/window.c | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Xext/xace.h b/Xext/xace.h
index de0e8fe81..6f92290a0 100644
--- a/Xext/xace.h
+++ b/Xext/xace.h
@@ -32,6 +32,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define XaceNumberEvents		0
 #define XaceNumberErrors		0
 
+/* Default window background */
+#define XaceBackgroundNoneState		None
+
 /* security hooks */
 /* Constants used to identify the available security hooks
  */
@@ -94,6 +97,9 @@ extern void XaceCensorImage(
 
 #else /* XACE */
 
+/* Default window background */
+#define XaceBackgroundNoneState		None
+
 /* Define calls away when XACE is not being built. */
 
 #ifdef __GNUC__
diff --git a/dix/window.c b/dix/window.c
index 0404655d4..33cf76b59 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -704,7 +704,7 @@ CreateWindow(Window wid, WindowPtr pParent, int x, int y, unsigned w,
 	return NullWindow;
     }
 
-    pWin->backgroundState = BackgroundPixel;
+    pWin->backgroundState = XaceBackgroundNoneState;
     pWin->background.pixel = 0;
 
     pWin->borderIsPixel = pParent->borderIsPixel;
@@ -1016,7 +1016,7 @@ ChangeWindowAttributes(WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client)
 		if (!pWin->parent)
 		    MakeRootTile(pWin);
 		else {
-		    pWin->backgroundState = BackgroundPixel;
+		    pWin->backgroundState = XaceBackgroundNoneState;
 		    pWin->background.pixel = 0;
 		}
 	    }

From 51fab1eb30691c503f1b4dc98b465f2bc2e1394e Mon Sep 17 00:00:00 2001
From: Sam Lau <sam.lau@sun.com>
Date: Tue, 18 Dec 2007 11:38:47 -0800
Subject: [PATCH 329/552] Sun bug 6278039: Xevie checking wrong size in swapped
 XevieSelectInput requests

<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6278039>
---
 Xext/xevie.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Xext/xevie.c b/Xext/xevie.c
index 7dd67bbf6..ea409f104 100644
--- a/Xext/xevie.c
+++ b/Xext/xevie.c
@@ -368,7 +368,7 @@ int SProcSelectInput (ClientPtr client)
 
     REQUEST (xXevieSelectInputReq);
     swaps (&stuff->length, n);
-    REQUEST_AT_LEAST_SIZE (xXevieSendReq);
+    REQUEST_AT_LEAST_SIZE (xXevieSelectInputReq);
     swapl(&stuff->event_mask, n);
     return ProcSelectInput (client);
 }

From 7721d3e9217b41aab3a0ee5eaa52f5b53cbb07db Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Tue, 18 Dec 2007 19:14:26 -0500
Subject: [PATCH 330/552] Reference cvt and gtf in the xorg.conf man page.

---
 hw/xfree86/doc/man/xorg.conf.man.pre | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
index 3c657d0f0..77439a517 100644
--- a/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -2144,7 +2144,9 @@ The data therein is not used in this release.
 General:
 .BR X (__miscmansuffix__),
 .BR Xserver (__appmansuffix__),
-.BR __xservername__ (__appmansuffix__).
+.BR __xservername__ (__appmansuffix__),
+.BR cvt (__appmansuffix__),
+.BR gtf (__appmansuffix__).
 .PP
 .B Not all modules or interfaces are available on all platforms.
 .PP

From bcad2a5a24f30cfdf9eca31915ed5a55ed094285 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 18 Dec 2007 20:19:26 -0500
Subject: [PATCH 331/552] XACE: Too many arguments to selection access hook.

---
 xfixes/select.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/xfixes/select.c b/xfixes/select.c
index 2321212ce..415257ec1 100755
--- a/xfixes/select.c
+++ b/xfixes/select.c
@@ -135,8 +135,7 @@ XFixesSelectSelectionInput (ClientPtr	pClient,
     int rc;
     SelectionEventPtr	*prev, e;
 
-    rc = XaceHook(XACE_SELECTION_ACCESS, pClient, selection, NULL,
-		  DixGetAttrAccess);
+    rc = XaceHook(XACE_SELECTION_ACCESS, pClient, selection, DixGetAttrAccess);
     if (rc != Success)
 	return rc;
 

From 66b00029e587cec628d0041179a301e888277f8e Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed, 19 Dec 2007 18:10:50 +1030
Subject: [PATCH 332/552] Xext: remove redefinition of Bool.

Thanks to Simon Thum.
---
 Xext/dpmsstubs.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Xext/dpmsstubs.c b/Xext/dpmsstubs.c
index fad07bde6..0f59d5160 100644
--- a/Xext/dpmsstubs.c
+++ b/Xext/dpmsstubs.c
@@ -26,8 +26,6 @@ Equipment Corporation.
 
 ******************************************************************/
 
-typedef int Bool;
-
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif

From d0308b64655360517d83e07e866d103c3f2b389d Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed, 19 Dec 2007 18:18:10 +1030
Subject: [PATCH 333/552] Xi: specify correct struct when calculating size of
 GetDeviceControl reply.

This doesn't change much, as the struct previously given has the same size as
the ones now anyway. Still, we should be pendantic.

Thanks to Simon Thum for reporting.
---
 Xi/getdctl.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Xi/getdctl.c b/Xi/getdctl.c
index 6e1e3ef58..c979959e2 100644
--- a/Xi/getdctl.c
+++ b/Xi/getdctl.c
@@ -265,19 +265,19 @@ ProcXGetDeviceControl(ClientPtr client)
         if (!dev->absolute)
 	    return BadMatch;
 
-        total_length = sizeof(xDeviceAbsCalibCtl);
+        total_length = sizeof(xDeviceAbsCalibState);
         break;
     case DEVICE_ABS_AREA:
         if (!dev->absolute)
 	    return BadMatch;
 
-        total_length = sizeof(xDeviceAbsAreaCtl);
+        total_length = sizeof(xDeviceAbsAreaState);
         break;
     case DEVICE_CORE:
-        total_length = sizeof(xDeviceCoreCtl);
+        total_length = sizeof(xDeviceCoreState);
         break;
     case DEVICE_ENABLE:
-        total_length = sizeof(xDeviceEnableCtl);
+        total_length = sizeof(xDeviceEnableState);
         break;
     default:
 	return BadValue;

From 50e80c39870adfdc84fdbc00dddf1362117ad443 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed, 19 Dec 2007 16:20:36 +1030
Subject: [PATCH 334/552] include: never overwrite realInputProc with
 enqueueInputProc. Bug #13511

In some cases (triggered by a key repeat during a sync grab) XKB unwrapping
can overwrite the device's realInputProc with the enqueueInputProc. When the
grab is released and the events are replayed, we end up in an infinite loop.
Each event is replayed and in replaying pushed to the end of the queue again.

This fix is a hack only. It ensures that the realInputProc is never
overwritten with the enqueueInputProc.

This fixes Bug #13511 (https://bugs.freedesktop.org/show_bug.cgi?id=13511)
(cherry picked from commit eace88989c3b65d5c20e9f37ea9b23c7c8e19335)
---
 include/xkbsrv.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 6425e37ae..bf386e72d 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -258,7 +258,8 @@ typedef struct
 	    device->public.processInputProc = proc; \
 	oldprocs->processInputProc = \
 	oldprocs->realInputProc = device->public.realInputProc; \
-	device->public.realInputProc = proc; \
+	if (proc != device->public.enqueueInputProc) \
+		device->public.realInputProc = proc; \
 	oldprocs->unwrapProc = device->unwrapProc; \
 	device->unwrapProc = unwrapproc;
 

From 7ef7727b800fa4715b80a82850d65b88fde5fe6c Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@clockmaker.usersys.redhat.com>
Date: Thu, 20 Dec 2007 10:11:26 +1000
Subject: [PATCH 335/552] entity sharing: make !shareable entity non-fatal.

Just because the entity isn't shareable, we should bring down the server.
Just ignore the extra screen and keep going.
---
 hw/xfree86/common/xf86Bus.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
index 599f7a46e..f7ffac85e 100644
--- a/hw/xfree86/common/xf86Bus.c
+++ b/hw/xfree86/common/xf86Bus.c
@@ -290,8 +290,10 @@ xf86AddEntityToScreen(ScrnInfoPtr pScrn, int entityIndex)
     if (entityIndex == -1)
 	return;
     if (xf86Entities[entityIndex]->inUse &&
-	!(xf86Entities[entityIndex]->entityProp & IS_SHARED_ACCEL))
-	FatalError("Requested Entity already in use!\n");
+	!(xf86Entities[entityIndex]->entityProp & IS_SHARED_ACCEL)) {
+	ErrorF("Requested Entity already in use!\n");
+	return;
+    }
 
     pScrn->numEntities++;
     pScrn->entityList = xnfrealloc(pScrn->entityList,

From 42802a8e6b3d3795acc4f8b7597ea5a48619b5cd Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Thu, 20 Dec 2007 13:17:30 -0800
Subject: [PATCH 336/552] Xquartz: General Cleanup General code cleanup,
 whitespace, dead code removal, added missing prototypes. Made Xquartz come to
 foreground later in startup, so it doesn't appear for Xquartz -version
 (cherry picked from commit 36922e8ff4316c93843aa3fe959cf8df3c7d5892)

---
 dix/main.c                  |  4 +++
 hw/xquartz/X11Application.h | 52 +++++++++++++++---------------
 hw/xquartz/X11Application.m | 64 ++++++++++++++++++-------------------
 hw/xquartz/X11Controller.h  |  4 ---
 hw/xquartz/X11Controller.m  |  8 +----
 hw/xquartz/darwin.c         | 19 +++--------
 hw/xquartz/quartz.c         | 51 ++++++++---------------------
 hw/xquartz/quartzCommon.h   |  1 -
 hw/xquartz/quartzStartup.c  | 29 +++--------------
 hw/xquartz/xpr/xpr.h        |  2 +-
 10 files changed, 85 insertions(+), 149 deletions(-)

diff --git a/dix/main.c b/dix/main.c
index 532b32534..9114f00d9 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -238,6 +238,10 @@ static int indexForScanlinePad[ 65 ] = {
 #define MIN(a,b) (((a) < (b)) ? (a) : (b))
 #endif
 
+#ifdef __APPLE__
+void DarwinHandleGUI(int argc, char **argv, char **envp);
+#endif
+
 int
 main(int argc, char *argv[], char *envp[])
 {
diff --git a/hw/xquartz/X11Application.h b/hw/xquartz/X11Application.h
index 861565798..c42e6a5a2 100644
--- a/hw/xquartz/X11Application.h
+++ b/hw/xquartz/X11Application.h
@@ -64,40 +64,38 @@ extern X11Application *X11App;
 
 #endif /* __OBJC__ */
 
-extern void X11ApplicationSetWindowMenu (int nitems, const char **items,
+void X11ApplicationSetWindowMenu (int nitems, const char **items,
 					 const char *shortcuts);
-extern void X11ApplicationSetWindowMenuCheck (int idx);
-extern void X11ApplicationSetFrontProcess (void);
-extern void X11ApplicationSetCanQuit (int state);
-extern void X11ApplicationServerReady (void);
-extern void X11ApplicationShowHideMenubar (int state);
+void X11ApplicationSetWindowMenuCheck (int idx);
+void X11ApplicationSetFrontProcess (void);
+void X11ApplicationSetCanQuit (int state);
+void X11ApplicationServerReady (void);
+void X11ApplicationShowHideMenubar (int state);
 
-extern void X11ApplicationMain (int argc, const char *argv[],
-				void (*server_thread) (void *),
-				void *server_arg);
+void X11ApplicationMain(int argc, char **argv, void (*server_thread) (void *), void *server_arg);
 
 extern int X11EnableKeyEquivalents;
 extern int quartzHasRoot, quartzEnableRootless;
 
 #define APP_PREFS "org.x.X11"
 
-#define PREFS_APPSMENU		"apps_menu"
-#define PREFS_FAKEBUTTONS	"enable_fake_buttons"
-#define PREFS_SYSBEEP		"enable_system_beep"
-#define PREFS_KEYEQUIVS		"enable_key_equivalents"
-#define PREFS_KEYMAP_FILE	"keymap_file"
-#define PREFS_SYNC_KEYMAP	"sync_keymap"
-#define PREFS_DEPTH		"depth"
-#define PREFS_NO_AUTH		"no_auth"
-#define PREFS_NO_TCP		"nolisten_tcp"
-#define PREFS_DONE_XINIT_CHECK	"done_xinit_check"
-#define PREFS_NO_QUIT_ALERT	"no_quit_alert"
-#define PREFS_FAKE_BUTTON2	"fake_button2"
-#define PREFS_FAKE_BUTTON3	"fake_button3"
-#define PREFS_ROOTLESS		"rootless"
-#define PREFS_FULLSCREEN_HOTKEYS "fullscreen_hotkeys"
-#define PREFS_SWAP_ALT_META	"swap_alt_meta"
-#define PREFS_XP_OPTIONS	"xp_options"
-#define PREFS_ENABLE_STEREO	"enable_stereo"
+#define PREFS_APPSMENU              "apps_menu"
+#define PREFS_FAKEBUTTONS           "enable_fake_buttons"
+#define PREFS_SYSBEEP               "enable_system_beep"
+#define PREFS_KEYEQUIVS             "enable_key_equivalents"
+#define PREFS_KEYMAP_FILE           "keymap_file"
+#define PREFS_SYNC_KEYMAP           "sync_keymap"
+#define PREFS_DEPTH                 "depth"
+#define PREFS_NO_AUTH               "no_auth"
+#define PREFS_NO_TCP                "nolisten_tcp"
+#define PREFS_DONE_XINIT_CHECK      "done_xinit_check"
+#define PREFS_NO_QUIT_ALERT         "no_quit_alert"
+#define PREFS_FAKE_BUTTON2          "fake_button2"
+#define PREFS_FAKE_BUTTON3          "fake_button3"
+#define PREFS_ROOTLESS              "rootless"
+#define PREFS_FULLSCREEN_HOTKEYS    "fullscreen_hotkeys"
+#define PREFS_SWAP_ALT_META         "swap_alt_meta"
+#define PREFS_XP_OPTIONS            "xp_options"
+#define PREFS_ENABLE_STEREO         "enable_stereo"
 
 #endif /* X11APPLICATION_H */
diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index 8d4076a0a..92a503b45 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -32,6 +32,7 @@
 #endif
 
 #include "quartzCommon.h"
+#include "quartzForeground.h"
 
 #import "X11Application.h"
 #include <Carbon/Carbon.h>
@@ -82,8 +83,8 @@ static mach_port_t _port;
 static void send_nsevent (NSEventType type, NSEvent *e);
 
 /* Quartz mode initialization routine. This is often dynamically loaded
- but is statically linked into this X server. */
-extern Bool QuartzModeBundleInit(void);
+   but is statically linked into this X server. */
+Bool QuartzModeBundleInit(void);
 
 static void init_ports (void) {
     kern_return_t r;
@@ -789,44 +790,43 @@ environment?", @"Startup xinitrc dialog");
     [X11App prefs_synchronize];
 }
 
-void X11ApplicationMain (int argc, const char *argv[],
-			 void (*server_thread) (void *), void *server_arg) {
-  NSAutoreleasePool *pool;
-  
+void X11ApplicationMain (int argc, char **argv, void (*server_thread) (void *), void *server_arg) {
+    NSAutoreleasePool *pool;
+
 #ifdef DEBUG
-  while (access ("/tmp/x11-block", F_OK) == 0) sleep (1);
+    while (access ("/tmp/x11-block", F_OK) == 0) sleep (1);
 #endif
   
-  pool = [[NSAutoreleasePool alloc] init];
-  X11App = (X11Application *) [X11Application sharedApplication];
-  init_ports ();
-  [NSApp read_defaults];
-  [NSBundle loadNibNamed:@"main" owner:NSApp];
-  [[NSNotificationCenter defaultCenter] addObserver:NSApp
+    pool = [[NSAutoreleasePool alloc] init];
+    X11App = (X11Application *) [X11Application sharedApplication];
+    init_ports ();
+    [NSApp read_defaults];
+    [NSBundle loadNibNamed:@"main" owner:NSApp];
+    [[NSNotificationCenter defaultCenter] addObserver:NSApp
 					selector:@selector (became_key:)
 					name:NSWindowDidBecomeKeyNotification object:nil];
-  check_xinitrc ();
-	
-  /*
-   * The xpr Quartz mode is statically linked into this server.
-   * Initialize all the Quartz functions.
-   */
-  QuartzModeBundleInit();
-  
-  /* Calculate the height of the menubar so we can avoid it. */
-  aquaMenuBarHeight = NSHeight([[NSScreen mainScreen] frame]) -
+    check_xinitrc ();
+
+    /*
+     * The xpr Quartz mode is statically linked into this server.
+     * Initialize all the Quartz functions.
+     */
+    QuartzModeBundleInit();
+
+    /* Calculate the height of the menubar so we can avoid it. */
+    aquaMenuBarHeight = NSHeight([[NSScreen mainScreen] frame]) -
     NSMaxY([[NSScreen mainScreen] visibleFrame]);
   
-  if (!create_thread (server_thread, server_arg)) {
-    ErrorF("can't create secondary thread\n");
-    exit (1);
-  }
-  
-  [NSApp run];
-  
-  /* not reached */
-}
+    if (!create_thread (server_thread, server_arg)) {
+        ErrorF("can't create secondary thread\n");
+        exit (1);
+    }
 
+    QuartzMoveToForeground();
+
+    [NSApp run];
+    /* not reached */
+}
 
 /* event conversion */
 
diff --git a/hw/xquartz/X11Controller.h b/hw/xquartz/X11Controller.h
index f1399dc49..bfbb04f8a 100644
--- a/hw/xquartz/X11Controller.h
+++ b/hw/xquartz/X11Controller.h
@@ -78,8 +78,4 @@
 
 #endif /* __OBJC__ */
 
-extern void X11ControllerMain (int argc, const char *argv[],
-			       void (*server_thread) (void *),
-			       void *server_arg);
-
 #endif /* X11CONTROLLER_H */
diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
index 0f64e4571..ecd88abde 100644
--- a/hw/xquartz/X11Controller.m
+++ b/hw/xquartz/X11Controller.m
@@ -337,7 +337,7 @@
       /* Setup environment */
       temp = getenv("DISPLAY");
       if (temp == NULL || temp[0] == 0) {
-	snprintf(buf, sizeof(buf), ":%s", display);
+    snprintf(buf, sizeof(buf), ":%s", display);
 	setenv("DISPLAY", buf, TRUE);
       }
 	
@@ -741,9 +741,3 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row
 }
 
 @end
-
-void X11ControllerMain (int argc, const char *argv[],
-			void (*server_thread) (void *), void *server_arg)
-{
-  X11ApplicationMain (argc, argv, server_thread, server_arg);
-}
diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index d932bcd74..06e88bd0d 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -715,16 +715,6 @@ int ddxProcessArgument( int argc, char *argv[], int i )
         return 1;
     }
 
-    if ( !strcmp( argv[i], "-quartz" ) ) {
-        ErrorF( "Running in parallel with Mac OS X Quartz window server.\n" );
-        return 1;
-    }
-
-    // The Mac OS X front end uses this argument, which we just ignore here.
-    if ( !strcmp( argv[i], "-nostartx" ) ) {
-        return 1;
-    }
-
     // This command line arg is passed when launched from the Aqua GUI.
     if ( !strncmp( argv[i], "-psn_", 5 ) ) {
         return 1;
@@ -876,9 +866,9 @@ void ddxUseMsg( void )
     ErrorF("-keymap <file> : read the keymapping from a file instead of the kernel.\n");
     ErrorF("-version : show the server version.\n");
     ErrorF("\n");
-    ErrorF("Quartz modes (Experimental / In Development):\n");
-    ErrorF("-fullscreen : run full screen in parallel with Mac OS X window server.\n");
-    ErrorF("-rootless : run rootless inside Mac OS X window server.\n");
+//    ErrorF("Quartz modes (Experimental / In Development):\n");
+//    ErrorF("-fullscreen : run full screen in parallel with Mac OS X window server.\n");
+//    ErrorF("-rootless : run rootless inside Mac OS X window server.\n");
     ErrorF("\n");
     ErrorF("Options ignored in rootless mode:\n");
     ErrorF("-size <height> <width> : use a screen resolution of <height> x <width>.\n");
@@ -896,7 +886,8 @@ void ddxGiveUp( void )
 {
     ErrorF( "Quitting XQuartz...\n" );
 
-    QuartzGiveUp();
+    //if (!quartzRootless)
+    //    quartzProcs->ReleaseScreens();
 }
 
 
diff --git a/hw/xquartz/quartz.c b/hw/xquartz/quartz.c
index 206330056..75f4e5eb0 100644
--- a/hw/xquartz/quartz.c
+++ b/hw/xquartz/quartz.c
@@ -61,7 +61,6 @@
 
 // Shared global variables for Quartz modes
 int                     quartzEventWriteFD = -1;
-int                     quartzStartClients = 1;
 int                     quartzRootless = -1;
 int                     quartzUseSysBeep = 0;
 int                     quartzUseAGL = 1;
@@ -408,12 +407,10 @@ QuartzMessageServerThread(
  * QuartzProcessEvent
  *  Process Quartz specific events.
  */
-void QuartzProcessEvent(
-    xEvent *xe)
-{
+void QuartzProcessEvent(xEvent *xe) {
     switch (xe->u.u.type) {
         case kXDarwinControllerNotify:
-	  DEBUG_LOG("kXDarwinControllerNotify\n");
+            DEBUG_LOG("kXDarwinControllerNotify\n");
             AppleWMSendEvent(AppleWMControllerNotify,
                              AppleWMControllerNotifyMask,
                              xe->u.clientMessage.u.l.longs0,
@@ -421,7 +418,7 @@ void QuartzProcessEvent(
             break;
 
         case kXDarwinPasteboardNotify:
-	  DEBUG_LOG("kXDarwinPasteboardNotify\n");
+            DEBUG_LOG("kXDarwinPasteboardNotify\n");
             AppleWMSendEvent(AppleWMPasteboardNotify,
                              AppleWMPasteboardNotifyMask,
                              xe->u.clientMessage.u.l.longs0,
@@ -429,7 +426,7 @@ void QuartzProcessEvent(
             break;
 
         case kXDarwinActivate:
-	  DEBUG_LOG("kXDarwinActivate\n");
+            DEBUG_LOG("kXDarwinActivate\n");
             QuartzShow(xe->u.keyButtonPointer.rootX,
                        xe->u.keyButtonPointer.rootY);
             AppleWMSendEvent(AppleWMActivationNotify,
@@ -438,7 +435,7 @@ void QuartzProcessEvent(
             break;
 
         case kXDarwinDeactivate:
-  	  DEBUG_LOG("kXDarwinDeactivate\n");
+            DEBUG_LOG("kXDarwinDeactivate\n");
             AppleWMSendEvent(AppleWMActivationNotify,
                              AppleWMActivationNotifyMask,
                              AppleWMIsInactive, 0);
@@ -446,23 +443,23 @@ void QuartzProcessEvent(
             break;
 
         case kXDarwinDisplayChanged:
-	    DEBUG_LOG("kXDarwinDisplayChanged\n");
+            DEBUG_LOG("kXDarwinDisplayChanged\n");
             QuartzUpdateScreens();
             break;
 
         case kXDarwinWindowState:
-	  DEBUG_LOG("kXDarwinWindowState\n");
+            DEBUG_LOG("kXDarwinWindowState\n");
             RootlessNativeWindowStateChanged(xe->u.clientMessage.u.l.longs0,
 		  			     xe->u.clientMessage.u.l.longs1);
 	    break;
 	  
         case kXDarwinWindowMoved:
-	  DEBUG_LOG("kXDarwinWindowMoved\n");
-	  RootlessNativeWindowMoved ((WindowPtr)xe->u.clientMessage.u.l.longs0);
+            DEBUG_LOG("kXDarwinWindowMoved\n");
+            RootlessNativeWindowMoved ((WindowPtr)xe->u.clientMessage.u.l.longs0);
 	    break;
 
         case kXDarwinToggleFullscreen:
-	  DEBUG_LOG("kXDarwinToggleFullscreen\n");
+            DEBUG_LOG("kXDarwinToggleFullscreen\n");
 #ifdef DARWIN_DDX_MISSING
             if (quartzEnableRootless) QuartzSetFullscreen(!quartzHasRoot);
             else if (quartzHasRoot) QuartzHide();
@@ -473,6 +470,7 @@ void QuartzProcessEvent(
             break;
 
         case kXDarwinSetRootless:
+            DEBUG_LOG("kXDarwinSetRootless\n");
 #ifdef DARWIN_DDX_MISSING
             QuartzSetRootless(xe->u.clientMessage.u.l.longs0);
             if (!quartzEnableRootless && !quartzHasRoot) QuartzHide();
@@ -498,34 +496,11 @@ void QuartzProcessEvent(
             break;
 
         case kXDarwinBringAllToFront:
-  	  DEBUG_LOG("kXDarwinBringAllToFront\n");
-	    RootlessOrderAllWindows();
+            DEBUG_LOG("kXDarwinBringAllToFront\n");
+            RootlessOrderAllWindows();
             break;
 
         default:
             ErrorF("Unknown application defined event type %d.\n", xe->u.u.type);
     }
 }
-
-
-/*
- * QuartzGiveUp
- *  Cleanup before X server shutdown
- *  Release the screen and restore the Aqua cursor.
- */
-void QuartzGiveUp(void)
-{
-#if 0
-// Trying to switch cursors when quitting causes deadlock
-    int i;
-
-    for (i = 0; i < screenInfo.numScreens; i++) {
-        if (screenInfo.screens[i]) {
-            QuartzSuspendXCursor(screenInfo.screens[i]);
-        }
-    }
-#endif
-
-    if (!quartzRootless)
-        quartzProcs->ReleaseScreens();
-}
diff --git a/hw/xquartz/quartzCommon.h b/hw/xquartz/quartzCommon.h
index 50b50f610..a0d467389 100644
--- a/hw/xquartz/quartzCommon.h
+++ b/hw/xquartz/quartzCommon.h
@@ -64,7 +64,6 @@ typedef struct {
 
 // Data stored at startup for Cocoa front end
 extern int              quartzEventWriteFD;
-extern int              quartzStartClients;
 
 // User preferences used by Quartz modes
 extern int              quartzRootless;
diff --git a/hw/xquartz/quartzStartup.c b/hw/xquartz/quartzStartup.c
index 87bcadac8..50ce2a63e 100644
--- a/hw/xquartz/quartzStartup.c
+++ b/hw/xquartz/quartzStartup.c
@@ -34,8 +34,8 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <CoreFoundation/CoreFoundation.h>
-#include "quartzForeground.h"
 #include "quartzCommon.h"
+#include "X11Application.h"
 #include "darwin.h"
 #include "quartz.h"
 #include "opaque.h"
@@ -52,9 +52,6 @@
 char **envpGlobal;      // argcGlobal and argvGlobal
                         // are from dix/globals.c
 
-
-void X11ControllerMain(int argc, char *argv[], void (*server_thread) (void *), void *server_arg);
-
 static void server_thread (void *arg) {
   extern int main(int argc, char **argv, char **envp);
   exit (main (argcGlobal, argvGlobal, envpGlobal));
@@ -68,22 +65,16 @@ static void server_thread (void *arg) {
  *  server. On the second call this function loads the user
  *  preferences set by the Mac OS X front end.
  */
-void DarwinHandleGUI(
-    int         argc,
-    char        *argv[],
-    char        *envp[] )
-{
+void DarwinHandleGUI(int argc, char **argv, char **envp) {
     static Bool been_here = FALSE;
     int         i;
     int         fd[2];
 
-    QuartzMoveToForeground();
-    
     if (been_here) {
         return;
     }
     been_here = TRUE;
-
+    
     // Make a pipe to pass events
     assert( pipe(fd) == 0 );
     darwinEventReadFD = fd[0];
@@ -95,26 +86,14 @@ void DarwinHandleGUI(
     argvGlobal = argv;
     envpGlobal = envp;
 
-    quartzStartClients = 1;
     for (i = 1; i < argc; i++) {
         // Display version info without starting Mac OS X UI if requested
         if (!strcmp( argv[i], "-showconfig" ) || !strcmp( argv[i], "-version" )) {
             DarwinPrintBanner();
             exit(0);
         }
-
-        // Determine if we need to start X clients
-        // and what display mode to use
-        if (!strcmp(argv[i], "-nostartx")) {
-            quartzStartClients = 0;    
-        } else if (!strcmp( argv[i], "-fullscreen")) {
-            quartzRootless = 0;
-        } else if (!strcmp( argv[i], "-rootless")) {
-            quartzRootless = 1;
-        }
     }
 
-
     /* Initially I ran the X server on the main thread, and received
        events on the second thread. But now we may be using Carbon,
        that needs to run on the main thread. (Otherwise, when it's
@@ -127,6 +106,6 @@ void DarwinHandleGUI(
     extern void _InitHLTB(void);
     
     _InitHLTB();    
-    X11ControllerMain(argc, argv, server_thread, NULL);
+    X11ApplicationMain(argc, argv, server_thread, NULL);
     exit(0);
 }
diff --git a/hw/xquartz/xpr/xpr.h b/hw/xquartz/xpr/xpr.h
index ddc6d0cb1..b8c69df0d 100644
--- a/hw/xquartz/xpr/xpr.h
+++ b/hw/xquartz/xpr/xpr.h
@@ -31,7 +31,7 @@
 
 #include "screenint.h"
 
-extern Bool QuartzModeBundleInit(void);
+Bool QuartzModeBundleInit(void);
 
 void AppleDRIExtensionInit(void);
 void xprAppleWMInit(void);

From 1393a97ea97b5f7d7b90e3e8c58b5996b600e0c6 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 20 Dec 2007 16:23:35 -0500
Subject: [PATCH 337/552] xselinux: Send AVC messages to audit system instead
 of log file/stderr.

---
 Xext/xselinux.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index bbae483a8..bbd8d1a46 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -462,8 +462,12 @@ static int
 SELinuxLog(int type, const char *fmt, ...)
 {
     va_list ap;
+    char buf[MAX_AUDIT_MESSAGE_LENGTH];
+    int rc, aut = AUDIT_USER_AVC;
+
     va_start(ap, fmt);
-    VErrorF(fmt, ap);
+    vsnprintf(buf, MAX_AUDIT_MESSAGE_LENGTH, fmt, ap);
+    rc = audit_log_user_avc_message(audit_fd, aut, buf, NULL, NULL, NULL, 0);
     va_end(ap);
     return 0;
 }

From 2d15d439f844d4016f169664a338595c11b91b77 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Thu, 20 Dec 2007 15:46:40 -0800
Subject: [PATCH 338/552] Xquartz: Use X11ControllerMain() (cherry picked from
 commit a9ac932543374aa2540f5a12cc85ef82c85b0e0c)

---
 hw/xquartz/X11Application.h | 2 +-
 hw/xquartz/X11Application.m | 2 +-
 hw/xquartz/X11Controller.h  | 2 ++
 hw/xquartz/X11Controller.m  | 4 ++++
 hw/xquartz/quartzStartup.c  | 4 ++--
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/hw/xquartz/X11Application.h b/hw/xquartz/X11Application.h
index c42e6a5a2..a1be7514a 100644
--- a/hw/xquartz/X11Application.h
+++ b/hw/xquartz/X11Application.h
@@ -72,7 +72,7 @@ void X11ApplicationSetCanQuit (int state);
 void X11ApplicationServerReady (void);
 void X11ApplicationShowHideMenubar (int state);
 
-void X11ApplicationMain(int argc, char **argv, void (*server_thread) (void *), void *server_arg);
+void X11ApplicationMain(int argc, const char **argv, void (*server_thread) (void *), void *server_arg);
 
 extern int X11EnableKeyEquivalents;
 extern int quartzHasRoot, quartzEnableRootless;
diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index 92a503b45..828cd30f2 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -790,7 +790,7 @@ environment?", @"Startup xinitrc dialog");
     [X11App prefs_synchronize];
 }
 
-void X11ApplicationMain (int argc, char **argv, void (*server_thread) (void *), void *server_arg) {
+void X11ApplicationMain (int argc, const char **argv, void (*server_thread) (void *), void *server_arg) {
     NSAutoreleasePool *pool;
 
 #ifdef DEBUG
diff --git a/hw/xquartz/X11Controller.h b/hw/xquartz/X11Controller.h
index bfbb04f8a..47f5220e4 100644
--- a/hw/xquartz/X11Controller.h
+++ b/hw/xquartz/X11Controller.h
@@ -78,4 +78,6 @@
 
 #endif /* __OBJC__ */
 
+void X11ControllerMain(int argc, const char **argv, void (*server_thread) (void *), void *server_arg);
+
 #endif /* X11CONTROLLER_H */
diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
index ecd88abde..6b7c35141 100644
--- a/hw/xquartz/X11Controller.m
+++ b/hw/xquartz/X11Controller.m
@@ -741,3 +741,7 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row
 }
 
 @end
+
+void X11ControllerMain(int argc, const char **argv, void (*server_thread) (void *), void *server_arg) {
+    X11ApplicationMain (argc, argv, server_thread, server_arg);
+}
diff --git a/hw/xquartz/quartzStartup.c b/hw/xquartz/quartzStartup.c
index 50ce2a63e..8600ec8d9 100644
--- a/hw/xquartz/quartzStartup.c
+++ b/hw/xquartz/quartzStartup.c
@@ -35,7 +35,7 @@
 #include <unistd.h>
 #include <CoreFoundation/CoreFoundation.h>
 #include "quartzCommon.h"
-#include "X11Application.h"
+#include "X11Controller.h"
 #include "darwin.h"
 #include "quartz.h"
 #include "opaque.h"
@@ -106,6 +106,6 @@ void DarwinHandleGUI(int argc, char **argv, char **envp) {
     extern void _InitHLTB(void);
     
     _InitHLTB();    
-    X11ApplicationMain(argc, argv, server_thread, NULL);
+    X11ControllerMain(argc, argv, server_thread, NULL);
     exit(0);
 }

From 1f74bef1ad1399323fc0d2e309b808bf32c622e4 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Thu, 20 Dec 2007 17:33:38 -0800
Subject: [PATCH 339/552] XQuartz: Don't fork to exec app_to_run. Plus other
 housecleaning... (cherry picked from commit
 ae302db472f127be082d05b418ede332fae8ccc5)

---
 hw/xquartz/X11Application.m                   |  2 +-
 .../bundle/X11.xcodeproj/project.pbxproj      |  4 --
 hw/xquartz/bundle/bundle-main.c               | 59 ++++++++++++++++---
 hw/xquartz/darwin.c                           |  5 +-
 4 files changed, 54 insertions(+), 16 deletions(-)

diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index 828cd30f2..56db2c477 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -153,7 +153,7 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
 	
     tem = [infoDict objectForKey:@"CFBundleShortVersionString"];
 	
-    [dict setObject:[NSString stringWithFormat:@"X11.app %@ - X.org X11R7.3", tem] 
+    [dict setObject:[NSString stringWithFormat:@"XQuartz %@ - (xorg-server %s)", tem, XSERVER_VERSION] 
 	  forKey:@"ApplicationVersion"];
 	
     [self orderFrontStandardAboutPanelWithOptions: dict];
diff --git a/hw/xquartz/bundle/X11.xcodeproj/project.pbxproj b/hw/xquartz/bundle/X11.xcodeproj/project.pbxproj
index 225f371c5..9d5c5d643 100644
--- a/hw/xquartz/bundle/X11.xcodeproj/project.pbxproj
+++ b/hw/xquartz/bundle/X11.xcodeproj/project.pbxproj
@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		3F5E1BE00D04BF110020CA24 /* launcher-main.c in Sources */ = {isa = PBXBuildFile; fileRef = 3F5E1BDE0D04BF110020CA24 /* launcher-main.c */; };
 		3F5E1BE10D04BF110020CA24 /* server-main.c in Sources */ = {isa = PBXBuildFile; fileRef = 3F5E1BDF0D04BF110020CA24 /* server-main.c */; };
 		527F24190B5D938C007840A7 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 0867D6AAFE840B52C02AAC07 /* InfoPlist.strings */; };
 		527F241A0B5D938C007840A7 /* main.nib in Resources */ = {isa = PBXBuildFile; fileRef = 02345980000FD03B11CA0E72 /* main.nib */; };
@@ -22,7 +21,6 @@
 /* Begin PBXFileReference section */
 		0867D6ABFE840B52C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		1870340FFE93FCAF11CA0CD7 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/main.nib; sourceTree = "<group>"; };
-		3F5E1BDE0D04BF110020CA24 /* launcher-main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "launcher-main.c"; sourceTree = "<group>"; };
 		3F5E1BDF0D04BF110020CA24 /* server-main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "server-main.c"; sourceTree = "<group>"; };
 		50459C5F038587C60ECA21EC /* X11.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = X11.icns; sourceTree = "<group>"; };
 		50EE2AB703849F0B0ECA21EC /* bundle-main.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = "bundle-main.c"; sourceTree = "<group>"; };
@@ -69,7 +67,6 @@
 		20286C2AFDCF999611CA2CEA /* Sources */ = {
 			isa = PBXGroup;
 			children = (
-				3F5E1BDE0D04BF110020CA24 /* launcher-main.c */,
 				3F5E1BDF0D04BF110020CA24 /* server-main.c */,
 				50EE2AB703849F0B0ECA21EC /* bundle-main.c */,
 			);
@@ -176,7 +173,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				527F241D0B5D938C007840A7 /* bundle-main.c in Sources */,
-				3F5E1BE00D04BF110020CA24 /* launcher-main.c in Sources */,
 				3F5E1BE10D04BF110020CA24 /* server-main.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/hw/xquartz/bundle/bundle-main.c b/hw/xquartz/bundle/bundle-main.c
index 681e1a8cc..ed41e6884 100644
--- a/hw/xquartz/bundle/bundle-main.c
+++ b/hw/xquartz/bundle/bundle-main.c
@@ -32,18 +32,23 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 
-int launcher_main(int argc, char **argv);
+#include <CoreFoundation/CoreFoundation.h>
+
+#define DEFAULT_APP "/usr/X11/bin/xterm"
+
+static int launcher_main(int argc, char **argv);
 int server_main(int argc, char **argv);
 
 int main(int argc, char **argv) {
     Display *display;
 
-    //size_t i;
-    //fprintf(stderr, "X11.app: main(): argc=%d\n", argc);
-    //for(i=0; i < argc; i++) {
-    //    fprintf(stderr, "\targv[%u] = %s\n", (unsigned)i, argv[i]);
-    //}
+    size_t i;
+    fprintf(stderr, "X11.app: main(): argc=%d\n", argc);
+    for(i=0; i < argc; i++) {
+        fprintf(stderr, "\targv[%u] = %s\n", (unsigned)i, argv[i]);
+    }
     
     /* If we have a process serial number and it's our only arg, act as if
      * the user double clicked the app bundle: launch app_to_run if possible
@@ -52,7 +57,7 @@ int main(int argc, char **argv) {
         /* Now, try to open a display, if so, run the launcher */
         display = XOpenDisplay(NULL);
         if(display) {
-            fprintf(stderr, "X11.app: main(): closing the display and sleeping");
+            fprintf(stderr, "X11.app: closing the display and sleeping for 2s to allow the X server to start up.\n");
             /* Could open the display, start the launcher */
             XCloseDisplay(display);
             
@@ -60,13 +65,49 @@ int main(int argc, char **argv) {
              * TODO: *Really* fix this race condition
              */
             usleep(2000);
-            //fprintf(stderr, "X11.app: main(): running launcher_main()");
             return launcher_main(argc, argv);
         }
     }
     
     /* Start the server */
-    //fprintf(stderr, "X11.app: main(): running server_main()");
+    fprintf(stderr, "X11.app: main(): running server_main()");
     return server_main(argc, argv);
 }
 
+int launcher_main (int argc, char **argv) {
+    char *command = DEFAULT_APP;
+    const char *newargv[7];
+    int child;
+    const char **s;
+    
+	CFPropertyListRef PlistRef = CFPreferencesCopyAppValue(CFSTR("app_to_run"), kCFPreferencesCurrentApplication);
+	
+	if ((PlistRef == NULL) || (CFGetTypeID(PlistRef) != CFStringGetTypeID())) {
+		CFPreferencesSetAppValue(CFSTR("app_to_run"), CFSTR(DEFAULT_APP), kCFPreferencesCurrentApplication);
+		CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
+	} else {
+		int len = CFStringGetLength((CFStringRef)PlistRef)+1;
+		command = (char *)malloc(len);
+		CFStringGetCString((CFStringRef)PlistRef, command, len,  kCFStringEncodingASCII);
+		fprintf(stderr, "command=%s\n", command);
+	}
+
+	if (PlistRef) CFRelease(PlistRef);
+
+	newargv[0] = "/usr/bin/login";
+	newargv[1] = "-fp";
+	newargv[2] = getlogin();
+	newargv[3] = "/bin/sh";
+	newargv[4] = "-c";
+	newargv[5] = command;
+	newargv[6] = NULL;
+
+    fprintf(stderr, "X11.app: Launching X11 Application:\n");
+    for(s=newargv; *s; s++) {
+        fprintf(stderr, "\targv[%d] = %s\n", s - newargv, *s);
+    }
+
+    execvp (newargv[0], (const char **) newargv);
+    perror ("X11.app: Couldn't exec.");
+    return(1);
+}
diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index 06e88bd0d..d6eb100ac 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -150,8 +150,9 @@ void
 DarwinPrintBanner(void)
 { 
   // this should change depending on which specific server we are building
-  ErrorF("X11.app starting:\n");
-  ErrorF("Xquartz server based on X.org %s, built on %s\n", XORG_RELEASE, BUILD_DATE );
+  ErrorF("XQuartz starting:\n");
+  ErrorF("X.org Release 7.2\n"); // This is here to help fink until they fix their packages.
+  ErrorF("X.Org X Server %s\nBuild Date: %s\n", XSERVER_VERSION, BUILD_DATE );
 }
 
 

From 4cf3002b6020024f2fc2ed0cc40a872a066e482d Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Thu, 20 Dec 2007 18:08:40 -0800
Subject: [PATCH 340/552] XQuartz: Kill off server-main.c and launcher-main.c
 Now using xinit (cherry picked from commit
 5d6ae3d299f72df714117948b3d31dcbddf6c0bc)

---
 .../bundle/X11.xcodeproj/project.pbxproj      |   4 -
 hw/xquartz/bundle/bundle-main.c               |  69 +-
 hw/xquartz/bundle/launcher-main.c             |  81 --
 hw/xquartz/bundle/server-main.c               | 903 ------------------
 4 files changed, 47 insertions(+), 1010 deletions(-)
 delete mode 100644 hw/xquartz/bundle/launcher-main.c
 delete mode 100644 hw/xquartz/bundle/server-main.c

diff --git a/hw/xquartz/bundle/X11.xcodeproj/project.pbxproj b/hw/xquartz/bundle/X11.xcodeproj/project.pbxproj
index 9d5c5d643..ddb6f8364 100644
--- a/hw/xquartz/bundle/X11.xcodeproj/project.pbxproj
+++ b/hw/xquartz/bundle/X11.xcodeproj/project.pbxproj
@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		3F5E1BE10D04BF110020CA24 /* server-main.c in Sources */ = {isa = PBXBuildFile; fileRef = 3F5E1BDF0D04BF110020CA24 /* server-main.c */; };
 		527F24190B5D938C007840A7 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 0867D6AAFE840B52C02AAC07 /* InfoPlist.strings */; };
 		527F241A0B5D938C007840A7 /* main.nib in Resources */ = {isa = PBXBuildFile; fileRef = 02345980000FD03B11CA0E72 /* main.nib */; };
 		527F241B0B5D938C007840A7 /* X11.icns in Resources */ = {isa = PBXBuildFile; fileRef = 50459C5F038587C60ECA21EC /* X11.icns */; };
@@ -21,7 +20,6 @@
 /* Begin PBXFileReference section */
 		0867D6ABFE840B52C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		1870340FFE93FCAF11CA0CD7 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/main.nib; sourceTree = "<group>"; };
-		3F5E1BDF0D04BF110020CA24 /* server-main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "server-main.c"; sourceTree = "<group>"; };
 		50459C5F038587C60ECA21EC /* X11.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = X11.icns; sourceTree = "<group>"; };
 		50EE2AB703849F0B0ECA21EC /* bundle-main.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = "bundle-main.c"; sourceTree = "<group>"; };
 		50F4F0A7039D6ACA0E82C0CB /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
@@ -67,7 +65,6 @@
 		20286C2AFDCF999611CA2CEA /* Sources */ = {
 			isa = PBXGroup;
 			children = (
-				3F5E1BDF0D04BF110020CA24 /* server-main.c */,
 				50EE2AB703849F0B0ECA21EC /* bundle-main.c */,
 			);
 			name = Sources;
@@ -173,7 +170,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				527F241D0B5D938C007840A7 /* bundle-main.c in Sources */,
-				3F5E1BE10D04BF110020CA24 /* server-main.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/hw/xquartz/bundle/bundle-main.c b/hw/xquartz/bundle/bundle-main.c
index ed41e6884..cd74ceae6 100644
--- a/hw/xquartz/bundle/bundle-main.c
+++ b/hw/xquartz/bundle/bundle-main.c
@@ -36,10 +36,11 @@
 
 #include <CoreFoundation/CoreFoundation.h>
 
-#define DEFAULT_APP "/usr/X11/bin/xterm"
+#define DEFAULT_CLIENT "/usr/X11/bin/xterm"
+#define DEFAULT_STARTX "/usr/X11/bin/startx"
 
 static int launcher_main(int argc, char **argv);
-int server_main(int argc, char **argv);
+static int server_main(int argc, char **argv);
 
 int main(int argc, char **argv) {
     Display *display;
@@ -57,7 +58,7 @@ int main(int argc, char **argv) {
         /* Now, try to open a display, if so, run the launcher */
         display = XOpenDisplay(NULL);
         if(display) {
-            fprintf(stderr, "X11.app: closing the display and sleeping for 2s to allow the X server to start up.\n");
+            fprintf(stderr, "X11.app: Closing the display and sleeping for 2s to allow the X server to start up.\n");
             /* Could open the display, start the launcher */
             XCloseDisplay(display);
             
@@ -70,29 +71,13 @@ int main(int argc, char **argv) {
     }
     
     /* Start the server */
-    fprintf(stderr, "X11.app: main(): running server_main()");
+    fprintf(stderr, "X11.app: Could not connect to server.  Starting X server.");
     return server_main(argc, argv);
 }
 
-int launcher_main (int argc, char **argv) {
-    char *command = DEFAULT_APP;
+static int myexecvp(const char *command) {
     const char *newargv[7];
-    int child;
     const char **s;
-    
-	CFPropertyListRef PlistRef = CFPreferencesCopyAppValue(CFSTR("app_to_run"), kCFPreferencesCurrentApplication);
-	
-	if ((PlistRef == NULL) || (CFGetTypeID(PlistRef) != CFStringGetTypeID())) {
-		CFPreferencesSetAppValue(CFSTR("app_to_run"), CFSTR(DEFAULT_APP), kCFPreferencesCurrentApplication);
-		CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
-	} else {
-		int len = CFStringGetLength((CFStringRef)PlistRef)+1;
-		command = (char *)malloc(len);
-		CFStringGetCString((CFStringRef)PlistRef, command, len,  kCFStringEncodingASCII);
-		fprintf(stderr, "command=%s\n", command);
-	}
-
-	if (PlistRef) CFRelease(PlistRef);
 
 	newargv[0] = "/usr/bin/login";
 	newargv[1] = "-fp";
@@ -102,7 +87,7 @@ int launcher_main (int argc, char **argv) {
 	newargv[5] = command;
 	newargv[6] = NULL;
 
-    fprintf(stderr, "X11.app: Launching X11 Application:\n");
+    fprintf(stderr, "X11.app: Launching %s:\n", command);
     for(s=newargv; *s; s++) {
         fprintf(stderr, "\targv[%d] = %s\n", s - newargv, *s);
     }
@@ -111,3 +96,43 @@ int launcher_main (int argc, char **argv) {
     perror ("X11.app: Couldn't exec.");
     return(1);
 }
+
+int launcher_main (int argc, char **argv) {
+    char *command = DEFAULT_CLIENT;
+    
+	CFPropertyListRef PlistRef = CFPreferencesCopyAppValue(CFSTR("app_to_run"), kCFPreferencesCurrentApplication);
+	
+	if ((PlistRef == NULL) || (CFGetTypeID(PlistRef) != CFStringGetTypeID())) {
+		CFPreferencesSetAppValue(CFSTR("app_to_run"), CFSTR(DEFAULT_CLIENT), kCFPreferencesCurrentApplication);
+		CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
+	} else {
+        int len = CFStringGetLength((CFStringRef)PlistRef)+1;
+		command = (char *)malloc(len);
+		CFStringGetCString((CFStringRef)PlistRef, command, len,  kCFStringEncodingASCII);
+	}
+
+	if (PlistRef)
+        CFRelease(PlistRef);
+
+    return myexecvp(command);
+}
+
+int server_main (int argc, char **argv) {
+    char *command = DEFAULT_STARTX;
+
+	CFPropertyListRef PlistRef = CFPreferencesCopyAppValue(CFSTR("startx_script"), kCFPreferencesCurrentApplication);
+	
+	if ((PlistRef == NULL) || (CFGetTypeID(PlistRef) != CFStringGetTypeID())) {
+		CFPreferencesSetAppValue(CFSTR("startx_script"), CFSTR(DEFAULT_STARTX), kCFPreferencesCurrentApplication);
+		CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
+	} else {
+        int len = CFStringGetLength((CFStringRef)PlistRef)+1;
+		command = (char *)malloc(len);
+		CFStringGetCString((CFStringRef)PlistRef, command, len,  kCFStringEncodingASCII);
+	}
+    
+	if (PlistRef)
+        CFRelease(PlistRef);
+    
+    return myexecvp(command);
+}
diff --git a/hw/xquartz/bundle/launcher-main.c b/hw/xquartz/bundle/launcher-main.c
deleted file mode 100644
index 60a1624b9..000000000
--- a/hw/xquartz/bundle/launcher-main.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/* main.c -- X application launcher
- 
- Copyright (c) 2007 Apple Inc.
- 
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation files
- (the "Software"), to deal in the Software without restriction,
- including without limitation the rights to use, copy, modify, merge,
- publish, distribute, sublicense, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
- 
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
- 
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT.  IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
- HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
- 
- Except as contained in this notice, the name(s) of the above
- copyright holders shall not be used in advertising or otherwise to
- promote the sale, use or other dealings in this Software without
- prior written authorization. */
-
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include <CoreFoundation/CoreFoundation.h>
-
-#define DEFAULT_APP "/usr/X11/bin/xterm"
-
-int launcher_main (int argc, char **argv) {
-  char *command = DEFAULT_APP;
-  const char *newargv[7];
-  int child;
-  
-
-	CFPropertyListRef PlistRef = CFPreferencesCopyAppValue(CFSTR("app_to_run"),
-									kCFPreferencesCurrentApplication);
-	
-	if ((PlistRef == NULL) || (CFGetTypeID(PlistRef) != CFStringGetTypeID())) {
-		CFPreferencesSetAppValue(CFSTR("app_to_run"), CFSTR(DEFAULT_APP), 
-								 kCFPreferencesCurrentApplication);
-		CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
-	} else {
-		int len = CFStringGetLength((CFStringRef)PlistRef)+1;
-		command = (char *) malloc(len);
-		CFStringGetCString((CFStringRef)PlistRef, command, len,  kCFStringEncodingASCII);
-		fprintf(stderr, "command=%s\n", command);
-	}
-	
-	if (PlistRef) CFRelease(PlistRef);
-	
-	newargv[0] = "/usr/bin/login";
-	newargv[1] = "-fp";
-	newargv[2] = getlogin();
-	newargv[3] = "/bin/sh";
-	newargv[4] = "-c";
-	newargv[5] = command;
-	newargv[6] = NULL;
-
-    child = fork();
-	
-    switch (child) {
-    case -1:				/* error */
-      perror ("fork");
-      return EXIT_FAILURE;		
-    case 0:				    /* child */
-      execvp (newargv[0], (char **const) newargv);
-      perror ("Couldn't exec");
-      _exit (1);
-   }
-	
-    return 0;
-}
diff --git a/hw/xquartz/bundle/server-main.c b/hw/xquartz/bundle/server-main.c
deleted file mode 100644
index 7e1bd7025..000000000
--- a/hw/xquartz/bundle/server-main.c
+++ /dev/null
@@ -1,903 +0,0 @@
-/* bundle-main.c -- X server launcher
- 
- Copyright (c) 2002-2007 Apple Inc. All rights reserved.
- 
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation files
- (the "Software"), to deal in the Software without restriction,
- including without limitation the rights to use, copy, modify, merge,
- publish, distribute, sublicense, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
- 
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
- 
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT.  IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
- HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
- 
- Except as contained in this notice, the name(s) of the above
- copyright holders shall not be used in advertising or otherwise to
- promote the sale, use or other dealings in this Software without
- prior written authorization.
- 
- Parts of this file are derived from xdm, which has this copyright:
- 
- Copyright 1988, 1998  The Open Group
- 
- Permission to use, copy, modify, distribute, and sell this software
- and its documentation for any purpose is hereby granted without fee,
- provided that the above copyright notice appear in all copies and
- that both that copyright notice and this permission notice appear in
- supporting documentation.
- 
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
- 
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY
- CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- 
- Except as contained in this notice, the name of The Open Group shall
- not be used in advertising or otherwise to promote the sale, use or
- other dealings in this Software without prior written authorization
- from The Open Group. */
-
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <sys/socket.h>
-#include <sys/utsname.h>
-#include <ifaddrs.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <time.h>
-#include <sys/wait.h>
-#include <setjmp.h>
-#include <sys/ioctl.h>
-
-#include <X11/Xlib.h>
-#include <X11/Xauth.h>
-#include <xcb/xcb.h>
-
-#include <CoreFoundation/CoreFoundation.h>
-#include <SystemConfiguration/SystemConfiguration.h>
-
-#define X_SERVER "/usr/X11/bin/Xquartz"
-#define XTERM_PATH "/usr/X11/bin/xterm"
-#define WM_PATH "/usr/bin/quartz-wm"
-#define DEFAULT_XINITRC "/usr/X11/lib/X11/xinit/xinitrc"
-#define DEFAULT_PATH "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/X11/bin"
-
-/* what xinit does */
-#ifndef SHELL
-# define SHELL "sh"
-#endif
-
-#undef FALSE
-#define FALSE 0
-#undef TRUE
-#define TRUE 1
-
-#define MAX_DISPLAYS 64
-
-static int server_pid = -1, client_pid = -1;
-static int xinit_kills_server = FALSE;
-static jmp_buf exit_continuation;
-static const char *server_name = NULL;
-static Display *server_dpy;
-
-static char *auth_file;
-
-typedef struct addr_list_struct addr_list;
-
-struct addr_list_struct {
-    addr_list *next;
-    Xauth auth;
-};
-
-static addr_list *addresses;
-
-
-/* Utility functions. */
-
-/* Return the current host name. Matches what Xlib does. */
-static char *
-host_name (void)
-{
-#ifdef NEED_UTSNAME
-    static struct utsname name;
-	
-    uname(&name);
-	
-    return name.nodename;
-#else
-    static char buf[100];
-	
-    gethostname(buf, sizeof(buf));
-	
-    return buf;
-#endif
-}
-
-static int
-read_boolean_pref (CFStringRef name, int default_)
-{
-    int value;
-    Boolean ok;
-	
-    value = CFPreferencesGetAppBooleanValue (name, CFSTR ("org.x.X11"), &ok);
-    return ok ? value : default_;
-}
-
-static inline int
-binary_equal (const void *a, const void *b, int length)
-{
-    return memcmp (a, b, length) == 0;
-}
-
-static inline void *
-binary_dup (const void *a, int length)
-{
-    void *b = malloc (length);
-    if (b != NULL)
-		memcpy (b, a, length);
-    return b;
-}
-
-static inline void
-binary_free (void *data, int length)
-{
-    if (data != NULL)
-		free (data);
-}
-
-
-/* Functions for managing the authentication entries. */
-
-/* Returns true if something matching AUTH is in our list of auth items */
-static int
-check_auth_item (Xauth *auth)
-{
-    addr_list *a;
-	
-    for (a = addresses; a != NULL; a = a->next)
-    {
-		if (a->auth.family == auth->family
-			&& a->auth.address_length == auth->address_length
-			&& binary_equal (a->auth.address, auth->address, auth->address_length)
-			&& a->auth.number_length == auth->number_length
-			&& binary_equal (a->auth.number, auth->number, auth->number_length)
-			&& a->auth.name_length == auth->name_length
-			&& binary_equal (a->auth.name, auth->name, auth->name_length))
-		{
-			return TRUE;
-		}
-    }
-	
-    return FALSE;
-}
-
-/* Add one item to our list of auth items. */
-static void
-add_auth_item (Xauth *auth)
-{
-    addr_list *a = malloc (sizeof (addr_list));
-	
-    a->auth.family = auth->family;
-    a->auth.address_length = auth->address_length;
-    a->auth.address = binary_dup (auth->address, auth->address_length);
-    a->auth.number_length = auth->number_length;
-    a->auth.number = binary_dup (auth->number, auth->number_length);
-    a->auth.name_length = auth->name_length;
-    a->auth.name = binary_dup (auth->name, auth->name_length);
-    a->auth.data_length = auth->data_length;
-    a->auth.data = binary_dup (auth->data, auth->data_length);
-	
-    a->next = addresses;
-    addresses = a;
-}
-
-/* Free all allocated auth items. */
-static void
-free_auth_items (void)
-{
-    addr_list *a;
-	
-    while ((a = addresses) != NULL)
-    {
-		addresses = a->next;
-		
-		binary_free (a->auth.address, a->auth.address_length);
-		binary_free (a->auth.number, a->auth.number_length);
-		binary_free (a->auth.name, a->auth.name_length);
-		binary_free (a->auth.data, a->auth.data_length);
-		free (a);
-    }
-}
-
-/* Add the unix domain auth item. */
-static void
-define_local (Xauth *auth)
-{
-    char *host = host_name ();
-	
-#ifdef DEBUG
-    fprintf (stderr, "x11: hostname is %s\n", host);
-#endif
-	
-    auth->family = FamilyLocal;
-    auth->address_length = strlen (host);
-    auth->address = host;
-	
-    add_auth_item (auth);
-}
-
-/* Add the tcp auth item. */
-static void
-define_named (Xauth *auth, const char *name)
-{
-    struct ifaddrs *addrs, *ptr;
-	
-    if (getifaddrs (&addrs) != 0)
-		return;
-	
-    for (ptr = addrs; ptr != NULL; ptr = ptr->ifa_next)
-    {
-		if (ptr->ifa_addr->sa_family != AF_INET)
-			continue;
-		
-		auth->family = FamilyInternet;
-		auth->address_length = sizeof (struct in_addr);
-		auth->address = (char *) &(((struct sockaddr_in *) ptr->ifa_addr)->sin_addr);
-		
-#ifdef DEBUG
-		fprintf (stderr, "x11: ipaddr is %d.%d.%d.%d\n",
-				 (unsigned char) auth->address[0],
-				 (unsigned char) auth->address[1],
-				 (unsigned char) auth->address[2],
-				 (unsigned char) auth->address[3]);
-#endif
-		
-		add_auth_item (auth);
-    }
-	
-    freeifaddrs (addrs);
-}
-
-/* Parse the display number from NAME and add it to AUTH. */
-static void
-set_auth_number (Xauth *auth, const char *name)
-{
-    char *colon;
-    char *dot, *number;
-	
-    colon = strrchr(name, ':');
-    if (colon != NULL)
-    {
-		colon++;
-		dot = strchr(colon, '.');
-		
-		if (dot != NULL)
-			auth->number_length = dot - colon;
-		else
-			auth->number_length = strlen (colon);
-		
-		number = malloc (auth->number_length + 1);
-		if (number != NULL)
-		{
-			strncpy (number, colon, auth->number_length);
-			number[auth->number_length] = '\0';
-		}
-		else
-		{
-			auth->number_length = 0;
-		}
-		
-		auth->number = number;
-    }
-}
-
-/* Put 128 bits of random data into DATA. If possible, it will be "high
- quality" */
-static int
-generate_mit_magic_cookie (char data[16])
-{
-    int fd, ret, i;
-    long *ldata = (long *) data;
-	
-    fd = open ("/dev/random", O_RDONLY);
-    if (fd > 0) {
-		ret = read (fd, data, 16);
-		close (fd);
-		if (ret == 16) return TRUE;
-    }
-	
-    /* fall back to the usual crappy rng */
-	
-    srand48 (getpid () ^ time (NULL));
-	
-    for (i = 0; i < 4; i++)
-		ldata[i] = lrand48 ();
-	
-    return TRUE;
-}
-
-/* Create the keys we'll be using for the display named NAME. */
-static int
-make_auth_keys (const char *name)
-{
-    Xauth auth;
-    char key[16];
-	
-    if (auth_file == NULL)
-		return FALSE;
-	
-    auth.name = "MIT-MAGIC-COOKIE-1";
-    auth.name_length = strlen (auth.name);
-	
-    if (!generate_mit_magic_cookie (key))
-    {
-		auth_file = NULL;
-		return FALSE;
-    }
-	
-    auth.data = key;
-    auth.data_length = 16;
-	
-    set_auth_number (&auth, name);
-	
-    define_named (&auth, host_name ());
-    define_local (&auth);
-	
-    free (auth.number);
-	
-    return TRUE;
-}
-
-/* If ADD-ENTRIES is true, merge our auth entries into the existing
- Xauthority file. If ADD-ENTRIES is false, remove our entries. */
-static int
-write_auth_file (int add_entries)
-{
-    char *home, newname[1024];
-    int fd, ret;
-    FILE *new_fh, *old_fh;
-    addr_list *addr;
-    Xauth *auth;
-	
-    if (auth_file == NULL)
-		return FALSE;
-	
-    home = getenv ("HOME");
-    if (home == NULL)
-    {
-		auth_file = NULL;
-		return FALSE;
-    }
-	
-    snprintf (newname, sizeof (newname), "%s/.XauthorityXXXXXX", home);
-    mktemp (newname);
-	
-    if (XauLockAuth (auth_file, 1, 2, 10) != LOCK_SUCCESS)
-    {
-		/* FIXME: do something here? */
-		
-		auth_file = NULL;
-		return FALSE;
-    }
-	
-    fd = open (newname, O_WRONLY | O_CREAT | O_TRUNC, 0600);
-    if (fd >= 0)
-    {
-		new_fh = fdopen (fd, "w");
-		if (new_fh != NULL)
-		{
-			if (add_entries)
-			{
-				for (addr = addresses; addr != NULL; addr = addr->next)
-				{
-					XauWriteAuth (new_fh, &addr->auth);
-				}
-			}
-			
-			old_fh = fopen (auth_file, "r");
-			if (old_fh != NULL)
-			{
-				while ((auth = XauReadAuth (old_fh)) != NULL)
-				{
-					if (!check_auth_item (auth))
-						XauWriteAuth (new_fh, auth);
-					XauDisposeAuth (auth);
-				}
-				fclose (old_fh);
-			}
-			
-			fclose (new_fh);
-			unlink (auth_file);
-			
-			ret = rename (newname, auth_file);
-			
-			if (ret != 0)
-				auth_file = NULL;
-			
-			XauUnlockAuth (auth_file);
-			return ret == 0;
-		}
-		
-		close (fd);
-    }
-	
-    XauUnlockAuth (auth_file);
-    auth_file = NULL;
-    return FALSE;
-}
-
-
-/* Subprocess management functions. */
-
-static int
-start_server (char **xargv)
-{
-    int child;
-	
-    child = fork ();
-	
-    switch (child)
-    {
-    case -1:				/* error */
-		perror ("fork");
-		return FALSE;
-		
-    case 0:				/* child */
-		execv (X_SERVER, xargv);
-		perror ("Couldn't exec " X_SERVER);
-		_exit (1);
-		
-    default:				/* parent */
-		server_pid = child;
-		return TRUE;
-    }
-}
-
-static int
-wait_for_server (void)
-{
-    int count = 100;
-	
-    while (count-- > 0)
-    {
-		int status;
-		
-		server_dpy = XOpenDisplay (server_name);
-		if (server_dpy != NULL)
-			return TRUE;
-		
-		if (waitpid (server_pid, &status, WNOHANG) == server_pid)
-			return FALSE;
-		
-		sleep (1);
-    }
-	
-    return FALSE;
-}
-
-static int
-start_client (void)
-{
-    int child;
-	
-    child = fork();
-	
-    switch (child) {
-		char *temp, buf[1024];		
-
-	case -1:				/* error */
-		perror("fork");
-		return FALSE;
-
-	case 0:					/* child */
-		/* Setup environment */
-		temp = getenv("DISPLAY");
-//		if (temp == NULL && temp[0] != 0)
-			setenv("DISPLAY", server_name, TRUE);
-
-		temp = getenv("PATH");
-		if (temp == NULL || temp[0] == 0) 
-			setenv ("PATH", DEFAULT_PATH, TRUE);
-		else if (strnstr(temp, "/usr/X11/bin", sizeof(temp)) == NULL) {
-			snprintf(buf, sizeof(buf), "%s:/usr/X11/bin", temp);		
-			setenv("PATH", buf, TRUE);	
-		}
-		
-		/* First try value of $XINITRC, if set. */
-		temp = getenv("XINITRC");
-		if (temp != NULL && temp[0] != 0 && access(temp, R_OK) == 0)
-			execlp (SHELL, SHELL, temp, NULL);
-
-		/* Then look for .xinitrc in user's home directory. */
-		temp = getenv("HOME");
-		if (temp != NULL && temp[0] != 0) {
-			chdir(temp);
-			snprintf (buf, sizeof (buf), "%s/.xinitrc", temp);
-			if (access(buf, R_OK) == 0)
-				execlp(SHELL, SHELL, buf, NULL);
-		}
-		
-		/* Then try the default xinitrc in the lib directory. */
-		
-		if (access(DEFAULT_XINITRC, R_OK) == 0)
-			execlp(SHELL, SHELL, DEFAULT_XINITRC, NULL);
-		
-		/* Then fallback to hardcoding an xterm and the window manager. */
-		
-		//		system(XTERM_PATH " &");
-		execl(WM_PATH, WM_PATH, NULL);
-		
-		perror("exec");
-		_exit(1);
-		
-    default:				/* parent */
-		client_pid = child;
-		return TRUE;
-    }
-}
-
-static void
-sigchld_handler (int sig)
-{
-    int pid, status;
-	
-	again:
-    pid = waitpid (WAIT_ANY, &status, WNOHANG);
-	
-    if (pid > 0)
-    {
-		if (pid == server_pid)
-		{
-			server_pid = -1;
-			
-			if (client_pid >= 0)
-				kill (client_pid, SIGTERM);
-		}
-		else if (pid == client_pid)
-		{
-			client_pid = -1;
-			
-			if (server_pid >= 0 && xinit_kills_server)
-				kill (server_pid, SIGTERM);
-		}
-		goto again;
-    }
-	
-    if (server_pid == -1 && client_pid == -1)
-		longjmp (exit_continuation, 1);
-	
-    signal (SIGCHLD, sigchld_handler);
-}
-
-
-/* Server utilities. */
-
-static Boolean
-display_exists_p (int number)
-{
-    char buf[64];
-    xcb_connection_t *conn;
-    char *fullname = NULL;
-    int idisplay, iscreen;
-    char *conn_auth_name, *conn_auth_data;
-    int conn_auth_namelen, conn_auth_datalen;
-    
-    //    extern void *_X11TransConnectDisplay ();
-    //    extern void _XDisconnectDisplay ();
-	
-    /* Since connecting to the display waits for a few seconds if the
-	 display doesn't exist, check for trivial non-existence - if the
-	 socket in /tmp exists or not.. (note: if the socket exists, the
-	 server may still not, so we need to try to connect in that case..) */
-	
-    sprintf (buf, "/tmp/.X11-unix/X%d", number);
-    if (access (buf, F_OK) != 0)
-		return FALSE;
-    
-    sprintf (buf, ":%d", number);
-    conn = xcb_connect(buf, NULL);
-    if (xcb_connection_has_error(conn)) return FALSE;
-	
-    xcb_disconnect(conn);
-    return TRUE;
-}
-
-
-/* Monitoring when the system's ip addresses change. */
-
-static Boolean pending_timer;
-
-static void
-timer_callback (CFRunLoopTimerRef timer, void *info)
-{
-    pending_timer = FALSE;
-	
-    /* Update authentication names. Need to write .Xauthority file first
-	 without the existing entries, then again with the new entries.. */
-	
-    write_auth_file (FALSE);
-	
-    free_auth_items ();
-    make_auth_keys (server_name);
-	
-    write_auth_file (TRUE);
-}
-
-/* This function is called when the system's ip addresses may have changed. */
-static void
-ipaddr_callback (SCDynamicStoreRef store, CFArrayRef changed_keys, void *info)
-{
-#if DEBUG
-    if (changed_keys != NULL) {
-		fprintf (stderr, "x11: changed sc keys: ");
-		CFShow (changed_keys);
-    }
-#endif
-
-    if (auth_file != NULL && !pending_timer)
-    {
-		CFRunLoopTimerRef timer;
-		
-		timer = CFRunLoopTimerCreate (NULL, CFAbsoluteTimeGetCurrent () + 1.0,
-									  0.0, 0, 0, timer_callback, NULL);
-		CFRunLoopAddTimer (CFRunLoopGetCurrent (), timer,
-						   kCFRunLoopDefaultMode);
-		CFRelease (timer);
-		
-		pending_timer = TRUE;
-    }
-}
-
-/* This code adapted from "Living in a Dynamic TCP/IP Environment" technote. */
-static Boolean
-install_ipaddr_source (void)
-{
-    CFRunLoopSourceRef source = NULL;
-	
-    SCDynamicStoreContext context = {0};
-    SCDynamicStoreRef ref;
-	
-    ref = SCDynamicStoreCreate (NULL,
-								CFSTR ("AddIPAddressListChangeCallbackSCF"),
-								ipaddr_callback, &context);
-	
-    if (ref != NULL)
-    {
-		const void *keys[4], *patterns[2];
-		int i;
-		
-		keys[0] = SCDynamicStoreKeyCreateNetworkGlobalEntity (NULL, kSCDynamicStoreDomainState, kSCEntNetIPv4);
-		keys[1] = SCDynamicStoreKeyCreateNetworkGlobalEntity (NULL, kSCDynamicStoreDomainState, kSCEntNetIPv6);
-		keys[2] = SCDynamicStoreKeyCreateComputerName (NULL);
-		keys[3] = SCDynamicStoreKeyCreateHostNames (NULL);
-		
-		patterns[0] = SCDynamicStoreKeyCreateNetworkInterfaceEntity (NULL, kSCDynamicStoreDomainState, kSCCompAnyRegex, kSCEntNetIPv4);
-		patterns[1] = SCDynamicStoreKeyCreateNetworkInterfaceEntity (NULL, kSCDynamicStoreDomainState, kSCCompAnyRegex, kSCEntNetIPv6);
-		
-		if (keys[0] != NULL && keys[1] != NULL && keys[2] != NULL
-			&& keys[3] != NULL && patterns[0] != NULL && patterns[1] != NULL)
-		{
-			CFArrayRef key_array, pattern_array;
-			
-			key_array = CFArrayCreate (NULL, keys, 4, &kCFTypeArrayCallBacks);
-			pattern_array = CFArrayCreate (NULL, patterns, 2, &kCFTypeArrayCallBacks);
-			
-			if (key_array != NULL || pattern_array != NULL)
-			{
-				SCDynamicStoreSetNotificationKeys (ref, key_array, pattern_array);
-				source = SCDynamicStoreCreateRunLoopSource (NULL, ref, 0);
-			}
-			
-			if (key_array != NULL)
-				CFRelease (key_array);
-			if (pattern_array != NULL)
-				CFRelease (pattern_array);
-		}
-		
-		
-		for (i = 0; i < 4; i++)
-			if (keys[i] != NULL)
-			CFRelease (keys[i]);
-		for (i = 0; i < 2; i++)
-			if (patterns[i] != NULL)
-			CFRelease (patterns[i]);
-		
-		CFRelease (ref); 
-    }
-	
-    if (source != NULL)
-    {
-		CFRunLoopAddSource (CFRunLoopGetCurrent (),
-							source, kCFRunLoopDefaultMode);
-		CFRelease (source);
-    }
-	
-    return source != NULL;
-}
-
-
-/* Entrypoint. */
-
-void
-termination_signal_handler (int unused_sig)
-{
-    signal (SIGTERM, SIG_DFL);
-    signal (SIGHUP, SIG_DFL);
-    signal (SIGINT, SIG_DFL);
-    signal (SIGQUIT, SIG_DFL);
-
-    longjmp (exit_continuation, 1);
-}
-
-int
-server_main (int argc, char **argv)
-{
-    char **xargv;
-    int i, j;
-    int fd;
-	
-    xargv = alloca (sizeof (char *) * (argc + 32));
-	
-    if (!read_boolean_pref (CFSTR ("no_auth"), FALSE))
-		auth_file = XauFileName ();
-	
-    /* The standard X11 behaviour is for the server to quit when the first
-	 client exits. But it can be useful for debugging (and to mimic our
-	 behaviour in the beta releases) to not do that. */
-	
-    xinit_kills_server = read_boolean_pref (CFSTR ("xinit_kills_server"), TRUE);
-	
-    for (i = 1; i < argc; i++)
-    {
-		if (argv[i][0] == ':')
-			server_name = argv[i];
-    }
-	
-    if (server_name == NULL)
-    {
-		static char name[8];
-		
-		/* No display number specified, so search for the first unused.
-		 
-		 There's a big old race condition here if two servers start at
-		 the same time, but that's fairly unlikely. We could create
-		 lockfiles or something, but that's seems more likely to cause
-		 problems than the race condition itself.. */
-		
-		for (i = 0; i < MAX_DISPLAYS; i++)
-		{
-			if (!display_exists_p (i))
-				break;
-		}
-		
-		if (i == MAX_DISPLAYS)
-		{
-			fprintf (stderr, "%s: couldn't allocate a display number", argv[0]);
-			exit (1);
-		}
-		
-		sprintf (name, ":%d", i);
-		server_name = name;
-    }
-	
-    if (auth_file != NULL)
-    {
-		/* Create new Xauth keys and add them to the .Xauthority file */
-		
-		make_auth_keys (server_name);
-		write_auth_file (TRUE);
-    }
-	
-    /* Construct our new argv */
-	
-    i = j = 0;
-	
-    xargv[i++] = argv[j++];
-	
-    if (auth_file != NULL)
-    {
-		xargv[i++] = "-auth";
-		xargv[i++] = auth_file;
-    }
-	
-    /* By default, don't listen on tcp sockets if Xauth is disabled. */
-	
-    if (read_boolean_pref (CFSTR ("nolisten_tcp"), auth_file == NULL))
-    {
-		xargv[i++] = "-nolisten";
-		xargv[i++] = "tcp";
-    }
-	
-    while (j < argc)
-    {
-		if (argv[j++][0] != ':')
-			xargv[i++] = argv[j-1];
-    }
-	
-    xargv[i++] = (char *) server_name;
-    xargv[i++] = NULL;
-	
-    /* Detach from any controlling terminal and connect stdin to /dev/null */
-	
-#ifdef TIOCNOTTY
-    fd = open ("/dev/tty", O_RDONLY);
-    if (fd != -1)
-    {
-		ioctl (fd, TIOCNOTTY, 0);
-		close (fd);
-    }
-#endif
-	
-    fd = open ("/dev/null", O_RDWR, 0);
-    if (fd >= 0)
-    {
-		dup2 (fd, 0);
-		if (fd > 0)
-			close (fd);
-    }
-	
-    if (!start_server (xargv))
-		return 1;
-	
-    if (!wait_for_server ())
-    {
-		kill (server_pid, SIGTERM);
-		return 1;
-    }
-	
-    if (!start_client ())
-    {
-		kill (server_pid, SIGTERM);
-		return 1;
-    }
-	
-    signal (SIGCHLD, sigchld_handler);
-	
-    signal (SIGTERM, termination_signal_handler);
-    signal (SIGHUP, termination_signal_handler);
-    signal (SIGINT, termination_signal_handler);
-    signal (SIGQUIT, termination_signal_handler);
-
-    if (setjmp (exit_continuation) == 0)
-    {
-		if (install_ipaddr_source ())
-			CFRunLoopRun ();
-		else
-			while (1) pause ();
-    }
-	
-    signal (SIGCHLD, SIG_IGN);
-
-    if (client_pid >= 0) kill (client_pid, SIGTERM);
-    if (server_pid >= 0) kill (server_pid, SIGTERM);
-	
-    if (auth_file != NULL)
-    {
-		/* Remove our Xauth keys */
-		
-		write_auth_file (FALSE);
-    }
-	
-    free_auth_items ();
-	
-    return 0;
-}

From 603a8b73d46d59e5f9f0be39be8317f3fadfe7e6 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Thu, 20 Dec 2007 18:29:57 -0800
Subject: [PATCH 341/552] XQuartz: Cleaned up command line arguments.

---
 hw/xquartz/darwin.c | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index d6eb100ac..463073485 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -701,20 +701,15 @@ void ddxInitGlobals(void)
  */
 int ddxProcessArgument( int argc, char *argv[], int i )
 {
-    if( !strcmp( argv[i], "-launchd" ) ) {
-        ErrorF( "Launchd command line argument noticed.\n" );
-        return 1;
-    }
+//    if ( !strcmp( argv[i], "-fullscreen" ) ) {
+//        ErrorF( "Running full screen in parallel with Mac OS X Quartz window server.\n" );
+//        return 1;
+//    }
 
-    if ( !strcmp( argv[i], "-fullscreen" ) ) {
-        ErrorF( "Running full screen in parallel with Mac OS X Quartz window server.\n" );
-        return 1;
-    }
-
-    if ( !strcmp( argv[i], "-rootless" ) ) {
-        ErrorF( "Running rootless inside Mac OS X window server.\n" );
-        return 1;
-    }
+//    if ( !strcmp( argv[i], "-rootless" ) ) {
+//        ErrorF( "Running rootless inside Mac OS X window server.\n" );
+//        return 1;
+//    }
 
     // This command line arg is passed when launched from the Aqua GUI.
     if ( !strncmp( argv[i], "-psn_", 5 ) ) {
@@ -838,12 +833,6 @@ int ddxProcessArgument( int argc, char *argv[], int i )
         exit(0);
     }
 
-    // XDarwinStartup uses this argument to indicate the IOKit X server
-    // should be started. Ignore it here.
-    if ( !strcmp( argv[i], "-iokit" ) ) {
-        return 1;
-    }
-
     return 0;
 }
 

From fa9680a7305d7f906da1bdeb40a0863ef66316e6 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Thu, 20 Dec 2007 19:38:20 -0800
Subject: [PATCH 342/552] XQuartz: Added localization. (cherry picked from
 commit 7a5cc7bfbb296a2c41a580b063324c448f7131db)

---
 .../bundle/Dutch.lproj/InfoPlist.strings      | Bin 0 -> 274 bytes
 .../bundle/Dutch.lproj/Localizable.strings    | Bin 0 -> 1084 bytes
 .../Dutch.lproj/main.nib/keyedobjects.nib     | Bin 0 -> 32654 bytes
 .../bundle/French.lproj/InfoPlist.strings     | Bin 0 -> 276 bytes
 .../bundle/French.lproj/Localizable.strings   | Bin 0 -> 1168 bytes
 .../French.lproj/main.nib/keyedobjects.nib    | Bin 0 -> 36404 bytes
 .../bundle/German.lproj/InfoPlist.strings     | Bin 0 -> 276 bytes
 .../bundle/German.lproj/Localizable.strings   | Bin 0 -> 1096 bytes
 .../German.lproj/main.nib/keyedobjects.nib    | Bin 0 -> 34995 bytes
 .../bundle/Italian.lproj/InfoPlist.strings    | Bin 0 -> 278 bytes
 .../bundle/Italian.lproj/Localizable.strings  | Bin 0 -> 1146 bytes
 .../Italian.lproj/main.nib/keyedobjects.nib   | Bin 0 -> 33677 bytes
 .../bundle/Japanese.lproj/InfoPlist.strings   | Bin 0 -> 272 bytes
 .../bundle/Japanese.lproj/Localizable.strings | Bin 0 -> 916 bytes
 .../Japanese.lproj/main.nib/keyedobjects.nib  | Bin 0 -> 33095 bytes
 .../bundle/Spanish.lproj/InfoPlist.strings    | Bin 0 -> 276 bytes
 .../bundle/Spanish.lproj/Localizable.strings  | Bin 0 -> 1134 bytes
 .../Spanish.lproj/main.nib/keyedobjects.nib   | Bin 0 -> 35294 bytes
 .../bundle/X11.xcodeproj/project.pbxproj      | 122 ++++++++++++++++++
 hw/xquartz/bundle/da.lproj/InfoPlist.strings  | Bin 0 -> 276 bytes
 .../bundle/da.lproj/Localizable.strings       | Bin 0 -> 1090 bytes
 .../bundle/da.lproj/main.nib/keyedobjects.nib | Bin 0 -> 34164 bytes
 hw/xquartz/bundle/fi.lproj/InfoPlist.strings  | Bin 0 -> 274 bytes
 .../bundle/fi.lproj/Localizable.strings       | Bin 0 -> 1102 bytes
 .../bundle/fi.lproj/main.nib/keyedobjects.nib | Bin 0 -> 34765 bytes
 hw/xquartz/bundle/ko.lproj/InfoPlist.strings  | Bin 0 -> 266 bytes
 .../bundle/ko.lproj/Localizable.strings       | Bin 0 -> 916 bytes
 .../bundle/ko.lproj/main.nib/keyedobjects.nib | Bin 0 -> 32690 bytes
 hw/xquartz/bundle/no.lproj/InfoPlist.strings  | Bin 0 -> 276 bytes
 .../bundle/no.lproj/Localizable.strings       | Bin 0 -> 1084 bytes
 .../bundle/no.lproj/main.nib/keyedobjects.nib | Bin 0 -> 33581 bytes
 hw/xquartz/bundle/pl.lproj/InfoPlist.strings  | Bin 0 -> 274 bytes
 .../bundle/pl.lproj/Localizable.strings       | Bin 0 -> 1116 bytes
 .../bundle/pl.lproj/main.nib/keyedobjects.nib | Bin 0 -> 35113 bytes
 hw/xquartz/bundle/pt.lproj/InfoPlist.strings  | Bin 0 -> 274 bytes
 .../bundle/pt.lproj/Localizable.strings       | Bin 0 -> 1192 bytes
 .../bundle/pt.lproj/main.nib/keyedobjects.nib | Bin 0 -> 34533 bytes
 .../bundle/pt_PT.lproj/InfoPlist.strings      | Bin 0 -> 274 bytes
 .../bundle/pt_PT.lproj/Localizable.strings    | Bin 0 -> 1140 bytes
 .../pt_PT.lproj/main.nib/keyedobjects.nib     | Bin 0 -> 35485 bytes
 hw/xquartz/bundle/ru.lproj/InfoPlist.strings  | Bin 0 -> 274 bytes
 .../bundle/ru.lproj/Localizable.strings       | Bin 0 -> 1122 bytes
 .../bundle/ru.lproj/main.nib/keyedobjects.nib | Bin 0 -> 36593 bytes
 hw/xquartz/bundle/sv.lproj/InfoPlist.strings  | Bin 0 -> 260 bytes
 .../bundle/sv.lproj/Localizable.strings       | Bin 0 -> 1106 bytes
 .../bundle/sv.lproj/main.nib/keyedobjects.nib | Bin 0 -> 35017 bytes
 .../bundle/zh_CN.lproj/InfoPlist.strings      | Bin 0 -> 260 bytes
 .../bundle/zh_CN.lproj/Localizable.strings    | Bin 0 -> 884 bytes
 .../zh_CN.lproj/main.nib/keyedobjects.nib     | Bin 0 -> 31481 bytes
 .../bundle/zh_TW.lproj/InfoPlist.strings      | Bin 0 -> 266 bytes
 .../bundle/zh_TW.lproj/Localizable.strings    | Bin 0 -> 890 bytes
 .../zh_TW.lproj/main.nib/keyedobjects.nib     | Bin 0 -> 31748 bytes
 52 files changed, 122 insertions(+)
 create mode 100644 hw/xquartz/bundle/Dutch.lproj/InfoPlist.strings
 create mode 100644 hw/xquartz/bundle/Dutch.lproj/Localizable.strings
 create mode 100644 hw/xquartz/bundle/Dutch.lproj/main.nib/keyedobjects.nib
 create mode 100644 hw/xquartz/bundle/French.lproj/InfoPlist.strings
 create mode 100644 hw/xquartz/bundle/French.lproj/Localizable.strings
 create mode 100644 hw/xquartz/bundle/French.lproj/main.nib/keyedobjects.nib
 create mode 100644 hw/xquartz/bundle/German.lproj/InfoPlist.strings
 create mode 100644 hw/xquartz/bundle/German.lproj/Localizable.strings
 create mode 100644 hw/xquartz/bundle/German.lproj/main.nib/keyedobjects.nib
 create mode 100644 hw/xquartz/bundle/Italian.lproj/InfoPlist.strings
 create mode 100644 hw/xquartz/bundle/Italian.lproj/Localizable.strings
 create mode 100644 hw/xquartz/bundle/Italian.lproj/main.nib/keyedobjects.nib
 create mode 100644 hw/xquartz/bundle/Japanese.lproj/InfoPlist.strings
 create mode 100644 hw/xquartz/bundle/Japanese.lproj/Localizable.strings
 create mode 100644 hw/xquartz/bundle/Japanese.lproj/main.nib/keyedobjects.nib
 create mode 100644 hw/xquartz/bundle/Spanish.lproj/InfoPlist.strings
 create mode 100644 hw/xquartz/bundle/Spanish.lproj/Localizable.strings
 create mode 100644 hw/xquartz/bundle/Spanish.lproj/main.nib/keyedobjects.nib
 create mode 100644 hw/xquartz/bundle/da.lproj/InfoPlist.strings
 create mode 100644 hw/xquartz/bundle/da.lproj/Localizable.strings
 create mode 100644 hw/xquartz/bundle/da.lproj/main.nib/keyedobjects.nib
 create mode 100644 hw/xquartz/bundle/fi.lproj/InfoPlist.strings
 create mode 100644 hw/xquartz/bundle/fi.lproj/Localizable.strings
 create mode 100644 hw/xquartz/bundle/fi.lproj/main.nib/keyedobjects.nib
 create mode 100644 hw/xquartz/bundle/ko.lproj/InfoPlist.strings
 create mode 100644 hw/xquartz/bundle/ko.lproj/Localizable.strings
 create mode 100644 hw/xquartz/bundle/ko.lproj/main.nib/keyedobjects.nib
 create mode 100644 hw/xquartz/bundle/no.lproj/InfoPlist.strings
 create mode 100644 hw/xquartz/bundle/no.lproj/Localizable.strings
 create mode 100644 hw/xquartz/bundle/no.lproj/main.nib/keyedobjects.nib
 create mode 100644 hw/xquartz/bundle/pl.lproj/InfoPlist.strings
 create mode 100644 hw/xquartz/bundle/pl.lproj/Localizable.strings
 create mode 100644 hw/xquartz/bundle/pl.lproj/main.nib/keyedobjects.nib
 create mode 100644 hw/xquartz/bundle/pt.lproj/InfoPlist.strings
 create mode 100644 hw/xquartz/bundle/pt.lproj/Localizable.strings
 create mode 100644 hw/xquartz/bundle/pt.lproj/main.nib/keyedobjects.nib
 create mode 100644 hw/xquartz/bundle/pt_PT.lproj/InfoPlist.strings
 create mode 100644 hw/xquartz/bundle/pt_PT.lproj/Localizable.strings
 create mode 100644 hw/xquartz/bundle/pt_PT.lproj/main.nib/keyedobjects.nib
 create mode 100644 hw/xquartz/bundle/ru.lproj/InfoPlist.strings
 create mode 100644 hw/xquartz/bundle/ru.lproj/Localizable.strings
 create mode 100644 hw/xquartz/bundle/ru.lproj/main.nib/keyedobjects.nib
 create mode 100644 hw/xquartz/bundle/sv.lproj/InfoPlist.strings
 create mode 100644 hw/xquartz/bundle/sv.lproj/Localizable.strings
 create mode 100644 hw/xquartz/bundle/sv.lproj/main.nib/keyedobjects.nib
 create mode 100644 hw/xquartz/bundle/zh_CN.lproj/InfoPlist.strings
 create mode 100644 hw/xquartz/bundle/zh_CN.lproj/Localizable.strings
 create mode 100644 hw/xquartz/bundle/zh_CN.lproj/main.nib/keyedobjects.nib
 create mode 100644 hw/xquartz/bundle/zh_TW.lproj/InfoPlist.strings
 create mode 100644 hw/xquartz/bundle/zh_TW.lproj/Localizable.strings
 create mode 100644 hw/xquartz/bundle/zh_TW.lproj/main.nib/keyedobjects.nib

diff --git a/hw/xquartz/bundle/Dutch.lproj/InfoPlist.strings b/hw/xquartz/bundle/Dutch.lproj/InfoPlist.strings
new file mode 100644
index 0000000000000000000000000000000000000000..8f978d63fbce745e2fa97bce8bc07e87994e97bb
GIT binary patch
literal 274
zcmZvX%L>9U5Jm6WuLxZhv9%i);zA3GAa2~amA(}1gSHC#@#;wyA|fHVlbJh{ljlo;
zd>L(2E73t0o%B$ql-vz%)sd-Hp$5%4*W7aAks9ak)RR5qzB`xC%mFLbQVU&ir}#2$
znO~wtGq$I_#w<_MKi(C-{`1m~xP_xq@zecHX(vZeg&GpY5H=9mzCuUG7*Pu~p*p8#
N>1~hwPePv~c>|}zEV}>z

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/Dutch.lproj/Localizable.strings b/hw/xquartz/bundle/Dutch.lproj/Localizable.strings
new file mode 100644
index 0000000000000000000000000000000000000000..1ff39fe67e3ec640b76f88b8af94b5211b17a38b
GIT binary patch
literal 1084
zcmcJOF;BxV5QT5<uduoxRTRXG5UOB+0VKo#1528O5C};~+D7Ha1K+a~HNae1j_o_&
zyLa!LuWviHnK`?(+#)NivW!z_FP2)#?!(r2R*ampd@~{@HnoK{+;O%gX3g62{cY($
zEQxf?itm8s?9omb=k|nO^V*(ANPq7g;uF%AHAL!MGYVM6?8UC)Mms`@dNvKbO2)vy
zV^=W5SiEX>xxF(|OV|l5#jkA2nv5`au~Mq_^$*NqG}AuAI_4qk#@{T7ks57pN$dz6
zot-hK_Q0Lg`=#b5`!{C8KH<LNWFP7eOafY{qULrv(sV%$;xUdIDqfj1?cmdZ9y*<R
zmg?6Uixg1(G3T69s32sYqgg|2#y9fHMRwqGNk6>-MY&#yz)t6oCnH8WIi`?THn%0K
zUW<ArKH`?!D=OrmgwBO%@o3;C=CVk^Q{LmGf5*3Y9Qmuhqv8Dpz8jE)u8uB!e}xe6
zRdEB_?tNc)mNE8X)TIRxB?=YT6|t}EH)M}tbLI2bBL@FH`>FqqD)r~@Ug$k1{V#pZ
EKNc>xSpWb4

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/Dutch.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Dutch.lproj/main.nib/keyedobjects.nib
new file mode 100644
index 0000000000000000000000000000000000000000..95c26d7b3f437730f9b969b7f44c6aeddbee0693
GIT binary patch
literal 32654
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
Li+R5Px8C~?1gk>^

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/French.lproj/InfoPlist.strings b/hw/xquartz/bundle/French.lproj/InfoPlist.strings
new file mode 100644
index 0000000000000000000000000000000000000000..88e1f04ac78e9f0b14a2b6fa57a4a02ae91d8edd
GIT binary patch
literal 276
zcmZvXy9&ZU5Jhk8S1c)mn3%>wEHt19Vq;?~c`2F)Nfh+s)w5ez1X*_P?983nv+s`r
z`7+w6R-%(`y6B}$DY*yQsv}dYLJgX8Zn@>e6E)7?sV95I{d6v$nIl%LwN|?0PVr^h
zGrvTQ7Hm&PO<A7if4m!f{qLm%aSKPKV$eOLG>YH~HO3di*uZ2v3!NQhL@m^e>XMq}
Mw><Vo34M;`3l6p|GXMYp

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/French.lproj/Localizable.strings b/hw/xquartz/bundle/French.lproj/Localizable.strings
new file mode 100644
index 0000000000000000000000000000000000000000..2770dfb8c234ca06dbeaccfab1657418ae4d6a12
GIT binary patch
literal 1168
zcmcJPJx;?w5QV4CDOM>X2%<&^MNmKi5~87?33dXO%sSW!Q8*3f;U>8R@V#AcY>+6U
zmE+m@doypw`TDja8=12UD{N||RrbVfZO=9{kMwFQEK5$oUA7Ss0~^}JYJ8k+h*|M&
z`2DR}lhG6Dcq)EVE@$_4%sI0M?0T+j-plmY?*N-JZFt8>-4~pasxo9%SK-n0vP|1*
zYU=WwRR0>O<fvlRwLmKDg)_4pN!e!Dg(lRzm$Qo%Q%&eURhGe-<R`TKI;4FIo}L)7
z(X^V}#_;IulxJw40k^S3yv3+;WW?3zr=faBEn+;{RY8HZ<5hL*9y$8x@q347ic{Xi
zup-`f5#m{hC3p^AY7m4aZ)KJ?+UDUd#+JLOM-I0=4pY5idDV8O43VGzCzxieC^07n
zVvO+OHpP67sZ{}SPKW(Xa7;oQ;fVBPm@$_EPM64AZkj^sX%VD6bg7A)u-}9BySO2X
zSgG0#iTj+mDZ)gwA&+5Sge4qLMr9vkN#Dyk{P~vOZt4?s9%Qjn?+yDJ?2KA2K`EJR
ZA3yfsEc)!L`&)X{|44_NG;wQN+#i^B${PRx

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/French.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/French.lproj/main.nib/keyedobjects.nib
new file mode 100644
index 0000000000000000000000000000000000000000..9f9a7da675bef548242cd451e03a10402bebdd72
GIT binary patch
literal 36404
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

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/German.lproj/InfoPlist.strings b/hw/xquartz/bundle/German.lproj/InfoPlist.strings
new file mode 100644
index 0000000000000000000000000000000000000000..aa37e755573dcd4141d4044dad25870ae3210b24
GIT binary patch
literal 276
zcmZvXy$ZrG6h^<<rwAR3Xzk)44q8wIaS_B-`YUQ%+A8S7t0x&0L_%_td(TZyo-YmM
z%V@1iu?{-xsE1M|<Zi@9EtyIs(GWA%6{n2-K(*srb!1P_cSrf$*<(anXs#=C0+(vT
z{THIql<8@&5yR8u54(ixJ}+(AH+YoFf4Yr!kY7uq5U)UexCqA@C)=5;aF!vpKx3*i
OYS!QS*dN98IhQvCmMs$i

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/German.lproj/Localizable.strings b/hw/xquartz/bundle/German.lproj/Localizable.strings
new file mode 100644
index 0000000000000000000000000000000000000000..a5489ab5cef0b82c86831a2eab039d1a4d01659c
GIT binary patch
literal 1096
zcmcJOy-veG5QMkRQ&=e@NJNbg3Q#~11fqa~CW-T75$=plu=0L96D9D?oh>_vHagk9
z+n?Flx%JQY$Oe|!m1Q=yjd@#fs%&iwbL`%1i|3t{ah7jjBkNh;##RuM*p8en-;(#f
zr2^5Bnecet4OU`LcEUQhXZ(6@Y}rBj8+U|HNISkUQ|Fwufz_P7*m)w#4$8D<Q^3oy
z8vYf#4NHv0D`%J4D{EmXJE1M`tD35&9n3aYN|mAihS?m=v|nNE@{si-L^^V$Mp;`@
z8=_-kXFPqI*cZL5Lv<<t02k@obgbHiz0^Ig@yzh+meTNU)qD)+|1kD5q-#ZNQ6s2d
zDWj@WDoIr_7gA(#Y<EO!MhYULX6nate;%8<i~UDs^I(zwQnBesm__JA--zE<R&>PB
z-D(bn8>2q!ZsVOQ$^{KinaCb<sY$+tNkXQt`Nav$LGg5xg<i#G7H(JwE36JIRT|=H
zCj62f9Y~sn_MXOM&I0eq&fz;u{R#Ew@VO2Q@(zdSImV+|UgAF#hx_{fZ~MQXnpBHZ
H*VO$5=Eu5y

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/German.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/German.lproj/main.nib/keyedobjects.nib
new file mode 100644
index 0000000000000000000000000000000000000000..19532a9c2bda4d9bd186b9baf2e553b5f19ffaf9
GIT binary patch
literal 34995
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

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/Italian.lproj/InfoPlist.strings b/hw/xquartz/bundle/Italian.lproj/InfoPlist.strings
new file mode 100644
index 0000000000000000000000000000000000000000..4121698807d1e090f39cf32b14d130c197c7d5f8
GIT binary patch
literal 278
zcmZvXI}5@<5QL}pR~#vWn3%>wEHt19Vq;?~c`2F)Nfh+QtKVH=5oEcWz1^9;+4o0*
zd>QRjE73_eUG!3>l-dJq)lsQcfd<UEx4d%li5kc6)Kk5}ema)V%n=c5t(ESuQ+S#7
z%r8Ns1;^7-Q^M2y4|fBv|NV3zZ}Cy77^sIX?eqv|p~hq}E*o4~ZK1RC8PN+hqr0SM
NH?SJJQ-aR9`2ulQEtmiR

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/Italian.lproj/Localizable.strings b/hw/xquartz/bundle/Italian.lproj/Localizable.strings
new file mode 100644
index 0000000000000000000000000000000000000000..d05d73d4449adbdbc554a16180b78a8bf11b2655
GIT binary patch
literal 1146
zcmcJPOH0E*6ov1)zhdaJh~ipAiVC_=5H~K|#3Zc)X%d@0Xn(x=otcEB?Ydkho!rN{
zXU^R8_s_0uV$L4STVjP(Hs@_?-<Dg+?#I?dR+#5qu?ZC;8{5>D<T%?=v*x$qdFa`K
zSW@X&70(XK*@s<YclJqK>)B=lq~p8`VnW*S8!Po*V+E{I_F`9&(F{<Mmdz4gCD!rZ
zvMVq#7O$F}w*{74#!hHCadlJIY=GI<N~tECzhjo7nf7zMLmu*OLS{*g)M#2yW|!#b
z?3OjQcXE7)>P*s7nu(F4zJgJX&k<>e`}TAhSe+`pp2Bjhm?@M#OKPq_(VZ$wxW{_#
z!Iz%u-6^i~DO0K?AtDTE>1~fit;AWUU1IX+%%}P$L2b>35Op)!sYVJ#uOg>B7i372
z8LMNY9-386-yFXfs(ZwVyoPM*&`Y-`{co7&QTr9V2DT~BI1h1p>%eORaz>5j;VVps
zz7X{*@rwN=k?!lb52sJ@7lS*Vl3Sv^<}W#0?-#IBxIBgK^+A6hZeDj1v(9z?H~Q#*
Mqo41`b{gA`|3uBg{Qv*}

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/Italian.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Italian.lproj/main.nib/keyedobjects.nib
new file mode 100644
index 0000000000000000000000000000000000000000..b6e2e1bb15ab0bea00866cc2a56194ac46e19224
GIT binary patch
literal 33677
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

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/Japanese.lproj/InfoPlist.strings b/hw/xquartz/bundle/Japanese.lproj/InfoPlist.strings
new file mode 100644
index 0000000000000000000000000000000000000000..2d6330fa7e8c58dec36e792de0f62f76ea0cb2fa
GIT binary patch
literal 272
zcmZvXJqp4=5QSguDMHF1x~8!Z3k@iO*x1-g{uDI{Nfh*C9>ZIB09#SNO<^Ij?9S}G
zH?!Zq-s;Meqq%a0T5GSZE{YXVI}uA&RB~lRhnR5AxFzHr6^*}AO?8L++_*euwpf8C
z8taHV!WV17`~%U^knL)v9?R9>k9Uf%{=T#%FX70P{&YL$W}fD1?&g8w!(`MZ3*al@
av0bS)4WW-_)JGkmS$4}}e-qNzaC`tP?k{@)

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/Japanese.lproj/Localizable.strings b/hw/xquartz/bundle/Japanese.lproj/Localizable.strings
new file mode 100644
index 0000000000000000000000000000000000000000..99821ea1f97299c57a8f24ee4719eb7661e96a0a
GIT binary patch
literal 916
zcmcIjyG{a85FPB~C)`jH#Y1h3Q7JScY9$*;l;?urE`mrXw6HKFYE1kA6MG9Q3qJ%K
zD+?1TwKU?HWf#z%Ozz&f^E~&=-Jib9OIQqvNm(*d6-O+dT2hjN*wl`sNzXB*%(ME!
z%m_+ImZi=ZL)y$~a&Pea*V1A|o0$fe!>?b<kfcN@OOmEv*SZwPD*ca}rB5rhxeqe+
zT%%NpDo0(>IgDtGRmpg0>cnMJeEcnHRf-~3Ts3NCIiwUMPfe>8=+|!AH9uB!l&efN
z-23~;a^y^Pi`H=*YCUlyZRRK&4bPI72zfMQkt^ii47aB%i3{wah;wvsO)UlsCN}yr
zL%uu~yjT;LC?Sx#>%<dt(5d<Udvx)EM||T6@AyO<d)P+?mF;vT%gTYR*HqH&6~h5y
z=5+CkF(%q5no-=~3THe`5#0i39`xQyg7+}UyW_Dom~oAKJG^O`j46|bWL*yR9a*&6
zv=$f>p~rtit1e?X+N&cb@PIdBeMWC$eK*-RM;vQz=h~>Zcpki<hwjAs?|6UJaQZrP
GzuPa6#IRTZ

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/Japanese.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Japanese.lproj/main.nib/keyedobjects.nib
new file mode 100644
index 0000000000000000000000000000000000000000..523fd08569ed38da1e38253b669925374536f0fe
GIT binary patch
literal 33095
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
R%?b#3k--Ts@_*N|{{T5LF{l6l

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/Spanish.lproj/InfoPlist.strings b/hw/xquartz/bundle/Spanish.lproj/InfoPlist.strings
new file mode 100644
index 0000000000000000000000000000000000000000..0e4287d14155bd78396ae9d50cecdf37782ca44a
GIT binary patch
literal 276
zcmZvXJqyAx6h-gsuLvEBXzk)44q8wIadB~#ep%GEv{lf*?XI3=5D^K<dwKW1my_p9
zL-{gVt5U4JPAYU)s)X8=*r=sasU#X=#<}8_kq=Zmf2)q_5%<lxd}j7okrtZkf;+*N
zYQy|9(P+x{w9|;?Y4XRr#MgaZ+LAYLl*)g)zbPN+Mj>2*`eYG|HB7cM*TGSSXo1G4
PGc?O@dF+p3`W(v}Gg2+L

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/Spanish.lproj/Localizable.strings b/hw/xquartz/bundle/Spanish.lproj/Localizable.strings
new file mode 100644
index 0000000000000000000000000000000000000000..652f432a5d851f6f95f560020908ed4dd3542812
GIT binary patch
literal 1134
zcmcJPO-{ow5QS&mQ&?SAsE9Q}sDcG7KtkQHVACcc1f@wxTB@Fovv3jMdv>fE_Q-N<
z&+nTz(|&#1sm;vUwN<vV+FC1l?d`=1Yq-7H4$YQT@s@6e$Hb<#upS#{2Yhy%1K;10
zJrNr`9lPZlV>x@YGuEX&q1V2(=Oof!yAyPZbl?o0dUvcER2g@nYq1!TD60`o53Yt4
z@$b3SEFl)Ij$36LR$)0eMJv!No3iFf%%iWE8hrf`Sq5jimq=3_lD>P(1|P98jFQ~u
z@aXJ<J+%*8VpVz;BU|D(_wfpRf~RWkM|tGq$m9}jw2R)+N<6CKoLE9wkEghdOlJ6t
z$xuUNTOCofP_cAd`^3s2ePw6pw?q?L!XE5|TwF@pkM`<9%Jj;=G$mn{99Rmh<tv|v
zSZoV%IMwrwtvy!BBR(<gd>;;2IM1f$Kotv__&#TPC*#!Ld;5%U=zo~j4v&_eRUU=<
zzxLChN=l?+N9g8g;;-S#SDzuTlb)th;rOrYcVy2%bK~=O34#U4cfNjS!Ro&-Jdj8K
O6vv5Pf+|ewnDYntYr#?g

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/Spanish.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/Spanish.lproj/main.nib/keyedobjects.nib
new file mode 100644
index 0000000000000000000000000000000000000000..029349dd078a50c3a5074bda5f5fec378cb6904f
GIT binary patch
literal 35294
zcmeFa2YeLO`T#oT?98^=B)jRAY<lkrA&?N#H$9sTy@VxMLL|w?6so`+Q4~Qb(i9P-
zilU+*h$w=J1(9w6LEx$=iVZ}-0`EIByU7Nk*L(l({a*WXZ`|D}=X~eu?aYj8ZE9@q
zNK8DzAO<rshGjTL&Zrpmu+T}Cw)RGAOHF8pwRL!?xvg$OBODqQY8`i%rLLphl|ggX
z9Ay-Ya&&QSymYYM++h|_t=6T&RBD-Osn4<9^nwom#_)`WNn+BN3}z6M$K*2xri_`x
zJi<K5Y+yDro0u)kbIkM1i_FW+4rUkg8uL1{hk28EmpQ~7V~#T?n2(rK%z5Sl^ELAg
z^F4E&`GffrF^EMxazR?8L!M|LDo2&58kx{YREO$OBWgkSqS<H;nvYhaXVDh44Q)p|
z(QD`p^e%c2y^ju}W9V~q7JZ4nMwig{=tp!J{f-gFSdHDVFZRQF9E4+VB2L47aR$!9
zxi}9O;$mEaEAbFK6c59ru?63Sn{YF}7th8I;0NJvK3;$q<E3~RejGoA*Wz_}J>HC8
z#M|(8{5sx)-@tF-1NZ}c5Pyh|;gk3j{tTbP=kW#nJ^mSA##iul86%U+lroj9k1R+Q
zB1@E|%F<+gWf`(TvJzRTY_M#IY^=;ItCKaz?vhQEwaTW*rpl(tX2~9uJuF)wTPRy8
zdqVc4Y_)8?Y=i6>*-NtRvX^ChWN*m!%J$0+$d1cS$WF>m$<E5YkzJJiAp2EzU3P=T
ztc+E%F07W-v7T%I+lLKg^=ud$$0o3eYzEt(9l#D^i&z6&%$Bf~>@ao&JCdzq>)G*a
z1KY$lvu*4&b~<|xE3gl+53+OFhuBBhrR*|xIlF>g#cp6Xu}`yG*_YUD>?`apb`Sd&
zdw~6bJ;;8@9%DaYKV{Fb7ucWJpV`aoHTD+Aa&k_=X*nI|!TECmTpuow3+2MNXfBCM
z=F+)=TsAj|%i#*Sa;}1_<f^#ATr=0gS-DoOotwhl!#%`3!mZ%eaBI1B+!pRR?j>#;
zw}acm?dA4y?{f#ZW84YuBkm0MId_5khP%l9%w6WLa96osxj*EbTq)PdedK;}e|e}p
zOdcmskSEIf$us0R@;rIIyo|dnFPB%yjq+jgk@8XUaq_$5ZFrl!Lq0=3Q$9!jpnR@;
zk$kcIarqPSRq_q;jq>N^TjejxcfozH%6H3Om+z6kA>S+CCx27EU;d8#1Njm8QTfO6
z&*kUj=j9jW-^wq^zn5Q@Uy)x|Fbb@YDR_lO;jC~`xGOvqzKS44up&ees)$lVE8-Pt
zioS|;ML$KBVxS^Vv03rFVw+;S;x)y7#XE|R6rU@;R(zxQUh$LSXT@(ynNp*4QhF)_
zm3n22GF6$S9H=Z&nv|oIqm|>84a$kiCgl|6ROK|~J<9u)4=Wcb7b}-4S1X@Vu2rs6
zZdAUYd{Oz5a))xK@)hN7`5xtK%Ga5G%Du`rRgtO%s$W&tRM%BERKKZySN);-Q*~2y
zOU<Z}8mnboo0?T~YPnjWR;pEMwVGFJ)J|$=wToJ-)~Q|9ZfbY6huTx^rS?|)sD0Ib
zYJYWrx{o?gtyc%BgViDGP<5C(Tpgi~R7a_!)iLT=b(}h0ouE!sC#jRwDe6>pn!2w#
zUENQeq3*99pw3ihsRydF)q~VI>Rff6I$vF&E>st(4eDZbiMmu>rY=`ks4LY~YNNVZ
zZBo~$2djsuhpI=YN2`D5ALAeASMpErtN17R)%+U%DSj=#j$hAj;5YJ{_^0{J{4@Ns
z{1*N>{(1fdek=bX{}R8A-_F0x@8EaxukgG0SNYxiYy9i{9{vq}FTam}lYfhUo8QmB
z!@tYF$G^`X;6LCG@*nbt_{01W{wRM;R?8pfPw*e{AM>B^pYkX9Q~YQAY5olVIe(Tv
z$Dil_#eczn$$!OP;J@a-;V<&v^55~7`0x22_#gS7_@DX9{1yHe{wn_~e~rJ+-{61a
zf9L<;|KxA-w=|3fX|P77VKtmau2E=|8kI(^;WZkKlg3%&qS0z}8dr^*#$Dr~@zi)}
zyfr==UyYx}UlX9|qY2dLH9?wSO^7B`6Q&8*L}(&4QJQE?j3!nSr-|1jXc9F^nq*Ci
zrmrSLlQ}rFrL(E&tk#urVw@QlM$70JSH_KTXFM2B#*6W0d>CKGkMU;$m_AG(qi2Gc
zU?zkKWx|+nCW47%qL^qVhKXh3n0O|ENgPsPs<v7?hJ@BNncLe(SC}d#V+7WwT{Js+
z^th#ch`FiL0!Mr*OgVLRmiG3>ag9xl9aAeC>uu-Y-aKnd3s^F+aqS~3Ocmy4OFJD0
zz8AK^kIB}yiS#OIM0#cf%m)L|uW&-V;jbpLjcskCR~A}ZI?By0<_1e!tyWuM8qx^x
zG+Bl=w$xiEOK{uPVIR(`7r5!P!(m#>ln#Jmlmv@(gMbOXLC_9@hY@^TP!V)RkP|$V
z;Nb-QLh!EwBPa;EOz<@w&L?=pF(5}WlftCJV#Nj0#R!}rqbK?@=}bSEDZag<t+Ay+
zU||V4t>7rsnJKc4G5whVOeT{xOrnCNeT4L-1;$v%WHAGoY>^h_ogHRarb!%SScR$U
zi?mp2oE#>1EtAV+j{!hB+dHhy(n-Kmac-Wq&T8(W1qH2uDP)R(3^sqGT~Mx(hAC!B
z)-feaDU%I|u}^I27!0#oI;1<xnF_)Df;OG0WU3e=Q_Yx|8fGvvgc-^VV}>&$n32pV
zW;8Q~sb$78W@a2y$J8?xW<1ltOkf(ByO@bg6VuGJFjl6OxtnQY+L;cflbOU!W~MMx
znQ6>)<{oASGn1Lc2n=EFWo9$?G4~5<!B@}=VM4T!AT$UQg=xYpVU93QSRgDCmI==b
zFA2Ma*M+x*{la^~hr)5;6XCS*h478=lW<x1RrsACh9ICF&{R#33qf84^&u#PpfG|W
z35p{qnV^LPEh6Yqf>si=il7YyZ6at3LC+Jkji8rL0O}rK9%SY+4>9wY`OL#W(R@pL
zM`MdfQA!(YXIq_RXoacFJkHW2_z0c?FL-|n_bp%+GK-kS%%jW_W+}6bS<b9r9%CM7
zRx(d8tKf#3#*QXStyU+xd<A!RHcl$H)|Z>xCjyy(WyK>fU3rV8+1k=rS7xmP)~akN
zZU%9nv}&AUsTY5MY?oVFIt35G$rUsOBRIRxx^?T8;3BvQ8oGi7%xY#0^Axj|S;wr0
zt0~U{|I(X^J1ouZ!ZQRNBIp=FhXJ1Q#+JtB#%bm@{Ul3E2S}f>`8W)c%skC(W}ac5
z1%|7(w2R9Yncr2=3OZPi2#dtOFmT=kOWnj~bK69T&0b)(u4T4T{su9Y_|-m$<KWu`
zI-0w96$MXRq^ZN)VUdQ}$-J_bd4<Ua6xpG-OXO~lLa))ol9E7!bhKHUnnaz^EG@=T
zJ6Y5j{iR{vVD_$K_A>h@JRX3L#&Ncry0i~0QaVZ%owcneAM9t|5ee-l1olSg_kqv{
zY=r(0s1hLb5ozI1SGqu?#1ZDG@Qm=jaG)7P$|8z{6$Hc#g3<^AVP@L&;Z=YIb8BmR
zt*8uY+b38j_jiONkolB332<N`NC^Ez9NLlHPItj@4qyne!4T}o4_`1}GG9^Rzedoz
z1id~wr_Rz=XV%wS^nk}&ZGg3{-qKds1_%WjwA7p1>T||fJ3Fe(EtVz+SS~W(f^=LG
zqJ(f@|HxA!EDM<*fc<}T5P$=Km&*XvWgBj;0e2U-n=Gy7HZ$NDc)GYfzp<UFzIp(;
zkBa`EGI4|>;(n)yBWULs5jXAjyCuTjWNxivZb^i77fD#z2~yV4MOQkKD9#8Y86Yo4
zi0_4jNZw6Cqy|{xZ0L*af&@7sXNtN51br~9pa~?V#oRWu-U5?Z98rVZn0d$pP?HF#
z8Glymj=YdJ<BWWeFY-hFC;;_Afk=;nP%sKXp(qT6qX-m<qEIx7L9r+f#iIn~GD<?p
zC<UdWG}IS<^+OqOegMiuS)#;I+XnK~YHb06)oKGlOSPFB8o&ri`iZKQLTg)vwFT6O
zxd{|W&7{I6b3;2I-C!}pO+y+jlSO5eYp$Ev&}Qvysn4@ESz$0&Fk($jU~g-twpvWE
zz`72&E6>{2V!sQFZgEQou#Tmv$<%7DgK390)^|)0-3S<^v$-Xw6DVwHZ=6O!>X=Fu
zpZA@287z$r6FNYvO2FA23RB}W3xHhEBC-Y?Eoy6&paTvP&0M(|Y~>U<W9n?Rv`vDw
zfB@If%cbeTSMdJ}oQMd4JFBgerRjwvEhAW5s|SJYPZKIsLPp3SB_saRqL4w-H%6ym
zgjAI<PDmD#ge*7Ex8lE$K}pgDCy^IWIU5Z^IY8T7lm~RpM+K-56(IvEMsBDS<%8A~
z!H31wNlOOBX6hVA7eHN>d}|%03w+Bh5~(5dC+I9epKDoy&gfJOaMc*0|52E!LP!xs
z097I5T4WSeWR*$6%ZTYIDJik~q>S_#AB$j7W(!9(XfPUrhN5Bc=>`}O@kQqo`U?GY
zh!N7^OX6QGWDG2%78Vju7h;3!B0=8(&H$w0wkgwRNKjeO`1NQ!YCsdH&IOw%PS(wO
zV3p|1ln!<_{>X;GAQ5vDQ4@d)6A78Z0HOaG5F@LI;8qZ!y8+2<faY-2jyg~$nuI2!
zDQGGP&0us7nt^7*F#$!x=mt}rWE+6V+C>QvZH)v-UQ=T$g#y@Hx-6%;gL<_?>^A|s
zQ9}V{QAE>rg1#c?JA%H|CJPxtUxH3oYPC6fh7tc(z$g6aP>KLoo)bW$x=#nZq{iwK
zXT<8KC-nuIq|dNn=stA+dUU^pq0zOD0%r5V(1U_`9h!?CLi2=yf=L*93Ox)Mcmyp#
z3(+F97(I%Xpc+sP%g}PP0zHNvM=Q}2@Y@Y!p|~CJ3SvY>qD$uUKwg0bMOg*L%ZDTs
zJtP@;QB-a22)G3Hi^|PY#IG<&aeG01qiCE|LbZ?`GRU--q5p(Ztt@0vzWAL98MI)K
z_)R4weuCBjz<%f{v=*&H>(K_Z5p6<Gqs^e{o&h}5$wis~Fg83>DFB&nwYG^$$9_RF
zTwMb?PZSDQmfU275+Pq0B;*K%Ln^Gz<Jv4>=+JY_YV<sM0c}MuqL+Zhs3HNvj~6Eq
z@<IlMOF#;_I*tFRvd+53dUH`5SUSnwKrf>mYtarS8*Zhc2q=H_3fhHU1=Q{a1c<X!
zg-89rp%WTAEJ8tPVmt_2N=kA@2BhD>;YY8dJ!{b(CL691Z}<pC*#qP3Mf+f+x6s>Y
zKYE9*o~m2wQBf`fQZ!i`ME|NlDAvjagHSZYG_@VvHBk5yM3voz07tk!5DIb=Z8Lv}
z4sAe(&|!209lcZRD7Ho8LB}a<v^3SzBe1L-F|?yUVBPfNqyycK1LaNt?LI;uqXhIR
zItiNWGv)v~W0MV#E-D+fTDJ;QRTH3Qg0%_Eixk4Rx+mQnBp8JXp-d<j5_K#CcC~Ui
z1wc<Ha-`XLpxGCcM$ug~V%;5AdI46N1j)_YvH2}}M*y4&RYDQScAex6cHv5*$q(r8
zdOKdEBR`>^*P@@9Y*>ba-S}$}yNZ5A*MJYMOCm-kpeAHcy;uEM09P0iGN^L&BKq|&
z+5V=)_9EX7rhGdz&)N*EXZ=Um?nWZT;9r7?ov<@@L62i?H<-gh1`P(l;GZxmWKgK|
z^-eIcJKBgnv6lp<D~m)K8zBs*u(m)r*$ED79k{Dk;8PDS?0Jap8X@vC_asRIdK>o<
zNm3z<6pBVlyel&Msh)g=gS$AZ6n%=rMa}|;5uFh&26!}++q=CJz`z(_qtQYl_=!TL
z1MA>8^de56tP?3MPRP}2djN%#0jLxasIfvV<r7aEpLCBeLg>J6xSuH8eWiak;l};(
zfOU8P&J^QtTlk#Q)@Ggx(k_1XoHrZh9VE_MFVqP|!yD|5jN?QFLP36Fe3~T0xCqs3
zKsDGPSq4ytR5OB<jp&XIs88P&rQ&j2Ax0+?gu8liZLzW2wPjX;YujjZZ8e|^a+)Do
zVQx#Pw$y_zY#TMrYHhYhPCX|XiARZ(Gzn8bwb|*TV1PrY|BA=pT09n;Q5tg@*Wocj
zvoJ-l3au)kMQFBLb?}Oq7~Fs-;6^kQ!hSTEpt}efVe@4mE}K3*sb8!<Lo}7CiOFCq
z`^}i~Ib|8#f~~j}-;LXFyJ$>~;|{bAcVc%ui8+9$;Hh{To(|t;pp$qc7ElZ(qC(1P
z0xuOpckl{DD=ucEtZmKaCR^|dzHXJJt<hTFSSNb4lg!i_=5}^;SX)G+ku16kUE_4e
zy!MFQ+yvf%s8;O*<y)G}Q$ejbj3P`1q_=5(v{>kXZ+C+-Y|_5xYREL+s?~;5{W}T5
zZwt){h~rt>X-w8(scSOVTlJO}8lC~i*kf`$M+}?W!L*qsH+Ixb0FMFB#Sh_mU{*vB
zMME-4=oEDwei%Qp7C%BQ0w`$-Eb%HSR*<e)h!?HLizLedHbJ_I>S*coqj<>%yu{9x
zFtK#OnASGS`1abm3FejtOMQO|qZn=B75FjWm+8XH-dOSpW(8g)1%+a?b&oJZjQe5%
z*<!#^2iY?~NQbrFYBY~%7h@2JNgU%WypfrQpN2R~fH>>^-g$Bheoo}c7i>IvuP|FB
z5TUt?=R75zO9rnD{Ima(>0Sk<+bA)eL}!u4_W_Lst2O|VXN`~y>x4)jqI^+tnjsw~
zDN&j>)5EVe_-u!7;~-_$0e>y@_o(saiI&=NA}_XgV|E{Y6EORL@KA4<-4B?3#{shs
z3UejQ4udS#1hCF+#%Y5g)U!IE5;9%*2tF!`_k7`z-iAGKn+|yxm{`m<frneuX0}MA
z(wm#~<J&+SAlP#mM>C?e9oE|MG@alu-9<bSCOiw2YXZtG1d?0CIIngh6hf&4wD;6J
zU*fMs&=w0zdjsv8ZqV>0P;X0Ypgl@4CMI9-kN77Vxt}2Dqv1JIJL}C<oQ6+<jK>5^
zQ)>^<t^#P+0JP-*+H-d@)eZa`{vH1zGSy9dLs%hf5gr#-s)Wac6;h;?Erx&LGK3ps
zG8v18$`C;i#DTV}At)2RJ2GE7L<Gr+{iNUklwWe+88gmm-Ow7DTE>IcYX!NMv>s%^
z&~ceY<|K2bx{q0kJ7q55>!&aWWUewdlp=GNd7zUrFMJg}4jGrrGC%a0%wHBztM%>9
zozYke!ug!0#)g(=yWRq`Wu07QZEvJGYe|!VP+QvCEcFHT4M0m!l7pdCKvRd18)~MB
zI8bk*PHY!*bz(GpU(U@zV41b0!n48?!YW|@CxzuIl@2WwR=djY9dygVVk2<&sKpj?
zX{<xj=*I>2v@BF4nL`#;7A6aqMc_Y}WwPjQI>WLOAQO@TTByd{)?lFt1j&bmEOw2#
z0Zg$7mar1|VU3L+RtrycafB>cmI7I&wZb}ZG(a#w*EX5;t!Bu6HZ_^ySZ%Adb#N<P
zurw~D5k)X%{RDPIWyb_55z=l8)MNt$^Lm+=EK4>}mJO?3FKiT^{;c=ah-=B~xfWTm
z2<e7yNVUq5$!UG{bu>b-wEx{u6}JslBM!C6VJMfu<&8~$KgjUg2B{SX+3YZg_b?cw
z$=YIpHA9Re8^<hN3rX&5=~unXvQcJ{jkntm(S56;DC{;PU{>uJ+%Bskn;>i4C~NGt
zE5KF`w+*hhw02Bz)CPgF7MT^a0Tx~mUOagRw}b<qv~{nAIVYP89I(~4j$m!{sB$Zm
zYHXGToWRbO361p@uq+N$n|23<0IE?oLpD>?Kih;??@$P+6W7Y_mCcsj2Ld+-bqd?T
z^VuQn)F~2F!pp*T$@!rPp<wF#$mW4Qm~V4_J|pN-mo5P3C#7EoxID>J7i6Tz>Qj<u
z%s69netL0zWQ#=CXDZ|fPs*0cmcf5#U_thn>~TpLsrOEuj&fm_@Cy8Qn=4IeiRb2k
zEDp`71KgV19K;V4akqzATMx8$K*UAJ_Xf(=foAjs<i9qI<~<w0uj(ewMcF1m)@Hb3
z4_x!s9jL-L09DV)o~OD~wpG-fQ-r<3K9%r>u%ZhOHiMj$)>ksffRf~t|IiDR?FM9Q
zy2Bv930T-utL+0t7jqND{q@wvvdcV(8o0ui4l4XMb2J_bvh8(k7E4R_BB`m|X!C>x
zVQTk@i?VlN_3y*#-+|S?`%g3C)F1CodxJ-=mC6>iU1@HIDVPsoicet*f0*Lns2s7*
zNIfMgl(gbkE;}ul*UHW?`-Kk#zkdn?typx!;6J9`S~sy)<OHw~o!#?OS-50d`=Q>V
z07~GWWtT+)|6(KX5#gvxIP5@RyO*Ex-#c8gTR`7SchL73(DzWSHgs@1b)}p1V8Wo1
zLx~J7bz29may04Np@+-TY<65#AS-7TqE0y>eB6tN!KxiK3LxtvyFM9RS=ZSFLZr7s
zd<Ge3PpV8r>+sj=gmq^<M0N71@L6w@c{3|mAIX7ZXdUOIa7y&Fg26CXiDuc-QrBp1
zkB^Tx#*UP{@7pRx7ujHD9vcdbat0XXUw29(gllXh8$}7l#$YL2J1d-137_BT8YiXw
z4=Ba<MJL(dJ1BJ?D0RlFjRV)%0yX1KaFD5EOdVuB<P#df6{aq6Be=tz4jBi#vuuH5
z^xArGl<D;r_@#$?r28!3Y@0{6Pi?8A4rQ~swI{6yve_c7zZAai)qb$KK!7|u0Yv-p
zm2g2K!ALv3!F@DN7)+_{pdvv&*m711#V-m!-hp;%E7)q*#6rrJ9b&T;-wBs=ia3?<
zt+2gI2YP`mNQdw@xvyvpl9C{Q{BNv*Ef5y10b9$C1+<q-*1%>2eh|I~q+guK<S;*r
zsFP6sJs=to*24<8I9P!ei(?7$qU;i^aUw9*Az-YZM|QSbYTKu_kF!`DkbIG~!bNw(
zMOWaWtG)4f2is{6|3n`D#g*}f<dhTx0;7l80^)>vOS{<?8~389Jv*!o4NzF>R@AkS
zkriv#Vhqa8WM=`buL-~P2E@HU=h+gS#TfLua6_bW?BFV}Y;DF#Lt4$CE4o8kc0T(s
z4EKj{tGD46!f=ZmhWk^vDGfIS3TL1rj8kgrIvv9x$}TI}C#WtU2x0_z?+mkseM)4Q
zbrQo6BqNB076;r5!z5)$k;H$>Fk6ru7-pp-!w|$l4YV8}>%kkY4!m(k>65O=%I>5q
z60Q)Wguvkr3f(3z!8Utx#?hA2arUt^$OX*s1UdJHZwPc*TcAs`S_EkbauP8PR#Z0x
zVjE~=0CnHc*+>IY^EKJ17RWl^ncTX_9)|gj3Q+`U>4ctCU)UNb*b~eF_G215>I7&d
zajj>{L0npx-)#1lJq7lb{fs?LkQ+hn|Ip&HhaD|0Obhq1U&EX|0v~7~`H(r%ZF<<l
z?2lq?WE?fiFoM7EzGR4C1cE%qw0DYUYyrz~(Tv|=!P%=4#tHK7#e}ohK}G$>{w`XE
zKiTU9`3O@8@*~I}Sk4!I-j>bdFegLyY~CD#?(R}zc1JGte~`}OoPaH_-flh!3ZRVX
z4T&?zxHUu6+6LYm5LfhssJ*Xi5@{~x&>)EIN}X_SoV(ydP#{6Uz3>$0#jN1GyJeUl
zJwZWTQrrrOQe)lVI&14x2QH@U6Uc=~?1Kpk9YzsPBOOP(GmnduT1W^A@3n`7i|wW~
zbB*$Igw4x{poSkB%poDxM4NQL@b?@!jq59k3UF|2Z_CPnW%ZYqC5cKjK{1l3jLCyA
z9~>Ba<Im*Lbxl^#>bB;Yo)hJB1=2+E1SR!0kpU(ucAO}IphUY&YV9%!Q8vxEwwbSC
z@OQz3nbc_QY`=5Li(EA`kE@}WO`(Fh;0!l}aps0{!?@wx2yP@diW|+1;cB_DoS7TP
z)p7Nlg&WT`a1*#j?k+qHJ<d(!Xn9NO9_+63f=6EsuA!I=6|3>ISE1cJ$zrR;N!N?r
zS|D&kYs5S-M5fYlu?etiR5}n`1VvI>Y7~<v(q*)+KoelJ^er6`yC7(Nm0sW2La&Ex
zEd@&)lAwMBJwnh!1U*bpnrqb*29o4`2}&hsK0)&cN{1E-a1AmbPn4RNA^Okh@I567
zl18u?NAHkI0XQj;2oYO%Y&x846WAI$;ca0lHwg{pCfmZ&41(s`)EhTVFh3>cuTImH
zKQ{xKShCR$n&E=dO*l7`n+1p`+`TA<n~hF#_oJcAWo{h&&4p+ms%msDnna<#F-;gj
zQ%Ox*XA5*kTI$92IXD6BSW=IPrQYEV5gQK@G?btrRN4oC{^<vQqN@Ut4mTe_qcMgZ
z)P;h1lk5_=7+>X<a7$&Ixa9(LxMc~;2`V6{MA$=6<sB9l-{2nSR&q~JeaAgXha)JT
zplpH$!CV7-hAk<Ot4kBno|2vj-We1pda2w&742hg1Gf=v<`#3CX)Q}I5|m3&j*tWJ
zxH5yl(}D7pRr?_9>ac>_N?li)@uj6S>9^$Q4r7wwe|m6%+r`ZBdALU3<?MFfA-TYM
zxTXotwt+`S-DsLm?tl_q3ydn|oqKhZ;YxaZJj`x~fZp3ZQ!Cs}v(eyU>-{0d91q{?
zU}Q%~9pKjo*hbVtpBv3;)9dM{R5~<^>$O8dGvgFW(Pd}idsfb%V#jTjDs}|r2}Pr9
z1v{}!C#Ida?cB>7xR>oU30sGNSlI5J(!01<MM}TcMd>1f3_$6^o|I04^h>goiAkeh
z6aS9VZv*2m=|SmY%CH5L$iqcoE$#i)y#w?icSr>2NEbk51eF6or49grC8eyFBo)R|
zGH78e_3t416nJlG4~Qx#@0CbwHvou8kxrR}_UCq2blXKzofnzMPUc4F+ND=Yu~{pS
z@(T3u(t-v(ItlKW2A_8WlhQ&49YJqnB|0wsC9!dQ?+7^0{Yyl^mt6<|VW|cLRP};@
zWHB5{>6iBJgzpj{V0jM&m?#1&B?LSKF%ae8o=c-kX%W#vyE18c+YEcB=;9ouF&=&o
zwk=aaNgW`u83I)*KV}DHN_SD-mV#9(=Xv6_RGy^JH3p7V_8<X0k^_HK>L>(~EYe_D
zl3^O~Qf)xHMrp__%_2e445L$7r|0Nreb;$OhAGLLY=o4cZiQbKan13dprI57YAr<y
z_fu#w0z!YOSBd)tHLSDua?uP9Tqsq{(&%*=8T2|a1I1m3o+a)EH<yEc>|vm<32OZq
zOvj(7fx8J!F>|?Fat4o)A#Q`51uI%y58ip>_(n?`SVf!uC#Z>_;R4(WbraB>&`~TV
z-{lH{H7406lB)&tM!Zq3kvrj$au+sO5C|Gc&{zR(wg_kL<hL>0<8pVo2jw@p7ly2d
zsOv`)GzR!>ltbo&=3+tMQYCgvhZH1y{cBw>4@8^gnjY*{OWAFt#BQsB?45vmJJBV@
zOi9~Q`s@muD)Mgjq=bxxYg<JLlgMqCwk8;XvXw=YKZ%_wK`9&4(d_Ke&4k?<6T3u@
zgYnyJtR{`#EROJ-ct2%odUu;>Am}GuhaTXg=0_TX&SM7nDBIP+H!AnG0w$cX8!<b~
z)R;M%7l~;b#qsIg6hg|_G|r+7+l$_ybc~dX*(<r2y%Om-j-WcAquGIucE#DxL2m%3
z{-x2DrvM?HdJwXn5^}6WNGkwEmroJW0%<EsLQ0k<SP}(XvTalrDN4GLPJi{3@~Lp-
zc3nVaQxDrGC;};>DUv0WI%)$))}Yr&sV}K&++9(o_O=ejqS}JaMMtD?Q}WSSD52>m
z{Vi3Z<C$J86h(BVJWCXq>@I<6AZP+0dVDX4PLjN%el&OWcixe_2oUYk1JR8X(H05O
zW?PGVGjI|`W4C>=b3Ek~N$J`ppxa@w^Y34AKSd68I4H+T$hLDbz2l$e9wn})a!O^}
zj#N9p#}6%lmK}4wS@cunmGY{!@+y0)ncXSAT`ijM4N)zE%L^*3h5DkB{<GTk-w4ou
z$wN$H^@2J}T`HBmF5YPt?}PwXy6*wIs;n2x8{`)Ds=PryLEcDE8${0pO(y6bg2)|;
zk|qJ<&GHtJ?yX%(fDVE>f$r^)1h579|50m>d>T3_x7-=aPomBeG@W}u5JpWw9Ymwu
z(R?q!0aFtBy&`b;iNJ~CKb4?q0Ns>s=tPSqI!=9UYzZCFf3L{r16wxqV9V*0Eom7I
z{Pm+?nJJ+qPnoJY$tK%XoaFq}fmB(<Gv`GWNt@;*jUf2})X$*IBPm-+ky6RDIxrDs
zODeO}ucj<z1}5te<(VeMJ3yx6;W+i4?P{Ddt|ax{?p!g5QMau3NRPwuZV{3UjAVZP
z3evkARwO|#Ig8W<JP(jd9!I-qs;H25i!5~&TVX8{gx|wB-RG$Gq{r#pcB60?e5(`J
zOR+2A)UH$iote4QSg_ZDU6#t1iR`kXn_XrSGz-{eh9kS!%znC<LrtNPH54KL##*ca
zZkf=7TLj82_ek7w*hU{aUjH+5FL`u590Z8IazwmHx?D20lAVyuEp^LnhF6TjsQHwX
z<VBGaDc#1wAGI1%0MG`MqqOSwHmOyUj6C&^#eGR|UV?_wf);Bi4?6mnR3>_IS2uS`
zGo6Pk=<L)^-s#%dsVm8XMGP;x9SDir{+jZX>!}k#S4-uJZaTEDP?A8(eQj_Jl^i>t
z{spIOmOmqM%9d_UnN84rz$y3M#wlWmXiIHEdFF2eGWmAkl*S&MazEu1B5}%~u7Hff
zZ>M=T1|&(7)*{8z-8iIoNYwcsgl5A{mWEE~OEuR^=IS->=6Z0}#jP77rl;C-Ok#&7
zIR4UBhSXH}+7E<f#)#?3Np!PGat36fe5a?xLmOScWJ?SUAsl|p5F4(<f~7RgTk^Np
z%HO6<iLgV^mUFW}5gw95wz?+Nd@Qs@+@aUimcEAmEXU$I3vFBS!!%RqO*4gyN7zdE
z9d!<cDJUz*Psl%#QkY8!di)OKLMwFglk!uv;37Y5FSsltXgP4e(q0NK$te;t{=<Tc
z{44ndu!bjk7F-@9XazNfONQllilzOY%^4n!r5EXfo*U0#ci=qv&ro*@qBwYB4DD|-
z)7^VwRjdaZ<-f|WNqBgYp!L1u;dl8TGU#fN-?Zal4M9%<9#%Wx0aRwPn2!)W?0?X;
z;#j9tC=^P-!mmBCu#TX$6bnxd%QLssK__ibEI1aR>ck5ia`8Z6*(QY>T^Y^yZ3K3_
zqnD$rRn-w8feLSh58Q?cdYYhTd&zAp{FxPs09$Sw>hc6_Cg>S4w;eo+dSq?3l&kUX
z5s==dn*)1Nhy9G1r--C1>PE@)97vN`p_wdhQ|<2e=qgqyVij?;Sn&cuFZBjcA^?;m
z0YvMU1Z^egMG>Ibq16_t)pNvPD1SJ%dR~-U0E|ouMjHiV`$!vt%$+?Ot>%HRCN_N2
z3#W>Xq#|Ddnbe<O(AFtpWk`O4xrR3?N|{f&YWW0qApTNelxxsDX!E%$8_0eJ&2TMH
z#aqd_DMsTJC?5(S^Fd5MWZk*N%(v`mZk(bKJ;utpG-efYW9LH``#x^D?2@8`%g2`#
zli8WvT=uYHI<sHq#VujZK~8suyiqY5atpuXk%|Xk8Qw_ES{3u<E^>?P3>&OigpZ)P
z@?T}|%KR0}<qd2(Yy!Im-mHr(Td`WPMz#q(q*#Z?AgtJ^*d%unQ45~(5+Q=-4qg$0
zpwK|=_m{$Af<B=E{7`7{TrO;+G+QqKA)pwE#PZRP(Af;Ph6`}S8!B<1(o}OelmNxN
z^**6gI6+X9pn>gre+UzV2WavM($NPAiWeRwkkz~<rbeJ{_nzP<fDjf4!8Aj+4Xgq|
zN5s@gE6rrQO{w&>5K9ZHz|s~<jt_)01nn2*3j;w+px<aULGM#9^&)hi4FNkPj1qv0
zKO|^3v|^bEIxaK|F$5hY=nV*FZ9#$JStwmH-*S-@>~Ja!wwkA6tKvn)OSI;>i=dAQ
zdUaU2xv_;7wCs28fN(;wMloHn9MB5#x*Jv@f&fz<|EpT&Ip&M*3YVgk{Shjdu;kak
z20|k-pdU(@CMa3hCwWgWZ(%-V-4*i{n-mWKofokKS-Gr5F<Ida8V(Q+=z#USO);|{
zXm)}U=p8`TKdi!vod?~0Pr-iyxS~;Uz8i4n90i=9eFW{5Ag7D)01FCxP@xq|Y+be^
z^1R|Z#U+Z!y#&2Q(3|$9{V15%K&1$_{7JW2+9`Jbd$7gI@xR-9O?!!YuJ*sVZ4>}a
zdz&mah}quC*4G@%);3Z{bQh~BrT+riNR6Djk!`y*7WP~_a!CXDOEhY*MLIUDDuV^{
z(|8|f%?@@x=f=)N7_Xp$2V8Mb_yeRC8bM-&>HiSTVoOLjzGD9ZU}hCOW1(yFzYSmw
zJY2yM;Gwq4rybHkf_XDDpG(8#irMTwE?=<`ACbLFRY{aEL6m;@3N_ZFAmZ=*LwIRn
z*MYv8|MIpmKwrrfv-4zc6vmhEk9Vy4QE0GtT=ihF)84-3Mp~`|#X1ruu<Mh*spq0j
zu1;xHwkq$Y^;~5;t>-E`xrxfjbZ0G8NxvuP2ZBzD1yaxj^R<Aoc?6x3N~EcfvrS1&
zq9xL_M4Hr2f)b8Z>uqn}0I&Jq#T8;yPoanAbXqsHFJva9oxu{FU{|7i`L8TA)`A5A
zvp~(klfp&&We<Rkgbn)w>`Wevl7uAK4h(yTVS9Ck{fY&E5wI(XqFbE={<D}+@7lL5
zCEk^fDwnKRF0uLIuocX<VHx&l)An+x#s<m4=oT#HGL(<<m5(VOM`_BH$|vCalaNt|
z#(_G>s=y{{0PjnJ{zcFi1f3W9hh+cw@m&IR1Uoith&z=fIFg{qLbs347zLfc_TA9Z
z!!(rZl^ZrFH`vQ=bOXC>i}k54s9NuU>ltWNrjTs`$e!<l=W7w33nDyUPt`lZL(2@1
zM})`<s3@T&t*gwS+)l9<FQh@;Tf9#6!=<YLXfgMb421719Z!R=)K|A5b(iwh^~zTz
zq(Tis0-vVkMs%~wFwuR6r*Tkv!2^JlZwMSgKZ&7>av#oIOSb@uv{d9P-<JF$q~^w<
zPQ`RQ2A<G#jtOM1Gw1LnCJ=lMH*PMZ_x#zzGJiO;3Oo}v6A0?AlexyMVz0BO;mRA#
zHTE!9t=NR-(rXl}fuw4<Rt-MY4f;*7jyZ?aGQ<Re-}Rx)AKy@{fis;j&ng*$Ehl5>
ztjsyZa`-%l$H4Iq#be-M!Az_0RnSn^0YW2si2EJQ13#%$Q3@ltDM~qU26~qO3b!8>
zv-iMnz(O$fihbbYQTWj;B!c4tUJ>{lT46OD)qv9x3uj{CGeQ8>2QI5S9A6<sh<!;Z
zV5MRAI$Q`Y3D7+j?udo6E9f`sn*`JO`qN2X0Y_>zO?&Q!voOC8y#V;OKTHcyP)qwh
zd<mwN8y~oq9;F`EcKGjd(Sz`zw|zo=o>uVP07kGiufSjcG<+K-P7b%*$fklm7;tCn
zWk?a*yF1H%W_M^E-C2~6SNuD77KjcGEp=w8Q+vBZE1LlhEwm~8dxuv3E1LW799qRj
zaA`${7LWzz?yntM>d4xB+B+QD{=)Qs>d<1zr9CKGDR69ib7_TblwJkk)cz+fE!Cj|
z|Cvim?PH9CORLCNEt2S|TC93hwM4a4wM?;9wL<ln>T%Ud)f1{!swY*eRclmFsn)92
zsn)ADs5YuLsh(DCRz0J7R<%X-oa%Yi3#zTE7gaB*wyCzOURLc;?Nq&@+NF9`wOjR?
z>UGr~)f=k4s(q?ARd1=@R_#~4qk32Mp6Y$o0o4bpgQ^czhg64EM^r~u$5h8vCz#!;
zk5!+jK2@Dmol<?KI;}dR`doEZbxw6&^)J;IsxMVvsV=C#R(+$osQOm*o$8Y6d({uB
zA5}l8epX#pT~Ym_x=IlI|5t(_R=7^k4bdV0jUXtjf;;mkK{pAyMKD7!A{Y}aBbX(a
zBN(1%rXW~Ju!>+c!92klf}IF<CfJ2wEx|g1T?uw0*qvYxf;|cLBG{W?AA)@e_9NJz
z-~fXA5FALbp5P#Yg9#2HIF#Tpg2M@pAUKlXD1xI2jv+Xf;5dTg2~Hq5k>DhPlL<~C
zIF;Zug8K?Ed^*AX2+kn5KfwbC&LlXC;DH2Z6Fi9E9D;KR&Li}ZYXt-s5?n;Ef#70-
zO9(C{xQyU(f-4BFB)E!TBf-@Kn+UEUcrd|3YPC@{)>b_fko8oL>mzOTmsq`2ErCya
zjw=dG2K8R`v@uB^X$zI%sApAY`vkqTVM!lp&%tzE9_hH>BFd_bf)d^YNG;Ye6TzLx
zg~Z(y_>5#|TK>P<?#aMZJ`Rw<4xR32GewP{?Op9+H<wj=24<lNPnyuIgIQ|;jw$fV
zKEFKy`kz*rrBtFl1t}I3|2OR{;+Q6`yVC1`=l?S8Olj=pKx2mu1#rg0;Y`;))u>VQ
zp(|Bw)&_XgV!KuQ+~3gte>)Aji%b7;rvVcMVZ80pWOUzl4G7pc$gb0h39Z&QLG6P+
z)Q}3<-#iS1l2{L$7&}|Lb;<2JOyLrp1FgmVnYVF<!}d=&<L!90!xlz372t5n-eTL;
z_73NJsx|wA%ix5o!;N`X+T9#AlE(J7hgXi2++tCm!o##2F1~$-K8)q(aQe1p<=a4n
z&exs~8-(-8;<E$wxz;KA$bZ(-4L3=`(o-wP!4sEyfYNir6lm>be<M9*KxA4_acE~0
ze@mgFz0CXnn|4elYGju@P{jH=(71;!j7u72d%T8?S+wGnkzGkK$^zmef5hHQ@xed(
z$gXDqMbW_>4WC^pio5FIUdM@h_NzyYk!G^-J<vC{hu97Qoo#`qj#81W0P50mDAnAt
zHj$=Xj8b0~J@Rjax~II*Jv~vQ3Snn;M7zFnGCUfuC+pqzWEEJ3y95604`XmdF+6F+
zQOfMHY;Tu`#jW@o=FI^E^}juhQd^I$b&P7_L<iOKPd0`|jgmM@G{272>DyCfi+jXi
ze9tbIQ*tLIcQa~OzHJjoPu1N+Y^+)zTRy52n6DV9M=RNsRsZq{p>#!#`u>hb7r=Rs
z9&W5{n|IU*X<3k9hfBQZ(-9i$^r8qxcJ(L&hZX+~hZTS_q)umdjauqBv)8Ao)A@gT
z+b{z_Rr~{>{%<Os_t23kfZ5yF!4`%9&V6n>;~0-P+CSUY$A9xIAV<!m+d>>vi(@e|
zs>OlBB75e|Md@(3@1N|sbey)IRcrkl!bm*)|Kb)tik~0{?a^z0TGS{96Pak$X8dJP
z_<zwx=N=500iLG=MSFWN4=k#uLujwE!wC;y(I$%?^Z`7-RUaumRnd{;sdgP0+5HF<
zkWV)UCUaC{J<2pxkk9@Nzx;1+9gQp`S5wlc{}1b}qXhH;(?tE>2>@y?eCvS!(MBa|
zw0hlG&P0uIbPcJe_qU#4@(`N7i33;2?{6H&p1zd*!8E|Zj)@(+PY9J(2bquzV6=l=
z|NY}YsJ!$P3)@2*;e=xdC;1B!^hpkWGZZKs{XU2A%Q4vR_LQyK8Gj=r|DSF^XQFI*
zdG&C}<F2v)80Gk*R?P6O>~26|hCwN$nVAL6PZrvU!kDC16sECfGYV5BYk_{o`|T|$
z%t+dl0<7CXGx^MPsWpYUPijtqAYnFbP+`W<78Q5_LZ`h=1zuZVh7!vNNVi#WIruyG
zcDJoCL!sDH%QP^f6_c5Xw1EZo3e98>GZUbVWjKh9vA1RxcwNF&Mvz)s7$P;bKoA4n
z!gsc|F!i(+z>KrEw=nlGlY6$fFqP;b=;s{8j8&{-hA?+`x4STtdNjNUvuJ4qvdgQW
zn*tg)piXm-5G_c(F9H+^Z|i>XrR^2){)Cr%bipj3eK7RZ3tqO`!NRV77^sWdTVmAW
z>lOMz+XTGD0a{~(F!9X{w*DA+8w0%70Si#RjU@08>IuSecq2p4o|$P-eR>IA_^^!j
z&io{H&j=0TI~=saX<Dh818;nQmq+|{FU>dN3m`Uh_0(*#wbj78CiV-L|Ejs>Jz9$p
zpuA^quo2%L5q4*rjhYsn6v83_nqiI$6X7isf@9MSyoSQg&ycu>qSH$CP4z9F;SrB{
z8PD<@FXt7!l2`F+p64~Z6YtEs@LFESyYg<lJMY1J@?N|*@5B4@e!M>)!1v(;c|9M*
z2lF9(C?Cd$^AUU`AH_%WF?=i^$H(&td?KI3C-W(MDxb#p<<t3od<Ng2AHZkwS^Pjg
zn;*pI@VR^*pU)TYg?tfj;EVYZzLYQH%lQhvlCR>8d^K<4Yxu$Z5Pm2>j33UA;79VK
z_|g0rzLp=$oB45k9beB|`0;!LKY?%L@8T!&O?)%o!dv-P{%*dFZ|6JsPJR+UnV-T>
z<)`t}`Fr>o{7ilp4?Pe3z5HzcKK_1w4*vlEAU~IXh@Z#L=O5-D;TP}=`9=I<{!xAj
zzm#9bFXvYfJd)s11dk?o48gSok0sbl@Hm3&2(BmCLhyKk8wj32a3jHY5j>ILCW4y@
zZXwu8a4W%g6Wm5{JHZ_UcM?2_;K>9}A$Tgm(+HkU@I3_2Ab2Lhvj`RlCIsJ0@N9zb
zBlv!T=Mek=!4DEVm*9s8o=5O}f*&UM5rP*GypZ5U1TQA|QG%Bcyp-T&1TQBTAb*VD
z#|d6Z@Dl{DBKS#yR};L3;HL;)OYk~^*Au*f;Ee=tBKT>7Hxv8}!Os%Bh2ZB1exBeL
z2;NHYiv+(!@HT?C6Z|s4@G6^~1iwP?E`nbrcsIeX5&SyAdkB7m;JpOzBlt~%-y-;J
zg7*{r4#Dpd{2syY6MTT+4+uU;@P`B+BKR=DM+iPj@G*jq6MTZ;j|l#l;7<ttl;D#D
zpCb4(f=?5ChTzW$K1=X9g3lBDFM_`y_)CJnBKQKqUlaTd!50bsmf-IQzC`f%1ph$r
zj|Bfj@XrKaCin`$zYu&?`<xDq(xFfta@L`VI`n`xK)Y3k(zN|`=wa<IIy6=LmUfN~
zZP1|r9eQ4ensnGphsNm8OdXn~!x|mhro*1vWjeH2hZg9tj}C=tSJ@xW|ECVk)o#(D
z2<;0xv`B}Nv~cqyIy6~_U9?1pX6sOg4rz7RS%>|!FKMr8@6{oA2j4&~T&&Z+to=ZT
zBDHIDC{c%lbvRFZSo@(4C1?-okV1#uv`^}ApboWbpU`1n?KT}+uS4-VG*E}`*Dlqe
zIofA+Xsq^-4&~_3CLMZEhn%$AbqD}@QHR}iNYEjo&Cns3G(?A{YXK9Zb;ztk={oGM
z!*HxsyHNYK4sF#wsNJl?dL4?>Ay$XOv<r0TZXKGW!yY=+ro%z-<~J0jLoqt+sy(7Z
z_vp|=+I2cKMTh$8P#+z-Plr-<I7^4d>2S6V&Ct4O`{{6i_J9sW>oDMdqYeQr;FkG1
zG*1VwCS0$>-rCtZ)T~3#h{}s8*Q5z%yJ6OVKJT*9ngP-ecr>6UOEYk-2HtE0j{qpn
zmEKWAA2iP>86PH?iGV%r{h4egAFOH(GhRMMUN3(^z60Ly_JRD2{01}yyD0({aqxDw
zLd7^mt75idsp192E_gHBdx{SfhZIK@ClntmPAWcw_q3f?d<pMry9jM|Kft@%eo<Ug
zGVr!GXQfu@qYP1oDN~f0$^vDTa;UOV*`}PXyiYk-xkCA@a=Y>k<v!(`$`6#slxLM+
zDSuG@q%y1OR2Ef(s!=sj)vU6r?pC#{I#rWZQ&rPdGgPoyL^WG=zv=<iT-7|)!|>*|
zMNng2s#*@!<&{ubUJX^{^-xWI2CB$gp?bUns>ZKDwfIe_62Ax4;X_arJ^|I>Q&0sy
z2i4yTs%!9WH)nWzn>W0<%^%*{mJRP&8>t?z?oiKE&r>f}FHtX3uT-y6uT`&CZ&W|6
z-lg8FKBzvVKB_*U{zUzq`g`?nU@Ukr6fR&GqCm~3gX$g%3VI|c=T=a(GeMay2GzL?
z-odsL-lz61yc6vQc&{0PcbakVKC?)88(A#8i7XM`LYAt@(d20gG)0<mnmWxS%>$ab
znt7UsH48LbG|y|cYF^T8*X+=|qIqBQf##6rsOE&`UryM`&B?>b%gM*d&ne%j+Nsvb
z>{RDe?=;@2!Ku+{qEoZeG^cx<W;zk4g-(w-t#R7v^tRJGPVYG#aQe>ad#4|res;Rz
zbk*saGwUpORyk{&J)8ra<DC<olbutY`#R5cUg`Y0^SjO`oWF7Y(?#tP>N3b>q)WX^
ztIIT(IW9|F*0{Xja>(VB%W0R-UCz0D<?^-5MVD_~F1cKFxu#{bGA*Z-Yn58HR-<*+
zdTI6A0&Tf=sCJyTNjph9MLS(PQ!8j^Yv+JmJ*1tlU8H?f`-Ju>?H27$?Gf#1?dRHa
z+Ap+UX}{K9)H&<4IyarC&PV5`3(y7XqIAi+0lG@v5ZyT4WZhKVblnWyEZuh9Ufuh;
z)4GegtFAIv&Q<BkyE?mSU0q$>UA<hRUE^F6T$5c>T}xeSTt~Z3bnS4R<T}H3mMd|c
z?YhNvx9fYZM_fO1{nquW8{_8W=Io|*b9M7`3vdf`i*!qJOLj|jGrEm-o8Z>wHp^|E
z+d{X+ZcE&jxvg+}-0dm1m)v%_z3KM0+lOw4-Hy4Pb^FHcd$(WQk-M|Ir@Oa%sC%4y
zvU`8`O81fOjqVfOo87JMce}T{PjjE|{+Rnp_b1&qxxeK8j{B$XU%6lM(0K%Uq<QrB
z$n+TKF~}p=Bj2OQqu8U=W3b0~j|m=kd$fB@@|f*$zsG|ft2|bFJms;@V}r*l9{W5F
zcpUfm)Z>Dui>KDp)zjTGz%$S@(lg34#?#<g;#uZd;aTNb?K#48mM8I??RmfF1D<m|
z=XpNtxx;g(=Pu9Po^N};<9XQgi03iSA3cBZ{MGZi=Wm{Wc;58#^Gfte_Dc2Y>($RI
z->cb+c+K{@-|GRdxnA?U=6gNjwb1J+uXSEqyq@>k>b2kNU9b1OKJfa`>w?!6udCk3
zTkWm$)_X^KXL)CP=XmFN7kF2CkMbVlUFY58J=vRh&-Y&Cz1sUJ?{(fAyx;MD&-;M)
zLGMG}N4$@Df9d_R5B6bw<UUFtwNH#soKJ#Jl23|Hs!v~^em><sl|I!zgMEhijP|MZ
zne4OG=N+FDJ{Nti`|`d4z6rirzS+JxzIna{zD2&pzNNn9zLma4Uz6`JU*h|S??T_j
zzDs;p`EK-m$#=W&4&OI?-}XJ_`-Sf%-y43|&&kizFU&95FV(NFUq8R$ek1)x`_=lH
z{p$QIepCFW`Q7ig%x{I?<9<*0J?Zy`-#)*${Pz33>-V1D0l$NONBxfbUGfj}kMNK3
zkMWQ5Pw-FjPw`LlZ}Xq!Ki~fm|AqdG{kQqQ?7!20m;Y}6*Ztq{f6xDb{}KQ5{$Kci
z<^Q$+#Q=4HCcrsB8{it?9^e@e7myuL6;K^e6EGxTSir=9dje(#2m$v7+!wGRU{k>6
zfM)}q3wR;m#eh8ldjsAIcqiaUz^Q=m0=^IUG2rKbD}CJic=qw`<J-r-Pe7l*K0$r@
z_sQxrs83#>!al`)D*9CQY3%b#pO5-{-RDN2bD)1<SYUWyWMFh)Y+!s~VqkJ$YGB{M
z^uT_B0|K)Ga|2C*g9C>Kjtv|a_-No0fg1v!4cr#^a^TLuU4gp;Uk`jEa9`kCfky(5
z1)d1}IPlxRn|g&_rFYi{=mYhU`e=QuK3<=wAFZ#|oAq^ii@rhMsGq2B)?4+{^-t@c
z(QnZ|uivVFNxxmcL;s5YRsCN5_xd08KkKjPuj;SqZ|Hy5|Ea$fqzuvpc?Jar#Rd%u
zstg(yWC>~yni}*_(EOlBf))lX4%!*CD`<Dn>p^b>?F)J<Xn)YLpznhI2)Y@}1mj>f
zI4n3KI4U?MI4(FbI4L+KI4!s&xGcCbxH@=n@QC11!5zVygI@~X9=s#?mEc!{Uklz7
zyf=7%@S)(3gU<$^5B?>D3sHoqLiiA;5YLc^kf@NDkhqY9kgAaCkeZMoA;Ut3hl~sv
z9WpMYK4eD7j*wSEUJZFIWKYQ6kT*l#4tXc!>yY0=HKER-+ECX}_t3D=h|s9en9#V;
zA)&)UM}&?H9UVF*bZqFj(E8BHp$~>W6gofjk<f*qt3o%1J{|g8=nJ7QhMo#N9r}6b
z+0gT${|fyw^g`%2q1VEcVd^kVm~)smEGaA{EG;ZOEF-LcSZ3J3u)MH>u+d@5!d8Sm
z9`;1olVNMZ)`qPQ+Zgs?*ymyA!u}QZW!QyqMYt-Q4|fW83D<?Yg$ITA4=)Wb53dY2
zhMU4W!Y74K37-~zPx#DmA$)Q8lJGU*FNSXme>r?-_^$9%;itnt4?h?FukbIzzY704
z{8IQ25sHXG5xEih5rq+kh?0o1h>D1+i02}9MI4AY7;z}#NW`&-YY{ghevkMw;#MSz
zltsEk>LR@&BO{|DV<Y1u6C;h0rpUpOLnDVrj*1)|SsQ7N93MF$^4`duk-H*yN4_5U
zM&!Q8w<7mPo{sz~^6SVOQR*m7lyj6e$~CG_R6<lzR7zA@RC?5~s1Z@4qRdfsQI@EN
zsK%&;QJbT7M7<LAYSe2{XQIwVosaq=>Z_=)qb^4M81-}1^=K|y5v_{mqhq7vqZ6Z(
zqf?{%M)!-(j?RfLj2;?2JbGmGm}qnKz0vnY&xxKJJwN*4=!MaXqnAfN7QHR{o9J(&
zFGc?l{d4q{=&RA!V^EAN#ych|CMG5>CLty{rYL4u%!rs#F=JxJ#@rp#9@7~!C1!fe
z6ERQ5JQcG(W@F6LG0(*8iP;x(DCTU;`Is+bF2r1n`7P#;m|L+ZmW_3a^^En74T#mp
zhQyY|R>W4t8e>hdHL*ithsBPJy)X8W*oCo+W0%A(i(L`>c<id!HL)+m?utDSdocD;
z?9tfcvA@J#i@g#1N9?UQCQcS7kMoNQh||Y~#D&Mj#KpxG#?6W&akJy@k9#0)ZruF1
zN8%R6y&Cs!-1~6{;||CD6n8o9YTWg>-{Ss=yBW{LE8?Bv`^4+xL*m2YBjc0ebK~>l
z3*(F9OXHj3TjKAIZ;$VcpBz6meqQ_&@lVFDiC-7LG5+27_u~)7AC5m7e?0!9_%Gux
z#Q&1OCBTE36Eq1f35f~G326!a68a}(CJan4Ce$P}Buq(|mM|k>R>HjrI}_ecIGXTv
z!qtRZiB5^WiJ^&o6H5|n62~UiC5}&QOl(TDCUzuFPMnrFBT-14o%m$p_Qcl`_b0xa
zcrfvN;unb*5-%oRO1zqQE%CR+Ka=8<vXX`*wIto0)R8nfX<E`fNwc6Oe0I`(Ne?6~
zOj?|@G--L#nxwT!FD7kE+L821((a@^NqdvtO8PSCLej;gOG!T_{giYi>1xt%Nq;1}
z!-l&7$pe#flJk-alS`A!lPgokrA$tlnle3QW{QyVaLTfjr&69vIh1lF<#@`+DJN4-
zrJPAQoAPDKg_N7AA*o@hk*P7MajA)^$*HNS15;~L&8hXN4XJmfPE2h{ZB6Y=ot(Nb
z_2tx^sjsHKp87`Wo2hT7zLS=nHa2Zsnk8*Q+QhV`G;7-3X_L~Xq%BI@k@ia3?zBB=
zd(+-Z+n@Gs-_QGAOJ~v*>4E8y>Cx#)>8a`I>HX79>0{IHN^eeYO>ax@OrMfIJ^jA)
zIq46kFG_zjeNFn>^bP4xr$3YaT>1;?N79d_f0X`d`e*5<)6b@#Prs1<O+ThzSigvV
z(f#83CG<<~m)fsy#^j6@8INbI%2<=JE@OShri{%Q&u47Sct7KZjGr>DWc-?OJ>&O`
zKQnIiKQ{mkkPVOzPz}%wa2lW;;5xu-fX{&B0Ye82A24b_?Ev$D`T^qyOvsGOOv@aY
znU`tIyeqRgvo*6Vvomu_=Jd?_GUsGIn7JTxedeajXELA5+?u&9^R>)9neS&F%siZV
zEc2txPcv_1{*iez3uUocT$VD6&(dbOW|d}@XH{kyvrJiovxa4j$Qqs1nYAqIv8*Su
zR%flvT9>skYjf7~SzEK-&-x+jr>rYkzh+&}`aSE<tXtXZv-fAem;FKZq3omC$Fe`l
z{xthc_Sx)fgZu~e85A@qbWr%9s6jD<;&Kk<{Frk&=W5RNoZoZ)$hnn^a}~L&+@RdT
zTtjYYZbfcYt|@nL?$F#*xnJgfpZjYb%Jaz!&CAIv&8x{9p4XH&C2wxtyu63=7UV6;
zTbs8&Z&Tjpye)Y<^WMulkasZeaNe=JD|uJ*uI2rf_h;Ts*jOOTSLUnpL-U8{kIWyP
zUz<NJ-;&>ue^-8c{yq6K^Oxms%HN#-Z2oikTl3$@Kazhe|3v;L`KR)K&;K+3Rsk;H
z3giW<0=__7;93w}P+MRws4K7(OemOG&|J`3Fty;`g8K>{D|n`0OTqI6TMM=o94R<o
z@I}E_1>Y2WSEwm;F4Pse7kU<Y7y1@P6h;-M78Vp16_ym16;>8D6m}F&Dx6w)PvNS<
z)rD&dHxzCv++6r<;kLq;3wIYDEId?rwD5T0$A$kYyi$0z@LJ(-g?|)rMarV1MJI|r
zDLPejy6E$w^F?12T`0O(^j*>SML!i?DY{y8t>{M4??pEai~$=sgVMkooDEuotHHzI
zW$-ol8~PZ63?YVaLzE%b5N}8{q!`i+>4pr$07I5xkRjJlU@#a;4CRJOL$zVBVVGfr
zVU(fPU^dhn#v2+9O$Mu>&Cp?(Y?x}e$1u|%7-k#h80H%086Gw)G%PkOF)TMcW>{%>
z((sgFoneDvli?Y|7Q^#~7Y*ADI}EQFb{k$dykU6Lu;1{W;i%!b;ZwsY!x_U5hMx>q
z48Iy~6ysvP*s0jN*sr)xaZqt+aYS)dadmM`@zCPo#UqPH7mqEjD{d%mEp98GSNw4C
zg5t%+ON&<&KVH15cy;kp#p{YU7H=*-R(zuP<Kj<>PZpmlK3)8I@wpOJ318w|qAPJL
z@hI^s@hR~y2`@=6$tcMz$u7w)DJ>~4sVEs+GPh)2$-^a&lq@V+RPt!a(vsyRdrRId
zdAnqP$-5=*l^iHJSaPW3TFH%)-%I`|xmj|n6qU+Kxl-5C0i{``*`+z9d8GxVMWrRB
z<)xEKr<6`Bol!cgl$6dcol`oubVcb?rRz$!m+mOtRr*@#p3;4#Z<X#ZeYf<d(#xg4
zlwK{pR(iekx6(gKZ<a-rMU};r#g`?PC6}d^rI+<D%PlJ{D=!;cHm=N4)=+j=S#w!y
zS$kP$+2pb{WoygUmu)E9RQ7b)Gi6)Ko-g~P>}1(zWv9zNFFRXyzU+&#ugZQY4=4{T
z4=N8W4=;}_k1mfZPb}|So?V_(o?l*AUS0k``P}mP<qOIemoF_}QNFVL$?`Sj>&iEl
z?<@bM{Lk`R70L>Ag;#}7g?~k0MNma(MR-L*MN&m(#lVW3iu{Vg3PXhvUR^q*Vpv6M
z#ng&>D;}<Rsp7SYJr#Q^-l}+~;{A$)6^AN5sW@HndBwF#w$iE6yE3G*tg@oAs?t<B
zq;h!WsLC;w4V6umEtPXB7gR2)TvEBLa!cj@%0rc(RDN0cW99WKR3)pDSGiQVR|Qn*
zt1ec3SM@{HPgPf{u2x;Ex>5Ce)lDN~#75RAH!6+1(aGpybTzsgJ&oQ*U!%XVk5O+7
zHijC*jZwx}W4tlZm~2cl_A?GJW*M`MImUcrq0wM0F_sxCj8(>JV~ugBakz1$ag1@S
zvCe2QHW(X?O~w{utFhhKX`Eu5Zk%D9WhBPg#yQ3ZjSm^;8y6TC86Pz+H7++kW?X4p
zWn67sYusSmWPHZB#rT5pMdLQ(4&yH4ZsY65y~ekU`;G4!-#30>JYoE#dTsTF>Zhxp
zt$wchh3c28w^#41ezp3w>OIx_s^6}DxBC6+52`<`K3sjY`grxn)hDY@SD&puU;Rb(
zh3aprzpMVf`p4?a)xT6<tNyL}&+1zyWMWNnlhUL%X-v*0t;x;gY4S1onF36DQ?Mz_
z6lsbv#hDUJNv0H2UsHxD)0Az>H5HhOOeLl=Q>DphGQq1Ohnq&3#+b&M>P!~X1k+un
zCR2;)Zc~S8l4*)*nrVh<mWi0|Gd*CMYno?z#I(@#sA;Kbg=wW}y=hZTTTN%pl$z-^
zGiylAeKil%JXG^=&BB^TYnIhKR`W#7>YBAR8)}}edA8>Hnip%f*X*o$wdVDjy)|$B
zA2r?kQ`BV?$8l#9laZk?MDmU>7>apGQSyS8O5|O?55g|HF3aNXe$VrqbG~H;NnRKs
zl#$WAGcpt*S!$N!EgcyOL-7(SNiui`#V`y-MH!5CraC`-&R_AKmsX)wYUi{n?UHs`
zyQ0-;*R@+(gVv}uY0X-T)~Y?#o@*Uir!Wa0(OvWq{vtpGir%7+=r0C|P!TR7M5GuY
zMvJjxyqF*+i7Db;F+;?OSz@kOAcRN|7GV>~!YN!r7fP`BP%IPaB15bcnIcQ%h+L5;
zHj2$+o5&XhqEg%t&*J^#Q{q>~uS<wcNKQyk$WE+JY&H)y&o(EUmz%em51XsZ4dxbe
zho!G2+LCC=vy@m)CbcGYTKicetP`zC)->xDYq7P{7HA8x#n|F)4%_O*2NyRker)ez
z53~=rN7?7wv+X7JQhTMnJ~_?N+Y#!R<VbYnIr1Hc9G6mjQUX#QIfI;`&h5@(=PBn+
z=d;wVsllmJT_)E!*9_MZmvZI0id;usXIyRWSKVRmVeWD6IqoIim{)qp!=7|chUZgH
zwr8#Wv;K>IT0g6w*Q@l4`fqxTUaQyX*Yuluy?#e;)c?@`)F0>%^;Z3f-ljj-JM_Py
z3z)!LEkY0QhX4qKAP9y&&<_T}U<iXDFcc!;O&A4ZAPS;kBE-NuFdbqc4ran^m<J0%
zz#>S5B(Q-U9FPib&_M!$0ZU;Sq(cU*fK`wQYakoeLN2U_4e&W^f$fkF1yBe@Pz)uo
z8}`6H_#O_xAvg-hp%luX94g>6oQ3mn0jl9L{0_BH2iM>x)Wco42Tjlnf5Ag|3{T-1
zv_l7UN|Wp=yGdW^C;erBd`<R}!LqOHF9*sH879N!8*-Q&E=S7Ia*P}&-<Ff)6d5OH
zsVtSFa#fz%s5Yx@Dqj_-FVt76M17<7s{QJKI;4)O<Em8sq)w_+>Wn(CE~si%qiWSv
zbwk}&cho&~Up-I{)nnDB+SLo}f-hk=^hG~>1$$yI4931V07Ebghu}~gjwA6cjKXM~
zh%xvMPRI9fCeFe6sNo_sqZRF#f=keY5(z)Rk1!3F;|g4jYw$B%hwE_zZo;j&19xH}
z7U3@3jeGDr`~eT*5j=(`unfzw0xR(xR^cVQj90J@uj4Ijz(#DsW^BP$e2UMp13Sq?
zKGdChkUs@bAoZp`)Sm`XD1}o5MbZcwO=D?1O`yp%m8MZFy-%}g9xbGJN+1i_DA~)P
zxyVC6NK9UdozmzN%Al2$Nm-Obxs*p6X)|r3d@7(qDxzJqoA%H?I!r&(aVn)UDyIrM
zO=sy>x=7VjL$!33ZqRLNpu2RB?$ZNmp;mfAZPZR3)X66H;g{K${n(!aIFN(*b?(Ol
zID|tvoFh1rNAM^f!%-Z~6L>OD<!KztaXgFX@&YgXlfY)SvYk^nmE8=CZ17V4nA3SV
zui#aj$yuDkxtzxvcoT2s9lVnZ`AaV5ulZZv%lr8NALJu^j8AYGmvaSI@;R>Ji(Jh$
ze1+@yI^W_3ZsaCz<`#a$Pq>ZS`GwKV=x+ELJ&j&QkTK90Y=jz-#(ze$$>c3ez2_J6
K@Be>|DgOX<^AGy~

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/X11.xcodeproj/project.pbxproj b/hw/xquartz/bundle/X11.xcodeproj/project.pbxproj
index ddb6f8364..ae8ec07e6 100644
--- a/hw/xquartz/bundle/X11.xcodeproj/project.pbxproj
+++ b/hw/xquartz/bundle/X11.xcodeproj/project.pbxproj
@@ -20,6 +20,57 @@
 /* Begin PBXFileReference section */
 		0867D6ABFE840B52C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		1870340FFE93FCAF11CA0CD7 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/main.nib; sourceTree = "<group>"; };
+		3FB03E460D1B6C05005958A5 /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/Localizable.strings; sourceTree = "<group>"; };
+		3FB03E470D1B6C05005958A5 /* Dutch */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Dutch; path = Dutch.lproj/Localizable.strings; sourceTree = "<group>"; };
+		3FB03E480D1B6C05005958A5 /* fi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fi; path = fi.lproj/Localizable.strings; sourceTree = "<group>"; };
+		3FB03E490D1B6C05005958A5 /* French */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = French; path = French.lproj/Localizable.strings; sourceTree = "<group>"; };
+		3FB03E4A0D1B6C05005958A5 /* German */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = German; path = German.lproj/Localizable.strings; sourceTree = "<group>"; };
+		3FB03E4B0D1B6C05005958A5 /* Italian */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Italian; path = Italian.lproj/Localizable.strings; sourceTree = "<group>"; };
+		3FB03E4C0D1B6C05005958A5 /* Japanese */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Japanese; path = Japanese.lproj/Localizable.strings; sourceTree = "<group>"; };
+		3FB03E4D0D1B6C05005958A5 /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/Localizable.strings; sourceTree = "<group>"; };
+		3FB03E4E0D1B6C05005958A5 /* no */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = no; path = no.lproj/Localizable.strings; sourceTree = "<group>"; };
+		3FB03E4F0D1B6C05005958A5 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/Localizable.strings; sourceTree = "<group>"; };
+		3FB03E500D1B6C05005958A5 /* pt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt; path = pt.lproj/Localizable.strings; sourceTree = "<group>"; };
+		3FB03E510D1B6C05005958A5 /* pt_PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt_PT; path = pt_PT.lproj/Localizable.strings; sourceTree = "<group>"; };
+		3FB03E520D1B6C05005958A5 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = "<group>"; };
+		3FB03E530D1B6C05005958A5 /* Spanish */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Spanish; path = Spanish.lproj/Localizable.strings; sourceTree = "<group>"; };
+		3FB03E540D1B6C05005958A5 /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/Localizable.strings; sourceTree = "<group>"; };
+		3FB03E550D1B6C05005958A5 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_CN; path = zh_CN.lproj/Localizable.strings; sourceTree = "<group>"; };
+		3FB03E560D1B6C05005958A5 /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_TW; path = zh_TW.lproj/Localizable.strings; sourceTree = "<group>"; };
+		3FB03E570D1B6C17005958A5 /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		3FB03E580D1B6C17005958A5 /* Dutch */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Dutch; path = Dutch.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		3FB03E590D1B6C17005958A5 /* fi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fi; path = fi.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		3FB03E5A0D1B6C17005958A5 /* French */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = French; path = French.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		3FB03E5B0D1B6C17005958A5 /* German */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = German; path = German.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		3FB03E5C0D1B6C17005958A5 /* Italian */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Italian; path = Italian.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		3FB03E5D0D1B6C17005958A5 /* Japanese */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Japanese; path = Japanese.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		3FB03E5E0D1B6C17005958A5 /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		3FB03E5F0D1B6C17005958A5 /* no */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = no; path = no.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		3FB03E600D1B6C17005958A5 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		3FB03E610D1B6C17005958A5 /* pt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt; path = pt.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		3FB03E620D1B6C17005958A5 /* pt_PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt_PT; path = pt_PT.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		3FB03E630D1B6C17005958A5 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		3FB03E640D1B6C17005958A5 /* Spanish */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Spanish; path = Spanish.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		3FB03E650D1B6C17005958A5 /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		3FB03E660D1B6C17005958A5 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_CN; path = zh_CN.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		3FB03E670D1B6C17005958A5 /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_TW; path = zh_TW.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		3FB03E680D1B6C34005958A5 /* da */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = da; path = da.lproj/main.nib; sourceTree = "<group>"; };
+		3FB03E690D1B6C34005958A5 /* Dutch */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Dutch; path = Dutch.lproj/main.nib; sourceTree = "<group>"; };
+		3FB03E6A0D1B6C34005958A5 /* fi */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = fi; path = fi.lproj/main.nib; sourceTree = "<group>"; };
+		3FB03E6B0D1B6C34005958A5 /* French */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = French; path = French.lproj/main.nib; sourceTree = "<group>"; };
+		3FB03E6C0D1B6C34005958A5 /* German */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = German; path = German.lproj/main.nib; sourceTree = "<group>"; };
+		3FB03E6D0D1B6C34005958A5 /* Italian */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Italian; path = Italian.lproj/main.nib; sourceTree = "<group>"; };
+		3FB03E6E0D1B6C34005958A5 /* Japanese */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Japanese; path = Japanese.lproj/main.nib; sourceTree = "<group>"; };
+		3FB03E6F0D1B6C34005958A5 /* ko */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = ko; path = ko.lproj/main.nib; sourceTree = "<group>"; };
+		3FB03E700D1B6C34005958A5 /* no */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = no; path = no.lproj/main.nib; sourceTree = "<group>"; };
+		3FB03E710D1B6C34005958A5 /* pl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = pl; path = pl.lproj/main.nib; sourceTree = "<group>"; };
+		3FB03E720D1B6C34005958A5 /* pt */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = pt; path = pt.lproj/main.nib; sourceTree = "<group>"; };
+		3FB03E730D1B6C34005958A5 /* pt_PT */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = pt_PT; path = pt_PT.lproj/main.nib; sourceTree = "<group>"; };
+		3FB03E740D1B6C34005958A5 /* ru */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = ru; path = ru.lproj/main.nib; sourceTree = "<group>"; };
+		3FB03E750D1B6C34005958A5 /* Spanish */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Spanish; path = Spanish.lproj/main.nib; sourceTree = "<group>"; };
+		3FB03E760D1B6C34005958A5 /* sv */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sv; path = sv.lproj/main.nib; sourceTree = "<group>"; };
+		3FB03E770D1B6C34005958A5 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = zh_CN; path = zh_CN.lproj/main.nib; sourceTree = "<group>"; };
+		3FB03E780D1B6C34005958A5 /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = zh_TW; path = zh_TW.lproj/main.nib; sourceTree = "<group>"; };
 		50459C5F038587C60ECA21EC /* X11.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = X11.icns; sourceTree = "<group>"; };
 		50EE2AB703849F0B0ECA21EC /* bundle-main.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = "bundle-main.c"; sourceTree = "<group>"; };
 		50F4F0A7039D6ACA0E82C0CB /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
@@ -130,6 +181,26 @@
 			buildConfigurationList = 527F24080B5D8FFC007840A7 /* Build configuration list for PBXProject "X11" */;
 			compatibilityVersion = "Xcode 2.4";
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+				da,
+				Dutch,
+				fi,
+				Italian,
+				ko,
+				no,
+				pl,
+				pt,
+				pt_PT,
+				ru,
+				Spanish,
+				sv,
+				zh_CN,
+				zh_TW,
+			);
 			mainGroup = 20286C29FDCF999611CA2CEA /* X11 */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -180,6 +251,23 @@
 			isa = PBXVariantGroup;
 			children = (
 				1870340FFE93FCAF11CA0CD7 /* English */,
+				3FB03E680D1B6C34005958A5 /* da */,
+				3FB03E690D1B6C34005958A5 /* Dutch */,
+				3FB03E6A0D1B6C34005958A5 /* fi */,
+				3FB03E6B0D1B6C34005958A5 /* French */,
+				3FB03E6C0D1B6C34005958A5 /* German */,
+				3FB03E6D0D1B6C34005958A5 /* Italian */,
+				3FB03E6E0D1B6C34005958A5 /* Japanese */,
+				3FB03E6F0D1B6C34005958A5 /* ko */,
+				3FB03E700D1B6C34005958A5 /* no */,
+				3FB03E710D1B6C34005958A5 /* pl */,
+				3FB03E720D1B6C34005958A5 /* pt */,
+				3FB03E730D1B6C34005958A5 /* pt_PT */,
+				3FB03E740D1B6C34005958A5 /* ru */,
+				3FB03E750D1B6C34005958A5 /* Spanish */,
+				3FB03E760D1B6C34005958A5 /* sv */,
+				3FB03E770D1B6C34005958A5 /* zh_CN */,
+				3FB03E780D1B6C34005958A5 /* zh_TW */,
 			);
 			name = main.nib;
 			sourceTree = "<group>";
@@ -188,6 +276,23 @@
 			isa = PBXVariantGroup;
 			children = (
 				0867D6ABFE840B52C02AAC07 /* English */,
+				3FB03E570D1B6C17005958A5 /* da */,
+				3FB03E580D1B6C17005958A5 /* Dutch */,
+				3FB03E590D1B6C17005958A5 /* fi */,
+				3FB03E5A0D1B6C17005958A5 /* French */,
+				3FB03E5B0D1B6C17005958A5 /* German */,
+				3FB03E5C0D1B6C17005958A5 /* Italian */,
+				3FB03E5D0D1B6C17005958A5 /* Japanese */,
+				3FB03E5E0D1B6C17005958A5 /* ko */,
+				3FB03E5F0D1B6C17005958A5 /* no */,
+				3FB03E600D1B6C17005958A5 /* pl */,
+				3FB03E610D1B6C17005958A5 /* pt */,
+				3FB03E620D1B6C17005958A5 /* pt_PT */,
+				3FB03E630D1B6C17005958A5 /* ru */,
+				3FB03E640D1B6C17005958A5 /* Spanish */,
+				3FB03E650D1B6C17005958A5 /* sv */,
+				3FB03E660D1B6C17005958A5 /* zh_CN */,
+				3FB03E670D1B6C17005958A5 /* zh_TW */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -196,6 +301,23 @@
 			isa = PBXVariantGroup;
 			children = (
 				52D9C0EC0BCDDF6B00CD2AFC /* English */,
+				3FB03E460D1B6C05005958A5 /* da */,
+				3FB03E470D1B6C05005958A5 /* Dutch */,
+				3FB03E480D1B6C05005958A5 /* fi */,
+				3FB03E490D1B6C05005958A5 /* French */,
+				3FB03E4A0D1B6C05005958A5 /* German */,
+				3FB03E4B0D1B6C05005958A5 /* Italian */,
+				3FB03E4C0D1B6C05005958A5 /* Japanese */,
+				3FB03E4D0D1B6C05005958A5 /* ko */,
+				3FB03E4E0D1B6C05005958A5 /* no */,
+				3FB03E4F0D1B6C05005958A5 /* pl */,
+				3FB03E500D1B6C05005958A5 /* pt */,
+				3FB03E510D1B6C05005958A5 /* pt_PT */,
+				3FB03E520D1B6C05005958A5 /* ru */,
+				3FB03E530D1B6C05005958A5 /* Spanish */,
+				3FB03E540D1B6C05005958A5 /* sv */,
+				3FB03E550D1B6C05005958A5 /* zh_CN */,
+				3FB03E560D1B6C05005958A5 /* zh_TW */,
 			);
 			name = Localizable.strings;
 			sourceTree = "<group>";
diff --git a/hw/xquartz/bundle/da.lproj/InfoPlist.strings b/hw/xquartz/bundle/da.lproj/InfoPlist.strings
new file mode 100644
index 0000000000000000000000000000000000000000..88e1f04ac78e9f0b14a2b6fa57a4a02ae91d8edd
GIT binary patch
literal 276
zcmZvXy9&ZU5Jhk8S1c)mn3%>wEHt19Vq;?~c`2F)Nfh+s)w5ez1X*_P?983nv+s`r
z`7+w6R-%(`y6B}$DY*yQsv}dYLJgX8Zn@>e6E)7?sV95I{d6v$nIl%LwN|?0PVr^h
zGrvTQ7Hm&PO<A7if4m!f{qLm%aSKPKV$eOLG>YH~HO3di*uZ2v3!NQhL@m^e>XMq}
Mw><Vo34M;`3l6p|GXMYp

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/da.lproj/Localizable.strings b/hw/xquartz/bundle/da.lproj/Localizable.strings
new file mode 100644
index 0000000000000000000000000000000000000000..9608a2e6b91daf976b16e342d8cff6cca1cd93e2
GIT binary patch
literal 1090
zcmcJO%}&EG5QO*Kr?7ggXc1?GPz6Zk021QDflJ$j5E_z@^hbSQcnshhJ0YR>%8KK7
zcW1`q&G(O;+Q^(;TWWL5tgwWyoxNIYIjaxb5Lq))z7-o$F|eUcts=+So|+Bsn)(0E
z4#b>F$5Sx3Sk9j8jB#nt#P!_TOAqNV?}V6;_Pj%-zDq`iswHcwE6AvODDy^5g|3{@
z>ff=-7*Z@<C9Bll8L>sIgccJQn^>bBW>+hxYJdJ#*%HsRPT1}1(C*e}=G4fIy4i_r
zf{)HFc!qX^UI$z7GPM;W_Iss$TJS*CA!F-LA*_rF-H-0#(AOEvsaMnDcG+SJ`ND3!
zC>u`oLe|3^<5PwHgn8b$Re4p>U&V`OTlqRUkfTi4p{JDR?8`e^p(;4lV(8TEnVol1
z`gDgY_T`^?Ywht8{7`gFe8DUi&*{lQ)64fTI{Kn$bcP-b`sIg|=vEj0j@9Rh*Ash|
z36ZwPuVBbQQa^MzHDym{3l3FBW50uaiJF<`FMA3?WQ<R5IGS-c$8z9-bL#)^PX7p>
II<8^-1@m{fhX4Qo

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/da.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/da.lproj/main.nib/keyedobjects.nib
new file mode 100644
index 0000000000000000000000000000000000000000..4a2bd4bded4b836fde586c94351c85611c514456
GIT binary patch
literal 34164
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
W59tv<5A07sz>5tGeX;+yp7{?3U5%Ci

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/fi.lproj/InfoPlist.strings b/hw/xquartz/bundle/fi.lproj/InfoPlist.strings
new file mode 100644
index 0000000000000000000000000000000000000000..8e4f6474fd29ef2edb5e82a98f879321a49cefd2
GIT binary patch
literal 274
zcmZvX%L>9U5Jm6WuLxZhv9%i);zA3GAa2~amA(}1gSHC#@#;wyf+8WglbJh{ljlo;
zd>L(2E73t0o%B$ql-vz%)sd-Hp$5%4*W7aAks9ak)RR5qzB`xC%mFLbQVU&ir}#2$
znO~wtGq$I_#w<_MKi(C-{`1m~xP_xq@zecHX%s;fYKSX_uz|?-6*@Y`h+3!#)j2gw
MZ)xm*68ap;8>)3I#Q*>R

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/fi.lproj/Localizable.strings b/hw/xquartz/bundle/fi.lproj/Localizable.strings
new file mode 100644
index 0000000000000000000000000000000000000000..e8420fbaa583bd0560a910ba37af49f0ac587930
GIT binary patch
literal 1102
zcmcJNJ5R$v5QMkRuQ;WQc!(B+5P~8+B{~WklbFQulb9sR|IKfp1irb8V~0LE`FxMv
znc3O<`L$CUn6q0;EV9f>o3LBi)M6`GecFPXFGj*%cLOqd*0*b$6XR@6&Vql<ynnI+
zu^`j&mCOy6vsXJ~T-h7<`tIzbgY-Y{h&v&z`G-vHD@KN@5o@U{iKsg$(N@hIT?M1j
zzhad!q*%HtR*B_|*v71c7IQB)v5q^KZLXZEef^EH5uRy1;k2tmr%NAMkRvzh?aA0q
z@X^^NU*CqDW@r_EN~9x8HRQ}vns6f43M};_Vl;l7!`r%f@3nQKh1rdjqbd0bbLx?U
zug7FgZ3aW;d6l)#DNQ<E+J>9(GQNr3>@><#`6<7pQeBbKnV;oy;Vam9oP8DQQi9{*
z?I~NG(oSnRp~}mhwj93}{v?G(zR1xF-e+(7uAhl^yb<LDZmF;EwWNl?r4GOQev4`1
zmB*mXL2KXp4eSL-@}}+D1N=Ey(ZP71z#gGv=$WeycerVLruq+6{R?%f+im5KR2|;p
GuJ%9O3BJDo

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/fi.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/fi.lproj/main.nib/keyedobjects.nib
new file mode 100644
index 0000000000000000000000000000000000000000..b5039fd44faa2f45ae58ac1b194d3abcd28de61b
GIT binary patch
literal 34765
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

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/ko.lproj/InfoPlist.strings b/hw/xquartz/bundle/ko.lproj/InfoPlist.strings
new file mode 100644
index 0000000000000000000000000000000000000000..4c738f8b2cede8838240e77dd9579e4ff9cea110
GIT binary patch
literal 266
zcmZvXJqp4=5QSf1<tdhwK{TeZ5DN_`g4o#DO8yiz2__0!dn^y&snl<`un<{x-|Wmc
zvu|H-_2kQFp;ECnI%ubxQYGXr=t(u1QUz+zjC0N{Bkrnle65D;9{TDipP6k|q^Tx4
zLnm;lmdrn*MkBVTwfZbi!$0f{uKB*SB0k}xQ2x_x9`|R9T!@=M9ij+l6;3RlYwNs)
U)B+8tj;UGK)`k5?OrLY`0d_DfIRF3v

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/ko.lproj/Localizable.strings b/hw/xquartz/bundle/ko.lproj/Localizable.strings
new file mode 100644
index 0000000000000000000000000000000000000000..56a335859cf822e078add171aa9d280a8d1182fd
GIT binary patch
literal 916
zcmcIjJx{_=6g`6zo15bco5Wz8jZq_m8Z}{KU_n46fwuA?@&g=5{1GlDn4kk<M50M0
zN+Hq2rJI8T13$q@J-4({-ObJGyYGIUd*18k7v>RyLIhbPkb{m4PZjJV4UO6X%Jh^d
zS)RogVnzT#tfIgeg(`E(+>8AFwp3VAW2WNL`Sofk#IQhFMx1_G8`$$z`WrV#pH!-H
zA7{$hpyY@uNnOzCj41l5BwREF;?gJ{{tC4mMGy-vgIX4ON*XC@QY}rtbd#<rU(HFb
zFjaKs_mCyYndli>{W!#W=tOGF5jKjhC513~R9NB)jwiDsQ2pcfvmI-kcCVZL%Pk*E
z&g_$jP6=eDJG5(1gK6sss#9;hvzE(|744lv*;DQK#m7zEV&_4v`zEo?QER5dx%;rr
z?AXABdfK#By!<<}ac?&4yjU#OZ_PIQ&7p&JkvAW3U(61tQDk3txf|cKLDqH7n<a0;
zr^2qoq`amKts1Rq#)RqdUecPwTaxzNgpZfe!wFCS({Y;}lSHuY^fV@2;d-tfd*<!y
Rzx9v0f7Q?J%bk1Oz5%hy$l3q^

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/ko.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/ko.lproj/main.nib/keyedobjects.nib
new file mode 100644
index 0000000000000000000000000000000000000000..925945c4d9769d6c6cd5bc97bfb6cc284fa3326e
GIT binary patch
literal 32690
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
GvHd?HH}qQo

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/no.lproj/InfoPlist.strings b/hw/xquartz/bundle/no.lproj/InfoPlist.strings
new file mode 100644
index 0000000000000000000000000000000000000000..eb1cfb002dc72e22621c7d4713ff8d708401109b
GIT binary patch
literal 276
zcmZvX%L>9U5Jm6WuLxZh(b|m*aiIl85I1hzN?+DTTiPn<$Ezn<D2RmQPG;^*PM$9f
z<;!TTO0o7jtI$KK5^^`RQA?&$i5fKHTye{Y2dbUFRY&%O`|eymGkdH^3(a-Ko#0Eg
zVg3a*nzB9ZG-7$0{P8aFb)T2E#0?y!@}KT6<<U_Zg>VJx<BQ1DFxk#r2S*uF3pA!W
Pqh|RnkNr_hpJRCg4*xAQ

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/no.lproj/Localizable.strings b/hw/xquartz/bundle/no.lproj/Localizable.strings
new file mode 100644
index 0000000000000000000000000000000000000000..5157a67dea765a4c1ef6b12eadd236878ebcbb36
GIT binary patch
literal 1084
zcmcJOPfx-?5XI-rr`T{Lit%iWA!>pLO}u&V0<_jjDYX>{AK0&<{@!la7Vc!yvfY_^
z@68{6e(l0W=IqXLn^|FN%lO*ayQNlg`m_z6FD&O<z7ZJ%8`{KbVw~;C+3?%&KD^n1
zSd!^@*1RK@vlqL>ZtNAmo(FsDAsxq^;S<uH-;k;A3M){x;4F1(BAOn`tW{H^tHh%I
z9j5}5V(F?l<+j37OE?KF#V<CoCOyn9SDk8n{ZZM1p6Q%%+t;Dnt&c3pQ8$|QCb2Pn
zbau@%w0rbA*g`LJTVkodtLz((bVdKx*Py#CXazZ%kfw3m*(njZ*AtMBGsGEk)aBTb
zs;xmAQS@-n=~hh@8Sh!!Ga+m^=V(ueEo_djMvoA~J_YWmTCrl1UTs-IbeK-4w;^kV
zFZMuDViD?+TXj?T>fRN*IB0kHi9E+XC|lDEyB8FTTk15;xu324ndePC-WX5Z?OV7?
ukW@`Kp$W`$nD=m>iun=d1xlu#yXvubo{xXuX{vu_p8C%pR^IJdTl*g_ueWpn

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/no.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/no.lproj/main.nib/keyedobjects.nib
new file mode 100644
index 0000000000000000000000000000000000000000..ca25327f5393df6fbd306b95803947c90dbf8b52
GIT binary patch
literal 33581
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
Cj}eRj

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/pl.lproj/InfoPlist.strings b/hw/xquartz/bundle/pl.lproj/InfoPlist.strings
new file mode 100644
index 0000000000000000000000000000000000000000..b9c9502149297d06b225625c20a74e31a4347144
GIT binary patch
literal 274
zcmZvXy9&ZU5Jhk8S1c)mXiQ@v78+0lv9Yn0yo`?|BvH|iSI=%?A+qe=*_k`DXJ2m(
z<;!TTO0o7jtI$)a5^^`RQA?&$i5fKHTye{Y2dbUFRY&%O`{7(ZGkdH^3(a-Ko#0Eg
zVg3a*nzB9ZG-7$0{P8aFb>Ek^#0?y!@}F*_J5Eb^WV%rZRiHjm1Yr%4?aOs=j3Ko^
RW2!T1mfq6X|HSk;k`JdvEV%#x

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/pl.lproj/Localizable.strings b/hw/xquartz/bundle/pl.lproj/Localizable.strings
new file mode 100644
index 0000000000000000000000000000000000000000..4ae12d77f898e651e2b8baf8f441d5baad8be6aa
GIT binary patch
literal 1116
zcmcJPPfx-?5XGk_6Fx=5kr<3;V+?_VnrQT9)JvrmkkTS;X=wcH>hEm}R6LW-(%t#<
z=FQs)-#>O{J@aj3GYc%X)F#|Yn_6TEr%x;J<g6KY`Fdn@tZM^X5#!s2oPux0?_Wy^
zVnU|RPWjzp`SxVztSfuPuYF_hEu_P^Q+z_&@U1g-U$SCYjX8^5N<`K|2^uylcqObY
z|B_S85@YdNa+=wK6<NqhXc2x@Q`NAAxzCkSnd^VcY>Z|)Pq4Om$hvls2{}?DYb>Gl
z(b2a{cGrehxta-HA65~spbVc5r);5C+$#KYOT7^`GQ1OPhkD*x<h?j`{>3*ab%vCk
zTi|`srTWzi7Oq~39<`>jFR^PfR@7eX>Iqva<XEMzra|m;u*6vif%Dfaa`M&V!o>@B
z#x95#?wDKMVd=gbmpR|z3SYeoIYk@QRK=>Pqxq1Y7fffTnd<vSKXs$`t*5c>W({(P
zP4D~Wx|e@~Rk#tH`gpd}K6Lf;3UTYr2E-Ov3i~)(<vZ82Z`ZE&vQ_<o?iTDZJnJZN
a*Gy+_7LTRHBmL?>VL!XiaNN&iQ}-7j8oy@%

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/pl.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/pl.lproj/main.nib/keyedobjects.nib
new file mode 100644
index 0000000000000000000000000000000000000000..e9ca5404b8aa575c2689e2d72f571aa627953e0e
GIT binary patch
literal 35113
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

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/pt.lproj/InfoPlist.strings b/hw/xquartz/bundle/pt.lproj/InfoPlist.strings
new file mode 100644
index 0000000000000000000000000000000000000000..33c637448e0e489cb79e7d95fa78e79811090653
GIT binary patch
literal 274
zcmZvXy9&ZU5Jhk8S1c)mXiQ@v78+0lv9Yn0ybNj*k|^l!`XB1qEfhqC-Fe-aJ^OrV
zC|^cvRf@IONrmo8l~B9l8?{s_m3V{CxL0Hu@j$iHx9X@KQQw@(XJ-$Kw9s4^)Csy&
z8}^^^MpKTbokp0a$sg?!UH5ruOWeRwD*u`OQa&Iu3ZV+rCyK~xi0oXhgJTTo1sc<x
P(X;fH#{MT}&XK$U%u6jl

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/pt.lproj/Localizable.strings b/hw/xquartz/bundle/pt.lproj/Localizable.strings
new file mode 100644
index 0000000000000000000000000000000000000000..23ea9684754a62d8b7e6b9b12a505243f50b8970
GIT binary patch
literal 1192
zcmcJPKTG6L6va>Nr+8S3DAvoehzeRL$Zla_6DQ+1l1XB+GlTnW#bUwUR{fp#5)wu1
z<dNjQ`}f>)@65}qcD1FTL(P?`P^B5SwQe+3iFBtWmcN`iciXmz*wCi-)!-9!Pt1~U
z%lo}%O~#VQz*F(=a|K;!kMm2H*!`U7dX(v--!?X9y62lBeXltMs3yopSK-l)vSb~a
z23#el$G=7@I7Vz-HPT!Q&Qv*)vrVzPnycocoI|XcYGeOBvI(47o}nG%uyz$aOJdAM
z+i7y`z+=!)o=yG1XMr@~+e8fi@Jp<j=RD?}>NaXUo#feYZ?K!;kG%elb-(g8x8^&e
z^EOJZp7<TJyNdl9#ZYI!=8ioB_vsyQA89ImoVjZB7^6K2bKGz$d}|_|*Q|LG!yK}B
zOWpx}ph898Pe^slU{)GEaQ7^8sya*mF1k9I{_7b}+uW@)l^vSTuzNxUwVcN@`oYF;
zbib4{>Uc^<Zmem;>)6XGc4GWNS8;=EpP?=BG}0X`{V(W%{Ar5CXb;9(Pxia2pHh7S
lnqzPkusLkvK0CIITm~ht@4|3S9sj!wwU0VRyc?tL-vE-m&fNe2

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/pt.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/pt.lproj/main.nib/keyedobjects.nib
new file mode 100644
index 0000000000000000000000000000000000000000..e88cccdba36e84db38b7d58e4e211d32cae24e87
GIT binary patch
literal 34533
zcmeFa2YeL8`!K#UyI1#;+@<$idLg|BBt5zG<OsdRBRRrJk_#zR!5u_I5D-K~DN08W
zq=OX|#D+9Mnn)4BUa=Sc&+OhM7YKg+ec#Xj^MC)J_Z5@u?aj_S^R#)|%#LYovb1+3
zCZ1#vgBh0L7#SmHRE&CP*hF(%yT#fvFs#GcIxNi8RzJ=Hw}ysU$J}GC?`U^r(ClZ9
zGYUpIsx&`dy4hgrFbSwm>rz!)Zk}Rp$g@54ybk}x@Qj8@V$zr_CYLE-3Yik7f|<=M
zU{*5gnDxvC<~e2yvz6J->}K{bFEB4NuQ0DNZ!m8$hne@86U+tXW9D<_3+7AaTjmDy
z7vhi%sSuAe$OXA0KNN)YC>TYcOq7QTP%*<J1FA<2Xgq2{R@9C<;Ab+LhVDZTpxJ01
zT8y4ROVN|)DfBd2k2au<XbakdUPiB?{pdY(7#%@J(Mfb3eS|KckI^USOY|KoMn9lG
z(4XipjIa`GuoHI1F4!G=U|$@H!*K+T#|bzIC*us9jdO4=F2cpQ3>)zPT#E<dVc3Mn
z;&Ir5+i*Lcj0wIU&%*QZ0=y6}!OP*Bm3RZ*h_~Racqe`lzl2}Lui!WEW&9of0sn}9
zXIYkG6|9EUv%zc_8^iWzi`ZheoULJN*%9nWb`*Oz+rV1cR<@m;%uZpau`}2Q+4<}O
z_Hp)Ub{)H(-ON76?qOeIUt?cq53=vD@3QZ+N7-ZSDfUD59DA9)!hXVDWj|+sV1Hz9
zus^ZCaSVqz%(0x3bK$g{j`QIBxd1MZ3*y4KST3GR;4-*Ot}oY*%jNR8Vy=p-;f&mH
zZUi@yGjaED<GEID4)+i@mz&2e;2z_i<Ti58aeKJ^-0R#M+<V+%?l^aXJH>s>UE(ft
zKXbovf5_xAwTzc(WG*sKnO+tw>m!SmrOPs8{bboPgRE3mCL18Dm5r2*met7`W#eQM
zWbLvJ*}byqvKcZ#Mr04l9+5pNTP|BGTQA!ndtSCpwomq=>?PR&*+JQ1*%8@M*=cBd
zMs`;Ak?a%MHQ9C9*Rr2vf5~pj8M#WXmb=Q`<sR|?d7wN(9wm>KC&`oLedTw_`^$@D
z)8)l-gS?dC<z@16d4;@EUL`lm2grxWN6PEv4RW)5tbDw@Nj^b7Sw2NRRX$BF$mhr(
zlFyYdls_SVQvQ^DwS0|yoqWA~vwW9)pZo>+tMdKwgYq}!@5)cePs&fpFUUWZUy@&z
zUz1;#e<lA>enb9~{CD{u3Pynxa)pz^S>d8^Q}`<U6#j}}MT8<!5vxd2BrDPt{T11Y
z97V38NKv7vR18q;Q@pM?q<BklRB=XeR`HqQd&TdHKa`A;RdPxvrKi$MsaJ+8<CO`@
zzRCh+g|bpPOgTn5UfHDVR8CY*RZe3vl{1vHm2;Kzlnazgl}{;`DVHmsR&G>oQf^j0
zuiU2GuH2=3P5HX=4dp@Q`|>j75#>?kaaD$DrCO$zs}*XcTBTO2d9_CEq;^)jsI_XH
z+EwkQc2|3-J=I=nZ?%uwSM8_vR|lvA)j?{#I#?Z|4poP#!_^V$NOhDtS{<YAqmEU_
zspHiN>O^&tI$52fPF1I=)72U3Om&vJuezW5E_Hu(wmL_htIkvBs|(bH>LPWq+Mq5`
zmvZyfW$JQug}PE*rLI=jsEz6Y>RR<c^&s_N^$_(?^)U5t^$7Jy^(ggdb)EWdwMjij
zU9WCXo7H307IhP^<~Q=s@|*b0{B!&kek=bxzm4C{@8EaxyZGJw9)2&skAH!Gk$;JQ
znSX_UmEX_5#=p+L!5`oc@^A8o__z4C`FHqt`S<w4{QLY7{wRNpKhB@vKj2UDr}z)~
z)BG9!EPswa&ws>U;6LUs@|XC_{1yHa{wn_|e~rJ+f5v|<OXI)bzvRE-zvjQ;zvaK<
zzvqA8f8=lQKk+~Fzwp2Ezwy8GfAD|ufAN3wH#Lj~X|RUXa2lCLu2E=|8kI(^;WZkK
zlg3%&qS0z}8dr^*#$Dr~@zi)}yfr==UyYx}UlX7S)C6htnqW<cCR7uq3D-nuA~jK(
zXibc!k0w?Vr-|1jXc9F^nq*CiCRLNBN!Mg(GBsJ6zM6iTyEOeZ*_s?pt|m{DuPM@$
zXvznLwRAQ$UDUcVPK-0-!e|*C<I1=(?u-ZH$#^l|j1S|>_%Z%W029arF?uGL31LE+
zFeaRdU?Q0)CYp(1`Y^Ff923tZFo}b!Y6n=Y9fQN_n@sKPqpE7Fr6md0oOW^XDWLbw
z?SoBCoo2Y>Q&pQ+UvF-2w~VngSvsavTN-TN!LtR{mKIpgV5MsxQB_-IYBsmie&D*e
z4L(e=wvDH)q#o%v!(lw=fL_8E;sbXY$kw;DjkYYdwscgQT1<`RwmPl0s&=pi;At`s
zv9vT;CrNPI=3(#7s~5QGu)|<j^W+YIVx$C%^nd^h%AW+iK=25H{}5CJ{Vd1{9!~H`
zf_@?RH-Qlp1pP$t?>bya@Te0&j$|f<NrlOZ6Qq+7WCBaSNM|ybOc*J?y`#<2(kO5+
zg}hcU7wSzEStppjOh4u>rvFfh3g-6V(nSmOv4-i-WHUJ;Eh;-ZOfbz_v6rD$wOtp|
zWTk%cnEcgDK9e&V0O@S+ur^Cy0-j3q3#|24Qx`2LXhlphV*oPPtd4d;`Ha*}DO0wF
zDPzi+96*eHU~|VH7}eY%Jz2?A2~p2$Gni_ohA}b&m|A8aGl&_?3}J>c!<gaB2xcTR
ziW$w+F?Ta2W(-r$G%#jnEYrx0V=T-)%y_1WX=Yj&E7QtMVA_~=ri1BZCNh(l$;=dH
zDl?6_mzmDYVD4iChA=ak`<YqH1A<!c6=H=Xp-3nfs)eD#D8Vd@7n+4mVTv$K5QGPX
z1;P^HabcNoL^vj#63z)1g-?XfgztnOgx>_9s+FKtf;tJBM9{qi2?Wg{=wX5u5cCK^
zO9^_4pp^tYL(po1))Taepv?qrA!sW>+X&iC(7uy^x(As#%tOpvW*+k}Gao2gXm0PY
zw1^a?w6S)!)tiS@)mE6sn41J2!BgM`?=$e+Lgo=>5wn<ilv%<&#yrkE!7OE-WS(M{
zG0T}1@W4PzN0Yfus}l{sq6wXriIvudN>lrIAQP~xcn5~7Y%w=mTP*bz)_P#A>Xy=G
z5C=*t%Vcwd_yJ_Q(%jN1cnD6epeY!^+4a7gH*X3qf}5bBGg!zx%{;@bVpcP2n6=QF
z@+|N#eW<j<+}tii6SSY8cL;jTs&xS(w~6F4!{0A}Z1q4y6A&$){ximY06iu%8<}UB
zP0VKCz5(WT5eK3qxC&Z92a^*4lb9JsDHvz2AKz?h8!z$P^USu@%r?sGAkz}_+B<RV
ze3w9ba~E4tSj8FFc9=TMQa5{<eXE&$Ob+17J{7xoz62uaHEL*55~!1oHfvLpxot#i
zn|W+|UHdreq`uPg`<d6)Ft0JMQ$RcbE0!^~)?GRXW+&aH>dxBM%?$^bgP?T}34H`V
z0ShsXNPdTTmw8W!7W{=EAz&Z{%q~Sog{alcG3K}sDCp1G7~}(Bk&_Ng@-8sRY3Sj!
zjZqE)2b8wgnp;h6CV&9wUfN!0X{YL;0SF$XqW@Du`_<4cFW$m+mw@lCFrPrD@7g<L
zJ_9zY?Htn#kOBYZiFzEm3KfC@VzDbBWJI1#YfZGak8YP5OD+3S3M~}b=@aG~m}jsM
zW}o2qbb>!HKMLVO#J`>3l^(MQ?M-lQI)G1`N7~>FZ3b4QOxg~br3F~D2^e)M{B6@m
zh!jS0q*#L#NGWPbn{vx*Ycov&4i*1O&D6|et3gC_hBjF1$4e9gO^uw8^BUwV@rS#}
z3Dun-vK?LQ(ajH_9gr(>6U9GHNbF@6$g_JE$QNdjV4FpJ7eY}03Z$ZVnxHeo^6u$u
zFzJDVhfPjOsvBo+YVF%S+yN8{1BL_pC4;^xJc}Y3XB35^Q4H#XVo@B5M+qnqC81=L
z!kk8FC><q;!bsOZ5VcloOM|%$kRYxRpb-kpO-;ZI6N{TnjdZOnY7sdMZb@q`aG}_=
z(gbVLWY8V8ovr4!i5BxDAw?(<(uGW&f>8+>LaLB*+6GM)Kobj)^hN#9U8q0G1~~eH
ztOD=R2ipna2udL+nIO3iF+v91I1cm37t$oM6r!Tls7RFWnp$aO5Y%bYk}_lUS&7qQ
z_0v)llVkNsnbW6#j7s3iQdEY@Q3a|*Rj3-(AR`)pYSBP62n}Z5MMKdrG#rh9t5Ik)
z3PpD#6B<L8ahSU}?>em;utigcxec_tnd$;_ONVH%SlgOSO*WP0T2)(PZnIb$EcK<(
zqHUt73DiV>XGe#%MeHV7R9Id8bZbJpQa3e0zkmq)2%<c;wp!ad0L}C!D6GMNA(3MC
zu?o#irYRu)UC<^&V~0^)IrKLp<O5Un*ZOF&kONm)LSG?S`?i*GExF5hvrZd4sNK}2
zx9ZJf&6W<UzQL?FO|-Pbg;n1UAq{i030Mr7nWxcM)QH9*3%Un*qt-Ij42&>VoSbl1
zXl@K6{wMU)aqc54I_oVBCPSMEI7%X0Giq6lT9_Pol-h3&8XdKX8a*3&tDR)&s2>N4
z19hT_XcCY?#FMy&<O#V_PgBs;)o3bJ&p;Syu3{@`&6V2Ri>9wd)6onREm|;AD~cq*
zm87xg2dS-q$T~#OOmsh*1=4Qs6Yy`xIyEuP6q+s}8PVBpu4|vtKE`Zr?G`{P?+>B5
zqP!OiWxdJ!d}b+HASqq62;{v)C>6D<f%alsk<k+L7<!z_{BeR#5p-fyvAKR6(5TGR
z0`xXc8dcw9h4Cke2Cstxn9BsA6=)@lkA(`M>a^IUgRy~Dbt(K6Fm|O)*Jwu6TF11R
zfdxRZ)M*2(ZJ-8<+ki^2thO|m+8Xl4SUWpv=;%F0n};@|=fv682t&^FP&ZWBYz1Yr
z4Q)p|K-ug<TLmNNgj!*sPLZGz1_;Je;saD4>}C3ZHh2+q!ApQ-QKeA!0<({5g6|0W
z-lhTSw4T$ZrDUaocqdayPfALP)u$v+pMJq6>AlJMYoeSFLkB><-$aMt_hyjtchI|T
zU=H1!WfKrB0<jn@41(V^u1a8K@!Q!mb8lK8$VOL^dRR$1nXkc$wbG@Hn)Me14#e8j
z+S*<x+U9i)))w<EC^~^Y5K%Nt7}*;`d<YC-Th>K}7%q&E7y>%3w6s{7EmONG-wZdK
zrJKEye;&Gwu85<J78-6R$W<W7HFRCn{-2|(LLCsqB#coBcMEkAHKGvEL!`zx=v$O+
zqd*BknKlai&s6HKfb7eXN|lt5sDSDL$D`}C;dvdFi7+=)yS~F*4{o8}OwC<U51QNc
z?bb1rA4f|D8t{Khqq#w}GepB1-NX#cbgXbsFIdGavlMfZm|+F5`Z&QNVzserS;cD1
zQxSWgpd+ACYt2pOdho^oo`IbWR-<WnJH6A9*W}3Z2f$F9huvU>4TKf83DzBI8`uP~
zuH9~r_0R~|8~cbPX%RYZCke<14#0sph&hdeZ8Fj-OwcLfRDxA7cJaLz@O?%~tUfti
zV*C_X;{FrkOADOH_&5glL8Gy^#P}jD`U>qr8&INUbRH~P($uNl--EYZ9C*9MJgFyZ
z<20Nu&TOJExi=zYIoLK-*G;nN8w21wuNh29Q(M9Sb3^A;OWVk)R%`R^3XK}n^KhYP
zP<skfhl$vxCMqSP$OgCsmjVp;3itH}K?Sfur2`vG7iLIoFt`BLRa2XB^1%Aej$39m
z#3n+d7ZJk4fnFo=C@Mm@4i6V*f(XqL9#9GQ3o~yKA>4q?T_V&#P<0nEL5WdoB{?bM
zzc*K~73ewSHrbjD6eU)z8<PjRssrrc7Wi!e-39h9#DnTZO=boU`zQFWy(gni#FIpF
z&JpI{!FI&c@V%1li0?xQqLDXOm`5$VhlG?{r<atLE=?~Brke6Uw8rpUnBK(OruQ&R
zZ%&=o6?|gRQt5#8P+vdJY%$eoea)hIS~nJAWbO5BW^+rOU2F85=VBXy7xqG61UeEw
zftQK|e#)jJ7YU11!XrZ6f1?BOTA0Y<+a~fTOk|-|>jxp2W}sA)jXuplpHA>x%s?v|
zEztw@sJq<`S7YG2j$7$=01p8Pc@89mfJS<3gbfF#&W>?CC%ql-5Q+PQ@KkS-vKu62
zkAq#ZRCv<947o^Vhdz(mwH9le=@$&k5UAye7HemFFG7p=14yp}NXr4F_b+PQQ6xUV
zIOBu(O?(Kyh2O^S;CJzRbm2#R@L}qh;P>$nd=wu;CVU*9z#rg~AYUKi)93&`gHrHW
z_;enBgpc8m@kM;8P8$RPmo`&lBgE4rvyVndimh!`))t6}n3}+N8z{LgVDOcgO<>SS
zwll<4@=f*Q8{4d%Ee!?MCM$#x!FC5V523?>Q(Dd9LeN1?YHM4I{V6XnMCt77!Dy^)
zHPyqgLo5v)<HU$4^wQbflGh22xVhajm4ehUg~o8aZ-1)9Y-t?V0Y;9Y%_0pCUcx}?
zRY|=-^wR$hQxoS!ZBXkZsTW~|aM*P~F2o|A5%#ErwV}DxY=QqmbHzUp@_AY%yd$iH
zh8sm|hT1!!xk=Ku=OlX#U!hAr{sdnIDtwBs;p_M_{5k#te~I_wui^84z-4`x3s`8a
zr-+1m`34bv;BQd(5xf|BUsy-bMS?!of)jT^r(%Ew4hido<u=I~J}o5$7O|wPjOibW
z!&4TB$2ag#_-B-je}TXIVTvL`#O_uJYlPLpDq;DZq5TV>{TrbDK!o-K8w8&d^cmoV
z4*twA+o&1SMT4J}vGTR7Tr&5?NSiobH<#G;cnpAcja9K~0PPxdv_V)eth<0BS%|))
zDAt*EL0PO8*f^fm;ZIptw3T&dJy=iH3;)FWu)eGx+z9}tJqB|ssjZhHPT*j)+Z;=X
zb4jBXG+A2de1YwxW_isWG;luH{*cWD1P@U}i;<vD3Hp+tFSN<RDuO<$)@t+g3?u$5
zg}?BlLn#8Zy9Cr<QKxkW`ymDFX3;@TN(UNbOt+yUgbiKGhDzudRp-d~wg?UzAw;cV
zBiSf6T6k7?N!Wjm?ZY^;v1}Y0&nB>mY!aJ{Z!o9XR5p!GXEWGLHjC{GBD)`$yR;pg
zCNSnHk9Wx;b-p0ZAj%N9yoHeMrnjKE*ce2}7V!iN*xsnpG+DfaPD<O08Z4s0trA`o
zHihO6lvrBWrDa2N3#AXCxeIf}E0wVPG<6T~A<_M>WwY5FHkZv~^VtGqVhbt50SAlR
z?8*`Fmv;(Vgw4Wp!t(>Gtj%W7qjv9?EkPExjC#8fwh{a3H2z?WuoY}2TLlxZ2Jpn5
zsG6Vw;34BI9cE!`d15@Ueo9JmRu&_1p^+W1njOI8KpXLaQ_#x*=w~212znaA4rPb2
z!vQw&OX>kr9soo&SsO)vc&o5OD;Ks4+XmN8p<X%|RpUfO*EJbOxax$h`H8lXP3)L;
z>=?FQa*uD707?ik#z6ZiwwRk5=$*3;7&M|<)(lu2%QoVZtOeG${cIESF54n{<TXt&
z@p0BBP`Ofu!qq+L?_A*pVUMsI7QN*<jsZJx?=afEo_6gBW*dN+#N3XGiR^FzCM@g|
zw!zv{FGWMTCMqFxDqFwSJ}K$Wz3lYW>~tmvFz29S@65e~oyp!0M4TmYFJ-QmLvzPv
zG~5l;7G4d_tsb?AUfz+T=1LqTGSDlOfrb=Vo56*){wwr#<A@^Y&R{;tKE*BrFqe0O
z`C4dhDF6ol2?s-S!=%gG!9;_A@mH~{yTE)yc%6bdI1l)0oV5qufwV)}XGOg45e^93
zMo8Qxvg5g1xM52dKYYzv*zF=eK)jlA1T46)Qcr5{UUgxbhkzB{6qZAnTG;C-Ui(12
zUZmm`CCxzSr`7fVihTuudQ}AKZQ(7-44yV-=<Z*H(2=PQh~k$n{g-tMcO8Nb-x51~
zPk2|@HmuRUFgx~eSlC*a7@ua7pCkCjI()+(FdE+NB6V9_2Oz#ak39)CP$<|yM@Nf}
zi`cM-_rjiG&w^EUTsYZ_O~!u2EM+e^crPb}54yaUR&bt-^@HlIty6lqFG1{e_A}@b
z3m*z+&x!#chkO(J1@k!j6?FTx)Gf1u{T_0915J(Ko}CuXh}~<nF(az$JDb2iq7Jxm
z+@Num26MOP&Hlpv3L~5sKJE?ZKcM$N9f1BwxF7*NWPo|BX{x!+IDAl>xxv~KYEI56
zM5r$bS9*n-Q+GR)6l#F?vdx{;jI6XmYSres14neWP=LXt%j?dvws*tNxpD3=)>Ywp
zFYt3-%u>$V0sc>gYZCl}fUf}O69>1NK;8BLe;yaYg+iB}!so)bz54iEBo{?}d@jc3
z<9{i9r4qjA#lcU?$`m78|3e3#OW{({XfC9Oga3{2wa{1i95CN(g^IHtp1o@~+txKe
zsH4Y}4&aH*JT3>=cMeSIdywMWd@BcD=L(>45j6f08vlCx{K2K-O1U!XQgIbFm+B|s
zXO(cH%cT+nd(<aRN=y0gePV71prGJ3U+Wh@!jE;@h+1=Fr-eqko4{Y}>@d?%w-|Y%
zzGPRhdqn$`mioH!<|)l4htTc;ZZu5tZkXinFv&muWgbh6=yhk~An>7;g0{WIiVkqi
zFoYF`_)G94sO17TfpO;AxOT3C>*OYKleo#;6mBXvjk}kd&duQN;{=XyGr9Y@S=<9?
zIGf4M<{kv|L(0u`o0H%O4}eIPxHyZkRqCp=n<koVMupT~%sYcwKV+b2oWhbR-51Ll
zx_YG@K_jrmXn<BU6QpKT{esyh>U-&q=mb$Sj<&b7(Du}#1uIwVk|0b_GeH)DnuMFK
zHIo^L_A<iX1dS)?9)h6w(VND4fhSTEvqYZAfa{c`^y$;BTJ0Uv(R!#pNMe$}suJVX
zHlF9^3*10Dwv>hvgU(_aDh>7H7NKlzF-qf>&}0(?oLPbz=_O4>fPY@eJt0J`LVY0-
z1;#&+<SBd*(rPW#Z$h!`78K7d<CX(SR&q}x6ZZ`8;A)!I0&brUKN}<uj}9)T)q&M*
z{^r28&K9TvF*k@s0^s^Vx><5R%?)6$*q;zFHI|?>f>H&5LMCLW;2!*x+X37}0fcyr
z{qt5KY6A-8wsG6J9o$Ylk=rdmJ`GA%TnGv!C`y2mhqzv2JlsC+1@1*D#>2fr`y|Mj
zAQ(&yVIG2%4sjkxx}|_8A%%HTGQqn@hNN3BrVf}Ljod-*O|}3)dYjq>!V3gx2;zn3
z04!IiV-;;et9A-hlSr`+3si+bgi4HqSmC!wRrpJzBQ%!v2}DEm;*SYxMl5ibeumgQ
z{B9RN)96<-wADjTCiq5rCKf(RQLwSlwhdaC#ph^ciUp!&7F!>*E=78h-Zevn#vYMr
zg{NriTMHrXG<uQP)&j8`t2m!p_)B|l6F<k_X5Vl}CHsaTCt=%2n|UJ|HKJ9^eZZYu
z$DOpBA2#nrG}L>i=xOc@ch*MHk0gqQ5Tql>RivoafuazY%%EhH1THC=1}Q<_E^6IS
z33rA21ahh6;0;N+)EZ_VGICeBPq}L}qslyn26ERS)pLM(m-~YI5*^^a;=Tr9_?Fww
zW<u%0Y3@h1iMzr51fja_+6<af6XWcb#ul)RKutl-Gi2edlWMH(7Fr-B-l>5y4Rae9
z4n+-(pm!i-GYIO^s6auYs+nfzL1T&8)poHKM9S^t{hbRorna1*V1nETa;Ng+0b-z1
z>1ef&r>h(iJPsBpO>a^QROn|@95luA5%=e<h7@y&{et_8JIg#SW4a9!?uJZ;FQNnB
z;tw>nHJUp>3yIJGt_2v@OR`vCT!Os8zLY8^WJ;NeW+HqD@*PrW(hr1~Cg{<+R%`2^
zRyspliG>X!nX|wRukIKp#irVAA}`YkQERzxWo|Ne8H@z~`w<jCP|*2108c^p=?S_l
z$Ob1ZQh|~W2~MqYSaMpr9>QVf_J8Uu?3T`AY@G%6=*(qkrKJgSng85Z!YzHJ+4|D=
z=*zp2sRVg#V#Y~PQBgc(nX;_)vMgC&d-_*gl4>X}yR*Qck}1nj<Wdh*dhjk;|Mjx|
zs4Ei;4CU}x@3OT|mM6=XWJ^}mr7gn=iV$Th%t5wji9!a*la#qkOQT};586^z38J&3
zhqjEQ+#3og*b8nYV6d<HPCyNo4Y2_=ybCCxM;{TWXa}HZI+X^4q{4}mELu2``cF`e
z0Uf@x2UM|CheuJUtlC^yE@>GbRl2mS@48J*Qw7`(|LA@CGZxgiR6!<{=+M-}1h{8{
zyOIj0%Ga*)KZk3YvM__<rb!K|%<1=3iB5!1RE5(thnb1L6GFzznrsNMb|EBzphOWN
z@x34<SxmE~qycjNaZ!^^0)*`DfsiDMkT?k;cS9bA=3gk7($wz}CrQ^6dZ!J3)9NJq
z+96Fj9zG8e(M1tMr%KljiXggH(QGtb*CbTM!HQ`|bR3K(ty#2R+NTAoE$PZ5Wq;_?
zln53W*FGZ6I7sNE2$Z0z2Z=I6D-#nh8Rm&#cu9773SAPwMweoTvis2eYwUqk%HYsY
z%4wz1c3D}pooGYJ?uQtnY!<gcHk+VyFkJ|$`jBy!%|Z9e9)d8~L$bNDd60bR%N>+0
zq#?crSPLv;E#@{bA8p1EL1hGG2z6kHiPl4@T_Y|QIAfB1pvQ!$^?0%D3E5I~S@slH
zAS@&(i$Ef7G(iQzkG;4j+&<aUvS%oN$W~MLM6`JN5p)+=J$)Tqlw0f_D#8C`@5nZ>
z1+pi4uttB%8d;Pz>a^2qq0okAz#B~Mv3E*>L$TKw6O^V=SA|9n+V!p026MCCLbDOD
zAc8wnZ*A6F+x4dI(md+Sfa9*8&}r5~oeF%dZ-&C8u~2Z_U~SV^nmbJKy`y2LY?p|J
zJzZ$XB`6QjkmG;`yUxgzL?n~q0SJ9ZyHEBi;9+SGJmgb6WJ@B_0ZN=Qvy`kH2iKH^
zsfk53h6UJ@7V$N}4>bm*-?S|)$B;gC3joy<w+aZo*V3h3s31`TkQN2fq^P5~n7Tw&
z61!WHZqSxOA&C`*PZBI?Oi6^OCZZ5K3YV15i)Ylmqx>z|+ak)}?Lv7GLB)Xb!d_6G
zBsxO>+0>Su0F*z~1LX#a@&XCv!)z6j&Ega!ZD7|f5=v=Kl1{b-RJe3UvWF#A+bK?v
zqFPeCRNF|Xp;q`9k$9AR_2QMJq9r{>^%h+W><H>6q=Z090=f)H);2|?O(PB|f&w@Y
z6=|tHCp*7dcHSP?wL40;>XVP5+>z>&E2844pstLhI4bRm<5N%^$!4Y&Mx=E;Ca}f3
z^%3Oy>C<1q)51*qqh`CB`BsQphlj|%m;E67QFcQh1l15Uh@jyF)!jyES~ej2RrZ@m
z=|7~h0fGh)R11VQ3Nvp@ou~dU6f(-?XteD6TcaQZ4W#Bnja3`o3-xcQ3+SS+Bq;Xf
zRr1Ct^(gy8e!7>5a{J^?a%VbGxt2~;RHj1+8VWNV+;gU)<&kb<X;?W@p^)p2T14&*
zEd4_dmL5h~dXU7@Z-`4@x0PVGJS4WVTN0EZ>9W?wT!u+Vj7=9i>O$I`P0H31I%w+M
z3am))NXd8;d?V>4i8W2YtR3(?b>^rxm;$x%dSEB|gk6N}OE^U$?S-Q5x=lyWcBMcL
zyEyc8T&b%njn*5aRFkzqpVa<|17V|mQCD>$%#CU{Dv<54)khLMyLh+4Q_@^4@Emoq
zsgXcoq-5<Kf0Ev9?b4Z&K_fY{j`+QOQNhE39fIW{B0Ge2u><U)83pVx!hs!ZYipKm
zP5F=95DVP!V-Ic^O}SyX#0{HmH0ajo-Po|>lCCRVg)lJp-V0`^>C_A=?Q{4|*9r-H
z^qOK^!kgW|lg4mdQ5xZCsvPO+){SNQWFv5n^bJ+8z0<#&mng-k;ns5`O4~clhSKGq
z=tjAantt}6M2pQ*Z|}0$>Fn$agfz1|&^Jw<F48x%i@qj;#sGcq?nz(K`?2XYTEY2G
zeug|3=zF6Fed{TG>m>RXcKI1}j*_P#7Bs=9ZeN2^iQ@L3ybZ}7=w4{_Kxs!g==L@!
zz9gzs+DY;iZxI=-2QkGJN?sy+Xszra$uu55E!7^n6f4z%xurCGYARf2W`Gend|Gl6
zEsOv|3Zf&^QsSY8Ju}(dhnm|CAEt|C|6)a?G)%R;X0^P=wr9o`$TdT09YhsvJ6l?5
z)oypN9!iwC?Na>{gh7M`$8Un<!{sAr7KWe+1a<V19g&Y_mdfkwxg#3VXd|ed#tH<@
z$fA~dh|rj%q|t=oV4y;&Dgfe;Dmj1`GxOy4K!|%G4RKE#Io34ZTsKCnlJ8lJCb!C4
zX-0*h$plU74U~2Or9%RRhS>?4LeNwZ6k1<st6365{$MMceql$pK*G6~Y9;w}0O>xV
z4?)xEaJ|(L%4f>&x0jPLP&rM|3|H7}$p}(WsRlypw!(g>9);+Q9(Fd-iZss-Yhxo+
z0y$KqSs>)#i1T^!`SJzQM8Sl3@U{h&7E#L=%O9o5Bl%-e@`#}O37Q20HnW%fQF4mJ
zTmQrSk$k26X*60s-!Xqg5cp~jP^*CqE$kHii=H_o562vm)SxH1<r@LFn<#D{qPU&+
zFViOSosiz^N}CWgw<}i0d?MdVcNY=#-e_^~-fM2<)8(&7NS#j5d<YlbMhHiy<hBEp
z2Pl*-6v~Bz8qBS?l+VfEmcJu)xQL)9dZ*I+@*}j=U4G0?rAG-`0#sV;Kqc^<k~2j?
z7n6MdrhMI@idTMCeh!HAc26QbPS9hNNQ;IRm_P&}Nog~0rSf#gL|?twz;W(q1<d_Z
z5XcHT^(RM9h8+MVTJ2wVJEwjj|5C!iGJ;n0CX(NDhwUVhTn_4*DhH5AuYqke`zuyg
z>*>BVeQ_JO_%w$!hHi_k>#)|1rF#w>p@ZF(LGs@KI!~&Uo*qgQm5rcMdPorSqx>d?
zONbz76=c{Pm{Q!<=h!$%!6{_W7<yYn(7IkGp-^^DLX!2hwn=D4+q2@Z;j7IG`5I4}
zXBI=TdA(+u6*`5h0Abw?1U=i^P#)bw(JFO<Hrj@29Gur`YBaSCxh*pb`WtL}vBn>a
zc}M+y09|J0Dd_I6(Ug?W0VZroTgYXKmGwO}EF?;$tpY#x=tcHD^pZ%0p@w$z{BT<*
z9rdkL3dN#pMXDl=&TBhCyLy{fCbLwL)ty5pXa_+%MMh{G3j1WGGJvUrpaQdJ8NfV6
zfkaAz_5dw=>)OzbGO8sA+AE<9lmu`RY>R4#8vZ7_XCgj6-jVY2P^fLb$wGtZ#3^bO
z0|~nEytZC;16`I+=R$BAH(D`5J{+A;j8@bE9!!ccihA~bg&8lF&u61$vlOXZv)l@m
zkwfG=vA1G^><5Jow)m}3Oq6+`1a5<3Dsv1R@7<tMegrx#;tHTrCxhF`tbqLB4v5bG
zh&C%Y`9?O1InMr~Sj26E3d@PiLB->^ME(WmhWdhZUsbG7tW-RWZgO(0;J(G%(L=J?
zvZaaw=89qy@|C&c;mpGjS-QbqXMRxZgd)R8_6*JI)zKK&bSOfYDEv;)i?ECf!w7nb
zptmR~4-)htL9Yt05_FCR#fY$948?61{(@CjSWbP|xk3v;Z;OuX1|d$UAm|OqAyCh`
zoS>sZAcPPgwn-Hw2wRO{fRz71VHb`6YQ!`p00DW2;R5)=AYTtbv7lZ!PtY;Q@(Jsp
zm;k=~N`PJ0%Y>_<N4<zf+YS@-0YN8)vBD*x5poy86GAbB2O&ZPd>}xVuM6>z%z#>Z
zUJT`VLTw9#*x!W>MbAR*O!B{6Rj4#~uPQzEKr0R?4l3THNtl-jI!n+iLn}>|7Mdck
zx%-NDz};8WD|P~D7AeL68ex19a+unO6oB6L*sg%R)m?jR6{DHY006+#eml#)B!tvL
zpw2$Vc_HdK(8mueHYp|o8%|f$vDXzGCs$064+s4WlYd>L2M`vPwYLPI<{IIWNUsV1
zB@XTYIWYc>ZpfJx6mpS)4%l^}5He0QecQm_w21z!s9kJ3*c3Mue=BZMd>$a^5J7L+
zrl`b1)H5KbP-R+6H;Teh5){e*3&7Lu^#5tM^euEB38PbeZMF~H3+d!L!4JBHbW}QQ
zo1sCdgb@3jLSTQhe50ZO_#OE54j9D>>`=jE;{{;$_Z@g)uvpb9uHH~}piB~?HY!p<
zOH9Qj>>17tG|f%Wxm2Ex!iJaQRD?DNWB(=c=mO)w{f&2k6D>kZZk@PbfSrhra7xCt
zeg4%#)U)UWdI+Z}R)TKau6P<W*=S*yP%KOoC3~{)1c)~k`rrR0u(#ID{Fjf721-j#
zQ5T!_LTluU0&bf!D4f#{QywI4ytdDHvJkZjGP-dipnpe20Y`u+rwcNI&f8lGG)j1k
z4Pf1&wEaV21=M3h={6L!ueG<B1AXEB!g6U3Gq`|a{-mo+Udpp5A6Cv^tDJ9hC!r45
zRxb|eE}Gs&QLt(665U6kTnOvQHRWREqbNnWMEMw8KLH68SQqQT*a8*2jv!#0D+GN)
z&}Cs=XwJ7E-XlP<rDFtAEEJdENP^%#t=6AD61Fzli_xWn5|k^HE7vJk+UpSL7H(UG
zJJjk+P_fRp!L<e*5FuL!kZtIK=eh_F)Yt<&N4;KigokF8Ai)690@&{<p(U*=tEAjQ
zvG;)hI>k+FC;C28D*#$dUL}K%oi5!^gG=fk*^s(JxpS>@r-W2UIZ5EtVDdjyUZJhr
z4CP+sKIIFv@=Ey<t-Mmc!p&Chr^WVA&-4R9KN9o}K~T>0H54;xL2chd(6>@KQ!4C*
zN=Z$kb4g30*GT{kc>Giq(HxJ%0SmS)4&@WrYDx>3>@0H#GF)i0d_EW~*W_<wZ@StN
zSoMLni-eZp-8~N#t$Em;Dh3Ob$B=S0J@r8BM^USUMVDGX5S+fstN=%I5n2SQeg*sv
zg1<qq2#r>Z21_Lf@^V}8e$*E$;Cc~o*l=ofFe~tItU$i>87S-6Abx)k+9sd`<_fe~
zgs!sDY$Qrh)N{>X9o>MD;3=@2_A>{uLNOXzZiTi%Oc3<52yC6{Xe-!QqbVdX)(Qpm
zORrI1bQLu6akw)EYAj|0j90<JS^@UZXt132!_x_19n=XLFbNFsPXqr9Py?%>hCWy@
zFHwd465ObR2Ft<n5E|iw0r+pGWJhS=@kSw@J}6c_fVD&0_`w4y@Gq3MI|d*2gT(>H
z(5q0Q2Y)=_DI<MiuCN^1f;xW*8XMsU!@out0B&K*80qvY3Rxp<ewaQApXeZ9|I7s=
z3GTvj?g?fOzySAL;15_n0QgtXccZPeOHr%J5{cH((_{r7Za6hr!Eo&|S=ng$e8_{&
zl3TfEMJgc48xTL_c9WGkrkMKACM$E?ZnRR96<-6Rwaa9M6p5R>%VY)ixCvyG%Vtxf
z70OYT0*MO#M@B2PR40fNe~TKg2OW*p{gltaas_Norbg>_Kurt9A6Txv8?6FZtVjQ?
z(W-YaTVatsMg>aYXtYv#f%fcSv|=z@8>tmmC7G>YCuLL0?E!1;pUqaA7^<F;D5_ee
zTCG~6TB};8TCdu`yrg<oaX__M^_*&pYOCsb)i%|3)ehB8)h^X;)gIMe)jrh=suxu+
zsa{sSqIy-eU-g>mb=4cH1FD0nH&usJZ>io^y`y?p^`7dm>V4G_)lt<k)p6Ac)d#AR
zs#B^DRi{;FRA*J^ROeM6sV=BKR$WwGQe9SEQGKGis`^xQO?6%Mnd)=Z7pgB+U#Y%U
zeWUtT^_}W_)eov4RX0>WseV@dqWV?!o9cJfAF4l9f2saf-BdGbq{eDi%@On~LBA0M
z9>^aA{YelI>Tkh|P~+ugf*FDl!EnG9OE5>Uj9@rfOF^)bKt&@~6U-B=A=rsvXM$Y_
z))K5E*p*;6g53%BAlQ>&FM_=Z_957pU_XNW2@W7Qkl-MK^#lhK971p?!C?f46C6Qs
zB*9SxM-v=Fa36wW363K;p5O$66A4ZtIGNxSf>Q}jBRHMl41zNW&LX%k!Tkuni{SnQ
zXA_)5a4x}l1m_c6K<Lq5MFbZUY#_LV;8KFi2rehMg5XMms|c<pxQ1XO!2<}cC3qmg
zg9si>@DPHB5<JYRrKe`m5Hk(z*E4!JL5rp&I^Zhmf0qz96J4iG5|3)q=UXT1qyE*d
zeRw8FT+?WY6+9yypW+xDg%%z)o$cfFQdO2d%2uQf_x&87?72@odPLWuM{#Km*Kllw
zx5HD8p=ifP;1Cvnhh|Wg+~a(OXnM|7C6J&6BK(vDwQ%j=;ZRiQ9G(}ALb&JRa1Z=B
zxDz1mZW4<!#XU~?sIKi!(Q!#|j*_ifgH|_sh<lTuz>aPsrTC>=ai9;+9_X<LU;)NR
zra&yvsfQ!f^l;dl6<9`MnEzrcF`bhaK%l3Fk6t2|E!Pg;IFjO)kb3lRT9er>R$0UT
zLI)JsLp<<&h%`5`?<l&NE*9n~?ud%jcTLp4$3%OcMgV=did{!Jm_~qupgZ88_blG6
z>1{`zNU>^<{eu+d0cv|si`r`wXuA0Srj`F+Oe<3sm6*V$O~lwJ-1Kl@x~`M4;J%l`
zeTSoMfNk6z#Jd#qtd!L2MbPOH3f-E(v1yNzQzm*a<?Xm6tJVXQH$CQ14@V$cpyNq!
z<@j7zkqHw$tV@YGsIW|{w(%eMP&(7ho{*)9XM0LtN&(x;4gR;O*kJ(OE&ni~JaN(c
z|7~F;WlB$|5AJO3TET3!+c0mRJMhjO52mBYO1gteyPfj4sxy0e%73WVVWLM#s#MbC
zFo9%;b^YJ%j)I5${$XwV4=Z1?Ra^BBEKvj{3)C92r}RI8rOh#+|DV(OQaQ@MN$2-c
zJj_H7m+(W^@R9WJFNm3l>msNcTE}mxhx9J&T8^@nUjs56RZv%%JP`ARf0!n<D(F=H
zeKkk#s~Sbs|E*22)uvE+^l{Mpj^+YY&t6bwMN2Wq0qXPNsssMf5+G_g6^K_<dTi%=
z(axlpjI`qPO#C@o4_TlEdfIO``v!V&a{$M-`4#Ruu4Fbr93h3CL{_tEAN&W_`9E%V
z6s1I<gO<Ae;GgKBa3+a(KIcdpKd))CHo|e!kezizGzctgXNJB)9cXfgj5J7Z6s+a6
zs)#ydx31~bF{AZd_M%r>h1I>bOP_A7?}C9H{RVL-G2H8E;oGzK@P#AjQc}Q?=h7Xl
zhK!NLmL_v#yS{o7oL1A*V87)|GrRV;b=cEma@;~KE?~D$yr(hK%M^QY7VKvR!JHh0
zv&VUc@SUTibg!Z_|3MJ`52+ca>@T@iJ^Y_I@OK@teM{ckky%nlN^6?kS9NsM>|3#H
zMl7t(es?rnXu;s^dmhEZpDB>@daRHCpKfgcXe42a>fR*>_Z*!9yFM2e`YvNUE-A5R
zGsiV#w4*&h@$c4C?NjF#Msbwf0xLbG0dB@QD6s!{*lM&bE~p*{alvQoAI3X=fS4x)
z?w2tmnNHaaI2(N^GZTtGhS3rRrv3IJ24;w23{$J9XN2xj2F5I##kAPV8DMR!mr5F7
zeSCn%h?%>k!Uo1dOB<LOw77w3w3jz99a4b<bC12mff-MW9GHRjG6!Z5oZUW^X|_j>
zA$UIq*4Jq?f-Ig1KgF^10bC|)cliS|f@zgXAZR?f_aX?UTIS9ep%7vKBNjuzN%Ld5
z8)C4Ao*#c7lt$bShfbToOPXabk$_U?dtv|F6!FA&h_P=G%y6nZl*<5ep=tt-gBN-)
zoDfDq6j~?}v;LbM>n8-r{-@JJ<-2Mqe1&DUItt+;oD?s`rG*7FQw!x30%YAF9T5Zv
z%ZoJ?!nqz*6+%~G#b<)8v_kk!EUpkBA%Vrc+kUjXqMD%9a8NxQXb-8MHTFV_#|20}
ztrY7m=t216VfKz?7s62S^m~We3!zgy3?K3lkPA8qIg5WP!4TB62qPA99!Wy8z|)OP
z(}YuE(qfXs3HqC8UBWgYTv#HWvcJ2#P~!+e&j`sjj^-ibL7A9$;+=UHUd!uvSKf_x
z=RJ5&-i!C<eRyBqkN4*T_&`30*Ym-A2p`Ia@!@;~AIV4Y(R>WwhmYms_;@~nPvn#M
zWIlyY<<t0dK7-HXv-rMzKmIPhKcCI#@VR^*pU)TYg?tfT%p3R;zLYQH%lQhvlCR>c
z`5NBH58!M0f&3tTFh7JJ$`9j*^CS3?{3w1jU&r6goA@z&J>S5a`LTQ>KaRKX_weKS
zCcc?(;jMftKY?%K+xZT@lb^^>;wSS{_^JFf{$74MKZC!I2Ym4}`TO}<`~&=K{y}~Y
z{}4ZypT|GU&*vBL3;9R*Mf_s^QGN;k82>o`1izGjl7EU{#xLhr@GJSJ`Dgf5{Azv;
zzm{Leuje-qJeuG-g6}5SMDQ4b>j`ck*i7(Pf*T1QN3ez9dk7v+a1+7J1h)`uCAgK~
z2?Vzh+)i)@!JPz8BzO|RlL?+e@Kl1Q5qvMf(+QqI@O=ae1QUX1!uyp7o<;Bj1kWb;
zL4xNH{1Cx&37$vr!vxPKcmcr+34Vm&MFcM<_)&tF5d0Xyj}!a^!Al8#lHjKZUPkb8
zf>#i{lHjKaeum&x1g|D|4Z&*(UPthHf?;+W34WH~O$2Wy_&I{N5WJP(=Lz0M@OFZC
z5WJJ%T?FqYcn`sQ3EoHW3k1JN@Jj^0Oz<lNze@0af?p%}b%Ng@_yEBN34W8{Lj=D?
z@Y@8xL-4x<zen(4g5M|j2*F1QK1T3yf=>|q0l_B;K1J|{1fM4O48dm!K1c9*f<Geo
z0>K{>e39Tw1Yaij3c;Tce3jr&3BE?~b%H-5_;Z54Aoxpyzasc+g1;g7TY|qM_<MqX
zAoxduZxH+w!9NrH3&FqY&~rMZ)1hfPG*7!zhi2(es}8&AuwIA4bvRsmSbI$Sh<1+F
zOB<lW!P<k`nL6~a4z1C?ug%n<hjh5V{fNK6bZEQ|h3T-DcDD|V(xJuLmD(FR?4v_b
zI<!fL;&f=D4ms;kx(+?BL-Vzd>Cj{ynyX!_L+iACwcE7!>(F%V0Ua8xLw9R;XqW4-
zMu#ToaF7lq>d*`wcGsavI+UP8Z91Hz!`V6<qC+#aSvs^``;!h49fCPb(V=)9QfQCr
z5T`?-+C@5~)u9+2cGh8k9h##<TeMrWZaTD3heLHJPlq~mC{l+5bZCPP1!$kqzN<qE
zv@-2x9U7@aeROap$Ppddrd^{Qsl(nnT%dhU`?&U59TIfdSNon0nRKXGhmv&IMY~Xk
zU^>}4be|5b*P$^wG+T!<v;bL?7ACz_hwjy3KOGL!p$Bv*O@|g~XKQ!qu!j!8>>t#j
zR2_2Cp+Fsq)~?WDR~`1$A^UE7O(E1V*%X-u(zspgw5Ck@051yARA?$!YbwQ;43y?e
zuVJAF-7!jdOHT+B$t1yxUvij2SiuG|W8rmI_sDn4UzQ(`AD4e3zX>m=@==5<Qs6aI
z6^e0?ihoG4OtD+BUvXG*L~&ekQgK>wPVtfAqT;gRs^Yrh3&q!pZ{ej>Hx$3Xi>dxn
z%9XB4cX%yTkTP1?N13I}SC%UWD@Q4<%E?LsFQHnfTnR6ndQthN@-5}t%Hzs2%1@PF
zDsL!%RyC?Ds`093l~pxC)voGPO;Sx!O;b%*-KQd|`&AF99#lP~nx~qtTBus2dQ|n8
z>Iv18s%5Gbs;41;xdw8V8&sPhW4R47m3tsV`7&fC-++wd+mMMo0vX7Yka;`@8OKYI
zX}ks*#;;U=!7HuY;iXl9@WQGPcv)2uyj;qpZc<NG&r&Z^FI7LKUanrHUZdWq-lTp`
zy;Z$meMo&meNuf|eNKHr{Ws6R0^$!#gdUcM7*O{`pw>r$YHk9x+zJZ!VNk5gL1}J)
z7f<bl7fBt4mqmTa{|+y3a)OsP>EOjpVend}D0n4PEWC)RFT8dsPg4M|TWZnVt9eK>
zPcvV$K=X)Zk>*j&W11&4OEs@+-qW1ae5g62Ij8wZ^RecV=8ER3<~z+zCykS{lh(=A
z$<HakDa0wvDZ;7R$>>z;G|*|V(-5a&P9vN~In8hqoMt-Ba+>Wl$7!z9I;X8pyPXa?
z9d<h9bk6A$r>~rTbXGh2IR`igIR`t3Iu|+@JC`_@IafGWIoCLka;|e8<7{@eI!|$)
z>-@0u0_R7Z7d!8De#iN^^BL#M&R;s;aKSFlE?O5?7k3v=7atd27k`&P7rje=mlBt9
zmns*d%RrYQF2h_#x|m$*U7B1bxZLZq#N~aLvo7Dd{H1l(25VEb#ag3wgw~>+2D;{P
z?K15O?bF&-AaU!o8??`AH-o@FuidWQsokgjNc*++hW0P*O`TGw);Z~Xb)mW_U4rf|
zUA8V)m#-_=4b<JO8>4H`HS5}Rb99SzPw6)3cIjTxy{$X0JFmN<`$qS>EAQ&$>f)+%
zb#qO1O?S<7?dy7%Yqo2ytI@UAb+GF&*O9LGxHh>?b)Dxr-*utuBG*S<x4G_c-Q~K+
zb)V~tt}na3?fRMPZ?1p1{^fep4Y`H5g}FtzMY+Ye#ks}1CAuZM8Qf~!2DuG&8{szE
zt=`S-Hp6YF+skgRy1nN1hTB26LvC-oz3X<^?YP@Hx3ArPcKg+xclUP>bl1CwxQDqH
zxf|R|-OJr8-K*V=?hWo^-KV(Eb${4>f%_xwi`{p+?{?qo{(}2U?k~H)>i(MhDfiRv
z=iD#2UvmG{{kn(VBg7-jBf=xfBgP}vBi<v?W2i@?M~BBmkI5cWJ(hW_@Oau|mB$*7
zbsif$c6sdac){akk0Tz(JkEQ3<?)TjcOE}@-0;+R26zT}2788jhI<x!mUxzVR(Mu<
z8a)Si4)h%CIl^<4=OoYPJhyso^W5RN%X5$CKF=3D-|;-*dD8Qm=P#bWdH&(~m*-6{
zy;q1=m{){Xlvj*btXH;Ixz|Xq(O!3Zjqz&mYVn%pHQnnzFXFY@YpvIMuZ>=tyq@#g
z>b2Wzuh+|7?|U8fI_~v>*D0@`y?*uj-Rn=UzrAjHBX8E*+uPSWz+3Mf>K)}B<6Yo=
zulEdZ!F#6nEbrOgbG+wzKkU8R`;hnB-tT%J_CDhMqxVnVzj*)V{fGCT-hcZrKG;X$
zqw)#y8R0X^r_RUZQ}1K;Y4ox9jE95LSNLr8+2*suXP3_&pVK~Pea`z_@VV%7$>)mC
zRiDp&zVr?Ajqr`~jq#23jrUFTP4-RoZT6kvEBMazo#i{*cd_pp-*vtle4q8*?0eYv
zi0?7q6TT;XKlDB0`-Sh<evF^a&&|)n&&$upugPzL-%`JIelPeP@jLJLlfTYC)<4tV
z;6K*C&A-EcqW?7i>Hhcm3;r|x=lL)3f875G|0n&I`LFPQ+JB?}cK>t!SN*^7|204!
zpbX#xoCCB0ZULSF-T}S={sDmjp#k9mi2<bng93&G3=0?$Fe;!fU{1i?fcXKB1Uwq>
zSilnjPX;UtSQoH0U~j;C0ha=<1Y8Zc7VueMKwxxWa$r&5fWXm#O@S?e69PK|Ck0Lk
zoEA7Ea8clrz{dlh3|tntB5+sWD}jdsPX=BHycl>b@Uy@#0>29K2nq{I3d#y945|$p
z9b^fb7&IwpO3<{RSwXXd<^(MYdMapH(2AfJgAN6~7xaG6(V*i&9|WBWIv4b1(APmf
z2mKoKhhC}o&<E&)^nLWH`Ye5(ez1OwzE$6*@6b=wPu5S>6aAz5XY{M}>-1aoFX-Rb
zUkv7geS?F7gM&kZ!-FG(ql06E<AW1}`vx0=OM@$dO~LiS=HSL)OYptH4+Jj=ej<2z
z@TTAof=>p27<?x9a_}d?Uj=_1{B4LP#5qJ8;u_)};u#VcQV>!UVhAY>DG#X(sSYuQ
zObwY9GCkzJkU1f9LmmxT67qP+&XC<9dqZ9bc`4+Tkb@y-L(Yd>2)P(?Ipph5&(N6A
z*wFaU#L(o>)X=ohjL@vmve1gqL7_uJhlRF;wuZKac7#q0T^PDNbY<wK(EXvWhaL!h
zGxV*{<DnmiUJCs*^qbJ%!niPxFt0G5Fu$;Xu-LGyuzq3v!*asz4jU8J5H>b!T-ZHf
zO=0a}onh0$9u8X&_DI;`uq9zHgzXP|J?uc(n_+K-y%Y9c*!y8;!_J3Y4*MqTyRaX^
zZiIV;dxiUi`-KOD2ZaZRM~C+bPYTZuFAOgZF9|OTw}wv$Zx8PbpA<eNd|LRN@Kxbk
z!?%U+2;UWcD*SZ#+3@q>7s4-wUk<+>{(1O!5h#L<kVPmWR1q-|u@UhRi4n;WDG_NA
z84-6yWJe5*m>;n)Vo}7S5syVY5%FZivWPVi&qZvFI1q6%;=_nD5$7U4iuf)P4l$0D
zMJggykuj06k@1m<k;#!Mk!g_`k#|LAM-GX6Byw@&lE}v+mqtDnxjb@Z<TH`)M4pPg
z7WrA^7m;5@eiP*t<rC!><sTIo6%-X56&e*Dl^InURUTCtRUI`T>cOZbQLCc%M!gwz
zH0nas7g0B&<<Y*;VbO`vDbeZCS<!bzXGa%A7e|*wmq%Ac8>5?|7e+r3{Y>=g=nc^a
zqYp*D6MZ=PX!P;ulhGHVFGgR9{xrrnCORfRW_Zk~n7d=@W5&jeiy0r&9McjrA*L;+
zGiFAN5OaUb12GF?9*KE6W>w7Em<=(TVz$IQAG0Iobj;b9k76#yT#5N4=F^zZV!nv^
zHs<?2sy^|368og|N$-={r(d7kKKXqLW3ytbVryat#14ub659~l96LF7R_wE}n`5`e
zZjap+yE}Go?2EB4$G#qWAoioUK5->+!{eIbNZi7>rEyQjEsI+b_e|WHxb<-x<2J`_
zje9<BTinjLJ#jC^9gaH^cP#E~-1&G-yhnUMygoi8K0H1$K03Y+>`+OH&yLTHFNiOW
zuZkZNKR&)WesVmCzd!!r_=WL{;~$G(8vkbe+wt$lzaM`z{&@Tc@gK&YjXxj%X@YBl
zM}k*^Z-Re9V1hm&G$A4(Dj_Lhbb=|NK4EOaxP*HWni8xDZ3!I-_a{7@@MOZ4gqIWE
zOgNEnDN&ZFNK_{}C2A9OiEfFWiQb6;i9v}Oi6aw7Cz=u)62~T562~VtCw3-2mAE|d
z>BQBE>k`)|ZcN;qxFvB%;;zK^6Msm&k@!pE?}>jV-b_MCY|`wc%}HC5wk7RM+LN?5
z>4l`1lU_|ako0EK$H{E6ELoY%Cp#r;lU<YDlTRmqm;74_lj5BcoD!N6lM<Jb2(`Ku
zDZ^6gQ^uxPQpTsWq)bTZNSU5;UkXW?oAPkVlPSwmR;H{<S(CCpWn;=aDet8mNjaW!
zGUZgtnUr%W7gH{${FWM+s!t6~jYy43?UNdpnvnW@>ao-lsi#uUq@GXxDD`6M<<x7b
zpQWL+h_tA*K56l3iD@ZmX=xehA?XF_Md>B!<>^)F)#(G$2c{28ACcaX{$%>H^p)wW
z($}P~Pv4lnDWfi<F{3r3Gvoe@<rz<Btj<`Qu_0qq#+Hmd8T&F`%y={7T*ifriy2ok
zKF#<n<NJ&sGycwGGTBUdrYcjD8JC%mnUt9ddwer9`(^ge%+D;$9F_Ta=F-fkGM8tr
z%zP$uP3F4HjhR1Xd1iTM`DF!W1!sk1g=a-(#b(848M2zPTCyf&b!1J<nvyjwYkEJf
zUwFUBelh*x`X%;D>X+Ity<fk6{re5-H?`lr{qE~Gv)`<K5B7Vg-@Lo7_Lucn^jG(H
z>aXpu>+jy*v%g>efc|OyhxZ@Zzpnq7{tf*b`&;^t@BeeQD%&;NFFPVTJG(S{Y<6q*
zl<XPVi?UZ_Z_VD8y(4>f_TKEbv)|1=oP9L=MD~x_KV|=#{YUm+**9}gj&qJS$1f)~
zCq5@JCpjlACqJh)XHd?NoZ&g6a%SWRIrrzx&Y6=lH|OD;l{u?&w&v{5c|GS~&Y_%l
za=ys<D(Bmr8#zDc{F?K7&Y!uixqWi)%FWKr%`M0+&TY)K<c`m6$(@kfmfM*-Dfiyo
z8M#Yy-_Jdodp!4p+z)fl=AO^}IQM$)cey|0sq_5u0`l~EA$j3>Re3de1M+I~2IURT
z8=5yfZ&cnrc};mOc@y%4yhVAB<~^3TG;dknw!GK#4&)umdpqyFyyJOS@~-Ax%lka<
zt9++?mwa8md%jn`cfMbKKz>MmSbqQfw)~F#iTRWBr{&Mc7xM4Ve>nfK{3r6C%YP+*
zfBx(F2l5Z)pUS_M|5^SQ`CsRMSD-6!EATAvF7PezF9<BiEGR1&Q822YuE12#P|#d3
zqd+K_Sum^M!Gfm>HWzFuc)nmq!R~?&3(gdrFSt-}vEXvSCj~zg@`c`ozJ&pW`og@z
zg2Lj$lESjWio&YGL4~6VTMAnX+X_1iCl$^qoLl&C;ex_Ng=-6U7w#>5q41@`R|=05
z9xMEy@KoWM!cPjnEBvAGr@~*0e2V;v0*iu+LW{zSB8w7>l8Z8nN{h;iDvN50YKuCG
zCKgR8npQNu=)R(vMN5j-6>TVbwrF$FmZCjHFBH!#exUfl;<?2S7cVG&r1;U|$BUO1
zFDqVI{7mth;`PPP7H=-zTD+}zXYuaheZ?;ozf$~K@f*bli{C1Kr}%L3(c%-uCyPHU
zK3n`z@yErNi?0@6EB?IrtKx5qzc0Q~{B!ZI#lIK-S$xxg44gq>P#c^KE(TYFhr!F>
zWAHNs8iEa>hHyiqA;u7ENH8QBQVkh~EW=%f97DdL&`@kBF_arB4b_GLhCzm*hT(=$
zhC0I-LxW+g!D47Kv=~|q?S@XnB*PTLG{aiMdc#J;vxd!v=L}m7+YCDl2Mli--Zs2v
zIAS<$xMa9u_}cKD;YY*IhTjZ-mV}o?mPD7tmc*ANmL!*?m1LCkD=91~E~zUqmDHDv
zEwPj|l~_yKN;*m=l}stQx8%N(jU}5(o-5f>@_fm*k{u<xO7@goEV*2Awd8uq=Otg3
zd|mQw$@itW)UDK`)VtKLG_W+XG`cjV^sZ8KX=ACS^qx|9iCn3*bV6x+>GIN*rO%YE
zDqT~$wsd{z#?notdrL2sUMc;w^m^&%rC*kQUHV<=52b&U{#Ay{WM#^-q_UK<w6e^y
zzGZinWtZiZ6_k~g)s_t^8(U^68(-E^)>_t9)=@U8Y)aYcvbAOF%QlofTehj}xw5Tg
z+se+CoiDpkcB$-2+10XZWuKRQS@uKOA7y`)Ys+2B-OD}8eaijI1IvTU!^$JdtILh$
zwdDiL2bT{iA67o1d{p`D@;T*m%jcEPFJDmpNcrOOCFN_%50@V)KUV%h`Kj{L<!8%3
zD*w3rYWdgY-<JPSexrh^P*w01&J|u2J{4gV5f#xDu@&(Zi4|ED{VK96aw~>bm@4k6
z=&X3EVr|9xij5VUE4Ef_uh><wr(%D_!HPo_7c0K1_^Fbq<SSDv(<?J8`&DLF=2aF}
z7FSkR4y+tp*-|;Fa!TdBl`|@rRBox<Q@OwLa22XztK?OxDovG3m1~tpm3NhIRX~-#
zs$bR6DpOT`RZ~?<)wHVVRYKLws##SJRy|a;q-sUg`l`)UyQ=n93)M5LXI0Oxo>M)y
z`r+yY)sIv!u3l38c=giiWz{RIS5>d6URS-L`q}Eu)my8#Rqv?YRlTQrU-e7XuT<}^
ze!coY^_$giRliexxcX@IiRzQpA6B2KK3Dxw^~cqhsz0gzwEBAW=ha_Ue^dQk^$*oQ
zRsT}`TlF8+f7dWIxQ44y)TnCs8mAhU8eNTBjYo}Fjc<*AO;AlpO;}AtO;k-xO<YZ4
zO>#|YO-4;t&0RIwHMunfHN`chHRUyxH8nK@Y6jK}sTp1~vSxJ6-8Gh)CS!)NukkKp
zjxo<zU@S707|V>6#u{U-agcGSafETS@or<i(QF)NyvNvVY&EtSJB^c!Q;hc-XBdfb
zmhnO3L&kZ=1;$0jM~#mgml~HDR~lCt*BaLwpEYhaZZSS@+-}@u++%#f__A@o@eSia
z<00ca#>2)V#$(10jHirejOUCW87~?y8?PF#8$UOGW&FnYz43<e7vpcnKa77FZw|l%
zxB>D3ssWn+r=~Ois<Mota2PqFh$x8?IOBk(IM1eOj;Y`I?!~JhaJk&~eD68u<~&bn
zvLelCY0jhz#Stfx#34<^IT2??ilj)EBuSDiNsP5z?H~63EB5mkbqqhFz7b#q8jXz)
zj3!2NqoomQv^Bzv4n{{K+~{regBsuizEBSuKtpH@!O#SnLn~+lVelb@Ls#ely`dj`
z1RujEFdRm~7=TKZh65rY8k`Uh2m~IO4AWpH%z^o^2$nzsB*Jo732R^-Y=F&>1lwT;
z?1H_J3Wp#K(jfy*!f7}QnQ#fN!ga`o+i(vaLN4S%J`_M96hSeRKq-_#IaHWlrngzm
ztZCLZ>ze*%fEj28nIUE~v!&VEY-e^bJDFX~9GkDLlWmwy*{0eS+BVrzY?-zK+bg?|
zJ<Q(2KE`g@kK1qCOYE;B>PPg97#ATC2O^F;q8w8kUpaO-vK(cOH{-*`cN;%&g8zh)
z$XbyDB6minMLvnD8r3Q)GwMcEZdB>S+R=-nlcKYti=xY7{9;05`os*4b;QnzT@t%0
zc4zEWXRtHeIl>v^WaljBQfIRBu=84+S6oP3@3^t9O82SjYu83sitCi?yz6!RviNV~
zGvY7A=fxMh-*Y!|4|jvx?v8NBxZ~U|x40*%J!+pipbo3=RJzJgC)6o*Mx9le>Y}==
zuBj}Qt!}G(>VbNsepbJ#d{v+d)l>CM{iXg^rRt@6rT$fK&<nk>Dptpu=!3rKhyECV
zff$6r*c6*%OAN)f*d9A#ICjPE*bDn$e;kN|aVQSQQ8*gMB2;4QBhZ17I1yto4&7)W
zqX#GBG@OC6a4s&uMYtHhzywUhWw-)Y;Tl|r8*meD!6e*{$+#1D<33EqLzsp~@q0Xu
zr|=A(!%V!0m+>lI#~XMP@8EsR!CcJ4$M_rmfra=K|HNW^jxX>ZEW>iFu)Hj9tD05Q
z^09m^Kg-_=umY_hE7)pcHM3e+p;j9!-0G@5da|CTXX-h6zFwr4=medpm+O^!jb5iW
z=*>DwZ`V8YF1=T$>O(qBr|S%TQlHjmb*8?guj=bMTi@3A^h2Gi^K`y0(1p547wZyT
zs>^h_t{^Y+rfO7^YExbErvM71APS*o)RJ0LJL*84s0($cUeuQc&>$K@!)PRpCWCA=
zjwaAViX|5*(j+vArqT?WP4j3WEvBXPB`u>Bw3^n^dfG%=X&WU|3hkl&bdZkFQ94E^
z=m+|d&eKJ@LO;<Bx<z;C0X?E$=rR3HPv|K<qv!O3UeYUi&F}ELT$O9E5BqXGZomz>
zF$Z%~Zo#44mfLej?#$h|C->q0Jdg+TP#(dfcnkyE*};(<&9NNE@vPWlVh>N^DLkEL
z@f@DV3wbdw;}yJ`*YY>Kk+*OXZ{uW6;XS;c5AqQ{%E$NwpW-uojx+fZU*T(fowNBC
z-{l9K!?~Qt`CPz-T*Sp(!lhis<y;|NQppF98d6K@h@aG#_oa~pNr*I)77{9LrM+~N
z&eBbKNH6It17wg4kzq1YMvEb)*u^0eBuZi=PTYb*BJ!C`k?As1X3JbzAfL+;NsvTY
zE-PiVtd;e$Nw&&1NtP7ZE&C)@4oRA%ONN}3({fhM%LTbC*Cb1B${o2cIg%@Rk}m~P
nEYGDx%B4cyc&dA9d3-z#JdG-kmzAkf<?Z@>`gZ?sPn-V$hDr@l

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/pt_PT.lproj/InfoPlist.strings b/hw/xquartz/bundle/pt_PT.lproj/InfoPlist.strings
new file mode 100644
index 0000000000000000000000000000000000000000..33c637448e0e489cb79e7d95fa78e79811090653
GIT binary patch
literal 274
zcmZvXy9&ZU5Jhk8S1c)mXiQ@v78+0lv9Yn0ybNj*k|^l!`XB1qEfhqC-Fe-aJ^OrV
zC|^cvRf@IONrmo8l~B9l8?{s_m3V{CxL0Hu@j$iHx9X@KQQw@(XJ-$Kw9s4^)Csy&
z8}^^^MpKTbokp0a$sg?!UH5ruOWeRwD*u`OQa&Iu3ZV+rCyK~xi0oXhgJTTo1sc<x
P(X;fH#{MT}&XK$U%u6jl

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/pt_PT.lproj/Localizable.strings b/hw/xquartz/bundle/pt_PT.lproj/Localizable.strings
new file mode 100644
index 0000000000000000000000000000000000000000..71c33ad1490c13cf9a8589f0c8fd02587c9af727
GIT binary patch
literal 1140
zcmcIkF;2rk5S%)%uv|tch#DajK>-CwC=?Vl#x{=8#Wr?K2){)Xynq&%S^H#@f-X9p
zZ*OmRc5ZHy?;jjuiU8-x5y7EE#@z->q$p@Tqvgq(Bj;XcQ)WyMVvd?I0k+I(xi<X%
z^=yb(Ff-sR`Sn-<?r_9$ihG`GUgB|tv>SK8Ga+rccA45&9FDAF+G1BSq8Xt?J)4@m
z3J%YIL(6f9v3OOqa;!K~B(#K<@?6zaH5p+Jxl*dJ`+H_FHItpuJLVzpi$xa9ks3|!
zNid_10ZuqW+%jfGE8>i4*T&<`_KD?77b#xZ&BRjd<Pl;{Z@|5j-qm;UPn6UZvJe`x
zRJ&8y>-&i>BIs6Lf6ql;F?lkc;-2D_GbZAiJ|R`MMs_<XJ?Jc-ZXpC^Dpu8Xs~Yd-
zlXi;m48_b@MonvACjQbx9147x4w+>MFS6N~;>YaYN#FO^78mo|bwJmzQn=)+<;FxE
z@L>HQCYjYqjp2+Z{`YXk8il=_8@=k-D>Xvwr}`DE$7FLsUXCgbeKqIXw7o7}cXYA)
TVsgW3`o|a;EXYmW*;o7p$G^j!

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/pt_PT.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/pt_PT.lproj/main.nib/keyedobjects.nib
new file mode 100644
index 0000000000000000000000000000000000000000..a61933475b1522977519195efec69139420fb62b
GIT binary patch
literal 35485
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
E58N--)c^nh

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/ru.lproj/InfoPlist.strings b/hw/xquartz/bundle/ru.lproj/InfoPlist.strings
new file mode 100644
index 0000000000000000000000000000000000000000..7f722e4b628764cddad52da2150429794eb0b00d
GIT binary patch
literal 274
zcmZvXy9&ZU5JhjXm0uB32GJN01rdw^MG!4)Y$Y#6O+pd{{dn~xg@wqnJF|1|%$|L{
z)t4hnYvl@c&_yRb6)U24Czh(H<jRN^G2vWsOUQdFT7RXQ>KXT=bvexJumUYK*9~`s
zFV=?nSE8jU+tywKmaWMj?-F1AeQ8Ht!jUQc>9&k#hGu4bGd5c^4=Pt(vH-#YqNXp^
Xv1RnoT#ZnDw1&Q+Y5o(^*OGhyTJkHj

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/ru.lproj/Localizable.strings b/hw/xquartz/bundle/ru.lproj/Localizable.strings
new file mode 100644
index 0000000000000000000000000000000000000000..3b3811234301776bb8e5bfdaef2b71c2173a0a6f
GIT binary patch
literal 1122
zcmcJPK~KU!5QXP3Cypk@o2eX)K~RWQ1Vl8EfD&&WydWTw)E2Eu`19&F+g2)`&1AQ`
zvor5KW+r@o$-eB0Cl@l4p#&1il-oj{WFjG_7kTI94V!Vdw_P#{Qk1s56648|oOix4
z`)|(z#E?vn6|rYnp4>?VYso$Dwz~3|Lt2m9<IRwke3MMO&#?eiBhIESA|lSA3{y3)
z=nAn+|AJG1nPSs5=QNXNY$9V$hBo2d*o<|Y!(8QBrDFH{Gi4)cX6Gs1ybkkzxX6$k
zt45r9#!{k=o-|lR-O!$RTGg5!Yg^CtKz;U_*0rw<ZSr=hO+3!a?MTbS)bvcRoUaec
zT3vM$q`LY<C+O=rwVxbn3|d?9IOLXgv<rFz>p5==rluaUm-Q4wZPpE~5M5=RlieWe
zlvRZ}$v5qJX7l#M7)@EmYI$uKE**p2R@^@MhM9PM9gvsjY`Mx<Ed~zT>RM+?3+Z&<
zP<f9@iPAnNQ#ofsB6>5U$JTpK9$eRL@~3!1yc1$dykt|~aXlX44|2WRrZ0&;>rVgQ
p*soz9q2|i*&vOcP)cRu+aiV1+lF0w6!fpDmu$tbjKhv0Ue*-hWrCR_1

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/ru.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/ru.lproj/main.nib/keyedobjects.nib
new file mode 100644
index 0000000000000000000000000000000000000000..9354e0264c73cb7e69eb977d9d77c85a90c533bc
GIT binary patch
literal 36593
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

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/sv.lproj/InfoPlist.strings b/hw/xquartz/bundle/sv.lproj/InfoPlist.strings
new file mode 100644
index 0000000000000000000000000000000000000000..655d5ff63d6981c332fe77f5be9ae84ae9a64fb0
GIT binary patch
literal 260
zcmZvXy$ZrW5QM+lr#Mmu(Ikz9SZF{If{l%><j<fcA&G)MygGM<g~)O@d$Y5<bFVj3
zd<+Q<DMv0;Jjuz#-Gv>!n1)(tgoW;{UWM`rt<(1mV$V`PoXXeCks@ZziksA#bU8cC
zzX}Zt9ghQ{!ejnNyOD1AZrUsF<fEqi={7|25ik}X%Tp^4R#|d#t|HX}W~we#vwrP<
K`-4<{ZubWmZ7K}_

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/sv.lproj/Localizable.strings b/hw/xquartz/bundle/sv.lproj/Localizable.strings
new file mode 100644
index 0000000000000000000000000000000000000000..796f06c213fd3be890a8258ceb2e706f29768d45
GIT binary patch
literal 1106
zcmcJPyH3ME5JjiXSFBP-JVcEUilBf35FG`LlQ@ovv5id<<^TAU<QFJ`bJsSu(?=`s
zYaaK`-I0HO?c7G@?ABrnEV0ZYP8(ZTXeql7TVeTR#GGXt5izi#jjh1P*_N0UYsuWd
z*^n_M((z@?O)h6IcEPx|SM2)kZQjXr=y!rmnYOG|q|P}bfz_0~*kyQ>oh(7krhr$<
zX!vi~B@8hZubf?M?~Kr9?369UE;OOeIyu`|DOLLV8)j29(>~(1%R{$o@0k)KHOl&C
zW@qT=?22z_U+{IHRa)+BNsMlC+cS%mVk`UlzXs(lVY|W_U_Vs$iMpDozOQmOYA#_`
zDWF^RLDI=~3WoxZh&k~2O7HJ%=NZOW_P+9#XCF&?2tf)<+X;CJUr)ySEqa*JHTU+w
zdkaOcP*AhfRiyKXTIcr7S+5~($}UYW>Ci#l*^k&9C{2Y`M^+U{N5$xkC;r9N^^r#k
zxi84pcKi(pDVbD3`)*@iV1nnCdX9zs0P++jcOE<MptqJcbV^X}SR9_|G5rbpmAAcD
G<Ng6*FTZX8

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/sv.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/sv.lproj/main.nib/keyedobjects.nib
new file mode 100644
index 0000000000000000000000000000000000000000..bd01c2dacfdec10b0031d3470bf548d00b0e99b1
GIT binary patch
literal 35017
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
LJYU_qMY{b5t^g>m

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/zh_CN.lproj/InfoPlist.strings b/hw/xquartz/bundle/zh_CN.lproj/InfoPlist.strings
new file mode 100644
index 0000000000000000000000000000000000000000..b5df36885021f7d532daf12f218eb64269305e58
GIT binary patch
literal 260
zcmZvXJqyAx6h-eW{)o`AgVrt%;-G>eh>MG>^vj|)(pI7Vc<V_92a!i|lb7?}yLtB-
zE0obrR*6o!s?<xFQgTnURzt?BLJgX;Z@J~1N4k5yQA_p$-FYgc=YUvgt)(8&DO{#K
z{cotzoE7M(2@z=ahuy%n-$@6~H9jg8Kh@4<jFYGzGSA|u^JJm3cNHrlrc^C>bAH`?
K_k)BgKl=k<aVtUq

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/zh_CN.lproj/Localizable.strings b/hw/xquartz/bundle/zh_CN.lproj/Localizable.strings
new file mode 100644
index 0000000000000000000000000000000000000000..f88a6da4b901dfe0524ef5acf4ac410033e283ec
GIT binary patch
literal 884
zcmcIjJx{_=6uogU5gAP!X_yExD5Eh(jSiY<1<?qxX$qy(hSDOHHn3?JaDu_nA5edb
zi<7^^Nu%|=@@lI)xp{r}-OuyRef<t-o$@5m0U1;$lWfv)^5~j0vY_2iAD&x?fiv^v
zk&&V-?NJXg0u7MU$L`?!*W#g~g-ij<#y6@ZP?d_19g^T@>xf#3O8?{5;A52r*k_sS
z+=ZAxr9x-uY(zMTDs_&g2V52;!tX&dAq+9Y)rDqI2cl6E8mp$k&$_X$%|y*Omoepp
z_m7aN;Ed@ytVtZq>V}aPau^#9w=}5$9tGOQ$|}B>aYqk#Q!0Pp%<p-=8e}4tYWMn+
z;wSw<TJhWJWp461K6Xdq=jlb9DL?je!)19g{gM`kFBPXGwHrZNcEuINmlnlrt=QPr
zm-PHqwdA{_*1NX3u>dq%m~D!`2@!Y&@N08+X0z;qR~t7nzzkzdphn0QdoMby7OWa#
z3h+d4Wj|y_h24yATzTt^=hpEA9aSJW410FtuEafZ;p};C-OK#1`JHY!HO}r2bl9p>

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/zh_CN.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/zh_CN.lproj/main.nib/keyedobjects.nib
new file mode 100644
index 0000000000000000000000000000000000000000..e36c15fb6a168ab80ce6eb5e5aacf977cf758236
GIT binary patch
literal 31481
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
GnSTTPaiF{a

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/zh_TW.lproj/InfoPlist.strings b/hw/xquartz/bundle/zh_TW.lproj/InfoPlist.strings
new file mode 100644
index 0000000000000000000000000000000000000000..92d5473b020c840576b69f0063a31bae81dad9fe
GIT binary patch
literal 266
zcmZvXI}5@v6ot?1uLvEBXzk)44qEU5;^N{eeJN^N(kkeWSHEO%5DCe-x%ay_C$G1L
z3T3oWtyBkHbkb9~GIDp+swGpaLJeAQuDKP&12vv+)sa0zKRgvOv&Txb&|Ej@3@+D}
z`B&6v$_}*Gh!tq^hh4&T-<Nj879W+$pKfDUWuIJ(n@BE7aMs|&@uiO5TTCs|nCgt0
NbM0KXf28zz2OmKGD|!F`

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/zh_TW.lproj/Localizable.strings b/hw/xquartz/bundle/zh_TW.lproj/Localizable.strings
new file mode 100644
index 0000000000000000000000000000000000000000..f009302c27a4212d3983c73af44478e25bfc8f7f
GIT binary patch
literal 890
zcmcIjy-vbV6h6_xh(s4A7aJx*42r8UYIM*<2tP4kXu?l{N`Mxr6d`fYFrbUhJ^}g&
zzJW1u(>HK+GI6thr`+1=PEKy`x##!0-?{y^XobQg(Js}fNDb0S#i>ijR3Q!833cE(
zh176nUl<ua3eq;U5hGC#IUVc<zJD!URMe0uVd?lfwIs??6tYP&{Ji$5>Z$ZUZW%tV
z)Wbf`<Z}zs04fDKqtg*#c&Zcynl^B05C?x3S_8s}8CMHhjhc`Om7#I93jExSyOupQ
z-CSnMu<!36Q@|PPDy&`{Y&Gpj4LQt)AuMHzfJccou!4or*<<eR>f$`1=5ZGHJbba1
z9F{KM3nQ=B@|z#2SY644GGD_3b5Pn+XWh)=Qzz7)%P+_?>U94(Z6xG+$@0eog%MkB
z`$tiZmlxG=axIrN2i4Ei>*^HntYf-9@haj#EP-KN@H3uf3(V@cQw`iOXA+fcw)n-U
zuxhYY5EFsNc`Z9OHwx?x_s;3J=5S&iW9X;=!Jgf-<#r|Exe281uOF)O6GM;`|IY7>
J?db`Ie*hmFt8)MV

literal 0
HcmV?d00001

diff --git a/hw/xquartz/bundle/zh_TW.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/zh_TW.lproj/main.nib/keyedobjects.nib
new file mode 100644
index 0000000000000000000000000000000000000000..36602c53e3e7a8c925599b6bcb5e1ee10776b5c0
GIT binary patch
literal 31748
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

literal 0
HcmV?d00001


From f3042a63be0748bb60567144276d2c61b75ba0b7 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Fri, 21 Dec 2007 01:24:06 -0800
Subject: [PATCH 343/552] XQuartz: Handle Pseudorami init in miinitext (cherry
 picked from commit a585c94fedd4ecbc87524703c01bb128fc2aa951)

---
 hw/xquartz/pseudoramiX.c   |  2 +-
 hw/xquartz/quartz.c        | 12 +++---------
 hw/xquartz/quartzStartup.c |  2 +-
 mi/miinitext.c             |  9 +++++++++
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/hw/xquartz/pseudoramiX.c b/hw/xquartz/pseudoramiX.c
index b19c6050f..4a9d8e1f1 100644
--- a/hw/xquartz/pseudoramiX.c
+++ b/hw/xquartz/pseudoramiX.c
@@ -44,7 +44,7 @@ Equipment Corporation.
 #include <X11/extensions/panoramiXproto.h>
 #include "globals.h"
 
-extern int noPseudoramiXExtension;
+Bool noPseudoramiXExtension = FALSE;
 extern int noPanoramiXExtension;
 
 extern int ProcPanoramiXQueryVersion (ClientPtr client);
diff --git a/hw/xquartz/quartz.c b/hw/xquartz/quartz.c
index 75f4e5eb0..6f42c538f 100644
--- a/hw/xquartz/quartz.c
+++ b/hw/xquartz/quartz.c
@@ -39,11 +39,13 @@
 #include "quartzAudio.h"
 #include "pseudoramiX.h"
 #define _APPLEWM_SERVER_
-#include "X11/extensions/applewm.h"
 #include "applewmExt.h"
 
 #include "X11Application.h"
 
+#include <X11/extensions/applewm.h>
+#include <X11/extensions/randr.h>
+
 // X headers
 #include "scrnintstr.h"
 #include "windowstr.h"
@@ -69,7 +71,6 @@ int                     quartzServerVisible = TRUE;
 int                     quartzServerQuitting = FALSE;
 DevPrivateKey           quartzScreenKey = &quartzScreenKey;
 int                     aquaMenuBarHeight = 0;
-int                     noPseudoramiXExtension = FALSE;
 QuartzModeProcsPtr      quartzProcs = NULL;
 const char             *quartzOpenGLBundle = NULL;
 
@@ -165,13 +166,6 @@ void QuartzInitOutput(
 
     // Do display mode specific initialization
     quartzProcs->DisplayInit();
-
-    // Init PseudoramiX implementation of Xinerama.
-    // This should be in InitExtensions, but that causes link errors
-    // for servers that don't link in pseudoramiX.c.
-    if (!noPseudoramiXExtension) {
-        PseudoramiXExtensionInit(argc, argv);
-    }
 }
 
 
diff --git a/hw/xquartz/quartzStartup.c b/hw/xquartz/quartzStartup.c
index 8600ec8d9..1b2a22623 100644
--- a/hw/xquartz/quartzStartup.c
+++ b/hw/xquartz/quartzStartup.c
@@ -106,6 +106,6 @@ void DarwinHandleGUI(int argc, char **argv, char **envp) {
     extern void _InitHLTB(void);
     
     _InitHLTB();    
-    X11ControllerMain(argc, argv, server_thread, NULL);
+    X11ControllerMain(argc, (const char **)argv, server_thread, NULL);
     exit(0);
 }
diff --git a/mi/miinitext.c b/mi/miinitext.c
index d06ab8ad1..319d2ced6 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -206,6 +206,9 @@ extern Bool noXkbExtension;
 #ifdef PANORAMIX
 extern Bool noPanoramiXExtension;
 #endif
+#ifdef INXQUARTZ
+extern Bool noPseudoramiXExtension;
+#endif
 #ifdef XINPUT
 extern Bool noXInputExtension;
 #endif
@@ -274,6 +277,9 @@ extern void MultibufferExtensionInit(INITARGS);
 #ifdef PANORAMIX
 extern void PanoramiXExtensionInit(INITARGS);
 #endif
+#ifdef INXQUARTZ
+extern void PseudoramiXExtensionInit(INITARGS);
+#endif
 #ifdef XINPUT
 extern void XInputExtensionInit(INITARGS);
 #endif
@@ -533,6 +539,9 @@ InitExtensions(argc, argv)
   if (!noPanoramiXExtension) PanoramiXExtensionInit();
 # endif
 #endif
+#ifdef INXQUARTZ
+    if(!noPseudoramiXExtension) PseudoramiXExtensionInit();
+#endif
 #ifdef SHAPE
     if (!noShapeExtension) ShapeExtensionInit();
 #endif

From 2c24231fc2027cf5034bb1b6636332687f586726 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Fri, 21 Dec 2007 01:57:43 -0800
Subject: [PATCH 344/552] XQuartz: Reduce code duplication in X11.app (cherry
 picked from commit b81809cd91a9f90b7f2de77b1dcf514cee87c32d)

---
 hw/xquartz/bundle/bundle-main.c | 87 +++++++++++++++------------------
 1 file changed, 39 insertions(+), 48 deletions(-)

diff --git a/hw/xquartz/bundle/bundle-main.c b/hw/xquartz/bundle/bundle-main.c
index cd74ceae6..a7b00d651 100644
--- a/hw/xquartz/bundle/bundle-main.c
+++ b/hw/xquartz/bundle/bundle-main.c
@@ -39,8 +39,8 @@
 #define DEFAULT_CLIENT "/usr/X11/bin/xterm"
 #define DEFAULT_STARTX "/usr/X11/bin/startx"
 
-static int launcher_main(int argc, char **argv);
-static int server_main(int argc, char **argv);
+static int execute(const char *command);
+static char *command_from_prefs(const char *key, const char *default_value);
 
 int main(int argc, char **argv) {
     Display *display;
@@ -50,7 +50,7 @@ int main(int argc, char **argv) {
     for(i=0; i < argc; i++) {
         fprintf(stderr, "\targv[%u] = %s\n", (unsigned)i, argv[i]);
     }
-    
+
     /* If we have a process serial number and it's our only arg, act as if
      * the user double clicked the app bundle: launch app_to_run if possible
      */
@@ -61,32 +61,32 @@ int main(int argc, char **argv) {
             fprintf(stderr, "X11.app: Closing the display and sleeping for 2s to allow the X server to start up.\n");
             /* Could open the display, start the launcher */
             XCloseDisplay(display);
-            
+
             /* Give 2 seconds for the server to start... 
              * TODO: *Really* fix this race condition
              */
             usleep(2000);
-            return launcher_main(argc, argv);
+            return execute(command_from_prefs("app_to_run", DEFAULT_CLIENT));
         }
     }
-    
+
     /* Start the server */
     fprintf(stderr, "X11.app: Could not connect to server.  Starting X server.");
-    return server_main(argc, argv);
+    return execute(command_from_prefs("startx_script", DEFAULT_STARTX));
 }
 
-static int myexecvp(const char *command) {
+static int execute(const char *command) {
     const char *newargv[7];
     const char **s;
 
-	newargv[0] = "/usr/bin/login";
-	newargv[1] = "-fp";
-	newargv[2] = getlogin();
-	newargv[3] = "/bin/sh";
-	newargv[4] = "-c";
-	newargv[5] = command;
-	newargv[6] = NULL;
-
+    newargv[0] = "/usr/bin/login";
+    newargv[1] = "-fp";
+    newargv[2] = getlogin();
+    newargv[3] = "/bin/sh";
+    newargv[4] = "-c";
+    newargv[5] = command;
+    newargv[6] = NULL;
+    
     fprintf(stderr, "X11.app: Launching %s:\n", command);
     for(s=newargv; *s; s++) {
         fprintf(stderr, "\targv[%d] = %s\n", s - newargv, *s);
@@ -97,42 +97,33 @@ static int myexecvp(const char *command) {
     return(1);
 }
 
-int launcher_main (int argc, char **argv) {
-    char *command = DEFAULT_CLIENT;
+static char *command_from_prefs(const char *key, const char *default_value) {
+    char *command = NULL;
     
-	CFPropertyListRef PlistRef = CFPreferencesCopyAppValue(CFSTR("app_to_run"), kCFPreferencesCurrentApplication);
-	
-	if ((PlistRef == NULL) || (CFGetTypeID(PlistRef) != CFStringGetTypeID())) {
-		CFPreferencesSetAppValue(CFSTR("app_to_run"), CFSTR(DEFAULT_CLIENT), kCFPreferencesCurrentApplication);
-		CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
-	} else {
-        int len = CFStringGetLength((CFStringRef)PlistRef)+1;
-		command = (char *)malloc(len);
-		CFStringGetCString((CFStringRef)PlistRef, command, len,  kCFStringEncodingASCII);
-	}
+    CFStringRef cfKey = CFStringCreateWithPascalString(NULL, key, kCFStringEncodingASCII);
+    CFPropertyListRef PlistRef = CFPreferencesCopyAppValue(cfKey, kCFPreferencesCurrentApplication);
+    
+    if ((PlistRef == NULL) || (CFGetTypeID(PlistRef) != CFStringGetTypeID())) {
+        CFStringRef cfDefaultValue = CFStringCreateWithPascalString(NULL, default_value, kCFStringEncodingASCII);
 
-	if (PlistRef)
-        CFRelease(PlistRef);
-
-    return myexecvp(command);
-}
-
-int server_main (int argc, char **argv) {
-    char *command = DEFAULT_STARTX;
-
-	CFPropertyListRef PlistRef = CFPreferencesCopyAppValue(CFSTR("startx_script"), kCFPreferencesCurrentApplication);
-	
-	if ((PlistRef == NULL) || (CFGetTypeID(PlistRef) != CFStringGetTypeID())) {
-		CFPreferencesSetAppValue(CFSTR("startx_script"), CFSTR(DEFAULT_STARTX), kCFPreferencesCurrentApplication);
-		CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
-	} else {
-        int len = CFStringGetLength((CFStringRef)PlistRef)+1;
-		command = (char *)malloc(len);
-		CFStringGetCString((CFStringRef)PlistRef, command, len,  kCFStringEncodingASCII);
+        CFPreferencesSetAppValue(cfKey, cfDefaultValue, kCFPreferencesCurrentApplication);
+        CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
+        
+        int len = strlen(default_value) + 1;
+        command = (char *)malloc(len * sizeof(char));
+        if(!command)
+            return NULL;
+        strcpy(command, default_value);
+    } else {
+        int len = CFStringGetLength((CFStringRef)PlistRef) + 1;
+        command = (char *)malloc(len * sizeof(char));
+        if(!command)
+            return NULL;
+        CFStringGetCString((CFStringRef)PlistRef, command, len,  kCFStringEncodingASCII);
 	}
     
-	if (PlistRef)
+    if (PlistRef)
         CFRelease(PlistRef);
     
-    return myexecvp(command);
+    return command;
 }

From 5dd895efa305954e2695aa22a9e49acfb65b4d5e Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Fri, 21 Dec 2007 02:06:47 -0800
Subject: [PATCH 345/552] XQuartz: Use CFStringCreateWithCString (cherry picked
 from commit 79782b0e14761dcf5d6635b8eec161b74f06763a)

---
 hw/xquartz/bundle/bundle-main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/xquartz/bundle/bundle-main.c b/hw/xquartz/bundle/bundle-main.c
index a7b00d651..c66856794 100644
--- a/hw/xquartz/bundle/bundle-main.c
+++ b/hw/xquartz/bundle/bundle-main.c
@@ -100,7 +100,7 @@ static int execute(const char *command) {
 static char *command_from_prefs(const char *key, const char *default_value) {
     char *command = NULL;
     
-    CFStringRef cfKey = CFStringCreateWithPascalString(NULL, key, kCFStringEncodingASCII);
+    CFStringRef cfKey = CFStringCreateWithCString(NULL, key, kCFStringEncodingASCII);
     CFPropertyListRef PlistRef = CFPreferencesCopyAppValue(cfKey, kCFPreferencesCurrentApplication);
     
     if ((PlistRef == NULL) || (CFGetTypeID(PlistRef) != CFStringGetTypeID())) {

From beb29c605b8c66e1a18b89668aa421c1519645f6 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Fri, 21 Dec 2007 02:09:01 -0800
Subject: [PATCH 346/552] XQuartz: *REALLY* use CFStringCreateWithCString I
 need sleep!  Why am I making these stupid mistakes... sorry for pointless
 commit spam.  ugg. (cherry picked from commit
 b16351fc6457aabead328472d16dc25789032940)

---
 hw/xquartz/bundle/bundle-main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/xquartz/bundle/bundle-main.c b/hw/xquartz/bundle/bundle-main.c
index c66856794..df78d7fb8 100644
--- a/hw/xquartz/bundle/bundle-main.c
+++ b/hw/xquartz/bundle/bundle-main.c
@@ -104,7 +104,7 @@ static char *command_from_prefs(const char *key, const char *default_value) {
     CFPropertyListRef PlistRef = CFPreferencesCopyAppValue(cfKey, kCFPreferencesCurrentApplication);
     
     if ((PlistRef == NULL) || (CFGetTypeID(PlistRef) != CFStringGetTypeID())) {
-        CFStringRef cfDefaultValue = CFStringCreateWithPascalString(NULL, default_value, kCFStringEncodingASCII);
+        CFStringRef cfDefaultValue = CFStringCreateWithCString(NULL, default_value, kCFStringEncodingASCII);
 
         CFPreferencesSetAppValue(cfKey, cfDefaultValue, kCFPreferencesCurrentApplication);
         CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);

From 743008a4812d6b046211ebcf4eab202687b458d5 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Sun, 23 Dec 2007 14:27:14 -0500
Subject: [PATCH 347/552] Report serverClient resources in the X-Resource
 extension.

---
 Xext/xres.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/Xext/xres.c b/Xext/xres.c
index feadad27e..9bd70c672 100644
--- a/Xext/xres.c
+++ b/Xext/xres.c
@@ -67,7 +67,7 @@ ProcXResQueryClients (ClientPtr client)
     current_clients = xalloc((currentMaxClients - 1) * sizeof(int));
 
     num_clients = 0;
-    for(i = 1; i < currentMaxClients; i++) {
+    for(i = 0; i < currentMaxClients; i++) {
        if(clients[i]) {
            current_clients[num_clients] = i;
            num_clients++;   
@@ -128,9 +128,7 @@ ProcXResQueryClientResources (ClientPtr client)
 
     clientID = CLIENT_ID(stuff->xid);
 
-    /* we could remove the (clientID == 0) check if we wanted to allow
-       probing the X-server's resource usage */
-    if(!clientID || (clientID >= currentMaxClients) || !clients[clientID]) {
+    if((clientID >= currentMaxClients) || !clients[clientID]) {
         client->errorValue = stuff->xid;
         return BadValue;
     }
@@ -254,9 +252,7 @@ ProcXResQueryClientPixmapBytes (ClientPtr client)
 
     clientID = CLIENT_ID(stuff->xid);
 
-    /* we could remove the (clientID == 0) check if we wanted to allow
-       probing the X-server's resource usage */
-    if(!clientID || (clientID >= currentMaxClients) || !clients[clientID]) {
+    if((clientID >= currentMaxClients) || !clients[clientID]) {
         client->errorValue = stuff->xid;
         return BadValue;
     }

From 389e8917f66a489455f1d5c70f44c262717538ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih@pardus.org.tr>
Date: Tue, 25 Dec 2007 22:59:24 +0200
Subject: [PATCH 348/552] Config: Fix a memory leak

---
 config/hal.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/hal.c b/config/hal.c
index 4427deb39..45238c0f4 100644
--- a/config/hal.c
+++ b/config/hal.c
@@ -251,6 +251,8 @@ unwind:
         xfree(xkb_model);
     if (xkb_layout)
         xfree(xkb_layout);
+    if (xkb_variant)
+        xfree(xkb_variant);
     if (xkb_options)
         xfree(xkb_options);
     if (config_info)

From 009f1e4e55200425de2fe0dbc1f0ac0f431fb4cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih@pardus.org.tr>
Date: Tue, 25 Dec 2007 23:09:49 +0200
Subject: [PATCH 349/552] Config: Don't forget to add xkb_rules option

---
 config/hal.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/hal.c b/config/hal.c
index 45238c0f4..af96fc2c8 100644
--- a/config/hal.c
+++ b/config/hal.c
@@ -221,6 +221,8 @@ device_added(LibHalContext *hal_ctx, const char *udi)
         goto unwind;
     sprintf(config_info, "hal:%s", udi);
 
+    if (xkb_rules)
+        add_option(&options, "xkb_rules", xkb_rules);
     if (xkb_model)
         add_option(&options, "xkb_model", xkb_model);
     if (xkb_layout)

From ae869fc7669764729e13fdd70149ed636753f2a3 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 25 Dec 2007 22:42:50 -0800
Subject: [PATCH 350/552] [SBUS]: Fix build, use getpagesize() instead of
 xf86getpagesize().

xf86getpagesize() was removed, but this one call site was
not fixed up.

Signed-off-by: David S. Miller <davem@davemloft.net>
---
 hw/xfree86/os-support/bus/Sbus.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/xfree86/os-support/bus/Sbus.c b/hw/xfree86/os-support/bus/Sbus.c
index 2f0043f4c..ff257a8c7 100644
--- a/hw/xfree86/os-support/bus/Sbus.c
+++ b/hw/xfree86/os-support/bus/Sbus.c
@@ -585,7 +585,7 @@ xf86MapSbusMem(sbusDevicePtr psdp, unsigned long offset, unsigned long size)
 _X_EXPORT void
 xf86UnmapSbusMem(sbusDevicePtr psdp, pointer addr, unsigned long size)
 {
-    unsigned long mask = xf86getpagesize() - 1;
+    unsigned long mask = getpagesize() - 1;
     unsigned long base = (unsigned long)addr & ~mask;
     unsigned long len = (((unsigned long)addr + size + mask) & ~mask) - base;
 

From f44fd3f9e41bf467360ace93ef5b532d8f61fb2c Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Fri, 28 Dec 2007 15:47:21 +0200
Subject: [PATCH 351/552] Config: D-Bus: Don't leak timers

TimerCancel doesn't free the timer: you need TimerFree for that.
---
 config/dbus-core.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/config/dbus-core.c b/config/dbus-core.c
index eab72a530..9cf153076 100644
--- a/config/dbus-core.c
+++ b/config/dbus-core.c
@@ -76,7 +76,7 @@ teardown(void)
     struct config_dbus_core_hook *hook;
 
     if (bus_info.timer) {
-        TimerCancel(bus_info.timer);
+        TimerFree(bus_info.timer);
         bus_info.timer = NULL;
     }
 
@@ -116,6 +116,8 @@ message_filter(DBusConnection *connection, DBusMessage *message, void *data)
         bus_info.connection = NULL;
         teardown();
 
+        if (bus_info.timer)
+            TimerFree(bus_info.timer);
         bus_info.timer = TimerSet(NULL, 0, 1, reconnect_timer, NULL);
 
         return DBUS_HANDLER_RESULT_HANDLED;
@@ -186,6 +188,7 @@ static CARD32
 reconnect_timer(OsTimerPtr timer, CARD32 time, pointer arg)
 {
     if (connect_to_bus()) {
+        TimerFree(bus_info.timer);
         bus_info.timer = NULL;
         return 0;
     }

From 190a0506243b39cd8dfc0e12068e3a3f416330f1 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Fri, 28 Dec 2007 15:47:57 +0200
Subject: [PATCH 352/552] Config: HAL: Don't leak options on failure to add
 device

This showed up in Xephyr in particular, which denies new device requests.
---
 config/hal.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/config/hal.c b/config/hal.c
index af96fc2c8..4ab296159 100644
--- a/config/hal.c
+++ b/config/hal.c
@@ -92,6 +92,8 @@ add_option(InputOption **options, const char *key, const char *value)
     for (; *options; options = &(*options)->next)
         ;
     *options = xcalloc(sizeof(**options), 1);
+    if (!*options) /* Yeesh. */
+        return;
     (*options)->key = xstrdup(key);
     (*options)->value = xstrdup(value);
     (*options)->next = NULL;
@@ -156,7 +158,7 @@ device_added(LibHalContext *hal_ctx, const char *udi)
     char *path = NULL, *driver = NULL, *name = NULL, *xkb_rules = NULL;
     char *xkb_model = NULL, *xkb_layout = NULL, *xkb_variant = NULL;
     char *xkb_options = NULL, *config_info = NULL;
-    InputOption *options = NULL;
+    InputOption *options = NULL, *tmpo = NULL;
     DeviceIntPtr dev;
     DBusError error;
     int type = TYPE_NONE;
@@ -234,6 +236,7 @@ device_added(LibHalContext *hal_ctx, const char *udi)
 
     if (NewInputDeviceRequest(options, &dev) != Success) {
         DebugF("[config/hal] NewInputDeviceRequest failed\n");
+        dev = NULL;
         goto unwind;
     }
 
@@ -259,6 +262,12 @@ unwind:
         xfree(xkb_options);
     if (config_info)
         xfree(config_info);
+    while (!dev && (tmpo = options)) {
+        options = tmpo->next;
+        xfree(tmpo->key);
+        xfree(tmpo->value);
+        xfree(tmpo);
+    }
 
 out_error:
     dbus_error_free(&error);

From b2f6cd290c43b88f0d08fb29f8657618a067d2a0 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Fri, 28 Dec 2007 15:48:25 +0200
Subject: [PATCH 353/552] OS: Don't leak connection translation table on
 regeneration

---
 os/connection.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/os/connection.c b/os/connection.c
index 3b5742c2b..8b6541ce6 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -353,7 +353,8 @@ InitConnectionLimits(void)
 #endif
 
 #if !defined(WIN32)
-    ConnectionTranslation = (int *)xnfalloc(sizeof(int)*(lastfdesc + 1));
+    if (!ConnectionTranslation)
+        ConnectionTranslation = (int *)xnfalloc(sizeof(int)*(lastfdesc + 1));
 #else
     InitConnectionTranslation();
 #endif

From 941058f8da0d725f909dc97f68c32ce244a9dc0a Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Fri, 28 Dec 2007 15:48:57 +0200
Subject: [PATCH 354/552] KDrive: Xephyr: Don't leak screen damage structure

---
 hw/kdrive/ephyr/ephyr.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c
index a4d995cb8..2a762a2a9 100644
--- a/hw/kdrive/ephyr/ephyr.c
+++ b/hw/kdrive/ephyr/ephyr.c
@@ -402,6 +402,7 @@ ephyrUnsetInternalDamage (ScreenPtr pScreen)
   
   pPixmap = (*pScreen->GetScreenPixmap) (pScreen);
   DamageUnregister (&pPixmap->drawable, scrpriv->pDamage);
+  DamageDestroy (scrpriv->pDamage);
   
   RemoveBlockAndWakeupHandlers (ephyrInternalDamageBlockHandler,
 				ephyrInternalDamageWakeupHandler,

From 24105cf6582201a94bc39aeac5a795297018aeb5 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Fri, 28 Dec 2007 15:49:50 +0200
Subject: [PATCH 355/552] Input: Don't reinit devices

If a device is already initialised (i.e. the virtual core devices) during
IASD, don't init them again.  This fixes a leak.
---
 dix/devices.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dix/devices.c b/dix/devices.c
index adf2fba45..534a0b9e5 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -469,7 +469,8 @@ InitAndStartDevices(void)
 
     for (dev = inputInfo.off_devices; dev; dev = dev->next) {
         DebugF("(dix) initialising device %d\n", dev->id);
-	ActivateDevice(dev);
+        if (!dev->inited)
+            ActivateDevice(dev);
     }
     for (dev = inputInfo.off_devices; dev; dev = next)
     {

From 938da5ee389975f910721f1c2cebc2dcec793117 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 28 Dec 2007 12:23:44 -0500
Subject: [PATCH 356/552] Add HDMI and DisplayPort connector types.

---
 hw/xfree86/modes/xf86Crtc.c | 9 ++++++---
 hw/xfree86/modes/xf86Crtc.h | 4 +++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index e00fdf3f3..10db86267 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -2192,9 +2192,12 @@ xf86OutputGetEDID (xf86OutputPtr output, I2CBusPtr pDDCBus)
     return mon;
 }
 
-static char *_xf86ConnectorNames[] = { "None", "VGA", "DVI-I", "DVI-D",
-				      "DVI-A", "Composite", "S-Video",
-				      "Component", "LFP", "Proprietary" };
+static char *_xf86ConnectorNames[] = {
+					"None", "VGA", "DVI-I", "DVI-D",
+					"DVI-A", "Composite", "S-Video",
+					"Component", "LFP", "Proprietary",
+					"HDMI", "DisplayPort",
+				     };
 _X_EXPORT char *
 xf86ConnectorGetName(xf86ConnectorType connector)
 {
diff --git a/hw/xfree86/modes/xf86Crtc.h b/hw/xfree86/modes/xf86Crtc.h
index f312b30cb..62d85bbc9 100644
--- a/hw/xfree86/modes/xf86Crtc.h
+++ b/hw/xfree86/modes/xf86Crtc.h
@@ -61,7 +61,9 @@ typedef enum _xf86ConnectorType {
    XF86ConnectorSvideo,
    XF86ConnectorComponent,
    XF86ConnectorLFP,
-   XF86ConnectorProprietary
+   XF86ConnectorProprietary,
+   XF86ConnectorHDMI,
+   XF86ConnectorDisplayPort,
 } xf86ConnectorType;
 
 typedef enum _xf86OutputStatus {

From 1bbf64ab115e2a1121d6f9c0830b1b977f025178 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 20 Dec 2007 20:31:34 -0500
Subject: [PATCH 357/552] xselinux: Remove unnecessary structure definition.

---
 Xext/xselinux.h | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/Xext/xselinux.h b/Xext/xselinux.h
index ebcc4aae0..9800d5ae4 100644
--- a/Xext/xselinux.h
+++ b/Xext/xselinux.h
@@ -138,20 +138,6 @@ typedef struct {
     CARD32  id;
 } SELinuxGetContextReq;
 
-typedef struct {
-    CARD8   type;
-    CARD8   pad1;
-    CARD16  sequenceNumber;
-    CARD32  length;
-    CARD16  context_len;
-    CARD16  pad2;
-    CARD32  pad3;
-    CARD32  pad4;
-    CARD32  pad5;
-    CARD32  pad6;
-    CARD32  pad7;
-} SELinuxGetContextReply;
-
 typedef struct {
     CARD8   reqType;
     CARD8   SELinuxReqType;
@@ -172,7 +158,7 @@ typedef struct {
     CARD32  pad5;
     CARD32  pad6;
     CARD32  pad7;
-} SELinuxGetPropertyContextReply;
+} SELinuxGetContextReply;
 
 
 /* Private Flask definitions */

From f3780ece528ed3ead809ba6a388fa0f8aab2a775 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 20 Dec 2007 20:32:07 -0500
Subject: [PATCH 358/552] xselinux: Implement swapped protocol request logic.

---
 Xext/xselinux.c | 69 +++++++++++++++++++++++++++++--------------------
 1 file changed, 41 insertions(+), 28 deletions(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index bbd8d1a46..d7c73227d 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -1198,69 +1198,82 @@ SProcSELinuxSetSelectionManager(ClientPtr client)
     return ProcSELinuxSetSelectionManager(client);
 }
 
-static int
-SProcSELinuxGetSelectionManager(ClientPtr client)
-{
-    return ProcSELinuxGetSelectionManager(client);
-}
-
 static int
 SProcSELinuxSetDeviceCreateContext(ClientPtr client)
 {
-    return ProcSELinuxSetDeviceCreateContext(client);
-}
+    REQUEST(SELinuxSetCreateContextReq);
+    int n;
 
-static int
-SProcSELinuxGetDeviceCreateContext(ClientPtr client)
-{
-    return ProcSELinuxGetDeviceCreateContext(client);
+    REQUEST_AT_LEAST_SIZE(SELinuxSetCreateContextReq);
+    swaps(&stuff->context_len,n);
+    return ProcSELinuxSetDeviceCreateContext(client);
 }
 
 static int
 SProcSELinuxSetDeviceContext(ClientPtr client)
 {
+    REQUEST(SELinuxSetContextReq);
+    int n;
+
+    REQUEST_AT_LEAST_SIZE(SELinuxSetContextReq);
+    swapl(&stuff->id,n);
+    swaps(&stuff->context_len,n);
     return ProcSELinuxSetDeviceContext(client);
 }
 
 static int
 SProcSELinuxGetDeviceContext(ClientPtr client)
 {
+    REQUEST(SELinuxGetContextReq);
+    int n;
+
+    REQUEST_SIZE_MATCH(SELinuxGetContextReq);
+    swapl(&stuff->id,n);
     return ProcSELinuxGetDeviceContext(client);
 }
 
 static int
 SProcSELinuxSetPropertyCreateContext(ClientPtr client)
 {
-    return ProcSELinuxSetPropertyCreateContext(client);
-}
+    REQUEST(SELinuxSetCreateContextReq);
+    int n;
 
-static int
-SProcSELinuxGetPropertyCreateContext(ClientPtr client)
-{
-    return ProcSELinuxGetPropertyCreateContext(client);
+    REQUEST_AT_LEAST_SIZE(SELinuxSetCreateContextReq);
+    swaps(&stuff->context_len,n);
+    return ProcSELinuxSetPropertyCreateContext(client);
 }
 
 static int
 SProcSELinuxGetPropertyContext(ClientPtr client)
 {
+    REQUEST(SELinuxGetPropertyContextReq);
+    int n;
+
+    REQUEST_SIZE_MATCH(SELinuxGetPropertyContextReq);
+    swapl(&stuff->window,n);
+    swapl(&stuff->property,n);
     return ProcSELinuxGetPropertyContext(client);
 }
 
 static int
 SProcSELinuxSetWindowCreateContext(ClientPtr client)
 {
-    return ProcSELinuxSetWindowCreateContext(client);
-}
+    REQUEST(SELinuxSetCreateContextReq);
+    int n;
 
-static int
-SProcSELinuxGetWindowCreateContext(ClientPtr client)
-{
-    return ProcSELinuxGetWindowCreateContext(client);
+    REQUEST_AT_LEAST_SIZE(SELinuxSetCreateContextReq);
+    swaps(&stuff->context_len,n);
+    return ProcSELinuxSetWindowCreateContext(client);
 }
 
 static int
 SProcSELinuxGetWindowContext(ClientPtr client)
 {
+    REQUEST(SELinuxGetContextReq);
+    int n;
+
+    REQUEST_SIZE_MATCH(SELinuxGetContextReq);
+    swapl(&stuff->id,n);
     return ProcSELinuxGetWindowContext(client);
 }
 
@@ -1278,11 +1291,11 @@ SProcSELinuxDispatch(ClientPtr client)
     case X_SELinuxSetSelectionManager:
 	return SProcSELinuxSetSelectionManager(client);
     case X_SELinuxGetSelectionManager:
-    	return SProcSELinuxGetSelectionManager(client);
+    	return ProcSELinuxGetSelectionManager(client);
     case X_SELinuxSetDeviceCreateContext:
     	return SProcSELinuxSetDeviceCreateContext(client);
     case X_SELinuxGetDeviceCreateContext:
-    	return SProcSELinuxGetDeviceCreateContext(client);
+    	return ProcSELinuxGetDeviceCreateContext(client);
     case X_SELinuxSetDeviceContext:
     	return SProcSELinuxSetDeviceContext(client);
     case X_SELinuxGetDeviceContext:
@@ -1290,13 +1303,13 @@ SProcSELinuxDispatch(ClientPtr client)
     case X_SELinuxSetPropertyCreateContext:
     	return SProcSELinuxSetPropertyCreateContext(client);
     case X_SELinuxGetPropertyCreateContext:
-    	return SProcSELinuxGetPropertyCreateContext(client);
+    	return ProcSELinuxGetPropertyCreateContext(client);
     case X_SELinuxGetPropertyContext:
     	return SProcSELinuxGetPropertyContext(client);
     case X_SELinuxSetWindowCreateContext:
     	return SProcSELinuxSetWindowCreateContext(client);
     case X_SELinuxGetWindowCreateContext:
-    	return SProcSELinuxGetWindowCreateContext(client);
+    	return ProcSELinuxGetWindowCreateContext(client);
     case X_SELinuxGetWindowContext:
     	return SProcSELinuxGetWindowContext(client);
     default:

From f4bc333fc1e8d9fa9911771d2072df4df741c553 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 28 Dec 2007 11:56:54 -0500
Subject: [PATCH 359/552] xselinux: don't FatalError on an invalid class
 mapping, just disable support.

---
 Xext/xselinux.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index d7c73227d..f3a84571e 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -1376,15 +1376,20 @@ XSELinuxExtensionInit(INITARGS)
 
     /* Setup SELinux stuff */
     if (!is_selinux_enabled()) {
-        ErrorF("XSELinux: Extension failed to load: SELinux not enabled\n");
+        ErrorF("XSELinux: SELinux not enabled, disabling SELinux support.\n");
         return;
     }
 
     selinux_set_callback(SELINUX_CB_LOG, (union selinux_callback)SELinuxLog);
     selinux_set_callback(SELINUX_CB_AUDIT, (union selinux_callback)SELinuxAudit);
 
-    if (selinux_set_mapping(map) < 0)
+    if (selinux_set_mapping(map) < 0) {
+	if (errno == EINVAL) {
+	    ErrorF("XSELinux: Invalid object class mapping, disabling SELinux support.\n");
+	    return;
+	}
 	FatalError("XSELinux: Failed to set up security class mapping\n");
+    }
 
     if (avc_open(NULL, 0) < 0)
 	FatalError("XSELinux: Couldn't initialize SELinux userspace AVC\n");

From 643c52be32c187a0fdb9a031b1e31d97cd551339 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 28 Dec 2007 13:26:26 -0500
Subject: [PATCH 360/552] xselinux: Remove "X" prefix on remaining functions
 and strings.

Should be evident from the context.
---
 Xext/xselinux.c                     | 74 ++++++++++++++---------------
 Xext/xselinux.h                     | 10 ++--
 hw/xfree86/dixmods/extmod/modinit.h |  2 +-
 mi/miinitext.c                      |  6 +--
 4 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index f3a84571e..6550c7f72 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -175,12 +175,12 @@ SELinuxSelectionToSID(Atom selection, SELinuxStateRec *sid_return)
 	security_id_t sid;
 
 	if (selabel_lookup(label_hnd, &con, name, SELABEL_X_SELN) < 0) {
-	    ErrorF("XSELinux: a selection label lookup failed!\n");
+	    ErrorF("SELinux: a selection label lookup failed!\n");
 	    return BadValue;
 	}
 	/* Get a SID for context */
 	if (avc_context_to_sid(con, &sid) < 0) {
-	    ErrorF("XSELinux: a context_to_SID call failed!\n");
+	    ErrorF("SELinux: a context_to_SID call failed!\n");
 	    return BadAlloc;
 	}
 	freecon(con);
@@ -216,12 +216,12 @@ SELinuxEventToSID(unsigned type, security_id_t sid_of_window,
     if (!knownEvents[type]) {
 	/* Look in the mappings of event names to contexts */
 	if (selabel_lookup(label_hnd, &con, name, SELABEL_X_EVENT) < 0) {
-	    ErrorF("XSELinux: an event label lookup failed!\n");
+	    ErrorF("SELinux: an event label lookup failed!\n");
 	    return BadValue;
 	}
 	/* Get a SID for context */
 	if (avc_context_to_sid(con, knownEvents + type) < 0) {
-	    ErrorF("XSELinux: a context_to_SID call failed!\n");
+	    ErrorF("SELinux: a context_to_SID call failed!\n");
 	    return BadAlloc;
 	}
 	freecon(con);
@@ -230,7 +230,7 @@ SELinuxEventToSID(unsigned type, security_id_t sid_of_window,
     /* Perform a transition to obtain the final SID */
     if (avc_compute_create(sid_of_window, knownEvents[type], SECCLASS_X_EVENT,
 			   &sid_return->sid) < 0) {
-	ErrorF("XSELinux: a compute_create call failed!\n");
+	ErrorF("SELinux: a compute_create call failed!\n");
 	return BadValue;
     }
 
@@ -607,13 +607,13 @@ SELinuxExtension(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 
 	/* Look in the mappings of property names to contexts */
 	if (selabel_lookup(label_hnd, &con, name, SELABEL_X_EXT) < 0) {
-	    ErrorF("XSELinux: a property label lookup failed!\n");
+	    ErrorF("SELinux: a property label lookup failed!\n");
 	    rec->status = BadValue;
 	    return;
 	}
 	/* Get a SID for context */
 	if (avc_context_to_sid(con, &sid) < 0) {
-	    ErrorF("XSELinux: a context_to_SID call failed!\n");
+	    ErrorF("SELinux: a context_to_SID call failed!\n");
 	    rec->status = BadAlloc;
 	    return;
 	}
@@ -623,7 +623,7 @@ SELinuxExtension(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	/* Perform a transition to obtain the final SID */
 	if (avc_compute_create(serv->sid, sid, SECCLASS_X_EXTENSION,
 			       &obj->sid) < 0) {
-	    ErrorF("XSELinux: a SID transition call failed!\n");
+	    ErrorF("SELinux: a SID transition call failed!\n");
 	    freecon(con);
 	    rec->status = BadValue;
 	    return;
@@ -658,13 +658,13 @@ SELinuxProperty(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 
 	/* Look in the mappings of property names to contexts */
 	if (selabel_lookup(label_hnd, &con, name, SELABEL_X_PROP) < 0) {
-	    ErrorF("XSELinux: a property label lookup failed!\n");
+	    ErrorF("SELinux: a property label lookup failed!\n");
 	    rec->status = BadValue;
 	    return;
 	}
 	/* Get a SID for context */
 	if (avc_context_to_sid(con, &sid) < 0) {
-	    ErrorF("XSELinux: a context_to_SID call failed!\n");
+	    ErrorF("SELinux: a context_to_SID call failed!\n");
 	    rec->status = BadAlloc;
 	    return;
 	}
@@ -674,7 +674,7 @@ SELinuxProperty(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	/* Perform a transition to obtain the final SID */
 	if (avc_compute_create(subj->sid, sid, SECCLASS_X_PROPERTY,
 			       &obj->sid) < 0) {
-	    ErrorF("XSELinux: a SID transition call failed!\n");
+	    ErrorF("SELinux: a SID transition call failed!\n");
 	    freecon(con);
 	    rec->status = BadValue;
 	    return;
@@ -732,7 +732,7 @@ SELinuxResource(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 
 	/* Perform a transition to obtain the final SID */
 	if (avc_compute_create(subj->sid, pobj->sid, class, &obj->sid) < 0) {
-	    ErrorF("XSELinux: a compute_create call failed!\n");
+	    ErrorF("SELinux: a compute_create call failed!\n");
 	    rec->status = BadValue;
 	    return;
 	}
@@ -766,7 +766,7 @@ SELinuxScreen(CallbackListPtr *pcbl, pointer is_saver, pointer calldata)
 	/* Perform a transition to obtain the final SID */
 	if (avc_compute_create(subj->sid, subj->sid, SECCLASS_X_SCREEN,
 			       &obj->sid) < 0) {
-	    ErrorF("XSELinux: a compute_create call failed!\n");
+	    ErrorF("SELinux: a compute_create call failed!\n");
 	    rec->status = BadValue;
 	    return;
 	}
@@ -883,16 +883,16 @@ SELinuxResourceState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	security_context_t ctx;
 	int rc = avc_sid_to_context(state->sid, &ctx);
 	if (rc < 0)
-	    FatalError("XSELinux: Failed to get security context!\n");
+	    FatalError("SELinux: Failed to get security context!\n");
 	rc = dixChangeWindowProperty(serverClient,
 				     pWin, atom_client_ctx, XA_STRING, 8,
 				     PropModeReplace, strlen(ctx), ctx, FALSE);
 	if (rc != Success)
-	    FatalError("XSELinux: Failed to set label property on window!\n");
+	    FatalError("SELinux: Failed to set label property on window!\n");
 	freecon(ctx);
     }
     else
-	FatalError("XSELinux: Unexpected unlabeled client found\n");
+	FatalError("SELinux: Unexpected unlabeled client found\n");
 
     state = dixLookupPrivate(&pWin->devPrivates, stateKey);
 
@@ -900,16 +900,16 @@ SELinuxResourceState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	security_context_t ctx;
 	int rc = avc_sid_to_context(state->sid, &ctx);
 	if (rc < 0)
-	    FatalError("XSELinux: Failed to get security context!\n");
+	    FatalError("SELinux: Failed to get security context!\n");
 	rc = dixChangeWindowProperty(serverClient,
 				     pWin, atom_ctx, XA_STRING, 8,
 				     PropModeReplace, strlen(ctx), ctx, FALSE);
 	if (rc != Success)
-	    FatalError("XSELinux: Failed to set label property on window!\n");
+	    FatalError("SELinux: Failed to set label property on window!\n");
 	freecon(ctx);
     }
     else
-	FatalError("XSELinux: Unexpected unlabeled window found\n");
+	FatalError("SELinux: Unexpected unlabeled window found\n");
 }
 
 static void
@@ -931,7 +931,7 @@ SELinuxSelectionState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 
 	if (avc_compute_create(subj->sid, subj->sid, SECCLASS_X_SELECTION,
 			       &obj->sid) < 0) {
-	    ErrorF("XSELinux: a compute_create call failed!\n");
+	    ErrorF("SELinux: a compute_create call failed!\n");
 	    obj->sid = unlabeled_sid;
 	}
 	break;
@@ -998,8 +998,8 @@ ProcSELinuxQueryVersion(ClientPtr client)
     rep.type = X_Reply;
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
-    rep.server_major = XSELINUX_MAJOR_VERSION;
-    rep.server_minor = XSELINUX_MINOR_VERSION;
+    rep.server_major = SELINUX_MAJOR_VERSION;
+    rep.server_minor = SELINUX_MINOR_VERSION;
     if (client->swapped) {
 	int n;
 	swaps(&rep.sequenceNumber, n);
@@ -1367,7 +1367,7 @@ SELinuxResetProc(ExtensionEntry *extEntry)
 }
 
 void
-XSELinuxExtensionInit(INITARGS)
+SELinuxExtensionInit(INITARGS)
 {
     ExtensionEntry *extEntry;
     struct selinux_opt options[] = { { SELABEL_OPT_VALIDATE, (char *)1 } };
@@ -1376,7 +1376,7 @@ XSELinuxExtensionInit(INITARGS)
 
     /* Setup SELinux stuff */
     if (!is_selinux_enabled()) {
-        ErrorF("XSELinux: SELinux not enabled, disabling SELinux support.\n");
+        ErrorF("SELinux: SELinux not enabled, disabling SELinux support.\n");
         return;
     }
 
@@ -1385,42 +1385,42 @@ XSELinuxExtensionInit(INITARGS)
 
     if (selinux_set_mapping(map) < 0) {
 	if (errno == EINVAL) {
-	    ErrorF("XSELinux: Invalid object class mapping, disabling SELinux support.\n");
+	    ErrorF("SELinux: Invalid object class mapping, disabling SELinux support.\n");
 	    return;
 	}
-	FatalError("XSELinux: Failed to set up security class mapping\n");
+	FatalError("SELinux: Failed to set up security class mapping\n");
     }
 
     if (avc_open(NULL, 0) < 0)
-	FatalError("XSELinux: Couldn't initialize SELinux userspace AVC\n");
+	FatalError("SELinux: Couldn't initialize SELinux userspace AVC\n");
     avc_active = 1;
 
     label_hnd = selabel_open(SELABEL_CTX_X, options, 1);
     if (!label_hnd)
-	FatalError("XSELinux: Failed to open x_contexts mapping in policy\n");
+	FatalError("SELinux: Failed to open x_contexts mapping in policy\n");
 
     if (security_get_initial_context("unlabeled", &con) < 0)
-	FatalError("XSELinux: Failed to look up unlabeled context\n");
+	FatalError("SELinux: Failed to look up unlabeled context\n");
     if (avc_context_to_sid(con, &unlabeled_sid) < 0)
-	FatalError("XSELinux: a context_to_SID call failed!\n");
+	FatalError("SELinux: a context_to_SID call failed!\n");
     freecon(con);
 
     /* Prepare for auditing */
     audit_fd = audit_open();
     if (audit_fd < 0)
-        FatalError("XSELinux: Failed to open the system audit log\n");
+        FatalError("SELinux: Failed to open the system audit log\n");
 
     /* Allocate private storage */
     if (!dixRequestPrivate(stateKey, sizeof(SELinuxStateRec)))
-	FatalError("XSELinux: Failed to allocate private storage.\n");
+	FatalError("SELinux: Failed to allocate private storage.\n");
 
     /* Create atoms for doing window labeling */
     atom_ctx = MakeAtom("_SELINUX_CONTEXT", 16, TRUE);
     if (atom_ctx == BAD_RESOURCE)
-	FatalError("XSELinux: Failed to create atom\n");
+	FatalError("SELinux: Failed to create atom\n");
     atom_client_ctx = MakeAtom("_SELINUX_CLIENT_CONTEXT", 23, TRUE);
     if (atom_client_ctx == BAD_RESOURCE)
-	FatalError("XSELinux: Failed to create atom\n");
+	FatalError("SELinux: Failed to create atom\n");
 
     /* Register callbacks */
     ret &= dixRegisterPrivateInitFunc(stateKey, SELinuxStateInit, NULL);
@@ -1443,11 +1443,11 @@ XSELinuxExtensionInit(INITARGS)
     ret &= XaceRegisterCallback(XACE_SCREEN_ACCESS, SELinuxScreen, NULL);
     ret &= XaceRegisterCallback(XACE_SCREENSAVER_ACCESS, SELinuxScreen, truep);
     if (!ret)
-	FatalError("XSELinux: Failed to register one or more callbacks\n");
+	FatalError("SELinux: Failed to register one or more callbacks\n");
 
     /* Add extension to server */
-    extEntry = AddExtension(XSELINUX_EXTENSION_NAME,
-			    XSELinuxNumberEvents, XSELinuxNumberErrors,
+    extEntry = AddExtension(SELINUX_EXTENSION_NAME,
+			    SELinuxNumberEvents, SELinuxNumberErrors,
 			    ProcSELinuxDispatch, SProcSELinuxDispatch,
 			    SELinuxResetProc, StandardMinorOpcode);
 
diff --git a/Xext/xselinux.h b/Xext/xselinux.h
index 9800d5ae4..ba1380b57 100644
--- a/Xext/xselinux.h
+++ b/Xext/xselinux.h
@@ -23,11 +23,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "dixaccess.h"
 
 /* Extension info */
-#define XSELINUX_EXTENSION_NAME		"SELinux"
-#define XSELINUX_MAJOR_VERSION		1
-#define XSELINUX_MINOR_VERSION		0
-#define XSELinuxNumberEvents		0
-#define XSELinuxNumberErrors		0
+#define SELINUX_EXTENSION_NAME		"SELinux"
+#define SELINUX_MAJOR_VERSION		1
+#define SELINUX_MINOR_VERSION		0
+#define SELinuxNumberEvents		0
+#define SELinuxNumberErrors		0
 
 /* Extension protocol */
 #define X_SELinuxQueryVersion			0
diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h
index 191b3ef89..99d714c4f 100644
--- a/hw/xfree86/dixmods/extmod/modinit.h
+++ b/hw/xfree86/dixmods/extmod/modinit.h
@@ -130,7 +130,7 @@ extern void XaceExtensionInit(INITARGS);
 #endif
 
 #ifdef XSELINUX
-extern void XSELinuxExtensionInit(INITARGS);
+extern void SELinuxExtensionInit(INITARGS);
 #endif
 
 #if 1
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 319d2ced6..b14690756 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -330,7 +330,7 @@ extern void XaceExtensionInit(INITARGS);
 extern void SecurityExtensionInit(INITARGS);
 #endif
 #ifdef XSELINUX
-extern void XSELinuxExtensionInit(INITARGS);
+extern void SELinuxExtensionInit(INITARGS);
 #endif
 #ifdef XPRINT
 extern void XpExtensionInit(INITARGS);
@@ -606,7 +606,7 @@ InitExtensions(argc, argv)
     if (!noSecurityExtension) SecurityExtensionInit();
 #endif
 #ifdef XSELINUX
-    XSELinuxExtensionInit();
+    SELinuxExtensionInit();
 #endif
 #ifdef XPRINT
     XpExtensionInit(); /* server-specific extension, cannot be disabled */
@@ -703,7 +703,7 @@ static ExtensionModule staticExtensions[] = {
     { SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension, NULL, NULL },
 #endif
 #ifdef XSELINUX
-    { XSELinuxExtensionInit, XSELINUX_EXTENSION_NAME, NULL, NULL, NULL },
+    { SELinuxExtensionInit, SELINUX_EXTENSION_NAME, NULL, NULL, NULL },
 #endif
 #ifdef XPRINT
     { XpExtensionInit, XP_PRINTNAME, NULL, NULL, NULL },

From 3b23dd9fd43a28033d0af7b02088b0c6ca433158 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 28 Dec 2007 13:29:45 -0500
Subject: [PATCH 361/552] xselinux: Fix whitespace warnings.

---
 Xext/xselinux.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 6550c7f72..4629e9027 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -1145,31 +1145,31 @@ ProcSELinuxDispatch(ClientPtr client)
     REQUEST(xReq);
     switch (stuff->data) {
     case X_SELinuxQueryVersion:
-        return ProcSELinuxQueryVersion(client);
+	return ProcSELinuxQueryVersion(client);
     case X_SELinuxSetSelectionManager:
 	return ProcSELinuxSetSelectionManager(client);
     case X_SELinuxGetSelectionManager:
-    	return ProcSELinuxGetSelectionManager(client);
+	return ProcSELinuxGetSelectionManager(client);
     case X_SELinuxSetDeviceCreateContext:
-    	return ProcSELinuxSetDeviceCreateContext(client);
+	return ProcSELinuxSetDeviceCreateContext(client);
     case X_SELinuxGetDeviceCreateContext:
-    	return ProcSELinuxGetDeviceCreateContext(client);
+	return ProcSELinuxGetDeviceCreateContext(client);
     case X_SELinuxSetDeviceContext:
-    	return ProcSELinuxSetDeviceContext(client);
+	return ProcSELinuxSetDeviceContext(client);
     case X_SELinuxGetDeviceContext:
-    	return ProcSELinuxGetDeviceContext(client);
+	return ProcSELinuxGetDeviceContext(client);
     case X_SELinuxSetPropertyCreateContext:
-    	return ProcSELinuxSetPropertyCreateContext(client);
+	return ProcSELinuxSetPropertyCreateContext(client);
     case X_SELinuxGetPropertyCreateContext:
-    	return ProcSELinuxGetPropertyCreateContext(client);
+	return ProcSELinuxGetPropertyCreateContext(client);
     case X_SELinuxGetPropertyContext:
-    	return ProcSELinuxGetPropertyContext(client);
+	return ProcSELinuxGetPropertyContext(client);
     case X_SELinuxSetWindowCreateContext:
-    	return ProcSELinuxSetWindowCreateContext(client);
+	return ProcSELinuxSetWindowCreateContext(client);
     case X_SELinuxGetWindowCreateContext:
-    	return ProcSELinuxGetWindowCreateContext(client);
+	return ProcSELinuxGetWindowCreateContext(client);
     case X_SELinuxGetWindowContext:
-    	return ProcSELinuxGetWindowContext(client);
+	return ProcSELinuxGetWindowContext(client);
     default:
 	return BadRequest;
     }

From bac3ecde39cc914ab515991234b7dc2138005b84 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 28 Dec 2007 13:33:39 -0500
Subject: [PATCH 362/552] EDID 1.4: Allow for sync range offsets.

Table 3.26: Display Range Limits & Timing Descriptor Block Definition
---
 hw/xfree86/ddc/edid.h | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/hw/xfree86/ddc/edid.h b/hw/xfree86/ddc/edid.h
index 4487273cd..02f5d09c5 100644
--- a/hw/xfree86/ddc/edid.h
+++ b/hw/xfree86/ddc/edid.h
@@ -1,5 +1,5 @@
-
-/* edid.h: defines to parse an EDID block 
+/*
+ * edid.h: defines to parse an EDID block 
  *
  * This file contains all information to interpret a standard EDIC block 
  * transmitted by a display device via DDC (Display Data Channel). So far 
@@ -241,14 +241,18 @@
 #define SERIAL_NUMBER 0xFF
 #define ASCII_STR 0xFE
 #define MONITOR_RANGES 0xFD
+#define _MIN_V_OFFSET(x) ((!!(x[4] & 0x01)) * 255)
+#define _MAX_V_OFFSET(x) ((!!(x[4] & 0x02)) * 255)
+#define _MIN_H_OFFSET(x) ((!!(x[4] & 0x04)) * 255)
+#define _MAX_H_OFFSET(x) ((!!(x[4] & 0x08)) * 255)
 #define _MIN_V(x) x[5]
-#define MIN_V _MIN_V(c) 
+#define MIN_V (_MIN_V(c) + _MIN_V_OFFSET(c))
 #define _MAX_V(x) x[6]
-#define MAX_V _MAX_V(c) 
+#define MAX_V (_MAX_V(c) + _MAX_V_OFFSET(c))
 #define _MIN_H(x) x[7]
-#define MIN_H _MIN_H(c) 
+#define MIN_H (_MIN_H(c) + _MIN_H_OFFSET(c))
 #define _MAX_H(x) x[8]
-#define MAX_H _MAX_H(c) 
+#define MAX_H (_MAX_H(c) + _MAX_H_OFFSET(c))
 #define _MAX_CLOCK(x) x[9]
 #define MAX_CLOCK _MAX_CLOCK(c) 
 #define _HAVE_2ND_GTF(x) (x[10] == 0x02)

From f6df66cc89bcd0a0be2e7bca05839fdd428c1d4c Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 28 Dec 2007 13:55:39 -0500
Subject: [PATCH 363/552] EDID 1.4: Trivial support for new detailed sections.

Nothing actually decoded yet, but at least we print what they are.

New in EDID 1.4:
- Color Management Data (0xF9), Section 3.10.3.7
- CVT 3 Byte Code Descriptor (0xF8), Section 3.10.3.8
- Established Timings III Descriptor (0xF7), section 3.10.3.9
- Manufacturer-specified data tag (0x00 - 0x0F), section 3.10.3.12
---
 hw/xfree86/ddc/edid.h           |  8 +++++++
 hw/xfree86/ddc/interpret_edid.c | 38 ++++++++++++++++++++++++++++++---
 hw/xfree86/ddc/print_edid.c     | 17 +++++++++++++++
 3 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/hw/xfree86/ddc/edid.h b/hw/xfree86/ddc/edid.h
index 02f5d09c5..2e3e7df4f 100644
--- a/hw/xfree86/ddc/edid.h
+++ b/hw/xfree86/ddc/edid.h
@@ -286,6 +286,9 @@
 #define _WHITE_GAMMA2(x) _GAMMA(x[14])
 #define WHITE_GAMMA2 _WHITE_GAMMA2(c)
 #define ADD_STD_TIMINGS 0xFA
+#define COLOR_MANAGEMENT_DATA 0xF9
+#define CVT_3BYTE_DATA 0xF8
+#define ADD_EST_TIMINGS 0xF7
 #define ADD_DUMMY 0x10
 
 #define _NEXT_DT_MD_SECTION(x) (x = (x + DET_TIMING_INFO_LEN))
@@ -418,8 +421,13 @@ struct detailed_timings {
 #define DS_RANGES 0xFD
 #define DS_WHITE_P 0xFB
 #define DS_STD_TIMINGS 0xFA
+#define DS_CMD 0xF9
+#define DS_CVT 0xF8
+#define DS_EST_III 0xF7
 #define DS_DUMMY 0x10
 #define DS_UNKOWN 0x100 /* type is an int */
+#define DS_VENDOR 0x101
+#define DS_VENDOR_MAX 0x110
 
 struct monitor_ranges {
   int min_v;
diff --git a/hw/xfree86/ddc/interpret_edid.c b/hw/xfree86/ddc/interpret_edid.c
index 7b4b2b9ec..ecec2b039 100644
--- a/hw/xfree86/ddc/interpret_edid.c
+++ b/hw/xfree86/ddc/interpret_edid.c
@@ -1,8 +1,28 @@
-
-/* interpret_edid.c: interpret a primary EDID block
- * 
+/*
  * Copyright 1998 by Egbert Eich <Egbert.Eich@Physik.TU-Darmstadt.DE>
+ * Copyright 2007 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software")
+ * to deal in the software without restriction, including without limitation
+ * on the rights to use, copy, modify, merge, publish, distribute, sub
+ * license, and/or sell copies of the Software, and to permit persons to whom
+ * them Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTIBILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES, OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT, OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * interpret_edid.c: interpret a primary EDID block
  */
+
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
@@ -207,6 +227,15 @@ get_dt_md_section(Uchar *c, struct edid_version *ver,
 	det_mon[i].type = DS_STD_TIMINGS;
 	get_dst_timing_section(c,det_mon[i].section.std_t, ver);
 	break;
+      case COLOR_MANAGEMENT_DATA:
+	det_mon[i].type = DS_CMD;
+	break;
+      case CVT_3BYTE_DATA:
+	det_mon[i].type = DS_CVT;
+	break;
+      case ADD_EST_TIMINGS:
+	det_mon[i].type = DS_EST_III;
+	break;
       case ADD_DUMMY:
 	det_mon[i].type = DS_DUMMY;
         break;
@@ -214,6 +243,9 @@ get_dt_md_section(Uchar *c, struct edid_version *ver,
         det_mon[i].type = DS_UNKOWN;
         break;
       }
+      if (c[3] <= 0x0F) {
+	det_mon[i].type = DS_VENDOR + c[3];
+      }
     } else { 
       det_mon[i].type = DT;
       get_detailed_timing_section(c,&det_mon[i].section.d_timings);
diff --git a/hw/xfree86/ddc/print_edid.c b/hw/xfree86/ddc/print_edid.c
index 30b607d4f..17e21aca8 100644
--- a/hw/xfree86/ddc/print_edid.c
+++ b/hw/xfree86/ddc/print_edid.c
@@ -290,10 +290,27 @@ print_detailed_monitor_section(int scrnIndex,
 			       m[i].section.wp[j].white_y,
 			       m[i].section.wp[j].white_gamma);
 	    break;
+	case DS_CMD:
+	    xf86DrvMsg(scrnIndex, X_INFO,
+		       "Color management data: (not decoded)\n");
+	    break;
+	case DS_CVT:
+	    xf86DrvMsg(scrnIndex, X_INFO,
+		       "CVT 3-byte-code modes: (not decoded)\n");
+	    break;
+	case DS_EST_III:
+	    xf86DrvMsg(scrnIndex, X_INFO,
+		       "Established timings III: (not decoded)\n");
+	    break;
 	case DS_DUMMY:
 	default:
 	    break;
 	}
+	if (m[i].type >= DS_VENDOR && m[i].type <= DS_VENDOR_MAX) {
+	    xf86DrvMsg(scrnIndex, X_WARNING,
+		       "Unknown vendor-specific block %hx\n",
+		       m[i].type - DS_VENDOR);
+	}
     }
 }
   

From a948216dccb5ee577a50a42035dc9bc49d0a00c6 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 28 Dec 2007 15:00:41 -0500
Subject: [PATCH 364/552] EDID 1.4: Decode CVT 3-byte codes and add them to the
 mode pool.

Section 3.10.3.8: CVT 3 Byte Code Descriptor Definition.
---
 hw/xfree86/ddc/edid.h            | 26 +++++++++++++++++++-----
 hw/xfree86/ddc/interpret_edid.c  | 29 +++++++++++++++++++++++++++
 hw/xfree86/ddc/print_edid.c      | 21 +++++++++++++++++++-
 hw/xfree86/modes/xf86EdidModes.c | 34 ++++++++++++++++++++++++++++++++
 4 files changed, 104 insertions(+), 6 deletions(-)

diff --git a/hw/xfree86/ddc/edid.h b/hw/xfree86/ddc/edid.h
index 2e3e7df4f..6708eaaa5 100644
--- a/hw/xfree86/ddc/edid.h
+++ b/hw/xfree86/ddc/edid.h
@@ -449,17 +449,33 @@ struct whitePoints{
   float white_gamma;
 };
 
+struct cvt_timings {
+    int width;
+    int height;
+    int rate;
+    int rates;
+};
+
+/*
+ * Be careful when adding new sections; this structure can't grow, it's
+ * embedded in the middle of xf86Monitor which is ABI.  Sizes below are
+ * in bytes, for ILP32 systems.  If all else fails just copy the section
+ * literally like serial and friends.
+ */
 struct detailed_monitor_section {
   int type;
   union {
-    struct detailed_timings d_timings;
+    struct detailed_timings d_timings;	/* 56 */
     Uchar serial[13];
     Uchar ascii_data[13];
     Uchar name[13];
-    struct monitor_ranges ranges;
-    struct std_timings std_t[5];
-    struct whitePoints wp[2];
-  } section;
+    struct monitor_ranges ranges;	/* 40 */
+    struct std_timings std_t[5];	/* 80 */
+    struct whitePoints wp[2];		/* 32 */
+    /* color management data */
+    struct cvt_timings cvt[4];		/* 64 */
+    /* established timings III */
+  } section;				/* max: 80 */
 };
 
 typedef struct {
diff --git a/hw/xfree86/ddc/interpret_edid.c b/hw/xfree86/ddc/interpret_edid.c
index ecec2b039..982a502fd 100644
--- a/hw/xfree86/ddc/interpret_edid.c
+++ b/hw/xfree86/ddc/interpret_edid.c
@@ -174,6 +174,34 @@ get_established_timing_section(Uchar *c, struct established_timings *r)
     r->t_manu = T_MANU;
 }
 
+static void
+get_cvt_timing_section(Uchar *c, struct cvt_timings *r)
+{
+    int i;
+
+    for (i = 0; i < 4; i++) {
+	if (c[0] && c[1] && c[2]) {
+	    r[i].height = (c[0] + ((c[1] & 0xF0) << 8) + 1) * 2;
+	    switch (c[1] & 0xc0) {
+		case 0x00: r[i].width = r[i].height * 4 / 3; break;
+		case 0x40: r[i].width = r[i].height * 16 / 9; break;
+		case 0x80: r[i].width = r[i].height * 16 / 10; break;
+		case 0xc0: r[i].width = r[i].height * 15 / 9; break;
+	    }
+	    switch (c[2] & 0x60) {
+		case 0x00: r[i].rate = 50; break;
+		case 0x20: r[i].rate = 60; break;
+		case 0x40: r[i].rate = 75; break;
+		case 0x60: r[i].rate = 85; break;
+	    }
+	    r[i].rates = c[2] & 0x1f;
+	} else {
+	    return;
+	}
+	c += 3;
+    }
+}
+
 static void
 get_std_timing_section(Uchar *c, struct std_timings *r,
 		       struct edid_version *v)
@@ -232,6 +260,7 @@ get_dt_md_section(Uchar *c, struct edid_version *ver,
 	break;
       case CVT_3BYTE_DATA:
 	det_mon[i].type = DS_CVT;
+	get_cvt_timing_section(c, det_mon[i].section.cvt);
 	break;
       case ADD_EST_TIMINGS:
 	det_mon[i].type = DS_EST_III;
diff --git a/hw/xfree86/ddc/print_edid.c b/hw/xfree86/ddc/print_edid.c
index 17e21aca8..5aebc6e74 100644
--- a/hw/xfree86/ddc/print_edid.c
+++ b/hw/xfree86/ddc/print_edid.c
@@ -235,6 +235,24 @@ print_std_timings(int scrnIndex, struct std_timings *t)
 	}
     }
 }
+
+static void
+print_cvt_timings(int si, struct cvt_timings *t)
+{
+    int i;
+
+    for (i = 0; i < 4; i++) {
+	if (t[i].height) {
+	    xf86DrvMsg(si, X_INFO, "%dx%d @ %s%s%s%s%s Hz\n",
+		    t[i].width, t[i].height,
+		    t[i].rates & 0x10 ? "50," : "",
+		    t[i].rates & 0x08 ? "60," : "",
+		    t[i].rates & 0x04 ? "75," : "",
+		    t[i].rates & 0x02 ? "85," : "",
+		    t[i].rates & 0x01 ? "60RB" : "");
+	} else break;
+    }
+}
   
 static void
 print_detailed_monitor_section(int scrnIndex,
@@ -296,7 +314,8 @@ print_detailed_monitor_section(int scrnIndex,
 	    break;
 	case DS_CVT:
 	    xf86DrvMsg(scrnIndex, X_INFO,
-		       "CVT 3-byte-code modes: (not decoded)\n");
+		       "CVT 3-byte-code modes:\n");
+	    print_cvt_timings(scrnIndex, m[i].section.cvt);
 	    break;
 	case DS_EST_III:
 	    xf86DrvMsg(scrnIndex, X_INFO,
diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c
index a125d8c82..d8c61617e 100644
--- a/hw/xfree86/modes/xf86EdidModes.c
+++ b/hw/xfree86/modes/xf86EdidModes.c
@@ -354,6 +354,36 @@ DDCModeFromDetailedTiming(int scrnIndex, struct detailed_timings *timing,
     return Mode;
 }
 
+static DisplayModePtr
+DDCModesFromCVT(int scrnIndex, struct cvt_timings *t)
+{
+    DisplayModePtr modes = NULL;
+    int i;
+
+    for (i = 0; i < 4; i++) {
+	if (t[i].height) {
+	    if (t[i].rates & 0x10)
+		modes = xf86ModesAdd(modes,
+			xf86CVTMode(t[i].width, t[i].height, 50, 0, 0));
+	    if (t[i].rates & 0x08)
+		modes = xf86ModesAdd(modes,
+			xf86CVTMode(t[i].width, t[i].height, 60, 0, 0));
+	    if (t[i].rates & 0x04)
+		modes = xf86ModesAdd(modes,
+			xf86CVTMode(t[i].width, t[i].height, 75, 0, 0));
+	    if (t[i].rates & 0x02)
+		modes = xf86ModesAdd(modes,
+			xf86CVTMode(t[i].width, t[i].height, 85, 0, 0));
+	    if (t[i].rates & 0x01)
+		modes = xf86ModesAdd(modes,
+			xf86CVTMode(t[i].width, t[i].height, 60, 1, 0));
+	} else break;
+    }
+
+    return modes;
+}
+
+
 /*
  *
  */
@@ -527,6 +557,10 @@ xf86DDCGetModes(int scrnIndex, xf86MonPtr DDC)
 					      quirks);
             Modes = xf86ModesAdd(Modes, Mode);
             break;
+	case DS_CVT:
+	    Mode = DDCModesFromCVT(scrnIndex, det_mon->section.cvt);
+	    Modes = xf86ModesAdd(Modes, Mode);
+	    break;
         default:
             break;
         }

From 14b5c8a447db0395fb14b2d404eafb1d8e4fb817 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 28 Dec 2007 15:52:42 -0500
Subject: [PATCH 365/552] EDID 1.4: Extended support for digital interfaces.

Section 3.6.1, Table 3.11: Video Input Definition.
---
 hw/xfree86/ddc/edid.h           |   7 +
 hw/xfree86/ddc/interpret_edid.c |   6 +-
 hw/xfree86/ddc/print_edid.c     | 262 ++++++++++++++++++--------------
 3 files changed, 157 insertions(+), 118 deletions(-)

diff --git a/hw/xfree86/ddc/edid.h b/hw/xfree86/ddc/edid.h
index 6708eaaa5..25163a69f 100644
--- a/hw/xfree86/ddc/edid.h
+++ b/hw/xfree86/ddc/edid.h
@@ -125,6 +125,10 @@
 #define SYNC _SYNC(GET(D_INPUT))
 #define _DFP(x) (x & 0x01)
 #define DFP _DFP(GET(D_INPUT))
+#define _BPC(x) ((x & 0x70) >> 4)
+#define BPC _BPC(GET(D_INPUT))
+#define _DIGITAL_INTERFACE(x) (x & 0x0F)
+#define DIGITAL_INTERFACE _DIGITAL_INTERFACE(GET(D_INPUT))
 #define _GAMMA(x) (x == 0xff ? 1.0 : ((x + 100.0)/100.0))
 #define GAMMA _GAMMA(GET(D_GAMMA))
 #define HSIZE_MAX GET(D_HSIZE)
@@ -364,6 +368,9 @@ struct disp_features {
   unsigned int input_setup:1;
   unsigned int input_sync:5;
   unsigned int input_dfp:1;
+  unsigned int input_bpc:3;
+  unsigned int input_interface:4;
+  /* 15 bit hole */
   int hsize;
   int vsize;
   float gamma;
diff --git a/hw/xfree86/ddc/interpret_edid.c b/hw/xfree86/ddc/interpret_edid.c
index 982a502fd..045c12d9d 100644
--- a/hw/xfree86/ddc/interpret_edid.c
+++ b/hw/xfree86/ddc/interpret_edid.c
@@ -148,8 +148,12 @@ get_display_section(Uchar *c, struct disp_features *r,
 	r->input_voltage = INPUT_VOLTAGE;
 	r->input_setup = SETUP;
 	r->input_sync = SYNC;
-    } else if (v->version > 1 || v->revision > 2)
+    } else if (v->revision == 2 || v->revision == 3) {
 	r->input_dfp = DFP;
+    } else if (v->revision >= 4) {
+	r->input_bpc = BPC;
+	r->input_interface = DIGITAL_INTERFACE;
+    }
     r->hsize = HSIZE_MAX;
     r->vsize = VSIZE_MAX;
     r->gamma = GAMMA;
diff --git a/hw/xfree86/ddc/print_edid.c b/hw/xfree86/ddc/print_edid.c
index 5aebc6e74..9bd7ebcf5 100644
--- a/hw/xfree86/ddc/print_edid.c
+++ b/hw/xfree86/ddc/print_edid.c
@@ -1,8 +1,28 @@
-
-/* print_edid.c: print out all information retrieved from display device 
- * 
+/*
  * Copyright 1998 by Egbert Eich <Egbert.Eich@Physik.TU-Darmstadt.DE>
+ * Copyright 2007 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software")
+ * to deal in the software without restriction, including without limitation
+ * on the rights to use, copy, modify, merge, publish, distribute, sub
+ * license, and/or sell copies of the Software, and to permit persons to whom
+ * them Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTIBILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES, OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT, OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * print_edid.c: print out all information retrieved from display device  
  */
+
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
@@ -11,53 +31,9 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86DDC.h"
+#include "edid.h"
   
-static void print_vendor(int scrnIndex, struct vendor *);
-static void print_version(int scrnIndex, struct edid_version *);
-static void print_display(int scrnIndex, struct disp_features *,
-			  struct edid_version *);
-static void print_established_timings(int scrnIndex,
-				      struct established_timings *);
-static void print_std_timings(int scrnIndex, struct std_timings *);
-static void print_detailed_monitor_section(int scrnIndex,
-					   struct detailed_monitor_section *);
-static void print_detailed_timings(int scrnIndex, struct detailed_timings *);
-
-static void print_input_features(int scrnIndex, struct disp_features *);
-static void print_dpms_features(int scrnIndex, struct disp_features *,
-				struct edid_version *v);
-static void print_whitepoint(int scrnIndex, struct disp_features *);
-static void print_number_sections(int scrnIndex, int);
-
 #define EDID_WIDTH	16
-
-xf86MonPtr
-xf86PrintEDID(xf86MonPtr m)
-{
-    CARD16 i, j;
-    char buf[EDID_WIDTH * 2 + 1];
-
-    if (!(m)) return NULL;
-
-    print_vendor(m->scrnIndex,&m->vendor);
-    print_version(m->scrnIndex,&m->ver);
-    print_display(m->scrnIndex,&m->features, &m->ver);
-    print_established_timings(m->scrnIndex,&m->timings1);
-    print_std_timings(m->scrnIndex,m->timings2);
-    print_detailed_monitor_section(m->scrnIndex,m->det_mon);
-    print_number_sections(m->scrnIndex,m->no_sections);
-
-    xf86DrvMsg(m->scrnIndex, X_INFO, "EDID (in hex):\n");
- 
-    for (i = 0; i < 128; i += j) {
-	for (j = 0; j < EDID_WIDTH; ++j) {
-	    sprintf(&buf[j * 2], "%02x", m->rawData[i + j]);
-	}
-	xf86DrvMsg(m->scrnIndex, X_INFO, "\t%s\n", buf);
-    }
-    
-    return m;
-}
   
 static void
 print_vendor(int scrnIndex, struct vendor *c)
@@ -66,7 +42,7 @@ print_vendor(int scrnIndex, struct vendor *c)
 	(char *)&c->name, c->prod_id, c->serial);
     xf86DrvMsg(scrnIndex, X_INFO, "Year: %u  Week: %u\n", c->year, c->week);
 }
-  
+
 static void
 print_version(int scrnIndex, struct edid_version *c)
 {
@@ -74,32 +50,38 @@ print_version(int scrnIndex, struct edid_version *c)
 	       c->revision);  
 }
   
-static void
-print_display(int scrnIndex, struct disp_features *disp,
-	      struct edid_version *version)
-{
-    print_input_features(scrnIndex,disp);
-    xf86DrvMsg(scrnIndex,X_INFO,"Max H-Image Size [cm]: ");
-    if (disp->hsize)
-	xf86ErrorF("horiz.: %i  ",disp->hsize);
-    else
-	xf86ErrorF("H-Size may change,  ");
-    if (disp->vsize)
-	xf86ErrorF("vert.: %i\n",disp->vsize);
-      else
-	xf86ErrorF("V-Size may change\n");
-    xf86DrvMsg(scrnIndex,X_INFO,"Gamma: %.2f\n", disp->gamma);
-    print_dpms_features(scrnIndex,disp,version);
-    print_whitepoint(scrnIndex,disp);
-}
-  
+static const char *digital_interfaces[] = {
+    "undefined",
+    "DVI",
+    "HDMI-a",
+    "HDMI-b",
+    "MDDI",
+    "DisplayPort",
+    "unknown"
+};
+
 static void 
-print_input_features(int scrnIndex, struct disp_features *c)
+print_input_features(int scrnIndex, struct disp_features *c,
+		     struct edid_version *v)
 {
     if (DIGITAL(c->input_type)) {
-	xf86DrvMsg(scrnIndex,X_INFO,"Digital Display Input\n");
-	if (DFP1(c->input_dfp))
-	    xf86DrvMsg(scrnIndex,X_INFO,"DFP 1.x compatible TMDS\n");
+	xf86DrvMsg(scrnIndex, X_INFO, "Digital Display Input\n");
+	if (v->revision == 2 || v->revision == 3) {
+	    if (DFP1(c->input_dfp))
+		xf86DrvMsg(scrnIndex, X_INFO, "DFP 1.x compatible TMDS\n");
+	} else if (v->revision >= 4) {
+	    int interface = c->input_interface;
+	    int bpc = c->input_bpc;
+	    if (interface > 6)
+		interface = 6; /* unknown */
+	    if (bpc == 0 || bpc == 7)
+		xf86DrvMsg(scrnIndex, X_INFO, "Undefined color depth\n");
+	    else
+		xf86DrvMsg(scrnIndex, X_INFO, "%d bits per channel\n",
+			   bpc * 2 + 4);
+	    xf86DrvMsg(scrnIndex, X_INFO, "Digital interface is %s\n",
+		       digital_interfaces[interface]);
+	}
     } else {
 	xf86DrvMsg(scrnIndex,X_INFO,"Analog Display Input,  ");
 	xf86ErrorF("Input Voltage Level: ");
@@ -187,7 +169,26 @@ print_whitepoint(int scrnIndex, struct disp_features *disp)
     xf86ErrorF("whiteX: %.3f whiteY: %.3f\n",
 	       disp->whitex,disp->whitey);
 }
-  
+
+static void
+print_display(int scrnIndex, struct disp_features *disp,
+	      struct edid_version *version)
+{
+    print_input_features(scrnIndex, disp, version);
+    xf86DrvMsg(scrnIndex,X_INFO,"Max H-Image Size [cm]: ");
+    if (disp->hsize)
+	xf86ErrorF("horiz.: %i  ",disp->hsize);
+    else
+	xf86ErrorF("H-Size may change,  ");
+    if (disp->vsize)
+	xf86ErrorF("vert.: %i\n",disp->vsize);
+      else
+	xf86ErrorF("V-Size may change\n");
+    xf86DrvMsg(scrnIndex,X_INFO,"Gamma: %.2f\n", disp->gamma);
+    print_dpms_features(scrnIndex,disp,version);
+    print_whitepoint(scrnIndex,disp);
+}
+
 static void 
 print_established_timings(int scrnIndex, struct established_timings *t)
 {
@@ -253,7 +254,50 @@ print_cvt_timings(int si, struct cvt_timings *t)
 	} else break;
     }
 }
-  
+
+static void
+print_detailed_timings(int scrnIndex, struct detailed_timings *t)
+{
+
+    if (t->clock > 15000000) {  /* sanity check */
+	xf86DrvMsg(scrnIndex,X_INFO,"Supported additional Video Mode:\n");
+	xf86DrvMsg(scrnIndex,X_INFO,"clock: %.1f MHz   ",t->clock/1000000.0);
+	xf86ErrorF("Image Size:  %i x %i mm\n",t->h_size,t->v_size); 
+	xf86DrvMsg(scrnIndex,X_INFO,
+		   "h_active: %i  h_sync: %i  h_sync_end %i h_blank_end %i ",
+		   t->h_active, t->h_sync_off + t->h_active,
+		   t->h_sync_off + t->h_sync_width + t->h_active,
+		   t->h_active + t->h_blanking);
+	xf86ErrorF("h_border: %i\n",t->h_border);
+	xf86DrvMsg(scrnIndex,X_INFO,
+		   "v_active: %i  v_sync: %i  v_sync_end %i v_blanking: %i ",
+		   t->v_active, t->v_sync_off + t->v_active,
+		   t->v_sync_off + t->v_sync_width + t->v_active,
+		   t->v_active + t->v_blanking);
+	xf86ErrorF("v_border: %i\n",t->v_border);
+	if (IS_STEREO(t->stereo)) {
+	    xf86DrvMsg(scrnIndex,X_INFO,"Stereo: ");
+	    if (IS_RIGHT_STEREO(t->stereo)) {
+		if (!t->stereo_1)
+		    xf86ErrorF("right channel on sync\n");
+		else
+		    xf86ErrorF("left channel on sync\n");
+	    } else if (IS_LEFT_STEREO(t->stereo)) {
+		if (!t->stereo_1)
+		    xf86ErrorF("right channel on even line\n");
+		else 
+		    xf86ErrorF("left channel on evel line\n");
+	    }
+	    if (IS_4WAY_STEREO(t->stereo)) {
+		if (!t->stereo_1)
+		    xf86ErrorF("4-way interleaved\n");
+		else
+		    xf86ErrorF("side-by-side interleaved");
+	    }
+	}
+    }
+}
+
 static void
 print_detailed_monitor_section(int scrnIndex,
 			       struct detailed_monitor_section *m)
@@ -333,49 +377,6 @@ print_detailed_monitor_section(int scrnIndex,
     }
 }
   
-static void
-print_detailed_timings(int scrnIndex, struct detailed_timings *t)
-{
-
-    if (t->clock > 15000000) {  /* sanity check */
-	xf86DrvMsg(scrnIndex,X_INFO,"Supported additional Video Mode:\n");
-	xf86DrvMsg(scrnIndex,X_INFO,"clock: %.1f MHz   ",t->clock/1000000.0);
-	xf86ErrorF("Image Size:  %i x %i mm\n",t->h_size,t->v_size); 
-	xf86DrvMsg(scrnIndex,X_INFO,
-		   "h_active: %i  h_sync: %i  h_sync_end %i h_blank_end %i ",
-		   t->h_active, t->h_sync_off + t->h_active,
-		   t->h_sync_off + t->h_sync_width + t->h_active,
-		   t->h_active + t->h_blanking);
-	xf86ErrorF("h_border: %i\n",t->h_border);
-	xf86DrvMsg(scrnIndex,X_INFO,
-		   "v_active: %i  v_sync: %i  v_sync_end %i v_blanking: %i ",
-		   t->v_active, t->v_sync_off + t->v_active,
-		   t->v_sync_off + t->v_sync_width + t->v_active,
-		   t->v_active + t->v_blanking);
-	xf86ErrorF("v_border: %i\n",t->v_border);
-	if (IS_STEREO(t->stereo)) {
-	    xf86DrvMsg(scrnIndex,X_INFO,"Stereo: ");
-	    if (IS_RIGHT_STEREO(t->stereo)) {
-		if (!t->stereo_1)
-		    xf86ErrorF("right channel on sync\n");
-		else
-		    xf86ErrorF("left channel on sync\n");
-	    } else if (IS_LEFT_STEREO(t->stereo)) {
-		if (!t->stereo_1)
-		    xf86ErrorF("right channel on even line\n");
-		else 
-		    xf86ErrorF("left channel on evel line\n");
-	    }
-	    if (IS_4WAY_STEREO(t->stereo)) {
-		if (!t->stereo_1)
-		    xf86ErrorF("4-way interleaved\n");
-		else
-		    xf86ErrorF("side-by-side interleaved");
-	    }
-	}
-    }
-}
-
 static void
 print_number_sections(int scrnIndex, int num)
 {
@@ -384,3 +385,30 @@ print_number_sections(int scrnIndex, int num)
 		   num);
 }
 
+xf86MonPtr
+xf86PrintEDID(xf86MonPtr m)
+{
+    CARD16 i, j;
+    char buf[EDID_WIDTH * 2 + 1];
+
+    if (!(m)) return NULL;
+
+    print_vendor(m->scrnIndex,&m->vendor);
+    print_version(m->scrnIndex,&m->ver);
+    print_display(m->scrnIndex,&m->features, &m->ver);
+    print_established_timings(m->scrnIndex,&m->timings1);
+    print_std_timings(m->scrnIndex,m->timings2);
+    print_detailed_monitor_section(m->scrnIndex,m->det_mon);
+    print_number_sections(m->scrnIndex,m->no_sections);
+
+    xf86DrvMsg(m->scrnIndex, X_INFO, "EDID (in hex):\n");
+ 
+    for (i = 0; i < 128; i += j) {
+	for (j = 0; j < EDID_WIDTH; ++j) {
+	    sprintf(&buf[j * 2], "%02x", m->rawData[i + j]);
+	}
+	xf86DrvMsg(m->scrnIndex, X_INFO, "\t%s\n", buf);
+    }
+    
+    return m;
+}

From 861ee38817523a647e6be10d7e8fe26f66054217 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 28 Dec 2007 16:06:45 -0500
Subject: [PATCH 366/552] EDID 1.4: Additional aspect ratio semantics for
 screen size fields.

Section 3.6.2, Table 3.12: Horizontal and Vertical Screen Size or
Aspect Ratio.
---
 hw/xfree86/ddc/print_edid.c | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/hw/xfree86/ddc/print_edid.c b/hw/xfree86/ddc/print_edid.c
index 9bd7ebcf5..59d414fc7 100644
--- a/hw/xfree86/ddc/print_edid.c
+++ b/hw/xfree86/ddc/print_edid.c
@@ -172,21 +172,28 @@ print_whitepoint(int scrnIndex, struct disp_features *disp)
 
 static void
 print_display(int scrnIndex, struct disp_features *disp,
-	      struct edid_version *version)
+	      struct edid_version *v)
 {
-    print_input_features(scrnIndex, disp, version);
-    xf86DrvMsg(scrnIndex,X_INFO,"Max H-Image Size [cm]: ");
-    if (disp->hsize)
-	xf86ErrorF("horiz.: %i  ",disp->hsize);
-    else
-	xf86ErrorF("H-Size may change,  ");
-    if (disp->vsize)
-	xf86ErrorF("vert.: %i\n",disp->vsize);
-      else
-	xf86ErrorF("V-Size may change\n");
-    xf86DrvMsg(scrnIndex,X_INFO,"Gamma: %.2f\n", disp->gamma);
-    print_dpms_features(scrnIndex,disp,version);
-    print_whitepoint(scrnIndex,disp);
+    print_input_features(scrnIndex, disp, v);
+    if (disp->hsize && disp->vsize) {
+	xf86DrvMsg(scrnIndex, X_INFO, "Max Image Size [cm]: ");
+	xf86ErrorF("horiz.: %i  ", disp->hsize);
+	xf86ErrorF("vert.: %i\n", disp->vsize);
+    } else if (v->revision >= 4 && (disp->hsize || disp->vsize)) {
+	if (disp->hsize)
+	    xf86DrvMsg(scrnIndex, X_INFO, "Aspect ratio: %.2f (landscape)\n",
+		       (disp->hsize + 99) / 100.0);
+	if (disp->vsize)
+	    xf86DrvMsg(scrnIndex, X_INFO, "Aspect ratio: %.2f (portrait)\n",
+		       100.0 / (float)(disp->vsize + 99));
+
+    } else {
+	xf86DrvMsg(scrnIndex, X_INFO, "Indeterminate output size\n");
+    }
+
+    xf86DrvMsg(scrnIndex, X_INFO, "Gamma: %.2f\n", disp->gamma);
+    print_dpms_features(scrnIndex, disp, v);
+    print_whitepoint(scrnIndex, disp);
 }
 
 static void 

From f1f43caf7e26a84dbacd4e5d7d47c8b4e4982836 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 28 Dec 2007 16:12:11 -0500
Subject: [PATCH 367/552] EDID 1.4: Allow for gamma definition in extension
 blocks.

Section 3.6.3, Table 3.13: Display Transfer Characteristics (Gamma)
---
 hw/xfree86/ddc/edid.h       | 2 +-
 hw/xfree86/ddc/print_edid.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/hw/xfree86/ddc/edid.h b/hw/xfree86/ddc/edid.h
index 25163a69f..198794eaa 100644
--- a/hw/xfree86/ddc/edid.h
+++ b/hw/xfree86/ddc/edid.h
@@ -129,7 +129,7 @@
 #define BPC _BPC(GET(D_INPUT))
 #define _DIGITAL_INTERFACE(x) (x & 0x0F)
 #define DIGITAL_INTERFACE _DIGITAL_INTERFACE(GET(D_INPUT))
-#define _GAMMA(x) (x == 0xff ? 1.0 : ((x + 100.0)/100.0))
+#define _GAMMA(x) (x == 0xff ? 0.0 : ((x + 100.0)/100.0))
 #define GAMMA _GAMMA(GET(D_GAMMA))
 #define HSIZE_MAX GET(D_HSIZE)
 #define VSIZE_MAX GET(D_VSIZE)
diff --git a/hw/xfree86/ddc/print_edid.c b/hw/xfree86/ddc/print_edid.c
index 59d414fc7..880ca073c 100644
--- a/hw/xfree86/ddc/print_edid.c
+++ b/hw/xfree86/ddc/print_edid.c
@@ -191,7 +191,11 @@ print_display(int scrnIndex, struct disp_features *disp,
 	xf86DrvMsg(scrnIndex, X_INFO, "Indeterminate output size\n");
     }
 
-    xf86DrvMsg(scrnIndex, X_INFO, "Gamma: %.2f\n", disp->gamma);
+    if (!gamma && v->revision >= 1.4)
+	xf86DrvMsg(scrnIndex, X_INFO, "Gamma defined in extension block\n");
+    else
+	xf86DrvMsg(scrnIndex, X_INFO, "Gamma: %.2f\n", disp->gamma);
+
     print_dpms_features(scrnIndex, disp, v);
     print_whitepoint(scrnIndex, disp);
 }

From 322d0103aee317500057c80d542d7270d69a5731 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 28 Dec 2007 16:28:44 -0500
Subject: [PATCH 368/552] EDID 1.4: Alternate color encodings for digital
 inputs.

Section 3.6.4, Table 3.14: Feature support.
---
 hw/xfree86/ddc/edid.h       |  6 +++++-
 hw/xfree86/ddc/print_edid.c | 35 ++++++++++++++++++++++-------------
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/hw/xfree86/ddc/edid.h b/hw/xfree86/ddc/edid.h
index 198794eaa..2496e19e6 100644
--- a/hw/xfree86/ddc/edid.h
+++ b/hw/xfree86/ddc/edid.h
@@ -326,11 +326,15 @@
 #define DPMS_SUSPEND(x) (x & 0x02)
 #define DPMS_OFF(x) (x & 0x01)
 
-/* display type */
+/* display type, analog */
 #define DISP_MONO 0
 #define DISP_RGB 1
 #define DISP_MULTCOLOR 2
 
+/* display color encodings, digital */
+#define DISP_YCRCB444 0x01
+#define DISP_YCRCB422 0x02
+
 /* Msc stuff EDID Ver > 1.1 */
 #define STD_COLOR_SPACE(x) (x & 0x4)
 #define PREFERRED_TIMING_MODE(x) (x & 0x2)
diff --git a/hw/xfree86/ddc/print_edid.c b/hw/xfree86/ddc/print_edid.c
index 880ca073c..30cd17588 100644
--- a/hw/xfree86/ddc/print_edid.c
+++ b/hw/xfree86/ddc/print_edid.c
@@ -128,20 +128,29 @@ print_dpms_features(int scrnIndex, struct disp_features *c,
 	 if (DPMS_OFF(c->dpms)) xf86ErrorF(" Off");
      } else 
 	 xf86DrvMsg(scrnIndex,X_INFO,"No DPMS capabilities specified");
-    switch (c->display_type){
-    case DISP_MONO:
-	xf86ErrorF("; Monochorome/GrayScale Display\n");
-	break;
-    case DISP_RGB:
-	xf86ErrorF("; RGB/Color Display\n");
-	break;
-    case DISP_MULTCOLOR:
-	xf86ErrorF("; Non RGB Multicolor Display\n");
-	break;
-    default:
-	xf86ErrorF("\n");
-	break;
+    if (!c->input_type) { /* analog */
+	switch (c->display_type){
+	    case DISP_MONO:
+		xf86ErrorF("; Monochorome/GrayScale Display\n");
+		break;
+	    case DISP_RGB:
+		xf86ErrorF("; RGB/Color Display\n");
+		break;
+	    case DISP_MULTCOLOR:
+		xf86ErrorF("; Non RGB Multicolor Display\n");
+		break;
+	    default:
+		xf86ErrorF("\n");
+		break;
+	}
+    } else {
+	int enc = c->display_type;
+	xf86DrvMsg(scrnIndex, X_INFO, "\nSupported color encodings: "
+		   "RGB 4:4:4 %s%s\n",
+		   enc & DISP_YCRCB444 ? "YCrCb 4:4:4 " : "",
+		   enc & DISP_YCRCB422 ? "YCrCb 4:2:2" : "");
     }
+
     if (STD_COLOR_SPACE(c->msc))
 	xf86DrvMsg(scrnIndex,X_INFO,
 		   "Default color space is primary color space\n"); 

From 592d814ee09e86e283116a7a1052762c8398e8e5 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 28 Dec 2007 16:37:23 -0500
Subject: [PATCH 369/552] EDID 1.4: Additional semantics for display feature
 bits.

First mode is _always_ preferred in 1.4; the bit that used to mean this
now means that the preferred mode is also the native pixel format.  The
old "is GTF" bit now means "is continuous-frequency" instead.

Section 3.6.4, Table 3.14: Feature Support, Notes 4 and 5.
---
 hw/xfree86/ddc/print_edid.c | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/hw/xfree86/ddc/print_edid.c b/hw/xfree86/ddc/print_edid.c
index 30cd17588..a55c46523 100644
--- a/hw/xfree86/ddc/print_edid.c
+++ b/hw/xfree86/ddc/print_edid.c
@@ -154,16 +154,27 @@ print_dpms_features(int scrnIndex, struct disp_features *c,
     if (STD_COLOR_SPACE(c->msc))
 	xf86DrvMsg(scrnIndex,X_INFO,
 		   "Default color space is primary color space\n"); 
-    if (PREFERRED_TIMING_MODE(c->msc))
-	xf86DrvMsg(scrnIndex,X_INFO,
+
+    if (PREFERRED_TIMING_MODE(c->msc) || v->revision >= 4) {
+	xf86DrvMsg(scrnIndex, X_INFO,
 		   "First detailed timing is preferred mode\n"); 
-    else if (v->version == 1 && v->revision >= 3)
+	if (v->revision >= 4)
+	    xf86DrvMsg(scrnIndex, X_INFO,
+		"Preferred mode is native pixel format and refresh rate\n");
+    } else if (v->revision == 3) {
 	xf86DrvMsg(scrnIndex,X_INFO,
 		   "First detailed timing not preferred "
 		   "mode in violation of standard!");
-    if (GFT_SUPPORTED(c->msc))
-	xf86DrvMsg(scrnIndex,X_INFO,
-		   "GTF timings supported\n"); 
+    }
+
+    if (v->revision >= 4) {
+	if (GFT_SUPPORTED(c->msc)) {
+	    xf86DrvMsg(scrnIndex, X_INFO, "Display is continuous-frequency\n");
+	}
+    } else {
+	if (GFT_SUPPORTED(c->msc))
+	    xf86DrvMsg(scrnIndex, X_INFO, "GTF timings supported\n"); 
+    }
 }
   
 static void 

From 70b2d6cfeb3bcb7b862a2ae29f6ef7cb84d69486 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 28 Dec 2007 16:39:00 -0500
Subject: [PATCH 370/552] Check the gamma value, not its address.

---
 hw/xfree86/ddc/print_edid.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/xfree86/ddc/print_edid.c b/hw/xfree86/ddc/print_edid.c
index a55c46523..d9f18fa9f 100644
--- a/hw/xfree86/ddc/print_edid.c
+++ b/hw/xfree86/ddc/print_edid.c
@@ -211,7 +211,7 @@ print_display(int scrnIndex, struct disp_features *disp,
 	xf86DrvMsg(scrnIndex, X_INFO, "Indeterminate output size\n");
     }
 
-    if (!gamma && v->revision >= 1.4)
+    if (!disp->gamma && v->revision >= 1.4)
 	xf86DrvMsg(scrnIndex, X_INFO, "Gamma defined in extension block\n");
     else
 	xf86DrvMsg(scrnIndex, X_INFO, "Gamma: %.2f\n", disp->gamma);

From bae459cfc4f17a5ec5f2810e9f913e3ad2d8b8d4 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 28 Dec 2007 16:50:18 -0500
Subject: [PATCH 371/552] Don't carp on EDID 1.4 blocks anymore.

Also whine more loudly when we get something other than 1.x.
---
 hw/xfree86/ddc/interpret_edid.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/hw/xfree86/ddc/interpret_edid.c b/hw/xfree86/ddc/interpret_edid.c
index 045c12d9d..14b0fd73a 100644
--- a/hw/xfree86/ddc/interpret_edid.c
+++ b/hw/xfree86/ddc/interpret_edid.c
@@ -369,13 +369,16 @@ get_detailed_timing_section(Uchar *c, struct detailed_timings *r)
   r->misc = MISC;
 }
 
-#define MAX_EDID_MINOR 3
+#define MAX_EDID_MINOR 4
 
 static Bool
 validate_version(int scrnIndex, struct edid_version *r)
 {
-    if (r->version != 1)
+    if (r->version != 1) {
+	xf86DrvMsg(scrnIndex, X_ERROR, "Unknown EDID version %d\n",
+		   r->version);
 	return FALSE;
+    }
 
     if (r->revision > MAX_EDID_MINOR)
 	xf86DrvMsg(scrnIndex, X_WARNING,

From 36ff05771b0699aa80ad718e24097bc25cb4fb00 Mon Sep 17 00:00:00 2001
From: Jurij Smakov <jurij@wooyd.org>
Date: Fri, 28 Dec 2007 23:59:53 +0200
Subject: [PATCH 372/552] GL: Add GLX compile flags lost in modular X server
 changes

RISC chips that trap on unaligned loads and stores need to
define __GLX_ALIGN64.  This used to get added to the cflags
in the old *.cf files but it no longer does in the modular
X server.

Also, Alpha needs to pass -mieee to the compiler as well.

This is a simple backport of a patch that debian, and probably other
distributions, have been applying forever.  To the best of my
knowledge the patch was written by Jurij Smakov.  See Debian bug
number #388125.

I just checked and this has been rotting for more than a year in
freedesktop bugzilla as #8392.

Signed-off-by: David S. Miller <davem@davemloft.net>
---
 GL/glx/Makefile.am          |  3 ++-
 configure.ac                | 10 ++++++++++
 hw/dmx/glxProxy/Makefile.am |  1 +
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/GL/glx/Makefile.am b/GL/glx/Makefile.am
index 8eda1531e..4cf56e89d 100644
--- a/GL/glx/Makefile.am
+++ b/GL/glx/Makefile.am
@@ -14,7 +14,8 @@ AM_CFLAGS = \
 	-I@MESA_SOURCE@/src/mesa/glapi \
 	-I@MESA_SOURCE@/src/mesa/main \
 	-DXFree86Server \
-	@GLX_DEFINES@
+	@GLX_DEFINES@ \
+	@GLX_ARCH_DEFINES@
 
 # none yet
 #sdk_HEADERS =
diff --git a/configure.ac b/configure.ac
index 0b718c9f5..0742040c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -304,6 +304,7 @@ case $host_cpu in
 	        *freebsd*)	SYS_LIBS=-lio ;;
 		*netbsd*)	AC_DEFINE(USE_ALPHA_PIO, 1, [NetBSD PIO alpha IO]) ;;
 	esac
+	GLX_ARCH_DEFINES="-D__GLX_ALIGN64 -mieee"
 	;;
   arm*)
 	ARM_VIDEO=yes
@@ -333,6 +334,7 @@ case $host_cpu in
 	xorg_loader_sparcmuldiv="yes"
 	SPARC64_VIDEO=yes
 	BSD_ARCH_SOURCES="sparc64_video.c ioperm_noop.c"
+	GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
 	;;
   x86_64*|amd64*)
   	use_x86_asm="yes"
@@ -347,8 +349,16 @@ case $host_cpu in
 				SYS_LIBS=-lamd64
 				;;
 	esac
+	GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
+	;;
+  ia64*)
+  	GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
+	;;
+  s390*)
+  	GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
 	;;
 esac
+AC_SUBST(GLX_ARCH_DEFINES)
 
 dnl BSD *_video.c selection
 AM_CONDITIONAL(ALPHA_VIDEO, [test "x$ALPHA_VIDEO" = xyes])
diff --git a/hw/dmx/glxProxy/Makefile.am b/hw/dmx/glxProxy/Makefile.am
index 1fbc8d764..f99549817 100644
--- a/hw/dmx/glxProxy/Makefile.am
+++ b/hw/dmx/glxProxy/Makefile.am
@@ -32,6 +32,7 @@ libglxproxy_a_SOURCES = compsize.c \
                         unpack.h
 
 AM_CFLAGS = \
+            @GLX_ARCH_DEFINES@ \
             $(DIX_CFLAGS) \
             -I$(top_srcdir)/hw/dmx \
             -I$(top_srcdir)/include \

From 9dbb73033ae60e7ab85f1469a696e2a52f0cb0fe Mon Sep 17 00:00:00 2001
From: Colin Harrison <colin.harrison@virgin.net>
Date: Sat, 29 Dec 2007 00:02:16 +0200
Subject: [PATCH 373/552] Rootless: Fix lvalue error from devPrivates change

Instead of trying to use an invalid expression as an lvalue, use the function
call instead.
---
 miext/rootless/accel/rlAccel.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/miext/rootless/accel/rlAccel.c b/miext/rootless/accel/rlAccel.c
index a14412416..f3cb21569 100644
--- a/miext/rootless/accel/rlAccel.c
+++ b/miext/rootless/accel/rlAccel.c
@@ -51,6 +51,9 @@ static DevPrivateKey rlAccelScreenPrivateKey = &rlAccelScreenPrivateKey;
 #define RLACCELREC(pScreen) ((rlAccelScreenRec *) \
     dixLookupPrivate(&(pScreen)->devPrivates, rlAccelScreenPrivateKey))
 
+#define SETRLACCELREC(pScreen, v) \
+    dixSetPrivate(&(pScreen)->devPrivates, rlAccelScreenPrivateKey, v)
+
 /* This is mostly identical to fbGCOps. */
 static GCOps rlAccelOps = {
     rlFillSpans,
@@ -132,7 +135,7 @@ RootlessAccelInit(ScreenPtr pScreen)
 
     s = xalloc(sizeof(rlAccelScreenRec));
     if (!s) return FALSE;
-    RLACCELREC(pScreen) = s;
+    SETRLACCELREC(pScreen, s);
 
     // Wrap the screen functions we need
     s->CreateGC = pScreen->CreateGC;

From 312b30cb03e439644ea10e08fa93268116333f0d Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 28 Dec 2007 17:18:30 -0500
Subject: [PATCH 374/552] EDID 1.4: First detailed mode is always preferred.

... so act like it in the modelist generator, not just the parser.
---
 hw/xfree86/modes/xf86EdidModes.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c
index d8c61617e..87a812765 100644
--- a/hw/xfree86/modes/xf86EdidModes.c
+++ b/hw/xfree86/modes/xf86EdidModes.c
@@ -534,6 +534,8 @@ xf86DDCGetModes(int scrnIndex, xf86MonPtr DDC)
     quirks = xf86DDCDetectQuirks(scrnIndex, DDC, TRUE);
 
     preferred = PREFERRED_TIMING_MODE(DDC->features.msc);
+    if (DDC->ver.revision >= 4)
+	preferred = TRUE;
     if (quirks & DDC_QUIRK_FIRST_DETAILED_PREFERRED)
 	preferred = TRUE;
     if (quirks & (DDC_QUIRK_PREFER_LARGE_60 | DDC_QUIRK_PREFER_LARGE_75))

From 85365ddf16e2b954d8249b380df53337420ed684 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 28 Dec 2007 17:35:54 -0500
Subject: [PATCH 375/552] EDID 1.4: If given a native pixel format, use it when
 inferring virtual.

---
 hw/xfree86/common/xf86Mode.c | 35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c
index 782f08b8d..fb899a1e4 100644
--- a/hw/xfree86/common/xf86Mode.c
+++ b/hw/xfree86/common/xf86Mode.c
@@ -1215,20 +1215,40 @@ inferVirtualSize(ScrnInfoPtr scrp, DisplayModePtr modes, int *vx, int *vy)
 {
     float aspect = 0.0;
     MonPtr mon = scrp->monitor;
+    xf86MonPtr DDC;
     int x = 0, y = 0;
     DisplayModePtr mode;
 
     if (!mon) return 0;
+    DDC = mon->DDC;
+
+    if (DDC && DDC->ver.revision >= 4) {
+	/* For 1.4, we might actually get native pixel format.  How novel. */
+	if (PREFERRED_TIMING_MODE(DDC->features.msc)) {
+		for (mode = modes; mode; mode = mode->next) {
+		    if (mode->type & (M_T_DRIVER | M_T_PREFERRED)) {
+			x = mode->HDisplay;
+			y = mode->VDisplay;
+			goto found;
+		    }
+		}
+	}
+	/*
+	 * Even if we don't, we might get aspect ratio from extra CVT info
+	 * or from the monitor size fields.  TODO.
+	 */
+    }
 
     /*
-     * technically this triggers if _either_ is zero, which is not what EDID
-     * says, but if only one is zero this is best effort.  also we don't
-     * know that all projectors are 4:3, but we certainly suspect it.
+     * Technically this triggers if either is zero.  That wasn't legal
+     * before EDID 1.4, but right now we'll get that wrong. TODO.
      */
-    if (!mon->widthmm || !mon->heightmm)
-	aspect = 4.0/3.0;
-    else
-	aspect = (float)mon->widthmm / (float)mon->heightmm;
+    if (!aspect) {
+	if (!mon->widthmm || !mon->heightmm)
+	    aspect = 4.0/3.0;
+	else
+	    aspect = (float)mon->widthmm / (float)mon->heightmm;
+    }
 
     /* find the largest M_T_DRIVER mode with that aspect ratio */
     for (mode = modes; mode; mode = mode->next) {
@@ -1252,6 +1272,7 @@ inferVirtualSize(ScrnInfoPtr scrp, DisplayModePtr modes, int *vx, int *vy)
 	return 0;
     }
 
+found:
     *vx = x;
     *vy = y;
 

From 5c362c2eb2cfdf1f6d667a3e64a0a7bc4942c950 Mon Sep 17 00:00:00 2001
From: Brian <brian@i915.localnet.net>
Date: Tue, 1 Jan 2008 09:07:48 -0700
Subject: [PATCH 376/552] regenerated, adds GL_MAX_3D_TEXTURE_SIZE (see bug
 13811)

---
 GL/glx/indirect_size_get.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/GL/glx/indirect_size_get.c b/GL/glx/indirect_size_get.c
index f64fb7ece..1a1b12399 100644
--- a/GL/glx/indirect_size_get.c
+++ b/GL/glx/indirect_size_get.c
@@ -538,6 +538,7 @@ __glGetBooleanv_size(GLenum e)
     case GL_UNPACK_SKIP_IMAGES:
     case GL_UNPACK_IMAGE_HEIGHT:
     case GL_TEXTURE_3D:
+    case GL_MAX_3D_TEXTURE_SIZE:
     case GL_VERTEX_ARRAY:
     case GL_NORMAL_ARRAY:
     case GL_COLOR_ARRAY:

From 306fde4082044dfecbedd9af41e660bafb3ce438 Mon Sep 17 00:00:00 2001
From: Brian <brian@i915.localnet.net>
Date: Tue, 1 Jan 2008 09:27:44 -0700
Subject: [PATCH 377/552] regenerated to add framebuffer object tokens (bug
 13800)

---
 GL/glx/indirect_size_get.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/GL/glx/indirect_size_get.c b/GL/glx/indirect_size_get.c
index 1a1b12399..e7eaf97cb 100644
--- a/GL/glx/indirect_size_get.c
+++ b/GL/glx/indirect_size_get.c
@@ -613,6 +613,7 @@ __glGetBooleanv_size(GLenum e)
 /*      case GL_CLIENT_ACTIVE_TEXTURE_ARB:*/
     case GL_MAX_TEXTURE_UNITS:
 /*      case GL_MAX_TEXTURE_UNITS_ARB:*/
+    case GL_MAX_RENDERBUFFER_SIZE_EXT:
     case GL_TEXTURE_COMPRESSION_HINT:
 /*      case GL_TEXTURE_COMPRESSION_HINT_ARB:*/
     case GL_TEXTURE_RECTANGLE_ARB:
@@ -715,6 +716,10 @@ __glGetBooleanv_size(GLenum e)
     case GL_ACTIVE_STENCIL_FACE_EXT:
     case GL_TEXTURE_BINDING_1D_ARRAY_EXT:
     case GL_TEXTURE_BINDING_2D_ARRAY_EXT:
+    case GL_DRAW_FRAMEBUFFER_BINDING_EXT:
+    case GL_RENDERBUFFER_BINDING_EXT:
+    case GL_READ_FRAMEBUFFER_BINDING_EXT:
+    case GL_MAX_COLOR_ATTACHMENTS_EXT:
     case GL_RASTER_POSITION_UNCLIPPED_IBM:
         return 1;
     case GL_SMOOTH_POINT_SIZE_RANGE:

From 895073f6b41d9313cfe748232c492c5e9f76b443 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed, 2 Jan 2008 18:09:26 -0800
Subject: [PATCH 378/552] Restore include & typedef needed by dtrace

996b621bec1bbc4fb21970c75eaec62053bc6ccb deleted a couple lines too many
---
 dix/dispatch.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dix/dispatch.c b/dix/dispatch.c
index 577e17cf0..004509caa 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -149,6 +149,8 @@ int ProcInitialConnection();
 
 #ifdef XSERVER_DTRACE
 #include "registry.h"
+#include <sys/types.h>
+typedef const char *string;
 #include "Xserver-dtrace.h"
 #endif
 

From 73f422996016107d5f53492e4197bb05ed9c4bb9 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed, 2 Jan 2008 19:17:54 -0800
Subject: [PATCH 379/552] Fix names/types of new
 vuidMouse{Get,Set}ScreenPrivates macros

---
 hw/xfree86/os-support/solaris/sun_mouse.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/xfree86/os-support/solaris/sun_mouse.c b/hw/xfree86/os-support/solaris/sun_mouse.c
index b1b7797f1..a5955ef2c 100644
--- a/hw/xfree86/os-support/solaris/sun_mouse.c
+++ b/hw/xfree86/os-support/solaris/sun_mouse.c
@@ -122,10 +122,10 @@ static void vuidMouseAdjustFrame(int index, int x, int y, int flags);
 
 static int vuidMouseGeneration = 0;
 static DevPrivateKey vuidMouseScreenKey = &vuidMouseScreenKey;
-#define vuidGetMouseScreenPrivate(s) ((VuidMsePtr) \
+#define vuidMouseGetScreenPrivate(s) ( \
     dixLookupPrivate(&(s)->devPrivates, vuidMouseScreenKey))
-#define vuidSetMouseScreenPrivate(s,p) \
-    dixSetPrivate(&(s)->devPrivates, vuidMouseScreenKey, p)
+#define vuidMouseSetScreenPrivate(s,p) \
+    dixSetPrivate(&(s)->devPrivates, vuidMouseScreenKey, (void *) p)
 #endif /* HAVE_ABSOLUTE_MOUSE_SCALING */
 
 static inline

From f6666dcc3b1ac60f850ea53c357a9ef61672a52a Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed, 2 Jan 2008 19:19:55 -0800
Subject: [PATCH 380/552] Add dixAllocatePrivate stub to dummylib for utils

Normally not necessary, except when building non-optimized/debug causes
the inline functions from private.h to appear in os-support/libxorgos.la
---
 hw/xfree86/dummylib/Makefile.am   |  1 +
 hw/xfree86/dummylib/dixprivates.c | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 hw/xfree86/dummylib/dixprivates.c

diff --git a/hw/xfree86/dummylib/Makefile.am b/hw/xfree86/dummylib/Makefile.am
index 3e70d25fe..2ab0a77ae 100644
--- a/hw/xfree86/dummylib/Makefile.am
+++ b/hw/xfree86/dummylib/Makefile.am
@@ -13,6 +13,7 @@ STRL_SRCS = $(top_srcdir)/os/strlcat.c $(top_srcdir)/os/strlcpy.c
 endif
 
 libdummy_nonserver_a_SOURCES = \
+	dixprivates.c \
 	fatalerror.c \
 	logvwrite.c \
 	$(STRL_SRCS) \
diff --git a/hw/xfree86/dummylib/dixprivates.c b/hw/xfree86/dummylib/dixprivates.c
new file mode 100644
index 000000000..40c173a20
--- /dev/null
+++ b/hw/xfree86/dummylib/dixprivates.c
@@ -0,0 +1,19 @@
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <X11/X.h>
+#include "os.h"
+#include "xf86.h"
+#include "xf86Priv.h"
+
+/*
+ * Utility functions required by libxf86_os. 
+ */
+
+_X_EXPORT pointer *
+dixAllocatePrivate(PrivateRec **privates, const DevPrivateKey key)
+{
+    return NULL;	/* not used */
+}
+

From dfd682b582636a36345144bcf835e3ee46718d90 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed, 2 Jan 2008 19:27:22 -0800
Subject: [PATCH 381/552] X.Org bug 4947/Sun bug 6646626: Xv extension not
 byte-swapping properly

X.Org Bugzilla #4947 <https://bugs.freedesktop.org/show_bug.cgi?id=4947>
Sun bug 6646626 <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6646626>

Don't use swapped data after swapping it.   When done swapping data,
send the swapped data, not the address of the pointer to it, to the client.
---
 Xext/xvdisp.c | 46 +++++++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c
index 8096c8c14..17ff1d788 100644
--- a/Xext/xvdisp.c
+++ b/Xext/xvdisp.c
@@ -67,7 +67,7 @@ SWriteQueryExtensionReply(
   swaps(&rep->version, n);
   swaps(&rep->revision, n);
   
-  (void)WriteToClient(client, sz_xvQueryExtensionReply, (char *)&rep);
+  (void)WriteToClient(client, sz_xvQueryExtensionReply, (char *)rep);
 
   return Success;
 }
@@ -83,7 +83,7 @@ SWriteQueryAdaptorsReply(
   swapl(&rep->length, n);
   swaps(&rep->num_adaptors, n);
   
-  (void)WriteToClient(client, sz_xvQueryAdaptorsReply, (char *)&rep);
+  (void)WriteToClient(client, sz_xvQueryAdaptorsReply, (char *)rep);
 
   return Success;
 }
@@ -99,7 +99,7 @@ SWriteQueryEncodingsReply(
   swapl(&rep->length, n);
   swaps(&rep->num_encodings, n);
   
-  (void)WriteToClient(client, sz_xvQueryEncodingsReply, (char *)&rep);
+  (void)WriteToClient(client, sz_xvQueryEncodingsReply, (char *)rep);
 
   return Success;
 }
@@ -204,7 +204,7 @@ SWriteGrabPortReply(
   swaps(&rep->sequenceNumber, n);
   swapl(&rep->length, n);
 
-  (void)WriteToClient(client, sz_xvGrabPortReply, (char *)&rep);
+  (void)WriteToClient(client, sz_xvGrabPortReply, (char *)rep);
 
   return Success;
 }
@@ -220,7 +220,7 @@ SWriteGetPortAttributeReply(
   swapl(&rep->length, n);
   swapl(&rep->value, n);
 
-  (void)WriteToClient(client, sz_xvGetPortAttributeReply, (char *)&rep);
+  (void)WriteToClient(client, sz_xvGetPortAttributeReply, (char *)rep);
 
   return Success;
 }
@@ -237,7 +237,7 @@ SWriteQueryBestSizeReply(
   swaps(&rep->actual_width, n);
   swaps(&rep->actual_height, n);
 
-  (void)WriteToClient(client, sz_xvQueryBestSizeReply, (char *)&rep);
+  (void)WriteToClient(client, sz_xvQueryBestSizeReply, (char *)rep);
 
   return Success;
 }
@@ -254,7 +254,7 @@ SWriteQueryPortAttributesReply(
   swapl(&rep->num_attributes, n);
   swapl(&rep->text_size, n);
 
-  (void)WriteToClient(client, sz_xvQueryPortAttributesReply, (char *)&rep);
+  (void)WriteToClient(client, sz_xvQueryPortAttributesReply, (char *)rep);
 
   return Success;
 }
@@ -273,7 +273,7 @@ SWriteQueryImageAttributesReply(
   swaps(&rep->width, n);
   swaps(&rep->height, n);
 
-  (void)WriteToClient(client, sz_xvQueryImageAttributesReply, (char *)&rep);
+  (void)WriteToClient(client, sz_xvQueryImageAttributesReply, (char *)rep);
 
   return Success;
 }
@@ -289,7 +289,7 @@ SWriteListImageFormatsReply(
   swapl(&rep->length, n);
   swapl(&rep->num_formats, n);
 
-  (void)WriteToClient(client, sz_xvListImageFormatsReply, (char *)&rep);
+  (void)WriteToClient(client, sz_xvListImageFormatsReply, (char *)rep);
 
   return Success;
 }
@@ -378,6 +378,7 @@ ProcXvQueryAdaptors(ClientPtr client)
   xvAdaptorInfo ainfo;
   xvQueryAdaptorsReply rep;
   int totalSize, na, nf, rc;
+  int nameSize;
   XvAdaptorPtr pa;
   XvFormatPtr pf;
   WindowPtr pWin;
@@ -439,12 +440,12 @@ ProcXvQueryAdaptors(ClientPtr client)
       ainfo.base_id = pa->base_id;
       ainfo.num_ports = pa->nPorts;
       ainfo.type = pa->type;
-      ainfo.name_size = strlen(pa->name);
+      ainfo.name_size = nameSize = strlen(pa->name);
       ainfo.num_formats = pa->nFormats;
 
       _WriteAdaptorInfo(client, &ainfo);
 
-      WriteToClient(client, ainfo.name_size, pa->name);
+      WriteToClient(client, nameSize, pa->name);
 
       nf = pa->nFormats;
       pf = pa->pFormats;
@@ -469,6 +470,7 @@ ProcXvQueryEncodings(ClientPtr client)
   xvEncodingInfo einfo;
   xvQueryEncodingsReply rep;
   int totalSize;
+  int nameSize;
   XvPortPtr pPort;
   int ne;
   XvEncodingPtr pe;
@@ -513,13 +515,13 @@ ProcXvQueryEncodings(ClientPtr client)
   while (ne--) 
     {
       einfo.encoding = pe->id;
-      einfo.name_size = strlen(pe->name);
+      einfo.name_size = nameSize = strlen(pe->name);
       einfo.width = pe->width;
       einfo.height = pe->height;
       einfo.rate.numerator = pe->rate.numerator;
       einfo.rate.denominator = pe->rate.denominator;
       _WriteEncodingInfo(client, &einfo);
-      WriteToClient(client, einfo.name_size, pe->name);
+      WriteToClient(client, nameSize, pe->name);
       pe++;
     }
 
@@ -984,18 +986,19 @@ ProcXvQueryPortAttributes(ClientPtr client)
   rep.text_size = 0;
 
   for(i = 0, pAtt = pPort->pAdaptor->pAttributes; 
-      i < rep.num_attributes; i++, pAtt++) 
+      i < pPort->pAdaptor->nAttributes; i++, pAtt++) 
   {    
       rep.text_size += (strlen(pAtt->name) + 1 + 3) & ~3L;
   }
 
-  rep.length = (rep.num_attributes * sz_xvAttributeInfo) + rep.text_size;
+  rep.length = (pPort->pAdaptor->nAttributes * sz_xvAttributeInfo)
+      + rep.text_size;
   rep.length >>= 2;
 
   _WriteQueryPortAttributesReply(client, &rep);
 
   for(i = 0, pAtt = pPort->pAdaptor->pAttributes; 
-      i < rep.num_attributes; i++, pAtt++) 
+      i < pPort->pAdaptor->nAttributes; i++, pAtt++) 
   {
       size = strlen(pAtt->name) + 1;  /* pass the NULL */
       Info.flags = pAtt->flags;
@@ -1211,6 +1214,7 @@ ProcXvQueryImageAttributes(ClientPtr client)
   XvPortPtr pPort;
   int *offsets;
   int *pitches;
+  int planeLength;
   REQUEST(xvQueryImageAttributesReq);
 
   REQUEST_SIZE_MATCH(xvQueryImageAttributesReq);
@@ -1250,7 +1254,7 @@ ProcXvQueryImageAttributes(ClientPtr client)
 
   rep.type = X_Reply;
   rep.sequenceNumber = client->sequence;
-  rep.length = num_planes << 1;
+  rep.length = planeLength = num_planes << 1;
   rep.num_planes = num_planes;
   rep.width = width;
   rep.height = height;
@@ -1258,8 +1262,8 @@ ProcXvQueryImageAttributes(ClientPtr client)
  
   _WriteQueryImageAttributesReply(client, &rep);
   if(client->swapped)
-    SwapLongs((CARD32*)offsets, rep.length);
-  WriteToClient(client, rep.length << 2, (char*)offsets);
+    SwapLongs((CARD32*)offsets, planeLength);
+  WriteToClient(client, planeLength << 2, (char*)offsets);
 
   xfree(offsets);
 
@@ -1287,13 +1291,13 @@ ProcXvListImageFormats(ClientPtr client)
   rep.type = X_Reply;
   rep.sequenceNumber = client->sequence;
   rep.num_formats = pPort->pAdaptor->nImages;
-  rep.length = rep.num_formats * sz_xvImageFormatInfo >> 2;
+  rep.length = pPort->pAdaptor->nImages * sz_xvImageFormatInfo >> 2;
 
   _WriteListImageFormatsReply(client, &rep);
 
   pImage = pPort->pAdaptor->pImages;
   
-  for(i = 0; i < rep.num_formats; i++, pImage++) {
+  for(i = 0; i < pPort->pAdaptor->nImages; i++, pImage++) {
      info.id = pImage->id; 	
      info.type = pImage->type; 	
      info.byte_order = pImage->byte_order; 

From ccf6636d2ca8acdaaeb8da34db507a10a082b0de Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed, 2 Jan 2008 19:28:33 -0800
Subject: [PATCH 382/552] Kill xf86getpagesize even harder (dummylib & ioport)

---
 hw/xfree86/dummylib/Makefile.am       |  1 -
 hw/xfree86/dummylib/xf86getpagesize.c | 21 ---------------------
 hw/xfree86/utils/ioport/ioport.c      |  1 -
 3 files changed, 23 deletions(-)
 delete mode 100644 hw/xfree86/dummylib/xf86getpagesize.c

diff --git a/hw/xfree86/dummylib/Makefile.am b/hw/xfree86/dummylib/Makefile.am
index 2ab0a77ae..ad3f1ea12 100644
--- a/hw/xfree86/dummylib/Makefile.am
+++ b/hw/xfree86/dummylib/Makefile.am
@@ -25,7 +25,6 @@ libdummy_nonserver_a_SOURCES = \
 	xf86drvmsgverb.c \
 	xf86errorf.c \
 	xf86errorfverb.c \
-	xf86getpagesize.c \
 	xf86getverb.c \
 	xf86info.c \
 	xf86msg.c \
diff --git a/hw/xfree86/dummylib/xf86getpagesize.c b/hw/xfree86/dummylib/xf86getpagesize.c
deleted file mode 100644
index 8859c7673..000000000
--- a/hw/xfree86/dummylib/xf86getpagesize.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include <X11/X.h>
-#include "os.h"
-#include "xf86.h"
-#include "xf86Priv.h"
-
-/*
- * Utility functions required by libxf86_os. 
- */
-
-int xf86getpagesize(void);
-
-_X_EXPORT int
-xf86getpagesize(void)
-{
-    return 4096;	/* not used */
-}
-
diff --git a/hw/xfree86/utils/ioport/ioport.c b/hw/xfree86/utils/ioport/ioport.c
index 32213642e..737043462 100644
--- a/hw/xfree86/utils/ioport/ioport.c
+++ b/hw/xfree86/utils/ioport/ioport.c
@@ -489,4 +489,3 @@ main(argc, argv)
 	return (0);
 }
 
-#include "xf86getpagesize.c"

From 17a9714a6789a389d52dbb40fd1eed1e24c04d64 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 3 Jan 2008 14:46:54 -0500
Subject: [PATCH 383/552] Bug #13794: Update MBE extension devPrivates to new
 interface.

---
 Xext/mbuf.c | 40 +++++++++++++---------------------------
 1 file changed, 13 insertions(+), 27 deletions(-)

diff --git a/Xext/mbuf.c b/Xext/mbuf.c
index 35c8c8988..0b5b91ea9 100644
--- a/Xext/mbuf.c
+++ b/Xext/mbuf.c
@@ -61,8 +61,8 @@ in this Software without prior written authorization from The Open Group.
 
 static int		MultibufferEventBase;
 static int		MultibufferErrorBase;
-int			MultibufferScreenIndex = -1;
-int			MultibufferWindowIndex = -1;
+static DevPrivateKey MultibufferScreenPrivKey = &MultibufferScreenPrivKey;
+static DevPrivateKey MultibufferWindowPrivKey = &MultibufferWindowPrivKey;
 
 static void		PerformDisplayRequest (
 				MultibuffersPtr * /* ppMultibuffers */,
@@ -200,27 +200,16 @@ MultibufferExtensionInit()
     ScreenPtr		    pScreen;
     MultibufferScreenPtr    pMultibufferScreen;
 
-    /*
-     * allocate private pointers in windows and screens.  Allocating
-     * window privates may seem like an unnecessary expense, but every
-     * PositionWindow call must check to see if the window is
-     * multi-buffered; a resource lookup is too expensive.
-     */
-    MultibufferScreenIndex = AllocateScreenPrivateIndex ();
-    if (MultibufferScreenIndex < 0)
-	return;
-    MultibufferWindowIndex = AllocateWindowPrivateIndex ();
     for (i = 0; i < screenInfo.numScreens; i++)
     {
 	pScreen = screenInfo.screens[i];
-	if (!AllocateWindowPrivate (pScreen, MultibufferWindowIndex, 0) ||
-	    !(pMultibufferScreen = (MultibufferScreenPtr) xalloc (sizeof (MultibufferScreenRec))))
+	if (!(pMultibufferScreen = (MultibufferScreenPtr) xalloc (sizeof (MultibufferScreenRec))))
 	{
 	    for (j = 0; j < i; j++)
-		xfree (screenInfo.screens[j]->devPrivates[MultibufferScreenIndex].ptr);
+		xfree (dixLookupPrivate(&screenInfo.screens[j]->devPrivates, MultibufferScreenPrivKey));
 	    return;
 	}
-	pScreen->devPrivates[MultibufferScreenIndex].ptr = (pointer) pMultibufferScreen;
+	dixSetPrivate(&pScreen->devPrivates, MultibufferScreenPrivKey, pMultibufferScreen);
 	/*
  	 * wrap PositionWindow to resize the pixmap when the window
 	 * changes size
@@ -260,14 +249,11 @@ ExtensionEntry	*extEntry;
     ScreenPtr		    pScreen;
     MultibufferScreenPtr    pMultibufferScreen;
     
-    if (MultibufferScreenIndex < 0)
-	return;
     for (i = 0; i < screenInfo.numScreens; i++)
     {
 	pScreen = screenInfo.screens[i];
-	if (pScreen->devPrivates[MultibufferScreenIndex].ptr)
+	if ((pMultibufferScreen = (MultibufferScreenPtr)dixLookupPrivate(&pScreen->devPrivates, MultibufferScreenPrivKey)))
 	{
-	    pMultibufferScreen = (MultibufferScreenPtr) pScreen->devPrivates[MultibufferScreenIndex].ptr;
 	    pScreen->PositionWindow = pMultibufferScreen->PositionWindow;
 	    xfree (pMultibufferScreen);
 	}
@@ -427,7 +413,7 @@ CreateImageBuffers (pWin, nbuf, ids, action, hint)
     pMultibuffers->lastUpdate.milliseconds = 0;
     pMultibuffers->width = width;
     pMultibuffers->height = height;
-    pWin->devPrivates[MultibufferWindowIndex].ptr = (pointer) pMultibuffers;
+    dixSetPrivate(&pWin->devPrivates, MultibufferWindowPrivKey, pMultibuffers);
     if (pClearGC) FreeScratchGC(pClearGC);
     return Success;
 }
@@ -487,7 +473,7 @@ ProcCreateImageBuffers (client)
     rep.type = X_Reply;
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
-    rep.numberBuffer = ((MultibuffersPtr) (pWin->devPrivates[MultibufferWindowIndex].ptr))->numMultibuffer;
+    rep.numberBuffer = ((MultibuffersPtr) (dixLookupPrivate(&pWin->devPrivates, MultibufferWindowPrivKey)))->numMultibuffer;
     if (client->swapped)
     {
     	swaps(&rep.sequenceNumber, n);
@@ -1236,7 +1222,7 @@ GetBufferPointer (pWin, i)
 {
     MultibuffersPtr pMultibuffers;
 
-    if (!(pMultibuffers = (MultibuffersPtr) pWin->devPrivates[MultibufferWindowIndex].ptr))
+    if (!(pMultibuffers = (MultibuffersPtr) dixLookupPrivate(&pWin->devPrivates, MultibufferWindowPrivKey)))
 	return NULL;
     return (DrawablePtr) pMultibuffers->buffers[i].pPixmap;
 }
@@ -1475,7 +1461,7 @@ DestroyImageBuffers (pWin)
 {
     FreeResourceByType (pWin->drawable.id, MultibuffersResType, FALSE);
     /* Zero out the window's pointer to the buffers so they won't be reused */
-    pWin->devPrivates[MultibufferWindowIndex].ptr = NULL;
+    dixSetPrivate(&pWin->devPrivates, MultibufferWindowPrivKey, NULL);
 }
 
 /*
@@ -1503,11 +1489,11 @@ MultibufferPositionWindow (pWin, x, y)
     Bool	    clear;
 
     pScreen = pWin->drawable.pScreen;
-    pMultibufferScreen = (MultibufferScreenPtr) pScreen->devPrivates[MultibufferScreenIndex].ptr;
+    pMultibufferScreen = (MultibufferScreenPtr) dixLookupPrivate(&pScreen->devPrivates, MultibufferScreenPrivKey);
     (*pMultibufferScreen->PositionWindow) (pWin, x, y);
 
     /* if this window is not multibuffered, we're done */
-    if (!(pMultibuffers = (MultibuffersPtr) pWin->devPrivates[MultibufferWindowIndex].ptr))
+    if (!(pMultibuffers = (MultibuffersPtr) dixLookupPrivate(&pWin->devPrivates, MultibufferWindowPrivKey)))
 	return TRUE;
 
     /* if new size is same as old, we're done */
@@ -1620,7 +1606,7 @@ MultibufferDrawableDelete (value, id)
     if (pDrawable->type == DRAWABLE_WINDOW)
     {
 	pWin = (WindowPtr) pDrawable;
-	pMultibuffers = (MultibuffersPtr) pWin->devPrivates[MultibufferWindowIndex].ptr;
+	pMultibuffers = (MultibuffersPtr) dixLookupPrivate(&pWin->devPrivates, MultibufferWindowPrivKey);
 	pPixmap = pMultibuffers->buffers[pMultibuffers->displayedMultibuffer].pPixmap;
     }
     else

From e46d559739e020dc7f6fcbdc6d1fb39c57aab4b1 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sat, 22 Dec 2007 15:09:12 -0800
Subject: [PATCH 384/552] XQuartz: Cleaned up color map configuration. 8 bit
 color still doesn't work, but the -depth command line argument now works
 properly. (cherry picked from commit
 6765949c27c053d22882f54337cfd09203aa5383)

---
 hw/xquartz/darwin.c        | 108 ++++++++++++++++---------------------
 hw/xquartz/darwin.h        |  10 ++--
 hw/xquartz/xpr/xprScreen.c |  81 ++++++++++++++++++----------
 3 files changed, 105 insertions(+), 94 deletions(-)

diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index 463073485..3ad9e14d5 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -78,7 +78,7 @@
 #include "darwinEvents.h"
 #include "darwinKeyboard.h"
 #include "quartz.h"
-#include "darwinClut8.h"
+//#include "darwinClut8.h"
 
 #ifdef ENABLE_DEBUG_LOG
 FILE *debug_log_fp = NULL;
@@ -176,17 +176,10 @@ static Bool DarwinSaveScreen(ScreenPtr pScreen, int on)
  *  This is a callback from dix during AddScreen() from InitOutput().
  *  Initialize the screen and communicate information about it back to dix.
  */
-static Bool DarwinAddScreen(
-    int         index,
-    ScreenPtr   pScreen,
-    int         argc,
-    char        **argv )
-{
-    int         bitsPerRGB, i, dpi;
+static Bool DarwinAddScreen(int index, ScreenPtr pScreen, int argc, char **argv) {
+    int         dpi;
     static int  foundIndex = 0;
     Bool        ret;
-    VisualPtr   visual;
-    ColormapPtr pmap;
     DarwinFramebufferPtr dfb;
 
     // reset index of found screens for each server generation
@@ -204,28 +197,13 @@ static Bool DarwinAddScreen(
     if (! ret)
         return FALSE;
 
-    bitsPerRGB = dfb->bitsPerComponent;
-
     // reset the visual list
     miClearVisualTypes();
 
     // setup a single visual appropriate for our pixel type
-    if (dfb->colorType == TrueColor) {
-        if (!miSetVisualTypes( dfb->colorBitsPerPixel, TrueColorMask,
-                               bitsPerRGB, TrueColor )) {
-            return FALSE;
-        }
-    } else if (dfb->colorType == PseudoColor) {
-        if (!miSetVisualTypes( dfb->colorBitsPerPixel, PseudoColorMask,
-                               bitsPerRGB, PseudoColor )) {
-            return FALSE;
-        }
-    } else if (dfb->colorType == StaticColor) {
-        if (!miSetVisualTypes( dfb->colorBitsPerPixel, StaticColorMask,
-                               bitsPerRGB, StaticColor )) {
-            return FALSE;
-        }
-    } else {
+    if(!miSetVisualTypesAndMasks(dfb->depth, dfb->visuals, dfb->bitsPerRGB,
+                                 dfb->preferredCVC, dfb->redMask,
+                                 dfb->greenMask, dfb->blueMask)) {
         return FALSE;
     }
 
@@ -249,20 +227,28 @@ static Bool DarwinAddScreen(
         return FALSE;
     }
 
+//    ErrorF("Screen type: %d, %d=%d, %d=%d, %d=%d, %x=%x=%x, %x=%x=%x, %x=%x=%x\n", pScreen->visuals->class,
+//           pScreen->visuals->offsetRed, dfb->bitsPerRGB * 2,
+//           pScreen->visuals->offsetGreen, dfb->bitsPerRGB,
+//           pScreen->visuals->offsetBlue, 0,
+//           pScreen->visuals->redMask, dfb->redMask, ((1<<dfb->bitsPerRGB)-1) << pScreen->visuals->offsetRed,
+//           pScreen->visuals->greenMask, dfb->greenMask, ((1<<dfb->bitsPerRGB)-1) << pScreen->visuals->offsetGreen,
+//           pScreen->visuals->blueMask, dfb->blueMask, ((1<<dfb->bitsPerRGB)-1) << pScreen->visuals->offsetBlue);
+
     // set the RGB order correctly for TrueColor
-    if (dfb->bitsPerPixel > 8) {
-        for (i = 0, visual = pScreen->visuals;  // someday we may have more than 1
-            i < pScreen->numVisuals; i++, visual++) {
-            if (visual->class == TrueColor) {
-                visual->offsetRed = bitsPerRGB * 2;
-                visual->offsetGreen = bitsPerRGB;
-                visual->offsetBlue = 0;
-                visual->redMask = ((1<<bitsPerRGB)-1) << visual->offsetRed;
-                visual->greenMask = ((1<<bitsPerRGB)-1) << visual->offsetGreen;
-                visual->blueMask = ((1<<bitsPerRGB)-1) << visual->offsetBlue;
-            }
-        }
-    }
+//    if (dfb->bitsPerPixel > 8) {
+//        for (i = 0, visual = pScreen->visuals;  // someday we may have more than 1
+//            i < pScreen->numVisuals; i++, visual++) {
+//            if (visual->class == TrueColor) {
+//                visual->offsetRed = bitsPerRGB * 2;
+//                visual->offsetGreen = bitsPerRGB;
+//                visual->offsetBlue = 0;
+//                visual->redMask = ((1<<bitsPerRGB)-1) << visual->offsetRed;
+//                visual->greenMask = ((1<<bitsPerRGB)-1) << visual->offsetGreen;
+//                visual->blueMask = ((1<<bitsPerRGB)-1) << visual->offsetBlue;
+//            }
+//        }
+//    }
 
 #ifdef RENDER
     if (! fbPictureInit(pScreen, 0, 0)) {
@@ -292,17 +278,16 @@ static Bool DarwinAddScreen(
      * mode and we're using a fixed color map.  Essentially this translates
      * to Darwin/x86 in 8-bit mode.
      */
-    if( (dfb->colorBitsPerPixel == 8) &&
-                (dfb->colorType == StaticColor) )
-    {
-        pmap = miInstalledMaps[pScreen->myNum];
-        visual = pmap->pVisual;
-        for( i = 0; i < visual->ColormapEntries; i++ ) {
-            pmap->red[i].co.local.red   = darwinClut8[i].red;
-            pmap->red[i].co.local.green = darwinClut8[i].green;
-            pmap->red[i].co.local.blue  = darwinClut8[i].blue;
-        }
-    }
+//    if(dfb->depth == 8) {
+//        ColormapPtr map = RootlessGetColormap (pScreen);
+//        for( i = 0; i < map->pVisual->ColormapEntries; i++ ) {
+//            Entry *ent = map->red + i;
+//            ErrorF("Setting lo %d -> r: %04x g: %04x b: %04x\n", i, darwinClut8[i].red, darwinClut8[i].green, darwinClut8[i].blue);
+//            ent->co.local.red   = darwinClut8[i].red;
+//            ent->co.local.green = darwinClut8[i].green;
+//            ent->co.local.blue  = darwinClut8[i].blue;
+//        }
+//    }
 
     dixScreenOrigins[index].x = dfb->x;
     dixScreenOrigins[index].y = dfb->y;
@@ -793,24 +778,21 @@ int ddxProcessArgument( int argc, char *argv[], int i )
     }
 
     if ( !strcmp( argv[i], "-depth" ) ) {
-        int     bitDepth;
-
         if ( i == argc-1 ) {
             FatalError( "-depth must be followed by a number\n" );
         }
 #ifdef OLD_POWERBOOK_G3
         ErrorF( "Ignoring unsupported -depth option on old PowerBook G3\n");
 #else
-        bitDepth = atoi( argv[i+1] );
-        if (bitDepth == 8)
-            darwinDesiredDepth = 0;
-        else if (bitDepth == 15)
-            darwinDesiredDepth = 1;
-        else if (bitDepth == 24)
-            darwinDesiredDepth = 2;
-        else
+        darwinDesiredDepth = atoi( argv[i+1] );
+        if(darwinDesiredDepth != -1 &&
+           darwinDesiredDepth != 8 &&
+           darwinDesiredDepth != 15 &&
+           darwinDesiredDepth != 24) {
             FatalError( "Unsupported pixel depth. Use 8, 15, or 24 bits\n" );
-        ErrorF( "Attempting to use pixel depth of %i\n", bitDepth );
+        }
+
+        ErrorF( "Attempting to use pixel depth of %i\n", darwinDesiredDepth );
 #endif
         return 2;
     }
diff --git a/hw/xquartz/darwin.h b/hw/xquartz/darwin.h
index c569d66df..19254247a 100644
--- a/hw/xquartz/darwin.h
+++ b/hw/xquartz/darwin.h
@@ -40,10 +40,14 @@ typedef struct {
     int                 width;
     int                 height;
     int                 pitch;
-    int                 colorType;
+    int                 depth;
+    int                 visuals;
+    int                 bitsPerRGB;
     int                 bitsPerPixel;
-    int                 colorBitsPerPixel;
-    int                 bitsPerComponent;
+    int                 preferredCVC;
+    Pixel               redMask;
+    Pixel               greenMask;
+    Pixel               blueMask;
 } DarwinFramebufferRec, *DarwinFramebufferPtr;
 
 // From darwin.c
diff --git a/hw/xquartz/xpr/xprScreen.c b/hw/xquartz/xpr/xprScreen.c
index 068b7b177..29179e5fd 100644
--- a/hw/xquartz/xpr/xprScreen.c
+++ b/hw/xquartz/xpr/xprScreen.c
@@ -42,6 +42,7 @@
 #include "globals.h"
 #include "Xplugin.h"
 #include "applewmExt.h"
+#include "micmap.h"
 
 // From xprFrame.c
 WindowPtr xprGetXWindow(xp_window_id wid);
@@ -249,35 +250,59 @@ static Bool
 xprAddScreen(int index, ScreenPtr pScreen)
 {
     DarwinFramebufferPtr dfb = SCREEN_PRIV(pScreen);
-
-    /* If no specific depth chosen, look for the depth of the main display.
-       Else if 16bpp specified, use that. Else use 32bpp. */
-
-    dfb->colorType = TrueColor;
-    dfb->bitsPerComponent = 8;
-    dfb->bitsPerPixel = 32;
-    dfb->colorBitsPerPixel = 24;
-
-    if (darwinDesiredDepth == -1)
-    {
-        dfb->bitsPerComponent = CGDisplayBitsPerSample(kCGDirectMainDisplay);
-        dfb->bitsPerPixel = CGDisplayBitsPerPixel(kCGDirectMainDisplay);
-        dfb->colorBitsPerPixel =
-                CGDisplaySamplesPerPixel(kCGDirectMainDisplay) *
-                dfb->bitsPerComponent;
+    int depth = darwinDesiredDepth;
+    
+    if(depth == -1) {
+        depth = CGDisplaySamplesPerPixel(kCGDirectMainDisplay) * CGDisplayBitsPerSample(kCGDirectMainDisplay);
+        //dfb->depth = CGDisplaySamplesPerPixel(kCGDirectMainDisplay) * CGDisplayBitsPerSample(kCGDirectMainDisplay);
+        //dfb->bitsPerRGB = CGDisplayBitsPerSample(kCGDirectMainDisplay);
+        //dfb->bitsPerPixel = CGDisplayBitsPerPixel(kCGDirectMainDisplay);
     }
-    else if (darwinDesiredDepth == 15)
-    {
-        dfb->bitsPerComponent = 5;
-        dfb->bitsPerPixel = 16;
-        dfb->colorBitsPerPixel = 15;
-    }
-    else if (darwinDesiredDepth == 8)
-    {
-        dfb->colorType = PseudoColor;
-        dfb->bitsPerComponent = 8;
-        dfb->bitsPerPixel = 8;
-        dfb->colorBitsPerPixel = 8;
+    
+    switch(depth) {
+        case -8: // broken
+            FatalError("Unsupported color depth %d\n", darwinDesiredDepth);
+            dfb->visuals = (1 << StaticGray) | (1 << GrayScale);
+            dfb->preferredCVC = GrayScale;
+            dfb->depth = 8;
+            dfb->bitsPerRGB = 8;
+            dfb->bitsPerPixel = 8;
+            dfb->redMask = 0;
+            dfb->greenMask = 0;
+            dfb->blueMask = 0;
+            break;
+        case 8: // broken
+            dfb->visuals = PseudoColorMask;
+            dfb->preferredCVC = PseudoColor;
+            dfb->depth = 8;
+            dfb->bitsPerRGB = 8;
+            dfb->bitsPerPixel = 8;
+            dfb->redMask = 0;
+            dfb->greenMask = 0;
+            dfb->blueMask = 0;
+            break;
+        case 15:
+            dfb->visuals = LARGE_VISUALS;
+            dfb->preferredCVC = TrueColor;
+            dfb->depth = 15;
+            dfb->bitsPerRGB = 5;
+            dfb->bitsPerPixel = 16;
+            dfb->redMask   = 0x7c00;
+            dfb->greenMask = 0x03e0;
+            dfb->blueMask  = 0x001f;
+            break;
+        case 24:
+            dfb->visuals = LARGE_VISUALS;
+            dfb->preferredCVC = TrueColor;
+            dfb->depth = 24;
+            dfb->bitsPerRGB = 8;
+            dfb->bitsPerPixel = 32;
+            dfb->redMask   = 0x00ff0000;
+            dfb->greenMask = 0x0000ff00;
+            dfb->blueMask  = 0x000000ff;
+            break;
+        default:
+            FatalError("Unsupported color depth %d\n", darwinDesiredDepth);
     }
 
     if (noPseudoramiXExtension)

From cd0603c2dc5ee000ebce66056bc1a72f99bfb617 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 3 Jan 2008 21:41:02 -0500
Subject: [PATCH 385/552] Bug #13765: Heap corruption in XC-SECURITY extension
 code.

---
 Xext/xace.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Xext/xace.c b/Xext/xace.c
index 9f8a8cc75..6a7df3188 100644
--- a/Xext/xace.c
+++ b/Xext/xace.c
@@ -448,7 +448,7 @@ XaceCensorImage(client, pVisibleRegion, widthBytesLine, pDraw, x, y, w, h,
 
 	/* convert region to list-of-rectangles for PolyFillRect */
 
-	pRects = (xRectangle *)xalloc(nRects * sizeof(xRectangle *));
+	pRects = (xRectangle *)xalloc(nRects * sizeof(xRectangle));
 	if (!pRects)
 	{
 	    failed = TRUE;

From 20eb26f9d149993ae360a2cbd1b536b68c9f4069 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alex@samba.(none)>
Date: Thu, 3 Jan 2008 22:53:36 -0500
Subject: [PATCH 386/552] Fix potential crasher in xf86CrtcRotate()

xf86CrtcRotate() is called by randr 1.2 drivers via xf86CrtcSetMode() or xf86SetDesiredModes()
during ScreenInit() at which point pScrn->pScreen is not set. If a user specifies a rotation
in their config file pScrn->pScreen is dereferenced and boom.
---
 hw/xfree86/modes/xf86Rotate.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hw/xfree86/modes/xf86Rotate.c b/hw/xfree86/modes/xf86Rotate.c
index 380478f7f..c129d9b92 100644
--- a/hw/xfree86/modes/xf86Rotate.c
+++ b/hw/xfree86/modes/xf86Rotate.c
@@ -494,7 +494,8 @@ xf86CrtcRotate (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation)
 {
     ScrnInfoPtr		pScrn = crtc->scrn;
     xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
-    ScreenPtr		pScreen = pScrn->pScreen;
+    /* if this is called during ScreenInit() we don't have pScrn->pScreen yet */
+    ScreenPtr		pScreen = screenInfo.screens[pScrn->scrnIndex];
     PictTransform	crtc_to_fb, fb_to_crtc;
     
     PictureTransformIdentity (&crtc_to_fb);

From de18703d2a25999e391d11b4c82ee018fb87372d Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 3 Jan 2008 23:07:24 -0500
Subject: [PATCH 387/552] dix: Fix bug+leak in callback manager
 DeleteCallbackList function.

---
 dix/dixutils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dix/dixutils.c b/dix/dixutils.c
index 786f4e335..dd485d518 100644
--- a/dix/dixutils.c
+++ b/dix/dixutils.c
@@ -800,7 +800,7 @@ _DeleteCallbackList(
 
     for (i = 0; i < numCallbackListsToCleanup; i++)
     {
-	if ((listsToCleanup[i] = pcbl) != 0)
+	if (listsToCleanup[i] == pcbl)
 	{
 	    listsToCleanup[i] = NULL;
 	    break;

From 7f376f23db463a65176de632ca6094acb55db951 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 3 Jan 2008 23:08:49 -0500
Subject: [PATCH 388/552] devPrivates rework: Free callback lists after use.

---
 dix/privates.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dix/privates.c b/dix/privates.c
index e04da41b1..47a0e1a29 100644
--- a/dix/privates.c
+++ b/dix/privates.c
@@ -232,6 +232,8 @@ dixResetPrivates(void)
     /* reset internal structures */
     while (items) {
 	next = items->next;
+	DeleteCallbackList(&items->initfuncs);
+	DeleteCallbackList(&items->deletefuncs);
 	xfree(items);
 	items = next;
     }

From 39cb782f28be4efb2621fd8c614f2367eb834412 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 3 Jan 2008 23:16:06 -0500
Subject: [PATCH 389/552] XACE: DeleteCallbackList zeroes out its argument so
 don't do it twice.

---
 Xext/xace.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Xext/xace.c b/Xext/xace.c
index 6a7df3188..e85a51714 100644
--- a/Xext/xace.c
+++ b/Xext/xace.c
@@ -262,10 +262,7 @@ XaceResetProc(ExtensionEntry *extEntry)
     int i;
 
     for (i=0; i<XACE_NUM_HOOKS; i++)
-    {
 	DeleteCallbackList(&XaceHooks[i]);
-	XaceHooks[i] = NULL;
-    }
 } /* XaceResetProc */
 
 

From 57468a696e1259c1e1c185fc60230e1d195defb7 Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@tungstengraphics.com>
Date: Fri, 4 Jan 2008 12:37:55 +0000
Subject: [PATCH 390/552] Fix Line drawing with CapNotLast set in PolySegment.

---
 exa/exa_accel.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/exa/exa_accel.c b/exa/exa_accel.c
index ae951ed9a..c2bfdee6b 100644
--- a/exa/exa_accel.c
+++ b/exa/exa_accel.c
@@ -739,6 +739,14 @@ exaPolySegment (DrawablePtr pDrawable, GCPtr pGC, int nseg,
 	    prect[i].y = pSeg[i].y2;
 	    prect[i].height = pSeg[i].y1 - pSeg[i].y2 + 1;
 	}
+
+	/* don't paint last pixel */
+	if (pGC->capStyle == CapNotLast) {
+	    if (prect[i].width == 1)
+		prect[i].height--;
+	    else
+		prect[i].width--;
+	}
     }
     pGC->ops->PolyFillRect(pDrawable, pGC, nseg, prect);
     xfree(prect);

From aca75f389e2b08096c3cacec03b12a58075cf12c Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Fri, 4 Jan 2008 12:23:09 -0800
Subject: [PATCH 391/552] XQuartz: Flush the debug log for easier debugging
 Also cleaned up formatting in xpr's eventHandler (cherry picked from commit
 16861d6d4239c7f3918332ef07752f1e211afb23)

---
 hw/xquartz/darwin.h        |  2 +-
 hw/xquartz/xpr/xprScreen.c | 91 +++++++++++++++++++-------------------
 2 files changed, 46 insertions(+), 47 deletions(-)

diff --git a/hw/xquartz/darwin.h b/hw/xquartz/darwin.h
index 19254247a..c5e2ed80d 100644
--- a/hw/xquartz/darwin.h
+++ b/hw/xquartz/darwin.h
@@ -124,7 +124,7 @@ enum {
 #ifdef ENABLE_DEBUG_LOG
 extern FILE *debug_log_fp;
 #define DEBUG_LOG_NAME "x11-debug.txt"
-#define DEBUG_LOG(msg, args...) if (debug_log_fp) fprintf(debug_log_fp, "%s:%d: " msg, __FUNCTION__, __LINE__, ##args )
+#define DEBUG_LOG(msg, args...) if (debug_log_fp) fprintf(debug_log_fp, "%s:%s:%d " msg, __FILE__, __FUNCTION__, __LINE__, ##args ); fflush(debug_log_fp);
 #else
 #define DEBUG_LOG(msg, args...) 
 #endif
diff --git a/hw/xquartz/xpr/xprScreen.c b/hw/xquartz/xpr/xprScreen.c
index 29179e5fd..e4e1fda7e 100644
--- a/hw/xquartz/xpr/xprScreen.c
+++ b/hw/xquartz/xpr/xprScreen.c
@@ -62,53 +62,52 @@ static const char *xprOpenGLBundle = "glxCGL.bundle";
  * eventHandler
  *  Callback handler for Xplugin events.
  */
-static void
-eventHandler(unsigned int type, const void *arg,
-             unsigned int arg_size, void *data)
-{
+static void eventHandler(unsigned int type, const void *arg,
+                         unsigned int arg_size, void *data) {
     switch (type) {
-    case XP_EVENT_DISPLAY_CHANGED:
-      DEBUG_LOG("XP_EVENT_DISPLAY_CHANGED\n");
-      QuartzMessageServerThread(kXDarwinDisplayChanged, 0);
-      break;
-
-    case XP_EVENT_WINDOW_STATE_CHANGED:
-      DEBUG_LOG("XP_EVENT_WINDOW_STATE_CHANGED\n");
-      if (arg_size >= sizeof(xp_window_state_event)) {
-	const xp_window_state_event *ws_arg = arg;
-	
-	QuartzMessageServerThread(kXDarwinWindowState, 2,
-				  ws_arg->id, ws_arg->state);
-      }
-      break;
-
-    case XP_EVENT_WINDOW_MOVED:
-      DEBUG_LOG("XP_EVENT_WINDOW_MOVED\n");
-      if (arg_size == sizeof(xp_window_id))  {
-	xp_window_id id = * (xp_window_id *) arg;
-	WindowPtr pWin = xprGetXWindow(id);
-	QuartzMessageServerThread(kXDarwinWindowMoved, 1, pWin);
-      }
-      break;
-      
-    case XP_EVENT_SURFACE_DESTROYED:
-      DEBUG_LOG("XP_EVENT_SURFACE_DESTROYED\n");
-    case XP_EVENT_SURFACE_CHANGED:
-      DEBUG_LOG("XP_EVENT_SURFACE_CHANGED\n");
-        if (arg_size == sizeof(xp_surface_id)) {
-	  int kind;
-	  
-	  if (type == XP_EVENT_SURFACE_DESTROYED)
-	    kind = AppleDRISurfaceNotifyDestroyed;
-	  else
-	    kind = AppleDRISurfaceNotifyChanged;
-	  
-	  DRISurfaceNotify(*(xp_surface_id *) arg, kind);
-        }
-        break;
-    default:
-      ErrorF("Unknown XP_EVENT type (%d) in xprScreen:eventHandler\n",
-	     type);
+        case XP_EVENT_DISPLAY_CHANGED:
+            DEBUG_LOG("XP_EVENT_DISPLAY_CHANGED\n");
+            QuartzMessageServerThread(kXDarwinDisplayChanged, 0);
+            break;
+            
+        case XP_EVENT_WINDOW_STATE_CHANGED:
+            if (arg_size >= sizeof(xp_window_state_event)) {
+                const xp_window_state_event *ws_arg = arg;
+                
+                DEBUG_LOG("XP_EVENT_WINDOW_STATE_CHANGED: id=%d, state=%d\n", ws_arg->id, ws_arg->state);
+                QuartzMessageServerThread(kXDarwinWindowState, 2,
+                                          ws_arg->id, ws_arg->state);
+            } else {
+                DEBUG_LOG("XP_EVENT_WINDOW_STATE_CHANGED: ignored\n");
+            }
+            break;
+            
+        case XP_EVENT_WINDOW_MOVED:
+            DEBUG_LOG("XP_EVENT_WINDOW_MOVED\n");
+            if (arg_size == sizeof(xp_window_id))  {
+                xp_window_id id = * (xp_window_id *) arg;
+                WindowPtr pWin = xprGetXWindow(id);
+                QuartzMessageServerThread(kXDarwinWindowMoved, 1, pWin);
+            }
+            break;
+            
+        case XP_EVENT_SURFACE_DESTROYED:
+            DEBUG_LOG("XP_EVENT_SURFACE_DESTROYED\n");
+        case XP_EVENT_SURFACE_CHANGED:
+            DEBUG_LOG("XP_EVENT_SURFACE_CHANGED\n");
+            if (arg_size == sizeof(xp_surface_id)) {
+                int kind;
+                
+                if (type == XP_EVENT_SURFACE_DESTROYED)
+                    kind = AppleDRISurfaceNotifyDestroyed;
+                else
+                    kind = AppleDRISurfaceNotifyChanged;
+                
+                DRISurfaceNotify(*(xp_surface_id *) arg, kind);
+            }
+            break;
+        default:
+            ErrorF("Unknown XP_EVENT type (%d) in xprScreen:eventHandler\n", type);
     }
 }
 

From 11967dce11cd953d123d53bb3389aa257c5158e8 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Fri, 4 Jan 2008 22:54:26 -0800
Subject: [PATCH 392/552] XQuartz: Fixed copyright in About box for 2008. 
 Happy New Year!

---
 hw/xquartz/Makefile.am       | 4 +++-
 hw/xquartz/bundle/Info.plist | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/hw/xquartz/Makefile.am b/hw/xquartz/Makefile.am
index 831ba49f4..9ac6e0a3e 100644
--- a/hw/xquartz/Makefile.am
+++ b/hw/xquartz/Makefile.am
@@ -1,7 +1,9 @@
 noinst_LTLIBRARIES = libXquartz.la
 AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
+AM_OBJCFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
 AM_CPPFLAGS = \
 	-DBUILD_DATE=\"$(BUILD_DATE)\" \
+	-DXSERVER_VERSION=\"$(VERSION)\" \
 	-DINXQUARTZ \
 	-DUSE_NEW_CLUT \
 	-DXFree86Server \
@@ -15,7 +17,7 @@ SUBDIRS = . xpr $(X11APP_SUBDIRS)
 DIST_SUBDIRS = xpr bundle
 
 libXquartz_la_SOURCES = \
-	$(top_srcdir)/fb/fbcmap.c \
+	$(top_srcdir)/fb/fbcmap_mi.c \
 	$(top_srcdir)/mi/miinitext.c \
 	X11Application.m \
 	X11Controller.m \
diff --git a/hw/xquartz/bundle/Info.plist b/hw/xquartz/bundle/Info.plist
index fce8c964d..5babdfe6e 100644
--- a/hw/xquartz/bundle/Info.plist
+++ b/hw/xquartz/bundle/Info.plist
@@ -25,9 +25,9 @@
 	<key>CSResourcesFileMapped</key>
 		<true/>
 	<key>NSHumanReadableCopyright</key>
-		<string>Copyright © 2003-2007, Apple Inc.
+		<string>Copyright © 2003-2008, Apple Inc.
 Copyright © 2003, XFree86 Project, Inc.
-Copyright © 2003-2007, X.org Project, Inc.
+Copyright © 2003-2008, X.org Project, Inc.
 </string>
 	<key>NSMainNibFile</key>
 		<string>main</string>

From 7d226d6a251cb90765be2b50a1973986c5b7605b Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sat, 5 Jan 2008 03:14:07 -0800
Subject: [PATCH 393/552] XQuartz: Cleanup for strict-prototyping Also fixed
 DarwinEQEnqueue to match changes to the callback And also use dpmsstubs.c
 rather than copying the code into darwin.c (cherry picked from commit
 4c5c30a4beb7a427b00b18097f548876ad3c11d7)

---
 hw/xquartz/Makefile.am        |  1 +
 hw/xquartz/X11Application.m   |  2 +-
 hw/xquartz/applewm.c          | 15 ++++++---------
 hw/xquartz/darwin.c           | 18 ------------------
 hw/xquartz/darwinEvents.c     |  7 +++----
 hw/xquartz/darwinEvents.h     |  5 +++--
 hw/xquartz/darwinKeyboard.c   |  6 +++---
 hw/xquartz/darwinXinput.c     |  9 +++------
 hw/xquartz/quartzAudio.c      |  2 +-
 hw/xquartz/quartzCocoa.m      |  1 +
 hw/xquartz/quartzForeground.c |  2 ++
 hw/xquartz/quartzForeground.h |  2 +-
 hw/xquartz/quartzPasteboard.h |  4 ++--
 hw/xquartz/quartzStartup.c    |  7 ++++---
 hw/xquartz/xpr/appledri.c     |  1 +
 15 files changed, 32 insertions(+), 50 deletions(-)

diff --git a/hw/xquartz/Makefile.am b/hw/xquartz/Makefile.am
index 9ac6e0a3e..99d23eb1f 100644
--- a/hw/xquartz/Makefile.am
+++ b/hw/xquartz/Makefile.am
@@ -19,6 +19,7 @@ DIST_SUBDIRS = xpr bundle
 libXquartz_la_SOURCES = \
 	$(top_srcdir)/fb/fbcmap_mi.c \
 	$(top_srcdir)/mi/miinitext.c \
+	$(top_srcdir)/Xext/dpmsstubs.c \
 	X11Application.m \
 	X11Controller.m \
 	applewm.c \
diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index 56db2c477..72537bb65 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -855,7 +855,7 @@ static void send_nsevent (NSEventType type, NSEvent *e) {
     NSWindow *window;
     int pointer_x, pointer_y, ev_button, ev_type; 
     //    int num_events=0, i=0, state;
-    xEvent xe;
+    // xEvent xe;
 	
     /* convert location to global top-left coordinates */
     location = [e locationInWindow];
diff --git a/hw/xquartz/applewm.c b/hw/xquartz/applewm.c
index 72dca28e7..c460ec6ae 100644
--- a/hw/xquartz/applewm.c
+++ b/hw/xquartz/applewm.c
@@ -264,8 +264,7 @@ WMFreeEvents (data, id)
 }
 
 static int
-ProcAppleWMSelectInput (client)
-    register ClientPtr  client;
+ProcAppleWMSelectInput (register ClientPtr client)
 {
     REQUEST(xAppleWMSelectInputReq);
     WMEventPtr      pEvent, pNewEvent, *pHead;
@@ -479,13 +478,11 @@ ProcAppleWMSetFrontProcess(
 }
 
 static int
-ProcAppleWMSetWindowLevel(
-    register ClientPtr client
-)
+ProcAppleWMSetWindowLevel(register ClientPtr client)
 {
     REQUEST(xAppleWMSetWindowLevelReq);
     WindowPtr pWin;
-    int errno;
+    int err;
 
     REQUEST_SIZE_MATCH(xAppleWMSetWindowLevelReq);
 
@@ -497,9 +494,9 @@ ProcAppleWMSetWindowLevel(
         return BadValue;
     }
 
-     errno = appleWMProcs->SetWindowLevel(pWin, stuff->level);
-     if (errno != Success) {
-        return errno;
+     err = appleWMProcs->SetWindowLevel(pWin, stuff->level);
+     if (err != Success) {
+        return err;
     }
 
     return (client->noClientException);
diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index 3ad9e14d5..20bcee592 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -879,24 +879,6 @@ void AbortDDX( void )
     ddxGiveUp();
 }
 
-
-/*
- * DPMS extension stubs
- */
-Bool DPMSSupported(void)
-{
-    return FALSE;
-}
-
-void DPMSSet(int level)
-{
-}
-
-int DPMSGet(int *level)
-{
-    return -1;
-}
-
 #include "mivalidate.h" // for union _Validate used by windowstr.h
 #include "windowstr.h"  // for struct _Window
 #include "scrnintstr.h" // for struct _Screen
diff --git a/hw/xquartz/darwinEvents.c b/hw/xquartz/darwinEvents.c
index 1760792c6..827fd81b8 100644
--- a/hw/xquartz/darwinEvents.c
+++ b/hw/xquartz/darwinEvents.c
@@ -45,6 +45,7 @@ in this Software without prior written authorization from The Open Group.
 #include "darwin.h"
 #include "quartz.h"
 #include "darwinKeyboard.h"
+#include "darwinEvents.h"
 
 #include <sys/types.h>
 #include <sys/uio.h>
@@ -213,9 +214,8 @@ Bool DarwinEQInit(DevicePtr pKbd, DevicePtr pPtr) {
  * 
  * This should be deprecated in favor of miEQEnqueue -- BB
  */
-void DarwinEQEnqueue(const xEvent *e) {
+void DarwinEQEnqueue(const xEventPtr e) {
     HWEventQueueType oldtail, newtail;
-    char byte = 0;
 
     oldtail = darwinEventQueue.tail;
 
@@ -253,7 +253,7 @@ void DarwinEQEnqueue(const xEvent *e) {
  * DarwinEQPointerPost
  *  Post a pointer event. Used by the mipointer.c routines.
  */
-void DarwinEQPointerPost(xEvent *e) {
+void DarwinEQPointerPost(DeviceIntPtr pdev, xEventPtr e) {
     (*darwinEventQueue.pPtr->processInputProc)
             (e, (DeviceIntPtr)darwinEventQueue.pPtr, 1);
 }
@@ -274,7 +274,6 @@ void ProcessInputEvents(void) {
     EventRec *e;
     int     x, y;
     xEvent  xe;
-    static int  old_flags = 0;  // last known modifier state
     // button number and modifier mask of currently pressed fake button
     input_check_flag=0;
 
diff --git a/hw/xquartz/darwinEvents.h b/hw/xquartz/darwinEvents.h
index d6cab2e6c..82cc26bc0 100644
--- a/hw/xquartz/darwinEvents.h
+++ b/hw/xquartz/darwinEvents.h
@@ -28,12 +28,13 @@
 #define _DARWIN_EVENTS_H
 
 Bool DarwinEQInit(DevicePtr pKbd, DevicePtr pPtr);
-void DarwinEQEnqueue(const xEvent *e);
-void DarwinEQPointerPost(xEvent *e);
+void DarwinEQEnqueue(const xEventPtr e);
+void DarwinEQPointerPost(DeviceIntPtr pDev, xEventPtr e);
 void DarwinEQSwitchScreen(ScreenPtr pScreen, Bool fromDIX);
 void DarwinPokeEQ(void);
 void DarwinSendPointerEvents(int ev_type, int ev_button, int pointer_x, int pointer_y);
 void DarwinSendKeyboardEvents(int ev_type, int keycode);
 void DarwinSendScrollEvents(float count, int pointer_x, int pointer_y);
+void DarwinUpdateModKeys(int flags);
 
 #endif  /* _DARWIN_EVENTS_H */
diff --git a/hw/xquartz/darwinKeyboard.c b/hw/xquartz/darwinKeyboard.c
index f1b90b76a..b368fe9d9 100644
--- a/hw/xquartz/darwinKeyboard.c
+++ b/hw/xquartz/darwinKeyboard.c
@@ -330,7 +330,7 @@ static void parse_next_char_code(DataStream *s, KeySym *k) {
  * DarwinReadKeymapFile
  *      Read the appropriate keymapping from a keymapping file.
  */
-Bool DarwinReadKeymapFile(NXKeyMapping *keyMap) {
+static Bool DarwinReadKeymapFile(NXKeyMapping *keyMap) {
     struct stat         st;
     NXEventSystemDevice info[20];
     int                 interface = 0, handler_id = 0;
@@ -439,7 +439,7 @@ Bool DarwinReadKeymapFile(NXKeyMapping *keyMap) {
 /*
  * DarwinParseNXKeyMapping
  */
-Bool DarwinParseNXKeyMapping(darwinKeyboardInfo  *info) {
+static Bool DarwinParseNXKeyMapping(darwinKeyboardInfo  *info) {
     KeySym              *k;
     int                 i;
     short               numMods, numKeys, numPadKeys = 0;
@@ -933,7 +933,7 @@ int DarwinModifierNXMaskToNXKey(int mask) {
     return -1;
 }
 
-const char *DarwinModifierNXMaskTostring(int mask) {
+static const char *DarwinModifierNXMaskTostring(int mask) {
     switch (mask) {
         case NX_ALPHASHIFTMASK:      return "NX_ALPHASHIFTMASK";
         case NX_SHIFTMASK:           return "NX_SHIFTMASK";
diff --git a/hw/xquartz/darwinXinput.c b/hw/xquartz/darwinXinput.c
index ee456a43a..e62ec0ab6 100644
--- a/hw/xquartz/darwinXinput.c
+++ b/hw/xquartz/darwinXinput.c
@@ -63,6 +63,7 @@ SOFTWARE.
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
 #include "XIstubs.h"
+#include "chgkbd.h"
 
 /***********************************************************************
  *
@@ -88,16 +89,12 @@ SOFTWARE.
  *
  */
 
-int
-ChangeKeyboardDevice (old_dev, new_dev)
-    DeviceIntPtr	old_dev;
-    DeviceIntPtr	new_dev;
-    {
+int ChangeKeyboardDevice (DeviceIntPtr old_dev, DeviceIntPtr new_dev) {
     /***********************************************************************
      DeleteFocusClassDeviceStruct(old_dev);	 * defined in xchgptr.c *
     **********************************************************************/
     return BadMatch;
-    }
+}
 
 
 /***********************************************************************
diff --git a/hw/xquartz/quartzAudio.c b/hw/xquartz/quartzAudio.c
index 86bb20015..5dee32f54 100644
--- a/hw/xquartz/quartzAudio.c
+++ b/hw/xquartz/quartzAudio.c
@@ -50,7 +50,7 @@
 #include <X11/extensions/XI.h>
 #include <assert.h>
 
-void NSBeep();
+void NSBeep(void);
 
 typedef struct QuartzAudioRec {
     double frequency;
diff --git a/hw/xquartz/quartzCocoa.m b/hw/xquartz/quartzCocoa.m
index 0086c5ca4..53e3f0897 100644
--- a/hw/xquartz/quartzCocoa.m
+++ b/hw/xquartz/quartzCocoa.m
@@ -37,6 +37,7 @@
 #endif
 
 #include "quartzCommon.h"
+#include "quartzPasteboard.h"
 
 #define BOOL xBOOL
 #include "darwin.h"
diff --git a/hw/xquartz/quartzForeground.c b/hw/xquartz/quartzForeground.c
index bfea642d1..0e724de76 100644
--- a/hw/xquartz/quartzForeground.c
+++ b/hw/xquartz/quartzForeground.c
@@ -32,6 +32,8 @@
 #include <ApplicationServices/ApplicationServices.h>
 #include <stdio.h>
 
+#include "quartzForeground.h"
+
 int QuartzMoveToForeground() {
    ProcessSerialNumber psn = { 0, kCurrentProcess };
    OSStatus returnCode = TransformProcessType(& psn, kProcessTransformToForegroundApplication);
diff --git a/hw/xquartz/quartzForeground.h b/hw/xquartz/quartzForeground.h
index 4fc21c72f..b5422ff9c 100644
--- a/hw/xquartz/quartzForeground.h
+++ b/hw/xquartz/quartzForeground.h
@@ -32,6 +32,6 @@
 #ifndef _QUARTZ_FOREGROUND_H_
 #define _QUARTZ_FOREGROUND_H_
 
-int QuartzMoveToForeground();
+int QuartzMoveToForeground(void);
 
 #endif /* _QUARTZ_FOREGROUND_H_ */
diff --git a/hw/xquartz/quartzPasteboard.h b/hw/xquartz/quartzPasteboard.h
index afcb6e587..d6a8ee815 100644
--- a/hw/xquartz/quartzPasteboard.h
+++ b/hw/xquartz/quartzPasteboard.h
@@ -34,11 +34,11 @@
 #define _QUARTZPASTEBOARD_H
 
 // Aqua->X 
-void QuartzReadPasteboard();
+void QuartzReadPasteboard(void);
 char * QuartzReadCocoaPasteboard(void);	// caller must free string
 
 // X->Aqua
-void QuartzWritePasteboard();
+void QuartzWritePasteboard(void);
 void QuartzWriteCocoaPasteboard(char *text);
 
 #endif	/* _QUARTZPASTEBOARD_H */
diff --git a/hw/xquartz/quartzStartup.c b/hw/xquartz/quartzStartup.c
index 1b2a22623..e25e15583 100644
--- a/hw/xquartz/quartzStartup.c
+++ b/hw/xquartz/quartzStartup.c
@@ -52,8 +52,11 @@
 char **envpGlobal;      // argcGlobal and argvGlobal
                         // are from dix/globals.c
 
+int main(int argc, char **argv, char **envp);
+void _InitHLTB(void);
+void DarwinHandleGUI(int argc, char **argv, char **envp);
+
 static void server_thread (void *arg) {
-  extern int main(int argc, char **argv, char **envp);
   exit (main (argcGlobal, argvGlobal, envpGlobal));
 }
 
@@ -103,8 +106,6 @@ void DarwinHandleGUI(int argc, char **argv, char **envp) {
        before the main thread when we're _not_ prebound, things fail,
        so initialize by hand. */
 
-    extern void _InitHLTB(void);
-    
     _InitHLTB();    
     X11ControllerMain(argc, (const char **)argv, server_thread, NULL);
     exit(0);
diff --git a/hw/xquartz/xpr/appledri.c b/hw/xquartz/xpr/appledri.c
index 95a443976..b4a4725e2 100644
--- a/hw/xquartz/xpr/appledri.c
+++ b/hw/xquartz/xpr/appledri.c
@@ -55,6 +55,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "swaprep.h"
 #include "dri.h"
 #include "dristruct.h"
+#include "xpr.h"
 
 static int DRIErrorBase = 0;
 

From 59df687835c68eda147de47edfe9bc415c0efb4f Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@debian.org>
Date: Sun, 6 Jan 2008 16:57:45 +0100
Subject: [PATCH 394/552] Document the AllowEmptyInput, AutoAddDevices and
 AutoEnableDevices flags

Add documentation for the new AllowEmptyInput, AutoAddDevices and
AutoEnableDevices server flags in the xorg.conf manpage.
---
 hw/xfree86/doc/man/xorg.conf.man.pre | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
index 77439a517..9a0811159 100644
--- a/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -704,6 +704,20 @@ default.
 .BI "Option \*qIgnoreABI\*q \*q" boolean \*q
 Allow modules built for a different, potentially incompatible version of
 the X server to load. Disabled by default.
+.TP 7
+.BI "Option \*qAllowEmptyInput\*q \*q" boolean \*q
+If enabled, don't add the standard keyboard and mouse drivers, if there are no
+input devices in the config file.  Disabled by default.
+.TP 7
+.BI "Option \*qAutoAddDevices\*q \*q" boolean \*q
+If this option is disabled, then no devices will be added from HAL events.
+Enabled by default.
+.TP 7
+.BI "Option \*qAutoEnableDevices\*q \*q" boolean \*q
+If this option is disabled, then the devices will be added (and the
+DevicePresenceNotify event sent), but not enabled, thus leaving policy up
+to the client.
+Enabled by default.
 .SH "MODULE SECTION"
 The
 .B Module

From 7e7622165940934e56ae96ae785a8f88eec1a5cf Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@debian.org>
Date: Sun, 6 Jan 2008 18:23:09 +0100
Subject: [PATCH 395/552] Fix the name of the XFree86-Misc extension in the
 xorg.conf manpage.

---
 hw/xfree86/doc/man/xorg.conf.man.pre | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
index 9a0811159..7eaf5d506 100644
--- a/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -493,7 +493,7 @@ extension) to connect from another host.
 Default: off.
 .TP 7
 .BI "Option \*qDisableModInDev\*q  \*q" boolean \*q
-This disables the parts of the __xservername__\-Misc extension that can be used to
+This disables the parts of the XFree86\-Misc extension that can be used to
 modify the input device settings dynamically.
 Default: that functionality is enabled.
 .TP 7

From 260505e3c5a18044e97d31ea3bcc0955e46335c8 Mon Sep 17 00:00:00 2001
From: David Nusinow <dnusinow@debian.org>
Date: Sun, 6 Jan 2008 16:37:13 -0500
Subject: [PATCH 396/552] Log enabling of DPMS even when it's not set in
 xorg.conf

---
 hw/xfree86/common/xf86DPMS.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hw/xfree86/common/xf86DPMS.c b/hw/xfree86/common/xf86DPMS.c
index 43efb8ed4..a23d81d3f 100644
--- a/hw/xfree86/common/xf86DPMS.c
+++ b/hw/xfree86/common/xf86DPMS.c
@@ -79,7 +79,6 @@ xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags)
 	    && !DPMSDisabledSwitch)
 	    DPMSEnabled = TRUE;
 	xf86MarkOptionUsed(DPMSOpt);
-	xf86DrvMsg(pScreen->myNum, X_CONFIG, "DPMS enabled\n");
     } else if (DPMSEnabledSwitch) {
 	if (!DPMSDisabledSwitch)
 	    DPMSEnabled = TRUE;
@@ -88,6 +87,8 @@ xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags)
     else {
 	pDPMS->Enabled = defaultDPMSEnabled;
     }
+    if (pDPMS->Enabled)
+	xf86DrvMsg(pScreen->myNum, X_CONFIG, "DPMS enabled\n");
     pDPMS->CloseScreen = pScreen->CloseScreen;
     pScreen->CloseScreen = DPMSClose;
     DPMSCount++;

From 981bb9f1e33e4564d1b59c00c808cc43a2e9497b Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue, 18 Dec 2007 13:57:07 +1030
Subject: [PATCH 397/552] dix: set the correct number of valuators in valuator
 events.

(first_valuator + num_valuators) must never be larger than the number of axes,
otherwise DIX freaks out. And from looking at libXI, anything larger than 6 is
wrong too.
(cherry picked from commit 9f6ae61ad12cc2813d04405458e1ca5aed8a539e)
---
 dix/getevents.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dix/getevents.c b/dix/getevents.c
index 40fc7f2a9..12cb950b2 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -346,7 +346,7 @@ getValuatorEvents(xEvent *events, DeviceIntPtr pDev, int first_valuator,
     for (i = first_valuator; i < final_valuator; i += 6, xv++, events++) {
         xv->type = DeviceValuator;
         xv->first_valuator = i;
-        xv->num_valuators = num_valuators;
+        xv->num_valuators = ((num_valuators - i) > 6) ? 6 : (num_valuators - i);
         xv->deviceid = pDev->id;
         switch (final_valuator - i) {
         case 6:

From 30375cd6d1439a3390b41714fe116aecc94743ca Mon Sep 17 00:00:00 2001
From: David Nusinow <dnusinow@debian.org>
Date: Mon, 7 Jan 2008 20:57:30 -0500
Subject: [PATCH 398/552] Don't log DPMS enabling as being from xorg.conf if
 it's not

---
 hw/xfree86/common/xf86DPMS.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hw/xfree86/common/xf86DPMS.c b/hw/xfree86/common/xf86DPMS.c
index a23d81d3f..4fb901aae 100644
--- a/hw/xfree86/common/xf86DPMS.c
+++ b/hw/xfree86/common/xf86DPMS.c
@@ -60,6 +60,7 @@ xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags)
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
     DPMSPtr pDPMS;
     pointer DPMSOpt;
+    MessageType enabled_from = X_INFO;
 
     DPMSKey = &DPMSKey;
 
@@ -78,6 +79,7 @@ xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags)
 	    = xf86SetBoolOption(pScrn->options, "dpms", FALSE))
 	    && !DPMSDisabledSwitch)
 	    DPMSEnabled = TRUE;
+            enabled_from = X_CONFIG;
 	xf86MarkOptionUsed(DPMSOpt);
     } else if (DPMSEnabledSwitch) {
 	if (!DPMSDisabledSwitch)
@@ -88,7 +90,7 @@ xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags)
 	pDPMS->Enabled = defaultDPMSEnabled;
     }
     if (pDPMS->Enabled)
-	xf86DrvMsg(pScreen->myNum, X_CONFIG, "DPMS enabled\n");
+	xf86DrvMsg(pScreen->myNum, enabled_from, "DPMS enabled\n");
     pDPMS->CloseScreen = pScreen->CloseScreen;
     pScreen->CloseScreen = DPMSClose;
     DPMSCount++;

From c31aead0fe9fe424120ce221cd9f76cb6d29a5b5 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@openedhand.com>
Date: Tue, 8 Jan 2008 12:12:06 +0100
Subject: [PATCH 399/552] [Kdrive] make XCalibrate 'orientation aware'

---
 Xext/xcalibrate.c      | 47 +++++++++++++++++++++++++++++++++++++++++-
 hw/kdrive/src/kdrive.h |  5 ++++-
 hw/kdrive/src/kinput.c | 12 +++++++++++
 3 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/Xext/xcalibrate.c b/Xext/xcalibrate.c
index 97ef3dc38..3fe2bdc5c 100644
--- a/Xext/xcalibrate.c
+++ b/Xext/xcalibrate.c
@@ -164,7 +164,6 @@ ProcXCalibrateSetRawMode (ClientPtr client)
   return (client->noClientException);
 }
 
-
 static int
 SProcXCalibrateSetRawMode (ClientPtr client)
 {
@@ -178,6 +177,47 @@ SProcXCalibrateSetRawMode (ClientPtr client)
   return ProcXCalibrateSetRawMode(client);
 }
 
+static int
+ProcXCalibrateScreenToCoord (ClientPtr client)
+{
+  REQUEST(xXCalibrateScreenToCoordReq);
+  xXCalibrateScreenToCoordReply rep;
+
+  REQUEST_SIZE_MATCH (xXCalibrateScreenToCoordReq);
+
+  memset (&rep, 0, sizeof (rep));
+  rep.type = X_Reply;
+  rep.sequenceNumber = client->sequence;
+  rep.x = stuff->x;
+  rep.y = stuff->y;
+
+  KdScreenToPointerCoords(&rep.x, &rep.y);
+
+  if (client->swapped)
+    {
+      int n;
+
+      swaps (&rep.x, n);
+      swaps (&rep.y, n);
+    }
+  WriteToClient(client, sizeof (rep), (char *) &rep);
+  return (client->noClientException);
+}
+
+static int
+SProcXCalibrateScreenToCoord (ClientPtr client)
+{
+  REQUEST(xXCalibrateScreenToCoordReq);
+  int n;
+
+  REQUEST_SIZE_MATCH (xXCalibrateScreenToCoordReq);
+
+  swaps(&stuff->x, n);
+  swaps(&stuff->y, n);
+
+  return ProcXCalibrateScreenToCoord(client);
+}
+
 static void
 XCalibrateResetProc (ExtensionEntry *extEntry) 
 { 
@@ -192,6 +232,9 @@ ProcXCalibrateDispatch (ClientPtr client)
         return ProcXCalibrateQueryVersion(client);
     case X_XCalibrateRawMode:
         return ProcXCalibrateSetRawMode(client);
+    case X_XCalibrateScreenToCoord:
+        return ProcXCalibrateScreenToCoord(client);
+
     default: break;
     }
 
@@ -211,6 +254,8 @@ SProcXCalibrateDispatch (ClientPtr client)
         return SProcXCalibrateQueryVersion(client);
     case X_XCalibrateRawMode:
         return SProcXCalibrateSetRawMode(client);
+    case X_XCalibrateScreenToCoord:
+        return SProcXCalibrateScreenToCoord(client);
 
     default: break;
     }
diff --git a/hw/kdrive/src/kdrive.h b/hw/kdrive/src/kdrive.h
index 8722ba303..4e04b59f7 100644
--- a/hw/kdrive/src/kdrive.h
+++ b/hw/kdrive/src/kdrive.h
@@ -832,7 +832,10 @@ KdSetPointerMatrix (KdPointerMatrix *pointer);
 
 void
 KdComputePointerMatrix (KdPointerMatrix *pointer, Rotation randr, int width, int height);
-    
+
+void
+KdScreenToPointerCoords (int *x, int *y);
+
 void
 KdBlockHandler (int		screen,
 		pointer		blockData,
diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index 6c247c185..df73942e7 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -631,6 +631,18 @@ KdComputePointerMatrix (KdPointerMatrix *m, Rotation randr, int width,
     }
 }
 
+void
+KdScreenToPointerCoords (int *x, int *y)
+{
+    int	(*m)[3] = kdPointerMatrix.matrix;
+    int div = m[0][1] * m[1][0] - m[1][1] * m[0][0];
+    int sx = *x;
+    int sy = *y;
+
+    *x = (m[0][1] * sy - m[0][1] * m[1][2] + m[1][1] * m[0][2] - m[1][1] * sx) / div;
+    *y = (m[1][0] * sx + m[0][0] * m[1][2] - m[1][0] * m[0][2] - m[0][0] * sy) / div;
+}
+
 static void
 KdKbdCtrl (DeviceIntPtr pDevice, KeybdCtrl *ctrl)
 {

From e070c2cbef0d6fbbafce8d417e8b29231c2fdc50 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri, 7 Dec 2007 20:18:49 +1030
Subject: [PATCH 400/552] mi: change infamous "Tossed event ..." error for
 something more explanatory.

Few whitespace errors fixed.
Two ErrorF's prefixed with [mi].
(cherry picked from commit 117458d2db49efd3f04432ff45871b44c7d4ad57)
---
 mi/mieq.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/mi/mieq.c b/mi/mieq.c
index c2f687a6b..aaa247d6c 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -122,7 +122,7 @@ mieqEnqueue(DeviceIntPtr pDev, xEvent *e)
      * motion event they need to be attached to.  Sigh. */
     if (e->u.u.type == DeviceValuator) {
         if (laste->nevents > 6) {
-            ErrorF("mieqEnqueue: more than six valuator events; dropping.\n");
+            ErrorF("[mi] mieqEnqueue: more than six valuator events; dropping.\n");
             return;
         }
         if (oldtail == miEventQueue.head ||
@@ -133,7 +133,7 @@ mieqEnqueue(DeviceIntPtr pDev, xEvent *e)
               lastkbp->type == ProximityOut) ||
             ((lastkbp->deviceid & DEVICE_BITS) !=
              (v->deviceid & DEVICE_BITS))) {
-            ErrorF("mieqEnequeue: out-of-order valuator event; dropping.\n");
+            ErrorF("[mi] mieqEnequeue: out-of-order valuator event; dropping.\n");
             return;
         }
         memcpy(&(laste->event[laste->nevents++]), e, sizeof(xEvent));
@@ -145,12 +145,13 @@ mieqEnqueue(DeviceIntPtr pDev, xEvent *e)
 	oldtail = (oldtail - 1) % QUEUE_SIZE;
     }
     else {
-    	newtail = (oldtail + 1) % QUEUE_SIZE;
-    	/* Toss events which come in late.  Usually this means your server's
+	newtail = (oldtail + 1) % QUEUE_SIZE;
+	/* Toss events which come in late.  Usually this means your server's
          * stuck in an infinite loop somewhere, but SIGIO is still getting
          * handled. */
-    	if (newtail == miEventQueue.head) {
-            ErrorF("tossed event which came in late\n");
+	if (newtail == miEventQueue.head) {
+            ErrorF("[mi] EQ overflowing. The server is probably stuck "
+                   "in an infinite loop.\n");
 	    return;
         }
 	miEventQueue.tail = newtail;

From 59a63d72a1407a8aaf9878eeff7ee7a66f65a42b Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed, 9 Jan 2008 18:42:58 -0800
Subject: [PATCH 401/552] Fix reference to old versions of XFree86 to not say
 "Xorg 4.2 or earlier"

---
 hw/xfree86/doc/man/xorg.conf.man.pre | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
index 7eaf5d506..1369a16c9 100644
--- a/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -2029,7 +2029,7 @@ These both specify that the upper left corner's coordinates are
 The
 .B Absolute
 keyword is optional.
-Some older versions of __xservername__ (4.2 and earlier) don't recognise the
+Some older versions of XFree86 (4.2 and earlier) don't recognise the
 .B Absolute
 keyword, so it's safest to just specify the coordinates without it.
 .TP 4

From 0883e838e25227f0af84d2a90979175724166d16 Mon Sep 17 00:00:00 2001
From: Peter Harris <peter.harris@hummingbird.com>
Date: Wed, 9 Jan 2008 14:52:33 -0500
Subject: [PATCH 402/552] xf86misc.c: Avoid use of swapped values

---
 hw/xfree86/dixmods/extmod/xf86misc.c | 33 +++++++++++++++-------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/hw/xfree86/dixmods/extmod/xf86misc.c b/hw/xfree86/dixmods/extmod/xf86misc.c
index 66278a298..8f4434601 100644
--- a/hw/xfree86/dixmods/extmod/xf86misc.c
+++ b/hw/xfree86/dixmods/extmod/xf86misc.c
@@ -250,6 +250,7 @@ ProcXF86MiscGetMouseSettings(client)
     char *devname;
     pointer mouse;
     register int n;
+    int devnamelen;
 
     DEBUG_P("XF86MiscGetMouseSettings");
 
@@ -269,7 +270,7 @@ ProcXF86MiscGetMouseSettings(client)
     rep.emulate3timeout = MiscExtGetMouseValue(mouse, MISC_MSE_EM3TIMEOUT);
     rep.chordmiddle =	  MiscExtGetMouseValue(mouse, MISC_MSE_CHORDMIDDLE);
     rep.flags =		  MiscExtGetMouseValue(mouse, MISC_MSE_FLAGS);
-    rep.devnamelen = (devname? strlen(devname): 0);
+    devnamelen = rep.devnamelen = (devname? strlen(devname): 0);
     rep.length = (sizeof(xXF86MiscGetMouseSettingsReply) -
 		  sizeof(xGenericReply) + ((rep.devnamelen+3) & ~3)) >> 2;
     
@@ -289,8 +290,8 @@ ProcXF86MiscGetMouseSettings(client)
     WriteToClient(client, SIZEOF(xXF86MiscGetMouseSettingsReply), (char *)&rep);
     MiscExtDestroyStruct(mouse, MISC_POINTER);
     
-    if (rep.devnamelen)
-        WriteToClient(client, rep.devnamelen, devname);
+    if (devnamelen)
+        WriteToClient(client, devnamelen, devname);
     return (client->noClientException);
 }
 
@@ -508,6 +509,7 @@ ProcXF86MiscGetFilePaths(client)
     const char *modulepath;
     const char *logfile;
     register int n;
+    int configlen, modulelen, loglen;
 
     DEBUG_P("XF86MiscGetFilePaths");
 
@@ -518,9 +520,9 @@ ProcXF86MiscGetFilePaths(client)
     if (!MiscExtGetFilePaths(&configfile, &modulepath, &logfile))
 	return BadValue;
 
-    rep.configlen = (configfile? strlen(configfile): 0);
-    rep.modulelen = (modulepath? strlen(modulepath): 0);
-    rep.loglen = (logfile? strlen(logfile): 0);
+    configlen = rep.configlen = (configfile? strlen(configfile): 0);
+    modulelen = rep.modulelen = (modulepath? strlen(modulepath): 0);
+    loglen = rep.loglen = (logfile? strlen(logfile): 0);
     rep.length = (SIZEOF(xXF86MiscGetFilePathsReply) - SIZEOF(xGenericReply) +
 		  ((rep.configlen + 3) & ~3) +
 		  ((rep.modulelen + 3) & ~3) +
@@ -535,12 +537,12 @@ ProcXF86MiscGetFilePaths(client)
     }
     WriteToClient(client, SIZEOF(xXF86MiscGetFilePathsReply), (char *)&rep);
     
-    if (rep.configlen)
-        WriteToClient(client, rep.configlen, (char *)configfile);
-    if (rep.modulelen)
-        WriteToClient(client, rep.modulelen, (char *)modulepath);
-    if (rep.loglen)
-        WriteToClient(client, rep.loglen, (char *)logfile);
+    if (configlen)
+        WriteToClient(client, configlen, (char *)configfile);
+    if (modulelen)
+        WriteToClient(client, modulelen, (char *)modulepath);
+    if (loglen)
+        WriteToClient(client, loglen, (char *)logfile);
 
     return (client->noClientException);
 }
@@ -553,6 +555,7 @@ ProcXF86MiscPassMessage(client)
     char *msgtype, *msgval, *retstr;
     int retval, size;
     register int n;
+    int mesglen;
 
     REQUEST(xXF86MiscPassMessageReq);
 
@@ -589,7 +592,7 @@ ProcXF86MiscPassMessage(client)
 
     rep.type = X_Reply;
     rep.sequenceNumber = client->sequence;
-    rep.mesglen = (retstr? strlen(retstr): 0);
+    mesglen = rep.mesglen = (retstr? strlen(retstr): 0);
     rep.length = (SIZEOF(xXF86MiscPassMessageReply) - SIZEOF(xGenericReply) +
 		  ((rep.mesglen + 3) & ~3)) >> 2;
     rep.status = 0;
@@ -601,8 +604,8 @@ ProcXF86MiscPassMessage(client)
     }
     WriteToClient(client, SIZEOF(xXF86MiscPassMessageReply), (char *)&rep);
     
-    if (rep.mesglen)
-        WriteToClient(client, rep.mesglen, (char *)retstr);
+    if (mesglen)
+        WriteToClient(client, mesglen, (char *)retstr);
 
     xfree(msgtype);
     xfree(msgval);

From 6844bd2e63490870bab3c469eec6030354ef2865 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed, 9 Jan 2008 19:52:00 -0800
Subject: [PATCH 403/552] More Xv extension byte swapping fixes

---
 Xext/xvdisp.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c
index 17ff1d788..237ad51c0 100644
--- a/Xext/xvdisp.c
+++ b/Xext/xvdisp.c
@@ -1532,6 +1532,7 @@ SProcXvShmPutImage(ClientPtr client)
   swapl(&stuff->gc, n);
   swapl(&stuff->shmseg, n);
   swapl(&stuff->id, n);
+  swapl(&stuff->offset, n);
   swaps(&stuff->src_x, n);
   swaps(&stuff->src_y, n);
   swaps(&stuff->src_w, n);
@@ -1540,7 +1541,6 @@ SProcXvShmPutImage(ClientPtr client)
   swaps(&stuff->drw_y, n);
   swaps(&stuff->drw_w, n);
   swaps(&stuff->drw_h, n);
-  swaps(&stuff->offset, n);
   swaps(&stuff->width, n);
   swaps(&stuff->height, n);
   return XvProcVector[xv_ShmPutImage](client);
@@ -1632,9 +1632,10 @@ SProcXvQueryImageAttributes(ClientPtr client)
   char n;
   REQUEST(xvQueryImageAttributesReq);
   swaps(&stuff->length, n);
+  swapl(&stuff->port, n);
   swapl(&stuff->id, n);
   swaps(&stuff->width, n);
-  swaps(&stuff->width, n);
+  swaps(&stuff->height, n);
   return XvProcVector[xv_QueryImageAttributes](client);
 }
 

From ec24a6b5aa732ec6999a27889d9a33cf80123886 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sun, 6 Jan 2008 18:29:54 -0800
Subject: [PATCH 404/552] XQuartz: Fixed switching into XQuartz via expose.
 (cherry picked from commit 627ed60ce5d7499761028edf379ebd95250d3e04)

---
 hw/xquartz/X11Application.m | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index 72537bb65..f68898582 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -164,7 +164,7 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
 	 have it activated while X is active (unless using the old
 	 keymapping files) */
     static TSMDocumentID x11_document;
-	
+	DEBUG_LOG("state=%d, _x_active=%d, \n", state, _x_active)
     if (state) {
       QuartzMessageServerThread (kXDarwinActivate, 0);
       
@@ -314,6 +314,7 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
 }
 
 - (void) set_front_process:unused {
+//    [self activateX:YES];
     QuartzMessageServerThread(kXDarwinBringAllToFront, 0);
 }
 
@@ -710,6 +711,10 @@ void X11ApplicationSetWindowMenuCheck (int idx) {
 
 void X11ApplicationSetFrontProcess (void) {
     message_kit_thread (@selector (set_front_process:), nil);
+
+    /* Hackery needed due to argv[0] hackery */
+    ProcessSerialNumber psn = { 0, kCurrentProcess };
+    SetFrontProcess(&psn);
 }
 
 void X11ApplicationSetCanQuit (int state) {

From f72255639c065d795f7767683e851b1b5b2d9480 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sat, 12 Jan 2008 11:35:48 -0800
Subject: [PATCH 405/552] XQuartz: added 'login_shell' option to defaults so
 the user can choose something other than /bin/sh (cherry picked from commit
 b549cf18cebd3435d70f62855239484974c455a1)

---
 hw/xquartz/X11Application.h     | 1 +
 hw/xquartz/X11Controller.m      | 2 +-
 hw/xquartz/bundle/Makefile.am   | 2 --
 hw/xquartz/bundle/bundle-main.c | 3 ++-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hw/xquartz/X11Application.h b/hw/xquartz/X11Application.h
index a1be7514a..af5aea2ce 100644
--- a/hw/xquartz/X11Application.h
+++ b/hw/xquartz/X11Application.h
@@ -97,5 +97,6 @@ extern int quartzHasRoot, quartzEnableRootless;
 #define PREFS_SWAP_ALT_META         "swap_alt_meta"
 #define PREFS_XP_OPTIONS            "xp_options"
 #define PREFS_ENABLE_STEREO         "enable_stereo"
+#define PREFS_LOGIN_SHELL           "login_shell"
 
 #endif /* X11APPLICATION_H */
diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
index 6b7c35141..e13edc15d 100644
--- a/hw/xquartz/X11Controller.m
+++ b/hw/xquartz/X11Controller.m
@@ -302,7 +302,7 @@
   argv[0] = "/usr/bin/login";
   argv[1] = "-fp";
   argv[2] = getlogin();
-  argv[3] = "/bin/sh";
+  argv[3] = [X11App prefs_get_string:@PREFS_FAKE_BUTTON2 default:"/bin/sh"];
   argv[4] = "-c";
   argv[5] = command;
   argv[6] = NULL;
diff --git a/hw/xquartz/bundle/Makefile.am b/hw/xquartz/bundle/Makefile.am
index 951167002..00d540fee 100644
--- a/hw/xquartz/bundle/Makefile.am
+++ b/hw/xquartz/bundle/Makefile.am
@@ -18,8 +18,6 @@ EXTRA_DIST = \
 	Info.plist \
 	X11.icns \
 	bundle-main.c \
-	launcher-main.c \
-	server-main.c \
 	English.lproj/InfoPlist.strings \
 	English.lproj/Localizable.strings \
 	English.lproj/main.nib/classes.nib \
diff --git a/hw/xquartz/bundle/bundle-main.c b/hw/xquartz/bundle/bundle-main.c
index df78d7fb8..54d01368d 100644
--- a/hw/xquartz/bundle/bundle-main.c
+++ b/hw/xquartz/bundle/bundle-main.c
@@ -38,6 +38,7 @@
 
 #define DEFAULT_CLIENT "/usr/X11/bin/xterm"
 #define DEFAULT_STARTX "/usr/X11/bin/startx"
+#define DEFAULT_SHELL  "/bin/sh"
 
 static int execute(const char *command);
 static char *command_from_prefs(const char *key, const char *default_value);
@@ -82,7 +83,7 @@ static int execute(const char *command) {
     newargv[0] = "/usr/bin/login";
     newargv[1] = "-fp";
     newargv[2] = getlogin();
-    newargv[3] = "/bin/sh";
+    newargv[3] = command_from_prefs("login_shell", DEFAULT_SHELL);
     newargv[4] = "-c";
     newargv[5] = command;
     newargv[6] = NULL;

From 6fd4a5e2e4d0be0ba0773df831687e11e1262c72 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sat, 12 Jan 2008 11:56:00 -0800
Subject: [PATCH 406/552] XQuartz: Corrected copyright X.org Project -> X.org
 Foundation (cherry picked from commit
 f21631444816fc12b8a534c2cf79e6ac6c2af7c9)

---
 hw/xquartz/bundle/Info.plist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/xquartz/bundle/Info.plist b/hw/xquartz/bundle/Info.plist
index 5babdfe6e..6ba02dda2 100644
--- a/hw/xquartz/bundle/Info.plist
+++ b/hw/xquartz/bundle/Info.plist
@@ -27,7 +27,7 @@
 	<key>NSHumanReadableCopyright</key>
 		<string>Copyright © 2003-2008, Apple Inc.
 Copyright © 2003, XFree86 Project, Inc.
-Copyright © 2003-2008, X.org Project, Inc.
+Copyright © 2003-2008, X.org Foundation, Inc.
 </string>
 	<key>NSMainNibFile</key>
 		<string>main</string>

From 180a5aba4de3104fed8bc4e7d42a1e3a51575318 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sat, 12 Jan 2008 21:24:34 -0800
Subject: [PATCH 407/552] XQuartz: Fixed copy-paste error with login_shell
 commit (cherry picked from commit 6deec3acc6f8010b5b53a1e55a0a2c4080ba69d2)

---
 hw/xquartz/X11Controller.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
index e13edc15d..d3f83656c 100644
--- a/hw/xquartz/X11Controller.m
+++ b/hw/xquartz/X11Controller.m
@@ -302,7 +302,7 @@
   argv[0] = "/usr/bin/login";
   argv[1] = "-fp";
   argv[2] = getlogin();
-  argv[3] = [X11App prefs_get_string:@PREFS_FAKE_BUTTON2 default:"/bin/sh"];
+  argv[3] = [X11App prefs_get_string:@PREFS_LOGIN_SHELL default:"/bin/sh"];
   argv[4] = "-c";
   argv[5] = command;
   argv[6] = NULL;

From e6ea3147bfb686798dac381eb8900f9f18beb88e Mon Sep 17 00:00:00 2001
From: Bernardo Innocenti <bernie@codewiz.org>
Date: Sun, 13 Jan 2008 19:50:37 -0500
Subject: [PATCH 408/552] exa: make the prototype for exaGetPixmapFirstPixel()
 public

This fixes a warning in amd_drv which is using it.

Signed-off-by: Bernardo Innocenti <bernie@codewiz.org>
---
 exa/exa.h      | 3 +++
 exa/exa_priv.h | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/exa/exa.h b/exa/exa.h
index 1ff0518e4..0774a700a 100644
--- a/exa/exa.h
+++ b/exa/exa.h
@@ -790,6 +790,9 @@ exaMoveOutPixmap (PixmapPtr pPixmap);
 void *
 exaGetPixmapDriverPrivate(PixmapPtr p);
 
+CARD32
+exaGetPixmapFirstPixel (PixmapPtr pPixmap);
+
 /**
  * Returns TRUE if the given planemask covers all the significant bits in the
  * pixel values for pDrawable.
diff --git a/exa/exa_priv.h b/exa/exa_priv.h
index de8b2f541..89f47184f 100644
--- a/exa/exa_priv.h
+++ b/exa/exa_priv.h
@@ -291,9 +291,6 @@ ExaCheckGetSpans (DrawablePtr pDrawable,
 		 int nspans,
 		 char *pdstStart);
 
-CARD32
-exaGetPixmapFirstPixel (PixmapPtr pPixmap); 
-
 /* exa_accel.c */
 
 static _X_INLINE Bool

From 1f83f40525acd3aff8f50b3c519bc1f307ff1e19 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Tue, 15 Jan 2008 10:20:50 +1000
Subject: [PATCH 409/552] xf86Cursors: fix memset for non-square cursors

---
 hw/xfree86/modes/xf86Cursors.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/xfree86/modes/xf86Cursors.c b/hw/xfree86/modes/xf86Cursors.c
index acf34c1d1..5a4d0f6fa 100644
--- a/hw/xfree86/modes/xf86Cursors.c
+++ b/hw/xfree86/modes/xf86Cursors.c
@@ -400,7 +400,7 @@ xf86_crtc_load_cursor_image (xf86CrtcPtr crtc, CARD8 *src)
 	int flags = cursor_info->Flags;
 	
 	cursor_image = xf86_config->cursor_image;
-	memset(cursor_image, 0, cursor_info->MaxWidth * stride);
+	memset(cursor_image, 0, cursor_info->MaxHeight * stride);
 	
         for (y = 0; y < cursor_info->MaxHeight; y++)
 	    for (x = 0; x < cursor_info->MaxWidth; x++) 

From 315d6a2b1d2a3de308e98d548afe780c59a784fc Mon Sep 17 00:00:00 2001
From: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Tue, 15 Jan 2008 02:59:56 -0200
Subject: [PATCH 410/552] Fix Xephyr compilation without GLX.

---
 configure.ac            | 2 +-
 hw/kdrive/ephyr/ephyr.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 0742040c9..566ddcbd0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1901,7 +1901,7 @@ if test "$KDRIVE" = yes; then
         XEPHYR=$xephyr
     fi
     XEPHYR_DRI=no
-    if test x$XEPHYR = xyes -a x$DRI = xyes; then
+    if test x$XEPHYR = xyes -a x$DRI = xyes && test "x$GLX" = xyes; then
         XEPHYR_DRI=yes
         XEPHYR_DRI_LIBS=-lGL
         AC_SUBST(XEPHYR_DRI_LIBS)
diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c
index 2a762a2a9..c5c8a5640 100644
--- a/hw/kdrive/ephyr/ephyr.c
+++ b/hw/kdrive/ephyr/ephyr.c
@@ -635,7 +635,9 @@ ephyrInitScreen (ScreenPtr pScreen)
   if (!ephyrNoDRI && !hostx_has_dri ()) {
       EPHYR_LOG ("host x does not support DRI. Disabling DRI forwarding\n") ;
       ephyrNoDRI = TRUE ;
+#ifdef GLXEXT
       noGlxVisualInit = FALSE ;
+#endif
   }
   if (!ephyrNoDRI) {
     ephyrDRIExtensionInit (pScreen) ;

From 7a0d16ef0a103bcb25fa8a20322685f017aaf5a3 Mon Sep 17 00:00:00 2001
From: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Tue, 15 Jan 2008 03:27:16 -0200
Subject: [PATCH 411/552] Removed some warnings.

---
 hw/kdrive/ephyr/ephyrdriext.c |  2 +-
 hw/kdrive/ephyr/ephyrlog.h    |  4 ++--
 hw/kdrive/ephyr/hostx.c       | 20 ++++++++++----------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/hw/kdrive/ephyr/ephyrdriext.c b/hw/kdrive/ephyr/ephyrdriext.c
index b6be47f5e..1b9dce5c8 100644
--- a/hw/kdrive/ephyr/ephyrdriext.c
+++ b/hw/kdrive/ephyr/ephyrdriext.c
@@ -206,7 +206,7 @@ ephyrDRIScreenInit (ScreenPtr a_screen)
     a_screen->ClipNotify = ephyrDRIClipNotify ;
 
     is_ok = TRUE ;
-out:
+
     return is_ok ;
 }
 
diff --git a/hw/kdrive/ephyr/ephyrlog.h b/hw/kdrive/ephyr/ephyrlog.h
index 4c6435edd..71f797777 100644
--- a/hw/kdrive/ephyr/ephyrlog.h
+++ b/hw/kdrive/ephyr/ephyrlog.h
@@ -33,8 +33,8 @@
 
 #ifdef NDEBUG
 /*we are not in debug mode*/
-#define EPHYR_LOG
-#define EPHYR_LOG_ERROR
+#define EPHYR_LOG(...)
+#define EPHYR_LOG_ERROR(...)
 #endif /*NDEBUG*/
 
 #define ERROR_LOG_LEVEL 3
diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c
index b5ffdd075..a5413b876 100644
--- a/hw/kdrive/ephyr/hostx.c
+++ b/hw/kdrive/ephyr/hostx.c
@@ -1078,16 +1078,6 @@ out:
 
 }
 
-typedef struct {
-    int is_valid ;
-    int local_id ;
-    int remote_id ;
-} ResourcePair ;
-
-#define RESOURCE_PEERS_SIZE 1024*10
-static ResourcePair resource_peers[RESOURCE_PEERS_SIZE] ;
-
-
 int
 hostx_create_window (int a_screen_number,
                      EphyrBox *a_geometry,
@@ -1259,6 +1249,16 @@ hostx_has_xshape (void)
 }
 
 #ifdef XEPHYR_DRI
+typedef struct {
+    int is_valid ;
+    int local_id ;
+    int remote_id ;
+} ResourcePair ;
+
+#define RESOURCE_PEERS_SIZE 1024*10
+static ResourcePair resource_peers[RESOURCE_PEERS_SIZE] ;
+
+
 int
 hostx_allocate_resource_id_peer (int a_local_resource_id,
                                  int *a_remote_resource_id)

From e46f6ddeccd082b2d507a1e8b57ea30e6b0a2c83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel@tungstengraphics.com>
Date: Wed, 16 Jan 2008 14:24:22 +0100
Subject: [PATCH 412/552] Yet another Xv extension byte swapping fix.

---
 Xext/xvdisp.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c
index 237ad51c0..de0128e14 100644
--- a/Xext/xvdisp.c
+++ b/Xext/xvdisp.c
@@ -1588,6 +1588,7 @@ SProcXvSetPortAttribute(ClientPtr client)
   swaps(&stuff->length, n);
   swapl(&stuff->port, n);
   swapl(&stuff->attribute, n);
+  swapl(&stuff->value, n);
   return XvProcVector[xv_SetPortAttribute](client);
 }
 

From a6a7fadbb03ee99312dfb15ac478ab3c414c1c0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@redhat.com>
Date: Wed, 16 Jan 2008 20:24:11 -0500
Subject: [PATCH 413/552] Don't break grab and focus state for a window when
 redirecting it.

Composite uses an unmap/map cycle to trigger backing pixmap allocation
and cliprect recomputation when a window is redirected or unredirected.
To avoid protocol visible side effects, map and unmap events are
disabled temporarily.  However, when a window is unmapped it is also
removed from grabs and loses focus, but these state changes are not
disabled.

This change supresses the unmap side effects during the composite
unmap/map cycle and fixes this bug:

  http://bugzilla.gnome.org/show_bug.cgi?id=488264

where compiz would cause gnome-screensaver to lose its grab when
compiz unredirects the fullscreen lock window.
---
 dix/window.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dix/window.c b/dix/window.c
index 33cf76b59..1ccf12603 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -2993,7 +2993,8 @@ UnrealizeTree(
 	    } 
 #endif
 	    (* Unrealize)(pChild);
-	    DeleteWindowFromAnyEvents(pChild, FALSE);
+	    if (MapUnmapEventsEnabled(pWin))
+		DeleteWindowFromAnyEvents(pChild, FALSE);
 	    if (pChild->viewable)
 	    {
 #ifdef DO_SAVE_UNDERS

From b99a43dfe97c1813e1c61f298b1c83c5d5ca88a2 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Sat, 5 Jan 2008 10:38:16 +0200
Subject: [PATCH 414/552] OS: IO: Zero out client buffers

For alignment reasons, we can write out uninitialised bytes, so allocate
the whole thing with xcalloc.
---
 os/io.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/os/io.c b/os/io.c
index 968f40a54..be89021e5 100644
--- a/os/io.c
+++ b/os/io.c
@@ -1196,7 +1196,7 @@ AllocateOutputBuffer(void)
     oco = (ConnectionOutputPtr)xalloc(sizeof(ConnectionOutput));
     if (!oco)
 	return (ConnectionOutputPtr)NULL;
-    oco->buf = (unsigned char *) xalloc(BUFSIZE);
+    oco->buf = (unsigned char *) xcalloc(1, BUFSIZE);
     if (!oco->buf)
     {
 	xfree(oco);

From 0137b0394a248f694448a7d97c9a1a3efcf24e81 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Sat, 5 Jan 2008 10:43:53 +0200
Subject: [PATCH 415/552] XKB: XkbCopyKeymap: Don't leak all the sections

Previously, we'd just keep num_sections at 0, which would break the
geometry and lead us to leak sections.  Don't do that.
---
 xkb/xkbUtils.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
index 31c1a9fa9..1fb47ed56 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -1793,6 +1793,7 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
             if (!tmp)
                 return FALSE;
             dst->geom->sections = tmp;
+            dst->geom->num_sections = src->geom->num_sections;
 
             for (i = 0,
                   ssection = src->geom->sections,

From e85130c85f727466fc27be1cfa46c88b257499fb Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Sat, 5 Jan 2008 10:47:39 +0200
Subject: [PATCH 416/552] Xephyr: One-time keyboard leak fix

Don't leak the originally-allocated keysym map.
---
 hw/kdrive/ephyr/ephyr.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c
index c5c8a5640..6ec95d631 100644
--- a/hw/kdrive/ephyr/ephyr.c
+++ b/hw/kdrive/ephyr/ephyr.c
@@ -1031,6 +1031,7 @@ EphyrKeyboardInit (KdKeyboardInfo *ki)
   ki->minScanCode = ki->keySyms.minKeyCode;
   ki->maxScanCode = ki->keySyms.maxKeyCode;
   ki->keySyms.mapWidth = ephyrKeySyms.mapWidth;
+  xfree(ki->keySyms.map);
   ki->keySyms.map = ephyrKeySyms.map;
   ki->name = KdSaveString("Xephyr virtual keyboard");
   ephyrKbd = ki;

From bbde5b62a137ba726a747b838d81e92d72c1b42b Mon Sep 17 00:00:00 2001
From: Matthieu Herrb <matthieu@bluenote.herrb.com>
Date: Thu, 17 Jan 2008 15:26:41 +0100
Subject: [PATCH 417/552] Fix for CVE-2007-5760 - XFree86 Misc extension out of
 bounds array index

---
 hw/xfree86/common/xf86MiscExt.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hw/xfree86/common/xf86MiscExt.c b/hw/xfree86/common/xf86MiscExt.c
index c1b9c60fc..40c196a3e 100644
--- a/hw/xfree86/common/xf86MiscExt.c
+++ b/hw/xfree86/common/xf86MiscExt.c
@@ -548,6 +548,10 @@ MiscExtPassMessage(int scrnIndex, const char *msgtype, const char *msgval,
 {
     ScrnInfoPtr pScr = xf86Screens[scrnIndex];
 
+    /* should check this in the protocol, but xf86NumScreens isn't exported */
+    if (scrnIndex >= xf86NumScreens)
+	return BadValue;
+
     if (*pScr->HandleMessage == NULL)
 	    return BadImplementation;
     return (*pScr->HandleMessage)(scrnIndex, msgtype, msgval, retstr);

From dd5e0f5cd5f3a87fee86d99c073ffa7cf89b0a27 Mon Sep 17 00:00:00 2001
From: Matthieu Herrb <matthieu@bluenote.herrb.com>
Date: Thu, 17 Jan 2008 15:27:34 +0100
Subject: [PATCH 418/552] Fix for CVE-2007-6427 - Xinput extension memory
 corruption.

---
 Xi/chgfctl.c  |  7 +------
 Xi/chgkmap.c  | 14 +++++++-------
 Xi/chgprop.c  | 10 +++-------
 Xi/grabdev.c  | 12 +++++-------
 Xi/grabdevb.c | 10 +++-------
 Xi/grabdevk.c |  9 ++-------
 Xi/selectev.c | 11 ++++-------
 Xi/sendexev.c | 14 ++++++++------
 8 files changed, 33 insertions(+), 54 deletions(-)

diff --git a/Xi/chgfctl.c b/Xi/chgfctl.c
index 8fc24d5ff..696b74a16 100644
--- a/Xi/chgfctl.c
+++ b/Xi/chgfctl.c
@@ -302,18 +302,13 @@ ChangeStringFeedback(ClientPtr client, DeviceIntPtr dev,
 		     xStringFeedbackCtl * f)
 {
     char n;
-    long *p;
     int i, j;
     KeySym *syms, *sup_syms;
 
     syms = (KeySym *) (f + 1);
     if (client->swapped) {
 	swaps(&f->length, n);	/* swapped num_keysyms in calling proc */
-	p = (long *)(syms);
-	for (i = 0; i < f->num_keysyms; i++) {
-	    swapl(p, n);
-	    p++;
-	}
+	SwapLongs((CARD32 *) syms, f->num_keysyms);
     }
 
     if (f->num_keysyms > s->ctrl.max_symbols)
diff --git a/Xi/chgkmap.c b/Xi/chgkmap.c
index 3361e9801..df334c11c 100644
--- a/Xi/chgkmap.c
+++ b/Xi/chgkmap.c
@@ -75,18 +75,14 @@ int
 SProcXChangeDeviceKeyMapping(ClientPtr client)
 {
     char n;
-    long *p;
-    int i, count;
+    unsigned int count;
 
     REQUEST(xChangeDeviceKeyMappingReq);
     swaps(&stuff->length, n);
     REQUEST_AT_LEAST_SIZE(xChangeDeviceKeyMappingReq);
-    p = (long *)&stuff[1];
     count = stuff->keyCodes * stuff->keySymsPerKeyCode;
-    for (i = 0; i < count; i++) {
-	swapl(p, n);
-	p++;
-    }
+    REQUEST_FIXED_SIZE(xChangeDeviceKeyMappingReq, count * sizeof(CARD32));
+    SwapLongs((CARD32 *) (&stuff[1]), count);
     return (ProcXChangeDeviceKeyMapping(client));
 }
 
@@ -102,10 +98,14 @@ ProcXChangeDeviceKeyMapping(ClientPtr client)
     int ret;
     unsigned len;
     DeviceIntPtr dev;
+    unsigned int count;
 
     REQUEST(xChangeDeviceKeyMappingReq);
     REQUEST_AT_LEAST_SIZE(xChangeDeviceKeyMappingReq);
 
+    count = stuff->keyCodes * stuff->keySymsPerKeyCode;
+    REQUEST_FIXED_SIZE(xChangeDeviceKeyMappingReq, count * sizeof(CARD32));
+
     ret = dixLookupDevice(&dev, stuff->deviceid, client, DixSetAttrAccess);
     if (ret != Success)
 	return ret;
diff --git a/Xi/chgprop.c b/Xi/chgprop.c
index 58db88620..3fb33e129 100644
--- a/Xi/chgprop.c
+++ b/Xi/chgprop.c
@@ -77,19 +77,15 @@ int
 SProcXChangeDeviceDontPropagateList(ClientPtr client)
 {
     char n;
-    long *p;
-    int i;
 
     REQUEST(xChangeDeviceDontPropagateListReq);
     swaps(&stuff->length, n);
     REQUEST_AT_LEAST_SIZE(xChangeDeviceDontPropagateListReq);
     swapl(&stuff->window, n);
     swaps(&stuff->count, n);
-    p = (long *)&stuff[1];
-    for (i = 0; i < stuff->count; i++) {
-	swapl(p, n);
-	p++;
-    }
+    REQUEST_FIXED_SIZE(xChangeDeviceDontPropagateListReq,
+                      stuff->count * sizeof(CARD32));
+    SwapLongs((CARD32 *) (&stuff[1]), stuff->count);
     return (ProcXChangeDeviceDontPropagateList(client));
 }
 
diff --git a/Xi/grabdev.c b/Xi/grabdev.c
index 110fc6b5f..0671e0ea7 100644
--- a/Xi/grabdev.c
+++ b/Xi/grabdev.c
@@ -78,8 +78,6 @@ int
 SProcXGrabDevice(ClientPtr client)
 {
     char n;
-    long *p;
-    int i;
 
     REQUEST(xGrabDeviceReq);
     swaps(&stuff->length, n);
@@ -87,11 +85,11 @@ SProcXGrabDevice(ClientPtr client)
     swapl(&stuff->grabWindow, n);
     swapl(&stuff->time, n);
     swaps(&stuff->event_count, n);
-    p = (long *)&stuff[1];
-    for (i = 0; i < stuff->event_count; i++) {
-	swapl(p, n);
-	p++;
-    }
+
+    if (stuff->length != (sizeof(xGrabDeviceReq) >> 2) + stuff->event_count)
+       return BadLength;
+    
+    SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count);
 
     return (ProcXGrabDevice(client));
 }
diff --git a/Xi/grabdevb.c b/Xi/grabdevb.c
index c2661e85b..ce0dcc5f9 100644
--- a/Xi/grabdevb.c
+++ b/Xi/grabdevb.c
@@ -77,8 +77,6 @@ int
 SProcXGrabDeviceButton(ClientPtr client)
 {
     char n;
-    long *p;
-    int i;
 
     REQUEST(xGrabDeviceButtonReq);
     swaps(&stuff->length, n);
@@ -86,11 +84,9 @@ SProcXGrabDeviceButton(ClientPtr client)
     swapl(&stuff->grabWindow, n);
     swaps(&stuff->modifiers, n);
     swaps(&stuff->event_count, n);
-    p = (long *)&stuff[1];
-    for (i = 0; i < stuff->event_count; i++) {
-	swapl(p, n);
-	p++;
-    }
+    REQUEST_FIXED_SIZE(xGrabDeviceButtonReq,
+                      stuff->event_count * sizeof(CARD32));
+    SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count);
 
     return (ProcXGrabDeviceButton(client));
 }
diff --git a/Xi/grabdevk.c b/Xi/grabdevk.c
index 43b19280d..d4b7fe815 100644
--- a/Xi/grabdevk.c
+++ b/Xi/grabdevk.c
@@ -77,8 +77,6 @@ int
 SProcXGrabDeviceKey(ClientPtr client)
 {
     char n;
-    long *p;
-    int i;
 
     REQUEST(xGrabDeviceKeyReq);
     swaps(&stuff->length, n);
@@ -86,11 +84,8 @@ SProcXGrabDeviceKey(ClientPtr client)
     swapl(&stuff->grabWindow, n);
     swaps(&stuff->modifiers, n);
     swaps(&stuff->event_count, n);
-    p = (long *)&stuff[1];
-    for (i = 0; i < stuff->event_count; i++) {
-	swapl(p, n);
-	p++;
-    }
+    REQUEST_FIXED_SIZE(xGrabDeviceKeyReq, stuff->event_count * sizeof(CARD32));
+    SwapLongs((CARD32 *) (&stuff[1]), stuff->event_count);
     return (ProcXGrabDeviceKey(client));
 }
 
diff --git a/Xi/selectev.c b/Xi/selectev.c
index b93618ace..d3670ab1b 100644
--- a/Xi/selectev.c
+++ b/Xi/selectev.c
@@ -127,19 +127,16 @@ int
 SProcXSelectExtensionEvent(ClientPtr client)
 {
     char n;
-    long *p;
-    int i;
 
     REQUEST(xSelectExtensionEventReq);
     swaps(&stuff->length, n);
     REQUEST_AT_LEAST_SIZE(xSelectExtensionEventReq);
     swapl(&stuff->window, n);
     swaps(&stuff->count, n);
-    p = (long *)&stuff[1];
-    for (i = 0; i < stuff->count; i++) {
-	swapl(p, n);
-	p++;
-    }
+    REQUEST_FIXED_SIZE(xSelectExtensionEventReq,
+                      stuff->count * sizeof(CARD32));
+    SwapLongs((CARD32 *) (&stuff[1]), stuff->count);
+
     return (ProcXSelectExtensionEvent(client));
 }
 
diff --git a/Xi/sendexev.c b/Xi/sendexev.c
index e4e38d790..588c91023 100644
--- a/Xi/sendexev.c
+++ b/Xi/sendexev.c
@@ -80,7 +80,7 @@ int
 SProcXSendExtensionEvent(ClientPtr client)
 {
     char n;
-    long *p;
+    CARD32 *p;
     int i;
     xEvent eventT;
     xEvent *eventP;
@@ -91,6 +91,11 @@ SProcXSendExtensionEvent(ClientPtr client)
     REQUEST_AT_LEAST_SIZE(xSendExtensionEventReq);
     swapl(&stuff->destination, n);
     swaps(&stuff->count, n);
+
+    if (stuff->length != (sizeof(xSendExtensionEventReq) >> 2) + stuff->count +
+       (stuff->num_events * (sizeof(xEvent) >> 2)))
+       return BadLength;
+
     eventP = (xEvent *) & stuff[1];
     for (i = 0; i < stuff->num_events; i++, eventP++) {
 	proc = EventSwapVector[eventP->u.u.type & 0177];
@@ -100,11 +105,8 @@ SProcXSendExtensionEvent(ClientPtr client)
 	*eventP = eventT;
     }
 
-    p = (long *)(((xEvent *) & stuff[1]) + stuff->num_events);
-    for (i = 0; i < stuff->count; i++) {
-	swapl(p, n);
-	p++;
-    }
+    p = (CARD32 *)(((xEvent *) & stuff[1]) + stuff->num_events);
+    SwapLongs(p, stuff->count);
     return (ProcXSendExtensionEvent(client));
 }
 

From 7dc1717ff0f96b99271a912b8948dfce5164d5ad Mon Sep 17 00:00:00 2001
From: Matthieu Herrb <matthieu@bluenote.herrb.com>
Date: Thu, 17 Jan 2008 15:28:03 +0100
Subject: [PATCH 419/552] Fix for CVE-2007-6428 - TOG-cup extension memory
 corruption.

---
 Xext/cup.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Xext/cup.c b/Xext/cup.c
index d0e820c41..fd1409e33 100644
--- a/Xext/cup.c
+++ b/Xext/cup.c
@@ -176,6 +176,9 @@ int ProcGetReservedColormapEntries(
 
     REQUEST_SIZE_MATCH (xXcupGetReservedColormapEntriesReq);
 
+    if (stuff->screen >= screenInfo.numScreens)
+	return BadValue;
+
 #ifndef HAVE_SPECIAL_DESKTOP_COLORS
     citems[CUP_BLACK_PIXEL].pixel = 
 	screenInfo.screens[stuff->screen]->blackPixel;

From 6de61f82728df22ea01f9659df6581b87f33f11d Mon Sep 17 00:00:00 2001
From: Matthieu Herrb <matthieu@bluenote.herrb.com>
Date: Thu, 17 Jan 2008 15:28:42 +0100
Subject: [PATCH 420/552] Fix for CVE-2007-6429 - MIT-SHM and EVI extensions
 integer overflows.

---
 Xext/EVI.c       | 15 ++++++++++++++-
 Xext/sampleEVI.c | 29 ++++++++++++++++++++++++-----
 Xext/shm.c       | 46 ++++++++++++++++++++++++++++++++++++++--------
 3 files changed, 76 insertions(+), 14 deletions(-)

diff --git a/Xext/EVI.c b/Xext/EVI.c
index 4bd050ca7..a637bae5d 100644
--- a/Xext/EVI.c
+++ b/Xext/EVI.c
@@ -34,6 +34,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/extensions/XEVIstr.h>
 #include "EVIstruct.h"
 #include "modinit.h"
+#include "scrnintstr.h"
 
 static EviPrivPtr eviPriv;
 
@@ -84,10 +85,22 @@ ProcEVIGetVisualInfo(ClientPtr client)
 {
     REQUEST(xEVIGetVisualInfoReq);
     xEVIGetVisualInfoReply rep;
-    int n, n_conflict, n_info, sz_info, sz_conflict;
+    int i, n, n_conflict, n_info, sz_info, sz_conflict;
     VisualID32 *conflict;
+    unsigned int total_visuals = 0;
     xExtendedVisualInfo *eviInfo;
     int status;
+
+    /*
+     * do this first, otherwise REQUEST_FIXED_SIZE can overflow.  we assume
+     * here that you don't have more than 2^32 visuals over all your screens;
+     * this seems like a safe assumption.
+     */
+    for (i = 0; i < screenInfo.numScreens; i++)
+	total_visuals += screenInfo.screens[i]->numVisuals;
+    if (stuff->n_visual > total_visuals)
+	return BadValue;
+
     REQUEST_FIXED_SIZE(xEVIGetVisualInfoReq, stuff->n_visual * sz_VisualID32);
     status = eviPriv->getVisualInfo((VisualID32 *)&stuff[1], (int)stuff->n_visual,
 		&eviInfo, &n_info, &conflict, &n_conflict);
diff --git a/Xext/sampleEVI.c b/Xext/sampleEVI.c
index 7508aa773..b871bfd74 100644
--- a/Xext/sampleEVI.c
+++ b/Xext/sampleEVI.c
@@ -34,6 +34,13 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/extensions/XEVIstr.h>
 #include "EVIstruct.h"
 #include "scrnintstr.h"
+
+#if HAVE_STDINT_H
+#include <stdint.h>
+#elif !defined(UINT32_MAX)
+#define UINT32_MAX 0xffffffffU
+#endif
+
 static int sampleGetVisualInfo(
     VisualID32 *visual,
     int n_visual,
@@ -42,24 +49,36 @@ static int sampleGetVisualInfo(
     VisualID32 **conflict_rn,
     int *n_conflict_rn)
 {
-    int max_sz_evi = n_visual * sz_xExtendedVisualInfo * screenInfo.numScreens;
+    unsigned int max_sz_evi;
     VisualID32 *temp_conflict;
     xExtendedVisualInfo *evi;
-    int max_visuals = 0, max_sz_conflict, sz_conflict = 0;
+    unsigned int max_visuals = 0, max_sz_conflict, sz_conflict = 0;
     register int visualI, scrI, sz_evi = 0, conflictI, n_conflict;
-    *evi_rn = evi = (xExtendedVisualInfo *)xalloc(max_sz_evi);
-    if (!*evi_rn)
-         return BadAlloc;
+
+    if (n_visual > UINT32_MAX/(sz_xExtendedVisualInfo * screenInfo.numScreens))
+	return BadAlloc;
+    max_sz_evi = n_visual * sz_xExtendedVisualInfo * screenInfo.numScreens;
+    
     for (scrI = 0; scrI < screenInfo.numScreens; scrI++) {
         if (screenInfo.screens[scrI]->numVisuals > max_visuals)
             max_visuals = screenInfo.screens[scrI]->numVisuals;
     }
+
+    if (n_visual > UINT32_MAX/(sz_VisualID32 * screenInfo.numScreens 
+			       * max_visuals)) 
+	return BadAlloc;
     max_sz_conflict = n_visual * sz_VisualID32 * screenInfo.numScreens * max_visuals;
+
+    *evi_rn = evi = (xExtendedVisualInfo *)xalloc(max_sz_evi);
+    if (!*evi_rn)
+         return BadAlloc;
+
     temp_conflict = (VisualID32 *)xalloc(max_sz_conflict);
     if (!temp_conflict) {
         xfree(*evi_rn);
         return BadAlloc;
     }
+
     for (scrI = 0; scrI < screenInfo.numScreens; scrI++) {
         for (visualI = 0; visualI < n_visual; visualI++) {
 	    evi[sz_evi].core_visual_id = visual[visualI];
diff --git a/Xext/shm.c b/Xext/shm.c
index e3d7a23ff..c545e4919 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -757,6 +757,8 @@ ProcPanoramiXShmCreatePixmap(
     int i, j, result, rc;
     ShmDescPtr shmdesc;
     REQUEST(xShmCreatePixmapReq);
+    unsigned int width, height, depth;
+    unsigned long size;
     PanoramiXRes *newPix;
 
     REQUEST_SIZE_MATCH(xShmCreatePixmapReq);
@@ -770,11 +772,26 @@ ProcPanoramiXShmCreatePixmap(
 	return rc;
 
     VERIFY_SHMPTR(stuff->shmseg, stuff->offset, TRUE, shmdesc, client);
-    if (!stuff->width || !stuff->height)
+
+    width = stuff->width;
+    height = stuff->height;
+    depth = stuff->depth;
+    if (!width || !height || !depth)
     {
 	client->errorValue = 0;
         return BadValue;
     }
+    if (width > 32767 || height > 32767)
+        return BadAlloc;
+    size = PixmapBytePad(width, depth) * height;
+    if (sizeof(size) == 4) {
+        if (size < width * height)
+            return BadAlloc;
+        /* thankfully, offset is unsigned */
+        if (stuff->offset + size < size)
+            return BadAlloc;
+    }
+
     if (stuff->depth != 1)
     {
         pDepth = pDraw->pScreen->allowedDepths;
@@ -785,9 +802,7 @@ ProcPanoramiXShmCreatePixmap(
         return BadValue;
     }
 CreatePmap:
-    VERIFY_SHMSIZE(shmdesc, stuff->offset,
-		   PixmapBytePad(stuff->width, stuff->depth) * stuff->height,
-		   client);
+    VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client);
 
     if(!(newPix = (PanoramiXRes *) xalloc(sizeof(PanoramiXRes))))
 	return BadAlloc;
@@ -1086,6 +1101,8 @@ ProcShmCreatePixmap(client)
     register int i, rc;
     ShmDescPtr shmdesc;
     REQUEST(xShmCreatePixmapReq);
+    unsigned int width, height, depth;
+    unsigned long size;
 
     REQUEST_SIZE_MATCH(xShmCreatePixmapReq);
     client->errorValue = stuff->pid;
@@ -1098,11 +1115,26 @@ ProcShmCreatePixmap(client)
 	return rc;
 
     VERIFY_SHMPTR(stuff->shmseg, stuff->offset, TRUE, shmdesc, client);
-    if (!stuff->width || !stuff->height)
+    
+    width = stuff->width;
+    height = stuff->height;
+    depth = stuff->depth;
+    if (!width || !height || !depth)
     {
 	client->errorValue = 0;
         return BadValue;
     }
+    if (width > 32767 || height > 32767)
+	return BadAlloc;
+    size = PixmapBytePad(width, depth) * height;
+    if (sizeof(size) == 4) {
+	if (size < width * height)
+	    return BadAlloc;
+	/* thankfully, offset is unsigned */
+	if (stuff->offset + size < size)
+	    return BadAlloc;
+    }
+
     if (stuff->depth != 1)
     {
         pDepth = pDraw->pScreen->allowedDepths;
@@ -1113,9 +1145,7 @@ ProcShmCreatePixmap(client)
         return BadValue;
     }
 CreatePmap:
-    VERIFY_SHMSIZE(shmdesc, stuff->offset,
-		   PixmapBytePad(stuff->width, stuff->depth) * stuff->height,
-		   client);
+    VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client);
     pMap = (*shmFuncs[pDraw->pScreen->myNum]->CreatePixmap)(
 			    pDraw->pScreen, stuff->width,
 			    stuff->height, stuff->depth,

From 8e133d96740d010a4fd969a8188e6e71fb2cafe2 Mon Sep 17 00:00:00 2001
From: Matthieu Herrb <matthieu@bluenote.herrb.com>
Date: Thu, 17 Jan 2008 15:29:06 +0100
Subject: [PATCH 421/552] Fix for CVE-2008-0006 - PCF Font parser buffer
 overflow.

---
 dix/dixfonts.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index 2979c6424..04f1f1b30 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -326,6 +326,13 @@ doOpenFont(ClientPtr client, OFclosurePtr c)
 	err = BadFontName;
 	goto bail;
     }
+    /* check values for firstCol, lastCol, firstRow, and lastRow */
+    if (pfont->info.firstCol > pfont->info.lastCol ||
+       pfont->info.firstRow > pfont->info.lastRow ||
+       pfont->info.lastCol - pfont->info.firstCol > 255) {
+       err = AllocError;
+       goto bail;
+    }
     if (!pfont->fpe)
 	pfont->fpe = fpe;
     pfont->refcnt++;

From 23f3f0e27dc90b7b3a375f2a5dd094e6f53552b5 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Sun, 13 Jan 2008 14:00:25 -0800
Subject: [PATCH 422/552] XQuartz: Moved SetFrontProcess haco to
 set_front_process So it is done by the other thread... (cherry picked from
 commit 7429379eb1001ee3dc769daa8fe6b3aef1b9cc8a)

---
 hw/xquartz/X11Application.m | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index f68898582..be5511d30 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -314,7 +314,11 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
 }
 
 - (void) set_front_process:unused {
-//    [self activateX:YES];
+    /* Hackery needed due to argv[0] hackery */
+    //    [self activateX:YES];
+    ProcessSerialNumber psn = { 0, kCurrentProcess };
+    SetFrontProcess(&psn);
+
     QuartzMessageServerThread(kXDarwinBringAllToFront, 0);
 }
 
@@ -711,10 +715,6 @@ void X11ApplicationSetWindowMenuCheck (int idx) {
 
 void X11ApplicationSetFrontProcess (void) {
     message_kit_thread (@selector (set_front_process:), nil);
-
-    /* Hackery needed due to argv[0] hackery */
-    ProcessSerialNumber psn = { 0, kCurrentProcess };
-    SetFrontProcess(&psn);
 }
 
 void X11ApplicationSetCanQuit (int state) {

From e9fa7c1c88a8130a48f772c92b186b8b777986b5 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 18 Jan 2008 14:41:20 -0500
Subject: [PATCH 423/552] CVE-2007-6429: Don't spuriously reject <8bpp shm
 pixmaps.

Move size validation after depth validation, and only validate size if
the bpp of the pixmap format is > 8.  If bpp < 8 then we're already
protected from overflow by the width and height checks.
---
 Xext/shm.c | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/Xext/shm.c b/Xext/shm.c
index c545e4919..e46f6fcde 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -783,14 +783,6 @@ ProcPanoramiXShmCreatePixmap(
     }
     if (width > 32767 || height > 32767)
         return BadAlloc;
-    size = PixmapBytePad(width, depth) * height;
-    if (sizeof(size) == 4) {
-        if (size < width * height)
-            return BadAlloc;
-        /* thankfully, offset is unsigned */
-        if (stuff->offset + size < size)
-            return BadAlloc;
-    }
 
     if (stuff->depth != 1)
     {
@@ -801,7 +793,17 @@ ProcPanoramiXShmCreatePixmap(
 	client->errorValue = stuff->depth;
         return BadValue;
     }
+
 CreatePmap:
+    size = PixmapBytePad(width, depth) * height;
+    if (sizeof(size) == 4 && BitsPerPixel(depth) > 8) {
+        if (size < width * height)
+            return BadAlloc;
+        /* thankfully, offset is unsigned */
+        if (stuff->offset + size < size)
+            return BadAlloc;
+    }
+
     VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client);
 
     if(!(newPix = (PanoramiXRes *) xalloc(sizeof(PanoramiXRes))))
@@ -1126,14 +1128,6 @@ ProcShmCreatePixmap(client)
     }
     if (width > 32767 || height > 32767)
 	return BadAlloc;
-    size = PixmapBytePad(width, depth) * height;
-    if (sizeof(size) == 4) {
-	if (size < width * height)
-	    return BadAlloc;
-	/* thankfully, offset is unsigned */
-	if (stuff->offset + size < size)
-	    return BadAlloc;
-    }
 
     if (stuff->depth != 1)
     {
@@ -1144,7 +1138,17 @@ ProcShmCreatePixmap(client)
 	client->errorValue = stuff->depth;
         return BadValue;
     }
+
 CreatePmap:
+    size = PixmapBytePad(width, depth) * height;
+    if (sizeof(size) == 4 && BitsPerPixel(depth) > 8) {
+	if (size < width * height)
+	    return BadAlloc;
+	/* thankfully, offset is unsigned */
+	if (stuff->offset + size < size)
+	    return BadAlloc;
+    }
+
     VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client);
     pMap = (*shmFuncs[pDraw->pScreen->myNum]->CreatePixmap)(
 			    pDraw->pScreen, stuff->width,

From 94a21d757ce58254accbd5dd3a86810aadeec9f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel@tungstengraphics.com>
Date: Sat, 19 Jan 2008 13:17:45 +0100
Subject: [PATCH 424/552] AIGLX: Fix GLX_EXT_texture_from_pixmap fallback with
 EXA.

Use pScreen->GetImage to obtain the pixmap contents instead of dereferencing
pPixmap->devPrivate.ptr directly.
---
 GL/glx/glxdri.c | 80 ++++++++++++++++++++++++++++++++-----------------
 1 file changed, 53 insertions(+), 27 deletions(-)

diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c
index c0da07b68..6c1a199f7 100644
--- a/GL/glx/glxdri.c
+++ b/GL/glx/glxdri.c
@@ -47,6 +47,8 @@
 #include <xf86.h>
 #include <dri.h>
 
+#include "servermd.h"
+
 #define DRI_NEW_INTERFACE_ONLY
 #include "glxserver.h"
 #include "glxutil.h"
@@ -308,18 +310,20 @@ __glXDRIcontextForceCurrent(__GLXcontext *baseContext)
 }
 
 static void
-glxFillAlphaChannel (PixmapPtr pixmap, int x, int y, int width, int height)
+glxFillAlphaChannel (CARD32 *pixels, CARD32 rowstride, int width, int height)
 {
     int i;
-    CARD32 *p, *end, *pixels = (CARD32 *)pixmap->devPrivate.ptr;
-    CARD32 rowstride = pixmap->devKind / 4;
+    CARD32 *p, *end;
+
+    rowstride /= 4;
     
-    for (i = y; i < y + height; i++)
+    for (i = 0; i < height; i++)
     {
-	p = &pixels[i * rowstride + x];
+	p = pixels;
 	end = p + width;
 	while (p < end)
 	  *p++ |= 0xFF000000;
+	pixels += rowstride;
     }
 }
 
@@ -430,22 +434,31 @@ nooverride:
 	type = GL_UNSIGNED_SHORT_5_6_5;
     }
 
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,
-				       pixmap->devKind / bpp) );
-
     if (pRegion == NULL)
     {
-	if (!override && pixmap->drawable.depth == 24)
-	    glxFillAlphaChannel(pixmap,
-				pixmap->drawable.x,
-				pixmap->drawable.y,
-				pixmap->drawable.width,
-				pixmap->drawable.height);
+	void *data = NULL;
 
-        CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,
-					   pixmap->drawable.x) );
-	CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,
-					   pixmap->drawable.y) );
+	if (!override) {
+	    unsigned pitch = PixmapBytePad(pixmap->drawable.width,
+					   pixmap->drawable.depth); 
+
+	    data = xalloc(pitch * pixmap->drawable.height);
+
+	    pScreen->GetImage(&pixmap->drawable, 0 /*pixmap->drawable.x*/,
+			      0 /*pixmap->drawable.y*/, pixmap->drawable.width,
+			      pixmap->drawable.height, ZPixmap, ~0, data);
+
+	    if (pixmap->drawable.depth == 24)
+		glxFillAlphaChannel(data,
+				    pitch,
+				    pixmap->drawable.width,
+				    pixmap->drawable.height);
+
+	    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,
+					       pitch / bpp) );
+	    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS, 0) );
+	    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS, 0) );
+	}
 
 	CALL_TexImage2D( GET_DISPATCH(),
 			 (glxPixmap->target,
@@ -456,26 +469,37 @@ nooverride:
 			  0,
 			  format,
 			  type,
-			  override ? NULL : pixmap->devPrivate.ptr) );
+			  data) );
+
+	xfree(data);
     } else if (!override) {
         int i, numRects;
 	BoxPtr p;
 
 	numRects = REGION_NUM_RECTS (pRegion);
 	p = REGION_RECTS (pRegion);
+
+	CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS, 0) );
+	CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS, 0) );
+
 	for (i = 0; i < numRects; i++)
 	{
+	    unsigned pitch = PixmapBytePad(p[i].x2 - p[i].x1,
+					   pixmap->drawable.depth);
+	    void *data = xalloc(pitch * (p[i].y2 - p[i].y1));
+
+	    pScreen->GetImage(&pixmap->drawable, /*pixmap->drawable.x +*/ p[i].x1,
+			      /*pixmap->drawable.y*/ + p[i].y1, p[i].x2 - p[i].x1,
+			      p[i].y2 - p[i].y1, ZPixmap, ~0, data);
+
 	    if (pixmap->drawable.depth == 24)
-		glxFillAlphaChannel(pixmap,
-				    pixmap->drawable.x + p[i].x1,
-				    pixmap->drawable.y + p[i].y1,
+		glxFillAlphaChannel(data,
+				    pitch,
 				    p[i].x2 - p[i].x1,
 				    p[i].y2 - p[i].y1);
 
-	    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,
-					       pixmap->drawable.x + p[i].x1) );
-	    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,
-					       pixmap->drawable.y + p[i].y1) );
+	    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,
+					       pitch / bpp) );
 
 	    CALL_TexSubImage2D( GET_DISPATCH(),
 				(glxPixmap->target,
@@ -484,7 +508,9 @@ nooverride:
 				 p[i].x2 - p[i].x1, p[i].y2 - p[i].y1,
 				 format,
 				 type,
-				 pixmap->devPrivate.ptr) );
+				 data) );
+
+	    xfree(data);
 	}
     }
 

From be6c17fcf9efebc0bbcc3d9a25f8c5a2450c2161 Mon Sep 17 00:00:00 2001
From: Matthias Hopf <mhopf@suse.de>
Date: Mon, 21 Jan 2008 16:13:21 +0100
Subject: [PATCH 425/552] CVE-2007-6429: Always test for size+offset wrapping.

---
 Xext/shm.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Xext/shm.c b/Xext/shm.c
index e46f6fcde..a7a1ecf75 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -799,10 +799,10 @@ CreatePmap:
     if (sizeof(size) == 4 && BitsPerPixel(depth) > 8) {
         if (size < width * height)
             return BadAlloc;
-        /* thankfully, offset is unsigned */
-        if (stuff->offset + size < size)
-            return BadAlloc;
     }
+    /* thankfully, offset is unsigned */
+    if (stuff->offset + size < size)
+	return BadAlloc;
 
     VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client);
 
@@ -1144,10 +1144,10 @@ CreatePmap:
     if (sizeof(size) == 4 && BitsPerPixel(depth) > 8) {
 	if (size < width * height)
 	    return BadAlloc;
-	/* thankfully, offset is unsigned */
-	if (stuff->offset + size < size)
-	    return BadAlloc;
     }
+    /* thankfully, offset is unsigned */
+    if (stuff->offset + size < size)
+	return BadAlloc;
 
     VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client);
     pMap = (*shmFuncs[pDraw->pScreen->myNum]->CreatePixmap)(

From 1a88aed5c82c7c131e3d473ef7b8766a418fdf1b Mon Sep 17 00:00:00 2001
From: David Nusinow <dnusinow@debian.org>
Date: Mon, 21 Jan 2008 21:16:13 -0500
Subject: [PATCH 426/552] Add tags/TAGS to .gitignore for ctags usage

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index b52664bda..406b74c4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,8 @@ install-sh
 libtool
 ltmain.sh
 missing
+TAGS
+tags
 ylwrap
 xorg-server.pc
 stamp-h?

From cc22b05ea06e08568d0f0abdaccf67bd32662e94 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Tue, 22 Jan 2008 18:57:11 -0500
Subject: [PATCH 427/552] There is no such thing as /dev/cpu/mtrr.

---
 hw/xfree86/os-support/linux/lnx_video.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c
index ad2b66f74..1bd2d575f 100644
--- a/hw/xfree86/os-support/linux/lnx_video.c
+++ b/hw/xfree86/os-support/linux/lnx_video.c
@@ -142,17 +142,8 @@ mtrr_open(int verbosity)
 	/* Only report absence of /proc/mtrr once. */
 	static Bool warned = FALSE;
 
-	char **fn;
-	static char *mtrr_files[] = {
-		"/dev/cpu/mtrr",	/* Possible future name */
-		"/proc/mtrr",		/* Current name */
-		NULL
-	};
-
 	if (mtrr_fd == MTRR_FD_UNOPENED) { 
-		/* So open it. */
-		for (fn = mtrr_files; mtrr_fd < 0 && *fn; fn++)
-			mtrr_fd = open(*fn, O_WRONLY);
+		mtrr_fd = open("/proc/mtrr", O_WRONLY);
 
 		if (mtrr_fd < 0)
 			mtrr_fd = MTRR_FD_PROBLEM;

From 734e115871ce98badb8800383c423493802ae3d3 Mon Sep 17 00:00:00 2001
From: Hong Liu <hong.liu@intel.com>
Date: Wed, 23 Jan 2008 21:04:32 +0800
Subject: [PATCH 428/552] Bug #12439: add a quirk to use +hsync +vsync for the
 probed detailed mode.

Samsung 205BW quirk is somehow reworked.
---
 hw/xfree86/modes/xf86EdidModes.c | 35 ++++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c
index 87a812765..b865727ef 100644
--- a/hw/xfree86/modes/xf86EdidModes.c
+++ b/hw/xfree86/modes/xf86EdidModes.c
@@ -66,6 +66,8 @@ typedef enum {
     DDC_QUIRK_DETAILED_USE_MAXIMUM_SIZE = 1 << 5,
     /* Monitor forgot to set the first detailed is preferred bit. */
     DDC_QUIRK_FIRST_DETAILED_PREFERRED = 1 << 6,
+    /* use +hsync +vsync for detailed mode */
+    DDC_QUIRK_DETAILED_SYNC_PP = 1 << 7,
 } ddc_quirk_t;
 
 static Bool quirk_prefer_large_60 (int scrnIndex, xf86MonPtr DDC)
@@ -160,6 +162,15 @@ static Bool quirk_first_detailed_preferred (int scrnIndex, xf86MonPtr DDC)
     return FALSE;
 }
 
+static Bool quirk_detailed_sync_pp(int scrnIndex, xf86MonPtr DDC)
+{
+    /* Bug #12439: Samsung SyncMaster 205BW */
+    if (memcmp (DDC->vendor.name, "SAM", 4) == 0 &&
+	DDC->vendor.prod_id == 541)
+	return TRUE;
+    return FALSE;
+}
+
 typedef struct {
     Bool	(*detect) (int scrnIndex, xf86MonPtr DDC);
     ddc_quirk_t	quirk;
@@ -195,6 +206,10 @@ static const ddc_quirk_map_t ddc_quirks[] = {
 	quirk_first_detailed_preferred, DDC_QUIRK_FIRST_DETAILED_PREFERRED,
 	"First detailed timing was not marked as preferred."
     },
+    {
+	quirk_detailed_sync_pp, DDC_QUIRK_DETAILED_SYNC_PP,
+	"Use +hsync +vsync for detailed timing."
+    },
     { 
 	NULL,		DDC_QUIRK_NONE,
 	"No known quirks"
@@ -341,15 +356,19 @@ DDCModeFromDetailedTiming(int scrnIndex, struct detailed_timings *timing,
     if (timing->interlaced)
         Mode->Flags |= V_INTERLACE;
 
-    if (timing->misc & 0x02)
-	Mode->Flags |= V_PVSYNC;
-    else
-	Mode->Flags |= V_NVSYNC;
+    if (quirks & DDC_QUIRK_DETAILED_SYNC_PP)
+	Mode->Flags |= V_PVSYNC | V_PHSYNC;
+    else {
+	if (timing->misc & 0x02)
+	    Mode->Flags |= V_PVSYNC;
+	else
+	    Mode->Flags |= V_NVSYNC;
 
-    if (timing->misc & 0x01)
-	Mode->Flags |= V_PHSYNC;
-    else
-	Mode->Flags |= V_NHSYNC;
+	if (timing->misc & 0x01)
+	    Mode->Flags |= V_PHSYNC;
+	else
+	    Mode->Flags |= V_NHSYNC;
+    }
 
     return Mode;
 }

From f0bf9a5231d4f612ac916355118484d055715f32 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 24 Jan 2008 19:02:35 -0500
Subject: [PATCH 429/552] xselinux: Whitespace fixups.

---
 Xext/xselinux.c | 66 ++++++++++++++++++++++++-------------------------
 1 file changed, 32 insertions(+), 34 deletions(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 4629e9027..ede0350d4 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -271,7 +271,7 @@ SELinuxTypeToClass(RESTYPE type)
 	    knownTypes[type] = SECCLASS_X_CURSOR;
 	if (fulltype == RT_COLORMAP)
 	    knownTypes[type] = SECCLASS_X_COLORMAP;
-	
+
 	/* Need to do a string lookup */
 	str = LookupResourceName(fulltype);
 	if (!strcmp(str, "PICTURE"))
@@ -890,8 +890,7 @@ SELinuxResourceState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	if (rc != Success)
 	    FatalError("SELinux: Failed to set label property on window!\n");
 	freecon(ctx);
-    }
-    else
+    } else
 	FatalError("SELinux: Unexpected unlabeled client found\n");
 
     state = dixLookupPrivate(&pWin->devPrivates, stateKey);
@@ -907,8 +906,7 @@ SELinuxResourceState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	if (rc != Success)
 	    FatalError("SELinux: Failed to set label property on window!\n");
 	freecon(ctx);
-    }
-    else
+    } else
 	FatalError("SELinux: Unexpected unlabeled window found\n");
 }
 
@@ -1181,9 +1179,9 @@ SProcSELinuxQueryVersion(ClientPtr client)
     REQUEST(SELinuxQueryVersionReq);
     int n;
 
-    REQUEST_SIZE_MATCH (SELinuxQueryVersionReq);
-    swaps(&stuff->client_major,n);
-    swaps(&stuff->client_minor,n);
+    REQUEST_SIZE_MATCH(SELinuxQueryVersionReq);
+    swaps(&stuff->client_major, n);
+    swaps(&stuff->client_minor, n);
     return ProcSELinuxQueryVersion(client);
 }
 
@@ -1193,8 +1191,8 @@ SProcSELinuxSetSelectionManager(ClientPtr client)
     REQUEST(SELinuxSetSelectionManagerReq);
     int n;
 
-    REQUEST_SIZE_MATCH (SELinuxSetSelectionManagerReq);
-    swapl(&stuff->window,n);
+    REQUEST_SIZE_MATCH(SELinuxSetSelectionManagerReq);
+    swapl(&stuff->window, n);
     return ProcSELinuxSetSelectionManager(client);
 }
 
@@ -1205,7 +1203,7 @@ SProcSELinuxSetDeviceCreateContext(ClientPtr client)
     int n;
 
     REQUEST_AT_LEAST_SIZE(SELinuxSetCreateContextReq);
-    swaps(&stuff->context_len,n);
+    swaps(&stuff->context_len, n);
     return ProcSELinuxSetDeviceCreateContext(client);
 }
 
@@ -1216,8 +1214,8 @@ SProcSELinuxSetDeviceContext(ClientPtr client)
     int n;
 
     REQUEST_AT_LEAST_SIZE(SELinuxSetContextReq);
-    swapl(&stuff->id,n);
-    swaps(&stuff->context_len,n);
+    swapl(&stuff->id, n);
+    swaps(&stuff->context_len, n);
     return ProcSELinuxSetDeviceContext(client);
 }
 
@@ -1228,7 +1226,7 @@ SProcSELinuxGetDeviceContext(ClientPtr client)
     int n;
 
     REQUEST_SIZE_MATCH(SELinuxGetContextReq);
-    swapl(&stuff->id,n);
+    swapl(&stuff->id, n);
     return ProcSELinuxGetDeviceContext(client);
 }
 
@@ -1239,7 +1237,7 @@ SProcSELinuxSetPropertyCreateContext(ClientPtr client)
     int n;
 
     REQUEST_AT_LEAST_SIZE(SELinuxSetCreateContextReq);
-    swaps(&stuff->context_len,n);
+    swaps(&stuff->context_len, n);
     return ProcSELinuxSetPropertyCreateContext(client);
 }
 
@@ -1250,8 +1248,8 @@ SProcSELinuxGetPropertyContext(ClientPtr client)
     int n;
 
     REQUEST_SIZE_MATCH(SELinuxGetPropertyContextReq);
-    swapl(&stuff->window,n);
-    swapl(&stuff->property,n);
+    swapl(&stuff->window, n);
+    swapl(&stuff->property, n);
     return ProcSELinuxGetPropertyContext(client);
 }
 
@@ -1262,7 +1260,7 @@ SProcSELinuxSetWindowCreateContext(ClientPtr client)
     int n;
 
     REQUEST_AT_LEAST_SIZE(SELinuxSetCreateContextReq);
-    swaps(&stuff->context_len,n);
+    swaps(&stuff->context_len, n);
     return ProcSELinuxSetWindowCreateContext(client);
 }
 
@@ -1273,7 +1271,7 @@ SProcSELinuxGetWindowContext(ClientPtr client)
     int n;
 
     REQUEST_SIZE_MATCH(SELinuxGetContextReq);
-    swapl(&stuff->id,n);
+    swapl(&stuff->id, n);
     return ProcSELinuxGetWindowContext(client);
 }
 
@@ -1287,31 +1285,31 @@ SProcSELinuxDispatch(ClientPtr client)
 
     switch (stuff->data) {
     case X_SELinuxQueryVersion:
-        return SProcSELinuxQueryVersion(client);
+	return SProcSELinuxQueryVersion(client);
     case X_SELinuxSetSelectionManager:
 	return SProcSELinuxSetSelectionManager(client);
     case X_SELinuxGetSelectionManager:
-    	return ProcSELinuxGetSelectionManager(client);
+	return ProcSELinuxGetSelectionManager(client);
     case X_SELinuxSetDeviceCreateContext:
-    	return SProcSELinuxSetDeviceCreateContext(client);
+	return SProcSELinuxSetDeviceCreateContext(client);
     case X_SELinuxGetDeviceCreateContext:
-    	return ProcSELinuxGetDeviceCreateContext(client);
+	return ProcSELinuxGetDeviceCreateContext(client);
     case X_SELinuxSetDeviceContext:
-    	return SProcSELinuxSetDeviceContext(client);
+	return SProcSELinuxSetDeviceContext(client);
     case X_SELinuxGetDeviceContext:
-    	return SProcSELinuxGetDeviceContext(client);
+	return SProcSELinuxGetDeviceContext(client);
     case X_SELinuxSetPropertyCreateContext:
-    	return SProcSELinuxSetPropertyCreateContext(client);
+	return SProcSELinuxSetPropertyCreateContext(client);
     case X_SELinuxGetPropertyCreateContext:
-    	return ProcSELinuxGetPropertyCreateContext(client);
+	return ProcSELinuxGetPropertyCreateContext(client);
     case X_SELinuxGetPropertyContext:
-    	return SProcSELinuxGetPropertyContext(client);
+	return SProcSELinuxGetPropertyContext(client);
     case X_SELinuxSetWindowCreateContext:
-    	return SProcSELinuxSetWindowCreateContext(client);
+	return SProcSELinuxSetWindowCreateContext(client);
     case X_SELinuxGetWindowCreateContext:
-    	return ProcSELinuxGetWindowCreateContext(client);
+	return ProcSELinuxGetWindowCreateContext(client);
     case X_SELinuxGetWindowContext:
-    	return SProcSELinuxGetWindowContext(client);
+	return SProcSELinuxGetWindowContext(client);
     default:
 	return BadRequest;
     }
@@ -1376,8 +1374,8 @@ SELinuxExtensionInit(INITARGS)
 
     /* Setup SELinux stuff */
     if (!is_selinux_enabled()) {
-        ErrorF("SELinux: SELinux not enabled, disabling SELinux support.\n");
-        return;
+	ErrorF("SELinux: SELinux not enabled, disabling SELinux support.\n");
+	return;
     }
 
     selinux_set_callback(SELINUX_CB_LOG, (union selinux_callback)SELinuxLog);
@@ -1408,7 +1406,7 @@ SELinuxExtensionInit(INITARGS)
     /* Prepare for auditing */
     audit_fd = audit_open();
     if (audit_fd < 0)
-        FatalError("SELinux: Failed to open the system audit log\n");
+	FatalError("SELinux: Failed to open the system audit log\n");
 
     /* Allocate private storage */
     if (!dixRequestPrivate(stateKey, sizeof(SELinuxStateRec)))

From 7ba8e97cbabfef4d614a6a38314830ec0f925471 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 24 Jan 2008 19:09:58 -0500
Subject: [PATCH 430/552] xselinux: Implement "get context" protocol requests.

---
 Xext/xselinux.c | 119 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 116 insertions(+), 3 deletions(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index ede0350d4..1432916de 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -1098,7 +1098,40 @@ ProcSELinuxSetDeviceContext(ClientPtr client)
 static int
 ProcSELinuxGetDeviceContext(ClientPtr client)
 {
-    return Success;
+    char *ctx;
+    DeviceIntPtr dev;
+    SELinuxStateRec *state;
+    SELinuxGetContextReply rep;
+    int rc;
+
+    REQUEST(SELinuxGetContextReq);
+    REQUEST_SIZE_MATCH(SELinuxGetContextReq);
+
+    rc = dixLookupDevice(&dev, stuff->id, client, DixGetAttrAccess);
+    if (rc != Success)
+	return rc;
+
+    state = dixLookupPrivate(&dev->devPrivates, stateKey);
+    rc = avc_sid_to_context(state->sid, &ctx);
+    if (rc != Success)
+	return BadValue;
+
+    rep.type = X_Reply;
+    rep.length = (strlen(ctx) + 4) >> 2;
+    rep.sequenceNumber = client->sequence;
+    rep.context_len = strlen(ctx) + 1;
+
+    if (client->swapped) {
+	int n;
+	swapl(&rep.length, n);
+	swaps(&rep.sequenceNumber, n);
+	swaps(&rep.context_len, n);
+    }
+
+    WriteToClient(client, sizeof(SELinuxGetContextReply), (char *)&rep);
+    WriteToClient(client, rep.context_len, ctx);
+    free(ctx);
+    return client->noClientException;
 }
 
 static int
@@ -1116,7 +1149,54 @@ ProcSELinuxGetPropertyCreateContext(ClientPtr client)
 static int
 ProcSELinuxGetPropertyContext(ClientPtr client)
 {
-    return Success;
+    char *ctx;
+    WindowPtr pWin;
+    PropertyPtr pProp;
+    SELinuxStateRec *state;
+    SELinuxGetContextReply rep;
+    int rc;
+
+    REQUEST(SELinuxGetPropertyContextReq);
+    REQUEST_SIZE_MATCH(SELinuxGetPropertyContextReq);
+
+    rc = dixLookupWindow(&pWin, stuff->window, client, DixGetPropAccess);
+    if (rc != Success)
+	return rc;
+
+    pProp = wUserProps(pWin);
+    while (pProp) {
+	if (pProp->propertyName == stuff->property)
+	    break;
+	pProp = pProp->next;
+    }
+    if (!pProp)
+	return BadValue;
+
+    rc = XaceHook(XACE_PROPERTY_ACCESS, client, pWin, pProp, DixGetAttrAccess);
+    if (rc != Success)
+	return rc;
+
+    state = dixLookupPrivate(&pProp->devPrivates, stateKey);
+    rc = avc_sid_to_context(state->sid, &ctx);
+    if (rc != Success)
+	return BadValue;
+
+    rep.type = X_Reply;
+    rep.length = (strlen(ctx) + 4) >> 2;
+    rep.sequenceNumber = client->sequence;
+    rep.context_len = strlen(ctx) + 1;
+
+    if (client->swapped) {
+	int n;
+	swapl(&rep.length, n);
+	swaps(&rep.sequenceNumber, n);
+	swaps(&rep.context_len, n);
+    }
+
+    WriteToClient(client, sizeof(SELinuxGetContextReply), (char *)&rep);
+    WriteToClient(client, rep.context_len, ctx);
+    free(ctx);
+    return client->noClientException;
 }
 
 static int
@@ -1134,7 +1214,40 @@ ProcSELinuxGetWindowCreateContext(ClientPtr client)
 static int
 ProcSELinuxGetWindowContext(ClientPtr client)
 {
-    return Success;
+    char *ctx;
+    WindowPtr pWin;
+    SELinuxStateRec *state;
+    SELinuxGetContextReply rep;
+    int rc;
+
+    REQUEST(SELinuxGetContextReq);
+    REQUEST_SIZE_MATCH(SELinuxGetContextReq);
+
+    rc = dixLookupWindow(&pWin, stuff->id, client, DixGetAttrAccess);
+    if (rc != Success)
+	return rc;
+
+    state = dixLookupPrivate(&pWin->devPrivates, stateKey);
+    rc = avc_sid_to_context(state->sid, &ctx);
+    if (rc != Success)
+	return BadValue;
+
+    rep.type = X_Reply;
+    rep.length = (strlen(ctx) + 4) >> 2;
+    rep.sequenceNumber = client->sequence;
+    rep.context_len = strlen(ctx) + 1;
+
+    if (client->swapped) {
+	int n;
+	swapl(&rep.length, n);
+	swaps(&rep.sequenceNumber, n);
+	swaps(&rep.context_len, n);
+    }
+
+    WriteToClient(client, sizeof(SELinuxGetContextReply), (char *)&rep);
+    WriteToClient(client, rep.context_len, ctx);
+    free(ctx);
+    return client->noClientException;
 }
 
 static int

From 6ffeecabb7f3f3173864e0f0af21a99bdc5b5044 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 24 Jan 2008 18:11:49 -0500
Subject: [PATCH 431/552] xselinux: Use a privileged bit in the state instead
 of passing an index to the permission checking function.

---
 Xext/xselinux.c | 60 ++++++++++++++++++++++---------------------------
 1 file changed, 27 insertions(+), 33 deletions(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 1432916de..53ea6c114 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -63,6 +63,7 @@ typedef struct {
     security_id_t sid;
     struct avc_entry_ref aeref;
     char *command;
+    int privileged;
 } SELinuxStateRec;
 
 /* selection manager */
@@ -287,11 +288,11 @@ SELinuxTypeToClass(RESTYPE type)
  * Performs an SELinux permission check.
  */
 static int
-SELinuxDoCheck(int clientIndex, SELinuxStateRec *subj, SELinuxStateRec *obj,
+SELinuxDoCheck(SELinuxStateRec *subj, SELinuxStateRec *obj,
 	       security_class_t class, Mask mode, SELinuxAuditRec *auditdata)
 {
     /* serverClient requests OK */
-    if (clientIndex == 0)
+    if (subj->privileged)
 	return Success;
 
     auditdata->command = subj->command;
@@ -383,6 +384,7 @@ SELinuxLabelInitial(void)
 
     /* Do the serverClient */
     state = dixLookupPrivate(&serverClient->devPrivates, stateKey);
+    state->privileged = 1;
     sidput(state->sid);
 
     /* Use the context of the X server process for the serverClient */
@@ -496,8 +498,8 @@ SELinuxDevice(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	obj->sid = subj->sid;
     }
 
-    rc = SELinuxDoCheck(rec->client->index, subj, obj, SECCLASS_X_DEVICE,
-			rec->access_mode, &auditdata);
+    rc = SELinuxDoCheck(subj, obj, SECCLASS_X_DEVICE, rec->access_mode,
+			&auditdata);
     if (rc != Success)
 	rec->status = rc;
 }
@@ -509,21 +511,18 @@ SELinuxSend(CallbackListPtr *pcbl, pointer unused, pointer calldata)
     SELinuxStateRec *subj, *obj, ev_sid;
     SELinuxAuditRec auditdata = { .client = rec->client };
     security_class_t class;
-    int rc, i, type, clientIndex;
+    int rc, i, type;
 
-    if (rec->dev) {
+    if (rec->dev)
 	subj = dixLookupPrivate(&rec->dev->devPrivates, stateKey);
-	clientIndex = -1; /* some nonzero value */
-    } else {
+    else
 	subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
-	clientIndex = rec->client->index;
-    }
 
     obj = dixLookupPrivate(&rec->pWin->devPrivates, stateKey);
 
     /* Check send permission on window */
-    rc = SELinuxDoCheck(clientIndex, subj, obj, SECCLASS_X_DRAWABLE,
-			DixSendAccess, &auditdata);
+    rc = SELinuxDoCheck(subj, obj, SECCLASS_X_DRAWABLE, DixSendAccess,
+			&auditdata);
     if (rc != Success)
 	goto err;
 
@@ -537,8 +536,7 @@ SELinuxSend(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	    goto err;
 
 	auditdata.event = type;
-	rc = SELinuxDoCheck(clientIndex, subj, &ev_sid, class,
-			    DixSendAccess, &auditdata);
+	rc = SELinuxDoCheck(subj, &ev_sid, class, DixSendAccess, &auditdata);
 	if (rc != Success)
 	    goto err;
     }
@@ -560,8 +558,8 @@ SELinuxReceive(CallbackListPtr *pcbl, pointer unused, pointer calldata)
     obj = dixLookupPrivate(&rec->pWin->devPrivates, stateKey);
 
     /* Check receive permission on window */
-    rc = SELinuxDoCheck(rec->client->index, subj, obj, SECCLASS_X_DRAWABLE,
-			DixReceiveAccess, &auditdata);
+    rc = SELinuxDoCheck(subj, obj, SECCLASS_X_DRAWABLE, DixReceiveAccess,
+			&auditdata);
     if (rc != Success)
 	goto err;
 
@@ -575,8 +573,7 @@ SELinuxReceive(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	    goto err;
 
 	auditdata.event = type;
-	rc = SELinuxDoCheck(rec->client->index, subj, &ev_sid, class,
-			    DixReceiveAccess, &auditdata);
+	rc = SELinuxDoCheck(subj, &ev_sid, class, DixReceiveAccess, &auditdata);
 	if (rc != Success)
 	    goto err;
     }
@@ -633,8 +630,8 @@ SELinuxExtension(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 
     /* Perform the security check */
     auditdata.extension = rec->ext->name;
-    rc = SELinuxDoCheck(rec->client->index, subj, obj, SECCLASS_X_EXTENSION,
-			rec->access_mode, &auditdata);
+    rc = SELinuxDoCheck(subj, obj, SECCLASS_X_EXTENSION, rec->access_mode,
+			&auditdata);
     if (rc != Success)
 	rec->status = rc;
 }
@@ -680,13 +677,12 @@ SELinuxProperty(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	    return;
 	}
 	freecon(con);
-	avc_entry_ref_init(&obj->aeref);
     }
 
     /* Perform the security check */
     auditdata.property = rec->pProp->propertyName;
-    rc = SELinuxDoCheck(rec->client->index, subj, obj, SECCLASS_X_PROPERTY,
-			rec->access_mode, &auditdata);
+    rc = SELinuxDoCheck(subj, obj, SECCLASS_X_PROPERTY, rec->access_mode,
+			&auditdata);
     if (rc != Success)
 	rec->status = rc;
 }
@@ -741,8 +737,7 @@ SELinuxResource(CallbackListPtr *pcbl, pointer unused, pointer calldata)
     /* Perform the security check */
     auditdata.restype = rec->rtype;
     auditdata.id = rec->id;
-    rc = SELinuxDoCheck(rec->client->index, subj, obj, class,
-			rec->access_mode, &auditdata);
+    rc = SELinuxDoCheck(subj, obj, class, rec->access_mode, &auditdata);
     if (rc != Success)
 	rec->status = rc;
 }
@@ -775,8 +770,7 @@ SELinuxScreen(CallbackListPtr *pcbl, pointer is_saver, pointer calldata)
     if (is_saver)
 	access_mode <<= 2;
 
-    rc = SELinuxDoCheck(rec->client->index, subj, obj, SECCLASS_X_SCREEN,
-			access_mode, &auditdata);
+    rc = SELinuxDoCheck(subj, obj, SECCLASS_X_SCREEN, access_mode, &auditdata);
     if (rc != Success)
 	rec->status = rc;
 }
@@ -792,8 +786,8 @@ SELinuxClient(CallbackListPtr *pcbl, pointer unused, pointer calldata)
     subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
     obj = dixLookupPrivate(&rec->target->devPrivates, stateKey);
 
-    rc = SELinuxDoCheck(rec->client->index, subj, obj, SECCLASS_X_CLIENT,
-			rec->access_mode, &auditdata);
+    rc = SELinuxDoCheck(subj, obj, SECCLASS_X_CLIENT, rec->access_mode,
+			&auditdata);
     if (rc != Success)
 	rec->status = rc;
 }
@@ -809,8 +803,8 @@ SELinuxServer(CallbackListPtr *pcbl, pointer unused, pointer calldata)
     subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
     obj = dixLookupPrivate(&serverClient->devPrivates, stateKey);
 
-    rc = SELinuxDoCheck(rec->client->index, subj, obj, SECCLASS_X_SERVER,
-			rec->access_mode, &auditdata);
+    rc = SELinuxDoCheck(subj, obj, SECCLASS_X_SERVER, rec->access_mode,
+			&auditdata);
     if (rc != Success)
 	rec->status = rc;
 }
@@ -832,8 +826,8 @@ SELinuxSelection(CallbackListPtr *pcbl, pointer unused, pointer calldata)
     }
 
     auditdata.selection = rec->name;
-    rc = SELinuxDoCheck(rec->client->index, subj, &sel_sid,
-			SECCLASS_X_SELECTION, rec->access_mode, &auditdata);
+    rc = SELinuxDoCheck(subj, &sel_sid, SECCLASS_X_SELECTION, rec->access_mode,
+			&auditdata);
     if (rc != Success)
 	rec->status = rc;
 }

From 46794d0c9665f07913980830d038c88d00407612 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 24 Jan 2008 19:49:13 -0500
Subject: [PATCH 432/552] xselinux: Rename SelectionManager to more generic
 SecurityManager.

---
 Xext/xselinux.c | 60 ++++++++++++++++++++++++-------------------------
 Xext/xselinux.h | 10 ++++-----
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 53ea6c114..a6e27e695 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -72,8 +72,8 @@ typedef struct {
     security_id_t sid;
 } SELinuxSelectionRec;
 
-static ClientPtr selectionManager;
-static Window selectionWindow;
+static ClientPtr securityManager;
+static Window securityWindow;
 
 /* audit file descriptor */
 static int audit_fd;
@@ -849,9 +849,9 @@ SELinuxClientState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 
     case ClientStateRetained:
     case ClientStateGone:
-	if (pci->client == selectionManager) {
-	    selectionManager = NULL;
-	    selectionWindow = 0;
+	if (pci->client == securityManager) {
+	    securityManager = NULL;
+	    securityWindow = 0;
 	}
 	break;
 
@@ -935,9 +935,9 @@ SELinuxSelectionState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 
     case SelectionConvertSelection:
 	/* redirect the convert request if necessary */
-	if (selectionManager && selectionManager != rec->client) {
-	    rec->selection->client = selectionManager;
-	    rec->selection->window = selectionWindow;
+	if (securityManager && securityManager != rec->client) {
+	    rec->selection->client = securityManager;
+	    rec->selection->window = securityWindow;
 	} else {
 	    rec->selection->client = rec->selection->alt_client;
 	    rec->selection->window = rec->selection->alt_window;
@@ -1004,39 +1004,39 @@ ProcSELinuxQueryVersion(ClientPtr client)
 }
 
 static int
-ProcSELinuxSetSelectionManager(ClientPtr client)
+ProcSELinuxSetSecurityManager(ClientPtr client)
 {
     WindowPtr pWin;
     int rc;
 
-    REQUEST(SELinuxSetSelectionManagerReq);
-    REQUEST_SIZE_MATCH(SELinuxSetSelectionManagerReq);
+    REQUEST(SELinuxSetSecurityManagerReq);
+    REQUEST_SIZE_MATCH(SELinuxSetSecurityManagerReq);
 
     if (stuff->window == None) {
-	selectionManager = NULL;
-	selectionWindow = None;
+	securityManager = NULL;
+	securityWindow = None;
     } else {
 	rc = dixLookupResource((pointer *)&pWin, stuff->window, RT_WINDOW,
 			       client, DixGetAttrAccess);
 	if (rc != Success)
 	    return rc;
 
-	selectionManager = client;
-	selectionWindow = stuff->window;
+	securityManager = client;
+	securityWindow = stuff->window;
     }
 
     return Success;
 }
 
 static int
-ProcSELinuxGetSelectionManager(ClientPtr client)
+ProcSELinuxGetSecurityManager(ClientPtr client)
 {
-    SELinuxGetSelectionManagerReply rep;
+    SELinuxGetSecurityManagerReply rep;
 
     rep.type = X_Reply;
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
-    rep.window = selectionWindow;
+    rep.window = securityWindow;
     if (client->swapped) {
 	int n;
 	swaps(&rep.sequenceNumber, n);
@@ -1251,10 +1251,10 @@ ProcSELinuxDispatch(ClientPtr client)
     switch (stuff->data) {
     case X_SELinuxQueryVersion:
 	return ProcSELinuxQueryVersion(client);
-    case X_SELinuxSetSelectionManager:
-	return ProcSELinuxSetSelectionManager(client);
-    case X_SELinuxGetSelectionManager:
-	return ProcSELinuxGetSelectionManager(client);
+    case X_SELinuxSetSecurityManager:
+	return ProcSELinuxSetSecurityManager(client);
+    case X_SELinuxGetSecurityManager:
+	return ProcSELinuxGetSecurityManager(client);
     case X_SELinuxSetDeviceCreateContext:
 	return ProcSELinuxSetDeviceCreateContext(client);
     case X_SELinuxGetDeviceCreateContext:
@@ -1293,14 +1293,14 @@ SProcSELinuxQueryVersion(ClientPtr client)
 }
 
 static int
-SProcSELinuxSetSelectionManager(ClientPtr client)
+SProcSELinuxSetSecurityManager(ClientPtr client)
 {
-    REQUEST(SELinuxSetSelectionManagerReq);
+    REQUEST(SELinuxSetSecurityManagerReq);
     int n;
 
-    REQUEST_SIZE_MATCH(SELinuxSetSelectionManagerReq);
+    REQUEST_SIZE_MATCH(SELinuxSetSecurityManagerReq);
     swapl(&stuff->window, n);
-    return ProcSELinuxSetSelectionManager(client);
+    return ProcSELinuxSetSecurityManager(client);
 }
 
 static int
@@ -1393,10 +1393,10 @@ SProcSELinuxDispatch(ClientPtr client)
     switch (stuff->data) {
     case X_SELinuxQueryVersion:
 	return SProcSELinuxQueryVersion(client);
-    case X_SELinuxSetSelectionManager:
-	return SProcSELinuxSetSelectionManager(client);
-    case X_SELinuxGetSelectionManager:
-	return ProcSELinuxGetSelectionManager(client);
+    case X_SELinuxSetSecurityManager:
+	return SProcSELinuxSetSecurityManager(client);
+    case X_SELinuxGetSecurityManager:
+	return ProcSELinuxGetSecurityManager(client);
     case X_SELinuxSetDeviceCreateContext:
 	return SProcSELinuxSetDeviceCreateContext(client);
     case X_SELinuxGetDeviceCreateContext:
diff --git a/Xext/xselinux.h b/Xext/xselinux.h
index ba1380b57..7eeea5046 100644
--- a/Xext/xselinux.h
+++ b/Xext/xselinux.h
@@ -31,8 +31,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 /* Extension protocol */
 #define X_SELinuxQueryVersion			0
-#define X_SELinuxSetSelectionManager		1
-#define X_SELinuxGetSelectionManager		2
+#define X_SELinuxSetSecurityManager		1
+#define X_SELinuxGetSecurityManager		2
 #define X_SELinuxSetDeviceCreateContext		3
 #define X_SELinuxGetDeviceCreateContext		4
 #define X_SELinuxSetDeviceContext		5
@@ -72,13 +72,13 @@ typedef struct {
     CARD8   SELinuxReqType;
     CARD16  length;
     CARD32  window;
-} SELinuxSetSelectionManagerReq;
+} SELinuxSetSecurityManagerReq;
 
 typedef struct {
     CARD8   reqType;
     CARD8   SELinuxReqType;
     CARD16  length;
-} SELinuxGetSelectionManagerReq;
+} SELinuxGetSecurityManagerReq;
 
 typedef struct {
     CARD8   type;
@@ -91,7 +91,7 @@ typedef struct {
     CARD32  pad4;
     CARD32  pad5;
     CARD32  pad6;
-} SELinuxGetSelectionManagerReply;
+} SELinuxGetSecurityManagerReply;
 
 typedef struct {
     CARD8   reqType;

From f82329b0811469ddae5c44dcfffa38185c11a67c Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 25 Jan 2008 16:20:46 -0500
Subject: [PATCH 433/552] XACE: Don't need to actually register a protocol
 extension.

---
 Xext/xace.c | 50 --------------------------------------------------
 Xext/xace.h |  3 ---
 2 files changed, 53 deletions(-)

diff --git a/Xext/xace.c b/Xext/xace.c
index e85a51714..632673548 100644
--- a/Xext/xace.c
+++ b/Xext/xace.c
@@ -221,51 +221,6 @@ int XaceHook(int hook, ...)
     return prv ? *prv : Success;
 }
 
-static int
-ProcXaceDispatch(ClientPtr client)
-{
-    REQUEST(xReq);
-
-    switch (stuff->data)
-    {
-	default:
-	    return BadRequest;
-    }
-} /* ProcXaceDispatch */
-
-static int
-SProcXaceDispatch(ClientPtr client)
-{
-    REQUEST(xReq);
-
-    switch (stuff->data)
-    {
-	default:
-	    return BadRequest;
-    }
-} /* SProcXaceDispatch */
-
-
-/* XaceResetProc
- *
- * Arguments:
- *	extEntry is the extension information for the XACE extension.
- *
- * Returns: nothing.
- *
- * Side Effects:
- *	Performs any cleanup needed by XACE at server shutdown time.
- */
-static void
-XaceResetProc(ExtensionEntry *extEntry)
-{
-    int i;
-
-    for (i=0; i<XACE_NUM_HOOKS; i++)
-	DeleteCallbackList(&XaceHooks[i]);
-} /* XaceResetProc */
-
-
 static int
 XaceCatchDispatchProc(ClientPtr client)
 {
@@ -365,11 +320,6 @@ void XaceExtensionInit(INITARGS)
     if (!AddCallback(&ClientStateCallback, XaceClientStateCallback, NULL))
 	return;
 
-    extEntry = AddExtension(XACE_EXTENSION_NAME,
-			    XaceNumberEvents, XaceNumberErrors,
-			    ProcXaceDispatch, SProcXaceDispatch,
-			    XaceResetProc, StandardMinorOpcode);
-
     /* initialize dispatching intercept functions */
     for (i = 0; i < 128; i++)
     {
diff --git a/Xext/xace.h b/Xext/xace.h
index 6f92290a0..fdf91d159 100644
--- a/Xext/xace.h
+++ b/Xext/xace.h
@@ -29,9 +29,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "pixmap.h"     /* for DrawablePtr */
 #include "regionstr.h"  /* for RegionPtr */
 
-#define XaceNumberEvents		0
-#define XaceNumberErrors		0
-
 /* Default window background */
 #define XaceBackgroundNoneState		None
 

From 7724c30a751c653ca3e2e8a6752af27bc37de3f0 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 25 Jan 2008 17:28:17 -0500
Subject: [PATCH 434/552] XACE: Stop using fake requestVectors in favor of a
 simple hook call.

---
 Xext/xace.c    | 139 +++++++------------------------------------------
 Xext/xace.h    |   6 +--
 dix/dispatch.c |   5 +-
 3 files changed, 24 insertions(+), 126 deletions(-)

diff --git a/Xext/xace.c b/Xext/xace.c
index 632673548..0b3baf6b1 100644
--- a/Xext/xace.c
+++ b/Xext/xace.c
@@ -28,27 +28,28 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 CallbackListPtr XaceHooks[XACE_NUM_HOOKS] = {0};
 
-/* Proc vectors for untrusted clients, swapped and unswapped versions.
- * These are the same as the normal proc vectors except that extensions
- * that haven't declared themselves secure will have ProcBadRequest plugged
- * in for their major opcode dispatcher.  This prevents untrusted clients
- * from guessing extension major opcodes and using the extension even though
- * the extension can't be listed or queried.
- */
-static int (*UntrustedProcVector[256])(
-    ClientPtr /*client*/
-);
-static int (*SwappedUntrustedProcVector[256])(
-    ClientPtr /*client*/
-);
-
 /* Special-cased hook functions.  Called by Xserver.
  */
-void XaceHookAuditBegin(ClientPtr ptr)
+int XaceHookDispatch(ClientPtr client, int major)
 {
-    XaceAuditRec rec = { ptr, 0 };
-    /* call callbacks, there is no return value. */
+    /* Call the audit begin callback, there is no return value. */
+    XaceAuditRec rec = { client, 0 };
     CallCallbacks(&XaceHooks[XACE_AUDIT_BEGIN], &rec);
+
+    if (major < 128) {
+	/* Call the core dispatch hook */
+	XaceCoreDispatchRec rec = { client, Success /* default allow */ };
+	CallCallbacks(&XaceHooks[XACE_CORE_DISPATCH], &rec);
+	return rec.status;
+    } else {
+	/* Call the extension dispatch hook */
+	ExtensionEntry *ext = GetExtensionEntry(major);
+	XaceExtAccessRec rec = { client, ext, DixUseAccess, Success };
+	if (ext)
+	    CallCallbacks(&XaceHooks[XACE_EXT_DISPATCH], &rec);
+	/* On error, pretend extension doesn't exist */
+	return (rec.status == Success) ? Success : BadRequest;
+    }
 }
 
 void XaceHookAuditEnd(ClientPtr ptr, int result)
@@ -221,116 +222,12 @@ int XaceHook(int hook, ...)
     return prv ? *prv : Success;
 }
 
-static int
-XaceCatchDispatchProc(ClientPtr client)
-{
-    REQUEST(xReq);
-    int major = stuff->reqType;
-    XaceCoreDispatchRec rec = { client, Success /* default allow */ };
-
-    if (!ProcVector[major])
-	return BadRequest;
-
-    /* call callbacks and return result, if any. */
-    CallCallbacks(&XaceHooks[XACE_CORE_DISPATCH], &rec);
-
-    if (rec.status != Success)
-	return rec.status;
-
-    return client->swapped ? 
-	(* SwappedProcVector[major])(client) :
-	(* ProcVector[major])(client);
-}
-
-static int
-XaceCatchExtProc(ClientPtr client)
-{
-    REQUEST(xReq);
-    int major = stuff->reqType;
-    ExtensionEntry *ext = GetExtensionEntry(major);
-    XaceExtAccessRec rec = { client, ext, DixUseAccess, Success };
-
-    if (!ext || !ProcVector[major])
-	return BadRequest;
-
-    /* call callbacks and return result, if any. */
-    CallCallbacks(&XaceHooks[XACE_EXT_DISPATCH], &rec);
-
-    if (rec.status != Success)
-	return BadRequest; /* pretend extension doesn't exist */
-
-    return client->swapped ?
-	(* SwappedProcVector[major])(client) :
-	(* ProcVector[major])(client);
-}
-
-	
-/* SecurityClientStateCallback
- *
- * Arguments:
- *	pcbl is &ClientStateCallback.
- *	nullata is NULL.
- *	calldata is a pointer to a NewClientInfoRec (include/dixstruct.h)
- *	which contains information about client state changes.
- *
- * Returns: nothing.
- *
- * Side Effects:
- * 
- * If a new client is connecting, its authorization ID is copied to
- * client->authID.  If this is a generated authorization, its reference
- * count is bumped, its timer is cancelled if it was running, and its
- * trustlevel is copied to TRUSTLEVEL(client).
- * 
- * If a client is disconnecting and the client was using a generated
- * authorization, the authorization's reference count is decremented, and
- * if it is now zero, the timer for this authorization is started.
- */
-
-static void
-XaceClientStateCallback(
-    CallbackListPtr *pcbl,
-    pointer nulldata,
-    pointer calldata)
-{
-    NewClientInfoRec *pci = (NewClientInfoRec *)calldata;
-    ClientPtr client = pci->client;
-
-    switch (client->clientState)
-    {
-	case ClientStateRunning:
-	{ 
-	    client->requestVector = client->swapped ?
-		SwappedUntrustedProcVector : UntrustedProcVector;
-	    break;
-	}
-	default: break; 
-    }
-} /* XaceClientStateCallback */
-
 /* XaceExtensionInit
  *
  * Initialize the XACE Extension
  */
 void XaceExtensionInit(INITARGS)
 {
-    ExtensionEntry	*extEntry;
-    int i;
-
-    if (!AddCallback(&ClientStateCallback, XaceClientStateCallback, NULL))
-	return;
-
-    /* initialize dispatching intercept functions */
-    for (i = 0; i < 128; i++)
-    {
-	UntrustedProcVector[i] = XaceCatchDispatchProc;
-	SwappedUntrustedProcVector[i] = XaceCatchDispatchProc;
-    }
-    for (i = 128; i < 256; i++)
-    {
-	UntrustedProcVector[i] = XaceCatchExtProc;
-	SwappedUntrustedProcVector[i] = XaceCatchExtProc;
-    }
 }
 
 /* XaceCensorImage
diff --git a/Xext/xace.h b/Xext/xace.h
index fdf91d159..a8fac98e2 100644
--- a/Xext/xace.h
+++ b/Xext/xace.h
@@ -65,8 +65,8 @@ extern int XaceHook(
 
 /* Special-cased hook functions
  */
+extern int XaceHookDispatch(ClientPtr ptr, int major);
 extern void XaceHookAuditEnd(ClientPtr ptr, int result);
-extern void XaceHookAuditBegin(ClientPtr ptr);
 
 /* Register a callback for a given hook.
  */
@@ -101,13 +101,13 @@ extern void XaceCensorImage(
 
 #ifdef __GNUC__
 #define XaceHook(args...) Success
+#define XaceHookDispatch(args...) Success
 #define XaceHookAuditEnd(args...) { ; }
-#define XaceHookAuditBegin(args...) { ; }
 #define XaceCensorImage(args...) { ; }
 #else
 #define XaceHook(...) Success
+#define XaceHookDispatch(...) Success
 #define XaceHookAuditEnd(...) { ; }
-#define XaceHookAuditBegin(...) { ; }
 #define XaceCensorImage(...) { ; }
 #endif
 
diff --git a/dix/dispatch.c b/dix/dispatch.c
index 004509caa..663bf7dd5 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -463,8 +463,9 @@ Dispatch(void)
 		if (result > (maxBigRequestSize << 2))
 		    result = BadLength;
 		else {
-		    XaceHookAuditBegin(client);
-		    result = (* client->requestVector[MAJOROP])(client);
+		    result = XaceHookDispatch(client, MAJOROP);
+		    if (result == Success)
+			result = (* client->requestVector[MAJOROP])(client);
 		    XaceHookAuditEnd(client, result);
 		}
 #ifdef XSERVER_DTRACE

From f6a78ee143e3a3ad69538adf2b9675d724468ffa Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 25 Jan 2008 18:04:10 -0500
Subject: [PATCH 435/552] XACE: Remove the extension code entirely, XACE is
 completely static now.

---
 Xext/xace.c                         |  9 ---------
 Xext/xace.h                         |  1 -
 hw/xfree86/dixmods/extmod/modinit.h |  4 ----
 mi/miinitext.c                      | 12 ------------
 4 files changed, 26 deletions(-)

diff --git a/Xext/xace.c b/Xext/xace.c
index 0b3baf6b1..0470e44dd 100644
--- a/Xext/xace.c
+++ b/Xext/xace.c
@@ -24,7 +24,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <stdarg.h>
 #include "scrnintstr.h"
 #include "xacestr.h"
-#include "modinit.h"
 
 CallbackListPtr XaceHooks[XACE_NUM_HOOKS] = {0};
 
@@ -222,14 +221,6 @@ int XaceHook(int hook, ...)
     return prv ? *prv : Success;
 }
 
-/* XaceExtensionInit
- *
- * Initialize the XACE Extension
- */
-void XaceExtensionInit(INITARGS)
-{
-}
-
 /* XaceCensorImage
  *
  * Called after pScreen->GetImage to prevent pieces or trusted windows from
diff --git a/Xext/xace.h b/Xext/xace.h
index a8fac98e2..4100ba16e 100644
--- a/Xext/xace.h
+++ b/Xext/xace.h
@@ -22,7 +22,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #ifdef XACE
 
-#define XACE_EXTENSION_NAME		"XAccessControlExtension"
 #define XACE_MAJOR_VERSION		2
 #define XACE_MINOR_VERSION		0
 
diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h
index 99d714c4f..116cb2ef7 100644
--- a/hw/xfree86/dixmods/extmod/modinit.h
+++ b/hw/xfree86/dixmods/extmod/modinit.h
@@ -125,10 +125,6 @@ extern void ShmRegisterFuncs(
     ShmFuncsPtr funcs);
 #endif
 
-#ifdef XACE
-extern void XaceExtensionInit(INITARGS);
-#endif
-
 #ifdef XSELINUX
 extern void SELinuxExtensionInit(INITARGS);
 #endif
diff --git a/mi/miinitext.c b/mi/miinitext.c
index b14690756..30cbc7a25 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -244,9 +244,6 @@ typedef void (*InitExtension)(INITARGS);
 #define _XAG_SERVER_
 #include <X11/extensions/Xagstr.h>
 #endif
-#ifdef XACE
-#include "xace.h"
-#endif
 #ifdef XCSECURITY
 #include "securitysrv.h"
 #include <X11/extensions/securstr.h>
@@ -323,9 +320,6 @@ extern void DbeExtensionInit(INITARGS);
 #ifdef XAPPGROUP
 extern void XagExtensionInit(INITARGS);
 #endif
-#ifdef XACE
-extern void XaceExtensionInit(INITARGS);
-#endif
 #ifdef XCSECURITY
 extern void SecurityExtensionInit(INITARGS);
 #endif
@@ -599,9 +593,6 @@ InitExtensions(argc, argv)
 #ifdef XAPPGROUP
     if (!noXagExtension) XagExtensionInit();
 #endif
-#ifdef XACE
-    XaceExtensionInit();
-#endif
 #ifdef XCSECURITY
     if (!noSecurityExtension) SecurityExtensionInit();
 #endif
@@ -696,9 +687,6 @@ static ExtensionModule staticExtensions[] = {
 #ifdef XAPPGROUP
     { XagExtensionInit, XAGNAME, &noXagExtension, NULL, NULL },
 #endif
-#ifdef XACE
-    { XaceExtensionInit, XACE_EXTENSION_NAME, NULL, NULL, NULL },
-#endif
 #ifdef XCSECURITY
     { SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension, NULL, NULL },
 #endif

From e915a2639752bc0ea9e6e192e020cc2031c08063 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 25 Jan 2008 19:22:19 -0500
Subject: [PATCH 436/552] xselinux: Move the extension to extmod instead of
 being built-in.

---
 Xext/Makefile.am                    | 2 +-
 hw/xfree86/dixmods/extmod/modinit.c | 9 +++++++++
 hw/xfree86/dixmods/extmod/modinit.h | 1 +
 mi/miinitext.c                      | 3 ---
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Xext/Makefile.am b/Xext/Makefile.am
index f57e59910..648736d95 100644
--- a/Xext/Makefile.am
+++ b/Xext/Makefile.am
@@ -76,7 +76,7 @@ endif
 # requires X-ACE extension
 XSELINUX_SRCS = xselinux.c xselinux.h
 if XSELINUX
-BUILTIN_SRCS += $(XSELINUX_SRCS)
+MODULE_SRCS += $(XSELINUX_SRCS)
 endif
 
 # Security extension: multi-level security to protect clients from each other
diff --git a/hw/xfree86/dixmods/extmod/modinit.c b/hw/xfree86/dixmods/extmod/modinit.c
index acd700694..d0d892aaf 100644
--- a/hw/xfree86/dixmods/extmod/modinit.c
+++ b/hw/xfree86/dixmods/extmod/modinit.c
@@ -38,6 +38,15 @@ static MODULESETUPPROTO(extmodSetup);
  * Array describing extensions to be initialized
  */
 static ExtensionModule extensionModules[] = {
+#ifdef XSELINUX
+    {
+	SELinuxExtensionInit,
+	SELINUX_EXTENSION_NAME,
+	NULL,
+	NULL,
+	NULL
+    },
+#endif
 #ifdef SHAPE
     {
 	ShapeExtensionInit,
diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h
index 116cb2ef7..3c2e2022a 100644
--- a/hw/xfree86/dixmods/extmod/modinit.h
+++ b/hw/xfree86/dixmods/extmod/modinit.h
@@ -127,6 +127,7 @@ extern void ShmRegisterFuncs(
 
 #ifdef XSELINUX
 extern void SELinuxExtensionInit(INITARGS);
+#include "xselinux.h"
 #endif
 
 #if 1
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 30cbc7a25..261fac9fc 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -690,9 +690,6 @@ static ExtensionModule staticExtensions[] = {
 #ifdef XCSECURITY
     { SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension, NULL, NULL },
 #endif
-#ifdef XSELINUX
-    { SELinuxExtensionInit, SELINUX_EXTENSION_NAME, NULL, NULL, NULL },
-#endif
 #ifdef XPRINT
     { XpExtensionInit, XP_PRINTNAME, NULL, NULL, NULL },
 #endif

From 4fc2d3cef8d7868b025aa14af7ed4b730e8f2c49 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@tifa.local>
Date: Mon, 28 Jan 2008 12:18:43 -0800
Subject: [PATCH 437/552] Rootless: RootlessEnsureFrame: Added check for
 !IsRoot This was causing an issue with Apple-DRI and was reported here:
 http://trac.macosforge.org/projects/xquartz/ticket/51 (cherry picked from
 commit 116800279d2ec783c63f43d3902627edde6a4cff)

---
 miext/rootless/rootlessWindow.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c
index b95339888..7285f959d 100644
--- a/miext/rootless/rootlessWindow.c
+++ b/miext/rootless/rootlessWindow.c
@@ -471,7 +471,7 @@ RootlessEnsureFrame(WindowPtr pWin)
     if (WINREC(pWin) != NULL)
         return WINREC(pWin);
 
-    if (!IsTopLevel(pWin))
+    if (!IsTopLevel(pWin) && !IsRoot(pWin))
         return NULL;
 
     if (pWin->drawable.class != InputOutput)

From 2cb0ebec2b85d96289c23c17cfdcdf97ef6877d2 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri, 25 Jan 2008 11:48:13 +1030
Subject: [PATCH 438/552] config: add a debug message, fix a whitespace error.

(cherry picked from commit 7732898aaa70e076000f6e6aa9420482896ed996)
---
 config/hal.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/config/hal.c b/config/hal.c
index 4ab296159..52a011333 100644
--- a/config/hal.c
+++ b/config/hal.c
@@ -105,7 +105,7 @@ get_prop_string(LibHalContext *hal_ctx, const char *udi, const char *name)
     char *prop, *ret;
 
     prop = libhal_device_get_property_string(hal_ctx, udi, name, NULL);
-    DebugF(" [config/hal] getting %s on %s returned %s\n", name, udi, prop);
+    DebugF("[config/hal] getting %s on %s returned %s\n", name, udi, prop);
     if (prop) {
         ret = xstrdup(prop);
         libhal_free_string(prop);
@@ -234,8 +234,9 @@ device_added(LibHalContext *hal_ctx, const char *udi)
     if (xkb_options)
         add_option(&options, "xkb_options", xkb_options);
 
+    DebugF("[config/hal] Adding device %s\n", name);
     if (NewInputDeviceRequest(options, &dev) != Success) {
-        DebugF("[config/hal] NewInputDeviceRequest failed\n");
+        ErrorF("[config/hal] NewInputDeviceRequest failed\n");
         dev = NULL;
         goto unwind;
     }

From f0ba7707161b8866e6fde32d6f25be6afcdecb48 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri, 25 Jan 2008 13:45:22 +1030
Subject: [PATCH 439/552] config: only shutdown libhal if the connection is
 valid.

Thanks to libdbus' extensive use of assert we won't just get an error, it'll
bring the whole server down for us.
(cherry picked from commit fb07fab2c07e7b0834724541dc47bfba02ba8574)
---
 config/hal.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/config/hal.c b/config/hal.c
index 52a011333..1575422c3 100644
--- a/config/hal.c
+++ b/config/hal.c
@@ -283,12 +283,14 @@ disconnect_hook(void *data)
     struct config_hal_info *info = data;
 
     if (info->hal_ctx) {
-        dbus_error_init(&error);
-        if (!libhal_ctx_shutdown(info->hal_ctx, &error))
-            DebugF("[config/hal] couldn't shut down context: %s (%s)\n",
-                   error.name, error.message);
+        if (dbus_connection_get_is_connected(info->system_bus)) {
+            dbus_error_init(&error);
+            if (!libhal_ctx_shutdown(info->hal_ctx, &error))
+                DebugF("[config/hal] couldn't shut down context: %s (%s)\n",
+                        error.name, error.message);
+            dbus_error_free(&error);
+        }
         libhal_ctx_free(info->hal_ctx);
-        dbus_error_free(&error);
     }
 
     info->hal_ctx = NULL;

From 7dde5a694a06efed0a9186f05d33f5be6f5dba71 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri, 25 Jan 2008 13:54:47 +1030
Subject: [PATCH 440/552] config: check connection != NULL before getting dbus'
 dispatch status.

(cherry picked from commit d23266522390a4ef7203ae7c062b2b920e45f9d7)
---
 config/dbus-core.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/config/dbus-core.c b/config/dbus-core.c
index 9cf153076..b349c6e3c 100644
--- a/config/dbus-core.c
+++ b/config/dbus-core.c
@@ -56,8 +56,9 @@ wakeup_handler(pointer data, int err, pointer read_mask)
     if (info->connection && FD_ISSET(info->fd, (fd_set *) read_mask)) {
         do {
             dbus_connection_read_write_dispatch(info->connection, 0);
-        } while (dbus_connection_get_dispatch_status(info->connection) ==
-                  DBUS_DISPATCH_DATA_REMAINS);
+        } while (info->connection &&
+                 dbus_connection_get_is_connected(info->connection) &&
+                 dbus_connection_get_dispatch_status(info->connection) == DBUS_DISPATCH_DATA_REMAINS);
     }
 }
 

From 975ab11799c819a81da1dfe83505194410dbcb95 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat, 26 Jan 2008 09:39:54 +1030
Subject: [PATCH 441/552] config: don't reset connection info on disconnect.

If dbus is restarted, we try to connect again and this is difficult if the
busname and/or busobject is not set.
(cherry picked from commit 210eeef495770c1883c842ff003c28ce25f279d4)
---
 config/dbus.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/config/dbus.c b/config/dbus.c
index f6ac4c11c..0be42afb6 100644
--- a/config/dbus.c
+++ b/config/dbus.c
@@ -396,9 +396,6 @@ err_start:
 static void
 disconnect_hook(void *data)
 {
-    struct connection_info *info = data;
-
-    reset_info(info);
 }
 
 #if 0
@@ -440,4 +437,6 @@ void
 config_dbus_fini(void)
 {
     config_dbus_core_remove_hook(&core_hook);
+    connection_data.busname[0] = '\0';
+    connection_data.busobject[0] = '\0';
 }

From 5b8641a5fdc112c19e78ca2954878712e328d403 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue, 29 Jan 2008 10:01:37 +1030
Subject: [PATCH 442/552] xfree86: fix AlwaysCore handling. (Bug #14256)

Assume AlwaysCore being set by default, just like the other options.

X.Org Bug 14256 <http://bugs.freedesktop.org/show_bug.cgi?id=14256>
---
 hw/xfree86/common/xf86Xinput.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index cd0c30ac1..9a94c0487 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -115,7 +115,7 @@ _X_EXPORT void
 xf86ProcessCommonOptions(LocalDevicePtr local,
                          pointer	list)
 {
-    if (xf86SetBoolOption(list, "AlwaysCore", 0) ||
+    if (!xf86SetBoolOption(list, "AlwaysCore", 1) ||
         !xf86SetBoolOption(list, "SendCoreEvents", 1) ||
         !xf86SetBoolOption(list, "CorePointer", 1) ||
         !xf86SetBoolOption(list, "CoreKeyboard", 1)) {

From 442838fcb3bf07ac57553ae5600d9e6c59a559bb Mon Sep 17 00:00:00 2001
From: Julien Goodwin <julien@studio442.com.au>
Date: Sun, 27 Jan 2008 12:27:26 +1100
Subject: [PATCH 443/552] xorg.conf.man: Fix monitor/output confusion in
 monitor positioning

On the Intel driver at least, LeftOf/RightOf/Above/Below in xorg.conf refers
to output names, not monitor names.  Fix nomenclature in xorg.conf.man.
---
 hw/xfree86/doc/man/xorg.conf.man.pre | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
index 1369a16c9..608ba37ed 100644
--- a/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -1432,24 +1432,24 @@ This optional entry specifies the position of the monitor within the X
 screen.
 (RandR 1.2-supporting drivers only)
 .TP 7
-.BI "Option " "\*qLeftOf\*q  " \*qmonitor\*q
+.BI "Option " "\*qLeftOf\*q  " \*qoutput\*q
 This optional entry specifies that the monitor should be positioned to the
-left of the monitor of the given name.
+left of the output (not monitor) of the given name.
 (RandR 1.2-supporting drivers only)
 .TP 7
-.BI "Option " "\*qRightOf\*q  " \*qmonitor\*q
+.BI "Option " "\*qRightOf\*q  " \*qoutput\*q
 This optional entry specifies that the monitor should be positioned to the
-right of the monitor of the given name.
+right of the output (not monitor) of the given name.
 (RandR 1.2-supporting drivers only)
 .TP 7
-.BI "Option " "\*qAbove\*q  " \*qmonitor\*q
+.BI "Option " "\*qAbove\*q  " \*qoutput\*q
 This optional entry specifies that the monitor should be positioned above the
-monitor of the given name.
+output (not monitor) of the given name.
 (RandR 1.2-supporting drivers only)
 .TP 7
-.BI "Option " "\*qBelow\*q  " \*qmonitor\*q
+.BI "Option " "\*qBelow\*q  " \*qoutput\*q
 This optional entry specifies that the monitor should be positioned below the
-monitor of the given name.
+output (not monitor) of the given name.
 (RandR 1.2-supporting drivers only)
 .TP 7
 .BI "Option " "\*qEnable\*q  " \*qbool\*q

From 94f412cb7e954fe872fed979057cbdfbef953c6f Mon Sep 17 00:00:00 2001
From: Julien Goodwin <julien@studio442.com.au>
Date: Sun, 27 Jan 2008 12:30:16 +1100
Subject: [PATCH 444/552] Loader: Fix verbosity confusion

'Loading foo' is verbosity 3, whereas 'already built-in' is verbosity 0.
This means that gdm's log would just be full of bare 'module already
built-in' messages.
---
 hw/xfree86/loader/loadmod.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c
index 584cabfd1..45e9cb374 100644
--- a/hw/xfree86/loader/loadmod.c
+++ b/hw/xfree86/loader/loadmod.c
@@ -864,7 +864,7 @@ doLoadModule(const char *module, const char *path, const char **subdirlist,
     for (cim = compiled_in_modules; *cim; cim++)
 	if (!strcmp (module, *cim))
 	{
-	    xf86MsgVerb(X_INFO, 0, "Module \"%s\" already built-in\n", module);
+	    xf86MsgVerb(X_INFO, 3, "Module \"%s\" already built-in\n", module);
 	    return (ModuleDescPtr) 1;
 	}
 

From df325be394e1f75c396b2768f81373f2989aef7c Mon Sep 17 00:00:00 2001
From: Coleman Kane <cokane@cokane.org>
Date: Tue, 29 Jan 2008 09:47:00 -0800
Subject: [PATCH 445/552] Bug 13101: xorg-server has a typo in
 hw/xfree86/os-support/bsd/i386_video.c

X.Org Bug #13101 <https://bugs.freedesktop.org/show_bug.cgi?id=13101>
Patch #12360 <https://bugs.freedesktop.org/attachment.cgi?id=12360>
---
 hw/xfree86/os-support/bsd/i386_video.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/xfree86/os-support/bsd/i386_video.c b/hw/xfree86/os-support/bsd/i386_video.c
index 42b905483..0dcff6631 100644
--- a/hw/xfree86/os-support/bsd/i386_video.c
+++ b/hw/xfree86/os-support/bsd/i386_video.c
@@ -602,7 +602,7 @@ cleanMTRR()
 #ifdef DEBUG
 			ErrorF("Clean for (0x%lx,0x%lx)\n",
 				(unsigned long)mrd[i].mr_base,
-				(unsigned long)rd[i].mr_len);
+				(unsigned long)mrd[i].mr_len);
 #endif
 			if (mrd[i].mr_flags & MDF_FIXACTIVE) {
 				mro.mo_arg[0] = MEMRANGE_SET_UPDATE;

From d954f9c80348de294602d931d387e5cd1ef4b9a5 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed, 30 Jan 2008 10:39:54 +1030
Subject: [PATCH 446/552] xkb: don't update LEDs if they don't exist. (Bug
 #13961)

In some weird cases we call this function when there is no SrvLedInfo on the
device. And it turns out null-pointer dereferences are bad.

X.Org Bug 13961 <http://bugs.freedesktop.org/show_bug.cgi?id=13961>
---
 xkb/xkbLEDs.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/xkb/xkbLEDs.c b/xkb/xkbLEDs.c
index 2877af0c4..55ce12aad 100644
--- a/xkb/xkbLEDs.c
+++ b/xkb/xkbLEDs.c
@@ -63,6 +63,9 @@ XkbSrvLedInfoPtr	sli;
 
     sli= XkbFindSrvLedInfo(dev,XkbDfltXIClass,XkbDfltXIId,0);
 
+    if (!sli)
+        return update;
+
     if (state_changes&(XkbModifierStateMask|XkbGroupStateMask))
 	update|= sli->usesEffective;
     if (state_changes&(XkbModifierBaseMask|XkbGroupBaseMask))

From 1692dcf197470d074f69d5af1608cb2ff1d08872 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed, 30 Jan 2008 13:04:58 +1030
Subject: [PATCH 447/552] dix: print out event type if a bogus pointer event
 occurs.

---
 dix/events.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dix/events.c b/dix/events.c
index 15aa16ed6..4a8e480c8 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -3312,7 +3312,7 @@ ProcessPointerEvent (xEvent *xE, DeviceIntPtr mouse, int count)
 		deactivateGrab = TRUE;
 	    break;
 	default: 
-	    FatalError("bogus pointer event from ddx");
+	    FatalError("bogus pointer event from ddx: %d", xE->u.u.type);
 	}
     }
     else if (!CheckMotion(xE))

From c68f063be639f39c2facbb496e8455e8e3771b41 Mon Sep 17 00:00:00 2001
From: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Fri, 1 Feb 2008 14:13:29 +1030
Subject: [PATCH 448/552] xfree86: don't call xalloc from signal handlers when
 posting events.

Reviewed-by: Peter Hutterer <peter@cs.unisa.edu.au>
---
 hw/xfree86/common/xf86Xinput.c | 69 ++++++++++++++++------------------
 1 file changed, 33 insertions(+), 36 deletions(-)

diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index 9a94c0487..3e9a4796e 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -133,6 +133,11 @@ xf86ProcessCommonOptions(LocalDevicePtr local,
 
     /* Backwards compatibility. */
     local->history_size = GetMotionHistorySize();
+    /* Preallocate xEvent store */
+    if (!xf86Events)
+        xf86Events = (xEvent *)xcalloc(sizeof(xEvent), GetMaximumEventsNum());
+    if (!xf86Events)
+        FatalError("Couldn't allocate event store\n");
 }
 
 /***********************************************************************
@@ -461,6 +466,8 @@ DeleteInputDeviceRequest(DeviceIntPtr pDev)
  * convenient functions to post events
  */
 
+#define MAX_VALUATORS 36 /* XXX from comment in dix/getevents.c */
+
 _X_EXPORT void
 xf86PostMotionEvent(DeviceIntPtr	device,
                     int			is_absolute,
@@ -470,17 +477,12 @@ xf86PostMotionEvent(DeviceIntPtr	device,
 {
     va_list var;
     int i = 0;
-    static int *valuators = NULL;
-    static int n_valuators = 0;
+    static int valuators[MAX_VALUATORS];
 
-    if (num_valuators > n_valuators) {
-	xfree (valuators);
-	valuators = NULL;
-    }
-
-    if (!valuators) {
-	valuators = xcalloc(sizeof(int), num_valuators);
-	n_valuators = num_valuators;
+    if (num_valuators > MAX_VALUATORS) {
+	xf86Msg(X_ERROR, "xf86PostMotionEvent: num_valuator %d"
+	    " is greater than MAX_VALUATORS\n", num_valuators);
+	return;
     }
 
     va_start(var, num_valuators);
@@ -529,9 +531,7 @@ xf86PostMotionEventP(DeviceIntPtr	device,
 #endif
 
     if (!xf86Events)
-        xf86Events = (xEvent *)xcalloc(sizeof(xEvent), GetMaximumEventsNum());
-    if (!xf86Events)
-        FatalError("Couldn't allocate event store\n");
+        FatalError("Didn't allocate event store\n");
 
     nevents = GetPointerEvents(xf86Events, device, MotionNotify, 0,
                                flags, first_valuator, num_valuators,
@@ -555,9 +555,15 @@ xf86PostProximityEvent(DeviceIntPtr	device,
                        ...)
 {
     va_list var;
-    int i, nevents, *valuators = NULL;
+    int i, nevents;
+    int valuators[MAX_VALUATORS];
 
-    valuators = xcalloc(sizeof(int), num_valuators);
+
+    if (num_valuators > MAX_VALUATORS) {
+	xf86Msg(X_ERROR, "xf86PostMotionEvent: num_valuator %d"
+	    " is greater than MAX_VALUATORS\n", num_valuators);
+	return;
+    }
 
     va_start(var, num_valuators);
     for (i = 0; i < num_valuators; i++)
@@ -565,9 +571,7 @@ xf86PostProximityEvent(DeviceIntPtr	device,
     va_end(var);
 
     if (!xf86Events)
-        xf86Events = (xEvent *)xcalloc(sizeof(xEvent), GetMaximumEventsNum());
-    if (!xf86Events)
-        FatalError("Couldn't allocate event store\n");
+        FatalError("Didn't allocate event store\n");
 
     nevents = GetProximityEvents(xf86Events, device,
                                  is_in ? ProximityIn : ProximityOut, 
@@ -575,7 +579,6 @@ xf86PostProximityEvent(DeviceIntPtr	device,
     for (i = 0; i < nevents; i++)
         mieqEnqueue(device, xf86Events + i);
 
-    xfree(valuators);
 }
 
 _X_EXPORT void
@@ -588,7 +591,7 @@ xf86PostButtonEvent(DeviceIntPtr	device,
                     ...)
 {
     va_list var;
-    int *valuators = NULL;
+    int valuators[MAX_VALUATORS];
     int i = 0, nevents = 0;
     int index;
 
@@ -599,18 +602,19 @@ xf86PostButtonEvent(DeviceIntPtr	device,
             return;
     }
 #endif
+    if (num_valuators > MAX_VALUATORS) {
+	xf86Msg(X_ERROR, "xf86PostMotionEvent: num_valuator %d"
+	    " is greater than MAX_VALUATORS\n", num_valuators);
+	return;
+    }
     
-    valuators = xcalloc(sizeof(int), num_valuators);
-
     va_start(var, num_valuators);
     for (i = 0; i < num_valuators; i++)
         valuators[i] = va_arg(var, int);
     va_end(var);
 
     if (!xf86Events)
-        xf86Events = (xEvent *)xcalloc(sizeof(xEvent), GetMaximumEventsNum());
-    if (!xf86Events)
-        FatalError("Couldn't allocate event store\n");
+        FatalError("Didn't allocate event store\n");
 
     nevents = GetPointerEvents(xf86Events, device,
                                is_down ? ButtonPress : ButtonRelease, button,
@@ -620,8 +624,6 @@ xf86PostButtonEvent(DeviceIntPtr	device,
 
     for (i = 0; i < nevents; i++)
         mieqEnqueue(device, xf86Events + i);
-
-    xfree(valuators);
 }
 
 _X_EXPORT void
@@ -634,7 +636,8 @@ xf86PostKeyEvent(DeviceIntPtr	device,
                  ...)
 {
     va_list var;
-    int i = 0, nevents = 0, *valuators = NULL;
+    int i = 0, nevents = 0;
+    static int valuators[MAX_VALUATORS];
 
     /* instil confidence in the user */
     DebugF("this function has never been tested properly.  if things go quite "
@@ -642,12 +645,9 @@ xf86PostKeyEvent(DeviceIntPtr	device,
            "broken.\n");
 
     if (!xf86Events)
-        xf86Events = (xEvent *)xcalloc(sizeof(xEvent), GetMaximumEventsNum());
-    if (!xf86Events)
-        FatalError("Couldn't allocate event store\n");
+        FatalError("Didn't allocate event store\n");
 
     if (is_absolute) {
-        valuators = xcalloc(sizeof(int), num_valuators);
         va_start(var, num_valuators);
         for (i = 0; i < num_valuators; i++)
             valuators[i] = va_arg(var, int);
@@ -657,7 +657,6 @@ xf86PostKeyEvent(DeviceIntPtr	device,
                                             is_down ? KeyPress : KeyRelease,
                                             key_code, first_valuator,
                                             num_valuators, valuators);
-        xfree(valuators);
     }
     else {
         nevents = GetKeyboardEvents(xf86Events, device,
@@ -686,9 +685,7 @@ xf86PostKeyboardEvent(DeviceIntPtr      device,
 #endif
 
     if (!xf86Events)
-        xf86Events = (xEvent *)xcalloc(sizeof(xEvent), GetMaximumEventsNum());
-    if (!xf86Events)
-        FatalError("Couldn't allocate event store\n");
+        FatalError("Didn't allocate event store\n");
 
     nevents = GetKeyboardEvents(xf86Events, device,
                                 is_down ? KeyPress : KeyRelease, key_code);

From 10617dc0fb7166ccd5b2e92fa708390c2d7d0d27 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Fri, 1 Feb 2008 14:24:04 +1030
Subject: [PATCH 449/552] xfree86: stick two more checks in for num_valuators <
 MAX_VALUATORS

---
 hw/xfree86/common/xf86Xinput.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index 3e9a4796e..eafc0e9a0 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -507,6 +507,12 @@ xf86PostMotionEventP(DeviceIntPtr	device,
     int index;
     int flags = 0;
 
+    if (num_valuators > MAX_VALUATORS) {
+	xf86Msg(X_ERROR, "xf86PostMotionEvent: num_valuator %d"
+	    " is greater than MAX_VALUATORS\n", num_valuators);
+	return;
+    }
+
     if (is_absolute)
         flags = POINTER_ABSOLUTE;
     else
@@ -644,6 +650,12 @@ xf86PostKeyEvent(DeviceIntPtr	device,
            "badly south after this message, then xf86PostKeyEvent is "
            "broken.\n");
 
+    if (num_valuators > MAX_VALUATORS) {
+	xf86Msg(X_ERROR, "xf86PostMotionEvent: num_valuator %d"
+	    " is greater than MAX_VALUATORS\n", num_valuators);
+	return;
+    }
+
     if (!xf86Events)
         FatalError("Didn't allocate event store\n");
 

From 521a7f26e088029707fb9a2bb80c9ddc734a3f8b Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue, 5 Feb 2008 18:34:31 +1030
Subject: [PATCH 450/552] mi: Only UpdateSpriteForScreen if we actually changed
 the screen. (Bug #12650)

X.Org Bug 12650 <http://bugs.freedesktop.org/show_bug.cgi?id=12650>
---
 mi/mipointer.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/mi/mipointer.c b/mi/mipointer.c
index 2c3c68913..b55e68bf0 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@@ -231,10 +231,14 @@ miPointerWarpCursor (pScreen, x, y)
     ScreenPtr	pScreen;
     int		x, y;
 {
+    BOOL changedScreen = FALSE;
     SetupScreen (pScreen);
 
     if (miPointer.pScreen != pScreen)
+    {
 	(*pScreenPriv->screenFuncs->NewEventScreen) (pScreen, TRUE);
+        changedScreen = TRUE;
+    }
 
     if (GenerateEvent)
     {
@@ -255,7 +259,9 @@ miPointerWarpCursor (pScreen, x, y)
 	miPointer.y = y;
 	miPointer.pScreen = pScreen;
     }
-    UpdateSpriteForScreen (pScreen) ;
+
+    if (changedScreen)
+        UpdateSpriteForScreen (pScreen) ;
 }
 
 /*

From 41991fb991313202e8e6b513fe928ba14f8fcb87 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue, 5 Feb 2008 16:01:56 +1030
Subject: [PATCH 451/552] xkb: when copying sections, make sure num_rows is set
 too.

---
 xkb/xkbUtils.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
index 1fb47ed56..9f813e5e3 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -1806,6 +1806,7 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
                         return FALSE;
                     dsection->rows = tmp;
                 }
+                dsection->num_rows = ssection->num_rows;
                 for (j = 0, srow = ssection->rows, drow = dsection->rows;
                      j < ssection->num_rows;
                      j++, srow++, drow++) {

From 12e532403210c15a25200ef448bfe9701735ab20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Magnus=20Vigerl=C3=B6f?= <Magnus.Vigerlof@ipbo.se>
Date: Sat, 2 Feb 2008 22:44:31 +0100
Subject: [PATCH 452/552] dix: Always add valuator information if present

Send valuator information for all event types, not only for
MotionEvents and absolute button events.
---
 dix/getevents.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/dix/getevents.c b/dix/getevents.c
index 12cb950b2..94cbd1553 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -525,9 +525,6 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons,
     int num_events = 0, final_valuator = 0;
     CARD32 ms = 0;
     deviceKeyButtonPointer *kbp = NULL;
-    /* Thanks to a broken lib, we _always_ have to chase DeviceMotionNotifies
-     * with DeviceValuators. */
-    Bool sendValuators = (type == MotionNotify || flags & POINTER_ABSOLUTE);
     DeviceIntPtr cp = inputInfo.pointer;
     int x = 0, y = 0;
     Bool coreOnly = (pDev == inputInfo.pointer);
@@ -553,7 +550,7 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons,
         return 0;
 
     /* Do we need to send a DeviceValuator event? */
-    if (!coreOnly && sendValuators) {
+    if (!coreOnly && num_valuators) {
         if ((((num_valuators - 1) / 6) + 1) > MAX_VALUATOR_EVENTS)
             num_valuators = MAX_VALUATOR_EVENTS * 6;
         num_events += ((num_valuators - 1) / 6) + 1;
@@ -684,7 +681,7 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons,
         kbp->root_y = y;
 
         events++;
-        if (sendValuators) {
+        if (num_valuators) {
             kbp->deviceid |= MORE_EVENTS;
             clipValuators(pDev, first_valuator, num_valuators, valuators);
             events = getValuatorEvents(events, pDev, first_valuator,

From f04c0838699f1a733735838e74cfbb1677b15dc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Magnus=20Vigerl=C3=B6f?= <Magnus.Vigerlof@ipbo.se>
Date: Sat, 2 Feb 2008 22:45:31 +0100
Subject: [PATCH 453/552] Bug # 10324: dix: Allow arbitrary value ranges in
 GetPointerEvents

Don't use a possitive value as a marker for if a max-value
is defined on the valuators. Use the existence of a valid
value range instead. This will also make it possible to
define arbitrary start and end-values for min and max as
long as min < max.
---
 dix/getevents.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/dix/getevents.c b/dix/getevents.c
index 94cbd1553..ea1c764f2 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -308,10 +308,13 @@ clipAxis(DeviceIntPtr pDev, int axisNum, int *val)
 {
     AxisInfoPtr axes = pDev->valuator->axes + axisNum;
 
-    if (*val < axes->min_value)
-        *val = axes->min_value;
-    if (axes->max_value >= 0 && *val > axes->max_value)
-        *val = axes->max_value;
+    /* No clipping if the value-range <= 0 */
+    if(axes->min_value < axes->min_value) {
+        if (*val < axes->min_value)
+            *val = axes->min_value;
+        if (*val > axes->max_value)
+            *val = axes->max_value;
+    }
 }
 
 /**

From d9e23c4ff1607a62164b34717ef9afd352ce2b94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Magnus=20Vigerl=C3=B6f?= <Magnus.Vigerlof@ipbo.se>
Date: Sat, 2 Feb 2008 22:57:32 +0100
Subject: [PATCH 454/552] Bug # 10324: dix: Add scaling of X and Y on the
 reported pointer-events

Restore the rescaling code for x and y axis when generating
motion events.
---
 dix/getevents.c | 97 ++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 76 insertions(+), 21 deletions(-)

diff --git a/dix/getevents.c b/dix/getevents.c
index ea1c764f2..c2736e4a3 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -531,6 +531,7 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons,
     DeviceIntPtr cp = inputInfo.pointer;
     int x = 0, y = 0;
     Bool coreOnly = (pDev == inputInfo.pointer);
+    ScreenPtr scr = miPointerGetScreen(pDev);
 
     /* Sanity checks. */
     if (type != MotionNotify && type != ButtonPress && type != ButtonRelease)
@@ -574,20 +575,39 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons,
             x = valuators[0];
         }
         else {
-            if (pDev->coreEvents)
-                x = cp->valuator->lastx;
-            else
-                x = pDev->valuator->lastx;
+            /* If we're sending core events but didn't provide a value,
+             * translate the core value (but use the device coord if
+             * it translates to the same coord to preserve sub-pixel
+             * coord information). If we're not sending core events use
+             * whatever value we have */
+            x = pDev->valuator->lastx;
+            if(pDev->coreEvents) {
+                int min = pDev->valuator->axes[0].min_value;
+                int max = pDev->valuator->axes[0].max_value;
+                if(min < max) {
+                    if((int)((float)(x-min)*scr->width/(max-min+1)) != cp->valuator->lastx)
+                        x = (int)((float)(cp->valuator->lastx)*(max-min+1)/scr->width)+min;
+                }
+                else
+                    x = cp->valuator->lastx;
+            }
         }
 
         if (first_valuator <= 1 && num_valuators >= (2 - first_valuator)) {
             y = valuators[1 - first_valuator];
         }
         else {
-            if (pDev->coreEvents)
-                y = cp->valuator->lasty;
-            else
-                y = pDev->valuator->lasty;
+            y = pDev->valuator->lasty;
+            if(pDev->coreEvents) {
+                int min = pDev->valuator->axes[1].min_value;
+                int max = pDev->valuator->axes[1].max_value;
+                if(min < max) {
+                    if((int)((float)(y-min)*scr->height/(max-min+1)) != cp->valuator->lasty)
+                        y = (int)((float)(cp->valuator->lasty)*(max-min+1)/scr->height)+min;
+                }
+                else
+                    y = cp->valuator->lasty;
+            }
         }
     }
     else {
@@ -596,15 +616,35 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons,
                               valuators);
 
         if (pDev->coreEvents) {
-            if (first_valuator == 0 && num_valuators >= 1)
-                x = cp->valuator->lastx + valuators[0];
+            /* Get and convert the core pointer coordinate space into
+             * device coordinates. Use the device coords if it translates
+             * into the same position as the core to preserve relative sub-
+             * pixel movements from the device. */
+            int min = pDev->valuator->axes[0].min_value;
+            int max = pDev->valuator->axes[0].max_value;
+            if(min < max) {
+                x = pDev->valuator->lastx;
+                if((int)((float)(x-min)*scr->width/(max-min+1)) != cp->valuator->lastx)
+                    x = (int)((float)(cp->valuator->lastx)*(max-min+1)/scr->width)+min;
+            }
             else
                 x = cp->valuator->lastx;
 
-            if (first_valuator <= 1 && num_valuators >= (2 - first_valuator))
-                y = cp->valuator->lasty + valuators[1 - first_valuator];
+            min = pDev->valuator->axes[1].min_value;
+            max = pDev->valuator->axes[1].max_value;
+            if(min < max) {
+                y = pDev->valuator->lasty;
+                if((int)((float)(y-min)*scr->height/(max-min+1)) != cp->valuator->lasty)
+                    y = (int)((float)(cp->valuator->lasty)*(max-min+1)/scr->height)+min;
+            }
             else
                 y = cp->valuator->lasty;
+
+            /* Add relative movement */
+            if (first_valuator == 0 && num_valuators >= 1)
+                x += valuators[0];
+            if (first_valuator <= 1 && num_valuators >= (2 - first_valuator))
+                y += valuators[1 - first_valuator];
         }
         else {
             if (first_valuator == 0 && num_valuators >= 1)
@@ -623,11 +663,6 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons,
     clipAxis(pDev, 0, &x);
     clipAxis(pDev, 1, &y);
 
-    /* This takes care of crossing screens for us, as well as clipping
-     * to the current screen.  Right now, we only have one history buffer,
-     * so we don't set this for both the device and core.*/
-    miPointerSetPosition(pDev, &x, &y, ms);
-
     /* Drop x and y back into the valuators list, if they were originally
      * present. */
     if (first_valuator == 0 && num_valuators >= 1)
@@ -637,12 +672,32 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons,
 
     updateMotionHistory(pDev, ms, first_valuator, num_valuators, valuators);
 
+    pDev->valuator->lastx = x;
+    pDev->valuator->lasty = y;
+    /* Convert the dev coord back to screen coord if we're
+     * sending core events */
+    if (pDev->coreEvents) {
+        int min = pDev->valuator->axes[0].min_value;
+        int max = pDev->valuator->axes[0].max_value;
+        if(min < max)
+            x = (int)((float)(x-min)*scr->width/(max-min+1));
+        cp->valuator->lastx = x;
+        min = pDev->valuator->axes[1].min_value;
+        max = pDev->valuator->axes[1].max_value;
+        if(min < max)
+            y = (int)((float)(y-min)*scr->height/(max-min+1));
+        cp->valuator->lasty = y;
+    }
+
+    /* This takes care of crossing screens for us, as well as clipping
+     * to the current screen.  Right now, we only have one history buffer,
+     * so we don't set this for both the device and core.*/
+    miPointerSetPosition(pDev, &x, &y, ms);
+
     if (pDev->coreEvents) {
         cp->valuator->lastx = x;
         cp->valuator->lasty = y;
     }
-    pDev->valuator->lastx = x;
-    pDev->valuator->lasty = y;
 
     /* for some reason inputInfo.pointer does not have coreEvents set */
     if (coreOnly || pDev->coreEvents) {
@@ -680,8 +735,8 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons,
             kbp->detail = pDev->button->map[buttons];
         }
 
-        kbp->root_x = x;
-        kbp->root_y = y;
+        kbp->root_x = pDev->valuator->lastx;
+        kbp->root_y = pDev->valuator->lasty;
 
         events++;
         if (num_valuators) {

From a0284d577aabea8406b72dd63773e341430ebe56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Magnus=20Vigerl=C3=B6f?= <Magnus.Vigerlof@ipbo.se>
Date: Sat, 2 Feb 2008 23:03:51 +0100
Subject: [PATCH 455/552] dix: Skip call to clipAxis for relative core-events

Relative events that generates both core and extention
events will have its axis cliped and screen changed by
miPointerSetPosition when the events are processed. For
absolute and non core-generating relative events the
axis must be clipped if we shouldn't end up completely
outside the defined ranges (if any).
---
 dix/getevents.c | 44 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 11 deletions(-)

diff --git a/dix/getevents.c b/dix/getevents.c
index c2736e4a3..bc64d318c 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -609,6 +609,10 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons,
                     y = cp->valuator->lasty;
             }
         }
+
+        /* Clip both x and y to the defined limits (usually co-ord space limit). */
+        clipAxis(pDev, 0, &x);
+        clipAxis(pDev, 1, &y);
     }
     else {
         if (flags & POINTER_ACCELERATE)
@@ -647,22 +651,22 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons,
                 y += valuators[1 - first_valuator];
         }
         else {
+            x = pDev->valuator->lastx;
+            y = pDev->valuator->lasty;
             if (first_valuator == 0 && num_valuators >= 1)
-                x = pDev->valuator->lastx + valuators[0];
-            else
-                x = pDev->valuator->lastx;
-
+                x += valuators[0];
             if (first_valuator <= 1 && num_valuators >= (2 - first_valuator))
-                y = pDev->valuator->lasty + valuators[1 - first_valuator];
-            else
-                y = pDev->valuator->lasty;
+                y += valuators[1 - first_valuator];
+
+            if(!coreOnly) {
+                /* Since we're not sending core-events we must clip both x and y
+                 * to the defined limits so we don't run outside the box. */
+                clipAxis(pDev, 0, &x);
+                clipAxis(pDev, 1, &y);
+            }
         }
     }
 
-    /* Clip both x and y to the defined limits (usually co-ord space limit). */
-    clipAxis(pDev, 0, &x);
-    clipAxis(pDev, 1, &y);
-
     /* Drop x and y back into the valuators list, if they were originally
      * present. */
     if (first_valuator == 0 && num_valuators >= 1)
@@ -695,6 +699,24 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons,
     miPointerSetPosition(pDev, &x, &y, ms);
 
     if (pDev->coreEvents) {
+        /* miPointerSetPosition may have changed screen */
+        scr = miPointerGetScreen(pDev);
+        if(x != cp->valuator->lastx) {
+            int min = pDev->valuator->axes[0].min_value;
+            int max = pDev->valuator->axes[0].max_value;
+            cp->valuator->lastx = pDev->valuator->lastx = x;
+            if(min < max)
+                pDev->valuator->lastx = (int)((float)(x)*(max-min+1)/scr->width)+min;
+        }
+        if(y != cp->valuator->lasty) {
+            int min = pDev->valuator->axes[1].min_value;
+            int max = pDev->valuator->axes[1].max_value;
+            cp->valuator->lasty = pDev->valuator->lasty = y;
+            if(min < max)
+                pDev->valuator->lasty = (int)((float)(y)*(max-min+1)/scr->height)+min;
+        }
+    }
+    else if (coreOnly) {
         cp->valuator->lastx = x;
         cp->valuator->lasty = y;
     }

From a56ef7aaa4b6ac13c8181f68fc7dad3ca89e6973 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Magnus=20Vigerl=C3=B6f?= <Magnus.Vigerlof@ipbo.se>
Date: Sat, 2 Feb 2008 23:04:46 +0100
Subject: [PATCH 456/552] dix: Move motion history update until after screen
 crossing and clipping

Cross screen and clip the coordinates before updating the motion history
so that it will have the same contents as the events that are reported.
---
 dix/getevents.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/dix/getevents.c b/dix/getevents.c
index bc64d318c..3e6fe5ae0 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -667,15 +667,6 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons,
         }
     }
 
-    /* Drop x and y back into the valuators list, if they were originally
-     * present. */
-    if (first_valuator == 0 && num_valuators >= 1)
-        valuators[0] = x;
-    if (first_valuator <= 1 && num_valuators >= (2 - first_valuator))
-        valuators[1 - first_valuator] = y;
-
-    updateMotionHistory(pDev, ms, first_valuator, num_valuators, valuators);
-
     pDev->valuator->lastx = x;
     pDev->valuator->lasty = y;
     /* Convert the dev coord back to screen coord if we're
@@ -721,6 +712,15 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons,
         cp->valuator->lasty = y;
     }
 
+    /* Drop x and y back into the valuators list, if they were originally
+     * present. */
+    if (first_valuator == 0 && num_valuators >= 1)
+        valuators[0] = pDev->valuator->lastx;
+    if (first_valuator <= 1 && num_valuators >= (2 - first_valuator))
+        valuators[1 - first_valuator] = pDev->valuator->lasty;
+
+    updateMotionHistory(pDev, ms, first_valuator, num_valuators, valuators);
+
     /* for some reason inputInfo.pointer does not have coreEvents set */
     if (coreOnly || pDev->coreEvents) {
         events->u.u.type = type;

From 4b5b6e7baab58072a983d2ec136965f404c3a74a Mon Sep 17 00:00:00 2001
From: liuhong <liuhong@devlinux-hong.sh.intel.com>
Date: Tue, 5 Feb 2008 10:54:10 +0800
Subject: [PATCH 457/552] fix max clock unit

max clock from EDID data is in MHz, while we need KHz to validate modes.
---
 hw/xfree86/modes/xf86Crtc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 10db86267..da035f2b9 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -1362,8 +1362,8 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
 			if (sync_source == sync_default)
 			    sync_source = sync_edid;
 		    }
-		    if (ranges->max_clock > max_clock)
-			max_clock = ranges->max_clock;
+		    if (ranges->max_clock * 1000 > max_clock)
+			max_clock = ranges->max_clock * 1000;
 		}
 	    }
 	}

From d3c36fe721edc55636438bc3e0e7a6c03f62784e Mon Sep 17 00:00:00 2001
From: liuhong <liuhong@devlinux-hong.sh.intel.com>
Date: Tue, 5 Feb 2008 10:54:58 +0800
Subject: [PATCH 458/552] validate mode clock for probed modes

Some modes claimed in monitor EDID data may not be supported by
the monitor. So also validating the max clock for probed modes.
---
 hw/xfree86/modes/xf86Crtc.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index da035f2b9..4ecf4b3d7 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -1410,9 +1410,12 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
 	/*
 	 * Check default modes against monitor max clock
 	 */
-	if (max_clock)
+	if (max_clock) {
 	    xf86ValidateModesClocks(scrn, default_modes,
 				    &min_clock, &max_clock, 1);
+	    xf86ValidateModesClocks(scrn, output_modes,
+				    &min_clock, &max_clock, 1);
+	}
 	
 	output->probed_modes = NULL;
 	output->probed_modes = xf86ModesAdd (output->probed_modes, config_modes);

From 019ad5acd20e34dc2aa3b89cc426138db5164c48 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 5 Feb 2008 15:44:41 -0500
Subject: [PATCH 459/552] XFixes: squash a pointer/integer size mismatch
 warning.

---
 xfixes/cursor.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/xfixes/cursor.c b/xfixes/cursor.c
index 1d122faea..d51251f19 100755
--- a/xfixes/cursor.c
+++ b/xfixes/cursor.c
@@ -707,7 +707,8 @@ SProcXFixesChangeCursor (ClientPtr client)
 static Bool
 TestForCursorName (CursorPtr pCursor, pointer closure)
 {
-    return (pCursor->name == (Atom) closure);
+    Atom *pName = closure;
+    return (pCursor->name == *pName);
 }
 
 int
@@ -724,7 +725,7 @@ ProcXFixesChangeCursorByName (ClientPtr client)
     tchar = (char *) &stuff[1];
     name = MakeAtom (tchar, stuff->nbytes, FALSE);
     if (name)
-	ReplaceCursor (pSource, TestForCursorName, (pointer) name);
+	ReplaceCursor (pSource, TestForCursorName, &name);
     return (client->noClientException);
 }
 

From bb1a577a6822f781f1e38d2434a13914e74f89aa Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 5 Feb 2008 20:07:08 -0500
Subject: [PATCH 460/552] XACE: Move the property access hook to its own
 function.

---
 Xext/xace.c     | 20 ++++++++------------
 Xext/xace.h     |  6 ++++++
 Xext/xselinux.c |  2 +-
 dix/property.c  | 16 +++++++---------
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/Xext/xace.c b/Xext/xace.c
index 0470e44dd..9ffac450d 100644
--- a/Xext/xace.c
+++ b/Xext/xace.c
@@ -51,6 +51,14 @@ int XaceHookDispatch(ClientPtr client, int major)
     }
 }
 
+int XaceHookPropertyAccess(ClientPtr client, WindowPtr pWin,
+			   PropertyPtr pProp, Mask access_mode)
+{
+    XacePropertyAccessRec rec = { client, pWin, pProp, access_mode, Success };
+    CallCallbacks(&XaceHooks[XACE_PROPERTY_ACCESS], &rec);
+    return rec.status;
+}
+
 void XaceHookAuditEnd(ClientPtr ptr, int result)
 {
     XaceAuditRec rec = { ptr, result };
@@ -100,18 +108,6 @@ int XaceHook(int hook, ...)
 	    prv = &rec.status;
 	    break;
 	}
-	case XACE_PROPERTY_ACCESS: {
-	    XacePropertyAccessRec rec = {
-		va_arg(ap, ClientPtr),
-		va_arg(ap, WindowPtr),
-		va_arg(ap, PropertyPtr),
-		va_arg(ap, Mask),
-		Success /* default allow */
-	    };
-	    calldata = &rec;
-	    prv = &rec.status;
-	    break;
-	}
 	case XACE_SEND_ACCESS: {
 	    XaceSendAccessRec rec = {
 		va_arg(ap, ClientPtr),
diff --git a/Xext/xace.h b/Xext/xace.h
index 4100ba16e..24b9dce68 100644
--- a/Xext/xace.h
+++ b/Xext/xace.h
@@ -27,6 +27,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "pixmap.h"     /* for DrawablePtr */
 #include "regionstr.h"  /* for RegionPtr */
+#include "window.h"  /* for WindowPtr */
+#include "property.h" /* for PropertyPtr */
 
 /* Default window background */
 #define XaceBackgroundNoneState		None
@@ -65,6 +67,8 @@ extern int XaceHook(
 /* Special-cased hook functions
  */
 extern int XaceHookDispatch(ClientPtr ptr, int major);
+extern int XaceHookPropertyAccess(ClientPtr ptr, WindowPtr pWin,
+				  PropertyPtr pProp, Mask access_mode);
 extern void XaceHookAuditEnd(ClientPtr ptr, int result);
 
 /* Register a callback for a given hook.
@@ -101,11 +105,13 @@ extern void XaceCensorImage(
 #ifdef __GNUC__
 #define XaceHook(args...) Success
 #define XaceHookDispatch(args...) Success
+#define XaceHookPropertyAccess(args...) Success
 #define XaceHookAuditEnd(args...) { ; }
 #define XaceCensorImage(args...) { ; }
 #else
 #define XaceHook(...) Success
 #define XaceHookDispatch(...) Success
+#define XaceHookPropertyAccess(...) Success
 #define XaceHookAuditEnd(...) { ; }
 #define XaceCensorImage(...) { ; }
 #endif
diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index a6e27e695..47383a4a9 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -1166,7 +1166,7 @@ ProcSELinuxGetPropertyContext(ClientPtr client)
     if (!pProp)
 	return BadValue;
 
-    rc = XaceHook(XACE_PROPERTY_ACCESS, client, pWin, pProp, DixGetAttrAccess);
+    rc = XaceHookPropertyAccess(client, pWin, pProp, DixGetAttrAccess);
     if (rc != Success)
 	return rc;
 
diff --git a/dix/property.c b/dix/property.c
index 3c0eaf1c9..ce6116992 100644
--- a/dix/property.c
+++ b/dix/property.c
@@ -156,8 +156,8 @@ ProcRotateProperties(ClientPtr client)
 	    xfree(props);
 	    return BadMatch;
 	}
-	rc = XaceHook(XACE_PROPERTY_ACCESS, client, pWin, pProp,
-		      DixReadAccess|DixWriteAccess);
+	rc = XaceHookPropertyAccess(client, pWin, pProp,
+				    DixReadAccess|DixWriteAccess);
 	if (rc != Success) {
 	    xfree(props);
 	    client->errorValue = atoms[i];
@@ -276,8 +276,8 @@ dixChangeWindowProperty(ClientPtr pClient, WindowPtr pWin, Atom property,
 	    memmove((char *)data, (char *)value, totalSize);
 	pProp->size = len;
 	pProp->devPrivates = NULL;
-	rc = XaceHook(XACE_PROPERTY_ACCESS, pClient, pWin, pProp,
-		      DixCreateAccess|DixWriteAccess);
+	rc = XaceHookPropertyAccess(pClient, pWin, pProp,
+				    DixCreateAccess|DixWriteAccess);
 	if (rc != Success) {
 	    xfree(data);
 	    xfree(pProp);
@@ -289,8 +289,7 @@ dixChangeWindowProperty(ClientPtr pClient, WindowPtr pWin, Atom property,
     }
     else
     {
-	rc = XaceHook(XACE_PROPERTY_ACCESS, pClient, pWin, pProp,
-		      DixWriteAccess);
+	rc = XaceHookPropertyAccess(pClient, pWin, pProp, DixWriteAccess);
 	if (rc != Success) {
 	    pClient->errorValue = property;
 	    return rc;
@@ -382,8 +381,7 @@ DeleteProperty(ClientPtr client, WindowPtr pWin, Atom propName)
     }
     if (pProp) 
     {		    
-	rc = XaceHook(XACE_PROPERTY_ACCESS, client, pWin, pProp,
-		      DixDestroyAccess);
+	rc = XaceHookPropertyAccess(client, pWin, pProp, DixDestroyAccess);
 	if (rc != Success)
 	    return rc;
 
@@ -502,7 +500,7 @@ ProcGetProperty(ClientPtr client)
     if (stuff->delete)
 	access_mode |= DixDestroyAccess;
 
-    rc = XaceHook(XACE_PROPERTY_ACCESS, client, pWin, pProp, access_mode);
+    rc = XaceHookPropertyAccess(client, pWin, pProp, access_mode);
     if (rc != Success) {
 	client->errorValue = stuff->property;
 	return rc;

From 5c30327275509576b7848a5f842e7a1bffabe980 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 5 Feb 2008 21:06:05 -0500
Subject: [PATCH 461/552] XACE: Push the dix "structure" includes down to the
 security modules.

---
 Xext/security.c |  3 +++
 Xext/xace.c     |  4 ++++
 Xext/xace.h     |  8 ++++----
 Xext/xacestr.h  |  9 ++++-----
 Xext/xselinux.c | 17 +++++++++++------
 5 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/Xext/security.c b/Xext/security.c
index 6aab3a342..069655964 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -29,6 +29,9 @@ in this Software without prior written authorization from The Open Group.
 #endif
 
 #include "scrnintstr.h"
+#include "inputstr.h"
+#include "windowstr.h"
+#include "propertyst.h"
 #include "colormapst.h"
 #include "privates.h"
 #include "registry.h"
diff --git a/Xext/xace.c b/Xext/xace.c
index 9ffac450d..b2c7e4ab4 100644
--- a/Xext/xace.c
+++ b/Xext/xace.c
@@ -23,6 +23,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <stdarg.h>
 #include "scrnintstr.h"
+#include "extnsionst.h"
+#include "pixmapstr.h"
+#include "regionstr.h"
+#include "gcstruct.h"
 #include "xacestr.h"
 
 CallbackListPtr XaceHooks[XACE_NUM_HOOKS] = {0};
diff --git a/Xext/xace.h b/Xext/xace.h
index 24b9dce68..6f1f267ad 100644
--- a/Xext/xace.h
+++ b/Xext/xace.h
@@ -25,10 +25,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define XACE_MAJOR_VERSION		2
 #define XACE_MINOR_VERSION		0
 
-#include "pixmap.h"     /* for DrawablePtr */
-#include "regionstr.h"  /* for RegionPtr */
-#include "window.h"  /* for WindowPtr */
-#include "property.h" /* for PropertyPtr */
+#include "pixmap.h"
+#include "region.h"
+#include "window.h"
+#include "property.h"
 
 /* Default window background */
 #define XaceBackgroundNoneState		None
diff --git a/Xext/xacestr.h b/Xext/xacestr.h
index 045f8364f..e31d4246a 100644
--- a/Xext/xacestr.h
+++ b/Xext/xacestr.h
@@ -20,13 +20,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef _XACESTR_H
 #define _XACESTR_H
 
-#include "dixstruct.h"
+#include "dix.h"
 #include "resource.h"
 #include "extnsionst.h"
-#include "gcstruct.h"
-#include "windowstr.h"
-#include "inputstr.h"
-#include "propertyst.h"
+#include "window.h"
+#include "input.h"
+#include "property.h"
 #include "selection.h"
 #include "xace.h"
 
diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 47383a4a9..b3d938b0a 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -22,21 +22,28 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  * All rights reserved.
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <sys/socket.h>
+#include <stdio.h>
+#include <stdarg.h>
+
 #include <selinux/selinux.h>
 #include <selinux/label.h>
 #include <selinux/avc.h>
 
 #include <libaudit.h>
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #include <X11/Xatom.h>
 #include "resource.h"
 #include "privates.h"
 #include "registry.h"
 #include "dixstruct.h"
+#include "inputstr.h"
+#include "windowstr.h"
+#include "propertyst.h"
 #include "extnsionst.h"
 #include "scrnintstr.h"
 #include "selection.h"
@@ -46,8 +53,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define TRANS_SERVER
 #include <X11/Xtrans/Xtrans.h>
 #include "../os/osdep.h"
-#include <stdio.h>
-#include <stdarg.h>
 #include "modinit.h"
 
 

From 2259b144f0fd4855085a656111a0c64246733e78 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 7 Feb 2008 14:35:02 -0500
Subject: [PATCH 462/552] xselinux: Add getattr and setattr to the permission
 map for properties.

---
 Xext/xselinux.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index b3d938b0a..c7ab8d095 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -127,7 +127,7 @@ static struct security_class_mapping map[] = {
     { "x_gc", { "", "", "destroy", "create", "getattr", "setattr", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "use", NULL }},
     { "x_font", { "", "", "destroy", "create", "getattr", "", "", "", "", "", "", "", "add_glyph", "remove_glyph", "", "", "", "", "", "", "", "", "", "", "use", NULL }},
     { "x_colormap", { "read", "write", "destroy", "create", "getattr", "", "", "", "", "", "", "", "add_color", "remove_color", "", "", "", "", "", "", "install", "uninstall", "", "", "use", NULL }},
-    { "x_property", { "read", "write", "destroy", "create", NULL }},
+    { "x_property", { "read", "write", "destroy", "create", "getattr", "setattr", NULL }},
     { "x_selection", { "read", "", "", "", "getattr", "setattr", NULL }},
     { "x_cursor", { "read", "write", "destroy", "create", "getattr", "setattr", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "use", NULL }},
     { "x_client", { "", "", "destroy", "", "getattr", "setattr", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "manage", NULL }},

From 6dcb7d732bfeadc214228d68c5a13eef30248eb1 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 7 Feb 2008 16:00:52 -0500
Subject: [PATCH 463/552] xselinux: Split devPrivate state into subject and
 object records.

---
 Xext/xselinux.c | 236 ++++++++++++++++++++++++++++++------------------
 1 file changed, 149 insertions(+), 87 deletions(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index c7ab8d095..60f0cc88f 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -61,7 +61,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 /* private state record */
-static DevPrivateKey stateKey = &stateKey;
+static DevPrivateKey subjectKey = &subjectKey;
+static DevPrivateKey objectKey = &objectKey;
 
 /* This is what we store for security state */
 typedef struct {
@@ -69,7 +70,12 @@ typedef struct {
     struct avc_entry_ref aeref;
     char *command;
     int privileged;
-} SELinuxStateRec;
+} SELinuxSubjectRec;
+
+typedef struct {
+    security_id_t sid;
+    int poly;
+} SELinuxObjectRec;
 
 /* selection manager */
 typedef struct {
@@ -155,7 +161,7 @@ static pointer truep = (pointer)1;
  * Looks up the SID corresponding to the given selection atom
  */
 static int
-SELinuxSelectionToSID(Atom selection, SELinuxStateRec *sid_return)
+SELinuxSelectionToSID(Atom selection, SELinuxObjectRec *sid_return)
 {
     const char *name;
     unsigned i, size;
@@ -202,7 +208,7 @@ SELinuxSelectionToSID(Atom selection, SELinuxStateRec *sid_return)
  */
 static int
 SELinuxEventToSID(unsigned type, security_id_t sid_of_window,
-		  SELinuxStateRec *sid_return)
+		  SELinuxObjectRec *sid_return)
 {
     const char *name = LookupEventName(type);
     security_context_t con;
@@ -293,7 +299,7 @@ SELinuxTypeToClass(RESTYPE type)
  * Performs an SELinux permission check.
  */
 static int
-SELinuxDoCheck(SELinuxStateRec *subj, SELinuxStateRec *obj,
+SELinuxDoCheck(SELinuxSubjectRec *subj, SELinuxObjectRec *obj,
 	       security_class_t class, Mask mode, SELinuxAuditRec *auditdata)
 {
     /* serverClient requests OK */
@@ -321,11 +327,14 @@ static void
 SELinuxLabelClient(ClientPtr client)
 {
     XtransConnInfo ci = ((OsCommPtr)client->osPrivate)->trans_conn;
-    SELinuxStateRec *state;
+    SELinuxSubjectRec *subj;
+    SELinuxObjectRec *obj;
     security_context_t ctx;
 
-    state = dixLookupPrivate(&client->devPrivates, stateKey);
-    sidput(state->sid);
+    subj = dixLookupPrivate(&client->devPrivates, subjectKey);
+    sidput(subj->sid);
+    obj = dixLookupPrivate(&client->devPrivates, objectKey);
+    sidput(obj->sid);
 
     if (_XSERVTransIsLocal(ci)) {
 	int fd = _XSERVTransGetConnectionNumber(ci);
@@ -354,12 +363,12 @@ SELinuxLabelClient(ClientPtr client)
 	if (bytes <= 0)
 	    goto finish;
 
-	state->command = xalloc(bytes);
-	if (!state->command)
+	subj->command = xalloc(bytes);
+	if (!subj->command)
 	    goto finish;
 
-	memcpy(state->command, path, bytes);
-	state->command[bytes - 1] = 0;
+	memcpy(subj->command, path, bytes);
+	subj->command[bytes - 1] = 0;
     } else
 	/* For remote clients, need to use a default context */
 	if (selabel_lookup(label_hnd, &ctx, NULL, SELABEL_X_CLIENT) < 0)
@@ -368,10 +377,12 @@ SELinuxLabelClient(ClientPtr client)
 
 finish:
     /* Get a SID from the context */
-    if (avc_context_to_sid(ctx, &state->sid) < 0)
+    if (avc_context_to_sid(ctx, &subj->sid) < 0)
 	FatalError("Client %d: context_to_sid(%s) failed\n",
 		   client->index, ctx);
 
+    sidget(subj->sid);
+    obj->sid = subj->sid;
     freecon(ctx);
 }
 
@@ -383,23 +394,27 @@ SELinuxLabelInitial(void)
 {
     int i;
     XaceScreenAccessRec srec;
-    SELinuxStateRec *state;
+    SELinuxSubjectRec *subj;
+    SELinuxObjectRec *obj;
     security_context_t ctx;
     pointer unused;
 
     /* Do the serverClient */
-    state = dixLookupPrivate(&serverClient->devPrivates, stateKey);
-    state->privileged = 1;
-    sidput(state->sid);
+    subj = dixLookupPrivate(&serverClient->devPrivates, subjectKey);
+    obj = dixLookupPrivate(&serverClient->devPrivates, objectKey);
+    subj->privileged = 1;
+    sidput(subj->sid);
 
     /* Use the context of the X server process for the serverClient */
     if (getcon(&ctx) < 0)
 	FatalError("Couldn't get context of X server process\n");
 
     /* Get a SID from the context */
-    if (avc_context_to_sid(ctx, &state->sid) < 0)
+    if (avc_context_to_sid(ctx, &subj->sid) < 0)
 	FatalError("serverClient: context_to_sid(%s) failed\n", ctx);
 
+    sidget(subj->sid);
+    obj->sid = subj->sid;
     freecon(ctx);
 
     srec.client = serverClient;
@@ -487,20 +502,27 @@ static void
 SELinuxDevice(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     XaceDeviceAccessRec *rec = calldata;
-    SELinuxStateRec *subj, *obj;
+    SELinuxSubjectRec *subj;
+    SELinuxObjectRec *obj;
     SELinuxAuditRec auditdata = { .client = rec->client };
     int rc;
 
-    subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
-    obj = dixLookupPrivate(&rec->dev->devPrivates, stateKey);
+    subj = dixLookupPrivate(&rec->client->devPrivates, subjectKey);
+    obj = dixLookupPrivate(&rec->dev->devPrivates, objectKey);
 
     /* If this is a new object that needs labeling, do it now */
     if (rec->access_mode & DixCreateAccess) {
+	SELinuxSubjectRec *dsubj;
+	dsubj = dixLookupPrivate(&rec->dev->devPrivates, subjectKey);
+
+	sidput(dsubj->sid);
 	sidput(obj->sid);
 
 	/* Label the device directly with the process SID */
 	sidget(subj->sid);
 	obj->sid = subj->sid;
+	sidget(subj->sid);
+	dsubj->sid = subj->sid;
     }
 
     rc = SELinuxDoCheck(subj, obj, SECCLASS_X_DEVICE, rec->access_mode,
@@ -513,17 +535,18 @@ static void
 SELinuxSend(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     XaceSendAccessRec *rec = calldata;
-    SELinuxStateRec *subj, *obj, ev_sid;
+    SELinuxSubjectRec *subj;
+    SELinuxObjectRec *obj, ev_sid;
     SELinuxAuditRec auditdata = { .client = rec->client };
     security_class_t class;
     int rc, i, type;
 
     if (rec->dev)
-	subj = dixLookupPrivate(&rec->dev->devPrivates, stateKey);
+	subj = dixLookupPrivate(&rec->dev->devPrivates, subjectKey);
     else
-	subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
+	subj = dixLookupPrivate(&rec->client->devPrivates, subjectKey);
 
-    obj = dixLookupPrivate(&rec->pWin->devPrivates, stateKey);
+    obj = dixLookupPrivate(&rec->pWin->devPrivates, objectKey);
 
     /* Check send permission on window */
     rc = SELinuxDoCheck(subj, obj, SECCLASS_X_DRAWABLE, DixSendAccess,
@@ -554,13 +577,14 @@ static void
 SELinuxReceive(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     XaceReceiveAccessRec *rec = calldata;
-    SELinuxStateRec *subj, *obj, ev_sid;
+    SELinuxSubjectRec *subj;
+    SELinuxObjectRec *obj, ev_sid;
     SELinuxAuditRec auditdata = { .client = NULL };
     security_class_t class;
     int rc, i, type;
 
-    subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
-    obj = dixLookupPrivate(&rec->pWin->devPrivates, stateKey);
+    subj = dixLookupPrivate(&rec->client->devPrivates, subjectKey);
+    obj = dixLookupPrivate(&rec->pWin->devPrivates, objectKey);
 
     /* Check receive permission on window */
     rc = SELinuxDoCheck(subj, obj, SECCLASS_X_DRAWABLE, DixReceiveAccess,
@@ -591,12 +615,13 @@ static void
 SELinuxExtension(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     XaceExtAccessRec *rec = calldata;
-    SELinuxStateRec *subj, *obj, *serv;
+    SELinuxSubjectRec *subj, *serv;
+    SELinuxObjectRec *obj;
     SELinuxAuditRec auditdata = { .client = rec->client };
     int rc;
 
-    subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
-    obj = dixLookupPrivate(&rec->ext->devPrivates, stateKey);
+    subj = dixLookupPrivate(&rec->client->devPrivates, subjectKey);
+    obj = dixLookupPrivate(&rec->ext->devPrivates, objectKey);
 
     /* If this is a new object that needs labeling, do it now */
     /* XXX there should be a separate callback for this */
@@ -605,9 +630,9 @@ SELinuxExtension(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	security_context_t con;
 	security_id_t sid;
 
-	serv = dixLookupPrivate(&serverClient->devPrivates, stateKey);
+	serv = dixLookupPrivate(&serverClient->devPrivates, subjectKey);
 
-	/* Look in the mappings of property names to contexts */
+	/* Look in the mappings of extension names to contexts */
 	if (selabel_lookup(label_hnd, &con, name, SELABEL_X_EXT) < 0) {
 	    ErrorF("SELinux: a property label lookup failed!\n");
 	    rec->status = BadValue;
@@ -645,12 +670,13 @@ static void
 SELinuxProperty(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     XacePropertyAccessRec *rec = calldata;
-    SELinuxStateRec *subj, *obj;
+    SELinuxSubjectRec *subj;
+    SELinuxObjectRec *obj;
     SELinuxAuditRec auditdata = { .client = rec->client };
     int rc;
 
-    subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
-    obj = dixLookupPrivate(&rec->pProp->devPrivates, stateKey);
+    subj = dixLookupPrivate(&rec->client->devPrivates, subjectKey);
+    obj = dixLookupPrivate(&rec->pProp->devPrivates, objectKey);
 
     /* If this is a new object that needs labeling, do it now */
     if (rec->access_mode & DixCreateAccess) {
@@ -696,13 +722,15 @@ static void
 SELinuxResource(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     XaceResourceAccessRec *rec = calldata;
-    SELinuxStateRec *subj, *obj, *pobj;
+    SELinuxSubjectRec *subj;
+    SELinuxObjectRec *obj, *sobj, *pobj;
     SELinuxAuditRec auditdata = { .client = rec->client };
     PrivateRec **privatePtr;
     security_class_t class;
     int rc, offset;
 
-    subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
+    subj = dixLookupPrivate(&rec->client->devPrivates, subjectKey);
+    sobj = dixLookupPrivate(&rec->client->devPrivates, objectKey);
 
     /* Determine if the resource object has a devPrivates field */
     offset = dixLookupPrivateOffset(rec->rtype);
@@ -710,12 +738,12 @@ SELinuxResource(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	/* No: use the SID of the owning client */
 	class = SECCLASS_X_RESOURCE;
 	privatePtr = &clients[CLIENT_ID(rec->id)]->devPrivates;
-	obj = dixLookupPrivate(privatePtr, stateKey);
+	obj = dixLookupPrivate(privatePtr, objectKey);
     } else {
 	/* Yes: use the SID from the resource object itself */
 	class = SELinuxTypeToClass(rec->rtype);
 	privatePtr = DEVPRIV_AT(rec->res, offset);
-	obj = dixLookupPrivate(privatePtr, stateKey);
+	obj = dixLookupPrivate(privatePtr, objectKey);
     }
 
     /* If this is a new object that needs labeling, do it now */
@@ -724,10 +752,10 @@ SELinuxResource(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	    offset = dixLookupPrivateOffset(rec->ptype);
 	if (rec->parent && offset >= 0)
 	    /* Use the SID of the parent object in the labeling operation */
-	    pobj = dixLookupPrivate(DEVPRIV_AT(rec->parent, offset), stateKey);
+	    pobj = dixLookupPrivate(DEVPRIV_AT(rec->parent, offset), objectKey);
 	else
 	    /* Use the SID of the subject */
-	    pobj = subj;
+	    pobj = sobj;
 
 	sidput(obj->sid);
 
@@ -751,13 +779,14 @@ static void
 SELinuxScreen(CallbackListPtr *pcbl, pointer is_saver, pointer calldata)
 {
     XaceScreenAccessRec *rec = calldata;
-    SELinuxStateRec *subj, *obj;
+    SELinuxSubjectRec *subj;
+    SELinuxObjectRec *obj;
     SELinuxAuditRec auditdata = { .client = rec->client };
     Mask access_mode = rec->access_mode;
     int rc;
 
-    subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
-    obj = dixLookupPrivate(&rec->screen->devPrivates, stateKey);
+    subj = dixLookupPrivate(&rec->client->devPrivates, subjectKey);
+    obj = dixLookupPrivate(&rec->screen->devPrivates, objectKey);
 
     /* If this is a new object that needs labeling, do it now */
     if (access_mode & DixCreateAccess) {
@@ -784,12 +813,13 @@ static void
 SELinuxClient(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     XaceClientAccessRec *rec = calldata;
-    SELinuxStateRec *subj, *obj;
+    SELinuxSubjectRec *subj;
+    SELinuxObjectRec *obj;
     SELinuxAuditRec auditdata = { .client = rec->client };
     int rc;
 
-    subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
-    obj = dixLookupPrivate(&rec->target->devPrivates, stateKey);
+    subj = dixLookupPrivate(&rec->client->devPrivates, subjectKey);
+    obj = dixLookupPrivate(&rec->target->devPrivates, objectKey);
 
     rc = SELinuxDoCheck(subj, obj, SECCLASS_X_CLIENT, rec->access_mode,
 			&auditdata);
@@ -801,12 +831,13 @@ static void
 SELinuxServer(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     XaceServerAccessRec *rec = calldata;
-    SELinuxStateRec *subj, *obj;
+    SELinuxSubjectRec *subj;
+    SELinuxObjectRec *obj;
     SELinuxAuditRec auditdata = { .client = rec->client };
     int rc;
 
-    subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
-    obj = dixLookupPrivate(&serverClient->devPrivates, stateKey);
+    subj = dixLookupPrivate(&rec->client->devPrivates, subjectKey);
+    obj = dixLookupPrivate(&serverClient->devPrivates, objectKey);
 
     rc = SELinuxDoCheck(subj, obj, SECCLASS_X_SERVER, rec->access_mode,
 			&auditdata);
@@ -818,11 +849,12 @@ static void
 SELinuxSelection(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     XaceSelectionAccessRec *rec = (XaceSelectionAccessRec *)calldata;
-    SELinuxStateRec *subj, sel_sid;
+    SELinuxSubjectRec *subj;
+    SELinuxObjectRec sel_sid;
     SELinuxAuditRec auditdata = { .client = rec->client };
     int rc;
 
-    subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
+    subj = dixLookupPrivate(&rec->client->devPrivates, subjectKey);
 
     rc = SELinuxSelectionToSID(rec->name, &sel_sid);
     if (rc != Success) {
@@ -869,18 +901,19 @@ static void
 SELinuxResourceState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     ResourceStateInfoRec *rec = calldata;
-    SELinuxStateRec *state;
+    SELinuxSubjectRec *subj;
+    SELinuxObjectRec *obj;
     WindowPtr pWin;
 
     if (rec->type != RT_WINDOW)
 	return;
 
     pWin = (WindowPtr)rec->value;
-    state = dixLookupPrivate(&wClient(pWin)->devPrivates, stateKey);
+    subj = dixLookupPrivate(&wClient(pWin)->devPrivates, subjectKey);
 
-    if (state->sid) {
+    if (subj->sid) {
 	security_context_t ctx;
-	int rc = avc_sid_to_context(state->sid, &ctx);
+	int rc = avc_sid_to_context(subj->sid, &ctx);
 	if (rc < 0)
 	    FatalError("SELinux: Failed to get security context!\n");
 	rc = dixChangeWindowProperty(serverClient,
@@ -892,11 +925,11 @@ SELinuxResourceState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
     } else
 	FatalError("SELinux: Unexpected unlabeled client found\n");
 
-    state = dixLookupPrivate(&pWin->devPrivates, stateKey);
+    obj = dixLookupPrivate(&pWin->devPrivates, objectKey);
 
-    if (state->sid) {
+    if (obj->sid) {
 	security_context_t ctx;
-	int rc = avc_sid_to_context(state->sid, &ctx);
+	int rc = avc_sid_to_context(obj->sid, &ctx);
 	if (rc < 0)
 	    FatalError("SELinux: Failed to get security context!\n");
 	rc = dixChangeWindowProperty(serverClient,
@@ -913,7 +946,8 @@ static void
 SELinuxSelectionState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     SelectionInfoRec *rec = calldata;
-    SELinuxStateRec *subj, *obj;
+    SELinuxSubjectRec *subj;
+    SELinuxObjectRec *obj;
 
     switch (rec->kind) {
     case SelectionSetOwner:
@@ -922,8 +956,8 @@ SELinuxSelectionState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	rec->selection->alt_window = rec->selection->window;
 
 	/* figure out the new label for the content */
-	subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
-	obj = dixLookupPrivate(&rec->selection->devPrivates, stateKey);
+	subj = dixLookupPrivate(&rec->client->devPrivates, subjectKey);
+	obj = dixLookupPrivate(&rec->selection->devPrivates, objectKey);
 	sidput(obj->sid);
 
 	if (avc_compute_create(subj->sid, subj->sid, SECCLASS_X_SELECTION,
@@ -959,27 +993,47 @@ SELinuxSelectionState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
  */
 
 static void
-SELinuxStateInit(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+SELinuxSubjectInit(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     PrivateCallbackRec *rec = calldata;
-    SELinuxStateRec *state = *rec->value;
+    SELinuxSubjectRec *subj = *rec->value;
 
     sidget(unlabeled_sid);
-    state->sid = unlabeled_sid;
+    subj->sid = unlabeled_sid;
 
-    avc_entry_ref_init(&state->aeref);
+    avc_entry_ref_init(&subj->aeref);
 }
 
 static void
-SELinuxStateFree(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+SELinuxSubjectFree(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     PrivateCallbackRec *rec = calldata;
-    SELinuxStateRec *state = *rec->value;
+    SELinuxSubjectRec *subj = *rec->value;
 
-    xfree(state->command);
+    xfree(subj->command);
 
     if (avc_active)
-	sidput(state->sid);
+	sidput(subj->sid);
+}
+
+static void
+SELinuxObjectInit(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+{
+    PrivateCallbackRec *rec = calldata;
+    SELinuxObjectRec *obj = *rec->value;
+
+    sidget(unlabeled_sid);
+    obj->sid = unlabeled_sid;
+}
+
+static void
+SELinuxObjectFree(CallbackListPtr *pcbl, pointer unused, pointer calldata)
+{
+    PrivateCallbackRec *rec = calldata;
+    SELinuxObjectRec *obj = *rec->value;
+
+    if (avc_active)
+	sidput(obj->sid);
 }
 
 
@@ -1070,7 +1124,8 @@ ProcSELinuxSetDeviceContext(ClientPtr client)
     char *ctx;
     security_id_t sid;
     DeviceIntPtr dev;
-    SELinuxStateRec *state;
+    SELinuxSubjectRec *subj;
+    SELinuxObjectRec *obj;
     int rc;
 
     REQUEST(SELinuxSetContextReq);
@@ -1088,9 +1143,13 @@ ProcSELinuxSetDeviceContext(ClientPtr client)
     if (rc != Success)
 	return BadValue;
 
-    state = dixLookupPrivate(&dev->devPrivates, stateKey);
-    sidput(state->sid);
-    state->sid = sid;
+    subj = dixLookupPrivate(&dev->devPrivates, subjectKey);
+    sidput(subj->sid);
+    subj->sid = sid;
+    obj = dixLookupPrivate(&dev->devPrivates, objectKey);
+    sidput(obj->sid);
+    obj->sid = sid;
+
     return Success;
 }
 
@@ -1099,7 +1158,7 @@ ProcSELinuxGetDeviceContext(ClientPtr client)
 {
     char *ctx;
     DeviceIntPtr dev;
-    SELinuxStateRec *state;
+    SELinuxSubjectRec *subj;
     SELinuxGetContextReply rep;
     int rc;
 
@@ -1110,8 +1169,8 @@ ProcSELinuxGetDeviceContext(ClientPtr client)
     if (rc != Success)
 	return rc;
 
-    state = dixLookupPrivate(&dev->devPrivates, stateKey);
-    rc = avc_sid_to_context(state->sid, &ctx);
+    subj = dixLookupPrivate(&dev->devPrivates, subjectKey);
+    rc = avc_sid_to_context(subj->sid, &ctx);
     if (rc != Success)
 	return BadValue;
 
@@ -1151,7 +1210,7 @@ ProcSELinuxGetPropertyContext(ClientPtr client)
     char *ctx;
     WindowPtr pWin;
     PropertyPtr pProp;
-    SELinuxStateRec *state;
+    SELinuxObjectRec *obj;
     SELinuxGetContextReply rep;
     int rc;
 
@@ -1175,8 +1234,8 @@ ProcSELinuxGetPropertyContext(ClientPtr client)
     if (rc != Success)
 	return rc;
 
-    state = dixLookupPrivate(&pProp->devPrivates, stateKey);
-    rc = avc_sid_to_context(state->sid, &ctx);
+    obj = dixLookupPrivate(&pProp->devPrivates, objectKey);
+    rc = avc_sid_to_context(obj->sid, &ctx);
     if (rc != Success)
 	return BadValue;
 
@@ -1215,7 +1274,7 @@ ProcSELinuxGetWindowContext(ClientPtr client)
 {
     char *ctx;
     WindowPtr pWin;
-    SELinuxStateRec *state;
+    SELinuxObjectRec *obj;
     SELinuxGetContextReply rep;
     int rc;
 
@@ -1226,8 +1285,8 @@ ProcSELinuxGetWindowContext(ClientPtr client)
     if (rc != Success)
 	return rc;
 
-    state = dixLookupPrivate(&pWin->devPrivates, stateKey);
-    rc = avc_sid_to_context(state->sid, &ctx);
+    obj = dixLookupPrivate(&pWin->devPrivates, objectKey);
+    rc = avc_sid_to_context(obj->sid, &ctx);
     if (rc != Success)
 	return BadValue;
 
@@ -1521,7 +1580,8 @@ SELinuxExtensionInit(INITARGS)
 	FatalError("SELinux: Failed to open the system audit log\n");
 
     /* Allocate private storage */
-    if (!dixRequestPrivate(stateKey, sizeof(SELinuxStateRec)))
+    if (!dixRequestPrivate(subjectKey, sizeof(SELinuxSubjectRec)) ||
+	!dixRequestPrivate(objectKey, sizeof(SELinuxObjectRec)))
 	FatalError("SELinux: Failed to allocate private storage.\n");
 
     /* Create atoms for doing window labeling */
@@ -1533,8 +1593,10 @@ SELinuxExtensionInit(INITARGS)
 	FatalError("SELinux: Failed to create atom\n");
 
     /* Register callbacks */
-    ret &= dixRegisterPrivateInitFunc(stateKey, SELinuxStateInit, NULL);
-    ret &= dixRegisterPrivateDeleteFunc(stateKey, SELinuxStateFree, NULL);
+    ret &= dixRegisterPrivateInitFunc(subjectKey, SELinuxSubjectInit, NULL);
+    ret &= dixRegisterPrivateDeleteFunc(subjectKey, SELinuxSubjectFree, NULL);
+    ret &= dixRegisterPrivateInitFunc(objectKey, SELinuxObjectInit, NULL);
+    ret &= dixRegisterPrivateDeleteFunc(objectKey, SELinuxObjectFree, NULL);
 
     ret &= AddCallback(&ClientStateCallback, SELinuxClientState, NULL);
     ret &= AddCallback(&ResourceStateCallback, SELinuxResourceState, NULL);

From 31934132a490b1b8ae73010c44e0b23217d8dab2 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 7 Feb 2008 16:32:06 -0500
Subject: [PATCH 464/552] xselinux: Use the device name in debugging output.

---
 Xext/xselinux.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 60f0cc88f..9acc93c61 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -92,6 +92,7 @@ static int audit_fd;
 /* structure passed to auditing callback */
 typedef struct {
     ClientPtr client;	/* client */
+    DeviceIntPtr dev;	/* device */
     char *command;	/* client's executable path */
     unsigned id;	/* resource id, if any */
     int restype;	/* resource type, if any */
@@ -461,11 +462,15 @@ SELinuxAudit(void *auditdata,
     propertyName = audit->property ? NameForAtom(audit->property) : NULL;
     selectionName = audit->selection ? NameForAtom(audit->selection) : NULL;
 
-    return snprintf(msgbuf, msgbufsize, "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
+    return snprintf(msgbuf, msgbufsize,
+		    "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
 		    (major >= 0) ? "request=" : "",
 		    (major >= 0) ? LookupRequestName(major, minor) : "",
 		    audit->command ? " comm=" : "",
 		    audit->command ? audit->command : "",
+		    audit->dev ? " xdevice=\"" : "",
+		    audit->dev ? audit->dev->name : "",
+		    audit->dev ? "\"" : "",
 		    audit->id ? " resid=" : "",
 		    audit->id ? idNum : "",
 		    audit->restype ? " restype=" : "",
@@ -504,7 +509,7 @@ SELinuxDevice(CallbackListPtr *pcbl, pointer unused, pointer calldata)
     XaceDeviceAccessRec *rec = calldata;
     SELinuxSubjectRec *subj;
     SELinuxObjectRec *obj;
-    SELinuxAuditRec auditdata = { .client = rec->client };
+    SELinuxAuditRec auditdata = { .client = rec->client, .dev = rec->dev };
     int rc;
 
     subj = dixLookupPrivate(&rec->client->devPrivates, subjectKey);
@@ -537,7 +542,7 @@ SELinuxSend(CallbackListPtr *pcbl, pointer unused, pointer calldata)
     XaceSendAccessRec *rec = calldata;
     SELinuxSubjectRec *subj;
     SELinuxObjectRec *obj, ev_sid;
-    SELinuxAuditRec auditdata = { .client = rec->client };
+    SELinuxAuditRec auditdata = { .client = rec->client, .dev = rec->dev };
     security_class_t class;
     int rc, i, type;
 

From de16a8c53046764dbdf26a87acc5c984ef00d818 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 7 Feb 2008 20:14:16 -0500
Subject: [PATCH 465/552] XACE: Correct some protocol error values in the
 colormap routines.

---
 dix/dispatch.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dix/dispatch.c b/dix/dispatch.c
index 663bf7dd5..0bca4417e 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -2537,7 +2537,7 @@ ProcFreeColormap(ClientPtr client)
     else 
     {
 	client->errorValue = stuff->id;
-	return rc;
+	return (rc == BadValue) ? BadColor : rc;
     }
 }
 
@@ -2566,7 +2566,7 @@ ProcCopyColormapAndFree(ClientPtr client)
     else
     {
 	client->errorValue = stuff->srcCmap;
-	return rc;
+	return (rc == BadValue) ? BadColor : rc;
     }
 }
 
@@ -2658,7 +2658,7 @@ ProcListInstalledColormaps(ClientPtr client)
     xfree(preply);
     rc = client->noClientException;
 out:
-    return (rc == BadValue) ? BadColor : rc;
+    return rc;
 }
 
 int

From 66f8001b61d12eaf4905ac71ccbb3f304914d00d Mon Sep 17 00:00:00 2001
From: Bart Trojanowski <bart@symbio-technologies.com>
Date: Thu, 7 Feb 2008 21:26:54 -0500
Subject: [PATCH 466/552] X86EMU: handle CPUID instruction

After trying to switch from X to VT (or just quit) the video-amd driver
attempts to issue INT 10/0 to go to mode 3 (VGA).  The emulator, running
the BIOS code, would then spit out:

        c000:0282: A2 ILLEGAL EXTENDED X86 OPCODE!

The opcode was 0F A2, or CPUID; it was not implemented in the emulator.
This simple patch, against 1.3.0.0, handles the CPUID instruction in one of
two ways:
 1) if ran on __i386__ or __x86_64__ then it calls the CPUID instruction
     directly.
 2) if ran elsewhere it returns a canned 486dx4 set of values for
     function 1.

This fix allows the video-amd driver to switch back to console mode,
with the GSW BIOS.

Thanks to Symbio Technologies for funding my work, and ThinCan for
providing hardware :)

Signed-off-by: Bart Trojanowski <bart@jukie.net>
Acked-by: Eric Anholt <eric@anholt.net>
---
 hw/xfree86/x86emu/ops2.c                | 16 ++++-
 hw/xfree86/x86emu/prim_ops.c            | 66 +++++++++++++++++++++
 hw/xfree86/x86emu/x86emu/prim_ops.h     |  1 +
 hw/xfree86/x86emu/x86emu/prim_x86_gcc.h | 79 +++++++++++++++++++++++++
 4 files changed, 161 insertions(+), 1 deletion(-)
 create mode 100644 hw/xfree86/x86emu/x86emu/prim_x86_gcc.h

diff --git a/hw/xfree86/x86emu/ops2.c b/hw/xfree86/x86emu/ops2.c
index 8c6c53539..324de8ad8 100644
--- a/hw/xfree86/x86emu/ops2.c
+++ b/hw/xfree86/x86emu/ops2.c
@@ -327,6 +327,20 @@ static void x86emuOp2_pop_FS(u8 X86EMU_UNUSED(op2))
     END_OF_INSTR();
 }
 
+/****************************************************************************
+REMARKS: CPUID takes EAX/ECX as inputs, writes EAX/EBX/ECX/EDX as output
+Handles opcode 0x0f,0xa2
+****************************************************************************/
+static void x86emuOp2_cpuid(u8 X86EMU_UNUSED(op2))
+{
+    START_OF_INSTR();
+    DECODE_PRINTF("CPUID\n");
+    TRACE_AND_STEP();
+    cpuid();
+    DECODE_CLEAR_SEGOVR();
+    END_OF_INSTR();
+}
+
 /****************************************************************************
 REMARKS:
 Handles opcode 0x0f,0xa3
@@ -2734,7 +2748,7 @@ void (*x86emu_optab2[256])(u8) =
 
 /*  0xa0 */ x86emuOp2_push_FS,
 /*  0xa1 */ x86emuOp2_pop_FS,
-/*  0xa2 */ x86emuOp2_illegal_op,
+/*  0xa2 */ x86emuOp2_cpuid,
 /*  0xa3 */ x86emuOp2_bt_R,
 /*  0xa4 */ x86emuOp2_shld_IMM,
 /*  0xa5 */ x86emuOp2_shld_CL,
diff --git a/hw/xfree86/x86emu/prim_ops.c b/hw/xfree86/x86emu/prim_ops.c
index b9e7257ca..b42cdc0a5 100644
--- a/hw/xfree86/x86emu/prim_ops.c
+++ b/hw/xfree86/x86emu/prim_ops.c
@@ -102,6 +102,12 @@
 #define	PRIM_OPS_NO_REDEFINE_ASM
 #include "x86emu/x86emui.h"
 
+#if defined(__GNUC__)
+# if defined (__i386__) || defined(__i386) || defined(__AMD64__) || defined(__x86_64__) || defined(__amd64__)
+#  include "x86emu/prim_x86_gcc.h"
+# endif
+#endif
+
 /*------------------------- Global Variables ------------------------------*/
 
 static u32 x86emu_parity_tab[8] =
@@ -2654,3 +2660,63 @@ DB(	if (CHECK_SP_ACCESS())
     return res;
 }
 
+/****************************************************************************
+REMARKS:
+CPUID takes EAX/ECX as inputs, writes EAX/EBX/ECX/EDX as output
+****************************************************************************/
+void cpuid (void)
+{
+    u32 feature = M.x86.R_EAX;
+
+#ifdef X86EMU_HAS_HW_CPUID
+    /* If the platform allows it, we will base our values on the real
+     * results from the CPUID instruction.  We limit support to the
+     * first two features, and the results of those are sanitized.
+     */
+    if (feature <= 1)
+	hw_cpuid(&M.x86.R_EAX, &M.x86.R_EBX, &M.x86.R_ECX, &M.x86.R_EDX);
+#endif
+
+    switch (feature) {
+    case 0:
+        /* Regardless if we have real data from the hardware, the emulator
+	 * will only support upto feature 1, which we set in register EAX.
+	 * Registers EBX:EDX:ECX contain a string identifying the CPU.
+	 */
+        M.x86.R_EAX = 1;
+#ifndef X86EMU_HAS_HW_CPUID
+        /* EBX:EDX:ECX = "GenuineIntel" */
+        M.x86.R_EBX = 0x756e6547;
+        M.x86.R_EDX = 0x49656e69;
+        M.x86.R_ECX = 0x6c65746e;
+#endif
+        break;
+    case 1:
+#ifndef X86EMU_HAS_HW_CPUID
+        /* If we don't have x86 compatible hardware, we return values from an
+	 * Intel 486dx4; which was one of the first processors to have CPUID.
+	 */
+        M.x86.R_EAX = 0x00000480;
+        M.x86.R_EBX = 0x00000000;
+        M.x86.R_ECX = 0x00000000;
+        M.x86.R_EDX = 0x00000002;	/* VME */
+#else
+        /* In the case that we have hardware CPUID instruction, we make sure
+	 * that the features reported are limited to TSC and VME.
+	 */
+        M.x86.R_EDX &= 0x00000012;
+#endif
+        break;
+    default:
+        /* Finally, we don't support any additional features.  Most CPUs
+	 * return all zeros when queried for invalid or unsupported feature
+	 * numbers.
+	 */
+        M.x86.R_EAX = 0;
+        M.x86.R_EBX = 0;
+        M.x86.R_ECX = 0;
+        M.x86.R_EDX = 0;
+        break;
+    }
+}
+
diff --git a/hw/xfree86/x86emu/x86emu/prim_ops.h b/hw/xfree86/x86emu/x86emu/prim_ops.h
index bea8357e4..6ac2a29f6 100644
--- a/hw/xfree86/x86emu/x86emu/prim_ops.h
+++ b/hw/xfree86/x86emu/x86emu/prim_ops.h
@@ -133,6 +133,7 @@ void    push_word (u16 w);
 void    push_long (u32 w);
 u16     pop_word (void);
 u32		pop_long (void);
+void    cpuid (void);
 
 #ifdef  __cplusplus
 }                       			/* End of "C" linkage for C++   	*/
diff --git a/hw/xfree86/x86emu/x86emu/prim_x86_gcc.h b/hw/xfree86/x86emu/x86emu/prim_x86_gcc.h
new file mode 100644
index 000000000..af61e2023
--- /dev/null
+++ b/hw/xfree86/x86emu/x86emu/prim_x86_gcc.h
@@ -0,0 +1,79 @@
+/****************************************************************************
+*
+* Inline helpers for x86emu
+*
+* Copyright (C) 2008 Bart Trojanowski, Symbio Technologies, LLC
+*
+*  ========================================================================
+*
+*  Permission to use, copy, modify, distribute, and sell this software and
+*  its documentation for any purpose is hereby granted without fee,
+*  provided that the above copyright notice appear in all copies and that
+*  both that copyright notice and this permission notice appear in
+*  supporting documentation, and that the name of the authors not be used
+*  in advertising or publicity pertaining to distribution of the software
+*  without specific, written prior permission.  The authors makes no
+*  representations about the suitability of this software for any purpose.
+*  It is provided "as is" without express or implied warranty.
+*
+*  THE AUTHORS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+*  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+*  EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+*  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+*  USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+*  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+*  PERFORMANCE OF THIS SOFTWARE.
+*
+*  ========================================================================
+*
+* Language:     GNU C
+* Environment:  GCC on i386 or x86-64
+* Developer:    Bart Trojanowski
+*
+* Description:  This file defines a few x86 macros that can be used by the
+*               emulator to execute native instructions.
+*
+*               For PIC vs non-PIC code refer to:
+*               http://sam.zoy.org/blog/2007-04-13-shlib-with-non-pic-code-have-inline-assembly-and-pic-mix-well
+*
+****************************************************************************/
+#ifndef __X86EMU_PRIM_X86_GCC_H
+#define __X86EMU_PRIM_X86_GCC_H
+
+#include "x86emu/types.h"
+
+#if !defined(__GNUC__) || !(defined (__i386__) || defined(__i386) || defined(__AMD64__) || defined(__x86_64__) || defined(__amd64__))
+#error This file is intended to be used by gcc on i386 or x86-64 system
+#endif
+
+#if defined(__PIC__) && defined(__i386__)
+
+#define X86EMU_HAS_HW_CPUID 1
+static inline void hw_cpuid (u32 *a, u32 *b, u32 *c, u32 *d)
+{
+    __asm__ __volatile__ ("pushl %%ebx      \n\t"
+                          "cpuid            \n\t"
+                          "movl %%ebx, %1   \n\t"
+                          "popl %%ebx       \n\t"
+                          : "=a" (*a), "=r" (*b),
+                            "=c" (*c), "=d" (*d)
+                          : "a" (*a), "c" (*c)
+                          : "cc");
+}
+
+#else // ! (__PIC__ && __i386__)
+
+#define x86EMU_HAS_HW_CPUID 1
+static inline void hw_cpuid (u32 *a, u32 *b, u32 *c, u32 *d)
+{
+    __asm__ __volatile__ ("cpuid"
+                          : "=a" (*a), "=b" (*b),
+                            "=c" (*c), "=d" (*d)
+                          : "a" (*a), "c" (*c)
+                          : "cc");
+}
+
+#endif // __PIC__ && __i386__
+
+
+#endif // __X86EMU_PRIM_X86_GCC_H

From 7018f280406eb0ef899a4046de274cfdd582881b Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu, 7 Feb 2008 15:48:04 +1030
Subject: [PATCH 467/552] xkb: when copying the keymap, make sure the structs
 default to 0/NULL.

It actually does help if a pointer is NULL rather than pointing to nirvana
when you're trying to free it lateron. Who would have thought?
---
 xkb/xkbUtils.c | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
index 9f813e5e3..3cedf825a 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -1730,9 +1730,8 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
         else {
             if (dst->geom->sz_shapes) {
                 xfree(dst->geom->shapes);
-                dst->geom->shapes = NULL;
             }
-            
+            dst->geom->shapes = NULL;
             dst->geom->num_shapes = 0;
             dst->geom->sz_shapes = 0;
         }
@@ -1781,6 +1780,7 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
             }
 
             dst->geom->num_sections = 0;
+            dst->geom->sections = NULL;
         }
 
         if (src->geom->num_sections) {
@@ -1792,6 +1792,7 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
                 tmp = xalloc(src->geom->num_sections * sizeof(XkbSectionRec));
             if (!tmp)
                 return FALSE;
+            memset(tmp, 0, src->geom->num_sections * sizeof(XkbSectionRec));
             dst->geom->sections = tmp;
             dst->geom->num_sections = src->geom->num_sections;
 
@@ -1828,6 +1829,10 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
                         return FALSE;
                     dsection->doodads = tmp;
                 }
+                else {
+                    dsection->doodads = NULL;
+                }
+
                 for (k = 0,
                       sdoodad = ssection->doodads,
                       ddoodad = dsection->doodads;
@@ -1855,9 +1860,9 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
         else {
             if (dst->geom->sz_sections) {
                 xfree(dst->geom->sections);
-                dst->geom->sections = NULL;
             }
 
+            dst->geom->sections = NULL;
             dst->geom->num_sections = 0;
             dst->geom->sz_sections = 0;
         }
@@ -1886,6 +1891,8 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
                     }
                 }
             }
+            dst->geom->num_doodads = 0;
+            dst->geom->doodads = NULL;
         }
 
         if (src->geom->num_doodads) {
@@ -1898,7 +1905,7 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
                               sizeof(XkbDoodadRec));
             if (!tmp)
                 return FALSE;
-            bzero(tmp, src->geom->num_doodads * sizeof(XkbDoodadRec));
+            memset(tmp, 0, src->geom->num_doodads * sizeof(XkbDoodadRec));
             dst->geom->doodads = tmp;
 
             dst->geom->sz_doodads = src->geom->num_doodads;
@@ -1927,9 +1934,9 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
         else {
             if (dst->geom->sz_doodads) {
                 xfree(dst->geom->doodads);
-                dst->geom->doodads = NULL;
             }
 
+            dst->geom->doodads = NULL;
             dst->geom->num_doodads = 0;
             dst->geom->sz_doodads = 0;
         }
@@ -1957,10 +1964,10 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
             dst->geom->num_key_aliases = dst->geom->sz_key_aliases;
         }
         else {
-            if (dst->geom->sz_key_aliases && dst->geom->key_aliases) {
+            if (dst->geom->key_aliases) {
                 xfree(dst->geom->key_aliases);
-                dst->geom->key_aliases = NULL;
             }
+            dst->geom->key_aliases = NULL;
             dst->geom->num_key_aliases = 0;
             dst->geom->sz_key_aliases = 0;
         }
@@ -1991,8 +1998,8 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
         else {
             if (dst->geom->label_font) {
                 xfree(dst->geom->label_font);
-                dst->geom->label_font = NULL;
             }
+            dst->geom->label_font = NULL;
             dst->geom->label_color = NULL;
             dst->geom->base_color = NULL;
         }

From 8004e160fa8cc75a3f1b7385fee64e5864b3b50a Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@tifa.local>
Date: Sun, 10 Feb 2008 16:34:40 -0800
Subject: [PATCH 468/552] XQuartz: Converted interface to nib 3.x format
 (cherry picked from commit 656aaab95773bd70fc3504b68bf7e1d292891d93)

---
 .../bundle/English.lproj/main.nib/classes.nib |  318 --
 .../English.lproj/main.nib/designable.nib     | 4098 +++++++++++++++++
 .../bundle/English.lproj/main.nib/info.nib    |   18 -
 .../English.lproj/main.nib/keyedobjects.nib   |  Bin 30865 -> 33883 bytes
 4 files changed, 4098 insertions(+), 336 deletions(-)
 delete mode 100644 hw/xquartz/bundle/English.lproj/main.nib/classes.nib
 create mode 100644 hw/xquartz/bundle/English.lproj/main.nib/designable.nib
 delete mode 100644 hw/xquartz/bundle/English.lproj/main.nib/info.nib

diff --git a/hw/xquartz/bundle/English.lproj/main.nib/classes.nib b/hw/xquartz/bundle/English.lproj/main.nib/classes.nib
deleted file mode 100644
index a82159bd5..000000000
--- a/hw/xquartz/bundle/English.lproj/main.nib/classes.nib
+++ /dev/null
@@ -1,318 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IBClasses</key>
-	<array>
-		<dict>
-			<key>CLASS</key>
-			<string>IBLibraryObjectTemplate</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>OUTLETS</key>
-			<dict>
-				<key>draggedView</key>
-				<string>NSView</string>
-				<key>representedObject</key>
-				<string>NSObject</string>
-			</dict>
-			<key>SUPERCLASS</key>
-			<string>NSView</string>
-		</dict>
-		<dict>
-			<key>CLASS</key>
-			<string>IBInspector</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>OUTLETS</key>
-			<dict>
-				<key>inspectorView</key>
-				<string>NSView</string>
-			</dict>
-			<key>SUPERCLASS</key>
-			<string>NSObject</string>
-		</dict>
-		<dict>
-			<key>CLASS</key>
-			<string>NSDateFormatter</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>SUPERCLASS</key>
-			<string>NSFormatter</string>
-		</dict>
-		<dict>
-			<key>ACTIONS</key>
-			<dict>
-				<key>apps_table_cancel</key>
-				<string>id</string>
-				<key>apps_table_delete</key>
-				<string>id</string>
-				<key>apps_table_done</key>
-				<string>id</string>
-				<key>apps_table_duplicate</key>
-				<string>id</string>
-				<key>apps_table_new</key>
-				<string>id</string>
-				<key>apps_table_show</key>
-				<string>id</string>
-				<key>bring_to_front</key>
-				<string>id</string>
-				<key>close_window</key>
-				<string>id</string>
-				<key>enable_fullscreen_changed</key>
-				<string>id</string>
-				<key>minimize_window</key>
-				<string>id</string>
-				<key>next_window</key>
-				<string>id</string>
-				<key>prefs_changed</key>
-				<string>id</string>
-				<key>prefs_show</key>
-				<string>id</string>
-				<key>previous_window</key>
-				<string>id</string>
-				<key>toggle_fullscreen</key>
-				<string>id</string>
-				<key>x11_help</key>
-				<string>id</string>
-				<key>zoom_window</key>
-				<string>id</string>
-			</dict>
-			<key>CLASS</key>
-			<string>X11Controller</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>OUTLETS</key>
-			<dict>
-				<key>apps_separator</key>
-				<string>id</string>
-				<key>apps_table</key>
-				<string>id</string>
-				<key>depth</key>
-				<string>id</string>
-				<key>dock_apps_menu</key>
-				<string>id</string>
-				<key>dock_menu</key>
-				<string>id</string>
-				<key>dock_window_separator</key>
-				<string>id</string>
-				<key>enable_auth</key>
-				<string>id</string>
-				<key>enable_fullscreen</key>
-				<string>id</string>
-				<key>enable_keyequivs</key>
-				<string>id</string>
-				<key>enable_tcp</key>
-				<string>id</string>
-				<key>fake_buttons</key>
-				<string>id</string>
-				<key>prefs_panel</key>
-				<string>id</string>
-				<key>sync_keymap</key>
-				<string>id</string>
-				<key>toggle_fullscreen_item</key>
-				<string>id</string>
-				<key>use_sysbeep</key>
-				<string>id</string>
-				<key>window_separator</key>
-				<string>id</string>
-				<key>x11_about_item</key>
-				<string>id</string>
-			</dict>
-			<key>SUPERCLASS</key>
-			<string>NSObject</string>
-		</dict>
-		<dict>
-			<key>CLASS</key>
-			<string>NSNumberFormatter</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>SUPERCLASS</key>
-			<string>NSFormatter</string>
-		</dict>
-		<dict>
-			<key>CLASS</key>
-			<string>NSFormatter</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>SUPERCLASS</key>
-			<string>NSObject</string>
-		</dict>
-		<dict>
-			<key>ACTIONS</key>
-			<dict>
-				<key>alignCenter:</key>
-				<string>id</string>
-				<key>alignJustified:</key>
-				<string>id</string>
-				<key>alignLeft:</key>
-				<string>id</string>
-				<key>alignRight:</key>
-				<string>id</string>
-				<key>arrangeInFront:</key>
-				<string>id</string>
-				<key>centerSelectionInVisibleArea:</key>
-				<string>id</string>
-				<key>changeFont:</key>
-				<string>id</string>
-				<key>checkSpelling:</key>
-				<string>id</string>
-				<key>clear:</key>
-				<string>id</string>
-				<key>clearRecentDocuments:</key>
-				<string>id</string>
-				<key>complete:</key>
-				<string>id</string>
-				<key>copy:</key>
-				<string>id</string>
-				<key>copyFont:</key>
-				<string>id</string>
-				<key>copyRuler:</key>
-				<string>id</string>
-				<key>cut:</key>
-				<string>id</string>
-				<key>delete:</key>
-				<string>id</string>
-				<key>deminiaturize:</key>
-				<string>id</string>
-				<key>fax:</key>
-				<string>id</string>
-				<key>hide:</key>
-				<string>id</string>
-				<key>hideOtherApplications:</key>
-				<string>id</string>
-				<key>loosenKerning:</key>
-				<string>id</string>
-				<key>lowerBaseline:</key>
-				<string>id</string>
-				<key>makeKeyAndOrderFront:</key>
-				<string>id</string>
-				<key>miniaturize:</key>
-				<string>id</string>
-				<key>newDocument:</key>
-				<string>id</string>
-				<key>openDocument:</key>
-				<string>id</string>
-				<key>orderBack:</key>
-				<string>id</string>
-				<key>orderFront:</key>
-				<string>id</string>
-				<key>orderFrontColorPanel:</key>
-				<string>id</string>
-				<key>orderFrontHelpPanel:</key>
-				<string>id</string>
-				<key>orderOut:</key>
-				<string>id</string>
-				<key>outline:</key>
-				<string>id</string>
-				<key>paste:</key>
-				<string>id</string>
-				<key>pasteAsPlainText:</key>
-				<string>id</string>
-				<key>pasteAsRichText:</key>
-				<string>id</string>
-				<key>pasteFont:</key>
-				<string>id</string>
-				<key>pasteRuler:</key>
-				<string>id</string>
-				<key>pause:</key>
-				<string>id</string>
-				<key>performClose:</key>
-				<string>id</string>
-				<key>performFindPanelAction:</key>
-				<string>id</string>
-				<key>performMiniaturize:</key>
-				<string>id</string>
-				<key>performZoom:</key>
-				<string>id</string>
-				<key>play:</key>
-				<string>id</string>
-				<key>print:</key>
-				<string>id</string>
-				<key>printDocument:</key>
-				<string>id</string>
-				<key>raiseBaseline:</key>
-				<string>id</string>
-				<key>record:</key>
-				<string>id</string>
-				<key>redo:</key>
-				<string>id</string>
-				<key>resume:</key>
-				<string>id</string>
-				<key>revertDocumentToSaved:</key>
-				<string>id</string>
-				<key>run:</key>
-				<string>id</string>
-				<key>runPageLayout:</key>
-				<string>id</string>
-				<key>runToolbarCustomizationPalette:</key>
-				<string>id</string>
-				<key>saveAllDocuments:</key>
-				<string>id</string>
-				<key>saveDocument:</key>
-				<string>id</string>
-				<key>saveDocumentAs:</key>
-				<string>id</string>
-				<key>saveDocumentTo:</key>
-				<string>id</string>
-				<key>selectAll:</key>
-				<string>id</string>
-				<key>selectText:</key>
-				<string>id</string>
-				<key>showGuessPanel:</key>
-				<string>id</string>
-				<key>showHelp:</key>
-				<string>id</string>
-				<key>start:</key>
-				<string>id</string>
-				<key>startSpeaking:</key>
-				<string>id</string>
-				<key>stop:</key>
-				<string>id</string>
-				<key>stopSpeaking:</key>
-				<string>id</string>
-				<key>subscript:</key>
-				<string>id</string>
-				<key>superscript:</key>
-				<string>id</string>
-				<key>terminate:</key>
-				<string>id</string>
-				<key>tightenKerning:</key>
-				<string>id</string>
-				<key>toggleContinuousSpellChecking:</key>
-				<string>id</string>
-				<key>toggleRuler:</key>
-				<string>id</string>
-				<key>toggleToolbarShown:</key>
-				<string>id</string>
-				<key>turnOffKerning:</key>
-				<string>id</string>
-				<key>turnOffLigatures:</key>
-				<string>id</string>
-				<key>underline:</key>
-				<string>id</string>
-				<key>undo:</key>
-				<string>id</string>
-				<key>unhideAllApplications:</key>
-				<string>id</string>
-				<key>unscript:</key>
-				<string>id</string>
-				<key>useAllLigatures:</key>
-				<string>id</string>
-				<key>useStandardKerning:</key>
-				<string>id</string>
-				<key>useStandardLigatures:</key>
-				<string>id</string>
-			</dict>
-			<key>CLASS</key>
-			<string>FirstResponder</string>
-			<key>LANGUAGE</key>
-			<string>ObjC</string>
-			<key>SUPERCLASS</key>
-			<string>NSObject</string>
-		</dict>
-	</array>
-	<key>IBVersion</key>
-	<integer>1</integer>
-</dict>
-</plist>
diff --git a/hw/xquartz/bundle/English.lproj/main.nib/designable.nib b/hw/xquartz/bundle/English.lproj/main.nib/designable.nib
new file mode 100644
index 000000000..c267e45e6
--- /dev/null
+++ b/hw/xquartz/bundle/English.lproj/main.nib/designable.nib
@@ -0,0 +1,4098 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.01">
+	<data>
+		<int key="IBDocument.SystemTarget">1050</int>
+		<string key="IBDocument.SystemVersion">9C31</string>
+		<string key="IBDocument.InterfaceBuilderVersion">629</string>
+		<string key="IBDocument.AppKitVersion">949.26</string>
+		<string key="IBDocument.HIToolboxVersion">352.00</string>
+		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+		</object>
+		<object class="NSArray" key="IBDocument.PluginDependencies">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<string id="874199827">com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</object>
+		<object class="NSMutableArray" key="IBDocument.RootObjects" id="874420287">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<object class="NSCustomObject" id="584863936">
+				<object class="NSMutableString" key="NSClassName">
+					<characters key="NS.bytes">NSApplication</characters>
+				</object>
+			</object>
+			<object class="NSCustomObject" id="518703249">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="166373373">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSMenu" id="496556081">
+				<string key="NSTitle" id="414137626">MainMenu</string>
+				<object class="NSMutableArray" key="NSMenuItems">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<object class="NSMenuItem" id="385138428">
+						<reference key="NSMenu" ref="496556081"/>
+						<string key="NSTitle" id="845099910">X11</string>
+						<string key="NSKeyEquiv" id="1005878359"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<object class="NSCustomResource" key="NSOnImage" id="732862070">
+							<string key="NSClassName" id="642323532">NSImage</string>
+							<string key="NSResourceName">NSMenuCheckmark</string>
+						</object>
+						<object class="NSCustomResource" key="NSMixedImage" id="154462367">
+							<reference key="NSClassName" ref="642323532"/>
+							<string key="NSResourceName">NSMenuMixedState</string>
+						</object>
+						<string key="NSAction">submenuAction:</string>
+						<object class="NSMenu" key="NSSubmenu" id="856655711">
+							<reference key="NSTitle" ref="845099910"/>
+							<object class="NSMutableArray" key="NSMenuItems">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSMenuItem" id="588913325">
+									<reference key="NSMenu" ref="856655711"/>
+									<string key="NSTitle">About X11</string>
+									<reference key="NSKeyEquiv" ref="1005878359"/>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="732862070"/>
+									<reference key="NSMixedImage" ref="154462367"/>
+								</object>
+								<object class="NSMenuItem" id="836585695">
+									<reference key="NSMenu" ref="856655711"/>
+									<string key="NSTitle">Preferences...</string>
+									<string key="NSKeyEquiv">,</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="732862070"/>
+									<reference key="NSMixedImage" ref="154462367"/>
+								</object>
+								<object class="NSMenuItem" id="562920394">
+									<reference key="NSMenu" ref="856655711"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<reference key="NSTitle" ref="1005878359"/>
+									<reference key="NSKeyEquiv" ref="1005878359"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="732862070"/>
+									<reference key="NSMixedImage" ref="154462367"/>
+								</object>
+								<object class="NSMenuItem" id="63158341">
+									<reference key="NSMenu" ref="856655711"/>
+									<string key="NSTitle">Services</string>
+									<reference key="NSKeyEquiv" ref="1005878359"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="732862070"/>
+									<reference key="NSMixedImage" ref="154462367"/>
+									<string key="NSAction">submenuAction:</string>
+									<object class="NSMenu" key="NSSubmenu" id="502073457">
+										<object class="NSMutableString" key="NSTitle">
+											<characters key="NS.bytes">Services</characters>
+										</object>
+										<object class="NSMutableArray" key="NSMenuItems">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+										</object>
+										<string key="NSName">_NSServicesMenu</string>
+									</object>
+								</object>
+								<object class="NSMenuItem" id="635454008">
+									<reference key="NSMenu" ref="856655711"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<reference key="NSTitle" ref="1005878359"/>
+									<reference key="NSKeyEquiv" ref="1005878359"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="732862070"/>
+									<reference key="NSMixedImage" ref="154462367"/>
+								</object>
+								<object class="NSMenuItem" id="101686423">
+									<reference key="NSMenu" ref="856655711"/>
+									<string key="NSTitle">Toggle Full Screen</string>
+									<string key="NSKeyEquiv" id="982375500">a</string>
+									<int key="NSKeyEquivModMask">1572864</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="732862070"/>
+									<reference key="NSMixedImage" ref="154462367"/>
+								</object>
+								<object class="NSMenuItem" id="754231570">
+									<reference key="NSMenu" ref="856655711"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<reference key="NSTitle" ref="1005878359"/>
+									<reference key="NSKeyEquiv" ref="1005878359"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="732862070"/>
+									<reference key="NSMixedImage" ref="154462367"/>
+								</object>
+								<object class="NSMenuItem" id="147703239">
+									<reference key="NSMenu" ref="856655711"/>
+									<string key="NSTitle">Hide X11</string>
+									<string key="NSKeyEquiv">h</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="732862070"/>
+									<reference key="NSMixedImage" ref="154462367"/>
+									<int key="NSTag">42</int>
+								</object>
+								<object class="NSMenuItem" id="191312176">
+									<reference key="NSMenu" ref="856655711"/>
+									<string key="NSTitle">Hide Others</string>
+									<reference key="NSKeyEquiv" ref="1005878359"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="732862070"/>
+									<reference key="NSMixedImage" ref="154462367"/>
+								</object>
+								<object class="NSMenuItem" id="392807560">
+									<reference key="NSMenu" ref="856655711"/>
+									<string key="NSTitle">Show All</string>
+									<reference key="NSKeyEquiv" ref="1005878359"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="732862070"/>
+									<reference key="NSMixedImage" ref="154462367"/>
+									<int key="NSTag">42</int>
+								</object>
+								<object class="NSMenuItem" id="648021277">
+									<reference key="NSMenu" ref="856655711"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<reference key="NSTitle" ref="1005878359"/>
+									<reference key="NSKeyEquiv" ref="1005878359"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="732862070"/>
+									<reference key="NSMixedImage" ref="154462367"/>
+								</object>
+								<object class="NSMenuItem" id="275459236">
+									<reference key="NSMenu" ref="856655711"/>
+									<string key="NSTitle">Quit X11</string>
+									<string key="NSKeyEquiv">q</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="732862070"/>
+									<reference key="NSMixedImage" ref="154462367"/>
+								</object>
+							</object>
+							<string key="NSName">_NSAppleMenu</string>
+						</object>
+					</object>
+					<object class="NSMenuItem" id="940914550">
+						<reference key="NSMenu" ref="496556081"/>
+						<string key="NSTitle" id="942587293">Applications</string>
+						<reference key="NSKeyEquiv" ref="1005878359"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="732862070"/>
+						<reference key="NSMixedImage" ref="154462367"/>
+						<string key="NSAction">submenuAction:</string>
+						<object class="NSMenu" key="NSSubmenu" id="684156653">
+							<reference key="NSTitle" ref="942587293"/>
+							<object class="NSMutableArray" key="NSMenuItems">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSMenuItem" id="940363272">
+									<reference key="NSMenu" ref="684156653"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<reference key="NSTitle" ref="1005878359"/>
+									<reference key="NSKeyEquiv" ref="1005878359"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="732862070"/>
+									<reference key="NSMixedImage" ref="154462367"/>
+								</object>
+								<object class="NSMenuItem" id="767830074">
+									<reference key="NSMenu" ref="684156653"/>
+									<string key="NSTitle">Customize...</string>
+									<reference key="NSKeyEquiv" ref="1005878359"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="732862070"/>
+									<reference key="NSMixedImage" ref="154462367"/>
+								</object>
+							</object>
+						</object>
+					</object>
+					<object class="NSMenuItem" id="326076563">
+						<reference key="NSMenu" ref="496556081"/>
+						<string key="NSTitle" id="38701994">Edit</string>
+						<reference key="NSKeyEquiv" ref="1005878359"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="732862070"/>
+						<reference key="NSMixedImage" ref="154462367"/>
+						<string key="NSAction">submenuAction:</string>
+						<object class="NSMenu" key="NSSubmenu" id="932839819">
+							<reference key="NSTitle" ref="38701994"/>
+							<object class="NSMutableArray" key="NSMenuItems">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSMenuItem" id="159704190">
+									<reference key="NSMenu" ref="932839819"/>
+									<string key="NSTitle">Undo</string>
+									<string key="NSKeyEquiv">z</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="732862070"/>
+									<reference key="NSMixedImage" ref="154462367"/>
+								</object>
+								<object class="NSMenuItem" id="634656440">
+									<reference key="NSMenu" ref="932839819"/>
+									<string key="NSTitle">Redo</string>
+									<string key="NSKeyEquiv">Z</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="732862070"/>
+									<reference key="NSMixedImage" ref="154462367"/>
+								</object>
+								<object class="NSMenuItem" id="342107529">
+									<reference key="NSMenu" ref="932839819"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<reference key="NSTitle" ref="1005878359"/>
+									<reference key="NSKeyEquiv" ref="1005878359"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="732862070"/>
+									<reference key="NSMixedImage" ref="154462367"/>
+								</object>
+								<object class="NSMenuItem" id="590926585">
+									<reference key="NSMenu" ref="932839819"/>
+									<string key="NSTitle">Cut</string>
+									<string key="NSKeyEquiv">x</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="732862070"/>
+									<reference key="NSMixedImage" ref="154462367"/>
+								</object>
+								<object class="NSMenuItem" id="204575684">
+									<reference key="NSMenu" ref="932839819"/>
+									<string key="NSTitle">Copy</string>
+									<string key="NSKeyEquiv">c</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="732862070"/>
+									<reference key="NSMixedImage" ref="154462367"/>
+								</object>
+								<object class="NSMenuItem" id="739720090">
+									<reference key="NSMenu" ref="932839819"/>
+									<string key="NSTitle">Paste</string>
+									<string key="NSKeyEquiv">v</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="732862070"/>
+									<reference key="NSMixedImage" ref="154462367"/>
+								</object>
+								<object class="NSMenuItem" id="549812830">
+									<reference key="NSMenu" ref="932839819"/>
+									<string key="NSTitle">Delete</string>
+									<reference key="NSKeyEquiv" ref="1005878359"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="732862070"/>
+									<reference key="NSMixedImage" ref="154462367"/>
+								</object>
+								<object class="NSMenuItem" id="584461964">
+									<reference key="NSMenu" ref="932839819"/>
+									<string key="NSTitle">Select All</string>
+									<reference key="NSKeyEquiv" ref="982375500"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="732862070"/>
+									<reference key="NSMixedImage" ref="154462367"/>
+								</object>
+							</object>
+						</object>
+					</object>
+					<object class="NSMenuItem" id="736341863">
+						<reference key="NSMenu" ref="496556081"/>
+						<string key="NSTitle">Window</string>
+						<reference key="NSKeyEquiv" ref="1005878359"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="732862070"/>
+						<reference key="NSMixedImage" ref="154462367"/>
+						<string key="NSAction">submenuAction:</string>
+						<object class="NSMenu" key="NSSubmenu" id="943404979">
+							<object class="NSMutableString" key="NSTitle">
+								<characters key="NS.bytes">Window</characters>
+							</object>
+							<object class="NSMutableArray" key="NSMenuItems">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSMenuItem" id="915861349">
+									<reference key="NSMenu" ref="943404979"/>
+									<string key="NSTitle">Minimize Window</string>
+									<string key="NSKeyEquiv">m</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="732862070"/>
+									<reference key="NSMixedImage" ref="154462367"/>
+								</object>
+								<object class="NSMenuItem" id="442007350">
+									<reference key="NSMenu" ref="943404979"/>
+									<string key="NSTitle">Close Window</string>
+									<string key="NSKeyEquiv">w</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="732862070"/>
+									<reference key="NSMixedImage" ref="154462367"/>
+								</object>
+								<object class="NSMenuItem" id="722764538">
+									<reference key="NSMenu" ref="943404979"/>
+									<string key="NSTitle">Zoom Window</string>
+									<reference key="NSKeyEquiv" ref="1005878359"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="732862070"/>
+									<reference key="NSMixedImage" ref="154462367"/>
+								</object>
+								<object class="NSMenuItem" id="783034074">
+									<reference key="NSMenu" ref="943404979"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<reference key="NSTitle" ref="1005878359"/>
+									<reference key="NSKeyEquiv" ref="1005878359"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="732862070"/>
+									<reference key="NSMixedImage" ref="154462367"/>
+								</object>
+								<object class="NSMenuItem" id="283496700">
+									<reference key="NSMenu" ref="943404979"/>
+									<string key="NSTitle">Next Window</string>
+									<string type="base64-UTF8" key="NSKeyEquiv">75yDA</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="732862070"/>
+									<reference key="NSMixedImage" ref="154462367"/>
+								</object>
+								<object class="NSMenuItem" id="500397106">
+									<reference key="NSMenu" ref="943404979"/>
+									<string key="NSTitle">Previous Window</string>
+									<string type="base64-UTF8" key="NSKeyEquiv">75yCA</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="732862070"/>
+									<reference key="NSMixedImage" ref="154462367"/>
+								</object>
+								<object class="NSMenuItem" id="303213786">
+									<reference key="NSMenu" ref="943404979"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<reference key="NSTitle" ref="1005878359"/>
+									<reference key="NSKeyEquiv" ref="1005878359"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="732862070"/>
+									<reference key="NSMixedImage" ref="154462367"/>
+								</object>
+								<object class="NSMenuItem" id="853630143">
+									<reference key="NSMenu" ref="943404979"/>
+									<string key="NSTitle">Bring All to Front</string>
+									<reference key="NSKeyEquiv" ref="1005878359"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="732862070"/>
+									<reference key="NSMixedImage" ref="154462367"/>
+								</object>
+								<object class="NSMenuItem" id="332241222">
+									<reference key="NSMenu" ref="943404979"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<reference key="NSTitle" ref="1005878359"/>
+									<reference key="NSKeyEquiv" ref="1005878359"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="732862070"/>
+									<reference key="NSMixedImage" ref="154462367"/>
+								</object>
+							</object>
+							<string key="NSName">_NSWindowsMenu</string>
+						</object>
+					</object>
+					<object class="NSMenuItem" id="934950259">
+						<reference key="NSMenu" ref="496556081"/>
+						<string key="NSTitle" id="955297347">Help</string>
+						<reference key="NSKeyEquiv" ref="1005878359"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="732862070"/>
+						<reference key="NSMixedImage" ref="154462367"/>
+						<string key="NSAction">submenuAction:</string>
+						<object class="NSMenu" key="NSSubmenu" id="1052262524">
+							<reference key="NSTitle" ref="955297347"/>
+							<object class="NSMutableArray" key="NSMenuItems">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSMenuItem" id="122992289">
+									<reference key="NSMenu" ref="1052262524"/>
+									<string key="NSTitle">X11 Help</string>
+									<reference key="NSKeyEquiv" ref="1005878359"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="732862070"/>
+									<reference key="NSMixedImage" ref="154462367"/>
+								</object>
+							</object>
+						</object>
+					</object>
+				</object>
+				<string key="NSName">_NSMainMenu</string>
+			</object>
+			<object class="NSCustomObject" id="88064061">
+				<string key="NSClassName" id="517073442">X11Controller</string>
+			</object>
+			<object class="NSWindowTemplate" id="210544761">
+				<int key="NSWindowStyleMask">3</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{319, 323}, {478, 316}}</string>
+				<int key="NSWTFlags">1350041600</int>
+				<string key="NSWindowTitle">X11 Preferences</string>
+				<string key="NSWindowClass" id="643663067">NSPanel</string>
+				<object class="NSMutableString" key="NSViewClass">
+					<characters key="NS.bytes">View</characters>
+				</object>
+				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
+				<string key="NSWindowContentMinSize">{213, 107}</string>
+				<object class="NSView" key="NSWindowView" id="404125972">
+					<nil key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<object class="NSMutableArray" key="NSSubviews">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSTabView" id="75927203">
+							<reference key="NSNextResponder" ref="404125972"/>
+							<int key="NSvFlags">256</int>
+							<object class="NSMutableArray" key="NSSubviews">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSView" id="527709877">
+									<reference key="NSNextResponder" ref="75927203"/>
+									<int key="NSvFlags">256</int>
+									<object class="NSMutableArray" key="NSSubviews">
+										<bool key="EncodedWithXMLCoder">YES</bool>
+										<object class="NSButton" id="1045559310">
+											<reference key="NSNextResponder" ref="527709877"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{18, 90}, {402, 18}}</string>
+											<reference key="NSSuperview" ref="527709877"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSButtonCell" key="NSCell" id="225158677">
+												<int key="NSCellFlags">67239424</int>
+												<int key="NSCellFlags2">0</int>
+												<string key="NSContents">Use system alert effect</string>
+												<object class="NSFont" key="NSSupport" id="706343604">
+													<string key="NSName" id="508374773">LucidaGrande</string>
+													<double key="NSSize">1.300000e+01</double>
+													<int key="NSfFlags">1044</int>
+												</object>
+												<reference key="NSControlView" ref="1045559310"/>
+												<int key="NSButtonFlags">1211912703</int>
+												<int key="NSButtonFlags2">2</int>
+												<object class="NSButtonImageSource" key="NSAlternateImage" id="876172194">
+													<string key="NSImageName">NSSwitch</string>
+												</object>
+												<reference key="NSAlternateContents" ref="1005878359"/>
+												<reference key="NSKeyEquivalent" ref="1005878359"/>
+												<int key="NSPeriodicDelay">200</int>
+												<int key="NSPeriodicInterval">25</int>
+											</object>
+										</object>
+										<object class="NSTextField" id="67626595">
+											<reference key="NSNextResponder" ref="527709877"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{36, 56}, {385, 28}}</string>
+											<reference key="NSSuperview" ref="527709877"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="1072420481">
+												<int key="NSCellFlags">67239424</int>
+												<int key="NSCellFlags2">4194304</int>
+												<string key="NSContents">X11 beeps will use the standard system alert, as defined in the Sound Effects system preferences panel.</string>
+												<object class="NSFont" key="NSSupport" id="26">
+													<reference key="NSName" ref="508374773"/>
+													<double key="NSSize">1.100000e+01</double>
+													<int key="NSfFlags">3100</int>
+												</object>
+												<reference key="NSControlView" ref="67626595"/>
+												<object class="NSColor" key="NSBackgroundColor" id="320865741">
+													<int key="NSColorSpace">6</int>
+													<string key="NSCatalogName" id="1000587476">System</string>
+													<string key="NSColorName">controlColor</string>
+													<object class="NSColor" key="NSColor" id="1000384962">
+														<int key="NSColorSpace">3</int>
+														<bytes key="NSWhite">MC42NjY2NjY2OQA</bytes>
+													</object>
+												</object>
+												<object class="NSColor" key="NSTextColor" id="233849662">
+													<int key="NSColorSpace">6</int>
+													<reference key="NSCatalogName" ref="1000587476"/>
+													<string key="NSColorName">controlTextColor</string>
+													<object class="NSColor" key="NSColor" id="608123050">
+														<int key="NSColorSpace">3</int>
+														<bytes key="NSWhite">MAA</bytes>
+													</object>
+												</object>
+											</object>
+										</object>
+										<object class="NSPopUpButton" id="300224954">
+											<reference key="NSNextResponder" ref="527709877"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{74, 209}, {128, 26}}</string>
+											<reference key="NSSuperview" ref="527709877"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSPopUpButtonCell" key="NSCell" id="301142744">
+												<int key="NSCellFlags">-2076049856</int>
+												<int key="NSCellFlags2">1024</int>
+												<reference key="NSSupport" ref="706343604"/>
+												<reference key="NSControlView" ref="300224954"/>
+												<int key="NSButtonFlags">109199615</int>
+												<int key="NSButtonFlags2">1</int>
+												<object class="NSFont" key="NSAlternateImage">
+													<reference key="NSName" ref="508374773"/>
+													<double key="NSSize">1.300000e+01</double>
+													<int key="NSfFlags">16</int>
+												</object>
+												<object class="NSMutableString" key="NSAlternateContents">
+													<characters key="NS.bytes"/>
+												</object>
+												<object class="NSMutableString" key="NSKeyEquivalent">
+													<characters key="NS.bytes"/>
+												</object>
+												<int key="NSPeriodicDelay">400</int>
+												<int key="NSPeriodicInterval">75</int>
+												<object class="NSMenuItem" key="NSMenuItem" id="473657062">
+													<reference key="NSMenu" ref="1071781177"/>
+													<string key="NSTitle">From Display</string>
+													<reference key="NSKeyEquiv" ref="1005878359"/>
+													<int key="NSKeyEquivModMask">1048576</int>
+													<int key="NSMnemonicLoc">2147483647</int>
+													<int key="NSState">1</int>
+													<reference key="NSOnImage" ref="732862070"/>
+													<reference key="NSMixedImage" ref="154462367"/>
+													<string key="NSAction">_popUpItemAction:</string>
+													<int key="NSTag">-1</int>
+													<reference key="NSTarget" ref="301142744"/>
+												</object>
+												<bool key="NSMenuItemRespectAlignment">YES</bool>
+												<object class="NSMenu" key="NSMenu" id="1071781177">
+													<object class="NSMutableString" key="NSTitle">
+														<characters key="NS.bytes">OtherViews</characters>
+													</object>
+													<object class="NSMutableArray" key="NSMenuItems">
+														<bool key="EncodedWithXMLCoder">YES</bool>
+														<reference ref="473657062"/>
+														<object class="NSMenuItem" id="827519886">
+															<reference key="NSMenu" ref="1071781177"/>
+															<string key="NSTitle">256 Colors</string>
+															<reference key="NSKeyEquiv" ref="1005878359"/>
+															<int key="NSKeyEquivModMask">1048576</int>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="732862070"/>
+															<reference key="NSMixedImage" ref="154462367"/>
+															<string key="NSAction">_popUpItemAction:</string>
+															<int key="NSTag">8</int>
+															<reference key="NSTarget" ref="301142744"/>
+														</object>
+														<object class="NSMenuItem" id="247508345">
+															<reference key="NSMenu" ref="1071781177"/>
+															<string key="NSTitle">Thousands</string>
+															<reference key="NSKeyEquiv" ref="1005878359"/>
+															<int key="NSKeyEquivModMask">1048576</int>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="732862070"/>
+															<reference key="NSMixedImage" ref="154462367"/>
+															<string key="NSAction">_popUpItemAction:</string>
+															<int key="NSTag">15</int>
+															<reference key="NSTarget" ref="301142744"/>
+														</object>
+														<object class="NSMenuItem" id="611307925">
+															<reference key="NSMenu" ref="1071781177"/>
+															<string key="NSTitle">Millions</string>
+															<reference key="NSKeyEquiv" ref="1005878359"/>
+															<int key="NSKeyEquivModMask">1048576</int>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="732862070"/>
+															<reference key="NSMixedImage" ref="154462367"/>
+															<string key="NSAction">_popUpItemAction:</string>
+															<int key="NSTag">24</int>
+															<reference key="NSTarget" ref="301142744"/>
+														</object>
+													</object>
+												</object>
+												<int key="NSPreferredEdge">3</int>
+												<bool key="NSUsesItemFromMenu">YES</bool>
+												<bool key="NSAltersState">YES</bool>
+												<int key="NSArrowPosition">1</int>
+											</object>
+										</object>
+										<object class="NSTextField" id="717889178">
+											<reference key="NSNextResponder" ref="527709877"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{17, 212}, {55, 20}}</string>
+											<reference key="NSSuperview" ref="527709877"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="749756205">
+												<int key="NSCellFlags">67239424</int>
+												<int key="NSCellFlags2">4194304</int>
+												<string type="base64-UTF8" key="NSContents">Q29sb3JzOgo</string>
+												<reference key="NSSupport" ref="706343604"/>
+												<reference key="NSControlView" ref="717889178"/>
+												<reference key="NSBackgroundColor" ref="320865741"/>
+												<reference key="NSTextColor" ref="233849662"/>
+											</object>
+										</object>
+										<object class="NSTextField" id="114173823">
+											<reference key="NSNextResponder" ref="527709877"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{36, 190}, {392, 14}}</string>
+											<reference key="NSSuperview" ref="527709877"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="725554783">
+												<int key="NSCellFlags">67239424</int>
+												<int key="NSCellFlags2">4194304</int>
+												<string key="NSContents">This option takes effect when X11 is launched again.</string>
+												<reference key="NSSupport" ref="26"/>
+												<reference key="NSControlView" ref="114173823"/>
+												<reference key="NSBackgroundColor" ref="320865741"/>
+												<reference key="NSTextColor" ref="233849662"/>
+											</object>
+										</object>
+										<object class="NSButton" id="817420822">
+											<reference key="NSNextResponder" ref="527709877"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{18, 156}, {409, 23}}</string>
+											<reference key="NSSuperview" ref="527709877"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSButtonCell" key="NSCell" id="100363081">
+												<int key="NSCellFlags">67239424</int>
+												<int key="NSCellFlags2">0</int>
+												<string key="NSContents">Full screen mode</string>
+												<reference key="NSSupport" ref="706343604"/>
+												<reference key="NSControlView" ref="817420822"/>
+												<int key="NSButtonFlags">1211912703</int>
+												<int key="NSButtonFlags2">2</int>
+												<reference key="NSAlternateImage" ref="876172194"/>
+												<reference key="NSAlternateContents" ref="1005878359"/>
+												<reference key="NSKeyEquivalent" ref="1005878359"/>
+												<int key="NSPeriodicDelay">200</int>
+												<int key="NSPeriodicInterval">25</int>
+											</object>
+										</object>
+										<object class="NSTextField" id="959270736">
+											<reference key="NSNextResponder" ref="527709877"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{36, 119}, {385, 31}}</string>
+											<reference key="NSSuperview" ref="527709877"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="550432669">
+												<int key="NSCellFlags">67239424</int>
+												<int key="NSCellFlags2">4194304</int>
+												<string key="NSContents">Enables the X11 root window. Use the Command-Option-A keystroke to enter and leave full screen mode.</string>
+												<reference key="NSSupport" ref="26"/>
+												<reference key="NSControlView" ref="959270736"/>
+												<reference key="NSBackgroundColor" ref="320865741"/>
+												<reference key="NSTextColor" ref="233849662"/>
+											</object>
+										</object>
+									</object>
+									<string key="NSFrame">{{10, 33}, {438, 253}}</string>
+									<reference key="NSSuperview" ref="75927203"/>
+								</object>
+							</object>
+							<string key="NSFrame">{{10, 7}, {458, 299}}</string>
+							<reference key="NSSuperview" ref="404125972"/>
+							<object class="NSMutableArray" key="NSTabViewItems">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSTabViewItem" id="17244958">
+									<object class="NSMutableString" key="NSIdentifier">
+										<characters key="NS.bytes">1</characters>
+									</object>
+									<object class="NSView" key="NSView" id="600332710">
+										<nil key="NSNextResponder"/>
+										<int key="NSvFlags">256</int>
+										<object class="NSMutableArray" key="NSSubviews">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+											<object class="NSButton" id="808306730">
+												<reference key="NSNextResponder" ref="600332710"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{18, 217}, {402, 18}}</string>
+												<reference key="NSSuperview" ref="600332710"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="727617204">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Emulate three button mouse</string>
+													<reference key="NSSupport" ref="706343604"/>
+													<reference key="NSControlView" ref="808306730"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="876172194"/>
+													<reference key="NSAlternateContents" ref="1005878359"/>
+													<reference key="NSKeyEquivalent" ref="1005878359"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="618388983">
+												<reference key="NSNextResponder" ref="600332710"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{36, 67}, {385, 31}}</string>
+												<reference key="NSSuperview" ref="600332710"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="140236247">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">When enabled, menu bar key equivalents may interfere with X11 applications that use the Meta modifier.</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="618388983"/>
+													<reference key="NSBackgroundColor" ref="320865741"/>
+													<reference key="NSTextColor" ref="233849662"/>
+												</object>
+											</object>
+											<object class="NSTextField" id="754792079">
+												<reference key="NSNextResponder" ref="600332710"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{36, 182}, {385, 29}}</string>
+												<reference key="NSSuperview" ref="600332710"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="110537159">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string type="base64-UTF8" key="NSContents">SG9sZCBPcHRpb24gYW5kIENvbW1hbmQgd2hpbGUgY2xpY2tpbmcgdG8gYWN0aXZhdGUgdGhlIG1pZGRs
+ZSBhbmQgcmlnaHQgbW91c2UgYnV0dG9ucy4KA</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="754792079"/>
+													<reference key="NSBackgroundColor" ref="320865741"/>
+													<reference key="NSTextColor" ref="233849662"/>
+												</object>
+											</object>
+											<object class="NSButton" id="677150201">
+												<reference key="NSNextResponder" ref="600332710"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{18, 104}, {402, 18}}</string>
+												<reference key="NSSuperview" ref="600332710"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="46680941">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Enable key equivalents under X11</string>
+													<reference key="NSSupport" ref="706343604"/>
+													<reference key="NSControlView" ref="677150201"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="876172194"/>
+													<reference key="NSAlternateContents" ref="1005878359"/>
+													<reference key="NSKeyEquivalent" ref="1005878359"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="228801813">
+												<reference key="NSNextResponder" ref="600332710"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{36, 133}, {385, 14}}</string>
+												<reference key="NSSuperview" ref="600332710"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="415694484">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">Allows input menu changes to overwrite the current X11 keymap.</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="228801813"/>
+													<reference key="NSBackgroundColor" ref="320865741"/>
+													<reference key="NSTextColor" ref="233849662"/>
+												</object>
+											</object>
+											<object class="NSButton" id="793493073">
+												<reference key="NSNextResponder" ref="600332710"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{18, 153}, {402, 18}}</string>
+												<reference key="NSSuperview" ref="600332710"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="466260504">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Follow system keyboard layout</string>
+													<reference key="NSSupport" ref="706343604"/>
+													<reference key="NSControlView" ref="793493073"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="876172194"/>
+													<reference key="NSAlternateContents" ref="1005878359"/>
+													<reference key="NSKeyEquivalent" ref="1005878359"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+										</object>
+										<string key="NSFrame">{{10, 33}, {438, 253}}</string>
+									</object>
+									<string key="NSLabel">Input</string>
+									<reference key="NSColor" ref="320865741"/>
+									<reference key="NSTabView" ref="75927203"/>
+								</object>
+								<object class="NSTabViewItem" id="493727923">
+									<object class="NSMutableString" key="NSIdentifier">
+										<characters key="NS.bytes">2</characters>
+									</object>
+									<reference key="NSView" ref="527709877"/>
+									<string key="NSLabel">Output</string>
+									<reference key="NSColor" ref="320865741"/>
+									<reference key="NSTabView" ref="75927203"/>
+								</object>
+								<object class="NSTabViewItem" id="1036577743">
+									<object class="NSView" key="NSView" id="536248195">
+										<nil key="NSNextResponder"/>
+										<int key="NSvFlags">256</int>
+										<object class="NSMutableArray" key="NSSubviews">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+											<object class="NSButton" id="137435489">
+												<reference key="NSNextResponder" ref="536248195"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{18, 217}, {402, 18}}</string>
+												<reference key="NSSuperview" ref="536248195"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="891925158">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Authenticate connections</string>
+													<reference key="NSSupport" ref="706343604"/>
+													<reference key="NSControlView" ref="137435489"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="876172194"/>
+													<reference key="NSAlternateContents" ref="1005878359"/>
+													<reference key="NSKeyEquivalent" ref="1005878359"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSButton" id="663154230">
+												<reference key="NSNextResponder" ref="536248195"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{18, 140}, {402, 18}}</string>
+												<reference key="NSSuperview" ref="536248195"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="836703945">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Allow connections from network clients</string>
+													<reference key="NSSupport" ref="706343604"/>
+													<reference key="NSControlView" ref="663154230"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="876172194"/>
+													<reference key="NSAlternateContents" ref="1005878359"/>
+													<reference key="NSKeyEquivalent" ref="1005878359"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="417801719">
+												<reference key="NSNextResponder" ref="536248195"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{36, 169}, {385, 42}}</string>
+												<reference key="NSSuperview" ref="536248195"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="935570098">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string type="base64-UTF8" key="NSContents">TGF1bmNoaW5nIFgxMSB3aWxsIGNyZWF0ZSBYYXV0aG9yaXR5IGFjY2Vzcy1jb250cm9sIGtleXMuIElm
+IHRoZSBzeXN0ZW0ncyBJUCBhZGRyZXNzIGNoYW5nZXMsIHRoZXNlIGtleXMgYmVjb21lIGludmFsaWQg
+d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="417801719"/>
+													<reference key="NSBackgroundColor" ref="320865741"/>
+													<reference key="NSTextColor" ref="233849662"/>
+												</object>
+											</object>
+											<object class="NSTextField" id="115954190">
+												<reference key="NSNextResponder" ref="536248195"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{36, 92}, {385, 42}}</string>
+												<reference key="NSSuperview" ref="536248195"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="144257898">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">If enabled, Authenticate connections must also be enabled to ensure system security. When disabled, connections from remote applications are not allowed.</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="115954190"/>
+													<reference key="NSBackgroundColor" ref="320865741"/>
+													<reference key="NSTextColor" ref="233849662"/>
+												</object>
+											</object>
+											<object class="NSTextField" id="1067279202">
+												<reference key="NSNextResponder" ref="536248195"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{17, 20}, {404, 14}}</string>
+												<reference key="NSSuperview" ref="536248195"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="703874672">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">These options take effect when X11 is next launched.</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="1067279202"/>
+													<reference key="NSBackgroundColor" ref="320865741"/>
+													<reference key="NSTextColor" ref="233849662"/>
+												</object>
+											</object>
+										</object>
+										<string key="NSFrame">{{10, 33}, {438, 253}}</string>
+									</object>
+									<string key="NSLabel">Security</string>
+									<reference key="NSColor" ref="320865741"/>
+									<reference key="NSTabView" ref="75927203"/>
+								</object>
+							</object>
+							<reference key="NSSelectedTabViewItem" ref="493727923"/>
+							<reference key="NSFont" ref="706343604"/>
+							<int key="NSTvFlags">0</int>
+							<bool key="NSAllowTruncatedLabels">YES</bool>
+							<bool key="NSDrawsBackground">YES</bool>
+						</object>
+					</object>
+					<string key="NSFrameSize">{478, 316}</string>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+				<string key="NSMinSize">{213, 129}</string>
+				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
+				<string key="NSFrameAutosaveName">x11_prefs</string>
+			</object>
+			<object class="NSWindowTemplate" id="796776534">
+				<int key="NSWindowStyleMask">11</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{279, 270}, {486, 310}}</string>
+				<int key="NSWTFlags">1350041600</int>
+				<string key="NSWindowTitle">X11 Application Menu</string>
+				<reference key="NSWindowClass" ref="643663067"/>
+				<object class="NSMutableString" key="NSViewClass">
+					<characters key="NS.bytes">View</characters>
+				</object>
+				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
+				<string key="NSWindowContentMinSize">{213, 107}</string>
+				<object class="NSView" key="NSWindowView" id="1039094689">
+					<nil key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<object class="NSMutableArray" key="NSSubviews">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSButton" id="1002101696">
+							<reference key="NSNextResponder" ref="1039094689"/>
+							<int key="NSvFlags">303</int>
+							<string key="NSFrame">{{388, 12}, {84, 32}}</string>
+							<reference key="NSSuperview" ref="1039094689"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="558394524">
+								<int key="NSCellFlags">-2080244224</int>
+								<int key="NSCellFlags2">137887744</int>
+								<string key="NSContents">Done</string>
+								<reference key="NSSupport" ref="706343604"/>
+								<reference key="NSControlView" ref="1002101696"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">1</int>
+								<object class="NSFont" key="NSAlternateImage" id="965938342">
+									<string key="NSName">Helvetica</string>
+									<double key="NSSize">1.300000e+01</double>
+									<int key="NSfFlags">16</int>
+								</object>
+								<reference key="NSAlternateContents" ref="1005878359"/>
+								<object class="NSMutableString" key="NSKeyEquivalent">
+									<characters key="NS.bytes"/>
+								</object>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSButton" id="711288662">
+							<reference key="NSNextResponder" ref="1039094689"/>
+							<int key="NSvFlags">301</int>
+							<string key="NSFrame">{{372, 230}, {100, 32}}</string>
+							<reference key="NSSuperview" ref="1039094689"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="413164923">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">137887744</int>
+								<string key="NSContents">Duplicate</string>
+								<reference key="NSSupport" ref="706343604"/>
+								<reference key="NSControlView" ref="711288662"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">1</int>
+								<reference key="NSAlternateImage" ref="965938342"/>
+								<object class="NSMutableString" key="NSAlternateContents">
+									<characters key="NS.bytes"/>
+								</object>
+								<object class="NSMutableString" key="NSKeyEquivalent">
+									<characters key="NS.bytes"/>
+								</object>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSButton" id="634701477">
+							<reference key="NSNextResponder" ref="1039094689"/>
+							<int key="NSvFlags">301</int>
+							<string key="NSFrame">{{372, 198}, {100, 32}}</string>
+							<reference key="NSSuperview" ref="1039094689"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="26248495">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">137887744</int>
+								<string key="NSContents">Remove</string>
+								<reference key="NSSupport" ref="706343604"/>
+								<reference key="NSControlView" ref="634701477"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">1</int>
+								<reference key="NSAlternateImage" ref="965938342"/>
+								<object class="NSMutableString" key="NSAlternateContents">
+									<characters key="NS.bytes"/>
+								</object>
+								<object class="NSMutableString" key="NSKeyEquivalent">
+									<characters key="NS.bytes"/>
+								</object>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSScrollView" id="1011512617">
+							<reference key="NSNextResponder" ref="1039094689"/>
+							<int key="NSvFlags">307</int>
+							<object class="NSMutableArray" key="NSSubviews">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSClipView" id="963977695">
+									<reference key="NSNextResponder" ref="1011512617"/>
+									<int key="NSvFlags">2304</int>
+									<object class="NSMutableArray" key="NSSubviews">
+										<bool key="EncodedWithXMLCoder">YES</bool>
+										<object class="NSTableView" id="411425856">
+											<reference key="NSNextResponder" ref="963977695"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrameSize">{333, 197}</string>
+											<reference key="NSSuperview" ref="963977695"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTableHeaderView" key="NSHeaderView" id="526973850">
+												<reference key="NSNextResponder" ref="935843221"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrameSize">{333, 17}</string>
+												<reference key="NSSuperview" ref="935843221"/>
+												<reference key="NSTableView" ref="411425856"/>
+											</object>
+											<object class="_NSCornerView" key="NSCornerView" id="182265797">
+												<reference key="NSNextResponder" ref="1011512617"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{334, 0}, {16, 17}}</string>
+												<reference key="NSSuperview" ref="1011512617"/>
+											</object>
+											<object class="NSMutableArray" key="NSTableColumns">
+												<bool key="EncodedWithXMLCoder">YES</bool>
+												<object class="NSTableColumn" id="621551865">
+													<double key="NSWidth">7.900000e+01</double>
+													<double key="NSMinWidth">4.000000e+01</double>
+													<double key="NSMaxWidth">1.000000e+03</double>
+													<object class="NSTableHeaderCell" key="NSHeaderCell">
+														<int key="NSCellFlags">75628032</int>
+														<int key="NSCellFlags2">0</int>
+														<string key="NSContents">Name</string>
+														<reference key="NSSupport" ref="26"/>
+														<object class="NSColor" key="NSBackgroundColor" id="182967138">
+															<int key="NSColorSpace">3</int>
+															<bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes>
+														</object>
+														<object class="NSColor" key="NSTextColor" id="645274518">
+															<int key="NSColorSpace">6</int>
+															<reference key="NSCatalogName" ref="1000587476"/>
+															<string key="NSColorName">headerTextColor</string>
+															<reference key="NSColor" ref="608123050"/>
+														</object>
+													</object>
+													<object class="NSTextFieldCell" key="NSDataCell" id="195831317">
+														<int key="NSCellFlags">338820672</int>
+														<int key="NSCellFlags2">1024</int>
+														<reference key="NSSupport" ref="706343604"/>
+														<reference key="NSControlView" ref="411425856"/>
+														<object class="NSColor" key="NSBackgroundColor" id="722293876">
+															<int key="NSColorSpace">3</int>
+															<bytes key="NSWhite">MQA</bytes>
+														</object>
+														<reference key="NSTextColor" ref="233849662"/>
+													</object>
+													<int key="NSResizingMask">3</int>
+													<bool key="NSIsResizeable">YES</bool>
+													<bool key="NSIsEditable">YES</bool>
+													<reference key="NSTableView" ref="411425856"/>
+												</object>
+												<object class="NSTableColumn" id="976084317">
+													<double key="NSWidth">1.937310e+02</double>
+													<double key="NSMinWidth">6.273100e+01</double>
+													<double key="NSMaxWidth">1.000000e+03</double>
+													<object class="NSTableHeaderCell" key="NSHeaderCell">
+														<int key="NSCellFlags">75628032</int>
+														<int key="NSCellFlags2">0</int>
+														<string key="NSContents">Command</string>
+														<reference key="NSSupport" ref="26"/>
+														<reference key="NSBackgroundColor" ref="182967138"/>
+														<reference key="NSTextColor" ref="645274518"/>
+													</object>
+													<object class="NSTextFieldCell" key="NSDataCell" id="656574062">
+														<int key="NSCellFlags">338820672</int>
+														<int key="NSCellFlags2">1024</int>
+														<reference key="NSSupport" ref="706343604"/>
+														<reference key="NSControlView" ref="411425856"/>
+														<reference key="NSBackgroundColor" ref="722293876"/>
+														<reference key="NSTextColor" ref="233849662"/>
+													</object>
+													<int key="NSResizingMask">3</int>
+													<bool key="NSIsResizeable">YES</bool>
+													<bool key="NSIsEditable">YES</bool>
+													<reference key="NSTableView" ref="411425856"/>
+												</object>
+												<object class="NSTableColumn" id="661701503">
+													<double key="NSWidth">5.100000e+01</double>
+													<double key="NSMinWidth">1.000000e+01</double>
+													<double key="NSMaxWidth">1.000000e+03</double>
+													<object class="NSTableHeaderCell" key="NSHeaderCell">
+														<int key="NSCellFlags">67239424</int>
+														<int key="NSCellFlags2">0</int>
+														<string key="NSContents">Shortcut</string>
+														<reference key="NSSupport" ref="26"/>
+														<object class="NSColor" key="NSBackgroundColor">
+															<int key="NSColorSpace">6</int>
+															<reference key="NSCatalogName" ref="1000587476"/>
+															<string key="NSColorName">headerColor</string>
+															<reference key="NSColor" ref="722293876"/>
+														</object>
+														<reference key="NSTextColor" ref="645274518"/>
+													</object>
+													<object class="NSTextFieldCell" key="NSDataCell" id="90031137">
+														<int key="NSCellFlags">338820672</int>
+														<int key="NSCellFlags2">1024</int>
+														<object class="NSFont" key="NSSupport">
+															<reference key="NSName" ref="508374773"/>
+															<double key="NSSize">1.200000e+01</double>
+															<int key="NSfFlags">16</int>
+														</object>
+														<reference key="NSControlView" ref="411425856"/>
+														<bool key="NSDrawsBackground">YES</bool>
+														<object class="NSColor" key="NSBackgroundColor" id="447702889">
+															<int key="NSColorSpace">6</int>
+															<reference key="NSCatalogName" ref="1000587476"/>
+															<string key="NSColorName">controlBackgroundColor</string>
+															<reference key="NSColor" ref="1000384962"/>
+														</object>
+														<reference key="NSTextColor" ref="233849662"/>
+													</object>
+													<int key="NSResizingMask">3</int>
+													<bool key="NSIsResizeable">YES</bool>
+													<bool key="NSIsEditable">YES</bool>
+													<reference key="NSTableView" ref="411425856"/>
+												</object>
+											</object>
+											<double key="NSIntercellSpacingWidth">3.000000e+00</double>
+											<double key="NSIntercellSpacingHeight">2.000000e+00</double>
+											<reference key="NSBackgroundColor" ref="722293876"/>
+											<object class="NSColor" key="NSGridColor">
+												<int key="NSColorSpace">6</int>
+												<reference key="NSCatalogName" ref="1000587476"/>
+												<string key="NSColorName">gridColor</string>
+												<object class="NSColor" key="NSColor">
+													<int key="NSColorSpace">3</int>
+													<bytes key="NSWhite">MC41AA</bytes>
+												</object>
+											</object>
+											<double key="NSRowHeight">1.700000e+01</double>
+											<int key="NSTvFlags">1379958784</int>
+											<int key="NSColumnAutoresizingStyle">1</int>
+											<int key="NSDraggingSourceMaskForLocal">-1</int>
+											<int key="NSDraggingSourceMaskForNonLocal">0</int>
+											<bool key="NSAllowsTypeSelect">YES</bool>
+										</object>
+									</object>
+									<string key="NSFrame">{{1, 17}, {333, 197}}</string>
+									<reference key="NSSuperview" ref="1011512617"/>
+									<reference key="NSNextKeyView" ref="411425856"/>
+									<reference key="NSDocView" ref="411425856"/>
+									<reference key="NSBGColor" ref="447702889"/>
+									<int key="NScvFlags">4</int>
+								</object>
+								<object class="NSScroller" id="152467947">
+									<reference key="NSNextResponder" ref="1011512617"/>
+									<int key="NSvFlags">256</int>
+									<string key="NSFrame">{{334, 17}, {15, 197}}</string>
+									<reference key="NSSuperview" ref="1011512617"/>
+									<reference key="NSTarget" ref="1011512617"/>
+									<string key="NSAction" id="607822787">_doScroller:</string>
+									<double key="NSPercent">9.949238e-01</double>
+								</object>
+								<object class="NSScroller" id="208024104">
+									<reference key="NSNextResponder" ref="1011512617"/>
+									<int key="NSvFlags">256</int>
+									<string key="NSFrame">{{1, 214}, {333, 15}}</string>
+									<reference key="NSSuperview" ref="1011512617"/>
+									<int key="NSsFlags">1</int>
+									<reference key="NSTarget" ref="1011512617"/>
+									<reference key="NSAction" ref="607822787"/>
+									<double key="NSPercent">9.940299e-01</double>
+								</object>
+								<object class="NSClipView" id="935843221">
+									<reference key="NSNextResponder" ref="1011512617"/>
+									<int key="NSvFlags">2304</int>
+									<object class="NSMutableArray" key="NSSubviews">
+										<bool key="EncodedWithXMLCoder">YES</bool>
+										<reference ref="526973850"/>
+									</object>
+									<string key="NSFrame">{{1, 0}, {333, 17}}</string>
+									<reference key="NSSuperview" ref="1011512617"/>
+									<reference key="NSNextKeyView" ref="526973850"/>
+									<reference key="NSDocView" ref="526973850"/>
+									<reference key="NSBGColor" ref="447702889"/>
+									<int key="NScvFlags">4</int>
+								</object>
+								<reference ref="182265797"/>
+							</object>
+							<string key="NSFrame">{{20, 60}, {350, 230}}</string>
+							<reference key="NSSuperview" ref="1039094689"/>
+							<reference key="NSNextKeyView" ref="963977695"/>
+							<int key="NSsFlags">50</int>
+							<reference key="NSVScroller" ref="152467947"/>
+							<reference key="NSHScroller" ref="208024104"/>
+							<reference key="NSContentView" ref="963977695"/>
+							<reference key="NSHeaderClipView" ref="935843221"/>
+							<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
+						</object>
+						<object class="NSButton" id="859414998">
+							<reference key="NSNextResponder" ref="1039094689"/>
+							<int key="NSvFlags">303</int>
+							<string key="NSFrame">{{304, 12}, {84, 32}}</string>
+							<reference key="NSSuperview" ref="1039094689"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="537937846">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">137887744</int>
+								<string key="NSContents">Cancel</string>
+								<reference key="NSSupport" ref="706343604"/>
+								<reference key="NSControlView" ref="859414998"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">1</int>
+								<reference key="NSAlternateImage" ref="965938342"/>
+								<object class="NSMutableString" key="NSAlternateContents">
+									<characters key="NS.bytes"/>
+								</object>
+								<object class="NSMutableString" key="NSKeyEquivalent">
+									<characters key="NS.bytes"/>
+								</object>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSButton" id="381268760">
+							<reference key="NSNextResponder" ref="1039094689"/>
+							<int key="NSvFlags">301</int>
+							<string key="NSFrame">{{372, 262}, {100, 32}}</string>
+							<reference key="NSSuperview" ref="1039094689"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="99903682">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">137887744</int>
+								<string key="NSContents">Add Item</string>
+								<reference key="NSSupport" ref="706343604"/>
+								<reference key="NSControlView" ref="381268760"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">1</int>
+								<reference key="NSAlternateImage" ref="965938342"/>
+								<object class="NSMutableString" key="NSAlternateContents">
+									<characters key="NS.bytes"/>
+								</object>
+								<object class="NSMutableString" key="NSKeyEquivalent">
+									<characters key="NS.bytes"/>
+								</object>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+					</object>
+					<string key="NSFrame">{{1, 1}, {486, 310}}</string>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+				<string key="NSMinSize">{213, 129}</string>
+				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
+				<string key="NSFrameAutosaveName">x11_apps</string>
+			</object>
+			<object class="NSMenu" id="1001514180">
+				<string key="NSTitle">Menu</string>
+				<object class="NSMutableArray" key="NSMenuItems">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<object class="NSMenuItem" id="355724345">
+						<reference key="NSMenu" ref="1001514180"/>
+						<bool key="NSIsDisabled">YES</bool>
+						<bool key="NSIsSeparator">YES</bool>
+						<reference key="NSTitle" ref="1005878359"/>
+						<reference key="NSKeyEquiv" ref="1005878359"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="732862070"/>
+						<reference key="NSMixedImage" ref="154462367"/>
+					</object>
+					<object class="NSMenuItem" id="107275095">
+						<reference key="NSMenu" ref="1001514180"/>
+						<reference key="NSTitle" ref="942587293"/>
+						<reference key="NSKeyEquiv" ref="1005878359"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="732862070"/>
+						<reference key="NSMixedImage" ref="154462367"/>
+						<string key="NSAction">submenuAction:</string>
+						<object class="NSMenu" key="NSSubmenu" id="321919370">
+							<reference key="NSTitle" ref="942587293"/>
+							<object class="NSMutableArray" key="NSMenuItems">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSMenuItem" id="500771766">
+									<reference key="NSMenu" ref="321919370"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<reference key="NSTitle" ref="1005878359"/>
+									<reference key="NSKeyEquiv" ref="1005878359"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="732862070"/>
+									<reference key="NSMixedImage" ref="154462367"/>
+								</object>
+								<object class="NSMenuItem" id="656726997">
+									<reference key="NSMenu" ref="321919370"/>
+									<string type="base64-UTF8" key="NSTitle">Q3VzdG9taXpl4oCmA</string>
+									<reference key="NSKeyEquiv" ref="1005878359"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="732862070"/>
+									<reference key="NSMixedImage" ref="154462367"/>
+								</object>
+							</object>
+						</object>
+					</object>
+				</object>
+				<reference key="NSName" ref="1005878359"/>
+			</object>
+		</object>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<object class="NSMutableArray" key="connectionRecords">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">cut:</string>
+						<reference key="source" ref="518703249"/>
+						<reference key="destination" ref="590926585"/>
+					</object>
+					<int key="connectionID">175</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">paste:</string>
+						<reference key="source" ref="518703249"/>
+						<reference key="destination" ref="739720090"/>
+					</object>
+					<int key="connectionID">176</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">redo:</string>
+						<reference key="source" ref="518703249"/>
+						<reference key="destination" ref="634656440"/>
+					</object>
+					<int key="connectionID">178</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">selectAll:</string>
+						<reference key="source" ref="518703249"/>
+						<reference key="destination" ref="584461964"/>
+					</object>
+					<int key="connectionID">179</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">undo:</string>
+						<reference key="source" ref="518703249"/>
+						<reference key="destination" ref="159704190"/>
+					</object>
+					<int key="connectionID">180</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">copy:</string>
+						<reference key="source" ref="518703249"/>
+						<reference key="destination" ref="204575684"/>
+					</object>
+					<int key="connectionID">181</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">delete:</string>
+						<reference key="source" ref="518703249"/>
+						<reference key="destination" ref="549812830"/>
+					</object>
+					<int key="connectionID">195</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">minimize_window:</string>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="915861349"/>
+					</object>
+					<int key="connectionID">202</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">close_window:</string>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="442007350"/>
+					</object>
+					<int key="connectionID">205</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">zoom_window:</string>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="722764538"/>
+					</object>
+					<int key="connectionID">206</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">bring_to_front:</string>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="853630143"/>
+					</object>
+					<int key="connectionID">207</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">window_separator</string>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="332241222"/>
+					</object>
+					<int key="connectionID">260</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">hideOtherApplications:</string>
+						<reference key="source" ref="584863936"/>
+						<reference key="destination" ref="191312176"/>
+					</object>
+					<int key="connectionID">263</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">apps_separator</string>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="940363272"/>
+					</object>
+					<int key="connectionID">273</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">apps_table</string>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="411425856"/>
+					</object>
+					<int key="connectionID">301</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">apps_table_done:</string>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="1002101696"/>
+					</object>
+					<int key="connectionID">302</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">apps_table_delete:</string>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="634701477"/>
+					</object>
+					<int key="connectionID">303</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">apps_table_duplicate:</string>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="711288662"/>
+					</object>
+					<int key="connectionID">304</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label" id="178478735">apps_table_show:</string>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="767830074"/>
+					</object>
+					<int key="connectionID">308</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">apps_table_cancel:</string>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="859414998"/>
+					</object>
+					<int key="connectionID">309</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">apps_table_new:</string>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="381268760"/>
+					</object>
+					<int key="connectionID">311</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">prefs_show:</string>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="836585695"/>
+					</object>
+					<int key="connectionID">318</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">x11_about_item</string>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="588913325"/>
+					</object>
+					<int key="connectionID">321</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">enable_auth</string>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="137435489"/>
+					</object>
+					<int key="connectionID">387</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">enable_tcp</string>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="663154230"/>
+					</object>
+					<int key="connectionID">388</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">depth</string>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="300224954"/>
+					</object>
+					<int key="connectionID">389</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">use_sysbeep</string>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="1045559310"/>
+					</object>
+					<int key="connectionID">390</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">fake_buttons</string>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="808306730"/>
+					</object>
+					<int key="connectionID">391</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">sync_keymap</string>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="793493073"/>
+					</object>
+					<int key="connectionID">392</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">enable_keyequivs</string>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="677150201"/>
+					</object>
+					<int key="connectionID">393</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label" id="694471214">prefs_changed:</string>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="808306730"/>
+					</object>
+					<int key="connectionID">394</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<reference key="label" ref="694471214"/>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="793493073"/>
+					</object>
+					<int key="connectionID">395</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<reference key="label" ref="694471214"/>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="677150201"/>
+					</object>
+					<int key="connectionID">396</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<reference key="label" ref="694471214"/>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="1045559310"/>
+					</object>
+					<int key="connectionID">397</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<reference key="label" ref="694471214"/>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="300224954"/>
+					</object>
+					<int key="connectionID">398</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<reference key="label" ref="694471214"/>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="137435489"/>
+					</object>
+					<int key="connectionID">399</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<reference key="label" ref="694471214"/>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="663154230"/>
+					</object>
+					<int key="connectionID">401</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">prefs_panel</string>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="210544761"/>
+					</object>
+					<int key="connectionID">402</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">x11_help:</string>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="122992289"/>
+					</object>
+					<int key="connectionID">422</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">dockMenu</string>
+						<reference key="source" ref="584863936"/>
+						<reference key="destination" ref="1001514180"/>
+					</object>
+					<int key="connectionID">426</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">dock_menu</string>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="1001514180"/>
+					</object>
+					<int key="connectionID">428</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="584863936"/>
+						<reference key="destination" ref="88064061"/>
+					</object>
+					<int key="connectionID">429</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">hide:</string>
+						<reference key="source" ref="584863936"/>
+						<reference key="destination" ref="147703239"/>
+					</object>
+					<int key="connectionID">430</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">unhideAllApplications:</string>
+						<reference key="source" ref="584863936"/>
+						<reference key="destination" ref="392807560"/>
+					</object>
+					<int key="connectionID">431</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">terminate:</string>
+						<reference key="source" ref="584863936"/>
+						<reference key="destination" ref="275459236"/>
+					</object>
+					<int key="connectionID">432</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">orderFrontStandardAboutPanel:</string>
+						<reference key="source" ref="584863936"/>
+						<reference key="destination" ref="588913325"/>
+					</object>
+					<int key="connectionID">433</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">dock_apps_menu</string>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="321919370"/>
+					</object>
+					<int key="connectionID">530</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">dock_window_separator</string>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="355724345"/>
+					</object>
+					<int key="connectionID">531</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<reference key="label" ref="178478735"/>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="656726997"/>
+					</object>
+					<int key="connectionID">534</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">next_window:</string>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="283496700"/>
+					</object>
+					<int key="connectionID">539</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">previous_window:</string>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="500397106"/>
+					</object>
+					<int key="connectionID">540</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">enable_fullscreen</string>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="817420822"/>
+					</object>
+					<int key="connectionID">546</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">enable_fullscreen_changed:</string>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="817420822"/>
+					</object>
+					<int key="connectionID">547</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggle_fullscreen:</string>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="101686423"/>
+					</object>
+					<int key="connectionID">548</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">toggle_fullscreen_item</string>
+						<reference key="source" ref="88064061"/>
+						<reference key="destination" ref="101686423"/>
+					</object>
+					<int key="connectionID">549</int>
+				</object>
+			</object>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<object class="NSArray" key="orderedObjects">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<object class="NSArray" key="object" id="0">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
+						<reference key="children" ref="874420287"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="584863936"/>
+						<reference key="parent" ref="0"/>
+						<string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="518703249"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="166373373"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Application</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">29</int>
+						<reference key="object" ref="496556081"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="736341863"/>
+							<reference ref="385138428"/>
+							<reference ref="326076563"/>
+							<reference ref="940914550"/>
+							<reference ref="934950259"/>
+						</object>
+						<reference key="parent" ref="0"/>
+						<reference key="objectName" ref="414137626"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">19</int>
+						<reference key="object" ref="736341863"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="943404979"/>
+						</object>
+						<reference key="parent" ref="496556081"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">24</int>
+						<reference key="object" ref="943404979"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="853630143"/>
+							<reference ref="915861349"/>
+							<reference ref="783034074"/>
+							<reference ref="442007350"/>
+							<reference ref="722764538"/>
+							<reference ref="332241222"/>
+							<reference ref="303213786"/>
+							<reference ref="283496700"/>
+							<reference ref="500397106"/>
+						</object>
+						<reference key="parent" ref="736341863"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5</int>
+						<reference key="object" ref="853630143"/>
+						<reference key="parent" ref="943404979"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">23</int>
+						<reference key="object" ref="915861349"/>
+						<reference key="parent" ref="943404979"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">92</int>
+						<reference key="object" ref="783034074"/>
+						<reference key="parent" ref="943404979"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">203</int>
+						<reference key="object" ref="442007350"/>
+						<reference key="parent" ref="943404979"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">204</int>
+						<reference key="object" ref="722764538"/>
+						<reference key="parent" ref="943404979"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">208</int>
+						<reference key="object" ref="332241222"/>
+						<reference key="parent" ref="943404979"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">536</int>
+						<reference key="object" ref="303213786"/>
+						<reference key="parent" ref="943404979"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">537</int>
+						<reference key="object" ref="283496700"/>
+						<reference key="parent" ref="943404979"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">538</int>
+						<reference key="object" ref="500397106"/>
+						<reference key="parent" ref="943404979"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">56</int>
+						<reference key="object" ref="385138428"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="856655711"/>
+						</object>
+						<reference key="parent" ref="496556081"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">57</int>
+						<reference key="object" ref="856655711"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="588913325"/>
+							<reference ref="836585695"/>
+							<reference ref="63158341"/>
+							<reference ref="147703239"/>
+							<reference ref="275459236"/>
+							<reference ref="562920394"/>
+							<reference ref="635454008"/>
+							<reference ref="191312176"/>
+							<reference ref="648021277"/>
+							<reference ref="392807560"/>
+							<reference ref="101686423"/>
+							<reference ref="754231570"/>
+						</object>
+						<reference key="parent" ref="385138428"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">58</int>
+						<reference key="object" ref="588913325"/>
+						<reference key="parent" ref="856655711"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">129</int>
+						<reference key="object" ref="836585695"/>
+						<reference key="parent" ref="856655711"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">131</int>
+						<reference key="object" ref="63158341"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="502073457"/>
+						</object>
+						<reference key="parent" ref="856655711"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">130</int>
+						<reference key="object" ref="502073457"/>
+						<reference key="parent" ref="63158341"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">134</int>
+						<reference key="object" ref="147703239"/>
+						<reference key="parent" ref="856655711"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">136</int>
+						<reference key="object" ref="275459236"/>
+						<reference key="parent" ref="856655711"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">143</int>
+						<reference key="object" ref="562920394"/>
+						<reference key="parent" ref="856655711"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">144</int>
+						<reference key="object" ref="635454008"/>
+						<reference key="parent" ref="856655711"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">145</int>
+						<reference key="object" ref="191312176"/>
+						<reference key="parent" ref="856655711"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">149</int>
+						<reference key="object" ref="648021277"/>
+						<reference key="parent" ref="856655711"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">150</int>
+						<reference key="object" ref="392807560"/>
+						<reference key="parent" ref="856655711"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">544</int>
+						<reference key="object" ref="101686423"/>
+						<reference key="parent" ref="856655711"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">545</int>
+						<reference key="object" ref="754231570"/>
+						<reference key="parent" ref="856655711"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">163</int>
+						<reference key="object" ref="326076563"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="932839819"/>
+						</object>
+						<reference key="parent" ref="496556081"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">169</int>
+						<reference key="object" ref="932839819"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="342107529"/>
+							<reference ref="204575684"/>
+							<reference ref="159704190"/>
+							<reference ref="590926585"/>
+							<reference ref="549812830"/>
+							<reference ref="739720090"/>
+							<reference ref="584461964"/>
+							<reference ref="634656440"/>
+						</object>
+						<reference key="parent" ref="326076563"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">156</int>
+						<reference key="object" ref="342107529"/>
+						<reference key="parent" ref="932839819"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">157</int>
+						<reference key="object" ref="204575684"/>
+						<reference key="parent" ref="932839819"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">158</int>
+						<reference key="object" ref="159704190"/>
+						<reference key="parent" ref="932839819"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">160</int>
+						<reference key="object" ref="590926585"/>
+						<reference key="parent" ref="932839819"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">164</int>
+						<reference key="object" ref="549812830"/>
+						<reference key="parent" ref="932839819"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">171</int>
+						<reference key="object" ref="739720090"/>
+						<reference key="parent" ref="932839819"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">172</int>
+						<reference key="object" ref="584461964"/>
+						<reference key="parent" ref="932839819"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">173</int>
+						<reference key="object" ref="634656440"/>
+						<reference key="parent" ref="932839819"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">269</int>
+						<reference key="object" ref="940914550"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="684156653"/>
+						</object>
+						<reference key="parent" ref="496556081"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">270</int>
+						<reference key="object" ref="684156653"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="940363272"/>
+							<reference ref="767830074"/>
+						</object>
+						<reference key="parent" ref="940914550"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">272</int>
+						<reference key="object" ref="940363272"/>
+						<reference key="parent" ref="684156653"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">305</int>
+						<reference key="object" ref="767830074"/>
+						<reference key="parent" ref="684156653"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">419</int>
+						<reference key="object" ref="934950259"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="1052262524"/>
+						</object>
+						<reference key="parent" ref="496556081"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">420</int>
+						<reference key="object" ref="1052262524"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="122992289"/>
+						</object>
+						<reference key="parent" ref="934950259"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">421</int>
+						<reference key="object" ref="122992289"/>
+						<reference key="parent" ref="1052262524"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">196</int>
+						<reference key="object" ref="88064061"/>
+						<reference key="parent" ref="0"/>
+						<reference key="objectName" ref="517073442"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">244</int>
+						<reference key="object" ref="210544761"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="404125972"/>
+						</object>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">PrefsPanel</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">245</int>
+						<reference key="object" ref="404125972"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="75927203"/>
+						</object>
+						<reference key="parent" ref="210544761"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">348</int>
+						<reference key="object" ref="75927203"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="17244958"/>
+							<reference ref="493727923"/>
+							<reference ref="1036577743"/>
+						</object>
+						<reference key="parent" ref="404125972"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">349</int>
+						<reference key="object" ref="17244958"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="600332710"/>
+						</object>
+						<reference key="parent" ref="75927203"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">351</int>
+						<reference key="object" ref="600332710"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="808306730"/>
+							<reference ref="618388983"/>
+							<reference ref="754792079"/>
+							<reference ref="677150201"/>
+							<reference ref="228801813"/>
+							<reference ref="793493073"/>
+						</object>
+						<reference key="parent" ref="17244958"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">363</int>
+						<reference key="object" ref="808306730"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="727617204"/>
+						</object>
+						<reference key="parent" ref="600332710"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">364</int>
+						<reference key="object" ref="618388983"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="140236247"/>
+						</object>
+						<reference key="parent" ref="600332710"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">365</int>
+						<reference key="object" ref="754792079"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="110537159"/>
+						</object>
+						<reference key="parent" ref="600332710"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">368</int>
+						<reference key="object" ref="677150201"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="46680941"/>
+						</object>
+						<reference key="parent" ref="600332710"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">369</int>
+						<reference key="object" ref="228801813"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="415694484"/>
+						</object>
+						<reference key="parent" ref="600332710"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">370</int>
+						<reference key="object" ref="793493073"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="466260504"/>
+						</object>
+						<reference key="parent" ref="600332710"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">352</int>
+						<reference key="object" ref="493727923"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="527709877"/>
+						</object>
+						<reference key="parent" ref="75927203"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">350</int>
+						<reference key="object" ref="527709877"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="1045559310"/>
+							<reference ref="67626595"/>
+							<reference ref="300224954"/>
+							<reference ref="717889178"/>
+							<reference ref="114173823"/>
+							<reference ref="817420822"/>
+							<reference ref="959270736"/>
+						</object>
+						<reference key="parent" ref="493727923"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">371</int>
+						<reference key="object" ref="1045559310"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="225158677"/>
+						</object>
+						<reference key="parent" ref="527709877"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">372</int>
+						<reference key="object" ref="67626595"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="1072420481"/>
+						</object>
+						<reference key="parent" ref="527709877"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">382</int>
+						<reference key="object" ref="300224954"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="301142744"/>
+						</object>
+						<reference key="parent" ref="527709877"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">385</int>
+						<reference key="object" ref="717889178"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="749756205"/>
+						</object>
+						<reference key="parent" ref="527709877"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">386</int>
+						<reference key="object" ref="114173823"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="725554783"/>
+						</object>
+						<reference key="parent" ref="527709877"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">541</int>
+						<reference key="object" ref="817420822"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="100363081"/>
+						</object>
+						<reference key="parent" ref="527709877"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">543</int>
+						<reference key="object" ref="959270736"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="550432669"/>
+						</object>
+						<reference key="parent" ref="527709877"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">353</int>
+						<reference key="object" ref="1036577743"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="536248195"/>
+						</object>
+						<reference key="parent" ref="75927203"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">354</int>
+						<reference key="object" ref="536248195"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="137435489"/>
+							<reference ref="663154230"/>
+							<reference ref="417801719"/>
+							<reference ref="115954190"/>
+							<reference ref="1067279202"/>
+						</object>
+						<reference key="parent" ref="1036577743"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">374</int>
+						<reference key="object" ref="137435489"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="891925158"/>
+						</object>
+						<reference key="parent" ref="536248195"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">375</int>
+						<reference key="object" ref="663154230"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="836703945"/>
+						</object>
+						<reference key="parent" ref="536248195"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">376</int>
+						<reference key="object" ref="417801719"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="935570098"/>
+						</object>
+						<reference key="parent" ref="536248195"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">377</int>
+						<reference key="object" ref="115954190"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="144257898"/>
+						</object>
+						<reference key="parent" ref="536248195"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">379</int>
+						<reference key="object" ref="1067279202"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="703874672"/>
+						</object>
+						<reference key="parent" ref="536248195"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">285</int>
+						<reference key="object" ref="796776534"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="1039094689"/>
+						</object>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">EditPrograms</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">286</int>
+						<reference key="object" ref="1039094689"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="1002101696"/>
+							<reference ref="711288662"/>
+							<reference ref="634701477"/>
+							<reference ref="1011512617"/>
+							<reference ref="859414998"/>
+							<reference ref="381268760"/>
+						</object>
+						<reference key="parent" ref="796776534"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">291</int>
+						<reference key="object" ref="1002101696"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="558394524"/>
+						</object>
+						<reference key="parent" ref="1039094689"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">292</int>
+						<reference key="object" ref="711288662"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="413164923"/>
+						</object>
+						<reference key="parent" ref="1039094689"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">293</int>
+						<reference key="object" ref="634701477"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="26248495"/>
+						</object>
+						<reference key="parent" ref="1039094689"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">295</int>
+						<reference key="object" ref="1011512617"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="411425856"/>
+							<reference ref="152467947"/>
+							<reference ref="208024104"/>
+							<reference ref="526973850"/>
+						</object>
+						<reference key="parent" ref="1039094689"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">296</int>
+						<reference key="object" ref="411425856"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="621551865"/>
+							<reference ref="976084317"/>
+							<reference ref="661701503"/>
+						</object>
+						<reference key="parent" ref="1011512617"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">297</int>
+						<reference key="object" ref="621551865"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="195831317"/>
+						</object>
+						<reference key="parent" ref="411425856"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">574</int>
+						<reference key="object" ref="195831317"/>
+						<reference key="parent" ref="621551865"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">298</int>
+						<reference key="object" ref="976084317"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="656574062"/>
+						</object>
+						<reference key="parent" ref="411425856"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">573</int>
+						<reference key="object" ref="656574062"/>
+						<reference key="parent" ref="976084317"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">535</int>
+						<reference key="object" ref="661701503"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="90031137"/>
+						</object>
+						<reference key="parent" ref="411425856"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">575</int>
+						<reference key="object" ref="90031137"/>
+						<reference key="parent" ref="661701503"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">299</int>
+						<reference key="object" ref="859414998"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="537937846"/>
+						</object>
+						<reference key="parent" ref="1039094689"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">310</int>
+						<reference key="object" ref="381268760"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="99903682"/>
+						</object>
+						<reference key="parent" ref="1039094689"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">423</int>
+						<reference key="object" ref="1001514180"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="355724345"/>
+							<reference ref="107275095"/>
+						</object>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">DockMenu</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">524</int>
+						<reference key="object" ref="355724345"/>
+						<reference key="parent" ref="1001514180"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">526</int>
+						<reference key="object" ref="107275095"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="321919370"/>
+						</object>
+						<reference key="parent" ref="1001514180"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">527</int>
+						<reference key="object" ref="321919370"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="656726997"/>
+							<reference ref="500771766"/>
+						</object>
+						<reference key="parent" ref="107275095"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">532</int>
+						<reference key="object" ref="656726997"/>
+						<reference key="parent" ref="321919370"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">533</int>
+						<reference key="object" ref="500771766"/>
+						<reference key="parent" ref="321919370"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100363</int>
+						<reference key="object" ref="727617204"/>
+						<reference key="parent" ref="808306730"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100364</int>
+						<reference key="object" ref="140236247"/>
+						<reference key="parent" ref="618388983"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100365</int>
+						<reference key="object" ref="110537159"/>
+						<reference key="parent" ref="754792079"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100368</int>
+						<reference key="object" ref="46680941"/>
+						<reference key="parent" ref="677150201"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100369</int>
+						<reference key="object" ref="415694484"/>
+						<reference key="parent" ref="228801813"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100370</int>
+						<reference key="object" ref="466260504"/>
+						<reference key="parent" ref="793493073"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100371</int>
+						<reference key="object" ref="225158677"/>
+						<reference key="parent" ref="1045559310"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100372</int>
+						<reference key="object" ref="1072420481"/>
+						<reference key="parent" ref="67626595"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100382</int>
+						<reference key="object" ref="301142744"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="1071781177"/>
+						</object>
+						<reference key="parent" ref="300224954"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100385</int>
+						<reference key="object" ref="749756205"/>
+						<reference key="parent" ref="717889178"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100386</int>
+						<reference key="object" ref="725554783"/>
+						<reference key="parent" ref="114173823"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100541</int>
+						<reference key="object" ref="100363081"/>
+						<reference key="parent" ref="817420822"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100543</int>
+						<reference key="object" ref="550432669"/>
+						<reference key="parent" ref="959270736"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100374</int>
+						<reference key="object" ref="891925158"/>
+						<reference key="parent" ref="137435489"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100375</int>
+						<reference key="object" ref="836703945"/>
+						<reference key="parent" ref="663154230"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100376</int>
+						<reference key="object" ref="935570098"/>
+						<reference key="parent" ref="417801719"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100377</int>
+						<reference key="object" ref="144257898"/>
+						<reference key="parent" ref="115954190"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100379</int>
+						<reference key="object" ref="703874672"/>
+						<reference key="parent" ref="1067279202"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100291</int>
+						<reference key="object" ref="558394524"/>
+						<reference key="parent" ref="1002101696"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100292</int>
+						<reference key="object" ref="413164923"/>
+						<reference key="parent" ref="711288662"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100293</int>
+						<reference key="object" ref="26248495"/>
+						<reference key="parent" ref="634701477"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100299</int>
+						<reference key="object" ref="537937846"/>
+						<reference key="parent" ref="859414998"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100310</int>
+						<reference key="object" ref="99903682"/>
+						<reference key="parent" ref="381268760"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">380</int>
+						<reference key="object" ref="1071781177"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="827519886"/>
+							<reference ref="473657062"/>
+							<reference ref="247508345"/>
+							<reference ref="611307925"/>
+						</object>
+						<reference key="parent" ref="301142744"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">435</int>
+						<reference key="object" ref="827519886"/>
+						<reference key="parent" ref="1071781177"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">384</int>
+						<reference key="object" ref="473657062"/>
+						<reference key="parent" ref="1071781177"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">383</int>
+						<reference key="object" ref="247508345"/>
+						<reference key="parent" ref="1071781177"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">381</int>
+						<reference key="object" ref="611307925"/>
+						<reference key="parent" ref="1071781177"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100295</int>
+						<reference key="object" ref="152467947"/>
+						<reference key="parent" ref="1011512617"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">200295</int>
+						<reference key="object" ref="208024104"/>
+						<reference key="parent" ref="1011512617"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300295</int>
+						<reference key="object" ref="526973850"/>
+						<reference key="parent" ref="1011512617"/>
+					</object>
+				</object>
+			</object>
+			<object class="NSMutableDictionary" key="flattenedProperties">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="NSMutableArray" key="dict.sortedKeys">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<string>-1.IBPluginDependency</string>
+					<string>-2.IBPluginDependency</string>
+					<string>-3.IBPluginDependency</string>
+					<string>-3.ImportedFromIB2</string>
+					<string>100295.IBShouldRemoveOnLegacySave</string>
+					<string>129.IBPluginDependency</string>
+					<string>129.ImportedFromIB2</string>
+					<string>130.IBPluginDependency</string>
+					<string>130.ImportedFromIB2</string>
+					<string>131.IBPluginDependency</string>
+					<string>131.ImportedFromIB2</string>
+					<string>134.IBPluginDependency</string>
+					<string>134.ImportedFromIB2</string>
+					<string>136.IBPluginDependency</string>
+					<string>136.ImportedFromIB2</string>
+					<string>143.IBPluginDependency</string>
+					<string>143.ImportedFromIB2</string>
+					<string>144.IBPluginDependency</string>
+					<string>144.ImportedFromIB2</string>
+					<string>145.IBPluginDependency</string>
+					<string>145.ImportedFromIB2</string>
+					<string>149.IBPluginDependency</string>
+					<string>149.ImportedFromIB2</string>
+					<string>150.IBPluginDependency</string>
+					<string>150.ImportedFromIB2</string>
+					<string>156.IBPluginDependency</string>
+					<string>156.ImportedFromIB2</string>
+					<string>157.IBPluginDependency</string>
+					<string>157.ImportedFromIB2</string>
+					<string>158.IBPluginDependency</string>
+					<string>158.ImportedFromIB2</string>
+					<string>160.IBPluginDependency</string>
+					<string>160.ImportedFromIB2</string>
+					<string>163.IBPluginDependency</string>
+					<string>163.ImportedFromIB2</string>
+					<string>164.IBPluginDependency</string>
+					<string>164.ImportedFromIB2</string>
+					<string>169.IBPluginDependency</string>
+					<string>169.ImportedFromIB2</string>
+					<string>171.IBPluginDependency</string>
+					<string>171.ImportedFromIB2</string>
+					<string>172.IBPluginDependency</string>
+					<string>172.ImportedFromIB2</string>
+					<string>173.IBPluginDependency</string>
+					<string>173.ImportedFromIB2</string>
+					<string>19.IBPluginDependency</string>
+					<string>19.ImportedFromIB2</string>
+					<string>196.IBPluginDependency</string>
+					<string>196.ImportedFromIB2</string>
+					<string>200295.IBShouldRemoveOnLegacySave</string>
+					<string>203.IBPluginDependency</string>
+					<string>203.ImportedFromIB2</string>
+					<string>204.IBPluginDependency</string>
+					<string>204.ImportedFromIB2</string>
+					<string>208.IBPluginDependency</string>
+					<string>208.ImportedFromIB2</string>
+					<string>23.IBPluginDependency</string>
+					<string>23.ImportedFromIB2</string>
+					<string>24.IBPluginDependency</string>
+					<string>24.ImportedFromIB2</string>
+					<string>244.IBPluginDependency</string>
+					<string>244.ImportedFromIB2</string>
+					<string>244.windowTemplate.hasMaxSize</string>
+					<string>244.windowTemplate.hasMinSize</string>
+					<string>244.windowTemplate.maxSize</string>
+					<string>244.windowTemplate.minSize</string>
+					<string>245.IBPluginDependency</string>
+					<string>245.ImportedFromIB2</string>
+					<string>269.IBPluginDependency</string>
+					<string>269.ImportedFromIB2</string>
+					<string>270.IBPluginDependency</string>
+					<string>270.ImportedFromIB2</string>
+					<string>272.IBPluginDependency</string>
+					<string>272.ImportedFromIB2</string>
+					<string>285.IBPluginDependency</string>
+					<string>285.ImportedFromIB2</string>
+					<string>285.windowTemplate.hasMaxSize</string>
+					<string>285.windowTemplate.hasMinSize</string>
+					<string>285.windowTemplate.maxSize</string>
+					<string>285.windowTemplate.minSize</string>
+					<string>286.IBPluginDependency</string>
+					<string>286.ImportedFromIB2</string>
+					<string>29.IBPluginDependency</string>
+					<string>29.ImportedFromIB2</string>
+					<string>291.IBPluginDependency</string>
+					<string>291.ImportedFromIB2</string>
+					<string>292.IBPluginDependency</string>
+					<string>292.ImportedFromIB2</string>
+					<string>293.IBPluginDependency</string>
+					<string>293.ImportedFromIB2</string>
+					<string>295.IBPluginDependency</string>
+					<string>295.ImportedFromIB2</string>
+					<string>296.IBPluginDependency</string>
+					<string>296.ImportedFromIB2</string>
+					<string>297.IBPluginDependency</string>
+					<string>297.ImportedFromIB2</string>
+					<string>298.IBPluginDependency</string>
+					<string>298.ImportedFromIB2</string>
+					<string>299.IBPluginDependency</string>
+					<string>299.ImportedFromIB2</string>
+					<string>300295.IBShouldRemoveOnLegacySave</string>
+					<string>305.IBPluginDependency</string>
+					<string>305.ImportedFromIB2</string>
+					<string>310.IBPluginDependency</string>
+					<string>310.ImportedFromIB2</string>
+					<string>348.IBPluginDependency</string>
+					<string>348.ImportedFromIB2</string>
+					<string>349.IBPluginDependency</string>
+					<string>349.ImportedFromIB2</string>
+					<string>350.IBPluginDependency</string>
+					<string>350.ImportedFromIB2</string>
+					<string>351.IBPluginDependency</string>
+					<string>351.ImportedFromIB2</string>
+					<string>352.IBPluginDependency</string>
+					<string>352.ImportedFromIB2</string>
+					<string>353.IBPluginDependency</string>
+					<string>353.ImportedFromIB2</string>
+					<string>354.IBPluginDependency</string>
+					<string>354.ImportedFromIB2</string>
+					<string>363.IBPluginDependency</string>
+					<string>363.ImportedFromIB2</string>
+					<string>364.IBPluginDependency</string>
+					<string>364.ImportedFromIB2</string>
+					<string>365.IBPluginDependency</string>
+					<string>365.ImportedFromIB2</string>
+					<string>368.IBPluginDependency</string>
+					<string>368.ImportedFromIB2</string>
+					<string>369.IBPluginDependency</string>
+					<string>369.ImportedFromIB2</string>
+					<string>370.IBPluginDependency</string>
+					<string>370.ImportedFromIB2</string>
+					<string>371.IBPluginDependency</string>
+					<string>371.ImportedFromIB2</string>
+					<string>372.IBPluginDependency</string>
+					<string>372.ImportedFromIB2</string>
+					<string>374.IBPluginDependency</string>
+					<string>374.ImportedFromIB2</string>
+					<string>375.IBPluginDependency</string>
+					<string>375.ImportedFromIB2</string>
+					<string>376.IBPluginDependency</string>
+					<string>376.ImportedFromIB2</string>
+					<string>377.IBPluginDependency</string>
+					<string>377.ImportedFromIB2</string>
+					<string>379.IBPluginDependency</string>
+					<string>379.ImportedFromIB2</string>
+					<string>380.IBPluginDependency</string>
+					<string>380.ImportedFromIB2</string>
+					<string>381.IBPluginDependency</string>
+					<string>381.ImportedFromIB2</string>
+					<string>382.IBPluginDependency</string>
+					<string>382.ImportedFromIB2</string>
+					<string>383.IBPluginDependency</string>
+					<string>383.ImportedFromIB2</string>
+					<string>384.IBPluginDependency</string>
+					<string>384.ImportedFromIB2</string>
+					<string>385.IBPluginDependency</string>
+					<string>385.ImportedFromIB2</string>
+					<string>386.IBPluginDependency</string>
+					<string>386.ImportedFromIB2</string>
+					<string>419.IBPluginDependency</string>
+					<string>419.ImportedFromIB2</string>
+					<string>420.IBPluginDependency</string>
+					<string>420.ImportedFromIB2</string>
+					<string>421.IBPluginDependency</string>
+					<string>421.ImportedFromIB2</string>
+					<string>423.IBPluginDependency</string>
+					<string>423.ImportedFromIB2</string>
+					<string>435.IBPluginDependency</string>
+					<string>435.ImportedFromIB2</string>
+					<string>5.IBPluginDependency</string>
+					<string>5.ImportedFromIB2</string>
+					<string>524.IBPluginDependency</string>
+					<string>524.ImportedFromIB2</string>
+					<string>526.IBPluginDependency</string>
+					<string>526.ImportedFromIB2</string>
+					<string>527.IBPluginDependency</string>
+					<string>527.ImportedFromIB2</string>
+					<string>532.IBPluginDependency</string>
+					<string>532.ImportedFromIB2</string>
+					<string>533.IBPluginDependency</string>
+					<string>533.ImportedFromIB2</string>
+					<string>535.IBPluginDependency</string>
+					<string>535.ImportedFromIB2</string>
+					<string>536.IBPluginDependency</string>
+					<string>536.ImportedFromIB2</string>
+					<string>537.IBPluginDependency</string>
+					<string>537.ImportedFromIB2</string>
+					<string>538.IBPluginDependency</string>
+					<string>538.ImportedFromIB2</string>
+					<string>541.IBPluginDependency</string>
+					<string>541.ImportedFromIB2</string>
+					<string>543.IBPluginDependency</string>
+					<string>543.ImportedFromIB2</string>
+					<string>544.IBPluginDependency</string>
+					<string>544.ImportedFromIB2</string>
+					<string>545.IBPluginDependency</string>
+					<string>545.ImportedFromIB2</string>
+					<string>56.IBPluginDependency</string>
+					<string>56.ImportedFromIB2</string>
+					<string>57.IBPluginDependency</string>
+					<string>57.ImportedFromIB2</string>
+					<string>573.IBPluginDependency</string>
+					<string>573.ImportedFromIB2</string>
+					<string>574.IBPluginDependency</string>
+					<string>574.ImportedFromIB2</string>
+					<string>575.IBPluginDependency</string>
+					<string>575.ImportedFromIB2</string>
+					<string>58.IBPluginDependency</string>
+					<string>58.ImportedFromIB2</string>
+					<string>92.IBPluginDependency</string>
+					<string>92.ImportedFromIB2</string>
+				</object>
+				<object class="NSMutableArray" key="dict.values">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<reference ref="874199827"/>
+					<reference ref="874199827"/>
+					<reference ref="874199827"/>
+					<integer value="1" id="5"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="5"/>
+					<reference ref="5"/>
+					<string>{3.40282e+38, 3.40282e+38}</string>
+					<string>{213, 107}</string>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="5"/>
+					<reference ref="5"/>
+					<string>{3.40282e+38, 3.40282e+38}</string>
+					<string>{213, 107}</string>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+					<reference ref="874199827"/>
+					<reference ref="5"/>
+				</object>
+			</object>
+			<object class="NSMutableDictionary" key="unlocalizedProperties">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="NSArray" key="dict.sortedKeys">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+				</object>
+				<object class="NSMutableArray" key="dict.values">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+				</object>
+			</object>
+			<nil key="activeLocalization"/>
+			<object class="NSMutableDictionary" key="localizations">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="NSArray" key="dict.sortedKeys">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+				</object>
+				<object class="NSMutableArray" key="dict.values">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+				</object>
+			</object>
+			<nil key="sourceID"/>
+			<int key="maxID">300295</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSFormatter</string>
+					<nil key="superclassName"/>
+					<object class="NSMutableDictionary" key="actions">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="outlets">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey" id="3826605">IBUserSource</string>
+						<string key="minorKey" id="25614681"/>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">FirstResponder</string>
+					<nil key="superclassName"/>
+					<object class="NSMutableDictionary" key="actions">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSMutableArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>alignCenter:</string>
+							<string>alignJustified:</string>
+							<string>alignLeft:</string>
+							<string>alignRight:</string>
+							<string>arrangeInFront:</string>
+							<string>centerSelectionInVisibleArea:</string>
+							<string>changeFont:</string>
+							<string>checkSpelling:</string>
+							<string>clear:</string>
+							<string>clearRecentDocuments:</string>
+							<string>complete:</string>
+							<string>copy:</string>
+							<string>copyFont:</string>
+							<string>copyRuler:</string>
+							<string>cut:</string>
+							<string>delete:</string>
+							<string>deminiaturize:</string>
+							<string>fax:</string>
+							<string>hide:</string>
+							<string>hideOtherApplications:</string>
+							<string>loosenKerning:</string>
+							<string>lowerBaseline:</string>
+							<string>makeKeyAndOrderFront:</string>
+							<string>miniaturize:</string>
+							<string>newDocument:</string>
+							<string>openDocument:</string>
+							<string>orderBack:</string>
+							<string>orderFront:</string>
+							<string>orderFrontColorPanel:</string>
+							<string>orderFrontHelpPanel:</string>
+							<string>orderOut:</string>
+							<string>outline:</string>
+							<string>paste:</string>
+							<string>pasteAsPlainText:</string>
+							<string>pasteAsRichText:</string>
+							<string>pasteFont:</string>
+							<string>pasteRuler:</string>
+							<string>pause:</string>
+							<string>performClose:</string>
+							<string>performFindPanelAction:</string>
+							<string>performMiniaturize:</string>
+							<string>performZoom:</string>
+							<string>play:</string>
+							<string>print:</string>
+							<string>printDocument:</string>
+							<string>raiseBaseline:</string>
+							<string>record:</string>
+							<string>redo:</string>
+							<string>resume:</string>
+							<string>revertDocumentToSaved:</string>
+							<string>run:</string>
+							<string>runPageLayout:</string>
+							<string>runToolbarCustomizationPalette:</string>
+							<string>saveAllDocuments:</string>
+							<string>saveDocument:</string>
+							<string>saveDocumentAs:</string>
+							<string>saveDocumentTo:</string>
+							<string>selectAll:</string>
+							<string>selectText:</string>
+							<string>showGuessPanel:</string>
+							<string>showHelp:</string>
+							<string>start:</string>
+							<string>startSpeaking:</string>
+							<string>stop:</string>
+							<string>stopSpeaking:</string>
+							<string>subscript:</string>
+							<string>superscript:</string>
+							<string>terminate:</string>
+							<string>tightenKerning:</string>
+							<string>toggleContinuousSpellChecking:</string>
+							<string>toggleRuler:</string>
+							<string>toggleToolbarShown:</string>
+							<string>turnOffKerning:</string>
+							<string>turnOffLigatures:</string>
+							<string>underline:</string>
+							<string>undo:</string>
+							<string>unhideAllApplications:</string>
+							<string>unscript:</string>
+							<string>useAllLigatures:</string>
+							<string>useStandardKerning:</string>
+							<string>useStandardLigatures:</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string id="663201829">id</string>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="outlets">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<reference key="majorKey" ref="3826605"/>
+						<reference key="minorKey" ref="25614681"/>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">X11Controller</string>
+					<string key="superclassName">NSObject</string>
+					<object class="NSMutableDictionary" key="actions">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSMutableArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>apps_table_cancel:</string>
+							<string>apps_table_delete:</string>
+							<string>apps_table_done:</string>
+							<string>apps_table_duplicate:</string>
+							<string>apps_table_new:</string>
+							<string>apps_table_show:</string>
+							<string>bring_to_front:</string>
+							<string>close_window:</string>
+							<string>enable_fullscreen_changed:</string>
+							<string>minimize_window:</string>
+							<string>next_window:</string>
+							<string>prefs_changed:</string>
+							<string>prefs_show:</string>
+							<string>previous_window:</string>
+							<string>toggle_fullscreen:</string>
+							<string>x11_help:</string>
+							<string>zoom_window:</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="outlets">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSMutableArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>apps_separator</string>
+							<string>apps_table</string>
+							<string>depth</string>
+							<string>dock_apps_menu</string>
+							<string>dock_menu</string>
+							<string>dock_window_separator</string>
+							<string>enable_auth</string>
+							<string>enable_fullscreen</string>
+							<string>enable_keyequivs</string>
+							<string>enable_tcp</string>
+							<string>fake_buttons</string>
+							<string>prefs_panel</string>
+							<string>sync_keymap</string>
+							<string>toggle_fullscreen_item</string>
+							<string>use_sysbeep</string>
+							<string>window_separator</string>
+							<string>x11_about_item</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+							<reference ref="663201829"/>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<reference key="majorKey" ref="3826605"/>
+						<reference key="minorKey" ref="25614681"/>
+					</object>
+				</object>
+			</object>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<nil key="IBDocument.LastKnownRelativeProjectPath"/>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<object class="NSMutableData" key="IBDocument.RunnableNib">
+			<bytes key="NS.bytes">YnBsaXN0MDDUAAEAAgADAAQABQAGAAkAClgkdmVyc2lvblQkdG9wWSRhcmNoaXZlclgkb2JqZWN0cxIA
+AYag0QAHAAhdSUIub2JqZWN0ZGF0YYABXxAPTlNLZXllZEFyY2hpdmVyrxEDKQALAAwAMQA1ADkAQABD
+AEQASABMAIYAjACcAKEAogCjAKgAqQCqAK0AsQCyALUAtgC6AMAAzgDUANUA7wDwAPgA+QD8AQABAQEE
+AQgBDgERARIBEwEXAR4BHwEgASEBJgEnASoBLwE0ATUBOgFFAVABUQFSAVYBWwFkAWsBbAFwAXIBcwF4
+AX8BhQGGAY4BjwGUAZsBoAGhAakBqgGrAbABsQG2Ab0BvgHWAdoB3AHeAesB7wHwAfEB9AH7AgUB8AIG
+AhAB8AIRAhsB8AIcAiACIwIoAjECNgI3AjwCRQJJAkoCTwJWAlcCXwJgAmECZgJnAmwCiAKJAooCiwKO
+Ao8CkAKWApoCqgKuArgCvwLAAsoCywLQAtoC2wLcAuAC4gLnAugC6wLuAvEC+AL5AwADAQMIAwkDEAMR
+AxgDGQMhAyIDKQMqAzEDMgMzAzUDNgM8A0UDSANRA1gDWQNgA2EDaANpA3ADcQN4A3kDgQOCA4kDigOR
+AzIDkgOTA5YDnQOgA6EDpwOvAlYDtgO+A78DxgPHA84DzwPWA9cD3gPfA+YD5wPuAzID7wPwA/ID8wP0
+Ao4D9QP2A/kD+gP+BAUEBgQHBAgEDQQSBBkEGgQfBCYEKwQsBC0EMgQ5BDoEOwRABEcESARJBEoETwRX
+BFgEWQReBF8EZARrBGwEbQRxBHgEeQR6BHsEgASHBIgEiQSKBI4ElQSWBJcEmASdBKQEpQSmBKsEsgS2
+BLcEuAS9BMIEwwTIBNAE1QTWBOAE4QTkBOUE5wTpBOoE7wTwBPUE/AT9BQUFBgUIBQoFCwUQBREFFgUX
+BRwFIwUkBSUFJgUrBTMFNAU9BT4FQAVBBUYFSwVMBVEFbAV7BXwFgwWMBY0FkAWVBakFqgWtBbMFxQXM
+Bc0F0AXVBdYF2QXgBeMF5gXvBfUF9gX8BgUGCwYMBhEGEgYZBh0GIgYjBigGKQYsBi4GLwY0BjwGPQY+
+Bj8GRAZLBkwGTQZRBlgGWQZaBlsGYAZnBmgGcAZxBnMGdQZ2BnsGfAaBBogGiQaKBosGkAaRBpYGlwac
+Bp0GoganBq4GrwawBrEGtga9Br4GvwbABsUGzAbNBtUG1gbYBtoG2wbgBuEG5QbsBu0G7gbvB28HeAeA
+B4QHhQeIB5EHkgeTB5YHngefB6MHpAelB6gHqQeuB7cHvAFRB70HzAfVB94BUQffB+QH5gfpB+oH8wf8
+CAUIBgFRCA8IEggeCCcIMAgxCDIIOghDAVEIRAhPCFgIEQFRCGEIagFRCGsIbwhwADgIcwiBCIIIgwKO
+Ao8D8wP0Ao4IhQiGCIgJCAmJCgoKCwoMCg0KDgoPChAKEQoSChMKFAoVChYKFwoYChkKGgobChwKHQoe
+Ch8KIAohCiIKIwokCiUKJgonCigKKQoqCisKLAotCi4KLwowCjEKMgozCjQKNQo2CjcKOAo5CjoKOwo8
+Cj0KPgo/CkAKQQpCCkMKRApFCkYKRwpICkkKSgpLCkwKTQpOCk8KUApRClIKUwpUClUKVgpXClgKWQpa
+ClsKXApdCl4KXwpgCmEKYgpjCmQKZQpmCmcKaAppCmoKawpsCm0KbgpvCnAKcQpyAo0Kcwp0CnUKdgp3
+CngKeQp6CnsKfAp9Cn4KfwqACoEKggqDCoQKhQqICosLQwv7C/wL/Qv+C/8MAAwBDAIMAwwEDAUMBgwH
+DAgMCQwKDAsMDAwNDA4MDwwQDBEMEgwTDBQMFQwWDBcMGAwZDBoMGwwcDB0MHgwfDCAMIQwiDCMMJAwl
+DCYMJwIaBTAMKAwpDCoMKwwsDC0MLgwvDDAMMQwyDDMMNAw1DDYMNww4DDkMOgw7DDwMPQw+DD8MQAxB
+DEIMQwxEDEUMRgxHDEgMSQxKDEsMTAxNDE4MTwxQDFEMUgxTDFQMVQxWDFcMWAxZDFoMWwxcDF0MXgxf
+DGAMYQxiDGMMZAxlDGYMZwxoDGkMagxrDGwMbQxuDG8McAxxDHIMcwx0DHUMdgx3BM0MeAx5DHoMewx8
+DH0Mfgx/DIAMgQyCDIMMhAyFDIYMhwyIDIkMigyLDIwMjQyODI8MkAyRDJIMkwyUDJUMlgyXDJgMmQya
+DJsMnAydDJ4MnwygDKEMogyjDKQMpQymDKcMqAypDKoMqwysDK0MsAyzDLZVJG51bGzfEBIADQAOAA8A
+EAARABIAEwAUABUAFgAXABgAGQAaABsAHAAdAB4AHwAgACEAIgAjACQAJQAmACcAKAApACoAKwAsAC0A
+LgAvADBWTlNSb290ViRjbGFzc11OU09iamVjdHNLZXlzXxAPTlNDbGFzc2VzVmFsdWVzXxAZTlNBY2Nl
+c3NpYmlsaXR5T2lkc1ZhbHVlc11OU0Nvbm5lY3Rpb25zW05TTmFtZXNLZXlzW05TRnJhbWV3b3JrXU5T
+Q2xhc3Nlc0tleXNaTlNPaWRzS2V5c11OU05hbWVzVmFsdWVzXxAZTlNBY2Nlc3NpYmlsaXR5Q29ubmVj
+dG9yc11OU0ZvbnRNYW5hZ2VyXxAQTlNWaXNpYmxlV2luZG93c18QD05TT2JqZWN0c1ZhbHVlc18QF05T
+QWNjZXNzaWJpbGl0eU9pZHNLZXlzWU5TTmV4dE9pZFxOU09pZHNWYWx1ZXOAAoEDKIEBp4ECbYEDJ4AJ
+gQHugAaBAmyBAm6BAe+BAyWAAIAHgQHtgQMmEgAElQiBAm/SAA4AMgAzADRbTlNDbGFzc05hbWWABYAD
+0gAOADYANwA4WU5TLnN0cmluZ4AEXU5TQXBwbGljYXRpb27SADoAOwA8AD1YJGNsYXNzZXNaJGNsYXNz
+bmFtZaMAPQA+AD9fEA9OU011dGFibGVTdHJpbmdYTlNTdHJpbmdYTlNPYmplY3TSADoAOwBBAEKiAEIA
+P15OU0N1c3RvbU9iamVjdF8QEElCQ29jb2FGcmFtZXdvcmvSAA4ARQBGAEdaTlMub2JqZWN0c4AIoNIA
+OgA7AEkASqMASgBLAD9cTlNNdXRhYmxlU2V0VU5TU2V00gAOAEUATQBOgD6vEDcATwBQAFEAUgBTAFQA
+VQBWAFcAWABZAFoAWwBcAF0AXgBfAGAAYQBiAGMAZABlAGYAZwBoAGkAagBrAGwAbQBuAG8AcABxAHIA
+cwB0AHUAdgB3AHgAeQB6AHsAfAB9AH4AfwCAAIEAggCDAIQAhYAKgBiAKYAugDGAQYBHgE6AUIBogGyA
+cIB2gHiA3YDigOOA5oDrgO+A9ID4gPqA/oEBA4EBCIEBDYEBEYEBFoEBF4EBGYEBJIEBJoEBLoEBMIEB
+MoEBN4EBPoEBP4EBQYEBaoEBb4EBc4EBeIEBgIEBgoEBh4EBiYEBi4EBjYEBjoEBk4EBmIEBoIEBotMA
+DgCHAIgAiQCKAItYTlNTb3VyY2VXTlNMYWJlbIAXgAuAFtgADgCNAI4AjwCQAJEAkgCTAJQAlQCWAJcA
+mACZAJoAm1dOU1RpdGxlXxARTlNLZXlFcXVpdk1vZE1hc2taTlNLZXlFcXVpdl1OU01uZW1vbmljTG9j
+WU5TT25JbWFnZVxOU01peGVkSW1hZ2VWTlNNZW51gBWADRIAEAAAgA4Sf////4APgBOADNMADgCNAJ0A
+ngCfAKBbTlNNZW51SXRlbXOAP4EB1IEB1lZEZWxldGVQ0wAOADIApAClAKYAp15OU1Jlc291cmNlTmFt
+ZYASgBCAEVdOU0ltYWdlXxAPTlNNZW51Q2hlY2ttYXJr0gA6ADsAqwCsogCsAD9fEBBOU0N1c3RvbVJl
+c291cmNl0wAOADIApAClAKYAsIASgBCAFF8QEE5TTWVudU1peGVkU3RhdGXSADoAOwCzALSiALQAP1pO
+U01lbnVJdGVtV2RlbGV0ZTrSADoAOwC3ALijALgAuQA/XxAVTlNOaWJDb250cm9sQ29ubmVjdG9yXk5T
+TmliQ29ubmVjdG9y1AAOALsAhwCIAIkAvQC+AL9dTlNEZXN0aW5hdGlvboAXgCaAGYAo1wDBAA4AwgDD
+AMQAxQDGAMcAyADJAMoAywDMAMdfEA9OU05leHRSZXNwb25kZXJXTlNGcmFtZVZOU0NlbGxYTlN2Rmxh
+Z3NZTlNFbmFibGVkW05TU3VwZXJ2aWV3gBqAJYAbgBwRAQAJgBrVAMEADgDCAM8AxAArANEA0gDTAMta
+TlNTdWJ2aWV3c4AAgKWAu4CqXxAWe3sxOCwgMTUzfSwgezQwMiwgMTh9fd0A1gAOANcA2ADZANoA2wDc
+AN0A3gDfAOAA4QDiAOMAlwDlAOYA5wCXAOkA6gC+AOwA7QDuW05TQ2VsbEZsYWdzXxATTlNBbHRlcm5h
+dGVDb250ZW50c18QEk5TUGVyaW9kaWNJbnRlcnZhbF5OU0J1dHRvbkZsYWdzMl8QEE5TQWx0ZXJuYXRl
+SW1hZ2VfEA9OU0tleUVxdWl2YWxlbnRaTlNDb250ZW50c1lOU1N1cHBvcnRdTlNDb250cm9sVmlld18Q
+D05TUGVyaW9kaWNEZWxheVxOU0NlbGxGbGFnczJdTlNCdXR0b25GbGFncxIEAf4AgCSADhAZEAKAIYAO
+gB2AHoAZEMgQABJIPFH/XxAdRm9sbG93IHN5c3RlbSBrZXlib2FyZCBsYXlvdXTUAA4A8QDyAPMA9AD1
+APYA91ZOU1NpemVWTlNOYW1lWE5TZkZsYWdzgCAjQCoAAAAAAACAHxEEFFxMdWNpZGFHcmFuZGXSADoA
+OwD6APuiAPsAP1ZOU0ZvbnTSAA4A/QD+AP9bTlNJbWFnZU5hbWWAI4AiWE5TU3dpdGNo0gA6ADsBAgED
+ogEDAD9fEBNOU0J1dHRvbkltYWdlU291cmNl0gA6ADsBBQEGpAEGAQcAwwA/XE5TQnV0dG9uQ2VsbFxO
+U0FjdGlvbkNlbGzSADoAOwEJAQqlAQoBCwEMAQ0AP1hOU0J1dHRvbllOU0NvbnRyb2xWTlNWaWV3W05T
+UmVzcG9uZGVy0gAOADIAMwEQgAWAJ11YMTFDb250cm9sbGVyXnByZWZzX2NoYW5nZWQ60wAOAIcAiACJ
+ARUBFoAXgCqALdgADgCNAI4AjwCQAJEAkgCTAJQBGQCWARoAmACZAJoAm4AVgCuALIAPgBOADFpTZWxl
+Y3QgQWxsUWFac2VsZWN0QWxsOtQADgC7AIcAiAEiAL0AHwElgDCAJoACgC9YZGVsZWdhdGXSADoAOwEo
+ASmjASkAuQA/XxAUTlNOaWJPdXRsZXRDb25uZWN0b3LUAA4AuwCHAIgBIgEsAB8BLoAwgDKAAoBA1AAO
+AI0A8gCdAJ4BMQCXATOAP4AzgA6ANFRNZW510gAOAEUATQE3gD6iATgBOYA1gDbaAA4AjQCOATsAjwE8
+AJAAkQCSAJMAlACXAJYAzACXAMwAmACZAJoBLF1OU0lzU2VwYXJhdG9yXE5TSXNEaXNhYmxlZIAVgA4J
+gA4JgA+AE4Ay2gAOAUYAjQCOAI8AkACRAJIAkwFHAJQBSQFKAJYAlwCYAJkAmgEsAU9ZTlNTdWJtZW51
+WE5TQWN0aW9ugBWAOYA3gA6AD4ATgDKAOFxBcHBsaWNhdGlvbnNec3VibWVudUFjdGlvbjrTAA4AjQCd
+AJ4BSgFVgD+AN4A60gAOAEUATQFYgD6iAVkBWoA7gDzaAA4AjQCOATsAjwE8AJAAkQCSAJMAlACXAJYA
+zACXAMwAmACZAJoBSYAVgA4JgA4JgA+AE4A52AAOAI0AjgCPAJAAkQCSAJMAlAFmAJYAlwCYAJkAmgFJ
+gBWAPYAOgA+AE4A5agBDAHUAcwB0AG8AbQBpAHoAZSAm0gA6ADsBbQFuowFuAW8AP15OU011dGFibGVB
+cnJheVdOU0FycmF50gA6ADsBcQCTogCTAD9YZG9ja01lbnXUAA4AuwCHAIgAiQC9AXYAv4AXgCaAQoAo
+1wDBAA4AwgDDAMQAxQDGAXkAyAF7AXwAywDMAXmAQ4AlgESARQmAQ9YAwQAOAMIAzwDEAMYBgADRAYIB
+gwDLAYCAgoClgKSAhICCXxAVe3sxOCwgOTB9LCB7NDAyLCAxOH193QDWAA4A1wDYANkA2gDbANwA3QDe
+AN8A4ADhAOIA4wCXAOUA5gDnAJcBiwDqAXYA7ADtAO6AJIAOgCGADoBGgB6AQl8QF1VzZSBzeXN0ZW0g
+YWxlcnQgZWZmZWN01AAOALsAhwCIASIBkQC9AZOAMIBIgCaATdcAwQAOAMIAwwDEAMUAxgGVAMgBlwGY
+AMsAzAGVgEmAJYBKgEsJgEnVAMEADgDCAM8AxAArANEBngGfAMuAAIClgNOAwl8QFnt7MTgsIDE0MH0s
+IHs0MDIsIDE4fX3dANYADgDXANgA2QDaANsA3ADdAN4A3wDgAOEA4gDjAJcA5QDmAOcAlwGmAOoBkQDs
+AO0A7oAkgA6AIYAOgEyAHoBIXxAmQWxsb3cgY29ubmVjdGlvbnMgZnJvbSBuZXR3b3JrIGNsaWVudHNa
+ZW5hYmxlX3RjcNQADgC7AIcAiACJAL0BWgGvgBeAJoA8gE9fEBBhcHBzX3RhYmxlX3Nob3c61AAOALsA
+hwCIAIkAvQG0AL+AF4AmgFGAKNcAwQAOAMIAwwDEAMUAxgF5AbgBuQG6AMsAzAF5gEOAZ4BSgFMJgENf
+EBZ7ezc0LCAyMDl9LCB7MTI4LCAyNn193xATANYBvwHAANcA2AAOANkA2gDbAN0AtADeAcEBwgHDAN8A
+4ACTAOEBxADMAcYBxwHIAckBxgHKAcsA6gHNAbQBzwDMAMwB0gHTAdQB1V8QGk5TTWVudUl0ZW1SZXNw
+ZWN0QWxpZ25tZW50XxAPTlNBcnJvd1Bvc2l0aW9uXxAPTlNQcmVmZXJyZWRFZGdlXxASTlNVc2VzSXRl
+bUZyb21NZW51XU5TQWx0ZXJzU3RhdGUT/////4RB/kAJEAGAVRBLgGaAVIBWgB6AV4BREAMJCREBkBEE
+AIBYEgaCQP/UAA4A8QDyAPMA9AD1APYB2YAggB8QENIADgA2ADcAooAE0gAOADYANwCigATcAd8ADgCN
+AI4AjwCQAJEAkgCTAUcB4AHhAboAlAHkAJYAlwCYAJkAmgHUAekB6gHGWE5TVGFyZ2V0VU5TVGFnV05T
+U3RhdGWAU4AVgFmADoAPgBOAWIBaE///////////0wAOAI0AnQCeAe0B7oA/gFuAXFxGcm9tIERpc3Bs
+YXlfEBFfcG9wVXBJdGVtQWN0aW9uOtIADgA2ADcB84AEWk90aGVyVmlld3PSAA4ARQBNAfaAPqQBzQH4
+AfkB+oBXgF2AYIBj2wHfAA4AjQCOAI8AkACRAJIAkwFHAeABugCUAf4AlgCXAJgAmQCaAdQCAwIEgFOA
+FYBegA6AD4ATgFiAXxAIWjI1NiBDb2xvcnPbAd8ADgCNAI4AjwCQAJEAkgCTAUcB4AG6AJQCCQCWAJcA
+mACZAJoB1AIOAg+AU4AVgGGADoAPgBOAWIBiEA9ZVGhvdXNhbmRz2wHfAA4AjQCOAI8AkACRAJIAkwFH
+AeABugCUAhQAlgCXAJgAmQCaAdQCGQIagFOAFYBkgA6AD4ATgFiAZRAYWE1pbGxpb25z0gA6ADsCHQIe
+pgIeAh8BBgEHAMMAP18QEU5TUG9wVXBCdXR0b25DZWxsXk5TTWVudUl0ZW1DZWxs0gA6ADsCIQIipgIi
+AQoBCwEMAQ0AP11OU1BvcFVwQnV0dG9u1AAOALsAhwCIASICJQC9AieAMIBpgCaAa9oADgCNAI4BOwCP
+ATwAkACRAJIAkwCUAJcAlgDMAJcAzACYAJkAmgIwgBWADgmADgmAD4ATgGrUAA4AjQDyAJ0AngIzAjQC
+NYA/gQHMgQHQgQHNXxAQd2luZG93X3NlcGFyYXRvctQADgC7AIcAiAEiAjkAvQI7gDCAbYAmgG/aAA4A
+jQCOATsAjwE8AJAAkQCSAJMAlACXAJYAzACXAMwAmACZAJoCRIAVgA4JgA4JgA+AE4Bu0wAOAI0AnQCe
+AUoCSIA/gDeBAbheYXBwc19zZXBhcmF0b3LUAA4AuwCHAIgBIgJMAL0CToAwgHGAJoB11wDBAA4AwgDD
+AMQAxQDGAMcAyAJSAlMAywDMAMeAGoAlgHKAcwmAGl8QFnt7MTgsIDIxN30sIHs0MDIsIDE4fX3dANYA
+DgDXANgA2QDaANsA3ADdAN4A3wDgAOEA4gDjAJcA5QDmAOcAlwJcAOoCTADsAO0A7oAkgA6AIYAOgHSA
+HoBxXxAaRW11bGF0ZSB0aHJlZSBidXR0b24gbW91c2VcZmFrZV9idXR0b25z1AAOALsAhwCIASIBtAC9
+AmWAMIBRgCaAd1VkZXB0aNQADgC7AIcAiAEiAmkAvQJrgDCAeYAmgNzfEA8CbQAOAm4CbwJwAnECcgJz
+AnQCdQJ2AncCeAJ5AnoCewJ8An0CfgJ/AoACgQKCAoMChAKFAOYBzwKGAodcTlNXaW5kb3dWaWV3XxAW
+TlNXaW5kb3dDb250ZW50TWF4U2l6ZVxOU1NjcmVlblJlY3RfEBNOU0ZyYW1lQXV0b3NhdmVOYW1lXU5T
+V2luZG93VGl0bGVZTlNXVEZsYWdzXU5TV2luZG93Q2xhc3NfEBZOU1dpbmRvd0NvbnRlbnRNaW5TaXpl
+XE5TV2luZG93UmVjdFlOU01heFNpemVfEA9OU1dpbmRvd0JhY2tpbmdfEBFOU1dpbmRvd1N0eWxlTWFz
+a1lOU01pblNpemVbTlNWaWV3Q2xhc3OAgIDbgH6A14DagHsSUHgAAIB8gH+AeoDZgNiAfV8QGHt7MzE5
+LCAzMjN9LCB7NDc4LCAzMTZ9fV8QD1gxMSBQcmVmZXJlbmNlc1dOU1BhbmVs0gAOADYANwKNgARUVmll
+d18QGnszLjQwMjgyZSszOCwgMy40MDI4MmUrMzh9WnsyMTMsIDEwN33VAMEADgDPAMQCkQArANEClADL
+ApVbTlNGcmFtZVNpemWAAIClgIGA1tIADgBFAE0CmIA+oQGAgILcAMEADgKbApwAwgD7AM8AxAKdAMYC
+ngKfAnsCoQKiAO0CowDqAqUAywDMAnsAzAKpXk5TVGFiVmlld0l0ZW1zWU5TVHZGbGFnc18QEU5TRHJh
+d3NCYWNrZ3JvdW5kXxAWTlNBbGxvd1RydW5jYXRlZExhYmVsc18QFU5TU2VsZWN0ZWRUYWJWaWV3SXRl
+bYCAgNWAp4CmgB6AgwmAgAmAvtIADgBFAE0CrIA+oQF5gEPSAA4ARQBNArCAPqcBdgKyAbQCtAK1ArYC
+t4BCgIWAUYCUgJiAnICg1wDBAA4AwgDDAMQAxQDGAXkCugK7ArwAywDMAXmAQ4CTgIaAhwmAQ18QFXt7
+MzYsIDU2fSwgezM4NSwgMjh9fdgA1gAOAsEA3ADdAN4A4ALCAOICwwLEAsUCxgKyAsgCyV8QEU5TQmFj
+a2dyb3VuZENvbG9yW05TVGV4dENvbG9ygJKAioCIgImAhRIAQAAAgI9fEGdYMTEgYmVlcHMgd2lsbCB1
+c2UgdGhlIHN0YW5kYXJkIHN5c3RlbSBhbGVydCwgYXMgZGVmaW5lZCBpbiB0aGUgU291bmQgRWZmZWN0
+cyBzeXN0ZW0gcHJlZmVyZW5jZXMgcGFuZWwu1AAOAPEA8gDzAPQCzQD2As+AICNAJgAAAAAAAIAfEQwc
+1QAOAtEC0gLTAtQC1QLWAtcC2ALZV05TQ29sb3JcTlNDb2xvclNwYWNlW05TQ29sb3JOYW1lXU5TQ2F0
+YWxvZ05hbWWAjoCNEAaAjICLVlN5c3RlbVxjb250cm9sQ29sb3LTAA4C0gLdAtUBzwLfV05TV2hpdGWA
+jkswLjY2NjY2NjY5ANIAOgA7AuEC0aIC0QA/1QAOAtEC0gLTAtQC1QLkAtcC5QLZgI6AkYCQgItfEBBj
+b250cm9sVGV4dENvbG9y0wAOAtIC3QLVAc8C6oCOQjAA0gA6ADsC7ALtpALtAQcAwwA/XxAPTlNUZXh0
+RmllbGRDZWxs0gA6ADsC7wLwpQLwAQsBDAENAD9bTlNUZXh0RmllbGTXAMEADgDCAMMAxADFAMYBeQK6
+AvQC9QDLAMwBeYBDgJOAlYCWCYBDXxAVe3sxNywgMjEyfSwgezU1LCAyMH192ADWAA4CwQDcAN0A3gDg
+AsIA4gLDAsQC/ADqArQCyALJgJKAioCXgB6AlICPWENvbG9yczoK1wDBAA4AwgDDAMQAxQDGAXkCugME
+AwUAywDMAXmAQ4CTgJmAmgmAQ18QFnt7MzYsIDE5MH0sIHszOTIsIDE0fX3YANYADgLBANwA3QDeAOAC
+wgDiAsMCxAMMAsYCtQLIAsmAkoCKgJuAiYCYgI9fEDRUaGlzIG9wdGlvbiB0YWtlcyBlZmZlY3Qgd2hl
+biBYMTEgaXMgbGF1bmNoZWQgYWdhaW4u1wDBAA4AwgDDAMQAxQDGAXkAyAMUAxUAywDMAXmAQ4AlgJ2A
+ngmAQ18QFnt7MTgsIDE1Nn0sIHs0MDksIDIzfX3dANYADgDXANgA2QDaANsA3ADdAN4A3wDgAOEA4gDj
+AJcA5QDmAOcAlwMeAOoCtgDsAO0A7oAkgA6AIYAOgJ+AHoCcXxAQRnVsbCBzY3JlZW4gbW9kZdcAwQAO
+AMIAwwDEAMUAxgF5AroDJQMmAMsAzAF5gEOAk4ChgKIJgENfEBZ7ezM2LCAxMTl9LCB7Mzg1LCAzMX19
+2ADWAA4CwQDcAN0A3gDgAsIA4gLDAsQDLQLGArcCyALJgJKAioCjgImAoICPXxBkRW5hYmxlcyB0aGUg
+WDExIHJvb3Qgd2luZG93LiBVc2UgdGhlIENvbW1hbmQtT3B0aW9uLUEga2V5c3Ryb2tlIHRvIGVudGVy
+IGFuZCBsZWF2ZSBmdWxsIHNjcmVlbiBtb2RlLl8QFnt7MTAsIDMzfSwgezQzOCwgMjUzfX3SADoAOwM0
+AQyjAQwBDQA/XxAVe3sxMCwgN30sIHs0NTgsIDI5OX190gAOAEUATQM4gD6jAzkCqQM7gKiAvoDB1gAO
+Az0BDAM+AtEAiAM/A0AAxwGAAsQDRFxOU0lkZW50aWZpZXJZTlNUYWJWaWV3gL2AqYAagIKAioC80gAO
+ADYANwNHgARRMdIADgBFAE0DSoA+pgJMA0wDTQNOA08AvoBxgKuAr4CzgLeAGdcAwQAOAMIAwwDEAMUA
+xgDHAroDVANVAMsAzADHgBqAk4CsgK0JgBpfEBV7ezM2LCA2N30sIHszODUsIDMxfX3YANYADgLBANwA
+3QDeAOACwgDiAsMCxANcAsYDTALIAsmAkoCKgK6AiYCrgI9fEGZXaGVuIGVuYWJsZWQsIG1lbnUgYmFy
+IGtleSBlcXVpdmFsZW50cyBtYXkgaW50ZXJmZXJlIHdpdGggWDExIGFwcGxpY2F0aW9ucyB0aGF0IHVz
+ZSB0aGUgTWV0YSBtb2RpZmllci7XAMEADgDCAMMAxADFAMYAxwK6A2QDZQDLAMwAx4AagJOAsICxCYAa
+XxAWe3szNiwgMTgyfSwgezM4NSwgMjl9fdgA1gAOAsEA3ADdAN4A4ALCAOICwwLEA2wCxgNNAsgCyYCS
+gIqAsoCJgK+Aj18QV0hvbGQgT3B0aW9uIGFuZCBDb21tYW5kIHdoaWxlIGNsaWNraW5nIHRvIGFjdGl2
+YXRlIHRoZSBtaWRkbGUgYW5kIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCtcAwQAOAMIAwwDEAMUAxgDHAMgD
+dAN1AMsAzADHgBqAJYC0gLUJgBpfEBZ7ezE4LCAxMDR9LCB7NDAyLCAxOH193QDWAA4A1wDYANkA2gDb
+ANwA3QDeAN8A4ADhAOIA4wCXAOUA5gDnAJcDfgDqA04A7ADtAO6AJIAOgCGADoC2gB6As18QIEVuYWJs
+ZSBrZXkgZXF1aXZhbGVudHMgdW5kZXIgWDEx1wDBAA4AwgDDAMQAxQDGAMcCugOFA4YAywDMAMeAGoCT
+gLiAuQmAGl8QFnt7MzYsIDEzM30sIHszODUsIDE0fX3YANYADgLBANwA3QDeAOACwgDiAsMCxAONAsYD
+TwLIAsmAkoCKgLqAiYC3gI9fED5BbGxvd3MgaW5wdXQgbWVudSBjaGFuZ2VzIHRvIG92ZXJ3cml0ZSB0
+aGUgY3VycmVudCBYMTEga2V5bWFwLlVJbnB1dNIAOgA7A5QDlaIDlQA/XU5TVGFiVmlld0l0ZW3WAA4D
+PQEMAz4C0QCIAz8DmAF5AYACxAOcgL2Av4BDgIKAioDA0gAOADYANwOfgARRMlZPdXRwdXTVAA4BDAM+
+AtEAiAM/AZUBgALEA6aAvYBJgIKAioDU0gAOAEUATQOpgD6lA6oBkQOsA60DroDDgEiAx4DLgM/XAMEA
+DgDCAMMAxADFAMYBlQDIA7IDswDLAMwBlYBJgCWAxIDFCYBJ3QDWAA4A1wDYANkA2gDbANwA3QDeAN8A
+4ADhAOIA4wCXAOUA5gDnAJcDuwDqA6oA7ADtAO6AJIAOgCGADoDGgB6Aw18QGEF1dGhlbnRpY2F0ZSBj
+b25uZWN0aW9uc9cAwQAOAMIAwwDEAMUAxgGVAroDwgPDAMsAzAGVgEmAk4DIgMkJgElfEBZ7ezM2LCAx
+Njl9LCB7Mzg1LCA0Mn192ADWAA4CwQDcAN0A3gDgAsIA4gLDAsQDygLGA6wCyALJgJKAioDKgImAx4CP
+XxCqTGF1bmNoaW5nIFgxMSB3aWxsIGNyZWF0ZSBYYXV0aG9yaXR5IGFjY2Vzcy1jb250cm9sIGtleXMu
+IElmIHRoZSBzeXN0ZW0ncyBJUCBhZGRyZXNzIGNoYW5nZXMsIHRoZXNlIGtleXMgYmVjb21lIGludmFs
+aWQgd2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy7XAMEADgDC
+AMMAxADFAMYBlQK6A9ID0wDLAMwBlYBJgJOAzIDNCYBJXxAVe3szNiwgOTJ9LCB7Mzg1LCA0Mn192ADW
+AA4CwQDcAN0A3gDgAsIA4gLDAsQD2gLGA60CyALJgJKAioDOgImAy4CPXxCZSWYgZW5hYmxlZCwgQXV0
+aGVudGljYXRlIGNvbm5lY3Rpb25zIG11c3QgYWxzbyBiZSBlbmFibGVkIHRvIGVuc3VyZSBzeXN0ZW0g
+c2VjdXJpdHkuIFdoZW4gZGlzYWJsZWQsIGNvbm5lY3Rpb25zIGZyb20gcmVtb3RlIGFwcGxpY2F0aW9u
+cyBhcmUgbm90IGFsbG93ZWQu1wDBAA4AwgDDAMQAxQDGAZUCugPiA+MAywDMAZWASYCTgNCA0QmASV8Q
+FXt7MTcsIDIwfSwgezQwNCwgMTR9fdgA1gAOAsEA3ADdAN4A4ALCAOICwwLEA+oCxgOuAsgCyYCSgIqA
+0oCJgM+Aj18QNFRoZXNlIG9wdGlvbnMgdGFrZSBlZmZlY3Qgd2hlbiBYMTEgaXMgbmV4dCBsYXVuY2hl
+ZC5YU2VjdXJpdHnSADoAOwPxAz6kAz4BDAENAD9aezQ3OCwgMzE2fV8QFXt7MCwgMH0sIHsxNDQwLCA4
+Nzh9fVp7MjEzLCAxMjl9WXgxMV9wcmVmc9IAOgA7A/cD+KID+AA/XxAQTlNXaW5kb3dUZW1wbGF0ZVtw
+cmVmc19wYW5lbNMADgCHAIgAiQP8A/2AF4DegOHYAA4AjQCOAI8AkACRAJIAkwCUBAAAlgQBAJgAmQCa
+AJuAFYDfgOCAD4ATgAxTQ3V0UXhUY3V0OtQADgC7AIcAiACJAL0BkQC/gBeAJoBIgCjUAA4AuwCHAIgA
+iQC9BBABr4AXgCaA5IBP2AAOAI0AjgCPAJAAkQCSAJMAlAQUAJYAlwCYAJkAmgJEgBWA5YAOgA+AE4Bu
+XEN1c3RvbWl6ZS4uLtQADgC7AIcAiAEiBBwAvQQegDCA54AmgOrXAA4AjQCPAJAAkQCSAJMAlAQhAJcA
+mACZAJoEJYAVgOmADoAPgBOA6NQADgCNAPIAnQCeBCgEKQQqgD+BAbuBAcmBAb1ZQWJvdXQgWDExXngx
+MV9hYm91dF9pdGVt1AAOALsAhwCIAIkAvQQwBDGAF4AmgOyA7tgADgCNAI4AjwCQAJEAkgCTAJQENACW
+AJcAmACZAJoCMIAVgO2ADoAPgBOAal8QEkJyaW5nIEFsbCB0byBGcm9udF8QD2JyaW5nX3RvX2Zyb250
+OtQADgC7AIcAiACJAL0EPgQ/gBeAJoDwgPPYAA4AjQCOAI8AkACRAJIAkwCUBEIAlgRDAJgAmQCaAjCA
+FYDxgPKAD4ATgGpcQ2xvc2UgV2luZG93UXddY2xvc2Vfd2luZG93OtQADgC7AIcAiAEiBEwAvQROgDCA
+9YAmgPfYAA4AjQCOAI8AkACRAJIAkwCUBFEEUgEaAJgAmQCaBCWAFYD2EgAYAACALIAPgBOA6F8QElRv
+Z2dsZSBGdWxsIFNjcmVlbl8QFnRvZ2dsZV9mdWxsc2NyZWVuX2l0ZW3UAA4AuwCHAIgBIgK2AL0EXYAw
+gJyAJoD5XxARZW5hYmxlX2Z1bGxzY3JlZW7UAA4AuwCHAIgAiQC9BGIEY4AXgCaA+4D92AAOAI0AjgCP
+AJAAkQCSAJMAlARmAJYAlwCYAJkAmgIwgBWA/IAOgA+AE4BqW1pvb20gV2luZG93XHpvb21fd2luZG93
+OtMADgCHAIgAiQRvBHCAF4D/gQEC2AAOAI0AjgCPAJAAkQCSAJMAlARzAJYEdACYAJkAmgCbgBWBAQCB
+AQGAD4ATgAxUUmVkb1FaVXJlZG861AAOALsAhwCIAIkAHwR+BH+AF4ACgQEEgQEH2AAOAI0AjgCPAJAA
+kQCSAJMAlASCAJYEgwCYAJkAmgQlgBWBAQWBAQaAD4ATgOhYUXVpdCBYMTFRcVp0ZXJtaW5hdGU60wAO
+AIcAiACJBIwEjYAXgQEJgQEM2AAOAI0AjgCPAJAAkQCSAJMAlASQAJYEkQCYAJkAmgCbgBWBAQqBAQuA
+D4ATgAxUVW5kb1F6VXVuZG861AAOALsAhwCIAIkAHwSbBJyAF4ACgQEOgQEQ2AAOAI0AjgCPAJAAkQCS
+AJMAlASfAJYAlwCYAJkAmgQlgBWBAQ+ADoAPgBOA6FtIaWRlIE90aGVyc18QFmhpZGVPdGhlckFwcGxp
+Y2F0aW9uczrUAA4AuwCHAIgAiQC9BKkEqoAXgCaBARKBARXYAA4AjQCOAI8AkACRAJIAkwCUBK0AlgCX
+AJgAmQCaBLGAFYEBFIAOgA+AE4EBE9MADgCNAJ0AngS0BLWAP4EB3IEB3lhYMTEgSGVscFl4MTFfaGVs
+cDrUAA4AuwCHAIgAiQC9A04Av4AXgCaAs4Ao1AAOALsAhwCIASIDTgC9BMGAMICzgCaBARhfEBBlbmFi
+bGVfa2V5ZXF1aXZz1AAOALsAhwCIAIkAvQTGBMeAF4AmgQEagQEj1wDBAA4AwgDDAMQAxQDGBMkAyATL
+BMwEzQDMBMmBARuAJYEBHIEBHREBLQmBARvVAMEADgDCAM8AxAArANEE0wTUAMuAAIClgQG3gQGoXxAX
+e3szNzIsIDIzMH0sIHsxMDAsIDMyfX3dANYADgDXANgA2QDaANsA3ADdAN4A3wDgAOEA4gDjBNgA5QHG
+BNkE2gTbAOoExgDsBN4E34AkgQEhgQEfgQEigQEegB6BARoSCDgAABP/////hoJA/1lEdXBsaWNhdGXU
+AA4A8QDyAPMA9AD1BOMB2YAggQEgWUhlbHZldGljYdIADgA2ADcAooAE0gAOADYANwCigARfEBVhcHBz
+X3RhYmxlX2R1cGxpY2F0ZTrUAA4AuwCHAIgBIgFJAL0E7oAwgDmAJoEBJV5kb2NrX2FwcHNfbWVuddQA
+DgC7AIcAiACJAL0E8wT0gBeAJoEBJ4EBLdcAwQAOAMIAwwDEAMUAxgTJAMgE+AT5BM0AzATJgQEbgCWB
+ASiBASkJgQEbXxAXe3szNzIsIDI2Mn0sIHsxMDAsIDMyfX3dANYADgDXANgA2QDaANsA3ADdAN4A3wDg
+AOEA4gDjBP8A5QHGBNkFAQUCAOoE8wDsBN4E34AkgQErgQEfgQEsgQEqgB6BASdYQWRkIEl0ZW3SAA4A
+NgA3AKKABNIADgA2ADcAooAEXxAPYXBwc190YWJsZV9uZXc61AAOALsAhwCIAIkAHwQcBQ+AF4ACgOeB
+AS9fEB1vcmRlckZyb250U3RhbmRhcmRBYm91dFBhbmVsOtQADgC7AIcAiAEiASwAvQUVgDCAMoAmgQEx
+WWRvY2tfbWVuddQADgC7AIcAiACJAL0FGgUbgBeAJoEBM4EBNtgADgCNAI4AjwCQAJEAkgCTAJQFHgCW
+BR8AmACZAJoCMIAVgQE0gQE1gA+AE4BqW05leHQgV2luZG93YfcDXG5leHRfd2luZG93OtQADgC7AIcA
+iACJAL0FKQUqgBeAJoEBOIEBPdcAwQAOAMIAwwDEAMUAxgTJAMgFLgUvBTAAzATJgQEbgCWBATmBAToR
+AS8JgQEbXxAVe3szODgsIDEyfSwgezg0LCAzMn193QDWAA4A1wDYANkA2gDbANwA3QDeAN8A4ADhBTUA
+4wCXAOUBxgTZBTkFOgDqBSkA7ATeBN8T/////4QB/gCAJIAOgQEfgQE8gQE7gB6BAThURG9uZdIADgA2
+ADcAooAEXxAQYXBwc190YWJsZV9kb25lOtQADgC7AIcAiACJAL0DqgC/gBeAJoDDgCjUAA4AuwCHAIgB
+IgOqAL0FSoAwgMOAJoEBQFtlbmFibGVfYXV0aNQADgC7AIcAiAEiBU4AvQVQgDCBAUKAJoEBad8QEwDB
+BVIADgKcBVMCwQVUBVUFVgVXBVgAxAKRAMUFWQVaAMYFWwVcBV0A7QVeBV8FYAVhAMwFYwVkAcYFZQDL
+BWYAzAVoAeoFXQVqBWtfEB9OU0RyYWdnaW5nU291cmNlTWFza0Zvck5vbkxvY2FsXE5TSGVhZGVyVmll
+d18QEk5TQWxsb3dzVHlwZVNlbGVjdFxOU0Nvcm5lclZpZXdfEBdOU0ludGVyY2VsbFNwYWNpbmdXaWR0
+aF8QGU5TQ29sdW1uQXV0b3Jlc2l6aW5nU3R5bGVfEBhOU0ludGVyY2VsbFNwYWNpbmdIZWlnaHRbTlNH
+cmlkQ29sb3JfEBxOU0RyYWdnaW5nU291cmNlTWFza0ZvckxvY2FsXk5TVGFibGVDb2x1bW5zW05TUm93
+SGVpZ2h0gQFDgQFoElJAgACBAUWBAVYJgQFJI0AIAAAAAAAAI0AAAAAAAAAAgQFECYEBZYEBQ4EBTSNA
+MQAAAAAAANoAwQAOAMIFbQDPAMQFbgVvAMYFcAVxBXIFcwV0BXUFdgVOBXgFcQVOWU5TY3ZGbGFnc1lO
+U0RvY1ZpZXdZTlNCR0NvbG9yXU5TTmV4dEtleVZpZXeBAUqBAayBAasQBIEBqhEJAIEBQoEBY4EBSoEB
+Qlp7MzMzLCAxOTd91gDBAA4AxAKRAMYFfQV+BX8AywWABX4FTltOU1RhYmxlVmlld4EBRoEBSIEBR4EB
+RoEBQtoAwQAOAMIFbQDPAMQFbgVvAMYFcAVxBXIFhgV0BYcFdgVgBXgFcQVggQFKgQGsgQG0gQGzgQFF
+gQFjgQFKgQFFWXszMzMsIDE3fdIAOgA7BY4Fj6QFjwEMAQ0AP18QEU5TVGFibGVIZWFkZXJWaWV31QDB
+AA4AwgDEAMYFcQWSBZMAywVxgQFKgQFMgQFLgQFK3QDBBZYADgDCBZcFmADPBZkAxADGBZoFcAWbBMkF
+nQWeBZ8FoAV+BaIFowWkBMkFpgVdBV1bTlNIU2Nyb2xsZXJYTlNzRmxhZ3NfEBBOU0hlYWRlckNsaXBW
+aWV3XE5TU2Nyb2xsQW10c1tOU1ZTY3JvbGxlcl1OU0NvbnRlbnRWaWV3gQEbgQGxgQG2gQG1EDKBAUaB
+AalPEBBBIAAAQSAAAEGYAABBmAAAEQEzgQEbgQGtgQFDgQFDXxAUe3szMzQsIDB9LCB7MTYsIDE3fX3S
+ADoAOwWrBaykBawBDAENAD9dX05TQ29ybmVyVmlld9IADgBFAE0Fr4A+owWwBbEFsoEBToEBWIEBXNoF
+tAAOBbUFtgW3BbgFuQW6BbsFfQDMBb0FvgW/BcABzwXBBcIAzAVOXk5TSXNSZXNpemVhYmxlXE5TSGVh
+ZGVyQ2VsbFdOU1dpZHRoWk5TRGF0YUNlbGxeTlNSZXNpemluZ01hc2taTlNNaW5XaWR0aFpOU01heFdp
+ZHRoXE5TSXNFZGl0YWJsZQmBAVeBAU8jQFPAAAAAAACBAVUjQEQAAAAAAAAjQI9AAAAAAAAJgQFC1wDW
+AA4CwQDcAN0A4ALCBcYFxwXIBckCxgDtBcsSBIH+AIEBVIEBUYEBUICJgQFSVE5hbWXTAA4C0gLdAtUB
+zwXPgI5LMC4zMzMzMzI5OQDVAA4C0QLSAtMC1ALVAuQC1wXTAtmAjoCRgQFTgItfEA9oZWFkZXJUZXh0
+Q29sb3LSADoAOwXXBdilBdgC7QEHAMMAP18QEU5TVGFibGVIZWFkZXJDZWxs1wDWAA4CwQDdAN4A4ALC
+BdoCwwVhAOoFTgHTAskSFDH+QICSgQFWgB6BAUKAj9MADgLSAt0C1QHPBeKAjkIxANIAOgA7BeQF5aIF
+5QA/XU5TVGFibGVDb2x1bW7aBbQADgW1BbYFtwW4BbkFugW7BX0AzAW9BekF6gXrAc8F7AXCAMwFTgmB
+AVeBAVkjQGg3ZGAAAACBAVsjQE9dkWAAAAAJgQFC1wDWAA4CwQDcAN0A4ALCBcYFxwXIBfICxgDtBcuB
+AVSBAVGBAVqAiYEBUldDb21tYW5k1wDWAA4CwQDdAN4A4ALCBdoCwwVhAOoFTgHTAsmAkoEBVoAegQFC
+gI/aBbQADgW1BbYFtwW4BbkFugW7BX0AzAW9Bf8GAAYBAc8GAgXCAMwFTgmBAVeBAV0jQEmAAAAAAACB
+AWEjQCQAAAAAAAAJgQFC1wDWAA4CwQDcAN0A4ALCAOIFxwYHBggCxgDtBcuBAVSBAV+BAV6AiYEBUlhT
+aG9ydGN1dNUADgLRAtIC0wLUAtUFYQLXBg8C2YCOgQFWgQFggItbaGVhZGVyQ29sb3LYANYADgLBAN0A
+3gDgAp0CwgXaAsMFeAYVBU4B0wDMAsmAkoEBY4EBYoEBQgmAj9QADgDxAPIA8wD0BhsA9gHZgCAjQCgA
+AAAAAACAH9UADgLRAtIC0wLUAtUC1gLXBiAC2YCOgI2BAWSAi18QFmNvbnRyb2xCYWNrZ3JvdW5kQ29s
+b3LVAA4C0QLSAtMC1ALVBiUC1wYmAtmAjoEBZ4EBZoCLWWdyaWRDb2xvctMADgLSAt0C1QHPBiuAjkQw
+LjUA0gA6ADsGLQV9pQV9AQsBDAENAD9aYXBwc190YWJsZdQADgC7AIcAiACJAB8GMgYzgBeAAoEBa4EB
+btkADgCNAI4AjwCQAJEAkgCTAeAAlAY2AJYGNwCYAJkAmgQlBjuAFYEBbIEBbYAPgBOA6BAqWEhpZGUg
+WDExUWhVaGlkZTrUAA4AuwCHAIgAiQAfBkIGQ4AXgAKBAXCBAXLZAA4AjQCOAI8AkACRAJIAkwHgAJQG
+RgCWAJcAmACZAJoEJQY7gBWBAXGADoAPgBOA6FhTaG93IEFsbF8QFnVuaGlkZUFsbEFwcGxpY2F0aW9u
+czrTAA4AhwCIAIkGTwZQgBeBAXSBAXfYAA4AjQCOAI8AkACRAJIAkwCUBlMAlgZUAJgAmQCaAJuAFYEB
+dYEBdoAPgBOADFVQYXN0ZVF2VnBhc3RlOtQADgC7AIcAiACJAL0GXgZfgBeAJoEBeYEBf9cAwQAOAMIA
+wwDEAMUAxgTJAMgGYwZkBM0AzATJgQEbgCWBAXqBAXsJgQEbXxAXe3szNzIsIDE5OH0sIHsxMDAsIDMy
+fX3dANYADgDXANgA2QDaANsA3ADdAN4A3wDgAOEA4gDjBmoA5QHGBNkGbAZtAOoGXgDsBN4E34AkgQF9
+gQEfgQF+gQF8gB6BAXlWUmVtb3Zl0gAOADYANwCigATSAA4ANgA3AKKABF8QEmFwcHNfdGFibGVfZGVs
+ZXRlOtQADgC7AIcAiAEiAL4AvQZ6gDCAGYAmgQGBW3N5bmNfa2V5bWFw1AAOALsAhwCIAIkAvQZ/BoCA
+F4AmgQGDgQGG2AAOAI0AjgCPAJAAkQCSAJMAlAaDAJYGhACYAJkAmgQlgBWBAYSBAYWAD4ATgOheUHJl
+ZmVyZW5jZXMuLi5RLFtwcmVmc19zaG93OtQADgC7AIcAiACJAL0ETAaPgBeAJoD1gQGIXxASdG9nZ2xl
+X2Z1bGxzY3JlZW461AAOALsAhwCIAIkAvQK2BpWAF4AmgJyBAYpfEBplbmFibGVfZnVsbHNjcmVlbl9j
+aGFuZ2VkOtQADgC7AIcAiAEiATgAvQabgDCANYAmgQGMXxAVZG9ja193aW5kb3dfc2VwYXJhdG9y1AAO
+ALsAhwCIAIkAvQJMAL+AF4AmgHGAKNQADgC7AIcAiACJAL0GpQamgBeAJoEBj4EBktgADgCNAI4AjwCQ
+AJEAkgCTAJQGqQCWBqoAmACZAJoCMIAVgQGQgQGRgA+AE4BqXxAPUHJldmlvdXMgV2luZG93YfcCXxAQ
+cHJldmlvdXNfd2luZG93OtQADgC7AIcAiACJAL0GtAa1gBeAJoEBlIEBl9gADgCNAI4AjwCQAJEAkgCT
+AJQGuACWBrkAmACZAJoCMIAVgQGVgQGWgA+AE4BqXxAPTWluaW1pemUgV2luZG93UW1fEBBtaW5pbWl6
+ZV93aW5kb3c61AAOALsAhwCIAIkAvQbDBsSAF4AmgQGZgQGf1wDBAA4AwgDDAMQAxQDGBMkAyAbIBskF
+MADMBMmBARuAJYEBmoEBmwmBARtfEBV7ezMwNCwgMTJ9LCB7ODQsIDMyfX3dANYADgDXANgA2QDaANsA
+3ADdAN4A3wDgAOEA4gDjBs8A5QHGBNkG0QbSAOoGwwDsBN4E34AkgQGdgQEfgQGegQGcgB6BAZlWQ2Fu
+Y2Vs0gAOADYANwCigATSAA4ANgA3AKKABF8QEmFwcHNfdGFibGVfY2FuY2VsOtQADgC7AIcAiAEiAXYA
+vQbfgDCAQoAmgQGhW3VzZV9zeXNiZWVw0wAOAIcAiACJBuMG5IAXgQGjgQGm2AAOAI0AjgCPAJAAkQCS
+AJMAlAbnAJYG6ACYAJkAmgCbgBWBAaSBAaWAD4ATgAxUQ29weVFjVWNvcHk60gAOAEUG8AbxgQHsrxB9
+BsMEyQG6AZECRAH6BBwGtAMVAyYBeQC+Bv4EfgNNAZUFKQcDBZ0HBQcGBBABOQOuASwDZQK3Ac0BdgWy
+BJsC9QZeAjACewQ+A04DdQF8A/wHGgHUBxwHHQYyA8MHIAJpBMYGyQNPBk8E8wK0BGIGfwcqAwUHLAIl
+AUkGQgcwArwCTAC9AYAFcQRMBbEE+QQwA7MBOAVOBbADOQNVAIoCOQdCBaYBWgdFBKkEjAH4BuMHSgKy
+BWADOwK1AlMD4wYBAqkFwAOGB1UBtAOsA60BFQK2A9MAxwZkBqUHXwSxA6oEJQdjBMwF6wFZBRoB+QGY
+BS8AmwDKA0wEb4EBmYEBG4BTgEiAboBjgOeBAZSAnoCigEOAGYEBuYEBBICvgEmBATiBAb+BAbGBAcaB
+AcqA5IA2gM+AMoCxgKCAV4BCgQFcgQEOgJaBAXmAaoCAgPCAs4C1gEWA3oEBuoBYgQHbgQHHgQFrgMmB
+AdeAeYEBGoEBm4C3gQF0gQEngJSA+4EBg4EBzoCagQHggGmAOYEBcIEBvoCHgHGAJoCCgQFKgPWBAViB
+ASmA7IDFgDWBAUKBAU6AqICtgAuAbYEB4oEBrYA8gQHYgQESgQEJgF2BAaOBAdOAhYEBRYDBgJiAc4DR
+gQFhgL6BAVWAuYEBz4BRgMeAy4AqgJyAzYAagQF7gQGPgQHIgQETgMOA6IEBwoEBHYEBW4A7gQEzgGCA
+S4EBOoAMgByAq4D/0gAOAEUATQdxgD6mBSkExgZeBXEGwwTzgQE4gQEagQF5gQFKgQGZgQEn0gAOAEUA
+TQd6gD6lBV0FpgWdBX4FY4EBQ4EBrYEBsYEBRoEBSdIADgBFAE0HgoA+oQVOgQFCXxAVe3sxLCAxN30s
+IHszMzMsIDE5N3190gA6ADsHhgeHpAeHAQwBDQA/Wk5TQ2xpcFZpZXfYAMEB3wAOAMIAxAFHAMYHiQVx
+BXEHjAeNAMsHjgVxB5BZTlNQZXJjZW50gQFKgQFKgQGwgQGugQGvgQFKIz/v1mqAAAAAXxAWe3szMzQs
+IDE3fSwgezE1LCAxOTd9fVxfZG9TY3JvbGxlcjrSADoAOweUB5WlB5UBCwEMAQ0AP1pOU1Njcm9sbGVy
+2QDBAd8ADgDCBZcAxAFHAMYHiQVxBXEHjAeaAcYAyweOBXEHnYEBSoEBSoEBsIEBsoEBr4EBSiM/788X
+wAAAAF8QFXt7MSwgMjE0fSwgezMzMywgMTV9fdIADgBFAE0HoYA+oQVggQFFXxATe3sxLCAwfSwgezMz
+MywgMTd9fV8QFnt7MjAsIDYwfSwgezM1MCwgMjMwfX3SADoAOwemB6ekB6cBDAENAD9cTlNTY3JvbGxW
+aWV3XxAUe3sxLCAxfSwgezQ4NiwgMzEwfX3SAA4ARQBNB6uAPqICOQQQgG2A5NoADgFGAI0AjgCPAJAA
+kQCSAJMBRwCUBCUEKACWAJcAmACZAJoHGge2gBWA6IEBu4AOgA+AE4EBuoEBvNQADgCNAPIAnQCeB7kH
+uge7gD+BAdGBAd+BAdJTWDEx0gAOAEUATQe/gD6sBBwGfwcwBwMHBQRMBx0GMgSbBkIHXwR+gOeBAYOB
+Ab6BAb+BAcaA9YEBx4EBa4EBDoEBcIEByIEBBNoADgCNAI4BOwCPATwAkACRAJIAkwCUAJcAlgDMAJcA
+zACYAJkAmgQlgBWADgmADgmAD4ATgOjaAA4BRgCNAI4AjwCQAJEAkgCTAUcAlAdjB9gAlgCXAJgAmQCa
+BCUH3YAVgQHCgQHAgA6AD4ATgOiBAcFYU2VydmljZXPUAA4AjQDyAJ0AngfhB+IH44A/gQHDgQHFgQHE
+0gAOADYANwfegATSAA4ARQBNB+iAPqBfEA9fTlNTZXJ2aWNlc01lbnXaAA4AjQCOATsAjwE8AJAAkQCS
+AJMAlACXAJYAzACXAMwAmACZAJoEJYAVgA4JgA4JgA+AE4Do2gAOAI0AjgE7AI8BPACQAJEAkgCTAJQA
+lwCWAMwAlwDMAJgAmQCaBCWAFYAOCYAOCYAPgBOA6NoADgCNAI4BOwCPATwAkACRAJIAkwCUAJcAlgDM
+AJcAzACYAJkAmgQlgBWADgmADgmAD4ATgOhcX05TQXBwbGVNZW512gAOAUYAjQCOAI8AkACRAJIAkwFH
+AJQCRAFKAJYAlwCYAJkAmgcaCA6AFYBugDeADoAPgBOBAbqBAcvSAA4ANgA3CBGABFZXaW5kb3fSAA4A
+RQBNCBSAPqkGtAQ+BGIHKgUaBqUHVQQwAiWBAZSA8ID7gQHOgQEzgQGPgQHPgOyAadoADgCNAI4BOwCP
+ATwAkACRAJIAkwCUAJcAlgDMAJcAzACYAJkAmgIwgBWADgmADgmAD4ATgGraAA4AjQCOATsAjwE8AJAA
+kQCSAJMAlACXAJYAzACXAMwAmACZAJoCMIAVgA4JgA4JgA+AE4BqXl9OU1dpbmRvd3NNZW51WE1haW5N
+ZW510gAOAEUATQg0gD6lBv4HBgdKB0UHHIEBuYEByoEB04EB2IEB29oADgFGAI0AjgCPAJAAkQCSAJMB
+RwCUAJsAnwCWAJcAmACZAJoHGghCgBWADIEB1IAOgA+AE4EBuoEB1VRFZGl00gAOAEUATQhGgD6oBIwE
+bwcgA/wG4wZPAIoBFYEBCYD/gQHXgN6BAaOBAXSAC4Aq2gAOAI0AjgE7AI8BPACQAJEAkgCTAJQAlwCW
+AMwAlwDMAJgAmQCaAJuAFYAOCYAOCYAPgBOADNoADgFGAI0AjgCPAJAAkQCSAJMBRwCUAjAIWwCWAJcA
+mACZAJoHGghggBWAaoEB2YAOgA+AE4EBuoEB2toADgFGAI0AjgCPAJAAkQCSAJMBRwCUBLEEtACWAJcA
+mACZAJoHGghpgBWBAROBAdyADoAPgBOBAbqBAd1USGVscNIADgBFAE0IbYA+oQSpgQESW19OU01haW5N
+ZW510gAOADIAMwhygAWBAeHfEA8CbQAOAm4CbwJwAnECcgJzAnQCdQJ2AncCeAJ5AnoEyQJ8CHYIdwh4
+CHkCgQKCCHsIfAh9AOYIfgh/CICBARuA24EB5oEB6IEB64EB5IB8gQHngQHjgQHqEAuBAemBAeVfEBh7
+ezI3OSwgMjcwfSwgezQ4NiwgMzEwfX1fEBRYMTEgQXBwbGljYXRpb24gTWVuddIADgA2ADcCjYAEWHgx
+MV9hcHBz0gA6ADsIhwFvogFvAD/SAA4ARQbwCIqBAeyvEH0EyQdCAbQBlQcGAdQEJQIwArYCtwKpAMcH
+GgQlAMcDOwTJBCUFcQQlBxoCRAEsAZUAHwNNAXkB1AF5BU4EJQK0BMkHRQJpAjAAxwNOAXYAmwAfAboH
+GgQlBCUDrACbAB8EyQbDAMcAmwTJAXkCMAQlAjACtQAfAjABOQQlBCUCsgDHAB8CewTJBCUFTgTzAjAD
+qgEsBXEFTgGAA0wAmwJEAB8FcQFJBxoEsQCbAdQAmwcaAXkFcQGAAXkCTAOuBbIBgAWwA08CMAF5AZUB
+lQCbAXkDrQM5Bl4CMAQlBxwBlQb+BwMExgWxAUkCMAHUAZEFKQdKAL4AxwCbgQEbgQHigFGASYEByoBY
+gOiAaoCcgKCAvoAagQG6gOiAGoDBgQEbgOiBAUqA6IEBuoBugDKASYACgK+AQ4BYgEOBAUKA6ICUgQEb
+gQHYgHmAaoAagLOAQoAMgAKAU4EBuoDogOiAx4AMgAKBARuBAZmAGoAMgQEbgEOAaoDogGqAmIACgGqA
+NoDogOiAhYAagAKAgIEBG4DogQFCgQEngGqAw4AygQFKgQFCgIKAq4AMgG6AAoEBSoA5gQG6gQETgAyA
+WIAMgQG6gEOBAUqAgoBDgHGAz4EBXICCgQFOgLeAaoBDgEmASYAMgEOAy4CogQF5gGqA6IEB24BJgQG5
+gQG/gQEagQFYgDmAaoBYgEiBATiBAdOAGYAagAzSAA4ARQbwCQqBAeyvEH4GwwTJAboBkQJEAfoEHAa0
+AxUDJgAfAXkBlQb+BH4FKQWdAL4HAwNNBwYHBQQQATkDrgEsA2UCtwHNBbIBdgSbBl4C9QIwAnsEPgNO
+A3UBfAP8BxoB1AccBMYHHQYyAmkHIAbJBPMDTwZPA8MCtARiBn8HKgMFAiUHLAFJBkIHMAK8AkwAvQGA
+BXEETAT5BbEEMAE4A7MFTgWwB0IDOQCKAjkFpgNVAVoHRQSpBIwB+AbjB0oFYAKyAzsCtQYBAlMD4wKp
+BcADhgdVA6wBtAOtARUCtgZkAMcD0wSxB18GpQOqBCUBWQTMB2MF6wUaAZgB+QUvAJsAygNMBG+BAZmB
+ARuAU4BIgG6AY4DngQGUgJ6AooACgEOASYEBuYEBBIEBOIEBsYAZgQG/gK+BAcqBAcaA5IA2gM+AMoCx
+gKCAV4EBXIBCgQEOgQF5gJaAaoCAgPCAs4C1gEWA3oEBuoBYgQHbgQEagQHHgQFrgHmBAdeBAZuBASeA
+t4EBdIDJgJSA+4EBg4EBzoCagGmBAeCAOYEBcIEBvoCHgHGAJoCCgQFKgPWBASmBAViA7IA1gMWBAUKB
+AU6BAeKAqIALgG2BAa2ArYA8gQHYgQESgQEJgF2BAaOBAdOBAUWAhYDBgJiBAWGAc4DRgL6BAVWAuYEB
+z4DHgFGAy4AqgJyBAXuAGoDNgQETgQHIgQGPgMOA6IA7gQEdgQHCgQFbgQEzgEuAYIEBOoAMgByAq4D/
+0gAOAEUG8AmLgQHsrxB+CYwJjQmOCY8JkAmRCZIJkwmUCZUJlgmXCZgJmQmaCZsJnAmdCZ4JnwmgCaEJ
+ogmjCaQJpQmmCacJqAmpCaoJqwmsCa0JrgmvCbAJsQmyCbMJtAe5CbYJtwm4CbkJugm7CbwJvQm+Cb8J
+wAnBCcIJwwnECcUJxgnHCcgJyQnKCcsJzAnNARAJzwnQCdEJ0gnTCdQJ1QnWCdcJ2AnZCdoJ2wncCd0J
+3gnfCeAJ4QniCeMJ5AnlCeYJ5wnoCekJ6gnrCewJ7QnuCe8J8AnxCfIJ8wn0CfUJ9gn3CfgJ+Qn6CfsJ
+/An9Cf4J/woACgEKAgoDCgQKBQoGCgcKCAoJgQHwgQHxgQHygQHzgQH0gQH1gQH2gQH3gQH4gQH5gQH6
+gQH7gQH8gQH9gQH+gQH/gQIAgQIBgQICgQIDgQIEgQIFgQIGgQIHgQIIgQIJgQIKgQILgQIMgQINgQIO
+gQIPgQIQgQIRgQISgQITgQIUgQIVgQIWgQIXgQIYgQHRgQIZgQIagQIbgQIcgQIdgQIegQIfgQIggQIh
+gQIigQIjgQIkgQIlgQImgQIngQIogQIpgQIqgQIrgQIsgQItgQIugQIvgQIwgCeBAjGBAjKBAjOBAjSB
+AjWBAjaBAjeBAjiBAjmBAjqBAjuBAjyBAj2BAj6BAj+BAkCBAkGBAkKBAkOBAkSBAkWBAkaBAkeBAkiB
+AkmBAkqBAkuBAkyBAk2BAk6BAk+BAlCBAlGBAlKBAlOBAlSBAlWBAlaBAleBAliBAlmBAlqBAluBAlyB
+Al2BAl6BAl+BAmCBAmGBAmKBAmOBAmSBAmWBAmaBAmeBAmiBAmmBAmqBAmtfEBRQdXNoIEJ1dHRvbiAo
+Q2FuY2VsKV5Db250ZW50IFZpZXctMV8QIVBvcCBVcCBCdXR0b24gQ2VsbCAoRnJvbSBEaXNwbGF5KV8Q
+MkNoZWNrIEJveCAoQWxsb3cgY29ubmVjdGlvbnMgZnJvbSBuZXR3b3JrIGNsaWVudHMpXxATTWVudSAo
+QXBwbGljYXRpb25zKV8QFE1lbnUgSXRlbSAoTWlsbGlvbnMpXxAVTWVudSBJdGVtIChBYm91dCBYMTEp
+XxAbTWVudSBJdGVtIChNaW5pbWl6ZSBXaW5kb3cpXxAeQnV0dG9uIENlbGwgKEZ1bGwgc2NyZWVuIG1v
+ZGUpXxB2VGV4dCBGaWVsZCBDZWxsIChFbmFibGVzIHRoZSBYMTEgcm9vdCB3aW5kb3cuIFVzZSB0aGUg
+Q29tbWFuZC1PcHRpb24tQSBrZXlzdHJva2UgdG8gZW50ZXIgYW5kIGxlYXZlIGZ1bGwgc2NyZWVuIG1v
+ZGUuKVxGaWxlJ3MgT3duZXJWVmlldy0yVlZpZXctMV8QD01lbnUgSXRlbSAoWDExKV8QFE1lbnUgSXRl
+bSAoUXVpdCBYMTEpXxASUHVzaCBCdXR0b24gKERvbmUpXxATSG9yaXpvbnRhbCBTY3JvbGxlcl8QKUNo
+ZWNrIEJveCAoRm9sbG93IHN5c3RlbSBrZXlib2FyZCBsYXlvdXQpXxAUTWVudSBJdGVtIChTZXJ2aWNl
+cylfEGVTdGF0aWMgVGV4dCAoSG9sZCBPcHRpb24gYW5kIENvbW1hbmQgd2hpbGUgY2xpY2tpbmcgdG8g
+YWN0aXZhdGUgdGhlIG1pZGRsZSBhbmQgcmlnaHQgbW91c2UgYnV0dG9ucy4KKV8QGE1lbnUgSXRlbSAo
+QXBwbGljYXRpb25zKVtTZXBhcmF0b3ItMV8QGE1lbnUgSXRlbSAoQ3VzdG9taXplLi4uKV8QGk1lbnUg
+SXRlbSAoQXBwbGljYXRpb25zKS0xXxBCU3RhdGljIFRleHQgKFRoZXNlIG9wdGlvbnMgdGFrZSBlZmZl
+Y3Qgd2hlbiBYMTEgaXMgbmV4dCBsYXVuY2hlZC4pWERvY2tNZW51XxBpVGV4dCBGaWVsZCBDZWxsIChI
+b2xkIE9wdGlvbiBhbmQgQ29tbWFuZCB3aGlsZSBjbGlja2luZyB0byBhY3RpdmF0ZSB0aGUgbWlkZGxl
+IGFuZCByaWdodCBtb3VzZSBidXR0b25zLgopXxByU3RhdGljIFRleHQgKEVuYWJsZXMgdGhlIFgxMSBy
+b290IHdpbmRvdy4gVXNlIHRoZSBDb21tYW5kLU9wdGlvbi1BIGtleXN0cm9rZSB0byBlbnRlciBhbmQg
+bGVhdmUgZnVsbCBzY3JlZW4gbW9kZS4pXxAYTWVudSBJdGVtIChGcm9tIERpc3BsYXkpXxAXVGFibGUg
+Q29sdW1uIChTaG9ydGN1dClfECNDaGVjayBCb3ggKFVzZSBzeXN0ZW0gYWxlcnQgZWZmZWN0KV8QF01l
+bnUgSXRlbSAoSGlkZSBPdGhlcnMpXxAUUHVzaCBCdXR0b24gKFJlbW92ZSlfEBpUZXh0IEZpZWxkIENl
+bGwgKENvbG9yczoKKV1NZW51IChXaW5kb3cpXENvbnRlbnQgVmlld18QGE1lbnUgSXRlbSAoQ2xvc2Ug
+V2luZG93KV8QLENoZWNrIEJveCAoRW5hYmxlIGtleSBlcXVpdmFsZW50cyB1bmRlciBYMTEpXxAuQnV0
+dG9uIENlbGwgKEVuYWJsZSBrZXkgZXF1aXZhbGVudHMgdW5kZXIgWDExKV8QJUJ1dHRvbiBDZWxsIChV
+c2Ugc3lzdGVtIGFsZXJ0IGVmZmVjdClfEA9NZW51IEl0ZW0gKEN1dClfEBFNZW51IChPdGhlclZpZXdz
+KV8QEE1lbnUgSXRlbSAoSGVscClfEBdQdXNoIEJ1dHRvbiAoRHVwbGljYXRlKVtTZXBhcmF0b3ItMl8Q
+FE1lbnUgSXRlbSAoSGlkZSBYMTEpWlByZWZzUGFuZWxbU2VwYXJhdG9yLTlfEBRCdXR0b24gQ2VsbCAo
+Q2FuY2VsKV8QFlB1c2ggQnV0dG9uIChBZGQgSXRlbSlfEExTdGF0aWMgVGV4dCAoQWxsb3dzIGlucHV0
+IG1lbnUgY2hhbmdlcyB0byBvdmVyd3JpdGUgdGhlIGN1cnJlbnQgWDExIGtleW1hcC4pXxARTWVudSBJ
+dGVtIChQYXN0ZSlfELxUZXh0IEZpZWxkIENlbGwgKExhdW5jaGluZyBYMTEgd2lsbCBjcmVhdGUgWGF1
+dGhvcml0eSBhY2Nlc3MtY29udHJvbCBrZXlzLiBJZiB0aGUgc3lzdGVtJ3MgSVAgYWRkcmVzcyBjaGFu
+Z2VzLCB0aGVzZSBrZXlzIGJlY29tZSBpbnZhbGlkIHdoaWNoIG1heSBwcmV2ZW50IFgxMSBhcHBsaWNh
+dGlvbnMgZnJvbSBsYXVuY2hpbmcuKV8QFlN0YXRpYyBUZXh0IChDb2xvcnM6CilfEBdNZW51IEl0ZW0g
+KFpvb20gV2luZG93KV8QGk1lbnUgSXRlbSAoUHJlZmVyZW5jZXMuLi4pW1NlcGFyYXRvci02XxBGVGV4
+dCBGaWVsZCBDZWxsIChUaGlzIG9wdGlvbiB0YWtlcyBlZmZlY3Qgd2hlbiBYMTEgaXMgbGF1bmNoZWQg
+YWdhaW4uKVtTZXBhcmF0b3ItN1tBcHBsaWNhdGlvbl8QFU1lbnUgKEFwcGxpY2F0aW9ucyktMV8QFE1l
+bnUgSXRlbSAoU2hvdyBBbGwpW1NlcGFyYXRvci0zXxB5VGV4dCBGaWVsZCBDZWxsIChYMTEgYmVlcHMg
+d2lsbCB1c2UgdGhlIHN0YW5kYXJkIHN5c3RlbSBhbGVydCwgYXMgZGVmaW5lZCBpbiB0aGUgU291bmQg
+RWZmZWN0cyBzeXN0ZW0gcHJlZmVyZW5jZXMgcGFuZWwuKV8QJkNoZWNrIEJveCAoRW11bGF0ZSB0aHJl
+ZSBidXR0b24gbW91c2UpXxAmVG9wIFRhYiBWaWV3IChJbnB1dCwgT3V0cHV0LCBTZWN1cml0eSlbU2Ny
+b2xsIFZpZXdfEB5NZW51IEl0ZW0gKFRvZ2dsZSBGdWxsIFNjcmVlbilfEBZCdXR0b24gQ2VsbCAoQWRk
+IEl0ZW0pXxAWVGFibGUgQ29sdW1uIChDb21tYW5kKV8QHk1lbnUgSXRlbSAoQnJpbmcgQWxsIHRvIEZy
+b250KVlTZXBhcmF0b3JfECZCdXR0b24gQ2VsbCAoQXV0aGVudGljYXRlIGNvbm5lY3Rpb25zKV8QJFRh
+YmxlIFZpZXcgKE5hbWUsIENvbW1hbmQsIFNob3J0Y3V0KV8QE1RhYmxlIENvbHVtbiAoTmFtZSlcRWRp
+dFByb2dyYW1zXxAVVGFiIFZpZXcgSXRlbSAoSW5wdXQpXxASTWVudSBJdGVtIChEZWxldGUpW1NlcGFy
+YXRvci01XxARVmVydGljYWwgU2Nyb2xsZXJfEHhUZXh0IEZpZWxkIENlbGwgKFdoZW4gZW5hYmxlZCwg
+bWVudSBiYXIga2V5IGVxdWl2YWxlbnRzIG1heSBpbnRlcmZlcmUgd2l0aCBYMTEgYXBwbGljYXRpb25z
+IHRoYXQgdXNlIHRoZSBNZXRhIG1vZGlmaWVyLilvEBYATQBlAG4AdQAgAEkAdABlAG0AIAAoAEMAdQBz
+AHQAbwBtAGkAegBlICYAKV8QEk1lbnUgSXRlbSAoV2luZG93KV8QFE1lbnUgSXRlbSAoWDExIEhlbHAp
+XxAQTWVudSBJdGVtIChVbmRvKV8QFk1lbnUgSXRlbSAoMjU2IENvbG9ycylfEBBNZW51IEl0ZW0gKENv
+cHkpXxAQTWVudSBJdGVtIChFZGl0KV8QEVRhYmxlIEhlYWRlciBWaWV3XxB1U3RhdGljIFRleHQgKFgx
+MSBiZWVwcyB3aWxsIHVzZSB0aGUgc3RhbmRhcmQgc3lzdGVtIGFsZXJ0LCBhcyBkZWZpbmVkIGluIHRo
+ZSBTb3VuZCBFZmZlY3RzIHN5c3RlbSBwcmVmZXJlbmNlcyBwYW5lbC4pXxAYVGFiIFZpZXcgSXRlbSAo
+U2VjdXJpdHkpXxBCU3RhdGljIFRleHQgKFRoaXMgb3B0aW9uIHRha2VzIGVmZmVjdCB3aGVuIFgxMSBp
+cyBsYXVuY2hlZCBhZ2Fpbi4pXxAPVGV4dCBGaWVsZCBDZWxsXxAoQnV0dG9uIENlbGwgKEVtdWxhdGUg
+dGhyZWUgYnV0dG9uIG1vdXNlKV8QRlRleHQgRmllbGQgQ2VsbCAoVGhlc2Ugb3B0aW9ucyB0YWtlIGVm
+ZmVjdCB3aGVuIFgxMSBpcyBuZXh0IGxhdW5jaGVkLilfEBZUYWIgVmlldyBJdGVtIChPdXRwdXQpXxAR
+VGV4dCBGaWVsZCBDZWxsLTJfEFBUZXh0IEZpZWxkIENlbGwgKEFsbG93cyBpbnB1dCBtZW51IGNoYW5n
+ZXMgdG8gb3ZlcndyaXRlIHRoZSBjdXJyZW50IFgxMSBrZXltYXAuKVtTZXBhcmF0b3ItOF8QuFN0YXRp
+YyBUZXh0IChMYXVuY2hpbmcgWDExIHdpbGwgY3JlYXRlIFhhdXRob3JpdHkgYWNjZXNzLWNvbnRyb2wg
+a2V5cy4gSWYgdGhlIHN5c3RlbSdzIElQIGFkZHJlc3MgY2hhbmdlcywgdGhlc2Uga2V5cyBiZWNvbWUg
+aW52YWxpZCB3aGljaCBtYXkgcHJldmVudCBYMTEgYXBwbGljYXRpb25zIGZyb20gbGF1bmNoaW5nLilf
+EBtQb3B1cCBCdXR0b24gKEZyb20gRGlzcGxheSlfEKdTdGF0aWMgVGV4dCAoSWYgZW5hYmxlZCwgQXV0
+aGVudGljYXRlIGNvbm5lY3Rpb25zIG11c3QgYWxzbyBiZSBlbmFibGVkIHRvIGVuc3VyZSBzeXN0ZW0g
+c2VjdXJpdHkuIFdoZW4gZGlzYWJsZWQsIGNvbm5lY3Rpb25zIGZyb20gcmVtb3RlIGFwcGxpY2F0aW9u
+cyBhcmUgbm90IGFsbG93ZWQuKV8QFk1lbnUgSXRlbSAoU2VsZWN0IEFsbClfEBxDaGVjayBCb3ggKEZ1
+bGwgc2NyZWVuIG1vZGUpXxAUQnV0dG9uIENlbGwgKFJlbW92ZSlfEKtUZXh0IEZpZWxkIENlbGwgKElm
+IGVuYWJsZWQsIEF1dGhlbnRpY2F0ZSBjb25uZWN0aW9ucyBtdXN0IGFsc28gYmUgZW5hYmxlZCB0byBl
+bnN1cmUgc3lzdGVtIHNlY3VyaXR5LiBXaGVuIGRpc2FibGVkLCBjb25uZWN0aW9ucyBmcm9tIHJlbW90
+ZSBhcHBsaWNhdGlvbnMgYXJlIG5vdCBhbGxvd2VkLilbTWVudSAoSGVscClbU2VwYXJhdG9yLTRfEBtN
+ZW51IEl0ZW0gKFByZXZpb3VzIFdpbmRvdylfECRDaGVjayBCb3ggKEF1dGhlbnRpY2F0ZSBjb25uZWN0
+aW9ucylaTWVudSAoWDExKVxTZXBhcmF0b3ItMTBfEBdCdXR0b24gQ2VsbCAoRHVwbGljYXRlKV8QD01l
+bnUgKFNlcnZpY2VzKV8QEVRleHQgRmllbGQgQ2VsbC0xXxAXTWVudSBJdGVtIChOZXh0IFdpbmRvdylf
+EDRCdXR0b24gQ2VsbCAoQWxsb3cgY29ubmVjdGlvbnMgZnJvbSBuZXR3b3JrIGNsaWVudHMpXxAVTWVu
+dSBJdGVtIChUaG91c2FuZHMpXxASQnV0dG9uIENlbGwgKERvbmUpW01lbnUgKEVkaXQpXxArQnV0dG9u
+IENlbGwgKEZvbGxvdyBzeXN0ZW0ga2V5Ym9hcmQgbGF5b3V0KV8QdFN0YXRpYyBUZXh0IChXaGVuIGVu
+YWJsZWQsIG1lbnUgYmFyIGtleSBlcXVpdmFsZW50cyBtYXkgaW50ZXJmZXJlIHdpdGggWDExIGFwcGxp
+Y2F0aW9ucyB0aGF0IHVzZSB0aGUgTWV0YSBtb2RpZmllci4pXxAQTWVudSBJdGVtIChSZWRvKdIADgBF
+BvAKh4EB7KDSAA4ARQbwCoqBAeyg0gAOAEUG8AqNgQHsrxC1BsMAbgTJAboBkQJEAfoAhAQcAFYGtAMV
+AyYAHwBpAXkAvgb+BH4DTQGVBSkHAwWdBwUHBgQQAFIAVQB4AH4BOQCAA64BLANlArcBzQBTAXYFsgSb
+AGsC9QZeAjAAegBQAnsEPgNOA3UBfABnAH0D/ACBAE8HGgHUBxwAYwB7AHEHHQYyA8MHIAJpBMYGyQNP
+Bk8E8wBcAGwAUQBeArQEYgBZAGUGfwcqAwUHLAIlAIMBSQZCAG8HMAK8AkwAVABiAHcAvQGABXEETAWx
+BPkEMAOzATgFTgWwAFgDOQNVAIoCOQdCBaYAZABbAVoAagBtB0UAcgCCBKkEjAB0AfgAdgB5BuMHSgKy
+BWADOwK1AHACUwPjBgECqQXAA4YHVQCFAGYBtAOsA60BFQK2A9MAxwZkAGAAYQBzBqUHXwSxA6oAVwB/
+BCUHYwTMBesBWQBaBRoAXwBoAfkBmAB8BS8AdQCbAMoDTARvAF2BAZmBASSBARuAU4BIgG6AY4EBoIDn
+gE6BAZSAnoCigAKBAQ2AQ4AZgQG5gQEEgK+ASYEBOIEBv4EBsYEBxoEByoDkgC6AR4EBb4EBiYA2gQGN
+gM+AMoCxgKCAV4AxgEKBAVyBAQ6BARaAloEBeYBqgQF4gBiAgIDwgLOAtYBFgQEDgQGHgN6BAY6ACoEB
+uoBYgQHbgPSBAYCBATCBAceBAWuAyYEB14B5gQEagQGbgLeBAXSBASeAeIEBF4ApgOKAlID7gGyA+oEB
+g4EBzoCagQHggGmBAZiAOYEBcIEBJoEBvoCHgHGAQYDvgQFqgCaAgoEBSoD1gQFYgQEpgOyAxYA1gQFC
+gQFOgGiAqICtgAuAbYEB4oEBrYD4gHaAPIEBEYEBGYEB2IEBMoEBk4EBEoEBCYEBPoBdgQFBgQFzgQGj
+gQHTgIWBAUWAwYCYgQEugHOA0YEBYYC+gQFVgLmBAc+BAaKA/oBRgMeAy4AqgJyAzYAagQF7gOaA64EB
+N4EBj4EByIEBE4DDgFCBAYuA6IEBwoEBHYEBW4A7gHCBATOA44EBCIBggEuBAYKBATqBAT+ADIAcgKuA
+/4Dd0gAOAEUG8AtFgQHsrxC1C0YLRwtIC0kLSgtLC0wLTQtOC08LUAtRC1ILUwtUC1ULVgtXC1gLWQta
+C1sLXAtdC14LXwtgC2ELYgtjC2QLZQtmC2cLaAtpC2oLawtsC20LbgtvC3ALcQtyC3MLdAt1C3YLdwt4
+C3kLegt7C3wLfQt+C38LgAuBC4ILgwuEC4ULhguHC4gLiQuKC4sLjAuNC44LjwuQC5ELkguTC5QLlQuW
+C5cLmAuZC5oLmwucC50LngufC6ALoQuiC6MLpAulC6YLpwuoC6kLqgurC6wLrQuuC68LsAuxC7ILswu0
+C7ULtgu3C7gLuQu6C7sLvAu9C74LvwvAC8ELwgvDC8QLxQvGC8cLyAvJC8oLywvMC80LzgvPC9AL0QvS
+C9ML1AvVC9YL1wvYC9kL2gvbC9wL3QveC98L4AvhC+IL4wvkC+UL5gvnC+gL6QvqC+sL7AvtC+4L7wvw
+C/EL8gvzC/QL9Qv2C/cL+Av5C/qBAnCBAnGBAnKBAnOBAnSBAnWBAnaBAneBAniBAnmBAnqBAnuBAnyB
+An2BAn6BAn+BAoCBAoGBAoKBAoOBAoSBAoWBAoaBAoeBAoiBAomBAoqBAouBAoyBAo2BAo6BAo+BApCB
+ApGBApKBApOBApSBApWBApaBApeBApiBApmBApqBApuBApyBAp2BAp6BAp+BAqCBAqGBAqKBAqOBAqSB
+AqWBAqaBAqeBAqiBAqmBAqqBAquBAqyBAq2BAq6BAq+BArCBArGBArKBArOBArSBArWBAraBAreBAriB
+ArmBArqBAruBAryBAr2BAr6BAr+BAsCBAsGBAsKBAsOBAsSBAsWBAsaBAseBAsiBAsmBAsqBAsuBAsyB
+As2BAs6BAs+BAtCBAtGBAtKBAtOBAtSBAtWBAtaBAteBAtiBAtmBAtqBAtuBAtyBAt2BAt6BAt+BAuCB
+AuGBAuKBAuOBAuSBAuWBAuaBAueBAuiBAumBAuqBAuuBAuyBAu2BAu6BAu+BAvCBAvGBAvKBAvOBAvSB
+AvWBAvaBAveBAviBAvmBAvqBAvuBAvyBAv2BAv6BAv+BAwCBAwGBAwKBAwOBAwSBAwWBAwaBAweBAwiB
+AwmBAwqBAwuBAwyBAw2BAw6BAw+BAxCBAxGBAxKBAxOBAxSBAxWBAxaBAxeBAxiBAxmBAxqBAxuBAxyB
+Ax2BAx6BAx+BAyCBAyGBAyKBAyOBAyQRASsRAhIRAR4SAAGIHhEBdxEBDhEBfREBhhA6EQIWEBcSAAGI
+vRIAAYi/EQJDEQEHEQFeEQFyEDgQiBEBbREBYhEBIxCDEgADDmcQkBEBDREBMREBrREBhBEBrxECIxEC
+DhEBihEBexEBpxIAAYgNEQIfEQGAEQGqEQFzEQIXEJERAYwSAAGIIREBJREBixD1EMsRAXASAAGIEBIA
+AYgTEQGwEQIkEKARAhwQwxAdEQF8EQGjEQIlEQGIEQGsEQIhEIYSAAGIGBCcEPQRASQSAAGHyxEBcRCr
+EQE2EQGSEQGJELMRAZERAYEQzBEBERDOEIEQXBIAAYgiE//////////9ENARATURAg8QlhEBNxCPEgAB
+iBQRAWsRAY0QzREBrhDEEQFcEQEnEQIgEQEqEgABh9YQBRIAAYgWEQIMEQEoEQEpEQEEEQFdEgABiAwQ
+pBEBEBEBHRIAAYfHEQIiEQGFEQIUEQGmEQEwEBMRAhsQyhEBpRCeEQGPEQGzELAQnRCjEQF0EgAElQcR
+AWERAYIRAbESAAGICxIAAYgbEQI/EQFgEQI+EgABiBERAhgQtRCyEQF+EQF4EQF5EKwRAh0SAAGIGREB
+XxIAAYfFEQFBEM8RAS4RAhoQlREBpBEBdhEBjhECExA5EIISAAGHxBECPRECFREBhxECGREBNBC0EQF/
+EgABiBcRAT4SAAGHwxEBgxCpEgABiBIRAWwQrRCv0gAOAEUATQyvgD6g0gAOAEUG8AyygQHsoNIADgBF
+BvAMtYEB7KDSADoAOwy3DLiiDLgAP15OU0lCT2JqZWN0RGF0YQAIABkAIgAnADEAOgA/AEQAUgBUAGYG
+vAbCBw0HFAcbBykHOwdXB2UHcQd9B4sHlgekB8AHzgfhB/MIDQgXCCQIJggpCCwILwgyCDQINwg5CDwI
+PwhCCEUIRwhJCEwITwhUCFcIYAhsCG4IcAh5CIMIhQiTCJwIpQiwCLcIyQjSCNsI5AjpCPgJCwkUCR8J
+IQkiCSsJMgk/CUUJTglQCcEJwwnFCccJyQnLCc0JzwnRCdMJ1QnXCdkJ2wndCd8J4QnjCeUJ5wnpCesJ
+7QnvCfEJ9An3CfoJ/QoACgMKBgoJCgwKDwoSChUKGAobCh4KIQokCicKKgotCjAKMwo2CjkKPAo/CkIK
+RQpICksKTgpbCmQKbApuCnAKcgqTCpsKrwq6CsgK0grfCuYK6ArqCu8K8Qr2CvgK+gr8CwkLFQsXCxoL
+HQskCyULMgtBC0MLRQtHC08LYQtqC28LgguPC5ELkwuVC6gLsQu2C8ELyQvSC9kL8QwADBEMHwwhDCMM
+JQwnDEQMVgxeDGUMbgx4DIQMhgyIDIoMjAyPDJAMkgynDLIMtAy2DLgMugzTDQgNFA0qDT8NTg1hDXMN
+fg2IDZYNqA21DcMNyA3KDcwNzg3QDdIN1A3WDdgN2g3cDd4N4w4DDhQOGw4iDisOLQ42DjgOOw5IDlEO
+Vg5dDmYOcg50DnYOfw6IDo0Oow6sDrUOwg7PDtgO4w7sDvYO/Q8JDxIPFA8WDyQPMw9AD0IPRA9GD2cP
+aQ9rD20Pbw9xD3MPfg+AD4sPnA+eD6APog+kD60Ptg+9D9QP5Q/nD+kP6w/tD/4QABACEAQQBhALEBQQ
+FhAbEB0QHxBIEFYQYxBlEGcQaBBqEGsQbRBvEHEQmhCkEK0QrxCxELMQtRC3ELkQuxC9EMoQ2RDmEOgQ
+6hDsEPUQ9xD8EP4RABEpESsRLREuETARMREzETURNxFYEVoRXBFeEWARYhFkEXkRghGJEZgRoBGpEa4R
+txHIEcoRzBHOEdAR7RHvEfER8xH1EfYR+BIREhMSFRIXEhkSGxIzEmgSahJsEm4ScBJyEnQSdhKQEqES
+oxKlEqcSqRLGEsgSyhLMEs4SzxLREuYS6BLqEuwS7hMHEzwTPhNAE0ITRBNGE0gTShNzE34TjxORE5MT
+lROXE6oTuxO9E78TwRPDE+AT4hPkE+YT6BPpE+sUBBRTFHAUghSUFKkUtxTAFMEUwxTFFMcUyRTLFM0U
+zxTRFNMU1RTWFNcU2hTdFN8U5BT1FPcU+RT7FQQVBhUPFREVQhVLFVEVWRVbFV0VXxVhFWMVZRVnFWkV
+chV/FYEVgxWFFZIVphWvFbEVvBXFFccV0BXSFdQV1hXYFgUWBxYJFgsWDRYPFhEWExYVFhcWIhZPFlEW
+UxZVFlcWWRZbFl0WXxZhFmsWmBaaFpwWnhagFqIWpBamFqgWqhazFrwWyRbdFuwW9RcCFxAXIRcjFyUX
+JxcpF1IXVBdWF1cXWRdaF1wXXhdgF3EXcxd2F3kXfBePF6AXohekF6YXqBfRF9MX1RfWF9gX2RfbF90X
+3xfsF+4X8BfzGAIYExgVGBcYGRgbGDgYOhg8GD4YQBhBGEMYXBiRGJMYlRiXGJkYmxidGJ8YvBjJGNoY
+3BjeGOAY4hjoGPkY+xj9GP8ZARlAGU0ZZhlzGYkZlxmhGa8ZyBnVGd8Z8RoFGg8aGxodGh8aIRojGiUa
+JxosGi4aMBoyGjQaNho4GlMaZRptGnYaeBp9GpoapRq6GsYayBrKGswazhrXGtka3BreGw8bHhsoGzwb
+VRttG28bcRtzG3Ubdxt5G3obfBt9G38biBuKG40bjxuYG5obqRurG60brxuxG7MbtRu3G9Qb1hvYG9ob
+3BvdG98b9xwYHCwcOBw6HDwcPhxAHEIcRxxJHLMcxBzGHM8c0RzUHOkc8Rz+HQodGB0aHRwdHh0gHSId
+KR02HUMdSx1NHVkdYh1nHXwdfh2AHYIdhB2XHaQdph2pHbIdux3NHdYd4R3tHgoeDB4OHhAeEh4THhUe
+LR5OHlAeUh5UHlYeWB5aHmMegB6CHoQehh6IHokeix6kHsUexx7JHssezR7PHtEfCB8lHycfKR8rHy0f
+Lh8wH0kffh+AH4IfhB+GH4gfih+MH58fvB++H8Afwh/EH8Ufxx/gIAEgAyAFIAcgCSALIA0gdCCNIJYg
+nSC1IL4gwCDHIMkgyyDNIOYg8yD9IP8hASEDIQUhByEJIRIhFCEWIR8hISEuITAhMiE0ITYhOCE6IVch
+WSFbIV0hXyFgIWIheiGbIZ0hnyGhIaMhpSGnIhAiLSIvIjEiMyI1IjYiOCJRInIidCJ2IngieiJ8In4i
+2CL1Ivci+SL7Iv0i/iMAIxkjTiNQI1IjVCNWI1gjWiNcI38jnCOeI6AjoiOkI6UjpyPAI+Ej4yPlI+cj
+6SPrI+0kLiQ0JD0kQiRQJGkkayRtJG8kcSRzJHUkfiSAJIIkiSSeJKAkoiSkJKYkqCSxJLMkviTAJMIk
+xCTGJMgk5STnJOkk6yTtJO4k8CUlJSclKSUrJS0lLyUxJTMlTiVrJW0lbyVxJXMldCV2JY8lsCWyJbQl
+tiW4JbolvCZpJoYmiCaKJowmjiaPJpEmqSbKJswmzibQJtIm1CbWJ3InjyeRJ5MnlSeXJ5gnmieyJ9Mn
+1SfXJ9kn2yfdJ98oFigfKCgoMSg8KFQoXyhpKHIodyiKKJYooyilKKcoqSjKKMwozijQKNIo1CjWKNoo
+3CjhKPIo9Cj2KPgo+ikLKQ0pDykRKRMpNCk2KTgpOik8KT4pQClNKV4pYCliKWQpZimDKYUphymJKYsp
+jSmPKaApoimlKagpqym1KcQp1SnXKdkp2yndKf4qACoCKgQqBioIKgoqHyoxKkIqRCpGKkgqSiprKm0q
+bypxKnMqdSp3KoQqhiqUKqUqpyqpKqsqrSrOKtAq0irXKtkq2yrdKt8q9CsNKx4rICsiKyQrJis6K0sr
+TStPK1ErUyt0K3YreCt6K3wrfiuAK4wrmSumK6grqiutK84r0CvTK9Yr2CvaK9wr4SvjK+kr+iv8K/4s
+ASwELCUsJywqLC0sLywxLDMsPCw+LEksVixYLFssXix/LIEshCyHLIksiyyNLJIslCyaLKssrSyvLLIs
+tSzWLNgs2yzdLN8s4SzjLO8tCC0ZLRstHS0gLSMtRC1GLUktSy1NLU8tUi1fLWEtZC1nLXAtei2LLY0t
+jy2RLZMtpC2mLagtqi2tLcAt0S3TLdUt2C3bLfgt+y39LgAuAy4GLgcuCi4fLiEuIy4mLikuQy54Lnou
+fS6ALoMuhi6ILosukC6ZLqMutC62Lrkuwy7MLs4u1y7ZLvEvAi8ELwYvCC8LLxovKy8tLy8vMi81L1Iv
+VS9XL1ovXS9eL2Evey+wL7IvtS+4L7svvi/AL8MvzC/VL9cv4C/iL/QwBTAHMAkwCzAOMC4wPzBBMEMw
+RTBIMFIwYzBlMGcwajBtMI4wkDCTMJYwmDCaMJwwqDCrMLgwyTDLMM0w0DDTMPAw8zD1MPgw+zD+MP8x
+AjEaMU8xWDFaMVwxXzFiMWUxZzFqMW8xeDF6MY0xnjGgMaIxpDGmMbcxuTG7Mb0xwDHMMd0x3zHiMeQx
+5zI2MlgyZTJ6MocyoTK9Mtgy5DMDMxIzHjMhMyQzKTMsMy8zMDMzMzwzRTNIM0kzTDNPM1IzWzOEM44z
+mDOiM7AzszO2M7kzuzO+M8EzxDPHM8ozzTPYM/Ez/TQANAM0BjQJNAw0NTQ4NDs0PjRBNEQ0RzRKNE00
+VzRgNGk0fTSSNJU0mDSbNJ400zTfNOg0+zUINRQ1IjUlNSg1KzUuNTA1MzU2NUk1TDVPNVI1VTVYNW81
+eDWBNY81mDWaNaE1pDWnNao10zXiNe819zYCNhE2HDYnNjQ2NTY4Njs2RDZHNlA2WTZaNl02ejZ/NoI2
+hTaINoo2jTaSNp82oTatNsI2xDbGNsk2yzbdNuY28TcFNyI3JzcpNyw3LjcxNzM3QDdCN0U3TjdTN2E3
+ijeLN443kTeaN503pjenN6o3xzfKN8030DfSN9U33Tf6N/w3/zgBOAQ4BjgvODA4Mzg2OD84QjhLOEw4
+TzhsOG84cjh1OHc4ejiDOJg4mjidOKA4ojiuOM840TjUONc42jjbON047jjwOPk4+zkQORI5FDkXORk5
+MjlHOUk5TDlPOVE5WzloOWo5bzl4OYM5jjmfOaE5ozmmOak5zjnQOdM51jnYOdo53DneOec56TnvOgA6
+AjoEOgc6CjovOjE6NDo2Ojg6Ojo8OkU6XjprOm06cDpzOpQ6ljqZOpw6njqgOqI6qDqqOrE6wjrEOsY6
+yTrMOuk67DruOvE69Dr1Ovg7EjtHO0k7TDtPO1I7VTtXO1o7YTtqO2w7dTt3O4w7nTufO6E7ozumO7I7
+wzvFO8c7yjvNO+478DvzO/Y7+Dv6O/w8CzwNPBk8KjwsPC48MDwzPEg8WTxbPF08XzxiPH88kDySPJQ8
+ljyZPLE8wjzEPMY8yDzKPNs83TzfPOI85T0GPQg9Cz0OPRA9Ej0UPSY9KT08PU09Tz1RPVQ9Vz14PXo9
+fT2APYI9hD2GPZg9mj2tPb49wD3CPcU9yD3lPeg96j3tPfA98T30Pgw+QT5DPkY+ST5MPk8+UT5UPls+
+ZD5mPm8+cT6GPpc+mT6bPp0+oD6sPrk+uz6+PsE+4j7kPuc+6j7sPu4+8D71Pvc+/T8GPwlABkAJQAxA
+DkAQQBJAFEAWQBlAG0AdQB9AIUAkQCdAKUArQC5AMUA0QDdAOkA8QD5AQEBCQERARkBIQEpATUBQQFJA
+VUBXQFlAW0BdQF9AYUBjQGZAaEBrQG5AcUBzQHZAeEB7QH5AgECDQIZAiECKQI1AkECSQJVAl0CZQJxA
+n0ChQKNApUCnQKpArECvQLJAtEC2QLhAu0C+QMBAwkDEQMZAyUDMQM5A0UDUQNdA2UDcQN9A4UDkQOZA
+6EDqQOxA70DxQPRA9kD5QPtA/UD/QQFBA0EFQQdBCkENQRBBE0EVQRdBGkEdQSBBIkElQSdBKUEsQS5B
+MEEyQTRBPUE/QUxBT0FSQVVBWEFbQV5BZ0FpQXRBd0F6QX1BgEGDQYxBjkGRQZRBrEG1Qb5ByUHqQfRB
+90H6Qf1CAEIDQgZCD0IoQjVCPkJJQlRCeUJ8Qn9CgkKFQohCi0KUQqxCtUK3QrpCvULTQuxC9UL+QwtD
+IkMrQy1DMkM0QzZDX0NhQ2NDZkNoQ2pDbENvQ3JDg0OFQ4hDi0OOQ5JDm0OdQ7ZDuEO7Q75DwUPEQ8ZD
+yUPMQ89D0kPVQ9hEAUQDRAVEBkQIRAlEC0QNRA9EOEQ6RD1EQERCRERERkRIREtEVERlRGdEakRtRHBE
+eUR7RIREhkSHRJlEwkTERMZEx0TJRMpEzETORNBE+UT7RP1E/kUARQFFA0UFRQdFMEUyRTRFNUU3RThF
+OkU8RT5FS0V0RXZFeEV6RXxFfkWARYNFhkWPRZFFmEWhRaNFtkW5RbtFvUXARcNFxkXJRctFzUX2RfhF
++kX7Rf1F/kYARgJGBEYtRi9GMUYyRjRGNUY3RjlGO0ZKRlNGXEZeRmlGbEZvRnJGdUZ4RqFGo0alRqhG
+qkasRq5GsUa0RrlGwkbERtVG2EbaRt1G30biRuVG50bpRxJHFEcWRxdHGUcaRxxHHkcgR0lHS0dNR1BH
+UkdUR1ZHWUdcR4VHh0eKR41Hj0eRR5NHlkeZR55Hp0epR6xHr0e7R8RHxkfJSAhIC0gNSBBIE0gWSBlI
+G0geSCFIJEgmSClILEhHSF5IZ0hpSHJIe0iASIlIjEmJSYxJj0mRSZNJlkmYSZpJnEmeSaBJokmkSadJ
+qUmrSa1JsEmySbVJt0m6SbxJvknAScJJxEnGSchJyknNSc9J0UnUSddJ2UnbSd1J30nhSeNJ5UnnSepJ
+7EnuSfBJ8kn0SfdJ+kn8Sf5KAUoDSgVKB0oJSgtKDUoPShFKE0oVShdKGUobSh1KIEoiSiVKKEoqSixK
+LkoxSjRKNko4SjpKPEo+SkFKQ0pGSklKS0pNSk9KUkpUSldKWUpbSl1KX0piSmRKZ0ppSmtKbUpvSnFK
+c0p1SndKeUp8Sn5KgEqDSoVKiEqLSo5KkUqTSpVKl0qZSpxKn0qhSqNKpUquSrFLsEuzS7ZLuEu6S7xL
+vkvAS8NLxUvHS8lLy0vNS9BL00vWS9lL20veS+BL40vmS+hL6kvsS+5L8EvyS/RL90v5S/xL/0wBTANM
+BUwHTAlMC0wNTA9MEkwUTBdMGkwdTCBMIkwlTChMK0wtTDBMMkw0TDZMOUw8TD5MQExDTEVMSExLTE1M
+T0xRTFNMVkxYTFtMXkxgTGJMZExnTGpMbUxvTHFMc0x2THhMekx9TIBMg0yFTIhMi0yOTJBMkkyUTJdM
+mUybTJ1MoEyiTKVMp0ypTKtMrUyvTLJMtEy2TLlMvEy/TMFMw0zFTMhMy0zOTNFM00zVTNhM2kzcTN5M
+4EzpTOxN603uTfFN9E33TfpN/U4ATgNOBk4JTgxOD04SThVOGE4bTh5OIU4kTidOKk4tTjBOM042TjlO
+PE4/TkJORU5ITktOTk5RTlROV05aTl1OYE5jTmZOaU5sTm9Ock51TnhOe05+ToFOhE6HTopOjU6QTpNO
+lk6ZTpxOn06iTqVOqE6rTq5OsU6zTrZOuU68Tr9Owk7FTshOy07OTtFO1E7XTtpO3U7gTuNO5k7pTuxO
+707yTvVO+E77Tv5PAU8ETwdPCk8NTxBPE08WTxlPHE8fTyJPJU8oTytPLk8xTzRPN086Tz1PQE9DT0ZP
+SU9MT09PUk9VT1hPW09eT2FPZE97T4pPrk/jT/lQEFAoUEZQZ1DgUO1Q9FD7UQ1RJFE5UU9Re1GSUfpS
+FVIhUjxSWVKeUqdTE1OIU6NTvVPjU/1UFFQxVD9UTFRnVJZUx1TvVQFVFVUoVUJVTlVlVXBVfFWTVaxV
++1YPVs5W51cBVx5XKldzV39Xi1ejV7pXxlhCWGtYlFigWMFY2ljzWRRZHllHWW5ZhFmRWalZvlnKWd5a
+WVqIWp1atFrHWuBa81sGWxpbklutW/JcBFwvXHhckVylXPhdBF2/Xd1eh16gXr9e1l+EX5BfnF+6X+Ff
+7F/5YBNgJWA5YFNgimCiYLdgw2DxYWhhe2GEYYdhiGGRYZRhlWGeYaFjDmMRYxRjF2MZYxtjHWMfYyJj
+JGMmYyljK2MtYy9jMmM0YzZjOWM8Yz5jQGNDY0ZjSWNMY09jUWNTY1VjWGNbY11jYGNiY2RjZmNoY2pj
+bGNuY3FjdGN3Y3ljfGN+Y4Fjg2OFY4djiWOLY41jkGOTY5VjmGOaY51jn2OiY6Rjp2OqY61jsGOyY7Vj
+t2O6Y71jv2PCY8Vjx2PKY8xjzmPQY9Jj1GPWY9lj3GPeY+Fj42PmY+hj62PuY/Fj82P1Y/dj+WP8Y/5k
+AGQDZAVkCGQLZA1kD2QRZBRkF2QZZBtkHWQfZCFkJGQnZClkK2QtZDBkM2Q2ZDlkPGQ/ZEJkRWRHZEpk
+TWRQZFNkVWRYZFpkXGRfZGFkY2RmZGhka2RtZHBkc2R1ZHdkeWR7ZH1kf2SBZINkhmSIZIpkjWSQZJNk
+lmSYZJpknWSfZKJkpWSoZKpkrGSvZLFktGS2ZLhku2S+ZMFkw2TFZMdkyWTLZNRk12ZEZkdmSmZNZlBm
+U2ZWZllmXGZfZmJmZWZoZmtmbmZxZnRmd2Z6Zn1mgGaDZoZmiWaMZo9mkmaVZphmm2aeZqFmpGanZqpm
+rWawZrNmtma5Zrxmv2bCZsVmyGbLZs5m0WbUZtdm2mbdZuBm42bmZulm7GbvZvJm9Wb4Zvtm/mcBZwRn
+B2cKZw1nEGcTZxZnGWccZx9nImclZyhnK2cuZzFnNGc3ZzpnPWdAZ0NnRmdJZ0xnT2dSZ1VnWGdbZ15n
+YWdkZ2dnamdtZ3Bnc2d2Z3lnfGd/Z4JnhWeIZ4tnjmeRZ5Rnl2eaZ51noGejZ6ZnqWesZ69nsme1Z7hn
+u2e+Z8FnxGfHZ8pnzWfQZ9Nn1mfZZ9xn32fiZ+Vn6GfrZ+5n8Wf0Z/dn+mf9aABoA2gGaAloDGgPaBJo
+FWgYaBtoHmghaCRoJ2gqaC1oMGgzaDZoOWg8aD9oQmhFaEhoS2hOaFFoVGhXaFpoXWhgaGNoZmhpaGxo
+cWh0aHdoemh9aH9ogmiEaIlojmiRaJRol2iaaJxonmihaKRop2ipaK5osGizaLZouWi8aL9owmjFaMho
+y2jOaNNo1mjZaNxo32jiaORo52jsaO9o8mj0aPZo+Wj+aQNpBmkJaQtpDmkQaRJpFWkYaRtpHmkhaSRp
+JmkraS1pL2kyaTdpOmk8aT9pQmlFaUdpSmlNaU9pUmlUaVZpWGldaWZpaGlraW5pcGlzaXVpeml9aYBp
+gmmFaYdpimmNaZBpk2mYaZppn2miaaVpqGmraa5ps2m1abhpu2nAacNpxmnJacxpz2nRadRp1mnZadtp
+3mnhaeNp5Wnnaepp72nyafVp+Gn9agJqBWoIagtqEGoTahVqF2oaah1qIGoiaiVqKmotajJqNWo3ajpq
+PWo/akJqRWpIaktqTWpPalRqV2paal1qYGpjamVqaGptanBqdWp4anpqf2qCaoRqhmqPapFqkmqbap5q
+n2qoaqtqrGq1aroAAAAAAAACAgAAAAAAAAy5AAAAAAAAAAAAAAAAAABqyQ</bytes>
+		</object>
+	</data>
+</archive>
diff --git a/hw/xquartz/bundle/English.lproj/main.nib/info.nib b/hw/xquartz/bundle/English.lproj/main.nib/info.nib
deleted file mode 100644
index 88bc6260d..000000000
--- a/hw/xquartz/bundle/English.lproj/main.nib/info.nib
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IBFramework Version</key>
-	<string>588</string>
-	<key>IBOpenObjects</key>
-	<array>
-		<integer>244</integer>
-		<integer>29</integer>
-		<integer>423</integer>
-	</array>
-	<key>IBSystem Version</key>
-	<string>9A356</string>
-	<key>targetFramework</key>
-	<string>IBCocoaFramework</string>
-</dict>
-</plist>
diff --git a/hw/xquartz/bundle/English.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/English.lproj/main.nib/keyedobjects.nib
index 8b31450ff5c9a6357f70baf56268899dee194109..194f4df7fdb98fef6f7ddc27edea49aab5e51e80 100644
GIT binary patch
literal 33883
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
E0e$|ai2wiq

literal 30865
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


From 3570ca1cb76f084272f7d8bd22c4cfdf03201a77 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@tifa.local>
Date: Sun, 10 Feb 2008 18:27:52 -0800
Subject: [PATCH 469/552] XQuartz: Added option for setting quartz-wm
 click-through preference (cherry picked from commit
 bf54c267cba97b2b3b9a621da0575776a388b2cb)

---
 hw/xquartz/X11Application.h                   |    1 +
 hw/xquartz/X11Controller.h                    |   54 +-
 hw/xquartz/X11Controller.m                    |    4 +-
 .../English.lproj/main.nib/designable.nib     | 4673 ++++++++---------
 .../English.lproj/main.nib/keyedobjects.nib   |  Bin 33883 -> 35390 bytes
 5 files changed, 2374 insertions(+), 2358 deletions(-)

diff --git a/hw/xquartz/X11Application.h b/hw/xquartz/X11Application.h
index af5aea2ce..86da67f2e 100644
--- a/hw/xquartz/X11Application.h
+++ b/hw/xquartz/X11Application.h
@@ -98,5 +98,6 @@ extern int quartzHasRoot, quartzEnableRootless;
 #define PREFS_XP_OPTIONS            "xp_options"
 #define PREFS_ENABLE_STEREO         "enable_stereo"
 #define PREFS_LOGIN_SHELL           "login_shell"
+#define PREFS_QUARTZ_WM_CLICK_THROUGH "wm_click_through"
 
 #endif /* X11APPLICATION_H */
diff --git a/hw/xquartz/X11Controller.h b/hw/xquartz/X11Controller.h
index 47f5220e4..64d5cd1ce 100644
--- a/hw/xquartz/X11Controller.h
+++ b/hw/xquartz/X11Controller.h
@@ -37,29 +37,30 @@
 
 @interface X11Controller : NSObject
 {
-    NSPanel *prefs_panel;
+    IBOutlet NSPanel *prefs_panel;
 
-    NSButton *fake_buttons;
-    NSButton *enable_fullscreen;
-    NSButton *use_sysbeep;
-    NSButton *enable_keyequivs;
-    NSButton *sync_keymap;
-    NSButton *enable_auth;
-    NSButton *enable_tcp;
-    NSPopUpButton *depth;
+    IBOutlet NSButton *fake_buttons;
+    IBOutlet NSButton *enable_fullscreen;
+    IBOutlet NSButton *use_sysbeep;
+    IBOutlet NSButton *enable_keyequivs;
+    IBOutlet NSButton *sync_keymap;
+    IBOutlet NSButton *click_through;
+    IBOutlet NSButton *enable_auth;
+    IBOutlet NSButton *enable_tcp;
+    IBOutlet NSPopUpButton *depth;
 
-    NSMenuItem *x11_about_item;
-    NSMenuItem *window_separator;
-    NSMenuItem *dock_window_separator;
-    NSMenuItem *apps_separator;
-    NSMenuItem *toggle_fullscreen_item;
-    NSMenu *dock_apps_menu;
-    NSTableView *apps_table;
+    IBOutlet NSMenuItem *x11_about_item;
+    IBOutlet NSMenuItem *window_separator;
+    IBOutlet NSMenuItem *dock_window_separator;
+    IBOutlet NSMenuItem *apps_separator;
+    IBOutlet NSMenuItem *toggle_fullscreen_item;
+    IBOutlet NSMenu *dock_apps_menu;
+    IBOutlet NSTableView *apps_table;
 
     NSArray *apps;
     NSMutableArray *table_apps;
 
-    NSMenu *dock_menu;
+    IBOutlet NSMenu *dock_menu;
 
     int checked_window_item;
     x_list *pending_apps;
@@ -74,6 +75,25 @@
 - (void) set_can_quit:(BOOL)state;
 - (void) server_ready;
 
+- (IBAction) apps_table_show:(id)sender;
+- (IBAction) apps_table_cancel:(id)sender;
+- (IBAction) apps_table_done:(id)sender;
+- (IBAction) apps_table_new:(id)sender;
+- (IBAction) apps_table_duplicate:(id)sender;
+- (IBAction) apps_table_delete:(id)sender;
+- (IBAction) bring_to_front:(id)sender;
+- (IBAction) close_window:(id)sender;
+- (IBAction) minimize_window:(id)sender;
+- (IBAction) zoom_window:(id)sender;
+- (IBAction) next_window:(id)sender;
+- (IBAction) previous_window:(id)sender;
+- (IBAction) enable_fullscreen_changed:(id)sender;
+- (IBAction) toggle_fullscreen:(id)sender;
+- (IBAction) prefs_changed:(id)sender;
+- (IBAction) prefs_show:(id)sender;
+- (IBAction) quit:(id)sender;
+- (IBAction) x11_help:(id)sender;
+
 @end
 
 #endif /* __OBJC__ */
diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
index d3f83656c..5111eafc3 100644
--- a/hw/xquartz/X11Controller.m
+++ b/hw/xquartz/X11Controller.m
@@ -613,7 +613,7 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row
   quartzUseSysBeep = [use_sysbeep intValue];
   X11EnableKeyEquivalents = [enable_keyequivs intValue];
   darwinSyncKeymap = [sync_keymap intValue];
-	
+
   /* after adding prefs here, also add to [X11Application read_defaults]
      and below */
 	
@@ -621,6 +621,7 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row
   [NSApp prefs_set_boolean:@PREFS_SYSBEEP value:quartzUseSysBeep];
   [NSApp prefs_set_boolean:@PREFS_KEYEQUIVS value:X11EnableKeyEquivalents];
   [NSApp prefs_set_boolean:@PREFS_SYNC_KEYMAP value:darwinSyncKeymap];
+  [NSApp prefs_set_boolean:@PREFS_QUARTZ_WM_CLICK_THROUGH value:[click_through intValue]];
   [NSApp prefs_set_boolean:@PREFS_NO_AUTH value:![enable_auth intValue]];
   [NSApp prefs_set_boolean:@PREFS_NO_TCP value:![enable_tcp intValue]];
   [NSApp prefs_set_integer:@PREFS_DEPTH value:[depth selectedTag]];
@@ -635,6 +636,7 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row
   [enable_keyequivs setIntValue:X11EnableKeyEquivalents];
   [sync_keymap setIntValue:darwinSyncKeymap];
   [sync_keymap setEnabled:darwinKeymapFile == NULL];
+  [click_through setIntValue:[NSApp prefs_get_boolean:@PREFS_QUARTZ_WM_CLICK_THROUGH default:NO]];
 	
   [enable_auth setIntValue:![NSApp prefs_get_boolean:@PREFS_NO_AUTH default:NO]];
   [enable_tcp setIntValue:![NSApp prefs_get_boolean:@PREFS_NO_TCP default:NO]];
diff --git a/hw/xquartz/bundle/English.lproj/main.nib/designable.nib b/hw/xquartz/bundle/English.lproj/main.nib/designable.nib
index c267e45e6..08b381039 100644
--- a/hw/xquartz/bundle/English.lproj/main.nib/designable.nib
+++ b/hw/xquartz/bundle/English.lproj/main.nib/designable.nib
@@ -8,85 +8,86 @@
 		<string key="IBDocument.HIToolboxVersion">352.00</string>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
+			<integer value="29"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string id="874199827">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string id="1013584587">com.apple.InterfaceBuilder.CocoaPlugin</string>
 		</object>
-		<object class="NSMutableArray" key="IBDocument.RootObjects" id="874420287">
+		<object class="NSMutableArray" key="IBDocument.RootObjects" id="904585544">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSCustomObject" id="584863936">
+			<object class="NSCustomObject" id="815810918">
 				<object class="NSMutableString" key="NSClassName">
 					<characters key="NS.bytes">NSApplication</characters>
 				</object>
 			</object>
-			<object class="NSCustomObject" id="518703249">
-				<string key="NSClassName">FirstResponder</string>
+			<object class="NSCustomObject" id="941939442">
+				<string key="NSClassName" id="671773319">FirstResponder</string>
 			</object>
-			<object class="NSCustomObject" id="166373373">
+			<object class="NSCustomObject" id="951368722">
 				<string key="NSClassName">NSApplication</string>
 			</object>
-			<object class="NSMenu" id="496556081">
-				<string key="NSTitle" id="414137626">MainMenu</string>
+			<object class="NSMenu" id="524015605">
+				<string key="NSTitle" id="121567387">MainMenu</string>
 				<object class="NSMutableArray" key="NSMenuItems">
 					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="NSMenuItem" id="385138428">
-						<reference key="NSMenu" ref="496556081"/>
-						<string key="NSTitle" id="845099910">X11</string>
-						<string key="NSKeyEquiv" id="1005878359"/>
+					<object class="NSMenuItem" id="365880285">
+						<reference key="NSMenu" ref="524015605"/>
+						<string key="NSTitle" id="335360021">X11</string>
+						<string key="NSKeyEquiv" id="331740794"/>
 						<int key="NSKeyEquivModMask">1048576</int>
 						<int key="NSMnemonicLoc">2147483647</int>
-						<object class="NSCustomResource" key="NSOnImage" id="732862070">
-							<string key="NSClassName" id="642323532">NSImage</string>
+						<object class="NSCustomResource" key="NSOnImage" id="531645050">
+							<string key="NSClassName" id="1072749539">NSImage</string>
 							<string key="NSResourceName">NSMenuCheckmark</string>
 						</object>
-						<object class="NSCustomResource" key="NSMixedImage" id="154462367">
-							<reference key="NSClassName" ref="642323532"/>
+						<object class="NSCustomResource" key="NSMixedImage" id="246283459">
+							<reference key="NSClassName" ref="1072749539"/>
 							<string key="NSResourceName">NSMenuMixedState</string>
 						</object>
 						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="856655711">
-							<reference key="NSTitle" ref="845099910"/>
+						<object class="NSMenu" key="NSSubmenu" id="576521955">
+							<reference key="NSTitle" ref="335360021"/>
 							<object class="NSMutableArray" key="NSMenuItems">
 								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="588913325">
-									<reference key="NSMenu" ref="856655711"/>
+								<object class="NSMenuItem" id="139290918">
+									<reference key="NSMenu" ref="576521955"/>
 									<string key="NSTitle">About X11</string>
-									<reference key="NSKeyEquiv" ref="1005878359"/>
+									<reference key="NSKeyEquiv" ref="331740794"/>
 									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="732862070"/>
-									<reference key="NSMixedImage" ref="154462367"/>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="246283459"/>
 								</object>
-								<object class="NSMenuItem" id="836585695">
-									<reference key="NSMenu" ref="856655711"/>
+								<object class="NSMenuItem" id="386173216">
+									<reference key="NSMenu" ref="576521955"/>
 									<string key="NSTitle">Preferences...</string>
 									<string key="NSKeyEquiv">,</string>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="732862070"/>
-									<reference key="NSMixedImage" ref="154462367"/>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="246283459"/>
 								</object>
-								<object class="NSMenuItem" id="562920394">
-									<reference key="NSMenu" ref="856655711"/>
+								<object class="NSMenuItem" id="272876017">
+									<reference key="NSMenu" ref="576521955"/>
 									<bool key="NSIsDisabled">YES</bool>
 									<bool key="NSIsSeparator">YES</bool>
-									<reference key="NSTitle" ref="1005878359"/>
-									<reference key="NSKeyEquiv" ref="1005878359"/>
+									<reference key="NSTitle" ref="331740794"/>
+									<reference key="NSKeyEquiv" ref="331740794"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="732862070"/>
-									<reference key="NSMixedImage" ref="154462367"/>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="246283459"/>
 								</object>
-								<object class="NSMenuItem" id="63158341">
-									<reference key="NSMenu" ref="856655711"/>
+								<object class="NSMenuItem" id="32285361">
+									<reference key="NSMenu" ref="576521955"/>
 									<string key="NSTitle">Services</string>
-									<reference key="NSKeyEquiv" ref="1005878359"/>
+									<reference key="NSKeyEquiv" ref="331740794"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="732862070"/>
-									<reference key="NSMixedImage" ref="154462367"/>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="246283459"/>
 									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="502073457">
+									<object class="NSMenu" key="NSSubmenu" id="821388474">
 										<object class="NSMutableString" key="NSTitle">
 											<characters key="NS.bytes">Services</characters>
 										</object>
@@ -96,343 +97,343 @@
 										<string key="NSName">_NSServicesMenu</string>
 									</object>
 								</object>
-								<object class="NSMenuItem" id="635454008">
-									<reference key="NSMenu" ref="856655711"/>
+								<object class="NSMenuItem" id="431301145">
+									<reference key="NSMenu" ref="576521955"/>
 									<bool key="NSIsDisabled">YES</bool>
 									<bool key="NSIsSeparator">YES</bool>
-									<reference key="NSTitle" ref="1005878359"/>
-									<reference key="NSKeyEquiv" ref="1005878359"/>
+									<reference key="NSTitle" ref="331740794"/>
+									<reference key="NSKeyEquiv" ref="331740794"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="732862070"/>
-									<reference key="NSMixedImage" ref="154462367"/>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="246283459"/>
 								</object>
-								<object class="NSMenuItem" id="101686423">
-									<reference key="NSMenu" ref="856655711"/>
+								<object class="NSMenuItem" id="6876565">
+									<reference key="NSMenu" ref="576521955"/>
 									<string key="NSTitle">Toggle Full Screen</string>
-									<string key="NSKeyEquiv" id="982375500">a</string>
+									<string key="NSKeyEquiv" id="934453074">a</string>
 									<int key="NSKeyEquivModMask">1572864</int>
 									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="732862070"/>
-									<reference key="NSMixedImage" ref="154462367"/>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="246283459"/>
 								</object>
-								<object class="NSMenuItem" id="754231570">
-									<reference key="NSMenu" ref="856655711"/>
+								<object class="NSMenuItem" id="479677589">
+									<reference key="NSMenu" ref="576521955"/>
 									<bool key="NSIsDisabled">YES</bool>
 									<bool key="NSIsSeparator">YES</bool>
-									<reference key="NSTitle" ref="1005878359"/>
-									<reference key="NSKeyEquiv" ref="1005878359"/>
+									<reference key="NSTitle" ref="331740794"/>
+									<reference key="NSKeyEquiv" ref="331740794"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="732862070"/>
-									<reference key="NSMixedImage" ref="154462367"/>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="246283459"/>
 								</object>
-								<object class="NSMenuItem" id="147703239">
-									<reference key="NSMenu" ref="856655711"/>
+								<object class="NSMenuItem" id="301008465">
+									<reference key="NSMenu" ref="576521955"/>
 									<string key="NSTitle">Hide X11</string>
 									<string key="NSKeyEquiv">h</string>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="732862070"/>
-									<reference key="NSMixedImage" ref="154462367"/>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="246283459"/>
 									<int key="NSTag">42</int>
 								</object>
-								<object class="NSMenuItem" id="191312176">
-									<reference key="NSMenu" ref="856655711"/>
+								<object class="NSMenuItem" id="206802571">
+									<reference key="NSMenu" ref="576521955"/>
 									<string key="NSTitle">Hide Others</string>
-									<reference key="NSKeyEquiv" ref="1005878359"/>
+									<reference key="NSKeyEquiv" ref="331740794"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="732862070"/>
-									<reference key="NSMixedImage" ref="154462367"/>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="246283459"/>
 								</object>
-								<object class="NSMenuItem" id="392807560">
-									<reference key="NSMenu" ref="856655711"/>
+								<object class="NSMenuItem" id="1023546148">
+									<reference key="NSMenu" ref="576521955"/>
 									<string key="NSTitle">Show All</string>
-									<reference key="NSKeyEquiv" ref="1005878359"/>
+									<reference key="NSKeyEquiv" ref="331740794"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="732862070"/>
-									<reference key="NSMixedImage" ref="154462367"/>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="246283459"/>
 									<int key="NSTag">42</int>
 								</object>
-								<object class="NSMenuItem" id="648021277">
-									<reference key="NSMenu" ref="856655711"/>
+								<object class="NSMenuItem" id="848095279">
+									<reference key="NSMenu" ref="576521955"/>
 									<bool key="NSIsDisabled">YES</bool>
 									<bool key="NSIsSeparator">YES</bool>
-									<reference key="NSTitle" ref="1005878359"/>
-									<reference key="NSKeyEquiv" ref="1005878359"/>
+									<reference key="NSTitle" ref="331740794"/>
+									<reference key="NSKeyEquiv" ref="331740794"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="732862070"/>
-									<reference key="NSMixedImage" ref="154462367"/>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="246283459"/>
 								</object>
-								<object class="NSMenuItem" id="275459236">
-									<reference key="NSMenu" ref="856655711"/>
+								<object class="NSMenuItem" id="274138642">
+									<reference key="NSMenu" ref="576521955"/>
 									<string key="NSTitle">Quit X11</string>
 									<string key="NSKeyEquiv">q</string>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="732862070"/>
-									<reference key="NSMixedImage" ref="154462367"/>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="246283459"/>
 								</object>
 							</object>
 							<string key="NSName">_NSAppleMenu</string>
 						</object>
 					</object>
-					<object class="NSMenuItem" id="940914550">
-						<reference key="NSMenu" ref="496556081"/>
-						<string key="NSTitle" id="942587293">Applications</string>
-						<reference key="NSKeyEquiv" ref="1005878359"/>
+					<object class="NSMenuItem" id="868031522">
+						<reference key="NSMenu" ref="524015605"/>
+						<string key="NSTitle" id="667842658">Applications</string>
+						<reference key="NSKeyEquiv" ref="331740794"/>
 						<int key="NSKeyEquivModMask">1048576</int>
 						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="732862070"/>
-						<reference key="NSMixedImage" ref="154462367"/>
+						<reference key="NSOnImage" ref="531645050"/>
+						<reference key="NSMixedImage" ref="246283459"/>
 						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="684156653">
-							<reference key="NSTitle" ref="942587293"/>
+						<object class="NSMenu" key="NSSubmenu" id="981161348">
+							<reference key="NSTitle" ref="667842658"/>
 							<object class="NSMutableArray" key="NSMenuItems">
 								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="940363272">
-									<reference key="NSMenu" ref="684156653"/>
+								<object class="NSMenuItem" id="390088328">
+									<reference key="NSMenu" ref="981161348"/>
 									<bool key="NSIsDisabled">YES</bool>
 									<bool key="NSIsSeparator">YES</bool>
-									<reference key="NSTitle" ref="1005878359"/>
-									<reference key="NSKeyEquiv" ref="1005878359"/>
+									<reference key="NSTitle" ref="331740794"/>
+									<reference key="NSKeyEquiv" ref="331740794"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="732862070"/>
-									<reference key="NSMixedImage" ref="154462367"/>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="246283459"/>
 								</object>
-								<object class="NSMenuItem" id="767830074">
-									<reference key="NSMenu" ref="684156653"/>
+								<object class="NSMenuItem" id="1065386165">
+									<reference key="NSMenu" ref="981161348"/>
 									<string key="NSTitle">Customize...</string>
-									<reference key="NSKeyEquiv" ref="1005878359"/>
+									<reference key="NSKeyEquiv" ref="331740794"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="732862070"/>
-									<reference key="NSMixedImage" ref="154462367"/>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="246283459"/>
 								</object>
 							</object>
 						</object>
 					</object>
-					<object class="NSMenuItem" id="326076563">
-						<reference key="NSMenu" ref="496556081"/>
-						<string key="NSTitle" id="38701994">Edit</string>
-						<reference key="NSKeyEquiv" ref="1005878359"/>
+					<object class="NSMenuItem" id="200491363">
+						<reference key="NSMenu" ref="524015605"/>
+						<string key="NSTitle" id="934359734">Edit</string>
+						<reference key="NSKeyEquiv" ref="331740794"/>
 						<int key="NSKeyEquivModMask">1048576</int>
 						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="732862070"/>
-						<reference key="NSMixedImage" ref="154462367"/>
+						<reference key="NSOnImage" ref="531645050"/>
+						<reference key="NSMixedImage" ref="246283459"/>
 						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="932839819">
-							<reference key="NSTitle" ref="38701994"/>
+						<object class="NSMenu" key="NSSubmenu" id="526778998">
+							<reference key="NSTitle" ref="934359734"/>
 							<object class="NSMutableArray" key="NSMenuItems">
 								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="159704190">
-									<reference key="NSMenu" ref="932839819"/>
+								<object class="NSMenuItem" id="1010221707">
+									<reference key="NSMenu" ref="526778998"/>
 									<string key="NSTitle">Undo</string>
 									<string key="NSKeyEquiv">z</string>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="732862070"/>
-									<reference key="NSMixedImage" ref="154462367"/>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="246283459"/>
 								</object>
-								<object class="NSMenuItem" id="634656440">
-									<reference key="NSMenu" ref="932839819"/>
+								<object class="NSMenuItem" id="535038564">
+									<reference key="NSMenu" ref="526778998"/>
 									<string key="NSTitle">Redo</string>
 									<string key="NSKeyEquiv">Z</string>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="732862070"/>
-									<reference key="NSMixedImage" ref="154462367"/>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="246283459"/>
 								</object>
-								<object class="NSMenuItem" id="342107529">
-									<reference key="NSMenu" ref="932839819"/>
+								<object class="NSMenuItem" id="839739619">
+									<reference key="NSMenu" ref="526778998"/>
 									<bool key="NSIsDisabled">YES</bool>
 									<bool key="NSIsSeparator">YES</bool>
-									<reference key="NSTitle" ref="1005878359"/>
-									<reference key="NSKeyEquiv" ref="1005878359"/>
+									<reference key="NSTitle" ref="331740794"/>
+									<reference key="NSKeyEquiv" ref="331740794"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="732862070"/>
-									<reference key="NSMixedImage" ref="154462367"/>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="246283459"/>
 								</object>
-								<object class="NSMenuItem" id="590926585">
-									<reference key="NSMenu" ref="932839819"/>
+								<object class="NSMenuItem" id="581727829">
+									<reference key="NSMenu" ref="526778998"/>
 									<string key="NSTitle">Cut</string>
 									<string key="NSKeyEquiv">x</string>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="732862070"/>
-									<reference key="NSMixedImage" ref="154462367"/>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="246283459"/>
 								</object>
-								<object class="NSMenuItem" id="204575684">
-									<reference key="NSMenu" ref="932839819"/>
+								<object class="NSMenuItem" id="185296989">
+									<reference key="NSMenu" ref="526778998"/>
 									<string key="NSTitle">Copy</string>
 									<string key="NSKeyEquiv">c</string>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="732862070"/>
-									<reference key="NSMixedImage" ref="154462367"/>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="246283459"/>
 								</object>
-								<object class="NSMenuItem" id="739720090">
-									<reference key="NSMenu" ref="932839819"/>
+								<object class="NSMenuItem" id="924678073">
+									<reference key="NSMenu" ref="526778998"/>
 									<string key="NSTitle">Paste</string>
 									<string key="NSKeyEquiv">v</string>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="732862070"/>
-									<reference key="NSMixedImage" ref="154462367"/>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="246283459"/>
 								</object>
-								<object class="NSMenuItem" id="549812830">
-									<reference key="NSMenu" ref="932839819"/>
+								<object class="NSMenuItem" id="994817848">
+									<reference key="NSMenu" ref="526778998"/>
 									<string key="NSTitle">Delete</string>
-									<reference key="NSKeyEquiv" ref="1005878359"/>
+									<reference key="NSKeyEquiv" ref="331740794"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="732862070"/>
-									<reference key="NSMixedImage" ref="154462367"/>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="246283459"/>
 								</object>
-								<object class="NSMenuItem" id="584461964">
-									<reference key="NSMenu" ref="932839819"/>
+								<object class="NSMenuItem" id="322866464">
+									<reference key="NSMenu" ref="526778998"/>
 									<string key="NSTitle">Select All</string>
-									<reference key="NSKeyEquiv" ref="982375500"/>
+									<reference key="NSKeyEquiv" ref="934453074"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="732862070"/>
-									<reference key="NSMixedImage" ref="154462367"/>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="246283459"/>
 								</object>
 							</object>
 						</object>
 					</object>
-					<object class="NSMenuItem" id="736341863">
-						<reference key="NSMenu" ref="496556081"/>
+					<object class="NSMenuItem" id="931553638">
+						<reference key="NSMenu" ref="524015605"/>
 						<string key="NSTitle">Window</string>
-						<reference key="NSKeyEquiv" ref="1005878359"/>
+						<reference key="NSKeyEquiv" ref="331740794"/>
 						<int key="NSKeyEquivModMask">1048576</int>
 						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="732862070"/>
-						<reference key="NSMixedImage" ref="154462367"/>
+						<reference key="NSOnImage" ref="531645050"/>
+						<reference key="NSMixedImage" ref="246283459"/>
 						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="943404979">
+						<object class="NSMenu" key="NSSubmenu" id="96874957">
 							<object class="NSMutableString" key="NSTitle">
 								<characters key="NS.bytes">Window</characters>
 							</object>
 							<object class="NSMutableArray" key="NSMenuItems">
 								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="915861349">
-									<reference key="NSMenu" ref="943404979"/>
-									<string key="NSTitle">Minimize Window</string>
+								<object class="NSMenuItem" id="677652931">
+									<reference key="NSMenu" ref="96874957"/>
+									<string key="NSTitle">Minimize</string>
 									<string key="NSKeyEquiv">m</string>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="732862070"/>
-									<reference key="NSMixedImage" ref="154462367"/>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="246283459"/>
 								</object>
-								<object class="NSMenuItem" id="442007350">
-									<reference key="NSMenu" ref="943404979"/>
-									<string key="NSTitle">Close Window</string>
+								<object class="NSMenuItem" id="1066447520">
+									<reference key="NSMenu" ref="96874957"/>
+									<string key="NSTitle">Zoom</string>
+									<reference key="NSKeyEquiv" ref="331740794"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="246283459"/>
+								</object>
+								<object class="NSMenuItem" id="1036389925">
+									<reference key="NSMenu" ref="96874957"/>
+									<string key="NSTitle">Cycle Through Windows</string>
+									<string key="NSKeyEquiv">`</string>
+									<int key="NSKeyEquivModMask">1048840</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="246283459"/>
+								</object>
+								<object class="NSMenuItem" id="369641893">
+									<reference key="NSMenu" ref="96874957"/>
+									<string key="NSTitle">Reverse Cycle Through Windows</string>
+									<string key="NSKeyEquiv">~</string>
+									<int key="NSKeyEquivModMask">1179914</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="246283459"/>
+								</object>
+								<object class="NSMenuItem" id="280172320">
+									<reference key="NSMenu" ref="96874957"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<reference key="NSTitle" ref="331740794"/>
+									<reference key="NSKeyEquiv" ref="331740794"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="246283459"/>
+								</object>
+								<object class="NSMenuItem" id="984461797">
+									<reference key="NSMenu" ref="96874957"/>
+									<string key="NSTitle">Close</string>
 									<string key="NSKeyEquiv">w</string>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="732862070"/>
-									<reference key="NSMixedImage" ref="154462367"/>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="246283459"/>
 								</object>
-								<object class="NSMenuItem" id="722764538">
-									<reference key="NSMenu" ref="943404979"/>
-									<string key="NSTitle">Zoom Window</string>
-									<reference key="NSKeyEquiv" ref="1005878359"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="732862070"/>
-									<reference key="NSMixedImage" ref="154462367"/>
-								</object>
-								<object class="NSMenuItem" id="783034074">
-									<reference key="NSMenu" ref="943404979"/>
+								<object class="NSMenuItem" id="155085383">
+									<reference key="NSMenu" ref="96874957"/>
 									<bool key="NSIsDisabled">YES</bool>
 									<bool key="NSIsSeparator">YES</bool>
-									<reference key="NSTitle" ref="1005878359"/>
-									<reference key="NSKeyEquiv" ref="1005878359"/>
+									<reference key="NSTitle" ref="331740794"/>
+									<reference key="NSKeyEquiv" ref="331740794"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="732862070"/>
-									<reference key="NSMixedImage" ref="154462367"/>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="246283459"/>
 								</object>
-								<object class="NSMenuItem" id="283496700">
-									<reference key="NSMenu" ref="943404979"/>
-									<string key="NSTitle">Next Window</string>
-									<string type="base64-UTF8" key="NSKeyEquiv">75yDA</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="732862070"/>
-									<reference key="NSMixedImage" ref="154462367"/>
-								</object>
-								<object class="NSMenuItem" id="500397106">
-									<reference key="NSMenu" ref="943404979"/>
-									<string key="NSTitle">Previous Window</string>
-									<string type="base64-UTF8" key="NSKeyEquiv">75yCA</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="732862070"/>
-									<reference key="NSMixedImage" ref="154462367"/>
-								</object>
-								<object class="NSMenuItem" id="303213786">
-									<reference key="NSMenu" ref="943404979"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<reference key="NSTitle" ref="1005878359"/>
-									<reference key="NSKeyEquiv" ref="1005878359"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="732862070"/>
-									<reference key="NSMixedImage" ref="154462367"/>
-								</object>
-								<object class="NSMenuItem" id="853630143">
-									<reference key="NSMenu" ref="943404979"/>
+								<object class="NSMenuItem" id="276216762">
+									<reference key="NSMenu" ref="96874957"/>
 									<string key="NSTitle">Bring All to Front</string>
-									<reference key="NSKeyEquiv" ref="1005878359"/>
+									<reference key="NSKeyEquiv" ref="331740794"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="732862070"/>
-									<reference key="NSMixedImage" ref="154462367"/>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="246283459"/>
 								</object>
-								<object class="NSMenuItem" id="332241222">
-									<reference key="NSMenu" ref="943404979"/>
+								<object class="NSMenuItem" id="444952046">
+									<reference key="NSMenu" ref="96874957"/>
 									<bool key="NSIsDisabled">YES</bool>
 									<bool key="NSIsSeparator">YES</bool>
-									<reference key="NSTitle" ref="1005878359"/>
-									<reference key="NSKeyEquiv" ref="1005878359"/>
+									<reference key="NSTitle" ref="331740794"/>
+									<reference key="NSKeyEquiv" ref="331740794"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="732862070"/>
-									<reference key="NSMixedImage" ref="154462367"/>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="246283459"/>
 								</object>
 							</object>
 							<string key="NSName">_NSWindowsMenu</string>
 						</object>
 					</object>
-					<object class="NSMenuItem" id="934950259">
-						<reference key="NSMenu" ref="496556081"/>
-						<string key="NSTitle" id="955297347">Help</string>
-						<reference key="NSKeyEquiv" ref="1005878359"/>
+					<object class="NSMenuItem" id="551174276">
+						<reference key="NSMenu" ref="524015605"/>
+						<string key="NSTitle" id="214661970">Help</string>
+						<reference key="NSKeyEquiv" ref="331740794"/>
 						<int key="NSKeyEquivModMask">1048576</int>
 						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="732862070"/>
-						<reference key="NSMixedImage" ref="154462367"/>
+						<reference key="NSOnImage" ref="531645050"/>
+						<reference key="NSMixedImage" ref="246283459"/>
 						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="1052262524">
-							<reference key="NSTitle" ref="955297347"/>
+						<object class="NSMenu" key="NSSubmenu" id="511848303">
+							<reference key="NSTitle" ref="214661970"/>
 							<object class="NSMutableArray" key="NSMenuItems">
 								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="122992289">
-									<reference key="NSMenu" ref="1052262524"/>
+								<object class="NSMenuItem" id="504984881">
+									<reference key="NSMenu" ref="511848303"/>
 									<string key="NSTitle">X11 Help</string>
-									<reference key="NSKeyEquiv" ref="1005878359"/>
+									<reference key="NSKeyEquiv" ref="331740794"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="732862070"/>
-									<reference key="NSMixedImage" ref="154462367"/>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="246283459"/>
 								</object>
 							</object>
 						</object>
@@ -440,562 +441,599 @@
 				</object>
 				<string key="NSName">_NSMainMenu</string>
 			</object>
-			<object class="NSCustomObject" id="88064061">
-				<string key="NSClassName" id="517073442">X11Controller</string>
+			<object class="NSCustomObject" id="485884620">
+				<string key="NSClassName" id="865849805">X11Controller</string>
 			</object>
-			<object class="NSWindowTemplate" id="210544761">
+			<object class="NSWindowTemplate" id="124913468">
 				<int key="NSWindowStyleMask">3</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{319, 323}, {478, 316}}</string>
+				<string key="NSWindowRect">{{319, 294}, {481, 345}}</string>
 				<int key="NSWTFlags">1350041600</int>
 				<string key="NSWindowTitle">X11 Preferences</string>
-				<string key="NSWindowClass" id="643663067">NSPanel</string>
+				<string key="NSWindowClass" id="666842945">NSPanel</string>
 				<object class="NSMutableString" key="NSViewClass">
 					<characters key="NS.bytes">View</characters>
 				</object>
 				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
 				<string key="NSWindowContentMinSize">{213, 107}</string>
-				<object class="NSView" key="NSWindowView" id="404125972">
+				<object class="NSView" key="NSWindowView" id="941366957">
 					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSTabView" id="75927203">
-							<reference key="NSNextResponder" ref="404125972"/>
+						<object class="NSTabView" id="448510093">
+							<reference key="NSNextResponder" ref="941366957"/>
 							<int key="NSvFlags">256</int>
 							<object class="NSMutableArray" key="NSSubviews">
 								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSView" id="527709877">
-									<reference key="NSNextResponder" ref="75927203"/>
+								<object class="NSView" id="596750588">
+									<reference key="NSNextResponder" ref="448510093"/>
 									<int key="NSvFlags">256</int>
 									<object class="NSMutableArray" key="NSSubviews">
 										<bool key="EncodedWithXMLCoder">YES</bool>
-										<object class="NSButton" id="1045559310">
-											<reference key="NSNextResponder" ref="527709877"/>
+										<object class="NSButton" id="119157981">
+											<reference key="NSNextResponder" ref="596750588"/>
 											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{18, 90}, {402, 18}}</string>
-											<reference key="NSSuperview" ref="527709877"/>
+											<string key="NSFrame">{{18, 243}, {402, 18}}</string>
+											<reference key="NSSuperview" ref="596750588"/>
 											<bool key="NSEnabled">YES</bool>
-											<object class="NSButtonCell" key="NSCell" id="225158677">
+											<object class="NSButtonCell" key="NSCell" id="990762273">
 												<int key="NSCellFlags">67239424</int>
 												<int key="NSCellFlags2">0</int>
-												<string key="NSContents">Use system alert effect</string>
-												<object class="NSFont" key="NSSupport" id="706343604">
-													<string key="NSName" id="508374773">LucidaGrande</string>
+												<string key="NSContents">Emulate three button mouse</string>
+												<object class="NSFont" key="NSSupport" id="463863101">
+													<string key="NSName" id="512586816">LucidaGrande</string>
 													<double key="NSSize">1.300000e+01</double>
 													<int key="NSfFlags">1044</int>
 												</object>
-												<reference key="NSControlView" ref="1045559310"/>
+												<reference key="NSControlView" ref="119157981"/>
 												<int key="NSButtonFlags">1211912703</int>
 												<int key="NSButtonFlags2">2</int>
-												<object class="NSButtonImageSource" key="NSAlternateImage" id="876172194">
+												<object class="NSButtonImageSource" key="NSAlternateImage" id="391434389">
 													<string key="NSImageName">NSSwitch</string>
 												</object>
-												<reference key="NSAlternateContents" ref="1005878359"/>
-												<reference key="NSKeyEquivalent" ref="1005878359"/>
+												<reference key="NSAlternateContents" ref="331740794"/>
+												<reference key="NSKeyEquivalent" ref="331740794"/>
 												<int key="NSPeriodicDelay">200</int>
 												<int key="NSPeriodicInterval">25</int>
 											</object>
 										</object>
-										<object class="NSTextField" id="67626595">
-											<reference key="NSNextResponder" ref="527709877"/>
+										<object class="NSTextField" id="443008216">
+											<reference key="NSNextResponder" ref="596750588"/>
 											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{36, 56}, {385, 28}}</string>
-											<reference key="NSSuperview" ref="527709877"/>
+											<string key="NSFrame">{{36, 93}, {385, 31}}</string>
+											<reference key="NSSuperview" ref="596750588"/>
 											<bool key="NSEnabled">YES</bool>
-											<object class="NSTextFieldCell" key="NSCell" id="1072420481">
+											<object class="NSTextFieldCell" key="NSCell" id="391919450">
 												<int key="NSCellFlags">67239424</int>
 												<int key="NSCellFlags2">4194304</int>
-												<string key="NSContents">X11 beeps will use the standard system alert, as defined in the Sound Effects system preferences panel.</string>
+												<string key="NSContents">When enabled, menu bar key equivalents may interfere with X11 applications that use the Meta modifier.</string>
 												<object class="NSFont" key="NSSupport" id="26">
-													<reference key="NSName" ref="508374773"/>
+													<reference key="NSName" ref="512586816"/>
 													<double key="NSSize">1.100000e+01</double>
 													<int key="NSfFlags">3100</int>
 												</object>
-												<reference key="NSControlView" ref="67626595"/>
-												<object class="NSColor" key="NSBackgroundColor" id="320865741">
+												<reference key="NSControlView" ref="443008216"/>
+												<object class="NSColor" key="NSBackgroundColor" id="57160303">
 													<int key="NSColorSpace">6</int>
-													<string key="NSCatalogName" id="1000587476">System</string>
+													<string key="NSCatalogName" id="905527164">System</string>
 													<string key="NSColorName">controlColor</string>
-													<object class="NSColor" key="NSColor" id="1000384962">
+													<object class="NSColor" key="NSColor" id="590688762">
 														<int key="NSColorSpace">3</int>
 														<bytes key="NSWhite">MC42NjY2NjY2OQA</bytes>
 													</object>
 												</object>
-												<object class="NSColor" key="NSTextColor" id="233849662">
+												<object class="NSColor" key="NSTextColor" id="930815747">
 													<int key="NSColorSpace">6</int>
-													<reference key="NSCatalogName" ref="1000587476"/>
+													<reference key="NSCatalogName" ref="905527164"/>
 													<string key="NSColorName">controlTextColor</string>
-													<object class="NSColor" key="NSColor" id="608123050">
+													<object class="NSColor" key="NSColor" id="214098874">
 														<int key="NSColorSpace">3</int>
 														<bytes key="NSWhite">MAA</bytes>
 													</object>
 												</object>
 											</object>
 										</object>
-										<object class="NSPopUpButton" id="300224954">
-											<reference key="NSNextResponder" ref="527709877"/>
+										<object class="NSTextField" id="282885445">
+											<reference key="NSNextResponder" ref="596750588"/>
 											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{74, 209}, {128, 26}}</string>
-											<reference key="NSSuperview" ref="527709877"/>
+											<string key="NSFrame">{{36, 208}, {385, 29}}</string>
+											<reference key="NSSuperview" ref="596750588"/>
 											<bool key="NSEnabled">YES</bool>
-											<object class="NSPopUpButtonCell" key="NSCell" id="301142744">
-												<int key="NSCellFlags">-2076049856</int>
-												<int key="NSCellFlags2">1024</int>
-												<reference key="NSSupport" ref="706343604"/>
-												<reference key="NSControlView" ref="300224954"/>
-												<int key="NSButtonFlags">109199615</int>
-												<int key="NSButtonFlags2">1</int>
-												<object class="NSFont" key="NSAlternateImage">
-													<reference key="NSName" ref="508374773"/>
-													<double key="NSSize">1.300000e+01</double>
-													<int key="NSfFlags">16</int>
-												</object>
-												<object class="NSMutableString" key="NSAlternateContents">
-													<characters key="NS.bytes"/>
-												</object>
-												<object class="NSMutableString" key="NSKeyEquivalent">
-													<characters key="NS.bytes"/>
-												</object>
-												<int key="NSPeriodicDelay">400</int>
-												<int key="NSPeriodicInterval">75</int>
-												<object class="NSMenuItem" key="NSMenuItem" id="473657062">
-													<reference key="NSMenu" ref="1071781177"/>
-													<string key="NSTitle">From Display</string>
-													<reference key="NSKeyEquiv" ref="1005878359"/>
-													<int key="NSKeyEquivModMask">1048576</int>
-													<int key="NSMnemonicLoc">2147483647</int>
-													<int key="NSState">1</int>
-													<reference key="NSOnImage" ref="732862070"/>
-													<reference key="NSMixedImage" ref="154462367"/>
-													<string key="NSAction">_popUpItemAction:</string>
-													<int key="NSTag">-1</int>
-													<reference key="NSTarget" ref="301142744"/>
-												</object>
-												<bool key="NSMenuItemRespectAlignment">YES</bool>
-												<object class="NSMenu" key="NSMenu" id="1071781177">
-													<object class="NSMutableString" key="NSTitle">
-														<characters key="NS.bytes">OtherViews</characters>
-													</object>
-													<object class="NSMutableArray" key="NSMenuItems">
-														<bool key="EncodedWithXMLCoder">YES</bool>
-														<reference ref="473657062"/>
-														<object class="NSMenuItem" id="827519886">
-															<reference key="NSMenu" ref="1071781177"/>
-															<string key="NSTitle">256 Colors</string>
-															<reference key="NSKeyEquiv" ref="1005878359"/>
-															<int key="NSKeyEquivModMask">1048576</int>
-															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="732862070"/>
-															<reference key="NSMixedImage" ref="154462367"/>
-															<string key="NSAction">_popUpItemAction:</string>
-															<int key="NSTag">8</int>
-															<reference key="NSTarget" ref="301142744"/>
-														</object>
-														<object class="NSMenuItem" id="247508345">
-															<reference key="NSMenu" ref="1071781177"/>
-															<string key="NSTitle">Thousands</string>
-															<reference key="NSKeyEquiv" ref="1005878359"/>
-															<int key="NSKeyEquivModMask">1048576</int>
-															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="732862070"/>
-															<reference key="NSMixedImage" ref="154462367"/>
-															<string key="NSAction">_popUpItemAction:</string>
-															<int key="NSTag">15</int>
-															<reference key="NSTarget" ref="301142744"/>
-														</object>
-														<object class="NSMenuItem" id="611307925">
-															<reference key="NSMenu" ref="1071781177"/>
-															<string key="NSTitle">Millions</string>
-															<reference key="NSKeyEquiv" ref="1005878359"/>
-															<int key="NSKeyEquivModMask">1048576</int>
-															<int key="NSMnemonicLoc">2147483647</int>
-															<reference key="NSOnImage" ref="732862070"/>
-															<reference key="NSMixedImage" ref="154462367"/>
-															<string key="NSAction">_popUpItemAction:</string>
-															<int key="NSTag">24</int>
-															<reference key="NSTarget" ref="301142744"/>
-														</object>
-													</object>
-												</object>
-												<int key="NSPreferredEdge">3</int>
-												<bool key="NSUsesItemFromMenu">YES</bool>
-												<bool key="NSAltersState">YES</bool>
-												<int key="NSArrowPosition">1</int>
-											</object>
-										</object>
-										<object class="NSTextField" id="717889178">
-											<reference key="NSNextResponder" ref="527709877"/>
-											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{17, 212}, {55, 20}}</string>
-											<reference key="NSSuperview" ref="527709877"/>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSTextFieldCell" key="NSCell" id="749756205">
+											<object class="NSTextFieldCell" key="NSCell" id="649334366">
 												<int key="NSCellFlags">67239424</int>
 												<int key="NSCellFlags2">4194304</int>
-												<string type="base64-UTF8" key="NSContents">Q29sb3JzOgo</string>
-												<reference key="NSSupport" ref="706343604"/>
-												<reference key="NSControlView" ref="717889178"/>
-												<reference key="NSBackgroundColor" ref="320865741"/>
-												<reference key="NSTextColor" ref="233849662"/>
-											</object>
-										</object>
-										<object class="NSTextField" id="114173823">
-											<reference key="NSNextResponder" ref="527709877"/>
-											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{36, 190}, {392, 14}}</string>
-											<reference key="NSSuperview" ref="527709877"/>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSTextFieldCell" key="NSCell" id="725554783">
-												<int key="NSCellFlags">67239424</int>
-												<int key="NSCellFlags2">4194304</int>
-												<string key="NSContents">This option takes effect when X11 is launched again.</string>
+												<string type="base64-UTF8" key="NSContents">SG9sZCBPcHRpb24gYW5kIENvbW1hbmQgd2hpbGUgY2xpY2tpbmcgdG8gYWN0aXZhdGUgdGhlIG1pZGRs
+ZSBhbmQgcmlnaHQgbW91c2UgYnV0dG9ucy4KA</string>
 												<reference key="NSSupport" ref="26"/>
-												<reference key="NSControlView" ref="114173823"/>
-												<reference key="NSBackgroundColor" ref="320865741"/>
-												<reference key="NSTextColor" ref="233849662"/>
+												<reference key="NSControlView" ref="282885445"/>
+												<reference key="NSBackgroundColor" ref="57160303"/>
+												<reference key="NSTextColor" ref="930815747"/>
 											</object>
 										</object>
-										<object class="NSButton" id="817420822">
-											<reference key="NSNextResponder" ref="527709877"/>
+										<object class="NSButton" id="842100515">
+											<reference key="NSNextResponder" ref="596750588"/>
 											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{18, 156}, {409, 23}}</string>
-											<reference key="NSSuperview" ref="527709877"/>
+											<string key="NSFrame">{{18, 130}, {402, 18}}</string>
+											<reference key="NSSuperview" ref="596750588"/>
 											<bool key="NSEnabled">YES</bool>
-											<object class="NSButtonCell" key="NSCell" id="100363081">
+											<object class="NSButtonCell" key="NSCell" id="940564599">
 												<int key="NSCellFlags">67239424</int>
 												<int key="NSCellFlags2">0</int>
-												<string key="NSContents">Full screen mode</string>
-												<reference key="NSSupport" ref="706343604"/>
-												<reference key="NSControlView" ref="817420822"/>
+												<string key="NSContents">Enable key equivalents under X11</string>
+												<reference key="NSSupport" ref="463863101"/>
+												<reference key="NSControlView" ref="842100515"/>
 												<int key="NSButtonFlags">1211912703</int>
 												<int key="NSButtonFlags2">2</int>
-												<reference key="NSAlternateImage" ref="876172194"/>
-												<reference key="NSAlternateContents" ref="1005878359"/>
-												<reference key="NSKeyEquivalent" ref="1005878359"/>
+												<reference key="NSAlternateImage" ref="391434389"/>
+												<reference key="NSAlternateContents" ref="331740794"/>
+												<reference key="NSKeyEquivalent" ref="331740794"/>
 												<int key="NSPeriodicDelay">200</int>
 												<int key="NSPeriodicInterval">25</int>
 											</object>
 										</object>
-										<object class="NSTextField" id="959270736">
-											<reference key="NSNextResponder" ref="527709877"/>
+										<object class="NSTextField" id="31160162">
+											<reference key="NSNextResponder" ref="596750588"/>
 											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{36, 119}, {385, 31}}</string>
-											<reference key="NSSuperview" ref="527709877"/>
+											<string key="NSFrame">{{36, 159}, {385, 14}}</string>
+											<reference key="NSSuperview" ref="596750588"/>
 											<bool key="NSEnabled">YES</bool>
-											<object class="NSTextFieldCell" key="NSCell" id="550432669">
+											<object class="NSTextFieldCell" key="NSCell" id="666057093">
 												<int key="NSCellFlags">67239424</int>
 												<int key="NSCellFlags2">4194304</int>
-												<string key="NSContents">Enables the X11 root window. Use the Command-Option-A keystroke to enter and leave full screen mode.</string>
+												<string key="NSContents">Allows input menu changes to overwrite the current X11 keymap.</string>
 												<reference key="NSSupport" ref="26"/>
-												<reference key="NSControlView" ref="959270736"/>
-												<reference key="NSBackgroundColor" ref="320865741"/>
-												<reference key="NSTextColor" ref="233849662"/>
+												<reference key="NSControlView" ref="31160162"/>
+												<reference key="NSBackgroundColor" ref="57160303"/>
+												<reference key="NSTextColor" ref="930815747"/>
+											</object>
+										</object>
+										<object class="NSButton" id="179949713">
+											<reference key="NSNextResponder" ref="596750588"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{18, 179}, {402, 18}}</string>
+											<reference key="NSSuperview" ref="596750588"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSButtonCell" key="NSCell" id="967619578">
+												<int key="NSCellFlags">67239424</int>
+												<int key="NSCellFlags2">0</int>
+												<string key="NSContents">Follow system keyboard layout</string>
+												<reference key="NSSupport" ref="463863101"/>
+												<reference key="NSControlView" ref="179949713"/>
+												<int key="NSButtonFlags">1211912703</int>
+												<int key="NSButtonFlags2">2</int>
+												<reference key="NSAlternateImage" ref="391434389"/>
+												<reference key="NSAlternateContents" ref="331740794"/>
+												<reference key="NSKeyEquivalent" ref="331740794"/>
+												<int key="NSPeriodicDelay">200</int>
+												<int key="NSPeriodicInterval">25</int>
+											</object>
+										</object>
+										<object class="NSButton" id="915448994">
+											<reference key="NSNextResponder" ref="596750588"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{18, 69}, {402, 18}}</string>
+											<reference key="NSSuperview" ref="596750588"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSButtonCell" key="NSCell" id="117056849">
+												<int key="NSCellFlags">67239424</int>
+												<int key="NSCellFlags2">0</int>
+												<string key="NSContents">Click-through Inactive Windows</string>
+												<reference key="NSSupport" ref="463863101"/>
+												<reference key="NSControlView" ref="915448994"/>
+												<int key="NSButtonFlags">1211912703</int>
+												<int key="NSButtonFlags2">2</int>
+												<reference key="NSAlternateImage" ref="391434389"/>
+												<reference key="NSAlternateContents" ref="331740794"/>
+												<reference key="NSKeyEquivalent" ref="331740794"/>
+												<int key="NSPeriodicDelay">200</int>
+												<int key="NSPeriodicInterval">25</int>
+											</object>
+										</object>
+										<object class="NSTextField" id="707276799">
+											<reference key="NSNextResponder" ref="596750588"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrame">{{33, 32}, {385, 31}}</string>
+											<reference key="NSSuperview" ref="596750588"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="318286890">
+												<int key="NSCellFlags">67239424</int>
+												<int key="NSCellFlags2">4194304</int>
+												<string key="NSContents">When enabled, clicking on an inactive window will cause that mouse click to pass through to that window in addition to activating it.</string>
+												<reference key="NSSupport" ref="26"/>
+												<reference key="NSControlView" ref="707276799"/>
+												<reference key="NSBackgroundColor" ref="57160303"/>
+												<reference key="NSTextColor" ref="930815747"/>
 											</object>
 										</object>
 									</object>
-									<string key="NSFrame">{{10, 33}, {438, 253}}</string>
-									<reference key="NSSuperview" ref="75927203"/>
+									<string key="NSFrame">{{10, 33}, {438, 279}}</string>
+									<reference key="NSSuperview" ref="448510093"/>
 								</object>
 							</object>
-							<string key="NSFrame">{{10, 7}, {458, 299}}</string>
-							<reference key="NSSuperview" ref="404125972"/>
+							<string key="NSFrame">{{10, 10}, {458, 325}}</string>
+							<reference key="NSSuperview" ref="941366957"/>
 							<object class="NSMutableArray" key="NSTabViewItems">
 								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSTabViewItem" id="17244958">
+								<object class="NSTabViewItem" id="287591690">
 									<object class="NSMutableString" key="NSIdentifier">
 										<characters key="NS.bytes">1</characters>
 									</object>
-									<object class="NSView" key="NSView" id="600332710">
-										<nil key="NSNextResponder"/>
-										<int key="NSvFlags">256</int>
-										<object class="NSMutableArray" key="NSSubviews">
-											<bool key="EncodedWithXMLCoder">YES</bool>
-											<object class="NSButton" id="808306730">
-												<reference key="NSNextResponder" ref="600332710"/>
-												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{18, 217}, {402, 18}}</string>
-												<reference key="NSSuperview" ref="600332710"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSButtonCell" key="NSCell" id="727617204">
-													<int key="NSCellFlags">67239424</int>
-													<int key="NSCellFlags2">0</int>
-													<string key="NSContents">Emulate three button mouse</string>
-													<reference key="NSSupport" ref="706343604"/>
-													<reference key="NSControlView" ref="808306730"/>
-													<int key="NSButtonFlags">1211912703</int>
-													<int key="NSButtonFlags2">2</int>
-													<reference key="NSAlternateImage" ref="876172194"/>
-													<reference key="NSAlternateContents" ref="1005878359"/>
-													<reference key="NSKeyEquivalent" ref="1005878359"/>
-													<int key="NSPeriodicDelay">200</int>
-													<int key="NSPeriodicInterval">25</int>
-												</object>
-											</object>
-											<object class="NSTextField" id="618388983">
-												<reference key="NSNextResponder" ref="600332710"/>
-												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{36, 67}, {385, 31}}</string>
-												<reference key="NSSuperview" ref="600332710"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSTextFieldCell" key="NSCell" id="140236247">
-													<int key="NSCellFlags">67239424</int>
-													<int key="NSCellFlags2">4194304</int>
-													<string key="NSContents">When enabled, menu bar key equivalents may interfere with X11 applications that use the Meta modifier.</string>
-													<reference key="NSSupport" ref="26"/>
-													<reference key="NSControlView" ref="618388983"/>
-													<reference key="NSBackgroundColor" ref="320865741"/>
-													<reference key="NSTextColor" ref="233849662"/>
-												</object>
-											</object>
-											<object class="NSTextField" id="754792079">
-												<reference key="NSNextResponder" ref="600332710"/>
-												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{36, 182}, {385, 29}}</string>
-												<reference key="NSSuperview" ref="600332710"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSTextFieldCell" key="NSCell" id="110537159">
-													<int key="NSCellFlags">67239424</int>
-													<int key="NSCellFlags2">4194304</int>
-													<string type="base64-UTF8" key="NSContents">SG9sZCBPcHRpb24gYW5kIENvbW1hbmQgd2hpbGUgY2xpY2tpbmcgdG8gYWN0aXZhdGUgdGhlIG1pZGRs
-ZSBhbmQgcmlnaHQgbW91c2UgYnV0dG9ucy4KA</string>
-													<reference key="NSSupport" ref="26"/>
-													<reference key="NSControlView" ref="754792079"/>
-													<reference key="NSBackgroundColor" ref="320865741"/>
-													<reference key="NSTextColor" ref="233849662"/>
-												</object>
-											</object>
-											<object class="NSButton" id="677150201">
-												<reference key="NSNextResponder" ref="600332710"/>
-												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{18, 104}, {402, 18}}</string>
-												<reference key="NSSuperview" ref="600332710"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSButtonCell" key="NSCell" id="46680941">
-													<int key="NSCellFlags">67239424</int>
-													<int key="NSCellFlags2">0</int>
-													<string key="NSContents">Enable key equivalents under X11</string>
-													<reference key="NSSupport" ref="706343604"/>
-													<reference key="NSControlView" ref="677150201"/>
-													<int key="NSButtonFlags">1211912703</int>
-													<int key="NSButtonFlags2">2</int>
-													<reference key="NSAlternateImage" ref="876172194"/>
-													<reference key="NSAlternateContents" ref="1005878359"/>
-													<reference key="NSKeyEquivalent" ref="1005878359"/>
-													<int key="NSPeriodicDelay">200</int>
-													<int key="NSPeriodicInterval">25</int>
-												</object>
-											</object>
-											<object class="NSTextField" id="228801813">
-												<reference key="NSNextResponder" ref="600332710"/>
-												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{36, 133}, {385, 14}}</string>
-												<reference key="NSSuperview" ref="600332710"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSTextFieldCell" key="NSCell" id="415694484">
-													<int key="NSCellFlags">67239424</int>
-													<int key="NSCellFlags2">4194304</int>
-													<string key="NSContents">Allows input menu changes to overwrite the current X11 keymap.</string>
-													<reference key="NSSupport" ref="26"/>
-													<reference key="NSControlView" ref="228801813"/>
-													<reference key="NSBackgroundColor" ref="320865741"/>
-													<reference key="NSTextColor" ref="233849662"/>
-												</object>
-											</object>
-											<object class="NSButton" id="793493073">
-												<reference key="NSNextResponder" ref="600332710"/>
-												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{18, 153}, {402, 18}}</string>
-												<reference key="NSSuperview" ref="600332710"/>
-												<bool key="NSEnabled">YES</bool>
-												<object class="NSButtonCell" key="NSCell" id="466260504">
-													<int key="NSCellFlags">67239424</int>
-													<int key="NSCellFlags2">0</int>
-													<string key="NSContents">Follow system keyboard layout</string>
-													<reference key="NSSupport" ref="706343604"/>
-													<reference key="NSControlView" ref="793493073"/>
-													<int key="NSButtonFlags">1211912703</int>
-													<int key="NSButtonFlags2">2</int>
-													<reference key="NSAlternateImage" ref="876172194"/>
-													<reference key="NSAlternateContents" ref="1005878359"/>
-													<reference key="NSKeyEquivalent" ref="1005878359"/>
-													<int key="NSPeriodicDelay">200</int>
-													<int key="NSPeriodicInterval">25</int>
-												</object>
-											</object>
-										</object>
-										<string key="NSFrame">{{10, 33}, {438, 253}}</string>
-									</object>
+									<reference key="NSView" ref="596750588"/>
 									<string key="NSLabel">Input</string>
-									<reference key="NSColor" ref="320865741"/>
-									<reference key="NSTabView" ref="75927203"/>
+									<reference key="NSColor" ref="57160303"/>
+									<reference key="NSTabView" ref="448510093"/>
 								</object>
-								<object class="NSTabViewItem" id="493727923">
+								<object class="NSTabViewItem" id="960678392">
 									<object class="NSMutableString" key="NSIdentifier">
 										<characters key="NS.bytes">2</characters>
 									</object>
-									<reference key="NSView" ref="527709877"/>
-									<string key="NSLabel">Output</string>
-									<reference key="NSColor" ref="320865741"/>
-									<reference key="NSTabView" ref="75927203"/>
-								</object>
-								<object class="NSTabViewItem" id="1036577743">
-									<object class="NSView" key="NSView" id="536248195">
+									<object class="NSView" key="NSView" id="515308735">
 										<nil key="NSNextResponder"/>
 										<int key="NSvFlags">256</int>
 										<object class="NSMutableArray" key="NSSubviews">
 											<bool key="EncodedWithXMLCoder">YES</bool>
-											<object class="NSButton" id="137435489">
-												<reference key="NSNextResponder" ref="536248195"/>
+											<object class="NSButton" id="418227126">
+												<reference key="NSNextResponder" ref="515308735"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{18, 217}, {402, 18}}</string>
-												<reference key="NSSuperview" ref="536248195"/>
+												<string key="NSFrame">{{18, 116}, {402, 18}}</string>
+												<reference key="NSSuperview" ref="515308735"/>
 												<bool key="NSEnabled">YES</bool>
-												<object class="NSButtonCell" key="NSCell" id="891925158">
+												<object class="NSButtonCell" key="NSCell" id="1016069354">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Use system alert effect</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="418227126"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<reference key="NSAlternateContents" ref="331740794"/>
+													<reference key="NSKeyEquivalent" ref="331740794"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="1039016593">
+												<reference key="NSNextResponder" ref="515308735"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{36, 82}, {385, 28}}</string>
+												<reference key="NSSuperview" ref="515308735"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="624655599">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">X11 beeps will use the standard system alert, as defined in the Sound Effects system preferences panel.</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="1039016593"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSPopUpButton" id="709074847">
+												<reference key="NSNextResponder" ref="515308735"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{74, 235}, {128, 26}}</string>
+												<reference key="NSSuperview" ref="515308735"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSPopUpButtonCell" key="NSCell" id="633115429">
+													<int key="NSCellFlags">-2076049856</int>
+													<int key="NSCellFlags2">1024</int>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="709074847"/>
+													<int key="NSButtonFlags">109199615</int>
+													<int key="NSButtonFlags2">1</int>
+													<object class="NSFont" key="NSAlternateImage">
+														<reference key="NSName" ref="512586816"/>
+														<double key="NSSize">1.300000e+01</double>
+														<int key="NSfFlags">16</int>
+													</object>
+													<object class="NSMutableString" key="NSAlternateContents">
+														<characters key="NS.bytes"/>
+													</object>
+													<object class="NSMutableString" key="NSKeyEquivalent">
+														<characters key="NS.bytes"/>
+													</object>
+													<int key="NSPeriodicDelay">400</int>
+													<int key="NSPeriodicInterval">75</int>
+													<object class="NSMenuItem" key="NSMenuItem" id="616492372">
+														<reference key="NSMenu" ref="341113515"/>
+														<string key="NSTitle">From Display</string>
+														<reference key="NSKeyEquiv" ref="331740794"/>
+														<int key="NSKeyEquivModMask">1048576</int>
+														<int key="NSMnemonicLoc">2147483647</int>
+														<int key="NSState">1</int>
+														<reference key="NSOnImage" ref="531645050"/>
+														<reference key="NSMixedImage" ref="246283459"/>
+														<string key="NSAction">_popUpItemAction:</string>
+														<int key="NSTag">-1</int>
+														<reference key="NSTarget" ref="633115429"/>
+													</object>
+													<bool key="NSMenuItemRespectAlignment">YES</bool>
+													<object class="NSMenu" key="NSMenu" id="341113515">
+														<object class="NSMutableString" key="NSTitle">
+															<characters key="NS.bytes">OtherViews</characters>
+														</object>
+														<object class="NSMutableArray" key="NSMenuItems">
+															<bool key="EncodedWithXMLCoder">YES</bool>
+															<reference ref="616492372"/>
+															<object class="NSMenuItem" id="759499526">
+																<reference key="NSMenu" ref="341113515"/>
+																<string key="NSTitle">256 Colors</string>
+																<reference key="NSKeyEquiv" ref="331740794"/>
+																<int key="NSKeyEquivModMask">1048576</int>
+																<int key="NSMnemonicLoc">2147483647</int>
+																<reference key="NSOnImage" ref="531645050"/>
+																<reference key="NSMixedImage" ref="246283459"/>
+																<string key="NSAction">_popUpItemAction:</string>
+																<int key="NSTag">8</int>
+																<reference key="NSTarget" ref="633115429"/>
+															</object>
+															<object class="NSMenuItem" id="543935434">
+																<reference key="NSMenu" ref="341113515"/>
+																<string key="NSTitle">Thousands</string>
+																<reference key="NSKeyEquiv" ref="331740794"/>
+																<int key="NSKeyEquivModMask">1048576</int>
+																<int key="NSMnemonicLoc">2147483647</int>
+																<reference key="NSOnImage" ref="531645050"/>
+																<reference key="NSMixedImage" ref="246283459"/>
+																<string key="NSAction">_popUpItemAction:</string>
+																<int key="NSTag">15</int>
+																<reference key="NSTarget" ref="633115429"/>
+															</object>
+															<object class="NSMenuItem" id="836673018">
+																<reference key="NSMenu" ref="341113515"/>
+																<string key="NSTitle">Millions</string>
+																<reference key="NSKeyEquiv" ref="331740794"/>
+																<int key="NSKeyEquivModMask">1048576</int>
+																<int key="NSMnemonicLoc">2147483647</int>
+																<reference key="NSOnImage" ref="531645050"/>
+																<reference key="NSMixedImage" ref="246283459"/>
+																<string key="NSAction">_popUpItemAction:</string>
+																<int key="NSTag">24</int>
+																<reference key="NSTarget" ref="633115429"/>
+															</object>
+														</object>
+													</object>
+													<int key="NSPreferredEdge">3</int>
+													<bool key="NSUsesItemFromMenu">YES</bool>
+													<bool key="NSAltersState">YES</bool>
+													<int key="NSArrowPosition">1</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="201731424">
+												<reference key="NSNextResponder" ref="515308735"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{17, 238}, {55, 20}}</string>
+												<reference key="NSSuperview" ref="515308735"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="930265681">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string type="base64-UTF8" key="NSContents">Q29sb3JzOgo</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="201731424"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSTextField" id="86150604">
+												<reference key="NSNextResponder" ref="515308735"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{36, 216}, {392, 14}}</string>
+												<reference key="NSSuperview" ref="515308735"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="311969422">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">This option takes effect when X11 is launched again.</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="86150604"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSButton" id="477203622">
+												<reference key="NSNextResponder" ref="515308735"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{18, 182}, {409, 23}}</string>
+												<reference key="NSSuperview" ref="515308735"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="631531164">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Full screen mode</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="477203622"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<reference key="NSAlternateContents" ref="331740794"/>
+													<reference key="NSKeyEquivalent" ref="331740794"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="298603383">
+												<reference key="NSNextResponder" ref="515308735"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{36, 145}, {385, 31}}</string>
+												<reference key="NSSuperview" ref="515308735"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="761107402">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">Enables the X11 root window. Use the Command-Option-A keystroke to enter and leave full screen mode.</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="298603383"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+										</object>
+										<string key="NSFrame">{{10, 33}, {438, 279}}</string>
+									</object>
+									<string key="NSLabel">Output</string>
+									<reference key="NSColor" ref="57160303"/>
+									<reference key="NSTabView" ref="448510093"/>
+								</object>
+								<object class="NSTabViewItem" id="348328898">
+									<object class="NSView" key="NSView" id="300811574">
+										<nil key="NSNextResponder"/>
+										<int key="NSvFlags">256</int>
+										<object class="NSMutableArray" key="NSSubviews">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+											<object class="NSButton" id="989050925">
+												<reference key="NSNextResponder" ref="300811574"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{18, 243}, {402, 18}}</string>
+												<reference key="NSSuperview" ref="300811574"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="189594322">
 													<int key="NSCellFlags">67239424</int>
 													<int key="NSCellFlags2">0</int>
 													<string key="NSContents">Authenticate connections</string>
-													<reference key="NSSupport" ref="706343604"/>
-													<reference key="NSControlView" ref="137435489"/>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="989050925"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSAlternateImage" ref="876172194"/>
-													<reference key="NSAlternateContents" ref="1005878359"/>
-													<reference key="NSKeyEquivalent" ref="1005878359"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<reference key="NSAlternateContents" ref="331740794"/>
+													<reference key="NSKeyEquivalent" ref="331740794"/>
 													<int key="NSPeriodicDelay">200</int>
 													<int key="NSPeriodicInterval">25</int>
 												</object>
 											</object>
-											<object class="NSButton" id="663154230">
-												<reference key="NSNextResponder" ref="536248195"/>
+											<object class="NSButton" id="700826966">
+												<reference key="NSNextResponder" ref="300811574"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{18, 140}, {402, 18}}</string>
-												<reference key="NSSuperview" ref="536248195"/>
+												<string key="NSFrame">{{18, 166}, {402, 18}}</string>
+												<reference key="NSSuperview" ref="300811574"/>
 												<bool key="NSEnabled">YES</bool>
-												<object class="NSButtonCell" key="NSCell" id="836703945">
+												<object class="NSButtonCell" key="NSCell" id="489340979">
 													<int key="NSCellFlags">67239424</int>
 													<int key="NSCellFlags2">0</int>
 													<string key="NSContents">Allow connections from network clients</string>
-													<reference key="NSSupport" ref="706343604"/>
-													<reference key="NSControlView" ref="663154230"/>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="700826966"/>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
-													<reference key="NSAlternateImage" ref="876172194"/>
-													<reference key="NSAlternateContents" ref="1005878359"/>
-													<reference key="NSKeyEquivalent" ref="1005878359"/>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<reference key="NSAlternateContents" ref="331740794"/>
+													<reference key="NSKeyEquivalent" ref="331740794"/>
 													<int key="NSPeriodicDelay">200</int>
 													<int key="NSPeriodicInterval">25</int>
 												</object>
 											</object>
-											<object class="NSTextField" id="417801719">
-												<reference key="NSNextResponder" ref="536248195"/>
+											<object class="NSTextField" id="168436707">
+												<reference key="NSNextResponder" ref="300811574"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{36, 169}, {385, 42}}</string>
-												<reference key="NSSuperview" ref="536248195"/>
+												<string key="NSFrame">{{36, 195}, {385, 42}}</string>
+												<reference key="NSSuperview" ref="300811574"/>
 												<bool key="NSEnabled">YES</bool>
-												<object class="NSTextFieldCell" key="NSCell" id="935570098">
+												<object class="NSTextFieldCell" key="NSCell" id="53243865">
 													<int key="NSCellFlags">67239424</int>
 													<int key="NSCellFlags2">4194304</int>
 													<string type="base64-UTF8" key="NSContents">TGF1bmNoaW5nIFgxMSB3aWxsIGNyZWF0ZSBYYXV0aG9yaXR5IGFjY2Vzcy1jb250cm9sIGtleXMuIElm
 IHRoZSBzeXN0ZW0ncyBJUCBhZGRyZXNzIGNoYW5nZXMsIHRoZXNlIGtleXMgYmVjb21lIGludmFsaWQg
 d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 													<reference key="NSSupport" ref="26"/>
-													<reference key="NSControlView" ref="417801719"/>
-													<reference key="NSBackgroundColor" ref="320865741"/>
-													<reference key="NSTextColor" ref="233849662"/>
+													<reference key="NSControlView" ref="168436707"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
 												</object>
 											</object>
-											<object class="NSTextField" id="115954190">
-												<reference key="NSNextResponder" ref="536248195"/>
+											<object class="NSTextField" id="363817195">
+												<reference key="NSNextResponder" ref="300811574"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{36, 92}, {385, 42}}</string>
-												<reference key="NSSuperview" ref="536248195"/>
+												<string key="NSFrame">{{36, 118}, {385, 42}}</string>
+												<reference key="NSSuperview" ref="300811574"/>
 												<bool key="NSEnabled">YES</bool>
-												<object class="NSTextFieldCell" key="NSCell" id="144257898">
+												<object class="NSTextFieldCell" key="NSCell" id="390084685">
 													<int key="NSCellFlags">67239424</int>
 													<int key="NSCellFlags2">4194304</int>
 													<string key="NSContents">If enabled, Authenticate connections must also be enabled to ensure system security. When disabled, connections from remote applications are not allowed.</string>
 													<reference key="NSSupport" ref="26"/>
-													<reference key="NSControlView" ref="115954190"/>
-													<reference key="NSBackgroundColor" ref="320865741"/>
-													<reference key="NSTextColor" ref="233849662"/>
+													<reference key="NSControlView" ref="363817195"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
 												</object>
 											</object>
-											<object class="NSTextField" id="1067279202">
-												<reference key="NSNextResponder" ref="536248195"/>
+											<object class="NSTextField" id="223835729">
+												<reference key="NSNextResponder" ref="300811574"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{17, 20}, {404, 14}}</string>
-												<reference key="NSSuperview" ref="536248195"/>
+												<string key="NSFrame">{{20, 17}, {404, 14}}</string>
+												<reference key="NSSuperview" ref="300811574"/>
 												<bool key="NSEnabled">YES</bool>
-												<object class="NSTextFieldCell" key="NSCell" id="703874672">
+												<object class="NSTextFieldCell" key="NSCell" id="283628678">
 													<int key="NSCellFlags">67239424</int>
 													<int key="NSCellFlags2">4194304</int>
 													<string key="NSContents">These options take effect when X11 is next launched.</string>
 													<reference key="NSSupport" ref="26"/>
-													<reference key="NSControlView" ref="1067279202"/>
-													<reference key="NSBackgroundColor" ref="320865741"/>
-													<reference key="NSTextColor" ref="233849662"/>
+													<reference key="NSControlView" ref="223835729"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
 												</object>
 											</object>
 										</object>
-										<string key="NSFrame">{{10, 33}, {438, 253}}</string>
+										<string key="NSFrame">{{10, 33}, {438, 279}}</string>
 									</object>
 									<string key="NSLabel">Security</string>
-									<reference key="NSColor" ref="320865741"/>
-									<reference key="NSTabView" ref="75927203"/>
+									<reference key="NSColor" ref="57160303"/>
+									<reference key="NSTabView" ref="448510093"/>
 								</object>
 							</object>
-							<reference key="NSSelectedTabViewItem" ref="493727923"/>
-							<reference key="NSFont" ref="706343604"/>
+							<reference key="NSSelectedTabViewItem" ref="287591690"/>
+							<reference key="NSFont" ref="463863101"/>
 							<int key="NSTvFlags">0</int>
 							<bool key="NSAllowTruncatedLabels">YES</bool>
 							<bool key="NSDrawsBackground">YES</bool>
 						</object>
 					</object>
-					<string key="NSFrameSize">{478, 316}</string>
+					<string key="NSFrameSize">{481, 345}</string>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
 				<string key="NSMinSize">{213, 129}</string>
 				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
 				<string key="NSFrameAutosaveName">x11_prefs</string>
 			</object>
-			<object class="NSWindowTemplate" id="796776534">
+			<object class="NSWindowTemplate" id="604417141">
 				<int key="NSWindowStyleMask">11</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{279, 270}, {486, 310}}</string>
+				<string key="NSWindowRect">{{279, 253}, {486, 327}}</string>
 				<int key="NSWTFlags">1350041600</int>
 				<string key="NSWindowTitle">X11 Application Menu</string>
-				<reference key="NSWindowClass" ref="643663067"/>
+				<reference key="NSWindowClass" ref="666842945"/>
 				<object class="NSMutableString" key="NSViewClass">
 					<characters key="NS.bytes">View</characters>
 				</object>
 				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
 				<string key="NSWindowContentMinSize">{213, 107}</string>
-				<object class="NSView" key="NSWindowView" id="1039094689">
+				<object class="NSView" key="NSWindowView" id="85544634">
 					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSButton" id="1002101696">
-							<reference key="NSNextResponder" ref="1039094689"/>
+						<object class="NSButton" id="724002248">
+							<reference key="NSNextResponder" ref="85544634"/>
 							<int key="NSvFlags">303</int>
-							<string key="NSFrame">{{388, 12}, {84, 32}}</string>
-							<reference key="NSSuperview" ref="1039094689"/>
+							<string key="NSFrame">{{268, 12}, {84, 32}}</string>
+							<reference key="NSSuperview" ref="85544634"/>
 							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="558394524">
+							<object class="NSButtonCell" key="NSCell" id="809610613">
 								<int key="NSCellFlags">-2080244224</int>
 								<int key="NSCellFlags2">137887744</int>
 								<string key="NSContents">Done</string>
-								<reference key="NSSupport" ref="706343604"/>
-								<reference key="NSControlView" ref="1002101696"/>
+								<reference key="NSSupport" ref="463863101"/>
+								<reference key="NSControlView" ref="724002248"/>
 								<int key="NSButtonFlags">-2038284033</int>
 								<int key="NSButtonFlags2">1</int>
-								<object class="NSFont" key="NSAlternateImage" id="965938342">
+								<object class="NSFont" key="NSAlternateImage" id="549406736">
 									<string key="NSName">Helvetica</string>
 									<double key="NSSize">1.300000e+01</double>
 									<int key="NSfFlags">16</int>
 								</object>
-								<reference key="NSAlternateContents" ref="1005878359"/>
+								<reference key="NSAlternateContents" ref="331740794"/>
 								<object class="NSMutableString" key="NSKeyEquivalent">
 									<characters key="NS.bytes"/>
 								</object>
@@ -1003,21 +1041,21 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 								<int key="NSPeriodicInterval">25</int>
 							</object>
 						</object>
-						<object class="NSButton" id="711288662">
-							<reference key="NSNextResponder" ref="1039094689"/>
+						<object class="NSButton" id="671954382">
+							<reference key="NSNextResponder" ref="85544634"/>
 							<int key="NSvFlags">301</int>
-							<string key="NSFrame">{{372, 230}, {100, 32}}</string>
-							<reference key="NSSuperview" ref="1039094689"/>
+							<string key="NSFrame">{{372, 247}, {100, 32}}</string>
+							<reference key="NSSuperview" ref="85544634"/>
 							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="413164923">
+							<object class="NSButtonCell" key="NSCell" id="143554520">
 								<int key="NSCellFlags">67239424</int>
 								<int key="NSCellFlags2">137887744</int>
 								<string key="NSContents">Duplicate</string>
-								<reference key="NSSupport" ref="706343604"/>
-								<reference key="NSControlView" ref="711288662"/>
+								<reference key="NSSupport" ref="463863101"/>
+								<reference key="NSControlView" ref="671954382"/>
 								<int key="NSButtonFlags">-2038284033</int>
 								<int key="NSButtonFlags2">1</int>
-								<reference key="NSAlternateImage" ref="965938342"/>
+								<reference key="NSAlternateImage" ref="549406736"/>
 								<object class="NSMutableString" key="NSAlternateContents">
 									<characters key="NS.bytes"/>
 								</object>
@@ -1028,21 +1066,21 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 								<int key="NSPeriodicInterval">25</int>
 							</object>
 						</object>
-						<object class="NSButton" id="634701477">
-							<reference key="NSNextResponder" ref="1039094689"/>
+						<object class="NSButton" id="492358940">
+							<reference key="NSNextResponder" ref="85544634"/>
 							<int key="NSvFlags">301</int>
-							<string key="NSFrame">{{372, 198}, {100, 32}}</string>
-							<reference key="NSSuperview" ref="1039094689"/>
+							<string key="NSFrame">{{372, 215}, {100, 32}}</string>
+							<reference key="NSSuperview" ref="85544634"/>
 							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="26248495">
+							<object class="NSButtonCell" key="NSCell" id="8201128">
 								<int key="NSCellFlags">67239424</int>
 								<int key="NSCellFlags2">137887744</int>
 								<string key="NSContents">Remove</string>
-								<reference key="NSSupport" ref="706343604"/>
-								<reference key="NSControlView" ref="634701477"/>
+								<reference key="NSSupport" ref="463863101"/>
+								<reference key="NSControlView" ref="492358940"/>
 								<int key="NSButtonFlags">-2038284033</int>
 								<int key="NSButtonFlags2">1</int>
-								<reference key="NSAlternateImage" ref="965938342"/>
+								<reference key="NSAlternateImage" ref="549406736"/>
 								<object class="NSMutableString" key="NSAlternateContents">
 									<characters key="NS.bytes"/>
 								</object>
@@ -1053,39 +1091,39 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 								<int key="NSPeriodicInterval">25</int>
 							</object>
 						</object>
-						<object class="NSScrollView" id="1011512617">
-							<reference key="NSNextResponder" ref="1039094689"/>
+						<object class="NSScrollView" id="1063387772">
+							<reference key="NSNextResponder" ref="85544634"/>
 							<int key="NSvFlags">307</int>
 							<object class="NSMutableArray" key="NSSubviews">
 								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSClipView" id="963977695">
-									<reference key="NSNextResponder" ref="1011512617"/>
+								<object class="NSClipView" id="580565898">
+									<reference key="NSNextResponder" ref="1063387772"/>
 									<int key="NSvFlags">2304</int>
 									<object class="NSMutableArray" key="NSSubviews">
 										<bool key="EncodedWithXMLCoder">YES</bool>
-										<object class="NSTableView" id="411425856">
-											<reference key="NSNextResponder" ref="963977695"/>
+										<object class="NSTableView" id="905092943">
+											<reference key="NSNextResponder" ref="580565898"/>
 											<int key="NSvFlags">256</int>
 											<string key="NSFrameSize">{333, 197}</string>
-											<reference key="NSSuperview" ref="963977695"/>
+											<reference key="NSSuperview" ref="580565898"/>
 											<bool key="NSEnabled">YES</bool>
-											<object class="NSTableHeaderView" key="NSHeaderView" id="526973850">
-												<reference key="NSNextResponder" ref="935843221"/>
+											<object class="NSTableHeaderView" key="NSHeaderView" id="792419186">
+												<reference key="NSNextResponder" ref="672307654"/>
 												<int key="NSvFlags">256</int>
 												<string key="NSFrameSize">{333, 17}</string>
-												<reference key="NSSuperview" ref="935843221"/>
-												<reference key="NSTableView" ref="411425856"/>
+												<reference key="NSSuperview" ref="672307654"/>
+												<reference key="NSTableView" ref="905092943"/>
 											</object>
-											<object class="_NSCornerView" key="NSCornerView" id="182265797">
-												<reference key="NSNextResponder" ref="1011512617"/>
+											<object class="_NSCornerView" key="NSCornerView" id="898633680">
+												<reference key="NSNextResponder" ref="1063387772"/>
 												<int key="NSvFlags">256</int>
 												<string key="NSFrame">{{334, 0}, {16, 17}}</string>
-												<reference key="NSSuperview" ref="1011512617"/>
+												<reference key="NSSuperview" ref="1063387772"/>
 											</object>
 											<object class="NSMutableArray" key="NSTableColumns">
 												<bool key="EncodedWithXMLCoder">YES</bool>
-												<object class="NSTableColumn" id="621551865">
-													<double key="NSWidth">7.900000e+01</double>
+												<object class="NSTableColumn" id="84282687">
+													<double key="NSWidth">1.110000e+02</double>
 													<double key="NSMinWidth">4.000000e+01</double>
 													<double key="NSMaxWidth">1.000000e+03</double>
 													<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -1093,35 +1131,36 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 														<int key="NSCellFlags2">0</int>
 														<string key="NSContents">Name</string>
 														<reference key="NSSupport" ref="26"/>
-														<object class="NSColor" key="NSBackgroundColor" id="182967138">
+														<object class="NSColor" key="NSBackgroundColor" id="113872566">
 															<int key="NSColorSpace">3</int>
 															<bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes>
 														</object>
-														<object class="NSColor" key="NSTextColor" id="645274518">
+														<object class="NSColor" key="NSTextColor" id="249576247">
 															<int key="NSColorSpace">6</int>
-															<reference key="NSCatalogName" ref="1000587476"/>
+															<reference key="NSCatalogName" ref="905527164"/>
 															<string key="NSColorName">headerTextColor</string>
-															<reference key="NSColor" ref="608123050"/>
+															<reference key="NSColor" ref="214098874"/>
 														</object>
 													</object>
-													<object class="NSTextFieldCell" key="NSDataCell" id="195831317">
+													<object class="NSTextFieldCell" key="NSDataCell" id="432610585">
 														<int key="NSCellFlags">338820672</int>
 														<int key="NSCellFlags2">1024</int>
-														<reference key="NSSupport" ref="706343604"/>
-														<reference key="NSControlView" ref="411425856"/>
-														<object class="NSColor" key="NSBackgroundColor" id="722293876">
+														<string key="NSContents" id="548220387">Text Cell</string>
+														<reference key="NSSupport" ref="463863101"/>
+														<reference key="NSControlView" ref="905092943"/>
+														<object class="NSColor" key="NSBackgroundColor" id="822946413">
 															<int key="NSColorSpace">3</int>
 															<bytes key="NSWhite">MQA</bytes>
 														</object>
-														<reference key="NSTextColor" ref="233849662"/>
+														<reference key="NSTextColor" ref="930815747"/>
 													</object>
 													<int key="NSResizingMask">3</int>
 													<bool key="NSIsResizeable">YES</bool>
 													<bool key="NSIsEditable">YES</bool>
-													<reference key="NSTableView" ref="411425856"/>
+													<reference key="NSTableView" ref="905092943"/>
 												</object>
-												<object class="NSTableColumn" id="976084317">
-													<double key="NSWidth">1.937310e+02</double>
+												<object class="NSTableColumn" id="938444323">
+													<double key="NSWidth">1.327310e+02</double>
 													<double key="NSMinWidth">6.273100e+01</double>
 													<double key="NSMaxWidth">1.000000e+03</double>
 													<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -1129,24 +1168,25 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 														<int key="NSCellFlags2">0</int>
 														<string key="NSContents">Command</string>
 														<reference key="NSSupport" ref="26"/>
-														<reference key="NSBackgroundColor" ref="182967138"/>
-														<reference key="NSTextColor" ref="645274518"/>
+														<reference key="NSBackgroundColor" ref="113872566"/>
+														<reference key="NSTextColor" ref="249576247"/>
 													</object>
-													<object class="NSTextFieldCell" key="NSDataCell" id="656574062">
+													<object class="NSTextFieldCell" key="NSDataCell" id="825378892">
 														<int key="NSCellFlags">338820672</int>
 														<int key="NSCellFlags2">1024</int>
-														<reference key="NSSupport" ref="706343604"/>
-														<reference key="NSControlView" ref="411425856"/>
-														<reference key="NSBackgroundColor" ref="722293876"/>
-														<reference key="NSTextColor" ref="233849662"/>
+														<reference key="NSContents" ref="548220387"/>
+														<reference key="NSSupport" ref="463863101"/>
+														<reference key="NSControlView" ref="905092943"/>
+														<reference key="NSBackgroundColor" ref="822946413"/>
+														<reference key="NSTextColor" ref="930815747"/>
 													</object>
 													<int key="NSResizingMask">3</int>
 													<bool key="NSIsResizeable">YES</bool>
 													<bool key="NSIsEditable">YES</bool>
-													<reference key="NSTableView" ref="411425856"/>
+													<reference key="NSTableView" ref="905092943"/>
 												</object>
-												<object class="NSTableColumn" id="661701503">
-													<double key="NSWidth">5.100000e+01</double>
+												<object class="NSTableColumn" id="242608782">
+													<double key="NSWidth">8.000000e+01</double>
 													<double key="NSMinWidth">1.000000e+01</double>
 													<double key="NSMaxWidth">1.000000e+03</double>
 													<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -1156,42 +1196,43 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 														<reference key="NSSupport" ref="26"/>
 														<object class="NSColor" key="NSBackgroundColor">
 															<int key="NSColorSpace">6</int>
-															<reference key="NSCatalogName" ref="1000587476"/>
+															<reference key="NSCatalogName" ref="905527164"/>
 															<string key="NSColorName">headerColor</string>
-															<reference key="NSColor" ref="722293876"/>
+															<reference key="NSColor" ref="822946413"/>
 														</object>
-														<reference key="NSTextColor" ref="645274518"/>
+														<reference key="NSTextColor" ref="249576247"/>
 													</object>
-													<object class="NSTextFieldCell" key="NSDataCell" id="90031137">
+													<object class="NSTextFieldCell" key="NSDataCell" id="34714764">
 														<int key="NSCellFlags">338820672</int>
 														<int key="NSCellFlags2">1024</int>
+														<reference key="NSContents" ref="548220387"/>
 														<object class="NSFont" key="NSSupport">
-															<reference key="NSName" ref="508374773"/>
+															<reference key="NSName" ref="512586816"/>
 															<double key="NSSize">1.200000e+01</double>
 															<int key="NSfFlags">16</int>
 														</object>
-														<reference key="NSControlView" ref="411425856"/>
+														<reference key="NSControlView" ref="905092943"/>
 														<bool key="NSDrawsBackground">YES</bool>
-														<object class="NSColor" key="NSBackgroundColor" id="447702889">
+														<object class="NSColor" key="NSBackgroundColor" id="812484075">
 															<int key="NSColorSpace">6</int>
-															<reference key="NSCatalogName" ref="1000587476"/>
+															<reference key="NSCatalogName" ref="905527164"/>
 															<string key="NSColorName">controlBackgroundColor</string>
-															<reference key="NSColor" ref="1000384962"/>
+															<reference key="NSColor" ref="590688762"/>
 														</object>
-														<reference key="NSTextColor" ref="233849662"/>
+														<reference key="NSTextColor" ref="930815747"/>
 													</object>
 													<int key="NSResizingMask">3</int>
 													<bool key="NSIsResizeable">YES</bool>
 													<bool key="NSIsEditable">YES</bool>
-													<reference key="NSTableView" ref="411425856"/>
+													<reference key="NSTableView" ref="905092943"/>
 												</object>
 											</object>
 											<double key="NSIntercellSpacingWidth">3.000000e+00</double>
 											<double key="NSIntercellSpacingHeight">2.000000e+00</double>
-											<reference key="NSBackgroundColor" ref="722293876"/>
+											<reference key="NSBackgroundColor" ref="822946413"/>
 											<object class="NSColor" key="NSGridColor">
 												<int key="NSColorSpace">6</int>
-												<reference key="NSCatalogName" ref="1000587476"/>
+												<reference key="NSCatalogName" ref="905527164"/>
 												<string key="NSColorName">gridColor</string>
 												<object class="NSColor" key="NSColor">
 													<int key="NSColorSpace">3</int>
@@ -1207,72 +1248,73 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 										</object>
 									</object>
 									<string key="NSFrame">{{1, 17}, {333, 197}}</string>
-									<reference key="NSSuperview" ref="1011512617"/>
-									<reference key="NSNextKeyView" ref="411425856"/>
-									<reference key="NSDocView" ref="411425856"/>
-									<reference key="NSBGColor" ref="447702889"/>
+									<reference key="NSSuperview" ref="1063387772"/>
+									<reference key="NSNextKeyView" ref="905092943"/>
+									<reference key="NSDocView" ref="905092943"/>
+									<reference key="NSBGColor" ref="812484075"/>
 									<int key="NScvFlags">4</int>
 								</object>
-								<object class="NSScroller" id="152467947">
-									<reference key="NSNextResponder" ref="1011512617"/>
+								<object class="NSScroller" id="842897584">
+									<reference key="NSNextResponder" ref="1063387772"/>
 									<int key="NSvFlags">256</int>
 									<string key="NSFrame">{{334, 17}, {15, 197}}</string>
-									<reference key="NSSuperview" ref="1011512617"/>
-									<reference key="NSTarget" ref="1011512617"/>
-									<string key="NSAction" id="607822787">_doScroller:</string>
+									<reference key="NSSuperview" ref="1063387772"/>
+									<reference key="NSTarget" ref="1063387772"/>
+									<string key="NSAction" id="365694962">_doScroller:</string>
 									<double key="NSPercent">9.949238e-01</double>
 								</object>
-								<object class="NSScroller" id="208024104">
-									<reference key="NSNextResponder" ref="1011512617"/>
+								<object class="NSScroller" id="17278747">
+									<reference key="NSNextResponder" ref="1063387772"/>
 									<int key="NSvFlags">256</int>
 									<string key="NSFrame">{{1, 214}, {333, 15}}</string>
-									<reference key="NSSuperview" ref="1011512617"/>
+									<reference key="NSSuperview" ref="1063387772"/>
 									<int key="NSsFlags">1</int>
-									<reference key="NSTarget" ref="1011512617"/>
-									<reference key="NSAction" ref="607822787"/>
-									<double key="NSPercent">9.940299e-01</double>
+									<reference key="NSTarget" ref="1063387772"/>
+									<reference key="NSAction" ref="365694962"/>
+									<double key="NSPercent">6.885246e-01</double>
 								</object>
-								<object class="NSClipView" id="935843221">
-									<reference key="NSNextResponder" ref="1011512617"/>
+								<object class="NSClipView" id="672307654">
+									<reference key="NSNextResponder" ref="1063387772"/>
 									<int key="NSvFlags">2304</int>
 									<object class="NSMutableArray" key="NSSubviews">
 										<bool key="EncodedWithXMLCoder">YES</bool>
-										<reference ref="526973850"/>
+										<reference ref="792419186"/>
 									</object>
 									<string key="NSFrame">{{1, 0}, {333, 17}}</string>
-									<reference key="NSSuperview" ref="1011512617"/>
-									<reference key="NSNextKeyView" ref="526973850"/>
-									<reference key="NSDocView" ref="526973850"/>
-									<reference key="NSBGColor" ref="447702889"/>
+									<reference key="NSSuperview" ref="1063387772"/>
+									<reference key="NSNextKeyView" ref="792419186"/>
+									<reference key="NSDocView" ref="792419186"/>
+									<reference key="NSBGColor" ref="812484075"/>
 									<int key="NScvFlags">4</int>
 								</object>
-								<reference ref="182265797"/>
+								<reference ref="898633680"/>
 							</object>
-							<string key="NSFrame">{{20, 60}, {350, 230}}</string>
-							<reference key="NSSuperview" ref="1039094689"/>
-							<reference key="NSNextKeyView" ref="963977695"/>
+							<string key="NSFrame">{{20, 77}, {350, 230}}</string>
+							<reference key="NSSuperview" ref="85544634"/>
+							<reference key="NSNextKeyView" ref="580565898"/>
 							<int key="NSsFlags">50</int>
-							<reference key="NSVScroller" ref="152467947"/>
-							<reference key="NSHScroller" ref="208024104"/>
-							<reference key="NSContentView" ref="963977695"/>
-							<reference key="NSHeaderClipView" ref="935843221"/>
+							<reference key="NSVScroller" ref="842897584"/>
+							<reference key="NSHScroller" ref="17278747"/>
+							<reference key="NSContentView" ref="580565898"/>
+							<reference key="NSHeaderClipView" ref="672307654"/>
+							<reference key="NSCornerView" ref="898633680"/>
 							<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
 						</object>
-						<object class="NSButton" id="859414998">
-							<reference key="NSNextResponder" ref="1039094689"/>
+						<object class="NSButton" id="125703429">
+							<reference key="NSNextResponder" ref="85544634"/>
 							<int key="NSvFlags">303</int>
-							<string key="NSFrame">{{304, 12}, {84, 32}}</string>
-							<reference key="NSSuperview" ref="1039094689"/>
+							<string key="NSFrame">{{352, 12}, {84, 32}}</string>
+							<reference key="NSSuperview" ref="85544634"/>
 							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="537937846">
-								<int key="NSCellFlags">67239424</int>
+							<object class="NSButtonCell" key="NSCell" id="892296813">
+								<int key="NSCellFlags">-2080244224</int>
 								<int key="NSCellFlags2">137887744</int>
 								<string key="NSContents">Cancel</string>
-								<reference key="NSSupport" ref="706343604"/>
-								<reference key="NSControlView" ref="859414998"/>
+								<reference key="NSSupport" ref="463863101"/>
+								<reference key="NSControlView" ref="125703429"/>
 								<int key="NSButtonFlags">-2038284033</int>
 								<int key="NSButtonFlags2">1</int>
-								<reference key="NSAlternateImage" ref="965938342"/>
+								<reference key="NSAlternateImage" ref="549406736"/>
 								<object class="NSMutableString" key="NSAlternateContents">
 									<characters key="NS.bytes"/>
 								</object>
@@ -1283,21 +1325,21 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 								<int key="NSPeriodicInterval">25</int>
 							</object>
 						</object>
-						<object class="NSButton" id="381268760">
-							<reference key="NSNextResponder" ref="1039094689"/>
+						<object class="NSButton" id="758204686">
+							<reference key="NSNextResponder" ref="85544634"/>
 							<int key="NSvFlags">301</int>
-							<string key="NSFrame">{{372, 262}, {100, 32}}</string>
-							<reference key="NSSuperview" ref="1039094689"/>
+							<string key="NSFrame">{{372, 279}, {100, 32}}</string>
+							<reference key="NSSuperview" ref="85544634"/>
 							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="99903682">
+							<object class="NSButtonCell" key="NSCell" id="1025474039">
 								<int key="NSCellFlags">67239424</int>
 								<int key="NSCellFlags2">137887744</int>
 								<string key="NSContents">Add Item</string>
-								<reference key="NSSupport" ref="706343604"/>
-								<reference key="NSControlView" ref="381268760"/>
+								<reference key="NSSupport" ref="463863101"/>
+								<reference key="NSControlView" ref="758204686"/>
 								<int key="NSButtonFlags">-2038284033</int>
 								<int key="NSButtonFlags2">1</int>
-								<reference key="NSAlternateImage" ref="965938342"/>
+								<reference key="NSAlternateImage" ref="549406736"/>
 								<object class="NSMutableString" key="NSAlternateContents">
 									<characters key="NS.bytes"/>
 								</object>
@@ -1309,66 +1351,66 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 							</object>
 						</object>
 					</object>
-					<string key="NSFrame">{{1, 1}, {486, 310}}</string>
+					<string key="NSFrameSize">{486, 327}</string>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
 				<string key="NSMinSize">{213, 129}</string>
 				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
 				<string key="NSFrameAutosaveName">x11_apps</string>
 			</object>
-			<object class="NSMenu" id="1001514180">
+			<object class="NSMenu" id="294137138">
 				<string key="NSTitle">Menu</string>
 				<object class="NSMutableArray" key="NSMenuItems">
 					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="NSMenuItem" id="355724345">
-						<reference key="NSMenu" ref="1001514180"/>
+					<object class="NSMenuItem" id="318286212">
+						<reference key="NSMenu" ref="294137138"/>
 						<bool key="NSIsDisabled">YES</bool>
 						<bool key="NSIsSeparator">YES</bool>
-						<reference key="NSTitle" ref="1005878359"/>
-						<reference key="NSKeyEquiv" ref="1005878359"/>
+						<reference key="NSTitle" ref="331740794"/>
+						<reference key="NSKeyEquiv" ref="331740794"/>
 						<int key="NSKeyEquivModMask">1048576</int>
 						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="732862070"/>
-						<reference key="NSMixedImage" ref="154462367"/>
+						<reference key="NSOnImage" ref="531645050"/>
+						<reference key="NSMixedImage" ref="246283459"/>
 					</object>
-					<object class="NSMenuItem" id="107275095">
-						<reference key="NSMenu" ref="1001514180"/>
-						<reference key="NSTitle" ref="942587293"/>
-						<reference key="NSKeyEquiv" ref="1005878359"/>
+					<object class="NSMenuItem" id="511651072">
+						<reference key="NSMenu" ref="294137138"/>
+						<reference key="NSTitle" ref="667842658"/>
+						<reference key="NSKeyEquiv" ref="331740794"/>
 						<int key="NSKeyEquivModMask">1048576</int>
 						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="732862070"/>
-						<reference key="NSMixedImage" ref="154462367"/>
+						<reference key="NSOnImage" ref="531645050"/>
+						<reference key="NSMixedImage" ref="246283459"/>
 						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="321919370">
-							<reference key="NSTitle" ref="942587293"/>
+						<object class="NSMenu" key="NSSubmenu" id="48278059">
+							<reference key="NSTitle" ref="667842658"/>
 							<object class="NSMutableArray" key="NSMenuItems">
 								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="500771766">
-									<reference key="NSMenu" ref="321919370"/>
+								<object class="NSMenuItem" id="563798000">
+									<reference key="NSMenu" ref="48278059"/>
 									<bool key="NSIsDisabled">YES</bool>
 									<bool key="NSIsSeparator">YES</bool>
-									<reference key="NSTitle" ref="1005878359"/>
-									<reference key="NSKeyEquiv" ref="1005878359"/>
+									<reference key="NSTitle" ref="331740794"/>
+									<reference key="NSKeyEquiv" ref="331740794"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="732862070"/>
-									<reference key="NSMixedImage" ref="154462367"/>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="246283459"/>
 								</object>
-								<object class="NSMenuItem" id="656726997">
-									<reference key="NSMenu" ref="321919370"/>
+								<object class="NSMenuItem" id="1032342329">
+									<reference key="NSMenu" ref="48278059"/>
 									<string type="base64-UTF8" key="NSTitle">Q3VzdG9taXpl4oCmA</string>
-									<reference key="NSKeyEquiv" ref="1005878359"/>
+									<reference key="NSKeyEquiv" ref="331740794"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="732862070"/>
-									<reference key="NSMixedImage" ref="154462367"/>
+									<reference key="NSOnImage" ref="531645050"/>
+									<reference key="NSMixedImage" ref="246283459"/>
 								</object>
 							</object>
 						</object>
 					</object>
 				</object>
-				<reference key="NSName" ref="1005878359"/>
+				<reference key="NSName" ref="331740794"/>
 			</object>
 		</object>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
@@ -1377,1384 +1419,1438 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">cut:</string>
-						<reference key="source" ref="518703249"/>
-						<reference key="destination" ref="590926585"/>
+						<reference key="source" ref="941939442"/>
+						<reference key="destination" ref="581727829"/>
 					</object>
 					<int key="connectionID">175</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">paste:</string>
-						<reference key="source" ref="518703249"/>
-						<reference key="destination" ref="739720090"/>
+						<reference key="source" ref="941939442"/>
+						<reference key="destination" ref="924678073"/>
 					</object>
 					<int key="connectionID">176</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">redo:</string>
-						<reference key="source" ref="518703249"/>
-						<reference key="destination" ref="634656440"/>
+						<reference key="source" ref="941939442"/>
+						<reference key="destination" ref="535038564"/>
 					</object>
 					<int key="connectionID">178</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">selectAll:</string>
-						<reference key="source" ref="518703249"/>
-						<reference key="destination" ref="584461964"/>
+						<reference key="source" ref="941939442"/>
+						<reference key="destination" ref="322866464"/>
 					</object>
 					<int key="connectionID">179</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">undo:</string>
-						<reference key="source" ref="518703249"/>
-						<reference key="destination" ref="159704190"/>
+						<reference key="source" ref="941939442"/>
+						<reference key="destination" ref="1010221707"/>
 					</object>
 					<int key="connectionID">180</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">copy:</string>
-						<reference key="source" ref="518703249"/>
-						<reference key="destination" ref="204575684"/>
+						<reference key="source" ref="941939442"/>
+						<reference key="destination" ref="185296989"/>
 					</object>
 					<int key="connectionID">181</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">delete:</string>
-						<reference key="source" ref="518703249"/>
-						<reference key="destination" ref="549812830"/>
+						<reference key="source" ref="941939442"/>
+						<reference key="destination" ref="994817848"/>
 					</object>
 					<int key="connectionID">195</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">minimize_window:</string>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="915861349"/>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="677652931"/>
 					</object>
 					<int key="connectionID">202</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">close_window:</string>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="442007350"/>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="984461797"/>
 					</object>
 					<int key="connectionID">205</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">zoom_window:</string>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="722764538"/>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="1066447520"/>
 					</object>
 					<int key="connectionID">206</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">bring_to_front:</string>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="853630143"/>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="276216762"/>
 					</object>
 					<int key="connectionID">207</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">window_separator</string>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="332241222"/>
-					</object>
-					<int key="connectionID">260</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">hideOtherApplications:</string>
-						<reference key="source" ref="584863936"/>
-						<reference key="destination" ref="191312176"/>
+						<reference key="source" ref="815810918"/>
+						<reference key="destination" ref="206802571"/>
 					</object>
 					<int key="connectionID">263</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">apps_separator</string>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="940363272"/>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="390088328"/>
 					</object>
 					<int key="connectionID">273</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">apps_table</string>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="411425856"/>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="905092943"/>
 					</object>
 					<int key="connectionID">301</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">apps_table_done:</string>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="1002101696"/>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="724002248"/>
 					</object>
 					<int key="connectionID">302</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">apps_table_delete:</string>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="634701477"/>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="492358940"/>
 					</object>
 					<int key="connectionID">303</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">apps_table_duplicate:</string>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="711288662"/>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="671954382"/>
 					</object>
 					<int key="connectionID">304</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<string key="label" id="178478735">apps_table_show:</string>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="767830074"/>
+						<string key="label" id="75505755">apps_table_show:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="1065386165"/>
 					</object>
 					<int key="connectionID">308</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">apps_table_cancel:</string>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="859414998"/>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="125703429"/>
 					</object>
 					<int key="connectionID">309</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">apps_table_new:</string>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="381268760"/>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="758204686"/>
 					</object>
 					<int key="connectionID">311</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">prefs_show:</string>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="836585695"/>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="386173216"/>
 					</object>
 					<int key="connectionID">318</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">x11_about_item</string>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="588913325"/>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="139290918"/>
 					</object>
 					<int key="connectionID">321</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">enable_auth</string>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="137435489"/>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="989050925"/>
 					</object>
 					<int key="connectionID">387</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">enable_tcp</string>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="663154230"/>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="700826966"/>
 					</object>
 					<int key="connectionID">388</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">depth</string>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="300224954"/>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="709074847"/>
 					</object>
 					<int key="connectionID">389</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">use_sysbeep</string>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="1045559310"/>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="418227126"/>
 					</object>
 					<int key="connectionID">390</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">fake_buttons</string>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="808306730"/>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="119157981"/>
 					</object>
 					<int key="connectionID">391</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">sync_keymap</string>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="793493073"/>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="179949713"/>
 					</object>
 					<int key="connectionID">392</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">enable_keyequivs</string>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="677150201"/>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="842100515"/>
 					</object>
 					<int key="connectionID">393</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<string key="label" id="694471214">prefs_changed:</string>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="808306730"/>
+						<string key="label" id="582333102">prefs_changed:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="119157981"/>
 					</object>
 					<int key="connectionID">394</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<reference key="label" ref="694471214"/>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="793493073"/>
+						<reference key="label" ref="582333102"/>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="179949713"/>
 					</object>
 					<int key="connectionID">395</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<reference key="label" ref="694471214"/>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="677150201"/>
+						<reference key="label" ref="582333102"/>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="842100515"/>
 					</object>
 					<int key="connectionID">396</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<reference key="label" ref="694471214"/>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="1045559310"/>
+						<reference key="label" ref="582333102"/>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="418227126"/>
 					</object>
 					<int key="connectionID">397</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<reference key="label" ref="694471214"/>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="300224954"/>
+						<reference key="label" ref="582333102"/>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="709074847"/>
 					</object>
 					<int key="connectionID">398</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<reference key="label" ref="694471214"/>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="137435489"/>
+						<reference key="label" ref="582333102"/>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="989050925"/>
 					</object>
 					<int key="connectionID">399</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<reference key="label" ref="694471214"/>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="663154230"/>
+						<reference key="label" ref="582333102"/>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="700826966"/>
 					</object>
 					<int key="connectionID">401</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">prefs_panel</string>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="210544761"/>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="124913468"/>
 					</object>
 					<int key="connectionID">402</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">x11_help:</string>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="122992289"/>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="504984881"/>
 					</object>
 					<int key="connectionID">422</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">dockMenu</string>
-						<reference key="source" ref="584863936"/>
-						<reference key="destination" ref="1001514180"/>
+						<reference key="source" ref="815810918"/>
+						<reference key="destination" ref="294137138"/>
 					</object>
 					<int key="connectionID">426</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">dock_menu</string>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="1001514180"/>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="294137138"/>
 					</object>
 					<int key="connectionID">428</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">delegate</string>
-						<reference key="source" ref="584863936"/>
-						<reference key="destination" ref="88064061"/>
+						<reference key="source" ref="815810918"/>
+						<reference key="destination" ref="485884620"/>
 					</object>
 					<int key="connectionID">429</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">hide:</string>
-						<reference key="source" ref="584863936"/>
-						<reference key="destination" ref="147703239"/>
+						<reference key="source" ref="815810918"/>
+						<reference key="destination" ref="301008465"/>
 					</object>
 					<int key="connectionID">430</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">unhideAllApplications:</string>
-						<reference key="source" ref="584863936"/>
-						<reference key="destination" ref="392807560"/>
+						<reference key="source" ref="815810918"/>
+						<reference key="destination" ref="1023546148"/>
 					</object>
 					<int key="connectionID">431</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">terminate:</string>
-						<reference key="source" ref="584863936"/>
-						<reference key="destination" ref="275459236"/>
-					</object>
-					<int key="connectionID">432</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">orderFrontStandardAboutPanel:</string>
-						<reference key="source" ref="584863936"/>
-						<reference key="destination" ref="588913325"/>
+						<reference key="source" ref="815810918"/>
+						<reference key="destination" ref="139290918"/>
 					</object>
 					<int key="connectionID">433</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">dock_apps_menu</string>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="321919370"/>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="48278059"/>
 					</object>
 					<int key="connectionID">530</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">dock_window_separator</string>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="355724345"/>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="318286212"/>
 					</object>
 					<int key="connectionID">531</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<reference key="label" ref="178478735"/>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="656726997"/>
+						<reference key="label" ref="75505755"/>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="1032342329"/>
 					</object>
 					<int key="connectionID">534</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">next_window:</string>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="283496700"/>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="1036389925"/>
 					</object>
 					<int key="connectionID">539</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">previous_window:</string>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="500397106"/>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="369641893"/>
 					</object>
 					<int key="connectionID">540</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">enable_fullscreen</string>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="817420822"/>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="477203622"/>
 					</object>
 					<int key="connectionID">546</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">enable_fullscreen_changed:</string>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="817420822"/>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="477203622"/>
 					</object>
 					<int key="connectionID">547</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">toggle_fullscreen:</string>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="101686423"/>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="6876565"/>
 					</object>
 					<int key="connectionID">548</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">toggle_fullscreen_item</string>
-						<reference key="source" ref="88064061"/>
-						<reference key="destination" ref="101686423"/>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="6876565"/>
 					</object>
 					<int key="connectionID">549</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<reference key="label" ref="582333102"/>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="915448994"/>
+					</object>
+					<int key="connectionID">300300</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">window_separator</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="444952046"/>
+					</object>
+					<int key="connectionID">300331</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">click_through</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="915448994"/>
+					</object>
+					<int key="connectionID">300332</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">quit:</string>
+						<reference key="source" ref="485884620"/>
+						<reference key="destination" ref="274138642"/>
+					</object>
+					<int key="connectionID">300333</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">menu</string>
+						<reference key="source" ref="815810918"/>
+						<reference key="destination" ref="524015605"/>
+					</object>
+					<int key="connectionID">300334</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<object class="IBObjectRecord">
 						<int key="objectID">0</int>
-						<object class="NSArray" key="object" id="0">
+						<object class="NSArray" key="object" id="330408435">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 						</object>
-						<reference key="children" ref="874420287"/>
+						<reference key="children" ref="904585544"/>
 						<nil key="parent"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">-2</int>
-						<reference key="object" ref="584863936"/>
-						<reference key="parent" ref="0"/>
+						<reference key="object" ref="815810918"/>
+						<reference key="parent" ref="330408435"/>
 						<string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">-1</int>
-						<reference key="object" ref="518703249"/>
-						<reference key="parent" ref="0"/>
+						<reference key="object" ref="941939442"/>
+						<reference key="parent" ref="330408435"/>
 						<string key="objectName">First Responder</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">-3</int>
-						<reference key="object" ref="166373373"/>
-						<reference key="parent" ref="0"/>
+						<reference key="object" ref="951368722"/>
+						<reference key="parent" ref="330408435"/>
 						<string key="objectName">Application</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">29</int>
-						<reference key="object" ref="496556081"/>
+						<reference key="object" ref="524015605"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="736341863"/>
-							<reference ref="385138428"/>
-							<reference ref="326076563"/>
-							<reference ref="940914550"/>
-							<reference ref="934950259"/>
+							<reference ref="931553638"/>
+							<reference ref="365880285"/>
+							<reference ref="200491363"/>
+							<reference ref="868031522"/>
+							<reference ref="551174276"/>
 						</object>
-						<reference key="parent" ref="0"/>
-						<reference key="objectName" ref="414137626"/>
+						<reference key="parent" ref="330408435"/>
+						<reference key="objectName" ref="121567387"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">19</int>
-						<reference key="object" ref="736341863"/>
+						<reference key="object" ref="931553638"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="943404979"/>
+							<reference ref="96874957"/>
 						</object>
-						<reference key="parent" ref="496556081"/>
+						<reference key="parent" ref="524015605"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">24</int>
-						<reference key="object" ref="943404979"/>
+						<reference key="object" ref="96874957"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="853630143"/>
-							<reference ref="915861349"/>
-							<reference ref="783034074"/>
-							<reference ref="442007350"/>
-							<reference ref="722764538"/>
-							<reference ref="332241222"/>
-							<reference ref="303213786"/>
-							<reference ref="283496700"/>
-							<reference ref="500397106"/>
+							<reference ref="677652931"/>
+							<reference ref="276216762"/>
+							<reference ref="1066447520"/>
+							<reference ref="1036389925"/>
+							<reference ref="280172320"/>
+							<reference ref="369641893"/>
+							<reference ref="984461797"/>
+							<reference ref="155085383"/>
+							<reference ref="444952046"/>
 						</object>
-						<reference key="parent" ref="736341863"/>
+						<reference key="parent" ref="931553638"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">5</int>
-						<reference key="object" ref="853630143"/>
-						<reference key="parent" ref="943404979"/>
+						<reference key="object" ref="276216762"/>
+						<reference key="parent" ref="96874957"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">23</int>
-						<reference key="object" ref="915861349"/>
-						<reference key="parent" ref="943404979"/>
+						<reference key="object" ref="677652931"/>
+						<reference key="parent" ref="96874957"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">92</int>
-						<reference key="object" ref="783034074"/>
-						<reference key="parent" ref="943404979"/>
+						<reference key="object" ref="280172320"/>
+						<reference key="parent" ref="96874957"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">203</int>
-						<reference key="object" ref="442007350"/>
-						<reference key="parent" ref="943404979"/>
+						<reference key="object" ref="984461797"/>
+						<reference key="parent" ref="96874957"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">204</int>
-						<reference key="object" ref="722764538"/>
-						<reference key="parent" ref="943404979"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">208</int>
-						<reference key="object" ref="332241222"/>
-						<reference key="parent" ref="943404979"/>
+						<reference key="object" ref="1066447520"/>
+						<reference key="parent" ref="96874957"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">536</int>
-						<reference key="object" ref="303213786"/>
-						<reference key="parent" ref="943404979"/>
+						<reference key="object" ref="155085383"/>
+						<reference key="parent" ref="96874957"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">537</int>
-						<reference key="object" ref="283496700"/>
-						<reference key="parent" ref="943404979"/>
+						<reference key="object" ref="1036389925"/>
+						<reference key="parent" ref="96874957"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">538</int>
-						<reference key="object" ref="500397106"/>
-						<reference key="parent" ref="943404979"/>
+						<reference key="object" ref="369641893"/>
+						<reference key="parent" ref="96874957"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">56</int>
-						<reference key="object" ref="385138428"/>
+						<reference key="object" ref="365880285"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="856655711"/>
+							<reference ref="576521955"/>
 						</object>
-						<reference key="parent" ref="496556081"/>
+						<reference key="parent" ref="524015605"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">57</int>
-						<reference key="object" ref="856655711"/>
+						<reference key="object" ref="576521955"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="588913325"/>
-							<reference ref="836585695"/>
-							<reference ref="63158341"/>
-							<reference ref="147703239"/>
-							<reference ref="275459236"/>
-							<reference ref="562920394"/>
-							<reference ref="635454008"/>
-							<reference ref="191312176"/>
-							<reference ref="648021277"/>
-							<reference ref="392807560"/>
-							<reference ref="101686423"/>
-							<reference ref="754231570"/>
+							<reference ref="139290918"/>
+							<reference ref="386173216"/>
+							<reference ref="32285361"/>
+							<reference ref="301008465"/>
+							<reference ref="274138642"/>
+							<reference ref="272876017"/>
+							<reference ref="431301145"/>
+							<reference ref="206802571"/>
+							<reference ref="848095279"/>
+							<reference ref="1023546148"/>
+							<reference ref="6876565"/>
+							<reference ref="479677589"/>
 						</object>
-						<reference key="parent" ref="385138428"/>
+						<reference key="parent" ref="365880285"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">58</int>
-						<reference key="object" ref="588913325"/>
-						<reference key="parent" ref="856655711"/>
+						<reference key="object" ref="139290918"/>
+						<reference key="parent" ref="576521955"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">129</int>
-						<reference key="object" ref="836585695"/>
-						<reference key="parent" ref="856655711"/>
+						<reference key="object" ref="386173216"/>
+						<reference key="parent" ref="576521955"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">131</int>
-						<reference key="object" ref="63158341"/>
+						<reference key="object" ref="32285361"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="502073457"/>
+							<reference ref="821388474"/>
 						</object>
-						<reference key="parent" ref="856655711"/>
+						<reference key="parent" ref="576521955"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">130</int>
-						<reference key="object" ref="502073457"/>
-						<reference key="parent" ref="63158341"/>
+						<reference key="object" ref="821388474"/>
+						<reference key="parent" ref="32285361"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">134</int>
-						<reference key="object" ref="147703239"/>
-						<reference key="parent" ref="856655711"/>
+						<reference key="object" ref="301008465"/>
+						<reference key="parent" ref="576521955"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">136</int>
-						<reference key="object" ref="275459236"/>
-						<reference key="parent" ref="856655711"/>
+						<reference key="object" ref="274138642"/>
+						<reference key="parent" ref="576521955"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">143</int>
-						<reference key="object" ref="562920394"/>
-						<reference key="parent" ref="856655711"/>
+						<reference key="object" ref="272876017"/>
+						<reference key="parent" ref="576521955"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">144</int>
-						<reference key="object" ref="635454008"/>
-						<reference key="parent" ref="856655711"/>
+						<reference key="object" ref="431301145"/>
+						<reference key="parent" ref="576521955"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">145</int>
-						<reference key="object" ref="191312176"/>
-						<reference key="parent" ref="856655711"/>
+						<reference key="object" ref="206802571"/>
+						<reference key="parent" ref="576521955"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">149</int>
-						<reference key="object" ref="648021277"/>
-						<reference key="parent" ref="856655711"/>
+						<reference key="object" ref="848095279"/>
+						<reference key="parent" ref="576521955"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">150</int>
-						<reference key="object" ref="392807560"/>
-						<reference key="parent" ref="856655711"/>
+						<reference key="object" ref="1023546148"/>
+						<reference key="parent" ref="576521955"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">544</int>
-						<reference key="object" ref="101686423"/>
-						<reference key="parent" ref="856655711"/>
+						<reference key="object" ref="6876565"/>
+						<reference key="parent" ref="576521955"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">545</int>
-						<reference key="object" ref="754231570"/>
-						<reference key="parent" ref="856655711"/>
+						<reference key="object" ref="479677589"/>
+						<reference key="parent" ref="576521955"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">163</int>
-						<reference key="object" ref="326076563"/>
+						<reference key="object" ref="200491363"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="932839819"/>
+							<reference ref="526778998"/>
 						</object>
-						<reference key="parent" ref="496556081"/>
+						<reference key="parent" ref="524015605"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">169</int>
-						<reference key="object" ref="932839819"/>
+						<reference key="object" ref="526778998"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="342107529"/>
-							<reference ref="204575684"/>
-							<reference ref="159704190"/>
-							<reference ref="590926585"/>
-							<reference ref="549812830"/>
-							<reference ref="739720090"/>
-							<reference ref="584461964"/>
-							<reference ref="634656440"/>
+							<reference ref="839739619"/>
+							<reference ref="185296989"/>
+							<reference ref="1010221707"/>
+							<reference ref="581727829"/>
+							<reference ref="994817848"/>
+							<reference ref="924678073"/>
+							<reference ref="322866464"/>
+							<reference ref="535038564"/>
 						</object>
-						<reference key="parent" ref="326076563"/>
+						<reference key="parent" ref="200491363"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">156</int>
-						<reference key="object" ref="342107529"/>
-						<reference key="parent" ref="932839819"/>
+						<reference key="object" ref="839739619"/>
+						<reference key="parent" ref="526778998"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">157</int>
-						<reference key="object" ref="204575684"/>
-						<reference key="parent" ref="932839819"/>
+						<reference key="object" ref="185296989"/>
+						<reference key="parent" ref="526778998"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">158</int>
-						<reference key="object" ref="159704190"/>
-						<reference key="parent" ref="932839819"/>
+						<reference key="object" ref="1010221707"/>
+						<reference key="parent" ref="526778998"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">160</int>
-						<reference key="object" ref="590926585"/>
-						<reference key="parent" ref="932839819"/>
+						<reference key="object" ref="581727829"/>
+						<reference key="parent" ref="526778998"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">164</int>
-						<reference key="object" ref="549812830"/>
-						<reference key="parent" ref="932839819"/>
+						<reference key="object" ref="994817848"/>
+						<reference key="parent" ref="526778998"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">171</int>
-						<reference key="object" ref="739720090"/>
-						<reference key="parent" ref="932839819"/>
+						<reference key="object" ref="924678073"/>
+						<reference key="parent" ref="526778998"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">172</int>
-						<reference key="object" ref="584461964"/>
-						<reference key="parent" ref="932839819"/>
+						<reference key="object" ref="322866464"/>
+						<reference key="parent" ref="526778998"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">173</int>
-						<reference key="object" ref="634656440"/>
-						<reference key="parent" ref="932839819"/>
+						<reference key="object" ref="535038564"/>
+						<reference key="parent" ref="526778998"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">269</int>
-						<reference key="object" ref="940914550"/>
+						<reference key="object" ref="868031522"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="684156653"/>
+							<reference ref="981161348"/>
 						</object>
-						<reference key="parent" ref="496556081"/>
+						<reference key="parent" ref="524015605"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">270</int>
-						<reference key="object" ref="684156653"/>
+						<reference key="object" ref="981161348"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="940363272"/>
-							<reference ref="767830074"/>
+							<reference ref="390088328"/>
+							<reference ref="1065386165"/>
 						</object>
-						<reference key="parent" ref="940914550"/>
+						<reference key="parent" ref="868031522"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">272</int>
-						<reference key="object" ref="940363272"/>
-						<reference key="parent" ref="684156653"/>
+						<reference key="object" ref="390088328"/>
+						<reference key="parent" ref="981161348"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">305</int>
-						<reference key="object" ref="767830074"/>
-						<reference key="parent" ref="684156653"/>
+						<reference key="object" ref="1065386165"/>
+						<reference key="parent" ref="981161348"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">419</int>
-						<reference key="object" ref="934950259"/>
+						<reference key="object" ref="551174276"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1052262524"/>
+							<reference ref="511848303"/>
 						</object>
-						<reference key="parent" ref="496556081"/>
+						<reference key="parent" ref="524015605"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">420</int>
-						<reference key="object" ref="1052262524"/>
+						<reference key="object" ref="511848303"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="122992289"/>
+							<reference ref="504984881"/>
 						</object>
-						<reference key="parent" ref="934950259"/>
+						<reference key="parent" ref="551174276"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">421</int>
-						<reference key="object" ref="122992289"/>
-						<reference key="parent" ref="1052262524"/>
+						<reference key="object" ref="504984881"/>
+						<reference key="parent" ref="511848303"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">196</int>
-						<reference key="object" ref="88064061"/>
-						<reference key="parent" ref="0"/>
-						<reference key="objectName" ref="517073442"/>
+						<reference key="object" ref="485884620"/>
+						<reference key="parent" ref="330408435"/>
+						<reference key="objectName" ref="865849805"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">244</int>
-						<reference key="object" ref="210544761"/>
+						<reference key="object" ref="124913468"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="404125972"/>
+							<reference ref="941366957"/>
 						</object>
-						<reference key="parent" ref="0"/>
+						<reference key="parent" ref="330408435"/>
 						<string key="objectName">PrefsPanel</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">245</int>
-						<reference key="object" ref="404125972"/>
+						<reference key="object" ref="941366957"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="75927203"/>
+							<reference ref="448510093"/>
 						</object>
-						<reference key="parent" ref="210544761"/>
+						<reference key="parent" ref="124913468"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">348</int>
-						<reference key="object" ref="75927203"/>
+						<reference key="object" ref="448510093"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="17244958"/>
-							<reference ref="493727923"/>
-							<reference ref="1036577743"/>
+							<reference ref="287591690"/>
+							<reference ref="960678392"/>
+							<reference ref="348328898"/>
 						</object>
-						<reference key="parent" ref="404125972"/>
+						<reference key="parent" ref="941366957"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">349</int>
-						<reference key="object" ref="17244958"/>
+						<reference key="object" ref="287591690"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="600332710"/>
+							<reference ref="596750588"/>
 						</object>
-						<reference key="parent" ref="75927203"/>
+						<reference key="parent" ref="448510093"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">351</int>
-						<reference key="object" ref="600332710"/>
+						<reference key="object" ref="596750588"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="808306730"/>
-							<reference ref="618388983"/>
-							<reference ref="754792079"/>
-							<reference ref="677150201"/>
-							<reference ref="228801813"/>
-							<reference ref="793493073"/>
+							<reference ref="119157981"/>
+							<reference ref="443008216"/>
+							<reference ref="282885445"/>
+							<reference ref="842100515"/>
+							<reference ref="31160162"/>
+							<reference ref="179949713"/>
+							<reference ref="915448994"/>
+							<reference ref="707276799"/>
 						</object>
-						<reference key="parent" ref="17244958"/>
+						<reference key="parent" ref="287591690"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">363</int>
-						<reference key="object" ref="808306730"/>
+						<reference key="object" ref="119157981"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="727617204"/>
+							<reference ref="990762273"/>
 						</object>
-						<reference key="parent" ref="600332710"/>
+						<reference key="parent" ref="596750588"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">364</int>
-						<reference key="object" ref="618388983"/>
+						<reference key="object" ref="443008216"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="140236247"/>
+							<reference ref="391919450"/>
 						</object>
-						<reference key="parent" ref="600332710"/>
+						<reference key="parent" ref="596750588"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">365</int>
-						<reference key="object" ref="754792079"/>
+						<reference key="object" ref="282885445"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="110537159"/>
+							<reference ref="649334366"/>
 						</object>
-						<reference key="parent" ref="600332710"/>
+						<reference key="parent" ref="596750588"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">368</int>
-						<reference key="object" ref="677150201"/>
+						<reference key="object" ref="842100515"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="46680941"/>
+							<reference ref="940564599"/>
 						</object>
-						<reference key="parent" ref="600332710"/>
+						<reference key="parent" ref="596750588"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">369</int>
-						<reference key="object" ref="228801813"/>
+						<reference key="object" ref="31160162"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="415694484"/>
+							<reference ref="666057093"/>
 						</object>
-						<reference key="parent" ref="600332710"/>
+						<reference key="parent" ref="596750588"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">370</int>
-						<reference key="object" ref="793493073"/>
+						<reference key="object" ref="179949713"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="466260504"/>
+							<reference ref="967619578"/>
 						</object>
-						<reference key="parent" ref="600332710"/>
+						<reference key="parent" ref="596750588"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">352</int>
-						<reference key="object" ref="493727923"/>
+						<reference key="object" ref="960678392"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="527709877"/>
+							<reference ref="515308735"/>
 						</object>
-						<reference key="parent" ref="75927203"/>
+						<reference key="parent" ref="448510093"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">350</int>
-						<reference key="object" ref="527709877"/>
+						<reference key="object" ref="515308735"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1045559310"/>
-							<reference ref="67626595"/>
-							<reference ref="300224954"/>
-							<reference ref="717889178"/>
-							<reference ref="114173823"/>
-							<reference ref="817420822"/>
-							<reference ref="959270736"/>
+							<reference ref="418227126"/>
+							<reference ref="1039016593"/>
+							<reference ref="709074847"/>
+							<reference ref="201731424"/>
+							<reference ref="86150604"/>
+							<reference ref="477203622"/>
+							<reference ref="298603383"/>
 						</object>
-						<reference key="parent" ref="493727923"/>
+						<reference key="parent" ref="960678392"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">371</int>
-						<reference key="object" ref="1045559310"/>
+						<reference key="object" ref="418227126"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="225158677"/>
+							<reference ref="1016069354"/>
 						</object>
-						<reference key="parent" ref="527709877"/>
+						<reference key="parent" ref="515308735"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">372</int>
-						<reference key="object" ref="67626595"/>
+						<reference key="object" ref="1039016593"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1072420481"/>
+							<reference ref="624655599"/>
 						</object>
-						<reference key="parent" ref="527709877"/>
+						<reference key="parent" ref="515308735"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">382</int>
-						<reference key="object" ref="300224954"/>
+						<reference key="object" ref="709074847"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="301142744"/>
+							<reference ref="633115429"/>
 						</object>
-						<reference key="parent" ref="527709877"/>
+						<reference key="parent" ref="515308735"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">385</int>
-						<reference key="object" ref="717889178"/>
+						<reference key="object" ref="201731424"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="749756205"/>
+							<reference ref="930265681"/>
 						</object>
-						<reference key="parent" ref="527709877"/>
+						<reference key="parent" ref="515308735"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">386</int>
-						<reference key="object" ref="114173823"/>
+						<reference key="object" ref="86150604"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="725554783"/>
+							<reference ref="311969422"/>
 						</object>
-						<reference key="parent" ref="527709877"/>
+						<reference key="parent" ref="515308735"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">541</int>
-						<reference key="object" ref="817420822"/>
+						<reference key="object" ref="477203622"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="100363081"/>
+							<reference ref="631531164"/>
 						</object>
-						<reference key="parent" ref="527709877"/>
+						<reference key="parent" ref="515308735"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">543</int>
-						<reference key="object" ref="959270736"/>
+						<reference key="object" ref="298603383"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="550432669"/>
+							<reference ref="761107402"/>
 						</object>
-						<reference key="parent" ref="527709877"/>
+						<reference key="parent" ref="515308735"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">353</int>
-						<reference key="object" ref="1036577743"/>
+						<reference key="object" ref="348328898"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="536248195"/>
+							<reference ref="300811574"/>
 						</object>
-						<reference key="parent" ref="75927203"/>
+						<reference key="parent" ref="448510093"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">354</int>
-						<reference key="object" ref="536248195"/>
+						<reference key="object" ref="300811574"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="137435489"/>
-							<reference ref="663154230"/>
-							<reference ref="417801719"/>
-							<reference ref="115954190"/>
-							<reference ref="1067279202"/>
+							<reference ref="989050925"/>
+							<reference ref="700826966"/>
+							<reference ref="168436707"/>
+							<reference ref="363817195"/>
+							<reference ref="223835729"/>
 						</object>
-						<reference key="parent" ref="1036577743"/>
+						<reference key="parent" ref="348328898"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">374</int>
-						<reference key="object" ref="137435489"/>
+						<reference key="object" ref="989050925"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="891925158"/>
+							<reference ref="189594322"/>
 						</object>
-						<reference key="parent" ref="536248195"/>
+						<reference key="parent" ref="300811574"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">375</int>
-						<reference key="object" ref="663154230"/>
+						<reference key="object" ref="700826966"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="836703945"/>
+							<reference ref="489340979"/>
 						</object>
-						<reference key="parent" ref="536248195"/>
+						<reference key="parent" ref="300811574"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">376</int>
-						<reference key="object" ref="417801719"/>
+						<reference key="object" ref="168436707"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="935570098"/>
+							<reference ref="53243865"/>
 						</object>
-						<reference key="parent" ref="536248195"/>
+						<reference key="parent" ref="300811574"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">377</int>
-						<reference key="object" ref="115954190"/>
+						<reference key="object" ref="363817195"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="144257898"/>
+							<reference ref="390084685"/>
 						</object>
-						<reference key="parent" ref="536248195"/>
+						<reference key="parent" ref="300811574"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">379</int>
-						<reference key="object" ref="1067279202"/>
+						<reference key="object" ref="223835729"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="703874672"/>
+							<reference ref="283628678"/>
 						</object>
-						<reference key="parent" ref="536248195"/>
+						<reference key="parent" ref="300811574"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">285</int>
-						<reference key="object" ref="796776534"/>
+						<reference key="object" ref="604417141"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1039094689"/>
+							<reference ref="85544634"/>
 						</object>
-						<reference key="parent" ref="0"/>
+						<reference key="parent" ref="330408435"/>
 						<string key="objectName">EditPrograms</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">286</int>
-						<reference key="object" ref="1039094689"/>
+						<reference key="object" ref="85544634"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1002101696"/>
-							<reference ref="711288662"/>
-							<reference ref="634701477"/>
-							<reference ref="1011512617"/>
-							<reference ref="859414998"/>
-							<reference ref="381268760"/>
+							<reference ref="1063387772"/>
+							<reference ref="758204686"/>
+							<reference ref="671954382"/>
+							<reference ref="492358940"/>
+							<reference ref="125703429"/>
+							<reference ref="724002248"/>
 						</object>
-						<reference key="parent" ref="796776534"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">291</int>
-						<reference key="object" ref="1002101696"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="558394524"/>
-						</object>
-						<reference key="parent" ref="1039094689"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">292</int>
-						<reference key="object" ref="711288662"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="413164923"/>
-						</object>
-						<reference key="parent" ref="1039094689"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">293</int>
-						<reference key="object" ref="634701477"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="26248495"/>
-						</object>
-						<reference key="parent" ref="1039094689"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">295</int>
-						<reference key="object" ref="1011512617"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="411425856"/>
-							<reference ref="152467947"/>
-							<reference ref="208024104"/>
-							<reference ref="526973850"/>
-						</object>
-						<reference key="parent" ref="1039094689"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">296</int>
-						<reference key="object" ref="411425856"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="621551865"/>
-							<reference ref="976084317"/>
-							<reference ref="661701503"/>
-						</object>
-						<reference key="parent" ref="1011512617"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">297</int>
-						<reference key="object" ref="621551865"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="195831317"/>
-						</object>
-						<reference key="parent" ref="411425856"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">574</int>
-						<reference key="object" ref="195831317"/>
-						<reference key="parent" ref="621551865"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">298</int>
-						<reference key="object" ref="976084317"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="656574062"/>
-						</object>
-						<reference key="parent" ref="411425856"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">573</int>
-						<reference key="object" ref="656574062"/>
-						<reference key="parent" ref="976084317"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">535</int>
-						<reference key="object" ref="661701503"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="90031137"/>
-						</object>
-						<reference key="parent" ref="411425856"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">575</int>
-						<reference key="object" ref="90031137"/>
-						<reference key="parent" ref="661701503"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">299</int>
-						<reference key="object" ref="859414998"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="537937846"/>
-						</object>
-						<reference key="parent" ref="1039094689"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">310</int>
-						<reference key="object" ref="381268760"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="99903682"/>
-						</object>
-						<reference key="parent" ref="1039094689"/>
+						<reference key="parent" ref="604417141"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">423</int>
-						<reference key="object" ref="1001514180"/>
+						<reference key="object" ref="294137138"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="355724345"/>
-							<reference ref="107275095"/>
+							<reference ref="318286212"/>
+							<reference ref="511651072"/>
 						</object>
-						<reference key="parent" ref="0"/>
+						<reference key="parent" ref="330408435"/>
 						<string key="objectName">DockMenu</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">524</int>
-						<reference key="object" ref="355724345"/>
-						<reference key="parent" ref="1001514180"/>
+						<reference key="object" ref="318286212"/>
+						<reference key="parent" ref="294137138"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">526</int>
-						<reference key="object" ref="107275095"/>
+						<reference key="object" ref="511651072"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="321919370"/>
+							<reference ref="48278059"/>
 						</object>
-						<reference key="parent" ref="1001514180"/>
+						<reference key="parent" ref="294137138"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">527</int>
-						<reference key="object" ref="321919370"/>
+						<reference key="object" ref="48278059"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="656726997"/>
-							<reference ref="500771766"/>
+							<reference ref="1032342329"/>
+							<reference ref="563798000"/>
 						</object>
-						<reference key="parent" ref="107275095"/>
+						<reference key="parent" ref="511651072"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">532</int>
-						<reference key="object" ref="656726997"/>
-						<reference key="parent" ref="321919370"/>
+						<reference key="object" ref="1032342329"/>
+						<reference key="parent" ref="48278059"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">533</int>
-						<reference key="object" ref="500771766"/>
-						<reference key="parent" ref="321919370"/>
+						<reference key="object" ref="563798000"/>
+						<reference key="parent" ref="48278059"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100363</int>
-						<reference key="object" ref="727617204"/>
-						<reference key="parent" ref="808306730"/>
+						<reference key="object" ref="990762273"/>
+						<reference key="parent" ref="119157981"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100364</int>
-						<reference key="object" ref="140236247"/>
-						<reference key="parent" ref="618388983"/>
+						<reference key="object" ref="391919450"/>
+						<reference key="parent" ref="443008216"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100365</int>
-						<reference key="object" ref="110537159"/>
-						<reference key="parent" ref="754792079"/>
+						<reference key="object" ref="649334366"/>
+						<reference key="parent" ref="282885445"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100368</int>
-						<reference key="object" ref="46680941"/>
-						<reference key="parent" ref="677150201"/>
+						<reference key="object" ref="940564599"/>
+						<reference key="parent" ref="842100515"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100369</int>
-						<reference key="object" ref="415694484"/>
-						<reference key="parent" ref="228801813"/>
+						<reference key="object" ref="666057093"/>
+						<reference key="parent" ref="31160162"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100370</int>
-						<reference key="object" ref="466260504"/>
-						<reference key="parent" ref="793493073"/>
+						<reference key="object" ref="967619578"/>
+						<reference key="parent" ref="179949713"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100371</int>
-						<reference key="object" ref="225158677"/>
-						<reference key="parent" ref="1045559310"/>
+						<reference key="object" ref="1016069354"/>
+						<reference key="parent" ref="418227126"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100372</int>
-						<reference key="object" ref="1072420481"/>
-						<reference key="parent" ref="67626595"/>
+						<reference key="object" ref="624655599"/>
+						<reference key="parent" ref="1039016593"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100382</int>
-						<reference key="object" ref="301142744"/>
+						<reference key="object" ref="633115429"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1071781177"/>
+							<reference ref="341113515"/>
 						</object>
-						<reference key="parent" ref="300224954"/>
+						<reference key="parent" ref="709074847"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100385</int>
-						<reference key="object" ref="749756205"/>
-						<reference key="parent" ref="717889178"/>
+						<reference key="object" ref="930265681"/>
+						<reference key="parent" ref="201731424"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100386</int>
-						<reference key="object" ref="725554783"/>
-						<reference key="parent" ref="114173823"/>
+						<reference key="object" ref="311969422"/>
+						<reference key="parent" ref="86150604"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100541</int>
-						<reference key="object" ref="100363081"/>
-						<reference key="parent" ref="817420822"/>
+						<reference key="object" ref="631531164"/>
+						<reference key="parent" ref="477203622"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100543</int>
-						<reference key="object" ref="550432669"/>
-						<reference key="parent" ref="959270736"/>
+						<reference key="object" ref="761107402"/>
+						<reference key="parent" ref="298603383"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100374</int>
-						<reference key="object" ref="891925158"/>
-						<reference key="parent" ref="137435489"/>
+						<reference key="object" ref="189594322"/>
+						<reference key="parent" ref="989050925"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100375</int>
-						<reference key="object" ref="836703945"/>
-						<reference key="parent" ref="663154230"/>
+						<reference key="object" ref="489340979"/>
+						<reference key="parent" ref="700826966"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100376</int>
-						<reference key="object" ref="935570098"/>
-						<reference key="parent" ref="417801719"/>
+						<reference key="object" ref="53243865"/>
+						<reference key="parent" ref="168436707"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100377</int>
-						<reference key="object" ref="144257898"/>
-						<reference key="parent" ref="115954190"/>
+						<reference key="object" ref="390084685"/>
+						<reference key="parent" ref="363817195"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100379</int>
-						<reference key="object" ref="703874672"/>
-						<reference key="parent" ref="1067279202"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">100291</int>
-						<reference key="object" ref="558394524"/>
-						<reference key="parent" ref="1002101696"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">100292</int>
-						<reference key="object" ref="413164923"/>
-						<reference key="parent" ref="711288662"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">100293</int>
-						<reference key="object" ref="26248495"/>
-						<reference key="parent" ref="634701477"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">100299</int>
-						<reference key="object" ref="537937846"/>
-						<reference key="parent" ref="859414998"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">100310</int>
-						<reference key="object" ref="99903682"/>
-						<reference key="parent" ref="381268760"/>
+						<reference key="object" ref="283628678"/>
+						<reference key="parent" ref="223835729"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">380</int>
-						<reference key="object" ref="1071781177"/>
+						<reference key="object" ref="341113515"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="827519886"/>
-							<reference ref="473657062"/>
-							<reference ref="247508345"/>
-							<reference ref="611307925"/>
+							<reference ref="759499526"/>
+							<reference ref="616492372"/>
+							<reference ref="543935434"/>
+							<reference ref="836673018"/>
 						</object>
-						<reference key="parent" ref="301142744"/>
+						<reference key="parent" ref="633115429"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">435</int>
-						<reference key="object" ref="827519886"/>
-						<reference key="parent" ref="1071781177"/>
+						<reference key="object" ref="759499526"/>
+						<reference key="parent" ref="341113515"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">384</int>
-						<reference key="object" ref="473657062"/>
-						<reference key="parent" ref="1071781177"/>
+						<reference key="object" ref="616492372"/>
+						<reference key="parent" ref="341113515"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">383</int>
-						<reference key="object" ref="247508345"/>
-						<reference key="parent" ref="1071781177"/>
+						<reference key="object" ref="543935434"/>
+						<reference key="parent" ref="341113515"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">381</int>
-						<reference key="object" ref="611307925"/>
-						<reference key="parent" ref="1071781177"/>
+						<reference key="object" ref="836673018"/>
+						<reference key="parent" ref="341113515"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">100295</int>
-						<reference key="object" ref="152467947"/>
-						<reference key="parent" ref="1011512617"/>
+						<int key="objectID">300296</int>
+						<reference key="object" ref="915448994"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="117056849"/>
+						</object>
+						<reference key="parent" ref="596750588"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">200295</int>
-						<reference key="object" ref="208024104"/>
-						<reference key="parent" ref="1011512617"/>
+						<int key="objectID">300297</int>
+						<reference key="object" ref="117056849"/>
+						<reference key="parent" ref="915448994"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300298</int>
+						<reference key="object" ref="707276799"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="318286890"/>
+						</object>
+						<reference key="parent" ref="596750588"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300299</int>
+						<reference key="object" ref="318286890"/>
+						<reference key="parent" ref="707276799"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">295</int>
+						<reference key="object" ref="1063387772"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="792419186"/>
+							<reference ref="17278747"/>
+							<reference ref="842897584"/>
+							<reference ref="905092943"/>
+						</object>
+						<reference key="parent" ref="85544634"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">300295</int>
-						<reference key="object" ref="526973850"/>
-						<reference key="parent" ref="1011512617"/>
+						<reference key="object" ref="792419186"/>
+						<reference key="parent" ref="1063387772"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">200295</int>
+						<reference key="object" ref="17278747"/>
+						<reference key="parent" ref="1063387772"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100295</int>
+						<reference key="object" ref="842897584"/>
+						<reference key="parent" ref="1063387772"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">296</int>
+						<reference key="object" ref="905092943"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="242608782"/>
+							<reference ref="938444323"/>
+							<reference ref="84282687"/>
+						</object>
+						<reference key="parent" ref="1063387772"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">535</int>
+						<reference key="object" ref="242608782"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="34714764"/>
+						</object>
+						<reference key="parent" ref="905092943"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">575</int>
+						<reference key="object" ref="34714764"/>
+						<reference key="parent" ref="242608782"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">298</int>
+						<reference key="object" ref="938444323"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="825378892"/>
+						</object>
+						<reference key="parent" ref="905092943"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">573</int>
+						<reference key="object" ref="825378892"/>
+						<reference key="parent" ref="938444323"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">297</int>
+						<reference key="object" ref="84282687"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="432610585"/>
+						</object>
+						<reference key="parent" ref="905092943"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">574</int>
+						<reference key="object" ref="432610585"/>
+						<reference key="parent" ref="84282687"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">310</int>
+						<reference key="object" ref="758204686"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="1025474039"/>
+						</object>
+						<reference key="parent" ref="85544634"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100310</int>
+						<reference key="object" ref="1025474039"/>
+						<reference key="parent" ref="758204686"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">292</int>
+						<reference key="object" ref="671954382"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="143554520"/>
+						</object>
+						<reference key="parent" ref="85544634"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100292</int>
+						<reference key="object" ref="143554520"/>
+						<reference key="parent" ref="671954382"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">293</int>
+						<reference key="object" ref="492358940"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="8201128"/>
+						</object>
+						<reference key="parent" ref="85544634"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100293</int>
+						<reference key="object" ref="8201128"/>
+						<reference key="parent" ref="492358940"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">299</int>
+						<reference key="object" ref="125703429"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="892296813"/>
+						</object>
+						<reference key="parent" ref="85544634"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100299</int>
+						<reference key="object" ref="892296813"/>
+						<reference key="parent" ref="125703429"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">291</int>
+						<reference key="object" ref="724002248"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="809610613"/>
+						</object>
+						<reference key="parent" ref="85544634"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100291</int>
+						<reference key="object" ref="809610613"/>
+						<reference key="parent" ref="724002248"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">300330</int>
+						<reference key="object" ref="444952046"/>
+						<reference key="parent" ref="96874957"/>
 					</object>
 				</object>
 			</object>
@@ -2801,6 +2897,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 					<string>164.ImportedFromIB2</string>
 					<string>169.IBPluginDependency</string>
 					<string>169.ImportedFromIB2</string>
+					<string>169.editorWindowContentRectSynchronizationRect</string>
 					<string>171.IBPluginDependency</string>
 					<string>171.ImportedFromIB2</string>
 					<string>172.IBPluginDependency</string>
@@ -2816,14 +2913,15 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 					<string>203.ImportedFromIB2</string>
 					<string>204.IBPluginDependency</string>
 					<string>204.ImportedFromIB2</string>
-					<string>208.IBPluginDependency</string>
-					<string>208.ImportedFromIB2</string>
 					<string>23.IBPluginDependency</string>
 					<string>23.ImportedFromIB2</string>
 					<string>24.IBPluginDependency</string>
 					<string>24.ImportedFromIB2</string>
+					<string>24.editorWindowContentRectSynchronizationRect</string>
 					<string>244.IBPluginDependency</string>
+					<string>244.IBWindowTemplateEditedContentRect</string>
 					<string>244.ImportedFromIB2</string>
+					<string>244.editorWindowContentRectSynchronizationRect</string>
 					<string>244.windowTemplate.hasMaxSize</string>
 					<string>244.windowTemplate.hasMinSize</string>
 					<string>244.windowTemplate.maxSize</string>
@@ -2834,10 +2932,15 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 					<string>269.ImportedFromIB2</string>
 					<string>270.IBPluginDependency</string>
 					<string>270.ImportedFromIB2</string>
+					<string>270.editorWindowContentRectSynchronizationRect</string>
 					<string>272.IBPluginDependency</string>
 					<string>272.ImportedFromIB2</string>
 					<string>285.IBPluginDependency</string>
+					<string>285.IBViewEditorWindowController.showingBoundsRectangles</string>
+					<string>285.IBViewEditorWindowController.showingLayoutRectangles</string>
+					<string>285.IBWindowTemplateEditedContentRect</string>
 					<string>285.ImportedFromIB2</string>
+					<string>285.editorWindowContentRectSynchronizationRect</string>
 					<string>285.windowTemplate.hasMaxSize</string>
 					<string>285.windowTemplate.hasMinSize</string>
 					<string>285.windowTemplate.maxSize</string>
@@ -2846,6 +2949,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 					<string>286.ImportedFromIB2</string>
 					<string>29.IBPluginDependency</string>
 					<string>29.ImportedFromIB2</string>
+					<string>29.editorWindowContentRectSynchronizationRect</string>
 					<string>291.IBPluginDependency</string>
 					<string>291.ImportedFromIB2</string>
 					<string>292.IBPluginDependency</string>
@@ -2863,6 +2967,12 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 					<string>299.IBPluginDependency</string>
 					<string>299.ImportedFromIB2</string>
 					<string>300295.IBShouldRemoveOnLegacySave</string>
+					<string>300296.IBPluginDependency</string>
+					<string>300296.ImportedFromIB2</string>
+					<string>300298.IBPluginDependency</string>
+					<string>300298.ImportedFromIB2</string>
+					<string>300330.IBPluginDependency</string>
+					<string>300330.ImportedFromIB2</string>
 					<string>305.IBPluginDependency</string>
 					<string>305.ImportedFromIB2</string>
 					<string>310.IBPluginDependency</string>
@@ -2963,6 +3073,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 					<string>56.ImportedFromIB2</string>
 					<string>57.IBPluginDependency</string>
 					<string>57.ImportedFromIB2</string>
+					<string>57.editorWindowContentRectSynchronizationRect</string>
 					<string>573.IBPluginDependency</string>
 					<string>573.ImportedFromIB2</string>
 					<string>574.IBPluginDependency</string>
@@ -2976,217 +3087,232 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 				</object>
 				<object class="NSMutableArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
-					<reference ref="874199827"/>
-					<reference ref="874199827"/>
-					<reference ref="874199827"/>
-					<integer value="1" id="5"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="5"/>
-					<reference ref="5"/>
-					<string>{3.40282e+38, 3.40282e+38}</string>
-					<string>{213, 107}</string>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="5"/>
-					<reference ref="5"/>
-					<string>{3.40282e+38, 3.40282e+38}</string>
-					<string>{213, 107}</string>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
-					<reference ref="874199827"/>
-					<reference ref="5"/>
+					<reference ref="1013584587"/>
+					<reference ref="1013584587"/>
+					<reference ref="1013584587"/>
+					<integer value="1" id="9"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<string>{{202, 626}, {154, 153}}</string>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<string>{{271, 666}, {301, 153}}</string>
+					<reference ref="1013584587"/>
+					<string>{{184, 290}, {481, 345}}</string>
+					<reference ref="9"/>
+					<string>{{184, 290}, {481, 345}}</string>
+					<reference ref="9"/>
+					<reference ref="9"/>
+					<string id="169660368">{3.40282e+38, 3.40282e+38}</string>
+					<string id="432763037">{213, 107}</string>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<string>{{100, 746}, {155, 33}}</string>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="9"/>
+					<string id="678991548">{{433, 406}, {486, 327}}</string>
+					<reference ref="9"/>
+					<reference ref="678991548"/>
+					<reference ref="9"/>
+					<reference ref="9"/>
+					<reference ref="169660368"/>
+					<reference ref="432763037"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<string>{{67, 819}, {336, 20}}</string>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<string>{{79, 616}, {218, 203}}</string>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
+					<reference ref="1013584587"/>
+					<reference ref="9"/>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -3209,13 +3335,13 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">300295</int>
+			<int key="maxID">300334</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
 				<bool key="EncodedWithXMLCoder">YES</bool>
 				<object class="IBPartialClassDescription">
-					<string key="className">NSFormatter</string>
+					<reference key="className" ref="671773319"/>
 					<nil key="superclassName"/>
 					<object class="NSMutableDictionary" key="actions">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -3236,196 +3362,8 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey" id="3826605">IBUserSource</string>
-						<string key="minorKey" id="25614681"/>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">FirstResponder</string>
-					<nil key="superclassName"/>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSMutableArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>alignCenter:</string>
-							<string>alignJustified:</string>
-							<string>alignLeft:</string>
-							<string>alignRight:</string>
-							<string>arrangeInFront:</string>
-							<string>centerSelectionInVisibleArea:</string>
-							<string>changeFont:</string>
-							<string>checkSpelling:</string>
-							<string>clear:</string>
-							<string>clearRecentDocuments:</string>
-							<string>complete:</string>
-							<string>copy:</string>
-							<string>copyFont:</string>
-							<string>copyRuler:</string>
-							<string>cut:</string>
-							<string>delete:</string>
-							<string>deminiaturize:</string>
-							<string>fax:</string>
-							<string>hide:</string>
-							<string>hideOtherApplications:</string>
-							<string>loosenKerning:</string>
-							<string>lowerBaseline:</string>
-							<string>makeKeyAndOrderFront:</string>
-							<string>miniaturize:</string>
-							<string>newDocument:</string>
-							<string>openDocument:</string>
-							<string>orderBack:</string>
-							<string>orderFront:</string>
-							<string>orderFrontColorPanel:</string>
-							<string>orderFrontHelpPanel:</string>
-							<string>orderOut:</string>
-							<string>outline:</string>
-							<string>paste:</string>
-							<string>pasteAsPlainText:</string>
-							<string>pasteAsRichText:</string>
-							<string>pasteFont:</string>
-							<string>pasteRuler:</string>
-							<string>pause:</string>
-							<string>performClose:</string>
-							<string>performFindPanelAction:</string>
-							<string>performMiniaturize:</string>
-							<string>performZoom:</string>
-							<string>play:</string>
-							<string>print:</string>
-							<string>printDocument:</string>
-							<string>raiseBaseline:</string>
-							<string>record:</string>
-							<string>redo:</string>
-							<string>resume:</string>
-							<string>revertDocumentToSaved:</string>
-							<string>run:</string>
-							<string>runPageLayout:</string>
-							<string>runToolbarCustomizationPalette:</string>
-							<string>saveAllDocuments:</string>
-							<string>saveDocument:</string>
-							<string>saveDocumentAs:</string>
-							<string>saveDocumentTo:</string>
-							<string>selectAll:</string>
-							<string>selectText:</string>
-							<string>showGuessPanel:</string>
-							<string>showHelp:</string>
-							<string>start:</string>
-							<string>startSpeaking:</string>
-							<string>stop:</string>
-							<string>stopSpeaking:</string>
-							<string>subscript:</string>
-							<string>superscript:</string>
-							<string>terminate:</string>
-							<string>tightenKerning:</string>
-							<string>toggleContinuousSpellChecking:</string>
-							<string>toggleRuler:</string>
-							<string>toggleToolbarShown:</string>
-							<string>turnOffKerning:</string>
-							<string>turnOffLigatures:</string>
-							<string>underline:</string>
-							<string>undo:</string>
-							<string>unhideAllApplications:</string>
-							<string>unscript:</string>
-							<string>useAllLigatures:</string>
-							<string>useStandardKerning:</string>
-							<string>useStandardLigatures:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string id="663201829">id</string>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<reference key="majorKey" ref="3826605"/>
-						<reference key="minorKey" ref="25614681"/>
+						<string key="majorKey" id="360524387">IBUserSource</string>
+						<reference key="minorKey" ref="331740794"/>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -3449,29 +3387,31 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 							<string>prefs_changed:</string>
 							<string>prefs_show:</string>
 							<string>previous_window:</string>
+							<string>quit:</string>
 							<string>toggle_fullscreen:</string>
 							<string>x11_help:</string>
 							<string>zoom_window:</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
+							<string id="678582588">id</string>
+							<reference ref="678582588"/>
+							<reference ref="678582588"/>
+							<reference ref="678582588"/>
+							<reference ref="678582588"/>
+							<reference ref="678582588"/>
+							<reference ref="678582588"/>
+							<reference ref="678582588"/>
+							<reference ref="678582588"/>
+							<reference ref="678582588"/>
+							<reference ref="678582588"/>
+							<reference ref="678582588"/>
+							<reference ref="678582588"/>
+							<reference ref="678582588"/>
+							<reference ref="678582588"/>
+							<reference ref="678582588"/>
+							<reference ref="678582588"/>
+							<reference ref="678582588"/>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">
@@ -3480,6 +3420,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>apps_separator</string>
 							<string>apps_table</string>
+							<string>click_through</string>
 							<string>depth</string>
 							<string>dock_apps_menu</string>
 							<string>dock_menu</string>
@@ -3498,28 +3439,55 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
-							<reference ref="663201829"/>
+							<string id="133216019">NSMenuItem</string>
+							<string>NSTableView</string>
+							<string id="623744785">NSButton</string>
+							<string>NSPopUpButton</string>
+							<string id="455827649">NSMenu</string>
+							<reference ref="455827649"/>
+							<reference ref="133216019"/>
+							<reference ref="623744785"/>
+							<reference ref="623744785"/>
+							<reference ref="623744785"/>
+							<reference ref="623744785"/>
+							<reference ref="623744785"/>
+							<string>NSPanel</string>
+							<reference ref="623744785"/>
+							<reference ref="133216019"/>
+							<reference ref="623744785"/>
+							<reference ref="133216019"/>
+							<reference ref="133216019"/>
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<reference key="majorKey" ref="3826605"/>
-						<reference key="minorKey" ref="25614681"/>
+						<string key="majorKey">IBUserSource</string>
+						<string key="minorKey"/>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSFormatter</string>
+					<nil key="superclassName"/>
+					<object class="NSMutableDictionary" key="actions">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="outlets">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<reference key="majorKey" ref="360524387"/>
+						<reference key="minorKey" ref="331740794"/>
 					</object>
 				</object>
 			</object>
@@ -3529,570 +3497,595 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<object class="NSMutableData" key="IBDocument.RunnableNib">
 			<bytes key="NS.bytes">YnBsaXN0MDDUAAEAAgADAAQABQAGAAkAClgkdmVyc2lvblQkdG9wWSRhcmNoaXZlclgkb2JqZWN0cxIA
-AYag0QAHAAhdSUIub2JqZWN0ZGF0YYABXxAPTlNLZXllZEFyY2hpdmVyrxEDKQALAAwAMQA1ADkAQABD
-AEQASABMAIYAjACcAKEAogCjAKgAqQCqAK0AsQCyALUAtgC6AMAAzgDUANUA7wDwAPgA+QD8AQABAQEE
-AQgBDgERARIBEwEXAR4BHwEgASEBJgEnASoBLwE0ATUBOgFFAVABUQFSAVYBWwFkAWsBbAFwAXIBcwF4
-AX8BhQGGAY4BjwGUAZsBoAGhAakBqgGrAbABsQG2Ab0BvgHWAdoB3AHeAesB7wHwAfEB9AH7AgUB8AIG
-AhAB8AIRAhsB8AIcAiACIwIoAjECNgI3AjwCRQJJAkoCTwJWAlcCXwJgAmECZgJnAmwCiAKJAooCiwKO
-Ao8CkAKWApoCqgKuArgCvwLAAsoCywLQAtoC2wLcAuAC4gLnAugC6wLuAvEC+AL5AwADAQMIAwkDEAMR
-AxgDGQMhAyIDKQMqAzEDMgMzAzUDNgM8A0UDSANRA1gDWQNgA2EDaANpA3ADcQN4A3kDgQOCA4kDigOR
-AzIDkgOTA5YDnQOgA6EDpwOvAlYDtgO+A78DxgPHA84DzwPWA9cD3gPfA+YD5wPuAzID7wPwA/ID8wP0
-Ao4D9QP2A/kD+gP+BAUEBgQHBAgEDQQSBBkEGgQfBCYEKwQsBC0EMgQ5BDoEOwRABEcESARJBEoETwRX
-BFgEWQReBF8EZARrBGwEbQRxBHgEeQR6BHsEgASHBIgEiQSKBI4ElQSWBJcEmASdBKQEpQSmBKsEsgS2
-BLcEuAS9BMIEwwTIBNAE1QTWBOAE4QTkBOUE5wTpBOoE7wTwBPUE/AT9BQUFBgUIBQoFCwUQBREFFgUX
-BRwFIwUkBSUFJgUrBTMFNAU9BT4FQAVBBUYFSwVMBVEFbAV7BXwFgwWMBY0FkAWVBakFqgWtBbMFxQXM
-Bc0F0AXVBdYF2QXgBeMF5gXvBfUF9gX8BgUGCwYMBhEGEgYZBh0GIgYjBigGKQYsBi4GLwY0BjwGPQY+
-Bj8GRAZLBkwGTQZRBlgGWQZaBlsGYAZnBmgGcAZxBnMGdQZ2BnsGfAaBBogGiQaKBosGkAaRBpYGlwac
-Bp0GoganBq4GrwawBrEGtga9Br4GvwbABsUGzAbNBtUG1gbYBtoG2wbgBuEG5QbsBu0G7gbvB28HeAeA
-B4QHhQeIB5EHkgeTB5YHngefB6MHpAelB6gHqQeuB7cHvAFRB70HzAfVB94BUQffB+QH5gfpB+oH8wf8
-CAUIBgFRCA8IEggeCCcIMAgxCDIIOghDAVEIRAhPCFgIEQFRCGEIagFRCGsIbwhwADgIcwiBCIIIgwKO
-Ao8D8wP0Ao4IhQiGCIgJCAmJCgoKCwoMCg0KDgoPChAKEQoSChMKFAoVChYKFwoYChkKGgobChwKHQoe
-Ch8KIAohCiIKIwokCiUKJgonCigKKQoqCisKLAotCi4KLwowCjEKMgozCjQKNQo2CjcKOAo5CjoKOwo8
-Cj0KPgo/CkAKQQpCCkMKRApFCkYKRwpICkkKSgpLCkwKTQpOCk8KUApRClIKUwpUClUKVgpXClgKWQpa
-ClsKXApdCl4KXwpgCmEKYgpjCmQKZQpmCmcKaAppCmoKawpsCm0KbgpvCnAKcQpyAo0Kcwp0CnUKdgp3
-CngKeQp6CnsKfAp9Cn4KfwqACoEKggqDCoQKhQqICosLQwv7C/wL/Qv+C/8MAAwBDAIMAwwEDAUMBgwH
-DAgMCQwKDAsMDAwNDA4MDwwQDBEMEgwTDBQMFQwWDBcMGAwZDBoMGwwcDB0MHgwfDCAMIQwiDCMMJAwl
-DCYMJwIaBTAMKAwpDCoMKwwsDC0MLgwvDDAMMQwyDDMMNAw1DDYMNww4DDkMOgw7DDwMPQw+DD8MQAxB
-DEIMQwxEDEUMRgxHDEgMSQxKDEsMTAxNDE4MTwxQDFEMUgxTDFQMVQxWDFcMWAxZDFoMWwxcDF0MXgxf
-DGAMYQxiDGMMZAxlDGYMZwxoDGkMagxrDGwMbQxuDG8McAxxDHIMcwx0DHUMdgx3BM0MeAx5DHoMewx8
-DH0Mfgx/DIAMgQyCDIMMhAyFDIYMhwyIDIkMigyLDIwMjQyODI8MkAyRDJIMkwyUDJUMlgyXDJgMmQya
-DJsMnAydDJ4MnwygDKEMogyjDKQMpQymDKcMqAypDKoMqwysDK0MsAyzDLZVJG51bGzfEBIADQAOAA8A
-EAARABIAEwAUABUAFgAXABgAGQAaABsAHAAdAB4AHwAgACEAIgAjACQAJQAmACcAKAApACoAKwAsAC0A
-LgAvADBWTlNSb290ViRjbGFzc11OU09iamVjdHNLZXlzXxAPTlNDbGFzc2VzVmFsdWVzXxAZTlNBY2Nl
-c3NpYmlsaXR5T2lkc1ZhbHVlc11OU0Nvbm5lY3Rpb25zW05TTmFtZXNLZXlzW05TRnJhbWV3b3JrXU5T
-Q2xhc3Nlc0tleXNaTlNPaWRzS2V5c11OU05hbWVzVmFsdWVzXxAZTlNBY2Nlc3NpYmlsaXR5Q29ubmVj
-dG9yc11OU0ZvbnRNYW5hZ2VyXxAQTlNWaXNpYmxlV2luZG93c18QD05TT2JqZWN0c1ZhbHVlc18QF05T
-QWNjZXNzaWJpbGl0eU9pZHNLZXlzWU5TTmV4dE9pZFxOU09pZHNWYWx1ZXOAAoEDKIEBp4ECbYEDJ4AJ
-gQHugAaBAmyBAm6BAe+BAyWAAIAHgQHtgQMmEgAElQiBAm/SAA4AMgAzADRbTlNDbGFzc05hbWWABYAD
-0gAOADYANwA4WU5TLnN0cmluZ4AEXU5TQXBwbGljYXRpb27SADoAOwA8AD1YJGNsYXNzZXNaJGNsYXNz
-bmFtZaMAPQA+AD9fEA9OU011dGFibGVTdHJpbmdYTlNTdHJpbmdYTlNPYmplY3TSADoAOwBBAEKiAEIA
-P15OU0N1c3RvbU9iamVjdF8QEElCQ29jb2FGcmFtZXdvcmvSAA4ARQBGAEdaTlMub2JqZWN0c4AIoNIA
-OgA7AEkASqMASgBLAD9cTlNNdXRhYmxlU2V0VU5TU2V00gAOAEUATQBOgD6vEDcATwBQAFEAUgBTAFQA
-VQBWAFcAWABZAFoAWwBcAF0AXgBfAGAAYQBiAGMAZABlAGYAZwBoAGkAagBrAGwAbQBuAG8AcABxAHIA
-cwB0AHUAdgB3AHgAeQB6AHsAfAB9AH4AfwCAAIEAggCDAIQAhYAKgBiAKYAugDGAQYBHgE6AUIBogGyA
-cIB2gHiA3YDigOOA5oDrgO+A9ID4gPqA/oEBA4EBCIEBDYEBEYEBFoEBF4EBGYEBJIEBJoEBLoEBMIEB
-MoEBN4EBPoEBP4EBQYEBaoEBb4EBc4EBeIEBgIEBgoEBh4EBiYEBi4EBjYEBjoEBk4EBmIEBoIEBotMA
-DgCHAIgAiQCKAItYTlNTb3VyY2VXTlNMYWJlbIAXgAuAFtgADgCNAI4AjwCQAJEAkgCTAJQAlQCWAJcA
-mACZAJoAm1dOU1RpdGxlXxARTlNLZXlFcXVpdk1vZE1hc2taTlNLZXlFcXVpdl1OU01uZW1vbmljTG9j
-WU5TT25JbWFnZVxOU01peGVkSW1hZ2VWTlNNZW51gBWADRIAEAAAgA4Sf////4APgBOADNMADgCNAJ0A
-ngCfAKBbTlNNZW51SXRlbXOAP4EB1IEB1lZEZWxldGVQ0wAOADIApAClAKYAp15OU1Jlc291cmNlTmFt
-ZYASgBCAEVdOU0ltYWdlXxAPTlNNZW51Q2hlY2ttYXJr0gA6ADsAqwCsogCsAD9fEBBOU0N1c3RvbVJl
-c291cmNl0wAOADIApAClAKYAsIASgBCAFF8QEE5TTWVudU1peGVkU3RhdGXSADoAOwCzALSiALQAP1pO
-U01lbnVJdGVtV2RlbGV0ZTrSADoAOwC3ALijALgAuQA/XxAVTlNOaWJDb250cm9sQ29ubmVjdG9yXk5T
-TmliQ29ubmVjdG9y1AAOALsAhwCIAIkAvQC+AL9dTlNEZXN0aW5hdGlvboAXgCaAGYAo1wDBAA4AwgDD
-AMQAxQDGAMcAyADJAMoAywDMAMdfEA9OU05leHRSZXNwb25kZXJXTlNGcmFtZVZOU0NlbGxYTlN2Rmxh
-Z3NZTlNFbmFibGVkW05TU3VwZXJ2aWV3gBqAJYAbgBwRAQAJgBrVAMEADgDCAM8AxAArANEA0gDTAMta
-TlNTdWJ2aWV3c4AAgKWAu4CqXxAWe3sxOCwgMTUzfSwgezQwMiwgMTh9fd0A1gAOANcA2ADZANoA2wDc
-AN0A3gDfAOAA4QDiAOMAlwDlAOYA5wCXAOkA6gC+AOwA7QDuW05TQ2VsbEZsYWdzXxATTlNBbHRlcm5h
-dGVDb250ZW50c18QEk5TUGVyaW9kaWNJbnRlcnZhbF5OU0J1dHRvbkZsYWdzMl8QEE5TQWx0ZXJuYXRl
-SW1hZ2VfEA9OU0tleUVxdWl2YWxlbnRaTlNDb250ZW50c1lOU1N1cHBvcnRdTlNDb250cm9sVmlld18Q
-D05TUGVyaW9kaWNEZWxheVxOU0NlbGxGbGFnczJdTlNCdXR0b25GbGFncxIEAf4AgCSADhAZEAKAIYAO
-gB2AHoAZEMgQABJIPFH/XxAdRm9sbG93IHN5c3RlbSBrZXlib2FyZCBsYXlvdXTUAA4A8QDyAPMA9AD1
-APYA91ZOU1NpemVWTlNOYW1lWE5TZkZsYWdzgCAjQCoAAAAAAACAHxEEFFxMdWNpZGFHcmFuZGXSADoA
-OwD6APuiAPsAP1ZOU0ZvbnTSAA4A/QD+AP9bTlNJbWFnZU5hbWWAI4AiWE5TU3dpdGNo0gA6ADsBAgED
-ogEDAD9fEBNOU0J1dHRvbkltYWdlU291cmNl0gA6ADsBBQEGpAEGAQcAwwA/XE5TQnV0dG9uQ2VsbFxO
-U0FjdGlvbkNlbGzSADoAOwEJAQqlAQoBCwEMAQ0AP1hOU0J1dHRvbllOU0NvbnRyb2xWTlNWaWV3W05T
-UmVzcG9uZGVy0gAOADIAMwEQgAWAJ11YMTFDb250cm9sbGVyXnByZWZzX2NoYW5nZWQ60wAOAIcAiACJ
-ARUBFoAXgCqALdgADgCNAI4AjwCQAJEAkgCTAJQBGQCWARoAmACZAJoAm4AVgCuALIAPgBOADFpTZWxl
-Y3QgQWxsUWFac2VsZWN0QWxsOtQADgC7AIcAiAEiAL0AHwElgDCAJoACgC9YZGVsZWdhdGXSADoAOwEo
-ASmjASkAuQA/XxAUTlNOaWJPdXRsZXRDb25uZWN0b3LUAA4AuwCHAIgBIgEsAB8BLoAwgDKAAoBA1AAO
-AI0A8gCdAJ4BMQCXATOAP4AzgA6ANFRNZW510gAOAEUATQE3gD6iATgBOYA1gDbaAA4AjQCOATsAjwE8
-AJAAkQCSAJMAlACXAJYAzACXAMwAmACZAJoBLF1OU0lzU2VwYXJhdG9yXE5TSXNEaXNhYmxlZIAVgA4J
-gA4JgA+AE4Ay2gAOAUYAjQCOAI8AkACRAJIAkwFHAJQBSQFKAJYAlwCYAJkAmgEsAU9ZTlNTdWJtZW51
-WE5TQWN0aW9ugBWAOYA3gA6AD4ATgDKAOFxBcHBsaWNhdGlvbnNec3VibWVudUFjdGlvbjrTAA4AjQCd
-AJ4BSgFVgD+AN4A60gAOAEUATQFYgD6iAVkBWoA7gDzaAA4AjQCOATsAjwE8AJAAkQCSAJMAlACXAJYA
-zACXAMwAmACZAJoBSYAVgA4JgA4JgA+AE4A52AAOAI0AjgCPAJAAkQCSAJMAlAFmAJYAlwCYAJkAmgFJ
-gBWAPYAOgA+AE4A5agBDAHUAcwB0AG8AbQBpAHoAZSAm0gA6ADsBbQFuowFuAW8AP15OU011dGFibGVB
-cnJheVdOU0FycmF50gA6ADsBcQCTogCTAD9YZG9ja01lbnXUAA4AuwCHAIgAiQC9AXYAv4AXgCaAQoAo
-1wDBAA4AwgDDAMQAxQDGAXkAyAF7AXwAywDMAXmAQ4AlgESARQmAQ9YAwQAOAMIAzwDEAMYBgADRAYIB
-gwDLAYCAgoClgKSAhICCXxAVe3sxOCwgOTB9LCB7NDAyLCAxOH193QDWAA4A1wDYANkA2gDbANwA3QDe
-AN8A4ADhAOIA4wCXAOUA5gDnAJcBiwDqAXYA7ADtAO6AJIAOgCGADoBGgB6AQl8QF1VzZSBzeXN0ZW0g
-YWxlcnQgZWZmZWN01AAOALsAhwCIASIBkQC9AZOAMIBIgCaATdcAwQAOAMIAwwDEAMUAxgGVAMgBlwGY
-AMsAzAGVgEmAJYBKgEsJgEnVAMEADgDCAM8AxAArANEBngGfAMuAAIClgNOAwl8QFnt7MTgsIDE0MH0s
-IHs0MDIsIDE4fX3dANYADgDXANgA2QDaANsA3ADdAN4A3wDgAOEA4gDjAJcA5QDmAOcAlwGmAOoBkQDs
-AO0A7oAkgA6AIYAOgEyAHoBIXxAmQWxsb3cgY29ubmVjdGlvbnMgZnJvbSBuZXR3b3JrIGNsaWVudHNa
-ZW5hYmxlX3RjcNQADgC7AIcAiACJAL0BWgGvgBeAJoA8gE9fEBBhcHBzX3RhYmxlX3Nob3c61AAOALsA
-hwCIAIkAvQG0AL+AF4AmgFGAKNcAwQAOAMIAwwDEAMUAxgF5AbgBuQG6AMsAzAF5gEOAZ4BSgFMJgENf
-EBZ7ezc0LCAyMDl9LCB7MTI4LCAyNn193xATANYBvwHAANcA2AAOANkA2gDbAN0AtADeAcEBwgHDAN8A
-4ACTAOEBxADMAcYBxwHIAckBxgHKAcsA6gHNAbQBzwDMAMwB0gHTAdQB1V8QGk5TTWVudUl0ZW1SZXNw
-ZWN0QWxpZ25tZW50XxAPTlNBcnJvd1Bvc2l0aW9uXxAPTlNQcmVmZXJyZWRFZGdlXxASTlNVc2VzSXRl
-bUZyb21NZW51XU5TQWx0ZXJzU3RhdGUT/////4RB/kAJEAGAVRBLgGaAVIBWgB6AV4BREAMJCREBkBEE
-AIBYEgaCQP/UAA4A8QDyAPMA9AD1APYB2YAggB8QENIADgA2ADcAooAE0gAOADYANwCigATcAd8ADgCN
-AI4AjwCQAJEAkgCTAUcB4AHhAboAlAHkAJYAlwCYAJkAmgHUAekB6gHGWE5TVGFyZ2V0VU5TVGFnV05T
-U3RhdGWAU4AVgFmADoAPgBOAWIBaE///////////0wAOAI0AnQCeAe0B7oA/gFuAXFxGcm9tIERpc3Bs
-YXlfEBFfcG9wVXBJdGVtQWN0aW9uOtIADgA2ADcB84AEWk90aGVyVmlld3PSAA4ARQBNAfaAPqQBzQH4
-AfkB+oBXgF2AYIBj2wHfAA4AjQCOAI8AkACRAJIAkwFHAeABugCUAf4AlgCXAJgAmQCaAdQCAwIEgFOA
-FYBegA6AD4ATgFiAXxAIWjI1NiBDb2xvcnPbAd8ADgCNAI4AjwCQAJEAkgCTAUcB4AG6AJQCCQCWAJcA
-mACZAJoB1AIOAg+AU4AVgGGADoAPgBOAWIBiEA9ZVGhvdXNhbmRz2wHfAA4AjQCOAI8AkACRAJIAkwFH
-AeABugCUAhQAlgCXAJgAmQCaAdQCGQIagFOAFYBkgA6AD4ATgFiAZRAYWE1pbGxpb25z0gA6ADsCHQIe
-pgIeAh8BBgEHAMMAP18QEU5TUG9wVXBCdXR0b25DZWxsXk5TTWVudUl0ZW1DZWxs0gA6ADsCIQIipgIi
-AQoBCwEMAQ0AP11OU1BvcFVwQnV0dG9u1AAOALsAhwCIASICJQC9AieAMIBpgCaAa9oADgCNAI4BOwCP
-ATwAkACRAJIAkwCUAJcAlgDMAJcAzACYAJkAmgIwgBWADgmADgmAD4ATgGrUAA4AjQDyAJ0AngIzAjQC
-NYA/gQHMgQHQgQHNXxAQd2luZG93X3NlcGFyYXRvctQADgC7AIcAiAEiAjkAvQI7gDCAbYAmgG/aAA4A
-jQCOATsAjwE8AJAAkQCSAJMAlACXAJYAzACXAMwAmACZAJoCRIAVgA4JgA4JgA+AE4Bu0wAOAI0AnQCe
-AUoCSIA/gDeBAbheYXBwc19zZXBhcmF0b3LUAA4AuwCHAIgBIgJMAL0CToAwgHGAJoB11wDBAA4AwgDD
-AMQAxQDGAMcAyAJSAlMAywDMAMeAGoAlgHKAcwmAGl8QFnt7MTgsIDIxN30sIHs0MDIsIDE4fX3dANYA
-DgDXANgA2QDaANsA3ADdAN4A3wDgAOEA4gDjAJcA5QDmAOcAlwJcAOoCTADsAO0A7oAkgA6AIYAOgHSA
-HoBxXxAaRW11bGF0ZSB0aHJlZSBidXR0b24gbW91c2VcZmFrZV9idXR0b25z1AAOALsAhwCIASIBtAC9
-AmWAMIBRgCaAd1VkZXB0aNQADgC7AIcAiAEiAmkAvQJrgDCAeYAmgNzfEA8CbQAOAm4CbwJwAnECcgJz
-AnQCdQJ2AncCeAJ5AnoCewJ8An0CfgJ/AoACgQKCAoMChAKFAOYBzwKGAodcTlNXaW5kb3dWaWV3XxAW
-TlNXaW5kb3dDb250ZW50TWF4U2l6ZVxOU1NjcmVlblJlY3RfEBNOU0ZyYW1lQXV0b3NhdmVOYW1lXU5T
-V2luZG93VGl0bGVZTlNXVEZsYWdzXU5TV2luZG93Q2xhc3NfEBZOU1dpbmRvd0NvbnRlbnRNaW5TaXpl
-XE5TV2luZG93UmVjdFlOU01heFNpemVfEA9OU1dpbmRvd0JhY2tpbmdfEBFOU1dpbmRvd1N0eWxlTWFz
-a1lOU01pblNpemVbTlNWaWV3Q2xhc3OAgIDbgH6A14DagHsSUHgAAIB8gH+AeoDZgNiAfV8QGHt7MzE5
-LCAzMjN9LCB7NDc4LCAzMTZ9fV8QD1gxMSBQcmVmZXJlbmNlc1dOU1BhbmVs0gAOADYANwKNgARUVmll
-d18QGnszLjQwMjgyZSszOCwgMy40MDI4MmUrMzh9WnsyMTMsIDEwN33VAMEADgDPAMQCkQArANEClADL
-ApVbTlNGcmFtZVNpemWAAIClgIGA1tIADgBFAE0CmIA+oQGAgILcAMEADgKbApwAwgD7AM8AxAKdAMYC
-ngKfAnsCoQKiAO0CowDqAqUAywDMAnsAzAKpXk5TVGFiVmlld0l0ZW1zWU5TVHZGbGFnc18QEU5TRHJh
-d3NCYWNrZ3JvdW5kXxAWTlNBbGxvd1RydW5jYXRlZExhYmVsc18QFU5TU2VsZWN0ZWRUYWJWaWV3SXRl
-bYCAgNWAp4CmgB6AgwmAgAmAvtIADgBFAE0CrIA+oQF5gEPSAA4ARQBNArCAPqcBdgKyAbQCtAK1ArYC
-t4BCgIWAUYCUgJiAnICg1wDBAA4AwgDDAMQAxQDGAXkCugK7ArwAywDMAXmAQ4CTgIaAhwmAQ18QFXt7
-MzYsIDU2fSwgezM4NSwgMjh9fdgA1gAOAsEA3ADdAN4A4ALCAOICwwLEAsUCxgKyAsgCyV8QEU5TQmFj
-a2dyb3VuZENvbG9yW05TVGV4dENvbG9ygJKAioCIgImAhRIAQAAAgI9fEGdYMTEgYmVlcHMgd2lsbCB1
-c2UgdGhlIHN0YW5kYXJkIHN5c3RlbSBhbGVydCwgYXMgZGVmaW5lZCBpbiB0aGUgU291bmQgRWZmZWN0
-cyBzeXN0ZW0gcHJlZmVyZW5jZXMgcGFuZWwu1AAOAPEA8gDzAPQCzQD2As+AICNAJgAAAAAAAIAfEQwc
-1QAOAtEC0gLTAtQC1QLWAtcC2ALZV05TQ29sb3JcTlNDb2xvclNwYWNlW05TQ29sb3JOYW1lXU5TQ2F0
-YWxvZ05hbWWAjoCNEAaAjICLVlN5c3RlbVxjb250cm9sQ29sb3LTAA4C0gLdAtUBzwLfV05TV2hpdGWA
-jkswLjY2NjY2NjY5ANIAOgA7AuEC0aIC0QA/1QAOAtEC0gLTAtQC1QLkAtcC5QLZgI6AkYCQgItfEBBj
-b250cm9sVGV4dENvbG9y0wAOAtIC3QLVAc8C6oCOQjAA0gA6ADsC7ALtpALtAQcAwwA/XxAPTlNUZXh0
-RmllbGRDZWxs0gA6ADsC7wLwpQLwAQsBDAENAD9bTlNUZXh0RmllbGTXAMEADgDCAMMAxADFAMYBeQK6
-AvQC9QDLAMwBeYBDgJOAlYCWCYBDXxAVe3sxNywgMjEyfSwgezU1LCAyMH192ADWAA4CwQDcAN0A3gDg
-AsIA4gLDAsQC/ADqArQCyALJgJKAioCXgB6AlICPWENvbG9yczoK1wDBAA4AwgDDAMQAxQDGAXkCugME
-AwUAywDMAXmAQ4CTgJmAmgmAQ18QFnt7MzYsIDE5MH0sIHszOTIsIDE0fX3YANYADgLBANwA3QDeAOAC
-wgDiAsMCxAMMAsYCtQLIAsmAkoCKgJuAiYCYgI9fEDRUaGlzIG9wdGlvbiB0YWtlcyBlZmZlY3Qgd2hl
-biBYMTEgaXMgbGF1bmNoZWQgYWdhaW4u1wDBAA4AwgDDAMQAxQDGAXkAyAMUAxUAywDMAXmAQ4AlgJ2A
-ngmAQ18QFnt7MTgsIDE1Nn0sIHs0MDksIDIzfX3dANYADgDXANgA2QDaANsA3ADdAN4A3wDgAOEA4gDj
-AJcA5QDmAOcAlwMeAOoCtgDsAO0A7oAkgA6AIYAOgJ+AHoCcXxAQRnVsbCBzY3JlZW4gbW9kZdcAwQAO
-AMIAwwDEAMUAxgF5AroDJQMmAMsAzAF5gEOAk4ChgKIJgENfEBZ7ezM2LCAxMTl9LCB7Mzg1LCAzMX19
-2ADWAA4CwQDcAN0A3gDgAsIA4gLDAsQDLQLGArcCyALJgJKAioCjgImAoICPXxBkRW5hYmxlcyB0aGUg
-WDExIHJvb3Qgd2luZG93LiBVc2UgdGhlIENvbW1hbmQtT3B0aW9uLUEga2V5c3Ryb2tlIHRvIGVudGVy
-IGFuZCBsZWF2ZSBmdWxsIHNjcmVlbiBtb2RlLl8QFnt7MTAsIDMzfSwgezQzOCwgMjUzfX3SADoAOwM0
-AQyjAQwBDQA/XxAVe3sxMCwgN30sIHs0NTgsIDI5OX190gAOAEUATQM4gD6jAzkCqQM7gKiAvoDB1gAO
-Az0BDAM+AtEAiAM/A0AAxwGAAsQDRFxOU0lkZW50aWZpZXJZTlNUYWJWaWV3gL2AqYAagIKAioC80gAO
-ADYANwNHgARRMdIADgBFAE0DSoA+pgJMA0wDTQNOA08AvoBxgKuAr4CzgLeAGdcAwQAOAMIAwwDEAMUA
-xgDHAroDVANVAMsAzADHgBqAk4CsgK0JgBpfEBV7ezM2LCA2N30sIHszODUsIDMxfX3YANYADgLBANwA
-3QDeAOACwgDiAsMCxANcAsYDTALIAsmAkoCKgK6AiYCrgI9fEGZXaGVuIGVuYWJsZWQsIG1lbnUgYmFy
+AYag0QAHAAhdSUIub2JqZWN0ZGF0YYABXxAPTlNLZXllZEFyY2hpdmVyrxEDQgALAAwAMQA1ADkAQABD
+AEQASABMAIkAkQCZAJoAnwCyALMAuAC5ALoAvQDBAMIAxQDQANEA0gDWANsA5ADrAOwA8ADyAPMA9wD8
+AQoBEgETAS0BLgE1ATYBOQE9AT4BQAFCAUYBTAFPAVABUQFUAVkBYAFlAWYBZwFsAXMBeAF5AXoBewGA
+AYcBjQGOAZkBmgGeAZ8BogGjAagBrwGwAbgBuQG6Ab8BwAHFAcwB0QHSAekB7AHuAfAB/QIBAgICAwIG
+Ag0CFwICAhgCIgICAiMCLQICAi4CMgI1AjYCOwJDAkQCRQJKAlMCVwJYAl0CZAJlAm0CbgJzAnsCfAJ9
+An4CgwKIAo8ClAKVAp0CngKjAqoCqwKzArQCuQLBAsICwwLEAskC0QLSAtMC1ALZAtoC3wLgAuQC6wLv
+AvAC8QL1AvwC/QL+Av8DBAMJAwoDEgMbANEDHAMrAzIDMwM0Az0DRgDRA0cDTANOA1EDUgNbA2QDawNs
+A20DdAN1A34DhQOGA4cDiADRA5EDlgOdA54DpwDRA6gDswO6A7sDvAPDA8QDxQPOA9UD1gPXA94D3wPg
+A+cD6APxANED8gP0BAAEBwQIBAkEEAQRBBoEIwQqBCsENAQ1BD4A0QQ/BEMERwROBE8EUARRBFYEWwRi
+BGMEawRsBG0EcgRzBHgEfwSABIgEiQSLBI0EjgSSBJMEmASZBJ4EnwSkBMAEwQTCBMMExgTHBMgEzQTR
+BOEE5QTwBPcE+AUCBQMFCAUSBRMFFAUYBRoFHwUgBSMFJgUpBTAFMQU4BTkFQAVBBUgFSQVQBVEFWAVZ
+BVoFXAVdBWMFbAVvBXAFcwV6BX0FhwWOBY8FlwWYBZ8FoAWnBagFrwWwBbcFuAW/BcAFxwXIBc8F0AXX
+BVkF2AXZBd8F5wKqBe4F9gX3Bf4F/wYGBgcGDgYPBhYGFwYeBh8GJgVZBicGKAYqBisGLATGBi0GLgYx
+BjIGNwY4Bj0GPgZDBkQGSQZKBk8GVwZYBmEGYgZkBmYGZwZsBnEGcgZ2BncGfAaDBoQGjAaNBo8GkQaS
+BpcGmAadBrgGxwbIBs8G2AbZBtwG4Qb2BvcG+gcABxIHGQcaBx0HIgcjByYHLgcvBzIHNQc+B0QHRQdM
+B1UHWwdcB2EHYgdqB24Hcwd0B3kHegd9B38HgAeFB4YHiweMB5EHkgeXB5sHnAehB6IHpwesB60HsQey
+B7cHuAe9B74HwwfEB8kHygfPB9AH1AfVB9oH2wfgB+cH6AfwB/EH8wf0CHgIgAiECIUIiAiRCJIIkwiW
+CJ4InwijCKQIpQioCLYItwi4BMYExwi6CMMGKwYsBMYIxAjFADgIyAjKCU4J0wpYClkKWgpbClwKXQpe
+Cl8KYAphCmIKYwpkCmUKZgpnCmgKaQpqCmsKbAptCm4KbwpwCnEKcgpzCnQKdQp2CncKeAp5CnoKewp8
+Cn0Kfgp/CoAKgQqCCoMKhAqFCoYKhwqICokKigqLBMUKjAqNCo4KjwqQCpEKkgqTCpQKlQqWCpcKmAqZ
+CpoKmwqcCp0KngqfCqAKoQqiCqMKpAqlCqYKpwqoCqkKqgqrCqwKrQquCq8KsAqxCrIKswq0CrUKtgq3
+CrgKuQq6CrsKvAq9Cr4KvwrACsEKwgrDCsQKxQrGCscKyArJCsoKywrMCs0KzgrPCtAK0QrSCtMK1ArV
+CtYK1wraCt0LnAxbDFwMXQxeDF8MYAxhDGIMYwxkDGUMZgxnDGgMaQxqDGsMbAxtDG4MbwxwDHEMcgxz
+DHQMdQx2DHcMeAx5DHoMewx8DH0Mfgx/DIAMgQyCDIMMhAyFDIYMhwyIDIkMigyLDIwMjQyODI8MkAyR
+DJIMkwyUDJUMlgyXDJgMmQyaDJsMnAydDJ4MnwygDKEMogyjDKQMpQymDKcMqAypDKoMqwysDK0Mrgyv
+DLAMsQyyDLMMtAy1DLYMtwy4DLkMugy7DLwMvQy+DL8MwAzBDMIMwwzEDMUMxgzHDMgMyQzKDMsMzAzN
+AiwMzgzPDNAM0QzSDNMM1AzVDNYM1wzYDNkM2gzbDNwM3QzeDN8M4AzhDOIM4wzkDOUM5gznDOgM6Qzq
+DOsM7AztDO4M7wzwDPEM8gzzDPQM9Qz2DPcM+Az5DPoBBwz7DPwM/Qz+DP8NAA0BDQINAw0EDQUGVA0G
+DQcNCA0JDQoNCw0MDQ0NDg0PDRANEQ0SDRMNFA0XDRoNHVUkbnVsbN8QEgANAA4ADwAQABEAEgATABQA
+FQAWABcAGAAZABoAGwAcAB0AHgAfACAAIQAiACMAJAAlACYAJwAoACkAKgArACwALQAuAC8AMFZOU1Jv
+b3RWJGNsYXNzXU5TT2JqZWN0c0tleXNfEA9OU0NsYXNzZXNWYWx1ZXNfEBlOU0FjY2Vzc2liaWxpdHlP
+aWRzVmFsdWVzXU5TQ29ubmVjdGlvbnNbTlNOYW1lc0tleXNbTlNGcmFtZXdvcmtdTlNDbGFzc2VzS2V5
+c1pOU09pZHNLZXlzXU5TTmFtZXNWYWx1ZXNfEBlOU0FjY2Vzc2liaWxpdHlDb25uZWN0b3JzXU5TRm9u
+dE1hbmFnZXJfEBBOU1Zpc2libGVXaW5kb3dzXxAPTlNPYmplY3RzVmFsdWVzXxAXTlNBY2Nlc3NpYmls
+aXR5T2lkc0tleXNZTlNOZXh0T2lkXE5TT2lkc1ZhbHVlc4ACgQNBgQHdgQJ/gQNAgAmBAfyABoECfoEC
+gIEB/YEDPoAAgAeBAfuBAz8SAASVMIECgdIADgAyADMANFtOU0NsYXNzTmFtZYAFgAPSAA4ANgA3ADhZ
+TlMuc3RyaW5ngARdTlNBcHBsaWNhdGlvbtIAOgA7ADwAPVgkY2xhc3Nlc1okY2xhc3NuYW1lowA9AD4A
+P18QD05TTXV0YWJsZVN0cmluZ1hOU1N0cmluZ1hOU09iamVjdNIAOgA7AEEAQqIAQgA/Xk5TQ3VzdG9t
+T2JqZWN0XxAQSUJDb2NvYUZyYW1ld29ya9IADgBFAEYAR1pOUy5vYmplY3RzgAig0gA6ADsASQBKowBK
+AEsAP1xOU011dGFibGVTZXRVTlNTZXTSAA4ARQBNAE6AH68QOgBPAFAAUQBSAFMAVABVAFYAVwBYAFkA
+WgBbAFwAXQBeAF8AYABhAGIAYwBkAGUAZgBnAGgAaQBqAGsAbABtAG4AbwBwAHEAcgBzAHQAdQB2AHcA
+eAB5AHoAewB8AH0AfgB/AIAAgQCCAIMAhACFAIYAhwCIgAqAI4A2gDuAQYBLgFGAU4BtgHGAdYB6gH+A
+gICGgIuAkICVgJeAmYCegKOA84D0gPqA/IEBBIEBBoEBCIEBCoEBb4EBcYEBc4EBdYEBd4EBf4EBgIEB
+goEBhIEBjIEBjoEBuIEBuoEBvIEBvoEBv4EBwYEBw4EBxIEBxoEByIEByoEBzIEBzoEB0IEB0oEB1IEB
+1tQADgCKAIsAjACNAI4AHwCQXU5TRGVzdGluYXRpb25YTlNTb3VyY2VXTlNMYWJlbIAigAuAAoAh1AAO
+AJIAkwCUAJUAlgCXAJhXTlNUaXRsZVZOU05hbWVbTlNNZW51SXRlbXOAIIAMgA+ADVRNZW510gAOAEUA
+TQCcgB+iAJ0AnoAOgBfaAA4AkgCgAKEAogCjAKQApQCmAKcAqACXAKoAqwCXAKsArgCvALAAjl8QEU5T
+S2V5RXF1aXZNb2RNYXNrXU5TSXNTZXBhcmF0b3JaTlNLZXlFcXVpdlxOU0lzRGlzYWJsZWRdTlNNbmVt
+b25pY0xvY1lOU09uSW1hZ2VcTlNNaXhlZEltYWdlVk5TTWVudYAWgA8SABAAAAmADwkSf////4AQgBSA
+C1DTAA4AMgC0ALUAtgC3Xk5TUmVzb3VyY2VOYW1lgBOAEYASV05TSW1hZ2VfEA9OU01lbnVDaGVja21h
+cmvSADoAOwC7ALyiALwAP18QEE5TQ3VzdG9tUmVzb3VyY2XTAA4AMgC0ALUAtgDAgBOAEYAVXxAQTlNN
+ZW51TWl4ZWRTdGF0ZdIAOgA7AMMAxKIAxAA/Wk5TTWVudUl0ZW3aAA4AxgCSAKAAogCkAKUApgCnAMcA
+qADJAMoAqgCXAK4ArwCwAI4Az1lOU1N1Ym1lbnVYTlNBY3Rpb26AFoAagBiAD4AQgBSAC4AZXEFwcGxp
+Y2F0aW9uc15zdWJtZW51QWN0aW9uOtMADgCSAJQAlQDKANWAIIAYgBvSAA4ARQBNANiAH6IA2QDagByA
+HdoADgCSAKAAoQCiAKMApAClAKYApwCoAJcAqgCrAJcAqwCuAK8AsADJgBaADwmADwmAEIAUgBrYAA4A
+kgCgAKIApAClAKYApwCoAOYAqgCXAK4ArwCwAMmAFoAegA+AEIAUgBpqAEMAdQBzAHQAbwBtAGkAegBl
+ICbSADoAOwDtAO6jAO4A7wA/Xk5TTXV0YWJsZUFycmF5V05TQXJyYXnSADoAOwDxAKeiAKcAP1hkb2Nr
+TWVuddIAOgA7APQA9aMA9QD2AD9fEBROU05pYk91dGxldENvbm5lY3Rvcl5OU05pYkNvbm5lY3RvctQA
+DgCKAIsAjAD4APkA+gD7gDWAMoAkgDTXAP0ADgD+AP8BAAEBAQIBAwEEAQUBBgEHAKsBA18QD05TTmV4
+dFJlc3BvbmRlcldOU0ZyYW1lVk5TQ2VsbFhOU3ZGbGFnc1lOU0VuYWJsZWRbTlNTdXBlcnZpZXeAJYAx
+gCaAJxEBLQmAJdUA/QAOAQsBAAEMACsBDgEPARABEVpOU1N1YnZpZXdzW05TRnJhbWVTaXplgACBATOB
+AfIRAQCBAfNfEBd7ezM3MiwgMjc5fSwgezEwMCwgMzJ9fd0BFAAOARUBFgEXARgBGQEaARsBHAEdAR4B
+HwEgASEBIgEjASQBJQEmAScBKAD6ASoBKwEsW05TQ2VsbEZsYWdzXxATTlNBbHRlcm5hdGVDb250ZW50
+c18QEk5TUGVyaW9kaWNJbnRlcnZhbF5OU0J1dHRvbkZsYWdzMl8QEE5TQWx0ZXJuYXRlSW1hZ2VfEA9O
+U0tleUVxdWl2YWxlbnRaTlNDb250ZW50c1lOU1N1cHBvcnRdTlNDb250cm9sVmlld18QD05TUGVyaW9k
+aWNEZWxheVxOU0NlbGxGbGFnczJdTlNCdXR0b25GbGFncxIEAf4AgDCALhAZEAGALIAvgCiAKYAkEMgS
+CDgAABP/////hoJA/1hBZGQgSXRlbdQADgEvAJMBMAExATIBMwE0Vk5TU2l6ZVhOU2ZGbGFnc4ArI0Aq
+AAAAAAAAgCoRBBRcTHVjaWRhR3JhbmRl0gA6ADsBNwE4ogE4AD9WTlNGb2501AAOAS8AkwEwATEBMgE7
+ATyAK4AtEBBZSGVsdmV0aWNh0gAOADYANwCygATSAA4ANgA3ALKABNIAOgA7AUMBRKQBRAFFAP8AP1xO
+U0J1dHRvbkNlbGxcTlNBY3Rpb25DZWxs0gA6ADsBRwFIpQFIAUkBSgFLAD9YTlNCdXR0b25ZTlNDb250
+cm9sVk5TVmlld1tOU1Jlc3BvbmRlctIADgAyADMBToAFgDNdWDExQ29udHJvbGxlcl8QD2FwcHNfdGFi
+bGVfbmV3OtIAOgA7AVIBU6MBUwD2AD9fEBVOU05pYkNvbnRyb2xDb25uZWN0b3LUAA4AigCLAIwA+AAf
+AVcBWIA1gAKAN4A61wAOAJIAogCkAKUApgCnAKgBWwCXAK4ArwCwAV+AFoA5gA+AEIAUgDjUAA4AkgCT
+AJQAlQFiAWMBZIAggKiAwYCqWUFib3V0IFgxMV8QHW9yZGVyRnJvbnRTdGFuZGFyZEFib3V0UGFuZWw6
+1AAOAIoAiwCMAPgA+QFqAWuANYAygDyAQNgADgCSAKAAogCkAKUApgCnAKgBbgCqAW8ArgCvALABcoAW
+gD6AP4AQgBSAPdQADgCSAJMAlACVAXUBdgF3gCCA3YDpgN5VQ2xvc2VRd11jbG9zZV93aW5kb3c61AAO
+AIoAiwCMAI0BfQD5AX+AIoBCgDKAStcA/QAOAP4A/wEAAQEBAgGBAQQBgwGEARAAqwGBgEOAMYBEgEUJ
+gEPWAP0ADgD+AQsBAAECAYgBDgGKAYsBEAGIgQEUgQEzgQEygQEWgQEUXxAWe3sxOCwgMTMwfSwgezQw
+MiwgMTh9fd0BFAAOARUBFgEXARgBGQEaARsBHAEdAR4BHwEgASEAlwEjAZEBkgCXAZQBKAF9ASoBlwGY
+gDCADxACgEeAD4BGgCmAQhAAEkg8Uf9fECBFbmFibGUga2V5IGVxdWl2YWxlbnRzIHVuZGVyIFgxMdIA
+DgGbAZwBnVtOU0ltYWdlTmFtZYBJgEhYTlNTd2l0Y2jSADoAOwGgAaGiAaEAP18QE05TQnV0dG9uSW1h
+Z2VTb3VyY2VfEBBlbmFibGVfa2V5ZXF1aXZz1AAOAIoAiwCMAPgA+QGmAaeANYAygEyAUNcA/QAOAP4A
+/wEAAQEBAgGBAQQBqwGsARAAqwGBgEOAMYBNgE4JgENfEBZ7ezE4LCAxNzl9LCB7NDAyLCAxOH193QEU
+AA4BFQEWARcBGAEZARoBGwEcAR0BHgEfASABIQCXASMBkQGSAJcBtQEoAaYBKgGXAZiAMIAPgEeAD4BP
+gCmATF8QHUZvbGxvdyBzeXN0ZW0ga2V5Ym9hcmQgbGF5b3V0XnByZWZzX2NoYW5nZWQ61AAOAIoAiwCM
+AI0AjgD5Ab6AIoALgDKAUllkb2NrX21lbnXUAA4AigCLAIwAjQHCAPkBxIAigFSAMoBs1wD9AA4A/gD/
+AQABAQECAcYBxwHIAckBEACrAcaAVYBrgFaAVwmAVdUA/QAOAP4BCwEAACsBDgHPAdABEIAAgQEzgQFR
+gQE8XxAWe3s3NCwgMjM1fSwgezEyOCwgMjZ9fd8QEwEUAdMB1AEVARYADgEXARgBGQEbAMQBHAHVAdYB
+1wEdAR4ApwEfAdgAqwEkAdoB2wHcASQB3QHeASgB4AHCAeIAqwCrAeUB5gHnAehfEBpOU01lbnVJdGVt
+UmVzcGVjdEFsaWdubWVudF8QD05TQXJyb3dQb3NpdGlvbl8QD05TUHJlZmVycmVkRWRnZV8QEk5TVXNl
+c0l0ZW1Gcm9tTWVudV1OU0FsdGVyc1N0YXRlE/////+EQf5ACYBZEEuAaoBYgFqAKYBbgFQQAwkJEQGQ
+EQQAgFwSBoJA/9QADgEvAJMBMAExATIBMwE8gCuAKtIADgA2ADcAsoAE0gAOADYANwCygATcAfEADgCS
+AKAAogCkAKUApgCnAMcB8gHzAckAqAH2AKoAlwCuAK8AsAHnAfsB/AEkWE5TVGFyZ2V0VU5TVGFnV05T
+U3RhdGWAV4AWgF2AD4AQgBSAXIBeE///////////0wAOAJIAlACVAf8CAIAggF+AYFxGcm9tIERpc3Bs
+YXlfEBFfcG9wVXBJdGVtQWN0aW9uOtIADgA2ADcCBYAEWk90aGVyVmlld3PSAA4ARQBNAgiAH6QB4AIK
+AgsCDIBbgGGAZIBn2wHxAA4AkgCgAKIApAClAKYApwDHAfIByQCoAhAAqgCXAK4ArwCwAecCFQIWgFeA
+FoBigA+AEIAUgFyAYxAIWjI1NiBDb2xvcnPbAfEADgCSAKAAogCkAKUApgCnAMcB8gHJAKgCGwCqAJcA
+rgCvALAB5wIgAiGAV4AWgGWAD4AQgBSAXIBmEA9ZVGhvdXNhbmRz2wHxAA4AkgCgAKIApAClAKYApwDH
+AfIByQCoAiYAqgCXAK4ArwCwAecCKwIsgFeAFoBogA+AEIAUgFyAaRAYWE1pbGxpb25z0gA6ADsCLwIw
+pgIwAjEBRAFFAP8AP18QEU5TUG9wVXBCdXR0b25DZWxsXk5TTWVudUl0ZW1DZWxs0gA6ADsCMwI0pgI0
+AUgBSQFKAUsAP11OU1BvcFVwQnV0dG9uVWRlcHRo1AAOAIoAiwCMAPgAHwI5AjqANYACgG6AcNkADgCS
+AKAAogCkAKUApgCnAfIAqAI9AKoAlwCuAK8AsAFfAkKAFoBvgA+AEIAUgDgQKlhTaG93IEFsbF8QFnVu
+aGlkZUFsbEFwcGxpY2F0aW9uczrUAA4AigCLAIwAjQJHAPkCSYAigHKAMoB02gAOAJIAoAChAKIAowCk
+AKUApgCnAKgAlwCqAKsAlwCrAK4ArwCwAlKAFoAPCYAPCYAQgBSAc9MADgCSAJQAlQDKAlaAIIAYgMRe
+YXBwc19zZXBhcmF0b3LUAA4AigCLAIwA+AD5AlsBp4A1gDKAdoBQ1wD9AA4A/gD/AQABAQECAYEBBAJg
+AmEBEACrAYGAQ4AxgHeAeAmAQ18QFXt7MTgsIDY5fSwgezQwMiwgMTh9fd0BFAAOARUBFgEXARgBGQEa
+ARsBHAEdAR4BHwEgASEAlwEjAZEBkgCXAmoBKAJbASoBlwGYgDCAD4BHgA+AeYApgHZfEB5DbGljay10
+aHJvdWdoIEluYWN0aXZlIFdpbmRvd3PUAA4AigCLAIwA+AD5AnECcoA1gDKAe4B+2AAOAJIAoACiAKQA
+pQCmAKcAqAJ1AnYCdwCuAK8AsAFygBaAfBIAEAEIgH2AEIAUgD1fEBVDeWNsZSBUaHJvdWdoIFdpbmRv
+d3NRYFxuZXh0X3dpbmRvdzrUAA4AigCLAIwA+AD5AcIBp4A1gDKAVIBQ1AAOAIoAiwCMAPgA+QKGAaeA
+NYAygIGAUNcA/QAOAP4A/wEAAQEBAgKJAQQCiwKMARAAqwKJgIKAMYCDgIQJgILVAP0ADgD+AQsBAAAr
+AQ4CkgKTARCAAIEBM4EBZYEBVF8QFnt7MTgsIDE2Nn0sIHs0MDIsIDE4fX3dARQADgEVARYBFwEYARkB
+GgEbARwBHQEeAR8BIAEhAJcBIwGRAZIAlwKaASgChgEqAZcBmIAwgA+AR4APgIWAKYCBXxAmQWxsb3cg
+Y29ubmVjdGlvbnMgZnJvbSBuZXR3b3JrIGNsaWVudHPUAA4AigCLAIwA+AD5AqEBp4A1gDKAh4BQ1wD9
+AA4A/gD/AQABAQECAYEBBAKmAqcBEACrAYGAQ4AxgIiAiQmAQ18QFnt7MTgsIDI0M30sIHs0MDIsIDE4
+fX3dARQADgEVARYBFwEYARkBGgEbARwBHQEeAR8BIAEhAJcBIwGRAZIAlwKwASgCoQEqAZcBmIAwgA+A
+R4APgIqAKYCHXxAaRW11bGF0ZSB0aHJlZSBidXR0b24gbW91c2XUAA4AigCLAIwAjQK2APkCuIAigIyA
+MoCP2AAOAJIAoACiAKQApQCmAKcAqAK7ArwCvQCuAK8AsAFfgBaAjRIAGAAAgI6AEIAUgDhfEBJUb2dn
+bGUgRnVsbCBTY3JlZW5RYV8QFnRvZ2dsZV9mdWxsc2NyZWVuX2l0ZW3UAA4AigCLAIwA+AD5AscCyIA1
+gDKAkYCU2AAOAJIAoACiAKQApQCmAKcAqALLAswCzQCuAK8AsAFygBaAkhIAEgEKgJOAEIAUgD1fEB1S
+ZXZlcnNlIEN5Y2xlIFRocm91Z2ggV2luZG93c1F+XxAQcHJldmlvdXNfd2luZG93OtQADgCKAIsAjACN
+AVcA+QLYgCKAN4AygJZeeDExX2Fib3V0X2l0ZW3UAA4AigCLAIwAjQDJAPkC3oAigBqAMoCYXmRvY2tf
+YXBwc19tZW510wAOAIsAjAD4AuIC44A1gJqAndgADgCSAKAAogCkAKUApgCnAKgC5gCqAr0ArgCvALAC
+6oAWgJyAjoAQgBSAm9MADgCSAJQAlQLtAu6AIIDIgMpaU2VsZWN0IEFsbFpzZWxlY3RBbGw60wAOAIsA
+jAD4AvMC9IA1gJ+AotgADgCSAKAAogCkAKUApgCnAKgC9wCqAvgArgCvALAC6oAWgKCAoYAQgBSAm1RD
+b3B5UWNVY29weTrUAA4AigCLAIwAjQMBAB8DA4AigKSAAoDy1AAOAJIAkwCUAJUDBgMHAwiAIIClgPGA
+plhNYWluTWVuddIADgBFAE0DDIAfpQMNAw4DDwMQAxGAp4DCgMeA2oDq2gAOAMYAkgCgAKIApAClAKYA
+pwDHAKgBXwFiAKoAlwCuAK8AsAMBAxqAFoA4gKiAD4AQgBSApICpU1gxMdIADgBFAE0DHoAfrAFXAyAD
+IQMiAyMCtgMlAyYDJwI5AykDKoA3gKuAroCvgLaAjIC3gLiAu4BugL2AvtgADgCSAKAAogCkAKUApgCn
+AKgDLQCqAy4ArgCvALABX4AWgKyArYAQgBSAOF5QcmVmZXJlbmNlcy4uLlEs2gAOAJIAoAChAKIAowCk
+AKUApgCnAKgAlwCqAKsAlwCrAK4ArwCwAV+AFoAPCYAPCYAQgBSAONoADgDGAJIAoACiAKQApQCmAKcA
+xwCoAz8DQACqAJcArgCvALABXwNFgBaAsoCwgA+AEIAUgDiAsVhTZXJ2aWNlc9QADgCSAJMAlACVA0kD
+SgNLgCCAs4C1gLTSAA4ANgA3A0aABNIADgBFAE0DUIAfoF8QD19OU1NlcnZpY2VzTWVuddoADgCSAKAA
+oQCiAKMApAClAKYApwCoAJcAqgCrAJcAqwCuAK8AsAFfgBaADwmADwmAEIAUgDjaAA4AkgCgAKEAogCj
+AKQApQCmAKcAqACXAKoAqwCXAKsArgCvALABX4AWgA8JgA8JgBCAFIA42QAOAJIAoACiAKQApQCmAKcB
+8gCoA2YAqgNnAK4ArwCwAV8CQoAWgLmAuoAQgBSAOFhIaWRlIFgxMVFo2AAOAJIAoACiAKQApQCmAKcA
+qANvAKoAlwCuAK8AsAFfgBaAvIAPgBCAFIA4W0hpZGUgT3RoZXJz2gAOAJIAoAChAKIAowCkAKUApgCn
+AKgAlwCqAKsAlwCrAK4ArwCwAV+AFoAPCYAPCYAQgBSAONgADgCSAKAAogCkAKUApgCnAKgDgACqA4EA
+rgCvALABX4AWgL+AwIAQgBSAOFhRdWl0IFgxMVFxXF9OU0FwcGxlTWVuddoADgDGAJIAoACiAKQApQCm
+AKcAxwCoAlIAygCqAJcArgCvALADAQOQgBaAc4AYgA+AEIAUgKSAw9IADgBFAE0Dk4AfogJHA5WAcoDF
+2AAOAJIAoACiAKQApQCmAKcAqAOYAKoAlwCuAK8AsAJSgBaAxoAPgBCAFIBzXEN1c3RvbWl6ZS4uLtoA
+DgDGAJIAoACiAKQApQCmAKcAxwCoAuoC7QCqAJcArgCvALADAQOmgBaAm4DIgA+AEIAUgKSAyVRFZGl0
+0gAOAEUATQOqgB+oA6sDrAOtA64C8wOwA7EC4oDLgM6A0YDSgJ+A1YDYgJrYAA4AkgCgAKIApAClAKYA
+pwCoA7UAqgO2AK4ArwCwAuqAFoDMgM2AEIAUgJtUVW5kb1F62AAOAJIAoACiAKQApQCmAKcAqAO+AKoD
+vwCuAK8AsALqgBaAz4DQgBCAFICbVFJlZG9RWtoADgCSAKAAoQCiAKMApAClAKYApwCoAJcAqgCrAJcA
+qwCuAK8AsALqgBaADwmADwmAEIAUgJvYAA4AkgCgAKIApAClAKYApwCoA9AAqgPRAK4ArwCwAuqAFoDT
+gNSAEIAUgJtTQ3V0UXjYAA4AkgCgAKIApAClAKYApwCoA9kAqgPaAK4ArwCwAuqAFoDWgNeAEIAUgJtV
+UGFzdGVRdtgADgCSAKAAogCkAKUApgCnAKgD4gCqAJcArgCvALAC6oAWgNmAD4AQgBSAm1ZEZWxldGXa
+AA4AxgCSAKAAogCkAKUApgCnAMcAqAFyA+sAqgCXAK4ArwCwAwED8IAWgD2A24APgBCAFICkgNxWV2lu
+ZG930gAOADYANwPxgATSAA4ARQBNA/aAH6kD9wP4AnECxwP7AWoD/QP+A/+A34DigHuAkYDkgDyA5YDm
+gOjYAA4AkgCgAKIApAClAKYApwCoBAIAqgQDAK4ArwCwAXKAFoDggOGAEIAUgD1YTWluaW1pemVRbdgA
+DgCSAKAAogCkAKUApgCnAKgECwCqAJcArgCvALABcoAWgOOAD4AQgBSAPVRab29t2gAOAJIAoAChAKIA
+owCkAKUApgCnAKgAlwCqAKsAlwCrAK4ArwCwAXKAFoAPCYAPCYAQgBSAPdoADgCSAKAAoQCiAKMApACl
+AKYApwCoAJcAqgCrAJcAqwCuAK8AsAFygBaADwmADwmAEIAUgD3YAA4AkgCgAKIApAClAKYApwCoBCUA
+qgCXAK4ArwCwAXKAFoDngA+AEIAUgD1fEBJCcmluZyBBbGwgdG8gRnJvbnTaAA4AkgCgAKEAogCjAKQA
+pQCmAKcAqACXAKoAqwCXAKsArgCvALABcoAWgA8JgA8JgBCAFIA9Xl9OU1dpbmRvd3NNZW512gAOAMYA
+kgCgAKIApAClAKYApwDHAKgENwQ4AKoAlwCuAK8AsAMBBD2AFoDtgOuAD4AQgBSApIDsVEhlbHDTAA4A
+kgCUAJUEOARCgCCA64Du0gAOAEUATQRFgB+hBEaA79gADgCSAKAAogCkAKUApgCnAKgESQCqAJcArgCv
+ALAEN4AWgPCAD4AQgBSA7VhYMTEgSGVscFtfTlNNYWluTWVudVRtZW511AAOAIoAiwCMAPgA+QF9AaeA
+NYAygEKAUNQADgCKAIsAjACNBFgA+QRagCKA9YAygPnXAP0ADgD+AP8BAAEBAQIBxgEEBF4EXwEQAKsB
+xoBVgDGA9oD3CYBVXxAWe3sxOCwgMTgyfSwgezQwOSwgMjN9fd0BFAAOARUBFgEXARgBGQEaARsBHAEd
+AR4BHwEgASEAlwEjAZEBkgCXBGgBKARYASoBlwGYgDCAD4BHgA+A+IApgPVfEBBGdWxsIHNjcmVlbiBt
+b2RlXxARZW5hYmxlX2Z1bGxzY3JlZW7UAA4AigCLAIwA+AD5BFgEcYA1gDKA9YD7XxAaZW5hYmxlX2Z1
+bGxzY3JlZW5fY2hhbmdlZDrUAA4AigCLAIwA+AD5BHYEd4A1gDKA/YEBA9cA/QAOAP4A/wEAAQEBAgED
+AQQEewR8AQcAqwEDgCWAMYD+gP8JgCVfEBd7ezM3MiwgMjE1fSwgezEwMCwgMzJ9fd0BFAAOARUBFgEX
+ARgBGQEaARsBHAEdAR4BHwEgASEEggEjASQBJQSEBIUBKAR2ASoBKwEsgDCBAQGALIEBAoEBAIApgP1W
+UmVtb3Zl0gAOADYANwCygATSAA4ANgA3ALKABF8QEmFwcHNfdGFibGVfZGVsZXRlOtMADgCLAIwA+AOr
+BJGANYDLgQEFVXVuZG861AAOAIoAiwCMAPgA+QMgBJeANYAygKuBAQdbcHJlZnNfc2hvdzrUAA4AigCL
+AIwA+AD5ArYEnYA1gDKAjIEBCV8QEnRvZ2dsZV9mdWxsc2NyZWVuOtQADgCKAIsAjACNBKEA+QSjgCKB
+AQuAMoEBbt8QDwSlAA4EpgSnBKgEqQSqBKsErAStBK4ErwSwBLEEsgSzBLQEtQS2BLcEuAS5BLoEuwS8
+BL0BkQHiBL4Ev1xOU1dpbmRvd1ZpZXdfEBZOU1dpbmRvd0NvbnRlbnRNYXhTaXplXE5TU2NyZWVuUmVj
+dF8QE05TRnJhbWVBdXRvc2F2ZU5hbWVdTlNXaW5kb3dUaXRsZVlOU1dURmxhZ3NdTlNXaW5kb3dDbGFz
+c18QFk5TV2luZG93Q29udGVudE1pblNpemVcTlNXaW5kb3dSZWN0WU5TTWF4U2l6ZV8QD05TV2luZG93
+QmFja2luZ18QEU5TV2luZG93U3R5bGVNYXNrWU5TTWluU2l6ZVtOU1ZpZXdDbGFzc4EBEoEBbYEBEIEB
+aYEBbIEBDRJQeAAAgQEOgQERgQEMgQFrgQFqgQEPXxAYe3szMTksIDI5NH0sIHs0ODEsIDM0NX19XxAP
+WDExIFByZWZlcmVuY2VzV05TUGFuZWzSAA4ANgA3BMWABFRWaWV3XxAaezMuNDAyODJlKzM4LCAzLjQw
+MjgyZSszOH1aezIxMywgMTA3fdUA/QAOAQsBAAEMACsBDgTLARAEzIAAgQEzgQETgQFo0gAOAEUATQTP
+gB+hAYiBARTcAP0ADgTSBNMA/gE4AQsBAATUAQIE1QTWBLME2ATZAZcE2gEoBNwBEACrBLMAqwTgXk5T
+VGFiVmlld0l0ZW1zWU5TVHZGbGFnc18QEU5TRHJhd3NCYWNrZ3JvdW5kXxAWTlNBbGxvd1RydW5jYXRl
+ZExhYmVsc18QFU5TU2VsZWN0ZWRUYWJWaWV3SXRlbYEBEoEBZ4EBNYEBNIApgQEVCYEBEgmBATbSAA4A
+RQBNBOOAH6EBgYBD0gAOAEUATQTngB+oAqEE6QTqAX0E7AGmAlsE74CHgQEXgQEmgEKBASqATIB2gQEu
+1wD9AA4A/gD/AQABAQECAYEE8gTzBPQBEACrAYGAQ4EBJYEBGIEBGQmAQ18QFXt7MzYsIDkzfSwgezM4
+NSwgMzF9fdgBFAAOBPkBGgEbARwBHgT6ASAE+wT8BP0E/gTpBQAFAV8QEU5TQmFja2dyb3VuZENvbG9y
+W05TVGV4dENvbG9ygQEkgQEcgQEagQEbgQEXEgBAAACBASFfEGZXaGVuIGVuYWJsZWQsIG1lbnUgYmFy
 IGtleSBlcXVpdmFsZW50cyBtYXkgaW50ZXJmZXJlIHdpdGggWDExIGFwcGxpY2F0aW9ucyB0aGF0IHVz
-ZSB0aGUgTWV0YSBtb2RpZmllci7XAMEADgDCAMMAxADFAMYAxwK6A2QDZQDLAMwAx4AagJOAsICxCYAa
-XxAWe3szNiwgMTgyfSwgezM4NSwgMjl9fdgA1gAOAsEA3ADdAN4A4ALCAOICwwLEA2wCxgNNAsgCyYCS
-gIqAsoCJgK+Aj18QV0hvbGQgT3B0aW9uIGFuZCBDb21tYW5kIHdoaWxlIGNsaWNraW5nIHRvIGFjdGl2
-YXRlIHRoZSBtaWRkbGUgYW5kIHJpZ2h0IG1vdXNlIGJ1dHRvbnMuCtcAwQAOAMIAwwDEAMUAxgDHAMgD
-dAN1AMsAzADHgBqAJYC0gLUJgBpfEBZ7ezE4LCAxMDR9LCB7NDAyLCAxOH193QDWAA4A1wDYANkA2gDb
-ANwA3QDeAN8A4ADhAOIA4wCXAOUA5gDnAJcDfgDqA04A7ADtAO6AJIAOgCGADoC2gB6As18QIEVuYWJs
-ZSBrZXkgZXF1aXZhbGVudHMgdW5kZXIgWDEx1wDBAA4AwgDDAMQAxQDGAMcCugOFA4YAywDMAMeAGoCT
-gLiAuQmAGl8QFnt7MzYsIDEzM30sIHszODUsIDE0fX3YANYADgLBANwA3QDeAOACwgDiAsMCxAONAsYD
-TwLIAsmAkoCKgLqAiYC3gI9fED5BbGxvd3MgaW5wdXQgbWVudSBjaGFuZ2VzIHRvIG92ZXJ3cml0ZSB0
-aGUgY3VycmVudCBYMTEga2V5bWFwLlVJbnB1dNIAOgA7A5QDlaIDlQA/XU5TVGFiVmlld0l0ZW3WAA4D
-PQEMAz4C0QCIAz8DmAF5AYACxAOcgL2Av4BDgIKAioDA0gAOADYANwOfgARRMlZPdXRwdXTVAA4BDAM+
-AtEAiAM/AZUBgALEA6aAvYBJgIKAioDU0gAOAEUATQOpgD6lA6oBkQOsA60DroDDgEiAx4DLgM/XAMEA
-DgDCAMMAxADFAMYBlQDIA7IDswDLAMwBlYBJgCWAxIDFCYBJ3QDWAA4A1wDYANkA2gDbANwA3QDeAN8A
-4ADhAOIA4wCXAOUA5gDnAJcDuwDqA6oA7ADtAO6AJIAOgCGADoDGgB6Aw18QGEF1dGhlbnRpY2F0ZSBj
-b25uZWN0aW9uc9cAwQAOAMIAwwDEAMUAxgGVAroDwgPDAMsAzAGVgEmAk4DIgMkJgElfEBZ7ezM2LCAx
-Njl9LCB7Mzg1LCA0Mn192ADWAA4CwQDcAN0A3gDgAsIA4gLDAsQDygLGA6wCyALJgJKAioDKgImAx4CP
-XxCqTGF1bmNoaW5nIFgxMSB3aWxsIGNyZWF0ZSBYYXV0aG9yaXR5IGFjY2Vzcy1jb250cm9sIGtleXMu
-IElmIHRoZSBzeXN0ZW0ncyBJUCBhZGRyZXNzIGNoYW5nZXMsIHRoZXNlIGtleXMgYmVjb21lIGludmFs
-aWQgd2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy7XAMEADgDC
-AMMAxADFAMYBlQK6A9ID0wDLAMwBlYBJgJOAzIDNCYBJXxAVe3szNiwgOTJ9LCB7Mzg1LCA0Mn192ADW
-AA4CwQDcAN0A3gDgAsIA4gLDAsQD2gLGA60CyALJgJKAioDOgImAy4CPXxCZSWYgZW5hYmxlZCwgQXV0
-aGVudGljYXRlIGNvbm5lY3Rpb25zIG11c3QgYWxzbyBiZSBlbmFibGVkIHRvIGVuc3VyZSBzeXN0ZW0g
-c2VjdXJpdHkuIFdoZW4gZGlzYWJsZWQsIGNvbm5lY3Rpb25zIGZyb20gcmVtb3RlIGFwcGxpY2F0aW9u
-cyBhcmUgbm90IGFsbG93ZWQu1wDBAA4AwgDDAMQAxQDGAZUCugPiA+MAywDMAZWASYCTgNCA0QmASV8Q
-FXt7MTcsIDIwfSwgezQwNCwgMTR9fdgA1gAOAsEA3ADdAN4A4ALCAOICwwLEA+oCxgOuAsgCyYCSgIqA
-0oCJgM+Aj18QNFRoZXNlIG9wdGlvbnMgdGFrZSBlZmZlY3Qgd2hlbiBYMTEgaXMgbmV4dCBsYXVuY2hl
-ZC5YU2VjdXJpdHnSADoAOwPxAz6kAz4BDAENAD9aezQ3OCwgMzE2fV8QFXt7MCwgMH0sIHsxNDQwLCA4
-Nzh9fVp7MjEzLCAxMjl9WXgxMV9wcmVmc9IAOgA7A/cD+KID+AA/XxAQTlNXaW5kb3dUZW1wbGF0ZVtw
-cmVmc19wYW5lbNMADgCHAIgAiQP8A/2AF4DegOHYAA4AjQCOAI8AkACRAJIAkwCUBAAAlgQBAJgAmQCa
-AJuAFYDfgOCAD4ATgAxTQ3V0UXhUY3V0OtQADgC7AIcAiACJAL0BkQC/gBeAJoBIgCjUAA4AuwCHAIgA
-iQC9BBABr4AXgCaA5IBP2AAOAI0AjgCPAJAAkQCSAJMAlAQUAJYAlwCYAJkAmgJEgBWA5YAOgA+AE4Bu
-XEN1c3RvbWl6ZS4uLtQADgC7AIcAiAEiBBwAvQQegDCA54AmgOrXAA4AjQCPAJAAkQCSAJMAlAQhAJcA
-mACZAJoEJYAVgOmADoAPgBOA6NQADgCNAPIAnQCeBCgEKQQqgD+BAbuBAcmBAb1ZQWJvdXQgWDExXngx
-MV9hYm91dF9pdGVt1AAOALsAhwCIAIkAvQQwBDGAF4AmgOyA7tgADgCNAI4AjwCQAJEAkgCTAJQENACW
-AJcAmACZAJoCMIAVgO2ADoAPgBOAal8QEkJyaW5nIEFsbCB0byBGcm9udF8QD2JyaW5nX3RvX2Zyb250
-OtQADgC7AIcAiACJAL0EPgQ/gBeAJoDwgPPYAA4AjQCOAI8AkACRAJIAkwCUBEIAlgRDAJgAmQCaAjCA
-FYDxgPKAD4ATgGpcQ2xvc2UgV2luZG93UXddY2xvc2Vfd2luZG93OtQADgC7AIcAiAEiBEwAvQROgDCA
-9YAmgPfYAA4AjQCOAI8AkACRAJIAkwCUBFEEUgEaAJgAmQCaBCWAFYD2EgAYAACALIAPgBOA6F8QElRv
-Z2dsZSBGdWxsIFNjcmVlbl8QFnRvZ2dsZV9mdWxsc2NyZWVuX2l0ZW3UAA4AuwCHAIgBIgK2AL0EXYAw
-gJyAJoD5XxARZW5hYmxlX2Z1bGxzY3JlZW7UAA4AuwCHAIgAiQC9BGIEY4AXgCaA+4D92AAOAI0AjgCP
-AJAAkQCSAJMAlARmAJYAlwCYAJkAmgIwgBWA/IAOgA+AE4BqW1pvb20gV2luZG93XHpvb21fd2luZG93
-OtMADgCHAIgAiQRvBHCAF4D/gQEC2AAOAI0AjgCPAJAAkQCSAJMAlARzAJYEdACYAJkAmgCbgBWBAQCB
-AQGAD4ATgAxUUmVkb1FaVXJlZG861AAOALsAhwCIAIkAHwR+BH+AF4ACgQEEgQEH2AAOAI0AjgCPAJAA
-kQCSAJMAlASCAJYEgwCYAJkAmgQlgBWBAQWBAQaAD4ATgOhYUXVpdCBYMTFRcVp0ZXJtaW5hdGU60wAO
-AIcAiACJBIwEjYAXgQEJgQEM2AAOAI0AjgCPAJAAkQCSAJMAlASQAJYEkQCYAJkAmgCbgBWBAQqBAQuA
-D4ATgAxUVW5kb1F6VXVuZG861AAOALsAhwCIAIkAHwSbBJyAF4ACgQEOgQEQ2AAOAI0AjgCPAJAAkQCS
-AJMAlASfAJYAlwCYAJkAmgQlgBWBAQ+ADoAPgBOA6FtIaWRlIE90aGVyc18QFmhpZGVPdGhlckFwcGxp
-Y2F0aW9uczrUAA4AuwCHAIgAiQC9BKkEqoAXgCaBARKBARXYAA4AjQCOAI8AkACRAJIAkwCUBK0AlgCX
-AJgAmQCaBLGAFYEBFIAOgA+AE4EBE9MADgCNAJ0AngS0BLWAP4EB3IEB3lhYMTEgSGVscFl4MTFfaGVs
-cDrUAA4AuwCHAIgAiQC9A04Av4AXgCaAs4Ao1AAOALsAhwCIASIDTgC9BMGAMICzgCaBARhfEBBlbmFi
-bGVfa2V5ZXF1aXZz1AAOALsAhwCIAIkAvQTGBMeAF4AmgQEagQEj1wDBAA4AwgDDAMQAxQDGBMkAyATL
-BMwEzQDMBMmBARuAJYEBHIEBHREBLQmBARvVAMEADgDCAM8AxAArANEE0wTUAMuAAIClgQG3gQGoXxAX
-e3szNzIsIDIzMH0sIHsxMDAsIDMyfX3dANYADgDXANgA2QDaANsA3ADdAN4A3wDgAOEA4gDjBNgA5QHG
-BNkE2gTbAOoExgDsBN4E34AkgQEhgQEfgQEigQEegB6BARoSCDgAABP/////hoJA/1lEdXBsaWNhdGXU
-AA4A8QDyAPMA9AD1BOMB2YAggQEgWUhlbHZldGljYdIADgA2ADcAooAE0gAOADYANwCigARfEBVhcHBz
-X3RhYmxlX2R1cGxpY2F0ZTrUAA4AuwCHAIgBIgFJAL0E7oAwgDmAJoEBJV5kb2NrX2FwcHNfbWVuddQA
-DgC7AIcAiACJAL0E8wT0gBeAJoEBJ4EBLdcAwQAOAMIAwwDEAMUAxgTJAMgE+AT5BM0AzATJgQEbgCWB
-ASiBASkJgQEbXxAXe3szNzIsIDI2Mn0sIHsxMDAsIDMyfX3dANYADgDXANgA2QDaANsA3ADdAN4A3wDg
-AOEA4gDjBP8A5QHGBNkFAQUCAOoE8wDsBN4E34AkgQErgQEfgQEsgQEqgB6BASdYQWRkIEl0ZW3SAA4A
-NgA3AKKABNIADgA2ADcAooAEXxAPYXBwc190YWJsZV9uZXc61AAOALsAhwCIAIkAHwQcBQ+AF4ACgOeB
-AS9fEB1vcmRlckZyb250U3RhbmRhcmRBYm91dFBhbmVsOtQADgC7AIcAiAEiASwAvQUVgDCAMoAmgQEx
-WWRvY2tfbWVuddQADgC7AIcAiACJAL0FGgUbgBeAJoEBM4EBNtgADgCNAI4AjwCQAJEAkgCTAJQFHgCW
-BR8AmACZAJoCMIAVgQE0gQE1gA+AE4BqW05leHQgV2luZG93YfcDXG5leHRfd2luZG93OtQADgC7AIcA
-iACJAL0FKQUqgBeAJoEBOIEBPdcAwQAOAMIAwwDEAMUAxgTJAMgFLgUvBTAAzATJgQEbgCWBATmBAToR
-AS8JgQEbXxAVe3szODgsIDEyfSwgezg0LCAzMn193QDWAA4A1wDYANkA2gDbANwA3QDeAN8A4ADhBTUA
-4wCXAOUBxgTZBTkFOgDqBSkA7ATeBN8T/////4QB/gCAJIAOgQEfgQE8gQE7gB6BAThURG9uZdIADgA2
-ADcAooAEXxAQYXBwc190YWJsZV9kb25lOtQADgC7AIcAiACJAL0DqgC/gBeAJoDDgCjUAA4AuwCHAIgB
-IgOqAL0FSoAwgMOAJoEBQFtlbmFibGVfYXV0aNQADgC7AIcAiAEiBU4AvQVQgDCBAUKAJoEBad8QEwDB
-BVIADgKcBVMCwQVUBVUFVgVXBVgAxAKRAMUFWQVaAMYFWwVcBV0A7QVeBV8FYAVhAMwFYwVkAcYFZQDL
-BWYAzAVoAeoFXQVqBWtfEB9OU0RyYWdnaW5nU291cmNlTWFza0Zvck5vbkxvY2FsXE5TSGVhZGVyVmll
-d18QEk5TQWxsb3dzVHlwZVNlbGVjdFxOU0Nvcm5lclZpZXdfEBdOU0ludGVyY2VsbFNwYWNpbmdXaWR0
-aF8QGU5TQ29sdW1uQXV0b3Jlc2l6aW5nU3R5bGVfEBhOU0ludGVyY2VsbFNwYWNpbmdIZWlnaHRbTlNH
-cmlkQ29sb3JfEBxOU0RyYWdnaW5nU291cmNlTWFza0ZvckxvY2FsXk5TVGFibGVDb2x1bW5zW05TUm93
-SGVpZ2h0gQFDgQFoElJAgACBAUWBAVYJgQFJI0AIAAAAAAAAI0AAAAAAAAAAgQFECYEBZYEBQ4EBTSNA
-MQAAAAAAANoAwQAOAMIFbQDPAMQFbgVvAMYFcAVxBXIFcwV0BXUFdgVOBXgFcQVOWU5TY3ZGbGFnc1lO
-U0RvY1ZpZXdZTlNCR0NvbG9yXU5TTmV4dEtleVZpZXeBAUqBAayBAasQBIEBqhEJAIEBQoEBY4EBSoEB
-Qlp7MzMzLCAxOTd91gDBAA4AxAKRAMYFfQV+BX8AywWABX4FTltOU1RhYmxlVmlld4EBRoEBSIEBR4EB
-RoEBQtoAwQAOAMIFbQDPAMQFbgVvAMYFcAVxBXIFhgV0BYcFdgVgBXgFcQVggQFKgQGsgQG0gQGzgQFF
-gQFjgQFKgQFFWXszMzMsIDE3fdIAOgA7BY4Fj6QFjwEMAQ0AP18QEU5TVGFibGVIZWFkZXJWaWV31QDB
-AA4AwgDEAMYFcQWSBZMAywVxgQFKgQFMgQFLgQFK3QDBBZYADgDCBZcFmADPBZkAxADGBZoFcAWbBMkF
-nQWeBZ8FoAV+BaIFowWkBMkFpgVdBV1bTlNIU2Nyb2xsZXJYTlNzRmxhZ3NfEBBOU0hlYWRlckNsaXBW
-aWV3XE5TU2Nyb2xsQW10c1tOU1ZTY3JvbGxlcl1OU0NvbnRlbnRWaWV3gQEbgQGxgQG2gQG1EDKBAUaB
-AalPEBBBIAAAQSAAAEGYAABBmAAAEQEzgQEbgQGtgQFDgQFDXxAUe3szMzQsIDB9LCB7MTYsIDE3fX3S
-ADoAOwWrBaykBawBDAENAD9dX05TQ29ybmVyVmlld9IADgBFAE0Fr4A+owWwBbEFsoEBToEBWIEBXNoF
-tAAOBbUFtgW3BbgFuQW6BbsFfQDMBb0FvgW/BcABzwXBBcIAzAVOXk5TSXNSZXNpemVhYmxlXE5TSGVh
-ZGVyQ2VsbFdOU1dpZHRoWk5TRGF0YUNlbGxeTlNSZXNpemluZ01hc2taTlNNaW5XaWR0aFpOU01heFdp
-ZHRoXE5TSXNFZGl0YWJsZQmBAVeBAU8jQFPAAAAAAACBAVUjQEQAAAAAAAAjQI9AAAAAAAAJgQFC1wDW
-AA4CwQDcAN0A4ALCBcYFxwXIBckCxgDtBcsSBIH+AIEBVIEBUYEBUICJgQFSVE5hbWXTAA4C0gLdAtUB
-zwXPgI5LMC4zMzMzMzI5OQDVAA4C0QLSAtMC1ALVAuQC1wXTAtmAjoCRgQFTgItfEA9oZWFkZXJUZXh0
-Q29sb3LSADoAOwXXBdilBdgC7QEHAMMAP18QEU5TVGFibGVIZWFkZXJDZWxs1wDWAA4CwQDdAN4A4ALC
-BdoCwwVhAOoFTgHTAskSFDH+QICSgQFWgB6BAUKAj9MADgLSAt0C1QHPBeKAjkIxANIAOgA7BeQF5aIF
-5QA/XU5TVGFibGVDb2x1bW7aBbQADgW1BbYFtwW4BbkFugW7BX0AzAW9BekF6gXrAc8F7AXCAMwFTgmB
-AVeBAVkjQGg3ZGAAAACBAVsjQE9dkWAAAAAJgQFC1wDWAA4CwQDcAN0A4ALCBcYFxwXIBfICxgDtBcuB
-AVSBAVGBAVqAiYEBUldDb21tYW5k1wDWAA4CwQDdAN4A4ALCBdoCwwVhAOoFTgHTAsmAkoEBVoAegQFC
-gI/aBbQADgW1BbYFtwW4BbkFugW7BX0AzAW9Bf8GAAYBAc8GAgXCAMwFTgmBAVeBAV0jQEmAAAAAAACB
-AWEjQCQAAAAAAAAJgQFC1wDWAA4CwQDcAN0A4ALCAOIFxwYHBggCxgDtBcuBAVSBAV+BAV6AiYEBUlhT
-aG9ydGN1dNUADgLRAtIC0wLUAtUFYQLXBg8C2YCOgQFWgQFggItbaGVhZGVyQ29sb3LYANYADgLBAN0A
-3gDgAp0CwgXaAsMFeAYVBU4B0wDMAsmAkoEBY4EBYoEBQgmAj9QADgDxAPIA8wD0BhsA9gHZgCAjQCgA
-AAAAAACAH9UADgLRAtIC0wLUAtUC1gLXBiAC2YCOgI2BAWSAi18QFmNvbnRyb2xCYWNrZ3JvdW5kQ29s
-b3LVAA4C0QLSAtMC1ALVBiUC1wYmAtmAjoEBZ4EBZoCLWWdyaWRDb2xvctMADgLSAt0C1QHPBiuAjkQw
-LjUA0gA6ADsGLQV9pQV9AQsBDAENAD9aYXBwc190YWJsZdQADgC7AIcAiACJAB8GMgYzgBeAAoEBa4EB
-btkADgCNAI4AjwCQAJEAkgCTAeAAlAY2AJYGNwCYAJkAmgQlBjuAFYEBbIEBbYAPgBOA6BAqWEhpZGUg
-WDExUWhVaGlkZTrUAA4AuwCHAIgAiQAfBkIGQ4AXgAKBAXCBAXLZAA4AjQCOAI8AkACRAJIAkwHgAJQG
-RgCWAJcAmACZAJoEJQY7gBWBAXGADoAPgBOA6FhTaG93IEFsbF8QFnVuaGlkZUFsbEFwcGxpY2F0aW9u
-czrTAA4AhwCIAIkGTwZQgBeBAXSBAXfYAA4AjQCOAI8AkACRAJIAkwCUBlMAlgZUAJgAmQCaAJuAFYEB
-dYEBdoAPgBOADFVQYXN0ZVF2VnBhc3RlOtQADgC7AIcAiACJAL0GXgZfgBeAJoEBeYEBf9cAwQAOAMIA
-wwDEAMUAxgTJAMgGYwZkBM0AzATJgQEbgCWBAXqBAXsJgQEbXxAXe3szNzIsIDE5OH0sIHsxMDAsIDMy
-fX3dANYADgDXANgA2QDaANsA3ADdAN4A3wDgAOEA4gDjBmoA5QHGBNkGbAZtAOoGXgDsBN4E34AkgQF9
-gQEfgQF+gQF8gB6BAXlWUmVtb3Zl0gAOADYANwCigATSAA4ANgA3AKKABF8QEmFwcHNfdGFibGVfZGVs
-ZXRlOtQADgC7AIcAiAEiAL4AvQZ6gDCAGYAmgQGBW3N5bmNfa2V5bWFw1AAOALsAhwCIAIkAvQZ/BoCA
-F4AmgQGDgQGG2AAOAI0AjgCPAJAAkQCSAJMAlAaDAJYGhACYAJkAmgQlgBWBAYSBAYWAD4ATgOheUHJl
-ZmVyZW5jZXMuLi5RLFtwcmVmc19zaG93OtQADgC7AIcAiACJAL0ETAaPgBeAJoD1gQGIXxASdG9nZ2xl
-X2Z1bGxzY3JlZW461AAOALsAhwCIAIkAvQK2BpWAF4AmgJyBAYpfEBplbmFibGVfZnVsbHNjcmVlbl9j
-aGFuZ2VkOtQADgC7AIcAiAEiATgAvQabgDCANYAmgQGMXxAVZG9ja193aW5kb3dfc2VwYXJhdG9y1AAO
-ALsAhwCIAIkAvQJMAL+AF4AmgHGAKNQADgC7AIcAiACJAL0GpQamgBeAJoEBj4EBktgADgCNAI4AjwCQ
-AJEAkgCTAJQGqQCWBqoAmACZAJoCMIAVgQGQgQGRgA+AE4BqXxAPUHJldmlvdXMgV2luZG93YfcCXxAQ
-cHJldmlvdXNfd2luZG93OtQADgC7AIcAiACJAL0GtAa1gBeAJoEBlIEBl9gADgCNAI4AjwCQAJEAkgCT
-AJQGuACWBrkAmACZAJoCMIAVgQGVgQGWgA+AE4BqXxAPTWluaW1pemUgV2luZG93UW1fEBBtaW5pbWl6
-ZV93aW5kb3c61AAOALsAhwCIAIkAvQbDBsSAF4AmgQGZgQGf1wDBAA4AwgDDAMQAxQDGBMkAyAbIBskF
-MADMBMmBARuAJYEBmoEBmwmBARtfEBV7ezMwNCwgMTJ9LCB7ODQsIDMyfX3dANYADgDXANgA2QDaANsA
-3ADdAN4A3wDgAOEA4gDjBs8A5QHGBNkG0QbSAOoGwwDsBN4E34AkgQGdgQEfgQGegQGcgB6BAZlWQ2Fu
-Y2Vs0gAOADYANwCigATSAA4ANgA3AKKABF8QEmFwcHNfdGFibGVfY2FuY2VsOtQADgC7AIcAiAEiAXYA
-vQbfgDCAQoAmgQGhW3VzZV9zeXNiZWVw0wAOAIcAiACJBuMG5IAXgQGjgQGm2AAOAI0AjgCPAJAAkQCS
-AJMAlAbnAJYG6ACYAJkAmgCbgBWBAaSBAaWAD4ATgAxUQ29weVFjVWNvcHk60gAOAEUG8AbxgQHsrxB9
-BsMEyQG6AZECRAH6BBwGtAMVAyYBeQC+Bv4EfgNNAZUFKQcDBZ0HBQcGBBABOQOuASwDZQK3Ac0BdgWy
-BJsC9QZeAjACewQ+A04DdQF8A/wHGgHUBxwHHQYyA8MHIAJpBMYGyQNPBk8E8wK0BGIGfwcqAwUHLAIl
-AUkGQgcwArwCTAC9AYAFcQRMBbEE+QQwA7MBOAVOBbADOQNVAIoCOQdCBaYBWgdFBKkEjAH4BuMHSgKy
-BWADOwK1AlMD4wYBAqkFwAOGB1UBtAOsA60BFQK2A9MAxwZkBqUHXwSxA6oEJQdjBMwF6wFZBRoB+QGY
-BS8AmwDKA0wEb4EBmYEBG4BTgEiAboBjgOeBAZSAnoCigEOAGYEBuYEBBICvgEmBATiBAb+BAbGBAcaB
-AcqA5IA2gM+AMoCxgKCAV4BCgQFcgQEOgJaBAXmAaoCAgPCAs4C1gEWA3oEBuoBYgQHbgQHHgQFrgMmB
-AdeAeYEBGoEBm4C3gQF0gQEngJSA+4EBg4EBzoCagQHggGmAOYEBcIEBvoCHgHGAJoCCgQFKgPWBAViB
-ASmA7IDFgDWBAUKBAU6AqICtgAuAbYEB4oEBrYA8gQHYgQESgQEJgF2BAaOBAdOAhYEBRYDBgJiAc4DR
-gQFhgL6BAVWAuYEBz4BRgMeAy4AqgJyAzYAagQF7gQGPgQHIgQETgMOA6IEBwoEBHYEBW4A7gQEzgGCA
-S4EBOoAMgByAq4D/0gAOAEUATQdxgD6mBSkExgZeBXEGwwTzgQE4gQEagQF5gQFKgQGZgQEn0gAOAEUA
-TQd6gD6lBV0FpgWdBX4FY4EBQ4EBrYEBsYEBRoEBSdIADgBFAE0HgoA+oQVOgQFCXxAVe3sxLCAxN30s
-IHszMzMsIDE5N3190gA6ADsHhgeHpAeHAQwBDQA/Wk5TQ2xpcFZpZXfYAMEB3wAOAMIAxAFHAMYHiQVx
-BXEHjAeNAMsHjgVxB5BZTlNQZXJjZW50gQFKgQFKgQGwgQGugQGvgQFKIz/v1mqAAAAAXxAWe3szMzQs
-IDE3fSwgezE1LCAxOTd9fVxfZG9TY3JvbGxlcjrSADoAOweUB5WlB5UBCwEMAQ0AP1pOU1Njcm9sbGVy
-2QDBAd8ADgDCBZcAxAFHAMYHiQVxBXEHjAeaAcYAyweOBXEHnYEBSoEBSoEBsIEBsoEBr4EBSiM/788X
-wAAAAF8QFXt7MSwgMjE0fSwgezMzMywgMTV9fdIADgBFAE0HoYA+oQVggQFFXxATe3sxLCAwfSwgezMz
-MywgMTd9fV8QFnt7MjAsIDYwfSwgezM1MCwgMjMwfX3SADoAOwemB6ekB6cBDAENAD9cTlNTY3JvbGxW
-aWV3XxAUe3sxLCAxfSwgezQ4NiwgMzEwfX3SAA4ARQBNB6uAPqICOQQQgG2A5NoADgFGAI0AjgCPAJAA
-kQCSAJMBRwCUBCUEKACWAJcAmACZAJoHGge2gBWA6IEBu4AOgA+AE4EBuoEBvNQADgCNAPIAnQCeB7kH
-uge7gD+BAdGBAd+BAdJTWDEx0gAOAEUATQe/gD6sBBwGfwcwBwMHBQRMBx0GMgSbBkIHXwR+gOeBAYOB
-Ab6BAb+BAcaA9YEBx4EBa4EBDoEBcIEByIEBBNoADgCNAI4BOwCPATwAkACRAJIAkwCUAJcAlgDMAJcA
-zACYAJkAmgQlgBWADgmADgmAD4ATgOjaAA4BRgCNAI4AjwCQAJEAkgCTAUcAlAdjB9gAlgCXAJgAmQCa
-BCUH3YAVgQHCgQHAgA6AD4ATgOiBAcFYU2VydmljZXPUAA4AjQDyAJ0AngfhB+IH44A/gQHDgQHFgQHE
-0gAOADYANwfegATSAA4ARQBNB+iAPqBfEA9fTlNTZXJ2aWNlc01lbnXaAA4AjQCOATsAjwE8AJAAkQCS
-AJMAlACXAJYAzACXAMwAmACZAJoEJYAVgA4JgA4JgA+AE4Do2gAOAI0AjgE7AI8BPACQAJEAkgCTAJQA
-lwCWAMwAlwDMAJgAmQCaBCWAFYAOCYAOCYAPgBOA6NoADgCNAI4BOwCPATwAkACRAJIAkwCUAJcAlgDM
-AJcAzACYAJkAmgQlgBWADgmADgmAD4ATgOhcX05TQXBwbGVNZW512gAOAUYAjQCOAI8AkACRAJIAkwFH
-AJQCRAFKAJYAlwCYAJkAmgcaCA6AFYBugDeADoAPgBOBAbqBAcvSAA4ANgA3CBGABFZXaW5kb3fSAA4A
-RQBNCBSAPqkGtAQ+BGIHKgUaBqUHVQQwAiWBAZSA8ID7gQHOgQEzgQGPgQHPgOyAadoADgCNAI4BOwCP
-ATwAkACRAJIAkwCUAJcAlgDMAJcAzACYAJkAmgIwgBWADgmADgmAD4ATgGraAA4AjQCOATsAjwE8AJAA
-kQCSAJMAlACXAJYAzACXAMwAmACZAJoCMIAVgA4JgA4JgA+AE4BqXl9OU1dpbmRvd3NNZW51WE1haW5N
-ZW510gAOAEUATQg0gD6lBv4HBgdKB0UHHIEBuYEByoEB04EB2IEB29oADgFGAI0AjgCPAJAAkQCSAJMB
-RwCUAJsAnwCWAJcAmACZAJoHGghCgBWADIEB1IAOgA+AE4EBuoEB1VRFZGl00gAOAEUATQhGgD6oBIwE
-bwcgA/wG4wZPAIoBFYEBCYD/gQHXgN6BAaOBAXSAC4Aq2gAOAI0AjgE7AI8BPACQAJEAkgCTAJQAlwCW
-AMwAlwDMAJgAmQCaAJuAFYAOCYAOCYAPgBOADNoADgFGAI0AjgCPAJAAkQCSAJMBRwCUAjAIWwCWAJcA
-mACZAJoHGghggBWAaoEB2YAOgA+AE4EBuoEB2toADgFGAI0AjgCPAJAAkQCSAJMBRwCUBLEEtACWAJcA
-mACZAJoHGghpgBWBAROBAdyADoAPgBOBAbqBAd1USGVscNIADgBFAE0IbYA+oQSpgQESW19OU01haW5N
-ZW510gAOADIAMwhygAWBAeHfEA8CbQAOAm4CbwJwAnECcgJzAnQCdQJ2AncCeAJ5AnoEyQJ8CHYIdwh4
-CHkCgQKCCHsIfAh9AOYIfgh/CICBARuA24EB5oEB6IEB64EB5IB8gQHngQHjgQHqEAuBAemBAeVfEBh7
-ezI3OSwgMjcwfSwgezQ4NiwgMzEwfX1fEBRYMTEgQXBwbGljYXRpb24gTWVuddIADgA2ADcCjYAEWHgx
-MV9hcHBz0gA6ADsIhwFvogFvAD/SAA4ARQbwCIqBAeyvEH0EyQdCAbQBlQcGAdQEJQIwArYCtwKpAMcH
-GgQlAMcDOwTJBCUFcQQlBxoCRAEsAZUAHwNNAXkB1AF5BU4EJQK0BMkHRQJpAjAAxwNOAXYAmwAfAboH
-GgQlBCUDrACbAB8EyQbDAMcAmwTJAXkCMAQlAjACtQAfAjABOQQlBCUCsgDHAB8CewTJBCUFTgTzAjAD
-qgEsBXEFTgGAA0wAmwJEAB8FcQFJBxoEsQCbAdQAmwcaAXkFcQGAAXkCTAOuBbIBgAWwA08CMAF5AZUB
-lQCbAXkDrQM5Bl4CMAQlBxwBlQb+BwMExgWxAUkCMAHUAZEFKQdKAL4AxwCbgQEbgQHigFGASYEByoBY
-gOiAaoCcgKCAvoAagQG6gOiAGoDBgQEbgOiBAUqA6IEBuoBugDKASYACgK+AQ4BYgEOBAUKA6ICUgQEb
-gQHYgHmAaoAagLOAQoAMgAKAU4EBuoDogOiAx4AMgAKBARuBAZmAGoAMgQEbgEOAaoDogGqAmIACgGqA
-NoDogOiAhYAagAKAgIEBG4DogQFCgQEngGqAw4AygQFKgQFCgIKAq4AMgG6AAoEBSoA5gQG6gQETgAyA
-WIAMgQG6gEOBAUqAgoBDgHGAz4EBXICCgQFOgLeAaoBDgEmASYAMgEOAy4CogQF5gGqA6IEB24BJgQG5
-gQG/gQEagQFYgDmAaoBYgEiBATiBAdOAGYAagAzSAA4ARQbwCQqBAeyvEH4GwwTJAboBkQJEAfoEHAa0
-AxUDJgAfAXkBlQb+BH4FKQWdAL4HAwNNBwYHBQQQATkDrgEsA2UCtwHNBbIBdgSbBl4C9QIwAnsEPgNO
-A3UBfAP8BxoB1AccBMYHHQYyAmkHIAbJBPMDTwZPA8MCtARiBn8HKgMFAiUHLAFJBkIHMAK8AkwAvQGA
-BXEETAT5BbEEMAE4A7MFTgWwB0IDOQCKAjkFpgNVAVoHRQSpBIwB+AbjB0oFYAKyAzsCtQYBAlMD4wKp
-BcADhgdVA6wBtAOtARUCtgZkAMcD0wSxB18GpQOqBCUBWQTMB2MF6wUaAZgB+QUvAJsAygNMBG+BAZmB
-ARuAU4BIgG6AY4DngQGUgJ6AooACgEOASYEBuYEBBIEBOIEBsYAZgQG/gK+BAcqBAcaA5IA2gM+AMoCx
-gKCAV4EBXIBCgQEOgQF5gJaAaoCAgPCAs4C1gEWA3oEBuoBYgQHbgQEagQHHgQFrgHmBAdeBAZuBASeA
-t4EBdIDJgJSA+4EBg4EBzoCagGmBAeCAOYEBcIEBvoCHgHGAJoCCgQFKgPWBASmBAViA7IA1gMWBAUKB
-AU6BAeKAqIALgG2BAa2ArYA8gQHYgQESgQEJgF2BAaOBAdOBAUWAhYDBgJiBAWGAc4DRgL6BAVWAuYEB
-z4DHgFGAy4AqgJyBAXuAGoDNgQETgQHIgQGPgMOA6IA7gQEdgQHCgQFbgQEzgEuAYIEBOoAMgByAq4D/
-0gAOAEUG8AmLgQHsrxB+CYwJjQmOCY8JkAmRCZIJkwmUCZUJlgmXCZgJmQmaCZsJnAmdCZ4JnwmgCaEJ
-ogmjCaQJpQmmCacJqAmpCaoJqwmsCa0JrgmvCbAJsQmyCbMJtAe5CbYJtwm4CbkJugm7CbwJvQm+Cb8J
-wAnBCcIJwwnECcUJxgnHCcgJyQnKCcsJzAnNARAJzwnQCdEJ0gnTCdQJ1QnWCdcJ2AnZCdoJ2wncCd0J
-3gnfCeAJ4QniCeMJ5AnlCeYJ5wnoCekJ6gnrCewJ7QnuCe8J8AnxCfIJ8wn0CfUJ9gn3CfgJ+Qn6CfsJ
-/An9Cf4J/woACgEKAgoDCgQKBQoGCgcKCAoJgQHwgQHxgQHygQHzgQH0gQH1gQH2gQH3gQH4gQH5gQH6
-gQH7gQH8gQH9gQH+gQH/gQIAgQIBgQICgQIDgQIEgQIFgQIGgQIHgQIIgQIJgQIKgQILgQIMgQINgQIO
-gQIPgQIQgQIRgQISgQITgQIUgQIVgQIWgQIXgQIYgQHRgQIZgQIagQIbgQIcgQIdgQIegQIfgQIggQIh
-gQIigQIjgQIkgQIlgQImgQIngQIogQIpgQIqgQIrgQIsgQItgQIugQIvgQIwgCeBAjGBAjKBAjOBAjSB
-AjWBAjaBAjeBAjiBAjmBAjqBAjuBAjyBAj2BAj6BAj+BAkCBAkGBAkKBAkOBAkSBAkWBAkaBAkeBAkiB
-AkmBAkqBAkuBAkyBAk2BAk6BAk+BAlCBAlGBAlKBAlOBAlSBAlWBAlaBAleBAliBAlmBAlqBAluBAlyB
-Al2BAl6BAl+BAmCBAmGBAmKBAmOBAmSBAmWBAmaBAmeBAmiBAmmBAmqBAmtfEBRQdXNoIEJ1dHRvbiAo
-Q2FuY2VsKV5Db250ZW50IFZpZXctMV8QIVBvcCBVcCBCdXR0b24gQ2VsbCAoRnJvbSBEaXNwbGF5KV8Q
-MkNoZWNrIEJveCAoQWxsb3cgY29ubmVjdGlvbnMgZnJvbSBuZXR3b3JrIGNsaWVudHMpXxATTWVudSAo
-QXBwbGljYXRpb25zKV8QFE1lbnUgSXRlbSAoTWlsbGlvbnMpXxAVTWVudSBJdGVtIChBYm91dCBYMTEp
-XxAbTWVudSBJdGVtIChNaW5pbWl6ZSBXaW5kb3cpXxAeQnV0dG9uIENlbGwgKEZ1bGwgc2NyZWVuIG1v
-ZGUpXxB2VGV4dCBGaWVsZCBDZWxsIChFbmFibGVzIHRoZSBYMTEgcm9vdCB3aW5kb3cuIFVzZSB0aGUg
-Q29tbWFuZC1PcHRpb24tQSBrZXlzdHJva2UgdG8gZW50ZXIgYW5kIGxlYXZlIGZ1bGwgc2NyZWVuIG1v
-ZGUuKVxGaWxlJ3MgT3duZXJWVmlldy0yVlZpZXctMV8QD01lbnUgSXRlbSAoWDExKV8QFE1lbnUgSXRl
-bSAoUXVpdCBYMTEpXxASUHVzaCBCdXR0b24gKERvbmUpXxATSG9yaXpvbnRhbCBTY3JvbGxlcl8QKUNo
-ZWNrIEJveCAoRm9sbG93IHN5c3RlbSBrZXlib2FyZCBsYXlvdXQpXxAUTWVudSBJdGVtIChTZXJ2aWNl
-cylfEGVTdGF0aWMgVGV4dCAoSG9sZCBPcHRpb24gYW5kIENvbW1hbmQgd2hpbGUgY2xpY2tpbmcgdG8g
-YWN0aXZhdGUgdGhlIG1pZGRsZSBhbmQgcmlnaHQgbW91c2UgYnV0dG9ucy4KKV8QGE1lbnUgSXRlbSAo
-QXBwbGljYXRpb25zKVtTZXBhcmF0b3ItMV8QGE1lbnUgSXRlbSAoQ3VzdG9taXplLi4uKV8QGk1lbnUg
-SXRlbSAoQXBwbGljYXRpb25zKS0xXxBCU3RhdGljIFRleHQgKFRoZXNlIG9wdGlvbnMgdGFrZSBlZmZl
-Y3Qgd2hlbiBYMTEgaXMgbmV4dCBsYXVuY2hlZC4pWERvY2tNZW51XxBpVGV4dCBGaWVsZCBDZWxsIChI
-b2xkIE9wdGlvbiBhbmQgQ29tbWFuZCB3aGlsZSBjbGlja2luZyB0byBhY3RpdmF0ZSB0aGUgbWlkZGxl
-IGFuZCByaWdodCBtb3VzZSBidXR0b25zLgopXxByU3RhdGljIFRleHQgKEVuYWJsZXMgdGhlIFgxMSBy
-b290IHdpbmRvdy4gVXNlIHRoZSBDb21tYW5kLU9wdGlvbi1BIGtleXN0cm9rZSB0byBlbnRlciBhbmQg
-bGVhdmUgZnVsbCBzY3JlZW4gbW9kZS4pXxAYTWVudSBJdGVtIChGcm9tIERpc3BsYXkpXxAXVGFibGUg
-Q29sdW1uIChTaG9ydGN1dClfECNDaGVjayBCb3ggKFVzZSBzeXN0ZW0gYWxlcnQgZWZmZWN0KV8QF01l
-bnUgSXRlbSAoSGlkZSBPdGhlcnMpXxAUUHVzaCBCdXR0b24gKFJlbW92ZSlfEBpUZXh0IEZpZWxkIENl
-bGwgKENvbG9yczoKKV1NZW51IChXaW5kb3cpXENvbnRlbnQgVmlld18QGE1lbnUgSXRlbSAoQ2xvc2Ug
-V2luZG93KV8QLENoZWNrIEJveCAoRW5hYmxlIGtleSBlcXVpdmFsZW50cyB1bmRlciBYMTEpXxAuQnV0
-dG9uIENlbGwgKEVuYWJsZSBrZXkgZXF1aXZhbGVudHMgdW5kZXIgWDExKV8QJUJ1dHRvbiBDZWxsIChV
-c2Ugc3lzdGVtIGFsZXJ0IGVmZmVjdClfEA9NZW51IEl0ZW0gKEN1dClfEBFNZW51IChPdGhlclZpZXdz
-KV8QEE1lbnUgSXRlbSAoSGVscClfEBdQdXNoIEJ1dHRvbiAoRHVwbGljYXRlKVtTZXBhcmF0b3ItMl8Q
-FE1lbnUgSXRlbSAoSGlkZSBYMTEpWlByZWZzUGFuZWxbU2VwYXJhdG9yLTlfEBRCdXR0b24gQ2VsbCAo
-Q2FuY2VsKV8QFlB1c2ggQnV0dG9uIChBZGQgSXRlbSlfEExTdGF0aWMgVGV4dCAoQWxsb3dzIGlucHV0
-IG1lbnUgY2hhbmdlcyB0byBvdmVyd3JpdGUgdGhlIGN1cnJlbnQgWDExIGtleW1hcC4pXxARTWVudSBJ
-dGVtIChQYXN0ZSlfELxUZXh0IEZpZWxkIENlbGwgKExhdW5jaGluZyBYMTEgd2lsbCBjcmVhdGUgWGF1
-dGhvcml0eSBhY2Nlc3MtY29udHJvbCBrZXlzLiBJZiB0aGUgc3lzdGVtJ3MgSVAgYWRkcmVzcyBjaGFu
-Z2VzLCB0aGVzZSBrZXlzIGJlY29tZSBpbnZhbGlkIHdoaWNoIG1heSBwcmV2ZW50IFgxMSBhcHBsaWNh
-dGlvbnMgZnJvbSBsYXVuY2hpbmcuKV8QFlN0YXRpYyBUZXh0IChDb2xvcnM6CilfEBdNZW51IEl0ZW0g
-KFpvb20gV2luZG93KV8QGk1lbnUgSXRlbSAoUHJlZmVyZW5jZXMuLi4pW1NlcGFyYXRvci02XxBGVGV4
-dCBGaWVsZCBDZWxsIChUaGlzIG9wdGlvbiB0YWtlcyBlZmZlY3Qgd2hlbiBYMTEgaXMgbGF1bmNoZWQg
-YWdhaW4uKVtTZXBhcmF0b3ItN1tBcHBsaWNhdGlvbl8QFU1lbnUgKEFwcGxpY2F0aW9ucyktMV8QFE1l
-bnUgSXRlbSAoU2hvdyBBbGwpW1NlcGFyYXRvci0zXxB5VGV4dCBGaWVsZCBDZWxsIChYMTEgYmVlcHMg
-d2lsbCB1c2UgdGhlIHN0YW5kYXJkIHN5c3RlbSBhbGVydCwgYXMgZGVmaW5lZCBpbiB0aGUgU291bmQg
-RWZmZWN0cyBzeXN0ZW0gcHJlZmVyZW5jZXMgcGFuZWwuKV8QJkNoZWNrIEJveCAoRW11bGF0ZSB0aHJl
-ZSBidXR0b24gbW91c2UpXxAmVG9wIFRhYiBWaWV3IChJbnB1dCwgT3V0cHV0LCBTZWN1cml0eSlbU2Ny
-b2xsIFZpZXdfEB5NZW51IEl0ZW0gKFRvZ2dsZSBGdWxsIFNjcmVlbilfEBZCdXR0b24gQ2VsbCAoQWRk
-IEl0ZW0pXxAWVGFibGUgQ29sdW1uIChDb21tYW5kKV8QHk1lbnUgSXRlbSAoQnJpbmcgQWxsIHRvIEZy
-b250KVlTZXBhcmF0b3JfECZCdXR0b24gQ2VsbCAoQXV0aGVudGljYXRlIGNvbm5lY3Rpb25zKV8QJFRh
-YmxlIFZpZXcgKE5hbWUsIENvbW1hbmQsIFNob3J0Y3V0KV8QE1RhYmxlIENvbHVtbiAoTmFtZSlcRWRp
-dFByb2dyYW1zXxAVVGFiIFZpZXcgSXRlbSAoSW5wdXQpXxASTWVudSBJdGVtIChEZWxldGUpW1NlcGFy
-YXRvci01XxARVmVydGljYWwgU2Nyb2xsZXJfEHhUZXh0IEZpZWxkIENlbGwgKFdoZW4gZW5hYmxlZCwg
-bWVudSBiYXIga2V5IGVxdWl2YWxlbnRzIG1heSBpbnRlcmZlcmUgd2l0aCBYMTEgYXBwbGljYXRpb25z
-IHRoYXQgdXNlIHRoZSBNZXRhIG1vZGlmaWVyLilvEBYATQBlAG4AdQAgAEkAdABlAG0AIAAoAEMAdQBz
-AHQAbwBtAGkAegBlICYAKV8QEk1lbnUgSXRlbSAoV2luZG93KV8QFE1lbnUgSXRlbSAoWDExIEhlbHAp
-XxAQTWVudSBJdGVtIChVbmRvKV8QFk1lbnUgSXRlbSAoMjU2IENvbG9ycylfEBBNZW51IEl0ZW0gKENv
-cHkpXxAQTWVudSBJdGVtIChFZGl0KV8QEVRhYmxlIEhlYWRlciBWaWV3XxB1U3RhdGljIFRleHQgKFgx
-MSBiZWVwcyB3aWxsIHVzZSB0aGUgc3RhbmRhcmQgc3lzdGVtIGFsZXJ0LCBhcyBkZWZpbmVkIGluIHRo
-ZSBTb3VuZCBFZmZlY3RzIHN5c3RlbSBwcmVmZXJlbmNlcyBwYW5lbC4pXxAYVGFiIFZpZXcgSXRlbSAo
-U2VjdXJpdHkpXxBCU3RhdGljIFRleHQgKFRoaXMgb3B0aW9uIHRha2VzIGVmZmVjdCB3aGVuIFgxMSBp
-cyBsYXVuY2hlZCBhZ2Fpbi4pXxAPVGV4dCBGaWVsZCBDZWxsXxAoQnV0dG9uIENlbGwgKEVtdWxhdGUg
-dGhyZWUgYnV0dG9uIG1vdXNlKV8QRlRleHQgRmllbGQgQ2VsbCAoVGhlc2Ugb3B0aW9ucyB0YWtlIGVm
-ZmVjdCB3aGVuIFgxMSBpcyBuZXh0IGxhdW5jaGVkLilfEBZUYWIgVmlldyBJdGVtIChPdXRwdXQpXxAR
-VGV4dCBGaWVsZCBDZWxsLTJfEFBUZXh0IEZpZWxkIENlbGwgKEFsbG93cyBpbnB1dCBtZW51IGNoYW5n
-ZXMgdG8gb3ZlcndyaXRlIHRoZSBjdXJyZW50IFgxMSBrZXltYXAuKVtTZXBhcmF0b3ItOF8QuFN0YXRp
-YyBUZXh0IChMYXVuY2hpbmcgWDExIHdpbGwgY3JlYXRlIFhhdXRob3JpdHkgYWNjZXNzLWNvbnRyb2wg
-a2V5cy4gSWYgdGhlIHN5c3RlbSdzIElQIGFkZHJlc3MgY2hhbmdlcywgdGhlc2Uga2V5cyBiZWNvbWUg
-aW52YWxpZCB3aGljaCBtYXkgcHJldmVudCBYMTEgYXBwbGljYXRpb25zIGZyb20gbGF1bmNoaW5nLilf
-EBtQb3B1cCBCdXR0b24gKEZyb20gRGlzcGxheSlfEKdTdGF0aWMgVGV4dCAoSWYgZW5hYmxlZCwgQXV0
-aGVudGljYXRlIGNvbm5lY3Rpb25zIG11c3QgYWxzbyBiZSBlbmFibGVkIHRvIGVuc3VyZSBzeXN0ZW0g
-c2VjdXJpdHkuIFdoZW4gZGlzYWJsZWQsIGNvbm5lY3Rpb25zIGZyb20gcmVtb3RlIGFwcGxpY2F0aW9u
-cyBhcmUgbm90IGFsbG93ZWQuKV8QFk1lbnUgSXRlbSAoU2VsZWN0IEFsbClfEBxDaGVjayBCb3ggKEZ1
-bGwgc2NyZWVuIG1vZGUpXxAUQnV0dG9uIENlbGwgKFJlbW92ZSlfEKtUZXh0IEZpZWxkIENlbGwgKElm
-IGVuYWJsZWQsIEF1dGhlbnRpY2F0ZSBjb25uZWN0aW9ucyBtdXN0IGFsc28gYmUgZW5hYmxlZCB0byBl
-bnN1cmUgc3lzdGVtIHNlY3VyaXR5LiBXaGVuIGRpc2FibGVkLCBjb25uZWN0aW9ucyBmcm9tIHJlbW90
-ZSBhcHBsaWNhdGlvbnMgYXJlIG5vdCBhbGxvd2VkLilbTWVudSAoSGVscClbU2VwYXJhdG9yLTRfEBtN
-ZW51IEl0ZW0gKFByZXZpb3VzIFdpbmRvdylfECRDaGVjayBCb3ggKEF1dGhlbnRpY2F0ZSBjb25uZWN0
-aW9ucylaTWVudSAoWDExKVxTZXBhcmF0b3ItMTBfEBdCdXR0b24gQ2VsbCAoRHVwbGljYXRlKV8QD01l
-bnUgKFNlcnZpY2VzKV8QEVRleHQgRmllbGQgQ2VsbC0xXxAXTWVudSBJdGVtIChOZXh0IFdpbmRvdylf
-EDRCdXR0b24gQ2VsbCAoQWxsb3cgY29ubmVjdGlvbnMgZnJvbSBuZXR3b3JrIGNsaWVudHMpXxAVTWVu
-dSBJdGVtIChUaG91c2FuZHMpXxASQnV0dG9uIENlbGwgKERvbmUpW01lbnUgKEVkaXQpXxArQnV0dG9u
-IENlbGwgKEZvbGxvdyBzeXN0ZW0ga2V5Ym9hcmQgbGF5b3V0KV8QdFN0YXRpYyBUZXh0IChXaGVuIGVu
-YWJsZWQsIG1lbnUgYmFyIGtleSBlcXVpdmFsZW50cyBtYXkgaW50ZXJmZXJlIHdpdGggWDExIGFwcGxp
-Y2F0aW9ucyB0aGF0IHVzZSB0aGUgTWV0YSBtb2RpZmllci4pXxAQTWVudSBJdGVtIChSZWRvKdIADgBF
-BvAKh4EB7KDSAA4ARQbwCoqBAeyg0gAOAEUG8AqNgQHsrxC1BsMAbgTJAboBkQJEAfoAhAQcAFYGtAMV
-AyYAHwBpAXkAvgb+BH4DTQGVBSkHAwWdBwUHBgQQAFIAVQB4AH4BOQCAA64BLANlArcBzQBTAXYFsgSb
-AGsC9QZeAjAAegBQAnsEPgNOA3UBfABnAH0D/ACBAE8HGgHUBxwAYwB7AHEHHQYyA8MHIAJpBMYGyQNP
-Bk8E8wBcAGwAUQBeArQEYgBZAGUGfwcqAwUHLAIlAIMBSQZCAG8HMAK8AkwAVABiAHcAvQGABXEETAWx
-BPkEMAOzATgFTgWwAFgDOQNVAIoCOQdCBaYAZABbAVoAagBtB0UAcgCCBKkEjAB0AfgAdgB5BuMHSgKy
-BWADOwK1AHACUwPjBgECqQXAA4YHVQCFAGYBtAOsA60BFQK2A9MAxwZkAGAAYQBzBqUHXwSxA6oAVwB/
-BCUHYwTMBesBWQBaBRoAXwBoAfkBmAB8BS8AdQCbAMoDTARvAF2BAZmBASSBARuAU4BIgG6AY4EBoIDn
-gE6BAZSAnoCigAKBAQ2AQ4AZgQG5gQEEgK+ASYEBOIEBv4EBsYEBxoEByoDkgC6AR4EBb4EBiYA2gQGN
-gM+AMoCxgKCAV4AxgEKBAVyBAQ6BARaAloEBeYBqgQF4gBiAgIDwgLOAtYBFgQEDgQGHgN6BAY6ACoEB
-uoBYgQHbgPSBAYCBATCBAceBAWuAyYEB14B5gQEagQGbgLeBAXSBASeAeIEBF4ApgOKAlID7gGyA+oEB
-g4EBzoCagQHggGmBAZiAOYEBcIEBJoEBvoCHgHGAQYDvgQFqgCaAgoEBSoD1gQFYgQEpgOyAxYA1gQFC
-gQFOgGiAqICtgAuAbYEB4oEBrYD4gHaAPIEBEYEBGYEB2IEBMoEBk4EBEoEBCYEBPoBdgQFBgQFzgQGj
-gQHTgIWBAUWAwYCYgQEugHOA0YEBYYC+gQFVgLmBAc+BAaKA/oBRgMeAy4AqgJyAzYAagQF7gOaA64EB
-N4EBj4EByIEBE4DDgFCBAYuA6IEBwoEBHYEBW4A7gHCBATOA44EBCIBggEuBAYKBATqBAT+ADIAcgKuA
-/4Dd0gAOAEUG8AtFgQHsrxC1C0YLRwtIC0kLSgtLC0wLTQtOC08LUAtRC1ILUwtUC1ULVgtXC1gLWQta
-C1sLXAtdC14LXwtgC2ELYgtjC2QLZQtmC2cLaAtpC2oLawtsC20LbgtvC3ALcQtyC3MLdAt1C3YLdwt4
-C3kLegt7C3wLfQt+C38LgAuBC4ILgwuEC4ULhguHC4gLiQuKC4sLjAuNC44LjwuQC5ELkguTC5QLlQuW
-C5cLmAuZC5oLmwucC50LngufC6ALoQuiC6MLpAulC6YLpwuoC6kLqgurC6wLrQuuC68LsAuxC7ILswu0
-C7ULtgu3C7gLuQu6C7sLvAu9C74LvwvAC8ELwgvDC8QLxQvGC8cLyAvJC8oLywvMC80LzgvPC9AL0QvS
-C9ML1AvVC9YL1wvYC9kL2gvbC9wL3QveC98L4AvhC+IL4wvkC+UL5gvnC+gL6QvqC+sL7AvtC+4L7wvw
-C/EL8gvzC/QL9Qv2C/cL+Av5C/qBAnCBAnGBAnKBAnOBAnSBAnWBAnaBAneBAniBAnmBAnqBAnuBAnyB
-An2BAn6BAn+BAoCBAoGBAoKBAoOBAoSBAoWBAoaBAoeBAoiBAomBAoqBAouBAoyBAo2BAo6BAo+BApCB
-ApGBApKBApOBApSBApWBApaBApeBApiBApmBApqBApuBApyBAp2BAp6BAp+BAqCBAqGBAqKBAqOBAqSB
-AqWBAqaBAqeBAqiBAqmBAqqBAquBAqyBAq2BAq6BAq+BArCBArGBArKBArOBArSBArWBAraBAreBAriB
-ArmBArqBAruBAryBAr2BAr6BAr+BAsCBAsGBAsKBAsOBAsSBAsWBAsaBAseBAsiBAsmBAsqBAsuBAsyB
-As2BAs6BAs+BAtCBAtGBAtKBAtOBAtSBAtWBAtaBAteBAtiBAtmBAtqBAtuBAtyBAt2BAt6BAt+BAuCB
-AuGBAuKBAuOBAuSBAuWBAuaBAueBAuiBAumBAuqBAuuBAuyBAu2BAu6BAu+BAvCBAvGBAvKBAvOBAvSB
-AvWBAvaBAveBAviBAvmBAvqBAvuBAvyBAv2BAv6BAv+BAwCBAwGBAwKBAwOBAwSBAwWBAwaBAweBAwiB
-AwmBAwqBAwuBAwyBAw2BAw6BAw+BAxCBAxGBAxKBAxOBAxSBAxWBAxaBAxeBAxiBAxmBAxqBAxuBAxyB
-Ax2BAx6BAx+BAyCBAyGBAyKBAyOBAyQRASsRAhIRAR4SAAGIHhEBdxEBDhEBfREBhhA6EQIWEBcSAAGI
-vRIAAYi/EQJDEQEHEQFeEQFyEDgQiBEBbREBYhEBIxCDEgADDmcQkBEBDREBMREBrREBhBEBrxECIxEC
-DhEBihEBexEBpxIAAYgNEQIfEQGAEQGqEQFzEQIXEJERAYwSAAGIIREBJREBixD1EMsRAXASAAGIEBIA
-AYgTEQGwEQIkEKARAhwQwxAdEQF8EQGjEQIlEQGIEQGsEQIhEIYSAAGIGBCcEPQRASQSAAGHyxEBcRCr
-EQE2EQGSEQGJELMRAZERAYEQzBEBERDOEIEQXBIAAYgiE//////////9ENARATURAg8QlhEBNxCPEgAB
-iBQRAWsRAY0QzREBrhDEEQFcEQEnEQIgEQEqEgABh9YQBRIAAYgWEQIMEQEoEQEpEQEEEQFdEgABiAwQ
-pBEBEBEBHRIAAYfHEQIiEQGFEQIUEQGmEQEwEBMRAhsQyhEBpRCeEQGPEQGzELAQnRCjEQF0EgAElQcR
-AWERAYIRAbESAAGICxIAAYgbEQI/EQFgEQI+EgABiBERAhgQtRCyEQF+EQF4EQF5EKwRAh0SAAGIGREB
-XxIAAYfFEQFBEM8RAS4RAhoQlREBpBEBdhEBjhECExA5EIISAAGHxBECPRECFREBhxECGREBNBC0EQF/
-EgABiBcRAT4SAAGHwxEBgxCpEgABiBIRAWwQrRCv0gAOAEUATQyvgD6g0gAOAEUG8AyygQHsoNIADgBF
-BvAMtYEB7KDSADoAOwy3DLiiDLgAP15OU0lCT2JqZWN0RGF0YQAIABkAIgAnADEAOgA/AEQAUgBUAGYG
-vAbCBw0HFAcbBykHOwdXB2UHcQd9B4sHlgekB8AHzgfhB/MIDQgXCCQIJggpCCwILwgyCDQINwg5CDwI
-PwhCCEUIRwhJCEwITwhUCFcIYAhsCG4IcAh5CIMIhQiTCJwIpQiwCLcIyQjSCNsI5AjpCPgJCwkUCR8J
-IQkiCSsJMgk/CUUJTglQCcEJwwnFCccJyQnLCc0JzwnRCdMJ1QnXCdkJ2wndCd8J4QnjCeUJ5wnpCesJ
-7QnvCfEJ9An3CfoJ/QoACgMKBgoJCgwKDwoSChUKGAobCh4KIQokCicKKgotCjAKMwo2CjkKPAo/CkIK
-RQpICksKTgpbCmQKbApuCnAKcgqTCpsKrwq6CsgK0grfCuYK6ArqCu8K8Qr2CvgK+gr8CwkLFQsXCxoL
-HQskCyULMgtBC0MLRQtHC08LYQtqC28LgguPC5ELkwuVC6gLsQu2C8ELyQvSC9kL8QwADBEMHwwhDCMM
-JQwnDEQMVgxeDGUMbgx4DIQMhgyIDIoMjAyPDJAMkgynDLIMtAy2DLgMugzTDQgNFA0qDT8NTg1hDXMN
-fg2IDZYNqA21DcMNyA3KDcwNzg3QDdIN1A3WDdgN2g3cDd4N4w4DDhQOGw4iDisOLQ42DjgOOw5IDlEO
-Vg5dDmYOcg50DnYOfw6IDo0Oow6sDrUOwg7PDtgO4w7sDvYO/Q8JDxIPFA8WDyQPMw9AD0IPRA9GD2cP
-aQ9rD20Pbw9xD3MPfg+AD4sPnA+eD6APog+kD60Ptg+9D9QP5Q/nD+kP6w/tD/4QABACEAQQBhALEBQQ
-FhAbEB0QHxBIEFYQYxBlEGcQaBBqEGsQbRBvEHEQmhCkEK0QrxCxELMQtRC3ELkQuxC9EMoQ2RDmEOgQ
-6hDsEPUQ9xD8EP4RABEpESsRLREuETARMREzETURNxFYEVoRXBFeEWARYhFkEXkRghGJEZgRoBGpEa4R
-txHIEcoRzBHOEdAR7RHvEfER8xH1EfYR+BIREhMSFRIXEhkSGxIzEmgSahJsEm4ScBJyEnQSdhKQEqES
-oxKlEqcSqRLGEsgSyhLMEs4SzxLREuYS6BLqEuwS7hMHEzwTPhNAE0ITRBNGE0gTShNzE34TjxORE5MT
-lROXE6oTuxO9E78TwRPDE+AT4hPkE+YT6BPpE+sUBBRTFHAUghSUFKkUtxTAFMEUwxTFFMcUyRTLFM0U
-zxTRFNMU1RTWFNcU2hTdFN8U5BT1FPcU+RT7FQQVBhUPFREVQhVLFVEVWRVbFV0VXxVhFWMVZRVnFWkV
-chV/FYEVgxWFFZIVphWvFbEVvBXFFccV0BXSFdQV1hXYFgUWBxYJFgsWDRYPFhEWExYVFhcWIhZPFlEW
-UxZVFlcWWRZbFl0WXxZhFmsWmBaaFpwWnhagFqIWpBamFqgWqhazFrwWyRbdFuwW9RcCFxAXIRcjFyUX
-JxcpF1IXVBdWF1cXWRdaF1wXXhdgF3EXcxd2F3kXfBePF6AXohekF6YXqBfRF9MX1RfWF9gX2RfbF90X
-3xfsF+4X8BfzGAIYExgVGBcYGRgbGDgYOhg8GD4YQBhBGEMYXBiRGJMYlRiXGJkYmxidGJ8YvBjJGNoY
-3BjeGOAY4hjoGPkY+xj9GP8ZARlAGU0ZZhlzGYkZlxmhGa8ZyBnVGd8Z8RoFGg8aGxodGh8aIRojGiUa
-JxosGi4aMBoyGjQaNho4GlMaZRptGnYaeBp9GpoapRq6GsYayBrKGswazhrXGtka3BreGw8bHhsoGzwb
-VRttG28bcRtzG3Ubdxt5G3obfBt9G38biBuKG40bjxuYG5obqRurG60brxuxG7MbtRu3G9Qb1hvYG9ob
-3BvdG98b9xwYHCwcOBw6HDwcPhxAHEIcRxxJHLMcxBzGHM8c0RzUHOkc8Rz+HQodGB0aHRwdHh0gHSId
-KR02HUMdSx1NHVkdYh1nHXwdfh2AHYIdhB2XHaQdph2pHbIdux3NHdYd4R3tHgoeDB4OHhAeEh4THhUe
-LR5OHlAeUh5UHlYeWB5aHmMegB6CHoQehh6IHokeix6kHsUexx7JHssezR7PHtEfCB8lHycfKR8rHy0f
-Lh8wH0kffh+AH4IfhB+GH4gfih+MH58fvB++H8Afwh/EH8Ufxx/gIAEgAyAFIAcgCSALIA0gdCCNIJYg
-nSC1IL4gwCDHIMkgyyDNIOYg8yD9IP8hASEDIQUhByEJIRIhFCEWIR8hISEuITAhMiE0ITYhOCE6IVch
-WSFbIV0hXyFgIWIheiGbIZ0hnyGhIaMhpSGnIhAiLSIvIjEiMyI1IjYiOCJRInIidCJ2IngieiJ8In4i
-2CL1Ivci+SL7Iv0i/iMAIxkjTiNQI1IjVCNWI1gjWiNcI38jnCOeI6AjoiOkI6UjpyPAI+Ej4yPlI+cj
-6SPrI+0kLiQ0JD0kQiRQJGkkayRtJG8kcSRzJHUkfiSAJIIkiSSeJKAkoiSkJKYkqCSxJLMkviTAJMIk
-xCTGJMgk5STnJOkk6yTtJO4k8CUlJSclKSUrJS0lLyUxJTMlTiVrJW0lbyVxJXMldCV2JY8lsCWyJbQl
-tiW4JbolvCZpJoYmiCaKJowmjiaPJpEmqSbKJswmzibQJtIm1CbWJ3InjyeRJ5MnlSeXJ5gnmieyJ9Mn
-1SfXJ9kn2yfdJ98oFigfKCgoMSg8KFQoXyhpKHIodyiKKJYooyilKKcoqSjKKMwozijQKNIo1CjWKNoo
-3CjhKPIo9Cj2KPgo+ikLKQ0pDykRKRMpNCk2KTgpOik8KT4pQClNKV4pYCliKWQpZimDKYUphymJKYsp
-jSmPKaApoimlKagpqym1KcQp1SnXKdkp2yndKf4qACoCKgQqBioIKgoqHyoxKkIqRCpGKkgqSiprKm0q
-bypxKnMqdSp3KoQqhiqUKqUqpyqpKqsqrSrOKtAq0irXKtkq2yrdKt8q9CsNKx4rICsiKyQrJis6K0sr
-TStPK1ErUyt0K3YreCt6K3wrfiuAK4wrmSumK6grqiutK84r0CvTK9Yr2CvaK9wr4SvjK+kr+iv8K/4s
-ASwELCUsJywqLC0sLywxLDMsPCw+LEksVixYLFssXix/LIEshCyHLIksiyyNLJIslCyaLKssrSyvLLIs
-tSzWLNgs2yzdLN8s4SzjLO8tCC0ZLRstHS0gLSMtRC1GLUktSy1NLU8tUi1fLWEtZC1nLXAtei2LLY0t
-jy2RLZMtpC2mLagtqi2tLcAt0S3TLdUt2C3bLfgt+y39LgAuAy4GLgcuCi4fLiEuIy4mLikuQy54Lnou
-fS6ALoMuhi6ILosukC6ZLqMutC62Lrkuwy7MLs4u1y7ZLvEvAi8ELwYvCC8LLxovKy8tLy8vMi81L1Iv
-VS9XL1ovXS9eL2Evey+wL7IvtS+4L7svvi/AL8MvzC/VL9cv4C/iL/QwBTAHMAkwCzAOMC4wPzBBMEMw
-RTBIMFIwYzBlMGcwajBtMI4wkDCTMJYwmDCaMJwwqDCrMLgwyTDLMM0w0DDTMPAw8zD1MPgw+zD+MP8x
-AjEaMU8xWDFaMVwxXzFiMWUxZzFqMW8xeDF6MY0xnjGgMaIxpDGmMbcxuTG7Mb0xwDHMMd0x3zHiMeQx
-5zI2MlgyZTJ6MocyoTK9Mtgy5DMDMxIzHjMhMyQzKTMsMy8zMDMzMzwzRTNIM0kzTDNPM1IzWzOEM44z
-mDOiM7AzszO2M7kzuzO+M8EzxDPHM8ozzTPYM/Ez/TQANAM0BjQJNAw0NTQ4NDs0PjRBNEQ0RzRKNE00
-VzRgNGk0fTSSNJU0mDSbNJ400zTfNOg0+zUINRQ1IjUlNSg1KzUuNTA1MzU2NUk1TDVPNVI1VTVYNW81
-eDWBNY81mDWaNaE1pDWnNao10zXiNe819zYCNhE2HDYnNjQ2NTY4Njs2RDZHNlA2WTZaNl02ejZ/NoI2
-hTaINoo2jTaSNp82oTatNsI2xDbGNsk2yzbdNuY28TcFNyI3JzcpNyw3LjcxNzM3QDdCN0U3TjdTN2E3
-ijeLN443kTeaN503pjenN6o3xzfKN8030DfSN9U33Tf6N/w3/zgBOAQ4BjgvODA4Mzg2OD84QjhLOEw4
-TzhsOG84cjh1OHc4ejiDOJg4mjidOKA4ojiuOM840TjUONc42jjbON047jjwOPk4+zkQORI5FDkXORk5
-MjlHOUk5TDlPOVE5WzloOWo5bzl4OYM5jjmfOaE5ozmmOak5zjnQOdM51jnYOdo53DneOec56TnvOgA6
-AjoEOgc6CjovOjE6NDo2Ojg6Ojo8OkU6XjprOm06cDpzOpQ6ljqZOpw6njqgOqI6qDqqOrE6wjrEOsY6
-yTrMOuk67DruOvE69Dr1Ovg7EjtHO0k7TDtPO1I7VTtXO1o7YTtqO2w7dTt3O4w7nTufO6E7ozumO7I7
-wzvFO8c7yjvNO+478DvzO/Y7+Dv6O/w8CzwNPBk8KjwsPC48MDwzPEg8WTxbPF08XzxiPH88kDySPJQ8
-ljyZPLE8wjzEPMY8yDzKPNs83TzfPOI85T0GPQg9Cz0OPRA9Ej0UPSY9KT08PU09Tz1RPVQ9Vz14PXo9
-fT2APYI9hD2GPZg9mj2tPb49wD3CPcU9yD3lPeg96j3tPfA98T30Pgw+QT5DPkY+ST5MPk8+UT5UPls+
-ZD5mPm8+cT6GPpc+mT6bPp0+oD6sPrk+uz6+PsE+4j7kPuc+6j7sPu4+8D71Pvc+/T8GPwlABkAJQAxA
-DkAQQBJAFEAWQBlAG0AdQB9AIUAkQCdAKUArQC5AMUA0QDdAOkA8QD5AQEBCQERARkBIQEpATUBQQFJA
-VUBXQFlAW0BdQF9AYUBjQGZAaEBrQG5AcUBzQHZAeEB7QH5AgECDQIZAiECKQI1AkECSQJVAl0CZQJxA
-n0ChQKNApUCnQKpArECvQLJAtEC2QLhAu0C+QMBAwkDEQMZAyUDMQM5A0UDUQNdA2UDcQN9A4UDkQOZA
-6EDqQOxA70DxQPRA9kD5QPtA/UD/QQFBA0EFQQdBCkENQRBBE0EVQRdBGkEdQSBBIkElQSdBKUEsQS5B
-MEEyQTRBPUE/QUxBT0FSQVVBWEFbQV5BZ0FpQXRBd0F6QX1BgEGDQYxBjkGRQZRBrEG1Qb5ByUHqQfRB
-90H6Qf1CAEIDQgZCD0IoQjVCPkJJQlRCeUJ8Qn9CgkKFQohCi0KUQqxCtUK3QrpCvULTQuxC9UL+QwtD
-IkMrQy1DMkM0QzZDX0NhQ2NDZkNoQ2pDbENvQ3JDg0OFQ4hDi0OOQ5JDm0OdQ7ZDuEO7Q75DwUPEQ8ZD
-yUPMQ89D0kPVQ9hEAUQDRAVEBkQIRAlEC0QNRA9EOEQ6RD1EQERCRERERkRIREtEVERlRGdEakRtRHBE
-eUR7RIREhkSHRJlEwkTERMZEx0TJRMpEzETORNBE+UT7RP1E/kUARQFFA0UFRQdFMEUyRTRFNUU3RThF
-OkU8RT5FS0V0RXZFeEV6RXxFfkWARYNFhkWPRZFFmEWhRaNFtkW5RbtFvUXARcNFxkXJRctFzUX2RfhF
-+kX7Rf1F/kYARgJGBEYtRi9GMUYyRjRGNUY3RjlGO0ZKRlNGXEZeRmlGbEZvRnJGdUZ4RqFGo0alRqhG
-qkasRq5GsUa0RrlGwkbERtVG2EbaRt1G30biRuVG50bpRxJHFEcWRxdHGUcaRxxHHkcgR0lHS0dNR1BH
-UkdUR1ZHWUdcR4VHh0eKR41Hj0eRR5NHlkeZR55Hp0epR6xHr0e7R8RHxkfJSAhIC0gNSBBIE0gWSBlI
-G0geSCFIJEgmSClILEhHSF5IZ0hpSHJIe0iASIlIjEmJSYxJj0mRSZNJlkmYSZpJnEmeSaBJokmkSadJ
-qUmrSa1JsEmySbVJt0m6SbxJvknAScJJxEnGSchJyknNSc9J0UnUSddJ2UnbSd1J30nhSeNJ5UnnSepJ
-7EnuSfBJ8kn0SfdJ+kn8Sf5KAUoDSgVKB0oJSgtKDUoPShFKE0oVShdKGUobSh1KIEoiSiVKKEoqSixK
-LkoxSjRKNko4SjpKPEo+SkFKQ0pGSklKS0pNSk9KUkpUSldKWUpbSl1KX0piSmRKZ0ppSmtKbUpvSnFK
-c0p1SndKeUp8Sn5KgEqDSoVKiEqLSo5KkUqTSpVKl0qZSpxKn0qhSqNKpUquSrFLsEuzS7ZLuEu6S7xL
-vkvAS8NLxUvHS8lLy0vNS9BL00vWS9lL20veS+BL40vmS+hL6kvsS+5L8EvyS/RL90v5S/xL/0wBTANM
-BUwHTAlMC0wNTA9MEkwUTBdMGkwdTCBMIkwlTChMK0wtTDBMMkw0TDZMOUw8TD5MQExDTEVMSExLTE1M
-T0xRTFNMVkxYTFtMXkxgTGJMZExnTGpMbUxvTHFMc0x2THhMekx9TIBMg0yFTIhMi0yOTJBMkkyUTJdM
-mUybTJ1MoEyiTKVMp0ypTKtMrUyvTLJMtEy2TLlMvEy/TMFMw0zFTMhMy0zOTNFM00zVTNhM2kzcTN5M
-4EzpTOxN603uTfFN9E33TfpN/U4ATgNOBk4JTgxOD04SThVOGE4bTh5OIU4kTidOKk4tTjBOM042TjlO
-PE4/TkJORU5ITktOTk5RTlROV05aTl1OYE5jTmZOaU5sTm9Ock51TnhOe05+ToFOhE6HTopOjU6QTpNO
-lk6ZTpxOn06iTqVOqE6rTq5OsU6zTrZOuU68Tr9Owk7FTshOy07OTtFO1E7XTtpO3U7gTuNO5k7pTuxO
-707yTvVO+E77Tv5PAU8ETwdPCk8NTxBPE08WTxlPHE8fTyJPJU8oTytPLk8xTzRPN086Tz1PQE9DT0ZP
-SU9MT09PUk9VT1hPW09eT2FPZE97T4pPrk/jT/lQEFAoUEZQZ1DgUO1Q9FD7UQ1RJFE5UU9Re1GSUfpS
-FVIhUjxSWVKeUqdTE1OIU6NTvVPjU/1UFFQxVD9UTFRnVJZUx1TvVQFVFVUoVUJVTlVlVXBVfFWTVaxV
-+1YPVs5W51cBVx5XKldzV39Xi1ejV7pXxlhCWGtYlFigWMFY2ljzWRRZHllHWW5ZhFmRWalZvlnKWd5a
-WVqIWp1atFrHWuBa81sGWxpbklutW/JcBFwvXHhckVylXPhdBF2/Xd1eh16gXr9e1l+EX5BfnF+6X+Ff
-7F/5YBNgJWA5YFNgimCiYLdgw2DxYWhhe2GEYYdhiGGRYZRhlWGeYaFjDmMRYxRjF2MZYxtjHWMfYyJj
-JGMmYyljK2MtYy9jMmM0YzZjOWM8Yz5jQGNDY0ZjSWNMY09jUWNTY1VjWGNbY11jYGNiY2RjZmNoY2pj
-bGNuY3FjdGN3Y3ljfGN+Y4Fjg2OFY4djiWOLY41jkGOTY5VjmGOaY51jn2OiY6Rjp2OqY61jsGOyY7Vj
-t2O6Y71jv2PCY8Vjx2PKY8xjzmPQY9Jj1GPWY9lj3GPeY+Fj42PmY+hj62PuY/Fj82P1Y/dj+WP8Y/5k
-AGQDZAVkCGQLZA1kD2QRZBRkF2QZZBtkHWQfZCFkJGQnZClkK2QtZDBkM2Q2ZDlkPGQ/ZEJkRWRHZEpk
-TWRQZFNkVWRYZFpkXGRfZGFkY2RmZGhka2RtZHBkc2R1ZHdkeWR7ZH1kf2SBZINkhmSIZIpkjWSQZJNk
-lmSYZJpknWSfZKJkpWSoZKpkrGSvZLFktGS2ZLhku2S+ZMFkw2TFZMdkyWTLZNRk12ZEZkdmSmZNZlBm
-U2ZWZllmXGZfZmJmZWZoZmtmbmZxZnRmd2Z6Zn1mgGaDZoZmiWaMZo9mkmaVZphmm2aeZqFmpGanZqpm
-rWawZrNmtma5Zrxmv2bCZsVmyGbLZs5m0WbUZtdm2mbdZuBm42bmZulm7GbvZvJm9Wb4Zvtm/mcBZwRn
-B2cKZw1nEGcTZxZnGWccZx9nImclZyhnK2cuZzFnNGc3ZzpnPWdAZ0NnRmdJZ0xnT2dSZ1VnWGdbZ15n
-YWdkZ2dnamdtZ3Bnc2d2Z3lnfGd/Z4JnhWeIZ4tnjmeRZ5Rnl2eaZ51noGejZ6ZnqWesZ69nsme1Z7hn
-u2e+Z8FnxGfHZ8pnzWfQZ9Nn1mfZZ9xn32fiZ+Vn6GfrZ+5n8Wf0Z/dn+mf9aABoA2gGaAloDGgPaBJo
-FWgYaBtoHmghaCRoJ2gqaC1oMGgzaDZoOWg8aD9oQmhFaEhoS2hOaFFoVGhXaFpoXWhgaGNoZmhpaGxo
-cWh0aHdoemh9aH9ogmiEaIlojmiRaJRol2iaaJxonmihaKRop2ipaK5osGizaLZouWi8aL9owmjFaMho
-y2jOaNNo1mjZaNxo32jiaORo52jsaO9o8mj0aPZo+Wj+aQNpBmkJaQtpDmkQaRJpFWkYaRtpHmkhaSRp
-JmkraS1pL2kyaTdpOmk8aT9pQmlFaUdpSmlNaU9pUmlUaVZpWGldaWZpaGlraW5pcGlzaXVpeml9aYBp
-gmmFaYdpimmNaZBpk2mYaZppn2miaaVpqGmraa5ps2m1abhpu2nAacNpxmnJacxpz2nRadRp1mnZadtp
-3mnhaeNp5Wnnaepp72nyafVp+Gn9agJqBWoIagtqEGoTahVqF2oaah1qIGoiaiVqKmotajJqNWo3ajpq
-PWo/akJqRWpIaktqTWpPalRqV2paal1qYGpjamVqaGptanBqdWp4anpqf2qCaoRqhmqPapFqkmqbap5q
-n2qoaqtqrGq1aroAAAAAAAACAgAAAAAAAAy5AAAAAAAAAAAAAAAAAABqyQ</bytes>
+ZSB0aGUgTWV0YSBtb2RpZmllci7UAA4BLwCTATABMQUFATMFB4ArI0AmAAAAAAAAgCoRDBzVAA4FCQUK
+BQsFDAUNBQ4FDwUQBRFXTlNDb2xvclxOU0NvbG9yU3BhY2VbTlNDb2xvck5hbWVdTlNDYXRhbG9nTmFt
+ZYEBIIEBHxAGgQEegQEdVlN5c3RlbVxjb250cm9sQ29sb3LTAA4FCgUVBQ0B4gUXV05TV2hpdGWBASBL
+MC42NjY2NjY2OQDSADoAOwUZBQmiBQkAP9UADgUJBQoFCwUMBQ0FHAUPBR0FEYEBIIEBI4EBIoEBHV8Q
+EGNvbnRyb2xUZXh0Q29sb3LTAA4FCgUVBQ0B4gUigQEgQjAA0gA6ADsFJAUlpAUlAUUA/wA/XxAPTlNU
+ZXh0RmllbGRDZWxs0gA6ADsFJwUopQUoAUkBSgFLAD9bTlNUZXh0RmllbGTXAP0ADgD+AP8BAAEBAQIB
+gQTyBSwFLQEQAKsBgYBDgQElgQEngQEoCYBDXxAWe3szNiwgMjA4fSwgezM4NSwgMjl9fdgBFAAOBPkB
+GgEbARwBHgT6ASAE+wT8BTQE/gTqBQAFAYEBJIEBHIEBKYEBG4EBJoEBIV8QV0hvbGQgT3B0aW9uIGFu
+ZCBDb21tYW5kIHdoaWxlIGNsaWNraW5nIHRvIGFjdGl2YXRlIHRoZSBtaWRkbGUgYW5kIHJpZ2h0IG1v
+dXNlIGJ1dHRvbnMuCtcA/QAOAP4A/wEAAQEBAgGBBPIFPAU9ARAAqwGBgEOBASWBASuBASwJgENfEBZ7
+ezM2LCAxNTl9LCB7Mzg1LCAxNH192AEUAA4E+QEaARsBHAEeBPoBIAT7BPwFRAT+BOwFAAUBgQEkgQEc
+gQEtgQEbgQEqgQEhXxA+QWxsb3dzIGlucHV0IG1lbnUgY2hhbmdlcyB0byBvdmVyd3JpdGUgdGhlIGN1
+cnJlbnQgWDExIGtleW1hcC7XAP0ADgD+AP8BAAEBAQIBgQTyBUwFTQEQAKsBgYBDgQElgQEvgQEwCYBD
+XxAVe3szMywgMzJ9LCB7Mzg1LCAzMX192AEUAA4E+QEaARsBHAEeBPoBIAT7BPwFVAT+BO8FAAUBgQEk
+gQEcgQExgQEbgQEugQEhXxCFV2hlbiBlbmFibGVkLCBjbGlja2luZyBvbiBhbiBpbmFjdGl2ZSB3aW5k
+b3cgd2lsbCBjYXVzZSB0aGF0IG1vdXNlIGNsaWNrIHRvIHBhc3MgdGhyb3VnaCB0byB0aGF0IHdpbmRv
+dyBpbiBhZGRpdGlvbiB0byBhY3RpdmF0aW5nIGl0Ll8QFnt7MTAsIDMzfSwgezQzOCwgMjc5fX3SADoA
+OwVbAUqjAUoBSwA/XxAWe3sxMCwgMTB9LCB7NDU4LCAzMjV9fdIADgBFAE0FX4AfowTgBWEFYoEBNoEB
+OoEBU9YADgVkAUoFZQUJAIwFZgVnAYEBiAT8BWtcTlNJZGVudGlmaWVyWU5TVGFiVmlld4EBOYEBN4BD
+gQEUgQEcgQE40gAOADYANwVugARRMVVJbnB1dNIAOgA7BXEFcqIFcgA/XU5TVGFiVmlld0l0ZW3WAA4F
+ZAFKBWUFCQCMBWYFdQHGAYgE/AV5gQE5gQE7gFWBARSBARyBAVLSAA4ANgA3BXyABFEy0gAOAEUATQV/
+gB+nBYAFgQHCBYMFhARYBYaBAT2BAUGAVIEBRYEBSYD1gQFN1wD9AA4A/gD/AQABAQECAcYBBAWKBYsB
+EACrAcaAVYAxgQE+gQE/CYBVXxAWe3sxOCwgMTE2fSwgezQwMiwgMTh9fd0BFAAOARUBFgEXARgBGQEa
+ARsBHAEdAR4BHwEgASEAlwEjAZEBkgCXBZQBKAWAASoBlwGYgDCAD4BHgA+BAUCAKYEBPV8QF1VzZSBz
+eXN0ZW0gYWxlcnQgZWZmZWN01wD9AA4A/gD/AQABAQECAcYE8gWbBZwBEACrAcaAVYEBJYEBQoEBQwmA
+VV8QFXt7MzYsIDgyfSwgezM4NSwgMjh9fdgBFAAOBPkBGgEbARwBHgT6ASAE+wT8BaME/gWBBQAFAYEB
+JIEBHIEBRIEBG4EBQYEBIV8QZ1gxMSBiZWVwcyB3aWxsIHVzZSB0aGUgc3RhbmRhcmQgc3lzdGVtIGFs
+ZXJ0LCBhcyBkZWZpbmVkIGluIHRoZSBTb3VuZCBFZmZlY3RzIHN5c3RlbSBwcmVmZXJlbmNlcyBwYW5l
+bC7XAP0ADgD+AP8BAAEBAQIBxgTyBasFrAEQAKsBxoBVgQElgQFGgQFHCYBVXxAVe3sxNywgMjM4fSwg
+ezU1LCAyMH192AEUAA4E+QEaARsBHAEeBPoBIAT7BPwFswEoBYMFAAUBgQEkgQEcgQFIgCmBAUWBASFY
+Q29sb3JzOgrXAP0ADgD+AP8BAAEBAQIBxgTyBbsFvAEQAKsBxoBVgQElgQFKgQFLCYBVXxAWe3szNiwg
+MjE2fSwgezM5MiwgMTR9fdgBFAAOBPkBGgEbARwBHgT6ASAE+wT8BcME/gWEBQAFAYEBJIEBHIEBTIEB
+G4EBSYEBIV8QNFRoaXMgb3B0aW9uIHRha2VzIGVmZmVjdCB3aGVuIFgxMSBpcyBsYXVuY2hlZCBhZ2Fp
+bi7XAP0ADgD+AP8BAAEBAQIBxgTyBcsFzAEQAKsBxoBVgQElgQFOgQFPCYBVXxAWe3szNiwgMTQ1fSwg
+ezM4NSwgMzF9fdgBFAAOBPkBGgEbARwBHgT6ASAE+wT8BdME/gWGBQAFAYEBJIEBHIEBUIEBG4EBTYEB
+IV8QZEVuYWJsZXMgdGhlIFgxMSByb290IHdpbmRvdy4gVXNlIHRoZSBDb21tYW5kLU9wdGlvbi1BIGtl
+eXN0cm9rZSB0byBlbnRlciBhbmQgbGVhdmUgZnVsbCBzY3JlZW4gbW9kZS5WT3V0cHV01QAOAUoFZQUJ
+AIwFZgKJAYgE/AXegQE5gIKBARSBARyBAWbSAA4ARQBNBeGAH6UF4gKGBeQF5QXmgQFVgIGBAVmBAV2B
+AWHXAP0ADgD+AP8BAAEBAQICiQEEBeoF6wEQAKsCiYCCgDGBAVaBAVcJgILdARQADgEVARYBFwEYARkB
+GgEbARwBHQEeAR8BIAEhAJcBIwGRAZIAlwXzASgF4gEqAZcBmIAwgA+AR4APgQFYgCmBAVVfEBhBdXRo
+ZW50aWNhdGUgY29ubmVjdGlvbnPXAP0ADgD+AP8BAAEBAQICiQTyBfoF+wEQAKsCiYCCgQElgQFagQFb
+CYCCXxAWe3szNiwgMTk1fSwgezM4NSwgNDJ9fdgBFAAOBPkBGgEbARwBHgT6ASAE+wT8BgIE/gXkBQAF
+AYEBJIEBHIEBXIEBG4EBWYEBIV8QqkxhdW5jaGluZyBYMTEgd2lsbCBjcmVhdGUgWGF1dGhvcml0eSBh
+Y2Nlc3MtY29udHJvbCBrZXlzLiBJZiB0aGUgc3lzdGVtJ3MgSVAgYWRkcmVzcyBjaGFuZ2VzLCB0aGVz
+ZSBrZXlzIGJlY29tZSBpbnZhbGlkIHdoaWNoIG1heSBwcmV2ZW50IFgxMSBhcHBsaWNhdGlvbnMgZnJv
+bSBsYXVuY2hpbmcu1wD9AA4A/gD/AQABAQECAokE8gYKBgsBEACrAomAgoEBJYEBXoEBXwmAgl8QFnt7
+MzYsIDExOH0sIHszODUsIDQyfX3YARQADgT5ARoBGwEcAR4E+gEgBPsE/AYSBP4F5QUABQGBASSBARyB
+AWCBARuBAV2BASFfEJlJZiBlbmFibGVkLCBBdXRoZW50aWNhdGUgY29ubmVjdGlvbnMgbXVzdCBhbHNv
+IGJlIGVuYWJsZWQgdG8gZW5zdXJlIHN5c3RlbSBzZWN1cml0eS4gV2hlbiBkaXNhYmxlZCwgY29ubmVj
+dGlvbnMgZnJvbSByZW1vdGUgYXBwbGljYXRpb25zIGFyZSBub3QgYWxsb3dlZC7XAP0ADgD+AP8BAAEB
+AQICiQTyBhoGGwEQAKsCiYCCgQElgQFigQFjCYCCXxAVe3syMCwgMTd9LCB7NDA0LCAxNH192AEUAA4E
++QEaARsBHAEeBPoBIAT7BPwGIgT+BeYFAAUBgQEkgQEcgQFkgQEbgQFhgQEhXxA0VGhlc2Ugb3B0aW9u
+cyB0YWtlIGVmZmVjdCB3aGVuIFgxMSBpcyBuZXh0IGxhdW5jaGVkLlhTZWN1cml0edIAOgA7BikFZaQF
+ZQFKAUsAP1p7NDgxLCAzNDV9XxAVe3swLCAwfSwgezE0NDAsIDg3OH19WnsyMTMsIDEyOX1ZeDExX3By
+ZWZz0gA6ADsGLwYwogYwAD9fEBBOU1dpbmRvd1RlbXBsYXRlW3ByZWZzX3BhbmVs1AAOAIoAiwCMAPgA
++QDaBjaANYAygB2BAXBfEBBhcHBzX3RhYmxlX3Nob3c61AAOAIoAiwCMAI0A+QAfBjyAIoAygAKBAXJY
+ZGVsZWdhdGXUAA4AigCLAIwAjQXiAPkGQoAigQFVgDKBAXRbZW5hYmxlX2F1dGjUAA4AigCLAIwA+AAf
+AycGSIA1gAKAu4EBdl8QFmhpZGVPdGhlckFwcGxpY2F0aW9uczrUAA4AigCLAIwA+AD5Bk0GToA1gDKB
+AXiBAX7XAP0ADgD+AP8BAAEBAQIBAwEEBlIGUwZUAKsBA4AlgDGBAXmBAXoRAS8JgCVfEBV7ezM1Miwg
+MTJ9LCB7ODQsIDMyfX3dARQADgEVARYBFwEYARkBGgEbARwBHQEeAR8GWQEhBlsBIwEkASUGXQZeASgG
+TQEqASsBLBP/////hAH+AIAwgQF8gCyBAX2BAXuAKYEBeFZDYW5jZWzSAA4ANgA3ALKABNIADgA2ADcA
+soAEXxASYXBwc190YWJsZV9jYW5jZWw61AAOAIoAiwCMAPgA+QOVBjaANYAygMWBAXDUAA4AigCLAIwA
++AD5A/cGcIA1gDKA34EBgV8QEG1pbmltaXplX3dpbmRvdzrTAA4AiwCMAPgDrgZ1gDWA0oEBg1RjdXQ6
+1AAOAIoAiwCMAPgA+QZ6BnuANYAygQGFgQGL1wD9AA4A/gD/AQABAQECAQMBBAZ/BoABBwCrAQOAJYAx
+gQGGgQGHCYAlXxAXe3szNzIsIDI0N30sIHsxMDAsIDMyfX3dARQADgEVARYBFwEYARkBGgEbARwBHQEe
+AR8BIAEhBoYBIwEkASUGiAaJASgGegEqASsBLIAwgQGJgCyBAYqBAYiAKYEBhVlEdXBsaWNhdGXSAA4A
+NgA3ALKABNIADgA2ADcAsoAEXxAVYXBwc190YWJsZV9kdXBsaWNhdGU61AAOAIoAiwCMAI0FgAD5BpaA
+IoEBPYAygQGNW3VzZV9zeXNiZWVw1AAOAIoAiwCMAI0GmgD5BpyAIoEBj4AygQG33xATAP0GngAOBNMG
+nwT5BqAGoQaiBqMGpAEAAQwBAQalBqYBAganBqgGqQGXBqoGqwasBq0AqwavBrABJAaxARAGsgCrBrQB
+/AapBrYGt18QH05TRHJhZ2dpbmdTb3VyY2VNYXNrRm9yTm9uTG9jYWxcTlNIZWFkZXJWaWV3XxASTlNB
+bGxvd3NUeXBlU2VsZWN0XE5TQ29ybmVyVmlld18QF05TSW50ZXJjZWxsU3BhY2luZ1dpZHRoXxAZTlND
+b2x1bW5BdXRvcmVzaXppbmdTdHlsZV8QGE5TSW50ZXJjZWxsU3BhY2luZ0hlaWdodFtOU0dyaWRDb2xv
+cl8QHE5TRHJhZ2dpbmdTb3VyY2VNYXNrRm9yTG9jYWxeTlNUYWJsZUNvbHVtbnNbTlNSb3dIZWlnaHSB
+AZCBAbYSUkCAAIEBkoEBpAmBAZYjQAgAAAAAAAAjQAAAAAAAAACBAZEJgQGzgQGQgQGaI0AxAAAAAAAA
+2gD9AA4A/ga5AQsBAAa6BrsBAga8Br0Gvga/BsAGwQbCBpoGxAa9BppZTlNjdkZsYWdzWU5TRG9jVmll
+d1lOU0JHQ29sb3JdTlNOZXh0S2V5Vmlld4EBl4EB4YEB4BAEgQHfEQkAgQGPgQGxgQGXgQGPWnszMzMs
+IDE5N33WAP0ADgEAAQwBAgbJBsoGywEQBswGygaaW05TVGFibGVWaWV3gQGTgQGVgQGUgQGTgQGP2gD9
+AA4A/ga5AQsBAAa6BrsBAga8Br0GvgbSBsAG0wbCBqwGxAa9BqyBAZeBAeGBAemBAeiBAZKBAbGBAZeB
+AZJZezMzMywgMTd90gA6ADsG2gbbpAbbAUoBSwA/XxARTlNUYWJsZUhlYWRlclZpZXfVAP0ADgD+AQAB
+Aga9Bt4G3wEQBr2BAZeBAZmBAZiBAZfeAP0G4gAOAP4G4wahBuQBCwblAQABAgbmBrwG5wEDBukG6gbr
+BuwGrwbKBu8G8AbxAQMG8wapBqlbTlNIU2Nyb2xsZXJYTlNzRmxhZ3NfEBBOU0hlYWRlckNsaXBWaWV3
+XE5TU2Nyb2xsQW10c1tOU1ZTY3JvbGxlcl1OU0NvbnRlbnRWaWV3gCWBAeaBAeuBAeoQMoEBloEBk4EB
+3k8QEEEgAABBIAAAQZgAAEGYAAARATOAJYEB4oEBkIEBkF8QFHt7MzM0LCAwfSwgezE2LCAxN3190gA6
+ADsG+Ab5pAb5AUoBSwA/XV9OU0Nvcm5lclZpZXfSAA4ARQBNBvyAH6MG/Qb+Bv+BAZuBAaaBAaraBwEA
+DgcCBwMHBAcFBwYHBwcIBskAqwcKBwsHDAcNAeIHDgcPAKsGml5OU0lzUmVzaXplYWJsZVxOU0hlYWRl
+ckNlbGxXTlNXaWR0aFpOU0RhdGFDZWxsXk5TUmVzaXppbmdNYXNrWk5TTWluV2lkdGhaTlNNYXhXaWR0
+aFxOU0lzRWRpdGFibGUJgQGlgQGcI0BbwAAAAAAAgQGiI0BEAAAAAAAAI0CPQAAAAAAACYEBj9cBFAAO
+BPkBGgEbAR4E+gcTBxQHFQcWBP4BlwcYEgSB/gCBAaGBAZ6BAZ2BARuBAZ9UTmFtZdMADgUKBRUFDQHi
+BxyBASBLMC4zMzMzMzI5OQDVAA4FCQUKBQsFDAUNBRwFDwcgBRGBASCBASOBAaCBAR1fEA9oZWFkZXJU
+ZXh0Q29sb3LSADoAOwckByWlByUFJQFFAP8AP18QEU5TVGFibGVIZWFkZXJDZWxs2AEUAA4E+QEaARsB
+HAEeBPoHJwT7Bq0HKgEoBpoB5gUBEhQx/kCBASSBAaSBAaOAKYEBj4EBIVlUZXh0IENlbGzTAA4FCgUV
+BQ0B4gcxgQEgQjEA0gA6ADsHMwc0ogc0AD9dTlNUYWJsZUNvbHVtbtoHAQAOBwIHAwcEBwUHBgcHBwgG
+yQCrBwoHOAc5BzoB4gc7Bw8AqwaaCYEBpYEBpyNAYJdkYAAAAIEBqSNAT12RYAAAAAmBAY/XARQADgT5
+ARoBGwEeBPoHEwcUBxUHQQT+AZcHGIEBoYEBnoEBqIEBG4EBn1dDb21tYW5k2AEUAA4E+QEaARsBHAEe
+BPoHJwT7Bq0HKgEoBpoB5gUBgQEkgQGkgQGjgCmBAY+BASHaBwEADgcCBwMHBAcFBwYHBwcIBskAqwcK
+B08HUAdRAeIHUgcPAKsGmgmBAaWBAasjQFQAAAAAAACBAa8jQCQAAAAAAAAJgQGP1wEUAA4E+QEaARsB
+HgT6ASAHFAdXB1gE/gGXBxiBAaGBAa2BAayBARuBAZ9YU2hvcnRjdXTVAA4FCQUKBQsFDAUNBq0FDwdf
+BRGBASCBAaSBAa6BAR1baGVhZGVyQ29sb3LZARQADgT5ARoBGwEcAR4E1AT6BycE+wbEByoHZgaaAeYA
+qwUBgQEkgQGxgQGjgQGwgQGPCYEBIdQADgEvAJMBMAExB2wBMwE8gCsjQCgAAAAAAACAKtUADgUJBQoF
+CwUMBQ0FDgUPB3EFEYEBIIEBH4EBsoEBHV8QFmNvbnRyb2xCYWNrZ3JvdW5kQ29sb3LVAA4FCQUKBQsF
+DAUNB3YFDwd3BRGBASCBAbWBAbSBAR1ZZ3JpZENvbG9y0wAOBQoFFQUNAeIHfIEBIEQwLjUA0gA6ADsH
+fgbJpQbJAUkBSgFLAD9aYXBwc190YWJsZdQADgCKAIsAjAD4AB8DJgeEgDWAAoC4gQG5VWhpZGU61AAO
+AIoAiwCMAPgA+QP4B4qANYAygOKBAbtcem9vbV93aW5kb3c61AAOAIoAiwCMAPgA+QP+B5CANYAygOaB
+Ab1fEA9icmluZ190b19mcm9udDrUAA4AigCLAIwA+AD5BeIBp4A1gDKBAVWAUNMADgCLAIwA+AOxB5qA
+NYDYgQHAV2RlbGV0ZTrUAA4AigCLAIwAjQGmAPkHoIAigEyAMoEBwltzeW5jX2tleW1hcNQADgCKAIsA
+jAD4APkFgAGngDWAMoEBPYBQ1AAOAIoAiwCMAPgA+QRGB6uANYAygO+BAcVZeDExX2hlbHA60wAOAIsA
+jAD4A7AHsIA1gNWBAcdWcGFzdGU61AAOAIoAiwCMAI0CWwD5B7aAIoB2gDKBAcldY2xpY2tfdGhyb3Vn
+aNQADgCKAIsAjACNA/8A+Qe8gCKA6IAygQHLXxAQd2luZG93X3NlcGFyYXRvctQADgCKAIsAjAD4APkD
+KgfCgDWAMoC+gQHNVXF1aXQ61AAOAIoAiwCMAI0CoQD5B8iAIoCHgDKBAc9cZmFrZV9idXR0b25z1AAO
+AIoAiwCMAI0AnQD5B86AIoAOgDKBAdFfEBVkb2NrX3dpbmRvd19zZXBhcmF0b3LTAA4AiwCMAPgDrAfT
+gDWAzoEB01VyZWRvOtQADgCKAIsAjACNAoYA+QfZgCKAgYAygQHVWmVuYWJsZV90Y3DUAA4AigCLAIwA
++AD5B94H34A1gDKBAdeBAdzXAP0ADgD+AP8BAAEBAQIBAwEEB+MH5AZUAKsBA4AlgDGBAdiBAdkJgCVf
+EBV7ezI2OCwgMTJ9LCB7ODQsIDMyfX3dARQADgEVARYBFwEYARkBGgEbARwBHQEeAR8GWQEhAJcBIwEk
+ASUH7AftASgH3gEqASsBLIAwgA+ALIEB24EB2oApgQHXVERvbmXSAA4ANgA3ALKABF8QEGFwcHNfdGFi
+bGVfZG9uZTrSAA4ARQf1B/aBAfqvEIEDIAOsAecG/wXmAscCWwa9APkF+wUtAgsCDATvAYED/QMmAyoD
+lQGmAawF6wR8Bk0A2QTsAxEFnACdAmEFYQaABv0CcQGIBeIGrAEGB94CpwMQBeUFgAHCA/cAngK2A60C
+4gWBAMkFiwHGBgsDPwJHA/sGegOrA/4DDwMhANoDJwTqBzoAjgYbCDsCoQTgBYQHUQb+AuoCOQShAlIE
+RgFyA/gDAQbzAeABAwOuAPoFTQWGBWIBhAFXBukBXwfkBeQDJQKGAgoE6QW8CFwFPQOxBcwDIgF9BF8E
+swHJBlMC8wT0Aw0HDQR2BDcFgwMjBFgGmgMOA7AFrAP/AowBagMpAomAq4DOgFyBAaqBAWGAkYB2gQGX
+gDKBAVuBASiAZIBngQEugEOA5YC4gL6AxYBMgE6BAVeA/4EBeIAcgQEqgOqBAUOADoB4gQE6gQGHgQGb
+gHuBARSBAVWBAZKAJ4EB14CJgNqBAV2BAT2AVIDfgBeAjIDRgJqBAUGAGoEBP4BVgQFfgLKAcoDkgQGF
+gMuA5oDHgK6AHYC7gQEmgQGpgAuBAWOBAeyAh4EBNoEBSYEBr4EBpoCbgG6BAQuAc4DvgD2A4oCkgQHi
+gFuAJYDSgCSBATCBAU2BAVOARYA3gQHmgDiBAdmBAVmAt4CBgGGBAReBAUuBAfiBASyA2IEBT4CvgEKA
+94EBEoBXgQF6gJ+BARmAp4EBooD9gO2BAUWAtoD1gQGPgMKA1YEBR4DogISAPIC9gILSAA4ARQBNCHqA
+H6UGqQbzBukGygavgQGQgQHigQHmgQGTgQGW0gAOAEUATQiCgB+hBpqBAY9fEBV7ezEsIDE3fSwgezMz
+MywgMTk3fX3SADoAOwiGCIekCIcBSgFLAD9aTlNDbGlwVmlld9gA/QHxAA4A/gEAAMcBAgiJBr0GvQiM
+CI0BEAiOBr0IkFlOU1BlcmNlbnSBAZeBAZeBAeWBAeOBAeSBAZcjP+/WamAAAABfEBZ7ezMzNCwgMTd9
+LCB7MTUsIDE5N319XF9kb1Njcm9sbGVyOtIAOgA7CJQIlaUIlQFJAUoBSwA/Wk5TU2Nyb2xsZXLZAP0B
+8QAOAP4G4wEAAMcBAgiJBr0GvQiMCJoBJAEQCI4GvQidgQGXgQGXgQHlgQHngQHkgQGXIz/mCGTAAAAA
+XxAVe3sxLCAyMTR9LCB7MzMzLCAxNX190gAOAEUATQihgB+hBqyBAZJfEBN7ezEsIDB9LCB7MzMzLCAx
+N319XxAWe3syMCwgNzd9LCB7MzUwLCAyMzB9fdIAOgA7CKYIp6QIpwFKAUsAP1xOU1Njcm9sbFZpZXff
+EA8EpQAOBKYEpwSoBKkEqgSrBKwErQSuBK8EsASxBLIBAwS0CKsIrAitCK4EuQS6CLAIsQiyAZEIswi0
+CLWAJYEBbYEB8IEB9IEB94EB7oEBDoEB8YEB7YEB9hALgQH1gQHvXxAYe3syNzksIDI1M30sIHs0ODYs
+IDMyN319XxAUWDExIEFwcGxpY2F0aW9uIE1lbnXSAA4ANgA3BMWABNIADgBFAE0IvIAfpgfeBnoEdga9
+Bk0A+oEB14EBhYD9gQGXgQF4gCRaezQ4NiwgMzI3fVh4MTFfYXBwc9IADgAyADMIx4AFgQH50gA6ADsI
+yQDvogDvAD/SAA4ARQf1CMyBAfqvEIEBXwLqAckGmgKJAXIBgQEDAB8F5ATqAecB5wGBBOABcgFfAV8C
+UgGBAaYF4gR2AQMAyQGBAwEFgQCOAlsBiAZ6BpoBcgSzAokGvQD6AQMCoQMBAokBxgHGAXIAjgFfAuoC
+6gHGAJ4FgAVhBeUDIgJSAXIBAwLqAXIDAQFfAMkBXwGBBv4AHwXmAB8BgQGIAcYG/waaAw8BXwAfAw4E
+NwMQAXIAHwa9AecIOwLqAQME7wHGAYgBfQFfBr0DDQfeAokBXwKJAecBgQWEAB8E7ALqBYYBXwGBBFgE
+oQHCBk0C6gTpAwEG/QEDAxEBxgFfAcYGvQMBAuoFgwFyAoYBcgFfBWKAOICbgFeBAY+AgoA9gEOAJYAC
+gQFZgQEmgFyAXIBDgQE2gD2AOIA4gHOAQ4BMgQFVgP2AJYAagEOApIEBQYALgHaBARSBAYWBAY+APYEB
+EoCCgQGXgCSAJYCHgKSAgoBVgFWAPYALgDiAm4CbgFWAF4EBPYEBOoEBXYCvgHOAPYAlgJuAPYCkgDiA
+GoA4gEOBAaaAAoEBYYACgEOBARSAVYEBqoEBj4DHgDiAAoDCgO2A2oA9gAKBAZeAXIEB7ICbgCWBAS6A
+VYEBFIBCgDiBAZeAp4EB14CCgDiAgoBcgEOBAUmAAoEBKoCbgQFNgDiAQ4D1gQELgFSBAXiAm4EBF4Ck
+gQGbgCWA6oBVgDiAVYEBl4CkgJuBAUWAPYCBgD2AOIEBU9IADgBFB/UJUIEB+q8QggMgA6wG/wHnBeYC
+xwa9AlsA+QX7BS0CCwIMBO8BgQP9AyYDKgOVBHwBpgGsBesGTQDZBOwDEQWcAJ0FYQaAAmEG/QGIAnEF
+4gasAQYH3gKnAxAF5QWAAJ4D9wHCArYAHwOtAuIFgQDJBYsBxgYLAz8CRwZ6A/sDqwP+Aw8DIQDaAycE
+6gCOBzoGGwg7AqEE4AWEB1EG/gLqAjkEoQJSBEYBcgP4AwEG8wEDAeADrgD6BWIFhgVNBukBVwfkAV8B
+hAXkAyUChgIKBOkFvAhcBcwDsQU9AyIBfQRfBLMByQZTAvMHDQMNBPQEdgQ3BYMDIwRYBpoDDgOwBawD
+/wKMAWoDKQKJgKuAzoEBqoBcgQFhgJGBAZeAdoAygQFbgQEogGSAZ4EBLoBDgOWAuIC+gMWA/4BMgE6B
+AVeBAXiAHIEBKoDqgQFDgA6BATqBAYeAeIEBm4EBFIB7gQFVgQGSgCeBAdeAiYDagQFdgQE9gBeA34BU
+gIyAAoDRgJqBAUGAGoEBP4BVgQFfgLKAcoEBhYDkgMuA5oDHgK6AHYC7gQEmgAuBAamBAWOBAeyAh4EB
+NoEBSYEBr4EBpoCbgG6BAQuAc4DvgD2A4oCkgQHigCWAW4DSgCSBAVOBAU2BATCBAeaAN4EB2YA4gEWB
+AVmAt4CBgGGBAReBAUuBAfiBAU+A2IEBLICvgEKA94EBEoBXgQF6gJ+BAaKAp4EBGYD9gO2BAUWAtoD1
+gQGPgMKA1YEBR4DogISAPIC9gILSAA4ARQf1CdWBAfqvEIIJ1gnXCdgJ2QnaCdsJ3AndAU4J3wngCeEJ
+4gnjCeQJ5QnmCecJ6AnpCeoJ6wnsCe0J7gnvCfAJ8QnyCfMJ9An1CfYJ9wn4CfkJ+gn7CfwJ/Qn+Cf8K
+AAoBCgIKAwoECgUKBgoHCggKCQoKCgsKDAoNCg4KDwoQChEKEgoTChQKFQoWChcKGAoZChoKGwocCh0K
+HgofCiAKIQoiCiMKJAolCiYKJwMGCikKKgorCiwKLQouCi8KMAoxCjIKMwo0CjUKNgo3CjgKOQo6CjsK
+PAo9Cj4KPwpACkEKQgpDCkQKRQpGCkcKSApJCkoKSwpMCk0KTgpPClAKUQpSClMKVApVClYKV4EB/oEB
+/4ECAIECAYECAoECA4ECBIECBYAzgQIGgQIHgQIIgQIJgQIKgQILgQIMgQINgQIOgQIPgQIQgQIRgQIS
+gQITgQIUgQIVgQIWgQIXgQIYgQIZgQIagQIbgQIcgQIdgQIegQIfgQIggQIhgQIigQIjgQIkgQIlgQIm
+gQIngQIogQIpgQIqgQIrgQIsgQItgQIugQIvgQIwgQIxgQIygQIzgQI0gQI1gQI2gQI3gQI4gQI5gQI6
+gQI7gQI8gQI9gQI+gQI/gQJAgQJBgQJCgQJDgQJEgQJFgQJGgQJHgQJIgQJJgQJKgQJLgQJMgQJNgQJO
+gKWBAk+BAlCBAlGBAlKBAlOBAlSBAlWBAlaBAleBAliBAlmBAlqBAluBAlyBAl2BAl6BAl+BAmCBAmGB
+AmKBAmOBAmSBAmWBAmaBAmeBAmiBAmmBAmqBAmuBAmyBAm2BAm6BAm+BAnCBAnGBAnKBAnOBAnSBAnWB
+AnaBAneBAniBAnmBAnqBAnuBAnyBAn1fEBpNZW51IEl0ZW0gKFByZWZlcmVuY2VzLi4uKV8QEE1lbnUg
+SXRlbSAoUmVkbylfEBdUYWJsZSBDb2x1bW4gKFNob3J0Y3V0KV8QEU1lbnUgKE90aGVyVmlld3MpXxBC
+U3RhdGljIFRleHQgKFRoZXNlIG9wdGlvbnMgdGFrZSBlZmZlY3Qgd2hlbiBYMTEgaXMgbmV4dCBsYXVu
+Y2hlZC4pXxApTWVudSBJdGVtIChSZXZlcnNlIEN5Y2xlIFRocm91Z2ggV2luZG93cylbU2Nyb2xsIFZp
+ZXdfECpDaGVjayBCb3ggKENsaWNrLXRocm91Z2ggSW5hY3RpdmUgV2luZG93cylfELxUZXh0IEZpZWxk
+IENlbGwgKExhdW5jaGluZyBYMTEgd2lsbCBjcmVhdGUgWGF1dGhvcml0eSBhY2Nlc3MtY29udHJvbCBr
+ZXlzLiBJZiB0aGUgc3lzdGVtJ3MgSVAgYWRkcmVzcyBjaGFuZ2VzLCB0aGVzZSBrZXlzIGJlY29tZSBp
+bnZhbGlkIHdoaWNoIG1heSBwcmV2ZW50IFgxMSBhcHBsaWNhdGlvbnMgZnJvbSBsYXVuY2hpbmcuKV8Q
+aVRleHQgRmllbGQgQ2VsbCAoSG9sZCBPcHRpb24gYW5kIENvbW1hbmQgd2hpbGUgY2xpY2tpbmcgdG8g
+YWN0aXZhdGUgdGhlIG1pZGRsZSBhbmQgcmlnaHQgbW91c2UgYnV0dG9ucy4KKV8QFU1lbnUgSXRlbSAo
+VGhvdXNhbmRzKV8QFE1lbnUgSXRlbSAoTWlsbGlvbnMpXxCTU3RhdGljIFRleHQgKFdoZW4gZW5hYmxl
+ZCwgY2xpY2tpbmcgb24gYW4gaW5hY3RpdmUgd2luZG93IHdpbGwgY2F1c2UgdGhhdCBtb3VzZSBjbGlj
+ayB0byBwYXNzIHRocm91Z2ggdG8gdGhhdCB3aW5kb3cgaW4gYWRkaXRpb24gdG8gYWN0aXZhdGluZyBp
+dC4pVlZpZXctMVtTZXBhcmF0b3ItMV8QFE1lbnUgSXRlbSAoSGlkZSBYMTEpXxAUTWVudSBJdGVtIChR
+dWl0IFgxMSlfEBhNZW51IEl0ZW0gKEN1c3RvbWl6ZS4uLilfEBRCdXR0b24gQ2VsbCAoUmVtb3ZlKV8Q
+KUNoZWNrIEJveCAoRm9sbG93IHN5c3RlbSBrZXlib2FyZCBsYXlvdXQpXxArQnV0dG9uIENlbGwgKEZv
+bGxvdyBzeXN0ZW0ga2V5Ym9hcmQgbGF5b3V0KV8QJkJ1dHRvbiBDZWxsIChBdXRoZW50aWNhdGUgY29u
+bmVjdGlvbnMpXxAUUHVzaCBCdXR0b24gKENhbmNlbClcU2VwYXJhdG9yLTEwXxBMU3RhdGljIFRleHQg
+KEFsbG93cyBpbnB1dCBtZW51IGNoYW5nZXMgdG8gb3ZlcndyaXRlIHRoZSBjdXJyZW50IFgxMSBrZXlt
+YXAuKV8QEE1lbnUgSXRlbSAoSGVscClfEHlUZXh0IEZpZWxkIENlbGwgKFgxMSBiZWVwcyB3aWxsIHVz
+ZSB0aGUgc3RhbmRhcmQgc3lzdGVtIGFsZXJ0LCBhcyBkZWZpbmVkIGluIHRoZSBTb3VuZCBFZmZlY3Rz
+IHN5c3RlbSBwcmVmZXJlbmNlcyBwYW5lbC4pWVNlcGFyYXRvcl8QFlRhYiBWaWV3IEl0ZW0gKE91dHB1
+dClfEBdCdXR0b24gQ2VsbCAoRHVwbGljYXRlKV8QLEJ1dHRvbiBDZWxsIChDbGljay10aHJvdWdoIElu
+YWN0aXZlIFdpbmRvd3MpXxATVGFibGUgQ29sdW1uIChOYW1lKV8QJlRvcCBUYWIgVmlldyAoSW5wdXQs
+IE91dHB1dCwgU2VjdXJpdHkpXxAhTWVudSBJdGVtIChDeWNsZSBUaHJvdWdoIFdpbmRvd3MpXxAkQ2hl
+Y2sgQm94IChBdXRoZW50aWNhdGUgY29ubmVjdGlvbnMpXxARVGFibGUgSGVhZGVyIFZpZXdfEBZCdXR0
+b24gQ2VsbCAoQWRkIEl0ZW0pXxASUHVzaCBCdXR0b24gKERvbmUpXxAoQnV0dG9uIENlbGwgKEVtdWxh
+dGUgdGhyZWUgYnV0dG9uIG1vdXNlKV8QEk1lbnUgSXRlbSAoV2luZG93KV8Qp1N0YXRpYyBUZXh0IChJ
+ZiBlbmFibGVkLCBBdXRoZW50aWNhdGUgY29ubmVjdGlvbnMgbXVzdCBhbHNvIGJlIGVuYWJsZWQgdG8g
+ZW5zdXJlIHN5c3RlbSBzZWN1cml0eS4gV2hlbiBkaXNhYmxlZCwgY29ubmVjdGlvbnMgZnJvbSByZW1v
+dGUgYXBwbGljYXRpb25zIGFyZSBub3QgYWxsb3dlZC4pXxAjQ2hlY2sgQm94IChVc2Ugc3lzdGVtIGFs
+ZXJ0IGVmZmVjdClfEBpNZW51IEl0ZW0gKEFwcGxpY2F0aW9ucyktMV8QFE1lbnUgSXRlbSAoTWluaW1p
+emUpXxAbUG9wdXAgQnV0dG9uIChGcm9tIERpc3BsYXkpXxAeTWVudSBJdGVtIChUb2dnbGUgRnVsbCBT
+Y3JlZW4pXEZpbGUncyBPd25lcltTZXBhcmF0b3ItNF8QFk1lbnUgSXRlbSAoU2VsZWN0IEFsbClfEHVT
+dGF0aWMgVGV4dCAoWDExIGJlZXBzIHdpbGwgdXNlIHRoZSBzdGFuZGFyZCBzeXN0ZW0gYWxlcnQsIGFz
+IGRlZmluZWQgaW4gdGhlIFNvdW5kIEVmZmVjdHMgc3lzdGVtIHByZWZlcmVuY2VzIHBhbmVsLilfEBVN
+ZW51IChBcHBsaWNhdGlvbnMpLTFfECVCdXR0b24gQ2VsbCAoVXNlIHN5c3RlbSBhbGVydCBlZmZlY3Qp
+XxCrVGV4dCBGaWVsZCBDZWxsIChJZiBlbmFibGVkLCBBdXRoZW50aWNhdGUgY29ubmVjdGlvbnMgbXVz
+dCBhbHNvIGJlIGVuYWJsZWQgdG8gZW5zdXJlIHN5c3RlbSBzZWN1cml0eS4gV2hlbiBkaXNhYmxlZCwg
+Y29ubmVjdGlvbnMgZnJvbSByZW1vdGUgYXBwbGljYXRpb25zIGFyZSBub3QgYWxsb3dlZC4pXxAPTWVu
+dSAoU2VydmljZXMpW1NlcGFyYXRvci05XxAXUHVzaCBCdXR0b24gKER1cGxpY2F0ZSlbU2VwYXJhdG9y
+LTJfEBBNZW51IEl0ZW0gKFVuZG8pXxAeTWVudSBJdGVtIChCcmluZyBBbGwgdG8gRnJvbnQpXxAQTWVu
+dSBJdGVtIChFZGl0KVtTZXBhcmF0b3ItNW8QFgBNAGUAbgB1ACAASQB0AGUAbQAgACgAQwB1AHMAdABv
+AG0AaQB6AGUgJgApXxAXTWVudSBJdGVtIChIaWRlIE90aGVycylfEGVTdGF0aWMgVGV4dCAoSG9sZCBP
+cHRpb24gYW5kIENvbW1hbmQgd2hpbGUgY2xpY2tpbmcgdG8gYWN0aXZhdGUgdGhlIG1pZGRsZSBhbmQg
+cmlnaHQgbW91c2UgYnV0dG9ucy4KKVhEb2NrTWVudV8QHVRleHQgRmllbGQgQ2VsbCAoVGV4dCBDZWxs
+KS0yXxBGVGV4dCBGaWVsZCBDZWxsIChUaGVzZSBvcHRpb25zIHRha2UgZWZmZWN0IHdoZW4gWDExIGlz
+IG5leHQgbGF1bmNoZWQuKVxFZGl0UHJvZ3JhbXNfECZDaGVjayBCb3ggKEVtdWxhdGUgdGhyZWUgYnV0
+dG9uIG1vdXNlKV8QFVRhYiBWaWV3IEl0ZW0gKElucHV0KV8QQlN0YXRpYyBUZXh0IChUaGlzIG9wdGlv
+biB0YWtlcyBlZmZlY3Qgd2hlbiBYMTEgaXMgbGF1bmNoZWQgYWdhaW4uKV8QG1RleHQgRmllbGQgQ2Vs
+bCAoVGV4dCBDZWxsKV8QFlRhYmxlIENvbHVtbiAoQ29tbWFuZClbTWVudSAoRWRpdClfEBRNZW51IEl0
+ZW0gKFNob3cgQWxsKVpQcmVmc1BhbmVsXxATTWVudSAoQXBwbGljYXRpb25zKV8QFE1lbnUgSXRlbSAo
+WDExIEhlbHApXU1lbnUgKFdpbmRvdylfEBBNZW51IEl0ZW0gKFpvb20pXxARVmVydGljYWwgU2Nyb2xs
+ZXJeQ29udGVudCBWaWV3LTFfEBhNZW51IEl0ZW0gKEZyb20gRGlzcGxheSlfEA9NZW51IEl0ZW0gKEN1
+dClfEBZQdXNoIEJ1dHRvbiAoQWRkIEl0ZW0pXxAYVGFiIFZpZXcgSXRlbSAoU2VjdXJpdHkpXxByU3Rh
+dGljIFRleHQgKEVuYWJsZXMgdGhlIFgxMSByb290IHdpbmRvdy4gVXNlIHRoZSBDb21tYW5kLU9wdGlv
+bi1BIGtleXN0cm9rZSB0byBlbnRlciBhbmQgbGVhdmUgZnVsbCBzY3JlZW4gbW9kZS4pXxCXVGV4dCBG
+aWVsZCBDZWxsIChXaGVuIGVuYWJsZWQsIGNsaWNraW5nIG9uIGFuIGluYWN0aXZlIHdpbmRvdyB3aWxs
+IGNhdXNlIHRoYXQgbW91c2UgY2xpY2sgdG8gcGFzcyB0aHJvdWdoIHRvIHRoYXQgd2luZG93IGluIGFk
+ZGl0aW9uIHRvIGFjdGl2YXRpbmcgaXQuKV8QE0hvcml6b250YWwgU2Nyb2xsZXJfEBVNZW51IEl0ZW0g
+KEFib3V0IFgxMSlfEBJCdXR0b24gQ2VsbCAoRG9uZSlaTWVudSAoWDExKV8QLkJ1dHRvbiBDZWxsIChF
+bmFibGUga2V5IGVxdWl2YWxlbnRzIHVuZGVyIFgxMSlfELhTdGF0aWMgVGV4dCAoTGF1bmNoaW5nIFgx
+MSB3aWxsIGNyZWF0ZSBYYXV0aG9yaXR5IGFjY2Vzcy1jb250cm9sIGtleXMuIElmIHRoZSBzeXN0ZW0n
+cyBJUCBhZGRyZXNzIGNoYW5nZXMsIHRoZXNlIGtleXMgYmVjb21lIGludmFsaWQgd2hpY2ggbWF5IHBy
+ZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4pW1NlcGFyYXRvci02XxAyQ2hlY2sg
+Qm94IChBbGxvdyBjb25uZWN0aW9ucyBmcm9tIG5ldHdvcmsgY2xpZW50cylfEBZNZW51IEl0ZW0gKDI1
+NiBDb2xvcnMpXxB0U3RhdGljIFRleHQgKFdoZW4gZW5hYmxlZCwgbWVudSBiYXIga2V5IGVxdWl2YWxl
+bnRzIG1heSBpbnRlcmZlcmUgd2l0aCBYMTEgYXBwbGljYXRpb25zIHRoYXQgdXNlIHRoZSBNZXRhIG1v
+ZGlmaWVyLilfEEZUZXh0IEZpZWxkIENlbGwgKFRoaXMgb3B0aW9uIHRha2VzIGVmZmVjdCB3aGVuIFgx
+MSBpcyBsYXVuY2hlZCBhZ2Fpbi4pW0FwcGxpY2F0aW9uXxB2VGV4dCBGaWVsZCBDZWxsIChFbmFibGVz
+IHRoZSBYMTEgcm9vdCB3aW5kb3cuIFVzZSB0aGUgQ29tbWFuZC1PcHRpb24tQSBrZXlzdHJva2UgdG8g
+ZW50ZXIgYW5kIGxlYXZlIGZ1bGwgc2NyZWVuIG1vZGUuKV8QEk1lbnUgSXRlbSAoRGVsZXRlKV8QUFRl
+eHQgRmllbGQgQ2VsbCAoQWxsb3dzIGlucHV0IG1lbnUgY2hhbmdlcyB0byBvdmVyd3JpdGUgdGhlIGN1
+cnJlbnQgWDExIGtleW1hcC4pXxAUTWVudSBJdGVtIChTZXJ2aWNlcylfECxDaGVjayBCb3ggKEVuYWJs
+ZSBrZXkgZXF1aXZhbGVudHMgdW5kZXIgWDExKV8QHkJ1dHRvbiBDZWxsIChGdWxsIHNjcmVlbiBtb2Rl
+KVxDb250ZW50IFZpZXdfECFQb3AgVXAgQnV0dG9uIENlbGwgKEZyb20gRGlzcGxheSlfEBRCdXR0b24g
+Q2VsbCAoQ2FuY2VsKV8QEE1lbnUgSXRlbSAoQ29weSlfEB1UZXh0IEZpZWxkIENlbGwgKFRleHQgQ2Vs
+bCktMV8QD01lbnUgSXRlbSAoWDExKV8QeFRleHQgRmllbGQgQ2VsbCAoV2hlbiBlbmFibGVkLCBtZW51
+IGJhciBrZXkgZXF1aXZhbGVudHMgbWF5IGludGVyZmVyZSB3aXRoIFgxMSBhcHBsaWNhdGlvbnMgdGhh
+dCB1c2UgdGhlIE1ldGEgbW9kaWZpZXIuKV8QFFB1c2ggQnV0dG9uIChSZW1vdmUpW01lbnUgKEhlbHAp
+XxAWU3RhdGljIFRleHQgKENvbG9yczoKKVtTZXBhcmF0b3ItN18QHENoZWNrIEJveCAoRnVsbCBzY3Jl
+ZW4gbW9kZSlfECRUYWJsZSBWaWV3IChOYW1lLCBDb21tYW5kLCBTaG9ydGN1dClfEBhNZW51IEl0ZW0g
+KEFwcGxpY2F0aW9ucylfEBFNZW51IEl0ZW0gKFBhc3RlKV8QGlRleHQgRmllbGQgQ2VsbCAoQ29sb3Jz
+OgopW1NlcGFyYXRvci0zXxA0QnV0dG9uIENlbGwgKEFsbG93IGNvbm5lY3Rpb25zIGZyb20gbmV0d29y
+ayBjbGllbnRzKV8QEU1lbnUgSXRlbSAoQ2xvc2UpW1NlcGFyYXRvci04VlZpZXctMtIADgBFB/UK2YEB
++qDSAA4ARQf1CtyBAfqg0gAOAEUH9QrfgQH6rxC8AyADrAHnBv8F5gLHAHICWwa9APkAagCHBfsFLQIL
+AgwE7wGBA/0DJgMqA5UBpgGsBesEfABZAFwAXQBgAGkGTQDZBOwDEQWcAJ0AUwBwAHYCYQVhBoAAXwb9
+AnEBiAXiAGcAWAasAF4BBgBkB94CpwCBAH8AhACFAxAF5QWAAcID9wCeArYAVQBtAB8AdAOtAuIFgQDJ
+BYsATwBXAcYGCwBmAz8CRwP7BnoDqwB8A/4DDwMhANoDJwTqBzoAjgYbAFoIOwKhAFsE4ACCBYQHUQb+
+AuoCOQShAFIAVgJSAGwAYwB4BEYBcgBUA/gAeQMBBvMAhgHgAQMDrgD6BU0FhgViAYQBVwbpAV8H5AXk
+AyUAYgBuAHoAfgCDAoYAcwIKAIgAYQB9BOkFvAhcBT0DsQXMAFADIgBxAX0EXwCABLMByQB3BlMAdQLz
+BPQDDQcNAGUEdgQ3BYMDIwBoAG8AawRYAFEGmgMOA7AFrAP/AowBagMpAHsCiYCrgM6AXIEBqoEBYYCR
+gQF/gHaBAZeAMoEBBoEB1IEBW4EBKIBkgGeBAS6AQ4DlgLiAvoDFgEyAToEBV4D/gHWAgICGgJWBAQSB
+AXiAHIEBKoDqgQFDgA6AQYEBdYEBjIB4gQE6gQGHgJCBAZuAe4EBFIEBVYD6gHGBAZKAi4AngKOBAdeA
+iYEByIEBxIEBzoEB0IDagQFdgQE9gFSA34AXgIyAUYEBb4ACgQGCgNGAmoEBQYAagQE/gAqAbYBVgQFf
+gPSAsoBygOSBAYWAy4EBv4DmgMeAroAdgLuBASaBAamAC4EBY4B6gQHsgIeAf4EBNoEByoEBSYEBr4EB
+poCbgG6BAQuAO4BTgHOBAQqAnoEBuIDvgD2AS4DigQG6gKSBAeKBAdKAW4AlgNKAJIEBMIEBTYEBU4BF
+gDeBAeaAOIEB2YEBWYC3gJmBAXGBAbyBAcOBAcyAgYEBgIBhgQHWgJeBAcGBAReBAUuBAfiBASyA2IEB
+T4AjgK+BAXeAQoD3gQHGgQESgFeBAY6BAXqBAYSAn4EBGYCngQGigPOA/YDtgQFFgLaA/IEBc4EBCID1
+gDaBAY+AwoDVgQFHgOiAhIA8gL2BAb6AgtIADgBFB/ULnoEB+q8QvAufC6ALoQuiC6MLpAulC6YLpwuo
+C6kLqgurC6wLrQuuC68LsAuxC7ILswu0C7ULtgu3C7gLuQu6C7sLvAu9C74LvwvAC8ELwgvDC8QLxQvG
+C8cLyAvJC8oLywvMC80LzgvPC9AL0QvSC9ML1AvVC9YL1wvYC9kL2gvbC9wL3QveC98L4AvhC+IL4wvk
+C+UL5gvnC+gL6QvqC+sL7AvtC+4L7wvwC/EL8gvzC/QL9Qv2C/cL+Av5C/oL+wv8C/0L/gv/DAAMAQwC
+DAMMBAwFDAYMBwwIDAkMCgwLDAwMDQwODA8MEAwRDBIMEwwUDBUMFgwXDBgMGQwaDBsMHAwdDB4MHwwg
+DCEMIgwjDCQMJQwmDCcMKAwpDCoMKwwsDC0MLgwvDDAMMQwyDDMMNAw1DDYMNww4DDkMOgw7DDwMPQw+
+DD8MQAxBDEIMQwxEDEUMRgxHDEgMSQxKDEsMTAxNDE4MTwxQDFEMUgxTDFQMVQxWDFcMWAxZDFqBAoKB
+AoOBAoSBAoWBAoaBAoeBAoiBAomBAoqBAouBAoyBAo2BAo6BAo+BApCBApGBApKBApOBApSBApWBApaB
+ApeBApiBApmBApqBApuBApyBAp2BAp6BAp+BAqCBAqGBAqKBAqOBAqSBAqWBAqaBAqeBAqiBAqmBAqqB
+AquBAqyBAq2BAq6BAq+BArCBArGBArKBArOBArSBArWBAraBAreBAriBArmBArqBAruBAryBAr2BAr6B
+Ar+BAsCBAsGBAsKBAsOBAsSBAsWBAsaBAseBAsiBAsmBAsqBAsuBAsyBAs2BAs6BAs+BAtCBAtGBAtKB
+AtOBAtSBAtWBAtaBAteBAtiBAtmBAtqBAtuBAtyBAt2BAt6BAt+BAuCBAuGBAuKBAuOBAuSBAuWBAuaB
+AueBAuiBAumBAuqBAuuBAuyBAu2BAu6BAu+BAvCBAvGBAvKBAvOBAvSBAvWBAvaBAveBAviBAvmBAvqB
+AvuBAvyBAv2BAv6BAv+BAwCBAwGBAwKBAwOBAwSBAwWBAwaBAweBAwiBAwmBAwqBAwuBAwyBAw2BAw6B
+Aw+BAxCBAxGBAxKBAxOBAxSBAxWBAxaBAxeBAxiBAxmBAxqBAxuBAxyBAx2BAx6BAx+BAyCBAyGBAyKB
+AyOBAySBAyWBAyaBAyeBAyiBAymBAyqBAyuBAyyBAy2BAy6BAy+BAzCBAzGBAzKBAzOBAzSBAzWBAzaB
+AzeBAziBAzmBAzqBAzuBAzyBAz0QgRCtEQF8EQIXEQF7EQIaEQE0EgAElQgRAScQxBEBPhEBhBIAAYgY
+EgABiA0RAX8RAX0SAASVChEBXxECGBCGEIgRATERAXISAAGIEhIAAYgWEgABh8USAASVDBEBkREBihEB
+QRC0EQErEQIVEQFxEQGjEgABiBQRAgwRAYkRAQcRAYYSAASVCREBYBIAAYfEEQIcEQEpEQIZEQFcEQF2
+EQIjEQEREgAElQcRAiUSAAGH1hIABJUuEQEjEgABiAsSAASVLBEBphEBhxECExATEQF5EQFzEQF+EBcR
+Ag4RAiARAawRAhYSAASVLxCvEJwQrBEBdBECDxIAAYgTEQGqEQGvEQFeEgABiBkRAiIQghEBEBBcEQEk
+EJ4QwxAFEKMQjxECFBCREQFtEQI9EQGnEgABiBsRAhsRAR0RAWsRAY4RAV0SAASVKxEBghECPxEBKhCp
+EJYQ9BDNEQGFEQEOEQGSELURAa4RAaURAYsQzBDOEB0SAAGHxxCyEQGAEQEeEKARATYSAASVCxECHxEB
+YRIAAYgQEDoSAAMOZxA5EgABh8MRAXgRAiEQsxEBrRDPEQGNEgAElS0RAXcQyhEBsxEBLhECEhEBiBEB
+bBIAAYgiE//////////9EgABiBEQpBIAAYi/EQE3EIMRATURAXASAAGIvRCwEPUSAAGIHhIAAYfLEQEw
+EJ0SAAGIDBA4EQI+EQGMEQElEQGkEQGBEJARAYMRAiQRAh0RAbERASgRAQ0QqxIAAYghEgAElSoSAAGI
+FxDLEJURAY8RAWLSAA4ARQBNDRaAH6DSAA4ARQf1DRmBAfqg0gAOAEUH9Q0cgQH6oNIAOgA7DR4NH6IN
+HwA/Xk5TSUJPYmplY3REYXRhAAgAGQAiACcAMQA6AD8ARABSAFQAZgbuBvQHPwdGB00HWwdtB4kHlwej
+B68HvQfIB9YH8ggACBMIJQg/CEkIVghYCFsIXghhCGQIZghpCGsIbghxCHQIdwh5CHsIfgiBCIYIiQiS
+CJ4IoAiiCKsItQi3CMUIzgjXCOII6Qj7CQQJDQkWCRsJKgk9CUYJUQlTCVQJXQlkCXEJdwmACYIJ+Qn7
+Cf0J/woBCgMKBQoHCgkKCwoNCg8KEQoTChUKFwoZChsKHQofCiEKIwolCicKKQorCi0KMAozCjYKOQo8
+Cj8KQgpFCkgKSwpOClEKVApXCloKXQpgCmMKZgppCmwKbwpyCnUKeAp7Cn4KgQqECocKigqNCp4KrAq1
+Cr0KvwrBCsMKxQrWCt4K5QrxCvMK9Qr3CvkK/gsHCwkLDgsQCxILOwtPC10LaAt1C4MLjQuaC6ELowul
+C6oLqwutC64Lswu1C7cLuQu6C8cL1gvYC9oL3AvkC/YL/wwEDBcMJAwmDCgMKgw9DEYMSwxWDH8MiQyS
+DJQMlgyYDJoMnAyeDKAMogyvDL4MywzNDM8M0QzaDNwM4QzjDOUNDg0QDRINEw0VDRYNGA0aDRwNPQ0/
+DUENQw1FDUcNSQ1eDWcNbg19DYUNjg2TDZwNpQ2sDcMN0g3jDeUN5w3pDesOCA4aDiIOKQ4yDjwOSA5K
+DkwOTg5QDlMOVA5WDmsOdg6CDoQOhw6KDo0OkA6qDt8O6w8BDxYPJQ84D0oPVQ9fD20Pfw+MD5oPnw+h
+D6MPpQ+nD6kPqw+tD68PsQ+zD7gPwQ/KD9sP4g/rD+0P9g/4D/sQCBAREBYQHRAuEDAQMhA0ED4QRxBJ
+EFIQVBBdEGYQcxCAEIkQlBCdEKcQrhC6EMMQxRDHENUQ5xDwEPcRDxEgESIRJBEmESgRRRFHEUkRSxFN
+EU8RURFiEWQRZhFoEWoRdBGUEaURpxGpEasRrRHOEdAR0hHUEdYR2BHaEesR7RHvEfER8xH5EfsSCRIa
+EhwSHhIgEiISPxJBEkMSRRJHEkgSShJjEmYSaRJsEm8SchKLEsASwhLEEsYSyBLKEswSzhLQEtIS1xL6
+EwMTDxMRExMTHBMlEyoTQBNTE2QTZhNoE2oTbBOJE4sTjROPE5ETkhOUE60T4hPkE+YT6BPqE+wT7hPw
+FBAUHxQwFDIUNBQ2FDgUQhRTFFUUVxRZFFsUeBR6FHwUfhSAFIEUgxSYFJoUnRSgFKMUvBULFSgVOhVM
+FWEVbxV4FXkVexV9FX8VgRWDFYUVhxWJFYsVjBWNFZAVkxWVFZoVqxWtFa8VuBW6FcMVxRX2Ff8WBRYN
+Fg8WERYTFhUWFxYZFhsWHRYmFjMWNRY3FjkWRhZaFmMWZRZwFnkWexaEFoYWiBaKFowWuRa7Fr0WvxbB
+FsMWxRbHFskWyxbWFwMXBRcHFwkXCxcNFw8XERcTFxUXHxdMF04XUBdSF1QXVhdYF1oXXBdeF2cXcBd9
+F5EXoBepF7YXxBfKF9sX3RffF+EX4xgIGAoYDBgOGBAYEhgUGBYYHxg4GEkYSxhNGE8YURh6GHwYfhh/
+GIEYghiEGIYYiBiVGJcYmRibGKoYuxi9GL8YwRjDGOAY4hjkGOYY6BjpGOsZAxk4GToZPBk+GUAZQhlE
+GUYZZxl4GXoZfBl+GYAZoRmjGaUZqhmsGa4ZsBmyGcoZzBnZGeoZ7BnuGfAZ8hoDGgUaBxoJGgsaKBoq
+GiwaLhowGjEaMxpIGkoaTRpQGlMabBqhGqMapRqnGqkaqxqtGq8a2BrpGusa7RrvGvEbDhsQGxIbFBsW
+GxcbGRsyG2cbaRtrG20bbxtxG3MbdRuSG6MbpRunG6kbqxvMG84b0BvVG9cb2RvbG90b8hv0HA0cHhwg
+HCIcJBwmHEccSRxLHFAcUhxUHFYcWBx4HHocjRyeHKAcohykHKYctRzGHMgcyhzMHM4c3RzqHOwc7hzw
+HREdEx0VHRcdGR0bHR0dKh0sHS4dMB07HUYdUx1VHVcdWR16HXwdfh2AHYIdhB2GHYsdjR2THaQdph2o
+HaodrB29Hb8dwR3DHcUdzh3XHdkd5B3mHegd6h3sHe4eFx4ZHhseHR4fHiEeIx4lHiceKx40HjYeTx5R
+HlMeVR5XHlkeWx5dHl8eYR5jHmUeZx6IHooejB6OHpAekh6UHqMepR7OHtAe0h7THtUe1h7YHtoe3B8F
+HwcfCR8LHw0fDx8RHxMfFR8eHy8fMR8zHzUfNx9AH0IfSx9NH04fYB+JH4sfjR+OH5AfkR+TH5Uflx/A
+H8IfxB/FH8cfyB/KH8wfzh/zH/Uf9x/5H/sf/R//IAggCiArIC0gLyAxIDMgNSA3IEMgbCBuIHAgcSBz
+IHQgdiB4IHogmyCdIJ8goSCjIKUgpyCwILIgvyDoIOog7CDuIPAg8iD0IPYg+CEBIQMhCCEKIQwhLSEv
+ITEhMyE1ITchOSFGIW8hcSFzIXUhdyF5IXshfSF/IYQhjSGPIaAhoiGkIaYhqCGqIawhriGwIdEh0yHV
+Idch2SHbId0h4iHkIgUiByIJIgsiDSIPIhEiFiIYIkEiQyJFIkYiSCJJIksiTSJPInAiciJ0InYieCJ6
+InwigCKCIqMipSKnIqkiqyKtIq8itSK3Itgi2iLcIt4i4CLiIuQi6yMUIxYjGCMaIxwjHiMgIyIjJCMr
+IzQjNiM/I0EjVCNWI1gjWiNcI14jYCNiI2QjZiOHI4kjiyONI48jkSOTI5wjniO/I8EjwyPFI8cjySPL
+I9Aj+SP7I/0j/iQAJAEkAyQFJAckMCQyJDQkNSQ3JDgkOiQ8JD4kXyRhJGMkZSRnJGkkaySAJKkkqySt
+JK4ksCSxJLMktSS3JMYk7yTxJPMk9ST3JPkk+yT9JP8lBCURJRMlFSUXJSAlIiUlJSclSCVKJUwlTiVQ
+JVIlVCVdJWklbiV/JYElgyWFJYclmCWaJZwlniWgJb0lvyXBJcMlxSXGJcgl4SYWJhgmGiYcJh4mICYi
+JiQmNyZLJlwmXiZgJmImZCaBJpImlCaWJpgmmya4JromvCa+JsAmwSbDJt0nEicUJxcnGSccJx8nIScj
+JyonMyc1Jz4nQCdVJ2InZCdmJ2knbyeAJ4InhCeGJ4knlSemJ6gnqiesJ68nxCfVJ9cn2ifcJ98oHigr
+KEQoUShnKHUofyiNKKYosyi9KM8o4yjtKPko/Cj/KQIpBSkIKQspECkTKRYpGSkcKR8pIik9KU8pVylg
+KWIpZymEKY8ppCmmKakprCmvKbgpuim9KcAp8SoAKgoqHio3Kk8qUipVKlgqWypdKmAqYSpkKmUqaCpx
+KnMqdip4KoEqgyqUKpYqmSqcKp4qoSqjKqUqqCrFKscqyirNKtAq0SrTKusrDCsgKywrLysyKzUrOCs7
+K0ArQyusK70rvyvIK8orzSviK+or9ywDLBEsFCwXLBksHCwfLCYsMyxALEgsSyxXLGAsZSx6LH0sgCyD
+LIYsmSymLKksrCy1LL4s0CzZLOQs8C0NLQ8tEi0VLRgtGS0bLTQtVS1YLVstXi1hLWQtZy3BLd4t4C3j
+LeYt6S3qLewuBS4mLikuLC4vLjIuNS44Lnkuli6YLpsuni6hLqIupC68Lt0u4C7jLuYu6S7sLu8vdy+Q
+L5kvoC+5L8IvxC/LL84v0S/UL+0v+jAEMAcwCjAMMA8wEjAVMB4wIDAiMCgwMTA2MEQwXTBgMGMwZTBo
+MGswbjB3MHkwezCEMIYwlTCYMJswnTCgMKMwpTCoMMUwxzDJMMwwzzDQMNIw6zEgMSIxJDEmMSgxKzEt
+MTAxSjFnMWkxbDFvMXIxczF1MY0xrjGxMbQxtzG6Mb0xwDIqMkcySTJMMk8yUjJTMlUybTKOMpEylDKX
+MpkynDKfMqgyxTLHMsoyzTLQMtEy0zLsMw0zEDMTMxYzGTMcMx8zVjNzM3UzeDN7M34zfzOBM5ozuzO+
+M8EzxDPHM8ozzTQ0NDs0UDRTNFU0WDRbNF40ZzRpNHQ0dzR5NHw0fzSCNJ80oTSjNKY0qTSqNKw04TTj
+NOU05zTpNOw07jTxNQw1KTUrNS41MTU0NTU1NzVQNXE1dDV3NXo1fTWANYM2MDZNNk82UjZVNlg2WTZb
+NnQ2lTaYNps2njahNqQ2pzdDN2A3YjdlN2g3azdsN243hjenN6o3rTewN7M3tje5N/A3+TgCOAs4Fjgu
+ODk4QzhMOFE4ZDhwOIE4gziFOIc4ijidOK44sDiyOLQ4tzjAONE40zjWONg42zjnOPg4+jj8OP45ATka
+OSs5LTkvOTI5NTlSOVQ5VjlZOVw5XzlgOWI5ejmvObg5ujm9Ob85wjnFOcc5yjnROdo53DnlOec5/DoN
+Og86EToTOhY6JzopOis6LTowOkM6UDpSOlQ6VzpcOm06bzpxOnQ6dzqUOpY6mDqbOp46nzqhOrs68Dry
+OvU69zr6Ov06/zsCOww7FTsXOyA7Ijs6O0s7TTtQO1I7VTthO3I7dDt3O3k7fDvLO+07+jwPPBw8NjxS
+PG08eTyYPKc8szy2PLk8vjzBPMQ8xTzIPNE82jzdPN484TzkPOc88D0ZPSM9LT03PUU9SD1LPU49UD1T
+PVY9WT1cPV89Yj1tPYY9kj2VPZg9mz2ePaE9yj3NPdA90z3WPdk93D3fPeI97D31Pf4+Ej4nPio+LT4w
+PjM+bD54PoE+lD6hPq0+uz69PsA+wz7GPsg+yz7OPtE+5D7nPuk+7D7vPvI/CT8SPxs/KT8yPzQ/Oz8+
+P0E/RD9tP3w/iT+RP5w/qz+2P8E/zj/PP9I/1T/eP+E/6j/zP/Q/90AUQBlAHEAfQCJAJUAoQC1AOkA9
+QElAXkBhQGRAZ0BqQHxAhUCQQKRAxUDKQM1A0EDTQNVA2EDbQOVA8kD1QPhBAUEGQRRBPUE+QUFBREFN
+QVBBWUFaQV1BekF9QYBBg0GGQYlBkUGyQbVBuEG7Qb1BwEHDQexB7UHwQfNB/EH/QghCCUIMQilCLEIv
+QjJCNUI4QkFCVkJZQlxCX0JiQm5Ck0KWQplCnEKfQqJCo0KmQrdCuULCQsRC2ULcQt9C4kLlQv5DE0MW
+QxlDHEMfQylDNkM5Qz5DR0NSQ11DbkNwQ3JDdEN3Q31DjkOQQ5JDlEOXQ6RDtUO3Q7lDu0O+Q9BD4UPj
+Q+VD6EPqQ/dD+UP7Q/5EBkQXRBlEG0QdRCBELEQ9RD9EQUREREZEV0RZRFtEXURgRGpEd0R5RHtEfkSF
+RJZEmESaRJxEn0StRL5EwETCRMREx0TaROtE7UTvRPFE9ET6RQtFDUUPRRFFFEUhRTJFNEU2RThFO0VT
+RWBFYkVkRWdFbUV+RYBFgkWERYdFkkWjRaVFp0WqRa1FykXMRc5F0UXURdVF10XvRiRGJkYoRipGLUYw
+RjJGNUY6RkNGRUZYRmFGZEdpR2tHbUdvR3JHdUd3R3lHfEd+R4FHhEeGR4hHi0eNR49HkUeTR5VHl0eZ
+R5xHnkehR6NHpkeoR6tHrUevR7JHtUe4R7pHvUfAR8NHxUfIR8pHzEfPR9JH1EfWR9hH2kfcR95H4Ufj
+R+ZH6EfrR+1H70fxR/RH9kf4R/pH/Ef+SABIA0gGSAhIC0gOSBBIE0gWSBlIHEgeSCBII0glSCdIKUgr
+SC1IMEgySDRINkg4SDtIPkhBSENIRUhISEpITUhQSFJIVEhWSFlIXEhfSGJIZEhnSGlIa0htSHBIckh1
+SHdIekh8SH9IgUiDSIZIiEiKSI1Ij0iRSJRIlkiYSJpInEieSKdIqUi0SLdIuki9SMBIw0jMSM5I0UjU
+SOxI9Uj+SQlJKkk0STdJOkk9SUBJQ0lGSU9JaEl1SX5JiUmUSblJvEm/ScJJxUnISctJ1EnsSfVJ90n6
+Sf1KE0osSjVKPkpLSopKjEqPSpJKlUqYSptKnkqhSqRKp0qpSqxKr0rKSuFK6krsSvVK90sESwdLCksM
+Sw9LEksUSx9LKEsxSzNLNks/S0RLTUtQTFVMV0xZTFtMXkxgTGJMZExmTGhMa0xuTHBMckx0THdMeUx7
+TH1Mf0yBTINMhkyITIpMjEyOTJBMk0yVTJdMmkydTKBMokylTKdMqkysTK5MsEyyTLRMtky4TLpMvEy+
+TMBMwkzETMZMyUzMTM9M0UzTTNVM10zZTNtM3UzfTOFM40zlTOhM6kztTO9M8Uz0TPZM+Uz8TP5NAE0C
+TQRNBk0ITQpNDE0PTRFNFE0WTRhNG00dTSBNIk0kTSdNKU0sTS5NME0yTTRNNk05TTtNPk1ATUNNRU1H
+TUlNTE1OTVFNU01WTVhNW01dTV9NYU1jTWVNaE1qTWxNb01xTXNNdU13TXpNg02GTo1Oj06RTpROlk6Z
+TptOnk6gTqJOpU6oTqpOrE6vTrFOs061TrdOuU67Tr1Ov07CTsVOx07KTsxOz07RTtRO107ZTtxO307h
+TuRO507pTuxO7k7wTvNO9k74TvpO/E7+TwBPAk8ETwdPCU8MTw5PEU8TTxVPGE8aTxxPHk8gTyJPJE8m
+TylPK08uTzFPNE82TzlPPE8/T0JPRE9GT0lPS09NT09PUU9TT1ZPWE9aT1xPXk9hT2RPZ09qT2xPb09x
+T3NPdk94T3pPfE9/T4JPhU+IT4pPjU+PT5FPk0+WT5hPm0+dT6BPok+lT6dPqU+sT65PsE+zT7VPt0+6
+T7xPvk/AT8JPxE/NT9BQ11DaUN1Q4FDjUOZQ6VDsUO9Q8VD0UPdQ+lD9UQBRA1EGUQlRDFEPURJRFVEY
+URtRHlEhUSRRJ1EqUS1RMFEzUTZROVE8UT9RQlFFUUhRS1FOUVFRVFFXUVpRXVFgUWNRZlFpUWxRb1Fy
+UXVReFF7UX5RgVGEUYdRilGNUZBRk1GWUZlRnFGfUaJRpVGoUatRrlGxUbRRt1G6Ub1RwFHDUcZRyVHM
+Uc5R0VHUUddR2lHdUeBR41HmUelR7FHvUfJR9VH4UftR/lIBUgRSB1IKUg1SEFITUhZSGVIcUh9SIlIl
+UihSK1IuUjFSNFI3UjpSPVJAUkNSRlJJUkxST1JSUlVSWFJbUnhSi1KlUrlS/lMqUzZTY1QiVI5UplS9
+VVNVWlVmVX1VlFWvVcZV8lYgVklWYFZtVrxWz1dLV1VXbleIV7dXzVf2WBpYQVhVWG5Yg1iuWMNZbVmT
+WbBZx1nlWgZaE1ofWjhasFrIWvBbnluwW7xb1lviW/VcFlwpXDVcZFx+XOZc710PXVhdZV2OXaZd614J
+XiJeLl5FXlBeZl59Xotenl6yXsFe3F7uXwdfIl+XYDFgR2BfYHRgf2CwYWthd2GsYcViPGKFYpFjCmMf
+Y3JjiWO4Y9lj5mQKZCFkNGRUZGZk4WT4ZQRlHWUpZUhlb2WKZZ5lu2XHZf5mEmYeZiVmLmYxZjJmO2Y+
+Zj9mSGZLZ8ZnyGfKZ8xnz2fSZ9Rn12fZZ9xn3mfhZ+Rn52fqZ+xn7mfxZ/Nn9Wf3Z/ln+2f9Z/9oAmgE
+aAZoCGgKaAxoD2gSaBRoF2gZaBxoHmggaCNoJmgoaCtoLmgwaDNoNWg4aDtoPWg/aEJoRGhGaEhoS2hN
+aFBoU2hWaFloW2heaGFoY2hlaGdoaWhraG5ocGhzaHVod2h6aHxof2iBaINohWiIaIpojGiOaJBok2iV
+aJhommicaJ5ooGiiaKVoqGiqaK1or2iyaLRotmi5aLxov2jCaMVox2jJaMxozmjQaNJo1WjXaNpo3Gje
+aOBo4mjlaOdo6mjtaO9o8WjzaPVo+Gj7aP5pAGkCaQVpB2kKaQ1pD2kRaRRpF2kaaR1pH2kiaSRpJ2kp
+aSxpL2kyaTVpOGk6aT1pP2lBaURpRmlIaUtpTmlQaVNpVmlZaVtpXmlgaWNpZWlnaWlpbGluaXBpc2l2
+aXhpeml9aX9pgWmEaYZpiGmKaYxpj2mRaZppnWsYaxtrHmshayRrJ2sqay1rMGszazZrOWs8az9rQmtF
+a0hrS2tOa1FrVGtXa1prXWtga2NrZmtpa2xrb2tya3VreGt7a35rgWuEa4drimuNa5Brk2uWa5lrnGuf
+a6JrpWuoa6trrmuxa7Rrt2u6a71rwGvDa8ZryWvMa89r0mvVa9hr22vea+Fr5Gvna+pr7Wvwa/Nr9mv5
+a/xr/2wCbAVsCGwLbA5sEWwUbBdsGmwdbCBsI2wmbClsLGwvbDJsNWw4bDtsPmxBbERsR2xKbE1sUGxT
+bFZsWWxcbF9sYmxlbGhsa2xubHFsdGx3bHpsfWyAbINshmyJbIxsj2ySbJVsmGybbJ5soWykbKdsqmyt
+bLBss2y2bLlsvGy/bMJsxWzIbMtszmzRbNRs12zabN1s4GzjbOZs6WzsbO9s8mz1bPhs+2z+bQFtBG0H
+bQptDW0QbRNtFm0ZbRxtH20ibSVtKG0rbS5tMW00bTdtOm09bUBtQ21GbUltTG1ObVBtU21WbVltXG1f
+bWRtZ21pbWxtb210bXltfG1/bYRth22KbYxtjm2RbZRtmW2ebaNtqG2rba5tsW2zbbZtuW28bb9txG3H
+bcptzW3QbdVt2G3dbeBt423mbelt7G3vbfJt9236bf9uBG4HbgxuEW4UbhduGm4cbh9uIm4lbiduKm4t
+bjBuM244bjpuPG4+bkFuRG5JbkxuT25SblduWm5cbl9uYW5kbmZuaG5qbmxubm5xbnNudm55bnxugW6E
+boduim6NbpBulW6Ybptunm6gbqJupG6mbqlurG6vbrFutG63brpuvG6+bsBuxW7HbspuzW7PbtJu127a
+bt1u4m7kbulu627wbvNu9m74bvtu/W8AbwVvCG8Kbw1vEG8TbxZvGW8ebydvLG8ubzNvNm84bztvPm9D
+b0VvR29Mb1FvVG9Wb1tvXW9gb2NvZm9pb2xvbm9xb3Rvd296b31vgG+Cb4dvjG+Rb5NvlW+Yb5tvpG+m
+b6dvsG+zb7RvvW/Ab8Fvym/PAAAAAAAAAgIAAAAAAAANIAAAAAAAAAAAAAAAAAAAb94</bytes>
 		</object>
 	</data>
 </archive>
diff --git a/hw/xquartz/bundle/English.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/English.lproj/main.nib/keyedobjects.nib
index 194f4df7fdb98fef6f7ddc27edea49aab5e51e80..430610292bd903db47a1bf8b9f351b8395f48c25 100644
GIT binary patch
literal 35390
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

literal 33883
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
E0e$|ai2wiq


From 8a244c2bc04a4184535e42d1f2f8c9e3e55678b4 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@yuffie.local>
Date: Mon, 11 Feb 2008 12:09:41 -0800
Subject: [PATCH 470/552] XQuartz: Fixed layout of Applications->Customize menu

Now resizing it won't produce weir overlaps of the widgets.  Thanks to
Pelle Johansson for his help showing me how to do this.
(cherry picked from commit ef3498e92d13c82633fdbe8120396bfbe1e7489a)
---
 .../English.lproj/main.nib/designable.nib     | 1751 ++++++-----------
 .../English.lproj/main.nib/keyedobjects.nib   |  Bin 35390 -> 35529 bytes
 2 files changed, 570 insertions(+), 1181 deletions(-)

diff --git a/hw/xquartz/bundle/English.lproj/main.nib/designable.nib b/hw/xquartz/bundle/English.lproj/main.nib/designable.nib
index 08b381039..b5cfcf682 100644
--- a/hw/xquartz/bundle/English.lproj/main.nib/designable.nib
+++ b/hw/xquartz/bundle/English.lproj/main.nib/designable.nib
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.01">
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.02">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">9C31</string>
-		<string key="IBDocument.InterfaceBuilderVersion">629</string>
-		<string key="IBDocument.AppKitVersion">949.26</string>
-		<string key="IBDocument.HIToolboxVersion">352.00</string>
+		<string key="IBDocument.SystemVersion">9B18</string>
+		<string key="IBDocument.InterfaceBuilderVersion">639</string>
+		<string key="IBDocument.AppKitVersion">949</string>
+		<string key="IBDocument.HIToolboxVersion">343.00</string>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
+			<integer value="285"/>
 			<integer value="29"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string id="1013584587">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.RootObjects" id="904585544">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -22,41 +23,41 @@
 				</object>
 			</object>
 			<object class="NSCustomObject" id="941939442">
-				<string key="NSClassName" id="671773319">FirstResponder</string>
+				<string key="NSClassName">FirstResponder</string>
 			</object>
 			<object class="NSCustomObject" id="951368722">
 				<string key="NSClassName">NSApplication</string>
 			</object>
 			<object class="NSMenu" id="524015605">
-				<string key="NSTitle" id="121567387">MainMenu</string>
+				<string key="NSTitle">MainMenu</string>
 				<object class="NSMutableArray" key="NSMenuItems">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<object class="NSMenuItem" id="365880285">
 						<reference key="NSMenu" ref="524015605"/>
-						<string key="NSTitle" id="335360021">X11</string>
-						<string key="NSKeyEquiv" id="331740794"/>
+						<string key="NSTitle">X11</string>
+						<string key="NSKeyEquiv"/>
 						<int key="NSKeyEquivModMask">1048576</int>
 						<int key="NSMnemonicLoc">2147483647</int>
 						<object class="NSCustomResource" key="NSOnImage" id="531645050">
-							<string key="NSClassName" id="1072749539">NSImage</string>
+							<string key="NSClassName">NSImage</string>
 							<string key="NSResourceName">NSMenuCheckmark</string>
 						</object>
-						<object class="NSCustomResource" key="NSMixedImage" id="246283459">
-							<reference key="NSClassName" ref="1072749539"/>
+						<object class="NSCustomResource" key="NSMixedImage" id="351811234">
+							<string key="NSClassName">NSImage</string>
 							<string key="NSResourceName">NSMenuMixedState</string>
 						</object>
 						<string key="NSAction">submenuAction:</string>
 						<object class="NSMenu" key="NSSubmenu" id="576521955">
-							<reference key="NSTitle" ref="335360021"/>
+							<string key="NSTitle">X11</string>
 							<object class="NSMutableArray" key="NSMenuItems">
 								<bool key="EncodedWithXMLCoder">YES</bool>
 								<object class="NSMenuItem" id="139290918">
 									<reference key="NSMenu" ref="576521955"/>
 									<string key="NSTitle">About X11</string>
-									<reference key="NSKeyEquiv" ref="331740794"/>
+									<string key="NSKeyEquiv"/>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="531645050"/>
-									<reference key="NSMixedImage" ref="246283459"/>
+									<reference key="NSMixedImage" ref="351811234"/>
 								</object>
 								<object class="NSMenuItem" id="386173216">
 									<reference key="NSMenu" ref="576521955"/>
@@ -65,27 +66,27 @@
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="531645050"/>
-									<reference key="NSMixedImage" ref="246283459"/>
+									<reference key="NSMixedImage" ref="351811234"/>
 								</object>
 								<object class="NSMenuItem" id="272876017">
 									<reference key="NSMenu" ref="576521955"/>
 									<bool key="NSIsDisabled">YES</bool>
 									<bool key="NSIsSeparator">YES</bool>
-									<reference key="NSTitle" ref="331740794"/>
-									<reference key="NSKeyEquiv" ref="331740794"/>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="531645050"/>
-									<reference key="NSMixedImage" ref="246283459"/>
+									<reference key="NSMixedImage" ref="351811234"/>
 								</object>
 								<object class="NSMenuItem" id="32285361">
 									<reference key="NSMenu" ref="576521955"/>
 									<string key="NSTitle">Services</string>
-									<reference key="NSKeyEquiv" ref="331740794"/>
+									<string key="NSKeyEquiv"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="531645050"/>
-									<reference key="NSMixedImage" ref="246283459"/>
+									<reference key="NSMixedImage" ref="351811234"/>
 									<string key="NSAction">submenuAction:</string>
 									<object class="NSMenu" key="NSSubmenu" id="821388474">
 										<object class="NSMutableString" key="NSTitle">
@@ -101,32 +102,32 @@
 									<reference key="NSMenu" ref="576521955"/>
 									<bool key="NSIsDisabled">YES</bool>
 									<bool key="NSIsSeparator">YES</bool>
-									<reference key="NSTitle" ref="331740794"/>
-									<reference key="NSKeyEquiv" ref="331740794"/>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="531645050"/>
-									<reference key="NSMixedImage" ref="246283459"/>
+									<reference key="NSMixedImage" ref="351811234"/>
 								</object>
 								<object class="NSMenuItem" id="6876565">
 									<reference key="NSMenu" ref="576521955"/>
 									<string key="NSTitle">Toggle Full Screen</string>
-									<string key="NSKeyEquiv" id="934453074">a</string>
+									<string key="NSKeyEquiv">a</string>
 									<int key="NSKeyEquivModMask">1572864</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="531645050"/>
-									<reference key="NSMixedImage" ref="246283459"/>
+									<reference key="NSMixedImage" ref="351811234"/>
 								</object>
 								<object class="NSMenuItem" id="479677589">
 									<reference key="NSMenu" ref="576521955"/>
 									<bool key="NSIsDisabled">YES</bool>
 									<bool key="NSIsSeparator">YES</bool>
-									<reference key="NSTitle" ref="331740794"/>
-									<reference key="NSKeyEquiv" ref="331740794"/>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="531645050"/>
-									<reference key="NSMixedImage" ref="246283459"/>
+									<reference key="NSMixedImage" ref="351811234"/>
 								</object>
 								<object class="NSMenuItem" id="301008465">
 									<reference key="NSMenu" ref="576521955"/>
@@ -135,38 +136,38 @@
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="531645050"/>
-									<reference key="NSMixedImage" ref="246283459"/>
+									<reference key="NSMixedImage" ref="351811234"/>
 									<int key="NSTag">42</int>
 								</object>
 								<object class="NSMenuItem" id="206802571">
 									<reference key="NSMenu" ref="576521955"/>
 									<string key="NSTitle">Hide Others</string>
-									<reference key="NSKeyEquiv" ref="331740794"/>
+									<string key="NSKeyEquiv"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="531645050"/>
-									<reference key="NSMixedImage" ref="246283459"/>
+									<reference key="NSMixedImage" ref="351811234"/>
 								</object>
 								<object class="NSMenuItem" id="1023546148">
 									<reference key="NSMenu" ref="576521955"/>
 									<string key="NSTitle">Show All</string>
-									<reference key="NSKeyEquiv" ref="331740794"/>
+									<string key="NSKeyEquiv"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="531645050"/>
-									<reference key="NSMixedImage" ref="246283459"/>
+									<reference key="NSMixedImage" ref="351811234"/>
 									<int key="NSTag">42</int>
 								</object>
 								<object class="NSMenuItem" id="848095279">
 									<reference key="NSMenu" ref="576521955"/>
 									<bool key="NSIsDisabled">YES</bool>
 									<bool key="NSIsSeparator">YES</bool>
-									<reference key="NSTitle" ref="331740794"/>
-									<reference key="NSKeyEquiv" ref="331740794"/>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="531645050"/>
-									<reference key="NSMixedImage" ref="246283459"/>
+									<reference key="NSMixedImage" ref="351811234"/>
 								</object>
 								<object class="NSMenuItem" id="274138642">
 									<reference key="NSMenu" ref="576521955"/>
@@ -175,7 +176,7 @@
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="531645050"/>
-									<reference key="NSMixedImage" ref="246283459"/>
+									<reference key="NSMixedImage" ref="351811234"/>
 								</object>
 							</object>
 							<string key="NSName">_NSAppleMenu</string>
@@ -183,51 +184,51 @@
 					</object>
 					<object class="NSMenuItem" id="868031522">
 						<reference key="NSMenu" ref="524015605"/>
-						<string key="NSTitle" id="667842658">Applications</string>
-						<reference key="NSKeyEquiv" ref="331740794"/>
+						<string key="NSTitle">Applications</string>
+						<string key="NSKeyEquiv"/>
 						<int key="NSKeyEquivModMask">1048576</int>
 						<int key="NSMnemonicLoc">2147483647</int>
 						<reference key="NSOnImage" ref="531645050"/>
-						<reference key="NSMixedImage" ref="246283459"/>
+						<reference key="NSMixedImage" ref="351811234"/>
 						<string key="NSAction">submenuAction:</string>
 						<object class="NSMenu" key="NSSubmenu" id="981161348">
-							<reference key="NSTitle" ref="667842658"/>
+							<string key="NSTitle">Applications</string>
 							<object class="NSMutableArray" key="NSMenuItems">
 								<bool key="EncodedWithXMLCoder">YES</bool>
 								<object class="NSMenuItem" id="390088328">
 									<reference key="NSMenu" ref="981161348"/>
 									<bool key="NSIsDisabled">YES</bool>
 									<bool key="NSIsSeparator">YES</bool>
-									<reference key="NSTitle" ref="331740794"/>
-									<reference key="NSKeyEquiv" ref="331740794"/>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="531645050"/>
-									<reference key="NSMixedImage" ref="246283459"/>
+									<reference key="NSMixedImage" ref="351811234"/>
 								</object>
 								<object class="NSMenuItem" id="1065386165">
 									<reference key="NSMenu" ref="981161348"/>
 									<string key="NSTitle">Customize...</string>
-									<reference key="NSKeyEquiv" ref="331740794"/>
+									<string key="NSKeyEquiv"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="531645050"/>
-									<reference key="NSMixedImage" ref="246283459"/>
+									<reference key="NSMixedImage" ref="351811234"/>
 								</object>
 							</object>
 						</object>
 					</object>
 					<object class="NSMenuItem" id="200491363">
 						<reference key="NSMenu" ref="524015605"/>
-						<string key="NSTitle" id="934359734">Edit</string>
-						<reference key="NSKeyEquiv" ref="331740794"/>
+						<string key="NSTitle">Edit</string>
+						<string key="NSKeyEquiv"/>
 						<int key="NSKeyEquivModMask">1048576</int>
 						<int key="NSMnemonicLoc">2147483647</int>
 						<reference key="NSOnImage" ref="531645050"/>
-						<reference key="NSMixedImage" ref="246283459"/>
+						<reference key="NSMixedImage" ref="351811234"/>
 						<string key="NSAction">submenuAction:</string>
 						<object class="NSMenu" key="NSSubmenu" id="526778998">
-							<reference key="NSTitle" ref="934359734"/>
+							<string key="NSTitle">Edit</string>
 							<object class="NSMutableArray" key="NSMenuItems">
 								<bool key="EncodedWithXMLCoder">YES</bool>
 								<object class="NSMenuItem" id="1010221707">
@@ -237,7 +238,7 @@
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="531645050"/>
-									<reference key="NSMixedImage" ref="246283459"/>
+									<reference key="NSMixedImage" ref="351811234"/>
 								</object>
 								<object class="NSMenuItem" id="535038564">
 									<reference key="NSMenu" ref="526778998"/>
@@ -246,18 +247,18 @@
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="531645050"/>
-									<reference key="NSMixedImage" ref="246283459"/>
+									<reference key="NSMixedImage" ref="351811234"/>
 								</object>
 								<object class="NSMenuItem" id="839739619">
 									<reference key="NSMenu" ref="526778998"/>
 									<bool key="NSIsDisabled">YES</bool>
 									<bool key="NSIsSeparator">YES</bool>
-									<reference key="NSTitle" ref="331740794"/>
-									<reference key="NSKeyEquiv" ref="331740794"/>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="531645050"/>
-									<reference key="NSMixedImage" ref="246283459"/>
+									<reference key="NSMixedImage" ref="351811234"/>
 								</object>
 								<object class="NSMenuItem" id="581727829">
 									<reference key="NSMenu" ref="526778998"/>
@@ -266,7 +267,7 @@
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="531645050"/>
-									<reference key="NSMixedImage" ref="246283459"/>
+									<reference key="NSMixedImage" ref="351811234"/>
 								</object>
 								<object class="NSMenuItem" id="185296989">
 									<reference key="NSMenu" ref="526778998"/>
@@ -275,7 +276,7 @@
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="531645050"/>
-									<reference key="NSMixedImage" ref="246283459"/>
+									<reference key="NSMixedImage" ref="351811234"/>
 								</object>
 								<object class="NSMenuItem" id="924678073">
 									<reference key="NSMenu" ref="526778998"/>
@@ -284,25 +285,25 @@
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="531645050"/>
-									<reference key="NSMixedImage" ref="246283459"/>
+									<reference key="NSMixedImage" ref="351811234"/>
 								</object>
 								<object class="NSMenuItem" id="994817848">
 									<reference key="NSMenu" ref="526778998"/>
 									<string key="NSTitle">Delete</string>
-									<reference key="NSKeyEquiv" ref="331740794"/>
+									<string key="NSKeyEquiv"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="531645050"/>
-									<reference key="NSMixedImage" ref="246283459"/>
+									<reference key="NSMixedImage" ref="351811234"/>
 								</object>
 								<object class="NSMenuItem" id="322866464">
 									<reference key="NSMenu" ref="526778998"/>
 									<string key="NSTitle">Select All</string>
-									<reference key="NSKeyEquiv" ref="934453074"/>
+									<string key="NSKeyEquiv">a</string>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="531645050"/>
-									<reference key="NSMixedImage" ref="246283459"/>
+									<reference key="NSMixedImage" ref="351811234"/>
 								</object>
 							</object>
 						</object>
@@ -310,11 +311,11 @@
 					<object class="NSMenuItem" id="931553638">
 						<reference key="NSMenu" ref="524015605"/>
 						<string key="NSTitle">Window</string>
-						<reference key="NSKeyEquiv" ref="331740794"/>
+						<string key="NSKeyEquiv"/>
 						<int key="NSKeyEquivModMask">1048576</int>
 						<int key="NSMnemonicLoc">2147483647</int>
 						<reference key="NSOnImage" ref="531645050"/>
-						<reference key="NSMixedImage" ref="246283459"/>
+						<reference key="NSMixedImage" ref="351811234"/>
 						<string key="NSAction">submenuAction:</string>
 						<object class="NSMenu" key="NSSubmenu" id="96874957">
 							<object class="NSMutableString" key="NSTitle">
@@ -329,16 +330,16 @@
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="531645050"/>
-									<reference key="NSMixedImage" ref="246283459"/>
+									<reference key="NSMixedImage" ref="351811234"/>
 								</object>
 								<object class="NSMenuItem" id="1066447520">
 									<reference key="NSMenu" ref="96874957"/>
 									<string key="NSTitle">Zoom</string>
-									<reference key="NSKeyEquiv" ref="331740794"/>
+									<string key="NSKeyEquiv"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="531645050"/>
-									<reference key="NSMixedImage" ref="246283459"/>
+									<reference key="NSMixedImage" ref="351811234"/>
 								</object>
 								<object class="NSMenuItem" id="1036389925">
 									<reference key="NSMenu" ref="96874957"/>
@@ -347,7 +348,7 @@
 									<int key="NSKeyEquivModMask">1048840</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="531645050"/>
-									<reference key="NSMixedImage" ref="246283459"/>
+									<reference key="NSMixedImage" ref="351811234"/>
 								</object>
 								<object class="NSMenuItem" id="369641893">
 									<reference key="NSMenu" ref="96874957"/>
@@ -356,18 +357,18 @@
 									<int key="NSKeyEquivModMask">1179914</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="531645050"/>
-									<reference key="NSMixedImage" ref="246283459"/>
+									<reference key="NSMixedImage" ref="351811234"/>
 								</object>
 								<object class="NSMenuItem" id="280172320">
 									<reference key="NSMenu" ref="96874957"/>
 									<bool key="NSIsDisabled">YES</bool>
 									<bool key="NSIsSeparator">YES</bool>
-									<reference key="NSTitle" ref="331740794"/>
-									<reference key="NSKeyEquiv" ref="331740794"/>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="531645050"/>
-									<reference key="NSMixedImage" ref="246283459"/>
+									<reference key="NSMixedImage" ref="351811234"/>
 								</object>
 								<object class="NSMenuItem" id="984461797">
 									<reference key="NSMenu" ref="96874957"/>
@@ -376,38 +377,38 @@
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="531645050"/>
-									<reference key="NSMixedImage" ref="246283459"/>
+									<reference key="NSMixedImage" ref="351811234"/>
 								</object>
 								<object class="NSMenuItem" id="155085383">
 									<reference key="NSMenu" ref="96874957"/>
 									<bool key="NSIsDisabled">YES</bool>
 									<bool key="NSIsSeparator">YES</bool>
-									<reference key="NSTitle" ref="331740794"/>
-									<reference key="NSKeyEquiv" ref="331740794"/>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="531645050"/>
-									<reference key="NSMixedImage" ref="246283459"/>
+									<reference key="NSMixedImage" ref="351811234"/>
 								</object>
 								<object class="NSMenuItem" id="276216762">
 									<reference key="NSMenu" ref="96874957"/>
 									<string key="NSTitle">Bring All to Front</string>
-									<reference key="NSKeyEquiv" ref="331740794"/>
+									<string key="NSKeyEquiv"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="531645050"/>
-									<reference key="NSMixedImage" ref="246283459"/>
+									<reference key="NSMixedImage" ref="351811234"/>
 								</object>
 								<object class="NSMenuItem" id="444952046">
 									<reference key="NSMenu" ref="96874957"/>
 									<bool key="NSIsDisabled">YES</bool>
 									<bool key="NSIsSeparator">YES</bool>
-									<reference key="NSTitle" ref="331740794"/>
-									<reference key="NSKeyEquiv" ref="331740794"/>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="531645050"/>
-									<reference key="NSMixedImage" ref="246283459"/>
+									<reference key="NSMixedImage" ref="351811234"/>
 								</object>
 							</object>
 							<string key="NSName">_NSWindowsMenu</string>
@@ -415,25 +416,25 @@
 					</object>
 					<object class="NSMenuItem" id="551174276">
 						<reference key="NSMenu" ref="524015605"/>
-						<string key="NSTitle" id="214661970">Help</string>
-						<reference key="NSKeyEquiv" ref="331740794"/>
+						<string key="NSTitle">Help</string>
+						<string key="NSKeyEquiv"/>
 						<int key="NSKeyEquivModMask">1048576</int>
 						<int key="NSMnemonicLoc">2147483647</int>
 						<reference key="NSOnImage" ref="531645050"/>
-						<reference key="NSMixedImage" ref="246283459"/>
+						<reference key="NSMixedImage" ref="351811234"/>
 						<string key="NSAction">submenuAction:</string>
 						<object class="NSMenu" key="NSSubmenu" id="511848303">
-							<reference key="NSTitle" ref="214661970"/>
+							<string key="NSTitle">Help</string>
 							<object class="NSMutableArray" key="NSMenuItems">
 								<bool key="EncodedWithXMLCoder">YES</bool>
 								<object class="NSMenuItem" id="504984881">
 									<reference key="NSMenu" ref="511848303"/>
 									<string key="NSTitle">X11 Help</string>
-									<reference key="NSKeyEquiv" ref="331740794"/>
+									<string key="NSKeyEquiv"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="531645050"/>
-									<reference key="NSMixedImage" ref="246283459"/>
+									<reference key="NSMixedImage" ref="351811234"/>
 								</object>
 							</object>
 						</object>
@@ -442,15 +443,15 @@
 				<string key="NSName">_NSMainMenu</string>
 			</object>
 			<object class="NSCustomObject" id="485884620">
-				<string key="NSClassName" id="865849805">X11Controller</string>
+				<string key="NSClassName">X11Controller</string>
 			</object>
 			<object class="NSWindowTemplate" id="124913468">
 				<int key="NSWindowStyleMask">3</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{319, 294}, {481, 345}}</string>
+				<string key="NSWindowRect">{{479, 459}, {481, 345}}</string>
 				<int key="NSWTFlags">1350041600</int>
 				<string key="NSWindowTitle">X11 Preferences</string>
-				<string key="NSWindowClass" id="666842945">NSPanel</string>
+				<string key="NSWindowClass">NSPanel</string>
 				<object class="NSMutableString" key="NSViewClass">
 					<characters key="NS.bytes">View</characters>
 				</object>
@@ -464,193 +465,6 @@
 						<object class="NSTabView" id="448510093">
 							<reference key="NSNextResponder" ref="941366957"/>
 							<int key="NSvFlags">256</int>
-							<object class="NSMutableArray" key="NSSubviews">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSView" id="596750588">
-									<reference key="NSNextResponder" ref="448510093"/>
-									<int key="NSvFlags">256</int>
-									<object class="NSMutableArray" key="NSSubviews">
-										<bool key="EncodedWithXMLCoder">YES</bool>
-										<object class="NSButton" id="119157981">
-											<reference key="NSNextResponder" ref="596750588"/>
-											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{18, 243}, {402, 18}}</string>
-											<reference key="NSSuperview" ref="596750588"/>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSButtonCell" key="NSCell" id="990762273">
-												<int key="NSCellFlags">67239424</int>
-												<int key="NSCellFlags2">0</int>
-												<string key="NSContents">Emulate three button mouse</string>
-												<object class="NSFont" key="NSSupport" id="463863101">
-													<string key="NSName" id="512586816">LucidaGrande</string>
-													<double key="NSSize">1.300000e+01</double>
-													<int key="NSfFlags">1044</int>
-												</object>
-												<reference key="NSControlView" ref="119157981"/>
-												<int key="NSButtonFlags">1211912703</int>
-												<int key="NSButtonFlags2">2</int>
-												<object class="NSButtonImageSource" key="NSAlternateImage" id="391434389">
-													<string key="NSImageName">NSSwitch</string>
-												</object>
-												<reference key="NSAlternateContents" ref="331740794"/>
-												<reference key="NSKeyEquivalent" ref="331740794"/>
-												<int key="NSPeriodicDelay">200</int>
-												<int key="NSPeriodicInterval">25</int>
-											</object>
-										</object>
-										<object class="NSTextField" id="443008216">
-											<reference key="NSNextResponder" ref="596750588"/>
-											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{36, 93}, {385, 31}}</string>
-											<reference key="NSSuperview" ref="596750588"/>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSTextFieldCell" key="NSCell" id="391919450">
-												<int key="NSCellFlags">67239424</int>
-												<int key="NSCellFlags2">4194304</int>
-												<string key="NSContents">When enabled, menu bar key equivalents may interfere with X11 applications that use the Meta modifier.</string>
-												<object class="NSFont" key="NSSupport" id="26">
-													<reference key="NSName" ref="512586816"/>
-													<double key="NSSize">1.100000e+01</double>
-													<int key="NSfFlags">3100</int>
-												</object>
-												<reference key="NSControlView" ref="443008216"/>
-												<object class="NSColor" key="NSBackgroundColor" id="57160303">
-													<int key="NSColorSpace">6</int>
-													<string key="NSCatalogName" id="905527164">System</string>
-													<string key="NSColorName">controlColor</string>
-													<object class="NSColor" key="NSColor" id="590688762">
-														<int key="NSColorSpace">3</int>
-														<bytes key="NSWhite">MC42NjY2NjY2OQA</bytes>
-													</object>
-												</object>
-												<object class="NSColor" key="NSTextColor" id="930815747">
-													<int key="NSColorSpace">6</int>
-													<reference key="NSCatalogName" ref="905527164"/>
-													<string key="NSColorName">controlTextColor</string>
-													<object class="NSColor" key="NSColor" id="214098874">
-														<int key="NSColorSpace">3</int>
-														<bytes key="NSWhite">MAA</bytes>
-													</object>
-												</object>
-											</object>
-										</object>
-										<object class="NSTextField" id="282885445">
-											<reference key="NSNextResponder" ref="596750588"/>
-											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{36, 208}, {385, 29}}</string>
-											<reference key="NSSuperview" ref="596750588"/>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSTextFieldCell" key="NSCell" id="649334366">
-												<int key="NSCellFlags">67239424</int>
-												<int key="NSCellFlags2">4194304</int>
-												<string type="base64-UTF8" key="NSContents">SG9sZCBPcHRpb24gYW5kIENvbW1hbmQgd2hpbGUgY2xpY2tpbmcgdG8gYWN0aXZhdGUgdGhlIG1pZGRs
-ZSBhbmQgcmlnaHQgbW91c2UgYnV0dG9ucy4KA</string>
-												<reference key="NSSupport" ref="26"/>
-												<reference key="NSControlView" ref="282885445"/>
-												<reference key="NSBackgroundColor" ref="57160303"/>
-												<reference key="NSTextColor" ref="930815747"/>
-											</object>
-										</object>
-										<object class="NSButton" id="842100515">
-											<reference key="NSNextResponder" ref="596750588"/>
-											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{18, 130}, {402, 18}}</string>
-											<reference key="NSSuperview" ref="596750588"/>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSButtonCell" key="NSCell" id="940564599">
-												<int key="NSCellFlags">67239424</int>
-												<int key="NSCellFlags2">0</int>
-												<string key="NSContents">Enable key equivalents under X11</string>
-												<reference key="NSSupport" ref="463863101"/>
-												<reference key="NSControlView" ref="842100515"/>
-												<int key="NSButtonFlags">1211912703</int>
-												<int key="NSButtonFlags2">2</int>
-												<reference key="NSAlternateImage" ref="391434389"/>
-												<reference key="NSAlternateContents" ref="331740794"/>
-												<reference key="NSKeyEquivalent" ref="331740794"/>
-												<int key="NSPeriodicDelay">200</int>
-												<int key="NSPeriodicInterval">25</int>
-											</object>
-										</object>
-										<object class="NSTextField" id="31160162">
-											<reference key="NSNextResponder" ref="596750588"/>
-											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{36, 159}, {385, 14}}</string>
-											<reference key="NSSuperview" ref="596750588"/>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSTextFieldCell" key="NSCell" id="666057093">
-												<int key="NSCellFlags">67239424</int>
-												<int key="NSCellFlags2">4194304</int>
-												<string key="NSContents">Allows input menu changes to overwrite the current X11 keymap.</string>
-												<reference key="NSSupport" ref="26"/>
-												<reference key="NSControlView" ref="31160162"/>
-												<reference key="NSBackgroundColor" ref="57160303"/>
-												<reference key="NSTextColor" ref="930815747"/>
-											</object>
-										</object>
-										<object class="NSButton" id="179949713">
-											<reference key="NSNextResponder" ref="596750588"/>
-											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{18, 179}, {402, 18}}</string>
-											<reference key="NSSuperview" ref="596750588"/>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSButtonCell" key="NSCell" id="967619578">
-												<int key="NSCellFlags">67239424</int>
-												<int key="NSCellFlags2">0</int>
-												<string key="NSContents">Follow system keyboard layout</string>
-												<reference key="NSSupport" ref="463863101"/>
-												<reference key="NSControlView" ref="179949713"/>
-												<int key="NSButtonFlags">1211912703</int>
-												<int key="NSButtonFlags2">2</int>
-												<reference key="NSAlternateImage" ref="391434389"/>
-												<reference key="NSAlternateContents" ref="331740794"/>
-												<reference key="NSKeyEquivalent" ref="331740794"/>
-												<int key="NSPeriodicDelay">200</int>
-												<int key="NSPeriodicInterval">25</int>
-											</object>
-										</object>
-										<object class="NSButton" id="915448994">
-											<reference key="NSNextResponder" ref="596750588"/>
-											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{18, 69}, {402, 18}}</string>
-											<reference key="NSSuperview" ref="596750588"/>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSButtonCell" key="NSCell" id="117056849">
-												<int key="NSCellFlags">67239424</int>
-												<int key="NSCellFlags2">0</int>
-												<string key="NSContents">Click-through Inactive Windows</string>
-												<reference key="NSSupport" ref="463863101"/>
-												<reference key="NSControlView" ref="915448994"/>
-												<int key="NSButtonFlags">1211912703</int>
-												<int key="NSButtonFlags2">2</int>
-												<reference key="NSAlternateImage" ref="391434389"/>
-												<reference key="NSAlternateContents" ref="331740794"/>
-												<reference key="NSKeyEquivalent" ref="331740794"/>
-												<int key="NSPeriodicDelay">200</int>
-												<int key="NSPeriodicInterval">25</int>
-											</object>
-										</object>
-										<object class="NSTextField" id="707276799">
-											<reference key="NSNextResponder" ref="596750588"/>
-											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{33, 32}, {385, 31}}</string>
-											<reference key="NSSuperview" ref="596750588"/>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSTextFieldCell" key="NSCell" id="318286890">
-												<int key="NSCellFlags">67239424</int>
-												<int key="NSCellFlags2">4194304</int>
-												<string key="NSContents">When enabled, clicking on an inactive window will cause that mouse click to pass through to that window in addition to activating it.</string>
-												<reference key="NSSupport" ref="26"/>
-												<reference key="NSControlView" ref="707276799"/>
-												<reference key="NSBackgroundColor" ref="57160303"/>
-												<reference key="NSTextColor" ref="930815747"/>
-											</object>
-										</object>
-									</object>
-									<string key="NSFrame">{{10, 33}, {438, 279}}</string>
-									<reference key="NSSuperview" ref="448510093"/>
-								</object>
-							</object>
 							<string key="NSFrame">{{10, 10}, {458, 325}}</string>
 							<reference key="NSSuperview" ref="941366957"/>
 							<object class="NSMutableArray" key="NSTabViewItems">
@@ -659,7 +473,190 @@ ZSBhbmQgcmlnaHQgbW91c2UgYnV0dG9ucy4KA</string>
 									<object class="NSMutableString" key="NSIdentifier">
 										<characters key="NS.bytes">1</characters>
 									</object>
-									<reference key="NSView" ref="596750588"/>
+									<object class="NSView" key="NSView" id="596750588">
+										<reference key="NSNextResponder" ref="448510093"/>
+										<int key="NSvFlags">256</int>
+										<object class="NSMutableArray" key="NSSubviews">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+											<object class="NSButton" id="119157981">
+												<reference key="NSNextResponder" ref="596750588"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{18, 243}, {402, 18}}</string>
+												<reference key="NSSuperview" ref="596750588"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="990762273">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Emulate three button mouse</string>
+													<object class="NSFont" key="NSSupport" id="463863101">
+														<string key="NSName">LucidaGrande</string>
+														<double key="NSSize">1.300000e+01</double>
+														<int key="NSfFlags">1044</int>
+													</object>
+													<reference key="NSControlView" ref="119157981"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<object class="NSButtonImageSource" key="NSAlternateImage" id="391434389">
+														<string key="NSImageName">NSSwitch</string>
+													</object>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="443008216">
+												<reference key="NSNextResponder" ref="596750588"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{36, 93}, {385, 31}}</string>
+												<reference key="NSSuperview" ref="596750588"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="391919450">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">When enabled, menu bar key equivalents may interfere with X11 applications that use the Meta modifier.</string>
+													<object class="NSFont" key="NSSupport" id="26">
+														<string key="NSName">LucidaGrande</string>
+														<double key="NSSize">1.100000e+01</double>
+														<int key="NSfFlags">3100</int>
+													</object>
+													<reference key="NSControlView" ref="443008216"/>
+													<object class="NSColor" key="NSBackgroundColor" id="57160303">
+														<int key="NSColorSpace">6</int>
+														<string key="NSCatalogName">System</string>
+														<string key="NSColorName">controlColor</string>
+														<object class="NSColor" key="NSColor" id="590688762">
+															<int key="NSColorSpace">3</int>
+															<bytes key="NSWhite">MC42NjY2NjY2OQA</bytes>
+														</object>
+													</object>
+													<object class="NSColor" key="NSTextColor" id="930815747">
+														<int key="NSColorSpace">6</int>
+														<string key="NSCatalogName">System</string>
+														<string key="NSColorName">controlTextColor</string>
+														<object class="NSColor" key="NSColor" id="214098874">
+															<int key="NSColorSpace">3</int>
+															<bytes key="NSWhite">MAA</bytes>
+														</object>
+													</object>
+												</object>
+											</object>
+											<object class="NSTextField" id="282885445">
+												<reference key="NSNextResponder" ref="596750588"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{36, 208}, {385, 29}}</string>
+												<reference key="NSSuperview" ref="596750588"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="649334366">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string type="base64-UTF8" key="NSContents">SG9sZCBPcHRpb24gYW5kIENvbW1hbmQgd2hpbGUgY2xpY2tpbmcgdG8gYWN0aXZhdGUgdGhlIG1pZGRs
+ZSBhbmQgcmlnaHQgbW91c2UgYnV0dG9ucy4KA</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="282885445"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSButton" id="842100515">
+												<reference key="NSNextResponder" ref="596750588"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{18, 130}, {402, 18}}</string>
+												<reference key="NSSuperview" ref="596750588"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="940564599">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Enable key equivalents under X11</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="842100515"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="31160162">
+												<reference key="NSNextResponder" ref="596750588"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{36, 159}, {385, 14}}</string>
+												<reference key="NSSuperview" ref="596750588"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="666057093">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">Allows input menu changes to overwrite the current X11 keymap.</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="31160162"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+											<object class="NSButton" id="179949713">
+												<reference key="NSNextResponder" ref="596750588"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{18, 179}, {402, 18}}</string>
+												<reference key="NSSuperview" ref="596750588"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="967619578">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Follow system keyboard layout</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="179949713"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSButton" id="915448994">
+												<reference key="NSNextResponder" ref="596750588"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{18, 69}, {402, 18}}</string>
+												<reference key="NSSuperview" ref="596750588"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="117056849">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Click-through Inactive Windows</string>
+													<reference key="NSSupport" ref="463863101"/>
+													<reference key="NSControlView" ref="915448994"/>
+													<int key="NSButtonFlags">1211912703</int>
+													<int key="NSButtonFlags2">2</int>
+													<reference key="NSAlternateImage" ref="391434389"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="707276799">
+												<reference key="NSNextResponder" ref="596750588"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrame">{{33, 32}, {385, 31}}</string>
+												<reference key="NSSuperview" ref="596750588"/>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="318286890">
+													<int key="NSCellFlags">67239424</int>
+													<int key="NSCellFlags2">4194304</int>
+													<string key="NSContents">When enabled, clicking on an inactive window will cause that mouse click to pass through to that window in addition to activating it.</string>
+													<reference key="NSSupport" ref="26"/>
+													<reference key="NSControlView" ref="707276799"/>
+													<reference key="NSBackgroundColor" ref="57160303"/>
+													<reference key="NSTextColor" ref="930815747"/>
+												</object>
+											</object>
+										</object>
+										<string key="NSFrame">{{10, 33}, {438, 279}}</string>
+										<reference key="NSSuperview" ref="448510093"/>
+									</object>
 									<string key="NSLabel">Input</string>
 									<reference key="NSColor" ref="57160303"/>
 									<reference key="NSTabView" ref="448510093"/>
@@ -688,8 +685,8 @@ ZSBhbmQgcmlnaHQgbW91c2UgYnV0dG9ucy4KA</string>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
 													<reference key="NSAlternateImage" ref="391434389"/>
-													<reference key="NSAlternateContents" ref="331740794"/>
-													<reference key="NSKeyEquivalent" ref="331740794"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
 													<int key="NSPeriodicDelay">200</int>
 													<int key="NSPeriodicInterval">25</int>
 												</object>
@@ -724,7 +721,7 @@ ZSBhbmQgcmlnaHQgbW91c2UgYnV0dG9ucy4KA</string>
 													<int key="NSButtonFlags">109199615</int>
 													<int key="NSButtonFlags2">1</int>
 													<object class="NSFont" key="NSAlternateImage">
-														<reference key="NSName" ref="512586816"/>
+														<string key="NSName">LucidaGrande</string>
 														<double key="NSSize">1.300000e+01</double>
 														<int key="NSfFlags">16</int>
 													</object>
@@ -739,12 +736,12 @@ ZSBhbmQgcmlnaHQgbW91c2UgYnV0dG9ucy4KA</string>
 													<object class="NSMenuItem" key="NSMenuItem" id="616492372">
 														<reference key="NSMenu" ref="341113515"/>
 														<string key="NSTitle">From Display</string>
-														<reference key="NSKeyEquiv" ref="331740794"/>
+														<string key="NSKeyEquiv"/>
 														<int key="NSKeyEquivModMask">1048576</int>
 														<int key="NSMnemonicLoc">2147483647</int>
 														<int key="NSState">1</int>
 														<reference key="NSOnImage" ref="531645050"/>
-														<reference key="NSMixedImage" ref="246283459"/>
+														<reference key="NSMixedImage" ref="351811234"/>
 														<string key="NSAction">_popUpItemAction:</string>
 														<int key="NSTag">-1</int>
 														<reference key="NSTarget" ref="633115429"/>
@@ -760,11 +757,11 @@ ZSBhbmQgcmlnaHQgbW91c2UgYnV0dG9ucy4KA</string>
 															<object class="NSMenuItem" id="759499526">
 																<reference key="NSMenu" ref="341113515"/>
 																<string key="NSTitle">256 Colors</string>
-																<reference key="NSKeyEquiv" ref="331740794"/>
+																<string key="NSKeyEquiv"/>
 																<int key="NSKeyEquivModMask">1048576</int>
 																<int key="NSMnemonicLoc">2147483647</int>
 																<reference key="NSOnImage" ref="531645050"/>
-																<reference key="NSMixedImage" ref="246283459"/>
+																<reference key="NSMixedImage" ref="351811234"/>
 																<string key="NSAction">_popUpItemAction:</string>
 																<int key="NSTag">8</int>
 																<reference key="NSTarget" ref="633115429"/>
@@ -772,11 +769,11 @@ ZSBhbmQgcmlnaHQgbW91c2UgYnV0dG9ucy4KA</string>
 															<object class="NSMenuItem" id="543935434">
 																<reference key="NSMenu" ref="341113515"/>
 																<string key="NSTitle">Thousands</string>
-																<reference key="NSKeyEquiv" ref="331740794"/>
+																<string key="NSKeyEquiv"/>
 																<int key="NSKeyEquivModMask">1048576</int>
 																<int key="NSMnemonicLoc">2147483647</int>
 																<reference key="NSOnImage" ref="531645050"/>
-																<reference key="NSMixedImage" ref="246283459"/>
+																<reference key="NSMixedImage" ref="351811234"/>
 																<string key="NSAction">_popUpItemAction:</string>
 																<int key="NSTag">15</int>
 																<reference key="NSTarget" ref="633115429"/>
@@ -784,11 +781,11 @@ ZSBhbmQgcmlnaHQgbW91c2UgYnV0dG9ucy4KA</string>
 															<object class="NSMenuItem" id="836673018">
 																<reference key="NSMenu" ref="341113515"/>
 																<string key="NSTitle">Millions</string>
-																<reference key="NSKeyEquiv" ref="331740794"/>
+																<string key="NSKeyEquiv"/>
 																<int key="NSKeyEquivModMask">1048576</int>
 																<int key="NSMnemonicLoc">2147483647</int>
 																<reference key="NSOnImage" ref="531645050"/>
-																<reference key="NSMixedImage" ref="246283459"/>
+																<reference key="NSMixedImage" ref="351811234"/>
 																<string key="NSAction">_popUpItemAction:</string>
 																<int key="NSTag">24</int>
 																<reference key="NSTarget" ref="633115429"/>
@@ -848,8 +845,8 @@ ZSBhbmQgcmlnaHQgbW91c2UgYnV0dG9ucy4KA</string>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
 													<reference key="NSAlternateImage" ref="391434389"/>
-													<reference key="NSAlternateContents" ref="331740794"/>
-													<reference key="NSKeyEquivalent" ref="331740794"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
 													<int key="NSPeriodicDelay">200</int>
 													<int key="NSPeriodicInterval">25</int>
 												</object>
@@ -898,8 +895,8 @@ ZSBhbmQgcmlnaHQgbW91c2UgYnV0dG9ucy4KA</string>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
 													<reference key="NSAlternateImage" ref="391434389"/>
-													<reference key="NSAlternateContents" ref="331740794"/>
-													<reference key="NSKeyEquivalent" ref="331740794"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
 													<int key="NSPeriodicDelay">200</int>
 													<int key="NSPeriodicInterval">25</int>
 												</object>
@@ -919,8 +916,8 @@ ZSBhbmQgcmlnaHQgbW91c2UgYnV0dG9ucy4KA</string>
 													<int key="NSButtonFlags">1211912703</int>
 													<int key="NSButtonFlags2">2</int>
 													<reference key="NSAlternateImage" ref="391434389"/>
-													<reference key="NSAlternateContents" ref="331740794"/>
-													<reference key="NSKeyEquivalent" ref="331740794"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
 													<int key="NSPeriodicDelay">200</int>
 													<int key="NSPeriodicInterval">25</int>
 												</object>
@@ -988,11 +985,15 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 							<int key="NSTvFlags">0</int>
 							<bool key="NSAllowTruncatedLabels">YES</bool>
 							<bool key="NSDrawsBackground">YES</bool>
+							<object class="NSMutableArray" key="NSSubviews">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<reference ref="596750588"/>
+							</object>
 						</object>
 					</object>
 					<string key="NSFrameSize">{481, 345}</string>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMinSize">{213, 129}</string>
 				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
 				<string key="NSFrameAutosaveName">x11_prefs</string>
@@ -1000,51 +1001,24 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 			<object class="NSWindowTemplate" id="604417141">
 				<int key="NSWindowStyleMask">11</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{279, 253}, {486, 327}}</string>
+				<string key="NSWindowRect">{{537, 554}, {454, 311}}</string>
 				<int key="NSWTFlags">1350041600</int>
 				<string key="NSWindowTitle">X11 Application Menu</string>
-				<reference key="NSWindowClass" ref="666842945"/>
+				<string key="NSWindowClass">NSPanel</string>
 				<object class="NSMutableString" key="NSViewClass">
 					<characters key="NS.bytes">View</characters>
 				</object>
-				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
-				<string key="NSWindowContentMinSize">{213, 107}</string>
+				<string key="NSWindowContentMaxSize">{10000, 10000}</string>
+				<string key="NSWindowContentMinSize">{320, 240}</string>
 				<object class="NSView" key="NSWindowView" id="85544634">
-					<nil key="NSNextResponder"/>
+					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSButton" id="724002248">
-							<reference key="NSNextResponder" ref="85544634"/>
-							<int key="NSvFlags">303</int>
-							<string key="NSFrame">{{268, 12}, {84, 32}}</string>
-							<reference key="NSSuperview" ref="85544634"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="809610613">
-								<int key="NSCellFlags">-2080244224</int>
-								<int key="NSCellFlags2">137887744</int>
-								<string key="NSContents">Done</string>
-								<reference key="NSSupport" ref="463863101"/>
-								<reference key="NSControlView" ref="724002248"/>
-								<int key="NSButtonFlags">-2038284033</int>
-								<int key="NSButtonFlags2">1</int>
-								<object class="NSFont" key="NSAlternateImage" id="549406736">
-									<string key="NSName">Helvetica</string>
-									<double key="NSSize">1.300000e+01</double>
-									<int key="NSfFlags">16</int>
-								</object>
-								<reference key="NSAlternateContents" ref="331740794"/>
-								<object class="NSMutableString" key="NSKeyEquivalent">
-									<characters key="NS.bytes"/>
-								</object>
-								<int key="NSPeriodicDelay">200</int>
-								<int key="NSPeriodicInterval">25</int>
-							</object>
-						</object>
 						<object class="NSButton" id="671954382">
 							<reference key="NSNextResponder" ref="85544634"/>
-							<int key="NSvFlags">301</int>
-							<string key="NSFrame">{{372, 247}, {100, 32}}</string>
+							<int key="NSvFlags">265</int>
+							<string key="NSFrame">{{340, 231}, {100, 32}}</string>
 							<reference key="NSSuperview" ref="85544634"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="143554520">
@@ -1055,7 +1029,11 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 								<reference key="NSControlView" ref="671954382"/>
 								<int key="NSButtonFlags">-2038284033</int>
 								<int key="NSButtonFlags2">1</int>
-								<reference key="NSAlternateImage" ref="549406736"/>
+								<object class="NSFont" key="NSAlternateImage" id="549406736">
+									<string key="NSName">Helvetica</string>
+									<double key="NSSize">1.300000e+01</double>
+									<int key="NSfFlags">16</int>
+								</object>
 								<object class="NSMutableString" key="NSAlternateContents">
 									<characters key="NS.bytes"/>
 								</object>
@@ -1068,8 +1046,8 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 						</object>
 						<object class="NSButton" id="492358940">
 							<reference key="NSNextResponder" ref="85544634"/>
-							<int key="NSvFlags">301</int>
-							<string key="NSFrame">{{372, 215}, {100, 32}}</string>
+							<int key="NSvFlags">265</int>
+							<string key="NSFrame">{{340, 199}, {100, 32}}</string>
 							<reference key="NSSuperview" ref="85544634"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="8201128">
@@ -1093,7 +1071,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 						</object>
 						<object class="NSScrollView" id="1063387772">
 							<reference key="NSNextResponder" ref="85544634"/>
-							<int key="NSvFlags">307</int>
+							<int key="NSvFlags">274</int>
 							<object class="NSMutableArray" key="NSSubviews">
 								<bool key="EncodedWithXMLCoder">YES</bool>
 								<object class="NSClipView" id="580565898">
@@ -1104,26 +1082,26 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 										<object class="NSTableView" id="905092943">
 											<reference key="NSNextResponder" ref="580565898"/>
 											<int key="NSvFlags">256</int>
-											<string key="NSFrameSize">{333, 197}</string>
+											<string key="NSFrameSize">{301, 198}</string>
 											<reference key="NSSuperview" ref="580565898"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTableHeaderView" key="NSHeaderView" id="792419186">
 												<reference key="NSNextResponder" ref="672307654"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrameSize">{333, 17}</string>
+												<string key="NSFrameSize">{301, 17}</string>
 												<reference key="NSSuperview" ref="672307654"/>
 												<reference key="NSTableView" ref="905092943"/>
 											</object>
 											<object class="_NSCornerView" key="NSCornerView" id="898633680">
 												<reference key="NSNextResponder" ref="1063387772"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrame">{{334, 0}, {16, 17}}</string>
+												<string key="NSFrame">{{302, 0}, {16, 17}}</string>
 												<reference key="NSSuperview" ref="1063387772"/>
 											</object>
 											<object class="NSMutableArray" key="NSTableColumns">
 												<bool key="EncodedWithXMLCoder">YES</bool>
 												<object class="NSTableColumn" id="84282687">
-													<double key="NSWidth">1.110000e+02</double>
+													<double key="NSWidth">9.900000e+01</double>
 													<double key="NSMinWidth">4.000000e+01</double>
 													<double key="NSMaxWidth">1.000000e+03</double>
 													<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -1137,7 +1115,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 														</object>
 														<object class="NSColor" key="NSTextColor" id="249576247">
 															<int key="NSColorSpace">6</int>
-															<reference key="NSCatalogName" ref="905527164"/>
+															<string key="NSCatalogName">System</string>
 															<string key="NSColorName">headerTextColor</string>
 															<reference key="NSColor" ref="214098874"/>
 														</object>
@@ -1145,7 +1123,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 													<object class="NSTextFieldCell" key="NSDataCell" id="432610585">
 														<int key="NSCellFlags">338820672</int>
 														<int key="NSCellFlags2">1024</int>
-														<string key="NSContents" id="548220387">Text Cell</string>
+														<string key="NSContents">Text Cell</string>
 														<reference key="NSSupport" ref="463863101"/>
 														<reference key="NSControlView" ref="905092943"/>
 														<object class="NSColor" key="NSBackgroundColor" id="822946413">
@@ -1160,7 +1138,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 													<reference key="NSTableView" ref="905092943"/>
 												</object>
 												<object class="NSTableColumn" id="938444323">
-													<double key="NSWidth">1.327310e+02</double>
+													<double key="NSWidth">1.217310e+02</double>
 													<double key="NSMinWidth">6.273100e+01</double>
 													<double key="NSMaxWidth">1.000000e+03</double>
 													<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -1174,7 +1152,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 													<object class="NSTextFieldCell" key="NSDataCell" id="825378892">
 														<int key="NSCellFlags">338820672</int>
 														<int key="NSCellFlags2">1024</int>
-														<reference key="NSContents" ref="548220387"/>
+														<string key="NSContents">Text Cell</string>
 														<reference key="NSSupport" ref="463863101"/>
 														<reference key="NSControlView" ref="905092943"/>
 														<reference key="NSBackgroundColor" ref="822946413"/>
@@ -1186,7 +1164,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 													<reference key="NSTableView" ref="905092943"/>
 												</object>
 												<object class="NSTableColumn" id="242608782">
-													<double key="NSWidth">8.000000e+01</double>
+													<double key="NSWidth">7.100000e+01</double>
 													<double key="NSMinWidth">1.000000e+01</double>
 													<double key="NSMaxWidth">1.000000e+03</double>
 													<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -1196,7 +1174,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 														<reference key="NSSupport" ref="26"/>
 														<object class="NSColor" key="NSBackgroundColor">
 															<int key="NSColorSpace">6</int>
-															<reference key="NSCatalogName" ref="905527164"/>
+															<string key="NSCatalogName">System</string>
 															<string key="NSColorName">headerColor</string>
 															<reference key="NSColor" ref="822946413"/>
 														</object>
@@ -1205,9 +1183,9 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 													<object class="NSTextFieldCell" key="NSDataCell" id="34714764">
 														<int key="NSCellFlags">338820672</int>
 														<int key="NSCellFlags2">1024</int>
-														<reference key="NSContents" ref="548220387"/>
+														<string key="NSContents">Text Cell</string>
 														<object class="NSFont" key="NSSupport">
-															<reference key="NSName" ref="512586816"/>
+															<string key="NSName">LucidaGrande</string>
 															<double key="NSSize">1.200000e+01</double>
 															<int key="NSfFlags">16</int>
 														</object>
@@ -1215,7 +1193,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 														<bool key="NSDrawsBackground">YES</bool>
 														<object class="NSColor" key="NSBackgroundColor" id="812484075">
 															<int key="NSColorSpace">6</int>
-															<reference key="NSCatalogName" ref="905527164"/>
+															<string key="NSCatalogName">System</string>
 															<string key="NSColorName">controlBackgroundColor</string>
 															<reference key="NSColor" ref="590688762"/>
 														</object>
@@ -1232,7 +1210,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 											<reference key="NSBackgroundColor" ref="822946413"/>
 											<object class="NSColor" key="NSGridColor">
 												<int key="NSColorSpace">6</int>
-												<reference key="NSCatalogName" ref="905527164"/>
+												<string key="NSCatalogName">System</string>
 												<string key="NSColorName">gridColor</string>
 												<object class="NSColor" key="NSColor">
 													<int key="NSColorSpace">3</int>
@@ -1247,7 +1225,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 											<bool key="NSAllowsTypeSelect">YES</bool>
 										</object>
 									</object>
-									<string key="NSFrame">{{1, 17}, {333, 197}}</string>
+									<string key="NSFrame">{{1, 17}, {301, 198}}</string>
 									<reference key="NSSuperview" ref="1063387772"/>
 									<reference key="NSNextKeyView" ref="905092943"/>
 									<reference key="NSDocView" ref="905092943"/>
@@ -1257,20 +1235,20 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 								<object class="NSScroller" id="842897584">
 									<reference key="NSNextResponder" ref="1063387772"/>
 									<int key="NSvFlags">256</int>
-									<string key="NSFrame">{{334, 17}, {15, 197}}</string>
+									<string key="NSFrame">{{302, 17}, {15, 198}}</string>
 									<reference key="NSSuperview" ref="1063387772"/>
 									<reference key="NSTarget" ref="1063387772"/>
-									<string key="NSAction" id="365694962">_doScroller:</string>
+									<string key="NSAction">_doScroller:</string>
 									<double key="NSPercent">9.949238e-01</double>
 								</object>
 								<object class="NSScroller" id="17278747">
 									<reference key="NSNextResponder" ref="1063387772"/>
 									<int key="NSvFlags">256</int>
-									<string key="NSFrame">{{1, 214}, {333, 15}}</string>
+									<string key="NSFrame">{{1, 215}, {301, 15}}</string>
 									<reference key="NSSuperview" ref="1063387772"/>
 									<int key="NSsFlags">1</int>
 									<reference key="NSTarget" ref="1063387772"/>
-									<reference key="NSAction" ref="365694962"/>
+									<string key="NSAction">_doScroller:</string>
 									<double key="NSPercent">6.885246e-01</double>
 								</object>
 								<object class="NSClipView" id="672307654">
@@ -1280,7 +1258,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 										<bool key="EncodedWithXMLCoder">YES</bool>
 										<reference ref="792419186"/>
 									</object>
-									<string key="NSFrame">{{1, 0}, {333, 17}}</string>
+									<string key="NSFrame">{{1, 0}, {301, 17}}</string>
 									<reference key="NSSuperview" ref="1063387772"/>
 									<reference key="NSNextKeyView" ref="792419186"/>
 									<reference key="NSDocView" ref="792419186"/>
@@ -1289,7 +1267,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 								</object>
 								<reference ref="898633680"/>
 							</object>
-							<string key="NSFrame">{{20, 77}, {350, 230}}</string>
+							<string key="NSFrame">{{20, 60}, {318, 231}}</string>
 							<reference key="NSSuperview" ref="85544634"/>
 							<reference key="NSNextKeyView" ref="580565898"/>
 							<int key="NSsFlags">50</int>
@@ -1300,10 +1278,35 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 							<reference key="NSCornerView" ref="898633680"/>
 							<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
 						</object>
+						<object class="NSButton" id="758204686">
+							<reference key="NSNextResponder" ref="85544634"/>
+							<int key="NSvFlags">265</int>
+							<string key="NSFrame">{{340, 263}, {100, 32}}</string>
+							<reference key="NSSuperview" ref="85544634"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="1025474039">
+								<int key="NSCellFlags">-2080244224</int>
+								<int key="NSCellFlags2">137887744</int>
+								<string key="NSContents">Add Item</string>
+								<reference key="NSSupport" ref="463863101"/>
+								<reference key="NSControlView" ref="758204686"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">1</int>
+								<reference key="NSAlternateImage" ref="549406736"/>
+								<object class="NSMutableString" key="NSAlternateContents">
+									<characters key="NS.bytes"/>
+								</object>
+								<object class="NSMutableString" key="NSKeyEquivalent">
+									<characters key="NS.bytes"/>
+								</object>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
 						<object class="NSButton" id="125703429">
 							<reference key="NSNextResponder" ref="85544634"/>
-							<int key="NSvFlags">303</int>
-							<string key="NSFrame">{{352, 12}, {84, 32}}</string>
+							<int key="NSvFlags">257</int>
+							<string key="NSFrame">{{356, 12}, {84, 32}}</string>
 							<reference key="NSSuperview" ref="85544634"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="892296813">
@@ -1325,24 +1328,22 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 								<int key="NSPeriodicInterval">25</int>
 							</object>
 						</object>
-						<object class="NSButton" id="758204686">
+						<object class="NSButton" id="724002248">
 							<reference key="NSNextResponder" ref="85544634"/>
-							<int key="NSvFlags">301</int>
-							<string key="NSFrame">{{372, 279}, {100, 32}}</string>
+							<int key="NSvFlags">257</int>
+							<string key="NSFrame">{{272, 12}, {84, 32}}</string>
 							<reference key="NSSuperview" ref="85544634"/>
 							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="1025474039">
-								<int key="NSCellFlags">67239424</int>
+							<object class="NSButtonCell" key="NSCell" id="809610613">
+								<int key="NSCellFlags">-2080244224</int>
 								<int key="NSCellFlags2">137887744</int>
-								<string key="NSContents">Add Item</string>
+								<string key="NSContents">Done</string>
 								<reference key="NSSupport" ref="463863101"/>
-								<reference key="NSControlView" ref="758204686"/>
+								<reference key="NSControlView" ref="724002248"/>
 								<int key="NSButtonFlags">-2038284033</int>
 								<int key="NSButtonFlags2">1</int>
 								<reference key="NSAlternateImage" ref="549406736"/>
-								<object class="NSMutableString" key="NSAlternateContents">
-									<characters key="NS.bytes"/>
-								</object>
+								<string key="NSAlternateContents"/>
 								<object class="NSMutableString" key="NSKeyEquivalent">
 									<characters key="NS.bytes"/>
 								</object>
@@ -1351,11 +1352,11 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 							</object>
 						</object>
 					</object>
-					<string key="NSFrameSize">{486, 327}</string>
+					<string key="NSFrameSize">{454, 311}</string>
+					<reference key="NSSuperview"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
-				<string key="NSMinSize">{213, 129}</string>
-				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
+				<string key="NSMinSize">{320, 262}</string>
 				<string key="NSFrameAutosaveName">x11_apps</string>
 			</object>
 			<object class="NSMenu" id="294137138">
@@ -1366,51 +1367,51 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 						<reference key="NSMenu" ref="294137138"/>
 						<bool key="NSIsDisabled">YES</bool>
 						<bool key="NSIsSeparator">YES</bool>
-						<reference key="NSTitle" ref="331740794"/>
-						<reference key="NSKeyEquiv" ref="331740794"/>
+						<string key="NSTitle"/>
+						<string key="NSKeyEquiv"/>
 						<int key="NSKeyEquivModMask">1048576</int>
 						<int key="NSMnemonicLoc">2147483647</int>
 						<reference key="NSOnImage" ref="531645050"/>
-						<reference key="NSMixedImage" ref="246283459"/>
+						<reference key="NSMixedImage" ref="351811234"/>
 					</object>
 					<object class="NSMenuItem" id="511651072">
 						<reference key="NSMenu" ref="294137138"/>
-						<reference key="NSTitle" ref="667842658"/>
-						<reference key="NSKeyEquiv" ref="331740794"/>
+						<string key="NSTitle">Applications</string>
+						<string key="NSKeyEquiv"/>
 						<int key="NSKeyEquivModMask">1048576</int>
 						<int key="NSMnemonicLoc">2147483647</int>
 						<reference key="NSOnImage" ref="531645050"/>
-						<reference key="NSMixedImage" ref="246283459"/>
+						<reference key="NSMixedImage" ref="351811234"/>
 						<string key="NSAction">submenuAction:</string>
 						<object class="NSMenu" key="NSSubmenu" id="48278059">
-							<reference key="NSTitle" ref="667842658"/>
+							<string key="NSTitle">Applications</string>
 							<object class="NSMutableArray" key="NSMenuItems">
 								<bool key="EncodedWithXMLCoder">YES</bool>
 								<object class="NSMenuItem" id="563798000">
 									<reference key="NSMenu" ref="48278059"/>
 									<bool key="NSIsDisabled">YES</bool>
 									<bool key="NSIsSeparator">YES</bool>
-									<reference key="NSTitle" ref="331740794"/>
-									<reference key="NSKeyEquiv" ref="331740794"/>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="531645050"/>
-									<reference key="NSMixedImage" ref="246283459"/>
+									<reference key="NSMixedImage" ref="351811234"/>
 								</object>
 								<object class="NSMenuItem" id="1032342329">
 									<reference key="NSMenu" ref="48278059"/>
 									<string type="base64-UTF8" key="NSTitle">Q3VzdG9taXpl4oCmA</string>
-									<reference key="NSKeyEquiv" ref="331740794"/>
+									<string key="NSKeyEquiv"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="531645050"/>
-									<reference key="NSMixedImage" ref="246283459"/>
+									<reference key="NSMixedImage" ref="351811234"/>
 								</object>
 							</object>
 						</object>
 					</object>
 				</object>
-				<reference key="NSName" ref="331740794"/>
+				<string key="NSName"/>
 			</object>
 		</object>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
@@ -1554,7 +1555,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<string key="label" id="75505755">apps_table_show:</string>
+						<string key="label">apps_table_show:</string>
 						<reference key="source" ref="485884620"/>
 						<reference key="destination" ref="1065386165"/>
 					</object>
@@ -1650,7 +1651,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<string key="label" id="582333102">prefs_changed:</string>
+						<string key="label">prefs_changed:</string>
 						<reference key="source" ref="485884620"/>
 						<reference key="destination" ref="119157981"/>
 					</object>
@@ -1658,7 +1659,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<reference key="label" ref="582333102"/>
+						<string key="label">prefs_changed:</string>
 						<reference key="source" ref="485884620"/>
 						<reference key="destination" ref="179949713"/>
 					</object>
@@ -1666,7 +1667,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<reference key="label" ref="582333102"/>
+						<string key="label">prefs_changed:</string>
 						<reference key="source" ref="485884620"/>
 						<reference key="destination" ref="842100515"/>
 					</object>
@@ -1674,7 +1675,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<reference key="label" ref="582333102"/>
+						<string key="label">prefs_changed:</string>
 						<reference key="source" ref="485884620"/>
 						<reference key="destination" ref="418227126"/>
 					</object>
@@ -1682,7 +1683,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<reference key="label" ref="582333102"/>
+						<string key="label">prefs_changed:</string>
 						<reference key="source" ref="485884620"/>
 						<reference key="destination" ref="709074847"/>
 					</object>
@@ -1690,7 +1691,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<reference key="label" ref="582333102"/>
+						<string key="label">prefs_changed:</string>
 						<reference key="source" ref="485884620"/>
 						<reference key="destination" ref="989050925"/>
 					</object>
@@ -1698,7 +1699,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<reference key="label" ref="582333102"/>
+						<string key="label">prefs_changed:</string>
 						<reference key="source" ref="485884620"/>
 						<reference key="destination" ref="700826966"/>
 					</object>
@@ -1786,7 +1787,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<reference key="label" ref="75505755"/>
+						<string key="label">apps_table_show:</string>
 						<reference key="source" ref="485884620"/>
 						<reference key="destination" ref="1032342329"/>
 					</object>
@@ -1842,7 +1843,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<reference key="label" ref="582333102"/>
+						<string key="label">prefs_changed:</string>
 						<reference key="source" ref="485884620"/>
 						<reference key="destination" ref="915448994"/>
 					</object>
@@ -1922,7 +1923,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 							<reference ref="551174276"/>
 						</object>
 						<reference key="parent" ref="330408435"/>
-						<reference key="objectName" ref="121567387"/>
+						<string key="objectName">MainMenu</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">19</int>
@@ -2209,7 +2210,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 						<int key="objectID">196</int>
 						<reference key="object" ref="485884620"/>
 						<reference key="parent" ref="330408435"/>
-						<reference key="objectName" ref="865849805"/>
+						<string key="objectName">X11Controller</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">244</int>
@@ -2935,18 +2936,21 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 					<string>270.editorWindowContentRectSynchronizationRect</string>
 					<string>272.IBPluginDependency</string>
 					<string>272.ImportedFromIB2</string>
+					<string>285.IBEditorWindowLastContentRect</string>
 					<string>285.IBPluginDependency</string>
 					<string>285.IBViewEditorWindowController.showingBoundsRectangles</string>
 					<string>285.IBViewEditorWindowController.showingLayoutRectangles</string>
 					<string>285.IBWindowTemplateEditedContentRect</string>
 					<string>285.ImportedFromIB2</string>
 					<string>285.editorWindowContentRectSynchronizationRect</string>
+					<string>285.lastResizeAction</string>
 					<string>285.windowTemplate.hasMaxSize</string>
 					<string>285.windowTemplate.hasMinSize</string>
 					<string>285.windowTemplate.maxSize</string>
 					<string>285.windowTemplate.minSize</string>
 					<string>286.IBPluginDependency</string>
 					<string>286.ImportedFromIB2</string>
+					<string>29.IBEditorWindowLastContentRect</string>
 					<string>29.IBPluginDependency</string>
 					<string>29.ImportedFromIB2</string>
 					<string>29.editorWindowContentRectSynchronizationRect</string>
@@ -3087,231 +3091,246 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 				</object>
 				<object class="NSMutableArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
-					<reference ref="1013584587"/>
-					<reference ref="1013584587"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1" id="9"/>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>{{202, 626}, {154, 153}}</string>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>{{271, 666}, {301, 153}}</string>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>{{184, 290}, {481, 345}}</string>
 					<reference ref="9"/>
 					<string>{{184, 290}, {481, 345}}</string>
 					<reference ref="9"/>
 					<reference ref="9"/>
-					<string id="169660368">{3.40282e+38, 3.40282e+38}</string>
-					<string id="432763037">{213, 107}</string>
-					<reference ref="1013584587"/>
+					<string>{3.40282e+38, 3.40282e+38}</string>
+					<string>{213, 107}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>{{100, 746}, {155, 33}}</string>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>{{537, 554}, {454, 311}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<reference ref="9"/>
-					<string id="678991548">{{433, 406}, {486, 327}}</string>
+					<string>{{537, 554}, {454, 311}}</string>
 					<reference ref="9"/>
-					<reference ref="678991548"/>
+					<string>{{433, 406}, {486, 327}}</string>
+					<object class="NSDictionary">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSMutableArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>IBResizeActionFinalFrame</string>
+							<string>IBResizeActionInitialFrame</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>{{537, 554}, {454, 311}}</string>
+							<string>{{537, 576}, {471, 289}}</string>
+						</object>
+					</object>
+					<integer value="0"/>
 					<reference ref="9"/>
+					<string>{3.40282e+38, 3.40282e+38}</string>
+					<string>{320, 240}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="169660368"/>
-					<reference ref="432763037"/>
-					<reference ref="1013584587"/>
-					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>{{0, 1114}, {336, 20}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>{{67, 819}, {336, 20}}</string>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>{{79, 616}, {218, 203}}</string>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<reference ref="1013584587"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 				</object>
 			</object>
@@ -3341,29 +3360,17 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
 				<bool key="EncodedWithXMLCoder">YES</bool>
 				<object class="IBPartialClassDescription">
-					<reference key="className" ref="671773319"/>
-					<nil key="superclassName"/>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-					</object>
+					<string key="className">FirstResponder</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey" id="360524387">IBUserSource</string>
-						<reference key="minorKey" ref="331740794"/>
+						<string key="majorKey">IBUserSource</string>
+						<string key="minorKey"/>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSFormatter</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBUserSource</string>
+						<string key="minorKey"/>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -3394,24 +3401,24 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string id="678582588">id</string>
-							<reference ref="678582588"/>
-							<reference ref="678582588"/>
-							<reference ref="678582588"/>
-							<reference ref="678582588"/>
-							<reference ref="678582588"/>
-							<reference ref="678582588"/>
-							<reference ref="678582588"/>
-							<reference ref="678582588"/>
-							<reference ref="678582588"/>
-							<reference ref="678582588"/>
-							<reference ref="678582588"/>
-							<reference ref="678582588"/>
-							<reference ref="678582588"/>
-							<reference ref="678582588"/>
-							<reference ref="678582588"/>
-							<reference ref="678582588"/>
-							<reference ref="678582588"/>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">
@@ -3439,24 +3446,24 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string id="133216019">NSMenuItem</string>
+							<string>NSMenuItem</string>
 							<string>NSTableView</string>
-							<string id="623744785">NSButton</string>
+							<string>NSButton</string>
 							<string>NSPopUpButton</string>
-							<string id="455827649">NSMenu</string>
-							<reference ref="455827649"/>
-							<reference ref="133216019"/>
-							<reference ref="623744785"/>
-							<reference ref="623744785"/>
-							<reference ref="623744785"/>
-							<reference ref="623744785"/>
-							<reference ref="623744785"/>
+							<string>NSMenu</string>
+							<string>NSMenu</string>
+							<string>NSMenuItem</string>
+							<string>NSButton</string>
+							<string>NSButton</string>
+							<string>NSButton</string>
+							<string>NSButton</string>
+							<string>NSButton</string>
 							<string>NSPanel</string>
-							<reference ref="623744785"/>
-							<reference ref="133216019"/>
-							<reference ref="623744785"/>
-							<reference ref="133216019"/>
-							<reference ref="133216019"/>
+							<string>NSButton</string>
+							<string>NSMenuItem</string>
+							<string>NSButton</string>
+							<string>NSMenuItem</string>
+							<string>NSMenuItem</string>
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -3464,628 +3471,10 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 						<string key="minorKey"/>
 					</object>
 				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NSFormatter</string>
-					<nil key="superclassName"/>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<reference key="majorKey" ref="360524387"/>
-						<reference key="minorKey" ref="331740794"/>
-					</object>
-				</object>
 			</object>
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
 		<nil key="IBDocument.LastKnownRelativeProjectPath"/>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<object class="NSMutableData" key="IBDocument.RunnableNib">
-			<bytes key="NS.bytes">YnBsaXN0MDDUAAEAAgADAAQABQAGAAkAClgkdmVyc2lvblQkdG9wWSRhcmNoaXZlclgkb2JqZWN0cxIA
-AYag0QAHAAhdSUIub2JqZWN0ZGF0YYABXxAPTlNLZXllZEFyY2hpdmVyrxEDQgALAAwAMQA1ADkAQABD
-AEQASABMAIkAkQCZAJoAnwCyALMAuAC5ALoAvQDBAMIAxQDQANEA0gDWANsA5ADrAOwA8ADyAPMA9wD8
-AQoBEgETAS0BLgE1ATYBOQE9AT4BQAFCAUYBTAFPAVABUQFUAVkBYAFlAWYBZwFsAXMBeAF5AXoBewGA
-AYcBjQGOAZkBmgGeAZ8BogGjAagBrwGwAbgBuQG6Ab8BwAHFAcwB0QHSAekB7AHuAfAB/QIBAgICAwIG
-Ag0CFwICAhgCIgICAiMCLQICAi4CMgI1AjYCOwJDAkQCRQJKAlMCVwJYAl0CZAJlAm0CbgJzAnsCfAJ9
-An4CgwKIAo8ClAKVAp0CngKjAqoCqwKzArQCuQLBAsICwwLEAskC0QLSAtMC1ALZAtoC3wLgAuQC6wLv
-AvAC8QL1AvwC/QL+Av8DBAMJAwoDEgMbANEDHAMrAzIDMwM0Az0DRgDRA0cDTANOA1EDUgNbA2QDawNs
-A20DdAN1A34DhQOGA4cDiADRA5EDlgOdA54DpwDRA6gDswO6A7sDvAPDA8QDxQPOA9UD1gPXA94D3wPg
-A+cD6APxANED8gP0BAAEBwQIBAkEEAQRBBoEIwQqBCsENAQ1BD4A0QQ/BEMERwROBE8EUARRBFYEWwRi
-BGMEawRsBG0EcgRzBHgEfwSABIgEiQSLBI0EjgSSBJMEmASZBJ4EnwSkBMAEwQTCBMMExgTHBMgEzQTR
-BOEE5QTwBPcE+AUCBQMFCAUSBRMFFAUYBRoFHwUgBSMFJgUpBTAFMQU4BTkFQAVBBUgFSQVQBVEFWAVZ
-BVoFXAVdBWMFbAVvBXAFcwV6BX0FhwWOBY8FlwWYBZ8FoAWnBagFrwWwBbcFuAW/BcAFxwXIBc8F0AXX
-BVkF2AXZBd8F5wKqBe4F9gX3Bf4F/wYGBgcGDgYPBhYGFwYeBh8GJgVZBicGKAYqBisGLATGBi0GLgYx
-BjIGNwY4Bj0GPgZDBkQGSQZKBk8GVwZYBmEGYgZkBmYGZwZsBnEGcgZ2BncGfAaDBoQGjAaNBo8GkQaS
-BpcGmAadBrgGxwbIBs8G2AbZBtwG4Qb2BvcG+gcABxIHGQcaBx0HIgcjByYHLgcvBzIHNQc+B0QHRQdM
-B1UHWwdcB2EHYgdqB24Hcwd0B3kHegd9B38HgAeFB4YHiweMB5EHkgeXB5sHnAehB6IHpwesB60HsQey
-B7cHuAe9B74HwwfEB8kHygfPB9AH1AfVB9oH2wfgB+cH6AfwB/EH8wf0CHgIgAiECIUIiAiRCJIIkwiW
-CJ4InwijCKQIpQioCLYItwi4BMYExwi6CMMGKwYsBMYIxAjFADgIyAjKCU4J0wpYClkKWgpbClwKXQpe
-Cl8KYAphCmIKYwpkCmUKZgpnCmgKaQpqCmsKbAptCm4KbwpwCnEKcgpzCnQKdQp2CncKeAp5CnoKewp8
-Cn0Kfgp/CoAKgQqCCoMKhAqFCoYKhwqICokKigqLBMUKjAqNCo4KjwqQCpEKkgqTCpQKlQqWCpcKmAqZ
-CpoKmwqcCp0KngqfCqAKoQqiCqMKpAqlCqYKpwqoCqkKqgqrCqwKrQquCq8KsAqxCrIKswq0CrUKtgq3
-CrgKuQq6CrsKvAq9Cr4KvwrACsEKwgrDCsQKxQrGCscKyArJCsoKywrMCs0KzgrPCtAK0QrSCtMK1ArV
-CtYK1wraCt0LnAxbDFwMXQxeDF8MYAxhDGIMYwxkDGUMZgxnDGgMaQxqDGsMbAxtDG4MbwxwDHEMcgxz
-DHQMdQx2DHcMeAx5DHoMewx8DH0Mfgx/DIAMgQyCDIMMhAyFDIYMhwyIDIkMigyLDIwMjQyODI8MkAyR
-DJIMkwyUDJUMlgyXDJgMmQyaDJsMnAydDJ4MnwygDKEMogyjDKQMpQymDKcMqAypDKoMqwysDK0Mrgyv
-DLAMsQyyDLMMtAy1DLYMtwy4DLkMugy7DLwMvQy+DL8MwAzBDMIMwwzEDMUMxgzHDMgMyQzKDMsMzAzN
-AiwMzgzPDNAM0QzSDNMM1AzVDNYM1wzYDNkM2gzbDNwM3QzeDN8M4AzhDOIM4wzkDOUM5gznDOgM6Qzq
-DOsM7AztDO4M7wzwDPEM8gzzDPQM9Qz2DPcM+Az5DPoBBwz7DPwM/Qz+DP8NAA0BDQINAw0EDQUGVA0G
-DQcNCA0JDQoNCw0MDQ0NDg0PDRANEQ0SDRMNFA0XDRoNHVUkbnVsbN8QEgANAA4ADwAQABEAEgATABQA
-FQAWABcAGAAZABoAGwAcAB0AHgAfACAAIQAiACMAJAAlACYAJwAoACkAKgArACwALQAuAC8AMFZOU1Jv
-b3RWJGNsYXNzXU5TT2JqZWN0c0tleXNfEA9OU0NsYXNzZXNWYWx1ZXNfEBlOU0FjY2Vzc2liaWxpdHlP
-aWRzVmFsdWVzXU5TQ29ubmVjdGlvbnNbTlNOYW1lc0tleXNbTlNGcmFtZXdvcmtdTlNDbGFzc2VzS2V5
-c1pOU09pZHNLZXlzXU5TTmFtZXNWYWx1ZXNfEBlOU0FjY2Vzc2liaWxpdHlDb25uZWN0b3JzXU5TRm9u
-dE1hbmFnZXJfEBBOU1Zpc2libGVXaW5kb3dzXxAPTlNPYmplY3RzVmFsdWVzXxAXTlNBY2Nlc3NpYmls
-aXR5T2lkc0tleXNZTlNOZXh0T2lkXE5TT2lkc1ZhbHVlc4ACgQNBgQHdgQJ/gQNAgAmBAfyABoECfoEC
-gIEB/YEDPoAAgAeBAfuBAz8SAASVMIECgdIADgAyADMANFtOU0NsYXNzTmFtZYAFgAPSAA4ANgA3ADhZ
-TlMuc3RyaW5ngARdTlNBcHBsaWNhdGlvbtIAOgA7ADwAPVgkY2xhc3Nlc1okY2xhc3NuYW1lowA9AD4A
-P18QD05TTXV0YWJsZVN0cmluZ1hOU1N0cmluZ1hOU09iamVjdNIAOgA7AEEAQqIAQgA/Xk5TQ3VzdG9t
-T2JqZWN0XxAQSUJDb2NvYUZyYW1ld29ya9IADgBFAEYAR1pOUy5vYmplY3RzgAig0gA6ADsASQBKowBK
-AEsAP1xOU011dGFibGVTZXRVTlNTZXTSAA4ARQBNAE6AH68QOgBPAFAAUQBSAFMAVABVAFYAVwBYAFkA
-WgBbAFwAXQBeAF8AYABhAGIAYwBkAGUAZgBnAGgAaQBqAGsAbABtAG4AbwBwAHEAcgBzAHQAdQB2AHcA
-eAB5AHoAewB8AH0AfgB/AIAAgQCCAIMAhACFAIYAhwCIgAqAI4A2gDuAQYBLgFGAU4BtgHGAdYB6gH+A
-gICGgIuAkICVgJeAmYCegKOA84D0gPqA/IEBBIEBBoEBCIEBCoEBb4EBcYEBc4EBdYEBd4EBf4EBgIEB
-goEBhIEBjIEBjoEBuIEBuoEBvIEBvoEBv4EBwYEBw4EBxIEBxoEByIEByoEBzIEBzoEB0IEB0oEB1IEB
-1tQADgCKAIsAjACNAI4AHwCQXU5TRGVzdGluYXRpb25YTlNTb3VyY2VXTlNMYWJlbIAigAuAAoAh1AAO
-AJIAkwCUAJUAlgCXAJhXTlNUaXRsZVZOU05hbWVbTlNNZW51SXRlbXOAIIAMgA+ADVRNZW510gAOAEUA
-TQCcgB+iAJ0AnoAOgBfaAA4AkgCgAKEAogCjAKQApQCmAKcAqACXAKoAqwCXAKsArgCvALAAjl8QEU5T
-S2V5RXF1aXZNb2RNYXNrXU5TSXNTZXBhcmF0b3JaTlNLZXlFcXVpdlxOU0lzRGlzYWJsZWRdTlNNbmVt
-b25pY0xvY1lOU09uSW1hZ2VcTlNNaXhlZEltYWdlVk5TTWVudYAWgA8SABAAAAmADwkSf////4AQgBSA
-C1DTAA4AMgC0ALUAtgC3Xk5TUmVzb3VyY2VOYW1lgBOAEYASV05TSW1hZ2VfEA9OU01lbnVDaGVja21h
-cmvSADoAOwC7ALyiALwAP18QEE5TQ3VzdG9tUmVzb3VyY2XTAA4AMgC0ALUAtgDAgBOAEYAVXxAQTlNN
-ZW51TWl4ZWRTdGF0ZdIAOgA7AMMAxKIAxAA/Wk5TTWVudUl0ZW3aAA4AxgCSAKAAogCkAKUApgCnAMcA
-qADJAMoAqgCXAK4ArwCwAI4Az1lOU1N1Ym1lbnVYTlNBY3Rpb26AFoAagBiAD4AQgBSAC4AZXEFwcGxp
-Y2F0aW9uc15zdWJtZW51QWN0aW9uOtMADgCSAJQAlQDKANWAIIAYgBvSAA4ARQBNANiAH6IA2QDagByA
-HdoADgCSAKAAoQCiAKMApAClAKYApwCoAJcAqgCrAJcAqwCuAK8AsADJgBaADwmADwmAEIAUgBrYAA4A
-kgCgAKIApAClAKYApwCoAOYAqgCXAK4ArwCwAMmAFoAegA+AEIAUgBpqAEMAdQBzAHQAbwBtAGkAegBl
-ICbSADoAOwDtAO6jAO4A7wA/Xk5TTXV0YWJsZUFycmF5V05TQXJyYXnSADoAOwDxAKeiAKcAP1hkb2Nr
-TWVuddIAOgA7APQA9aMA9QD2AD9fEBROU05pYk91dGxldENvbm5lY3Rvcl5OU05pYkNvbm5lY3RvctQA
-DgCKAIsAjAD4APkA+gD7gDWAMoAkgDTXAP0ADgD+AP8BAAEBAQIBAwEEAQUBBgEHAKsBA18QD05TTmV4
-dFJlc3BvbmRlcldOU0ZyYW1lVk5TQ2VsbFhOU3ZGbGFnc1lOU0VuYWJsZWRbTlNTdXBlcnZpZXeAJYAx
-gCaAJxEBLQmAJdUA/QAOAQsBAAEMACsBDgEPARABEVpOU1N1YnZpZXdzW05TRnJhbWVTaXplgACBATOB
-AfIRAQCBAfNfEBd7ezM3MiwgMjc5fSwgezEwMCwgMzJ9fd0BFAAOARUBFgEXARgBGQEaARsBHAEdAR4B
-HwEgASEBIgEjASQBJQEmAScBKAD6ASoBKwEsW05TQ2VsbEZsYWdzXxATTlNBbHRlcm5hdGVDb250ZW50
-c18QEk5TUGVyaW9kaWNJbnRlcnZhbF5OU0J1dHRvbkZsYWdzMl8QEE5TQWx0ZXJuYXRlSW1hZ2VfEA9O
-U0tleUVxdWl2YWxlbnRaTlNDb250ZW50c1lOU1N1cHBvcnRdTlNDb250cm9sVmlld18QD05TUGVyaW9k
-aWNEZWxheVxOU0NlbGxGbGFnczJdTlNCdXR0b25GbGFncxIEAf4AgDCALhAZEAGALIAvgCiAKYAkEMgS
-CDgAABP/////hoJA/1hBZGQgSXRlbdQADgEvAJMBMAExATIBMwE0Vk5TU2l6ZVhOU2ZGbGFnc4ArI0Aq
-AAAAAAAAgCoRBBRcTHVjaWRhR3JhbmRl0gA6ADsBNwE4ogE4AD9WTlNGb2501AAOAS8AkwEwATEBMgE7
-ATyAK4AtEBBZSGVsdmV0aWNh0gAOADYANwCygATSAA4ANgA3ALKABNIAOgA7AUMBRKQBRAFFAP8AP1xO
-U0J1dHRvbkNlbGxcTlNBY3Rpb25DZWxs0gA6ADsBRwFIpQFIAUkBSgFLAD9YTlNCdXR0b25ZTlNDb250
-cm9sVk5TVmlld1tOU1Jlc3BvbmRlctIADgAyADMBToAFgDNdWDExQ29udHJvbGxlcl8QD2FwcHNfdGFi
-bGVfbmV3OtIAOgA7AVIBU6MBUwD2AD9fEBVOU05pYkNvbnRyb2xDb25uZWN0b3LUAA4AigCLAIwA+AAf
-AVcBWIA1gAKAN4A61wAOAJIAogCkAKUApgCnAKgBWwCXAK4ArwCwAV+AFoA5gA+AEIAUgDjUAA4AkgCT
-AJQAlQFiAWMBZIAggKiAwYCqWUFib3V0IFgxMV8QHW9yZGVyRnJvbnRTdGFuZGFyZEFib3V0UGFuZWw6
-1AAOAIoAiwCMAPgA+QFqAWuANYAygDyAQNgADgCSAKAAogCkAKUApgCnAKgBbgCqAW8ArgCvALABcoAW
-gD6AP4AQgBSAPdQADgCSAJMAlACVAXUBdgF3gCCA3YDpgN5VQ2xvc2VRd11jbG9zZV93aW5kb3c61AAO
-AIoAiwCMAI0BfQD5AX+AIoBCgDKAStcA/QAOAP4A/wEAAQEBAgGBAQQBgwGEARAAqwGBgEOAMYBEgEUJ
-gEPWAP0ADgD+AQsBAAECAYgBDgGKAYsBEAGIgQEUgQEzgQEygQEWgQEUXxAWe3sxOCwgMTMwfSwgezQw
-MiwgMTh9fd0BFAAOARUBFgEXARgBGQEaARsBHAEdAR4BHwEgASEAlwEjAZEBkgCXAZQBKAF9ASoBlwGY
-gDCADxACgEeAD4BGgCmAQhAAEkg8Uf9fECBFbmFibGUga2V5IGVxdWl2YWxlbnRzIHVuZGVyIFgxMdIA
-DgGbAZwBnVtOU0ltYWdlTmFtZYBJgEhYTlNTd2l0Y2jSADoAOwGgAaGiAaEAP18QE05TQnV0dG9uSW1h
-Z2VTb3VyY2VfEBBlbmFibGVfa2V5ZXF1aXZz1AAOAIoAiwCMAPgA+QGmAaeANYAygEyAUNcA/QAOAP4A
-/wEAAQEBAgGBAQQBqwGsARAAqwGBgEOAMYBNgE4JgENfEBZ7ezE4LCAxNzl9LCB7NDAyLCAxOH193QEU
-AA4BFQEWARcBGAEZARoBGwEcAR0BHgEfASABIQCXASMBkQGSAJcBtQEoAaYBKgGXAZiAMIAPgEeAD4BP
-gCmATF8QHUZvbGxvdyBzeXN0ZW0ga2V5Ym9hcmQgbGF5b3V0XnByZWZzX2NoYW5nZWQ61AAOAIoAiwCM
-AI0AjgD5Ab6AIoALgDKAUllkb2NrX21lbnXUAA4AigCLAIwAjQHCAPkBxIAigFSAMoBs1wD9AA4A/gD/
-AQABAQECAcYBxwHIAckBEACrAcaAVYBrgFaAVwmAVdUA/QAOAP4BCwEAACsBDgHPAdABEIAAgQEzgQFR
-gQE8XxAWe3s3NCwgMjM1fSwgezEyOCwgMjZ9fd8QEwEUAdMB1AEVARYADgEXARgBGQEbAMQBHAHVAdYB
-1wEdAR4ApwEfAdgAqwEkAdoB2wHcASQB3QHeASgB4AHCAeIAqwCrAeUB5gHnAehfEBpOU01lbnVJdGVt
-UmVzcGVjdEFsaWdubWVudF8QD05TQXJyb3dQb3NpdGlvbl8QD05TUHJlZmVycmVkRWRnZV8QEk5TVXNl
-c0l0ZW1Gcm9tTWVudV1OU0FsdGVyc1N0YXRlE/////+EQf5ACYBZEEuAaoBYgFqAKYBbgFQQAwkJEQGQ
-EQQAgFwSBoJA/9QADgEvAJMBMAExATIBMwE8gCuAKtIADgA2ADcAsoAE0gAOADYANwCygATcAfEADgCS
-AKAAogCkAKUApgCnAMcB8gHzAckAqAH2AKoAlwCuAK8AsAHnAfsB/AEkWE5TVGFyZ2V0VU5TVGFnV05T
-U3RhdGWAV4AWgF2AD4AQgBSAXIBeE///////////0wAOAJIAlACVAf8CAIAggF+AYFxGcm9tIERpc3Bs
-YXlfEBFfcG9wVXBJdGVtQWN0aW9uOtIADgA2ADcCBYAEWk90aGVyVmlld3PSAA4ARQBNAgiAH6QB4AIK
-AgsCDIBbgGGAZIBn2wHxAA4AkgCgAKIApAClAKYApwDHAfIByQCoAhAAqgCXAK4ArwCwAecCFQIWgFeA
-FoBigA+AEIAUgFyAYxAIWjI1NiBDb2xvcnPbAfEADgCSAKAAogCkAKUApgCnAMcB8gHJAKgCGwCqAJcA
-rgCvALAB5wIgAiGAV4AWgGWAD4AQgBSAXIBmEA9ZVGhvdXNhbmRz2wHxAA4AkgCgAKIApAClAKYApwDH
-AfIByQCoAiYAqgCXAK4ArwCwAecCKwIsgFeAFoBogA+AEIAUgFyAaRAYWE1pbGxpb25z0gA6ADsCLwIw
-pgIwAjEBRAFFAP8AP18QEU5TUG9wVXBCdXR0b25DZWxsXk5TTWVudUl0ZW1DZWxs0gA6ADsCMwI0pgI0
-AUgBSQFKAUsAP11OU1BvcFVwQnV0dG9uVWRlcHRo1AAOAIoAiwCMAPgAHwI5AjqANYACgG6AcNkADgCS
-AKAAogCkAKUApgCnAfIAqAI9AKoAlwCuAK8AsAFfAkKAFoBvgA+AEIAUgDgQKlhTaG93IEFsbF8QFnVu
-aGlkZUFsbEFwcGxpY2F0aW9uczrUAA4AigCLAIwAjQJHAPkCSYAigHKAMoB02gAOAJIAoAChAKIAowCk
-AKUApgCnAKgAlwCqAKsAlwCrAK4ArwCwAlKAFoAPCYAPCYAQgBSAc9MADgCSAJQAlQDKAlaAIIAYgMRe
-YXBwc19zZXBhcmF0b3LUAA4AigCLAIwA+AD5AlsBp4A1gDKAdoBQ1wD9AA4A/gD/AQABAQECAYEBBAJg
-AmEBEACrAYGAQ4AxgHeAeAmAQ18QFXt7MTgsIDY5fSwgezQwMiwgMTh9fd0BFAAOARUBFgEXARgBGQEa
-ARsBHAEdAR4BHwEgASEAlwEjAZEBkgCXAmoBKAJbASoBlwGYgDCAD4BHgA+AeYApgHZfEB5DbGljay10
-aHJvdWdoIEluYWN0aXZlIFdpbmRvd3PUAA4AigCLAIwA+AD5AnECcoA1gDKAe4B+2AAOAJIAoACiAKQA
-pQCmAKcAqAJ1AnYCdwCuAK8AsAFygBaAfBIAEAEIgH2AEIAUgD1fEBVDeWNsZSBUaHJvdWdoIFdpbmRv
-d3NRYFxuZXh0X3dpbmRvdzrUAA4AigCLAIwA+AD5AcIBp4A1gDKAVIBQ1AAOAIoAiwCMAPgA+QKGAaeA
-NYAygIGAUNcA/QAOAP4A/wEAAQEBAgKJAQQCiwKMARAAqwKJgIKAMYCDgIQJgILVAP0ADgD+AQsBAAAr
-AQ4CkgKTARCAAIEBM4EBZYEBVF8QFnt7MTgsIDE2Nn0sIHs0MDIsIDE4fX3dARQADgEVARYBFwEYARkB
-GgEbARwBHQEeAR8BIAEhAJcBIwGRAZIAlwKaASgChgEqAZcBmIAwgA+AR4APgIWAKYCBXxAmQWxsb3cg
-Y29ubmVjdGlvbnMgZnJvbSBuZXR3b3JrIGNsaWVudHPUAA4AigCLAIwA+AD5AqEBp4A1gDKAh4BQ1wD9
-AA4A/gD/AQABAQECAYEBBAKmAqcBEACrAYGAQ4AxgIiAiQmAQ18QFnt7MTgsIDI0M30sIHs0MDIsIDE4
-fX3dARQADgEVARYBFwEYARkBGgEbARwBHQEeAR8BIAEhAJcBIwGRAZIAlwKwASgCoQEqAZcBmIAwgA+A
-R4APgIqAKYCHXxAaRW11bGF0ZSB0aHJlZSBidXR0b24gbW91c2XUAA4AigCLAIwAjQK2APkCuIAigIyA
-MoCP2AAOAJIAoACiAKQApQCmAKcAqAK7ArwCvQCuAK8AsAFfgBaAjRIAGAAAgI6AEIAUgDhfEBJUb2dn
-bGUgRnVsbCBTY3JlZW5RYV8QFnRvZ2dsZV9mdWxsc2NyZWVuX2l0ZW3UAA4AigCLAIwA+AD5AscCyIA1
-gDKAkYCU2AAOAJIAoACiAKQApQCmAKcAqALLAswCzQCuAK8AsAFygBaAkhIAEgEKgJOAEIAUgD1fEB1S
-ZXZlcnNlIEN5Y2xlIFRocm91Z2ggV2luZG93c1F+XxAQcHJldmlvdXNfd2luZG93OtQADgCKAIsAjACN
-AVcA+QLYgCKAN4AygJZeeDExX2Fib3V0X2l0ZW3UAA4AigCLAIwAjQDJAPkC3oAigBqAMoCYXmRvY2tf
-YXBwc19tZW510wAOAIsAjAD4AuIC44A1gJqAndgADgCSAKAAogCkAKUApgCnAKgC5gCqAr0ArgCvALAC
-6oAWgJyAjoAQgBSAm9MADgCSAJQAlQLtAu6AIIDIgMpaU2VsZWN0IEFsbFpzZWxlY3RBbGw60wAOAIsA
-jAD4AvMC9IA1gJ+AotgADgCSAKAAogCkAKUApgCnAKgC9wCqAvgArgCvALAC6oAWgKCAoYAQgBSAm1RD
-b3B5UWNVY29weTrUAA4AigCLAIwAjQMBAB8DA4AigKSAAoDy1AAOAJIAkwCUAJUDBgMHAwiAIIClgPGA
-plhNYWluTWVuddIADgBFAE0DDIAfpQMNAw4DDwMQAxGAp4DCgMeA2oDq2gAOAMYAkgCgAKIApAClAKYA
-pwDHAKgBXwFiAKoAlwCuAK8AsAMBAxqAFoA4gKiAD4AQgBSApICpU1gxMdIADgBFAE0DHoAfrAFXAyAD
-IQMiAyMCtgMlAyYDJwI5AykDKoA3gKuAroCvgLaAjIC3gLiAu4BugL2AvtgADgCSAKAAogCkAKUApgCn
-AKgDLQCqAy4ArgCvALABX4AWgKyArYAQgBSAOF5QcmVmZXJlbmNlcy4uLlEs2gAOAJIAoAChAKIAowCk
-AKUApgCnAKgAlwCqAKsAlwCrAK4ArwCwAV+AFoAPCYAPCYAQgBSAONoADgDGAJIAoACiAKQApQCmAKcA
-xwCoAz8DQACqAJcArgCvALABXwNFgBaAsoCwgA+AEIAUgDiAsVhTZXJ2aWNlc9QADgCSAJMAlACVA0kD
-SgNLgCCAs4C1gLTSAA4ANgA3A0aABNIADgBFAE0DUIAfoF8QD19OU1NlcnZpY2VzTWVuddoADgCSAKAA
-oQCiAKMApAClAKYApwCoAJcAqgCrAJcAqwCuAK8AsAFfgBaADwmADwmAEIAUgDjaAA4AkgCgAKEAogCj
-AKQApQCmAKcAqACXAKoAqwCXAKsArgCvALABX4AWgA8JgA8JgBCAFIA42QAOAJIAoACiAKQApQCmAKcB
-8gCoA2YAqgNnAK4ArwCwAV8CQoAWgLmAuoAQgBSAOFhIaWRlIFgxMVFo2AAOAJIAoACiAKQApQCmAKcA
-qANvAKoAlwCuAK8AsAFfgBaAvIAPgBCAFIA4W0hpZGUgT3RoZXJz2gAOAJIAoAChAKIAowCkAKUApgCn
-AKgAlwCqAKsAlwCrAK4ArwCwAV+AFoAPCYAPCYAQgBSAONgADgCSAKAAogCkAKUApgCnAKgDgACqA4EA
-rgCvALABX4AWgL+AwIAQgBSAOFhRdWl0IFgxMVFxXF9OU0FwcGxlTWVuddoADgDGAJIAoACiAKQApQCm
-AKcAxwCoAlIAygCqAJcArgCvALADAQOQgBaAc4AYgA+AEIAUgKSAw9IADgBFAE0Dk4AfogJHA5WAcoDF
-2AAOAJIAoACiAKQApQCmAKcAqAOYAKoAlwCuAK8AsAJSgBaAxoAPgBCAFIBzXEN1c3RvbWl6ZS4uLtoA
-DgDGAJIAoACiAKQApQCmAKcAxwCoAuoC7QCqAJcArgCvALADAQOmgBaAm4DIgA+AEIAUgKSAyVRFZGl0
-0gAOAEUATQOqgB+oA6sDrAOtA64C8wOwA7EC4oDLgM6A0YDSgJ+A1YDYgJrYAA4AkgCgAKIApAClAKYA
-pwCoA7UAqgO2AK4ArwCwAuqAFoDMgM2AEIAUgJtUVW5kb1F62AAOAJIAoACiAKQApQCmAKcAqAO+AKoD
-vwCuAK8AsALqgBaAz4DQgBCAFICbVFJlZG9RWtoADgCSAKAAoQCiAKMApAClAKYApwCoAJcAqgCrAJcA
-qwCuAK8AsALqgBaADwmADwmAEIAUgJvYAA4AkgCgAKIApAClAKYApwCoA9AAqgPRAK4ArwCwAuqAFoDT
-gNSAEIAUgJtTQ3V0UXjYAA4AkgCgAKIApAClAKYApwCoA9kAqgPaAK4ArwCwAuqAFoDWgNeAEIAUgJtV
-UGFzdGVRdtgADgCSAKAAogCkAKUApgCnAKgD4gCqAJcArgCvALAC6oAWgNmAD4AQgBSAm1ZEZWxldGXa
-AA4AxgCSAKAAogCkAKUApgCnAMcAqAFyA+sAqgCXAK4ArwCwAwED8IAWgD2A24APgBCAFICkgNxWV2lu
-ZG930gAOADYANwPxgATSAA4ARQBNA/aAH6kD9wP4AnECxwP7AWoD/QP+A/+A34DigHuAkYDkgDyA5YDm
-gOjYAA4AkgCgAKIApAClAKYApwCoBAIAqgQDAK4ArwCwAXKAFoDggOGAEIAUgD1YTWluaW1pemVRbdgA
-DgCSAKAAogCkAKUApgCnAKgECwCqAJcArgCvALABcoAWgOOAD4AQgBSAPVRab29t2gAOAJIAoAChAKIA
-owCkAKUApgCnAKgAlwCqAKsAlwCrAK4ArwCwAXKAFoAPCYAPCYAQgBSAPdoADgCSAKAAoQCiAKMApACl
-AKYApwCoAJcAqgCrAJcAqwCuAK8AsAFygBaADwmADwmAEIAUgD3YAA4AkgCgAKIApAClAKYApwCoBCUA
-qgCXAK4ArwCwAXKAFoDngA+AEIAUgD1fEBJCcmluZyBBbGwgdG8gRnJvbnTaAA4AkgCgAKEAogCjAKQA
-pQCmAKcAqACXAKoAqwCXAKsArgCvALABcoAWgA8JgA8JgBCAFIA9Xl9OU1dpbmRvd3NNZW512gAOAMYA
-kgCgAKIApAClAKYApwDHAKgENwQ4AKoAlwCuAK8AsAMBBD2AFoDtgOuAD4AQgBSApIDsVEhlbHDTAA4A
-kgCUAJUEOARCgCCA64Du0gAOAEUATQRFgB+hBEaA79gADgCSAKAAogCkAKUApgCnAKgESQCqAJcArgCv
-ALAEN4AWgPCAD4AQgBSA7VhYMTEgSGVscFtfTlNNYWluTWVudVRtZW511AAOAIoAiwCMAPgA+QF9AaeA
-NYAygEKAUNQADgCKAIsAjACNBFgA+QRagCKA9YAygPnXAP0ADgD+AP8BAAEBAQIBxgEEBF4EXwEQAKsB
-xoBVgDGA9oD3CYBVXxAWe3sxOCwgMTgyfSwgezQwOSwgMjN9fd0BFAAOARUBFgEXARgBGQEaARsBHAEd
-AR4BHwEgASEAlwEjAZEBkgCXBGgBKARYASoBlwGYgDCAD4BHgA+A+IApgPVfEBBGdWxsIHNjcmVlbiBt
-b2RlXxARZW5hYmxlX2Z1bGxzY3JlZW7UAA4AigCLAIwA+AD5BFgEcYA1gDKA9YD7XxAaZW5hYmxlX2Z1
-bGxzY3JlZW5fY2hhbmdlZDrUAA4AigCLAIwA+AD5BHYEd4A1gDKA/YEBA9cA/QAOAP4A/wEAAQEBAgED
-AQQEewR8AQcAqwEDgCWAMYD+gP8JgCVfEBd7ezM3MiwgMjE1fSwgezEwMCwgMzJ9fd0BFAAOARUBFgEX
-ARgBGQEaARsBHAEdAR4BHwEgASEEggEjASQBJQSEBIUBKAR2ASoBKwEsgDCBAQGALIEBAoEBAIApgP1W
-UmVtb3Zl0gAOADYANwCygATSAA4ANgA3ALKABF8QEmFwcHNfdGFibGVfZGVsZXRlOtMADgCLAIwA+AOr
-BJGANYDLgQEFVXVuZG861AAOAIoAiwCMAPgA+QMgBJeANYAygKuBAQdbcHJlZnNfc2hvdzrUAA4AigCL
-AIwA+AD5ArYEnYA1gDKAjIEBCV8QEnRvZ2dsZV9mdWxsc2NyZWVuOtQADgCKAIsAjACNBKEA+QSjgCKB
-AQuAMoEBbt8QDwSlAA4EpgSnBKgEqQSqBKsErAStBK4ErwSwBLEEsgSzBLQEtQS2BLcEuAS5BLoEuwS8
-BL0BkQHiBL4Ev1xOU1dpbmRvd1ZpZXdfEBZOU1dpbmRvd0NvbnRlbnRNYXhTaXplXE5TU2NyZWVuUmVj
-dF8QE05TRnJhbWVBdXRvc2F2ZU5hbWVdTlNXaW5kb3dUaXRsZVlOU1dURmxhZ3NdTlNXaW5kb3dDbGFz
-c18QFk5TV2luZG93Q29udGVudE1pblNpemVcTlNXaW5kb3dSZWN0WU5TTWF4U2l6ZV8QD05TV2luZG93
-QmFja2luZ18QEU5TV2luZG93U3R5bGVNYXNrWU5TTWluU2l6ZVtOU1ZpZXdDbGFzc4EBEoEBbYEBEIEB
-aYEBbIEBDRJQeAAAgQEOgQERgQEMgQFrgQFqgQEPXxAYe3szMTksIDI5NH0sIHs0ODEsIDM0NX19XxAP
-WDExIFByZWZlcmVuY2VzV05TUGFuZWzSAA4ANgA3BMWABFRWaWV3XxAaezMuNDAyODJlKzM4LCAzLjQw
-MjgyZSszOH1aezIxMywgMTA3fdUA/QAOAQsBAAEMACsBDgTLARAEzIAAgQEzgQETgQFo0gAOAEUATQTP
-gB+hAYiBARTcAP0ADgTSBNMA/gE4AQsBAATUAQIE1QTWBLME2ATZAZcE2gEoBNwBEACrBLMAqwTgXk5T
-VGFiVmlld0l0ZW1zWU5TVHZGbGFnc18QEU5TRHJhd3NCYWNrZ3JvdW5kXxAWTlNBbGxvd1RydW5jYXRl
-ZExhYmVsc18QFU5TU2VsZWN0ZWRUYWJWaWV3SXRlbYEBEoEBZ4EBNYEBNIApgQEVCYEBEgmBATbSAA4A
-RQBNBOOAH6EBgYBD0gAOAEUATQTngB+oAqEE6QTqAX0E7AGmAlsE74CHgQEXgQEmgEKBASqATIB2gQEu
-1wD9AA4A/gD/AQABAQECAYEE8gTzBPQBEACrAYGAQ4EBJYEBGIEBGQmAQ18QFXt7MzYsIDkzfSwgezM4
-NSwgMzF9fdgBFAAOBPkBGgEbARwBHgT6ASAE+wT8BP0E/gTpBQAFAV8QEU5TQmFja2dyb3VuZENvbG9y
-W05TVGV4dENvbG9ygQEkgQEcgQEagQEbgQEXEgBAAACBASFfEGZXaGVuIGVuYWJsZWQsIG1lbnUgYmFy
-IGtleSBlcXVpdmFsZW50cyBtYXkgaW50ZXJmZXJlIHdpdGggWDExIGFwcGxpY2F0aW9ucyB0aGF0IHVz
-ZSB0aGUgTWV0YSBtb2RpZmllci7UAA4BLwCTATABMQUFATMFB4ArI0AmAAAAAAAAgCoRDBzVAA4FCQUK
-BQsFDAUNBQ4FDwUQBRFXTlNDb2xvclxOU0NvbG9yU3BhY2VbTlNDb2xvck5hbWVdTlNDYXRhbG9nTmFt
-ZYEBIIEBHxAGgQEegQEdVlN5c3RlbVxjb250cm9sQ29sb3LTAA4FCgUVBQ0B4gUXV05TV2hpdGWBASBL
-MC42NjY2NjY2OQDSADoAOwUZBQmiBQkAP9UADgUJBQoFCwUMBQ0FHAUPBR0FEYEBIIEBI4EBIoEBHV8Q
-EGNvbnRyb2xUZXh0Q29sb3LTAA4FCgUVBQ0B4gUigQEgQjAA0gA6ADsFJAUlpAUlAUUA/wA/XxAPTlNU
-ZXh0RmllbGRDZWxs0gA6ADsFJwUopQUoAUkBSgFLAD9bTlNUZXh0RmllbGTXAP0ADgD+AP8BAAEBAQIB
-gQTyBSwFLQEQAKsBgYBDgQElgQEngQEoCYBDXxAWe3szNiwgMjA4fSwgezM4NSwgMjl9fdgBFAAOBPkB
-GgEbARwBHgT6ASAE+wT8BTQE/gTqBQAFAYEBJIEBHIEBKYEBG4EBJoEBIV8QV0hvbGQgT3B0aW9uIGFu
-ZCBDb21tYW5kIHdoaWxlIGNsaWNraW5nIHRvIGFjdGl2YXRlIHRoZSBtaWRkbGUgYW5kIHJpZ2h0IG1v
-dXNlIGJ1dHRvbnMuCtcA/QAOAP4A/wEAAQEBAgGBBPIFPAU9ARAAqwGBgEOBASWBASuBASwJgENfEBZ7
-ezM2LCAxNTl9LCB7Mzg1LCAxNH192AEUAA4E+QEaARsBHAEeBPoBIAT7BPwFRAT+BOwFAAUBgQEkgQEc
-gQEtgQEbgQEqgQEhXxA+QWxsb3dzIGlucHV0IG1lbnUgY2hhbmdlcyB0byBvdmVyd3JpdGUgdGhlIGN1
-cnJlbnQgWDExIGtleW1hcC7XAP0ADgD+AP8BAAEBAQIBgQTyBUwFTQEQAKsBgYBDgQElgQEvgQEwCYBD
-XxAVe3szMywgMzJ9LCB7Mzg1LCAzMX192AEUAA4E+QEaARsBHAEeBPoBIAT7BPwFVAT+BO8FAAUBgQEk
-gQEcgQExgQEbgQEugQEhXxCFV2hlbiBlbmFibGVkLCBjbGlja2luZyBvbiBhbiBpbmFjdGl2ZSB3aW5k
-b3cgd2lsbCBjYXVzZSB0aGF0IG1vdXNlIGNsaWNrIHRvIHBhc3MgdGhyb3VnaCB0byB0aGF0IHdpbmRv
-dyBpbiBhZGRpdGlvbiB0byBhY3RpdmF0aW5nIGl0Ll8QFnt7MTAsIDMzfSwgezQzOCwgMjc5fX3SADoA
-OwVbAUqjAUoBSwA/XxAWe3sxMCwgMTB9LCB7NDU4LCAzMjV9fdIADgBFAE0FX4AfowTgBWEFYoEBNoEB
-OoEBU9YADgVkAUoFZQUJAIwFZgVnAYEBiAT8BWtcTlNJZGVudGlmaWVyWU5TVGFiVmlld4EBOYEBN4BD
-gQEUgQEcgQE40gAOADYANwVugARRMVVJbnB1dNIAOgA7BXEFcqIFcgA/XU5TVGFiVmlld0l0ZW3WAA4F
-ZAFKBWUFCQCMBWYFdQHGAYgE/AV5gQE5gQE7gFWBARSBARyBAVLSAA4ANgA3BXyABFEy0gAOAEUATQV/
-gB+nBYAFgQHCBYMFhARYBYaBAT2BAUGAVIEBRYEBSYD1gQFN1wD9AA4A/gD/AQABAQECAcYBBAWKBYsB
-EACrAcaAVYAxgQE+gQE/CYBVXxAWe3sxOCwgMTE2fSwgezQwMiwgMTh9fd0BFAAOARUBFgEXARgBGQEa
-ARsBHAEdAR4BHwEgASEAlwEjAZEBkgCXBZQBKAWAASoBlwGYgDCAD4BHgA+BAUCAKYEBPV8QF1VzZSBz
-eXN0ZW0gYWxlcnQgZWZmZWN01wD9AA4A/gD/AQABAQECAcYE8gWbBZwBEACrAcaAVYEBJYEBQoEBQwmA
-VV8QFXt7MzYsIDgyfSwgezM4NSwgMjh9fdgBFAAOBPkBGgEbARwBHgT6ASAE+wT8BaME/gWBBQAFAYEB
-JIEBHIEBRIEBG4EBQYEBIV8QZ1gxMSBiZWVwcyB3aWxsIHVzZSB0aGUgc3RhbmRhcmQgc3lzdGVtIGFs
-ZXJ0LCBhcyBkZWZpbmVkIGluIHRoZSBTb3VuZCBFZmZlY3RzIHN5c3RlbSBwcmVmZXJlbmNlcyBwYW5l
-bC7XAP0ADgD+AP8BAAEBAQIBxgTyBasFrAEQAKsBxoBVgQElgQFGgQFHCYBVXxAVe3sxNywgMjM4fSwg
-ezU1LCAyMH192AEUAA4E+QEaARsBHAEeBPoBIAT7BPwFswEoBYMFAAUBgQEkgQEcgQFIgCmBAUWBASFY
-Q29sb3JzOgrXAP0ADgD+AP8BAAEBAQIBxgTyBbsFvAEQAKsBxoBVgQElgQFKgQFLCYBVXxAWe3szNiwg
-MjE2fSwgezM5MiwgMTR9fdgBFAAOBPkBGgEbARwBHgT6ASAE+wT8BcME/gWEBQAFAYEBJIEBHIEBTIEB
-G4EBSYEBIV8QNFRoaXMgb3B0aW9uIHRha2VzIGVmZmVjdCB3aGVuIFgxMSBpcyBsYXVuY2hlZCBhZ2Fp
-bi7XAP0ADgD+AP8BAAEBAQIBxgTyBcsFzAEQAKsBxoBVgQElgQFOgQFPCYBVXxAWe3szNiwgMTQ1fSwg
-ezM4NSwgMzF9fdgBFAAOBPkBGgEbARwBHgT6ASAE+wT8BdME/gWGBQAFAYEBJIEBHIEBUIEBG4EBTYEB
-IV8QZEVuYWJsZXMgdGhlIFgxMSByb290IHdpbmRvdy4gVXNlIHRoZSBDb21tYW5kLU9wdGlvbi1BIGtl
-eXN0cm9rZSB0byBlbnRlciBhbmQgbGVhdmUgZnVsbCBzY3JlZW4gbW9kZS5WT3V0cHV01QAOAUoFZQUJ
-AIwFZgKJAYgE/AXegQE5gIKBARSBARyBAWbSAA4ARQBNBeGAH6UF4gKGBeQF5QXmgQFVgIGBAVmBAV2B
-AWHXAP0ADgD+AP8BAAEBAQICiQEEBeoF6wEQAKsCiYCCgDGBAVaBAVcJgILdARQADgEVARYBFwEYARkB
-GgEbARwBHQEeAR8BIAEhAJcBIwGRAZIAlwXzASgF4gEqAZcBmIAwgA+AR4APgQFYgCmBAVVfEBhBdXRo
-ZW50aWNhdGUgY29ubmVjdGlvbnPXAP0ADgD+AP8BAAEBAQICiQTyBfoF+wEQAKsCiYCCgQElgQFagQFb
-CYCCXxAWe3szNiwgMTk1fSwgezM4NSwgNDJ9fdgBFAAOBPkBGgEbARwBHgT6ASAE+wT8BgIE/gXkBQAF
-AYEBJIEBHIEBXIEBG4EBWYEBIV8QqkxhdW5jaGluZyBYMTEgd2lsbCBjcmVhdGUgWGF1dGhvcml0eSBh
-Y2Nlc3MtY29udHJvbCBrZXlzLiBJZiB0aGUgc3lzdGVtJ3MgSVAgYWRkcmVzcyBjaGFuZ2VzLCB0aGVz
-ZSBrZXlzIGJlY29tZSBpbnZhbGlkIHdoaWNoIG1heSBwcmV2ZW50IFgxMSBhcHBsaWNhdGlvbnMgZnJv
-bSBsYXVuY2hpbmcu1wD9AA4A/gD/AQABAQECAokE8gYKBgsBEACrAomAgoEBJYEBXoEBXwmAgl8QFnt7
-MzYsIDExOH0sIHszODUsIDQyfX3YARQADgT5ARoBGwEcAR4E+gEgBPsE/AYSBP4F5QUABQGBASSBARyB
-AWCBARuBAV2BASFfEJlJZiBlbmFibGVkLCBBdXRoZW50aWNhdGUgY29ubmVjdGlvbnMgbXVzdCBhbHNv
-IGJlIGVuYWJsZWQgdG8gZW5zdXJlIHN5c3RlbSBzZWN1cml0eS4gV2hlbiBkaXNhYmxlZCwgY29ubmVj
-dGlvbnMgZnJvbSByZW1vdGUgYXBwbGljYXRpb25zIGFyZSBub3QgYWxsb3dlZC7XAP0ADgD+AP8BAAEB
-AQICiQTyBhoGGwEQAKsCiYCCgQElgQFigQFjCYCCXxAVe3syMCwgMTd9LCB7NDA0LCAxNH192AEUAA4E
-+QEaARsBHAEeBPoBIAT7BPwGIgT+BeYFAAUBgQEkgQEcgQFkgQEbgQFhgQEhXxA0VGhlc2Ugb3B0aW9u
-cyB0YWtlIGVmZmVjdCB3aGVuIFgxMSBpcyBuZXh0IGxhdW5jaGVkLlhTZWN1cml0edIAOgA7BikFZaQF
-ZQFKAUsAP1p7NDgxLCAzNDV9XxAVe3swLCAwfSwgezE0NDAsIDg3OH19WnsyMTMsIDEyOX1ZeDExX3By
-ZWZz0gA6ADsGLwYwogYwAD9fEBBOU1dpbmRvd1RlbXBsYXRlW3ByZWZzX3BhbmVs1AAOAIoAiwCMAPgA
-+QDaBjaANYAygB2BAXBfEBBhcHBzX3RhYmxlX3Nob3c61AAOAIoAiwCMAI0A+QAfBjyAIoAygAKBAXJY
-ZGVsZWdhdGXUAA4AigCLAIwAjQXiAPkGQoAigQFVgDKBAXRbZW5hYmxlX2F1dGjUAA4AigCLAIwA+AAf
-AycGSIA1gAKAu4EBdl8QFmhpZGVPdGhlckFwcGxpY2F0aW9uczrUAA4AigCLAIwA+AD5Bk0GToA1gDKB
-AXiBAX7XAP0ADgD+AP8BAAEBAQIBAwEEBlIGUwZUAKsBA4AlgDGBAXmBAXoRAS8JgCVfEBV7ezM1Miwg
-MTJ9LCB7ODQsIDMyfX3dARQADgEVARYBFwEYARkBGgEbARwBHQEeAR8GWQEhBlsBIwEkASUGXQZeASgG
-TQEqASsBLBP/////hAH+AIAwgQF8gCyBAX2BAXuAKYEBeFZDYW5jZWzSAA4ANgA3ALKABNIADgA2ADcA
-soAEXxASYXBwc190YWJsZV9jYW5jZWw61AAOAIoAiwCMAPgA+QOVBjaANYAygMWBAXDUAA4AigCLAIwA
-+AD5A/cGcIA1gDKA34EBgV8QEG1pbmltaXplX3dpbmRvdzrTAA4AiwCMAPgDrgZ1gDWA0oEBg1RjdXQ6
-1AAOAIoAiwCMAPgA+QZ6BnuANYAygQGFgQGL1wD9AA4A/gD/AQABAQECAQMBBAZ/BoABBwCrAQOAJYAx
-gQGGgQGHCYAlXxAXe3szNzIsIDI0N30sIHsxMDAsIDMyfX3dARQADgEVARYBFwEYARkBGgEbARwBHQEe
-AR8BIAEhBoYBIwEkASUGiAaJASgGegEqASsBLIAwgQGJgCyBAYqBAYiAKYEBhVlEdXBsaWNhdGXSAA4A
-NgA3ALKABNIADgA2ADcAsoAEXxAVYXBwc190YWJsZV9kdXBsaWNhdGU61AAOAIoAiwCMAI0FgAD5BpaA
-IoEBPYAygQGNW3VzZV9zeXNiZWVw1AAOAIoAiwCMAI0GmgD5BpyAIoEBj4AygQG33xATAP0GngAOBNMG
-nwT5BqAGoQaiBqMGpAEAAQwBAQalBqYBAganBqgGqQGXBqoGqwasBq0AqwavBrABJAaxARAGsgCrBrQB
-/AapBrYGt18QH05TRHJhZ2dpbmdTb3VyY2VNYXNrRm9yTm9uTG9jYWxcTlNIZWFkZXJWaWV3XxASTlNB
-bGxvd3NUeXBlU2VsZWN0XE5TQ29ybmVyVmlld18QF05TSW50ZXJjZWxsU3BhY2luZ1dpZHRoXxAZTlND
-b2x1bW5BdXRvcmVzaXppbmdTdHlsZV8QGE5TSW50ZXJjZWxsU3BhY2luZ0hlaWdodFtOU0dyaWRDb2xv
-cl8QHE5TRHJhZ2dpbmdTb3VyY2VNYXNrRm9yTG9jYWxeTlNUYWJsZUNvbHVtbnNbTlNSb3dIZWlnaHSB
-AZCBAbYSUkCAAIEBkoEBpAmBAZYjQAgAAAAAAAAjQAAAAAAAAACBAZEJgQGzgQGQgQGaI0AxAAAAAAAA
-2gD9AA4A/ga5AQsBAAa6BrsBAga8Br0Gvga/BsAGwQbCBpoGxAa9BppZTlNjdkZsYWdzWU5TRG9jVmll
-d1lOU0JHQ29sb3JdTlNOZXh0S2V5Vmlld4EBl4EB4YEB4BAEgQHfEQkAgQGPgQGxgQGXgQGPWnszMzMs
-IDE5N33WAP0ADgEAAQwBAgbJBsoGywEQBswGygaaW05TVGFibGVWaWV3gQGTgQGVgQGUgQGTgQGP2gD9
-AA4A/ga5AQsBAAa6BrsBAga8Br0GvgbSBsAG0wbCBqwGxAa9BqyBAZeBAeGBAemBAeiBAZKBAbGBAZeB
-AZJZezMzMywgMTd90gA6ADsG2gbbpAbbAUoBSwA/XxARTlNUYWJsZUhlYWRlclZpZXfVAP0ADgD+AQAB
-Aga9Bt4G3wEQBr2BAZeBAZmBAZiBAZfeAP0G4gAOAP4G4wahBuQBCwblAQABAgbmBrwG5wEDBukG6gbr
-BuwGrwbKBu8G8AbxAQMG8wapBqlbTlNIU2Nyb2xsZXJYTlNzRmxhZ3NfEBBOU0hlYWRlckNsaXBWaWV3
-XE5TU2Nyb2xsQW10c1tOU1ZTY3JvbGxlcl1OU0NvbnRlbnRWaWV3gCWBAeaBAeuBAeoQMoEBloEBk4EB
-3k8QEEEgAABBIAAAQZgAAEGYAAARATOAJYEB4oEBkIEBkF8QFHt7MzM0LCAwfSwgezE2LCAxN3190gA6
-ADsG+Ab5pAb5AUoBSwA/XV9OU0Nvcm5lclZpZXfSAA4ARQBNBvyAH6MG/Qb+Bv+BAZuBAaaBAaraBwEA
-DgcCBwMHBAcFBwYHBwcIBskAqwcKBwsHDAcNAeIHDgcPAKsGml5OU0lzUmVzaXplYWJsZVxOU0hlYWRl
-ckNlbGxXTlNXaWR0aFpOU0RhdGFDZWxsXk5TUmVzaXppbmdNYXNrWk5TTWluV2lkdGhaTlNNYXhXaWR0
-aFxOU0lzRWRpdGFibGUJgQGlgQGcI0BbwAAAAAAAgQGiI0BEAAAAAAAAI0CPQAAAAAAACYEBj9cBFAAO
-BPkBGgEbAR4E+gcTBxQHFQcWBP4BlwcYEgSB/gCBAaGBAZ6BAZ2BARuBAZ9UTmFtZdMADgUKBRUFDQHi
-BxyBASBLMC4zMzMzMzI5OQDVAA4FCQUKBQsFDAUNBRwFDwcgBRGBASCBASOBAaCBAR1fEA9oZWFkZXJU
-ZXh0Q29sb3LSADoAOwckByWlByUFJQFFAP8AP18QEU5TVGFibGVIZWFkZXJDZWxs2AEUAA4E+QEaARsB
-HAEeBPoHJwT7Bq0HKgEoBpoB5gUBEhQx/kCBASSBAaSBAaOAKYEBj4EBIVlUZXh0IENlbGzTAA4FCgUV
-BQ0B4gcxgQEgQjEA0gA6ADsHMwc0ogc0AD9dTlNUYWJsZUNvbHVtbtoHAQAOBwIHAwcEBwUHBgcHBwgG
-yQCrBwoHOAc5BzoB4gc7Bw8AqwaaCYEBpYEBpyNAYJdkYAAAAIEBqSNAT12RYAAAAAmBAY/XARQADgT5
-ARoBGwEeBPoHEwcUBxUHQQT+AZcHGIEBoYEBnoEBqIEBG4EBn1dDb21tYW5k2AEUAA4E+QEaARsBHAEe
-BPoHJwT7Bq0HKgEoBpoB5gUBgQEkgQGkgQGjgCmBAY+BASHaBwEADgcCBwMHBAcFBwYHBwcIBskAqwcK
-B08HUAdRAeIHUgcPAKsGmgmBAaWBAasjQFQAAAAAAACBAa8jQCQAAAAAAAAJgQGP1wEUAA4E+QEaARsB
-HgT6ASAHFAdXB1gE/gGXBxiBAaGBAa2BAayBARuBAZ9YU2hvcnRjdXTVAA4FCQUKBQsFDAUNBq0FDwdf
-BRGBASCBAaSBAa6BAR1baGVhZGVyQ29sb3LZARQADgT5ARoBGwEcAR4E1AT6BycE+wbEByoHZgaaAeYA
-qwUBgQEkgQGxgQGjgQGwgQGPCYEBIdQADgEvAJMBMAExB2wBMwE8gCsjQCgAAAAAAACAKtUADgUJBQoF
-CwUMBQ0FDgUPB3EFEYEBIIEBH4EBsoEBHV8QFmNvbnRyb2xCYWNrZ3JvdW5kQ29sb3LVAA4FCQUKBQsF
-DAUNB3YFDwd3BRGBASCBAbWBAbSBAR1ZZ3JpZENvbG9y0wAOBQoFFQUNAeIHfIEBIEQwLjUA0gA6ADsH
-fgbJpQbJAUkBSgFLAD9aYXBwc190YWJsZdQADgCKAIsAjAD4AB8DJgeEgDWAAoC4gQG5VWhpZGU61AAO
-AIoAiwCMAPgA+QP4B4qANYAygOKBAbtcem9vbV93aW5kb3c61AAOAIoAiwCMAPgA+QP+B5CANYAygOaB
-Ab1fEA9icmluZ190b19mcm9udDrUAA4AigCLAIwA+AD5BeIBp4A1gDKBAVWAUNMADgCLAIwA+AOxB5qA
-NYDYgQHAV2RlbGV0ZTrUAA4AigCLAIwAjQGmAPkHoIAigEyAMoEBwltzeW5jX2tleW1hcNQADgCKAIsA
-jAD4APkFgAGngDWAMoEBPYBQ1AAOAIoAiwCMAPgA+QRGB6uANYAygO+BAcVZeDExX2hlbHA60wAOAIsA
-jAD4A7AHsIA1gNWBAcdWcGFzdGU61AAOAIoAiwCMAI0CWwD5B7aAIoB2gDKBAcldY2xpY2tfdGhyb3Vn
-aNQADgCKAIsAjACNA/8A+Qe8gCKA6IAygQHLXxAQd2luZG93X3NlcGFyYXRvctQADgCKAIsAjAD4APkD
-KgfCgDWAMoC+gQHNVXF1aXQ61AAOAIoAiwCMAI0CoQD5B8iAIoCHgDKBAc9cZmFrZV9idXR0b25z1AAO
-AIoAiwCMAI0AnQD5B86AIoAOgDKBAdFfEBVkb2NrX3dpbmRvd19zZXBhcmF0b3LTAA4AiwCMAPgDrAfT
-gDWAzoEB01VyZWRvOtQADgCKAIsAjACNAoYA+QfZgCKAgYAygQHVWmVuYWJsZV90Y3DUAA4AigCLAIwA
-+AD5B94H34A1gDKBAdeBAdzXAP0ADgD+AP8BAAEBAQIBAwEEB+MH5AZUAKsBA4AlgDGBAdiBAdkJgCVf
-EBV7ezI2OCwgMTJ9LCB7ODQsIDMyfX3dARQADgEVARYBFwEYARkBGgEbARwBHQEeAR8GWQEhAJcBIwEk
-ASUH7AftASgH3gEqASsBLIAwgA+ALIEB24EB2oApgQHXVERvbmXSAA4ANgA3ALKABF8QEGFwcHNfdGFi
-bGVfZG9uZTrSAA4ARQf1B/aBAfqvEIEDIAOsAecG/wXmAscCWwa9APkF+wUtAgsCDATvAYED/QMmAyoD
-lQGmAawF6wR8Bk0A2QTsAxEFnACdAmEFYQaABv0CcQGIBeIGrAEGB94CpwMQBeUFgAHCA/cAngK2A60C
-4gWBAMkFiwHGBgsDPwJHA/sGegOrA/4DDwMhANoDJwTqBzoAjgYbCDsCoQTgBYQHUQb+AuoCOQShAlIE
-RgFyA/gDAQbzAeABAwOuAPoFTQWGBWIBhAFXBukBXwfkBeQDJQKGAgoE6QW8CFwFPQOxBcwDIgF9BF8E
-swHJBlMC8wT0Aw0HDQR2BDcFgwMjBFgGmgMOA7AFrAP/AowBagMpAomAq4DOgFyBAaqBAWGAkYB2gQGX
-gDKBAVuBASiAZIBngQEugEOA5YC4gL6AxYBMgE6BAVeA/4EBeIAcgQEqgOqBAUOADoB4gQE6gQGHgQGb
-gHuBARSBAVWBAZKAJ4EB14CJgNqBAV2BAT2AVIDfgBeAjIDRgJqBAUGAGoEBP4BVgQFfgLKAcoDkgQGF
-gMuA5oDHgK6AHYC7gQEmgQGpgAuBAWOBAeyAh4EBNoEBSYEBr4EBpoCbgG6BAQuAc4DvgD2A4oCkgQHi
-gFuAJYDSgCSBATCBAU2BAVOARYA3gQHmgDiBAdmBAVmAt4CBgGGBAReBAUuBAfiBASyA2IEBT4CvgEKA
-94EBEoBXgQF6gJ+BARmAp4EBooD9gO2BAUWAtoD1gQGPgMKA1YEBR4DogISAPIC9gILSAA4ARQBNCHqA
-H6UGqQbzBukGygavgQGQgQHigQHmgQGTgQGW0gAOAEUATQiCgB+hBpqBAY9fEBV7ezEsIDE3fSwgezMz
-MywgMTk3fX3SADoAOwiGCIekCIcBSgFLAD9aTlNDbGlwVmlld9gA/QHxAA4A/gEAAMcBAgiJBr0GvQiM
-CI0BEAiOBr0IkFlOU1BlcmNlbnSBAZeBAZeBAeWBAeOBAeSBAZcjP+/WamAAAABfEBZ7ezMzNCwgMTd9
-LCB7MTUsIDE5N319XF9kb1Njcm9sbGVyOtIAOgA7CJQIlaUIlQFJAUoBSwA/Wk5TU2Nyb2xsZXLZAP0B
-8QAOAP4G4wEAAMcBAgiJBr0GvQiMCJoBJAEQCI4GvQidgQGXgQGXgQHlgQHngQHkgQGXIz/mCGTAAAAA
-XxAVe3sxLCAyMTR9LCB7MzMzLCAxNX190gAOAEUATQihgB+hBqyBAZJfEBN7ezEsIDB9LCB7MzMzLCAx
-N319XxAWe3syMCwgNzd9LCB7MzUwLCAyMzB9fdIAOgA7CKYIp6QIpwFKAUsAP1xOU1Njcm9sbFZpZXff
-EA8EpQAOBKYEpwSoBKkEqgSrBKwErQSuBK8EsASxBLIBAwS0CKsIrAitCK4EuQS6CLAIsQiyAZEIswi0
-CLWAJYEBbYEB8IEB9IEB94EB7oEBDoEB8YEB7YEB9hALgQH1gQHvXxAYe3syNzksIDI1M30sIHs0ODYs
-IDMyN319XxAUWDExIEFwcGxpY2F0aW9uIE1lbnXSAA4ANgA3BMWABNIADgBFAE0IvIAfpgfeBnoEdga9
-Bk0A+oEB14EBhYD9gQGXgQF4gCRaezQ4NiwgMzI3fVh4MTFfYXBwc9IADgAyADMIx4AFgQH50gA6ADsI
-yQDvogDvAD/SAA4ARQf1CMyBAfqvEIEBXwLqAckGmgKJAXIBgQEDAB8F5ATqAecB5wGBBOABcgFfAV8C
-UgGBAaYF4gR2AQMAyQGBAwEFgQCOAlsBiAZ6BpoBcgSzAokGvQD6AQMCoQMBAokBxgHGAXIAjgFfAuoC
-6gHGAJ4FgAVhBeUDIgJSAXIBAwLqAXIDAQFfAMkBXwGBBv4AHwXmAB8BgQGIAcYG/waaAw8BXwAfAw4E
-NwMQAXIAHwa9AecIOwLqAQME7wHGAYgBfQFfBr0DDQfeAokBXwKJAecBgQWEAB8E7ALqBYYBXwGBBFgE
-oQHCBk0C6gTpAwEG/QEDAxEBxgFfAcYGvQMBAuoFgwFyAoYBcgFfBWKAOICbgFeBAY+AgoA9gEOAJYAC
-gQFZgQEmgFyAXIBDgQE2gD2AOIA4gHOAQ4BMgQFVgP2AJYAagEOApIEBQYALgHaBARSBAYWBAY+APYEB
-EoCCgQGXgCSAJYCHgKSAgoBVgFWAPYALgDiAm4CbgFWAF4EBPYEBOoEBXYCvgHOAPYAlgJuAPYCkgDiA
-GoA4gEOBAaaAAoEBYYACgEOBARSAVYEBqoEBj4DHgDiAAoDCgO2A2oA9gAKBAZeAXIEB7ICbgCWBAS6A
-VYEBFIBCgDiBAZeAp4EB14CCgDiAgoBcgEOBAUmAAoEBKoCbgQFNgDiAQ4D1gQELgFSBAXiAm4EBF4Ck
-gQGbgCWA6oBVgDiAVYEBl4CkgJuBAUWAPYCBgD2AOIEBU9IADgBFB/UJUIEB+q8QggMgA6wG/wHnBeYC
-xwa9AlsA+QX7BS0CCwIMBO8BgQP9AyYDKgOVBHwBpgGsBesGTQDZBOwDEQWcAJ0FYQaAAmEG/QGIAnEF
-4gasAQYH3gKnAxAF5QWAAJ4D9wHCArYAHwOtAuIFgQDJBYsBxgYLAz8CRwZ6A/sDqwP+Aw8DIQDaAycE
-6gCOBzoGGwg7AqEE4AWEB1EG/gLqAjkEoQJSBEYBcgP4AwEG8wEDAeADrgD6BWIFhgVNBukBVwfkAV8B
-hAXkAyUChgIKBOkFvAhcBcwDsQU9AyIBfQRfBLMByQZTAvMHDQMNBPQEdgQ3BYMDIwRYBpoDDgOwBawD
-/wKMAWoDKQKJgKuAzoEBqoBcgQFhgJGBAZeAdoAygQFbgQEogGSAZ4EBLoBDgOWAuIC+gMWA/4BMgE6B
-AVeBAXiAHIEBKoDqgQFDgA6BATqBAYeAeIEBm4EBFIB7gQFVgQGSgCeBAdeAiYDagQFdgQE9gBeA34BU
-gIyAAoDRgJqBAUGAGoEBP4BVgQFfgLKAcoEBhYDkgMuA5oDHgK6AHYC7gQEmgAuBAamBAWOBAeyAh4EB
-NoEBSYEBr4EBpoCbgG6BAQuAc4DvgD2A4oCkgQHigCWAW4DSgCSBAVOBAU2BATCBAeaAN4EB2YA4gEWB
-AVmAt4CBgGGBAReBAUuBAfiBAU+A2IEBLICvgEKA94EBEoBXgQF6gJ+BAaKAp4EBGYD9gO2BAUWAtoD1
-gQGPgMKA1YEBR4DogISAPIC9gILSAA4ARQf1CdWBAfqvEIIJ1gnXCdgJ2QnaCdsJ3AndAU4J3wngCeEJ
-4gnjCeQJ5QnmCecJ6AnpCeoJ6wnsCe0J7gnvCfAJ8QnyCfMJ9An1CfYJ9wn4CfkJ+gn7CfwJ/Qn+Cf8K
-AAoBCgIKAwoECgUKBgoHCggKCQoKCgsKDAoNCg4KDwoQChEKEgoTChQKFQoWChcKGAoZChoKGwocCh0K
-HgofCiAKIQoiCiMKJAolCiYKJwMGCikKKgorCiwKLQouCi8KMAoxCjIKMwo0CjUKNgo3CjgKOQo6CjsK
-PAo9Cj4KPwpACkEKQgpDCkQKRQpGCkcKSApJCkoKSwpMCk0KTgpPClAKUQpSClMKVApVClYKV4EB/oEB
-/4ECAIECAYECAoECA4ECBIECBYAzgQIGgQIHgQIIgQIJgQIKgQILgQIMgQINgQIOgQIPgQIQgQIRgQIS
-gQITgQIUgQIVgQIWgQIXgQIYgQIZgQIagQIbgQIcgQIdgQIegQIfgQIggQIhgQIigQIjgQIkgQIlgQIm
-gQIngQIogQIpgQIqgQIrgQIsgQItgQIugQIvgQIwgQIxgQIygQIzgQI0gQI1gQI2gQI3gQI4gQI5gQI6
-gQI7gQI8gQI9gQI+gQI/gQJAgQJBgQJCgQJDgQJEgQJFgQJGgQJHgQJIgQJJgQJKgQJLgQJMgQJNgQJO
-gKWBAk+BAlCBAlGBAlKBAlOBAlSBAlWBAlaBAleBAliBAlmBAlqBAluBAlyBAl2BAl6BAl+BAmCBAmGB
-AmKBAmOBAmSBAmWBAmaBAmeBAmiBAmmBAmqBAmuBAmyBAm2BAm6BAm+BAnCBAnGBAnKBAnOBAnSBAnWB
-AnaBAneBAniBAnmBAnqBAnuBAnyBAn1fEBpNZW51IEl0ZW0gKFByZWZlcmVuY2VzLi4uKV8QEE1lbnUg
-SXRlbSAoUmVkbylfEBdUYWJsZSBDb2x1bW4gKFNob3J0Y3V0KV8QEU1lbnUgKE90aGVyVmlld3MpXxBC
-U3RhdGljIFRleHQgKFRoZXNlIG9wdGlvbnMgdGFrZSBlZmZlY3Qgd2hlbiBYMTEgaXMgbmV4dCBsYXVu
-Y2hlZC4pXxApTWVudSBJdGVtIChSZXZlcnNlIEN5Y2xlIFRocm91Z2ggV2luZG93cylbU2Nyb2xsIFZp
-ZXdfECpDaGVjayBCb3ggKENsaWNrLXRocm91Z2ggSW5hY3RpdmUgV2luZG93cylfELxUZXh0IEZpZWxk
-IENlbGwgKExhdW5jaGluZyBYMTEgd2lsbCBjcmVhdGUgWGF1dGhvcml0eSBhY2Nlc3MtY29udHJvbCBr
-ZXlzLiBJZiB0aGUgc3lzdGVtJ3MgSVAgYWRkcmVzcyBjaGFuZ2VzLCB0aGVzZSBrZXlzIGJlY29tZSBp
-bnZhbGlkIHdoaWNoIG1heSBwcmV2ZW50IFgxMSBhcHBsaWNhdGlvbnMgZnJvbSBsYXVuY2hpbmcuKV8Q
-aVRleHQgRmllbGQgQ2VsbCAoSG9sZCBPcHRpb24gYW5kIENvbW1hbmQgd2hpbGUgY2xpY2tpbmcgdG8g
-YWN0aXZhdGUgdGhlIG1pZGRsZSBhbmQgcmlnaHQgbW91c2UgYnV0dG9ucy4KKV8QFU1lbnUgSXRlbSAo
-VGhvdXNhbmRzKV8QFE1lbnUgSXRlbSAoTWlsbGlvbnMpXxCTU3RhdGljIFRleHQgKFdoZW4gZW5hYmxl
-ZCwgY2xpY2tpbmcgb24gYW4gaW5hY3RpdmUgd2luZG93IHdpbGwgY2F1c2UgdGhhdCBtb3VzZSBjbGlj
-ayB0byBwYXNzIHRocm91Z2ggdG8gdGhhdCB3aW5kb3cgaW4gYWRkaXRpb24gdG8gYWN0aXZhdGluZyBp
-dC4pVlZpZXctMVtTZXBhcmF0b3ItMV8QFE1lbnUgSXRlbSAoSGlkZSBYMTEpXxAUTWVudSBJdGVtIChR
-dWl0IFgxMSlfEBhNZW51IEl0ZW0gKEN1c3RvbWl6ZS4uLilfEBRCdXR0b24gQ2VsbCAoUmVtb3ZlKV8Q
-KUNoZWNrIEJveCAoRm9sbG93IHN5c3RlbSBrZXlib2FyZCBsYXlvdXQpXxArQnV0dG9uIENlbGwgKEZv
-bGxvdyBzeXN0ZW0ga2V5Ym9hcmQgbGF5b3V0KV8QJkJ1dHRvbiBDZWxsIChBdXRoZW50aWNhdGUgY29u
-bmVjdGlvbnMpXxAUUHVzaCBCdXR0b24gKENhbmNlbClcU2VwYXJhdG9yLTEwXxBMU3RhdGljIFRleHQg
-KEFsbG93cyBpbnB1dCBtZW51IGNoYW5nZXMgdG8gb3ZlcndyaXRlIHRoZSBjdXJyZW50IFgxMSBrZXlt
-YXAuKV8QEE1lbnUgSXRlbSAoSGVscClfEHlUZXh0IEZpZWxkIENlbGwgKFgxMSBiZWVwcyB3aWxsIHVz
-ZSB0aGUgc3RhbmRhcmQgc3lzdGVtIGFsZXJ0LCBhcyBkZWZpbmVkIGluIHRoZSBTb3VuZCBFZmZlY3Rz
-IHN5c3RlbSBwcmVmZXJlbmNlcyBwYW5lbC4pWVNlcGFyYXRvcl8QFlRhYiBWaWV3IEl0ZW0gKE91dHB1
-dClfEBdCdXR0b24gQ2VsbCAoRHVwbGljYXRlKV8QLEJ1dHRvbiBDZWxsIChDbGljay10aHJvdWdoIElu
-YWN0aXZlIFdpbmRvd3MpXxATVGFibGUgQ29sdW1uIChOYW1lKV8QJlRvcCBUYWIgVmlldyAoSW5wdXQs
-IE91dHB1dCwgU2VjdXJpdHkpXxAhTWVudSBJdGVtIChDeWNsZSBUaHJvdWdoIFdpbmRvd3MpXxAkQ2hl
-Y2sgQm94IChBdXRoZW50aWNhdGUgY29ubmVjdGlvbnMpXxARVGFibGUgSGVhZGVyIFZpZXdfEBZCdXR0
-b24gQ2VsbCAoQWRkIEl0ZW0pXxASUHVzaCBCdXR0b24gKERvbmUpXxAoQnV0dG9uIENlbGwgKEVtdWxh
-dGUgdGhyZWUgYnV0dG9uIG1vdXNlKV8QEk1lbnUgSXRlbSAoV2luZG93KV8Qp1N0YXRpYyBUZXh0IChJ
-ZiBlbmFibGVkLCBBdXRoZW50aWNhdGUgY29ubmVjdGlvbnMgbXVzdCBhbHNvIGJlIGVuYWJsZWQgdG8g
-ZW5zdXJlIHN5c3RlbSBzZWN1cml0eS4gV2hlbiBkaXNhYmxlZCwgY29ubmVjdGlvbnMgZnJvbSByZW1v
-dGUgYXBwbGljYXRpb25zIGFyZSBub3QgYWxsb3dlZC4pXxAjQ2hlY2sgQm94IChVc2Ugc3lzdGVtIGFs
-ZXJ0IGVmZmVjdClfEBpNZW51IEl0ZW0gKEFwcGxpY2F0aW9ucyktMV8QFE1lbnUgSXRlbSAoTWluaW1p
-emUpXxAbUG9wdXAgQnV0dG9uIChGcm9tIERpc3BsYXkpXxAeTWVudSBJdGVtIChUb2dnbGUgRnVsbCBT
-Y3JlZW4pXEZpbGUncyBPd25lcltTZXBhcmF0b3ItNF8QFk1lbnUgSXRlbSAoU2VsZWN0IEFsbClfEHVT
-dGF0aWMgVGV4dCAoWDExIGJlZXBzIHdpbGwgdXNlIHRoZSBzdGFuZGFyZCBzeXN0ZW0gYWxlcnQsIGFz
-IGRlZmluZWQgaW4gdGhlIFNvdW5kIEVmZmVjdHMgc3lzdGVtIHByZWZlcmVuY2VzIHBhbmVsLilfEBVN
-ZW51IChBcHBsaWNhdGlvbnMpLTFfECVCdXR0b24gQ2VsbCAoVXNlIHN5c3RlbSBhbGVydCBlZmZlY3Qp
-XxCrVGV4dCBGaWVsZCBDZWxsIChJZiBlbmFibGVkLCBBdXRoZW50aWNhdGUgY29ubmVjdGlvbnMgbXVz
-dCBhbHNvIGJlIGVuYWJsZWQgdG8gZW5zdXJlIHN5c3RlbSBzZWN1cml0eS4gV2hlbiBkaXNhYmxlZCwg
-Y29ubmVjdGlvbnMgZnJvbSByZW1vdGUgYXBwbGljYXRpb25zIGFyZSBub3QgYWxsb3dlZC4pXxAPTWVu
-dSAoU2VydmljZXMpW1NlcGFyYXRvci05XxAXUHVzaCBCdXR0b24gKER1cGxpY2F0ZSlbU2VwYXJhdG9y
-LTJfEBBNZW51IEl0ZW0gKFVuZG8pXxAeTWVudSBJdGVtIChCcmluZyBBbGwgdG8gRnJvbnQpXxAQTWVu
-dSBJdGVtIChFZGl0KVtTZXBhcmF0b3ItNW8QFgBNAGUAbgB1ACAASQB0AGUAbQAgACgAQwB1AHMAdABv
-AG0AaQB6AGUgJgApXxAXTWVudSBJdGVtIChIaWRlIE90aGVycylfEGVTdGF0aWMgVGV4dCAoSG9sZCBP
-cHRpb24gYW5kIENvbW1hbmQgd2hpbGUgY2xpY2tpbmcgdG8gYWN0aXZhdGUgdGhlIG1pZGRsZSBhbmQg
-cmlnaHQgbW91c2UgYnV0dG9ucy4KKVhEb2NrTWVudV8QHVRleHQgRmllbGQgQ2VsbCAoVGV4dCBDZWxs
-KS0yXxBGVGV4dCBGaWVsZCBDZWxsIChUaGVzZSBvcHRpb25zIHRha2UgZWZmZWN0IHdoZW4gWDExIGlz
-IG5leHQgbGF1bmNoZWQuKVxFZGl0UHJvZ3JhbXNfECZDaGVjayBCb3ggKEVtdWxhdGUgdGhyZWUgYnV0
-dG9uIG1vdXNlKV8QFVRhYiBWaWV3IEl0ZW0gKElucHV0KV8QQlN0YXRpYyBUZXh0IChUaGlzIG9wdGlv
-biB0YWtlcyBlZmZlY3Qgd2hlbiBYMTEgaXMgbGF1bmNoZWQgYWdhaW4uKV8QG1RleHQgRmllbGQgQ2Vs
-bCAoVGV4dCBDZWxsKV8QFlRhYmxlIENvbHVtbiAoQ29tbWFuZClbTWVudSAoRWRpdClfEBRNZW51IEl0
-ZW0gKFNob3cgQWxsKVpQcmVmc1BhbmVsXxATTWVudSAoQXBwbGljYXRpb25zKV8QFE1lbnUgSXRlbSAo
-WDExIEhlbHApXU1lbnUgKFdpbmRvdylfEBBNZW51IEl0ZW0gKFpvb20pXxARVmVydGljYWwgU2Nyb2xs
-ZXJeQ29udGVudCBWaWV3LTFfEBhNZW51IEl0ZW0gKEZyb20gRGlzcGxheSlfEA9NZW51IEl0ZW0gKEN1
-dClfEBZQdXNoIEJ1dHRvbiAoQWRkIEl0ZW0pXxAYVGFiIFZpZXcgSXRlbSAoU2VjdXJpdHkpXxByU3Rh
-dGljIFRleHQgKEVuYWJsZXMgdGhlIFgxMSByb290IHdpbmRvdy4gVXNlIHRoZSBDb21tYW5kLU9wdGlv
-bi1BIGtleXN0cm9rZSB0byBlbnRlciBhbmQgbGVhdmUgZnVsbCBzY3JlZW4gbW9kZS4pXxCXVGV4dCBG
-aWVsZCBDZWxsIChXaGVuIGVuYWJsZWQsIGNsaWNraW5nIG9uIGFuIGluYWN0aXZlIHdpbmRvdyB3aWxs
-IGNhdXNlIHRoYXQgbW91c2UgY2xpY2sgdG8gcGFzcyB0aHJvdWdoIHRvIHRoYXQgd2luZG93IGluIGFk
-ZGl0aW9uIHRvIGFjdGl2YXRpbmcgaXQuKV8QE0hvcml6b250YWwgU2Nyb2xsZXJfEBVNZW51IEl0ZW0g
-KEFib3V0IFgxMSlfEBJCdXR0b24gQ2VsbCAoRG9uZSlaTWVudSAoWDExKV8QLkJ1dHRvbiBDZWxsIChF
-bmFibGUga2V5IGVxdWl2YWxlbnRzIHVuZGVyIFgxMSlfELhTdGF0aWMgVGV4dCAoTGF1bmNoaW5nIFgx
-MSB3aWxsIGNyZWF0ZSBYYXV0aG9yaXR5IGFjY2Vzcy1jb250cm9sIGtleXMuIElmIHRoZSBzeXN0ZW0n
-cyBJUCBhZGRyZXNzIGNoYW5nZXMsIHRoZXNlIGtleXMgYmVjb21lIGludmFsaWQgd2hpY2ggbWF5IHBy
-ZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4pW1NlcGFyYXRvci02XxAyQ2hlY2sg
-Qm94IChBbGxvdyBjb25uZWN0aW9ucyBmcm9tIG5ldHdvcmsgY2xpZW50cylfEBZNZW51IEl0ZW0gKDI1
-NiBDb2xvcnMpXxB0U3RhdGljIFRleHQgKFdoZW4gZW5hYmxlZCwgbWVudSBiYXIga2V5IGVxdWl2YWxl
-bnRzIG1heSBpbnRlcmZlcmUgd2l0aCBYMTEgYXBwbGljYXRpb25zIHRoYXQgdXNlIHRoZSBNZXRhIG1v
-ZGlmaWVyLilfEEZUZXh0IEZpZWxkIENlbGwgKFRoaXMgb3B0aW9uIHRha2VzIGVmZmVjdCB3aGVuIFgx
-MSBpcyBsYXVuY2hlZCBhZ2Fpbi4pW0FwcGxpY2F0aW9uXxB2VGV4dCBGaWVsZCBDZWxsIChFbmFibGVz
-IHRoZSBYMTEgcm9vdCB3aW5kb3cuIFVzZSB0aGUgQ29tbWFuZC1PcHRpb24tQSBrZXlzdHJva2UgdG8g
-ZW50ZXIgYW5kIGxlYXZlIGZ1bGwgc2NyZWVuIG1vZGUuKV8QEk1lbnUgSXRlbSAoRGVsZXRlKV8QUFRl
-eHQgRmllbGQgQ2VsbCAoQWxsb3dzIGlucHV0IG1lbnUgY2hhbmdlcyB0byBvdmVyd3JpdGUgdGhlIGN1
-cnJlbnQgWDExIGtleW1hcC4pXxAUTWVudSBJdGVtIChTZXJ2aWNlcylfECxDaGVjayBCb3ggKEVuYWJs
-ZSBrZXkgZXF1aXZhbGVudHMgdW5kZXIgWDExKV8QHkJ1dHRvbiBDZWxsIChGdWxsIHNjcmVlbiBtb2Rl
-KVxDb250ZW50IFZpZXdfECFQb3AgVXAgQnV0dG9uIENlbGwgKEZyb20gRGlzcGxheSlfEBRCdXR0b24g
-Q2VsbCAoQ2FuY2VsKV8QEE1lbnUgSXRlbSAoQ29weSlfEB1UZXh0IEZpZWxkIENlbGwgKFRleHQgQ2Vs
-bCktMV8QD01lbnUgSXRlbSAoWDExKV8QeFRleHQgRmllbGQgQ2VsbCAoV2hlbiBlbmFibGVkLCBtZW51
-IGJhciBrZXkgZXF1aXZhbGVudHMgbWF5IGludGVyZmVyZSB3aXRoIFgxMSBhcHBsaWNhdGlvbnMgdGhh
-dCB1c2UgdGhlIE1ldGEgbW9kaWZpZXIuKV8QFFB1c2ggQnV0dG9uIChSZW1vdmUpW01lbnUgKEhlbHAp
-XxAWU3RhdGljIFRleHQgKENvbG9yczoKKVtTZXBhcmF0b3ItN18QHENoZWNrIEJveCAoRnVsbCBzY3Jl
-ZW4gbW9kZSlfECRUYWJsZSBWaWV3IChOYW1lLCBDb21tYW5kLCBTaG9ydGN1dClfEBhNZW51IEl0ZW0g
-KEFwcGxpY2F0aW9ucylfEBFNZW51IEl0ZW0gKFBhc3RlKV8QGlRleHQgRmllbGQgQ2VsbCAoQ29sb3Jz
-OgopW1NlcGFyYXRvci0zXxA0QnV0dG9uIENlbGwgKEFsbG93IGNvbm5lY3Rpb25zIGZyb20gbmV0d29y
-ayBjbGllbnRzKV8QEU1lbnUgSXRlbSAoQ2xvc2UpW1NlcGFyYXRvci04VlZpZXctMtIADgBFB/UK2YEB
-+qDSAA4ARQf1CtyBAfqg0gAOAEUH9QrfgQH6rxC8AyADrAHnBv8F5gLHAHICWwa9APkAagCHBfsFLQIL
-AgwE7wGBA/0DJgMqA5UBpgGsBesEfABZAFwAXQBgAGkGTQDZBOwDEQWcAJ0AUwBwAHYCYQVhBoAAXwb9
-AnEBiAXiAGcAWAasAF4BBgBkB94CpwCBAH8AhACFAxAF5QWAAcID9wCeArYAVQBtAB8AdAOtAuIFgQDJ
-BYsATwBXAcYGCwBmAz8CRwP7BnoDqwB8A/4DDwMhANoDJwTqBzoAjgYbAFoIOwKhAFsE4ACCBYQHUQb+
-AuoCOQShAFIAVgJSAGwAYwB4BEYBcgBUA/gAeQMBBvMAhgHgAQMDrgD6BU0FhgViAYQBVwbpAV8H5AXk
-AyUAYgBuAHoAfgCDAoYAcwIKAIgAYQB9BOkFvAhcBT0DsQXMAFADIgBxAX0EXwCABLMByQB3BlMAdQLz
-BPQDDQcNAGUEdgQ3BYMDIwBoAG8AawRYAFEGmgMOA7AFrAP/AowBagMpAHsCiYCrgM6AXIEBqoEBYYCR
-gQF/gHaBAZeAMoEBBoEB1IEBW4EBKIBkgGeBAS6AQ4DlgLiAvoDFgEyAToEBV4D/gHWAgICGgJWBAQSB
-AXiAHIEBKoDqgQFDgA6AQYEBdYEBjIB4gQE6gQGHgJCBAZuAe4EBFIEBVYD6gHGBAZKAi4AngKOBAdeA
-iYEByIEBxIEBzoEB0IDagQFdgQE9gFSA34AXgIyAUYEBb4ACgQGCgNGAmoEBQYAagQE/gAqAbYBVgQFf
-gPSAsoBygOSBAYWAy4EBv4DmgMeAroAdgLuBASaBAamAC4EBY4B6gQHsgIeAf4EBNoEByoEBSYEBr4EB
-poCbgG6BAQuAO4BTgHOBAQqAnoEBuIDvgD2AS4DigQG6gKSBAeKBAdKAW4AlgNKAJIEBMIEBTYEBU4BF
-gDeBAeaAOIEB2YEBWYC3gJmBAXGBAbyBAcOBAcyAgYEBgIBhgQHWgJeBAcGBAReBAUuBAfiBASyA2IEB
-T4AjgK+BAXeAQoD3gQHGgQESgFeBAY6BAXqBAYSAn4EBGYCngQGigPOA/YDtgQFFgLaA/IEBc4EBCID1
-gDaBAY+AwoDVgQFHgOiAhIA8gL2BAb6AgtIADgBFB/ULnoEB+q8QvAufC6ALoQuiC6MLpAulC6YLpwuo
-C6kLqgurC6wLrQuuC68LsAuxC7ILswu0C7ULtgu3C7gLuQu6C7sLvAu9C74LvwvAC8ELwgvDC8QLxQvG
-C8cLyAvJC8oLywvMC80LzgvPC9AL0QvSC9ML1AvVC9YL1wvYC9kL2gvbC9wL3QveC98L4AvhC+IL4wvk
-C+UL5gvnC+gL6QvqC+sL7AvtC+4L7wvwC/EL8gvzC/QL9Qv2C/cL+Av5C/oL+wv8C/0L/gv/DAAMAQwC
-DAMMBAwFDAYMBwwIDAkMCgwLDAwMDQwODA8MEAwRDBIMEwwUDBUMFgwXDBgMGQwaDBsMHAwdDB4MHwwg
-DCEMIgwjDCQMJQwmDCcMKAwpDCoMKwwsDC0MLgwvDDAMMQwyDDMMNAw1DDYMNww4DDkMOgw7DDwMPQw+
-DD8MQAxBDEIMQwxEDEUMRgxHDEgMSQxKDEsMTAxNDE4MTwxQDFEMUgxTDFQMVQxWDFcMWAxZDFqBAoKB
-AoOBAoSBAoWBAoaBAoeBAoiBAomBAoqBAouBAoyBAo2BAo6BAo+BApCBApGBApKBApOBApSBApWBApaB
-ApeBApiBApmBApqBApuBApyBAp2BAp6BAp+BAqCBAqGBAqKBAqOBAqSBAqWBAqaBAqeBAqiBAqmBAqqB
-AquBAqyBAq2BAq6BAq+BArCBArGBArKBArOBArSBArWBAraBAreBAriBArmBArqBAruBAryBAr2BAr6B
-Ar+BAsCBAsGBAsKBAsOBAsSBAsWBAsaBAseBAsiBAsmBAsqBAsuBAsyBAs2BAs6BAs+BAtCBAtGBAtKB
-AtOBAtSBAtWBAtaBAteBAtiBAtmBAtqBAtuBAtyBAt2BAt6BAt+BAuCBAuGBAuKBAuOBAuSBAuWBAuaB
-AueBAuiBAumBAuqBAuuBAuyBAu2BAu6BAu+BAvCBAvGBAvKBAvOBAvSBAvWBAvaBAveBAviBAvmBAvqB
-AvuBAvyBAv2BAv6BAv+BAwCBAwGBAwKBAwOBAwSBAwWBAwaBAweBAwiBAwmBAwqBAwuBAwyBAw2BAw6B
-Aw+BAxCBAxGBAxKBAxOBAxSBAxWBAxaBAxeBAxiBAxmBAxqBAxuBAxyBAx2BAx6BAx+BAyCBAyGBAyKB
-AyOBAySBAyWBAyaBAyeBAyiBAymBAyqBAyuBAyyBAy2BAy6BAy+BAzCBAzGBAzKBAzOBAzSBAzWBAzaB
-AzeBAziBAzmBAzqBAzuBAzyBAz0QgRCtEQF8EQIXEQF7EQIaEQE0EgAElQgRAScQxBEBPhEBhBIAAYgY
-EgABiA0RAX8RAX0SAASVChEBXxECGBCGEIgRATERAXISAAGIEhIAAYgWEgABh8USAASVDBEBkREBihEB
-QRC0EQErEQIVEQFxEQGjEgABiBQRAgwRAYkRAQcRAYYSAASVCREBYBIAAYfEEQIcEQEpEQIZEQFcEQF2
-EQIjEQEREgAElQcRAiUSAAGH1hIABJUuEQEjEgABiAsSAASVLBEBphEBhxECExATEQF5EQFzEQF+EBcR
-Ag4RAiARAawRAhYSAASVLxCvEJwQrBEBdBECDxIAAYgTEQGqEQGvEQFeEgABiBkRAiIQghEBEBBcEQEk
-EJ4QwxAFEKMQjxECFBCREQFtEQI9EQGnEgABiBsRAhsRAR0RAWsRAY4RAV0SAASVKxEBghECPxEBKhCp
-EJYQ9BDNEQGFEQEOEQGSELURAa4RAaURAYsQzBDOEB0SAAGHxxCyEQGAEQEeEKARATYSAASVCxECHxEB
-YRIAAYgQEDoSAAMOZxA5EgABh8MRAXgRAiEQsxEBrRDPEQGNEgAElS0RAXcQyhEBsxEBLhECEhEBiBEB
-bBIAAYgiE//////////9EgABiBEQpBIAAYi/EQE3EIMRATURAXASAAGIvRCwEPUSAAGIHhIAAYfLEQEw
-EJ0SAAGIDBA4EQI+EQGMEQElEQGkEQGBEJARAYMRAiQRAh0RAbERASgRAQ0QqxIAAYghEgAElSoSAAGI
-FxDLEJURAY8RAWLSAA4ARQBNDRaAH6DSAA4ARQf1DRmBAfqg0gAOAEUH9Q0cgQH6oNIAOgA7DR4NH6IN
-HwA/Xk5TSUJPYmplY3REYXRhAAgAGQAiACcAMQA6AD8ARABSAFQAZgbuBvQHPwdGB00HWwdtB4kHlwej
-B68HvQfIB9YH8ggACBMIJQg/CEkIVghYCFsIXghhCGQIZghpCGsIbghxCHQIdwh5CHsIfgiBCIYIiQiS
-CJ4IoAiiCKsItQi3CMUIzgjXCOII6Qj7CQQJDQkWCRsJKgk9CUYJUQlTCVQJXQlkCXEJdwmACYIJ+Qn7
-Cf0J/woBCgMKBQoHCgkKCwoNCg8KEQoTChUKFwoZChsKHQofCiEKIwolCicKKQorCi0KMAozCjYKOQo8
-Cj8KQgpFCkgKSwpOClEKVApXCloKXQpgCmMKZgppCmwKbwpyCnUKeAp7Cn4KgQqECocKigqNCp4KrAq1
-Cr0KvwrBCsMKxQrWCt4K5QrxCvMK9Qr3CvkK/gsHCwkLDgsQCxILOwtPC10LaAt1C4MLjQuaC6ELowul
-C6oLqwutC64Lswu1C7cLuQu6C8cL1gvYC9oL3AvkC/YL/wwEDBcMJAwmDCgMKgw9DEYMSwxWDH8MiQyS
-DJQMlgyYDJoMnAyeDKAMogyvDL4MywzNDM8M0QzaDNwM4QzjDOUNDg0QDRINEw0VDRYNGA0aDRwNPQ0/
-DUENQw1FDUcNSQ1eDWcNbg19DYUNjg2TDZwNpQ2sDcMN0g3jDeUN5w3pDesOCA4aDiIOKQ4yDjwOSA5K
-DkwOTg5QDlMOVA5WDmsOdg6CDoQOhw6KDo0OkA6qDt8O6w8BDxYPJQ84D0oPVQ9fD20Pfw+MD5oPnw+h
-D6MPpQ+nD6kPqw+tD68PsQ+zD7gPwQ/KD9sP4g/rD+0P9g/4D/sQCBAREBYQHRAuEDAQMhA0ED4QRxBJ
-EFIQVBBdEGYQcxCAEIkQlBCdEKcQrhC6EMMQxRDHENUQ5xDwEPcRDxEgESIRJBEmESgRRRFHEUkRSxFN
-EU8RURFiEWQRZhFoEWoRdBGUEaURpxGpEasRrRHOEdAR0hHUEdYR2BHaEesR7RHvEfER8xH5EfsSCRIa
-EhwSHhIgEiISPxJBEkMSRRJHEkgSShJjEmYSaRJsEm8SchKLEsASwhLEEsYSyBLKEswSzhLQEtIS1xL6
-EwMTDxMRExMTHBMlEyoTQBNTE2QTZhNoE2oTbBOJE4sTjROPE5ETkhOUE60T4hPkE+YT6BPqE+wT7hPw
-FBAUHxQwFDIUNBQ2FDgUQhRTFFUUVxRZFFsUeBR6FHwUfhSAFIEUgxSYFJoUnRSgFKMUvBULFSgVOhVM
-FWEVbxV4FXkVexV9FX8VgRWDFYUVhxWJFYsVjBWNFZAVkxWVFZoVqxWtFa8VuBW6FcMVxRX2Ff8WBRYN
-Fg8WERYTFhUWFxYZFhsWHRYmFjMWNRY3FjkWRhZaFmMWZRZwFnkWexaEFoYWiBaKFowWuRa7Fr0WvxbB
-FsMWxRbHFskWyxbWFwMXBRcHFwkXCxcNFw8XERcTFxUXHxdMF04XUBdSF1QXVhdYF1oXXBdeF2cXcBd9
-F5EXoBepF7YXxBfKF9sX3RffF+EX4xgIGAoYDBgOGBAYEhgUGBYYHxg4GEkYSxhNGE8YURh6GHwYfhh/
-GIEYghiEGIYYiBiVGJcYmRibGKoYuxi9GL8YwRjDGOAY4hjkGOYY6BjpGOsZAxk4GToZPBk+GUAZQhlE
-GUYZZxl4GXoZfBl+GYAZoRmjGaUZqhmsGa4ZsBmyGcoZzBnZGeoZ7BnuGfAZ8hoDGgUaBxoJGgsaKBoq
-GiwaLhowGjEaMxpIGkoaTRpQGlMabBqhGqMapRqnGqkaqxqtGq8a2BrpGusa7RrvGvEbDhsQGxIbFBsW
-GxcbGRsyG2cbaRtrG20bbxtxG3MbdRuSG6MbpRunG6kbqxvMG84b0BvVG9cb2RvbG90b8hv0HA0cHhwg
-HCIcJBwmHEccSRxLHFAcUhxUHFYcWBx4HHocjRyeHKAcohykHKYctRzGHMgcyhzMHM4c3RzqHOwc7hzw
-HREdEx0VHRcdGR0bHR0dKh0sHS4dMB07HUYdUx1VHVcdWR16HXwdfh2AHYIdhB2GHYsdjR2THaQdph2o
-HaodrB29Hb8dwR3DHcUdzh3XHdkd5B3mHegd6h3sHe4eFx4ZHhseHR4fHiEeIx4lHiceKx40HjYeTx5R
-HlMeVR5XHlkeWx5dHl8eYR5jHmUeZx6IHooejB6OHpAekh6UHqMepR7OHtAe0h7THtUe1h7YHtoe3B8F
-HwcfCR8LHw0fDx8RHxMfFR8eHy8fMR8zHzUfNx9AH0IfSx9NH04fYB+JH4sfjR+OH5AfkR+TH5Uflx/A
-H8IfxB/FH8cfyB/KH8wfzh/zH/Uf9x/5H/sf/R//IAggCiArIC0gLyAxIDMgNSA3IEMgbCBuIHAgcSBz
-IHQgdiB4IHogmyCdIJ8goSCjIKUgpyCwILIgvyDoIOog7CDuIPAg8iD0IPYg+CEBIQMhCCEKIQwhLSEv
-ITEhMyE1ITchOSFGIW8hcSFzIXUhdyF5IXshfSF/IYQhjSGPIaAhoiGkIaYhqCGqIawhriGwIdEh0yHV
-Idch2SHbId0h4iHkIgUiByIJIgsiDSIPIhEiFiIYIkEiQyJFIkYiSCJJIksiTSJPInAiciJ0InYieCJ6
-InwigCKCIqMipSKnIqkiqyKtIq8itSK3Itgi2iLcIt4i4CLiIuQi6yMUIxYjGCMaIxwjHiMgIyIjJCMr
-IzQjNiM/I0EjVCNWI1gjWiNcI14jYCNiI2QjZiOHI4kjiyONI48jkSOTI5wjniO/I8EjwyPFI8cjySPL
-I9Aj+SP7I/0j/iQAJAEkAyQFJAckMCQyJDQkNSQ3JDgkOiQ8JD4kXyRhJGMkZSRnJGkkaySAJKkkqySt
-JK4ksCSxJLMktSS3JMYk7yTxJPMk9ST3JPkk+yT9JP8lBCURJRMlFSUXJSAlIiUlJSclSCVKJUwlTiVQ
-JVIlVCVdJWklbiV/JYElgyWFJYclmCWaJZwlniWgJb0lvyXBJcMlxSXGJcgl4SYWJhgmGiYcJh4mICYi
-JiQmNyZLJlwmXiZgJmImZCaBJpImlCaWJpgmmya4JromvCa+JsAmwSbDJt0nEicUJxcnGSccJx8nIScj
-JyonMyc1Jz4nQCdVJ2InZCdmJ2knbyeAJ4InhCeGJ4knlSemJ6gnqiesJ68nxCfVJ9cn2ifcJ98oHigr
-KEQoUShnKHUofyiNKKYosyi9KM8o4yjtKPko/Cj/KQIpBSkIKQspECkTKRYpGSkcKR8pIik9KU8pVylg
-KWIpZymEKY8ppCmmKakprCmvKbgpuim9KcAp8SoAKgoqHio3Kk8qUipVKlgqWypdKmAqYSpkKmUqaCpx
-KnMqdip4KoEqgyqUKpYqmSqcKp4qoSqjKqUqqCrFKscqyirNKtAq0SrTKusrDCsgKywrLysyKzUrOCs7
-K0ArQyusK70rvyvIK8orzSviK+or9ywDLBEsFCwXLBksHCwfLCYsMyxALEgsSyxXLGAsZSx6LH0sgCyD
-LIYsmSymLKksrCy1LL4s0CzZLOQs8C0NLQ8tEi0VLRgtGS0bLTQtVS1YLVstXi1hLWQtZy3BLd4t4C3j
-LeYt6S3qLewuBS4mLikuLC4vLjIuNS44Lnkuli6YLpsuni6hLqIupC68Lt0u4C7jLuYu6S7sLu8vdy+Q
-L5kvoC+5L8IvxC/LL84v0S/UL+0v+jAEMAcwCjAMMA8wEjAVMB4wIDAiMCgwMTA2MEQwXTBgMGMwZTBo
-MGswbjB3MHkwezCEMIYwlTCYMJswnTCgMKMwpTCoMMUwxzDJMMwwzzDQMNIw6zEgMSIxJDEmMSgxKzEt
-MTAxSjFnMWkxbDFvMXIxczF1MY0xrjGxMbQxtzG6Mb0xwDIqMkcySTJMMk8yUjJTMlUybTKOMpEylDKX
-MpkynDKfMqgyxTLHMsoyzTLQMtEy0zLsMw0zEDMTMxYzGTMcMx8zVjNzM3UzeDN7M34zfzOBM5ozuzO+
-M8EzxDPHM8ozzTQ0NDs0UDRTNFU0WDRbNF40ZzRpNHQ0dzR5NHw0fzSCNJ80oTSjNKY0qTSqNKw04TTj
-NOU05zTpNOw07jTxNQw1KTUrNS41MTU0NTU1NzVQNXE1dDV3NXo1fTWANYM2MDZNNk82UjZVNlg2WTZb
-NnQ2lTaYNps2njahNqQ2pzdDN2A3YjdlN2g3azdsN243hjenN6o3rTewN7M3tje5N/A3+TgCOAs4Fjgu
-ODk4QzhMOFE4ZDhwOIE4gziFOIc4ijidOK44sDiyOLQ4tzjAONE40zjWONg42zjnOPg4+jj8OP45ATka
-OSs5LTkvOTI5NTlSOVQ5VjlZOVw5XzlgOWI5ejmvObg5ujm9Ob85wjnFOcc5yjnROdo53DnlOec5/DoN
-Og86EToTOhY6JzopOis6LTowOkM6UDpSOlQ6VzpcOm06bzpxOnQ6dzqUOpY6mDqbOp46nzqhOrs68Dry
-OvU69zr6Ov06/zsCOww7FTsXOyA7Ijs6O0s7TTtQO1I7VTthO3I7dDt3O3k7fDvLO+07+jwPPBw8NjxS
-PG08eTyYPKc8szy2PLk8vjzBPMQ8xTzIPNE82jzdPN484TzkPOc88D0ZPSM9LT03PUU9SD1LPU49UD1T
-PVY9WT1cPV89Yj1tPYY9kj2VPZg9mz2ePaE9yj3NPdA90z3WPdk93D3fPeI97D31Pf4+Ej4nPio+LT4w
-PjM+bD54PoE+lD6hPq0+uz69PsA+wz7GPsg+yz7OPtE+5D7nPuk+7D7vPvI/CT8SPxs/KT8yPzQ/Oz8+
-P0E/RD9tP3w/iT+RP5w/qz+2P8E/zj/PP9I/1T/eP+E/6j/zP/Q/90AUQBlAHEAfQCJAJUAoQC1AOkA9
-QElAXkBhQGRAZ0BqQHxAhUCQQKRAxUDKQM1A0EDTQNVA2EDbQOVA8kD1QPhBAUEGQRRBPUE+QUFBREFN
-QVBBWUFaQV1BekF9QYBBg0GGQYlBkUGyQbVBuEG7Qb1BwEHDQexB7UHwQfNB/EH/QghCCUIMQilCLEIv
-QjJCNUI4QkFCVkJZQlxCX0JiQm5Ck0KWQplCnEKfQqJCo0KmQrdCuULCQsRC2ULcQt9C4kLlQv5DE0MW
-QxlDHEMfQylDNkM5Qz5DR0NSQ11DbkNwQ3JDdEN3Q31DjkOQQ5JDlEOXQ6RDtUO3Q7lDu0O+Q9BD4UPj
-Q+VD6EPqQ/dD+UP7Q/5EBkQXRBlEG0QdRCBELEQ9RD9EQUREREZEV0RZRFtEXURgRGpEd0R5RHtEfkSF
-RJZEmESaRJxEn0StRL5EwETCRMREx0TaROtE7UTvRPFE9ET6RQtFDUUPRRFFFEUhRTJFNEU2RThFO0VT
-RWBFYkVkRWdFbUV+RYBFgkWERYdFkkWjRaVFp0WqRa1FykXMRc5F0UXURdVF10XvRiRGJkYoRipGLUYw
-RjJGNUY6RkNGRUZYRmFGZEdpR2tHbUdvR3JHdUd3R3lHfEd+R4FHhEeGR4hHi0eNR49HkUeTR5VHl0eZ
-R5xHnkehR6NHpkeoR6tHrUevR7JHtUe4R7pHvUfAR8NHxUfIR8pHzEfPR9JH1EfWR9hH2kfcR95H4Ufj
-R+ZH6EfrR+1H70fxR/RH9kf4R/pH/Ef+SABIA0gGSAhIC0gOSBBIE0gWSBlIHEgeSCBII0glSCdIKUgr
-SC1IMEgySDRINkg4SDtIPkhBSENIRUhISEpITUhQSFJIVEhWSFlIXEhfSGJIZEhnSGlIa0htSHBIckh1
-SHdIekh8SH9IgUiDSIZIiEiKSI1Ij0iRSJRIlkiYSJpInEieSKdIqUi0SLdIuki9SMBIw0jMSM5I0UjU
-SOxI9Uj+SQlJKkk0STdJOkk9SUBJQ0lGSU9JaEl1SX5JiUmUSblJvEm/ScJJxUnISctJ1EnsSfVJ90n6
-Sf1KE0osSjVKPkpLSopKjEqPSpJKlUqYSptKnkqhSqRKp0qpSqxKr0rKSuFK6krsSvVK90sESwdLCksM
-Sw9LEksUSx9LKEsxSzNLNks/S0RLTUtQTFVMV0xZTFtMXkxgTGJMZExmTGhMa0xuTHBMckx0THdMeUx7
-TH1Mf0yBTINMhkyITIpMjEyOTJBMk0yVTJdMmkydTKBMokylTKdMqkysTK5MsEyyTLRMtky4TLpMvEy+
-TMBMwkzETMZMyUzMTM9M0UzTTNVM10zZTNtM3UzfTOFM40zlTOhM6kztTO9M8Uz0TPZM+Uz8TP5NAE0C
-TQRNBk0ITQpNDE0PTRFNFE0WTRhNG00dTSBNIk0kTSdNKU0sTS5NME0yTTRNNk05TTtNPk1ATUNNRU1H
-TUlNTE1OTVFNU01WTVhNW01dTV9NYU1jTWVNaE1qTWxNb01xTXNNdU13TXpNg02GTo1Oj06RTpROlk6Z
-TptOnk6gTqJOpU6oTqpOrE6vTrFOs061TrdOuU67Tr1Ov07CTsVOx07KTsxOz07RTtRO107ZTtxO307h
-TuRO507pTuxO7k7wTvNO9k74TvpO/E7+TwBPAk8ETwdPCU8MTw5PEU8TTxVPGE8aTxxPHk8gTyJPJE8m
-TylPK08uTzFPNE82TzlPPE8/T0JPRE9GT0lPS09NT09PUU9TT1ZPWE9aT1xPXk9hT2RPZ09qT2xPb09x
-T3NPdk94T3pPfE9/T4JPhU+IT4pPjU+PT5FPk0+WT5hPm0+dT6BPok+lT6dPqU+sT65PsE+zT7VPt0+6
-T7xPvk/AT8JPxE/NT9BQ11DaUN1Q4FDjUOZQ6VDsUO9Q8VD0UPdQ+lD9UQBRA1EGUQlRDFEPURJRFVEY
-URtRHlEhUSRRJ1EqUS1RMFEzUTZROVE8UT9RQlFFUUhRS1FOUVFRVFFXUVpRXVFgUWNRZlFpUWxRb1Fy
-UXVReFF7UX5RgVGEUYdRilGNUZBRk1GWUZlRnFGfUaJRpVGoUatRrlGxUbRRt1G6Ub1RwFHDUcZRyVHM
-Uc5R0VHUUddR2lHdUeBR41HmUelR7FHvUfJR9VH4UftR/lIBUgRSB1IKUg1SEFITUhZSGVIcUh9SIlIl
-UihSK1IuUjFSNFI3UjpSPVJAUkNSRlJJUkxST1JSUlVSWFJbUnhSi1KlUrlS/lMqUzZTY1QiVI5UplS9
-VVNVWlVmVX1VlFWvVcZV8lYgVklWYFZtVrxWz1dLV1VXbleIV7dXzVf2WBpYQVhVWG5Yg1iuWMNZbVmT
-WbBZx1nlWgZaE1ofWjhasFrIWvBbnluwW7xb1lviW/VcFlwpXDVcZFx+XOZc710PXVhdZV2OXaZd614J
-XiJeLl5FXlBeZl59Xotenl6yXsFe3F7uXwdfIl+XYDFgR2BfYHRgf2CwYWthd2GsYcViPGKFYpFjCmMf
-Y3JjiWO4Y9lj5mQKZCFkNGRUZGZk4WT4ZQRlHWUpZUhlb2WKZZ5lu2XHZf5mEmYeZiVmLmYxZjJmO2Y+
-Zj9mSGZLZ8ZnyGfKZ8xnz2fSZ9Rn12fZZ9xn3mfhZ+Rn52fqZ+xn7mfxZ/Nn9Wf3Z/ln+2f9Z/9oAmgE
-aAZoCGgKaAxoD2gSaBRoF2gZaBxoHmggaCNoJmgoaCtoLmgwaDNoNWg4aDtoPWg/aEJoRGhGaEhoS2hN
-aFBoU2hWaFloW2heaGFoY2hlaGdoaWhraG5ocGhzaHVod2h6aHxof2iBaINohWiIaIpojGiOaJBok2iV
-aJhommicaJ5ooGiiaKVoqGiqaK1or2iyaLRotmi5aLxov2jCaMVox2jJaMxozmjQaNJo1WjXaNpo3Gje
-aOBo4mjlaOdo6mjtaO9o8WjzaPVo+Gj7aP5pAGkCaQVpB2kKaQ1pD2kRaRRpF2kaaR1pH2kiaSRpJ2kp
-aSxpL2kyaTVpOGk6aT1pP2lBaURpRmlIaUtpTmlQaVNpVmlZaVtpXmlgaWNpZWlnaWlpbGluaXBpc2l2
-aXhpeml9aX9pgWmEaYZpiGmKaYxpj2mRaZppnWsYaxtrHmshayRrJ2sqay1rMGszazZrOWs8az9rQmtF
-a0hrS2tOa1FrVGtXa1prXWtga2NrZmtpa2xrb2tya3VreGt7a35rgWuEa4drimuNa5Brk2uWa5lrnGuf
-a6JrpWuoa6trrmuxa7Rrt2u6a71rwGvDa8ZryWvMa89r0mvVa9hr22vea+Fr5Gvna+pr7Wvwa/Nr9mv5
-a/xr/2wCbAVsCGwLbA5sEWwUbBdsGmwdbCBsI2wmbClsLGwvbDJsNWw4bDtsPmxBbERsR2xKbE1sUGxT
-bFZsWWxcbF9sYmxlbGhsa2xubHFsdGx3bHpsfWyAbINshmyJbIxsj2ySbJVsmGybbJ5soWykbKdsqmyt
-bLBss2y2bLlsvGy/bMJsxWzIbMtszmzRbNRs12zabN1s4GzjbOZs6WzsbO9s8mz1bPhs+2z+bQFtBG0H
-bQptDW0QbRNtFm0ZbRxtH20ibSVtKG0rbS5tMW00bTdtOm09bUBtQ21GbUltTG1ObVBtU21WbVltXG1f
-bWRtZ21pbWxtb210bXltfG1/bYRth22KbYxtjm2RbZRtmW2ebaNtqG2rba5tsW2zbbZtuW28bb9txG3H
-bcptzW3QbdVt2G3dbeBt423mbelt7G3vbfJt9236bf9uBG4HbgxuEW4UbhduGm4cbh9uIm4lbiduKm4t
-bjBuM244bjpuPG4+bkFuRG5JbkxuT25SblduWm5cbl9uYW5kbmZuaG5qbmxubm5xbnNudm55bnxugW6E
-boduim6NbpBulW6Ybptunm6gbqJupG6mbqlurG6vbrFutG63brpuvG6+bsBuxW7HbspuzW7PbtJu127a
-bt1u4m7kbulu627wbvNu9m74bvtu/W8AbwVvCG8Kbw1vEG8TbxZvGW8ebydvLG8ubzNvNm84bztvPm9D
-b0VvR29Mb1FvVG9Wb1tvXW9gb2NvZm9pb2xvbm9xb3Rvd296b31vgG+Cb4dvjG+Rb5NvlW+Yb5tvpG+m
-b6dvsG+zb7RvvW/Ab8Fvym/PAAAAAAAAAgIAAAAAAAANIAAAAAAAAAAAAAAAAAAAb94</bytes>
-		</object>
 	</data>
 </archive>
diff --git a/hw/xquartz/bundle/English.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/English.lproj/main.nib/keyedobjects.nib
index 430610292bd903db47a1bf8b9f351b8395f48c25..5223c9a95ecc5ed438a02c3f6aff0a65e6f8360f 100644
GIT binary patch
literal 35529
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

literal 35390
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


From 4be69e41c07b784f75918141eead70415c0ec4a4 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Mon, 11 Feb 2008 16:03:25 -0500
Subject: [PATCH 471/552] Revert "Bug #8937: Extension setup functions not
 called on server resets"

This reverts commit 5e946dd853a4ebc2722ae023429ce5797de3d7a6.

The devPrivates rework makes this workaround unnecessary.
---
 mi/miinitext.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/mi/miinitext.c b/mi/miinitext.c
index 261fac9fc..3c55eebb3 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -739,16 +739,6 @@ InitExtensions(argc, argv)
 	/* Sort the extensions according the init dependencies. */
 	LoaderSortExtensions();
 	listInitialised = TRUE;
-    } else {
-	/* Call the setup functions on subsequent server resets as well */
-	for (i = 0; ExtensionModuleList[i].name != NULL; i++) {
-	    ext = &ExtensionModuleList[i];
-	    if (ext->setupFunc != NULL &&
-		(ext->disablePtr == NULL ||
-		 (ext->disablePtr != NULL && !*ext->disablePtr))) {
-		(ext->setupFunc)();
-	    }
-	}
     }
 
     for (i = 0; ExtensionModuleList[i].name != NULL; i++) {

From 0d492b2166c4026b9078ffd86d89a31ebe590be4 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 12 Feb 2008 19:59:10 -0500
Subject: [PATCH 472/552] XACE: Move the selection access hook to its own
 function.

---
 Xext/xace.c    | 18 +++++++-----------
 Xext/xace.h    |  4 ++++
 dix/dispatch.c | 10 ++++------
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/Xext/xace.c b/Xext/xace.c
index b2c7e4ab4..e88debc5f 100644
--- a/Xext/xace.c
+++ b/Xext/xace.c
@@ -63,6 +63,13 @@ int XaceHookPropertyAccess(ClientPtr client, WindowPtr pWin,
     return rec.status;
 }
 
+int XaceHookSelectionAccess(ClientPtr client, Atom name, Mask access_mode)
+{
+    XaceSelectionAccessRec rec = { client, name, access_mode, Success };
+    CallCallbacks(&XaceHooks[XACE_SELECTION_ACCESS], &rec);
+    return rec.status;
+}
+
 void XaceHookAuditEnd(ClientPtr ptr, int result)
 {
     XaceAuditRec rec = { ptr, result };
@@ -169,17 +176,6 @@ int XaceHook(int hook, ...)
 	    prv = &rec.status;
 	    break;
 	}
-	case XACE_SELECTION_ACCESS: {
-	    XaceSelectionAccessRec rec = {
-		va_arg(ap, ClientPtr),
-		va_arg(ap, Atom),
-		va_arg(ap, Mask),
-		Success /* default allow */
-	    };
-	    calldata = &rec;
-	    prv = &rec.status;
-	    break;
-	}
 	case XACE_SCREEN_ACCESS:
 	case XACE_SCREENSAVER_ACCESS: {
 	    XaceScreenAccessRec rec = {
diff --git a/Xext/xace.h b/Xext/xace.h
index 6f1f267ad..2016ca322 100644
--- a/Xext/xace.h
+++ b/Xext/xace.h
@@ -69,6 +69,8 @@ extern int XaceHook(
 extern int XaceHookDispatch(ClientPtr ptr, int major);
 extern int XaceHookPropertyAccess(ClientPtr ptr, WindowPtr pWin,
 				  PropertyPtr pProp, Mask access_mode);
+extern int XaceHookSelectionAccess(ClientPtr ptr, Atom name,
+				   Mask access_mode);
 extern void XaceHookAuditEnd(ClientPtr ptr, int result);
 
 /* Register a callback for a given hook.
@@ -106,12 +108,14 @@ extern void XaceCensorImage(
 #define XaceHook(args...) Success
 #define XaceHookDispatch(args...) Success
 #define XaceHookPropertyAccess(args...) Success
+#define XaceHookSelectionAccess(args...) Success
 #define XaceHookAuditEnd(args...) { ; }
 #define XaceCensorImage(args...) { ; }
 #else
 #define XaceHook(...) Success
 #define XaceHookDispatch(...) Success
 #define XaceHookPropertyAccess(...) Success
+#define XaceHookSelectionAccess(...) Success
 #define XaceHookAuditEnd(...) { ; }
 #define XaceCensorImage(...) { ; }
 #endif
diff --git a/dix/dispatch.c b/dix/dispatch.c
index 0bca4417e..3589fba1c 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -995,8 +995,8 @@ ProcSetSelectionOwner(ClientPtr client)
     {
 	int i = 0;
 
-	rc = XaceHook(XACE_SELECTION_ACCESS, client, stuff->selection,
-		      DixSetAttrAccess);
+	rc = XaceHookSelectionAccess(client, stuff->selection,
+				     DixSetAttrAccess);
 	if (rc != Success)
 	    return rc;
 
@@ -1081,8 +1081,7 @@ ProcGetSelectionOwner(ClientPtr client)
 	int rc, i;
         xGetSelectionOwnerReply reply;
 
-	rc = XaceHook(XACE_SELECTION_ACCESS, client, stuff->id,
-		      DixGetAttrAccess);
+	rc = XaceHookSelectionAccess(client, stuff->id, DixGetAttrAccess);
 	if (rc != Success)
 	    return rc;
 
@@ -1127,8 +1126,7 @@ ProcConvertSelection(ClientPtr client)
     rc = dixLookupWindow(&pWin, stuff->requestor, client, DixSetAttrAccess);
     if (rc != Success)
         return rc;
-    rc = XaceHook(XACE_SELECTION_ACCESS, client, stuff->selection,
-		  DixReadAccess);
+    rc = XaceHookSelectionAccess(client, stuff->selection, DixReadAccess);
     if (rc != Success)
 	return rc;
 

From aa5216e89797b600f382c04e3eaa657e808a5c3e Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Thu, 31 Jan 2008 12:05:08 +1100
Subject: [PATCH 473/552] Rip out useless indirection in the callback list
 management.

---
 dix/dixutils.c      | 21 ++++++---------------
 include/dix.h       | 19 -------------------
 include/dixstruct.h |  1 -
 3 files changed, 6 insertions(+), 35 deletions(-)

diff --git a/dix/dixutils.c b/dix/dixutils.c
index dd485d518..aaf510623 100644
--- a/dix/dixutils.c
+++ b/dix/dixutils.c
@@ -816,16 +816,8 @@ _DeleteCallbackList(
     *pcbl = NULL;
 }
 
-static CallbackFuncsRec default_cbfuncs =
-{
-    _AddCallback,
-    _DeleteCallback,
-    _CallCallbacks,
-    _DeleteCallbackList
-};
-
 static Bool
-CreateCallbackList(CallbackListPtr *pcbl, CallbackFuncsPtr cbfuncs)
+CreateCallbackList(CallbackListPtr *pcbl)
 {
     CallbackListPtr  cbl;
     int i;
@@ -833,7 +825,6 @@ CreateCallbackList(CallbackListPtr *pcbl, CallbackFuncsPtr cbfuncs)
     if (!pcbl) return FALSE;
     cbl = (CallbackListPtr) xalloc(sizeof(CallbackListRec));
     if (!cbl) return FALSE;
-    cbl->funcs = cbfuncs ? *cbfuncs : default_cbfuncs;
     cbl->inCallback = 0;
     cbl->deleted = FALSE;
     cbl->numDeleted = 0;
@@ -864,31 +855,31 @@ AddCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, pointer data)
     if (!pcbl) return FALSE;
     if (!*pcbl)
     {	/* list hasn't been created yet; go create it */
-	if (!CreateCallbackList(pcbl, (CallbackFuncsPtr)NULL))
+	if (!CreateCallbackList(pcbl))
 	    return FALSE;
     }
-    return ((*(*pcbl)->funcs.AddCallback) (pcbl, callback, data));
+    return _AddCallback(pcbl, callback, data);
 }
 
 _X_EXPORT Bool 
 DeleteCallback(CallbackListPtr *pcbl, CallbackProcPtr callback, pointer data)
 {
     if (!pcbl || !*pcbl) return FALSE;
-    return ((*(*pcbl)->funcs.DeleteCallback) (pcbl, callback, data));
+    return _DeleteCallback(pcbl, callback, data);
 }
 
 void 
 CallCallbacks(CallbackListPtr *pcbl, pointer call_data)
 {
     if (!pcbl || !*pcbl) return;
-    (*(*pcbl)->funcs.CallCallbacks) (pcbl, call_data);
+    _CallCallbacks(pcbl, call_data);
 }
 
 void
 DeleteCallbackList(CallbackListPtr *pcbl)
 {
     if (!pcbl || !*pcbl) return;
-    (*(*pcbl)->funcs.DeleteCallbackList) (pcbl);
+    _DeleteCallbackList(pcbl);
 }
 
 void 
diff --git a/include/dix.h b/include/dix.h
index 8cfbbc4f6..ec9806aef 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -498,25 +498,6 @@ typedef struct _CallbackList *CallbackListPtr; /* also in misc.h */
 typedef void (*CallbackProcPtr) (
     CallbackListPtr *, pointer, pointer);
 
-typedef Bool (*AddCallbackProcPtr) (
-    CallbackListPtr *, CallbackProcPtr, pointer);
-
-typedef Bool (*DeleteCallbackProcPtr) (
-    CallbackListPtr *, CallbackProcPtr, pointer);
-
-typedef void (*CallCallbacksProcPtr) (
-    CallbackListPtr *, pointer);
-
-typedef void (*DeleteCallbackListProcPtr) (
-    CallbackListPtr *);
-
-typedef struct _CallbackProcs {
-    AddCallbackProcPtr		AddCallback;
-    DeleteCallbackProcPtr	DeleteCallback;
-    CallCallbacksProcPtr	CallCallbacks;
-    DeleteCallbackListProcPtr	DeleteCallbackList;
-} CallbackFuncsRec, *CallbackFuncsPtr;
-
 extern Bool AddCallback(
     CallbackListPtr * /*pcbl*/,
     CallbackProcPtr /*callback*/,
diff --git a/include/dixstruct.h b/include/dixstruct.h
index cbeac48cb..d44b9cfa7 100644
--- a/include/dixstruct.h
+++ b/include/dixstruct.h
@@ -187,7 +187,6 @@ typedef struct _CallbackRec {
 } CallbackRec, *CallbackPtr;
 
 typedef struct _CallbackList {
-  CallbackFuncsRec funcs;
   int inCallback;
   Bool deleted;
   int numDeleted;

From 3eaecdd66e791e0f3d86b23ce10be057ca44c044 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Thu, 31 Jan 2008 21:36:14 +1100
Subject: [PATCH 474/552] Disable Record by default.

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 566ddcbd0..d8b78eadc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -526,7 +526,7 @@ AC_ARG_ENABLE(composite,      AS_HELP_STRING([--disable-composite], [Build Compo
 AC_ARG_ENABLE(mitshm,         AS_HELP_STRING([--disable-shm], [Build SHM extension (default: enabled)]), [MITSHM=$enableval], [MITSHM=yes])
 AC_ARG_ENABLE(xres,           AS_HELP_STRING([--disable-xres], [Build XRes extension (default: enabled)]), [RES=$enableval], [RES=yes])
 AC_ARG_ENABLE(xtrap,          AS_HELP_STRING([--disable-xtrap], [Build XTrap extension (default: enabled)]), [XTRAP=$enableval], [XTRAP=yes])
-AC_ARG_ENABLE(record,         AS_HELP_STRING([--disable-record], [Build Record extension (default: enabled)]), [RECORD=$enableval], [RECORD=yes])
+AC_ARG_ENABLE(record,         AS_HELP_STRING([--disable-record], [Build Record extension (default: disabled)]), [RECORD=$enableval], [RECORD=no])
 AC_ARG_ENABLE(xv,             AS_HELP_STRING([--disable-xv], [Build Xv extension (default: enabled)]), [XV=$enableval], [XV=yes])
 AC_ARG_ENABLE(xvmc,           AS_HELP_STRING([--disable-xvmc], [Build XvMC extension (default: enabled)]), [XVMC=$enableval], [XVMC=yes])
 AC_ARG_ENABLE(dga,            AS_HELP_STRING([--disable-dga], [Build DGA extension (default: auto)]), [DGA=$enableval], [DGA=auto])

From 2ce35f6d45c3e1761d33b786520ff5ba56a3c518 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Thu, 31 Jan 2008 21:39:48 +1100
Subject: [PATCH 475/552] Simplify critical output flushing.

---
 dix/dispatch.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/dix/dispatch.c b/dix/dispatch.c
index 3589fba1c..32efff782 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -424,10 +424,9 @@ Dispatch(void)
 	    while (!isItTimeToYield)
 	    {
 	        if (*icheck[0] != *icheck[1])
-		{
 		    ProcessInputEvents();
-		    FlushIfCriticalOutputPending();
-		}
+		
+		FlushIfCriticalOutputPending();
 #ifdef SMART_SCHEDULE
 		if (!SmartScheduleDisable && 
 		    (SmartScheduleTime - start_tick) >= SmartScheduleSlice)
@@ -483,9 +482,6 @@ Dispatch(void)
 					  client->errorValue, result);
 		    break;
 	        }
-#ifdef DAMAGEEXT
-		FlushIfCriticalOutputPending ();
-#endif
 	    }
 	    FlushAllOutput();
 #ifdef SMART_SCHEDULE

From eb8dc11d19dd0b5354de408578ab0cfb865df672 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Thu, 31 Jan 2008 21:45:14 +1100
Subject: [PATCH 476/552] Remove some MAX* #defines that never get used.

---
 include/misc.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/include/misc.h b/include/misc.h
index e6a5e9eb2..a1cbe8670 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -87,10 +87,7 @@ extern unsigned long serverGeneration;
 #define MAXSCREENS	16
 #endif
 #define MAXCLIENTS	256
-#define MAXDITS		1
-#define MAXEXTENSIONS	128
 #define MAXFORMATS	8
-#define MAXVISUALS_PER_SCREEN 50
 
 typedef unsigned long PIXEL;
 typedef unsigned long ATOM;

From 62cfe8863823c0994f20555cb35ee3bacb9e5225 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 1 Feb 2008 14:57:25 +1100
Subject: [PATCH 477/552] Redact all mention of PanoramiX from user strings.

---
 Xext/panoramiX.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index 311a8e716..75277beaa 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -463,10 +463,8 @@ void PanoramiXExtensionInit(int argc, char *argv[])
 				ProcPanoramiXDispatch,
 				SProcPanoramiXDispatch, PanoramiXResetProc, 
 				StandardMinorOpcode);
-	if (!extEntry) {
-	    ErrorF("PanoramiXExtensionInit(): failed to AddExtension\n");
+	if (!extEntry)
 	    break;
- 	}
 
 	/*
 	 *	First make sure all the basic allocations succeed.  If not,
@@ -514,7 +512,7 @@ void PanoramiXExtensionInit(int argc, char *argv[])
 
     if (!success) {
 	noPanoramiXExtension = TRUE;
-	ErrorF("%s Extension failed to initialize\n", PANORAMIX_PROTOCOL_NAME);
+	ErrorF(PANORAMIX_PROTOCOL_NAME " extension failed to initialize\n");
 	return;
     }
   
@@ -604,14 +602,14 @@ Bool PanoramiXCreateConnectionBlock(void)
      */
 
     if(!PanoramiXNumDepths) {
-	ErrorF("PanoramiX error: Incompatible screens. No common visuals\n");
+	ErrorF("Xinerama error: No common visuals\n");
 	return FALSE;
     }
 
     for(i = 1; i < screenInfo.numScreens; i++) {
 	pScreen = screenInfo.screens[i];
 	if(pScreen->rootDepth != screenInfo.screens[0]->rootDepth) {
-	    ErrorF("PanoramiX error: Incompatible screens. Root window depths differ\n");
+	    ErrorF("Xinerama error: Root window depths differ\n");
 	    return FALSE;
 	}
 	if(pScreen->backingStoreSupport != screenInfo.screens[0]->backingStoreSupport)

From 7c0709a736c0f3aa011de67dd2c2962585ab146e Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 1 Feb 2008 14:59:58 +1100
Subject: [PATCH 478/552] requestingClient is an xprintism, hide it for other
 servers.

---
 dix/dispatch.c  | 4 ++++
 dix/dixfonts.c  | 5 ++++-
 dix/globals.c   | 2 ++
 hw/xnest/Font.c | 2 ++
 include/dix.h   | 2 ++
 5 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/dix/dispatch.c b/dix/dispatch.c
index 32efff782..e8e650a91 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -417,7 +417,9 @@ Dispatch(void)
 	    }
 	    isItTimeToYield = FALSE;
  
+#ifdef XPRINT
             requestingClient = client;
+#endif
 #ifdef SMART_SCHEDULE
 	    start_tick = SmartScheduleTime;
 #endif
@@ -489,7 +491,9 @@ Dispatch(void)
 	    if (client)
 		client->smart_stop_tick = SmartScheduleTime;
 #endif
+#ifdef XPRINT
 	    requestingClient = NULL;
+#endif
 	}
 	dispatchException &= ~DE_PRIORITYCHANGE;
     }
diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index 04f1f1b30..8def6ee21 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -1934,12 +1934,15 @@ GetDefaultPointSize ()
 FontResolutionPtr
 GetClientResolutions (int *num)
 {
+#ifdef XPRINT
     if (requestingClient && requestingClient->fontResFunc != NULL &&
 	!requestingClient->clientGone)
     {
 	return (*requestingClient->fontResFunc)(requestingClient, num);
     }
-    else {
+    else
+#endif
+    {
 	static struct _FontResolution res;
 	ScreenPtr   pScreen;
 
diff --git a/dix/globals.c b/dix/globals.c
index d76b604da..7f95eabd5 100644
--- a/dix/globals.c
+++ b/dix/globals.c
@@ -143,7 +143,9 @@ Bool loadableFonts = FALSE;
 CursorPtr rootCursor;
 Bool blackRoot=FALSE;
 Bool whiteRoot=FALSE;
+#ifdef XPRINT
 ClientPtr requestingClient;	/* XXX this should be obsolete now, remove? */
+#endif
 
 _X_EXPORT TimeStamp currentTime;
 _X_EXPORT TimeStamp lastDeviceEventTime;
diff --git a/hw/xnest/Font.c b/hw/xnest/Font.c
index 72edcee9a..9f30085b1 100644
--- a/hw/xnest/Font.c
+++ b/hw/xnest/Font.c
@@ -44,8 +44,10 @@ xnestRealizeFont(ScreenPtr pScreen, FontPtr pFont)
 
   FontSetPrivate(pFont, xnestFontPrivateIndex, NULL);
 
+#ifdef XPRINT
   if (requestingClient && XpClientIsPrintClient(requestingClient, NULL))
       return True;
+#endif
 
   name_atom = MakeAtom("FONT", 4, True);
   value_atom = 0L;
diff --git a/include/dix.h b/include/dix.h
index ec9806aef..52212e7e7 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -116,7 +116,9 @@ typedef struct _Client *ClientPtr; /* also in misc.h */
 
 typedef struct _WorkQueue	*WorkQueuePtr;
 
+#ifdef XPRINT
 extern ClientPtr requestingClient;
+#endif
 extern ClientPtr *clients;
 extern ClientPtr serverClient;
 extern int currentMaxClients;

From 9113fa3de36e84bbae2727cace82b1cf0d709a86 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 1 Feb 2008 15:03:57 +1100
Subject: [PATCH 479/552] Silence the harmless FreeFontPath error message.

---
 dix/dixfonts.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index 8def6ee21..e9a3f3963 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -1644,9 +1644,6 @@ FreeFontPath(FontPathElementPtr *list, int n, Bool force)
 		    found++;
 	    }
 	    if (list[i]->refcount != found) {
-		ErrorF("FreeFontPath: FPE \"%.*s\" refcount is %d, should be %d; fixing.\n",
-		       list[i]->name_length, list[i]->name,
-		       list[i]->refcount, found);
 		list[i]->refcount = found; /* ensure it will get freed */
 	    }
 	}

From 238b816469355159eea98600ca900e3baa8fa313 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 1 Feb 2008 15:08:03 +1100
Subject: [PATCH 480/552] X.Org Group -> X.Org Foundation

---
 include/site.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/site.h b/include/site.h
index 279cf2d70..fec87070b 100644
--- a/include/site.h
+++ b/include/site.h
@@ -52,7 +52,7 @@ SOFTWARE.
  * server executable.
  */
 #ifndef VENDOR_STRING
-#define VENDOR_STRING "The X.Org Group"
+#define VENDOR_STRING "The X.Org Foundation"
 #endif
 
 /*

From 89d3249c3e7611b22414bc84b10ca60aab4b9a77 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 1 Feb 2008 15:11:27 +1100
Subject: [PATCH 481/552] Silence FreeResource()

---
 dix/resource.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/dix/resource.c b/dix/resource.c
index 6c1b04dc7..f318de3c0 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -535,7 +535,6 @@ FreeResource(XID id, RESTYPE skipDeleteFuncType)
     ResourcePtr *prev, *head;
     int *eltptr;
     int		elements;
-    Bool	gotOne = FALSE;
 
     if (((cid = CLIENT_ID(id)) < MAXCLIENTS) && clientTable[cid].buckets)
     {
@@ -563,15 +562,11 @@ FreeResource(XID id, RESTYPE skipDeleteFuncType)
 		xfree(res);
 		if (*eltptr != elements)
 		    prev = head; /* prev may no longer be valid */
-		gotOne = TRUE;
 	    }
 	    else
 		prev = &res->next;
         }
     }
-    if (!gotOne)
-	ErrorF("Freeing resource id=%lX which isn't there.\n",
-		   (unsigned long)id);
 }
 
 

From b740b865e4c156a40adc6b63fcf215156fc9151a Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 1 Feb 2008 15:16:01 +1100
Subject: [PATCH 482/552] Silence an error message in ConfigureWindow that
 never happens.

---
 dix/window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dix/window.c b/dix/window.c
index 1ccf12603..b896ef742 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -2155,7 +2155,7 @@ WhereDoIGoInTheStack(
 	    return pWin->nextSib;
       default:
       {
-	ErrorF("Internal error in ConfigureWindow, smode == %d\n",smode );
+	/* should never happen; make something up. */
 	return pWin->nextSib;
       }
     }

From f3b3b37ec6197f8884417fbc26630d3a28f2e319 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 1 Feb 2008 15:36:11 +1100
Subject: [PATCH 483/552] Use strerror instead of errno values in user strings.

---
 Xext/xf86bigfont.c                         |  8 ++++----
 hw/dmx/examples/ev.c                       |  2 +-
 hw/kdrive/linux/linux.c                    |  2 +-
 hw/kdrive/src/kmap.c                       |  8 ++++----
 hw/kdrive/vesa/vm86.c                      |  2 +-
 hw/vfb/InitOutput.c                        | 18 +++++++++---------
 hw/xfree86/os-support/bsd/bsd_apm.c        |  2 +-
 hw/xfree86/os-support/bsd/bsd_kqueue_apm.c |  2 +-
 hw/xfree86/os-support/solaris/sun_apm.c    |  6 +++---
 hw/xprint/ps/psout_ftpstype1.c             |  2 +-
 hw/xquartz/darwinKeyboard.c                | 12 ++++++------
 os/WaitFor.c                               |  8 ++++----
 12 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c
index 779f3b940..d5c5704de 100644
--- a/Xext/xf86bigfont.c
+++ b/Xext/xf86bigfont.c
@@ -236,15 +236,15 @@ shmalloc(
     size = (size + pagesize-1) & -pagesize;
     shmid = shmget(IPC_PRIVATE, size, S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH);
     if (shmid == -1) {
-	ErrorF(XF86BIGFONTNAME " extension: shmget() failed, size = %u, errno = %d\n",
-	       size, errno);
+	ErrorF(XF86BIGFONTNAME " extension: shmget() failed, size = %u, %s\n",
+	       size, strerror(errno));
 	xfree(pDesc);
 	return (ShmDescPtr) NULL;
     }
 
     if ((addr = shmat(shmid, 0, 0)) == (char *)-1) {
-	ErrorF(XF86BIGFONTNAME " extension: shmat() failed, size = %u, errno = %d\n",
-	       size, errno);
+	ErrorF(XF86BIGFONTNAME " extension: shmat() failed, size = %u, %s\n",
+	       size, strerror(errno));
 	shmctl(shmid, IPC_RMID, (void *) 0);
 	xfree(pDesc);
 	return (ShmDescPtr) NULL;
diff --git a/hw/dmx/examples/ev.c b/hw/dmx/examples/ev.c
index 10912266d..ba45c2b25 100644
--- a/hw/dmx/examples/ev.c
+++ b/hw/dmx/examples/ev.c
@@ -174,7 +174,7 @@ int main(int argc, char **argv)
                 }
                 printf("\n");
             }
-            printf("rc = %d, errno = %d (%s)\n", rc, errno, strerror(errno));
+            printf("rc = %d, (%s)\n", rc, strerror(errno));
             close(fd);
         }
     }
diff --git a/hw/kdrive/linux/linux.c b/hw/kdrive/linux/linux.c
index 23cd8f59f..258dc7b81 100644
--- a/hw/kdrive/linux/linux.c
+++ b/hw/kdrive/linux/linux.c
@@ -441,7 +441,7 @@ LinuxFini (void)
 	memset (&vts, '\0', sizeof (vts));	/* valgrind */
 	ioctl (fd, VT_GETSTATE, &vts);
 	if (ioctl (fd, VT_DISALLOCATE, vtno) < 0)
-	    fprintf (stderr, "Can't deallocate console %d errno %d\n", vtno, errno);
+	    fprintf (stderr, "Can't deallocate console %d %s\n", vtno, strerror(errno));
 	close (fd);
     }
     return;
diff --git a/hw/kdrive/src/kmap.c b/hw/kdrive/src/kmap.c
index b92c1a84f..ce1e28ae4 100644
--- a/hw/kdrive/src/kmap.c
+++ b/hw/kdrive/src/kmap.c
@@ -132,8 +132,8 @@ KdSetMappedMode (CARD32 addr, CARD32 size, int mode)
 	sentry.type = type;
 	
 	if (ioctl (mtrr, MTRRIOC_ADD_ENTRY, &sentry) < 0)
-	    ErrorF ("MTRRIOC_ADD_ENTRY failed 0x%x 0x%x %d (errno %d)\n",
-		    base, bound - base, type, errno);
+	    ErrorF ("MTRRIOC_ADD_ENTRY failed 0x%x 0x%x %d (%s)\n",
+		    base, bound - base, type, strerror(errno));
     }
 #endif
 }
@@ -171,8 +171,8 @@ KdResetMappedMode (CARD32 addr, CARD32 size, int mode)
 	sentry.type = type;
 	
 	if (ioctl (mtrr, MTRRIOC_DEL_ENTRY, &sentry) < 0)
-	    ErrorF ("MTRRIOC_DEL_ENTRY failed 0x%x 0x%x %d (errno %d)\n",
-		    base, bound - base, type, errno);
+	    ErrorF ("MTRRIOC_DEL_ENTRY failed 0x%x 0x%x %d (%s)\n",
+		    base, bound - base, type, strerror(errno));
     }
 #endif
 }
diff --git a/hw/kdrive/vesa/vm86.c b/hw/kdrive/vesa/vm86.c
index 78fc593a7..0f7bb2262 100644
--- a/hw/kdrive/vesa/vm86.c
+++ b/hw/kdrive/vesa/vm86.c
@@ -567,7 +567,7 @@ vm86_loop(Vm86InfoPtr vi)
                 if(errno == ENOSYS) {
                     ErrorF("No vm86 support.  Are you running on AMD64?\n");
                 } else {
-                    ErrorF("vm86 failed (errno = %d).\n", errno);
+                    ErrorF("vm86 failed (%s).\n", strerror(errno));
                     Vm86Debug(vi);
                 }
             } else {
diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
index a00f7a5bb..1edceb930 100644
--- a/hw/vfb/InitOutput.c
+++ b/hw/vfb/InitOutput.c
@@ -179,8 +179,8 @@ ddxGiveUp()
 	    if (-1 == unlink(vfbScreens[i].mmap_file))
 	    {
 		perror("unlink");
-		ErrorF("unlink %s failed, errno %d",
-		       vfbScreens[i].mmap_file, errno);
+		ErrorF("unlink %s failed, %s",
+		       vfbScreens[i].mmap_file, strerror(errno));
 	    }
 	}
 	break;
@@ -196,7 +196,7 @@ ddxGiveUp()
 	    if (-1 == shmdt((char *)vfbScreens[i].pXWDHeader))
 	    {
 		perror("shmdt");
-		ErrorF("shmdt failed, errno %d", errno);
+		ErrorF("shmdt failed, %s", strerror(errno));
 	    }
 	}
 	break;
@@ -582,7 +582,7 @@ vfbBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadmask)
 #endif
 	{
 	    perror("msync");
-	    ErrorF("msync failed, errno %d", errno);
+	    ErrorF("msync failed, %s", strerror(errno));
 	}
     }
 }
@@ -605,7 +605,7 @@ vfbAllocateMmappedFramebuffer(vfbScreenInfoPtr pvfb)
     if (-1 == (pvfb->mmap_fd = open(pvfb->mmap_file, O_CREAT|O_RDWR, 0666)))
     {
 	perror("open");
-	ErrorF("open %s failed, errno %d", pvfb->mmap_file, errno);
+	ErrorF("open %s failed, %s", pvfb->mmap_file, strerror(errno));
 	return;
     }
 
@@ -621,7 +621,7 @@ vfbAllocateMmappedFramebuffer(vfbScreenInfoPtr pvfb)
 	if (-1 == write(pvfb->mmap_fd, dummyBuffer, writeThisTime))
 	{
 	    perror("write");
-	    ErrorF("write %s failed, errno %d", pvfb->mmap_file, errno);
+	    ErrorF("write %s failed, %s", pvfb->mmap_file, strerror(errno));
 	    return;
 	}
     }
@@ -635,7 +635,7 @@ vfbAllocateMmappedFramebuffer(vfbScreenInfoPtr pvfb)
     if (-1 == (long)pvfb->pXWDHeader)
     {
 	perror("mmap");
-	ErrorF("mmap %s failed, errno %d", pvfb->mmap_file, errno);
+	ErrorF("mmap %s failed, %s", pvfb->mmap_file, strerror(errno));
 	pvfb->pXWDHeader = NULL;
 	return;
     }
@@ -659,7 +659,7 @@ vfbAllocateSharedMemoryFramebuffer(vfbScreenInfoPtr pvfb)
     if (pvfb->shmid < 0)
     {
 	perror("shmget");
-	ErrorF("shmget %d bytes failed, errno %d", pvfb->sizeInBytes, errno);
+	ErrorF("shmget %d bytes failed, %s", pvfb->sizeInBytes, strerror(errno));
 	return;
     }
 
@@ -669,7 +669,7 @@ vfbAllocateSharedMemoryFramebuffer(vfbScreenInfoPtr pvfb)
     if (-1 == (long)pvfb->pXWDHeader)
     {
 	perror("shmat");
-	ErrorF("shmat failed, errno %d", errno);
+	ErrorF("shmat failed, %s", strerror(errno));
 	pvfb->pXWDHeader = NULL; 
 	return;
     }
diff --git a/hw/xfree86/os-support/bsd/bsd_apm.c b/hw/xfree86/os-support/bsd/bsd_apm.c
index 61779875c..43eda7421 100644
--- a/hw/xfree86/os-support/bsd/bsd_apm.c
+++ b/hw/xfree86/os-support/bsd/bsd_apm.c
@@ -66,7 +66,7 @@ bsdPMGetEventFromOS(int fd, pmEvent *events, int num)
 	if (ioctl(fd, APM_IOC_NEXTEVENT, &bsdEvent) < 0) {
 	    if (errno != EAGAIN) {
 		xf86Msg(X_WARNING, "bsdPMGetEventFromOS: APM_IOC_NEXTEVENT"
-			" errno = %d\n", errno);
+			" %s\n", strerror(errno));
 	    }
 	    break;
 	}
diff --git a/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c b/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c
index b0171e2c3..b37070c37 100644
--- a/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c
+++ b/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c
@@ -102,7 +102,7 @@ bsdPMGetEventFromOS(int kq, pmEvent *events, int num)
 	    break;
 	} else if (result < 0) {
 	    xf86Msg(X_WARNING, "bsdPMGetEventFromOS: kevent returns"
-		    " errno = %d\n", errno);
+		    " %s\n", strerror(errno));
 	    break;
 	}
 	events[i] = bsdToXF86(APM_EVENT_TYPE(ev.data));
diff --git a/hw/xfree86/os-support/solaris/sun_apm.c b/hw/xfree86/os-support/solaris/sun_apm.c
index a9657fd55..7decc900f 100644
--- a/hw/xfree86/os-support/solaris/sun_apm.c
+++ b/hw/xfree86/os-support/solaris/sun_apm.c
@@ -149,7 +149,7 @@ sunPMGetEventFromOS(int fd, pmEvent *events, int num)
 	if (ioctl(fd, APM_IOC_NEXTEVENT, &sunEvent) < 0) {
 	    if (errno != EAGAIN) {
 		xf86Msg(X_WARNING, "sunPMGetEventFromOS: APM_IOC_NEXTEVENT"
-			" errno = %d\n", errno);
+			" %s\n", strerror(errno));
 	    }
 	    break;
 	}
@@ -178,7 +178,7 @@ sunPMConfirmEventToOs(int fd, pmEvent event)
             return PM_CONTINUE;
         else {
 	    xf86Msg(X_WARNING, "sunPMConfirmEventToOs: APM_IOC_SUSPEND"
-		" errno = %d\n", errno);
+		" %s\n", strerror(errno));
             return PM_FAILED;
 	}
       case XF86_APM_STANDBY_RESUME:
@@ -191,7 +191,7 @@ sunPMConfirmEventToOs(int fd, pmEvent event)
             return PM_CONTINUE;
         else {
 	    xf86Msg(X_WARNING, "sunPMConfirmEventToOs: APM_IOC_RESUME"
-		" errno = %d\n", errno);
+		" %s\n", strerror(errno));
             return PM_FAILED;
 	}
       default:
diff --git a/hw/xprint/ps/psout_ftpstype1.c b/hw/xprint/ps/psout_ftpstype1.c
index 2d40c186a..572e13601 100644
--- a/hw/xprint/ps/psout_ftpstype1.c
+++ b/hw/xprint/ps/psout_ftpstype1.c
@@ -124,7 +124,7 @@ int PsOut_DownloadFreeType1(PsOutPtr self, const char *psfontname, FontPtr pFont
   switch(childpid)
   {
     case -1:
-        FatalError("PS DDX internal error: Cannot fork() converter child process, errno=%d\n", (int)errno);
+        FatalError("PS DDX internal error: Cannot fork() converter child process, %s\n", strerror(errno));
         break;
     case 0: /* child */
         fclose(self->Fp);
diff --git a/hw/xquartz/darwinKeyboard.c b/hw/xquartz/darwinKeyboard.c
index b368fe9d9..8d1ee8ec9 100644
--- a/hw/xquartz/darwinKeyboard.c
+++ b/hw/xquartz/darwinKeyboard.c
@@ -344,13 +344,13 @@ static Bool DarwinReadKeymapFile(NXKeyMapping *keyMap) {
 
     fref = fopen( darwinKeymapFile, "rb" );
     if (fref == NULL) {
-        ErrorF("Unable to open keymapping file '%s' (errno %d).\n",
-               darwinKeymapFile, errno);
+        ErrorF("Unable to open keymapping file '%s' (%s).\n",
+               darwinKeymapFile, strerror(errno));
         return FALSE;
     }
     if (fstat(fileno(fref), &st) == -1) {
-        ErrorF("Could not stat keymapping file '%s' (errno %d).\n",
-               darwinKeymapFile, errno);
+        ErrorF("Could not stat keymapping file '%s' (%s).\n",
+               darwinKeymapFile, strerror(errno));
         return FALSE;
     }
 
@@ -364,8 +364,8 @@ static Bool DarwinReadKeymapFile(NXKeyMapping *keyMap) {
     inBuffer = (char*) xalloc( st.st_size );
     bufferEnd = (int *) (inBuffer + st.st_size);
     if (fread(inBuffer, st.st_size, 1, fref) != 1) {
-        ErrorF("Could not read %qd bytes from keymapping file '%s' (errno %d).\n",
-               st.st_size, darwinKeymapFile, errno);
+        ErrorF("Could not read %qd bytes from keymapping file '%s' (%s).\n",
+               st.st_size, darwinKeymapFile, strerror(errno));
         return FALSE;
     }
 
diff --git a/os/WaitFor.c b/os/WaitFor.c
index c58f24888..36e01ca38 100644
--- a/os/WaitFor.c
+++ b/os/WaitFor.c
@@ -254,13 +254,13 @@ WaitForSomething(int *pClientsReady)
 		}
 		else if (selecterr == EINVAL)
 		{
-		    FatalError("WaitForSomething(): select: errno=%d\n",
-			selecterr);
+		    FatalError("WaitForSomething(): select: %s\n",
+			strerror(selecterr));
             }
 		else if (selecterr != EINTR && selecterr != EAGAIN)
 		{
-		    ErrorF("WaitForSomething(): select: errno=%d\n",
-			selecterr);
+		    ErrorF("WaitForSomething(): select: %s\n",
+			strerror(selecterr));
 		}
 	    }
 #ifdef SMART_SCHEDULE

From ef77e4c4419703b5a802f3eee92476a43f788a86 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 1 Feb 2008 16:03:01 +1100
Subject: [PATCH 484/552] Remove useless commentary from environment and
 argument processing.

---
 os/utils.c | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/os/utils.c b/os/utils.c
index 22f9541f5..4041028a3 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -2002,18 +2002,6 @@ enum BadCode {
 #define BUGADDRESS "xorg@freedesktop.org"
 #endif
 
-#define ARGMSG \
-    "\nIf the arguments used are valid, and have been rejected incorrectly\n" \
-      "please send details of the arguments and why they are valid to\n" \
-      "%s.  In the meantime, you can start the Xserver as\n" \
-      "the \"super user\" (root).\n"   
-
-#define ENVMSG \
-    "\nIf the environment is valid, and have been rejected incorrectly\n" \
-      "please send details of the environment and why it is valid to\n" \
-      "%s.  In the meantime, you can start the Xserver as\n" \
-      "the \"super user\" (root).\n"
-
 void
 CheckUserParameters(int argc, char **argv, char **envp)
 {
@@ -2060,10 +2048,6 @@ CheckUserParameters(int argc, char **argv, char **envp)
 		/* Check for bad environment variables and values */
 #if REMOVE_ENV_LD
 		while (envp[i] && (strncmp(envp[i], "LD", 2) == 0)) {
-#ifdef ENVDEBUG
-		    ErrorF("CheckUserParameters: removing %s from the "
-			   "environment\n", strtok(envp[i], "="));
-#endif
 		    for (j = i; envp[j]; j++) {
 			envp[j] = envp[j+1];
 		    }
@@ -2071,10 +2055,6 @@ CheckUserParameters(int argc, char **argv, char **envp)
 #endif   
 		if (envp[i] && (strlen(envp[i]) > MAX_ENV_LENGTH)) {
 #if REMOVE_LONG_ENV
-#ifdef ENVDEBUG
-		    ErrorF("CheckUserParameters: removing %s from the "
-			   "environment\n", strtok(envp[i], "="));
-#endif
 		    for (j = i; envp[j]; j++) {
 			envp[j] = envp[j+1];
 		    }
@@ -2127,20 +2107,16 @@ CheckUserParameters(int argc, char **argv, char **envp)
 	return;
     case UnsafeArg:
 	ErrorF("Command line argument number %d is unsafe\n", i);
-	ErrorF(ARGMSG, BUGADDRESS);
 	break;
     case ArgTooLong:
 	ErrorF("Command line argument number %d is too long\n", i);
-	ErrorF(ARGMSG, BUGADDRESS);
 	break;
     case UnprintableArg:
 	ErrorF("Command line argument number %d contains unprintable"
 		" characters\n", i);
-	ErrorF(ARGMSG, BUGADDRESS);
 	break;
     case EnvTooLong:
 	ErrorF("Environment variable `%s' is too long\n", e);
-	ErrorF(ENVMSG, BUGADDRESS);
 	break;
     case OutputIsPipe:
 	ErrorF("Stdout and/or stderr is a pipe\n");
@@ -2150,8 +2126,6 @@ CheckUserParameters(int argc, char **argv, char **envp)
 	break;
     default:
 	ErrorF("Unknown error\n");
-	ErrorF(ARGMSG, BUGADDRESS);
-	ErrorF(ENVMSG, BUGADDRESS);
 	break;
     }
     FatalError("X server aborted because of unsafe environment\n");

From 2aaf6ac134fa9f61984b1c03929c7b596c971cc8 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 1 Feb 2008 16:10:23 +1100
Subject: [PATCH 485/552] Don't even attempt to parse -bpp in xfree86 DDX
 option parsing.

This hasn't been valid since 1999.  Get with the times, man.
---
 hw/xfree86/common/xf86Init.c | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index d12b6bd6a..a3ddfd0b9 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -1566,15 +1566,6 @@ ddxProcessArgument(int argc, char **argv, int i)
     xf86sFlag = TRUE;
     return 0;
   }
-  if (!strcmp(argv[i], "-bpp"))
-  {
-    ErrorF("The -bpp option is no longer supported.\n"
-	"\tUse -depth to set the color depth, and use -fbbpp if you really\n"
-	"\tneed to force a non-default framebuffer (hardware) pixel format.\n");
-    if (++i >= argc)
-      return 1;
-    return 2;
-  }
   if (!strcmp(argv[i], "-pixmap24"))
   {
     xf86Pix24 = Pix24Use24;

From 24089b06243101b1bff4f2fd79fcbfd6a93992d5 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 1 Feb 2008 16:11:13 +1100
Subject: [PATCH 486/552] Don't bother warning people about the keyboard driver
 rename, just do it.

---
 hw/xfree86/common/xf86Init.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index a3ddfd0b9..2a7ecfdc8 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -1135,12 +1135,6 @@ InitInput(argc, argv)
 	for (pDev = xf86ConfigLayout.inputs; pDev && *pDev; pDev++) {
 	    /* Replace obsolete keyboard driver with kbd */
 	    if (!xf86NameCmp((*pDev)->driver, "keyboard")) {
-		xf86MsgVerb(X_WARNING, 0,
-			    "*** WARNING the legacy keyboard driver \"%s\" has been removed\n",
-			    (*pDev)->driver);
-		xf86MsgVerb(X_WARNING, 0,
-			    "*** Using the new \"kbd\" driver for \"%s\".\n",
-			    (*pDev)->identifier);
 		strcpy((*pDev)->driver, "kbd");
             }
 

From 0bdd20a0454c94f902fd4874855125bf7510fcf5 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 1 Feb 2008 16:15:58 +1100
Subject: [PATCH 487/552] Eradicate the VTInit code.

"This option should rarely be used."  Never sounds like a better idea.
---
 hw/xfree86/common/xf86Config.c       |  5 ----
 hw/xfree86/common/xf86Globals.c      |  1 -
 hw/xfree86/common/xf86Init.c         | 42 ----------------------------
 hw/xfree86/common/xf86Privstr.h      |  1 -
 hw/xfree86/doc/man/xorg.conf.man.pre | 11 --------
 hw/xfree86/parser/xf86tokens.h       |  1 -
 6 files changed, 61 deletions(-)

diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 622c31850..605c6b347 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -733,7 +733,6 @@ typedef enum {
     FLAG_DISABLEMODINDEV,
     FLAG_MODINDEVALLOWNONLOCAL,
     FLAG_ALLOWMOUSEOPENFAIL,
-    FLAG_VTINIT,
     FLAG_VTSYSREQ,
     FLAG_XKBDISABLE,
     FLAG_PCIPROBE1,
@@ -785,8 +784,6 @@ static OptionInfoRec FlagOptions[] = {
 	{0}, FALSE },
   { FLAG_ALLOWMOUSEOPENFAIL,	"AllowMouseOpenFail",		OPTV_BOOLEAN,
 	{0}, FALSE },
-  { FLAG_VTINIT,		"VTInit",			OPTV_STRING,
-	{0}, FALSE },
   { FLAG_VTSYSREQ,		"VTSysReq",			OPTV_BOOLEAN,
 	{0}, FALSE },
   { FLAG_XKBDISABLE,		"XkbDisable",			OPTV_BOOLEAN,
@@ -977,8 +974,6 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
 #endif
     }
 
-    xf86Info.vtinit = xf86GetOptValString(FlagOptions, FLAG_VTINIT);
-
     if (xf86IsOptionSet(FlagOptions, FLAG_PCIPROBE1))
 	xf86Info.pciFlags = PCIProbe1;
     if (xf86IsOptionSet(FlagOptions, FLAG_PCIPROBE2))
diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
index d796d627c..ba603f4df 100644
--- a/hw/xfree86/common/xf86Globals.c
+++ b/hw/xfree86/common/xf86Globals.c
@@ -97,7 +97,6 @@ InputInfoPtr xf86InputDevs = NULL;
 xf86InfoRec xf86Info = {
 	-1,		/* consoleFd */
 	-1,		/* vtno */
-	NULL,		/* vtinit */
 	FALSE,		/* vtSysreq */
 	SKWhenNeeded,	/* ddxSpecialKeys */
 	NULL,		/* pMouse */
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 2a7ecfdc8..41cf1d17c 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -102,7 +102,6 @@ static void xf86PrintBanner(void);
 static void xf86PrintMarkers(void);
 static void xf86PrintDefaultModulePath(void);
 static void xf86PrintDefaultLibraryPath(void);
-static void xf86RunVtInit(void);
 
 static Bool probe_devices_from_device_sections(DriverPtr drvp);
 static Bool add_matching_devices_to_configure_list(DriverPtr drvp);
@@ -238,9 +237,6 @@ PostConfigInit(void)
     xf86OSPMClose = xf86OSPMOpen();
 #endif
     
-    /* Run an external VT Init program if specified in the config file */
-    xf86RunVtInit();
-
     /* Do this after XF86Config is read (it's normally in OsInit()) */
     OsInitColors();
 }
@@ -1915,44 +1911,6 @@ xf86PrintDefaultLibraryPath(void)
   ErrorF("%s\n", DEFAULT_LIBRARY_PATH);
 }
 
-static void
-xf86RunVtInit(void)
-{
-    int i;
-
-    /*
-     * If VTInit was set, run that program with consoleFd as stdin and stdout
-     */
-
-    if (xf86Info.vtinit) {
-      switch(fork()) {
-      case -1:
-          FatalError("xf86RunVtInit: fork failed (%s)\n", strerror(errno));
-          break;
-      case 0:  /* child */
-	  if (setuid(getuid()) == -1) {
-	      xf86Msg(X_ERROR, "xf86RunVtInit: setuid failed (%s)\n",
-			 strerror(errno));
-	      exit(255);
-	  }
-          /* set stdin, stdout to the consoleFd */
-          for (i = 0; i < 2; i++) {
-            if (xf86Info.consoleFd != i) {
-              close(i);
-              dup(xf86Info.consoleFd);
-            }
-          }
-          execl("/bin/sh", "sh", "-c", xf86Info.vtinit, (void *)NULL);
-          xf86Msg(X_WARNING, "exec of /bin/sh failed for VTInit (%s)\n",
-                 strerror(errno));
-          exit(255);
-          break;
-      default:  /* parent */
-          wait(NULL);
-      }
-    }
-}
-
 /*
  * xf86LoadModules iterates over a list that is being passed in.
  */             
diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h
index 92a6305a0..d97ca440e 100644
--- a/hw/xfree86/common/xf86Privstr.h
+++ b/hw/xfree86/common/xf86Privstr.h
@@ -75,7 +75,6 @@ typedef enum {
 typedef struct {
     int			consoleFd;
     int			vtno;
-    char *		vtinit;
     Bool		vtSysreq;
     SpecialKeysInDDX	ddxSpecialKeys;
 
diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
index 608ba37ed..96f30c4bd 100644
--- a/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -507,17 +507,6 @@ This allows the server to start up even if the mouse device can't be
 opened/initialised.
 Default: false.
 .TP 7
-.BI "Option \*qVTInit\*q  \*q" command \*q
-Runs
-.I command
-after the VT used by the server has been opened.
-The command string is passed to \*q/bin/sh \-c\*q, and is run with the real
-user's id with stdin and stdout set to the VT.
-The purpose of this option is to allow system dependent VT initialisation
-commands to be run.
-This option should rarely be needed.
-Default: not set.
-.TP 7
 .BI "Option \*qVTSysReq\*q  \*q" boolean \*q
 enables the SYSV\-style VT switch sequence for non\-SYSV systems
 which support VT switching.
diff --git a/hw/xfree86/parser/xf86tokens.h b/hw/xfree86/parser/xf86tokens.h
index 786dac145..6e4fdeab5 100644
--- a/hw/xfree86/parser/xf86tokens.h
+++ b/hw/xfree86/parser/xf86tokens.h
@@ -208,7 +208,6 @@ typedef enum {
     XKBVARIANT,
     XKBOPTIONS,
     /* The next two have become ServerFlags options */
-    VTINIT,
     VTSYSREQ,
     /* Obsolete keyboard tokens */
     SERVERNUM,

From e91ff09568c5579818b6641e88e95c6fe122cbe7 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 1 Feb 2008 17:21:34 +1100
Subject: [PATCH 488/552] Friends don't let friends call xf86AddModuleInfo.

That code only existed to leak memory.  It can go now, thanks.
---
 hw/xfree86/common/xf86.h        |  4 ++--
 hw/xfree86/common/xf86Globals.c |  2 --
 hw/xfree86/common/xf86Helper.c  | 24 ++----------------------
 hw/xfree86/common/xf86Priv.h    |  3 ---
 hw/xfree86/common/xf86str.h     |  2 +-
 hw/xfree86/exa/examodule.c      | 26 +-------------------------
 hw/xfree86/loader/xf86sym.c     |  2 --
 hw/xfree86/xaa/xaaInitAccel.c   | 26 +-------------------------
 8 files changed, 7 insertions(+), 82 deletions(-)

diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index 4e7d914bf..4b3e10463 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -337,8 +337,8 @@ int  xf86RegisterRootWindowProperty(int ScrnIndex, Atom	property, Atom type,
 				    pointer value);
 Bool xf86IsUnblank(int mode);
 
-void xf86AddModuleInfo(ModuleInfoPtr info, pointer module);
-void xf86DeleteModuleInfo(int idx);
+_X_DEPRECATED void xf86AddModuleInfo(pointer info, pointer module);
+_X_DEPRECATED void xf86DeleteModuleInfo(int idx);
 void xf86getsecs(long *, long *);
 
 /* xf86Debug.c */
diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
index ba603f4df..0dc42c66b 100644
--- a/hw/xfree86/common/xf86Globals.c
+++ b/hw/xfree86/common/xf86Globals.c
@@ -153,8 +153,6 @@ DriverPtr *xf86DriverList = NULL;
 int xf86NumDrivers = 0;
 InputDriverPtr *xf86InputDriverList = NULL;
 int xf86NumInputDrivers = 0;
-ModuleInfoPtr *xf86ModuleInfoList = NULL;
-int xf86NumModuleInfos = 0;
 int xf86NumScreens = 0;
 
 const char *xf86VisualNames[] = {
diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index ec524e63c..8978f8206 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -170,37 +170,17 @@ xf86LookupInput(const char *name)
     return NULL;
 }
 
+/* ABI stubs of despair */
 _X_EXPORT void
-xf86AddModuleInfo(ModuleInfoPtr info, pointer module)
+xf86AddModuleInfo(pointer info, pointer module)
 {
-    /* Don't add null entries */
-    if (!module)
-	return;
-
-    if (xf86ModuleInfoList == NULL)
-	xf86NumModuleInfos = 0;
-
-    xf86NumModuleInfos++;
-    xf86ModuleInfoList = xnfrealloc(xf86ModuleInfoList,
-				    xf86NumModuleInfos * sizeof(ModuleInfoPtr));
-    xf86ModuleInfoList[xf86NumModuleInfos - 1] = xnfalloc(sizeof(ModuleInfoRec));
-    *xf86ModuleInfoList[xf86NumModuleInfos - 1] = *info;
-    xf86ModuleInfoList[xf86NumModuleInfos - 1]->module = module;
-    xf86ModuleInfoList[xf86NumModuleInfos - 1]->refCount = 0;
 }
 
 _X_EXPORT void
 xf86DeleteModuleInfo(int idx)
 {
-    if (xf86ModuleInfoList[idx]) {
-	if (xf86ModuleInfoList[idx]->module)
-	    UnloadModule(xf86ModuleInfoList[idx]->module);
-	xfree(xf86ModuleInfoList[idx]);
-	xf86ModuleInfoList[idx] = NULL;
-    }
 }
 
-
 /* Allocate a new ScrnInfoRec in xf86Screens */
 
 _X_EXPORT ScrnInfoPtr
diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
index 4723f5aba..32801cb3f 100644
--- a/hw/xfree86/common/xf86Priv.h
+++ b/hw/xfree86/common/xf86Priv.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1997-2002 by The XFree86 Project, Inc.
  *
@@ -97,8 +96,6 @@ extern Bool xf86SupportedMouseTypes[];
 extern int xf86NumMouseTypes;
 
 extern DriverPtr *xf86DriverList;
-extern ModuleInfoPtr *xf86ModuleInfoList;
-extern int xf86NumModuleInfos;
 extern int xf86NumDrivers;
 extern Bool xf86Resetting;
 extern Bool xf86Initialising;
diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
index 2e0213597..fc94284cb 100644
--- a/hw/xfree86/common/xf86str.h
+++ b/hw/xfree86/common/xf86str.h
@@ -348,7 +348,7 @@ typedef struct _DriverRec {
  * functions to configuration tools, the Xserver, or any other
  * application/module interested in such information.
  */
-typedef struct _ModuleInfoRec {
+_X_DEPRECATED typedef struct _ModuleInfoRec {
     int			moduleVersion;
     char *		moduleName;
     pointer		module;
diff --git a/hw/xfree86/exa/examodule.c b/hw/xfree86/exa/examodule.c
index b8d306eb4..086639cc5 100644
--- a/hw/xfree86/exa/examodule.c
+++ b/hw/xfree86/exa/examodule.c
@@ -178,8 +178,6 @@ exaDDXDriverInit(ScreenPtr pScreen)
     
 }
 
-static MODULESETUPPROTO(exaSetup);
-
 /*ARGSUSED*/
 static const OptionInfoRec *
 EXAAvailableOptions(void *unused)
@@ -201,26 +199,4 @@ static XF86ModuleVersionInfo exaVersRec =
 	{0,0,0,0}
 };
 
-_X_EXPORT XF86ModuleData exaModuleData = { &exaVersRec, exaSetup, NULL };
-
-static ModuleInfoRec EXA = {
-    1,
-    "EXA",
-    NULL,
-    0,
-    EXAAvailableOptions,
-};
-
-/*ARGSUSED*/
-static pointer
-exaSetup(pointer Module, pointer Options, int *ErrorMajor, int *ErrorMinor)
-{
-    static Bool Initialised = FALSE;
-
-    if (!Initialised) {
-	Initialised = TRUE;
-	xf86AddModuleInfo(&EXA, Module);
-    }
-
-    return (pointer)TRUE;
-}
+_X_EXPORT XF86ModuleData exaModuleData = { &exaVersRec, NULL, NULL };
diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c
index 623e87ab5..754e9c06b 100644
--- a/hw/xfree86/loader/xf86sym.c
+++ b/hw/xfree86/loader/xf86sym.c
@@ -479,8 +479,6 @@ _X_HIDDEN void *xfree86LookupTab[] = {
     SYMFUNC(xf86IsScreenPrimary)
     SYMFUNC(xf86RegisterRootWindowProperty)
     SYMFUNC(xf86IsUnblank)
-    SYMFUNC(xf86AddModuleInfo)
-    SYMFUNC(xf86DeleteModuleInfo)
 
 #if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__)
     /* xf86sbusBus.c */
diff --git a/hw/xfree86/xaa/xaaInitAccel.c b/hw/xfree86/xaa/xaaInitAccel.c
index fe0b70a14..1b7c15487 100644
--- a/hw/xfree86/xaa/xaaInitAccel.c
+++ b/hw/xfree86/xaa/xaaInitAccel.c
@@ -93,8 +93,6 @@ static const OptionInfoRec XAAOptions[] = {
 				OPTV_NONE,	{0}, FALSE }
 };
 
-static MODULESETUPPROTO(xaaSetup);
-
 static XF86ModuleVersionInfo xaaVersRec =
 {
 	"xaa",
@@ -109,29 +107,7 @@ static XF86ModuleVersionInfo xaaVersRec =
 	{0,0,0,0}
 };
 
-_X_EXPORT XF86ModuleData xaaModuleData = { &xaaVersRec, xaaSetup, NULL };
-
-ModuleInfoRec XAA = {
-    1,
-    "XAA",
-    NULL,
-    0,
-    XAAAvailableOptions,
-};
-
-/*ARGSUSED*/
-static pointer
-xaaSetup(pointer Module, pointer Options, int *ErrorMajor, int *ErrorMinor)
-{
-    static Bool Initialised = FALSE;
-
-    if (!Initialised) {
-	Initialised = TRUE;
-	xf86AddModuleInfo(&XAA, Module);
-    }
-
-    return (pointer)TRUE;
-}
+_X_EXPORT XF86ModuleData xaaModuleData = { &xaaVersRec, NULL, NULL };
 
 /*ARGSUSED*/
 static const OptionInfoRec *

From f750ce53ac450824d0c792d11eafdf311cf8abc0 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 1 Feb 2008 17:33:48 +1100
Subject: [PATCH 489/552] Remove some braindamage from ModuleDesc.

Yay dead code elimination.
---
 hw/xfree86/common/xf86Helper.c  |  1 -
 hw/xfree86/loader/loaderProcs.h |  6 ------
 hw/xfree86/loader/loadmod.c     | 21 ---------------------
 3 files changed, 28 deletions(-)

diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index 8978f8206..1368d04ab 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 1997-2003 by The XFree86 Project, Inc.
  *
diff --git a/hw/xfree86/loader/loaderProcs.h b/hw/xfree86/loader/loaderProcs.h
index b71ad4590..9c73db3a6 100644
--- a/hw/xfree86/loader/loaderProcs.h
+++ b/hw/xfree86/loader/loaderProcs.h
@@ -62,17 +62,11 @@ typedef struct module_desc {
     struct module_desc *child;
     struct module_desc *sib;
     struct module_desc *parent;
-    struct module_desc *demand_next;
     char *name;
-    char *filename;
-    char *identifier;
-    XID client_id;
-    int in_use;
     int handle;
     ModuleSetupProc SetupProc;
     ModuleTearDownProc TearDownProc;
     void *TearDownData;		/* returned from SetupProc */
-    const char *path;
     const XF86ModuleVersionInfo *VersionInfo;
 } ModuleDesc, *ModuleDescPtr;
 
diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c
index 45e9cb374..650dcf35c 100644
--- a/hw/xfree86/loader/loadmod.c
+++ b/hw/xfree86/loader/loadmod.c
@@ -786,12 +786,7 @@ NewModuleDesc(const char *name)
 	mdp->child = NULL;
 	mdp->sib = NULL;
 	mdp->parent = NULL;
-	mdp->demand_next = NULL;
 	mdp->name = xstrdup(name);
-	mdp->filename = NULL;
-	mdp->identifier = NULL;
-	mdp->client_id = 0;
-	mdp->in_use = 0;
 	mdp->handle = -1;
 	mdp->SetupProc = NULL;
 	mdp->TearDownProc = NULL;
@@ -816,15 +811,10 @@ DuplicateModule(ModuleDescPtr mod, ModuleDescPtr parent)
     if (LoaderHandleOpen(mod->handle) == -1)
 	return NULL;
 
-    ret->filename = xstrdup(mod->filename);
-    ret->identifier = mod->identifier;
-    ret->client_id = mod->client_id;
-    ret->in_use = mod->in_use;
     ret->handle = mod->handle;
     ret->SetupProc = mod->SetupProc;
     ret->TearDownProc = mod->TearDownProc;
     ret->TearDownData = NULL;
-    ret->path = mod->path;
     ret->child = DuplicateModule(mod->child, ret);
     ret->sib = DuplicateModule(mod->sib, parent);
     ret->parent = parent;
@@ -943,8 +933,6 @@ doLoadModule(const char *module, const char *path, const char **subdirlist,
     if (ret->handle < 0)
 	goto LoadModule_fail;
 
-    ret->filename = xstrdup(found);
-
     /* drop any explicit suffix from the module name */
     p = strchr(name, '.');
     if (p)
@@ -998,7 +986,6 @@ doLoadModule(const char *module, const char *path, const char **subdirlist,
 	    ret->SetupProc = setup;
 	if (teardown)
 	    ret->TearDownProc = teardown;
-	ret->path = path;
 	ret->VersionInfo = vers;
     } else {
 	/* No initdata is OK for external modules */
@@ -1120,7 +1107,6 @@ UnloadModuleOrDriver(ModuleDescPtr mod)
     if (mod->sib)
 	UnloadModuleOrDriver(mod->sib);
     TestFree(mod->name);
-    TestFree(mod->filename);
     xfree(mod);
 #ifdef __alpha__
     istream_mem_barrier();
@@ -1145,7 +1131,6 @@ UnloadSubModule(ModuleDescPtr mod)
 	UnloadModuleOrDriver(mod->child);
 
     TestFree(mod->name);
-    TestFree(mod->filename);
     xfree(mod);
 }
 
@@ -1156,12 +1141,6 @@ FreeModuleDesc(ModuleDescPtr head)
 
     if (head == (ModuleDescPtr) 1)
 	return;
-    /*
-     * only free it if it's not marked as in use. In use means that it may
-     * be unloaded someday, and UnloadModule will free it
-     */
-    if (head->in_use)
-	return;
     if (head->child)
 	FreeModuleDesc(head->child);
     sibs = head;

From ba69904148acf755bec8fbda2eb869144f0ef7d4 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Sun, 3 Feb 2008 22:49:23 +1100
Subject: [PATCH 490/552] Simplify dlloader a bit more.

---
 hw/xfree86/loader/dlloader.c | 43 ++++++++++++++----------------------
 1 file changed, 16 insertions(+), 27 deletions(-)

diff --git a/hw/xfree86/loader/dlloader.c b/hw/xfree86/loader/dlloader.c
index 2afdef789..4caefd071 100644
--- a/hw/xfree86/loader/dlloader.c
+++ b/hw/xfree86/loader/dlloader.c
@@ -71,15 +71,9 @@
 #define DLSYM_PREFIX ""
 #endif
 
-typedef struct {
-    int handle;
-    void *dlhandle;
-    int flags;
-} DLModuleRec, *DLModulePtr;
-
 /* Hooray, yet another open coded linked list! FIXME */
 typedef struct DLModuleList {
-    DLModulePtr module;
+    void *module;
     struct DLModuleList *next;
 } DLModuleList;
 
@@ -88,19 +82,22 @@ static DLModuleList *dlModuleList = NULL;
 static void *
 DLFindSymbolLocal(pointer module, const char *name)
 {
-    DLModulePtr dlfile = module;
     void *p;
     char *n;
 
     static const char symPrefix[] = DLSYM_PREFIX;
 
-    n = malloc(strlen(symPrefix) + strlen(name) + 1);
-    if (strlen(symPrefix))
+    if (strlen(symPrefix)) {
+	n = malloc(strlen(symPrefix) + strlen(name) + 1);
 	sprintf(n, "%s%s", symPrefix, name);
-    else
-	sprintf(n, "%s", name);
-    p = dlsym(dlfile->dlhandle, n);
-    free(n);
+    } else {
+	n = name;
+    }
+
+    p = dlsym(module, n);
+
+    if (strlen(symPrefix))
+	free(n);
 
     return p;
 }
@@ -127,7 +124,7 @@ DLFindSymbol(const char *name)
 	global_scope = dlopen(NULL, DLOPEN_LAZY | DLOPEN_GLOBAL);
 
     if (global_scope)
-	return dlsym(global_scope, name);
+	return DLFindSymbolLocal(global_scope, name);
 
     return NULL;
 }
@@ -135,23 +132,17 @@ DLFindSymbol(const char *name)
 void *
 DLLoadModule(loaderPtr modrec, int flags)
 {
-    DLModulePtr dlfile;
+    void * dlfile;
     DLModuleList *l;
     int dlopen_flags;
 
-    if ((dlfile = calloc(1, sizeof(DLModuleRec))) == NULL) {
-	ErrorF("Unable to allocate DLModuleRec\n");
-	return NULL;
-    }
-    dlfile->handle = modrec->handle;
     if (flags & LD_FLAG_GLOBAL)
 	dlopen_flags = DLOPEN_LAZY | DLOPEN_GLOBAL;
     else
 	dlopen_flags = DLOPEN_LAZY;
-    dlfile->dlhandle = dlopen(modrec->name, dlopen_flags);
-    if (dlfile->dlhandle == NULL) {
+    dlfile = dlopen(modrec->name, dlopen_flags);
+    if (dlfile == NULL) {
 	ErrorF("dlopen: %s\n", dlerror());
-	free(dlfile);
 	return NULL;
     }
 
@@ -166,7 +157,6 @@ DLLoadModule(loaderPtr modrec, int flags)
 void
 DLUnloadModule(void *modptr)
 {
-    DLModulePtr dlfile = (DLModulePtr) modptr;
     DLModuleList *l, *p;
 
     /* remove it from dlModuleList. */
@@ -185,6 +175,5 @@ DLUnloadModule(void *modptr)
 	    p = l;
 	}
     }
-    dlclose(dlfile->dlhandle);
-    free(modptr);
+    dlclose(modptr);
 }

From ae43d835bdaef96c3c73d7cee5b105f07340833d Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 13 Feb 2008 19:39:49 -0500
Subject: [PATCH 491/552] XACE: Change access modes for some device-related
 requests.

Opening a device is not really "reading" it.
Requests that globally configure a device should require "manage" access.
---
 Xi/chgdctl.c  |  2 +-
 Xi/chgfctl.c  |  2 +-
 Xi/chgkmap.c  |  2 +-
 Xi/closedev.c |  2 +-
 Xi/opendev.c  |  2 +-
 Xi/setbmap.c  |  2 +-
 Xi/setmmap.c  |  2 +-
 dix/devices.c | 10 +++++-----
 xkb/xkb.c     | 14 +++++++-------
 9 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Xi/chgdctl.c b/Xi/chgdctl.c
index e7d04a781..30174f496 100644
--- a/Xi/chgdctl.c
+++ b/Xi/chgdctl.c
@@ -111,7 +111,7 @@ ProcXChangeDeviceControl(ClientPtr client)
     REQUEST_AT_LEAST_SIZE(xChangeDeviceControlReq);
 
     len = stuff->length - (sizeof(xChangeDeviceControlReq) >> 2);
-    ret = dixLookupDevice(&dev, stuff->deviceid, client, DixSetAttrAccess);
+    ret = dixLookupDevice(&dev, stuff->deviceid, client, DixManageAccess);
     if (ret != Success)
         goto out;
 
diff --git a/Xi/chgfctl.c b/Xi/chgfctl.c
index 696b74a16..3155e87c2 100644
--- a/Xi/chgfctl.c
+++ b/Xi/chgfctl.c
@@ -444,7 +444,7 @@ ProcXChangeFeedbackControl(ClientPtr client)
     REQUEST_AT_LEAST_SIZE(xChangeFeedbackControlReq);
 
     len = stuff->length - (sizeof(xChangeFeedbackControlReq) >> 2);
-    rc = dixLookupDevice(&dev, stuff->deviceid, client, DixSetAttrAccess);
+    rc = dixLookupDevice(&dev, stuff->deviceid, client, DixManageAccess);
     if (rc != Success)
 	return rc;
 
diff --git a/Xi/chgkmap.c b/Xi/chgkmap.c
index df334c11c..3f51648e1 100644
--- a/Xi/chgkmap.c
+++ b/Xi/chgkmap.c
@@ -106,7 +106,7 @@ ProcXChangeDeviceKeyMapping(ClientPtr client)
     count = stuff->keyCodes * stuff->keySymsPerKeyCode;
     REQUEST_FIXED_SIZE(xChangeDeviceKeyMappingReq, count * sizeof(CARD32));
 
-    ret = dixLookupDevice(&dev, stuff->deviceid, client, DixSetAttrAccess);
+    ret = dixLookupDevice(&dev, stuff->deviceid, client, DixManageAccess);
     if (ret != Success)
 	return ret;
     len = stuff->length - (sizeof(xChangeDeviceKeyMappingReq) >> 2);
diff --git a/Xi/closedev.c b/Xi/closedev.c
index b2b5f69a6..94b7391fb 100644
--- a/Xi/closedev.c
+++ b/Xi/closedev.c
@@ -146,7 +146,7 @@ ProcXCloseDevice(ClientPtr client)
     REQUEST(xCloseDeviceReq);
     REQUEST_SIZE_MATCH(xCloseDeviceReq);
 
-    rc = dixLookupDevice(&d, stuff->deviceid, client, DixGetAttrAccess);
+    rc = dixLookupDevice(&d, stuff->deviceid, client, DixUseAccess);
     if (rc != Success)
 	return rc;
 
diff --git a/Xi/opendev.c b/Xi/opendev.c
index 128b1bd9c..acda38530 100644
--- a/Xi/opendev.c
+++ b/Xi/opendev.c
@@ -106,7 +106,7 @@ ProcXOpenDevice(ClientPtr client)
 	stuff->deviceid == inputInfo.keyboard->id)
 	return BadDevice;
 
-    status = dixLookupDevice(&dev, stuff->deviceid, client, DixReadAccess);
+    status = dixLookupDevice(&dev, stuff->deviceid, client, DixUseAccess);
     if (status == BadDevice) {  /* not open */
 	for (dev = inputInfo.off_devices; dev; dev = dev->next)
 	    if (dev->id == stuff->deviceid)
diff --git a/Xi/setbmap.c b/Xi/setbmap.c
index 3035c649e..f05225531 100644
--- a/Xi/setbmap.c
+++ b/Xi/setbmap.c
@@ -109,7 +109,7 @@ ProcXSetDeviceButtonMapping(ClientPtr client)
     rep.sequenceNumber = client->sequence;
     rep.status = MappingSuccess;
 
-    ret = dixLookupDevice(&dev, stuff->deviceid, client, DixSetAttrAccess);
+    ret = dixLookupDevice(&dev, stuff->deviceid, client, DixManageAccess);
     if (ret != Success)
 	return ret;
 
diff --git a/Xi/setmmap.c b/Xi/setmmap.c
index be3d3cb6c..34efde595 100644
--- a/Xi/setmmap.c
+++ b/Xi/setmmap.c
@@ -98,7 +98,7 @@ ProcXSetDeviceModifierMapping(ClientPtr client)
     REQUEST(xSetDeviceModifierMappingReq);
     REQUEST_AT_LEAST_SIZE(xSetDeviceModifierMappingReq);
 
-    ret = dixLookupDevice(&dev, stuff->deviceid, client, DixSetAttrAccess);
+    ret = dixLookupDevice(&dev, stuff->deviceid, client, DixManageAccess);
     if (ret != Success)
 	return ret;
 
diff --git a/dix/devices.c b/dix/devices.c
index 534a0b9e5..bdcca5aba 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -1295,7 +1295,7 @@ DoSetModifierMapping(ClientPtr client, KeyCode *inputMap,
                 }
             }
 
-	    rc = XaceHook(XACE_DEVICE_ACCESS, client, pDev, DixSetAttrAccess);
+	    rc = XaceHook(XACE_DEVICE_ACCESS, client, pDev, DixManageAccess);
 	    if (rc != Success)
 		return rc;
 
@@ -1435,7 +1435,7 @@ ProcChangeKeyboardMapping(ClientPtr client)
 
     for (pDev = inputInfo.devices; pDev; pDev = pDev->next) {
         if ((pDev->coreEvents || pDev == inputInfo.keyboard) && pDev->key) {
-            rc = XaceHook(XACE_DEVICE_ACCESS, client, pDev, DixSetAttrAccess);
+            rc = XaceHook(XACE_DEVICE_ACCESS, client, pDev, DixManageAccess);
 	    if (rc != Success)
                 return rc;
         }
@@ -1472,7 +1472,7 @@ DoSetPointerMapping(ClientPtr client, DeviceIntPtr device, BYTE *map, int n)
 
     for (dev = inputInfo.devices; dev; dev = dev->next) {
         if ((dev->coreEvents || dev == inputInfo.pointer) && dev->button) {
-	    rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixSetAttrAccess);
+	    rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixManageAccess);
 	    if (rc != Success)
 		return rc;
 	}
@@ -1810,7 +1810,7 @@ ProcChangeKeyboardControl (ClientPtr client)
     for (pDev = inputInfo.devices; pDev; pDev = pDev->next) {
         if ((pDev->coreEvents || pDev == inputInfo.keyboard) &&
             pDev->kbdfeed && pDev->kbdfeed->CtrlProc) {
-            ret = XaceHook(XACE_DEVICE_ACCESS, client, pDev, DixSetAttrAccess);
+            ret = XaceHook(XACE_DEVICE_ACCESS, client, pDev, DixManageAccess);
 	    if (ret != Success)
                 return ret;
         }
@@ -1961,7 +1961,7 @@ ProcChangePointerControl(ClientPtr client)
     for (mouse = inputInfo.devices; mouse; mouse = mouse->next) {
         if ((mouse->coreEvents || mouse == inputInfo.pointer) &&
             mouse->ptrfeed && mouse->ptrfeed->CtrlProc) {
-	    rc = XaceHook(XACE_DEVICE_ACCESS, client, mouse, DixSetAttrAccess);
+	    rc = XaceHook(XACE_DEVICE_ACCESS, client, mouse, DixManageAccess);
 	    if (rc != Success)
 		return rc;
 	}
diff --git a/xkb/xkb.c b/xkb/xkb.c
index 23e1dc76f..26f2812fe 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -211,7 +211,7 @@ ProcXkbSelectEvents(ClientPtr client)
     if (!(client->xkbClientFlags&_XkbClientInitialized))
 	return BadAccess;
 
-    CHK_ANY_DEVICE(dev, stuff->deviceSpec, client, DixReadAccess);
+    CHK_ANY_DEVICE(dev, stuff->deviceSpec, client, DixUseAccess);
 
     if (((stuff->affectWhich&XkbMapNotifyMask)!=0)&&(stuff->affectMap)) {
 	client->mapNotifyMask&= ~stuff->affectMap;
@@ -694,7 +694,7 @@ ProcXkbSetControls(ClientPtr client)
     if (!(client->xkbClientFlags & _XkbClientInitialized))
 	return BadAccess;
 
-    CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixSetAttrAccess);
+    CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixManageAccess);
     CHK_MASK_LEGAL(0x01, stuff->changeCtrls, XkbAllControlsMask);
 
     for (tmpd = inputInfo.keyboard; tmpd; tmpd = tmpd->next) {
@@ -2304,7 +2304,7 @@ ProcXkbSetMap(ClientPtr client)
     if (!(client->xkbClientFlags&_XkbClientInitialized))
 	return BadAccess;
 
-    CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixSetAttrAccess);
+    CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixManageAccess);
     CHK_MASK_LEGAL(0x01,stuff->present,XkbAllMapComponentsMask);
 
     XkbSetCauseXkbReq(&cause,X_kbSetMap,client);
@@ -2618,7 +2618,7 @@ ProcXkbSetCompatMap(ClientPtr client)
     if (!(client->xkbClientFlags&_XkbClientInitialized))
 	return BadAccess;
 
-    CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixSetAttrAccess);
+    CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixManageAccess);
 
     data = (char *)&stuff[1];
     xkbi = dev->key->xkbInfo;
@@ -4844,7 +4844,7 @@ ProcXkbSetGeometry(ClientPtr client)
     if (!(client->xkbClientFlags&_XkbClientInitialized))
 	return BadAccess;
 
-    CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixSetAttrAccess);
+    CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixManageAccess);
     CHK_ATOM_OR_NONE(stuff->name);
 
     xkb= dev->key->xkbInfo->desc;
@@ -5126,7 +5126,7 @@ ProcXkbGetKbdByName(ClientPtr client)
     Bool			geom_changed;
     XkbSrvLedInfoPtr            old_sli;
     XkbSrvLedInfoPtr            sli;
-    Mask access_mode = DixGetAttrAccess | DixSetAttrAccess;
+    Mask access_mode = DixGetAttrAccess | DixManageAccess;
 
     REQUEST(xkbGetKbdByNameReq);
     REQUEST_AT_LEAST_SIZE(xkbGetKbdByNameReq);
@@ -5997,7 +5997,7 @@ xkbExtensionDeviceNotify ed;
 
     change= stuff->change;
 
-    CHK_ANY_DEVICE(dev, stuff->deviceSpec, client, DixSetAttrAccess);
+    CHK_ANY_DEVICE(dev, stuff->deviceSpec, client, DixManageAccess);
     CHK_MASK_LEGAL(0x01,change,XkbXI_AllFeaturesMask);
 
     wire= (char *)&stuff[1];

From e99aadbc2635e87543fc9980d8156c3ede83544f Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 13 Feb 2008 19:46:29 -0500
Subject: [PATCH 492/552] xselinux: Add use to permission map for devices.

---
 Xext/xselinux.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 9acc93c61..5aa2ad3fa 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -138,7 +138,7 @@ static struct security_class_mapping map[] = {
     { "x_selection", { "read", "", "", "", "getattr", "setattr", NULL }},
     { "x_cursor", { "read", "write", "destroy", "create", "getattr", "setattr", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "use", NULL }},
     { "x_client", { "", "", "destroy", "", "getattr", "setattr", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "manage", NULL }},
-    { "x_device", { "read", "write", "", "", "getattr", "setattr", "", "", "", "getfocus", "setfocus", "", "", "", "", "", "", "grab", "freeze", "force_cursor", "", "", "", "", "", "manage", "", "bell", NULL }},
+    { "x_device", { "read", "write", "", "", "getattr", "setattr", "", "", "", "getfocus", "setfocus", "", "", "", "", "", "", "grab", "freeze", "force_cursor", "", "", "", "", "use", "manage", "", "bell", NULL }},
     { "x_server", { "record", "", "", "", "getattr", "setattr", "", "", "", "", "", "", "", "", "", "", "", "grab", "", "", "", "", "", "", "", "manage", "debug", NULL }},
     { "x_extension", { "", "", "", "", "query", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "use", NULL }},
     { "x_event", { "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "send", "receive", NULL }},

From 4573cb2ce4b859744118d9a33de3599f033cdd2b Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed, 13 Feb 2008 20:16:56 -0500
Subject: [PATCH 493/552] security: Revise set of permissions granted to
 untrusted clients.

Bug #14480: untrusted access broken on 7.3.
---
 Xext/security.c | 44 +++++++++++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 13 deletions(-)

diff --git a/Xext/security.c b/Xext/security.c
index 069655964..a3cde2cec 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -70,10 +70,19 @@ static char *SecurityUntrustedExtensions[] = {
     NULL
 };
 
-/* Access modes that untrusted clients can do to trusted stuff */
-static const Mask SecurityAllowedMask =
-    DixGetAttrAccess | DixListPropAccess | DixGetPropAccess |
-    DixGetFocusAccess | DixListAccess | DixReceiveAccess;
+/*
+ * Access modes that untrusted clients are allowed on trusted objects.
+ */
+static const Mask SecurityResourceMask =
+    DixGetAttrAccess | DixReceiveAccess | DixListPropAccess |
+    DixGetPropAccess | DixListAccess;
+static const Mask SecurityRootWindowExtraMask =
+    DixReceiveAccess | DixSendAccess | DixAddAccess | DixRemoveAccess;
+static const Mask SecurityDeviceMask =
+    DixGetAttrAccess | DixReceiveAccess | DixGetFocusAccess |
+    DixGrabAccess | DixSetAttrAccess | DixUseAccess;
+static const Mask SecurityServerMask = DixGetAttrAccess | DixGrabAccess;
+static const Mask SecurityClientMask = DixGetAttrAccess;
 
 
 /* SecurityAudit
@@ -751,11 +760,15 @@ SecurityDevice(CallbackListPtr *pcbl, pointer unused, pointer calldata)
     XaceDeviceAccessRec *rec = calldata;
     SecurityStateRec *subj, *obj;
     Mask requested = rec->access_mode;
-    Mask allowed = SecurityAllowedMask;
+    Mask allowed = SecurityDeviceMask;
 
     subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
     obj = dixLookupPrivate(&serverClient->devPrivates, stateKey);
 
+    if (rec->dev != inputInfo.keyboard)
+	/* this extension only supports the core keyboard */
+	allowed = requested;
+
     if (SecurityDoCheck(subj, obj, requested, allowed) != Success) {
 	SecurityAudit("Security denied client %d keyboard access on request "
 		      "%s\n", rec->client->index,
@@ -792,7 +805,7 @@ SecurityResource(CallbackListPtr *pcbl, pointer unused, pointer calldata)
     SecurityStateRec *subj, *obj;
     int cid = CLIENT_ID(rec->id);
     Mask requested = rec->access_mode;
-    Mask allowed = SecurityAllowedMask;
+    Mask allowed = SecurityResourceMask;
 
     subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
     obj = dixLookupPrivate(&clients[cid]->devPrivates, stateKey);
@@ -801,11 +814,15 @@ SecurityResource(CallbackListPtr *pcbl, pointer unused, pointer calldata)
     if (cid == 0) {
 	if (rec->rtype & RC_DRAWABLE)
 	    /* additional operations allowed on root windows */
-	    allowed |= DixReadAccess|DixSendAccess;
+	    allowed |= SecurityRootWindowExtraMask;
 
 	else if (rec->rtype == RT_COLORMAP)
 	    /* allow access to default colormaps */
 	    allowed = requested;
+
+	else
+	    /* allow read access to other server-owned resources */
+	    allowed |= DixReadAccess;
     }
 
     if (SecurityDoCheck(subj, obj, requested, allowed) == Success)
@@ -816,9 +833,10 @@ SecurityResource(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 	return;
 #endif
 
-    SecurityAudit("Security: denied client %d access to resource 0x%x "
-		  "of client %d on request %s\n", rec->client->index, rec->id,
-		  cid, SecurityLookupRequestName(rec->client));
+    SecurityAudit("Security: denied client %d access %x to resource 0x%x "
+		  "of client %d on request %s\n", rec->client->index,
+		  requested, rec->id, cid,
+		  SecurityLookupRequestName(rec->client));
     rec->status = BadAccess; /* deny access */
 }
 
@@ -850,7 +868,7 @@ SecurityServer(CallbackListPtr *pcbl, pointer unused, pointer calldata)
     XaceServerAccessRec *rec = calldata;
     SecurityStateRec *subj, *obj;
     Mask requested = rec->access_mode;
-    Mask allowed = SecurityAllowedMask;
+    Mask allowed = SecurityServerMask;
 
     subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
     obj = dixLookupPrivate(&serverClient->devPrivates, stateKey);
@@ -869,7 +887,7 @@ SecurityClient(CallbackListPtr *pcbl, pointer unused, pointer calldata)
     XaceClientAccessRec *rec = calldata;
     SecurityStateRec *subj, *obj;
     Mask requested = rec->access_mode;
-    Mask allowed = SecurityAllowedMask;
+    Mask allowed = SecurityClientMask;
 
     subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
     obj = dixLookupPrivate(&rec->target->devPrivates, stateKey);
@@ -889,7 +907,7 @@ SecurityProperty(CallbackListPtr *pcbl, pointer unused, pointer calldata)
     SecurityStateRec *subj, *obj;
     ATOM name = rec->pProp->propertyName;
     Mask requested = rec->access_mode;
-    Mask allowed = SecurityAllowedMask | DixReadAccess;
+    Mask allowed = SecurityResourceMask | DixReadAccess;
 
     subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
     obj = dixLookupPrivate(&wClient(rec->pWin)->devPrivates, stateKey);

From b8b7cdf6df3d338c50db670ce4cfd245f9fa8844 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 15 Feb 2008 01:31:46 +1100
Subject: [PATCH 494/552] Silence useless debug spew from XFree86-Misc
 extension.

---
 hw/xfree86/dixmods/extmod/xf86misc.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/hw/xfree86/dixmods/extmod/xf86misc.c b/hw/xfree86/dixmods/extmod/xf86misc.c
index 8f4434601..3164d7501 100644
--- a/hw/xfree86/dixmods/extmod/xf86misc.c
+++ b/hw/xfree86/dixmods/extmod/xf86misc.c
@@ -110,7 +110,8 @@ static unsigned char XF86MiscReqCode = 0;
 #ifdef DEBUG
 # define DEBUG_P(x) ErrorF(x"\n");
 #else
-# define DEBUG_P(x) /**/
+# define DEBUG_P(x) do {} while (0)
+}
 #endif
 
 #define MISCERR(x)	(miscErrorBase + x)
@@ -345,10 +346,10 @@ ProcXF86MiscSetMouseSettings(client)
     ClientVersion(client, &major, &minor);
     
     if (xf86GetVerbosity() > 1) {
-	ErrorF("SetMouseSettings - type: %d brate: %d srate: %d chdmid: %d\n",
+	DEBUG_P("SetMouseSettings - type: %d brate: %d srate: %d chdmid: %d\n",
 		(int)stuff->mousetype, (int)stuff->baudrate,
 		(int)stuff->samplerate, stuff->chordmiddle);
-	ErrorF("                   em3but: %d em3tim: %d res: %d flags: %ld\n",
+	DEBUG_P("                   em3but: %d em3tim: %d res: %d flags: %ld\n",
 		stuff->emulate3buttons, (int)stuff->emulate3timeout,
 		(int)stuff->resolution, (unsigned long)stuff->flags);
     }
@@ -376,7 +377,7 @@ ProcXF86MiscSetMouseSettings(client)
 		return BadAlloc;
 	    strncpy(devname,(char*)(&stuff[1]),stuff->devnamelen);
 	    if (xf86GetVerbosity() > 1)
-		ErrorF("SetMouseSettings - device: %s\n",devname);
+		DEBUG_P("SetMouseSettings - device: %s\n",devname);
 	    MiscExtSetMouseDevice(mouse, devname);
 	}
     }
@@ -395,12 +396,12 @@ ProcXF86MiscSetMouseSettings(client)
         case MISC_RET_BADCOMBO:     return MISCERR(XF86MiscBadMouseCombo);
         case MISC_RET_NOMODULE:     return MISCERR(XF86MiscNoModule);
         default:
-	    ErrorF("Unexpected return from MiscExtApply(POINTER) = %d\n", ret);
+	    DEBUG_P("Unexpected return from MiscExtApply(POINTER) = %d\n", ret);
 	    return BadImplementation;
     }
 
     if (xf86GetVerbosity() > 1)
-	ErrorF("SetMouseSettings - Succeeded\n");
+	DEBUG_P("SetMouseSettings - Succeeded\n");
     return (client->noClientException);
 }
 
@@ -417,7 +418,7 @@ ProcXF86MiscSetKbdSettings(client)
     REQUEST_SIZE_MATCH(xXF86MiscSetKbdSettingsReq);
 
     if (xf86GetVerbosity() > 1)
-	ErrorF("SetKbdSettings - type: %d rate: %d delay: %d snumlk: %d\n",
+	DEBUG_P("SetKbdSettings - type: %d rate: %d delay: %d snumlk: %d\n",
 		(int)stuff->kbdtype, (int)stuff->rate,
 		(int)stuff->delay, stuff->servnumlock);
 
@@ -434,12 +435,12 @@ ProcXF86MiscSetKbdSettings(client)
 	case MISC_RET_BADVAL:       return BadValue;
 	case MISC_RET_BADKBDTYPE:   return MISCERR(XF86MiscBadKbdType);
 	default:
-	    ErrorF("Unexpected return from MiscExtApply(KEYBOARD) = %d\n", ret);
+	    DEBUG_P("Unexpected return from MiscExtApply(KEYBOARD) = %d\n", ret);
 	    return BadImplementation;
     }
 
     if (xf86GetVerbosity() > 1)
-	ErrorF("SetKbdSettings - Succeeded\n");
+	DEBUG_P("SetKbdSettings - Succeeded\n");
     return (client->noClientException);
 }
 
@@ -457,7 +458,7 @@ ProcXF86MiscSetGrabKeysState(client)
 
     if ((status = MiscExtSetGrabKeysState(client, stuff->enable)) == 0) {
 	if (xf86GetVerbosity() > 1)
-	    ErrorF("SetGrabKeysState - %s\n",
+	    DEBUG_P("SetGrabKeysState - %s\n",
 		   stuff->enable ? "enabled" : "disabled");
     }
 
@@ -493,7 +494,7 @@ ProcXF86MiscSetClientVersion(ClientPtr client)
 	M_SETPRIV(client, pPriv);
     }
     if (xf86GetVerbosity() > 1) 
-	    ErrorF("SetClientVersion: %i %i\n",stuff->major,stuff->minor);
+	    DEBUG_P("SetClientVersion: %i %i\n",stuff->major,stuff->minor);
     pPriv->major = stuff->major;
     pPriv->minor = stuff->minor;
     

From c38feeb1492d9a47379b2e4d77dbadd8c421d17f Mon Sep 17 00:00:00 2001
From: Maarten Maathuis <madman2003@gmail.com>
Date: Thu, 14 Feb 2008 18:52:47 +0100
Subject: [PATCH 495/552] Fix typo in commit
 b8b7cdf6df3d338c50db670ce4cfd245f9fa8844.

---
 hw/xfree86/dixmods/extmod/xf86misc.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hw/xfree86/dixmods/extmod/xf86misc.c b/hw/xfree86/dixmods/extmod/xf86misc.c
index 3164d7501..d2ee59580 100644
--- a/hw/xfree86/dixmods/extmod/xf86misc.c
+++ b/hw/xfree86/dixmods/extmod/xf86misc.c
@@ -111,7 +111,6 @@ static unsigned char XF86MiscReqCode = 0;
 # define DEBUG_P(x) ErrorF(x"\n");
 #else
 # define DEBUG_P(x) do {} while (0)
-}
 #endif
 
 #define MISCERR(x)	(miscErrorBase + x)

From 3e0353c78571890f849a1db47b0540aacc6793bc Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 15 Feb 2008 06:42:48 +1100
Subject: [PATCH 496/552] Bah, macros are hard.

---
 hw/xfree86/dixmods/extmod/xf86misc.c | 50 +++++++++-------------------
 1 file changed, 15 insertions(+), 35 deletions(-)

diff --git a/hw/xfree86/dixmods/extmod/xf86misc.c b/hw/xfree86/dixmods/extmod/xf86misc.c
index d2ee59580..8127afdff 100644
--- a/hw/xfree86/dixmods/extmod/xf86misc.c
+++ b/hw/xfree86/dixmods/extmod/xf86misc.c
@@ -108,7 +108,7 @@ static unsigned char XF86MiscReqCode = 0;
 #endif
 
 #ifdef DEBUG
-# define DEBUG_P(x) ErrorF(x"\n");
+# define DEBUG_P(x) ErrorF x;
 #else
 # define DEBUG_P(x) do {} while (0)
 #endif
@@ -120,8 +120,6 @@ XFree86MiscExtensionInit(void)
 {
     ExtensionEntry* extEntry;
 
-    DEBUG_P("XFree86MiscExtensionInit");
-
     if (!xf86GetModInDevEnabled())
 	return;
 
@@ -154,8 +152,6 @@ ProcXF86MiscQueryVersion(client)
     xXF86MiscQueryVersionReply rep;
     register int n;
 
-    DEBUG_P("XF86MiscQueryVersion");
-
     REQUEST_SIZE_MATCH(xXF86MiscQueryVersionReq);
     rep.type = X_Reply;
     rep.length = 0;
@@ -252,8 +248,6 @@ ProcXF86MiscGetMouseSettings(client)
     register int n;
     int devnamelen;
 
-    DEBUG_P("XF86MiscGetMouseSettings");
-
     REQUEST_SIZE_MATCH(xXF86MiscGetMouseSettingsReq);
     rep.type = X_Reply;
     rep.sequenceNumber = client->sequence;
@@ -303,8 +297,6 @@ ProcXF86MiscGetKbdSettings(client)
     pointer kbd;
     register int n;
 
-    DEBUG_P("XF86MiscGetKbdSettings");
-
     REQUEST_SIZE_MATCH(xXF86MiscGetKbdSettingsReq);
     rep.type = X_Reply;
     rep.length = 0;
@@ -338,19 +330,17 @@ ProcXF86MiscSetMouseSettings(client)
     
     REQUEST(xXF86MiscSetMouseSettingsReq);
 
-    DEBUG_P("XF86MiscSetMouseSettings");
-
     REQUEST_AT_LEAST_SIZE(xXF86MiscSetMouseSettingsReq);
 
     ClientVersion(client, &major, &minor);
     
     if (xf86GetVerbosity() > 1) {
-	DEBUG_P("SetMouseSettings - type: %d brate: %d srate: %d chdmid: %d\n",
+	DEBUG_P(("SetMouseSettings - type: %d brate: %d srate: %d chdmid: %d\n",
 		(int)stuff->mousetype, (int)stuff->baudrate,
-		(int)stuff->samplerate, stuff->chordmiddle);
-	DEBUG_P("                   em3but: %d em3tim: %d res: %d flags: %ld\n",
+		(int)stuff->samplerate, stuff->chordmiddle));
+	DEBUG_P(("                   em3but: %d em3tim: %d res: %d flags: %ld\n",
 		stuff->emulate3buttons, (int)stuff->emulate3timeout,
-		(int)stuff->resolution, (unsigned long)stuff->flags);
+		(int)stuff->resolution, (unsigned long)stuff->flags));
     }
 
     if ((mouse = MiscExtCreateStruct(MISC_POINTER)) == (pointer) 0)
@@ -376,7 +366,7 @@ ProcXF86MiscSetMouseSettings(client)
 		return BadAlloc;
 	    strncpy(devname,(char*)(&stuff[1]),stuff->devnamelen);
 	    if (xf86GetVerbosity() > 1)
-		DEBUG_P("SetMouseSettings - device: %s\n",devname);
+		DEBUG_P(("SetMouseSettings - device: %s\n",devname));
 	    MiscExtSetMouseDevice(mouse, devname);
 	}
     }
@@ -395,12 +385,12 @@ ProcXF86MiscSetMouseSettings(client)
         case MISC_RET_BADCOMBO:     return MISCERR(XF86MiscBadMouseCombo);
         case MISC_RET_NOMODULE:     return MISCERR(XF86MiscNoModule);
         default:
-	    DEBUG_P("Unexpected return from MiscExtApply(POINTER) = %d\n", ret);
+	    DEBUG_P(("Unexpected return from MiscExtApply(POINTER) = %d\n", ret));
 	    return BadImplementation;
     }
 
     if (xf86GetVerbosity() > 1)
-	DEBUG_P("SetMouseSettings - Succeeded\n");
+	DEBUG_P(("SetMouseSettings - Succeeded\n"));
     return (client->noClientException);
 }
 
@@ -412,14 +402,12 @@ ProcXF86MiscSetKbdSettings(client)
     pointer kbd;
     REQUEST(xXF86MiscSetKbdSettingsReq);
 
-    DEBUG_P("XF86MiscSetKbdSettings");
-
     REQUEST_SIZE_MATCH(xXF86MiscSetKbdSettingsReq);
 
     if (xf86GetVerbosity() > 1)
-	DEBUG_P("SetKbdSettings - type: %d rate: %d delay: %d snumlk: %d\n",
+	DEBUG_P(("SetKbdSettings - type: %d rate: %d delay: %d snumlk: %d\n",
 		(int)stuff->kbdtype, (int)stuff->rate,
-		(int)stuff->delay, stuff->servnumlock);
+		(int)stuff->delay, stuff->servnumlock));
 
     if ((kbd = MiscExtCreateStruct(MISC_KEYBOARD)) == (pointer) 0)
 	return BadAlloc;
@@ -434,12 +422,12 @@ ProcXF86MiscSetKbdSettings(client)
 	case MISC_RET_BADVAL:       return BadValue;
 	case MISC_RET_BADKBDTYPE:   return MISCERR(XF86MiscBadKbdType);
 	default:
-	    DEBUG_P("Unexpected return from MiscExtApply(KEYBOARD) = %d\n", ret);
+	    DEBUG_P(("Unexpected return from MiscExtApply(KEYBOARD) = %d\n", ret));
 	    return BadImplementation;
     }
 
     if (xf86GetVerbosity() > 1)
-	DEBUG_P("SetKbdSettings - Succeeded\n");
+	DEBUG_P(("SetKbdSettings - Succeeded\n"));
     return (client->noClientException);
 }
 
@@ -451,14 +439,12 @@ ProcXF86MiscSetGrabKeysState(client)
     xXF86MiscSetGrabKeysStateReply rep;
     REQUEST(xXF86MiscSetGrabKeysStateReq);
 
-    DEBUG_P("XF86MiscSetGrabKeysState");
-
     REQUEST_SIZE_MATCH(xXF86MiscSetGrabKeysStateReq);
 
     if ((status = MiscExtSetGrabKeysState(client, stuff->enable)) == 0) {
 	if (xf86GetVerbosity() > 1)
-	    DEBUG_P("SetGrabKeysState - %s\n",
-		   stuff->enable ? "enabled" : "disabled");
+	    DEBUG_P(("SetGrabKeysState - %s\n",
+		   stuff->enable ? "enabled" : "disabled"));
     }
 
     rep.type = X_Reply;
@@ -482,8 +468,6 @@ ProcXF86MiscSetClientVersion(ClientPtr client)
 
     MiscPrivPtr pPriv;
 
-    DEBUG_P("XF86MiscSetClientVersion");
-
     REQUEST_SIZE_MATCH(xXF86MiscSetClientVersionReq);
 
     if ((pPriv = M_GETPRIV(client)) == NULL) {
@@ -493,7 +477,7 @@ ProcXF86MiscSetClientVersion(ClientPtr client)
 	M_SETPRIV(client, pPriv);
     }
     if (xf86GetVerbosity() > 1) 
-	    DEBUG_P("SetClientVersion: %i %i\n",stuff->major,stuff->minor);
+	    DEBUG_P(("SetClientVersion: %i %i\n",stuff->major,stuff->minor));
     pPriv->major = stuff->major;
     pPriv->minor = stuff->minor;
     
@@ -511,8 +495,6 @@ ProcXF86MiscGetFilePaths(client)
     register int n;
     int configlen, modulelen, loglen;
 
-    DEBUG_P("XF86MiscGetFilePaths");
-
     REQUEST_SIZE_MATCH(xXF86MiscGetFilePathsReq);
     rep.type = X_Reply;
     rep.sequenceNumber = client->sequence;
@@ -559,8 +541,6 @@ ProcXF86MiscPassMessage(client)
 
     REQUEST(xXF86MiscPassMessageReq);
 
-    DEBUG_P("XF86MiscPassMessage");
-
     REQUEST_AT_LEAST_SIZE(xXF86MiscPassMessageReq);
     size = (sizeof(xXF86MiscPassMessageReq) + 3) >> 2;
     size+= (stuff->typelen + 3) >> 2;

From cd78f0d0fc08e4e2339ed09dad1a12802de7729c Mon Sep 17 00:00:00 2001
From: Pierre Willenbrock <pierre@pirsoft.de>
Date: Thu, 7 Feb 2008 21:28:28 +0100
Subject: [PATCH 497/552] AIGLX: Fix crash after client using
 GLX_EXT_texture_from_pixmap died.

---
 GL/glx/glxdri.c | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c
index 6c1a199f7..e405ee06f 100644
--- a/GL/glx/glxdri.c
+++ b/GL/glx/glxdri.c
@@ -185,6 +185,42 @@ __glXDRIdrawableDestroy(__GLXdrawable *drawable)
 {
     __GLXDRIdrawable *private = (__GLXDRIdrawable *) drawable;
 
+    int i;
+
+    for (i = 0; i < screenInfo.numScreens; i++) {
+	__GLXDRIscreen * const screen = (__GLXDRIscreen *)
+	    glxGetScreen(screenInfo.screens[i]);
+
+	GLuint lastOverride = screen->lastTexOffsetOverride;
+
+	if (lastOverride) {
+	    __GLXDRIdrawable **texOffsetOverride = screen->texOffsetOverride;
+	    int i;
+	    
+	    for (i = 0; i < lastOverride; i++) {
+		if (texOffsetOverride[i] == private) {
+		    
+		    texOffsetOverride[i] = NULL;
+		    
+		    if (i + 1 == lastOverride) {
+			lastOverride = 0;
+			
+			while (i--) {
+			    if (texOffsetOverride[i]) {
+				lastOverride = i + 1;
+				break;
+			    }
+			}
+			
+			screen->lastTexOffsetOverride = lastOverride;
+			
+			break;
+		    }
+		}
+	    }
+	}
+    }
+
     (*private->driDrawable.destroyDrawable)(&private->driDrawable);
 
     /* If the X window was destroyed, the dri DestroyWindow hook will

From 005e31d3de04e7003f84a94d30f2b75a9636266e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel@tungstengraphics.com>
Date: Fri, 15 Feb 2008 00:01:32 +0000
Subject: [PATCH 498/552] AIGLX: Refactor code common between
 __glXDRI{drawableDestroy,releaseTexImage}.

---
 GL/glx/glxdri.c | 107 +++++++++++++++++++-----------------------------
 1 file changed, 41 insertions(+), 66 deletions(-)

diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c
index e405ee06f..304fed2bd 100644
--- a/GL/glx/glxdri.c
+++ b/GL/glx/glxdri.c
@@ -180,6 +180,41 @@ __glXDRIenterServer(GLboolean rendering)
     DRIWakeupHandler(NULL, 0, NULL);
 }
 
+
+static void
+__glXDRIdoReleaseTexImage(__GLXDRIscreen *screen, __GLXDRIdrawable *drawable)
+{
+    GLuint lastOverride = screen->lastTexOffsetOverride;
+
+    if (lastOverride) {
+	__GLXDRIdrawable **texOffsetOverride = screen->texOffsetOverride;
+	int i;
+
+	for (i = 0; i < lastOverride; i++) {
+	    if (texOffsetOverride[i] == drawable) {
+
+		texOffsetOverride[i] = NULL;
+
+		if (i + 1 == lastOverride) {
+		    lastOverride = 0;
+
+		    while (i--) {
+			if (texOffsetOverride[i]) {
+			    lastOverride = i + 1;
+			    break;
+			}
+		    }
+
+		    screen->lastTexOffsetOverride = lastOverride;
+
+		    break;
+		}
+	    }
+	}
+    }
+}
+
+
 static void
 __glXDRIdrawableDestroy(__GLXdrawable *drawable)
 {
@@ -188,37 +223,9 @@ __glXDRIdrawableDestroy(__GLXdrawable *drawable)
     int i;
 
     for (i = 0; i < screenInfo.numScreens; i++) {
-	__GLXDRIscreen * const screen = (__GLXDRIscreen *)
-	    glxGetScreen(screenInfo.screens[i]);
-
-	GLuint lastOverride = screen->lastTexOffsetOverride;
-
-	if (lastOverride) {
-	    __GLXDRIdrawable **texOffsetOverride = screen->texOffsetOverride;
-	    int i;
-	    
-	    for (i = 0; i < lastOverride; i++) {
-		if (texOffsetOverride[i] == private) {
-		    
-		    texOffsetOverride[i] = NULL;
-		    
-		    if (i + 1 == lastOverride) {
-			lastOverride = 0;
-			
-			while (i--) {
-			    if (texOffsetOverride[i]) {
-				lastOverride = i + 1;
-				break;
-			    }
-			}
-			
-			screen->lastTexOffsetOverride = lastOverride;
-			
-			break;
-		    }
-		}
-	    }
-	}
+	__glXDRIdoReleaseTexImage((__GLXDRIscreen *)
+				  glxGetScreen(screenInfo.screens[i]),
+				  private);
     }
 
     (*private->driDrawable.destroyDrawable)(&private->driDrawable);
@@ -561,41 +568,9 @@ __glXDRIreleaseTexImage(__GLXcontext *baseContext,
 			int buffer,
 			__GLXdrawable *pixmap)
 {
-    ScreenPtr pScreen = pixmap->pDraw->pScreen;
-    __GLXDRIdrawable *driDraw =
-	    containerOf(pixmap, __GLXDRIdrawable, base);
-    __GLXDRIscreen * const screen =
-	(__GLXDRIscreen *) glxGetScreen(pScreen);
-    GLuint lastOverride = screen->lastTexOffsetOverride;
-
-    if (lastOverride) {
-	__GLXDRIdrawable **texOffsetOverride = screen->texOffsetOverride;
-	int i;
-
-	for (i = 0; i < lastOverride; i++) {
-	    if (texOffsetOverride[i] == driDraw) {
-		if (screen->texOffsetFinish)
-		    screen->texOffsetFinish((PixmapPtr)pixmap->pDraw);
-
-		texOffsetOverride[i] = NULL;
-
-		if (i + 1 == lastOverride) {
-		    lastOverride = 0;
-
-		    while (i--) {
-			if (texOffsetOverride[i]) {
-			    lastOverride = i + 1;
-			    break;
-			}
-		    }
-
-		    screen->lastTexOffsetOverride = lastOverride;
-
-		    break;
-		}
-	    }
-	}
-    }
+    __glXDRIdoReleaseTexImage((__GLXDRIscreen *)
+			      glxGetScreen(pixmap->pDraw->pScreen),
+			      containerOf(pixmap, __GLXDRIdrawable, base));
 
     return Success;
 }

From b71dc54352bc56a889823040ec19c1d8e118a1f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@sasori.boston.redhat.com>
Date: Mon, 4 Feb 2008 11:58:24 -0500
Subject: [PATCH 499/552] Add DRI2 module.

---
 configure.ac                |  14 ++
 hw/xfree86/Makefile.am      |   8 +-
 hw/xfree86/dri2/Makefile.am |  15 ++
 hw/xfree86/dri2/dri2.c      | 448 ++++++++++++++++++++++++++++++++++++
 hw/xfree86/dri2/dri2.h      |  77 +++++++
 include/dix-config.h.in     |   3 +
 include/xorg-config.h.in    |   3 +
 include/xorg-server.h.in    |   3 +
 8 files changed, 569 insertions(+), 2 deletions(-)
 create mode 100644 hw/xfree86/dri2/Makefile.am
 create mode 100644 hw/xfree86/dri2/dri2.c
 create mode 100644 hw/xfree86/dri2/dri2.h

diff --git a/configure.ac b/configure.ac
index d8b78eadc..10aa24158 100644
--- a/configure.ac
+++ b/configure.ac
@@ -368,6 +368,7 @@ AM_CONDITIONAL(PPC_VIDEO, [test "x$PPC_VIDEO" = xyes])
 AM_CONDITIONAL(SPARC64_VIDEO, [test "x$SPARC64_VIDEO" = xyes])
 
 DRI=no
+DRI2=no
 KDRIVE_HW=no
 dnl it would be nice to autodetect these *CONS_SUPPORTs
 case $host_os in
@@ -380,6 +381,7 @@ case $host_os in
 	AC_DEFINE(PCVT_SUPPORT, 1, [System has PCVT console])
 	AC_DEFINE(SYSCONS_SUPPORT, 1, [System has syscons console])
 	DRI=yes
+	DRI2=yes
 	;;
   *netbsd*)
 	AC_DEFINE(CSRG_BASED, 1, [System is BSD-like])
@@ -387,6 +389,7 @@ case $host_os in
 	AC_DEFINE(PCVT_SUPPORT, 1, [System has PCVT console])
 	AC_DEFINE(WSCONS_SUPPORT, 1, [System has wscons console])
 	DRI=yes
+	DRI2=yes
 	;;
   *openbsd*)
 	AC_DEFINE(CSRG_BASED, 1, [System is BSD-like])
@@ -395,6 +398,7 @@ case $host_os in
 	;;
   *linux*)
 	DRI=yes
+	DRI2=yes
 	KDRIVE_HW=yes
 	;;
   *solaris*)
@@ -535,6 +539,7 @@ AC_ARG_ENABLE(xdmcp,          AS_HELP_STRING([--disable-xdmcp], [Build XDMCP ext
 AC_ARG_ENABLE(xdm-auth-1,     AS_HELP_STRING([--disable-xdm-auth-1], [Build XDM-Auth-1 extension (default: auto)]), [XDMAUTH=$enableval], [XDMAUTH=auto])
 AC_ARG_ENABLE(glx,            AS_HELP_STRING([--disable-glx], [Build GLX extension (default: enabled)]), [GLX=$enableval], [GLX=yes])
 AC_ARG_ENABLE(dri,            AS_HELP_STRING([--enable-dri], [Build DRI extension (default: auto)]), [DRI=$enableval])
+AC_ARG_ENABLE(dri2,           AS_HELP_STRING([--enable-dri2], [Build DRI2 extension (default: auto)]), [DRI2=$enableval])
 AC_ARG_ENABLE(xinerama,	      AS_HELP_STRING([--disable-xinerama], [Build Xinerama extension (default: enabled)]), [XINERAMA=$enableval], [XINERAMA=yes])
 AC_ARG_ENABLE(xf86vidmode,    AS_HELP_STRING([--disable-xf86vidmode], [Build XF86VidMode extension (default: auto)]), [XF86VIDMODE=$enableval], [XF86VIDMODE=auto])
 AC_ARG_ENABLE(xf86misc,       AS_HELP_STRING([--disable-xf86misc], [Build XF86Misc extension (default: auto)]), [XF86MISC=$enableval], [XF86MISC=auto])
@@ -857,6 +862,14 @@ if test "x$DRI" = xyes; then
 	AC_SUBST(GL_CFLAGS)
 fi
 
+AM_CONDITIONAL(DRI2, test "x$DRI2" = xyes)
+if test "x$DRI2" = xyes; then
+	# FIXME: Bump the versions once we have releases of these.
+	AC_DEFINE(DRI2, 1, [Build DRI2 extension])
+	PKG_CHECK_MODULES([DRIPROTO], [xf86driproto >= 2.0.3])
+	PKG_CHECK_MODULES([LIBDRM], [libdrm >= 2.3.1])
+fi
+
 AM_CONDITIONAL(XINERAMA, [test "x$XINERAMA" = xyes])
 if test "x$XINERAMA" = xyes; then
 	AC_DEFINE(XINERAMA, 1, [Support Xinerama extension])
@@ -2129,6 +2142,7 @@ hw/xfree86/doc/devel/Makefile
 hw/xfree86/doc/man/Makefile
 hw/xfree86/doc/sgml/Makefile
 hw/xfree86/dri/Makefile
+hw/xfree86/dri2/Makefile
 hw/xfree86/dummylib/Makefile
 hw/xfree86/exa/Makefile
 hw/xfree86/fbdevhw/Makefile
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 4afc3a4e5..03c2c3a3f 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -4,6 +4,10 @@ if DRI
 DRI_SUBDIR = dri
 endif
 
+if DRI2
+DRI2_SUBDIR = dri2
+endif
+
 if XF86UTILS
 XF86UTILS_SUBDIR = utils
 endif
@@ -21,11 +25,11 @@ DOC_SUBDIR = doc
 SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support parser rac \
 	  ramdac shadowfb vbe vgahw xaa $(MFB_SUBDIR) $(CFB_SUBDIR) \
 	  xf8_16bpp loader dixmods exa modes \
-	  $(DRI_SUBDIR) $(XF86UTILS_SUBDIR) $(DOC_SUBDIR)
+	  $(DRI_SUBDIR) $(DRI2_SUBDIR) $(XF86UTILS_SUBDIR) $(DOC_SUBDIR)
 
 DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \
                parser rac ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp \
-               xf8_16bpp xf8_32bpp loader dixmods dri exa modes \
+               xf8_16bpp xf8_32bpp loader dixmods dri dri2 exa modes \
 	       utils doc
 
 bin_PROGRAMS = Xorg
diff --git a/hw/xfree86/dri2/Makefile.am b/hw/xfree86/dri2/Makefile.am
new file mode 100644
index 000000000..be3cea48f
--- /dev/null
+++ b/hw/xfree86/dri2/Makefile.am
@@ -0,0 +1,15 @@
+libdri2_la_LTLIBRARIES = libdri2.la
+libdri2_la_CFLAGS = \
+	-DHAVE_XORG_CONFIG_H \
+	-I@MESA_SOURCE@/include \
+	@DIX_CFLAGS@ @DRIPROTO_CFLAGS@ @LIBDRM_CFLAGS@ \
+	-I$(top_srcdir)/hw/xfree86/common \
+	-I$(top_srcdir)/hw/xfree86/os-support/bus
+
+libdri2_la_LDFLAGS = -module -avoid-version @LIBDRM_LIBS@
+libdri2_ladir = $(moduledir)/extensions
+libdri2_la_SOURCES = \
+	dri2.c \
+	dri2.h
+
+sdk_HEADERS = dri2.h
diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c
new file mode 100644
index 000000000..7c703a72c
--- /dev/null
+++ b/hw/xfree86/dri2/dri2.c
@@ -0,0 +1,448 @@
+/*
+ * Copyright © 2007 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Soft-
+ * ware"), to deal in the Software without restriction, including without
+ * limitation the rights to use, copy, modify, merge, publish, distribute,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, provided that the above copyright
+ * notice(s) and this permission notice appear in all copies of the Soft-
+ * ware and that both the above copyright notice(s) and this permission
+ * notice appear in supporting documentation.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
+ * ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY
+ * RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
+ * THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE-
+ * QUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFOR-
+ * MANCE OF THIS SOFTWARE.
+ *
+ * Except as contained in this notice, the name of a copyright holder shall
+ * not be used in advertising or otherwise to promote the sale, use or
+ * other dealings in this Software without prior written authorization of
+ * the copyright holder.
+ *
+ * Authors:
+ *   Kristian Høgsberg (krh@redhat.com)
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <xf86drm.h>
+#include "xf86Module.h"
+#include "scrnintstr.h"
+#include "windowstr.h"
+#include "dri2.h"
+#include <GL/internal/dri_sarea.h>
+
+#include "xf86.h"
+
+static DevPrivateKey dri2ScreenPrivateKey = &dri2ScreenPrivateKey;
+static DevPrivateKey dri2WindowPrivateKey = &dri2WindowPrivateKey;
+static DevPrivateKey dri2PixmapPrivateKey = &dri2PixmapPrivateKey;
+
+typedef struct _DRI2DrawablePriv {
+    drm_drawable_t		 drawable;
+    unsigned int		 handle;
+} DRI2DrawablePrivRec, *DRI2DrawablePrivPtr;
+
+typedef struct _DRI2Screen {
+    int				 fd;
+    drmBO			 sareaBO;
+    void			*sarea;
+    unsigned int		 sareaSize;
+    const char			*driverName;
+    int				 ddxVersionMajor;
+    int				 ddxVersionMinor;
+    int				 ddxVersionPatch;
+
+    __DRIEventBuffer		*buffer;
+    int				 locked;
+
+    DRI2GetPixmapHandleProcPtr   getPixmapHandle;
+    DRI2BeginClipNotifyProcPtr	 beginClipNotify;
+    DRI2EndClipNotifyProcPtr	 endClipNotify;
+
+    ClipNotifyProcPtr		 ClipNotify;
+    HandleExposuresProcPtr	 HandleExposures;
+} DRI2ScreenRec, *DRI2ScreenPtr;
+
+static DRI2ScreenPtr
+DRI2GetScreen(ScreenPtr pScreen)
+{
+    return dixLookupPrivate(&pScreen->devPrivates, dri2ScreenPrivateKey);
+}
+
+static void *
+DRI2ScreenAllocEvent(DRI2ScreenPtr ds, size_t size)
+{
+    unsigned int *pad, mask = ds->buffer->size - 1;
+    size_t pad_size;
+    void *p;
+    
+    if ((ds->buffer->head & mask) + size > ds->buffer->size) {
+	/* The requested event size would wrap the buffer, so pad to
+	 * the end and allocate the event from the start. */
+	pad_size = ds->buffer->size - (ds->buffer->head & mask);
+	pad = (unsigned int *)
+	    (ds->buffer->data + (ds->buffer->prealloc & mask));
+	*pad = DRI2_EVENT_HEADER(DRI2_EVENT_PAD, pad_size);
+	ds->buffer->prealloc += pad_size;
+    }
+
+    p = ds->buffer->data + (ds->buffer->prealloc & mask);
+    ds->buffer->prealloc += size;
+
+    return p;
+}
+
+static void
+DRI2ScreenCommitEvents(DRI2ScreenPtr ds)
+{
+    ds->buffer->head = ds->buffer->prealloc;
+}
+
+static void
+DRI2PostDrawableConfig(DrawablePtr pDraw)
+{
+    ScreenPtr			 pScreen = pDraw->pScreen;
+    DRI2ScreenPtr		 ds = DRI2GetScreen(pScreen);
+    DRI2DrawablePrivPtr		 pPriv;
+    WindowPtr			 pWin;
+    PixmapPtr			 pPixmap;
+    BoxPtr			 pBox;
+    BoxRec			 pixmapBox;
+    int				 nBox;
+    int				 i;
+    __DRIDrawableConfigEvent	*e;
+    size_t			 size;
+
+    if (pDraw->type == DRAWABLE_WINDOW) {
+	pWin = (WindowPtr) pDraw;
+	pPriv = dixLookupPrivate(&pWin->devPrivates, dri2WindowPrivateKey);
+
+	nBox = REGION_NUM_RECTS(&pWin->clipList);
+	pBox = REGION_RECTS(&pWin->clipList);
+
+	pPixmap = pScreen->GetWindowPixmap(pWin);
+    } else {
+	pPixmap = (PixmapPtr) pDraw;
+	pPriv = dixLookupPrivate(&pPixmap->devPrivates, dri2PixmapPrivateKey);
+
+	pixmapBox.x1 = 0;
+	pixmapBox.y1 = 0;
+	pixmapBox.x2 = pDraw->width;
+	pixmapBox.y2 = pDraw->height;
+	nBox = 1;
+	pBox = &pixmapBox;
+    }
+
+    if (!pPriv)
+	return;
+
+    size = sizeof *e + nBox * sizeof e->rects[0];
+
+    e = DRI2ScreenAllocEvent(ds, size);
+    e->event_header = DRI2_EVENT_HEADER(DRI2_EVENT_DRAWABLE_CONFIG, size);
+    e->drawable = pPriv->drawable;
+    e->x = pDraw->x - pPixmap->screen_x;
+    e->y = pDraw->y - pPixmap->screen_y;
+    e->width = pDraw->width;
+    e->height = pDraw->height;
+
+    e->num_rects = nBox;
+    for (i = 0; i < nBox; i++) {
+	e->rects[i].x1 = pBox->x1 - pPixmap->screen_x;
+	e->rects[i].y1 = pBox->y1 - pPixmap->screen_y;
+	e->rects[i].x2 = pBox->x2 - pPixmap->screen_x;
+	e->rects[i].y2 = pBox->y2 - pPixmap->screen_y;
+	pBox++;
+    }
+}
+
+static void
+DRI2PostBufferAttach(DrawablePtr pDraw)
+{
+    ScreenPtr			 pScreen = pDraw->pScreen;
+    DRI2ScreenPtr		 ds = DRI2GetScreen(pScreen);
+    DRI2DrawablePrivPtr		 pPriv;
+    WindowPtr			 pWin;
+    PixmapPtr			 pPixmap;
+    __DRIBufferAttachEvent	*e;
+    size_t			 size;
+    unsigned int		 handle, flags;
+
+    if (pDraw->type == DRAWABLE_WINDOW) {
+	pWin = (WindowPtr) pDraw;
+	pPixmap = pScreen->GetWindowPixmap(pWin);
+	pPriv = dixLookupPrivate(&pWin->devPrivates, dri2WindowPrivateKey);
+    } else {
+	pPixmap = (PixmapPtr) pDraw;
+	pPriv = dixLookupPrivate(&pPixmap->devPrivates, dri2PixmapPrivateKey);
+    }
+
+    if (!pPriv)
+	return;
+
+    size = sizeof *e;
+
+    handle = ds->getPixmapHandle(pPixmap, &flags);
+    if (handle == 0 || handle == pPriv->handle)
+	return;
+
+    e = DRI2ScreenAllocEvent(ds, size);
+    e->event_header = DRI2_EVENT_HEADER(DRI2_EVENT_BUFFER_ATTACH, size);
+    e->drawable = pPriv->drawable;
+    e->buffer.attachment = DRI_DRAWABLE_BUFFER_FRONT_LEFT;
+    e->buffer.handle = handle;
+    e->buffer.pitch = pPixmap->devKind;
+    e->buffer.cpp = pPixmap->drawable.bitsPerPixel / 8;
+    e->buffer.flags = flags;
+
+    pPriv->handle = handle;
+}
+
+static void
+DRI2ClipNotify(WindowPtr pWin, int dx, int dy)
+{
+    ScreenPtr		pScreen = pWin->drawable.pScreen;
+    DRI2ScreenPtr	ds = DRI2GetScreen(pScreen);
+
+    if (!ds->locked) {
+        ds->beginClipNotify(pScreen);
+	ds->locked = 1;
+    }
+
+    if (ds->ClipNotify) {
+	pScreen->ClipNotify = ds->ClipNotify;
+	pScreen->ClipNotify(pWin, dx, dy);
+	pScreen->ClipNotify = DRI2ClipNotify;
+    }
+
+    DRI2PostDrawableConfig(&pWin->drawable);
+    DRI2PostBufferAttach(&pWin->drawable);
+}
+
+static void
+DRI2HandleExposures(WindowPtr pWin)
+{
+    ScreenPtr		pScreen = pWin->drawable.pScreen;
+    DRI2ScreenPtr	ds = DRI2GetScreen(pScreen);
+
+    if (ds->HandleExposures) {
+	pScreen->HandleExposures = ds->HandleExposures;
+	pScreen->HandleExposures(pWin);
+	pScreen->HandleExposures = DRI2HandleExposures;
+    }
+
+    DRI2ScreenCommitEvents(ds);
+
+    if (ds->locked) {
+        ds->endClipNotify(pScreen);
+	ds->locked = 0;
+    }
+}
+
+void
+DRI2CloseScreen(ScreenPtr pScreen)
+{
+    DRI2ScreenPtr	ds = DRI2GetScreen(pScreen);
+
+    pScreen->ClipNotify		= ds->ClipNotify;
+    pScreen->HandleExposures	= ds->HandleExposures;
+
+    drmBOUnmap(ds->fd, &ds->sareaBO);
+    drmBOUnreference(ds->fd, &ds->sareaBO);
+
+    xfree(ds);
+    dixSetPrivate(&pScreen->devPrivates, dri2ScreenPrivateKey, NULL);
+}
+
+Bool
+DRI2CreateDrawable(ScreenPtr pScreen,
+		   DrawablePtr pDraw, drm_drawable_t *pDrmDrawable)
+{
+    DRI2ScreenPtr	ds = DRI2GetScreen(pScreen);
+    WindowPtr		pWin;
+    PixmapPtr		pPixmap;
+    DRI2DrawablePrivPtr pPriv;
+    DevPrivateKey	key;
+    PrivateRec		**devPrivates;
+
+    if (pDraw->type == DRAWABLE_WINDOW) {
+	pWin = (WindowPtr) pDraw;
+	devPrivates = &pWin->devPrivates;
+	key = dri2WindowPrivateKey;
+    } else {
+	pPixmap = (PixmapPtr) pDraw;
+	devPrivates = &pPixmap->devPrivates;
+	key = dri2PixmapPrivateKey;
+    }
+
+    pPriv = dixLookupPrivate(devPrivates, key);
+    if (pPriv == NULL) {
+	pPriv = xalloc(sizeof *pPriv);
+	if (drmCreateDrawable(ds->fd, &pPriv->drawable))
+	    return FALSE;
+
+	dixSetPrivate(devPrivates, key, pPriv);
+    }
+
+    *pDrmDrawable = pPriv->drawable;
+
+    DRI2PostDrawableConfig(pDraw);
+    DRI2PostBufferAttach(pDraw);
+    DRI2ScreenCommitEvents(ds);
+
+    return TRUE;
+}
+
+void
+DRI2DestroyDrawable(ScreenPtr pScreen, DrawablePtr pDraw)
+{
+    DRI2ScreenPtr ds = DRI2GetScreen(pScreen);
+    PixmapPtr pPixmap;
+    WindowPtr pWin;
+    DRI2DrawablePrivPtr pPriv;
+
+    if (pDraw->type == DRAWABLE_WINDOW) {
+	pWin = (WindowPtr) pDraw;
+	pPriv = dixLookupPrivate(&pWin->devPrivates, dri2WindowPrivateKey);
+	dixSetPrivate(&pWin->devPrivates, dri2WindowPrivateKey, NULL);
+    } else {
+	pPixmap = (PixmapPtr) pDraw;
+	pPriv = dixLookupPrivate(&pPixmap->devPrivates, dri2PixmapPrivateKey);
+	dixSetPrivate(&pPixmap->devPrivates, dri2PixmapPrivateKey, NULL);
+    }
+
+    if (pPriv == NULL)
+	return;
+    
+    drmDestroyDrawable(ds->fd, pPriv->drawable);
+    xfree(pPriv);
+}
+
+Bool
+DRI2Connect(ScreenPtr pScreen, int *fd, const char **driverName,
+	    int *ddxMajor, int *ddxMinor, int *ddxPatch,
+	    unsigned int *sareaHandle)
+{
+    DRI2ScreenPtr ds = DRI2GetScreen(pScreen);
+
+    if (ds == NULL)
+	return FALSE;
+
+    *fd = ds->fd;
+    *driverName = ds->driverName;
+    *ddxMajor = ds->ddxVersionMajor;
+    *ddxMinor = ds->ddxVersionMinor;
+    *ddxPatch = ds->ddxVersionPatch;
+    *sareaHandle = ds->sareaBO.handle;
+
+    return TRUE;
+}
+
+static void *
+DRI2SetupSAREA(ScreenPtr pScreen, size_t driverSareaSize)
+{
+    DRI2ScreenPtr ds = DRI2GetScreen(pScreen);
+    unsigned long mask;
+    const size_t event_buffer_size = 32 * 1024;
+
+    ds->sareaSize = 
+	sizeof(*ds->buffer) + event_buffer_size +
+	driverSareaSize +
+	sizeof (unsigned int);
+
+    mask = DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE | DRM_BO_FLAG_MAPPABLE |
+	DRM_BO_FLAG_MEM_LOCAL | DRM_BO_FLAG_SHAREABLE;
+
+    if (drmBOCreate(ds->fd, ds->sareaSize, 1, NULL, mask, 0, &ds->sareaBO))
+	return NULL;
+
+    if (drmBOMap(ds->fd, &ds->sareaBO,
+		 DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE, 0, &ds->sarea)) {
+	drmBOUnreference(ds->fd, &ds->sareaBO);
+	return NULL;
+    }
+
+    xf86DrvMsg(pScreen->myNum, X_INFO,
+	       "[DRI2] Allocated %d byte SAREA, BO handle 0x%08x\n",
+	       ds->sareaSize, ds->sareaBO.handle);
+    memset(ds->sarea, 0, ds->sareaSize);
+
+    ds->buffer = ds->sarea;
+    ds->buffer->block_header =
+	DRI2_SAREA_BLOCK_HEADER(DRI2_SAREA_BLOCK_EVENT_BUFFER,
+				sizeof *ds->buffer + event_buffer_size);
+    ds->buffer->size = event_buffer_size;
+
+    return DRI2_SAREA_BLOCK_NEXT(ds->buffer);
+}
+
+void *
+DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info)
+{
+    DRI2ScreenPtr ds;
+    void *p;
+
+    ds = xalloc(sizeof *ds);
+    if (!ds)
+	return NULL;
+
+    ds->fd = info->fd;
+    ds->driverName		= info->driverName;
+    ds->ddxVersionMajor		= info->ddxVersionMajor;
+    ds->ddxVersionMinor		= info->ddxVersionMinor;
+    ds->ddxVersionPatch		= info->ddxVersionPatch;
+
+    ds->getPixmapHandle		= info->getPixmapHandle;
+    ds->beginClipNotify		= info->beginClipNotify;
+    ds->endClipNotify		= info->endClipNotify;
+
+    ds->ClipNotify		= pScreen->ClipNotify;
+    pScreen->ClipNotify		= DRI2ClipNotify;
+    ds->HandleExposures		= pScreen->HandleExposures;
+    pScreen->HandleExposures	= DRI2HandleExposures;
+
+    dixSetPrivate(&pScreen->devPrivates, dri2ScreenPrivateKey, ds);
+
+    p = DRI2SetupSAREA(pScreen, info->driverSareaSize);
+    if (p == NULL) {
+	xfree(ds);
+	return NULL;
+    }
+
+    xf86DrvMsg(pScreen->myNum, X_INFO, "[DRI2] Setup complete\n");
+
+    return p;
+}
+
+static pointer
+DRI2Setup(pointer module, pointer opts, int *errmaj, int *errmin)
+{
+    return (pointer) 1;
+}
+
+static XF86ModuleVersionInfo DRI2VersRec =
+{
+    "dri2",
+    MODULEVENDORSTRING,
+    MODINFOSTRING1,
+    MODINFOSTRING2,
+    XORG_VERSION_CURRENT,
+    1, 0, 0,
+    ABI_CLASS_EXTENSION,
+    ABI_EXTENSION_VERSION,
+    MOD_CLASS_NONE,
+    { 0, 0, 0, 0 }
+};
+
+_X_EXPORT XF86ModuleData dri2ModuleData = { &DRI2VersRec, DRI2Setup, NULL };
+
diff --git a/hw/xfree86/dri2/dri2.h b/hw/xfree86/dri2/dri2.h
new file mode 100644
index 000000000..65b4c6b76
--- /dev/null
+++ b/hw/xfree86/dri2/dri2.h
@@ -0,0 +1,77 @@
+/*
+ * Copyright © 2007 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Soft-
+ * ware"), to deal in the Software without restriction, including without
+ * limitation the rights to use, copy, modify, merge, publish, distribute,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, provided that the above copyright
+ * notice(s) and this permission notice appear in all copies of the Soft-
+ * ware and that both the above copyright notice(s) and this permission
+ * notice appear in supporting documentation.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
+ * ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY
+ * RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
+ * THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE-
+ * QUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFOR-
+ * MANCE OF THIS SOFTWARE.
+ *
+ * Except as contained in this notice, the name of a copyright holder shall
+ * not be used in advertising or otherwise to promote the sale, use or
+ * other dealings in this Software without prior written authorization of
+ * the copyright holder.
+ *
+ * Authors:
+ *   Kristian Høgsberg (krh@redhat.com)
+ */
+
+#ifndef _DRI2_H_
+#define _DRI2_H_
+
+typedef unsigned int	(*DRI2GetPixmapHandleProcPtr)(PixmapPtr p,
+						      unsigned int *flags);
+typedef void		(*DRI2BeginClipNotifyProcPtr)(ScreenPtr pScreen);
+typedef void		(*DRI2EndClipNotifyProcPtr)(ScreenPtr pScreen);
+
+typedef struct {
+    unsigned int version;	/* Version of this struct */
+    int fd;
+    size_t driverSareaSize;
+    const char *driverName;
+    int ddxVersionMajor, ddxVersionMinor, ddxVersionPatch;
+    DRI2GetPixmapHandleProcPtr getPixmapHandle;
+    DRI2BeginClipNotifyProcPtr beginClipNotify;
+    DRI2EndClipNotifyProcPtr endClipNotify;
+}  DRI2InfoRec, *DRI2InfoPtr;
+
+void *DRI2ScreenInit(ScreenPtr	pScreen,
+		     DRI2InfoPtr info);
+
+void DRI2CloseScreen(ScreenPtr pScreen);
+
+Bool DRI2Connect(ScreenPtr pScreen,
+		 int *fd,
+		 const char **driverName,
+		 int *ddxMajor,
+		 int *ddxMinor,
+		 int *ddxPatch,
+		 unsigned int *sareaHandle);
+
+void DRI2Lock(ScreenPtr pScreen);
+void DRI2Unlock(ScreenPtr pScreen);
+
+Bool DRI2CreateDrawable(ScreenPtr	 pScreen,
+			DrawablePtr	 pDraw,
+			drm_drawable_t	*pDrmDrawable);
+
+void DRI2DestroyDrawable(ScreenPtr	pScreen,
+			 DrawablePtr	pDraw);
+
+void DRI2ExtensionInit(void);
+
+#endif
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index 068b55170..38639d684 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -436,6 +436,9 @@
 
 #undef XEPHYR_DRI
 
+/* Build DRI2 extension */
+#undef DRI2
+
 /* Build DBE support */
 #undef DBE
 
diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in
index b91ea9260..0603eab67 100644
--- a/include/xorg-config.h.in
+++ b/include/xorg-config.h.in
@@ -54,6 +54,9 @@
 /* Building DRI-capable DDX. */
 #undef XF86DRI
 
+/* Build DRI2 extension */
+#undef DRI2
+
 /* Solaris 8 or later? */
 #undef __SOL8__
 
diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
index dc6f1b31f..1d41b4ce6 100644
--- a/include/xorg-server.h.in
+++ b/include/xorg-server.h.in
@@ -142,6 +142,9 @@
 /* Build DRI extension */
 #undef XF86DRI
 
+/* Build DRI2 extension */
+#undef DRI2
+
 /* Build Xorg server */
 #undef XORGSERVER
 

From 879515b1399f87a47010532af70f34b9b09e2a9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@sasori.boston.redhat.com>
Date: Mon, 4 Feb 2008 13:13:35 -0500
Subject: [PATCH 500/552] Add GLX provider for DRI2.

---
 GL/glx/Makefile.am             |   2 +
 GL/glx/glxdri2.c               | 573 +++++++++++++++++++++++++++++++++
 GL/glx/glxscreens.c            |  26 ++
 hw/xfree86/dixmods/glxmodule.c |   3 +
 4 files changed, 604 insertions(+)
 create mode 100644 GL/glx/glxdri2.c

diff --git a/GL/glx/Makefile.am b/GL/glx/Makefile.am
index 4cf56e89d..e37e499c5 100644
--- a/GL/glx/Makefile.am
+++ b/GL/glx/Makefile.am
@@ -25,6 +25,7 @@ INCLUDES = \
 	-I$(top_srcdir)/hw/xfree86/os-support/bus \
 	-I$(top_srcdir)/hw/xfree86/common \
 	-I$(top_srcdir)/hw/xfree86/dri \
+	-I$(top_srcdir)/hw/xfree86/dri2 \
 	-I$(top_srcdir)/mi
 
 
@@ -36,6 +37,7 @@ nodist_libglx_la_SOURCES = indirect_size.h \
 
 libglxdri_la_SOURCES = \
         glxdri.c \
+        glxdri2.c \
         extension_string.c \
         extension_string.h
 
diff --git a/GL/glx/glxdri2.c b/GL/glx/glxdri2.c
new file mode 100644
index 000000000..d8df604c2
--- /dev/null
+++ b/GL/glx/glxdri2.c
@@ -0,0 +1,573 @@
+/*
+ * Copyright © 2007 Red Hat, Inc
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of Red Hat,
+ * Inc not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission.  Red Hat, Inc makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * RED HAT, INC DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL RED HAT, INC BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <sys/time.h>
+#include <dlfcn.h>
+
+#include <drm.h>
+#include <GL/gl.h>
+#include <GL/internal/dri_interface.h>
+
+#include <windowstr.h>
+#include <os.h>
+
+#define _XF86DRI_SERVER_
+#include <xf86drm.h>
+#include <xf86dristr.h>
+#include <xf86str.h>
+#include <xf86.h>
+#include <dri2.h>
+
+#include "glxserver.h"
+#include "glxutil.h"
+#include "glcontextmodes.h"
+
+#include "g_disptab.h"
+#include "glapitable.h"
+#include "glapi.h"
+#include "glthread.h"
+#include "dispatch.h"
+#include "extension_string.h"
+
+#define containerOf(ptr, type, member)			\
+    (type *)( (char *)ptr - offsetof(type,member) )
+
+typedef struct __GLXDRIscreen   __GLXDRIscreen;
+typedef struct __GLXDRIcontext  __GLXDRIcontext;
+typedef struct __GLXDRIdrawable __GLXDRIdrawable;
+
+struct __GLXDRIscreen {
+    __GLXscreen		 base;
+    __DRIscreen		 driScreen;
+    void		*driver;
+    int			 fd;
+
+    xf86EnterVTProc	*enterVT;
+    xf86LeaveVTProc	*leaveVT;
+
+    __DRIcopySubBufferExtension *copySubBuffer;
+    __DRIswapControlExtension *swapControl;
+
+    unsigned char glx_enable_bits[__GLX_EXT_BYTES];
+};
+
+struct __GLXDRIcontext {
+    __GLXcontext base;
+    __DRIcontext driContext;
+    drm_context_t hwContext;
+};
+
+struct __GLXDRIdrawable {
+    __GLXdrawable base;
+    __DRIdrawable driDrawable;
+};
+
+static const char CREATE_NEW_SCREEN_FUNC[] = __DRI2_CREATE_NEW_SCREEN_STRING;
+
+static void
+__glXDRIdrawableDestroy(__GLXdrawable *drawable)
+{
+    __GLXDRIdrawable *private = (__GLXDRIdrawable *) drawable;
+
+    (*private->driDrawable.destroyDrawable)(&private->driDrawable);
+
+    /* If the X window was destroyed, the dri DestroyWindow hook will
+     * aready have taken care of this, so only call if pDraw isn't NULL. */
+    if (drawable->pDraw != NULL)
+	DRI2DestroyDrawable(drawable->pDraw->pScreen, drawable->pDraw);
+
+    xfree(private);
+}
+
+static GLboolean
+__glXDRIdrawableResize(__GLXdrawable *glxPriv)
+{
+    /* Nothing to do here, the DRI driver asks the server for drawable
+     * geometry when it sess the SAREA timestamps change.*/
+
+    return GL_TRUE;
+}
+
+static GLboolean
+__glXDRIdrawableSwapBuffers(__GLXdrawable *basePrivate)
+{
+    __GLXDRIdrawable *private = (__GLXDRIdrawable *) basePrivate;
+
+    (*private->driDrawable.swapBuffers)(&private->driDrawable);
+
+    return TRUE;
+}
+
+
+static int
+__glXDRIdrawableSwapInterval(__GLXdrawable *baseDrawable, int interval)
+{
+    __GLXDRIdrawable *draw = (__GLXDRIdrawable *) baseDrawable;
+    __GLXDRIscreen *screen = (__GLXDRIscreen *)
+	glxGetScreen(baseDrawable->pDraw->pScreen);
+
+    if (screen->swapControl)
+	screen->swapControl->setSwapInterval(&draw->driDrawable, interval);
+
+    return 0;
+}
+
+
+static void
+__glXDRIdrawableCopySubBuffer(__GLXdrawable *basePrivate,
+			       int x, int y, int w, int h)
+{
+    __GLXDRIdrawable *private = (__GLXDRIdrawable *) basePrivate;
+    __GLXDRIscreen *screen = (__GLXDRIscreen *)
+	glxGetScreen(basePrivate->pDraw->pScreen);
+
+    if (screen->copySubBuffer)
+	screen->copySubBuffer->copySubBuffer(&private->driDrawable,
+					     x, y, w, h);
+}
+
+static void
+__glXDRIcontextDestroy(__GLXcontext *baseContext)
+{
+    __GLXDRIcontext *context = (__GLXDRIcontext *) baseContext;
+    __GLXDRIscreen *screen = (__GLXDRIscreen *) baseContext->pGlxScreen;
+
+    context->driContext.destroyContext(&context->driContext);
+    drmDestroyContext(screen->fd, context->hwContext);
+    __glXContextDestroy(&context->base);
+    xfree(context);
+}
+
+static int
+__glXDRIcontextMakeCurrent(__GLXcontext *baseContext)
+{
+    __GLXDRIcontext *context = (__GLXDRIcontext *) baseContext;
+    __GLXDRIdrawable *draw = (__GLXDRIdrawable *) baseContext->drawPriv;
+    __GLXDRIdrawable *read = (__GLXDRIdrawable *) baseContext->readPriv;
+
+    return (*context->driContext.bindContext)(&context->driContext,
+					      &draw->driDrawable,
+					      &read->driDrawable);
+}					      
+
+static int
+__glXDRIcontextLoseCurrent(__GLXcontext *baseContext)
+{
+    __GLXDRIcontext *context = (__GLXDRIcontext *) baseContext;
+
+    return (*context->driContext.unbindContext)(&context->driContext);
+}
+
+static int
+__glXDRIcontextCopy(__GLXcontext *baseDst, __GLXcontext *baseSrc,
+		    unsigned long mask)
+{
+    __GLXDRIcontext *dst = (__GLXDRIcontext *) baseDst;
+    __GLXDRIcontext *src = (__GLXDRIcontext *) baseSrc;
+
+    /* FIXME: We will need to add DRIcontext::copyContext for this. */
+
+    (void) dst;
+    (void) src;
+
+    return FALSE;
+}
+
+static int
+__glXDRIcontextForceCurrent(__GLXcontext *baseContext)
+{
+    __GLXDRIcontext *context = (__GLXDRIcontext *) baseContext;
+    __GLXDRIdrawable *draw = (__GLXDRIdrawable *) baseContext->drawPriv;
+    __GLXDRIdrawable *read = (__GLXDRIdrawable *) baseContext->readPriv;
+
+    return (*context->driContext.bindContext)(&context->driContext,
+					      &draw->driDrawable,
+					      &read->driDrawable);
+}
+
+static int
+__glXDRIbindTexImage(__GLXcontext *baseContext,
+		     int buffer,
+		     __GLXdrawable *glxPixmap)
+{
+    return Success;
+}
+
+static int
+__glXDRIreleaseTexImage(__GLXcontext *baseContext,
+			int buffer,
+			__GLXdrawable *pixmap)
+{
+    return Success;
+}
+
+static __GLXtextureFromPixmap __glXDRItextureFromPixmap = {
+    __glXDRIbindTexImage,
+    __glXDRIreleaseTexImage
+};
+
+static void
+__glXDRIscreenDestroy(__GLXscreen *baseScreen)
+{
+    __GLXDRIscreen *screen = (__GLXDRIscreen *) baseScreen;
+
+    screen->driScreen.destroyScreen(&screen->driScreen);
+
+    dlclose(screen->driver);
+
+    __glXScreenDestroy(baseScreen);
+
+    xfree(screen);
+}
+
+static __GLXcontext *
+__glXDRIscreenCreateContext(__GLXscreen *baseScreen,
+			    __GLcontextModes *modes,
+			    __GLXcontext *baseShareContext)
+{
+    __GLXDRIscreen *screen = (__GLXDRIscreen *) baseScreen;
+    __GLXDRIcontext *context, *shareContext;
+    __DRIcontext *driShare;
+
+    shareContext = (__GLXDRIcontext *) baseShareContext;
+    if (shareContext)
+	driShare = &shareContext->driContext;
+    else
+	driShare = NULL;
+
+    context = xalloc(sizeof *context);
+    if (context == NULL)
+	return NULL;
+
+    memset(context, 0, sizeof *context);
+    context->base.destroy           = __glXDRIcontextDestroy;
+    context->base.makeCurrent       = __glXDRIcontextMakeCurrent;
+    context->base.loseCurrent       = __glXDRIcontextLoseCurrent;
+    context->base.copy              = __glXDRIcontextCopy;
+    context->base.forceCurrent      = __glXDRIcontextForceCurrent;
+    context->base.textureFromPixmap = &__glXDRItextureFromPixmap;
+
+    if (drmCreateContext(screen->fd, &context->hwContext))
+	    return GL_FALSE;
+
+    context->driContext.private =
+	screen->driScreen.createNewContext(&screen->driScreen,
+					   modes,
+					   0, /* render type */
+					   driShare,
+					   context->hwContext,
+					   &context->driContext);
+
+    return &context->base;
+}
+
+static __GLXdrawable *
+__glXDRIscreenCreateDrawable(__GLXscreen *screen,
+			     DrawablePtr pDraw,
+			     int type,
+			     XID drawId,
+			     __GLcontextModes *modes)
+{
+    __GLXDRIscreen *driScreen = (__GLXDRIscreen *) screen;
+    __GLXDRIdrawable *private;
+    GLboolean retval;
+    drm_drawable_t hwDrawable;
+
+    private = xalloc(sizeof *private);
+    if (private == NULL)
+	return NULL;
+
+    memset(private, 0, sizeof *private);
+
+    if (!__glXDrawableInit(&private->base, screen,
+			   pDraw, type, drawId, modes)) {
+        xfree(private);
+	return NULL;
+    }
+
+    private->base.destroy       = __glXDRIdrawableDestroy;
+    private->base.resize        = __glXDRIdrawableResize;
+    private->base.swapBuffers   = __glXDRIdrawableSwapBuffers;
+    private->base.copySubBuffer = __glXDRIdrawableCopySubBuffer;
+
+    retval = DRI2CreateDrawable(screen->pScreen, pDraw, &hwDrawable);
+
+    private->driDrawable.private =
+	(driScreen->driScreen.createNewDrawable)(&driScreen->driScreen,
+						 modes,
+						 &private->driDrawable,
+						 hwDrawable, 0, NULL);
+
+    return &private->base;
+}
+
+static int
+getUST(int64_t *ust)
+{
+    struct timeval  tv;
+    
+    if (ust == NULL)
+	return -EFAULT;
+
+    if (gettimeofday(&tv, NULL) == 0) {
+	ust[0] = (tv.tv_sec * 1000000) + tv.tv_usec;
+	return 0;
+    } else {
+	return -errno;
+    }
+}
+
+static void __glXReportDamage(__DRIdrawable *driDraw,
+			      int x, int y,
+			      drm_clip_rect_t *rects, int num_rects,
+			      GLboolean front_buffer)
+{
+    __GLXDRIdrawable *drawable =
+	    containerOf(driDraw, __GLXDRIdrawable, driDrawable);
+    DrawablePtr pDraw = drawable->base.pDraw;
+    RegionRec region;
+
+    REGION_INIT(pDraw->pScreen, &region, (BoxPtr) rects, num_rects);
+    REGION_TRANSLATE(pScreen, &region, pDraw->x, pDraw->y);
+    DamageDamageRegion(pDraw, &region);
+    REGION_UNINIT(pDraw->pScreen, &region);
+}
+
+/* Table of functions that we export to the driver. */
+static const __DRIinterfaceMethods interface_methods = {
+    _gl_context_modes_create,
+    _gl_context_modes_destroy,
+
+    NULL,
+
+    getUST,
+    NULL,
+
+    __glXReportDamage,
+};
+
+static const char dri_driver_path[] = DRI_DRIVER_PATH;
+
+static Bool
+glxDRIEnterVT (int index, int flags)
+{
+    __GLXDRIscreen *screen = (__GLXDRIscreen *) 
+	glxGetScreen(screenInfo.screens[index]);
+
+    LogMessage(X_INFO, "AIGLX: Resuming AIGLX clients after VT switch\n");
+
+    if (!(*screen->enterVT) (index, flags))
+	return FALSE;
+    
+    glxResumeClients();
+
+    return TRUE;
+}
+
+static void
+glxDRILeaveVT (int index, int flags)
+{
+    __GLXDRIscreen *screen = (__GLXDRIscreen *)
+	glxGetScreen(screenInfo.screens[index]);
+
+    LogMessage(X_INFO, "AIGLX: Suspending AIGLX clients for VT switch\n");
+
+    glxSuspendClients();
+
+    return (*screen->leaveVT) (index, flags);
+}
+
+static void
+initializeExtensions(__GLXDRIscreen *screen)
+{
+    const __DRIextension **extensions;
+    int i;
+
+    extensions = screen->driScreen.getExtensions(&screen->driScreen);
+    for (i = 0; extensions[i]; i++) {
+#ifdef __DRI_COPY_SUB_BUFFER
+	if (strcmp(extensions[i]->name, __DRI_COPY_SUB_BUFFER) == 0) {
+	    screen->copySubBuffer = (__DRIcopySubBufferExtension *) extensions[i];
+	    __glXEnableExtension(screen->glx_enable_bits,
+				 "GLX_MESA_copy_sub_buffer");
+	    
+	    LogMessage(X_INFO, "AIGLX: enabled GLX_MESA_copy_sub_buffer\n");
+	}
+#endif
+
+#ifdef __DRI_SWAP_CONTROL
+	if (strcmp(extensions[i]->name, __DRI_SWAP_CONTROL) == 0) {
+	    screen->swapControl = (__DRIswapControlExtension *) extensions[i];
+	    __glXEnableExtension(screen->glx_enable_bits,
+				 "GLX_SGI_swap_control");
+	    __glXEnableExtension(screen->glx_enable_bits,
+				 "GLX_MESA_swap_control");
+	    
+	    LogMessage(X_INFO, "AIGLX: enabled GLX_SGI_swap_control and GLX_MESA_swap_control\n");
+	}
+#endif
+	/* Ignore unknown extensions */
+    }
+}
+    
+static __GLXscreen *
+__glXDRIscreenProbe(ScreenPtr pScreen)
+{
+    __DRI2_CREATE_NEW_SCREEN_FUNC *createNewScreen;
+    __DRIversion   ddx_version;
+    __DRIversion   dri_version;
+    __DRIversion   drm_version;
+    drmVersionPtr version;
+    const char *driverName;
+    __GLXDRIscreen *screen;
+    char filename[128];
+    size_t buffer_size;
+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+    unsigned int sareaHandle;
+
+    screen = xalloc(sizeof *screen);
+    if (screen == NULL)
+      return NULL;
+    memset(screen, 0, sizeof *screen);
+
+    if (!xf86LoaderCheckSymbol("DRI2Connect") ||
+	!DRI2Connect(pScreen,
+		     &screen->fd,
+		     &driverName,
+		     &ddx_version.major,
+		     &ddx_version.minor,
+		     &ddx_version.patch,
+		     &sareaHandle)) {
+	LogMessage(X_INFO,
+		   "AIGLX: Screen %d is not DRI2 capable\n", pScreen->myNum);
+	return NULL;
+    }
+
+    screen->base.destroy        = __glXDRIscreenDestroy;
+    screen->base.createContext  = __glXDRIscreenCreateContext;
+    screen->base.createDrawable = __glXDRIscreenCreateDrawable;
+    screen->base.swapInterval   = __glXDRIdrawableSwapInterval;
+    screen->base.pScreen       = pScreen;
+
+    __glXInitExtensionEnableBits(screen->glx_enable_bits);
+
+    /* DRI protocol version. */
+    dri_version.major = XF86DRI_MAJOR_VERSION;
+    dri_version.minor = XF86DRI_MINOR_VERSION;
+    dri_version.patch = XF86DRI_PATCH_VERSION;
+
+    version = drmGetVersion(screen->fd);
+    if (version) {
+	drm_version.major = version->version_major;
+	drm_version.minor = version->version_minor;
+	drm_version.patch = version->version_patchlevel;
+	drmFreeVersion(version);
+    }
+    else {
+	drm_version.major = -1;
+	drm_version.minor = -1;
+	drm_version.patch = -1;
+    }
+
+    snprintf(filename, sizeof filename, "%s/%s_dri.so",
+             dri_driver_path, driverName);
+
+    screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
+    if (screen->driver == NULL) {
+	LogMessage(X_ERROR, "AIGLX error: dlopen of %s failed (%s)\n",
+		   filename, dlerror());
+        goto handle_error;
+    }
+
+    createNewScreen = dlsym(screen->driver, CREATE_NEW_SCREEN_FUNC);
+    if (createNewScreen == NULL) {
+	LogMessage(X_ERROR, "AIGLX error: dlsym for %s failed (%s)\n",
+		   CREATE_NEW_SCREEN_FUNC, dlerror());
+      goto handle_error;
+    }
+    
+    screen->driScreen.private =
+	(*createNewScreen)(pScreen->myNum,
+			   &screen->driScreen,
+			   &ddx_version,
+			   &dri_version,
+			   &drm_version,
+			   screen->fd,
+			   sareaHandle,
+			   &interface_methods,
+			   &screen->base.fbconfigs);
+
+    if (screen->driScreen.private == NULL) {
+	LogMessage(X_ERROR, "AIGLX error: Calling driver entry point failed");
+	goto handle_error;
+    }
+
+    initializeExtensions(screen);
+
+    __glXScreenInit(&screen->base, pScreen);
+
+    buffer_size = __glXGetExtensionString(screen->glx_enable_bits, NULL);
+    if (buffer_size > 0) {
+	if (screen->base.GLXextensions != NULL) {
+	    xfree(screen->base.GLXextensions);
+	}
+
+	screen->base.GLXextensions = xnfalloc(buffer_size);
+	(void) __glXGetExtensionString(screen->glx_enable_bits, 
+				       screen->base.GLXextensions);
+    }
+
+    screen->enterVT = pScrn->EnterVT;
+    pScrn->EnterVT = glxDRIEnterVT; 
+    screen->leaveVT = pScrn->LeaveVT;
+    pScrn->LeaveVT = glxDRILeaveVT;
+
+    LogMessage(X_INFO,
+	       "AIGLX: Loaded and initialized %s\n", filename);
+
+    return &screen->base;
+
+ handle_error:
+    if (screen->driver)
+        dlclose(screen->driver);
+
+    xfree(screen);
+
+    LogMessage(X_ERROR, "AIGLX: reverting to software rendering\n");
+
+    return NULL;
+}
+
+__GLXprovider __glXDRI2Provider = {
+    __glXDRIscreenProbe,
+    "DRI2",
+    NULL
+};
diff --git a/GL/glx/glxscreens.c b/GL/glx/glxscreens.c
index 88773a785..6575b271d 100644
--- a/GL/glx/glxscreens.c
+++ b/GL/glx/glxscreens.c
@@ -280,6 +280,30 @@ void GlxSetVisualConfigs(int nconfigs,
      * call it. */
 }
 
+static void
+filterOutNativeConfigs(__GLXscreen *pGlxScreen)
+{
+    __GLcontextModes *m, *next, *native_modes, **last;
+    ScreenPtr pScreen = pGlxScreen->pScreen;
+    int i, depth;
+
+    last = &pGlxScreen->fbconfigs;
+    for (m = pGlxScreen->fbconfigs; m != NULL; m = next) {
+	next = m->next;
+	depth = m->redBits + m->blueBits + m->greenBits;
+
+	for (i = 0; i < pScreen->numVisuals; i++) {
+	    if (pScreen->visuals[i].nplanes == depth) {
+		*last = m;
+		last = &m->next;
+		break;
+	    }
+	}
+    }
+
+    *last = NULL;
+}
+
 static XID
 findVisualForConfig(ScreenPtr pScreen, __GLcontextModes *m)
 {
@@ -513,6 +537,8 @@ void __glXScreenInit(__GLXscreen *pGlxScreen, ScreenPtr pScreen)
     pGlxScreen->CloseScreen = pScreen->CloseScreen;
     pScreen->CloseScreen = glxCloseScreen;
 
+    filterOutNativeConfigs(pGlxScreen);
+
     i = 0;
     for (m = pGlxScreen->fbconfigs; m != NULL; m = m->next) {
 	m->fbconfigID = FakeClientID(0);
diff --git a/hw/xfree86/dixmods/glxmodule.c b/hw/xfree86/dixmods/glxmodule.c
index 0ff867de0..a1a088629 100644
--- a/hw/xfree86/dixmods/glxmodule.c
+++ b/hw/xfree86/dixmods/glxmodule.c
@@ -125,6 +125,9 @@ glxSetup(pointer module, pointer opts, int *errmaj, int *errmin)
       provider = LoaderSymbol("__glXDRIProvider");
       if (provider)
 	GlxPushProvider(provider);
+      provider = LoaderSymbol("__glXDRI2Provider");
+      if (provider)
+	GlxPushProvider(provider);
     }
 
     switch (xf86Info.glxVisuals) {

From 0ffb6a3ad010e80fe8f973fc228d549f9dd3effd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@redhat.com>
Date: Thu, 14 Feb 2008 22:20:56 -0500
Subject: [PATCH 501/552] GLX: Implement support for TTM BO based TFP when
 available.

---
 GL/glx/glxdri2.c       | 60 ++++++++++++++++++++++++++++++++++++++++++
 hw/xfree86/dri2/dri2.c |  8 ++++++
 hw/xfree86/dri2/dri2.h |  3 +++
 3 files changed, 71 insertions(+)

diff --git a/GL/glx/glxdri2.c b/GL/glx/glxdri2.c
index d8df604c2..d1c8d417e 100644
--- a/GL/glx/glxdri2.c
+++ b/GL/glx/glxdri2.c
@@ -75,6 +75,7 @@ struct __GLXDRIscreen {
 
     __DRIcopySubBufferExtension *copySubBuffer;
     __DRIswapControlExtension *swapControl;
+    __DRItexBufferExtension *texBuffer;
 
     unsigned char glx_enable_bits[__GLX_EXT_BYTES];
 };
@@ -213,6 +214,55 @@ __glXDRIcontextForceCurrent(__GLXcontext *baseContext)
 					      &read->driDrawable);
 }
 
+#ifdef __DRI_TEX_BUFFER
+
+#define isPowerOfTwo(n) (((n) & ((n) - 1 )) == 0)
+
+static int
+__glXDRIbindTexImage(__GLXcontext *baseContext,
+		     int buffer,
+		     __GLXdrawable *glxPixmap)
+{
+    ScreenPtr pScreen = glxPixmap->pDraw->pScreen;
+    __GLXDRIscreen * const screen = (__GLXDRIscreen *) glxGetScreen(pScreen);
+    PixmapPtr pixmap;
+    __GLXDRIcontext *context = (__GLXDRIcontext *) baseContext;
+    unsigned int flags;
+    int w, h, target;
+
+    if (screen->texBuffer == NULL)
+        return Success;
+
+    pixmap = (PixmapPtr) glxPixmap->pDraw;
+    w = pixmap->drawable.width;
+    h = pixmap->drawable.height;
+
+    if (!isPowerOfTwo(w) || !isPowerOfTwo(h))
+	target = GL_TEXTURE_RECTANGLE_ARB;
+    else
+	target = GL_TEXTURE_2D;
+
+    screen->texBuffer->setTexBuffer(&context->driContext,
+				    target,
+				    DRI2GetPixmapHandle(pixmap, &flags),
+				    pixmap->drawable.depth,
+				    pixmap->devKind,
+				    h);
+
+    return Success;
+}
+
+static int
+__glXDRIreleaseTexImage(__GLXcontext *baseContext,
+			int buffer,
+			__GLXdrawable *pixmap)
+{
+    /* FIXME: Just unbind the texture? */
+    return Success;
+}
+
+#else
+
 static int
 __glXDRIbindTexImage(__GLXcontext *baseContext,
 		     int buffer,
@@ -229,6 +279,8 @@ __glXDRIreleaseTexImage(__GLXcontext *baseContext,
     return Success;
 }
 
+#endif
+
 static __GLXtextureFromPixmap __glXDRItextureFromPixmap = {
     __glXDRIbindTexImage,
     __glXDRIreleaseTexImage
@@ -434,6 +486,14 @@ initializeExtensions(__GLXDRIscreen *screen)
 	    LogMessage(X_INFO, "AIGLX: enabled GLX_SGI_swap_control and GLX_MESA_swap_control\n");
 	}
 #endif
+
+#ifdef __DRI_TEX_BUFFER
+	if (strcmp(extensions[i]->name, __DRI_TEX_BUFFER) == 0) {
+	    screen->texBuffer = (__DRItexBufferExtension *) extensions[i];
+	    /* GLX_EXT_texture_from_pixmap is always enabled. */
+	    LogMessage(X_INFO, "AIGLX: GLX_EXT_texture_from_pixmap backed by buffer objects\n");
+	}
+#endif
 	/* Ignore unknown extensions */
     }
 }
diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c
index 7c703a72c..3bc533ede 100644
--- a/hw/xfree86/dri2/dri2.c
+++ b/hw/xfree86/dri2/dri2.c
@@ -348,6 +348,14 @@ DRI2Connect(ScreenPtr pScreen, int *fd, const char **driverName,
     return TRUE;
 }
 
+unsigned int
+DRI2GetPixmapHandle(PixmapPtr pPixmap, unsigned int *flags)
+{
+    DRI2ScreenPtr ds = DRI2GetScreen(pPixmap->drawable.pScreen);
+
+    return ds->getPixmapHandle(pPixmap, flags);
+}
+
 static void *
 DRI2SetupSAREA(ScreenPtr pScreen, size_t driverSareaSize)
 {
diff --git a/hw/xfree86/dri2/dri2.h b/hw/xfree86/dri2/dri2.h
index 65b4c6b76..c687a93f6 100644
--- a/hw/xfree86/dri2/dri2.h
+++ b/hw/xfree86/dri2/dri2.h
@@ -62,6 +62,9 @@ Bool DRI2Connect(ScreenPtr pScreen,
 		 int *ddxPatch,
 		 unsigned int *sareaHandle);
 
+unsigned int DRI2GetPixmapHandle(PixmapPtr pPixmap,
+				 unsigned int *flags);
+
 void DRI2Lock(ScreenPtr pScreen);
 void DRI2Unlock(ScreenPtr pScreen);
 

From a7d936c4ac8e3d7227ecbfe0ddc6cc257b450458 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@tifa.local>
Date: Mon, 11 Feb 2008 16:09:03 -0800
Subject: [PATCH 502/552] XQuartz: Fixed EXTRA_DIST to include localization
 (cherry picked from commit 1b338c2a9330c85490a7c24d52adf24b124b70e6)

---
 hw/xquartz/bundle/Makefile.am | 56 +++++++++++++++++++++++++++++++++--
 1 file changed, 53 insertions(+), 3 deletions(-)

diff --git a/hw/xquartz/bundle/Makefile.am b/hw/xquartz/bundle/Makefile.am
index 00d540fee..95cfd19f7 100644
--- a/hw/xquartz/bundle/Makefile.am
+++ b/hw/xquartz/bundle/Makefile.am
@@ -18,9 +18,59 @@ EXTRA_DIST = \
 	Info.plist \
 	X11.icns \
 	bundle-main.c \
+	X11.xcodeproj/project.pbxproj
+	Dutch.lproj/InfoPlist.strings \
+	Dutch.lproj/Localizable.strings \
+	Dutch.lproj/main.nib/keyedobjects.nib \
 	English.lproj/InfoPlist.strings \
 	English.lproj/Localizable.strings \
-	English.lproj/main.nib/classes.nib \
-	English.lproj/main.nib/info.nib \
+	English.lproj/main.nib/designable.nib \
 	English.lproj/main.nib/keyedobjects.nib \
-	X11.xcodeproj/project.pbxproj
+	French.lproj/InfoPlist.strings \
+	French.lproj/Localizable.strings \
+	French.lproj/main.nib/keyedobjects.nib \
+	German.lproj/InfoPlist.strings \
+	German.lproj/Localizable.strings \
+	German.lproj/main.nib/keyedobjects.nib \
+	Italian.lproj/InfoPlist.strings \
+	Italian.lproj/Localizable.strings \
+	Italian.lproj/main.nib/keyedobjects.nib \
+	Japanese.lproj/InfoPlist.strings \
+	Japanese.lproj/Localizable.strings \
+	Japanese.lproj/main.nib/keyedobjects.nib \
+	Spanish.lproj/InfoPlist.strings \
+	Spanish.lproj/Localizable.strings \
+	Spanish.lproj/main.nib/keyedobjects.nib \
+	da.lproj/InfoPlist.strings \
+	da.lproj/Localizable.strings \
+	da.lproj/main.nib/keyedobjects.nib \
+	fi.lproj/InfoPlist.strings \
+	fi.lproj/Localizable.strings \
+	fi.lproj/main.nib/keyedobjects.nib \
+	ko.lproj/InfoPlist.strings \
+	ko.lproj/Localizable.strings \
+	ko.lproj/main.nib/keyedobjects.nib \
+	no.lproj/InfoPlist.strings \
+	no.lproj/Localizable.strings \
+	no.lproj/main.nib/keyedobjects.nib \
+	pl.lproj/InfoPlist.strings \
+	pl.lproj/Localizable.strings \
+	pl.lproj/main.nib/keyedobjects.nib \
+	pt.lproj/InfoPlist.strings \
+	pt.lproj/Localizable.strings \
+	pt.lproj/main.nib/keyedobjects.nib \
+	pt_PT.lproj/InfoPlist.strings \
+	pt_PT.lproj/Localizable.strings \
+	pt_PT.lproj/main.nib/keyedobjects.nib \
+	ru.lproj/InfoPlist.strings \
+	ru.lproj/Localizable.strings \
+	ru.lproj/main.nib/keyedobjects.nib \
+	sv.lproj/InfoPlist.strings \
+	sv.lproj/Localizable.strings \
+	sv.lproj/main.nib/keyedobjects.nib \
+	zh_CN.lproj/InfoPlist.strings \
+	zh_CN.lproj/Localizable.strings \
+	zh_CN.lproj/main.nib/keyedobjects.nib \
+	zh_TW.lproj/InfoPlist.strings \
+	zh_TW.lproj/Localizable.strings \
+	zh_TW.lproj/main.nib/keyedobjects.nib

From d103820bb8635c63b34b85b45cad95ed9c152d90 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@tifa-2.local>
Date: Sat, 16 Feb 2008 00:35:50 -0800
Subject: [PATCH 503/552] Fixed unescaped newline in EXTRA_DIST (cherry picked
 from commit 567c172c4d400fdfe69e7b096a3877fce5c2de9f)

---
 hw/xquartz/bundle/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/xquartz/bundle/Makefile.am b/hw/xquartz/bundle/Makefile.am
index 95cfd19f7..093a102b5 100644
--- a/hw/xquartz/bundle/Makefile.am
+++ b/hw/xquartz/bundle/Makefile.am
@@ -18,7 +18,7 @@ EXTRA_DIST = \
 	Info.plist \
 	X11.icns \
 	bundle-main.c \
-	X11.xcodeproj/project.pbxproj
+	X11.xcodeproj/project.pbxproj \
 	Dutch.lproj/InfoPlist.strings \
 	Dutch.lproj/Localizable.strings \
 	Dutch.lproj/main.nib/keyedobjects.nib \

From b95059c20746a71e60ef152bb627e1d5c2210d75 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@tifa-2.local>
Date: Sat, 16 Feb 2008 01:33:13 -0800
Subject: [PATCH 504/552] Added Xquartz.plist to EXTRA_DIST (cherry picked from
 commit 70f9495e0c1f1459507064b673fe57b1c90d3c2c)

---
 hw/xquartz/bundle/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/xquartz/bundle/Makefile.am b/hw/xquartz/bundle/Makefile.am
index 093a102b5..801fdc7d8 100644
--- a/hw/xquartz/bundle/Makefile.am
+++ b/hw/xquartz/bundle/Makefile.am
@@ -15,6 +15,7 @@ resourcedir=$(libdir)/X11/xserver
 resource_DATA = Xquartz.plist
 
 EXTRA_DIST = \
+	$(resource_DATA) \
 	Info.plist \
 	X11.icns \
 	bundle-main.c \

From 70c0592a97c7dc9db0576d32b3bdbe4766520509 Mon Sep 17 00:00:00 2001
From: Maarten Maathuis <madman2003@gmail.com>
Date: Sun, 17 Feb 2008 11:21:01 +0100
Subject: [PATCH 505/552] Resize composite overlay window when the root window
 changes.

- This allows some compositing managers to work, even after randr12 has changed the root window size.
- Thanks to ajax for figuring out the best place to put this.
- Example:
	- xf86RandR12SetMode() calls EnableDisableFBAccess().
	- That calls xf86SetRootClip() which in turn calls ResizeChildrenWinSize().
	- The final step is the call to PositionWindow().
---
 composite/compwindow.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/composite/compwindow.c b/composite/compwindow.c
index 579236713..ee0f7d270 100644
--- a/composite/compwindow.c
+++ b/composite/compwindow.c
@@ -165,6 +165,29 @@ compCheckRedirect (WindowPtr pWin)
     return TRUE;
 }
 
+static int
+updateOverlayWindow(ScreenPtr pScreen)
+{
+	CompScreenPtr cs;
+	WindowPtr pWin; /* overlay window */
+	XID vlist[2];
+
+	cs = GetCompScreen(pScreen);
+	if ((pWin = cs->pOverlayWin) != NULL) {
+		if ((pWin->drawable.width == pScreen->width) &&
+			(pWin->drawable.height == pScreen->height))
+			return Success;
+
+		/* Let's resize the overlay window. */
+		vlist[0] = pScreen->width;
+		vlist[1] = pScreen->height;
+		return ConfigureWindow(pWin, CWWidth | CWHeight, vlist, wClient(pWin));
+	}
+
+	/* Let's be on the safe side and not assume an overlay window is always allocated. */
+	return Success;
+}
+
 Bool
 compPositionWindow (WindowPtr pWin, int x, int y)
 {
@@ -203,6 +226,8 @@ compPositionWindow (WindowPtr pWin, int x, int y)
     cs->PositionWindow = pScreen->PositionWindow;
     pScreen->PositionWindow = compPositionWindow;
     compCheckTree (pWin->drawable.pScreen);
+    if (updateOverlayWindow(pScreen) != Success)
+	ret = FALSE;
     return ret;
 }
 

From a48cc88ea2674c28b69b8d738b168cbafcf4001f Mon Sep 17 00:00:00 2001
From: Maarten Maathuis <madman2003@gmail.com>
Date: Sun, 17 Feb 2008 18:47:28 +0100
Subject: [PATCH 506/552] Fix rotation for multi-monitor situation.

- The (x,y)-coordinates of the crtc were not being passed as xFixed values, which made it an obscure bug to find.
- Fix bug #13787.
---
 hw/xfree86/modes/xf86Rotate.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/xfree86/modes/xf86Rotate.c b/hw/xfree86/modes/xf86Rotate.c
index c129d9b92..e2d6295b9 100644
--- a/hw/xfree86/modes/xf86Rotate.c
+++ b/hw/xfree86/modes/xf86Rotate.c
@@ -580,9 +580,9 @@ xf86CrtcRotate (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation)
     }
     else
     {
-	PictureTransformTranslate (&crtc_to_fb, &fb_to_crtc, crtc->x, crtc->y);
+	PictureTransformTranslate (&crtc_to_fb, &fb_to_crtc, F(crtc->x), F(crtc->y));
 	PictureTransformIsInverse ("offset", &crtc_to_fb, &fb_to_crtc);
-	
+
 	/* 
 	 * these are the size of the shadow pixmap, which
 	 * matches the mode, not the pre-rotated copy in the

From e4eb7e5842f0f56f07e9cf3b16249c172d0a975d Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Wed, 30 Jan 2008 23:24:14 +1100
Subject: [PATCH 507/552] XKB: Delete xkberrs.c

Get rid of the XKB errors code to save a bunch of space.
---
 include/xkbsrv.h |  3 +--
 xkb/Makefile.am  |  1 -
 xkb/xkberrs.c    | 37 -------------------------------------
 3 files changed, 1 insertion(+), 40 deletions(-)
 delete mode 100644 xkb/xkberrs.c

diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index bf386e72d..c7709f727 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -310,8 +310,7 @@ extern CARD32	xkbDebugFlags;
 #define	_XkbClearElems(a,f,l,t)	bzero(&(a)[f],((l)-(f)+1)*sizeof(t))
 #define	_XkbFree(p)		Xfree(p)
 
-#define	_XkbLibError(c,l,d) \
-	{ _XkbErrCode= (c); _XkbErrLocation= (l); _XkbErrData= (d); }
+#define	_XkbLibError(c,l,d) /* Epoch fail */
 #define	_XkbErrCode2(a,b) ((XID)((((unsigned int)(a))<<24)|((b)&0xffffff)))
 #define	_XkbErrCode3(a,b,c)	_XkbErrCode2(a,(((unsigned int)(b))<<16)|(c))
 #define	_XkbErrCode4(a,b,c,d) _XkbErrCode3(a,b,((((unsigned int)(c))<<8)|(d)))
diff --git a/xkb/Makefile.am b/xkb/Makefile.am
index 78cdf7196..e750d6098 100644
--- a/xkb/Makefile.am
+++ b/xkb/Makefile.am
@@ -32,7 +32,6 @@ XKBFILE_SRCS = \
         xkmread.c \
         xkbtext.c \
         xkbfmisc.c \
-        xkberrs.c \
         xkbout.c
 
 X11_SRCS = \
diff --git a/xkb/xkberrs.c b/xkb/xkberrs.c
deleted file mode 100644
index 3534356c6..000000000
--- a/xkb/xkberrs.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/************************************************************
- Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
-
- Permission to use, copy, modify, and distribute this
- software and its documentation for any purpose and without
- fee is hereby granted, provided that the above copyright
- notice appear in all copies and that both that copyright
- notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be
- used in advertising or publicity pertaining to distribution
- of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability
- of this software for any purpose. It is provided "as is"
- without any express or implied warranty.
-
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
- THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
- ********************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include <stdio.h>
-#include <ctype.h>
-#include <stdlib.h>
-
-unsigned	_XkbErrCode;
-char *		_XkbErrLocation= NULL;
-unsigned	_XkbErrData;

From 37867626e314e74031378a8a4ff06f69b899a3b2 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Fri, 1 Feb 2008 14:41:04 +1100
Subject: [PATCH 508/552] main(): Remove uncredible failure

NO, NO, NO.

NO.

The only way this could possibly be worse is if you were viewing it in
Comic Sans.
---
 dix/main.c | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/dix/main.c b/dix/main.c
index 9114f00d9..068dae92e 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -137,8 +137,6 @@ _X_EXPORT PaddingInfo PixmapWidthPaddingInfo[33];
 
 int connBlockScreenStart;
 
-static int restart = 0;
-
 _X_EXPORT void
 NotImplemented(xEvent *from, xEvent *to)
 {
@@ -264,13 +262,6 @@ main(int argc, char *argv[], char *envp[])
     DarwinHandleGUI(argc, argv, envp);
 #endif
 
-    /* Notice if we're restarted.  Probably this is because we jumped through
-     * an uninitialized pointer */
-    if (restart)
-	FatalError("server restarted. Jumped through uninitialized pointer?\n");
-    else
-	restart = 1;
-
     CheckUserParameters(argc, argv, envp);
 
     CheckUserAuthorization();

From 68bd7ac1930b5cffb6657b8d5f5bf8ae58eae8d9 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Sun, 3 Feb 2008 23:12:15 +1100
Subject: [PATCH 509/552] XKB: Move headers into the server tree

We need to start breaking the XKB API to enforce sanity, so drag whichever
headers we need to do so into the server tree, as the client API is set in
stone, being part of Xlib.
---
 hw/dmx/examples/xinput.c                 |   2 +-
 hw/dmx/examples/xled.c                   |   2 +-
 hw/xfree86/utils/xorgcfg/text-mode.c     |   2 +-
 hw/xfree86/utils/xorgconfig/xorgconfig.c |   2 +-
 include/xkbsrv.h                         |   4 +-
 include/xkbstr.h                         | 613 +++++++++++++++++++++
 xkb/XKBAlloc.c                           |   2 +-
 xkb/XKBGAlloc.c                          |   2 +-
 xkb/maprules.c                           |   2 +-
 xkb/xkb.c                                |   2 +-
 xkb/xkb.h                                |   5 +-
 xkb/xkbInit.c                            |   4 +-
 xkb/xkbSwap.c                            |   2 +-
 xkb/xkbUtils.c                           |   2 +-
 xkb/xkbfile.h                            | 480 +++++++++++++++++
 xkb/xkbfmisc.c                           |   4 +-
 xkb/xkbgeom.h                            | 655 +++++++++++++++++++++++
 xkb/xkbout.c                             |   6 +-
 xkb/xkbtext.c                            |   4 +-
 xkb/xkmread.c                            |   4 +-
 20 files changed, 1774 insertions(+), 25 deletions(-)
 create mode 100644 include/xkbstr.h
 create mode 100644 xkb/xkbfile.h
 create mode 100644 xkb/xkbgeom.h

diff --git a/hw/dmx/examples/xinput.c b/hw/dmx/examples/xinput.c
index 74353a93b..b6753e4ec 100644
--- a/hw/dmx/examples/xinput.c
+++ b/hw/dmx/examples/xinput.c
@@ -38,7 +38,7 @@
 #include <X11/XKBlib.h>
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XKB.h>
-#include <X11/extensions/XKBstr.h>
+#include "xkbstr.h"
 #include <X11/extensions/dmxext.h>
 #include <sys/time.h>
 
diff --git a/hw/dmx/examples/xled.c b/hw/dmx/examples/xled.c
index 270f80511..322dda2f3 100644
--- a/hw/dmx/examples/xled.c
+++ b/hw/dmx/examples/xled.c
@@ -37,7 +37,7 @@
 #include <X11/Xlib.h>
 #include <X11/XKBlib.h>
 #include <X11/extensions/XKB.h>
-#include <X11/extensions/XKBstr.h>
+#include "xkbstr.h"
 #include <sys/time.h>
 
 int main(int argc, char **argv)
diff --git a/hw/xfree86/utils/xorgcfg/text-mode.c b/hw/xfree86/utils/xorgcfg/text-mode.c
index 0b6e65482..c1fa67ed7 100644
--- a/hw/xfree86/utils/xorgcfg/text-mode.c
+++ b/hw/xfree86/utils/xorgcfg/text-mode.c
@@ -39,7 +39,7 @@
 #endif
 #include <ctype.h>
 #include <X11/Xlib.h>
-#include <X11/extensions/XKBstr.h>
+#include "xkbstr.h"
 #include <X11/extensions/XKBrules.h>
 #include "cards.h"
 #include "config.h"
diff --git a/hw/xfree86/utils/xorgconfig/xorgconfig.c b/hw/xfree86/utils/xorgconfig/xorgconfig.c
index 30eb83182..d537abac4 100644
--- a/hw/xfree86/utils/xorgconfig/xorgconfig.c
+++ b/hw/xfree86/utils/xorgconfig/xorgconfig.c
@@ -106,7 +106,7 @@
 #include <sys/stat.h>
 
 #include <X11/Xlib.h>
-#include <X11/extensions/XKBstr.h>
+#include "xkbstr.h"
 #include <X11/extensions/XKBrules.h>
 #define MAX_XKBOPTIONS	5
 
diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index c7709f727..e825f33a0 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -27,7 +27,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifndef _XKBSRV_H_
 #define	_XKBSRV_H_
 
-#ifdef XKB_IN_SERVER
 #define XkbAllocClientMap		SrvXkbAllocClientMap
 #define XkbAllocServerMap		SrvXkbAllocServerMap
 #define XkbChangeTypesOfKey		SrvXkbChangeTypesOfKey
@@ -52,10 +51,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define XkbVirtualModsToReal		SrvXkbVirtualModsToReal
 #define	XkbChangeKeycodeRange		SrvXkbChangeKeycodeRange
 #define	XkbApplyVirtualModChanges	SrvXkbApplyVirtualModChanges
-#endif
 
-#include <X11/extensions/XKBstr.h>
 #include <X11/extensions/XKBproto.h>
+#include "xkbstr.h"
 #include "inputstr.h"
 
 typedef struct _XkbInterest {
diff --git a/include/xkbstr.h b/include/xkbstr.h
new file mode 100644
index 000000000..e519e657d
--- /dev/null
+++ b/include/xkbstr.h
@@ -0,0 +1,613 @@
+/************************************************************
+Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
+
+Permission to use, copy, modify, and distribute this
+software and its documentation for any purpose and without
+fee is hereby granted, provided that the above copyright
+notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting
+documentation, and that the name of Silicon Graphics not be 
+used in advertising or publicity pertaining to distribution 
+of the software without specific prior written permission.
+Silicon Graphics makes no representation about the suitability 
+of this software for any purpose. It is provided "as is"
+without any express or implied warranty.
+
+SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
+GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
+THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifndef _XKBSTR_H_
+#define	_XKBSTR_H_
+
+#include <X11/extensions/XKB.h>
+
+#define	XkbCharToInt(v)		((v)&0x80?(int)((v)|(~0xff)):(int)((v)&0x7f))
+#define	XkbIntTo2Chars(i,h,l)	(((h)=((i>>8)&0xff)),((l)=((i)&0xff)))
+
+#if defined(WORD64) && defined(UNSIGNEDBITFIELDS)
+#define	Xkb2CharsToInt(h,l)	((h)&0x80?(int)(((h)<<8)|(l)|(~0xffff)):\
+					  (int)(((h)<<8)|(l)&0x7fff))
+#else
+#define	Xkb2CharsToInt(h,l)	((short)(((h)<<8)|(l)))
+#endif
+
+	/*
+	 * Common data structures and access macros
+	 */
+
+typedef struct _XkbStateRec {
+	unsigned char	group;
+	unsigned char   locked_group;
+	unsigned short	base_group;
+	unsigned short	latched_group;
+	unsigned char	mods;
+	unsigned char	base_mods;
+	unsigned char	latched_mods;
+	unsigned char	locked_mods;
+	unsigned char	compat_state;
+	unsigned char	grab_mods;
+	unsigned char	compat_grab_mods;
+	unsigned char	lookup_mods;
+	unsigned char	compat_lookup_mods;
+	unsigned short	ptr_buttons;
+} XkbStateRec,*XkbStatePtr;
+#define	XkbModLocks(s)	 ((s)->locked_mods)
+#define	XkbStateMods(s)	 ((s)->base_mods|(s)->latched_mods|XkbModLocks(s))
+#define	XkbGroupLock(s)	 ((s)->locked_group)
+#define	XkbStateGroup(s) ((s)->base_group+(s)->latched_group+XkbGroupLock(s))
+#define	XkbStateFieldFromRec(s)	XkbBuildCoreState((s)->lookup_mods,(s)->group)
+#define	XkbGrabStateFromRec(s)	XkbBuildCoreState((s)->grab_mods,(s)->group)
+
+typedef struct _XkbMods {
+	unsigned char	mask;	/* effective mods */
+	unsigned char	real_mods;
+	unsigned short	vmods;
+} XkbModsRec,*XkbModsPtr;
+
+typedef struct _XkbKTMapEntry {
+	Bool		active;
+	unsigned char	level;
+	XkbModsRec	mods;
+} XkbKTMapEntryRec,*XkbKTMapEntryPtr;
+
+typedef struct _XkbKeyType {
+	XkbModsRec		mods;
+	unsigned char	  	num_levels;
+	unsigned char	  	map_count;
+	XkbKTMapEntryPtr  	map;
+	XkbModsPtr  		preserve;
+	Atom		  	name;
+	Atom *			level_names;
+} XkbKeyTypeRec, *XkbKeyTypePtr;
+
+#define	XkbNumGroups(g)			((g)&0x0f)
+#define	XkbOutOfRangeGroupInfo(g)	((g)&0xf0)
+#define	XkbOutOfRangeGroupAction(g)	((g)&0xc0)
+#define	XkbOutOfRangeGroupNumber(g)	(((g)&0x30)>>4)
+#define	XkbSetGroupInfo(g,w,n)	(((w)&0xc0)|(((n)&3)<<4)|((g)&0x0f))
+#define	XkbSetNumGroups(g,n)	(((g)&0xf0)|((n)&0x0f))
+
+	/*
+	 * Structures and access macros used primarily by the server
+	 */
+
+typedef struct _XkbBehavior {
+	unsigned char	type;
+	unsigned char	data;
+} XkbBehavior;
+
+#define	XkbAnyActionDataSize 7
+typedef	struct _XkbAnyAction {
+	unsigned char	type;
+	unsigned char	data[XkbAnyActionDataSize];
+} XkbAnyAction;
+
+typedef struct _XkbModAction {
+	unsigned char	type;
+	unsigned char	flags;
+	unsigned char	mask;
+	unsigned char	real_mods;
+	unsigned char	vmods1;
+	unsigned char	vmods2;
+} XkbModAction;
+#define	XkbModActionVMods(a)      \
+	((short)(((a)->vmods1<<8)|((a)->vmods2)))
+#define	XkbSetModActionVMods(a,v) \
+	(((a)->vmods1=(((v)>>8)&0xff)),(a)->vmods2=((v)&0xff))
+
+typedef struct _XkbGroupAction {
+	unsigned char	type;
+	unsigned char	flags;
+	char		group_XXX;
+} XkbGroupAction;
+#define	XkbSAGroup(a)		(XkbCharToInt((a)->group_XXX))
+#define	XkbSASetGroup(a,g)	((a)->group_XXX=(g))
+
+typedef struct _XkbISOAction {
+	unsigned char	type;
+	unsigned char	flags;
+	unsigned char	mask;
+	unsigned char	real_mods;
+	char		group_XXX;
+	unsigned char	affect;
+	unsigned char	vmods1;
+	unsigned char	vmods2;
+} XkbISOAction;
+
+typedef struct _XkbPtrAction {
+	unsigned char	type;
+	unsigned char	flags;
+	unsigned char	high_XXX;
+	unsigned char	low_XXX;
+	unsigned char	high_YYY;
+	unsigned char	low_YYY;
+} XkbPtrAction;
+#define	XkbPtrActionX(a)      (Xkb2CharsToInt((a)->high_XXX,(a)->low_XXX))
+#define	XkbPtrActionY(a)      (Xkb2CharsToInt((a)->high_YYY,(a)->low_YYY))
+#define	XkbSetPtrActionX(a,x) (XkbIntTo2Chars(x,(a)->high_XXX,(a)->low_XXX))
+#define	XkbSetPtrActionY(a,y) (XkbIntTo2Chars(y,(a)->high_YYY,(a)->low_YYY))
+
+typedef struct _XkbPtrBtnAction {
+	unsigned char	type;
+	unsigned char	flags;
+	unsigned char	count;
+	unsigned char	button;
+} XkbPtrBtnAction;
+
+typedef struct _XkbPtrDfltAction {
+	unsigned char	type;
+	unsigned char	flags;
+	unsigned char	affect;
+	char		valueXXX;
+} XkbPtrDfltAction;
+#define	XkbSAPtrDfltValue(a)		(XkbCharToInt((a)->valueXXX))
+#define	XkbSASetPtrDfltValue(a,c)	((a)->valueXXX= ((c)&0xff))
+
+typedef struct _XkbSwitchScreenAction {
+	unsigned char	type;
+	unsigned char	flags;
+	char		screenXXX;
+} XkbSwitchScreenAction;
+#define	XkbSAScreen(a)			(XkbCharToInt((a)->screenXXX))
+#define	XkbSASetScreen(a,s)		((a)->screenXXX= ((s)&0xff))
+
+typedef struct _XkbCtrlsAction {
+	unsigned char	type;
+	unsigned char	flags;
+	unsigned char	ctrls3;
+	unsigned char	ctrls2;
+	unsigned char	ctrls1;
+	unsigned char	ctrls0;
+} XkbCtrlsAction;
+#define	XkbActionSetCtrls(a,c)	(((a)->ctrls3=(((c)>>24)&0xff)),\
+					((a)->ctrls2=(((c)>>16)&0xff)),\
+					((a)->ctrls1=(((c)>>8)&0xff)),\
+					((a)->ctrls0=((c)&0xff)))
+#define	XkbActionCtrls(a) ((((unsigned int)(a)->ctrls3)<<24)|\
+			   (((unsigned int)(a)->ctrls2)<<16)|\
+			   (((unsigned int)(a)->ctrls1)<<8)|\
+			   ((unsigned int)((a)->ctrls0)))
+
+typedef struct _XkbMessageAction {
+	unsigned char	type;
+	unsigned char	flags;
+	unsigned char	message[6];
+} XkbMessageAction;
+
+typedef struct	_XkbRedirectKeyAction {
+	unsigned char	type;
+	unsigned char	new_key;
+	unsigned char	mods_mask;
+	unsigned char	mods;
+	unsigned char	vmods_mask0;
+	unsigned char	vmods_mask1;
+	unsigned char	vmods0;
+	unsigned char	vmods1;
+} XkbRedirectKeyAction;
+
+#define	XkbSARedirectVMods(a)		((((unsigned int)(a)->vmods1)<<8)|\
+					((unsigned int)(a)->vmods0))
+#define	XkbSARedirectSetVMods(a,m)	(((a)->vmods_mask1=(((m)>>8)&0xff)),\
+					 ((a)->vmods_mask0=((m)&0xff)))
+#define	XkbSARedirectVModsMask(a)	((((unsigned int)(a)->vmods_mask1)<<8)|\
+					((unsigned int)(a)->vmods_mask0))
+#define	XkbSARedirectSetVModsMask(a,m)	(((a)->vmods_mask1=(((m)>>8)&0xff)),\
+					 ((a)->vmods_mask0=((m)&0xff)))
+
+typedef struct _XkbDeviceBtnAction {
+	unsigned char	type;
+	unsigned char	flags;
+	unsigned char	count;
+	unsigned char	button;
+	unsigned char	device;
+} XkbDeviceBtnAction;
+
+typedef struct _XkbDeviceValuatorAction {
+	unsigned char	type;
+	unsigned char	device;
+	unsigned char	v1_what;
+	unsigned char	v1_ndx;
+	unsigned char	v1_value;
+	unsigned char	v2_what;
+	unsigned char	v2_ndx;
+	unsigned char	v2_value;
+} XkbDeviceValuatorAction;
+
+typedef	union _XkbAction {
+	XkbAnyAction		any;
+	XkbModAction		mods;
+	XkbGroupAction		group;
+	XkbISOAction		iso;
+	XkbPtrAction		ptr;
+	XkbPtrBtnAction		btn;
+	XkbPtrDfltAction	dflt;
+	XkbSwitchScreenAction	screen;
+	XkbCtrlsAction		ctrls;
+	XkbMessageAction	msg;
+	XkbRedirectKeyAction	redirect;
+	XkbDeviceBtnAction	devbtn;
+	XkbDeviceValuatorAction	devval;
+	unsigned char 		type;
+} XkbAction;
+
+typedef	struct _XkbControls {
+	unsigned char	mk_dflt_btn;
+	unsigned char	num_groups;
+	unsigned char	groups_wrap;
+	XkbModsRec	internal;
+	XkbModsRec	ignore_lock;
+	unsigned int	enabled_ctrls;
+	unsigned short	repeat_delay;
+	unsigned short	repeat_interval;
+	unsigned short	slow_keys_delay;
+	unsigned short	debounce_delay;
+	unsigned short	mk_delay;
+	unsigned short	mk_interval;
+	unsigned short	mk_time_to_max;
+	unsigned short	mk_max_speed;
+		 short	mk_curve;
+	unsigned short	ax_options;
+	unsigned short	ax_timeout;
+	unsigned short	axt_opts_mask;
+	unsigned short	axt_opts_values;
+	unsigned int	axt_ctrls_mask;
+	unsigned int	axt_ctrls_values;
+	unsigned char	per_key_repeat[XkbPerKeyBitArraySize];
+} XkbControlsRec, *XkbControlsPtr;
+
+#define	XkbAX_AnyFeedback(c)	((c)->enabled_ctrls&XkbAccessXFeedbackMask)
+#define	XkbAX_NeedOption(c,w)	((c)->ax_options&(w))
+#define	XkbAX_NeedFeedback(c,w)	(XkbAX_AnyFeedback(c)&&XkbAX_NeedOption(c,w))
+
+typedef struct _XkbServerMapRec {
+	unsigned short		 num_acts;
+	unsigned short		 size_acts;
+	XkbAction		*acts;
+
+	XkbBehavior		*behaviors;
+	unsigned short		*key_acts;
+#if defined(__cplusplus) || defined(c_plusplus)
+	/* explicit is a C++ reserved word */
+	unsigned char		*c_explicit;
+#else
+	unsigned char		*explicit;
+#endif
+	unsigned char		 vmods[XkbNumVirtualMods];
+	unsigned short		*vmodmap;
+} XkbServerMapRec, *XkbServerMapPtr;
+
+#define	XkbSMKeyActionsPtr(m,k) (&(m)->acts[(m)->key_acts[k]])
+
+	/*
+	 * Structures and access macros used primarily by clients
+	 */
+
+typedef	struct _XkbSymMapRec {
+	unsigned char	 kt_index[XkbNumKbdGroups];
+	unsigned char	 group_info;
+	unsigned char	 width;
+	unsigned short	 offset;
+} XkbSymMapRec, *XkbSymMapPtr;
+
+typedef struct _XkbClientMapRec {
+	unsigned char		 size_types;
+	unsigned char		 num_types;
+	XkbKeyTypePtr		 types;
+
+	unsigned short		 size_syms;
+	unsigned short		 num_syms;
+	KeySym			*syms;
+	XkbSymMapPtr		 key_sym_map;
+
+	unsigned char		*modmap;
+} XkbClientMapRec, *XkbClientMapPtr;
+
+#define	XkbCMKeyGroupInfo(m,k)  ((m)->key_sym_map[k].group_info)
+#define	XkbCMKeyNumGroups(m,k)	 (XkbNumGroups((m)->key_sym_map[k].group_info))
+#define	XkbCMKeyGroupWidth(m,k,g) (XkbCMKeyType(m,k,g)->num_levels)
+#define	XkbCMKeyGroupsWidth(m,k) ((m)->key_sym_map[k].width)
+#define	XkbCMKeyTypeIndex(m,k,g) ((m)->key_sym_map[k].kt_index[g&0x3])
+#define	XkbCMKeyType(m,k,g)	 (&(m)->types[XkbCMKeyTypeIndex(m,k,g)])
+#define	XkbCMKeyNumSyms(m,k) (XkbCMKeyGroupsWidth(m,k)*XkbCMKeyNumGroups(m,k))
+#define	XkbCMKeySymsOffset(m,k)	((m)->key_sym_map[k].offset)
+#define	XkbCMKeySymsPtr(m,k)	(&(m)->syms[XkbCMKeySymsOffset(m,k)])
+
+	/*
+	 * Compatibility structures and access macros
+	 */
+
+typedef struct _XkbSymInterpretRec {
+	KeySym		sym;
+	unsigned char	flags;
+	unsigned char	match;
+	unsigned char	mods;
+	unsigned char	virtual_mod;
+	XkbAnyAction	act;
+} XkbSymInterpretRec,*XkbSymInterpretPtr;
+
+typedef struct _XkbCompatMapRec {
+	XkbSymInterpretPtr	 sym_interpret;
+	XkbModsRec		 groups[XkbNumKbdGroups];
+	unsigned short		 num_si;
+	unsigned short		 size_si;
+} XkbCompatMapRec, *XkbCompatMapPtr;
+
+typedef struct _XkbIndicatorMapRec {
+	unsigned char	flags;
+	unsigned char	which_groups;
+	unsigned char	groups;
+	unsigned char	which_mods;
+	XkbModsRec	mods;
+	unsigned int	ctrls;
+} XkbIndicatorMapRec, *XkbIndicatorMapPtr;
+
+#define	XkbIM_IsAuto(i)	((((i)->flags&XkbIM_NoAutomatic)==0)&&\
+			    (((i)->which_groups&&(i)->groups)||\
+			     ((i)->which_mods&&(i)->mods.mask)||\
+			     ((i)->ctrls)))
+#define	XkbIM_InUse(i)	(((i)->flags)||((i)->which_groups)||\
+					((i)->which_mods)||((i)->ctrls))
+	
+
+typedef struct _XkbIndicatorRec {
+	unsigned long	  	phys_indicators;
+	XkbIndicatorMapRec	maps[XkbNumIndicators];
+} XkbIndicatorRec,*XkbIndicatorPtr;
+
+typedef	struct _XkbKeyNameRec {
+	char	name[XkbKeyNameLength];
+} XkbKeyNameRec,*XkbKeyNamePtr;
+
+typedef struct _XkbKeyAliasRec {
+	char	real[XkbKeyNameLength];
+	char	alias[XkbKeyNameLength];
+} XkbKeyAliasRec,*XkbKeyAliasPtr;
+
+	/*
+	 * Names for everything 
+	 */
+typedef struct _XkbNamesRec {
+	Atom		  keycodes;
+	Atom		  geometry;
+	Atom		  symbols;
+	Atom              types;
+	Atom		  compat;
+	Atom		  vmods[XkbNumVirtualMods];
+	Atom		  indicators[XkbNumIndicators];
+	Atom		  groups[XkbNumKbdGroups];
+	XkbKeyNamePtr	  keys;
+	XkbKeyAliasPtr	  key_aliases;
+	Atom		 *radio_groups;
+	Atom		  phys_symbols;
+
+	unsigned char	  num_keys;
+	unsigned char	  num_key_aliases;
+	unsigned short	  num_rg;
+} XkbNamesRec,*XkbNamesPtr;
+
+typedef	struct _XkbGeometry	*XkbGeometryPtr;
+	/*
+	 * Tie it all together into one big keyboard description
+	 */
+typedef	struct _XkbDesc {
+	struct _XDisplay *	dpy;
+	unsigned short	 	flags;
+	unsigned short		device_spec;
+	KeyCode			min_key_code;
+	KeyCode			max_key_code;
+
+	XkbControlsPtr		ctrls;
+	XkbServerMapPtr		server;
+	XkbClientMapPtr		map;
+	XkbIndicatorPtr		indicators;
+	XkbNamesPtr		names;
+	XkbCompatMapPtr		compat;
+	XkbGeometryPtr		geom;
+} XkbDescRec, *XkbDescPtr;
+#define	XkbKeyKeyTypeIndex(d,k,g)	(XkbCMKeyTypeIndex((d)->map,k,g))
+#define	XkbKeyKeyType(d,k,g)		(XkbCMKeyType((d)->map,k,g))
+#define	XkbKeyGroupWidth(d,k,g)		(XkbCMKeyGroupWidth((d)->map,k,g))
+#define	XkbKeyGroupsWidth(d,k)		(XkbCMKeyGroupsWidth((d)->map,k))
+#define	XkbKeyGroupInfo(d,k)		(XkbCMKeyGroupInfo((d)->map,(k)))
+#define	XkbKeyNumGroups(d,k)		(XkbCMKeyNumGroups((d)->map,(k)))
+#define	XkbKeyNumSyms(d,k)		(XkbCMKeyNumSyms((d)->map,(k)))
+#define	XkbKeySymsPtr(d,k)		(XkbCMKeySymsPtr((d)->map,(k)))
+#define	XkbKeySym(d,k,n)		(XkbKeySymsPtr(d,k)[n])
+#define	XkbKeySymEntry(d,k,sl,g) \
+	(XkbKeySym(d,k,((XkbKeyGroupsWidth(d,k)*(g))+(sl))))
+#define	XkbKeyAction(d,k,n) \
+	(XkbKeyHasActions(d,k)?&XkbKeyActionsPtr(d,k)[n]:NULL)
+#define	XkbKeyActionEntry(d,k,sl,g) \
+	(XkbKeyHasActions(d,k)?\
+		XkbKeyAction(d,k,((XkbKeyGroupsWidth(d,k)*(g))+(sl))):NULL)
+
+#define	XkbKeyHasActions(d,k)	((d)->server->key_acts[k]!=0)
+#define	XkbKeyNumActions(d,k)	(XkbKeyHasActions(d,k)?XkbKeyNumSyms(d,k):1)
+#define	XkbKeyActionsPtr(d,k)	(XkbSMKeyActionsPtr((d)->server,k))
+#define	XkbKeycodeInRange(d,k)	(((k)>=(d)->min_key_code)&&\
+				 ((k)<=(d)->max_key_code))
+#define	XkbNumKeys(d)		((d)->max_key_code-(d)->min_key_code+1)
+
+
+	/*
+	 * The following structures can be used to track changes
+	 * to a keyboard device
+	 */
+typedef struct _XkbMapChanges {
+	unsigned short		 changed;
+	KeyCode			 min_key_code;
+	KeyCode			 max_key_code;
+	unsigned char		 first_type;
+	unsigned char		 num_types;
+	KeyCode			 first_key_sym;
+	unsigned char		 num_key_syms;
+	KeyCode			 first_key_act;
+	unsigned char		 num_key_acts;
+	KeyCode			 first_key_behavior;
+	unsigned char		 num_key_behaviors;
+	KeyCode 		 first_key_explicit;
+	unsigned char		 num_key_explicit;
+	KeyCode			 first_modmap_key;
+	unsigned char		 num_modmap_keys;
+	KeyCode			 first_vmodmap_key;
+	unsigned char		 num_vmodmap_keys;
+	unsigned char		 pad;
+	unsigned short		 vmods;
+} XkbMapChangesRec,*XkbMapChangesPtr;
+
+typedef struct _XkbControlsChanges {
+	unsigned int 		 changed_ctrls;
+	unsigned int		 enabled_ctrls_changes;
+	Bool			 num_groups_changed;
+} XkbControlsChangesRec,*XkbControlsChangesPtr;
+
+typedef struct _XkbIndicatorChanges {
+	unsigned int		 state_changes;
+	unsigned int		 map_changes;
+} XkbIndicatorChangesRec,*XkbIndicatorChangesPtr;
+
+typedef struct _XkbNameChanges {
+	unsigned int 		changed;
+	unsigned char		first_type;
+	unsigned char		num_types;
+	unsigned char		first_lvl;
+	unsigned char		num_lvls;
+	unsigned char		num_aliases;
+	unsigned char		num_rg;
+	unsigned char		first_key;
+	unsigned char		num_keys;
+	unsigned short		changed_vmods;
+	unsigned long		changed_indicators;
+	unsigned char		changed_groups;
+} XkbNameChangesRec,*XkbNameChangesPtr;
+
+typedef struct _XkbCompatChanges {
+	unsigned char		changed_groups;
+	unsigned short		first_si;
+	unsigned short		num_si;
+} XkbCompatChangesRec,*XkbCompatChangesPtr;
+
+typedef struct _XkbChanges {
+	unsigned short		 device_spec;
+	unsigned short		 state_changes;
+	XkbMapChangesRec	 map;
+	XkbControlsChangesRec	 ctrls;
+	XkbIndicatorChangesRec	 indicators;
+	XkbNameChangesRec	 names;
+	XkbCompatChangesRec	 compat;
+} XkbChangesRec, *XkbChangesPtr;
+
+	/*
+	 * These data structures are used to construct a keymap from 
+	 * a set of components or to list components in the server
+	 * database.
+	 */
+typedef struct _XkbComponentNames {
+	char *			 keymap;
+	char *			 keycodes;
+	char *			 types;
+	char *			 compat;
+	char *			 symbols;
+	char *			 geometry;
+} XkbComponentNamesRec, *XkbComponentNamesPtr;
+
+typedef struct _XkbComponentName {
+	unsigned short		flags;
+	char *			name;
+} XkbComponentNameRec,*XkbComponentNamePtr;
+
+typedef struct _XkbComponentList {
+	int			num_keymaps;
+	int			num_keycodes;
+	int			num_types;
+	int			num_compat;
+	int			num_symbols;
+	int			num_geometry;
+	XkbComponentNamePtr	keymaps;
+	XkbComponentNamePtr 	keycodes;
+	XkbComponentNamePtr	types;
+	XkbComponentNamePtr	compat;
+	XkbComponentNamePtr	symbols;
+	XkbComponentNamePtr	geometry;
+} XkbComponentListRec, *XkbComponentListPtr;
+
+	/*
+	 * The following data structures describe and track changes to a 
+	 * non-keyboard extension device 
+	 */
+typedef struct _XkbDeviceLedInfo {
+	unsigned short			led_class;
+	unsigned short			led_id;
+	unsigned int			phys_indicators;
+	unsigned int			maps_present;
+	unsigned int			names_present;
+	unsigned int			state;
+	Atom 				names[XkbNumIndicators];
+	XkbIndicatorMapRec		maps[XkbNumIndicators];
+} XkbDeviceLedInfoRec,*XkbDeviceLedInfoPtr;
+
+typedef struct _XkbDeviceInfo {
+	char *			name;
+	Atom			type;
+	unsigned short		device_spec;
+	Bool			has_own_state;
+	unsigned short		supported;
+	unsigned short		unsupported;
+
+	unsigned short		num_btns;
+	XkbAction *		btn_acts;
+
+	unsigned short		sz_leds;
+	unsigned short		num_leds;
+	unsigned short		dflt_kbd_fb;
+	unsigned short		dflt_led_fb;
+	XkbDeviceLedInfoPtr	leds;
+} XkbDeviceInfoRec,*XkbDeviceInfoPtr;
+
+#define	XkbXI_DevHasBtnActs(d)	(((d)->num_btns>0)&&((d)->btn_acts!=NULL))
+#define	XkbXI_LegalDevBtn(d,b)	(XkbXI_DevHasBtnActs(d)&&((b)<(d)->num_btns))
+#define	XkbXI_DevHasLeds(d)	(((d)->num_leds>0)&&((d)->leds!=NULL))
+
+typedef struct _XkbDeviceLedChanges {
+	unsigned short		led_class;
+	unsigned short		led_id;
+	unsigned int		defined; /* names or maps changed */
+	struct _XkbDeviceLedChanges *next;
+} XkbDeviceLedChangesRec,*XkbDeviceLedChangesPtr;
+
+typedef struct _XkbDeviceChanges {
+	unsigned int		changed;
+	unsigned short		first_btn;
+	unsigned short		num_btns;
+	XkbDeviceLedChangesRec 	leds;
+} XkbDeviceChangesRec,*XkbDeviceChangesPtr;
+
+#endif /* _XKBSTR_H_ */
diff --git a/xkb/XKBAlloc.c b/xkb/XKBAlloc.c
index f0a1f890e..790aede92 100644
--- a/xkb/XKBAlloc.c
+++ b/xkb/XKBAlloc.c
@@ -36,7 +36,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "misc.h"
 #include "inputstr.h"
 #include <xkbsrv.h>
-#include <X11/extensions/XKBgeom.h>
+#include "xkbgeom.h"
 
 /***===================================================================***/
 
diff --git a/xkb/XKBGAlloc.c b/xkb/XKBGAlloc.c
index 815cc95f5..7a75d200d 100644
--- a/xkb/XKBGAlloc.c
+++ b/xkb/XKBGAlloc.c
@@ -37,7 +37,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "misc.h"
 #include "inputstr.h"
 #include <xkbsrv.h>
-#include <X11/extensions/XKBgeom.h>
+#include "xkbgeom.h"
 
 #ifdef X_NOT_POSIX
 #define Size_t unsigned int
diff --git a/xkb/maprules.c b/xkb/maprules.c
index 0fa356ee5..52a1cdc86 100644
--- a/xkb/maprules.c
+++ b/xkb/maprules.c
@@ -46,7 +46,7 @@
 #include "misc.h"
 #include "inputstr.h"
 #include "dix.h"
-#include <X11/extensions/XKBstr.h>
+#include "xkbstr.h"
 #define XKBSRV_NEED_FILE_FUNCS
 #include <xkbsrv.h>
 
diff --git a/xkb/xkb.c b/xkb/xkb.c
index 26f2812fe..66edcc1fd 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -3870,7 +3870,7 @@ ProcXkbSetNames(ClientPtr client)
 
 /***====================================================================***/
 
-#include <X11/extensions/XKBgeom.h>
+#include "xkbgeom.h"
 
 #define	XkbSizeCountedString(s)  ((s)?((((2+strlen(s))+3)/4)*4):4)
 
diff --git a/xkb/xkb.h b/xkb/xkb.h
index 99b60bf5e..bc6c6c954 100644
--- a/xkb/xkb.h
+++ b/xkb/xkb.h
@@ -1,4 +1,5 @@
-/* #include "XKBfile.h" */
+#ifndef _XKB_H
+#define _XKB_H
 
 extern int ProcXkbUseExtension(ClientPtr client);
 extern int ProcXkbSelectEvents(ClientPtr client);
@@ -35,3 +36,5 @@ extern Bool XkbCopyKeymap(
     XkbDescPtr              src,
     XkbDescPtr              dst,
     Bool                    sendNotifies);
+
+#endif
diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
index 6301a32e7..bb1de9de6 100644
--- a/xkb/xkbInit.c
+++ b/xkb/xkbInit.c
@@ -48,9 +48,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "property.h"
 #define	XKBSRV_NEED_FILE_FUNCS
 #include <xkbsrv.h>
-#include <X11/extensions/XKBgeom.h>
+#include "xkbgeom.h"
 #include <X11/extensions/XKMformat.h>
-#include <X11/extensions/XKBfile.h>
+#include "xkbfile.h"
 #include "xkb.h"
 
 #define	CREATE_ATOM(s)	MakeAtom(s,sizeof(s)-1,1)
diff --git a/xkb/xkbSwap.c b/xkb/xkbSwap.c
index da4c9053b..50b08f46c 100644
--- a/xkb/xkbSwap.c
+++ b/xkb/xkbSwap.c
@@ -36,7 +36,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "misc.h"
 #include "inputstr.h"
 #include <xkbsrv.h>
-#include <X11/extensions/XKBstr.h>
+#include "xkbstr.h"
 #include "extnsionst.h"
 #include "xkb.h"
 
diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
index 3cedf825a..67843e9fb 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -42,7 +42,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #define	XKBSRV_NEED_FILE_FUNCS
 #include <xkbsrv.h>
-#include <X11/extensions/XKBgeom.h>
+#include "xkbgeom.h"
 #include "xkb.h"
 
 int	XkbDisableLockActions = 0;
diff --git a/xkb/xkbfile.h b/xkb/xkbfile.h
new file mode 100644
index 000000000..d58bec69f
--- /dev/null
+++ b/xkb/xkbfile.h
@@ -0,0 +1,480 @@
+/************************************************************
+ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
+
+ Permission to use, copy, modify, and distribute this
+ software and its documentation for any purpose and without
+ fee is hereby granted, provided that the above copyright
+ notice appear in all copies and that both that copyright
+ notice and this permission notice appear in supporting
+ documentation, and that the name of Silicon Graphics not be 
+ used in advertising or publicity pertaining to distribution 
+ of the software without specific prior written permission.
+ Silicon Graphics makes no representation about the suitability 
+ of this software for any purpose. It is provided "as is"
+ without any express or implied warranty.
+ 
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+ AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
+ THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+ ********************************************************/
+
+#ifndef _XKBFILE_H_
+#define	_XKBFILE_H_ 1
+
+/***====================================================================***/
+
+#define	XkbXKMFile	0
+#define	XkbCFile	1
+#define	XkbXKBFile	2
+#define	XkbMessage	3
+
+#define	XkbMapDefined		(1<<0)
+#define	XkbStateDefined		(1<<1)
+
+typedef struct _XkbFileInfo {
+    unsigned		type;
+    unsigned		defined;
+    XkbDescPtr	 	xkb;
+} XkbFileInfo,*XkbFileInfoPtr;
+
+typedef void	(*XkbFileAddOnFunc)(
+    FILE *		/* file */,
+    XkbFileInfo *	/* result */,
+    Bool		/* topLevel */,
+    Bool		/* showImplicit */,
+    int			/* fileSection */,
+    void *		/* priv */
+);
+
+/***====================================================================***/
+
+#define	_XkbSuccess			0
+#define	_XkbErrMissingNames		1
+#define	_XkbErrMissingTypes		2
+#define	_XkbErrMissingReqTypes		3
+#define	_XkbErrMissingSymbols		4
+#define	_XkbErrMissingVMods		5
+#define	_XkbErrMissingIndicators	6
+#define	_XkbErrMissingCompatMap		7
+#define	_XkbErrMissingSymInterps	8
+#define	_XkbErrMissingGeometry		9
+#define	_XkbErrIllegalDoodad		10
+#define	_XkbErrIllegalTOCType		11
+#define	_XkbErrIllegalContents		12
+#define	_XkbErrEmptyFile		13
+#define	_XkbErrFileNotFound		14
+#define	_XkbErrFileCannotOpen		15
+#define	_XkbErrBadValue			16
+#define	_XkbErrBadMatch			17
+#define	_XkbErrBadTypeName		18
+#define	_XkbErrBadTypeWidth		19
+#define	_XkbErrBadFileType		20
+#define	_XkbErrBadFileVersion		21
+#define	_XkbErrBadFileFormat		22
+#define	_XkbErrBadAlloc			23
+#define	_XkbErrBadLength		24
+#define	_XkbErrXReqFailure		25
+#define	_XkbErrBadImplementation	26
+
+extern char *		_XkbErrMessages[];
+extern unsigned		_XkbErrCode;
+extern char *		_XkbErrLocation;
+extern unsigned		_XkbErrData;
+
+/***====================================================================***/
+
+_XFUNCPROTOBEGIN
+
+extern	char *	XkbIndentText(
+    unsigned	/* size */
+);
+
+extern	char *	XkbAtomText(
+    Display *	/* dpy */,
+    Atom 	/* atm */,
+    unsigned	/* format */
+);
+
+extern char *	XkbKeysymText(
+    KeySym	/* sym */,
+    unsigned	/* format */
+);
+
+extern char *	XkbStringText(
+    char *	/* str */,
+    unsigned	/* format */
+);
+
+extern char *	XkbKeyNameText(
+    char *	/* name */,
+    unsigned	/* format */
+);
+
+extern char *
+XkbModIndexText(
+    unsigned	/* ndx */,
+    unsigned	/* format */
+);
+
+extern char *
+XkbModMaskText(
+    unsigned	/* mask */,
+    unsigned	/* format */
+);
+
+extern char *	XkbVModIndexText(
+    Display *	/* dpy */,
+    XkbDescPtr	/* xkb */,
+    unsigned	/* ndx */,
+    unsigned	/* format */
+);
+
+extern	char *	XkbVModMaskText(
+    Display *	/* dpy */,
+    XkbDescPtr	/* xkb */,
+    unsigned	/* modMask */,
+    unsigned	/* mask */,
+    unsigned	/* format */
+);
+
+extern char *	XkbConfigText(
+    unsigned 	/* config */,
+    unsigned 	/* format */
+);
+
+extern char *	XkbSIMatchText(
+    unsigned	/* type */,
+    unsigned	/* format */
+);
+
+extern char *	XkbIMWhichStateMaskText(
+    unsigned	/* use_which */,
+    unsigned	/* format */
+);
+
+extern char *	XkbAccessXDetailText(
+    unsigned	/* state */,
+    unsigned	/* format */
+);
+
+extern char *	XkbNKNDetailMaskText(
+    unsigned	/* detail */,
+    unsigned	/* format */
+);
+
+extern char *	XkbControlsMaskText(
+    unsigned	/* ctrls */,
+    unsigned	/* format */
+);
+
+extern char *	XkbGeomFPText(
+    int		/* val */,
+    unsigned 	/* format */
+);
+
+extern char *	XkbDoodadTypeText(
+    unsigned	/* type */,
+    unsigned	/* format */
+);
+
+extern char *	XkbActionTypeText(
+    unsigned	/* type */,
+    unsigned	/* format */
+);
+
+extern char *	XkbActionText(
+    Display *	/* dpy */,
+    XkbDescPtr	/* xkb */,
+    XkbAction *	/* action */,
+    unsigned	/* format */
+);
+
+extern char *	XkbBehaviorText(
+    XkbDescPtr 		/* xkb */,
+    XkbBehavior *	/* behavior */,
+    unsigned		/* format */
+);
+
+/***====================================================================***/
+
+#define	_XkbKSLower	(1<<0)
+#define	_XkbKSUpper	(1<<1)
+
+#define	XkbKSIsLower(k)		(_XkbKSCheckCase(k)&_XkbKSLower)
+#define	XkbKSIsUpper(k)		(_XkbKSCheckCase(k)&_XkbKSUpper)
+#define XkbKSIsKeypad(k)	(((k)>=XK_KP_Space)&&((k)<=XK_KP_Equal))
+#define	XkbKSIsDeadKey(k)	\
+		(((k)>=XK_dead_grave)&&((k)<=XK_dead_semivoiced_sound))
+
+extern	unsigned _XkbKSCheckCase(
+   KeySym	/* sym */
+);
+
+extern	int	 XkbFindKeycodeByName(
+    XkbDescPtr	/* xkb */,
+    char *	/* name */,
+    Bool	/* use_aliases */
+);
+
+extern	Bool	XkbLookupGroupAndLevel(
+    XkbDescPtr	/* xkb */,
+    int		/* key */,
+    int	*	/* mods_inout */,
+    int *	/* grp_inout */,
+    int	*	/* lvl_rtrn */
+);
+
+/***====================================================================***/
+
+extern	char *	XkbAtomGetString(
+    Display *	/* dpy */,
+    Atom 	/* atm */
+);
+
+extern	Atom	XkbInternAtom(
+    Display *	/* dpy */,
+    char *	/* name */,
+    Bool	/* onlyIfExists */
+);
+
+extern	Status	XkbChangeKbdDisplay(
+    Display *		/* newDpy */,
+    XkbFileInfo *	/* result */
+);
+
+extern	Atom	XkbChangeAtomDisplay(
+    Display *	/* oldDpy */,
+    Display *	/* newDpy */,
+    Atom	/* atm */
+);
+
+extern	void	XkbInitAtoms(
+    Display *	/* dpy */
+);
+
+/***====================================================================***/
+
+#ifdef _XKBGEOM_H_
+
+#define	XkbDW_Unknown	0
+#define	XkbDW_Doodad	1
+#define	XkbDW_Section	2
+typedef struct _XkbDrawable {
+	int		type;
+	int		priority;
+	union {
+	    XkbDoodadPtr	doodad;
+	    XkbSectionPtr	section;
+	} u;
+	struct _XkbDrawable *	next;
+} XkbDrawableRec,*XkbDrawablePtr; 
+
+extern	XkbDrawablePtr
+XkbGetOrderedDrawables(
+    XkbGeometryPtr	/* geom */,
+    XkbSectionPtr	/* section */
+);
+
+extern	void
+XkbFreeOrderedDrawables(
+    XkbDrawablePtr	/* draw */
+);
+
+#endif
+
+/***====================================================================***/
+
+extern	unsigned	XkbConvertGetByNameComponents(
+    Bool		/* toXkm */,
+    unsigned 		/* orig */
+);
+
+extern	unsigned	XkbConvertXkbComponents(
+    Bool		/* toXkm */,
+    unsigned 		/* orig */
+);
+
+extern	Bool	XkbDetermineFileType(
+    XkbFileInfo *	/* xkb */,
+    int			/* format */,
+    int *		/* opts_missing */
+);
+
+extern	Bool	XkbNameMatchesPattern(
+    char *		/* name */,
+    char *		/* pattern */
+);
+
+/***====================================================================***/
+
+extern	Bool	XkbWriteXKBKeycodes(
+    FILE *		/* file */,
+    XkbFileInfo *	/* result */,
+    Bool		/* topLevel */,
+    Bool		/* showImplicit */,
+    XkbFileAddOnFunc	/* addOn */,
+    void *		/* priv */
+);
+
+extern	Bool	XkbWriteXKBKeyTypes(
+    FILE *		/* file */,
+    XkbFileInfo *	/* result */,
+    Bool		/* topLevel */,
+    Bool		/* showImplicit */,
+    XkbFileAddOnFunc	/* addOn */,
+    void *		/* priv */
+);
+
+extern	Bool	XkbWriteXKBCompatMap(
+    FILE *		/* file */,
+    XkbFileInfo *	/* result */,
+    Bool		/* topLevel */,
+    Bool		/* showImplicit */,
+    XkbFileAddOnFunc	/* addOn */,
+    void *		/* priv */
+);
+
+extern	Bool	XkbWriteXKBSymbols(
+    FILE *		/* file */,
+    XkbFileInfo *	/* result */,
+    Bool		/* topLevel */,
+    Bool		/* showImplicit */,
+    XkbFileAddOnFunc	/* addOn */,
+    void *		/* priv */
+);
+
+extern	Bool	XkbWriteXKBGeometry(
+    FILE *		/* file */,
+    XkbFileInfo *	/* result */,
+    Bool		/* topLevel */,
+    Bool		/* showImplicit */,
+    XkbFileAddOnFunc	/* addOn */,
+    void *		/* priv */
+);
+
+extern	Bool	XkbWriteXKBSemantics(
+    FILE *		/* file */,
+    XkbFileInfo *	/* result */,
+    Bool		/* topLevel */,
+    Bool		/* showImplicit */,
+    XkbFileAddOnFunc	/* addOn */,
+    void *		/* priv */
+);
+
+extern	Bool	XkbWriteXKBLayout(
+    FILE *		/* file */,
+    XkbFileInfo *	/* result */,
+    Bool		/* topLevel */,
+    Bool		/* showImplicit */,
+    XkbFileAddOnFunc	/* addOn */,
+    void *		/* priv */
+);
+
+extern	Bool	XkbWriteXKBKeymap(
+    FILE *		/* file */,
+    XkbFileInfo *	/* result */,
+    Bool		/* topLevel */,
+    Bool		/* showImplicit */,
+    XkbFileAddOnFunc	/* addOn */,
+    void *		/* priv */
+);
+
+extern	Bool	XkbWriteXKBFile(
+    FILE *		/* file */,
+    XkbFileInfo *	/* result */,
+    Bool		/* showImplicit */,
+    XkbFileAddOnFunc	/* addOn */,
+    void *		/* priv */
+);
+
+extern	Bool	XkbWriteCFile(
+    FILE *		/* file */,
+    char *		/* name */,
+    XkbFileInfo *	/* info */
+);
+
+extern	Bool	XkbWriteXKMFile(
+    FILE *		/* file */,
+    XkbFileInfo *	/* result */
+);
+
+extern	Bool	XkbWriteToServer(
+    XkbFileInfo *	/* result */
+);
+
+extern	void	XkbEnsureSafeMapName(
+    char *		/* name */
+);
+
+extern	Bool	XkbWriteXKBKeymapForNames(
+    FILE *			/* file */,
+    XkbComponentNamesPtr	/* names */,
+    Display *			/* dpy */,
+    XkbDescPtr			/* xkb */,
+    unsigned			/* want */,
+    unsigned			/* need */
+);
+
+extern	Status	XkbMergeFile(
+    XkbDescPtr			/* xkb */,
+    XkbFileInfo			/* finfo */
+);
+
+/***====================================================================***/
+
+extern Bool	XkmProbe(
+    FILE *		/* file */
+);
+
+extern unsigned XkbReadFromServer(
+    Display *		/* dpy */,
+    unsigned		/* need */,
+    unsigned		/* want */,
+    XkbFileInfo *	/* result */
+);
+
+extern unsigned	XkmReadFile(
+    FILE *		/* file */,
+    unsigned		/* need */,
+    unsigned		/* want */,
+    XkbFileInfo *	/* result */
+);
+
+#ifdef _XKMFORMAT_H_
+
+extern Bool	XkmReadTOC(
+    FILE *              /* file */,
+    xkmFileInfo *       /* file_info */,
+    int                 /* max_toc */,
+    xkmSectionInfo *    /* toc */
+);
+
+extern xkmSectionInfo *XkmFindTOCEntry(
+    xkmFileInfo *       /* finfo */,
+    xkmSectionInfo *    /* toc */,
+    unsigned            /* type */
+);
+
+extern Bool	XkmReadFileSection(
+    FILE *              /* file */,
+    xkmSectionInfo *    /* toc */,
+    XkbFileInfo *       /* result */,
+    unsigned *          /* loaded_rtrn */
+);
+
+extern char *	XkmReadFileSectionName(
+    FILE *		/* file */,
+    xkmSectionInfo *	/* toc */
+);
+
+#endif /* _XKMFORMAT_H  */
+
+_XFUNCPROTOEND
+
+#endif /* _XKBFILE_H_ */
diff --git a/xkb/xkbfmisc.c b/xkb/xkbfmisc.c
index 05344b475..06d3519af 100644
--- a/xkb/xkbfmisc.c
+++ b/xkb/xkbfmisc.c
@@ -42,10 +42,10 @@
 #include "misc.h"
 #include "inputstr.h"
 #include "dix.h"
-#include <X11/extensions/XKBstr.h>
+#include "xkbstr.h"
 #define XKBSRV_NEED_FILE_FUNCS	1
 #include <xkbsrv.h>
-#include <X11/extensions/XKBgeom.h>
+#include "xkbgeom.h"
 #include "xkb.h"
 
 unsigned
diff --git a/xkb/xkbgeom.h b/xkb/xkbgeom.h
new file mode 100644
index 000000000..a6918b4b9
--- /dev/null
+++ b/xkb/xkbgeom.h
@@ -0,0 +1,655 @@
+/************************************************************
+Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
+
+Permission to use, copy, modify, and distribute this
+software and its documentation for any purpose and without
+fee is hereby granted, provided that the above copyright
+notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting
+documentation, and that the name of Silicon Graphics not be 
+used in advertising or publicity pertaining to distribution 
+of the software without specific prior written permission.
+Silicon Graphics makes no representation about the suitability 
+of this software for any purpose. It is provided "as is"
+without any express or implied warranty.
+
+SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
+GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
+THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifndef _XKBGEOM_H_
+#define	_XKBGEOM_H_
+
+#include "xkbstr.h"
+
+#define XkbAddGeomKeyAlias 		SrvXkbAddGeomKeyAlias
+#define XkbAddGeomColor 		SrvXkbAddGeomColor
+#define XkbAddGeomDoodad		SrvXkbAddGeomDoodad
+#define XkbAddGeomKey			SrvXkbAddGeomKey
+#define XkbAddGeomOutline		SrvXkbAddGeomOutline
+#define XkbAddGeomOverlay		SrvXkbAddGeomOverlay
+#define XkbAddGeomOverlayRow		SrvXkbAddGeomOverlayRow
+#define	XkbAddGeomOverlayKey		SrvXkbAddGeomOverlayKey
+#define XkbAddGeomProperty		SrvXkbAddGeomProperty
+#define XkbAddGeomRow			SrvXkbAddGeomRow
+#define XkbAddGeomSection		SrvXkbAddGeomSection
+#define XkbAddGeomShape			SrvXkbAddGeomShape
+#define XkbAllocGeomKeyAliases		SrvXkbAllocGeomKeyAliases
+#define XkbAllocGeomColors		SrvXkbAllocGeomColors
+#define XkbAllocGeomDoodads		SrvXkbAllocGeomDoodads
+#define XkbAllocGeomKeys		SrvXkbAllocGeomKeys
+#define XkbAllocGeomOutlines		SrvXkbAllocGeomOutlines
+#define XkbAllocGeomPoints		SrvXkbAllocGeomPoints
+#define XkbAllocGeomProps		SrvXkbAllocGeomProps
+#define XkbAllocGeomRows		SrvXkbAllocGeomRows
+#define XkbAllocGeomSectionDoodads	SrvXkbAllocGeomSectionDoodads
+#define XkbAllocGeomSections		SrvXkbAllocGeomSections
+#define	XkbAllocGeomOverlays		SrvXkbAllocGeomOverlays
+#define	XkbAllocGeomOverlayRows		SrvXkbAllocGeomOverlayRows
+#define	XkbAllocGeomOverlayKeys		SrvXkbAllocGeomOverlayKeys
+#define XkbAllocGeomShapes		SrvXkbAllocGeomShapes
+#define XkbAllocGeometry		SrvXkbAllocGeometry
+#define XkbFreeGeomKeyAliases		SrvXkbFreeGeomKeyAliases
+#define XkbFreeGeomColors		SrvXkbFreeGeomColors
+#define XkbFreeGeomDoodads		SrvXkbFreeGeomDoodads
+#define XkbFreeGeomProperties		SrvXkbFreeGeomProperties
+#define	XkbFreeGeomOverlayKeys		SrvXkbFreeGeomOverlayKeys
+#define	XkbFreeGeomOverlayRows		SrvXkbFreeGeomOverlayRows
+#define	XkbFreeGeomOverlays		SrvXkbFreeGeomOverlays
+#define	XkbFreeGeomKeys			SrvXkbFreeGeomKeys
+#define	XkbFreeGeomRows			SrvXkbFreeGeomRows
+#define XkbFreeGeomSections		SrvXkbFreeGeomSections
+#define	XkbFreeGeomPoints		SrvXkbFreeGeomPoints
+#define	XkbFreeGeomOutlines		SrvXkbFreeGeomOutlines
+#define XkbFreeGeomShapes		SrvXkbFreeGeomShapes
+#define XkbFreeGeometry			SrvXkbFreeGeometry
+
+typedef	struct _XkbProperty {
+	char	*name;
+	char	*value;
+} XkbPropertyRec,*XkbPropertyPtr;
+
+typedef struct _XkbColor {
+	unsigned int 	pixel;
+	char *		spec;
+} XkbColorRec,*XkbColorPtr;
+
+typedef	struct _XkbPoint {
+	short	x;
+	short	y;
+} XkbPointRec, *XkbPointPtr;
+
+typedef struct	_XkbBounds {
+	short	x1,y1;
+	short	x2,y2;
+} XkbBoundsRec, *XkbBoundsPtr;
+#define	XkbBoundsWidth(b)	(((b)->x2)-((b)->x1))
+#define	XkbBoundsHeight(b)	(((b)->y2)-((b)->y1))
+
+typedef struct _XkbOutline {
+	unsigned short	num_points;
+	unsigned short	sz_points;
+	unsigned short	corner_radius;
+	XkbPointPtr	points;
+} XkbOutlineRec, *XkbOutlinePtr;
+
+typedef struct _XkbShape {
+	Atom	 	 name;
+	unsigned short	 num_outlines;
+	unsigned short	 sz_outlines;
+	XkbOutlinePtr	 outlines;
+	XkbOutlinePtr	 approx;
+	XkbOutlinePtr	 primary;
+	XkbBoundsRec	 bounds;
+} XkbShapeRec, *XkbShapePtr;
+#define	XkbOutlineIndex(s,o)	((int)((o)-&(s)->outlines[0]))
+
+typedef struct _XkbShapeDoodad {
+	Atom		 name;
+	unsigned char	 type;
+	unsigned char	 priority;
+	short		 top;
+	short		 left;
+	short	 	 angle;
+	unsigned short	 color_ndx;
+	unsigned short	 shape_ndx;
+} XkbShapeDoodadRec, *XkbShapeDoodadPtr;
+#define	XkbShapeDoodadColor(g,d)	(&(g)->colors[(d)->color_ndx])
+#define	XkbShapeDoodadShape(g,d)	(&(g)->shapes[(d)->shape_ndx])
+#define	XkbSetShapeDoodadColor(g,d,c)	((d)->color_ndx= (c)-&(g)->colors[0])
+#define	XkbSetShapeDoodadShape(g,d,s)	((d)->shape_ndx= (s)-&(g)->shapes[0])
+
+typedef struct _XkbTextDoodad {
+	Atom		 name;
+	unsigned char	 type;
+	unsigned char	 priority;
+	short	 	 top;
+	short	 	 left;
+	short	 	 angle;
+	short	 	 width;
+	short		 height;
+	unsigned short	 color_ndx;
+	char *		 text;
+	char *		 font;
+} XkbTextDoodadRec, *XkbTextDoodadPtr;
+#define	XkbTextDoodadColor(g,d)	(&(g)->colors[(d)->color_ndx])
+#define	XkbSetTextDoodadColor(g,d,c)	((d)->color_ndx= (c)-&(g)->colors[0])
+
+typedef struct _XkbIndicatorDoodad {
+	Atom		 name;
+	unsigned char	 type;
+	unsigned char	 priority;
+	short	 	 top;
+	short	 	 left;
+	short		 angle;
+	unsigned short	 shape_ndx;
+	unsigned short	 on_color_ndx;
+	unsigned short	 off_color_ndx;
+} XkbIndicatorDoodadRec, *XkbIndicatorDoodadPtr;
+#define	XkbIndicatorDoodadShape(g,d)	(&(g)->shapes[(d)->shape_ndx])
+#define	XkbIndicatorDoodadOnColor(g,d)	(&(g)->colors[(d)->on_color_ndx])
+#define	XkbIndicatorDoodadOffColor(g,d)	(&(g)->colors[(d)->off_color_ndx])
+#define	XkbSetIndicatorDoodadOnColor(g,d,c) \
+				((d)->on_color_ndx= (c)-&(g)->colors[0])
+#define	XkbSetIndicatorDoodadOffColor(g,d,c) \
+				((d)->off_color_ndx= (c)-&(g)->colors[0])
+#define	XkbSetIndicatorDoodadShape(g,d,s) \
+				((d)->shape_ndx= (s)-&(g)->shapes[0])
+
+typedef struct _XkbLogoDoodad {
+	Atom		 name;
+	unsigned char	 type;
+	unsigned char	 priority;
+	short		 top;
+	short		 left;
+	short	 	 angle;
+	unsigned short	 color_ndx;
+	unsigned short	 shape_ndx;
+	char *		 logo_name;
+} XkbLogoDoodadRec, *XkbLogoDoodadPtr;
+#define	XkbLogoDoodadColor(g,d)		(&(g)->colors[(d)->color_ndx])
+#define	XkbLogoDoodadShape(g,d)		(&(g)->shapes[(d)->shape_ndx])
+#define	XkbSetLogoDoodadColor(g,d,c)	((d)->color_ndx= (c)-&(g)->colors[0])
+#define	XkbSetLogoDoodadShape(g,d,s)	((d)->shape_ndx= (s)-&(g)->shapes[0])
+
+typedef struct _XkbAnyDoodad {
+	Atom		 name;
+	unsigned char	 type;
+	unsigned char	 priority;
+	short	 	 top;
+	short	 	 left;
+	short		 angle;
+} XkbAnyDoodadRec, *XkbAnyDoodadPtr;
+
+typedef union _XkbDoodad {
+	XkbAnyDoodadRec		any;
+	XkbShapeDoodadRec	shape;
+	XkbTextDoodadRec	text;
+	XkbIndicatorDoodadRec	indicator;
+	XkbLogoDoodadRec	logo;
+} XkbDoodadRec, *XkbDoodadPtr;
+
+#define	XkbUnknownDoodad	0
+#define	XkbOutlineDoodad	1
+#define	XkbSolidDoodad		2
+#define	XkbTextDoodad		3
+#define	XkbIndicatorDoodad	4
+#define	XkbLogoDoodad		5
+
+typedef struct _XkbKey {
+	XkbKeyNameRec	 name;
+	short		 gap;
+	unsigned char	 shape_ndx;
+	unsigned char	 color_ndx;
+} XkbKeyRec, *XkbKeyPtr;
+#define	XkbKeyShape(g,k)	(&(g)->shapes[(k)->shape_ndx])
+#define	XkbKeyColor(g,k)	(&(g)->colors[(k)->color_ndx])
+#define	XkbSetKeyShape(g,k,s)	((k)->shape_ndx= (s)-&(g)->shapes[0])
+#define	XkbSetKeyColor(g,k,c)	((k)->color_ndx= (c)-&(g)->colors[0])
+
+typedef struct _XkbRow {
+	short	 	top;
+	short	 	left;
+	unsigned short	num_keys;
+	unsigned short	sz_keys;
+	int		vertical;
+	XkbKeyPtr	keys;
+	XkbBoundsRec	bounds;
+} XkbRowRec, *XkbRowPtr;
+
+typedef struct _XkbSection {
+	Atom		 name;
+	unsigned char	 priority;
+	short	 	 top;
+	short	 	 left;
+	unsigned short	 width;
+	unsigned short	 height;
+	short	 	 angle;
+	unsigned short	 num_rows;
+	unsigned short	 num_doodads;
+	unsigned short	 num_overlays;
+	unsigned short	 sz_rows;
+	unsigned short	 sz_doodads;
+	unsigned short	 sz_overlays;
+	XkbRowPtr	 rows;
+	XkbDoodadPtr	 doodads;
+	XkbBoundsRec	 bounds;
+	struct _XkbOverlay *overlays;
+} XkbSectionRec, *XkbSectionPtr;
+
+typedef	struct _XkbOverlayKey {
+	XkbKeyNameRec	over;
+	XkbKeyNameRec	under;
+} XkbOverlayKeyRec,*XkbOverlayKeyPtr;
+
+typedef struct _XkbOverlayRow {
+	unsigned short		row_under;
+	unsigned short		num_keys;
+	unsigned short		sz_keys;
+	XkbOverlayKeyPtr	keys;
+} XkbOverlayRowRec,*XkbOverlayRowPtr;
+
+typedef struct _XkbOverlay {
+	Atom			name;
+	XkbSectionPtr		section_under;
+	unsigned short		num_rows;
+	unsigned short		sz_rows;
+	XkbOverlayRowPtr	rows;
+	XkbBoundsPtr		bounds;
+} XkbOverlayRec,*XkbOverlayPtr;
+
+typedef struct _XkbGeometry {
+	Atom		 name;
+	unsigned short	 width_mm;
+	unsigned short	 height_mm;
+	char *		 label_font;
+	XkbColorPtr	 label_color;
+	XkbColorPtr	 base_color;
+	unsigned short	 sz_properties;
+	unsigned short	 sz_colors;
+	unsigned short	 sz_shapes;
+	unsigned short   sz_sections;
+	unsigned short	 sz_doodads;
+	unsigned short	 sz_key_aliases;
+	unsigned short	 num_properties;
+	unsigned short	 num_colors;
+	unsigned short	 num_shapes;
+	unsigned short	 num_sections;
+	unsigned short	 num_doodads;
+	unsigned short	 num_key_aliases;
+	XkbPropertyPtr	 properties;
+	XkbColorPtr	 colors;
+	XkbShapePtr	 shapes;
+	XkbSectionPtr	 sections;
+	XkbDoodadPtr	 doodads;
+	XkbKeyAliasPtr	 key_aliases;
+} XkbGeometryRec;
+#define	XkbGeomColorIndex(g,c)	((int)((c)-&(g)->colors[0]))
+
+#define	XkbGeomPropertiesMask	(1<<0)
+#define	XkbGeomColorsMask	(1<<1)
+#define	XkbGeomShapesMask	(1<<2)
+#define	XkbGeomSectionsMask	(1<<3)
+#define	XkbGeomDoodadsMask	(1<<4)
+#define	XkbGeomKeyAliasesMask	(1<<5)
+#define	XkbGeomAllMask		(0x3f)
+
+typedef struct _XkbGeometrySizes {
+	unsigned int	which;
+	unsigned short	num_properties;
+	unsigned short	num_colors;
+	unsigned short	num_shapes;
+	unsigned short	num_sections;
+	unsigned short	num_doodads;
+	unsigned short	num_key_aliases;
+} XkbGeometrySizesRec,*XkbGeometrySizesPtr;
+
+_XFUNCPROTOBEGIN
+
+extern	XkbPropertyPtr
+XkbAddGeomProperty(
+    XkbGeometryPtr	/* geom */,
+    char *		/* name */,
+    char *		/* value */
+);
+
+extern	XkbKeyAliasPtr
+XkbAddGeomKeyAlias(
+    XkbGeometryPtr	/* geom */,
+    char *		/* alias */,
+    char *		/* real */
+);
+
+extern	XkbColorPtr
+XkbAddGeomColor(
+    XkbGeometryPtr	/* geom */,
+    char *		/* spec */,
+    unsigned int	/* pixel */
+);
+
+extern	XkbOutlinePtr
+XkbAddGeomOutline(
+    XkbShapePtr		/* shape */,
+    int			/* sz_points */
+);
+
+extern XkbShapePtr
+XkbAddGeomShape(
+    XkbGeometryPtr	/* geom */,
+    Atom		/* name */,
+    int			/* sz_outlines */
+);
+
+extern XkbKeyPtr
+XkbAddGeomKey(
+    XkbRowPtr		/* row */
+);
+
+extern XkbRowPtr
+XkbAddGeomRow(
+    XkbSectionPtr	/* section */,
+    int			/* sz_keys */
+);
+
+extern XkbSectionPtr
+XkbAddGeomSection(
+    XkbGeometryPtr	/* geom */,
+    Atom		/* name */,
+    int			/* sz_rows */,
+    int			/* sz_doodads */,
+    int			/* sz_overlays */
+);
+
+extern XkbOverlayPtr
+XkbAddGeomOverlay(
+    XkbSectionPtr	/* section */,
+    Atom		/* name */,
+    int			/* sz_rows */
+);
+
+extern XkbOverlayRowPtr
+XkbAddGeomOverlayRow(
+    XkbOverlayPtr	/* overlay */,
+    int			/* row_under */,
+    int			/* sz_keys */
+);
+
+extern XkbOverlayKeyPtr
+XkbAddGeomOverlayKey(
+    XkbOverlayPtr	/* overlay */,
+    XkbOverlayRowPtr	/* row */,
+    char *		/* over */,
+    char *		/* under */
+);
+
+extern XkbDoodadPtr
+XkbAddGeomDoodad(
+    XkbGeometryPtr	/* geom */,
+    XkbSectionPtr	/* section */,
+    Atom		/* name */
+);
+
+
+extern void
+XkbFreeGeomKeyAliases(
+    XkbGeometryPtr	/* geom */,
+    int			/* first */,
+    int			/* count */,
+    Bool		/* freeAll */
+);
+
+extern void
+XkbFreeGeomColors(
+    XkbGeometryPtr	/* geom */,
+    int			/* first */,
+    int			/* count */,
+    Bool		/* freeAll */
+);
+
+extern void
+XkbFreeGeomDoodads(
+    XkbDoodadPtr	/* doodads */,
+    int			/* nDoodads */,
+    Bool		/* freeAll */
+);
+
+
+extern void
+XkbFreeGeomProperties(
+    XkbGeometryPtr	/* geom */,
+    int			/* first */,
+    int			/* count */,
+    Bool		/* freeAll */
+);
+
+extern void
+XkbFreeGeomOverlayKeys(
+    XkbOverlayRowPtr	/* row */,
+    int			/* first */,
+    int			/* count */,
+    Bool		/* freeAll */
+);
+
+extern void
+XkbFreeGeomOverlayRows(
+    XkbOverlayPtr	/* overlay */,
+    int			/* first */,
+    int			/* count */,
+    Bool		/* freeAll */
+);
+
+extern void
+XkbFreeGeomOverlays(
+    XkbSectionPtr	/* section */,
+    int			/* first */,
+    int			/* count */,
+    Bool		/* freeAll */
+);
+
+extern void
+XkbFreeGeomKeys(
+    XkbRowPtr		/* row */,
+    int			/* first */,
+    int			/* count */,
+    Bool		/* freeAll */
+);
+
+extern void
+XkbFreeGeomRows(
+    XkbSectionPtr	/* section */,
+    int			/* first */,
+    int			/* count */,
+    Bool		/* freeAll */
+);
+
+extern void
+XkbFreeGeomSections(
+    XkbGeometryPtr	/* geom */,
+    int			/* first */,
+    int			/* count */,
+    Bool		/* freeAll */
+);
+
+
+extern void
+XkbFreeGeomPoints(
+    XkbOutlinePtr	/* outline */,
+    int			/* first */,
+    int			/* count */,
+    Bool		/* freeAll */
+);
+
+extern void
+XkbFreeGeomOutlines(
+    XkbShapePtr		/* shape */,
+    int			/* first */,
+    int			/* count */,
+    Bool		/* freeAll */
+);
+
+extern void
+XkbFreeGeomShapes(
+    XkbGeometryPtr	/* geom */,
+    int			/* first */,
+    int			/* count */,
+    Bool		/* freeAll */
+);
+
+extern void
+XkbFreeGeometry(
+    XkbGeometryPtr	/* geom */,
+    unsigned int	/* which */,
+    Bool		/* freeMap */
+);
+
+extern Status
+XkbAllocGeomProps(
+    XkbGeometryPtr	/* geom */,
+    int			/* nProps */
+);
+
+extern Status
+XkbAllocGeomKeyAliases(
+    XkbGeometryPtr	/* geom */,
+    int			/* nAliases */
+);
+
+extern Status
+XkbAllocGeomColors(
+    XkbGeometryPtr	/* geom */,
+    int			/* nColors */
+);
+
+extern Status
+XkbAllocGeomShapes(
+    XkbGeometryPtr	/* geom */,
+    int			/* nShapes */
+);
+
+extern Status
+XkbAllocGeomSections(
+    XkbGeometryPtr	/* geom */,
+    int			/* nSections */
+);
+
+extern Status
+XkbAllocGeomOverlays(
+    XkbSectionPtr	/* section */,
+    int			/* num_needed */
+);
+
+extern Status
+XkbAllocGeomOverlayRows(
+    XkbOverlayPtr	/* overlay */,
+    int			/* num_needed */
+);
+
+extern Status
+XkbAllocGeomOverlayKeys(
+    XkbOverlayRowPtr	/* row */,
+    int			/* num_needed */
+);
+
+extern Status
+XkbAllocGeomDoodads(
+    XkbGeometryPtr	/* geom */,
+    int			/* nDoodads */
+);
+
+extern Status
+XkbAllocGeomSectionDoodads(
+    XkbSectionPtr	/* section */,
+    int			/* nDoodads */
+);
+
+extern Status
+XkbAllocGeomOutlines(
+    XkbShapePtr		/* shape */,
+    int			/* nOL */
+);
+
+extern Status
+XkbAllocGeomRows(
+    XkbSectionPtr	/* section */,
+    int			/* nRows */
+);
+
+extern Status
+XkbAllocGeomPoints(
+    XkbOutlinePtr	/* ol */,
+    int			/* nPts */
+);
+
+extern Status
+XkbAllocGeomKeys(
+    XkbRowPtr		/* row */,
+    int			/* nKeys */
+);
+
+extern	Status
+XkbAllocGeometry(
+	XkbDescPtr		/* xkb */,
+	XkbGeometrySizesPtr	/* sizes */
+);
+
+extern	Status
+XkbSetGeometry(
+	Display *		/* dpy */,
+	unsigned		/* deviceSpec */,
+	XkbGeometryPtr		/* geom */
+);
+
+extern	Bool
+XkbComputeShapeTop(
+	XkbShapePtr		/* shape */,
+	XkbBoundsPtr		/* bounds */
+);
+
+extern	Bool
+XkbComputeShapeBounds(
+	XkbShapePtr		/* shape */
+);
+
+extern	Bool
+XkbComputeRowBounds(
+	XkbGeometryPtr		/* geom */,
+	XkbSectionPtr		/* section */,
+	XkbRowPtr		/* row */
+);
+
+extern	Bool
+XkbComputeSectionBounds(
+	XkbGeometryPtr		/* geom */,
+	XkbSectionPtr		/* section */
+);
+
+extern	char *
+XkbFindOverlayForKey(
+	XkbGeometryPtr		/* geom */,
+	XkbSectionPtr		/* wanted */,
+	char *			/* under */
+);
+
+extern	Status
+XkbGetGeometry(
+    Display *			/* dpy */,
+    XkbDescPtr			/* xkb */
+);
+
+extern	Status
+XkbGetNamedGeometry(
+    Display *			/* dpy */,
+    XkbDescPtr			/* xkb */,
+    Atom			/* name */
+);
+
+_XFUNCPROTOEND
+
+#endif /* _XKBGEOM_H_ */
diff --git a/xkb/xkbout.c b/xkb/xkbout.c
index 8905ef4d3..fc4e43e3f 100644
--- a/xkb/xkbout.c
+++ b/xkb/xkbout.c
@@ -40,12 +40,12 @@
 #include "misc.h"
 #include "inputstr.h"
 #include "dix.h"
-#include <X11/extensions/XKBstr.h>
+#include "xkbstr.h"
 #define XKBSRV_NEED_FILE_FUNCS	1
 #include <xkbsrv.h>
 
-#include <X11/extensions/XKBgeom.h>
-#include <X11/extensions/XKBfile.h>
+#include "xkbgeom.h"
+#include "xkbfile.h"
 
 #define	VMOD_HIDE_VALUE	0
 #define	VMOD_SHOW_VALUE	1
diff --git a/xkb/xkbtext.c b/xkb/xkbtext.c
index 4983e2b9e..1520a9f58 100644
--- a/xkb/xkbtext.c
+++ b/xkb/xkbtext.c
@@ -40,10 +40,10 @@
 #include "misc.h"
 #include "inputstr.h"
 #include "dix.h"
-#include <X11/extensions/XKBstr.h>
+#include "xkbstr.h"
 #define XKBSRV_NEED_FILE_FUNCS	1
 #include <xkbsrv.h>
-#include <X11/extensions/XKBgeom.h>
+#include "xkbgeom.h"
 
 /***====================================================================***/
 
diff --git a/xkb/xkmread.c b/xkb/xkmread.c
index c6c18422d..88296188a 100644
--- a/xkb/xkmread.c
+++ b/xkb/xkmread.c
@@ -39,10 +39,10 @@
 #include <X11/keysym.h>
 #include "misc.h"
 #include "inputstr.h"
-#include <X11/extensions/XKBstr.h>
+#include "xkbstr.h"
 #define	 XKBSRV_NEED_FILE_FUNCS
 #include <xkbsrv.h>
-#include <X11/extensions/XKBgeom.h>
+#include "xkbgeom.h"
 
 Atom
 XkbInternAtom(Display *dpy,char *str,Bool only_if_exists)

From 0f12a448dcbbbf1f40aa98d09c9d25ee511c5bbf Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Sun, 3 Feb 2008 23:15:39 +1100
Subject: [PATCH 510/552] XKB: Deprecate XKBSRV_NEED_FILE_FUNCS

There's no point in having the function definitions be conditional, so
whatever.
---
 {xkb => include}/xkbfile.h |  0
 include/xkbsrv.h           | 21 +--------------------
 2 files changed, 1 insertion(+), 20 deletions(-)
 rename {xkb => include}/xkbfile.h (100%)

diff --git a/xkb/xkbfile.h b/include/xkbfile.h
similarity index 100%
rename from xkb/xkbfile.h
rename to include/xkbfile.h
diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index e825f33a0..df9aefca3 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -124,8 +124,6 @@ typedef struct	_XkbEventCause {
 #define	_BEEP_LED_CHANGE	14
 #define	_BEEP_BOUNCE_REJECT	15
 
-struct _XkbSrvInfo; /* definition see below */
-
 typedef struct _XkbFilter {
 	CARD16			  keycode;
 	CARD8			  what;
@@ -317,13 +315,8 @@ extern	int	DeviceKeyPress,DeviceKeyRelease,DeviceMotionNotify;
 extern	int	DeviceButtonPress,DeviceButtonRelease;
 extern	int	DeviceEnterNotify,DeviceLeaveNotify;
 
-#ifdef XINPUT
 #define	_XkbIsPressEvent(t)	(((t)==KeyPress)||((t)==DeviceKeyPress))
 #define	_XkbIsReleaseEvent(t)	(((t)==KeyRelease)||((t)==DeviceKeyRelease))
-#else
-#define	_XkbIsPressEvent(t)	((t)==KeyPress)
-#define	_XkbIsReleaseEvent(t)	((t)==KeyRelease)
-#endif
 
 #define	_XkbCoreKeycodeInRange(c,k)	(((k)>=(c)->curKeySyms.minKeyCode)&&\
 					 ((k)<=(c)->curKeySyms.maxKeyCode))
@@ -343,14 +336,6 @@ extern	int	DeviceEnterNotify,DeviceLeaveNotify;
 #define	False	0
 #endif
 
-#ifndef PATH_MAX
-#ifdef MAXPATHLEN
-#define	PATH_MAX MAXPATHLEN
-#else
-#define	PATH_MAX 1024
-#endif
-#endif
-
 _XFUNCPROTOBEGIN
 
 extern void XkbUseMsg(
@@ -987,10 +972,8 @@ extern void XkbSendNewKeyboardNotify(
 	xkbNewKeyboardNotify *	/* pNKN */
 );
 
-#ifdef XKBSRV_NEED_FILE_FUNCS
-
+#include "xkbfile.h"
 #include <X11/extensions/XKMformat.h>
-#include <X11/extensions/XKBfile.h>
 #include <X11/extensions/XKBrules.h>
 
 #define	_XkbListKeymaps		0
@@ -1053,8 +1036,6 @@ extern	int _XkbStrCaseCmp(
 	char *			/* str2 */
 );
 
-#endif /* XKBSRV_NEED_FILE_FUNCS */
-
 _XFUNCPROTOEND
 
 #define	XkbAtomGetString(d,s)	NameForAtom(s)

From 534fc5140b039a8c98ab715d0a6740d513b41209 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Sun, 3 Feb 2008 23:30:22 +1100
Subject: [PATCH 511/552] XKB: Remove a bunch of mad ifdefs

We have SEEK_SET and size_t, seriously.  Also use DebugF instead of
ifdef DEBUG, and ditch a couple of random bits that were never used.
---
 xkb/XKBGAlloc.c   |  8 +----
 xkb/XKBMAlloc.c   |  4 +--
 xkb/XKBMisc.c     |  5 +--
 xkb/ddxBeep.c     |  4 ---
 xkb/ddxCtrls.c    | 23 -------------
 xkb/ddxKeyClick.c |  4 ---
 xkb/ddxList.c     | 13 ++-----
 xkb/ddxLoad.c     | 80 +++++++------------------------------------
 xkb/maprules.c    | 86 ++++++++++++++++++-----------------------------
 xkb/xkb.c         |  2 --
 xkb/xkbAccessX.c  |  8 ++---
 xkb/xkbEvents.c   | 34 +++++++------------
 xkb/xkbInit.c     | 17 +---------
 xkb/xkbPrKeyEv.c  |  4 +--
 xkb/xkbUtils.c    | 10 ------
 xkb/xkmread.c     | 19 ++---------
 16 files changed, 69 insertions(+), 252 deletions(-)

diff --git a/xkb/XKBGAlloc.c b/xkb/XKBGAlloc.c
index 7a75d200d..94072b8ce 100644
--- a/xkb/XKBGAlloc.c
+++ b/xkb/XKBGAlloc.c
@@ -39,12 +39,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <xkbsrv.h>
 #include "xkbgeom.h"
 
-#ifdef X_NOT_POSIX
-#define Size_t unsigned int
-#else
-#define Size_t size_t
-#endif
-
 /***====================================================================***/
 
 static void 
@@ -465,7 +459,7 @@ _XkbGeomAlloc(	XPointer *		old,
 		unsigned short *	num,
 		unsigned short *	total,
 		int			num_new,
-		Size_t			sz_elem)
+		size_t			sz_elem)
 {
     if (num_new<1)
 	return Success;
diff --git a/xkb/XKBMAlloc.c b/xkb/XKBMAlloc.c
index 9feaf8e93..178b5b89a 100644
--- a/xkb/XKBMAlloc.c
+++ b/xkb/XKBMAlloc.c
@@ -55,10 +55,8 @@ XkbClientMapPtr map;
 	((!XkbIsLegalKeycode(xkb->min_key_code))||
 	 (!XkbIsLegalKeycode(xkb->max_key_code))||
 	 (xkb->max_key_code<xkb->min_key_code))) {
-#ifdef DEBUG
-fprintf(stderr,"bad keycode (%d,%d) in XkbAllocClientMap\n",
+        DebugF("bad keycode (%d,%d) in XkbAllocClientMap\n",
 				xkb->min_key_code,xkb->max_key_code);
-#endif
 	return BadValue;
     }
 
diff --git a/xkb/XKBMisc.c b/xkb/XKBMisc.c
index 0404108a2..85415a4c9 100644
--- a/xkb/XKBMisc.c
+++ b/xkb/XKBMisc.c
@@ -416,10 +416,7 @@ unsigned		changed,tmp;
 	if (((explicit&XkbExplicitAutoRepeatMask)==0)&&(xkb->ctrls)) {
 	    CARD8 old;
 	    old= xkb->ctrls->per_key_repeat[key/8];
-#ifdef RETURN_SHOULD_REPEAT
-	    if (*XkbKeySymsPtr(xkb,key) != XK_Return)
-#endif
-		xkb->ctrls->per_key_repeat[key/8]|= (1<<(key%8));
+            xkb->ctrls->per_key_repeat[key/8]|= (1<<(key%8));
 	    if (changes && (old!=xkb->ctrls->per_key_repeat[key/8]))
 		changes->ctrls.changed_ctrls|= XkbPerKeyRepeatMask;
 	}
diff --git a/xkb/ddxBeep.c b/xkb/ddxBeep.c
index 331357ded..2faed5818 100644
--- a/xkb/ddxBeep.c
+++ b/xkb/ddxBeep.c
@@ -139,10 +139,6 @@ Atom		name;
     next= 0;
     pitch= oldPitch= ctrl->bell_pitch;
     duration= oldDuration= ctrl->bell_duration;
-#ifdef DEBUG
-    if (xkbDebugFlags>1)
-	ErrorF("beep: %d (count= %d)\n",xkbInfo->beepType,xkbInfo->beepCount);
-#endif
     name= None;
     switch (xkbInfo->beepType) {
 	default:
diff --git a/xkb/ddxCtrls.c b/xkb/ddxCtrls.c
index 0f7f9187f..34ea0bd3f 100644
--- a/xkb/ddxCtrls.c
+++ b/xkb/ddxCtrls.c
@@ -47,12 +47,6 @@ int realRepeat;
     realRepeat= ctrl->autoRepeat;
     if ((dev->kbdfeed)&&(XkbDDXUsesSoftRepeat(dev)))
 	ctrl->autoRepeat= 0;
-#ifdef DEBUG
-if (xkbDebugFlags&0x4) {
-    ErrorF("XkbDDXKeybdCtrlProc: setting repeat to %d (real repeat is %d)\n",
-					ctrl->autoRepeat,realRepeat);
-}
-#endif
     if (dev->key && dev->key->xkbInfo && dev->key->xkbInfo->kbdProc)
 	(*dev->key->xkbInfo->kbdProc)(dev,ctrl);
     ctrl->autoRepeat= realRepeat;
@@ -93,23 +87,6 @@ unsigned	changed, i;
 unsigned 	char *rep_old, *rep_new, *rep_fb;
 
     changed= new->enabled_ctrls^old->enabled_ctrls;
-#ifdef NOTDEF
-    if (changed&XkbRepeatKeysMask) {
-	if (dev->kbdfeed) {
-	    int realRepeat;
-
-	    if (new->enabled_ctrls&XkbRepeatKeysMask)
-		 dev->kbdfeed->ctrl.autoRepeat= realRepeat= 1;
-	    else dev->kbdfeed->ctrl.autoRepeat= realRepeat= 0;
-
-	    if (XkbDDXUsesSoftRepeat(dev))
-		dev->kbdfeed->ctrl.autoRepeat= FALSE;
-	    if (dev->kbdfeed->CtrlProc)
-		(*dev->kbdfeed->CtrlProc)(dev,&dev->kbdfeed->ctrl);
-	    dev->kbdfeed->ctrl.autoRepeat= realRepeat;
-	}
-    }
-#endif
     for (rep_old = old->per_key_repeat,
          rep_new = new->per_key_repeat,
 	 rep_fb  = dev->kbdfeed->ctrl.autoRepeats,
diff --git a/xkb/ddxKeyClick.c b/xkb/ddxKeyClick.c
index f48296dbc..51d78f56d 100644
--- a/xkb/ddxKeyClick.c
+++ b/xkb/ddxKeyClick.c
@@ -42,9 +42,5 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 void
 XkbDDXKeyClick(DeviceIntPtr pXDev,int keycode,int synthetic)
 {
-#ifdef DEBUG
-    if (xkbDebugFlags)
-	ErrorF("Click.\n");
-#endif
     return;
 }
diff --git a/xkb/ddxList.c b/xkb/ddxList.c
index a91a9badf..80e050524 100644
--- a/xkb/ddxList.c
+++ b/xkb/ddxList.c
@@ -43,14 +43,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <xkbsrv.h>
 #include <X11/extensions/XI.h>
 
-#ifndef PATH_MAX
-#ifdef MAXPATHLEN
-#define	PATH_MAX MAXPATHLEN
-#else
-#define	PATH_MAX 1024
-#endif
-#endif
-
 #ifdef WIN32
 /* from ddxLoad.c */
 extern const char* Win32TempDir();
@@ -199,9 +191,8 @@ char	tmpname[PATH_MAX];
 #ifndef WIN32
 	in= Popen(buf,"r");
 #else
-#ifdef DEBUG_CMD
-	ErrorF("xkb executes: %s\n",buf);
-#endif
+        if (xkbDebugFlags)
+            DebugF("xkbList executes: %s\n",buf);
 	if (System(buf) < 0)
 	    ErrorF("Could not invoke keymap compiler\n");
 	else
diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
index d79ae7a7b..63122264b 100644
--- a/xkb/ddxLoad.c
+++ b/xkb/ddxLoad.c
@@ -50,14 +50,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #if defined(CSRG_BASED) || defined(linux) || defined(__sgi) || defined(AIXV3) || defined(__osf__) || defined(__GNU__)
 #include <paths.h>
-#endif
-
-#ifndef PATH_MAX
-#ifdef MAXPATHLEN
-#define	PATH_MAX MAXPATHLEN
-#else
-#define	PATH_MAX 1024
-#endif
 #endif
 
 	/*
@@ -161,44 +153,19 @@ Win32System(const char *cmdline)
 #define System(x) Win32System(x)
 #endif
 
-#ifdef MAKE_XKM_OUTPUT_DIR
-/* Borrow trans_mkdir from Xtransutil.c to more safely make directories */
-# undef X11_t
-# define TRANS_SERVER
-# define PRMSG(lvl,x,a,b,c) \
-	if (lvl <= 1) { LogMessage(X_ERROR,x,a,b,c); } else ((void)0)
-# include <X11/Xtrans/Xtransutil.c>
-# ifndef XKM_OUTPUT_DIR_MODE
-#  define XKM_OUTPUT_DIR_MODE 0755
-# endif
-#endif
-
 static void
 OutputDirectory(
     char* outdir,
     size_t size)
 {
 #ifndef WIN32
-    if (getuid() == 0 && (strlen(XKM_OUTPUT_DIR) < size)
-#ifdef MAKE_XKM_OUTPUT_DIR    
-	&& (trans_mkdir(XKM_OUTPUT_DIR, XKM_OUTPUT_DIR_MODE) == 0)
-#endif
-	)
+    if (getuid() == 0 && (strlen(XKM_OUTPUT_DIR) < size))
     {
 	/* if server running as root it *may* be able to write */
 	/* FIXME: check whether directory is writable at all */
 	(void) strcpy (outdir, XKM_OUTPUT_DIR);
     } else
-#endif
-#ifdef _PATH_VARTMP
-    if ((strlen(_PATH_VARTMP) + 1) < size) 
-    {
-	(void) strcpy (outdir, _PATH_VARTMP);
-	if (outdir[strlen(outdir) - 1] != '/')	/* Hi IBM, Digital */
-	    (void) strcat (outdir, "/");
-    } else
-#endif
-#ifdef WIN32
+#else
     if (strlen(Win32TempDir()) + 1 < size)
     {
 	(void) strcpy(outdir, Win32TempDir());
@@ -256,15 +223,10 @@ char 	*cmd = NULL,file[PATH_MAX],xkm_output_dir[PATH_MAX],*map,*outFile;
 		PRE_ERROR_MSG,ERROR_PREFIX,POST_ERROR_MSG1,file,
 		xkm_output_dir,outFile);
     }
-#ifdef DEBUG
     if (xkbDebugFlags) {
-	ErrorF("XkbDDXCompileNamedKeymap compiling keymap using:\n");
-	ErrorF("    \"cmd\"\n");
+	DebugF("XkbDDXCompileNamedKeymap compiling keymap using:\n");
+	DebugF("    \"cmd\"\n");
     }
-#endif
-#ifdef DEBUG_CMD
-    ErrorF("xkb executes: %s\n",cmd);
-#endif
     if (System(cmd)==0) {
 	if (nameRtrn) {
 	    strncpy(nameRtrn,outFile,nameRtrnLen);
@@ -276,9 +238,7 @@ char 	*cmd = NULL,file[PATH_MAX],xkm_output_dir[PATH_MAX],*map,*outFile;
             xfree(cmd);
 	return True;
     } 
-#ifdef DEBUG
-    ErrorF("Error compiling keymap (%s)\n",names->keymap);
-#endif
+    DebugF("Error compiling keymap (%s)\n",names->keymap);
     if (outFile!=NULL)
 	_XkbFree(outFile);
     if (cmd!=NULL)
@@ -371,12 +331,8 @@ char tmpname[PATH_MAX];
 	if (fclose(out)==0 && System(buf) >= 0)
 #endif
 	{
-#ifdef DEBUG_CMD
-	    ErrorF("xkb executes: %s\n",buf);
-	    ErrorF("xkbcomp input:\n");
-	    XkbWriteXKBKeymapForNames(stderr,names,NULL,xkb,want,need);
-	    ErrorF("end xkbcomp input\n");
-#endif
+            if (xkbDebugFlags)
+                DebugF("xkb executes: %s\n",buf);
 	    if (nameRtrn) {
 		strncpy(nameRtrn,keymap,nameRtrnLen);
 		nameRtrn[nameRtrnLen-1]= '\0';
@@ -385,24 +341,20 @@ char tmpname[PATH_MAX];
                 xfree (buf);
 	    return True;
 	}
-#ifdef DEBUG
 	else
-	    ErrorF("Error compiling keymap (%s)\n",keymap);
-#endif
+	    DebugF("Error compiling keymap (%s)\n",keymap);
 #ifdef WIN32
         /* remove the temporary file */
         unlink(tmpname);
 #endif
     }
-#ifdef DEBUG
     else {
 #ifndef WIN32
-	ErrorF("Could not invoke keymap compiler\n");
+	DebugF("Could not invoke keymap compiler\n");
 #else
-	ErrorF("Could not open file %s\n", tmpname);
+	DebugF("Could not open file %s\n", tmpname);
 #endif
     }
-#endif
     if (nameRtrn)
 	nameRtrn[0]= '\0';
     if (buf != NULL)
@@ -477,17 +429,13 @@ unsigned	missing;
 	    return 0;
 	}
 	else if (!XkbDDXCompileNamedKeymap(xkb,names,nameRtrn,nameRtrnLen)) {
-#ifdef NOISY
-	    ErrorF("Couldn't compile keymap file\n");
-#endif
+	    DebugF("Couldn't compile keymap file\n");
 	    return 0;
 	}
     }
     else if (!XkbDDXCompileKeymapByNames(xkb,names,want,need,
 						nameRtrn,nameRtrnLen)){
-#ifdef NOISY
-	ErrorF("Couldn't compile keymap file\n");
-#endif
+	DebugF("Couldn't compile keymap file\n");
 	return 0;
     }
     file= XkbDDXOpenConfigFile(nameRtrn,fileName,PATH_MAX);
@@ -502,11 +450,9 @@ unsigned	missing;
 	(void) unlink (fileName);
 	return 0;
     }
-#ifdef DEBUG
     else if (xkbDebugFlags) {
-	ErrorF("Loaded %s, defined=0x%x\n",fileName,finfoRtrn->defined);
+	DebugF("Loaded XKB keymap %s, defined=0x%x\n",fileName,finfoRtrn->defined);
     }
-#endif
     fclose(file);
     (void) unlink (fileName);
     return (need|want)&(~missing);
diff --git a/xkb/maprules.c b/xkb/maprules.c
index 52a1cdc86..72e642fbe 100644
--- a/xkb/maprules.c
+++ b/xkb/maprules.c
@@ -50,16 +50,6 @@
 #define XKBSRV_NEED_FILE_FUNCS
 #include <xkbsrv.h>
 
-#ifdef DEBUG
-#define PR_DEBUG(s)		fprintf(stderr,s)
-#define PR_DEBUG1(s,a)		fprintf(stderr,s,a)
-#define PR_DEBUG2(s,a,b)	fprintf(stderr,s,a,b)
-#else
-#define PR_DEBUG(s)
-#define PR_DEBUG1(s,a)
-#define PR_DEBUG2(s,a,b)
-#endif
-
 /***====================================================================***/
 
 #define DFLT_LINE_SIZE	128
@@ -171,8 +161,8 @@ Bool	endOfFile,spacePending,slashPending,inComment;
 		}
 		if (checkbang && ch=='!') {
 		    if (line->num_line!=0) {
-			PR_DEBUG("The '!' legal only at start of line\n");
-			PR_DEBUG("Line containing '!' ignored\n");
+			DebugF("The '!' legal only at start of line\n");
+			DebugF("Line containing '!' ignored\n");
 			line->num_line= 0;
 			inComment= 0;
 			break;
@@ -273,9 +263,7 @@ unsigned	present, l_ndx_present, v_ndx_present;
 register int	i;
 int		len, ndx;
 _Xstrtokparams	strtok_buf;
-#ifdef DEBUG
 Bool		found;
-#endif
 
 
    l_ndx_present = v_ndx_present = present= 0;
@@ -284,9 +272,7 @@ Bool		found;
    bzero((char *)remap,sizeof(RemapSpec));
    remap->number = len;
    while ((tok=_XStrtok(str," ",strtok_buf))!=NULL) {
-#ifdef DEBUG
 	found= False;
-#endif
 	str= NULL;
 	if (strcmp(tok,"=")==0)
 	    continue;
@@ -299,22 +285,20 @@ Bool		found;
 			*end != '\0' || ndx == -1)
 		        break;
 		     if (ndx < 1 || ndx > XkbNumKbdGroups) {
-		        PR_DEBUG2("Illegal %s index: %d\n", cname[i], ndx);
-		        PR_DEBUG1("Index must be in range 1..%d\n",
+		        DebugF("Illegal %s index: %d\n", cname[i], ndx);
+		        DebugF("Index must be in range 1..%d\n",
 				   XkbNumKbdGroups);
 			break;
 		     }
                 } else {
 		    ndx = 0;
                 }
-#ifdef DEBUG
 		found= True;
-#endif
 		if (present&(1<<i)) {
 		    if ((i == LAYOUT && l_ndx_present&(1<<ndx)) ||
 			(i == VARIANT && v_ndx_present&(1<<ndx)) ) {
-		        PR_DEBUG1("Component \"%s\" listed twice\n",tok);
-		        PR_DEBUG("Second definition ignored\n");
+		        DebugF("Component \"%s\" listed twice\n",tok);
+		        DebugF("Second definition ignored\n");
 		        break;
 		    }
 		}
@@ -328,38 +312,34 @@ Bool		found;
 		break;
 	    }
 	}
-#ifdef DEBUG
 	if (!found) {
 	    fprintf(stderr,"Unknown component \"%s\" ignored\n",tok);
 	}
-#endif
    }
    if ((present&PART_MASK)==0) {
-#ifdef DEBUG
 	unsigned mask= PART_MASK;
-	fprintf(stderr,"Mapping needs at least one of ");
+	ErrorF("Mapping needs at least one of ");
 	for (i=0; (i<MAX_WORDS); i++) {
 	    if ((1L<<i)&mask) {
 		mask&= ~(1L<<i);
-		if (mask)	fprintf(stderr,"\"%s,\" ",cname[i]);
-		else		fprintf(stderr,"or \"%s\"\n",cname[i]);
+		if (mask)	DebugF("\"%s,\" ",cname[i]);
+		else		DebugF("or \"%s\"\n",cname[i]);
 	    }
 	}
-	fprintf(stderr,"Illegal mapping ignored\n");
-#endif
+	DebugF("Illegal mapping ignored\n");
 	remap->num_remap= 0;
 	return;
    }
    if ((present&COMPONENT_MASK)==0) {
-	PR_DEBUG("Mapping needs at least one component\n");
-	PR_DEBUG("Illegal mapping ignored\n");
+	DebugF("Mapping needs at least one component\n");
+	DebugF("Illegal mapping ignored\n");
 	remap->num_remap= 0;
 	return;
    }
    if (((present&COMPONENT_MASK)&(1<<KEYMAP))&&
 				((present&COMPONENT_MASK)!=(1<<KEYMAP))) {
-	PR_DEBUG("Keymap cannot appear with other components\n");
-	PR_DEBUG("Illegal mapping ignored\n");
+	DebugF("Keymap cannot appear with other components\n");
+	DebugF("Illegal mapping ignored\n");
 	remap->num_remap= 0;
 	return;
    }
@@ -434,8 +414,8 @@ Bool 		append = False;
     }
 
     if (remap->num_remap==0) {
-	PR_DEBUG("Must have a mapping before first line of data\n");
-	PR_DEBUG("Illegal line of data ignored\n");
+	DebugF("Must have a mapping before first line of data\n");
+	DebugF("Illegal line of data ignored\n");
 	return False;
     }
     bzero((char *)&tmp,sizeof(FileSpec));
@@ -447,8 +427,8 @@ Bool 		append = False;
 	    continue;
 	}
 	if (nread>remap->num_remap) {
-	    PR_DEBUG("Too many words on a line\n");
-	    PR_DEBUG1("Extra word \"%s\" ignored\n",tok);
+	    DebugF("Too many words on a line\n");
+	    DebugF("Extra word \"%s\" ignored\n",tok);
 	    continue;
 	}
 	tmp.name[remap->remap[nread].word]= tok;
@@ -456,8 +436,8 @@ Bool 		append = False;
 	    append = True;
     }
     if (nread<remap->num_remap) {
-	PR_DEBUG1("Too few words on a line: %s\n", line->line);
-	PR_DEBUG("line ignored\n");
+	DebugF("Too few words on a line: %s\n", line->line);
+	DebugF("line ignored\n");
 	return False;
     }
 
@@ -903,9 +883,7 @@ XkbRF_AddRule(XkbRF_RulesPtr	rules)
     }
     if (!rules->rules) {
 	rules->sz_rules= rules->num_rules= 0;
-#ifdef DEBUG
-	fprintf(stderr,"Allocation failure in XkbRF_AddRule\n");
-#endif
+	DebugF("Allocation failure in XkbRF_AddRule\n");
 	return NULL;
     }
     bzero((char *)&rules->rules[rules->num_rules],sizeof(XkbRF_RuleRec));
@@ -1022,7 +1000,7 @@ XkbRF_AddVarDesc(XkbRF_DescribeVarsPtr	vars)
     }
     if (!vars->desc) {
 	vars->sz_desc= vars->num_desc= 0;
-	PR_DEBUG("Allocation failure in XkbRF_AddVarDesc\n");
+	DebugF("Allocation failure in XkbRF_AddVarDesc\n");
 	return NULL;
     }
     vars->desc[vars->num_desc].name= NULL;
@@ -1059,7 +1037,7 @@ XkbRF_AddVarToDescribe(XkbRF_RulesPtr rules,char *name)
 							XkbRF_DescribeVarsRec);
     }
     if ((!rules->extra_names)||(!rules->extra)) {
-	PR_DEBUG("allocation error in extra parts\n");
+	DebugF("allocation error in extra parts\n");
 	rules->sz_extra= rules->num_extra= 0;
 	rules->extra_names= NULL;
 	rules->extra= NULL;
@@ -1102,7 +1080,7 @@ int			len,headingtype,extra_ndx = 0;
 		}
 		if (extra_ndx<0) {
 		    XkbRF_DescribeVarsPtr	var;
-		    PR_DEBUG1("Extra heading \"%s\" encountered\n",tok);
+		    DebugF("Extra heading \"%s\" encountered\n",tok);
 		    var= XkbRF_AddVarToDescribe(rules,tok);
 		    if (var)
 			 extra_ndx= var-rules->extra;
@@ -1113,20 +1091,20 @@ int			len,headingtype,extra_ndx = 0;
 	}
 
 	if (headingtype == HEAD_NONE) {
-	    PR_DEBUG("Must have a heading before first line of data\n");
-	    PR_DEBUG("Illegal line of data ignored\n");
+	    DebugF("Must have a heading before first line of data\n");
+	    DebugF("Illegal line of data ignored\n");
 	    continue;
 	}
 
 	len = strlen(line.line);
 	if ((tmp.name= strtok(line.line, " \t")) == NULL) {
-	    PR_DEBUG("Huh? No token on line\n");
-	    PR_DEBUG("Illegal line of data ignored\n");
+	    DebugF("Huh? No token on line\n");
+	    DebugF("Illegal line of data ignored\n");
 	    continue;
 	}
 	if (strlen(tmp.name) == len) {
-	    PR_DEBUG("No description found\n");
-	    PR_DEBUG("Illegal line of data ignored\n");
+	    DebugF("No description found\n");
+	    DebugF("Illegal line of data ignored\n");
 	    continue;
 	}
 
@@ -1134,8 +1112,8 @@ int			len,headingtype,extra_ndx = 0;
 	while ((*tok!='\n')&&isspace(*tok))
 		tok++;
 	if (*tok == '\0') {
-	    PR_DEBUG("No description found\n");
-	    PR_DEBUG("Illegal line of data ignored\n");
+	    DebugF("No description found\n");
+	    DebugF("Illegal line of data ignored\n");
 	    continue;
 	}
 	tmp.desc= tok;
diff --git a/xkb/xkb.c b/xkb/xkb.c
index 66edcc1fd..bd9a87cf5 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -5784,10 +5784,8 @@ char *			str;
 	    return status;
     }
     else if (length!=0)  {
-#ifdef DEBUG
 	ErrorF("Internal Error!  BadLength in ProcXkbGetDeviceInfo\n");
 	ErrorF("                 Wrote %d fewer bytes than expected\n",length);
-#endif
 	return BadLength;
     }
     if (stuff->wanted&(~supported)) {
diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c
index d95fbcdde..75b8c5a27 100644
--- a/xkb/xkbAccessX.c
+++ b/xkb/xkbAccessX.c
@@ -130,11 +130,9 @@ xEvent		xE;
     xE.u.u.type = type;
     xE.u.u.detail = keyCode;
     xE.u.keyButtonPointer.time = GetTimeInMillis();	    
-#ifdef DEBUG
     if (xkbDebugFlags&0x8) {
-	ErrorF("AXKE: Key %d %s\n",keyCode,(xE.u.u.type==KeyPress?"down":"up"));
+	DebugF("AXKE: Key %d %s\n",keyCode,(xE.u.u.type==KeyPress?"down":"up"));
     }
-#endif
 
     if (_XkbIsPressEvent(type))
 	XkbDDXKeyClick(keybd,keyCode,TRUE);
@@ -533,10 +531,8 @@ KeySym *	sym = XkbKeySymsPtr(xkbi->desc,key);
 		((ctrls->enabled_ctrls&(XkbSlowKeysMask|XkbRepeatKeysMask))==
 							XkbRepeatKeysMask)) {
 	    if (BitIsOn(keybd->kbdfeed->ctrl.autoRepeats,key)) {
-#ifdef DEBUG
 		if (xkbDebugFlags&0x10)
-		    ErrorF("Starting software autorepeat...\n");
-#endif	    
+		    DebugF("Starting software autorepeat...\n");
 		xkbi->repeatKey = key;
 		xkbi->repeatKeyTimer= TimerSet(xkbi->repeatKeyTimer,
 					0, ctrls->repeat_delay,
diff --git a/xkb/xkbEvents.c b/xkb/xkbEvents.c
index 7643703e4..49725d065 100644
--- a/xkb/xkbEvents.c
+++ b/xkb/xkbEvents.c
@@ -813,23 +813,21 @@ XkbSrvInfoPtr	xkbi;
 
     xkbi= pXDev->key->xkbInfo;
     if ( pClient->xkbClientFlags & _XkbClientInitialized ) {
-#ifdef DEBUG
 	if ((xkbDebugFlags&0x10)&&
 		((xE[0].u.u.type==KeyPress)||(xE[0].u.u.type==KeyRelease)||
                  (xE[0].u.u.type==DeviceKeyPress)||
                  (xE[0].u.u.type == DeviceKeyRelease))) {
-	    ErrorF("XKbFilterWriteEvents:\n");
-	    ErrorF("   Event state= 0x%04x\n",xE[0].u.keyButtonPointer.state);
-	    ErrorF("   XkbLastRepeatEvent!=xE (0x%p!=0x%p) %s\n",
+	    DebugF("XKbFilterWriteEvents:\n");
+	    DebugF("   Event state= 0x%04x\n",xE[0].u.keyButtonPointer.state);
+	    DebugF("   XkbLastRepeatEvent!=xE (0x%p!=0x%p) %s\n",
 			XkbLastRepeatEvent,xE,
 			((XkbLastRepeatEvent!=(pointer)xE)?"True":"False"));
-	    ErrorF("   (xkbClientEventsFlags&XWDA)==0 (0x%x) %s\n",
+	    DebugF("   (xkbClientEventsFlags&XWDA)==0 (0x%x) %s\n",
 		pClient->xkbClientFlags,
 		(_XkbWantsDetectableAutoRepeat(pClient)?"True":"False"));
-	    ErrorF("   !IsRelease(%d) %s\n",xE[0].u.u.type,
+	    DebugF("   !IsRelease(%d) %s\n",xE[0].u.u.type,
 			(!_XkbIsReleaseEvent(xE[0].u.u.type))?"True":"False");
 	}
-#endif /* DEBUG */
 	if (	(XkbLastRepeatEvent==(pointer)xE) &&
 	     	(_XkbWantsDetectableAutoRepeat(pClient)) &&
 	     	(_XkbIsReleaseEvent(xE[0].u.u.type)) ) {
@@ -866,13 +864,11 @@ XkbSrvInfoPtr	xkbi;
 	if (xE[0].u.u.type == ButtonPress &&
 	    ((xE[0].u.keyButtonPointer.state >> 7) & button_mask) == button_mask &&
 	    (xkbi->lockedPtrButtons & button_mask) == button_mask) {
-#ifdef DEBUG
 	    /* If the MouseKeys is pressed, and the "real" mouse is also pressed
 	     * when the mouse is released, the server does not behave properly.
 	     * Faking a release of the button here solves the problem.
 	     */
-	    ErrorF("Faking release of button %d\n", xE[0].u.u.detail);
-#endif
+	    DebugF("Faking release of button %d\n", xE[0].u.u.detail);
 	    XkbDDXFakePointerButton(ButtonRelease, xE[0].u.u.detail);
         }
     }
@@ -881,21 +877,19 @@ XkbSrvInfoPtr	xkbi;
 
 	for (i=0;i<nEvents;i++) {
 	    type= xE[i].u.u.type;
-#ifdef DEBUG
 	    if ((xkbDebugFlags&0x4)&&
 		((xE[i].u.u.type==KeyPress)||(xE[i].u.u.type==KeyRelease)||
                  (xE[i].u.u.type==DeviceKeyPress)||
                  (xE[i].u.u.type == DeviceKeyRelease))) {
 		XkbStatePtr s= &xkbi->state;
-		ErrorF("XKbFilterWriteEvents (non-XKB):\n");
-		ErrorF("event= 0x%04x\n",xE[i].u.keyButtonPointer.state);
-		ErrorF("lookup= 0x%02x, grab= 0x%02x\n",s->lookup_mods,
+		DebugF("XKbFilterWriteEvents (non-XKB):\n");
+		DebugF("event= 0x%04x\n",xE[i].u.keyButtonPointer.state);
+		DebugF("lookup= 0x%02x, grab= 0x%02x\n",s->lookup_mods,
 							s->grab_mods);
-		ErrorF("compat lookup= 0x%02x, grab= 0x%02x\n",
+		DebugF("compat lookup= 0x%02x, grab= 0x%02x\n",
 							s->compat_lookup_mods,
 							s->compat_grab_mods);
 	    }
-#endif
 	    if ( (type>=KeyPress)&&(type<=MotionNotify) ) {
 		CARD16	old,new;
 
@@ -924,16 +918,12 @@ XkbSrvInfoPtr	xkbi;
 	    if (type == ButtonPress &&
 		((xE[i].u.keyButtonPointer.state >> 7) & button_mask) == button_mask &&
 		(xkbi->lockedPtrButtons & button_mask) == button_mask) {
-#ifdef DEBUG
-		ErrorF("Faking release of button %d\n", xE[i].u.u.detail);
-#endif
+		DebugF("Faking release of button %d\n", xE[i].u.u.detail);
 		XkbDDXFakePointerButton(ButtonRelease, xE[i].u.u.detail);
 	    } else if (type == DeviceButtonPress &&
                     ((((deviceKeyButtonPointer*)&xE[i])->state >> 7) & button_mask) == button_mask &&
                     (xkbi->lockedPtrButtons & button_mask) == button_mask) {
-#ifdef DEBUG
-		ErrorF("Faking release of button %d\n", ((deviceKeyButtonPointer*)&xE[i])->state);
-#endif
+		DebugF("Faking release of button %d\n", ((deviceKeyButtonPointer*)&xE[i])->state);
 		XkbDDXFakePointerButton(DeviceButtonRelease, ((deviceKeyButtonPointer*)&xE[i])->state);
             }
 	}
diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
index bb1de9de6..2ac51f26c 100644
--- a/xkb/xkbInit.c
+++ b/xkb/xkbInit.c
@@ -280,10 +280,6 @@ XkbSetRulesDflts(char *rulesFile,char *model,char *layout,
 
 /***====================================================================***/
 
-#if defined(luna)
-#define	XKB_DDX_PERMANENT_LOCK	1
-#endif
-
 #include "xkbDflts.h"
 
 static Bool
@@ -390,15 +386,6 @@ Atom		unknown;
 	    names->indicators[LED_COMPOSE-1] = CREATE_ATOM("Compose");
 #endif
     }
-#ifdef DEBUG_RADIO_GROUPS
-    if (names->num_rg<1) {
-	names->radio_groups= (Atom *)_XkbCalloc(RG_COUNT, sizeof(Atom));
-	if (names->radio_groups) {
-	    names->num_rg = RG_COUNT;
-	    names->radio_groups[RG_BOGUS_FUNCTION_GROUP]= CREATE_ATOM("BOGUS");
-	}
-    }
-#endif
     if (xkb->geom!=NULL)
 	 names->geometry= xkb->geom->name;
     else names->geometry= unknown;
@@ -771,9 +758,7 @@ XkbSrvLedInfoPtr	sli;
     sli= XkbFindSrvLedInfo(pXDev,XkbDfltXIClass,XkbDfltXIId,0);
     if (sli && xkbi)
 	XkbCheckIndicatorMaps(xkbi->device,sli,XkbAllIndicatorsMask);
-#ifdef DEBUG
-    else ErrorF("No indicator feedback in XkbFinishInit (shouldn't happen)!\n");
-#endif
+    else DebugF("No indicator feedback in XkbFinishInit (shouldn't happen)!\n");
     return softRepeat;
 }
 
diff --git a/xkb/xkbPrKeyEv.c b/xkb/xkbPrKeyEv.c
index 3fec4f5ca..69c218c8c 100644
--- a/xkb/xkbPrKeyEv.c
+++ b/xkb/xkbPrKeyEv.c
@@ -56,11 +56,9 @@ int             xiEvent;
     xkbi= keyc->xkbInfo;
     key= xE->u.u.detail;
     xiEvent= (xE->u.u.type & EXTENSION_EVENT_BASE);
-#ifdef DEBUG
     if (xkbDebugFlags&0x8) {
-	ErrorF("XkbPKE: Key %d %s\n",key,(xE->u.u.type==KeyPress?"down":"up"));
+	DebugF("XkbPKE: Key %d %s\n",key,(xE->u.u.type==KeyPress?"down":"up"));
     }
-#endif
 
     if ( (xkbi->repeatKey==key) && (xE->u.u.type==KeyRelease) &&
 	 ((xkbi->desc->ctrls->enabled_ctrls&XkbRepeatKeysMask)==0) ) {
diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
index 67843e9fb..28d66b38b 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -211,16 +211,6 @@ KeySym			tsyms[XkbMaxSymsPerKey],*syms;
 XkbMapChangesPtr	mc;
 
     xkb= pXDev->key->xkbInfo->desc;
-#ifdef NOTYET
-    if (first<xkb->min_key_code) {
-	if (first>=XkbMinLegalKeyCode) {
-	    xkb->min_key_code= first;
-	    /* 1/12/95 (ef) -- XXX! should zero out the new maps */
-	    changes->map.changed|= XkbKeycodesMask;
-/* generate a NewKeyboard notify here? */
-	}
-    }
-#endif
     if (first+num-1>xkb->max_key_code) {
 	/* 1/12/95 (ef) -- XXX! should allow XKB structures to grow */
 	num= xkb->max_key_code-first+1;
diff --git a/xkb/xkmread.c b/xkb/xkmread.c
index 88296188a..2bb02896b 100644
--- a/xkb/xkmread.c
+++ b/xkb/xkmread.c
@@ -40,8 +40,7 @@
 #include "misc.h"
 #include "inputstr.h"
 #include "xkbstr.h"
-#define	 XKBSRV_NEED_FILE_FUNCS
-#include <xkbsrv.h>
+#include "xkbsrv.h"
 #include "xkbgeom.h"
 
 Atom
@@ -52,10 +51,6 @@ XkbInternAtom(Display *dpy,char *str,Bool only_if_exists)
     return MakeAtom(str,strlen(str),!only_if_exists);
 }
 
-#ifndef SEEK_SET
-#define	SEEK_SET 0
-#endif
-
 char *
 _XkbDupString(char *str)
 {
@@ -562,10 +557,8 @@ FindTypeForKey(XkbDescPtr xkb,Atom name,unsigned width,KeySym *syms)
 	register unsigned i;
 	for (i=0;i<xkb->map->num_types;i++) {
 	    if (xkb->map->types[i].name==name) {
-#ifdef DEBUG
 		if (xkb->map->types[i].num_levels!=width)
-		    fprintf(stderr,"Group width mismatch between key and type\n");
-#endif
+		    DebugF("Group width mismatch between key and type\n");
 		return &xkb->map->types[i];
 	    }
 	}
@@ -1086,10 +1079,8 @@ unsigned i,size_toc;
     fread(file_info,SIZEOF(xkmFileInfo),1,file);
     size_toc= file_info->num_toc;
     if (size_toc>max_toc) {
-#ifdef DEBUG
-	fprintf(stderr,"Warning! Too many TOC entries; last %d ignored\n",
+	DebugF("Warning! Too many TOC entries; last %d ignored\n",
 							size_toc-max_toc);
-#endif
 	size_toc= max_toc;
     }
     for (i=0;i<size_toc;i++) {
@@ -1227,11 +1218,7 @@ unsigned		which= need|want;
     if (result->xkb==NULL)
 	result->xkb= XkbAllocKeyboard();
     for (i=0;i<fileInfo.num_toc;i++) {
-#ifdef SEEK_SET
 	fseek(file,toc[i].offset,SEEK_SET);
-#else
-	fseek(file,toc[i].offset,0);
-#endif
 	tmp= fread(&tmpTOC,SIZEOF(xkmSectionInfo),1,file);
 	nRead= tmp*SIZEOF(xkmSectionInfo);
 	if ((tmpTOC.type!=toc[i].type)||(tmpTOC.format!=toc[i].format)||

From 1332343910a1880854bae21a790cff198855cd24 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Sun, 3 Feb 2008 23:43:18 +1100
Subject: [PATCH 512/552] XKB: Remove usage of client-side types

Since we're no longer sharing with Xlib, don't pass Displays and XPointers
everywhere.
---
 include/xkbfile.h | 33 +---------------
 include/xkbsrv.h  | 12 +++---
 include/xkbstr.h  |  1 -
 xkb/XKBGAlloc.c   | 32 ++++++++--------
 xkb/ddxLoad.c     |  4 +-
 xkb/xkbfmisc.c    | 11 +++---
 xkb/xkbgeom.h     | 20 ----------
 xkb/xkbout.c      | 96 +++++++++++++++++++----------------------------
 xkb/xkbtext.c     | 56 +++++++++++++--------------
 xkb/xkmread.c     | 51 ++++++++++++-------------
 10 files changed, 119 insertions(+), 197 deletions(-)

diff --git a/include/xkbfile.h b/include/xkbfile.h
index d58bec69f..e90d7668e 100644
--- a/include/xkbfile.h
+++ b/include/xkbfile.h
@@ -96,7 +96,6 @@ extern	char *	XkbIndentText(
 );
 
 extern	char *	XkbAtomText(
-    Display *	/* dpy */,
     Atom 	/* atm */,
     unsigned	/* format */
 );
@@ -129,14 +128,12 @@ XkbModMaskText(
 );
 
 extern char *	XkbVModIndexText(
-    Display *	/* dpy */,
     XkbDescPtr	/* xkb */,
     unsigned	/* ndx */,
     unsigned	/* format */
 );
 
 extern	char *	XkbVModMaskText(
-    Display *	/* dpy */,
     XkbDescPtr	/* xkb */,
     unsigned	/* modMask */,
     unsigned	/* mask */,
@@ -189,7 +186,6 @@ extern char *	XkbActionTypeText(
 );
 
 extern char *	XkbActionText(
-    Display *	/* dpy */,
     XkbDescPtr	/* xkb */,
     XkbAction *	/* action */,
     unsigned	/* format */
@@ -232,31 +228,12 @@ extern	Bool	XkbLookupGroupAndLevel(
 
 /***====================================================================***/
 
-extern	char *	XkbAtomGetString(
-    Display *	/* dpy */,
-    Atom 	/* atm */
-);
-
 extern	Atom	XkbInternAtom(
-    Display *	/* dpy */,
     char *	/* name */,
     Bool	/* onlyIfExists */
 );
 
-extern	Status	XkbChangeKbdDisplay(
-    Display *		/* newDpy */,
-    XkbFileInfo *	/* result */
-);
-
-extern	Atom	XkbChangeAtomDisplay(
-    Display *	/* oldDpy */,
-    Display *	/* newDpy */,
-    Atom	/* atm */
-);
-
-extern	void	XkbInitAtoms(
-    Display *	/* dpy */
-);
+extern	void	XkbInitAtoms(void);
 
 /***====================================================================***/
 
@@ -415,7 +392,6 @@ extern	void	XkbEnsureSafeMapName(
 extern	Bool	XkbWriteXKBKeymapForNames(
     FILE *			/* file */,
     XkbComponentNamesPtr	/* names */,
-    Display *			/* dpy */,
     XkbDescPtr			/* xkb */,
     unsigned			/* want */,
     unsigned			/* need */
@@ -432,13 +408,6 @@ extern Bool	XkmProbe(
     FILE *		/* file */
 );
 
-extern unsigned XkbReadFromServer(
-    Display *		/* dpy */,
-    unsigned		/* need */,
-    unsigned		/* want */,
-    XkbFileInfo *	/* result */
-);
-
 extern unsigned	XkmReadFile(
     FILE *		/* file */,
     unsigned		/* need */,
diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index df9aefca3..a71150462 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -328,12 +328,10 @@ extern	int	DeviceEnterNotify,DeviceLeaveNotify;
 #define	IsKeypadKey(s)		XkbKSIsKeypad(s)
 
 #define	Status		int
-#define	XPointer	pointer
-#define	Display		struct _XDisplay
 
 #ifndef True
-#define	True	1
-#define	False	0
+#define	True	TRUE
+#define	False	FALSE
 #endif
 
 _XFUNCPROTOBEGIN
@@ -1020,11 +1018,11 @@ extern	Bool XkbDDXNamesFromRules(
 );
 
 extern	Bool XkbDDXApplyConfig(
-	XPointer	/* cfg_in */,
+	void *	/* cfg_in */,
 	XkbSrvInfoPtr	/* xkbi */
 );
 
-extern XPointer XkbDDXPreloadConfig(
+extern void *XkbDDXPreloadConfig(
 	char **			/* rulesFileRtrn */,
 	XkbRF_VarDefsPtr	/* defs */,
 	XkbComponentNamesPtr	/* names */,
@@ -1038,6 +1036,6 @@ extern	int _XkbStrCaseCmp(
 
 _XFUNCPROTOEND
 
-#define	XkbAtomGetString(d,s)	NameForAtom(s)
+#define	XkbAtomGetString(s)	NameForAtom(s)
 
 #endif /* _XKBSRV_H_ */
diff --git a/include/xkbstr.h b/include/xkbstr.h
index e519e657d..f390c611c 100644
--- a/include/xkbstr.h
+++ b/include/xkbstr.h
@@ -418,7 +418,6 @@ typedef	struct _XkbGeometry	*XkbGeometryPtr;
 	 * Tie it all together into one big keyboard description
 	 */
 typedef	struct _XkbDesc {
-	struct _XDisplay *	dpy;
 	unsigned short	 	flags;
 	unsigned short		device_spec;
 	KeyCode			min_key_code;
diff --git a/xkb/XKBGAlloc.c b/xkb/XKBGAlloc.c
index 94072b8ce..c37f49a55 100644
--- a/xkb/XKBGAlloc.c
+++ b/xkb/XKBGAlloc.c
@@ -455,7 +455,7 @@ XkbFreeGeometry(XkbGeometryPtr geom,unsigned which,Bool freeMap)
 /***====================================================================***/
 
 static Status
-_XkbGeomAlloc(	XPointer *		old,
+_XkbGeomAlloc(	void **		old,
 		unsigned short *	num,
 		unsigned short *	total,
 		int			num_new,
@@ -471,8 +471,8 @@ _XkbGeomAlloc(	XPointer *		old,
 
     *total= (*num)+num_new;
     if ((*old)!=NULL)
-	 (*old)= (XPointer)_XkbRealloc((*old),(*total)*sz_elem);
-    else (*old)= (XPointer)_XkbCalloc((*total),sz_elem);
+	 (*old)= _XkbRealloc((*old),(*total)*sz_elem);
+    else (*old)= _XkbCalloc((*total),sz_elem);
     if ((*old)==NULL) {
 	*total= *num= 0;
 	return BadAlloc;
@@ -485,44 +485,44 @@ _XkbGeomAlloc(	XPointer *		old,
     return Success;
 }
 
-#define	_XkbAllocProps(g,n) _XkbGeomAlloc((XPointer *)&(g)->properties,\
+#define	_XkbAllocProps(g,n) _XkbGeomAlloc((void *)&(g)->properties,\
 				&(g)->num_properties,&(g)->sz_properties,\
 				(n),sizeof(XkbPropertyRec))
-#define	_XkbAllocColors(g,n) _XkbGeomAlloc((XPointer *)&(g)->colors,\
+#define	_XkbAllocColors(g,n) _XkbGeomAlloc((void *)&(g)->colors,\
 				&(g)->num_colors,&(g)->sz_colors,\
 				(n),sizeof(XkbColorRec))
-#define	_XkbAllocShapes(g,n) _XkbGeomAlloc((XPointer *)&(g)->shapes,\
+#define	_XkbAllocShapes(g,n) _XkbGeomAlloc((void *)&(g)->shapes,\
 				&(g)->num_shapes,&(g)->sz_shapes,\
 				(n),sizeof(XkbShapeRec))
-#define	_XkbAllocSections(g,n) _XkbGeomAlloc((XPointer *)&(g)->sections,\
+#define	_XkbAllocSections(g,n) _XkbGeomAlloc((void *)&(g)->sections,\
 				&(g)->num_sections,&(g)->sz_sections,\
 				(n),sizeof(XkbSectionRec))
-#define	_XkbAllocDoodads(g,n) _XkbGeomAlloc((XPointer *)&(g)->doodads,\
+#define	_XkbAllocDoodads(g,n) _XkbGeomAlloc((void *)&(g)->doodads,\
 				&(g)->num_doodads,&(g)->sz_doodads,\
 				(n),sizeof(XkbDoodadRec))
-#define	_XkbAllocKeyAliases(g,n) _XkbGeomAlloc((XPointer *)&(g)->key_aliases,\
+#define	_XkbAllocKeyAliases(g,n) _XkbGeomAlloc((void *)&(g)->key_aliases,\
 				&(g)->num_key_aliases,&(g)->sz_key_aliases,\
 				(n),sizeof(XkbKeyAliasRec))
 
-#define	_XkbAllocOutlines(s,n) _XkbGeomAlloc((XPointer *)&(s)->outlines,\
+#define	_XkbAllocOutlines(s,n) _XkbGeomAlloc((void *)&(s)->outlines,\
 				&(s)->num_outlines,&(s)->sz_outlines,\
 				(n),sizeof(XkbOutlineRec))
-#define	_XkbAllocRows(s,n) _XkbGeomAlloc((XPointer *)&(s)->rows,\
+#define	_XkbAllocRows(s,n) _XkbGeomAlloc((void *)&(s)->rows,\
 				&(s)->num_rows,&(s)->sz_rows,\
 				(n),sizeof(XkbRowRec))
-#define	_XkbAllocPoints(o,n) _XkbGeomAlloc((XPointer *)&(o)->points,\
+#define	_XkbAllocPoints(o,n) _XkbGeomAlloc((void *)&(o)->points,\
 				&(o)->num_points,&(o)->sz_points,\
 				(n),sizeof(XkbPointRec))
-#define	_XkbAllocKeys(r,n) _XkbGeomAlloc((XPointer *)&(r)->keys,\
+#define	_XkbAllocKeys(r,n) _XkbGeomAlloc((void *)&(r)->keys,\
 				&(r)->num_keys,&(r)->sz_keys,\
 				(n),sizeof(XkbKeyRec))
-#define	_XkbAllocOverlays(s,n) _XkbGeomAlloc((XPointer *)&(s)->overlays,\
+#define	_XkbAllocOverlays(s,n) _XkbGeomAlloc((void *)&(s)->overlays,\
 				&(s)->num_overlays,&(s)->sz_overlays,\
 				(n),sizeof(XkbOverlayRec))
-#define	_XkbAllocOverlayRows(o,n) _XkbGeomAlloc((XPointer *)&(o)->rows,\
+#define	_XkbAllocOverlayRows(o,n) _XkbGeomAlloc((void *)&(o)->rows,\
 				&(o)->num_rows,&(o)->sz_rows,\
 				(n),sizeof(XkbOverlayRowRec))
-#define	_XkbAllocOverlayKeys(r,n) _XkbGeomAlloc((XPointer *)&(r)->keys,\
+#define	_XkbAllocOverlayKeys(r,n) _XkbGeomAlloc((void *)&(r)->keys,\
 				&(r)->num_keys,&(r)->sz_keys,\
 				(n),sizeof(XkbOverlayKeyRec))
     
diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
index 63122264b..60a8d443a 100644
--- a/xkb/ddxLoad.c
+++ b/xkb/ddxLoad.c
@@ -321,10 +321,10 @@ char tmpname[PATH_MAX];
 #ifdef DEBUG
     if (xkbDebugFlags) {
        ErrorF("XkbDDXCompileKeymapByNames compiling keymap:\n");
-       XkbWriteXKBKeymapForNames(stderr,names,NULL,xkb,want,need);
+       XkbWriteXKBKeymapForNames(stderr,names,xkb,want,need);
     }
 #endif
-	XkbWriteXKBKeymapForNames(out,names,NULL,xkb,want,need);
+	XkbWriteXKBKeymapForNames(out,names,xkb,want,need);
 #ifndef WIN32
 	if (Pclose(out)==0)
 #else
diff --git a/xkb/xkbfmisc.c b/xkb/xkbfmisc.c
index 06d3519af..4182c3a34 100644
--- a/xkb/xkbfmisc.c
+++ b/xkb/xkbfmisc.c
@@ -160,7 +160,6 @@ _AddIncl(	FILE *		file,
 Bool
 XkbWriteXKBKeymapForNames(	FILE *			file,
 				XkbComponentNamesPtr	names,
-				Display *		dpy,
 				XkbDescPtr		xkb,
 				unsigned		want,
 				unsigned		need)
@@ -233,7 +232,7 @@ XkbFileInfo	finfo;
     if ((xkb!=NULL) && (old_names!=NULL)) {
 	if (wantNames&XkmTypesMask) {
 	    if (old_names->types!=None) {
-		tmp= XkbAtomGetString(dpy,old_names->types);
+		tmp= XkbAtomGetString(old_names->types);
 		names->types= _XkbDupString(tmp);
 	    }
 	    else {
@@ -243,7 +242,7 @@ XkbFileInfo	finfo;
 	}
 	if (wantNames&XkmCompatMapMask) {
 	    if (old_names->compat!=None) {
-		tmp= XkbAtomGetString(dpy,old_names->compat);
+		tmp= XkbAtomGetString(old_names->compat);
 		names->compat= _XkbDupString(tmp);
 	    }
 	    else wantDflts|= XkmCompatMapMask;
@@ -252,13 +251,13 @@ XkbFileInfo	finfo;
 	if (wantNames&XkmSymbolsMask) {
 	    if (old_names->symbols==None)
 		return False;
-	    tmp= XkbAtomGetString(dpy,old_names->symbols);
+	    tmp= XkbAtomGetString(old_names->symbols);
 	    names->symbols= _XkbDupString(tmp);
 	    complete|= XkmSymbolsMask; 
 	}
 	if (wantNames&XkmKeyNamesMask) {
 	   if (old_names->keycodes!=None) {
-		tmp= XkbAtomGetString(dpy,old_names->keycodes);
+		tmp= XkbAtomGetString(old_names->keycodes);
 		names->keycodes= _XkbDupString(tmp);
 	    }
 	    else wantDflts|= XkmKeyNamesMask;
@@ -267,7 +266,7 @@ XkbFileInfo	finfo;
 	if (wantNames&XkmGeometryMask) {
 	    if (old_names->geometry==None)
 		return False;
-	    tmp= XkbAtomGetString(dpy,old_names->geometry);
+	    tmp= XkbAtomGetString(old_names->geometry);
 	    names->geometry= _XkbDupString(tmp);
 	    complete|= XkmGeometryMask; 
 	    wantNames&= ~XkmGeometryMask;
diff --git a/xkb/xkbgeom.h b/xkb/xkbgeom.h
index a6918b4b9..173affee9 100644
--- a/xkb/xkbgeom.h
+++ b/xkb/xkbgeom.h
@@ -599,13 +599,6 @@ XkbAllocGeometry(
 	XkbGeometrySizesPtr	/* sizes */
 );
 
-extern	Status
-XkbSetGeometry(
-	Display *		/* dpy */,
-	unsigned		/* deviceSpec */,
-	XkbGeometryPtr		/* geom */
-);
-
 extern	Bool
 XkbComputeShapeTop(
 	XkbShapePtr		/* shape */,
@@ -637,19 +630,6 @@ XkbFindOverlayForKey(
 	char *			/* under */
 );
 
-extern	Status
-XkbGetGeometry(
-    Display *			/* dpy */,
-    XkbDescPtr			/* xkb */
-);
-
-extern	Status
-XkbGetNamedGeometry(
-    Display *			/* dpy */,
-    XkbDescPtr			/* xkb */,
-    Atom			/* name */
-);
-
 _XFUNCPROTOEND
 
 #endif /* _XKBGEOM_H_ */
diff --git a/xkb/xkbout.c b/xkb/xkbout.c
index fc4e43e3f..b72c05c60 100644
--- a/xkb/xkbout.c
+++ b/xkb/xkbout.c
@@ -52,7 +52,7 @@
 #define	VMOD_COMMENT_VALUE 2
 
 static Bool
-WriteXKBVModDecl(FILE *file,Display *dpy,XkbDescPtr xkb,int showValue)
+WriteXKBVModDecl(FILE *file,XkbDescPtr xkb,int showValue)
 {
 register int 	i,nMods;
 Atom *		vmodNames;
@@ -67,7 +67,7 @@ Atom *		vmodNames;
 	if ((vmodNames!=NULL)&&(vmodNames[i]!=None)) {
 	    if (nMods==0)	fprintf(file,"    virtual_modifiers ");
 	    else		fprintf(file,",");
-	    fprintf(file,"%s",XkbAtomText(dpy,vmodNames[i],XkbXKBFile));
+	    fprintf(file,"%s",XkbAtomText(vmodNames[i],XkbXKBFile));
 	    if ((showValue!=VMOD_HIDE_VALUE)&&
 		(xkb->server)&&(xkb->server->vmods[i]!=XkbNoModifierMask)) {
 		if (showValue==VMOD_COMMENT_VALUE) {
@@ -92,12 +92,7 @@ Atom *		vmodNames;
 static Bool
 WriteXKBAction(FILE *file,XkbFileInfo *result,XkbAnyAction *action)
 {
-XkbDescPtr	xkb;
-Display *	dpy;
-
-    xkb= result->xkb;
-    dpy= xkb->dpy;
-    fprintf(file,"%s",XkbActionText(dpy,xkb,(XkbAction *)action,XkbXKBFile));
+    fprintf(file,"%s",XkbActionText(result->xkb,(XkbAction *)action,XkbXKBFile));
     return True;
 }
 
@@ -114,11 +109,9 @@ XkbWriteXKBKeycodes(	FILE *			file,
 Atom			kcName;
 register unsigned 	i;
 XkbDescPtr		xkb;
-Display *		dpy;
 char *			alternate;
 
     xkb= result->xkb;
-    dpy= xkb->dpy;
     if ((!xkb)||(!xkb->names)||(!xkb->names->keys)) {
 	_XkbLibError(_XkbErrMissingNames,"XkbWriteXKBKeycodes",0);
 	return False;
@@ -126,7 +119,7 @@ char *			alternate;
     kcName= xkb->names->keycodes;
     if (kcName!=None)
 	 fprintf(file,"xkb_keycodes \"%s\" {\n",
-					XkbAtomText(dpy,kcName,XkbXKBFile));
+					XkbAtomText(kcName,XkbXKBFile));
     else fprintf(file,"xkb_keycodes {\n");
     fprintf(file,"    minimum = %d;\n",xkb->min_key_code);
     fprintf(file,"    maximum = %d;\n",xkb->max_key_code);
@@ -148,7 +141,7 @@ char *			alternate;
 	    else	type= "    virtual ";
 	    if (xkb->names->indicators[i]!=None) {
 		fprintf(file,"%sindicator %d = \"%s\";\n",type,i+1,
-			XkbAtomText(dpy,xkb->names->indicators[i],XkbXKBFile));
+			XkbAtomText(xkb->names->indicators[i],XkbXKBFile));
 	    }
 	}
     }
@@ -175,14 +168,12 @@ XkbWriteXKBKeyTypes(	FILE *			file,
 			XkbFileAddOnFunc	addOn,
 			void *			priv)
 {
-Display *		dpy;
 register unsigned	i,n;
 XkbKeyTypePtr		type;
 XkbKTMapEntryPtr	entry;
 XkbDescPtr		xkb;
 
     xkb= result->xkb;
-    dpy= xkb->dpy;
     if ((!xkb)||(!xkb->map)||(!xkb->map->types)) {
 	_XkbLibError(_XkbErrMissingTypes,"XkbWriteXKBKeyTypes",0);
 	return False;
@@ -194,27 +185,27 @@ XkbDescPtr		xkb;
     if ((xkb->names==NULL)||(xkb->names->types==None))
 	 fprintf(file,"xkb_types {\n\n");
     else fprintf(file,"xkb_types \"%s\" {\n\n",
-			XkbAtomText(dpy,xkb->names->types,XkbXKBFile));
-    WriteXKBVModDecl(file,dpy,xkb,
+			XkbAtomText(xkb->names->types,XkbXKBFile));
+    WriteXKBVModDecl(file,xkb,
 			(showImplicit?VMOD_COMMENT_VALUE:VMOD_HIDE_VALUE));
 
     type= xkb->map->types;
     for (i=0;i<xkb->map->num_types;i++,type++) {
 	fprintf(file,"    type \"%s\" {\n",
-		XkbAtomText(dpy,type->name,XkbXKBFile));
+		XkbAtomText(type->name,XkbXKBFile));
 	fprintf(file,"        modifiers= %s;\n",
-	       XkbVModMaskText(dpy,xkb,type->mods.real_mods,type->mods.vmods,
+	       XkbVModMaskText(xkb,type->mods.real_mods,type->mods.vmods,
 								XkbXKBFile));
 	entry= type->map;
 	for (n=0;n<type->map_count;n++,entry++) {
 	    char *str;	
-	    str=XkbVModMaskText(dpy,xkb,entry->mods.real_mods,entry->mods.vmods,
+	    str=XkbVModMaskText(xkb,entry->mods.real_mods,entry->mods.vmods,
 								XkbXKBFile);
 	    fprintf(file,"        map[%s]= Level%d;\n",str,entry->level+1);
 	    if ((type->preserve)&&((type->preserve[n].real_mods)||
 				   (type->preserve[n].vmods))) {
 		fprintf(file,"        preserve[%s]= ",str);
-		fprintf(file,"%s;\n",XkbVModMaskText(dpy,xkb,
+		fprintf(file,"%s;\n",XkbVModMaskText(xkb,
 					type->preserve[n].real_mods,
 					type->preserve[n].vmods,
 					XkbXKBFile));
@@ -226,7 +217,7 @@ XkbDescPtr		xkb;
 		if ((*name)==None)
 		    continue;
 		fprintf(file,"        level_name[Level%d]= \"%s\";\n",n+1,
-					XkbAtomText(dpy,*name,XkbXKBFile));
+					XkbAtomText(*name,XkbXKBFile));
 	    }
 	}
 	fprintf(file,"    };\n");
@@ -248,7 +239,7 @@ WriteXKBIndicatorMap(	FILE *			file,
 XkbDescPtr	xkb;
 
     xkb= result->xkb;
-    fprintf(file,"    indicator \"%s\" {\n",XkbAtomGetString(xkb->dpy,name));
+    fprintf(file,"    indicator \"%s\" {\n",XkbAtomGetString(name));
     if (led->flags&XkbIM_NoExplicit)
 	fprintf(file,"        !allowExplicit;\n");
     if (led->flags&XkbIM_LEDDrivesKB)
@@ -266,7 +257,7 @@ XkbDescPtr	xkb;
 			XkbIMWhichStateMaskText(led->which_mods,XkbXKBFile));
 	}
 	fprintf(file,"        modifiers= %s;\n",
-			XkbVModMaskText(xkb->dpy,xkb,
+			XkbVModMaskText(xkb,
 					led->mods.real_mods,led->mods.vmods,
 					XkbXKBFile));
     }
@@ -288,13 +279,11 @@ XkbWriteXKBCompatMap(	FILE *			file,
 			XkbFileAddOnFunc	addOn,
 			void *			priv)
 {
-Display *		dpy;
 register unsigned	i;
 XkbSymInterpretPtr	interp;
 XkbDescPtr		xkb;
 
     xkb= result->xkb;
-    dpy= xkb->dpy;
     if ((!xkb)||(!xkb->compat)||(!xkb->compat->sym_interpret)) {
 	_XkbLibError(_XkbErrMissingCompatMap,"XkbWriteXKBCompatMap",0);
 	return False;
@@ -302,8 +291,8 @@ XkbDescPtr		xkb;
     if ((xkb->names==NULL)||(xkb->names->compat==None))
 	 fprintf(file,"xkb_compatibility {\n\n");
     else fprintf(file,"xkb_compatibility \"%s\" {\n\n",
-			XkbAtomText(dpy,xkb->names->compat,XkbXKBFile));
-    WriteXKBVModDecl(file,dpy,xkb,
+			XkbAtomText(xkb->names->compat,XkbXKBFile));
+    WriteXKBVModDecl(file,xkb,
 			(showImplicit?VMOD_COMMENT_VALUE:VMOD_HIDE_VALUE));
 
     fprintf(file,"    interpret.useModMapMods= AnyLevel;\n");
@@ -318,7 +307,7 @@ XkbDescPtr		xkb;
 				XkbModMaskText(interp->mods,XkbXKBFile));
 	if (interp->virtual_mod!=XkbNoModifier) {
 	    fprintf(file,"        virtualModifier= %s;\n",
-		XkbVModIndexText(dpy,xkb,interp->virtual_mod,XkbXKBFile));
+		XkbVModIndexText(xkb,interp->virtual_mod,XkbXKBFile));
 	}
 	if (interp->match&XkbSI_LevelOneOnly)
 	    fprintf(file,"        useModMapMods=level1;\n");
@@ -337,7 +326,7 @@ XkbDescPtr		xkb;
 	gc= &xkb->compat->groups[i];
 	if ((gc->real_mods==0)&&(gc->vmods==0))
 	    continue;
-	fprintf(file,"    group %d = %s;\n",i+1,XkbVModMaskText(xkb->dpy,xkb,
+	fprintf(file,"    group %d = %s;\n",i+1,XkbVModMaskText(xkb,
 							gc->real_mods,gc->vmods,
 							XkbXKBFile));
     }
@@ -367,7 +356,6 @@ XkbWriteXKBSymbols(	FILE *			file,
 			XkbFileAddOnFunc	addOn,
 			void *			priv)
 {
-Display *		dpy;
 register unsigned	i,tmp;
 XkbDescPtr		xkb;
 XkbClientMapPtr		map;
@@ -377,7 +365,6 @@ Bool			showActions;
     xkb= result->xkb;
     map= xkb->map;
     srv= xkb->server;
-    dpy= xkb->dpy;
     if ((!xkb)||(!map)||(!map->syms)||(!map->key_sym_map)) {
 	_XkbLibError(_XkbErrMissingSymbols,"XkbWriteXKBSymbols",0);
 	return False;
@@ -389,11 +376,11 @@ Bool			showActions;
     if ((xkb->names==NULL)||(xkb->names->symbols==None))
 	 fprintf(file,"xkb_symbols {\n\n");
     else fprintf(file,"xkb_symbols \"%s\" {\n\n",
-			XkbAtomText(dpy,xkb->names->symbols,XkbXKBFile));
+			XkbAtomText(xkb->names->symbols,XkbXKBFile));
     for (tmp=i=0;i<XkbNumKbdGroups;i++) {
 	if (xkb->names->groups[i]!=None) {
 	    fprintf(file,"    name[group%d]=\"%s\";\n",i+1,
-			XkbAtomText(dpy,xkb->names->groups[i],XkbXKBFile));
+			XkbAtomText(xkb->names->groups[i],XkbXKBFile));
 	    tmp++;
 	}
     }
@@ -429,19 +416,19 @@ Bool			showActions;
 			if (srv->explicit[i]&(1<<g)) {
 			    fprintf(file,"\n%s      type[group%d]= \"%s\",",
 			    	comment,g+1,
-				XkbAtomText(dpy,map->types[typeNdx].name,
+				XkbAtomText(map->types[typeNdx].name,
 			    	XkbXKBFile));
 			}
 			else if (showImplicit) {
 			    fprintf(file,"\n//      type[group%d]= \"%s\",",g+1,
-				XkbAtomText(dpy,map->types[typeNdx].name,
+				XkbAtomText(map->types[typeNdx].name,
 			    	XkbXKBFile));
 			}
 		    }
 		}
 		else {
 		    fprintf(file,"\n%s      type= \"%s\",",comment,
-				XkbAtomText(dpy,map->types[typeNdx].name,
+				XkbAtomText(map->types[typeNdx].name,
 			    	XkbXKBFile));
 		}
 		simple= False;
@@ -457,13 +444,13 @@ Bool			showActions;
 					(xkb->server->vmodmap[i]!=0)) {
 		if ((srv->explicit[i]&XkbExplicitVModMapMask)!=0) {
 		    fprintf(file,"\n        virtualMods= %s,",
-				XkbVModMaskText(dpy,xkb,0,
+				XkbVModMaskText(xkb,0,
 						xkb->server->vmodmap[i],
 						XkbXKBFile));
 		}
 		else if (showImplicit) {
 		    fprintf(file,"\n//      virtualMods= %s,",
-				XkbVModMaskText(dpy,xkb,0,
+				XkbVModMaskText(xkb,0,
 						xkb->server->vmodmap[i],
 						XkbXKBFile));
 		}
@@ -603,7 +590,6 @@ char *		iStr;
 
 static Bool
 WriteXKBDoodad(	FILE *		file,
-		Display *	dpy,
 		unsigned	indent,
 		XkbGeometryPtr	geom,
 		XkbDoodadPtr	doodad)
@@ -615,7 +601,7 @@ XkbColorPtr	color;
     i_str= XkbIndentText(indent);
     fprintf(file,"%s%s \"%s\" {\n",i_str,
 				XkbDoodadTypeText(doodad->any.type,XkbMessage),
-				XkbAtomText(dpy,doodad->any.name,XkbMessage));
+				XkbAtomText(doodad->any.name,XkbMessage));
     fprintf(file,"%s    top=      %s;\n",i_str,
 				 XkbGeomFPText(doodad->any.top,XkbXKBFile));
     fprintf(file,"%s    left=     %s;\n",i_str,
@@ -634,7 +620,7 @@ XkbColorPtr	color;
 	    }
 	    shape= XkbShapeDoodadShape(geom,&doodad->shape);
 	    fprintf(file,"%s    shape= \"%s\";\n",i_str,
-			    XkbAtomText(dpy,shape->name,XkbXKBFile));
+			    XkbAtomText(shape->name,XkbXKBFile));
 	    break;
 	case XkbTextDoodad:
 	    if (doodad->text.angle!=0) {
@@ -670,7 +656,7 @@ XkbColorPtr	color;
 	    fprintf(file,"%s    offColor= \"%s\";\n",i_str,
 	    		    XkbStringText(color->spec,XkbXKBFile));
 	    fprintf(file,"%s    shape= \"%s\";\n",i_str,
-			     XkbAtomText(dpy,shape->name,XkbXKBFile));
+			     XkbAtomText(shape->name,XkbXKBFile));
 	    break;
 	case XkbLogoDoodad:
 	    fprintf(file,"%s    logoName= \"%s\";\n",i_str,
@@ -685,7 +671,7 @@ XkbColorPtr	color;
 	    }
 	    shape= XkbLogoDoodadShape(geom,&doodad->logo);
 	    fprintf(file,"%s    shape= \"%s\";\n",i_str,
-			    XkbAtomText(dpy,shape->name,XkbXKBFile));
+			    XkbAtomText(shape->name,XkbXKBFile));
 	    break;
     }
     fprintf(file,"%s};\n",i_str);
@@ -695,7 +681,6 @@ XkbColorPtr	color;
 /*ARGSUSED*/
 static Bool
 WriteXKBOverlay(	FILE *		file,
-			Display *	dpy,
 			unsigned	indent,
 			XkbGeometryPtr	geom,
 			XkbOverlayPtr	ol)
@@ -708,7 +693,7 @@ XkbOverlayKeyPtr	key;
     i_str= XkbIndentText(indent);
     if (ol->name!=None) {
 	 fprintf(file,"%soverlay \"%s\" {\n",i_str,
-    					XkbAtomText(dpy,ol->name,XkbMessage));
+    					XkbAtomText(ol->name,XkbMessage));
     }
     else fprintf(file,"%soverlay {\n",i_str);
     for (nOut=r=0,row=ol->rows;r<ol->num_rows;r++,row++) {
@@ -730,7 +715,6 @@ XkbOverlayKeyPtr	key;
 
 static Bool
 WriteXKBSection(	FILE *		file,
-			Display *	dpy,
 			XkbSectionPtr 	s,
 			XkbGeometryPtr	geom)
 {
@@ -739,7 +723,7 @@ XkbRowPtr	row;
 int		dfltKeyColor = 0;
 
     fprintf(file,"    section \"%s\" {\n",
-				XkbAtomText(dpy,s->name,XkbXKBFile));
+				XkbAtomText(s->name,XkbXKBFile));
     if (s->rows&&(s->rows->num_keys>0)) {
 	dfltKeyColor= s->rows->keys[0].color_ndx;
 	fprintf(file,"        key.color= \"%s\";\n",
@@ -788,7 +772,7 @@ int		dfltKeyColor = 0;
 		shape= XkbKeyShape(geom,key);
 		fprintf(file,"{ %6s, \"%s\", %3s",
 		      XkbKeyNameText(key->name.name,XkbXKBFile),
-		      XkbAtomText(dpy,shape->name,XkbXKBFile),
+		      XkbAtomText(shape->name,XkbXKBFile),
 		      XkbGeomFPText(key->gap,XkbXKBFile));
 		if (key->color_ndx!=dfltKeyColor) {
 		    fprintf(file,", color=\"%s\"",XkbKeyColor(geom,key)->spec);
@@ -803,17 +787,17 @@ int		dfltKeyColor = 0;
     if (s->doodads!=NULL) {
 	XkbDoodadPtr	doodad;
 	for (i=0,doodad=s->doodads;i<s->num_doodads;i++,doodad++) {
-	    WriteXKBDoodad(file,dpy,8,geom,doodad);
+	    WriteXKBDoodad(file,8,geom,doodad);
 	}
     }
     if (s->overlays!=NULL) {
 	XkbOverlayPtr	ol;
 	for (i=0,ol=s->overlays;i<s->num_overlays;i++,ol++) {
-	    WriteXKBOverlay(file,dpy,8,geom,ol);
+	    WriteXKBOverlay(file,8,geom,ol);
 	}
     }
     fprintf(file,"    }; // End of \"%s\" section\n\n",
-				XkbAtomText(dpy,s->name,XkbXKBFile));
+				XkbAtomText(s->name,XkbXKBFile));
     return True;
 }
 
@@ -825,7 +809,6 @@ XkbWriteXKBGeometry(	FILE *			file,
 			XkbFileAddOnFunc	addOn,
 			void *			priv)
 {
-Display *		dpy;
 register unsigned	i,n;
 XkbDescPtr		xkb;
 XkbGeometryPtr		geom;
@@ -835,12 +818,11 @@ XkbGeometryPtr		geom;
 	_XkbLibError(_XkbErrMissingGeometry,"XkbWriteXKBGeometry",0);
  	return False;
     }
-    dpy= xkb->dpy;
     geom= xkb->geom;
     if (geom->name==None)
 	 fprintf(file,"xkb_geometry {\n\n");
     else fprintf(file,"xkb_geometry \"%s\" {\n\n",
-				XkbAtomText(dpy,geom->name,XkbXKBFile));
+				XkbAtomText(geom->name,XkbXKBFile));
     fprintf(file,"    width=       %s;\n",
 				XkbGeomFPText(geom->width_mm,XkbXKBFile));
     fprintf(file,"    height=      %s;\n\n",
@@ -889,7 +871,7 @@ XkbGeometryPtr		geom;
 	for (shape=geom->shapes,i=0;i<geom->num_shapes;i++,shape++) {
 	    lastR=0;
 	    fprintf(file,"    shape \"%s\" {",
-				   XkbAtomText(dpy,shape->name,XkbXKBFile));
+				   XkbAtomText(shape->name,XkbXKBFile));
 	    outline= shape->outlines;
 	    if (shape->num_outlines>1) {
 		for (n=0;n<shape->num_outlines;n++,outline++) {
@@ -909,13 +891,13 @@ XkbGeometryPtr		geom;
     if (geom->num_sections>0) {
 	XkbSectionPtr	section;
 	for (section=geom->sections,i=0;i<geom->num_sections;i++,section++){
-	    WriteXKBSection(file,dpy,section,geom);
+	    WriteXKBSection(file,section,geom);
 	}
     }
     if (geom->num_doodads>0) {
 	XkbDoodadPtr	doodad;
 	for (i=0,doodad=geom->doodads;i<geom->num_doodads;i++,doodad++) {
-	    WriteXKBDoodad(file,dpy,4,geom,doodad);
+	    WriteXKBDoodad(file,4,geom,doodad);
 	}
     }
     if (addOn)
diff --git a/xkb/xkbtext.c b/xkb/xkbtext.c
index 1520a9f58..d08c91589 100644
--- a/xkb/xkbtext.c
+++ b/xkb/xkbtext.c
@@ -69,11 +69,11 @@ char *rtrn;
 /***====================================================================***/
 
 char *
-XkbAtomText(Display *dpy,Atom atm,unsigned format)
+XkbAtomText(Atom atm,unsigned format)
 {
 char	*rtrn,*tmp;
 
-    tmp= XkbAtomGetString(dpy,atm);
+    tmp= XkbAtomGetString(atm);
     if (tmp!=NULL) {
 	int	len;
 	len= strlen(tmp)+1;
@@ -101,7 +101,7 @@ char	*rtrn,*tmp;
 /***====================================================================***/
 
 char *
-XkbVModIndexText(Display *dpy,XkbDescPtr xkb,unsigned ndx,unsigned format)
+XkbVModIndexText(XkbDescPtr xkb,unsigned ndx,unsigned format)
 {
 register int len;
 register Atom *vmodNames;
@@ -116,7 +116,7 @@ char  numBuf[20];
     if (ndx>=XkbNumVirtualMods)
 	 tmp= "illegal";
     else if (vmodNames&&(vmodNames[ndx]!=None))
-	 tmp= XkbAtomGetString(dpy,vmodNames[ndx]);
+	 tmp= XkbAtomGetString(vmodNames[ndx]);
     if (tmp==NULL)
 	sprintf(tmp=numBuf,"%d",ndx);
 
@@ -135,8 +135,7 @@ char  numBuf[20];
 }
 
 char *
-XkbVModMaskText(	Display *	dpy,
-			XkbDescPtr	xkb,
+XkbVModMaskText(        XkbDescPtr	xkb,
 			unsigned	modMask,
 			unsigned	mask,
 			unsigned	format)
@@ -163,7 +162,7 @@ char *str,buf[BUFFER_SIZE];
 	char *tmp;
 	for (i=0,bit=1;i<XkbNumVirtualMods;i++,bit<<=1) {
 	    if (mask&bit) {
-		tmp= XkbVModIndexText(dpy,xkb,i,format);
+		tmp= XkbVModIndexText(xkb,i,format);
 		len= strlen(tmp)+1+(str==buf?0:1);
 		if (format==XkbCFile)
 		    len+= 4;
@@ -667,13 +666,13 @@ register int len;
 
 /*ARGSUSED*/
 static Bool
-CopyNoActionArgs(Display *dpy,XkbDescPtr xkb,XkbAction *action,char *buf,int*sz)
+CopyNoActionArgs(XkbDescPtr xkb,XkbAction *action,char *buf,int*sz)
 {
     return True;
 }
 
 static Bool
-CopyModActionArgs(Display *dpy,XkbDescPtr xkb,XkbAction *action,char *buf,
+CopyModActionArgs(XkbDescPtr xkb,XkbAction *action,char *buf,
 								int* sz)
 {
 XkbModAction *	act;
@@ -686,7 +685,7 @@ unsigned	tmp;
 	  TryCopyStr(buf,"modMapMods",sz);
     else if (act->real_mods || tmp) {
 	 TryCopyStr(buf,
-		     XkbVModMaskText(dpy,xkb,act->real_mods,tmp,XkbXKBFile),
+		     XkbVModMaskText(xkb,act->real_mods,tmp,XkbXKBFile),
 		     sz);
     }
     else TryCopyStr(buf,"none",sz);
@@ -701,7 +700,7 @@ unsigned	tmp;
 
 /*ARGSUSED*/
 static Bool
-CopyGroupActionArgs(Display *dpy,XkbDescPtr xkb,XkbAction *action,char *buf,
+CopyGroupActionArgs(XkbDescPtr xkb,XkbAction *action,char *buf,
 								int *sz)
 {
 XkbGroupAction *	act;
@@ -726,7 +725,7 @@ char			tbuf[32];
 
 /*ARGSUSED*/
 static Bool
-CopyMovePtrArgs(Display *dpy,XkbDescPtr xkb,XkbAction *action,char *buf,int *sz)
+CopyMovePtrArgs(XkbDescPtr xkb,XkbAction *action,char *buf,int *sz)
 {
 XkbPtrAction *	act;
 int		x,y;
@@ -751,7 +750,7 @@ char		tbuf[32];
 
 /*ARGSUSED*/
 static Bool
-CopyPtrBtnArgs(Display *dpy,XkbDescPtr xkb,XkbAction *action,char *buf,int *sz)
+CopyPtrBtnArgs(XkbDescPtr xkb,XkbAction *action,char *buf,int *sz)
 {
 XkbPtrBtnAction *	act;
 char			tbuf[32];
@@ -785,7 +784,7 @@ char			tbuf[32];
 
 /*ARGSUSED*/
 static Bool
-CopySetPtrDfltArgs(Display *dpy,XkbDescPtr xkb,XkbAction *action,char *buf,
+CopySetPtrDfltArgs(XkbDescPtr xkb,XkbAction *action,char *buf,
 								int *sz)
 {
 XkbPtrDfltAction *	act;
@@ -803,7 +802,7 @@ char			tbuf[32];
 }
 
 static Bool
-CopyISOLockArgs(Display *dpy,XkbDescPtr xkb,XkbAction *action,char *buf,int *sz)
+CopyISOLockArgs(XkbDescPtr xkb,XkbAction *action,char *buf,int *sz)
 {
 XkbISOAction *	act;
 char		tbuf[64];
@@ -831,7 +830,7 @@ char		tbuf[64];
 		    TryCopyStr(buf,"+",sz);
 	    }
 	    if (tmp)
-		TryCopyStr(buf,XkbVModMaskText(dpy,xkb,0,tmp,XkbXKBFile),sz);
+		TryCopyStr(buf,XkbVModMaskText(xkb,0,tmp,XkbXKBFile),sz);
 	}
 	else TryCopyStr(buf,"none",sz);
     }
@@ -865,7 +864,7 @@ char		tbuf[64];
 
 /*ARGSUSED*/
 static Bool
-CopySwitchScreenArgs(Display *dpy,XkbDescPtr xkb,XkbAction *action,char *buf,
+CopySwitchScreenArgs(XkbDescPtr xkb,XkbAction *action,char *buf,
 								int *sz)
 {
 XkbSwitchScreenAction *	act;
@@ -884,7 +883,7 @@ char			tbuf[32];
 
 /*ARGSUSED*/
 static Bool
-CopySetLockControlsArgs(Display *dpy,XkbDescPtr xkb,XkbAction *action,
+CopySetLockControlsArgs(XkbDescPtr xkb,XkbAction *action,
 							char *buf,int *sz)
 {
 XkbCtrlsAction *	act;
@@ -971,7 +970,7 @@ char			tbuf[32];
 
 /*ARGSUSED*/
 static Bool
-CopyActionMessageArgs(Display *dpy,XkbDescPtr xkb,XkbAction *action,char *buf,
+CopyActionMessageArgs(XkbDescPtr xkb,XkbAction *action,char *buf,
 								int *sz)
 {
 XkbMessageAction *	act;
@@ -998,7 +997,7 @@ char			tbuf[32];
 }
 
 static Bool
-CopyRedirectKeyArgs(Display *dpy,XkbDescPtr xkb,XkbAction *action,char *buf,
+CopyRedirectKeyArgs(XkbDescPtr xkb,XkbAction *action,char *buf,
 								int *sz)
 {
 XkbRedirectKeyAction *	act;
@@ -1022,19 +1021,19 @@ unsigned		vmods,vmods_mask;
 	return True;
     if ((act->mods_mask==XkbAllModifiersMask)&&
 	(vmods_mask==XkbAllVirtualModsMask)) {
-	tmp= XkbVModMaskText(dpy,xkb,act->mods,vmods,XkbXKBFile);
+	tmp= XkbVModMaskText(xkb,act->mods,vmods,XkbXKBFile);
 	TryCopyStr(buf,",mods=",sz);
 	TryCopyStr(buf,tmp,sz);
     }
     else {
 	if ((act->mods_mask&act->mods)||(vmods_mask&vmods)) {
-	    tmp= XkbVModMaskText(dpy,xkb,act->mods_mask&act->mods,
+	    tmp= XkbVModMaskText(xkb,act->mods_mask&act->mods,
 					 vmods_mask&vmods,XkbXKBFile);
 	    TryCopyStr(buf,",mods= ",sz);
 	    TryCopyStr(buf,tmp,sz);
 	}
 	if ((act->mods_mask&(~act->mods))||(vmods_mask&(~vmods))) {
-	    tmp= XkbVModMaskText(dpy,xkb,act->mods_mask&(~act->mods),
+	    tmp= XkbVModMaskText(xkb,act->mods_mask&(~act->mods),
 					 vmods_mask&(~vmods),XkbXKBFile);
 	    TryCopyStr(buf,",clearMods= ",sz);
 	    TryCopyStr(buf,tmp,sz);
@@ -1045,7 +1044,7 @@ unsigned		vmods,vmods_mask;
 
 /*ARGSUSED*/
 static Bool
-CopyDeviceBtnArgs(Display *dpy,XkbDescPtr xkb,XkbAction *action,char *buf,
+CopyDeviceBtnArgs(XkbDescPtr xkb,XkbAction *action,char *buf,
 								int *sz)
 {
 XkbDeviceBtnAction *	act;
@@ -1078,7 +1077,7 @@ char			tbuf[32];
 
 /*ARGSUSED*/
 static Bool
-CopyOtherArgs(Display *dpy,XkbDescPtr xkb,XkbAction *action,char *buf,int *sz)
+CopyOtherArgs(XkbDescPtr xkb,XkbAction *action,char *buf,int *sz)
 {
 XkbAnyAction *	act;
 char		tbuf[32];
@@ -1096,7 +1095,6 @@ char		tbuf[32];
 }
 
 typedef	Bool	(*actionCopy)(
-	Display *	/* dpy */,
 	XkbDescPtr 	/* xkb */,
 	XkbAction *	/* action */,
 	char *		/* buf */,
@@ -1128,7 +1126,7 @@ static actionCopy	copyActionArgs[XkbSA_NumActions] = {
 #define	ACTION_SZ	256
 
 char *
-XkbActionText(Display *dpy,XkbDescPtr xkb,XkbAction *action,unsigned format)
+XkbActionText(XkbDescPtr xkb,XkbAction *action,unsigned format)
 {
 char	buf[ACTION_SZ],*tmp;
 int	sz;
@@ -1145,8 +1143,8 @@ int	sz;
 	sprintf(buf,"%s(",XkbActionTypeText(action->type,XkbXKBFile));
 	sz= ACTION_SZ-strlen(buf)+2; /* room for close paren and NULL */
 	if (action->type<(unsigned)XkbSA_NumActions)
-	     (*copyActionArgs[action->type])(dpy,xkb,action,buf,&sz);
-	else CopyOtherArgs(dpy,xkb,action,buf,&sz);
+	     (*copyActionArgs[action->type])(xkb,action,buf,&sz);
+	else CopyOtherArgs(xkb,action,buf,&sz);
 	TryCopyStr(buf,")",&sz);
     }
     tmp= tbGetBuffer(strlen(buf)+1);
diff --git a/xkb/xkmread.c b/xkb/xkmread.c
index 2bb02896b..1e5b2cb4e 100644
--- a/xkb/xkmread.c
+++ b/xkb/xkmread.c
@@ -44,7 +44,7 @@
 #include "xkbgeom.h"
 
 Atom
-XkbInternAtom(Display *dpy,char *str,Bool only_if_exists)
+XkbInternAtom(char *str,Bool only_if_exists)
 {
     if (str==NULL)
 	return None;
@@ -66,18 +66,18 @@ char *new;
 
 /***====================================================================***/
 
-static XPointer
-XkmInsureSize(XPointer oldPtr,int oldCount,int *newCountRtrn,int elemSize)
+static void *
+XkmInsureSize(void *oldPtr,int oldCount,int *newCountRtrn,int elemSize)
 {
 int	newCount= *newCountRtrn;
 
     if (oldPtr==NULL) {
 	if (newCount==0)
 	    return NULL;
-	oldPtr= (XPointer)_XkbCalloc(newCount,elemSize);
+	oldPtr= _XkbCalloc(newCount,elemSize);
     }
     else if (oldCount<newCount) {
-	oldPtr= (XPointer)_XkbRealloc(oldPtr,newCount*elemSize);
+	oldPtr= _XkbRealloc(oldPtr,newCount*elemSize);
 	if (oldPtr!=NULL) {
 	    char *tmp= (char *)oldPtr;
 	    bzero(&tmp[oldCount*elemSize],(newCount-oldCount)*elemSize);
@@ -197,7 +197,7 @@ XkbDescPtr	xkb;
 	char name[100];
 	if (named&bit) {
 	    if (nRead+=XkmGetCountedString(file,name,100)) {
-		xkb->names->vmods[i]= XkbInternAtom(xkb->dpy,name,False);
+		xkb->names->vmods[i]= XkbInternAtom(name,False);
 		if (changes)
 		    changes->names.changed_vmods|= bit;
 	    }
@@ -244,7 +244,7 @@ XkbDescPtr	xkb;
 	return -1;
     }
     if (name[0]!='\0') {
-	xkb->names->keycodes= XkbInternAtom(xkb->dpy,name,False);
+	xkb->names->keycodes= XkbInternAtom(name,False);
     }
 
     for (pN=&xkb->names->keys[minKC],i=minKC;i<=(int)maxKC;i++,pN++) {
@@ -300,7 +300,7 @@ XkbDescPtr		xkb;
 	    _XkbLibError(_XkbErrBadAlloc,"ReadXkmKeyTypes",0);
 	    return -1;
         }
-	xkb->names->types= XkbInternAtom(xkb->dpy,buf,False);
+	xkb->names->types= XkbInternAtom(buf,False);
     }
     num_types= XkmGetCARD16(file,&nRead);
     nRead+= XkmSkipPadding(file,2);
@@ -355,7 +355,7 @@ XkbDescPtr		xkb;
 	   return -1;
 	}
 	if (buf[0]!='\0') {
-	     type->name= XkbInternAtom(xkb->dpy,buf,False);
+	     type->name= XkbInternAtom(buf,False);
 	}
 	else type->name= None;
 
@@ -393,7 +393,7 @@ XkbDescPtr		xkb;
 		    nRead+= tmp;
 		    if (strlen(buf)==0)
 			 type->level_names[n]= None;
-		    else type->level_names[n]= XkbInternAtom(xkb->dpy,buf,0);
+		    else type->level_names[n]= XkbInternAtom(buf,0);
 		}
 	    }
 	}
@@ -437,7 +437,7 @@ XkbCompatMapPtr		compat;
 	    _XkbLibError(_XkbErrBadAlloc,"ReadXkmCompatMap",0);
 	    return -1;
 	}
-	xkb->names->compat= XkbInternAtom(xkb->dpy,name,False);
+	xkb->names->compat= XkbInternAtom(name,False);
     }
     num_si= XkmGetCARD16(file,&nRead);
     groups= XkmGetCARD8(file,&nRead);
@@ -523,7 +523,7 @@ XkbDescPtr		xkb;
 	}
 	nRead+= tmp;
 	if (buf[0]!='\0')
-	     name= XkbInternAtom(xkb->dpy,buf,False);
+	     name= XkbInternAtom(buf,False);
 	else name= None;
 	if ((tmp=fread(&wire,SIZEOF(xkmIndicatorMapDesc),1,file))<1) {
 	    _XkbLibError(_XkbErrBadLength,"ReadXkmIndicators",0);
@@ -600,7 +600,7 @@ XkbDescPtr		xkb;
     }
     if ((buf[0]!='\0')&&(xkb->names)) {
 	Atom name;
-	name= XkbInternAtom(xkb->dpy,buf,0);
+	name= XkbInternAtom(buf,0);
 	xkb->names->symbols= name;
 	xkb->names->phys_symbols= name;
     }
@@ -611,7 +611,7 @@ XkbDescPtr		xkb;
 	    nRead+= tmp;
 	    if ((buf[0]!='\0')&&(xkb->names)) {
 		Atom name;
-		name= XkbInternAtom(xkb->dpy,buf,0);
+		name= XkbInternAtom(buf,0);
 		xkb->names->groups[i]= name;
 	    }	
 	    else xkb->names->groups[i]= None;
@@ -654,7 +654,7 @@ XkbDescPtr		xkb;
 	    for (g=0;g<XkbNumKbdGroups;g++) {
 		if ((wireMap.flags&(1<<g))&&
 			((tmp=XkmGetCountedString(file,buf,100))>0)) {
-		    typeName[g]= XkbInternAtom(xkb->dpy,buf,1);
+		    typeName[g]= XkbInternAtom(buf,1);
 		    nRead+= tmp;
 		}
 		type[g]=FindTypeForKey(xkb,typeName[g],wireMap.width,NULL);
@@ -732,7 +732,6 @@ XkbDescPtr		xkb;
 static int
 ReadXkmGeomDoodad(
     FILE *		file,
-    Display *		dpy,
     XkbGeometryPtr	geom,
     XkbSectionPtr	section)
 {
@@ -745,7 +744,7 @@ int		nRead=0;
     nRead+= XkmGetCountedString(file,buf,100);
     tmp= fread(&doodadWire,SIZEOF(xkmDoodadDesc),1,file);
     nRead+= SIZEOF(xkmDoodadDesc)*tmp;
-    doodad= XkbAddGeomDoodad(geom,section,XkbInternAtom(dpy,buf,False));
+    doodad= XkbAddGeomDoodad(geom,section,XkbInternAtom(buf,False));
     if (!doodad)
 	return nRead;
     doodad->any.type= doodadWire.any.type;
@@ -790,7 +789,6 @@ int		nRead=0;
 
 static int
 ReadXkmGeomOverlay(	FILE *		file,
-			Display *	dpy,
 			XkbGeometryPtr	geom,
 			XkbSectionPtr	section)
 {
@@ -806,7 +804,7 @@ register int		r;
     nRead+= XkmGetCountedString(file,buf,100);
     tmp= fread(&olWire,SIZEOF(xkmOverlayDesc),1,file);
     nRead+= tmp*SIZEOF(xkmOverlayDesc);
-    ol= XkbAddGeomOverlay(section,XkbInternAtom(dpy,buf,False),
+    ol= XkbAddGeomOverlay(section,XkbInternAtom(buf,False),
     							olWire.num_rows);
     if (!ol)
 	return nRead;
@@ -833,7 +831,6 @@ register int		r;
 
 static int
 ReadXkmGeomSection(	FILE *		file,
-			Display *	dpy,
 			XkbGeometryPtr	geom)
 {
 register int	i;
@@ -845,7 +842,7 @@ char		buf[100];
 Atom		nameAtom;
 
     nRead+= XkmGetCountedString(file,buf,100);
-    nameAtom= XkbInternAtom(dpy,buf,False);
+    nameAtom= XkbInternAtom(buf,False);
     tmp= fread(&sectionWire,SIZEOF(xkmSectionDesc),1,file);
     nRead+= SIZEOF(xkmSectionDesc)*tmp;
     section= XkbAddGeomSection(geom,nameAtom,sectionWire.num_rows,
@@ -896,7 +893,7 @@ Atom		nameAtom;
     }
     if (sectionWire.num_doodads>0) {
 	for (i=0;i<sectionWire.num_doodads;i++) {
-	    tmp= ReadXkmGeomDoodad(file,dpy,geom,section);
+	    tmp= ReadXkmGeomDoodad(file,geom,section);
 	    nRead+= tmp;
 	    if (tmp<1)
 		return nRead;
@@ -904,7 +901,7 @@ Atom		nameAtom;
     }
     if (sectionWire.num_overlays>0) {
 	for (i=0;i<sectionWire.num_overlays;i++) {
-	    tmp= ReadXkmGeomOverlay(file,dpy,geom,section);
+	    tmp= ReadXkmGeomOverlay(file,geom,section);
 	    nRead+= tmp;
 	    if (tmp<1)
 		return nRead;
@@ -939,7 +936,7 @@ XkbGeometrySizesRec	sizes;
 	return nRead;
     }
     geom= result->xkb->geom;
-    geom->name= XkbInternAtom(result->xkb->dpy,buf,False);
+    geom->name= XkbInternAtom(buf,False);
     geom->width_mm= wireGeom.width_mm;
     geom->height_mm= wireGeom.height_mm;
     nRead+= XkmGetCountedString(file,buf,100);
@@ -975,7 +972,7 @@ XkbGeometrySizesRec	sizes;
 	    XkbOutlinePtr	ol;
 	    xkmOutlineDesc	olWire;
 	    nRead+= XkmGetCountedString(file,buf,100);
-	    nameAtom= XkbInternAtom(result->xkb->dpy,buf,False);
+	    nameAtom= XkbInternAtom(buf,False);
 	    tmp= fread(&shapeWire,SIZEOF(xkmShapeDesc),1,file);
 	    nRead+= tmp*SIZEOF(xkmShapeDesc);
 	    shape= XkbAddGeomShape(geom,nameAtom,shapeWire.num_outlines);
@@ -1014,7 +1011,7 @@ XkbGeometrySizesRec	sizes;
     }
     if (wireGeom.num_sections>0) {
 	for (i=0;i<wireGeom.num_sections;i++) {
-	    tmp= ReadXkmGeomSection(file,result->xkb->dpy,geom);
+	    tmp= ReadXkmGeomSection(file,geom);
 	    nRead+= tmp;
 	    if (tmp==0)
 		return nRead;
@@ -1022,7 +1019,7 @@ XkbGeometrySizesRec	sizes;
     }
     if (wireGeom.num_doodads>0) {
 	for (i=0;i<wireGeom.num_doodads;i++) {
-	    tmp= ReadXkmGeomDoodad(file,result->xkb->dpy,geom,NULL);
+	    tmp= ReadXkmGeomDoodad(file,geom,NULL);
 	    nRead+= tmp;
 	    if (tmp==0)
 		return nRead;

From ab79110a84b2d299ecae0605fa535edbebd99565 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Sun, 3 Feb 2008 23:48:57 +1100
Subject: [PATCH 513/552] XKB: Remove support for pre-built keymaps

Don't load prebuilt keymaps anymore.
---
 include/xkbsrv.h |  7 ----
 xkb/ddxLoad.c    | 83 +-----------------------------------------------
 xkb/maprules.c   |  4 +--
 xkb/xkb.c        | 31 ++++++++----------
 xkb/xkbInit.c    | 21 ++----------
 5 files changed, 18 insertions(+), 128 deletions(-)

diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index a71150462..60b0eb7e5 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -1022,13 +1022,6 @@ extern	Bool XkbDDXApplyConfig(
 	XkbSrvInfoPtr	/* xkbi */
 );
 
-extern void *XkbDDXPreloadConfig(
-	char **			/* rulesFileRtrn */,
-	XkbRF_VarDefsPtr	/* defs */,
-	XkbComponentNamesPtr	/* names */,
-	DeviceIntPtr		/* dev */
-);
-
 extern	int _XkbStrCaseCmp(
 	char *			/* str1 */,
 	char *			/* str2 */
diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
index 60a8d443a..760119dc9 100644
--- a/xkb/ddxLoad.c
+++ b/xkb/ddxLoad.c
@@ -178,74 +178,6 @@ OutputDirectory(
     }
 }
 
-static Bool
-XkbDDXCompileNamedKeymap(	XkbDescPtr		xkb,
-				XkbComponentNamesPtr	names,
-				char *			nameRtrn,
-				int			nameRtrnLen)
-{
-char 	*cmd = NULL,file[PATH_MAX],xkm_output_dir[PATH_MAX],*map,*outFile;
-
-    if (names->keymap==NULL)
-	return False;
-    strncpy(file,names->keymap,PATH_MAX); file[PATH_MAX-1]= '\0';
-    if ((map= strrchr(file,'('))!=NULL) {
-	char *tmp;
-	if ((tmp= strrchr(map,')'))!=NULL) {
-	    *map++= '\0';
-	    *tmp= '\0';
-	}
-	else {
-	    map= NULL;
-	}
-    }
-    if ((outFile= strrchr(file,'/'))!=NULL)
-	 outFile= _XkbDupString(&outFile[1]);
-    else outFile= _XkbDupString(file);
-    XkbEnsureSafeMapName(outFile);
-    OutputDirectory(xkm_output_dir, sizeof(xkm_output_dir));
-
-    if (XkbBaseDirectory!=NULL) {
-        char *xkbbasedir = XkbBaseDirectory;
-        char *xkbbindir = XkbBinDirectory;
-
-	cmd = Xprintf("\"%s" PATHSEPARATOR "xkbcomp\" -w %d \"-R%s\" -xkm %s%s -em1 %s -emp %s -eml %s keymap/%s \"%s%s.xkm\"",
-		xkbbindir,
-		((xkbDebugFlags<2)?1:((xkbDebugFlags>10)?10:(int)xkbDebugFlags)),
-		xkbbasedir,(map?"-m ":""),(map?map:""),
-		PRE_ERROR_MSG,ERROR_PREFIX,POST_ERROR_MSG1,file,
-		xkm_output_dir,outFile);
-    }
-    else {
-	cmd = Xprintf("xkbcomp -w %d -xkm %s%s -em1 %s -emp %s -eml %s keymap/%s \"%s%s.xkm\"",
-		((xkbDebugFlags<2)?1:((xkbDebugFlags>10)?10:(int)xkbDebugFlags)),
-		(map?"-m ":""),(map?map:""),
-		PRE_ERROR_MSG,ERROR_PREFIX,POST_ERROR_MSG1,file,
-		xkm_output_dir,outFile);
-    }
-    if (xkbDebugFlags) {
-	DebugF("XkbDDXCompileNamedKeymap compiling keymap using:\n");
-	DebugF("    \"cmd\"\n");
-    }
-    if (System(cmd)==0) {
-	if (nameRtrn) {
-	    strncpy(nameRtrn,outFile,nameRtrnLen);
-	    nameRtrn[nameRtrnLen-1]= '\0';
-	}
-	if (outFile!=NULL)
-	    _XkbFree(outFile);
-        if (cmd!=NULL)
-            xfree(cmd);
-	return True;
-    } 
-    DebugF("Error compiling keymap (%s)\n",names->keymap);
-    if (outFile!=NULL)
-	_XkbFree(outFile);
-    if (cmd!=NULL)
-        xfree(cmd);
-    return False;
-}
-
 static Bool    	
 XkbDDXCompileKeymapByNames(	XkbDescPtr		xkb,
 				XkbComponentNamesPtr	names,
@@ -418,20 +350,7 @@ unsigned	missing;
     if ((names->keycodes==NULL)&&(names->types==NULL)&&
 	(names->compat==NULL)&&(names->symbols==NULL)&&
 	(names->geometry==NULL)) {
-	if (names->keymap==NULL) {
-	    bzero(finfoRtrn,sizeof(XkbFileInfo));
-	    if (xkb && XkbDetermineFileType(finfoRtrn,XkbXKMFile,NULL) &&
-	   				((finfoRtrn->defined&need)==need) ) {
-		finfoRtrn->xkb= xkb;
-		nameRtrn[0]= '\0';
-		return finfoRtrn->defined;
-	    }
-	    return 0;
-	}
-	else if (!XkbDDXCompileNamedKeymap(xkb,names,nameRtrn,nameRtrnLen)) {
-	    DebugF("Couldn't compile keymap file\n");
-	    return 0;
-	}
+        return 0;
     }
     else if (!XkbDDXCompileKeymapByNames(xkb,names,want,need,
 						nameRtrn,nameRtrnLen)){
diff --git a/xkb/maprules.c b/xkb/maprules.c
index 72e642fbe..4c947f004 100644
--- a/xkb/maprules.c
+++ b/xkb/maprules.c
@@ -459,7 +459,7 @@ Bool 		append = False;
     rule->types= _XkbDupString(tmp.name[TYPES]);
     rule->compat= _XkbDupString(tmp.name[COMPAT]);
     rule->geometry= _XkbDupString(tmp.name[GEOMETRY]);
-    rule->keymap= _XkbDupString(tmp.name[KEYMAP]);
+    rule->keymap= NULL;
 
     rule->layout_num = rule->variant_num = 0;
     for (i = 0; i < nread; i++) {
@@ -589,7 +589,6 @@ XkbRF_ApplyRule(	XkbRF_RulePtr 		rule,
     Apply(rule->types,    &names->types);
     Apply(rule->compat,   &names->compat);
     Apply(rule->geometry, &names->geometry);
-    Apply(rule->keymap,   &names->keymap);
 }
 
 static Bool
@@ -1279,7 +1278,6 @@ XkbRF_GroupPtr	group;
 	    if (rule->types)	_XkbFree(rule->types);
 	    if (rule->compat)	_XkbFree(rule->compat);
 	    if (rule->geometry)	_XkbFree(rule->geometry);
-	    if (rule->keymap)	_XkbFree(rule->keymap);
 	    bzero((char *)rule,sizeof(XkbRF_RuleRec));
 	}
 	_XkbFree(rules->rules);
diff --git a/xkb/xkb.c b/xkb/xkb.c
index bd9a87cf5..ea5189f2c 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -5157,25 +5157,20 @@ ProcXkbGetKbdByName(ClientPtr client)
     if (stuff->load)
 	 fwant= XkbGBN_AllComponentsMask;
     else fwant= stuff->want|stuff->need;
-    if (!names.keymap) {
-	if ((!names.compat)&&
-    		(fwant&(XkbGBN_CompatMapMask|XkbGBN_IndicatorMapMask))) {
-	    names.compat= _XkbDupString("%");
-	}
-	if ((!names.types)&&(fwant&(XkbGBN_TypesMask))) {
-	    names.types= _XkbDupString("%");
-	}
-	if ((!names.symbols)&&(fwant&XkbGBN_SymbolsMask)) {
-	    names.symbols= _XkbDupString("%");
-	}
-	geom_changed= ((names.geometry!=NULL)&&(strcmp(names.geometry,"%")!=0));
-	if ((!names.geometry)&&(fwant&XkbGBN_GeometryMask)) {
-	    names.geometry= _XkbDupString("%");
-	    geom_changed= False;
-	}
+    if ((!names.compat)&&
+        (fwant&(XkbGBN_CompatMapMask|XkbGBN_IndicatorMapMask))) {
+        names.compat= _XkbDupString("%");
     }
-    else {
-	geom_changed= True;
+    if ((!names.types)&&(fwant&(XkbGBN_TypesMask))) {
+        names.types= _XkbDupString("%");
+    }
+    if ((!names.symbols)&&(fwant&XkbGBN_SymbolsMask)) {
+        names.symbols= _XkbDupString("%");
+    }
+    geom_changed= ((names.geometry!=NULL)&&(strcmp(names.geometry,"%")!=0));
+    if ((!names.geometry)&&(fwant&XkbGBN_GeometryMask)) {
+        names.geometry= _XkbDupString("%");
+        geom_changed= False;
     }
 
     bzero(mapFile,PATH_MAX);
diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
index 2ac51f26c..73dd32e35 100644
--- a/xkb/xkbInit.c
+++ b/xkb/xkbInit.c
@@ -591,7 +591,7 @@ XkbRF_VarDefsRec	defs;
      * generation. Eventually they will be freed at the end of this
      * function.
      */
-    if (names->keymap) names->keymap = _XkbDupString(names->keymap);
+    names->keymap = NULL;
     if (names->keycodes) names->keycodes = _XkbDupString(names->keycodes);
     if (names->types) names->types = _XkbDupString(names->types);
     if (names->compat) names->compat = _XkbDupString(names->compat);
@@ -602,11 +602,6 @@ XkbRF_VarDefsRec	defs;
 	XkbComponentNamesRec	rNames;
 	bzero(&rNames,sizeof(XkbComponentNamesRec));
 	if (XkbDDXNamesFromRules(dev,rules,&defs,&rNames)) {
-	    if (rNames.keymap) {
-		if (!names->keymap)
-		    names->keymap = rNames.keymap;
-		else _XkbFree(rNames.keymap);
-	    }
 	    if (rNames.keycodes) {
 		if (!names->keycodes)
 		    names->keycodes =  rNames.keycodes;
@@ -637,16 +632,8 @@ XkbRF_VarDefsRec	defs;
 	}
     }
 
-    if (names->keymap) {
-        XkbComponentNamesRec	tmpNames;
-	bzero(&tmpNames,sizeof(XkbComponentNamesRec));
-	tmpNames.keymap = names->keymap;
-        ok = (Bool) XkbDDXLoadKeymapByNames(dev,&tmpNames,XkmAllIndicesMask,0,
-					    &finfo,name,PATH_MAX);
-    }
-    if (!(ok && (finfo.xkb!=NULL)))
-        ok = (Bool) XkbDDXLoadKeymapByNames(dev,names,XkmAllIndicesMask,0,
-					    &finfo,name,PATH_MAX);
+    ok = (Bool) XkbDDXLoadKeymapByNames(dev,names,XkmAllIndicesMask,0,
+                                        &finfo,name,PATH_MAX);
 
     if (ok && (finfo.xkb!=NULL)) {
 	XkbDescPtr	xkb;
@@ -694,8 +681,6 @@ XkbRF_VarDefsRec	defs;
 	pSyms->map= NULL;
     }
 
-    if (names->keymap) _XkbFree(names->keymap);
-    names->keymap = NULL;
     if (names->keycodes) _XkbFree(names->keycodes);
     names->keycodes = NULL;
     if (names->types) _XkbFree(names->types);

From 2d256f098ae05033ad76672d5ebdb9dfa7e6b995 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Sat, 16 Feb 2008 19:57:37 +0200
Subject: [PATCH 514/552] XKB: Always set size correctly in XkbCopyKeymap's
 geometry routines

We were forgetting to set the sizes for sections and rows and a couple of
other misc bits in XkbCopyKeymap's geometry.  Sort that out, and add a
couple of clarifying comments along the way.
---
 xkb/xkbUtils.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
index 28d66b38b..b3132701d 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -1506,10 +1506,12 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
         /* properties */
         if (src->geom->num_properties) {
             if (src->geom->num_properties != dst->geom->sz_properties) {
+                /* If we've got more properties in the destination than
+                 * the source, run through and free all the excess ones
+                 * first. */
                 if (src->geom->num_properties < dst->geom->sz_properties) {
                     for (i = src->geom->num_properties,
-                          dprop = dst->geom->properties +
-                                  src->geom->num_properties;
+                         dprop = dst->geom->properties + i;
                          i < dst->geom->num_properties;
                          i++, dprop++) {
                         xfree(dprop->name);
@@ -1529,6 +1531,8 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
                 dst->geom->properties = tmp;
             }
 
+            /* We don't set num_properties as we need it to try and avoid
+             * too much reallocing. */
             dst->geom->sz_properties = src->geom->num_properties;
 
             if (dst->geom->sz_properties > dst->geom->num_properties) {
@@ -1564,6 +1568,7 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
                 }
             }
 
+            /* ... which is already src->geom->num_properties. */
             dst->geom->num_properties = dst->geom->sz_properties;
         }
         else {
@@ -1587,8 +1592,7 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
             if (src->geom->num_colors != dst->geom->sz_colors) {
                 if (src->geom->num_colors < dst->geom->sz_colors) {
                     for (i = src->geom->num_colors,
-                          dcolor = dst->geom->colors +
-                                   src->geom->num_colors;
+                         dcolor = dst->geom->colors + i;
                          i < dst->geom->num_colors;
                          i++, dcolor++) {
                         xfree(dcolor->spec);
@@ -1706,7 +1710,7 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
                         }
 
                         doutline->num_points = soutline->num_points;
-                        doutline->sz_points = soutline->sz_points;
+                        doutline->sz_points = soutline->num_points;
                     }
                 }
 
@@ -1785,6 +1789,7 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
             memset(tmp, 0, src->geom->num_sections * sizeof(XkbSectionRec));
             dst->geom->sections = tmp;
             dst->geom->num_sections = src->geom->num_sections;
+            dst->geom->sz_sections = src->geom->num_sections;
 
             for (i = 0,
                   ssection = src->geom->sections,
@@ -1798,6 +1803,8 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
                     dsection->rows = tmp;
                 }
                 dsection->num_rows = ssection->num_rows;
+                dsection->sz_rows = ssection->num_rows;
+
                 for (j = 0, srow = ssection->rows, drow = dsection->rows;
                      j < ssection->num_rows;
                      j++, srow++, drow++) {

From e5f002eddef1abe324033a3155f01d048536a48d Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Sat, 16 Feb 2008 20:00:47 +0200
Subject: [PATCH 515/552] XkbProcessOtherEvent: Don't depend on now-removed
 header

We don't do XKBsrv.h anymore.
---
 xkb/xkbPrOtherEv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xkb/xkbPrOtherEv.c b/xkb/xkbPrOtherEv.c
index d65107cdc..8017903be 100644
--- a/xkb/xkbPrOtherEv.c
+++ b/xkb/xkbPrOtherEv.c
@@ -36,7 +36,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/keysym.h>
 #include "misc.h"
 #include "inputstr.h"
-#include <X11/extensions/XKBsrv.h>
+#include "xkbsrv.h"
 
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>

From fbd776894658e7afb2c55dc8582b2a3efab78a3c Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Sat, 16 Feb 2008 20:01:18 +0200
Subject: [PATCH 516/552] XKB: Ditch XkbFileInfo

Sorry about the megacommit, but this touches on a lot of stuff.

Get rid of XkbFileInfo, which was pretty seriously redundant, and move the
only useful thing it had (defined) into XkbDescRec.  defined will be removed
pretty soon anyway.  Is the compat map pointer non-NULL? Then you have a
compat map, congratulations! Anyhow, I digress.

All functions that took an XkbFileInfoPtr now take an XkbDescPtr, _except_
XkmReadFile, which returns an XkbDescPtr *, because people want to deal in
XkbDescPtrs, not XkbDescRecs.
---
 include/xkbfile.h |  45 +++++--------
 include/xkbsrv.h  |   2 +-
 include/xkbstr.h  |   1 +
 xkb/ddxLoad.c     |  14 ++--
 xkb/xkb.c         |  89 +++++++++++++------------
 xkb/xkbActions.c  |   4 +-
 xkb/xkbInit.c     | 157 +++++++++++++++++---------------------------
 xkb/xkbfmisc.c    |  98 ++--------------------------
 xkb/xkbout.c      |  46 +++++--------
 xkb/xkmread.c     | 161 ++++++----------------------------------------
 10 files changed, 175 insertions(+), 442 deletions(-)

diff --git a/include/xkbfile.h b/include/xkbfile.h
index e90d7668e..0a6cb18b9 100644
--- a/include/xkbfile.h
+++ b/include/xkbfile.h
@@ -37,15 +37,9 @@
 #define	XkbMapDefined		(1<<0)
 #define	XkbStateDefined		(1<<1)
 
-typedef struct _XkbFileInfo {
-    unsigned		type;
-    unsigned		defined;
-    XkbDescPtr	 	xkb;
-} XkbFileInfo,*XkbFileInfoPtr;
-
 typedef void	(*XkbFileAddOnFunc)(
     FILE *		/* file */,
-    XkbFileInfo *	/* result */,
+    XkbDescPtr  	/* result */,
     Bool		/* topLevel */,
     Bool		/* showImplicit */,
     int			/* fileSection */,
@@ -277,12 +271,6 @@ extern	unsigned	XkbConvertXkbComponents(
     unsigned 		/* orig */
 );
 
-extern	Bool	XkbDetermineFileType(
-    XkbFileInfo *	/* xkb */,
-    int			/* format */,
-    int *		/* opts_missing */
-);
-
 extern	Bool	XkbNameMatchesPattern(
     char *		/* name */,
     char *		/* pattern */
@@ -292,7 +280,7 @@ extern	Bool	XkbNameMatchesPattern(
 
 extern	Bool	XkbWriteXKBKeycodes(
     FILE *		/* file */,
-    XkbFileInfo *	/* result */,
+    XkbDescPtr          /* result */,
     Bool		/* topLevel */,
     Bool		/* showImplicit */,
     XkbFileAddOnFunc	/* addOn */,
@@ -301,7 +289,7 @@ extern	Bool	XkbWriteXKBKeycodes(
 
 extern	Bool	XkbWriteXKBKeyTypes(
     FILE *		/* file */,
-    XkbFileInfo *	/* result */,
+    XkbDescPtr  	/* result */,
     Bool		/* topLevel */,
     Bool		/* showImplicit */,
     XkbFileAddOnFunc	/* addOn */,
@@ -310,7 +298,7 @@ extern	Bool	XkbWriteXKBKeyTypes(
 
 extern	Bool	XkbWriteXKBCompatMap(
     FILE *		/* file */,
-    XkbFileInfo *	/* result */,
+    XkbDescPtr	/* result */,
     Bool		/* topLevel */,
     Bool		/* showImplicit */,
     XkbFileAddOnFunc	/* addOn */,
@@ -319,7 +307,7 @@ extern	Bool	XkbWriteXKBCompatMap(
 
 extern	Bool	XkbWriteXKBSymbols(
     FILE *		/* file */,
-    XkbFileInfo *	/* result */,
+    XkbDescPtr	/* result */,
     Bool		/* topLevel */,
     Bool		/* showImplicit */,
     XkbFileAddOnFunc	/* addOn */,
@@ -328,7 +316,7 @@ extern	Bool	XkbWriteXKBSymbols(
 
 extern	Bool	XkbWriteXKBGeometry(
     FILE *		/* file */,
-    XkbFileInfo *	/* result */,
+    XkbDescPtr	/* result */,
     Bool		/* topLevel */,
     Bool		/* showImplicit */,
     XkbFileAddOnFunc	/* addOn */,
@@ -337,7 +325,7 @@ extern	Bool	XkbWriteXKBGeometry(
 
 extern	Bool	XkbWriteXKBSemantics(
     FILE *		/* file */,
-    XkbFileInfo *	/* result */,
+    XkbDescPtr	/* result */,
     Bool		/* topLevel */,
     Bool		/* showImplicit */,
     XkbFileAddOnFunc	/* addOn */,
@@ -346,7 +334,7 @@ extern	Bool	XkbWriteXKBSemantics(
 
 extern	Bool	XkbWriteXKBLayout(
     FILE *		/* file */,
-    XkbFileInfo *	/* result */,
+    XkbDescPtr	/* result */,
     Bool		/* topLevel */,
     Bool		/* showImplicit */,
     XkbFileAddOnFunc	/* addOn */,
@@ -355,7 +343,7 @@ extern	Bool	XkbWriteXKBLayout(
 
 extern	Bool	XkbWriteXKBKeymap(
     FILE *		/* file */,
-    XkbFileInfo *	/* result */,
+    XkbDescPtr	/* result */,
     Bool		/* topLevel */,
     Bool		/* showImplicit */,
     XkbFileAddOnFunc	/* addOn */,
@@ -364,7 +352,7 @@ extern	Bool	XkbWriteXKBKeymap(
 
 extern	Bool	XkbWriteXKBFile(
     FILE *		/* file */,
-    XkbFileInfo *	/* result */,
+    XkbDescPtr	/* result */,
     Bool		/* showImplicit */,
     XkbFileAddOnFunc	/* addOn */,
     void *		/* priv */
@@ -373,16 +361,16 @@ extern	Bool	XkbWriteXKBFile(
 extern	Bool	XkbWriteCFile(
     FILE *		/* file */,
     char *		/* name */,
-    XkbFileInfo *	/* info */
+    XkbDescPtr	/* info */
 );
 
 extern	Bool	XkbWriteXKMFile(
     FILE *		/* file */,
-    XkbFileInfo *	/* result */
+    XkbDescPtr	/* result */
 );
 
 extern	Bool	XkbWriteToServer(
-    XkbFileInfo *	/* result */
+    XkbDescPtr	/* result */
 );
 
 extern	void	XkbEnsureSafeMapName(
@@ -398,8 +386,7 @@ extern	Bool	XkbWriteXKBKeymapForNames(
 );
 
 extern	Status	XkbMergeFile(
-    XkbDescPtr			/* xkb */,
-    XkbFileInfo			/* finfo */
+    XkbDescPtr			/* xkb */
 );
 
 /***====================================================================***/
@@ -412,7 +399,7 @@ extern unsigned	XkmReadFile(
     FILE *		/* file */,
     unsigned		/* need */,
     unsigned		/* want */,
-    XkbFileInfo *	/* result */
+    XkbDescPtr	        * /* result */
 );
 
 #ifdef _XKMFORMAT_H_
@@ -433,7 +420,7 @@ extern xkmSectionInfo *XkmFindTOCEntry(
 extern Bool	XkmReadFileSection(
     FILE *              /* file */,
     xkmSectionInfo *    /* toc */,
-    XkbFileInfo *       /* result */,
+    XkbDescPtr       /* result */,
     unsigned *          /* loaded_rtrn */
 );
 
diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index 60b0eb7e5..ef99e94e7 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -1005,7 +1005,7 @@ extern	unsigned int XkbDDXLoadKeymapByNames(
 	XkbComponentNamesPtr	/* names */,
 	unsigned int		/* want */,
 	unsigned int		/* need */,
-	XkbFileInfoPtr		/* finfoRtrn */,
+	XkbDescPtr *		/* finfoRtrn */,
 	char *			/* keymapNameRtrn */,
 	int 			/* keymapNameRtrnLen */
 );
diff --git a/include/xkbstr.h b/include/xkbstr.h
index f390c611c..214a5543c 100644
--- a/include/xkbstr.h
+++ b/include/xkbstr.h
@@ -418,6 +418,7 @@ typedef	struct _XkbGeometry	*XkbGeometryPtr;
 	 * Tie it all together into one big keyboard description
 	 */
 typedef	struct _XkbDesc {
+        unsigned int            defined;
 	unsigned short	 	flags;
 	unsigned short		device_spec;
 	KeyCode			min_key_code;
diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
index 760119dc9..d80ce62b8 100644
--- a/xkb/ddxLoad.c
+++ b/xkb/ddxLoad.c
@@ -334,16 +334,16 @@ XkbDDXLoadKeymapByNames(	DeviceIntPtr		keybd,
 				XkbComponentNamesPtr	names,
 				unsigned		want,
 				unsigned		need,
-				XkbFileInfo *		finfoRtrn,
+				XkbDescPtr *		xkbRtrn,
 				char *			nameRtrn,
 				int 			nameRtrnLen)
 {
-XkbDescPtr	xkb;
+XkbDescPtr      xkb;
 FILE	*	file;
 char		fileName[PATH_MAX];
 unsigned	missing;
 
-    bzero(finfoRtrn,sizeof(XkbFileInfo));
+    *xkbRtrn = NULL;
     if ((keybd==NULL)||(keybd->key==NULL)||(keybd->key->xkbInfo==NULL))
 	 xkb= NULL;
     else xkb= keybd->key->xkbInfo->desc;
@@ -353,7 +353,7 @@ unsigned	missing;
         return 0;
     }
     else if (!XkbDDXCompileKeymapByNames(xkb,names,want,need,
-						nameRtrn,nameRtrnLen)){
+                                         nameRtrn,nameRtrnLen)){
 	DebugF("Couldn't compile keymap file\n");
 	return 0;
     }
@@ -362,15 +362,15 @@ unsigned	missing;
 	LogMessage(X_ERROR, "Couldn't open compiled keymap file %s\n",fileName);
 	return 0;
     }
-    missing= XkmReadFile(file,need,want,finfoRtrn);
-    if (finfoRtrn->xkb==NULL) {
+    missing= XkmReadFile(file,need,want,xkbRtrn);
+    if (*xkbRtrn==NULL) {
 	LogMessage(X_ERROR, "Error loading keymap %s\n",fileName);
 	fclose(file);
 	(void) unlink (fileName);
 	return 0;
     }
     else if (xkbDebugFlags) {
-	DebugF("Loaded XKB keymap %s, defined=0x%x\n",fileName,finfoRtrn->defined);
+	DebugF("Loaded XKB keymap %s, defined=0x%x\n",fileName,(*xkbRtrn)->defined);
     }
     fclose(file);
     (void) unlink (fileName);
diff --git a/xkb/xkb.c b/xkb/xkb.c
index ea5189f2c..b0d2f0d3d 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -5109,7 +5109,6 @@ ProcXkbGetKbdByName(ClientPtr client)
 {
     DeviceIntPtr 		dev;
     DeviceIntPtr                tmpd;
-    XkbFileInfo			finfo;
     xkbGetKbdByNameReply 	rep;
     xkbGetMapReply		mrep;
     xkbGetCompatMapReply	crep;
@@ -5117,7 +5116,7 @@ ProcXkbGetKbdByName(ClientPtr client)
     xkbGetNamesReply		nrep;
     xkbGetGeometryReply		grep;
     XkbComponentNamesRec	names;
-    XkbDescPtr			xkb;
+    XkbDescPtr			xkb, new;
     unsigned char *		str;
     char 			mapFile[PATH_MAX];
     unsigned			len;
@@ -5194,35 +5193,35 @@ ProcXkbGetKbdByName(ClientPtr client)
     }
 
     /* We pass dev in here so we can get the old names out if needed. */
-    rep.found = XkbDDXLoadKeymapByNames(dev,&names,fwant,fneed,&finfo,
+    rep.found = XkbDDXLoadKeymapByNames(dev,&names,fwant,fneed,&new,
                                         mapFile,PATH_MAX);
     rep.newKeyboard= False;
     rep.pad1= rep.pad2= rep.pad3= rep.pad4= 0;
 
     stuff->want|= stuff->need;
-    if (finfo.xkb==NULL)
+    if (new==NULL)
 	rep.reported= 0;
     else {
 	if (stuff->load)
 	    rep.loaded= True;
 	if (stuff->load || 
-		((rep.reported&XkbGBN_SymbolsMask) && (finfo.xkb->compat))) {
+		((rep.reported&XkbGBN_SymbolsMask) && (new->compat))) {
 	    XkbChangesRec changes;
 	    bzero(&changes,sizeof(changes));
-	    XkbUpdateDescActions(finfo.xkb,
-			finfo.xkb->min_key_code,XkbNumKeys(finfo.xkb),
+	    XkbUpdateDescActions(new,
+			new->min_key_code,XkbNumKeys(new),
 			&changes);
 	}
 
-	if (finfo.xkb->map==NULL)
+	if (new->map==NULL)
 	    rep.reported&= ~(XkbGBN_SymbolsMask|XkbGBN_TypesMask);
 	else if (rep.reported&(XkbGBN_SymbolsMask|XkbGBN_TypesMask)) {
 	    mrep.type= X_Reply;
 	    mrep.deviceID = dev->id;
 	    mrep.sequenceNumber= client->sequence;
 	    mrep.length = ((SIZEOF(xkbGetMapReply)-SIZEOF(xGenericReply))>>2);
-	    mrep.minKeyCode = finfo.xkb->min_key_code;
-	    mrep.maxKeyCode = finfo.xkb->max_key_code;
+	    mrep.minKeyCode = new->min_key_code;
+	    mrep.maxKeyCode = new->max_key_code;
 	    mrep.present = 0;
 	    mrep.totalSyms = mrep.totalActs =
 		mrep.totalKeyBehaviors= mrep.totalKeyExplicit= 
@@ -5230,7 +5229,7 @@ ProcXkbGetKbdByName(ClientPtr client)
 	    if (rep.reported&(XkbGBN_TypesMask|XkbGBN_ClientSymbolsMask)) {
 		mrep.present|= XkbKeyTypesMask;
 		mrep.firstType = 0;
-		mrep.nTypes = mrep.totalTypes= finfo.xkb->map->num_types;
+		mrep.nTypes = mrep.totalTypes= new->map->num_types;
 	    }
 	    else {
 		mrep.firstType = mrep.nTypes= 0;
@@ -5238,8 +5237,8 @@ ProcXkbGetKbdByName(ClientPtr client)
 	    }
 	    if (rep.reported&XkbGBN_ClientSymbolsMask) {
 		mrep.present|= (XkbKeySymsMask|XkbModifierMapMask);
-		mrep.firstKeySym = mrep.firstModMapKey= finfo.xkb->min_key_code;
-		mrep.nKeySyms = mrep.nModMapKeys= XkbNumKeys(finfo.xkb);
+		mrep.firstKeySym = mrep.firstModMapKey= new->min_key_code;
+		mrep.nKeySyms = mrep.nModMapKeys= XkbNumKeys(new);
 	    }
 	    else {
 		mrep.firstKeySym= mrep.firstModMapKey= 0;
@@ -5249,9 +5248,9 @@ ProcXkbGetKbdByName(ClientPtr client)
 		mrep.present|= XkbAllServerInfoMask;
 		mrep.virtualMods= ~0;
 		mrep.firstKeyAct = mrep.firstKeyBehavior = 
-			mrep.firstKeyExplicit = finfo.xkb->min_key_code;
+			mrep.firstKeyExplicit = new->min_key_code;
 		mrep.nKeyActs = mrep.nKeyBehaviors = 
-			mrep.nKeyExplicit = XkbNumKeys(finfo.xkb);
+			mrep.nKeyExplicit = XkbNumKeys(new);
 	    }
 	    else {
 		mrep.virtualMods= 0;
@@ -5259,10 +5258,10 @@ ProcXkbGetKbdByName(ClientPtr client)
 			mrep.firstKeyExplicit = 0;
 		mrep.nKeyActs= mrep.nKeyBehaviors= mrep.nKeyExplicit= 0;
 	    }
-	    XkbComputeGetMapReplySize(finfo.xkb,&mrep);
+	    XkbComputeGetMapReplySize(new,&mrep);
 	    rep.length+= SIZEOF(xGenericReply)/4+mrep.length;
 	}
-	if (finfo.xkb->compat==NULL)
+	if (new->compat==NULL)
 	    rep.reported&= ~XkbGBN_CompatMapMask;
 	else if (rep.reported&XkbGBN_CompatMapMask) {
 	    crep.type= X_Reply;
@@ -5271,11 +5270,11 @@ ProcXkbGetKbdByName(ClientPtr client)
 	    crep.length= 0;
 	    crep.groups= XkbAllGroupsMask;
 	    crep.firstSI= 0;
-	    crep.nSI= crep.nTotalSI= finfo.xkb->compat->num_si;
-	    XkbComputeGetCompatMapReplySize(finfo.xkb->compat,&crep);
+	    crep.nSI= crep.nTotalSI= new->compat->num_si;
+	    XkbComputeGetCompatMapReplySize(new->compat,&crep);
 	    rep.length+= SIZEOF(xGenericReply)/4+crep.length;
 	}
-	if (finfo.xkb->indicators==NULL)
+	if (new->indicators==NULL)
 	    rep.reported&= ~XkbGBN_IndicatorMapMask;
 	else if (rep.reported&XkbGBN_IndicatorMapMask) {
 	    irep.type= X_Reply;
@@ -5283,28 +5282,28 @@ ProcXkbGetKbdByName(ClientPtr client)
 	    irep.sequenceNumber= client->sequence;
 	    irep.length= 0;
 	    irep.which= XkbAllIndicatorsMask;
-	    XkbComputeGetIndicatorMapReplySize(finfo.xkb->indicators,&irep);
+	    XkbComputeGetIndicatorMapReplySize(new->indicators,&irep);
 	    rep.length+= SIZEOF(xGenericReply)/4+irep.length;
 	}
-	if (finfo.xkb->names==NULL)
+	if (new->names==NULL)
 	    rep.reported&= ~(XkbGBN_OtherNamesMask|XkbGBN_KeyNamesMask);
 	else if (rep.reported&(XkbGBN_OtherNamesMask|XkbGBN_KeyNamesMask)) {
 	    nrep.type= X_Reply;
 	    nrep.deviceID= dev->id;
 	    nrep.sequenceNumber= client->sequence;
 	    nrep.length= 0;
-	    nrep.minKeyCode= finfo.xkb->min_key_code;
-	    nrep.maxKeyCode= finfo.xkb->max_key_code;
+	    nrep.minKeyCode= new->min_key_code;
+	    nrep.maxKeyCode= new->max_key_code;
 	    if (rep.reported&XkbGBN_OtherNamesMask) {
 		nrep.which= XkbAllNamesMask;
-		if (finfo.xkb->map!=NULL)
-		     nrep.nTypes= finfo.xkb->map->num_types;
+		if (new->map!=NULL)
+		     nrep.nTypes= new->map->num_types;
 		else nrep.nTypes= 0;
 		nrep.nKTLevels= 0;
 		nrep.groupNames= XkbAllGroupsMask;
 		nrep.virtualMods= XkbAllVirtualModsMask;
 		nrep.indicators= XkbAllIndicatorsMask;
-		nrep.nRadioGroups= finfo.xkb->names->num_rg;
+		nrep.nRadioGroups= new->names->num_rg;
 	    }
 	    else {
 		nrep.which= 0;
@@ -5317,9 +5316,9 @@ ProcXkbGetKbdByName(ClientPtr client)
 	    }
 	    if (rep.reported&XkbGBN_KeyNamesMask) {
 		nrep.which|= XkbKeyNamesMask;
-		nrep.firstKey= finfo.xkb->min_key_code;
-		nrep.nKeys= XkbNumKeys(finfo.xkb);
-		nrep.nKeyAliases= finfo.xkb->names->num_key_aliases;
+		nrep.firstKey= new->min_key_code;
+		nrep.nKeys= XkbNumKeys(new);
+		nrep.nKeyAliases= new->names->num_key_aliases;
 		if (nrep.nKeyAliases)
 		    nrep.which|= XkbKeyAliasesMask;
 	    }
@@ -5328,10 +5327,10 @@ ProcXkbGetKbdByName(ClientPtr client)
 		nrep.firstKey= nrep.nKeys= 0;
 		nrep.nKeyAliases= 0;
 	    }
-	    XkbComputeGetNamesReplySize(finfo.xkb,&nrep);
+	    XkbComputeGetNamesReplySize(new,&nrep);
 	    rep.length+= SIZEOF(xGenericReply)/4+nrep.length;
 	}
-	if (finfo.xkb->geom==NULL)
+	if (new->geom==NULL)
 	    rep.reported&= ~XkbGBN_GeometryMask;
 	else if (rep.reported&XkbGBN_GeometryMask) {
 	    grep.type= X_Reply;
@@ -5344,7 +5343,7 @@ ProcXkbGetKbdByName(ClientPtr client)
 	    grep.nProperties= grep.nColors= grep.nShapes= 0;
 	    grep.nSections= grep.nDoodads= 0;
 	    grep.baseColorNdx= grep.labelColorNdx= 0;
-	    XkbComputeGetGeometryReplySize(finfo.xkb->geom,&grep,None);
+	    XkbComputeGetGeometryReplySize(new->geom,&grep,None);
 	    rep.length+= SIZEOF(xGenericReply)/4+grep.length;
 	}
     }
@@ -5359,23 +5358,23 @@ ProcXkbGetKbdByName(ClientPtr client)
     }
     WriteToClient(client,SIZEOF(xkbGetKbdByNameReply), (char *)&rep);
     if (reported&(XkbGBN_SymbolsMask|XkbGBN_TypesMask))
-	XkbSendMap(client,finfo.xkb,&mrep);
+	XkbSendMap(client,new,&mrep);
     if (reported&XkbGBN_CompatMapMask)
-	XkbSendCompatMap(client,finfo.xkb->compat,&crep);
+	XkbSendCompatMap(client,new->compat,&crep);
     if (reported&XkbGBN_IndicatorMapMask)
-	XkbSendIndicatorMap(client,finfo.xkb->indicators,&irep);
+	XkbSendIndicatorMap(client,new->indicators,&irep);
     if (reported&(XkbGBN_KeyNamesMask|XkbGBN_OtherNamesMask))
-	XkbSendNames(client,finfo.xkb,&nrep);
+	XkbSendNames(client,new,&nrep);
     if (reported&XkbGBN_GeometryMask)
-	XkbSendGeometry(client,finfo.xkb->geom,&grep,False);
+	XkbSendGeometry(client,new->geom,&grep,False);
     if (rep.loaded) {
 	XkbDescPtr		old_xkb;
 	xkbNewKeyboardNotify 	nkn;
 	int 			i,nG,nTG;
 	old_xkb= xkb;
-	xkb= finfo.xkb;
+	xkb= new;
 	dev->key->xkbInfo->desc= xkb;
-	finfo.xkb= old_xkb; /* so it'll get freed automatically */
+	new= old_xkb; /* so it'll get freed automatically */
 
 	*xkb->ctrls= *old_xkb->ctrls;
 	for (nG=nTG=0,i=xkb->min_key_code;i<=xkb->max_key_code;i++) {
@@ -5419,8 +5418,8 @@ ProcXkbGetKbdByName(ClientPtr client)
         /* this should be either a MN or an NKN, depending on whether or not
          * the keycode range changed? */
 	nkn.deviceID= nkn.oldDeviceID= dev->id;
-	nkn.minKeyCode= finfo.xkb->min_key_code;
-	nkn.maxKeyCode= finfo.xkb->max_key_code;
+	nkn.minKeyCode= new->min_key_code;
+	nkn.maxKeyCode= new->max_key_code;
 	nkn.oldMinKeyCode= xkb->min_key_code;
 	nkn.oldMaxKeyCode= xkb->max_key_code;
 	nkn.requestMajor= XkbReqCode;
@@ -5430,9 +5429,9 @@ ProcXkbGetKbdByName(ClientPtr client)
 	    nkn.changed|= XkbNKN_GeometryMask;
 	XkbSendNewKeyboardNotify(dev,&nkn);
     }
-    if ((finfo.xkb!=NULL)&&(finfo.xkb!=xkb)) {
-	XkbFreeKeyboard(finfo.xkb,XkbAllComponentsMask,True);
-	finfo.xkb= NULL;
+    if ((new!=NULL)&&(new!=xkb)) {
+	XkbFreeKeyboard(new,XkbAllComponentsMask,True);
+	new= NULL;
     }
     if (names.keymap)	{ _XkbFree(names.keymap); names.keymap= NULL; }
     if (names.keycodes)	{ _XkbFree(names.keycodes); names.keycodes= NULL; }
diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
index 2aacc8ca6..890cf4250 100644
--- a/xkb/xkbActions.c
+++ b/xkb/xkbActions.c
@@ -843,7 +843,7 @@ _XkbFilterRedirectKey(	XkbSrvInfoPtr	xkbi,
 			unsigned	keycode,
 			XkbAction *	pAction)
 {
-unsigned	realMods;
+unsigned	realMods = 0;
 xEvent 		ev;
 int		x,y;
 XkbStateRec	old;
@@ -1145,7 +1145,7 @@ void
 XkbHandleActions(DeviceIntPtr dev,DeviceIntPtr kbd,xEvent *xE,int count)
 {
 int		key,bit,i;
-CARD8		realMods;
+CARD8		realMods = 0;
 XkbSrvInfoPtr	xkbi;
 KeyClassPtr	keyc;
 int		changed,sendEvent;
diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
index 73dd32e35..37dd94019 100644
--- a/xkb/xkbInit.c
+++ b/xkb/xkbInit.c
@@ -88,7 +88,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 typedef struct	_SrvXkmInfo {
 	DeviceIntPtr	dev;
 	FILE *		file;
-	XkbFileInfo	xkbinfo;
+	XkbDescPtr	xkb;
 } SrvXkmInfo;
 
 
@@ -125,7 +125,6 @@ typedef struct	_SrvXkmInfo {
 char	*		XkbBaseDirectory=	XKB_BASE_DIRECTORY;
 char	*		XkbBinDirectory=	XKB_BIN_DIRECTORY;
 static int	 	XkbWantAccessX=		0;	
-static XkbFileInfo *	_XkbInitFileInfo=	NULL;
 
 static Bool		rulesDefined=		False;
 static char *		XkbRulesFile=		NULL;
@@ -283,10 +282,8 @@ XkbSetRulesDflts(char *rulesFile,char *model,char *layout,
 #include "xkbDflts.h"
 
 static Bool
-XkbInitKeyTypes(XkbDescPtr xkb,SrvXkmInfo *file)
+XkbInitKeyTypes(XkbDescPtr xkb)
 {
-    if (file->xkbinfo.defined&XkmTypesMask)
-	return True;
     initTypeNames(NULL);
     if (XkbAllocClientMap(xkb,XkbKeyTypesMask,num_dflt_types)!=Success)
 	return False;
@@ -299,7 +296,7 @@ XkbInitKeyTypes(XkbDescPtr xkb,SrvXkmInfo *file)
 }
 
 static void
-XkbInitRadioGroups(XkbSrvInfoPtr xkbi,SrvXkmInfo *file)
+XkbInitRadioGroups(XkbSrvInfoPtr xkbi)
 {
     xkbi->nRadioGroups = 0;
     xkbi->radioGroups = NULL;
@@ -308,13 +305,11 @@ XkbInitRadioGroups(XkbSrvInfoPtr xkbi,SrvXkmInfo *file)
 
 
 static Status
-XkbInitCompatStructs(XkbDescPtr xkb,SrvXkmInfo *file)
+XkbInitCompatStructs(XkbDescPtr xkb)
 {
 register int 	i;
 XkbCompatMapPtr	compat;
 
-    if (file->xkbinfo.defined&XkmCompatMapMask)
-	return Success;
     if (XkbAllocCompatMap(xkb,XkbAllCompatMask,num_dfltSI)!=Success)
 	return BadAlloc;
     compat = xkb->compat;
@@ -335,17 +330,17 @@ XkbCompatMapPtr	compat;
 }
 
 static void
-XkbInitSemantics(XkbDescPtr xkb,SrvXkmInfo *file)
+XkbInitSemantics(XkbDescPtr xkb)
 {
-    XkbInitKeyTypes(xkb,file);
-    XkbInitCompatStructs(xkb,file);
+    XkbInitKeyTypes(xkb);
+    XkbInitCompatStructs(xkb);
     return;
 }
 
 /***====================================================================***/
 
 static Status
-XkbInitNames(XkbSrvInfoPtr xkbi,SrvXkmInfo *file)
+XkbInitNames(XkbSrvInfoPtr xkbi)
 {
 XkbDescPtr	xkb;
 XkbNamesPtr	names;
@@ -363,29 +358,25 @@ Atom		unknown;
     if (names->symbols==None)		names->symbols= unknown;
     if (names->types==None)		names->types= unknown;
     if (names->compat==None)		names->compat= unknown;
-    if ((file->xkbinfo.defined&XkmVirtualModsMask)==0) {
-	if (names->vmods[vmod_NumLock]==None)
-	    names->vmods[vmod_NumLock]= CREATE_ATOM("NumLock");
-	if (names->vmods[vmod_Alt]==None)
-	    names->vmods[vmod_Alt]= CREATE_ATOM("Alt");
-	if (names->vmods[vmod_AltGr]==None)
-	    names->vmods[vmod_AltGr]= CREATE_ATOM("ModeSwitch");
-    }
+    if (names->vmods[vmod_NumLock]==None)
+        names->vmods[vmod_NumLock]= CREATE_ATOM("NumLock");
+    if (names->vmods[vmod_Alt]==None)
+        names->vmods[vmod_Alt]= CREATE_ATOM("Alt");
+    if (names->vmods[vmod_AltGr]==None)
+        names->vmods[vmod_AltGr]= CREATE_ATOM("ModeSwitch");
 
-    if (((file->xkbinfo.defined&XkmIndicatorsMask)==0)||
-	((file->xkbinfo.defined&XkmGeometryMask)==0)) {
-	initIndicatorNames(NULL,xkb);
-	if (names->indicators[LED_CAPS-1]==None)
-	    names->indicators[LED_CAPS-1] = CREATE_ATOM("Caps Lock");
-	if (names->indicators[LED_NUM-1]==None)
-	    names->indicators[LED_NUM-1] = CREATE_ATOM("Num Lock");
-	if (names->indicators[LED_SCROLL-1]==None)
-	    names->indicators[LED_SCROLL-1] = CREATE_ATOM("Scroll Lock");
+    initIndicatorNames(NULL,xkb);
+    if (names->indicators[LED_CAPS-1]==None)
+        names->indicators[LED_CAPS-1] = CREATE_ATOM("Caps Lock");
+    if (names->indicators[LED_NUM-1]==None)
+        names->indicators[LED_NUM-1] = CREATE_ATOM("Num Lock");
+    if (names->indicators[LED_SCROLL-1]==None)
+        names->indicators[LED_SCROLL-1] = CREATE_ATOM("Scroll Lock");
 #ifdef LED_COMPOSE
-	if (names->indicators[LED_COMPOSE-1]==None)
-	    names->indicators[LED_COMPOSE-1] = CREATE_ATOM("Compose");
+    if (names->indicators[LED_COMPOSE-1]==None)
+        names->indicators[LED_COMPOSE-1] = CREATE_ATOM("Compose");
 #endif
-    }
+
     if (xkb->geom!=NULL)
 	 names->geometry= xkb->geom->name;
     else names->geometry= unknown;
@@ -393,7 +384,7 @@ Atom		unknown;
 }
 
 static Status
-XkbInitIndicatorMap(XkbSrvInfoPtr xkbi,SrvXkmInfo *file)
+XkbInitIndicatorMap(XkbSrvInfoPtr xkbi)
 {
 XkbDescPtr		xkb;
 XkbIndicatorPtr		map;
@@ -402,27 +393,24 @@ XkbSrvLedInfoPtr	sli;
     xkb= xkbi->desc;
     if (XkbAllocIndicatorMaps(xkb)!=Success)
 	return BadAlloc;
-    if ((file->xkbinfo.defined&XkmIndicatorsMask)==0) {
-	map= xkb->indicators;
-	map->phys_indicators = PHYS_LEDS;
-	map->maps[LED_CAPS-1].flags= XkbIM_NoExplicit;
-	map->maps[LED_CAPS-1].which_mods= XkbIM_UseLocked;
-	map->maps[LED_CAPS-1].mods.mask= LockMask;
-	map->maps[LED_CAPS-1].mods.real_mods= LockMask;
+    map= xkb->indicators;
+    map->phys_indicators = PHYS_LEDS;
+    map->maps[LED_CAPS-1].flags= XkbIM_NoExplicit;
+    map->maps[LED_CAPS-1].which_mods= XkbIM_UseLocked;
+    map->maps[LED_CAPS-1].mods.mask= LockMask;
+    map->maps[LED_CAPS-1].mods.real_mods= LockMask;
 
-	map->maps[LED_NUM-1].flags= XkbIM_NoExplicit;
-	map->maps[LED_NUM-1].which_mods= XkbIM_UseLocked;
-	map->maps[LED_NUM-1].mods.mask= 0;
-	map->maps[LED_NUM-1].mods.real_mods= 0;
-	map->maps[LED_NUM-1].mods.vmods= vmod_NumLockMask;
+    map->maps[LED_NUM-1].flags= XkbIM_NoExplicit;
+    map->maps[LED_NUM-1].which_mods= XkbIM_UseLocked;
+    map->maps[LED_NUM-1].mods.mask= 0;
+    map->maps[LED_NUM-1].mods.real_mods= 0;
+    map->maps[LED_NUM-1].mods.vmods= vmod_NumLockMask;
+
+    map->maps[LED_SCROLL-1].flags= XkbIM_NoExplicit;
+    map->maps[LED_SCROLL-1].which_mods= XkbIM_UseLocked;
+    map->maps[LED_SCROLL-1].mods.mask= Mod3Mask;
+    map->maps[LED_SCROLL-1].mods.real_mods= Mod3Mask;
 
-/* Metro Link */
-	map->maps[LED_SCROLL-1].flags= XkbIM_NoExplicit;
-	map->maps[LED_SCROLL-1].which_mods= XkbIM_UseLocked;
-	map->maps[LED_SCROLL-1].mods.mask= Mod3Mask;
-	map->maps[LED_SCROLL-1].mods.real_mods= Mod3Mask;
-/* Metro Link */
-    }
     sli= XkbFindSrvLedInfo(xkbi->device,XkbDfltXIClass,XkbDfltXIId,0);
     if (sli)
 	XkbCheckIndicatorMaps(xkbi->device,sli,XkbAllIndicatorsMask);
@@ -430,7 +418,7 @@ XkbSrvLedInfoPtr	sli;
 }
 
 static Status
-XkbInitControls(DeviceIntPtr pXDev,XkbSrvInfoPtr xkbi,SrvXkmInfo *file)
+XkbInitControls(DeviceIntPtr pXDev,XkbSrvInfoPtr xkbi)
 {
 XkbDescPtr	xkb;
 XkbControlsPtr	ctrls;
@@ -440,8 +428,7 @@ XkbControlsPtr	ctrls;
     if (XkbAllocControls(xkb,XkbAllControlsMask)!=Success)
 	FatalError("Couldn't allocate keyboard controls\n");
     ctrls= xkb->ctrls;
-    if ((file->xkbinfo.defined&XkmSymbolsMask)==0)
-	ctrls->num_groups = 1;
+    ctrls->num_groups = 1;
     ctrls->groups_wrap = XkbSetGroupInfo(1,XkbWrapIntoRange,0);
     ctrls->internal.mask = 0;
     ctrls->internal.real_mods = 0;
@@ -464,29 +451,18 @@ XkbInitDevice(DeviceIntPtr pXDev)
 int			i;
 XkbSrvInfoPtr		xkbi;
 XkbChangesRec		changes;
-SrvXkmInfo		file;
 unsigned		check;
 XkbEventCauseRec	cause;
 
-    file.dev= pXDev;
-    file.file=NULL;
-    bzero(&file.xkbinfo,sizeof(XkbFileInfo));
     bzero(&changes,sizeof(XkbChangesRec));
     pXDev->key->xkbInfo= xkbi= _XkbTypedCalloc(1,XkbSrvInfoRec);
     if ( xkbi ) {
 	XkbDescPtr	xkb;
-	if ((_XkbInitFileInfo!=NULL)&&(_XkbInitFileInfo->xkb!=NULL)) {
-	    file.xkbinfo= *_XkbInitFileInfo;
-	    xkbi->desc= _XkbInitFileInfo->xkb;
-	    _XkbInitFileInfo= NULL;
-	}
-	else {
-	    xkbi->desc= XkbAllocKeyboard();
-	    if (!xkbi->desc)
-		FatalError("Couldn't allocate keyboard description\n");
-	    xkbi->desc->min_key_code = pXDev->key->curKeySyms.minKeyCode;
-	    xkbi->desc->max_key_code = pXDev->key->curKeySyms.maxKeyCode;
-	}
+        xkbi->desc= XkbAllocKeyboard();
+	if (!xkbi->desc)
+	    FatalError("Couldn't allocate keyboard description\n");
+	xkbi->desc->min_key_code = pXDev->key->curKeySyms.minKeyCode;
+	xkbi->desc->max_key_code = pXDev->key->curKeySyms.maxKeyCode;
 	xkb= xkbi->desc;
 	if (xkb->min_key_code == 0)
 	    xkb->min_key_code = pXDev->key->curKeySyms.minKeyCode;
@@ -509,32 +485,23 @@ XkbEventCauseRec	cause;
 	xkbi->dfltPtrDelta=1;
 	xkbi->device = pXDev;
 
-	file.xkbinfo.xkb= xkb;
-	XkbInitSemantics(xkb,&file);
-	XkbInitNames(xkbi,&file);
-	XkbInitRadioGroups(xkbi,&file);
+	XkbInitSemantics(xkb);
+	XkbInitNames(xkbi);
+	XkbInitRadioGroups(xkbi);
 
 	/* 12/31/94 (ef) -- XXX! Should check if state loaded from file */
 	bzero(&xkbi->state,sizeof(XkbStateRec));
 
-	XkbInitControls(pXDev,xkbi,&file);
+	XkbInitControls(pXDev,xkbi);
 
-	if (file.xkbinfo.defined&XkmSymbolsMask)
-	   memcpy(pXDev->key->modifierMap,xkb->map->modmap,xkb->max_key_code+1);
-	else
-	   memcpy(xkb->map->modmap,pXDev->key->modifierMap,xkb->max_key_code+1);
+        memcpy(xkb->map->modmap,pXDev->key->modifierMap,xkb->max_key_code+1);
 
-	XkbInitIndicatorMap(xkbi,&file);
+	XkbInitIndicatorMap(xkbi);
 
 	XkbDDXInitDevice(pXDev);
 
-	if (!(file.xkbinfo.defined&XkmSymbolsMask)) {
-	    XkbUpdateKeyTypesFromCore(pXDev,xkb->min_key_code,XkbNumKeys(xkb),
-								&changes);
-	}
-	else {
-	    XkbUpdateCoreDescription(pXDev,True);
-	}
+        XkbUpdateKeyTypesFromCore(pXDev,xkb->min_key_code,XkbNumKeys(xkb),
+                                  &changes);
 	XkbSetCauseUnknown(&cause);
 	XkbUpdateActions(pXDev,xkb->min_key_code, XkbNumKeys(xkb),&changes,
 								&check,&cause);
@@ -546,8 +513,6 @@ XkbEventCauseRec	cause;
 	pXDev->key->curKeySyms.minKeyCode = xkb->min_key_code;
 	pXDev->key->curKeySyms.maxKeyCode = xkb->max_key_code;
     }
-    if (file.file!=NULL)
-	fclose(file.file);
     return;
 }
 
@@ -571,12 +536,12 @@ XkbInitKeyboardDeviceStruct(
         DeviceIntPtr /*device*/,
         KeybdCtrl * /*ctrl*/))
 {
-XkbFileInfo		finfo;
 KeySymsRec		tmpSyms,*pSyms;
 CARD8			tmpMods[XkbMaxLegalKeyCode+1],*pMods;
 char			name[PATH_MAX],*rules;
 Bool			ok=False;
 XkbRF_VarDefsRec	defs;
+XkbDescPtr              xkb;
 
     if ((dev->key!=NULL)||(dev->kbdfeed!=NULL))
 	return False;
@@ -633,13 +598,11 @@ XkbRF_VarDefsRec	defs;
     }
 
     ok = (Bool) XkbDDXLoadKeymapByNames(dev,names,XkmAllIndicesMask,0,
-                                        &finfo,name,PATH_MAX);
+                                        &xkb,name,PATH_MAX);
 
-    if (ok && (finfo.xkb!=NULL)) {
-	XkbDescPtr	xkb;
+    if (ok && (xkb!=NULL)) {
 	KeyCode		minKC,maxKC;
 
-	xkb= finfo.xkb;
 	minKC= xkb->min_key_code;
 	maxKC= xkb->max_key_code;
 	if (XkbIsLegalKeycode(minKC)&&XkbIsLegalKeycode(maxKC)&&(minKC<=maxKC)&&
@@ -669,13 +632,11 @@ XkbRF_VarDefsRec	defs;
 		pMods= tmpMods;
 	    }
 	}
-	_XkbInitFileInfo= &finfo;
     }
     else {
 	LogMessage(X_WARNING, "Couldn't load XKB keymap, falling back to pre-XKB keymap\n");
     }
     ok= InitKeyboardDeviceStruct((DevicePtr)dev,pSyms,pMods,bellProc,ctrlProc);
-    _XkbInitFileInfo= NULL;
     if ((pSyms==&tmpSyms)&&(pSyms->map!=NULL)) {
 	_XkbFree(pSyms->map);
 	pSyms->map= NULL;
diff --git a/xkb/xkbfmisc.c b/xkb/xkbfmisc.c
index 4182c3a34..866b4b154 100644
--- a/xkb/xkbfmisc.c
+++ b/xkb/xkbfmisc.c
@@ -146,7 +146,7 @@ XkbWriteSectionFromName(FILE *file,char *sectionName,char *name)
 /* ARGSUSED */
 static void
 _AddIncl(	FILE *		file,
-		XkbFileInfo *	result,
+		XkbDescPtr 	xkb,
 		Bool 		topLevel,
 		Bool 		showImplicit,
 		int 		index,
@@ -169,9 +169,6 @@ unsigned	complete;
 XkbNamesPtr	old_names;
 int		multi_section;
 unsigned	wantNames,wantConfig,wantDflts;
-XkbFileInfo	finfo;
-
-    bzero(&finfo,sizeof(XkbFileInfo));
 
     complete= 0;
     if ((name=names->keymap)==NULL)	name= "default";
@@ -187,14 +184,8 @@ XkbFileInfo	finfo;
     if (want==0)
 	return False;
 
-    if (xkb!=NULL) {
+    if (xkb!=NULL)
 	 old_names= xkb->names;
-	 finfo.type= 0;
-	 finfo.defined= 0;
-	 finfo.xkb= xkb;
-	 if (!XkbDetermineFileType(&finfo,XkbXKBFile,NULL))
-	    return False;
-    }
     else old_names= NULL;
 
     wantConfig= want&(~complete);
@@ -304,7 +295,7 @@ XkbFileInfo	finfo;
     wantNames= complete&(~(wantConfig|wantDflts));
     name= names->keycodes;
     if (wantConfig&XkmKeyNamesMask)
-	XkbWriteXKBKeycodes(file,&finfo,False,False,_AddIncl,name);
+	XkbWriteXKBKeycodes(file,xkb,False,False,_AddIncl,name);
     else if (wantDflts&XkmKeyNamesMask)
 	fprintf(stderr,"Default symbols not implemented yet!\n");
     else if (wantNames&XkmKeyNamesMask)
@@ -312,7 +303,7 @@ XkbFileInfo	finfo;
 
     name= names->types;
     if (wantConfig&XkmTypesMask)
-	XkbWriteXKBKeyTypes(file,&finfo,False,False,_AddIncl,name);
+	XkbWriteXKBKeyTypes(file,xkb,False,False,_AddIncl,name);
     else if (wantDflts&XkmTypesMask)
 	fprintf(stderr,"Default types not implemented yet!\n");
     else if (wantNames&XkmTypesMask)
@@ -320,7 +311,7 @@ XkbFileInfo	finfo;
 
     name= names->compat;
     if (wantConfig&XkmCompatMapMask)
-	XkbWriteXKBCompatMap(file,&finfo,False,False,_AddIncl,name);
+	XkbWriteXKBCompatMap(file,xkb,False,False,_AddIncl,name);
     else if (wantDflts&XkmCompatMapMask)
 	fprintf(stderr,"Default interps not implemented yet!\n");
     else if (wantNames&XkmCompatMapMask)
@@ -328,13 +319,13 @@ XkbFileInfo	finfo;
 
     name= names->symbols;
     if (wantConfig&XkmSymbolsMask)
-	XkbWriteXKBSymbols(file,&finfo,False,False,_AddIncl,name);
+	XkbWriteXKBSymbols(file,xkb,False,False,_AddIncl,name);
     else if (wantNames&XkmSymbolsMask)
 	XkbWriteSectionFromName(file,"symbols",name);
 
     name= names->geometry;
     if (wantConfig&XkmGeometryMask)
-	XkbWriteXKBGeometry(file,&finfo,False,False,_AddIncl,name);
+	XkbWriteXKBGeometry(file,xkb,False,False,_AddIncl,name);
     else if (wantNames&XkmGeometryMask)
 	XkbWriteSectionFromName(file,"geometry",name);
 
@@ -404,81 +395,6 @@ unsigned	rtrn;
     return rtrn;
 }
 
-Bool
-XkbDetermineFileType(XkbFileInfoPtr finfo,int format,int *opts_missing)
-{
-unsigned	present;
-XkbDescPtr	xkb;
-
-    if ((!finfo)||(!finfo->xkb))
-	return False;
-    if (opts_missing)
-	*opts_missing= 0;
-    xkb= finfo->xkb;
-    present= 0;
-    if ((xkb->names)&&(xkb->names->keys))	present|= XkmKeyNamesMask;
-    if ((xkb->map)&&(xkb->map->types))		present|= XkmTypesMask;
-    if (xkb->compat)				present|= XkmCompatMapMask;
-    if ((xkb->map)&&(xkb->map->num_syms>1))	present|= XkmSymbolsMask;
-    if (xkb->indicators)			present|= XkmIndicatorsMask;
-    if (xkb->geom)				present|= XkmGeometryMask;
-    if (!present)
-	return False;
-    else switch (present) {
-	case XkmKeyNamesMask:	
-	    finfo->type= 	XkmKeyNamesIndex;
-	    finfo->defined= 	present;
-	    return True;
-	case XkmTypesMask:
-	    finfo->type=	XkmTypesIndex;
-	    finfo->defined= 	present;
-	    return True;
-	case XkmCompatMapMask:	
-	    finfo->type=	XkmCompatMapIndex;
-	    finfo->defined=	present;
-	    return True;
-	case XkmSymbolsMask:	
-	    if (format!=XkbXKMFile) {
-		finfo->type= 	XkmSymbolsIndex;
-		finfo->defined=	present;
-		return True;
-	    }
-	    break;
-	case XkmGeometryMask:	
-	    finfo->type=	XkmGeometryIndex;
-	    finfo->defined=	present;
-	    return True;
-    }
-    if ((present&(~XkmSemanticsLegal))==0) {
-	if ((XkmSemanticsRequired&present)==XkmSemanticsRequired) {
-	    if (opts_missing)
-		*opts_missing= XkmSemanticsOptional&(~present);
-	    finfo->type= 	XkmSemanticsFile;
-	    finfo->defined=	present;
-	    return True;
-	}
-    }
-    else if ((present&(~XkmLayoutLegal))==0) {
-	if ((XkmLayoutRequired&present)==XkmLayoutRequired) {
-	    if (opts_missing)
-		*opts_missing= XkmLayoutOptional&(~present);
-	    finfo->type=	XkmLayoutFile;
-	    finfo->defined=	present;
-	    return True;
-	}
-    }
-    else if ((present&(~XkmKeymapLegal))==0) {
-	if ((XkmKeymapRequired&present)==XkmKeymapRequired) {
-	    if (opts_missing)
-		*opts_missing= XkmKeymapOptional&(~present);
-	    finfo->type=	XkmKeymapFile;
-	    finfo->defined=	present;
-	    return True;
-	}
-    }
-    return False;
-}
-
 /* all latin-1 alphanumerics, plus parens, slash, minus, underscore and */
 /* wildcards */
 
diff --git a/xkb/xkbout.c b/xkb/xkbout.c
index b72c05c60..229cc9258 100644
--- a/xkb/xkbout.c
+++ b/xkb/xkbout.c
@@ -90,9 +90,9 @@ Atom *		vmodNames;
 /***====================================================================***/
 
 static Bool
-WriteXKBAction(FILE *file,XkbFileInfo *result,XkbAnyAction *action)
+WriteXKBAction(FILE *file,XkbDescPtr xkb,XkbAnyAction *action)
 {
-    fprintf(file,"%s",XkbActionText(result->xkb,(XkbAction *)action,XkbXKBFile));
+    fprintf(file,"%s",XkbActionText(xkb,(XkbAction *)action,XkbXKBFile));
     return True;
 }
 
@@ -100,7 +100,7 @@ WriteXKBAction(FILE *file,XkbFileInfo *result,XkbAnyAction *action)
 
 Bool
 XkbWriteXKBKeycodes(	FILE *			file,
-			XkbFileInfo *		result,
+			XkbDescPtr		xkb,
 			Bool			topLevel,
 			Bool			showImplicit,
 			XkbFileAddOnFunc	addOn,
@@ -108,10 +108,8 @@ XkbWriteXKBKeycodes(	FILE *			file,
 {
 Atom			kcName;
 register unsigned 	i;
-XkbDescPtr		xkb;
 char *			alternate;
 
-    xkb= result->xkb;
     if ((!xkb)||(!xkb->names)||(!xkb->names->keys)) {
 	_XkbLibError(_XkbErrMissingNames,"XkbWriteXKBKeycodes",0);
 	return False;
@@ -155,14 +153,14 @@ char *			alternate;
 	}
     }
     if (addOn)
-	(*addOn)(file,result,topLevel,showImplicit,XkmKeyNamesIndex,priv);
+	(*addOn)(file,xkb,topLevel,showImplicit,XkmKeyNamesIndex,priv);
     fprintf(file,"};\n\n");
     return True;
 }
 
 Bool
 XkbWriteXKBKeyTypes(	FILE *			file,
-			XkbFileInfo *		result,
+			XkbDescPtr              xkb,
 			Bool			topLevel,
 			Bool			showImplicit,
 			XkbFileAddOnFunc	addOn,
@@ -171,9 +169,7 @@ XkbWriteXKBKeyTypes(	FILE *			file,
 register unsigned	i,n;
 XkbKeyTypePtr		type;
 XkbKTMapEntryPtr	entry;
-XkbDescPtr		xkb;
 
-    xkb= result->xkb;
     if ((!xkb)||(!xkb->map)||(!xkb->map->types)) {
 	_XkbLibError(_XkbErrMissingTypes,"XkbWriteXKBKeyTypes",0);
 	return False;
@@ -223,22 +219,20 @@ XkbDescPtr		xkb;
 	fprintf(file,"    };\n");
     }
     if (addOn)
-	(*addOn)(file,result,topLevel,showImplicit,XkmTypesIndex,priv);
+	(*addOn)(file,xkb,topLevel,showImplicit,XkmTypesIndex,priv);
     fprintf(file,"};\n\n");
     return True;
 }
 
 static Bool
 WriteXKBIndicatorMap(	FILE *			file,
-			XkbFileInfo *		result,
+			XkbDescPtr              xkb,
 			Atom			name,
 			XkbIndicatorMapPtr	led,
 			XkbFileAddOnFunc	addOn,
 			void *			priv)
 {
-XkbDescPtr	xkb;
 
-    xkb= result->xkb;
     fprintf(file,"    indicator \"%s\" {\n",XkbAtomGetString(name));
     if (led->flags&XkbIM_NoExplicit)
 	fprintf(file,"        !allowExplicit;\n");
@@ -266,14 +260,14 @@ XkbDescPtr	xkb;
 			XkbControlsMaskText(led->ctrls,XkbXKBFile));
     }
     if (addOn)
-	(*addOn)(file,result,False,True,XkmIndicatorsIndex,priv);
+	(*addOn)(file,xkb,False,True,XkmIndicatorsIndex,priv);
     fprintf(file,"    };\n");
     return True;
 }
 
 Bool
 XkbWriteXKBCompatMap(	FILE *			file,
-			XkbFileInfo *		result,
+			XkbDescPtr              xkb,
 			Bool			topLevel,
 			Bool			showImplicit,
 			XkbFileAddOnFunc	addOn,
@@ -281,9 +275,7 @@ XkbWriteXKBCompatMap(	FILE *			file,
 {
 register unsigned	i;
 XkbSymInterpretPtr	interp;
-XkbDescPtr		xkb;
 
-    xkb= result->xkb;
     if ((!xkb)||(!xkb->compat)||(!xkb->compat->sym_interpret)) {
 	_XkbLibError(_XkbErrMissingCompatMap,"XkbWriteXKBCompatMap",0);
 	return False;
@@ -316,7 +308,7 @@ XkbDescPtr		xkb;
 	if (interp->flags&XkbSI_AutoRepeat)
 	    fprintf(file,"        repeat= True;\n");
 	fprintf(file,"        action= ");
-	WriteXKBAction(file,result,&interp->act);
+	WriteXKBAction(file,xkb,&interp->act);
 	fprintf(file,";\n");
 	fprintf(file,"    };\n");
     }
@@ -337,32 +329,30 @@ XkbDescPtr		xkb;
 		(map->which_mods!=0)||
 		(map->mods.real_mods!=0)||(map->mods.vmods!=0)||
 		(map->ctrls!=0)) {
-		WriteXKBIndicatorMap(file,result,xkb->names->indicators[i],map,
+		WriteXKBIndicatorMap(file,xkb,xkb->names->indicators[i],map,
 								addOn,priv);
 	    }
 	}
     }
     if (addOn)
-	(*addOn)(file,result,topLevel,showImplicit,XkmCompatMapIndex,priv);
+	(*addOn)(file,xkb,topLevel,showImplicit,XkmCompatMapIndex,priv);
     fprintf(file,"};\n\n");
     return True;
 }
 
 Bool
 XkbWriteXKBSymbols(	FILE *			file,
-			XkbFileInfo *		result,
+			XkbDescPtr              xkb,
 			Bool			topLevel,
 			Bool			showImplicit,
 			XkbFileAddOnFunc	addOn,
 			void *			priv)
 {
 register unsigned	i,tmp;
-XkbDescPtr		xkb;
 XkbClientMapPtr		map;
 XkbServerMapPtr		srv;
 Bool			showActions;
 
-    xkb= result->xkb;
     map= xkb->map;
     srv= xkb->server;
     if ((!xkb)||(!map)||(!map->syms)||(!map->key_sym_map)) {
@@ -517,7 +507,7 @@ Bool			showActions;
 		    for (s=0;s<XkbKeyGroupWidth(xkb,i,g);s++) {
 			if (s!=0)
 			    fprintf(file,", ");
-			WriteXKBAction(file,result,(XkbAnyAction *)&acts[s]);
+			WriteXKBAction(file,xkb,(XkbAnyAction *)&acts[s]);
 		    }
 		    fprintf(file," ]");
 		    acts+= XkbKeyGroupsWidth(xkb,i);
@@ -543,7 +533,7 @@ Bool			showActions;
 	}
     }
     if (addOn)
-	(*addOn)(file,result,topLevel,showImplicit,XkmSymbolsIndex,priv);
+	(*addOn)(file,xkb,topLevel,showImplicit,XkmSymbolsIndex,priv);
     fprintf(file,"};\n\n");
     return True;
 }
@@ -803,17 +793,15 @@ int		dfltKeyColor = 0;
 
 Bool
 XkbWriteXKBGeometry(	FILE *			file,
-			XkbFileInfo *		result,
+			XkbDescPtr              xkb,
 			Bool			topLevel,
 			Bool			showImplicit,
 			XkbFileAddOnFunc	addOn,
 			void *			priv)
 {
 register unsigned	i,n;
-XkbDescPtr		xkb;
 XkbGeometryPtr		geom;
 
-    xkb= result->xkb;
     if ((!xkb)||(!xkb->geom)) {
 	_XkbLibError(_XkbErrMissingGeometry,"XkbWriteXKBGeometry",0);
  	return False;
@@ -901,7 +889,7 @@ XkbGeometryPtr		geom;
 	}
     }
     if (addOn)
-	(*addOn)(file,result,topLevel,showImplicit,XkmGeometryIndex,priv);
+	(*addOn)(file,xkb,topLevel,showImplicit,XkmGeometryIndex,priv);
     fprintf(file,"};\n\n");
     return True;
 }
diff --git a/xkb/xkmread.c b/xkb/xkmread.c
index 1e5b2cb4e..b14a5beda 100644
--- a/xkb/xkmread.c
+++ b/xkb/xkmread.c
@@ -165,14 +165,12 @@ int	count,nRead=0;
 /***====================================================================***/
 
 static int
-ReadXkmVirtualMods(FILE *file,XkbFileInfo *result,XkbChangesPtr changes)
+ReadXkmVirtualMods(FILE *file,XkbDescPtr xkb,XkbChangesPtr changes)
 {
 register unsigned int i,bit;
 unsigned int	bound,named,tmp;
 int		nRead=0;
-XkbDescPtr	xkb;
 
-    xkb= result->xkb;
     if (XkbAllocServerMap(xkb,XkbVirtualModsMask,0)!=Success) {
 	_XkbLibError(_XkbErrBadAlloc,"ReadXkmVirtualMods",0);
 	return -1;
@@ -209,16 +207,14 @@ XkbDescPtr	xkb;
 /***====================================================================***/
 
 static int
-ReadXkmKeycodes(FILE *file,XkbFileInfo *result,XkbChangesPtr changes)
+ReadXkmKeycodes(FILE *file,XkbDescPtr xkb,XkbChangesPtr changes)
 {
 register int	i;
 unsigned	minKC,maxKC,nAl;
 int		nRead=0;
 char 		name[100];
 XkbKeyNamePtr	pN;
-XkbDescPtr	xkb;
 
-    xkb= result->xkb;
     name[0]= '\0';
     nRead+= XkmGetCountedString(file,name,100);
     minKC= XkmGetCARD8(file,&nRead);
@@ -276,7 +272,7 @@ XkbDescPtr	xkb;
 /***====================================================================***/
 
 static int
-ReadXkmKeyTypes(FILE *file,XkbFileInfo *result,XkbChangesPtr changes)
+ReadXkmKeyTypes(FILE *file,XkbDescPtr xkb,XkbChangesPtr changes)
 {
 register unsigned	i,n;
 unsigned		num_types;
@@ -287,9 +283,7 @@ xkmKeyTypeDesc		wire;
 XkbKTMapEntryPtr	entry;
 xkmKTMapEntryDesc	wire_entry;
 char 			buf[100];
-XkbDescPtr		xkb;
 
-    xkb= result->xkb;
     if ((tmp= XkmGetCountedString(file,buf,100))<1) {
 	_XkbLibError(_XkbErrBadLength,"ReadXkmKeyTypes",0);
 	return -1;
@@ -414,7 +408,7 @@ XkbDescPtr		xkb;
 /***====================================================================***/
 
 static int
-ReadXkmCompatMap(FILE *file,XkbFileInfo *result,XkbChangesPtr changes)
+ReadXkmCompatMap(FILE *file,XkbDescPtr xkb,XkbChangesPtr changes)
 {
 register int		i;
 unsigned		num_si,groups;
@@ -423,10 +417,8 @@ XkbSymInterpretPtr	interp;
 xkmSymInterpretDesc	wire;
 unsigned		tmp;
 int			nRead=0;
-XkbDescPtr		xkb;
 XkbCompatMapPtr		compat;
 
-    xkb= result->xkb;
     if ((tmp= XkmGetCountedString(file,name,100))<1) {
 	_XkbLibError(_XkbErrBadLength,"ReadXkmCompatMap",0);
 	return -1;
@@ -492,16 +484,14 @@ XkbCompatMapPtr		compat;
 }
 
 static int
-ReadXkmIndicators(FILE *file,XkbFileInfo *result,XkbChangesPtr changes)
+ReadXkmIndicators(FILE *file,XkbDescPtr xkb,XkbChangesPtr changes)
 {
 register unsigned	nLEDs;
 xkmIndicatorMapDesc	wire;
 char			buf[100];
 unsigned		tmp;
 int			nRead=0;
-XkbDescPtr		xkb;
 
-    xkb= result->xkb;
     if ((xkb->indicators==NULL)&&(XkbAllocIndicatorMaps(xkb)!=Success)) {
 	_XkbLibError(_XkbErrBadAlloc,"indicator rec",0);
 	return -1;
@@ -575,16 +565,14 @@ FindTypeForKey(XkbDescPtr xkb,Atom name,unsigned width,KeySym *syms)
 }
 
 static int
-ReadXkmSymbols(FILE *file,XkbFileInfo *result)
+ReadXkmSymbols(FILE *file,XkbDescPtr xkb)
 {
 register int		i,g,s,totalVModMaps;
 xkmKeySymMapDesc 	wireMap;
 char 			buf[100];
 unsigned		minKC,maxKC,groupNames,tmp;
 int			nRead=0;
-XkbDescPtr		xkb;
 
-    xkb= result->xkb;
     if ((tmp=XkmGetCountedString(file,buf,100))<1)
 	return -1;
     nRead+= tmp;
@@ -911,7 +899,7 @@ Atom		nameAtom;
 }
 
 static int
-ReadXkmGeometry(FILE *file,XkbFileInfo *result)
+ReadXkmGeometry(FILE *file,XkbDescPtr xkb)
 {
 register int		i;
 char 			buf[100];
@@ -931,11 +919,11 @@ XkbGeometrySizesRec	sizes;
     sizes.num_sections= wireGeom.num_sections;
     sizes.num_doodads= wireGeom.num_doodads;
     sizes.num_key_aliases= wireGeom.num_key_aliases;
-    if (XkbAllocGeometry(result->xkb,&sizes)!=Success) {
+    if (XkbAllocGeometry(xkb,&sizes)!=Success) {
 	_XkbLibError(_XkbErrBadAlloc,"ReadXkmGeometry",0);
 	return nRead;
     }
-    geom= result->xkb->geom;
+    geom= xkb->geom;
     geom->name= XkbInternAtom(buf,False);
     geom->width_mm= wireGeom.width_mm;
     geom->height_mm= wireGeom.height_mm;
@@ -1055,7 +1043,7 @@ int	 nRead=0;
     return 1;
 }
 
-Bool
+static Bool
 XkmReadTOC(FILE *file,xkmFileInfo* file_info,int max_toc,xkmSectionInfo *toc)
 {
 unsigned hdr,tmp;
@@ -1086,117 +1074,11 @@ unsigned i,size_toc;
     return 1;
 }
 
-Bool
-XkmReadFileSection(	FILE *			file,
-			xkmSectionInfo *	toc,
-			XkbFileInfo *		result,
-			unsigned *		loaded_rtrn)
-{
-xkmSectionInfo		tmpTOC;
-int			nRead;
-
-    if ((!result)||(!result->xkb)) {
-	_XkbLibError(_XkbErrBadMatch,"XkmReadFileSection",0);
-	return 0;
-    }
-    fseek(file,toc->offset,SEEK_SET);
-    fread(&tmpTOC,SIZEOF(xkmSectionInfo),1,file);
-    nRead= SIZEOF(xkmSectionInfo);
-    if ((tmpTOC.type!=toc->type)||(tmpTOC.format!=toc->format)||
-	(tmpTOC.size!=toc->size)||(tmpTOC.offset!=toc->offset)) {
-	_XkbLibError(_XkbErrIllegalContents,"XkmReadFileSection",0);
-	return 0;
-    }
-    switch (tmpTOC.type) {
-	case XkmVirtualModsIndex:
-	    nRead+= ReadXkmVirtualMods(file,result,NULL);
-	    if ((loaded_rtrn)&&(nRead>=0))
-		*loaded_rtrn|= XkmVirtualModsMask;
-	    break;
-	case XkmTypesIndex:
-	    nRead+= ReadXkmKeyTypes(file,result,NULL);
-	    if ((loaded_rtrn)&&(nRead>=0))
-		*loaded_rtrn|= XkmTypesMask;
-	    break;
-	case XkmCompatMapIndex:
-	    nRead+= ReadXkmCompatMap(file,result,NULL);
-	    if ((loaded_rtrn)&&(nRead>=0))
-		*loaded_rtrn|= XkmCompatMapMask;
-	    break;
-	case XkmKeyNamesIndex:
-	    nRead+= ReadXkmKeycodes(file,result,NULL);
-	    if ((loaded_rtrn)&&(nRead>=0))
-		*loaded_rtrn|= XkmKeyNamesMask;
-	    break;
-	case XkmSymbolsIndex:
-	    nRead+= ReadXkmSymbols(file,result);
-	    if ((loaded_rtrn)&&(nRead>=0))
-		*loaded_rtrn|= XkmSymbolsMask;
-	    break;
-	case XkmIndicatorsIndex:
-	    nRead+= ReadXkmIndicators(file,result,NULL);
-	    if ((loaded_rtrn)&&(nRead>=0))
-		*loaded_rtrn|= XkmIndicatorsMask;
-	    break;
-	case XkmGeometryIndex:
-	    nRead+= ReadXkmGeometry(file,result);
-	    if ((loaded_rtrn)&&(nRead>=0))
-		*loaded_rtrn|= XkmGeometryMask;
-	    break;
-	default:
-	    _XkbLibError(_XkbErrBadImplementation,
-	    			XkbConfigText(tmpTOC.type,XkbMessage),0);
-	    nRead= 0;
-	    break;
-    }
-    if (nRead!=tmpTOC.size) {
-	_XkbLibError(_XkbErrBadLength,XkbConfigText(tmpTOC.type,XkbMessage),
-						nRead-tmpTOC.size);
-	return 0;
-    }
-    return (nRead>=0);
-}
-
-char *
-XkmReadFileSectionName(FILE *file,xkmSectionInfo *toc)
-{
-xkmSectionInfo	tmpTOC;
-char 		name[100];
-
-    if ((!file)||(!toc))
-	return 0;
-    switch (toc->type) {
-	case XkmVirtualModsIndex:
-	case XkmIndicatorsIndex:
-	    break;
-	case XkmTypesIndex:
-	case XkmCompatMapIndex:
-	case XkmKeyNamesIndex:
-	case XkmSymbolsIndex:
-	case XkmGeometryIndex:
-	    fseek(file,toc->offset,SEEK_SET);
-	    fread(&tmpTOC,SIZEOF(xkmSectionInfo),1,file);
-	    if ((tmpTOC.type!=toc->type)||(tmpTOC.format!=toc->format)||
-		(tmpTOC.size!=toc->size)||(tmpTOC.offset!=toc->offset)) {
-		_XkbLibError(_XkbErrIllegalContents,"XkmReadFileSectionName",0);
-		return 0;
-	    }
-	    if (XkmGetCountedString(file,name,100)>0)
-		return _XkbDupString(name);
-	    break;
-	default:
-	    _XkbLibError(_XkbErrBadImplementation,
-				XkbConfigText(tmpTOC.type,XkbMessage),0);
-	    break;
-    }
-    return NULL;
-}
-
 /***====================================================================***/
 
 #define	MAX_TOC	16
 unsigned
-XkmReadFile(FILE *file,unsigned need,unsigned want,XkbFileInfo *result)
+XkmReadFile(FILE *file,unsigned need,unsigned want,XkbDescPtr *xkb)
 {
 register unsigned	i;
 xkmSectionInfo		toc[MAX_TOC],tmpTOC;
@@ -1211,9 +1093,8 @@ unsigned		which= need|want;
        						need&(~fileInfo.present));
        return which;
     }
-    result->type= fileInfo.type;
-    if (result->xkb==NULL)
-	result->xkb= XkbAllocKeyboard();
+    if (*xkb==NULL)
+	*xkb= XkbAllocKeyboard();
     for (i=0;i<fileInfo.num_toc;i++) {
 	fseek(file,toc[i].offset,SEEK_SET);
 	tmp= fread(&tmpTOC,SIZEOF(xkmSectionInfo),1,file);
@@ -1227,25 +1108,25 @@ unsigned		which= need|want;
 	}
 	switch (tmpTOC.type) {
 	    case XkmVirtualModsIndex:
-		tmp= ReadXkmVirtualMods(file,result,NULL);
+		tmp= ReadXkmVirtualMods(file,*xkb,NULL);
 		break;
 	    case XkmTypesIndex:
-		tmp= ReadXkmKeyTypes(file,result,NULL);
+		tmp= ReadXkmKeyTypes(file,*xkb,NULL);
 		break;
 	    case XkmCompatMapIndex:
-		tmp= ReadXkmCompatMap(file,result,NULL);
+		tmp= ReadXkmCompatMap(file,*xkb,NULL);
 		break;
 	    case XkmKeyNamesIndex:
-		tmp= ReadXkmKeycodes(file,result,NULL);
+		tmp= ReadXkmKeycodes(file,*xkb,NULL);
 		break;
 	    case XkmIndicatorsIndex:
-		tmp= ReadXkmIndicators(file,result,NULL);
+		tmp= ReadXkmIndicators(file,*xkb,NULL);
 		break;
 	    case XkmSymbolsIndex:
-		tmp= ReadXkmSymbols(file,result);
+		tmp= ReadXkmSymbols(file,*xkb);
 		break;
 	    case XkmGeometryIndex:
-		tmp= ReadXkmGeometry(file,result);
+		tmp= ReadXkmGeometry(file,*xkb);
 		break;
 	    default:
 		_XkbLibError(_XkbErrBadImplementation,
@@ -1256,7 +1137,7 @@ unsigned		which= need|want;
 	if (tmp>0) {
 	    nRead+= tmp;
 	    which&= ~(1<<toc[i].type);
-	    result->defined|= (1<<toc[i].type);
+	    (*xkb)->defined|= (1<<toc[i].type);
 	}
 	if (nRead!=tmpTOC.size) {
 	    _XkbLibError(_XkbErrBadLength,XkbConfigText(tmpTOC.type,XkbMessage),

From 45d00433e7bfbab476dd02ec92a9fbee40af5dad Mon Sep 17 00:00:00 2001
From: Dan Nicholson <dbn.lists@gmail.com>
Date: Tue, 15 Jan 2008 19:43:16 -0800
Subject: [PATCH 517/552] glx: Use glapi sources from the mesa tree

With recent mesa HEAD, the glapi sources used only in the xserver glx
module are carried in the mesa tree. Previously, these were generated
separately and committed to the xserver tree.

The build is changed to symlink these files like the other mesa sources.
This reduces the chance for mismatches between mesa's glX API and the
xserver's glX API.
---
 GL/glx/.gitignore               |   12 +-
 GL/glx/Makefile.am              |   18 +-
 GL/glx/indirect_dispatch.c      | 5889 ------------------------------
 GL/glx/indirect_dispatch.h      | 1047 ------
 GL/glx/indirect_dispatch_swap.c | 6051 -------------------------------
 GL/glx/indirect_reqsize.c       |  832 -----
 GL/glx/indirect_reqsize.h       |  121 -
 GL/glx/indirect_size_get.c      | 1206 ------
 GL/glx/indirect_size_get.h      |  102 -
 GL/glx/indirect_table.c         | 1596 --------
 GL/symlink-mesa.sh              |    8 +
 11 files changed, 27 insertions(+), 16855 deletions(-)
 delete mode 100644 GL/glx/indirect_dispatch.c
 delete mode 100644 GL/glx/indirect_dispatch.h
 delete mode 100644 GL/glx/indirect_dispatch_swap.c
 delete mode 100644 GL/glx/indirect_reqsize.c
 delete mode 100644 GL/glx/indirect_reqsize.h
 delete mode 100644 GL/glx/indirect_size_get.c
 delete mode 100644 GL/glx/indirect_size_get.h
 delete mode 100644 GL/glx/indirect_table.c

diff --git a/GL/glx/.gitignore b/GL/glx/.gitignore
index 5cf6f0a44..c49b54d43 100644
--- a/GL/glx/.gitignore
+++ b/GL/glx/.gitignore
@@ -1,5 +1,13 @@
-indirect_size.h
+glapi.c
 glcontextmodes.c
 glcontextmodes.h
-glapi.c
 glthread.c
+indirect_dispatch.c
+indirect_dispatch.h
+indirect_dispatch_swap.c
+indirect_reqsize.c
+indirect_reqsize.h
+indirect_size.h
+indirect_size_get.c
+indirect_size_get.h
+indirect_table.c
diff --git a/GL/glx/Makefile.am b/GL/glx/Makefile.am
index e37e499c5..377d76019 100644
--- a/GL/glx/Makefile.am
+++ b/GL/glx/Makefile.am
@@ -33,7 +33,15 @@ nodist_libglx_la_SOURCES = indirect_size.h \
 			   glapi.c \
 			   glcontextmodes.c \
 			   glcontextmode.h \
-			   glthread.c
+			   glthread.c \
+			   indirect_dispatch.c \
+			   indirect_dispatch.h \
+			   indirect_dispatch_swap.c \
+			   indirect_reqsize.c \
+			   indirect_reqsize.h \
+			   indirect_size_get.c \
+			   indirect_size_get.h \
+			   indirect_table.c
 
 libglxdri_la_SOURCES = \
         glxdri.c \
@@ -56,15 +64,7 @@ libglx_la_SOURCES = \
         glxserver.h \
         glxutil.c \
         glxutil.h \
-        indirect_dispatch.c \
-        indirect_dispatch.h \
-        indirect_dispatch_swap.c \
         indirect_program.c \
-        indirect_reqsize.c \
-        indirect_reqsize.h \
-        indirect_size_get.c \
-        indirect_size_get.h \
-        indirect_table.c \
         indirect_table.h \
         indirect_texture_compression.c \
         indirect_util.c \
diff --git a/GL/glx/indirect_dispatch.c b/GL/glx/indirect_dispatch.c
deleted file mode 100644
index 2afd3eb22..000000000
--- a/GL/glx/indirect_dispatch.c
+++ /dev/null
@@ -1,5889 +0,0 @@
-/* DO NOT EDIT - This file generated automatically by glX_proto_recv.py (from Mesa) script */
-
-/*
- * (C) Copyright IBM Corporation 2005
- * All Rights Reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sub license,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
- * IBM,
- * AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <X11/Xmd.h>
-#include <GL/gl.h>
-#include <GL/glxproto.h>
-#include <inttypes.h>
-#include "indirect_size.h"
-#include "indirect_size_get.h"
-#include "indirect_dispatch.h"
-#include "glxserver.h"
-#include "glxbyteorder.h"
-#include "indirect_util.h"
-#include "singlesize.h"
-#include "glapitable.h"
-#include "glapi.h"
-#include "glthread.h"
-#include "dispatch.h"
-
-#define __GLX_PAD(x)  (((x) + 3) & ~3)
-
-typedef struct {
-    __GLX_PIXEL_3D_HDR;
-} __GLXpixel3DHeader;
-
-extern GLboolean __glXErrorOccured( void );
-extern void __glXClearErrorOccured( void );
-
-static const unsigned dummy_answer[2] = {0, 0};
-
-int __glXDisp_NewList(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        CALL_NewList( GET_DISPATCH(), (
-            *(GLuint   *)(pc +  0),
-            *(GLenum   *)(pc +  4)
-        ) );
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_EndList(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        CALL_EndList( GET_DISPATCH(), () );
-        error = Success;
-    }
-
-    return error;
-}
-
-void __glXDisp_CallList(GLbyte * pc)
-{
-    CALL_CallList( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_CallLists(GLbyte * pc)
-{
-    const GLsizei n = *(GLsizei  *)(pc +  0);
-    const GLenum type = *(GLenum   *)(pc +  4);
-    const GLvoid * lists =  (const GLvoid *)(pc +  8);
-
-    lists = (const GLvoid *) (pc + 8);
-
-    CALL_CallLists( GET_DISPATCH(), (
-        n,
-        type,
-        lists
-    ) );
-}
-
-int __glXDisp_DeleteLists(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        CALL_DeleteLists( GET_DISPATCH(), (
-            *(GLuint   *)(pc +  0),
-            *(GLsizei  *)(pc +  4)
-        ) );
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GenLists(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLuint retval;
-        retval = CALL_GenLists( GET_DISPATCH(), (
-            *(GLsizei  *)(pc +  0)
-        ) );
-        __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-void __glXDisp_ListBase(GLbyte * pc)
-{
-    CALL_ListBase( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Begin(GLbyte * pc)
-{
-    CALL_Begin( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Bitmap(GLbyte * pc)
-{
-    const GLubyte * const bitmap = (const GLubyte *) (pc + 44);
-    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
-
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) hdr->rowLength) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) hdr->skipRows) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) hdr->skipPixels) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) hdr->alignment) );
-
-    CALL_Bitmap( GET_DISPATCH(), (
-        *(GLsizei  *)(pc + 20),
-        *(GLsizei  *)(pc + 24),
-        *(GLfloat  *)(pc + 28),
-        *(GLfloat  *)(pc + 32),
-        *(GLfloat  *)(pc + 36),
-        *(GLfloat  *)(pc + 40),
-        bitmap
-    ) );
-}
-
-void __glXDisp_Color3bv(GLbyte * pc)
-{
-    CALL_Color3bv( GET_DISPATCH(), (
-         (const GLbyte *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Color3dv(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 24);
-        pc -= 4;
-    }
-#endif
-
-    CALL_Color3dv( GET_DISPATCH(), (
-         (const GLdouble *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Color3fv(GLbyte * pc)
-{
-    CALL_Color3fv( GET_DISPATCH(), (
-         (const GLfloat *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Color3iv(GLbyte * pc)
-{
-    CALL_Color3iv( GET_DISPATCH(), (
-         (const GLint *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Color3sv(GLbyte * pc)
-{
-    CALL_Color3sv( GET_DISPATCH(), (
-         (const GLshort *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Color3ubv(GLbyte * pc)
-{
-    CALL_Color3ubv( GET_DISPATCH(), (
-         (const GLubyte *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Color3uiv(GLbyte * pc)
-{
-    CALL_Color3uiv( GET_DISPATCH(), (
-         (const GLuint *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Color3usv(GLbyte * pc)
-{
-    CALL_Color3usv( GET_DISPATCH(), (
-         (const GLushort *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Color4bv(GLbyte * pc)
-{
-    CALL_Color4bv( GET_DISPATCH(), (
-         (const GLbyte *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Color4dv(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 32);
-        pc -= 4;
-    }
-#endif
-
-    CALL_Color4dv( GET_DISPATCH(), (
-         (const GLdouble *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Color4fv(GLbyte * pc)
-{
-    CALL_Color4fv( GET_DISPATCH(), (
-         (const GLfloat *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Color4iv(GLbyte * pc)
-{
-    CALL_Color4iv( GET_DISPATCH(), (
-         (const GLint *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Color4sv(GLbyte * pc)
-{
-    CALL_Color4sv( GET_DISPATCH(), (
-         (const GLshort *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Color4ubv(GLbyte * pc)
-{
-    CALL_Color4ubv( GET_DISPATCH(), (
-         (const GLubyte *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Color4uiv(GLbyte * pc)
-{
-    CALL_Color4uiv( GET_DISPATCH(), (
-         (const GLuint *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Color4usv(GLbyte * pc)
-{
-    CALL_Color4usv( GET_DISPATCH(), (
-         (const GLushort *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_EdgeFlagv(GLbyte * pc)
-{
-    CALL_EdgeFlagv( GET_DISPATCH(), (
-         (const GLboolean *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_End(GLbyte * pc)
-{
-    CALL_End( GET_DISPATCH(), () );
-}
-
-void __glXDisp_Indexdv(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 8);
-        pc -= 4;
-    }
-#endif
-
-    CALL_Indexdv( GET_DISPATCH(), (
-         (const GLdouble *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Indexfv(GLbyte * pc)
-{
-    CALL_Indexfv( GET_DISPATCH(), (
-         (const GLfloat *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Indexiv(GLbyte * pc)
-{
-    CALL_Indexiv( GET_DISPATCH(), (
-         (const GLint *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Indexsv(GLbyte * pc)
-{
-    CALL_Indexsv( GET_DISPATCH(), (
-         (const GLshort *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Normal3bv(GLbyte * pc)
-{
-    CALL_Normal3bv( GET_DISPATCH(), (
-         (const GLbyte *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Normal3dv(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 24);
-        pc -= 4;
-    }
-#endif
-
-    CALL_Normal3dv( GET_DISPATCH(), (
-         (const GLdouble *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Normal3fv(GLbyte * pc)
-{
-    CALL_Normal3fv( GET_DISPATCH(), (
-         (const GLfloat *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Normal3iv(GLbyte * pc)
-{
-    CALL_Normal3iv( GET_DISPATCH(), (
-         (const GLint *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Normal3sv(GLbyte * pc)
-{
-    CALL_Normal3sv( GET_DISPATCH(), (
-         (const GLshort *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_RasterPos2dv(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 16);
-        pc -= 4;
-    }
-#endif
-
-    CALL_RasterPos2dv( GET_DISPATCH(), (
-         (const GLdouble *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_RasterPos2fv(GLbyte * pc)
-{
-    CALL_RasterPos2fv( GET_DISPATCH(), (
-         (const GLfloat *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_RasterPos2iv(GLbyte * pc)
-{
-    CALL_RasterPos2iv( GET_DISPATCH(), (
-         (const GLint *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_RasterPos2sv(GLbyte * pc)
-{
-    CALL_RasterPos2sv( GET_DISPATCH(), (
-         (const GLshort *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_RasterPos3dv(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 24);
-        pc -= 4;
-    }
-#endif
-
-    CALL_RasterPos3dv( GET_DISPATCH(), (
-         (const GLdouble *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_RasterPos3fv(GLbyte * pc)
-{
-    CALL_RasterPos3fv( GET_DISPATCH(), (
-         (const GLfloat *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_RasterPos3iv(GLbyte * pc)
-{
-    CALL_RasterPos3iv( GET_DISPATCH(), (
-         (const GLint *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_RasterPos3sv(GLbyte * pc)
-{
-    CALL_RasterPos3sv( GET_DISPATCH(), (
-         (const GLshort *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_RasterPos4dv(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 32);
-        pc -= 4;
-    }
-#endif
-
-    CALL_RasterPos4dv( GET_DISPATCH(), (
-         (const GLdouble *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_RasterPos4fv(GLbyte * pc)
-{
-    CALL_RasterPos4fv( GET_DISPATCH(), (
-         (const GLfloat *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_RasterPos4iv(GLbyte * pc)
-{
-    CALL_RasterPos4iv( GET_DISPATCH(), (
-         (const GLint *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_RasterPos4sv(GLbyte * pc)
-{
-    CALL_RasterPos4sv( GET_DISPATCH(), (
-         (const GLshort *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Rectdv(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 32);
-        pc -= 4;
-    }
-#endif
-
-    CALL_Rectdv( GET_DISPATCH(), (
-         (const GLdouble *)(pc +  0),
-         (const GLdouble *)(pc + 16)
-    ) );
-}
-
-void __glXDisp_Rectfv(GLbyte * pc)
-{
-    CALL_Rectfv( GET_DISPATCH(), (
-         (const GLfloat *)(pc +  0),
-         (const GLfloat *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_Rectiv(GLbyte * pc)
-{
-    CALL_Rectiv( GET_DISPATCH(), (
-         (const GLint *)(pc +  0),
-         (const GLint *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_Rectsv(GLbyte * pc)
-{
-    CALL_Rectsv( GET_DISPATCH(), (
-         (const GLshort *)(pc +  0),
-         (const GLshort *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_TexCoord1dv(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 8);
-        pc -= 4;
-    }
-#endif
-
-    CALL_TexCoord1dv( GET_DISPATCH(), (
-         (const GLdouble *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_TexCoord1fv(GLbyte * pc)
-{
-    CALL_TexCoord1fv( GET_DISPATCH(), (
-         (const GLfloat *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_TexCoord1iv(GLbyte * pc)
-{
-    CALL_TexCoord1iv( GET_DISPATCH(), (
-         (const GLint *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_TexCoord1sv(GLbyte * pc)
-{
-    CALL_TexCoord1sv( GET_DISPATCH(), (
-         (const GLshort *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_TexCoord2dv(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 16);
-        pc -= 4;
-    }
-#endif
-
-    CALL_TexCoord2dv( GET_DISPATCH(), (
-         (const GLdouble *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_TexCoord2fv(GLbyte * pc)
-{
-    CALL_TexCoord2fv( GET_DISPATCH(), (
-         (const GLfloat *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_TexCoord2iv(GLbyte * pc)
-{
-    CALL_TexCoord2iv( GET_DISPATCH(), (
-         (const GLint *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_TexCoord2sv(GLbyte * pc)
-{
-    CALL_TexCoord2sv( GET_DISPATCH(), (
-         (const GLshort *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_TexCoord3dv(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 24);
-        pc -= 4;
-    }
-#endif
-
-    CALL_TexCoord3dv( GET_DISPATCH(), (
-         (const GLdouble *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_TexCoord3fv(GLbyte * pc)
-{
-    CALL_TexCoord3fv( GET_DISPATCH(), (
-         (const GLfloat *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_TexCoord3iv(GLbyte * pc)
-{
-    CALL_TexCoord3iv( GET_DISPATCH(), (
-         (const GLint *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_TexCoord3sv(GLbyte * pc)
-{
-    CALL_TexCoord3sv( GET_DISPATCH(), (
-         (const GLshort *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_TexCoord4dv(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 32);
-        pc -= 4;
-    }
-#endif
-
-    CALL_TexCoord4dv( GET_DISPATCH(), (
-         (const GLdouble *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_TexCoord4fv(GLbyte * pc)
-{
-    CALL_TexCoord4fv( GET_DISPATCH(), (
-         (const GLfloat *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_TexCoord4iv(GLbyte * pc)
-{
-    CALL_TexCoord4iv( GET_DISPATCH(), (
-         (const GLint *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_TexCoord4sv(GLbyte * pc)
-{
-    CALL_TexCoord4sv( GET_DISPATCH(), (
-         (const GLshort *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Vertex2dv(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 16);
-        pc -= 4;
-    }
-#endif
-
-    CALL_Vertex2dv( GET_DISPATCH(), (
-         (const GLdouble *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Vertex2fv(GLbyte * pc)
-{
-    CALL_Vertex2fv( GET_DISPATCH(), (
-         (const GLfloat *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Vertex2iv(GLbyte * pc)
-{
-    CALL_Vertex2iv( GET_DISPATCH(), (
-         (const GLint *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Vertex2sv(GLbyte * pc)
-{
-    CALL_Vertex2sv( GET_DISPATCH(), (
-         (const GLshort *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Vertex3dv(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 24);
-        pc -= 4;
-    }
-#endif
-
-    CALL_Vertex3dv( GET_DISPATCH(), (
-         (const GLdouble *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Vertex3fv(GLbyte * pc)
-{
-    CALL_Vertex3fv( GET_DISPATCH(), (
-         (const GLfloat *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Vertex3iv(GLbyte * pc)
-{
-    CALL_Vertex3iv( GET_DISPATCH(), (
-         (const GLint *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Vertex3sv(GLbyte * pc)
-{
-    CALL_Vertex3sv( GET_DISPATCH(), (
-         (const GLshort *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Vertex4dv(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 32);
-        pc -= 4;
-    }
-#endif
-
-    CALL_Vertex4dv( GET_DISPATCH(), (
-         (const GLdouble *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Vertex4fv(GLbyte * pc)
-{
-    CALL_Vertex4fv( GET_DISPATCH(), (
-         (const GLfloat *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Vertex4iv(GLbyte * pc)
-{
-    CALL_Vertex4iv( GET_DISPATCH(), (
-         (const GLint *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Vertex4sv(GLbyte * pc)
-{
-    CALL_Vertex4sv( GET_DISPATCH(), (
-         (const GLshort *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_ClipPlane(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 36);
-        pc -= 4;
-    }
-#endif
-
-    CALL_ClipPlane( GET_DISPATCH(), (
-        *(GLenum   *)(pc + 32),
-         (const GLdouble *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_ColorMaterial(GLbyte * pc)
-{
-    CALL_ColorMaterial( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLenum   *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_CullFace(GLbyte * pc)
-{
-    CALL_CullFace( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Fogf(GLbyte * pc)
-{
-    CALL_Fogf( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLfloat  *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_Fogfv(GLbyte * pc)
-{
-    const GLenum pname = *(GLenum   *)(pc +  0);
-    const GLfloat * params;
-
-    params = (const GLfloat *) (pc + 4);
-
-    CALL_Fogfv( GET_DISPATCH(), (
-        pname,
-        params
-    ) );
-}
-
-void __glXDisp_Fogi(GLbyte * pc)
-{
-    CALL_Fogi( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLint    *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_Fogiv(GLbyte * pc)
-{
-    const GLenum pname = *(GLenum   *)(pc +  0);
-    const GLint * params;
-
-    params = (const GLint *) (pc + 4);
-
-    CALL_Fogiv( GET_DISPATCH(), (
-        pname,
-        params
-    ) );
-}
-
-void __glXDisp_FrontFace(GLbyte * pc)
-{
-    CALL_FrontFace( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Hint(GLbyte * pc)
-{
-    CALL_Hint( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLenum   *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_Lightf(GLbyte * pc)
-{
-    CALL_Lightf( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLenum   *)(pc +  4),
-        *(GLfloat  *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_Lightfv(GLbyte * pc)
-{
-    const GLenum pname = *(GLenum   *)(pc +  4);
-    const GLfloat * params;
-
-    params = (const GLfloat *) (pc + 8);
-
-    CALL_Lightfv( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        pname,
-        params
-    ) );
-}
-
-void __glXDisp_Lighti(GLbyte * pc)
-{
-    CALL_Lighti( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLenum   *)(pc +  4),
-        *(GLint    *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_Lightiv(GLbyte * pc)
-{
-    const GLenum pname = *(GLenum   *)(pc +  4);
-    const GLint * params;
-
-    params = (const GLint *) (pc + 8);
-
-    CALL_Lightiv( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        pname,
-        params
-    ) );
-}
-
-void __glXDisp_LightModelf(GLbyte * pc)
-{
-    CALL_LightModelf( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLfloat  *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_LightModelfv(GLbyte * pc)
-{
-    const GLenum pname = *(GLenum   *)(pc +  0);
-    const GLfloat * params;
-
-    params = (const GLfloat *) (pc + 4);
-
-    CALL_LightModelfv( GET_DISPATCH(), (
-        pname,
-        params
-    ) );
-}
-
-void __glXDisp_LightModeli(GLbyte * pc)
-{
-    CALL_LightModeli( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLint    *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_LightModeliv(GLbyte * pc)
-{
-    const GLenum pname = *(GLenum   *)(pc +  0);
-    const GLint * params;
-
-    params = (const GLint *) (pc + 4);
-
-    CALL_LightModeliv( GET_DISPATCH(), (
-        pname,
-        params
-    ) );
-}
-
-void __glXDisp_LineStipple(GLbyte * pc)
-{
-    CALL_LineStipple( GET_DISPATCH(), (
-        *(GLint    *)(pc +  0),
-        *(GLushort *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_LineWidth(GLbyte * pc)
-{
-    CALL_LineWidth( GET_DISPATCH(), (
-        *(GLfloat  *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Materialf(GLbyte * pc)
-{
-    CALL_Materialf( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLenum   *)(pc +  4),
-        *(GLfloat  *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_Materialfv(GLbyte * pc)
-{
-    const GLenum pname = *(GLenum   *)(pc +  4);
-    const GLfloat * params;
-
-    params = (const GLfloat *) (pc + 8);
-
-    CALL_Materialfv( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        pname,
-        params
-    ) );
-}
-
-void __glXDisp_Materiali(GLbyte * pc)
-{
-    CALL_Materiali( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLenum   *)(pc +  4),
-        *(GLint    *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_Materialiv(GLbyte * pc)
-{
-    const GLenum pname = *(GLenum   *)(pc +  4);
-    const GLint * params;
-
-    params = (const GLint *) (pc + 8);
-
-    CALL_Materialiv( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        pname,
-        params
-    ) );
-}
-
-void __glXDisp_PointSize(GLbyte * pc)
-{
-    CALL_PointSize( GET_DISPATCH(), (
-        *(GLfloat  *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_PolygonMode(GLbyte * pc)
-{
-    CALL_PolygonMode( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLenum   *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_PolygonStipple(GLbyte * pc)
-{
-    const GLubyte * const mask = (const GLubyte *) (pc + 20);
-    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
-
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) hdr->rowLength) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) hdr->skipRows) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) hdr->skipPixels) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) hdr->alignment) );
-
-    CALL_PolygonStipple( GET_DISPATCH(), (
-        mask
-    ) );
-}
-
-void __glXDisp_Scissor(GLbyte * pc)
-{
-    CALL_Scissor( GET_DISPATCH(), (
-        *(GLint    *)(pc +  0),
-        *(GLint    *)(pc +  4),
-        *(GLsizei  *)(pc +  8),
-        *(GLsizei  *)(pc + 12)
-    ) );
-}
-
-void __glXDisp_ShadeModel(GLbyte * pc)
-{
-    CALL_ShadeModel( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_TexParameterf(GLbyte * pc)
-{
-    CALL_TexParameterf( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLenum   *)(pc +  4),
-        *(GLfloat  *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_TexParameterfv(GLbyte * pc)
-{
-    const GLenum pname = *(GLenum   *)(pc +  4);
-    const GLfloat * params;
-
-    params = (const GLfloat *) (pc + 8);
-
-    CALL_TexParameterfv( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        pname,
-        params
-    ) );
-}
-
-void __glXDisp_TexParameteri(GLbyte * pc)
-{
-    CALL_TexParameteri( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLenum   *)(pc +  4),
-        *(GLint    *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_TexParameteriv(GLbyte * pc)
-{
-    const GLenum pname = *(GLenum   *)(pc +  4);
-    const GLint * params;
-
-    params = (const GLint *) (pc + 8);
-
-    CALL_TexParameteriv( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        pname,
-        params
-    ) );
-}
-
-void __glXDisp_TexImage1D(GLbyte * pc)
-{
-    const GLvoid * const pixels = (const GLvoid *) (pc + 52);
-    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
-
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) hdr->rowLength) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) hdr->skipRows) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) hdr->skipPixels) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) hdr->alignment) );
-
-    CALL_TexImage1D( GET_DISPATCH(), (
-        *(GLenum   *)(pc + 20),
-        *(GLint    *)(pc + 24),
-        *(GLint    *)(pc + 28),
-        *(GLsizei  *)(pc + 32),
-        *(GLint    *)(pc + 40),
-        *(GLenum   *)(pc + 44),
-        *(GLenum   *)(pc + 48),
-        pixels
-    ) );
-}
-
-void __glXDisp_TexImage2D(GLbyte * pc)
-{
-    const GLvoid * const pixels = (const GLvoid *) (pc + 52);
-    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
-
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) hdr->rowLength) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) hdr->skipRows) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) hdr->skipPixels) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) hdr->alignment) );
-
-    CALL_TexImage2D( GET_DISPATCH(), (
-        *(GLenum   *)(pc + 20),
-        *(GLint    *)(pc + 24),
-        *(GLint    *)(pc + 28),
-        *(GLsizei  *)(pc + 32),
-        *(GLsizei  *)(pc + 36),
-        *(GLint    *)(pc + 40),
-        *(GLenum   *)(pc + 44),
-        *(GLenum   *)(pc + 48),
-        pixels
-    ) );
-}
-
-void __glXDisp_TexEnvf(GLbyte * pc)
-{
-    CALL_TexEnvf( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLenum   *)(pc +  4),
-        *(GLfloat  *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_TexEnvfv(GLbyte * pc)
-{
-    const GLenum pname = *(GLenum   *)(pc +  4);
-    const GLfloat * params;
-
-    params = (const GLfloat *) (pc + 8);
-
-    CALL_TexEnvfv( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        pname,
-        params
-    ) );
-}
-
-void __glXDisp_TexEnvi(GLbyte * pc)
-{
-    CALL_TexEnvi( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLenum   *)(pc +  4),
-        *(GLint    *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_TexEnviv(GLbyte * pc)
-{
-    const GLenum pname = *(GLenum   *)(pc +  4);
-    const GLint * params;
-
-    params = (const GLint *) (pc + 8);
-
-    CALL_TexEnviv( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        pname,
-        params
-    ) );
-}
-
-void __glXDisp_TexGend(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 16);
-        pc -= 4;
-    }
-#endif
-
-    CALL_TexGend( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  8),
-        *(GLenum   *)(pc + 12),
-        *(GLdouble *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_TexGendv(GLbyte * pc)
-{
-    const GLenum pname = *(GLenum   *)(pc +  4);
-    const GLdouble * params;
-
-#ifdef __GLX_ALIGN64
-    const GLuint compsize = __glTexGendv_size(pname);
-    const GLuint cmdlen = 12 + __GLX_PAD((compsize * 8)) - 4;
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, cmdlen);
-        pc -= 4;
-    }
-#endif
-
-    params = (const GLdouble *) (pc + 8);
-
-    CALL_TexGendv( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        pname,
-        params
-    ) );
-}
-
-void __glXDisp_TexGenf(GLbyte * pc)
-{
-    CALL_TexGenf( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLenum   *)(pc +  4),
-        *(GLfloat  *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_TexGenfv(GLbyte * pc)
-{
-    const GLenum pname = *(GLenum   *)(pc +  4);
-    const GLfloat * params;
-
-    params = (const GLfloat *) (pc + 8);
-
-    CALL_TexGenfv( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        pname,
-        params
-    ) );
-}
-
-void __glXDisp_TexGeni(GLbyte * pc)
-{
-    CALL_TexGeni( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLenum   *)(pc +  4),
-        *(GLint    *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_TexGeniv(GLbyte * pc)
-{
-    const GLenum pname = *(GLenum   *)(pc +  4);
-    const GLint * params;
-
-    params = (const GLint *) (pc + 8);
-
-    CALL_TexGeniv( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        pname,
-        params
-    ) );
-}
-
-void __glXDisp_InitNames(GLbyte * pc)
-{
-    CALL_InitNames( GET_DISPATCH(), () );
-}
-
-void __glXDisp_LoadName(GLbyte * pc)
-{
-    CALL_LoadName( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_PassThrough(GLbyte * pc)
-{
-    CALL_PassThrough( GET_DISPATCH(), (
-        *(GLfloat  *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_PopName(GLbyte * pc)
-{
-    CALL_PopName( GET_DISPATCH(), () );
-}
-
-void __glXDisp_PushName(GLbyte * pc)
-{
-    CALL_PushName( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_DrawBuffer(GLbyte * pc)
-{
-    CALL_DrawBuffer( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Clear(GLbyte * pc)
-{
-    CALL_Clear( GET_DISPATCH(), (
-        *(GLbitfield *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_ClearAccum(GLbyte * pc)
-{
-    CALL_ClearAccum( GET_DISPATCH(), (
-        *(GLfloat  *)(pc +  0),
-        *(GLfloat  *)(pc +  4),
-        *(GLfloat  *)(pc +  8),
-        *(GLfloat  *)(pc + 12)
-    ) );
-}
-
-void __glXDisp_ClearIndex(GLbyte * pc)
-{
-    CALL_ClearIndex( GET_DISPATCH(), (
-        *(GLfloat  *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_ClearColor(GLbyte * pc)
-{
-    CALL_ClearColor( GET_DISPATCH(), (
-        *(GLclampf *)(pc +  0),
-        *(GLclampf *)(pc +  4),
-        *(GLclampf *)(pc +  8),
-        *(GLclampf *)(pc + 12)
-    ) );
-}
-
-void __glXDisp_ClearStencil(GLbyte * pc)
-{
-    CALL_ClearStencil( GET_DISPATCH(), (
-        *(GLint    *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_ClearDepth(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 8);
-        pc -= 4;
-    }
-#endif
-
-    CALL_ClearDepth( GET_DISPATCH(), (
-        *(GLclampd *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_StencilMask(GLbyte * pc)
-{
-    CALL_StencilMask( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_ColorMask(GLbyte * pc)
-{
-    CALL_ColorMask( GET_DISPATCH(), (
-        *(GLboolean *)(pc +  0),
-        *(GLboolean *)(pc +  1),
-        *(GLboolean *)(pc +  2),
-        *(GLboolean *)(pc +  3)
-    ) );
-}
-
-void __glXDisp_DepthMask(GLbyte * pc)
-{
-    CALL_DepthMask( GET_DISPATCH(), (
-        *(GLboolean *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_IndexMask(GLbyte * pc)
-{
-    CALL_IndexMask( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Accum(GLbyte * pc)
-{
-    CALL_Accum( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLfloat  *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_Disable(GLbyte * pc)
-{
-    CALL_Disable( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Enable(GLbyte * pc)
-{
-    CALL_Enable( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_PopAttrib(GLbyte * pc)
-{
-    CALL_PopAttrib( GET_DISPATCH(), () );
-}
-
-void __glXDisp_PushAttrib(GLbyte * pc)
-{
-    CALL_PushAttrib( GET_DISPATCH(), (
-        *(GLbitfield *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_MapGrid1d(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 20);
-        pc -= 4;
-    }
-#endif
-
-    CALL_MapGrid1d( GET_DISPATCH(), (
-        *(GLint    *)(pc + 16),
-        *(GLdouble *)(pc +  0),
-        *(GLdouble *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_MapGrid1f(GLbyte * pc)
-{
-    CALL_MapGrid1f( GET_DISPATCH(), (
-        *(GLint    *)(pc +  0),
-        *(GLfloat  *)(pc +  4),
-        *(GLfloat  *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_MapGrid2d(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 40);
-        pc -= 4;
-    }
-#endif
-
-    CALL_MapGrid2d( GET_DISPATCH(), (
-        *(GLint    *)(pc + 32),
-        *(GLdouble *)(pc +  0),
-        *(GLdouble *)(pc +  8),
-        *(GLint    *)(pc + 36),
-        *(GLdouble *)(pc + 16),
-        *(GLdouble *)(pc + 24)
-    ) );
-}
-
-void __glXDisp_MapGrid2f(GLbyte * pc)
-{
-    CALL_MapGrid2f( GET_DISPATCH(), (
-        *(GLint    *)(pc +  0),
-        *(GLfloat  *)(pc +  4),
-        *(GLfloat  *)(pc +  8),
-        *(GLint    *)(pc + 12),
-        *(GLfloat  *)(pc + 16),
-        *(GLfloat  *)(pc + 20)
-    ) );
-}
-
-void __glXDisp_EvalCoord1dv(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 8);
-        pc -= 4;
-    }
-#endif
-
-    CALL_EvalCoord1dv( GET_DISPATCH(), (
-         (const GLdouble *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_EvalCoord1fv(GLbyte * pc)
-{
-    CALL_EvalCoord1fv( GET_DISPATCH(), (
-         (const GLfloat *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_EvalCoord2dv(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 16);
-        pc -= 4;
-    }
-#endif
-
-    CALL_EvalCoord2dv( GET_DISPATCH(), (
-         (const GLdouble *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_EvalCoord2fv(GLbyte * pc)
-{
-    CALL_EvalCoord2fv( GET_DISPATCH(), (
-         (const GLfloat *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_EvalMesh1(GLbyte * pc)
-{
-    CALL_EvalMesh1( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLint    *)(pc +  4),
-        *(GLint    *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_EvalPoint1(GLbyte * pc)
-{
-    CALL_EvalPoint1( GET_DISPATCH(), (
-        *(GLint    *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_EvalMesh2(GLbyte * pc)
-{
-    CALL_EvalMesh2( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLint    *)(pc +  4),
-        *(GLint    *)(pc +  8),
-        *(GLint    *)(pc + 12),
-        *(GLint    *)(pc + 16)
-    ) );
-}
-
-void __glXDisp_EvalPoint2(GLbyte * pc)
-{
-    CALL_EvalPoint2( GET_DISPATCH(), (
-        *(GLint    *)(pc +  0),
-        *(GLint    *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_AlphaFunc(GLbyte * pc)
-{
-    CALL_AlphaFunc( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLclampf *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_BlendFunc(GLbyte * pc)
-{
-    CALL_BlendFunc( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLenum   *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_LogicOp(GLbyte * pc)
-{
-    CALL_LogicOp( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_StencilFunc(GLbyte * pc)
-{
-    CALL_StencilFunc( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLint    *)(pc +  4),
-        *(GLuint   *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_StencilOp(GLbyte * pc)
-{
-    CALL_StencilOp( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLenum   *)(pc +  4),
-        *(GLenum   *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_DepthFunc(GLbyte * pc)
-{
-    CALL_DepthFunc( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_PixelZoom(GLbyte * pc)
-{
-    CALL_PixelZoom( GET_DISPATCH(), (
-        *(GLfloat  *)(pc +  0),
-        *(GLfloat  *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_PixelTransferf(GLbyte * pc)
-{
-    CALL_PixelTransferf( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLfloat  *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_PixelTransferi(GLbyte * pc)
-{
-    CALL_PixelTransferi( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLint    *)(pc +  4)
-    ) );
-}
-
-int __glXDisp_PixelStoref(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        CALL_PixelStoref( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            *(GLfloat  *)(pc +  4)
-        ) );
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_PixelStorei(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        CALL_PixelStorei( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            *(GLint    *)(pc +  4)
-        ) );
-        error = Success;
-    }
-
-    return error;
-}
-
-void __glXDisp_PixelMapfv(GLbyte * pc)
-{
-    const GLsizei mapsize = *(GLsizei  *)(pc +  4);
-
-    CALL_PixelMapfv( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        mapsize,
-         (const GLfloat *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_PixelMapuiv(GLbyte * pc)
-{
-    const GLsizei mapsize = *(GLsizei  *)(pc +  4);
-
-    CALL_PixelMapuiv( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        mapsize,
-         (const GLuint *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_PixelMapusv(GLbyte * pc)
-{
-    const GLsizei mapsize = *(GLsizei  *)(pc +  4);
-
-    CALL_PixelMapusv( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        mapsize,
-         (const GLushort *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_ReadBuffer(GLbyte * pc)
-{
-    CALL_ReadBuffer( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_CopyPixels(GLbyte * pc)
-{
-    CALL_CopyPixels( GET_DISPATCH(), (
-        *(GLint    *)(pc +  0),
-        *(GLint    *)(pc +  4),
-        *(GLsizei  *)(pc +  8),
-        *(GLsizei  *)(pc + 12),
-        *(GLenum   *)(pc + 16)
-    ) );
-}
-
-void __glXDisp_DrawPixels(GLbyte * pc)
-{
-    const GLvoid * const pixels = (const GLvoid *) (pc + 36);
-    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
-
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) hdr->rowLength) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) hdr->skipRows) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) hdr->skipPixels) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) hdr->alignment) );
-
-    CALL_DrawPixels( GET_DISPATCH(), (
-        *(GLsizei  *)(pc + 20),
-        *(GLsizei  *)(pc + 24),
-        *(GLenum   *)(pc + 28),
-        *(GLenum   *)(pc + 32),
-        pixels
-    ) );
-}
-
-int __glXDisp_GetBooleanv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  0);
-
-        const GLuint compsize = __glGetBooleanv_size(pname);
-        GLboolean answerBuffer[200];
-        GLboolean * params = __glXGetAnswerBuffer(cl, compsize, answerBuffer, sizeof(answerBuffer), 1);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetBooleanv( GET_DISPATCH(), (
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 1, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetClipPlane(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLdouble equation[4];
-        CALL_GetClipPlane( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            equation
-        ) );
-        __glXSendReply(cl->client, equation, 4, 8, GL_TRUE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetDoublev(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  0);
-
-        const GLuint compsize = __glGetDoublev_size(pname);
-        GLdouble answerBuffer[200];
-        GLdouble * params = __glXGetAnswerBuffer(cl, compsize * 8, answerBuffer, sizeof(answerBuffer), 8);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetDoublev( GET_DISPATCH(), (
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 8, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetError(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLenum retval;
-        retval = CALL_GetError( GET_DISPATCH(), () );
-        __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetFloatv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  0);
-
-        const GLuint compsize = __glGetFloatv_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetFloatv( GET_DISPATCH(), (
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetIntegerv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  0);
-
-        const GLuint compsize = __glGetIntegerv_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetIntegerv( GET_DISPATCH(), (
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetLightfv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetLightfv_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetLightfv( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetLightiv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetLightiv_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetLightiv( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetMapdv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum target = *(GLenum   *)(pc +  0);
-        const GLenum query = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetMapdv_size(target,query);
-        GLdouble answerBuffer[200];
-        GLdouble * v = __glXGetAnswerBuffer(cl, compsize * 8, answerBuffer, sizeof(answerBuffer), 8);
-
-        if (v == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetMapdv( GET_DISPATCH(), (
-            target,
-            query,
-            v
-        ) );
-        __glXSendReply(cl->client, v, compsize, 8, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetMapfv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum target = *(GLenum   *)(pc +  0);
-        const GLenum query = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetMapfv_size(target,query);
-        GLfloat answerBuffer[200];
-        GLfloat * v = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (v == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetMapfv( GET_DISPATCH(), (
-            target,
-            query,
-            v
-        ) );
-        __glXSendReply(cl->client, v, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetMapiv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum target = *(GLenum   *)(pc +  0);
-        const GLenum query = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetMapiv_size(target,query);
-        GLint answerBuffer[200];
-        GLint * v = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (v == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetMapiv( GET_DISPATCH(), (
-            target,
-            query,
-            v
-        ) );
-        __glXSendReply(cl->client, v, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetMaterialfv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetMaterialfv_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetMaterialfv( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetMaterialiv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetMaterialiv_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetMaterialiv( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetPixelMapfv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum map = *(GLenum   *)(pc +  0);
-
-        const GLuint compsize = __glGetPixelMapfv_size(map);
-        GLfloat answerBuffer[200];
-        GLfloat * values = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (values == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetPixelMapfv( GET_DISPATCH(), (
-            map,
-            values
-        ) );
-        __glXSendReply(cl->client, values, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetPixelMapuiv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum map = *(GLenum   *)(pc +  0);
-
-        const GLuint compsize = __glGetPixelMapuiv_size(map);
-        GLuint answerBuffer[200];
-        GLuint * values = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (values == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetPixelMapuiv( GET_DISPATCH(), (
-            map,
-            values
-        ) );
-        __glXSendReply(cl->client, values, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetPixelMapusv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum map = *(GLenum   *)(pc +  0);
-
-        const GLuint compsize = __glGetPixelMapusv_size(map);
-        GLushort answerBuffer[200];
-        GLushort * values = __glXGetAnswerBuffer(cl, compsize * 2, answerBuffer, sizeof(answerBuffer), 2);
-
-        if (values == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetPixelMapusv( GET_DISPATCH(), (
-            map,
-            values
-        ) );
-        __glXSendReply(cl->client, values, compsize, 2, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetTexEnvfv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetTexEnvfv_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetTexEnvfv( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetTexEnviv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetTexEnviv_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetTexEnviv( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetTexGendv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetTexGendv_size(pname);
-        GLdouble answerBuffer[200];
-        GLdouble * params = __glXGetAnswerBuffer(cl, compsize * 8, answerBuffer, sizeof(answerBuffer), 8);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetTexGendv( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 8, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetTexGenfv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetTexGenfv_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetTexGenfv( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetTexGeniv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetTexGeniv_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetTexGeniv( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetTexParameterfv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetTexParameterfv_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetTexParameterfv( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetTexParameteriv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetTexParameteriv_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetTexParameteriv( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetTexLevelParameterfv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  8);
-
-        const GLuint compsize = __glGetTexLevelParameterfv_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetTexLevelParameterfv( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            *(GLint    *)(pc +  4),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetTexLevelParameteriv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  8);
-
-        const GLuint compsize = __glGetTexLevelParameteriv_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetTexLevelParameteriv( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            *(GLint    *)(pc +  4),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_IsEnabled(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLboolean retval;
-        retval = CALL_IsEnabled( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0)
-        ) );
-        __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_IsList(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLboolean retval;
-        retval = CALL_IsList( GET_DISPATCH(), (
-            *(GLuint   *)(pc +  0)
-        ) );
-        __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-void __glXDisp_DepthRange(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 16);
-        pc -= 4;
-    }
-#endif
-
-    CALL_DepthRange( GET_DISPATCH(), (
-        *(GLclampd *)(pc +  0),
-        *(GLclampd *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_Frustum(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 48);
-        pc -= 4;
-    }
-#endif
-
-    CALL_Frustum( GET_DISPATCH(), (
-        *(GLdouble *)(pc +  0),
-        *(GLdouble *)(pc +  8),
-        *(GLdouble *)(pc + 16),
-        *(GLdouble *)(pc + 24),
-        *(GLdouble *)(pc + 32),
-        *(GLdouble *)(pc + 40)
-    ) );
-}
-
-void __glXDisp_LoadIdentity(GLbyte * pc)
-{
-    CALL_LoadIdentity( GET_DISPATCH(), () );
-}
-
-void __glXDisp_LoadMatrixf(GLbyte * pc)
-{
-    CALL_LoadMatrixf( GET_DISPATCH(), (
-         (const GLfloat *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_LoadMatrixd(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 128);
-        pc -= 4;
-    }
-#endif
-
-    CALL_LoadMatrixd( GET_DISPATCH(), (
-         (const GLdouble *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_MatrixMode(GLbyte * pc)
-{
-    CALL_MatrixMode( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_MultMatrixf(GLbyte * pc)
-{
-    CALL_MultMatrixf( GET_DISPATCH(), (
-         (const GLfloat *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_MultMatrixd(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 128);
-        pc -= 4;
-    }
-#endif
-
-    CALL_MultMatrixd( GET_DISPATCH(), (
-         (const GLdouble *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_Ortho(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 48);
-        pc -= 4;
-    }
-#endif
-
-    CALL_Ortho( GET_DISPATCH(), (
-        *(GLdouble *)(pc +  0),
-        *(GLdouble *)(pc +  8),
-        *(GLdouble *)(pc + 16),
-        *(GLdouble *)(pc + 24),
-        *(GLdouble *)(pc + 32),
-        *(GLdouble *)(pc + 40)
-    ) );
-}
-
-void __glXDisp_PopMatrix(GLbyte * pc)
-{
-    CALL_PopMatrix( GET_DISPATCH(), () );
-}
-
-void __glXDisp_PushMatrix(GLbyte * pc)
-{
-    CALL_PushMatrix( GET_DISPATCH(), () );
-}
-
-void __glXDisp_Rotated(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 32);
-        pc -= 4;
-    }
-#endif
-
-    CALL_Rotated( GET_DISPATCH(), (
-        *(GLdouble *)(pc +  0),
-        *(GLdouble *)(pc +  8),
-        *(GLdouble *)(pc + 16),
-        *(GLdouble *)(pc + 24)
-    ) );
-}
-
-void __glXDisp_Rotatef(GLbyte * pc)
-{
-    CALL_Rotatef( GET_DISPATCH(), (
-        *(GLfloat  *)(pc +  0),
-        *(GLfloat  *)(pc +  4),
-        *(GLfloat  *)(pc +  8),
-        *(GLfloat  *)(pc + 12)
-    ) );
-}
-
-void __glXDisp_Scaled(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 24);
-        pc -= 4;
-    }
-#endif
-
-    CALL_Scaled( GET_DISPATCH(), (
-        *(GLdouble *)(pc +  0),
-        *(GLdouble *)(pc +  8),
-        *(GLdouble *)(pc + 16)
-    ) );
-}
-
-void __glXDisp_Scalef(GLbyte * pc)
-{
-    CALL_Scalef( GET_DISPATCH(), (
-        *(GLfloat  *)(pc +  0),
-        *(GLfloat  *)(pc +  4),
-        *(GLfloat  *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_Translated(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 24);
-        pc -= 4;
-    }
-#endif
-
-    CALL_Translated( GET_DISPATCH(), (
-        *(GLdouble *)(pc +  0),
-        *(GLdouble *)(pc +  8),
-        *(GLdouble *)(pc + 16)
-    ) );
-}
-
-void __glXDisp_Translatef(GLbyte * pc)
-{
-    CALL_Translatef( GET_DISPATCH(), (
-        *(GLfloat  *)(pc +  0),
-        *(GLfloat  *)(pc +  4),
-        *(GLfloat  *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_Viewport(GLbyte * pc)
-{
-    CALL_Viewport( GET_DISPATCH(), (
-        *(GLint    *)(pc +  0),
-        *(GLint    *)(pc +  4),
-        *(GLsizei  *)(pc +  8),
-        *(GLsizei  *)(pc + 12)
-    ) );
-}
-
-void __glXDisp_BindTexture(GLbyte * pc)
-{
-    CALL_BindTexture( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLuint   *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_Indexubv(GLbyte * pc)
-{
-    CALL_Indexubv( GET_DISPATCH(), (
-         (const GLubyte *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_PolygonOffset(GLbyte * pc)
-{
-    CALL_PolygonOffset( GET_DISPATCH(), (
-        *(GLfloat  *)(pc +  0),
-        *(GLfloat  *)(pc +  4)
-    ) );
-}
-
-int __glXDisp_AreTexturesResident(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLsizei n = *(GLsizei  *)(pc +  0);
-
-        GLboolean retval;
-        GLboolean answerBuffer[200];
-        GLboolean * residences = __glXGetAnswerBuffer(cl, n, answerBuffer, sizeof(answerBuffer), 1);
-        retval = CALL_AreTexturesResident( GET_DISPATCH(), (
-            n,
-             (const GLuint *)(pc +  4),
-            residences
-        ) );
-        __glXSendReply(cl->client, residences, n, 1, GL_TRUE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_AreTexturesResidentEXT(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLsizei n = *(GLsizei  *)(pc +  0);
-
-        GLboolean retval;
-        GLboolean answerBuffer[200];
-        GLboolean * residences = __glXGetAnswerBuffer(cl, n, answerBuffer, sizeof(answerBuffer), 1);
-        retval = CALL_AreTexturesResident( GET_DISPATCH(), (
-            n,
-             (const GLuint *)(pc +  4),
-            residences
-        ) );
-        __glXSendReply(cl->client, residences, n, 1, GL_TRUE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-void __glXDisp_CopyTexImage1D(GLbyte * pc)
-{
-    CALL_CopyTexImage1D( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLint    *)(pc +  4),
-        *(GLenum   *)(pc +  8),
-        *(GLint    *)(pc + 12),
-        *(GLint    *)(pc + 16),
-        *(GLsizei  *)(pc + 20),
-        *(GLint    *)(pc + 24)
-    ) );
-}
-
-void __glXDisp_CopyTexImage2D(GLbyte * pc)
-{
-    CALL_CopyTexImage2D( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLint    *)(pc +  4),
-        *(GLenum   *)(pc +  8),
-        *(GLint    *)(pc + 12),
-        *(GLint    *)(pc + 16),
-        *(GLsizei  *)(pc + 20),
-        *(GLsizei  *)(pc + 24),
-        *(GLint    *)(pc + 28)
-    ) );
-}
-
-void __glXDisp_CopyTexSubImage1D(GLbyte * pc)
-{
-    CALL_CopyTexSubImage1D( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLint    *)(pc +  4),
-        *(GLint    *)(pc +  8),
-        *(GLint    *)(pc + 12),
-        *(GLint    *)(pc + 16),
-        *(GLsizei  *)(pc + 20)
-    ) );
-}
-
-void __glXDisp_CopyTexSubImage2D(GLbyte * pc)
-{
-    CALL_CopyTexSubImage2D( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLint    *)(pc +  4),
-        *(GLint    *)(pc +  8),
-        *(GLint    *)(pc + 12),
-        *(GLint    *)(pc + 16),
-        *(GLint    *)(pc + 20),
-        *(GLsizei  *)(pc + 24),
-        *(GLsizei  *)(pc + 28)
-    ) );
-}
-
-int __glXDisp_DeleteTextures(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLsizei n = *(GLsizei  *)(pc +  0);
-
-        CALL_DeleteTextures( GET_DISPATCH(), (
-            n,
-             (const GLuint *)(pc +  4)
-        ) );
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_DeleteTexturesEXT(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLsizei n = *(GLsizei  *)(pc +  0);
-
-        CALL_DeleteTextures( GET_DISPATCH(), (
-            n,
-             (const GLuint *)(pc +  4)
-        ) );
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GenTextures(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLsizei n = *(GLsizei  *)(pc +  0);
-
-        GLuint answerBuffer[200];
-        GLuint * textures = __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer), 4);
-        CALL_GenTextures( GET_DISPATCH(), (
-            n,
-            textures
-        ) );
-        __glXSendReply(cl->client, textures, n, 4, GL_TRUE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GenTexturesEXT(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLsizei n = *(GLsizei  *)(pc +  0);
-
-        GLuint answerBuffer[200];
-        GLuint * textures = __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer), 4);
-        CALL_GenTextures( GET_DISPATCH(), (
-            n,
-            textures
-        ) );
-        __glXSendReply(cl->client, textures, n, 4, GL_TRUE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_IsTexture(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLboolean retval;
-        retval = CALL_IsTexture( GET_DISPATCH(), (
-            *(GLuint   *)(pc +  0)
-        ) );
-        __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_IsTextureEXT(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLboolean retval;
-        retval = CALL_IsTexture( GET_DISPATCH(), (
-            *(GLuint   *)(pc +  0)
-        ) );
-        __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-void __glXDisp_PrioritizeTextures(GLbyte * pc)
-{
-    const GLsizei n = *(GLsizei  *)(pc +  0);
-
-    CALL_PrioritizeTextures( GET_DISPATCH(), (
-        n,
-         (const GLuint *)(pc +  4),
-         (const GLclampf *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_TexSubImage1D(GLbyte * pc)
-{
-    const CARD32 ptr_is_null = *(CARD32 *)(pc + 52);
-    const GLvoid * const pixels = (const GLvoid *) (ptr_is_null != 0) ? NULL : (pc + 56);
-    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
-
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) hdr->rowLength) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) hdr->skipRows) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) hdr->skipPixels) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) hdr->alignment) );
-
-    CALL_TexSubImage1D( GET_DISPATCH(), (
-        *(GLenum   *)(pc + 20),
-        *(GLint    *)(pc + 24),
-        *(GLint    *)(pc + 28),
-        *(GLsizei  *)(pc + 36),
-        *(GLenum   *)(pc + 44),
-        *(GLenum   *)(pc + 48),
-        pixels
-    ) );
-}
-
-void __glXDisp_TexSubImage2D(GLbyte * pc)
-{
-    const CARD32 ptr_is_null = *(CARD32 *)(pc + 52);
-    const GLvoid * const pixels = (const GLvoid *) (ptr_is_null != 0) ? NULL : (pc + 56);
-    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
-
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) hdr->rowLength) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) hdr->skipRows) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) hdr->skipPixels) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) hdr->alignment) );
-
-    CALL_TexSubImage2D( GET_DISPATCH(), (
-        *(GLenum   *)(pc + 20),
-        *(GLint    *)(pc + 24),
-        *(GLint    *)(pc + 28),
-        *(GLint    *)(pc + 32),
-        *(GLsizei  *)(pc + 36),
-        *(GLsizei  *)(pc + 40),
-        *(GLenum   *)(pc + 44),
-        *(GLenum   *)(pc + 48),
-        pixels
-    ) );
-}
-
-void __glXDisp_BlendColor(GLbyte * pc)
-{
-    CALL_BlendColor( GET_DISPATCH(), (
-        *(GLclampf *)(pc +  0),
-        *(GLclampf *)(pc +  4),
-        *(GLclampf *)(pc +  8),
-        *(GLclampf *)(pc + 12)
-    ) );
-}
-
-void __glXDisp_BlendEquation(GLbyte * pc)
-{
-    CALL_BlendEquation( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_ColorTable(GLbyte * pc)
-{
-    const GLvoid * const table = (const GLvoid *) (pc + 40);
-    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
-
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) hdr->rowLength) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) hdr->skipRows) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) hdr->skipPixels) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) hdr->alignment) );
-
-    CALL_ColorTable( GET_DISPATCH(), (
-        *(GLenum   *)(pc + 20),
-        *(GLenum   *)(pc + 24),
-        *(GLsizei  *)(pc + 28),
-        *(GLenum   *)(pc + 32),
-        *(GLenum   *)(pc + 36),
-        table
-    ) );
-}
-
-void __glXDisp_ColorTableParameterfv(GLbyte * pc)
-{
-    const GLenum pname = *(GLenum   *)(pc +  4);
-    const GLfloat * params;
-
-    params = (const GLfloat *) (pc + 8);
-
-    CALL_ColorTableParameterfv( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        pname,
-        params
-    ) );
-}
-
-void __glXDisp_ColorTableParameteriv(GLbyte * pc)
-{
-    const GLenum pname = *(GLenum   *)(pc +  4);
-    const GLint * params;
-
-    params = (const GLint *) (pc + 8);
-
-    CALL_ColorTableParameteriv( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        pname,
-        params
-    ) );
-}
-
-void __glXDisp_CopyColorTable(GLbyte * pc)
-{
-    CALL_CopyColorTable( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLenum   *)(pc +  4),
-        *(GLint    *)(pc +  8),
-        *(GLint    *)(pc + 12),
-        *(GLsizei  *)(pc + 16)
-    ) );
-}
-
-int __glXDisp_GetColorTableParameterfv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetColorTableParameterfv_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetColorTableParameterfv( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetColorTableParameterfvSGI(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetColorTableParameterfv_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetColorTableParameterfv( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetColorTableParameteriv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetColorTableParameteriv_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetColorTableParameteriv( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetColorTableParameterivSGI(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetColorTableParameteriv_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetColorTableParameteriv( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-void __glXDisp_ColorSubTable(GLbyte * pc)
-{
-    const GLvoid * const data = (const GLvoid *) (pc + 40);
-    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
-
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) hdr->rowLength) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) hdr->skipRows) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) hdr->skipPixels) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) hdr->alignment) );
-
-    CALL_ColorSubTable( GET_DISPATCH(), (
-        *(GLenum   *)(pc + 20),
-        *(GLsizei  *)(pc + 24),
-        *(GLsizei  *)(pc + 28),
-        *(GLenum   *)(pc + 32),
-        *(GLenum   *)(pc + 36),
-        data
-    ) );
-}
-
-void __glXDisp_CopyColorSubTable(GLbyte * pc)
-{
-    CALL_CopyColorSubTable( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLsizei  *)(pc +  4),
-        *(GLint    *)(pc +  8),
-        *(GLint    *)(pc + 12),
-        *(GLsizei  *)(pc + 16)
-    ) );
-}
-
-void __glXDisp_ConvolutionFilter1D(GLbyte * pc)
-{
-    const GLvoid * const image = (const GLvoid *) (pc + 44);
-    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
-
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) hdr->rowLength) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) hdr->skipRows) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) hdr->skipPixels) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) hdr->alignment) );
-
-    CALL_ConvolutionFilter1D( GET_DISPATCH(), (
-        *(GLenum   *)(pc + 20),
-        *(GLenum   *)(pc + 24),
-        *(GLsizei  *)(pc + 28),
-        *(GLenum   *)(pc + 36),
-        *(GLenum   *)(pc + 40),
-        image
-    ) );
-}
-
-void __glXDisp_ConvolutionFilter2D(GLbyte * pc)
-{
-    const GLvoid * const image = (const GLvoid *) (pc + 44);
-    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
-
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) hdr->rowLength) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) hdr->skipRows) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) hdr->skipPixels) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) hdr->alignment) );
-
-    CALL_ConvolutionFilter2D( GET_DISPATCH(), (
-        *(GLenum   *)(pc + 20),
-        *(GLenum   *)(pc + 24),
-        *(GLsizei  *)(pc + 28),
-        *(GLsizei  *)(pc + 32),
-        *(GLenum   *)(pc + 36),
-        *(GLenum   *)(pc + 40),
-        image
-    ) );
-}
-
-void __glXDisp_ConvolutionParameterf(GLbyte * pc)
-{
-    CALL_ConvolutionParameterf( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLenum   *)(pc +  4),
-        *(GLfloat  *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_ConvolutionParameterfv(GLbyte * pc)
-{
-    const GLenum pname = *(GLenum   *)(pc +  4);
-    const GLfloat * params;
-
-    params = (const GLfloat *) (pc + 8);
-
-    CALL_ConvolutionParameterfv( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        pname,
-        params
-    ) );
-}
-
-void __glXDisp_ConvolutionParameteri(GLbyte * pc)
-{
-    CALL_ConvolutionParameteri( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLenum   *)(pc +  4),
-        *(GLint    *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_ConvolutionParameteriv(GLbyte * pc)
-{
-    const GLenum pname = *(GLenum   *)(pc +  4);
-    const GLint * params;
-
-    params = (const GLint *) (pc + 8);
-
-    CALL_ConvolutionParameteriv( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        pname,
-        params
-    ) );
-}
-
-void __glXDisp_CopyConvolutionFilter1D(GLbyte * pc)
-{
-    CALL_CopyConvolutionFilter1D( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLenum   *)(pc +  4),
-        *(GLint    *)(pc +  8),
-        *(GLint    *)(pc + 12),
-        *(GLsizei  *)(pc + 16)
-    ) );
-}
-
-void __glXDisp_CopyConvolutionFilter2D(GLbyte * pc)
-{
-    CALL_CopyConvolutionFilter2D( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLenum   *)(pc +  4),
-        *(GLint    *)(pc +  8),
-        *(GLint    *)(pc + 12),
-        *(GLsizei  *)(pc + 16),
-        *(GLsizei  *)(pc + 20)
-    ) );
-}
-
-int __glXDisp_GetConvolutionParameterfv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetConvolutionParameterfv_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetConvolutionParameterfv( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetConvolutionParameterfvEXT(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetConvolutionParameterfv_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetConvolutionParameterfv( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetConvolutionParameteriv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetConvolutionParameteriv_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetConvolutionParameteriv( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetConvolutionParameterivEXT(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetConvolutionParameteriv_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetConvolutionParameteriv( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetHistogramParameterfv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetHistogramParameterfv_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetHistogramParameterfv( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetHistogramParameterfvEXT(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetHistogramParameterfv_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetHistogramParameterfv( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetHistogramParameteriv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetHistogramParameteriv_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetHistogramParameteriv( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetHistogramParameterivEXT(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetHistogramParameteriv_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetHistogramParameteriv( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetMinmaxParameterfv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetMinmaxParameterfv_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetMinmaxParameterfv( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetMinmaxParameterfvEXT(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetMinmaxParameterfv_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetMinmaxParameterfv( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetMinmaxParameteriv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetMinmaxParameteriv_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetMinmaxParameteriv( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetMinmaxParameterivEXT(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetMinmaxParameteriv_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetMinmaxParameteriv( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-void __glXDisp_Histogram(GLbyte * pc)
-{
-    CALL_Histogram( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLsizei  *)(pc +  4),
-        *(GLenum   *)(pc +  8),
-        *(GLboolean *)(pc + 12)
-    ) );
-}
-
-void __glXDisp_Minmax(GLbyte * pc)
-{
-    CALL_Minmax( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLenum   *)(pc +  4),
-        *(GLboolean *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_ResetHistogram(GLbyte * pc)
-{
-    CALL_ResetHistogram( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_ResetMinmax(GLbyte * pc)
-{
-    CALL_ResetMinmax( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_TexImage3D(GLbyte * pc)
-{
-    const CARD32 ptr_is_null = *(CARD32 *)(pc + 76);
-    const GLvoid * const pixels = (const GLvoid *) (ptr_is_null != 0) ? NULL : (pc + 80);
-    __GLXpixel3DHeader * const hdr = (__GLXpixel3DHeader *)(pc);
-
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) hdr->rowLength) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_IMAGE_HEIGHT, (GLint) hdr->imageHeight) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) hdr->skipRows) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_IMAGES,  (GLint) hdr->skipImages) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) hdr->skipPixels) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) hdr->alignment) );
-
-    CALL_TexImage3D( GET_DISPATCH(), (
-        *(GLenum   *)(pc + 36),
-        *(GLint    *)(pc + 40),
-        *(GLint    *)(pc + 44),
-        *(GLsizei  *)(pc + 48),
-        *(GLsizei  *)(pc + 52),
-        *(GLsizei  *)(pc + 56),
-        *(GLint    *)(pc + 64),
-        *(GLenum   *)(pc + 68),
-        *(GLenum   *)(pc + 72),
-        pixels
-    ) );
-}
-
-void __glXDisp_TexSubImage3D(GLbyte * pc)
-{
-    const CARD32 ptr_is_null = *(CARD32 *)(pc + 84);
-    const GLvoid * const pixels = (const GLvoid *) (ptr_is_null != 0) ? NULL : (pc + 88);
-    __GLXpixel3DHeader * const hdr = (__GLXpixel3DHeader *)(pc);
-
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) hdr->rowLength) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_IMAGE_HEIGHT, (GLint) hdr->imageHeight) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) hdr->skipRows) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_IMAGES,  (GLint) hdr->skipImages) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) hdr->skipPixels) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) hdr->alignment) );
-
-    CALL_TexSubImage3D( GET_DISPATCH(), (
-        *(GLenum   *)(pc + 36),
-        *(GLint    *)(pc + 40),
-        *(GLint    *)(pc + 44),
-        *(GLint    *)(pc + 48),
-        *(GLint    *)(pc + 52),
-        *(GLsizei  *)(pc + 60),
-        *(GLsizei  *)(pc + 64),
-        *(GLsizei  *)(pc + 68),
-        *(GLenum   *)(pc + 76),
-        *(GLenum   *)(pc + 80),
-        pixels
-    ) );
-}
-
-void __glXDisp_CopyTexSubImage3D(GLbyte * pc)
-{
-    CALL_CopyTexSubImage3D( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLint    *)(pc +  4),
-        *(GLint    *)(pc +  8),
-        *(GLint    *)(pc + 12),
-        *(GLint    *)(pc + 16),
-        *(GLint    *)(pc + 20),
-        *(GLint    *)(pc + 24),
-        *(GLsizei  *)(pc + 28),
-        *(GLsizei  *)(pc + 32)
-    ) );
-}
-
-void __glXDisp_ActiveTextureARB(GLbyte * pc)
-{
-    CALL_ActiveTextureARB( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_MultiTexCoord1dvARB(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 12);
-        pc -= 4;
-    }
-#endif
-
-    CALL_MultiTexCoord1dvARB( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  8),
-         (const GLdouble *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_MultiTexCoord1fvARB(GLbyte * pc)
-{
-    CALL_MultiTexCoord1fvARB( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-         (const GLfloat *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_MultiTexCoord1ivARB(GLbyte * pc)
-{
-    CALL_MultiTexCoord1ivARB( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-         (const GLint *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_MultiTexCoord1svARB(GLbyte * pc)
-{
-    CALL_MultiTexCoord1svARB( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-         (const GLshort *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_MultiTexCoord2dvARB(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 20);
-        pc -= 4;
-    }
-#endif
-
-    CALL_MultiTexCoord2dvARB( GET_DISPATCH(), (
-        *(GLenum   *)(pc + 16),
-         (const GLdouble *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_MultiTexCoord2fvARB(GLbyte * pc)
-{
-    CALL_MultiTexCoord2fvARB( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-         (const GLfloat *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_MultiTexCoord2ivARB(GLbyte * pc)
-{
-    CALL_MultiTexCoord2ivARB( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-         (const GLint *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_MultiTexCoord2svARB(GLbyte * pc)
-{
-    CALL_MultiTexCoord2svARB( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-         (const GLshort *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_MultiTexCoord3dvARB(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 28);
-        pc -= 4;
-    }
-#endif
-
-    CALL_MultiTexCoord3dvARB( GET_DISPATCH(), (
-        *(GLenum   *)(pc + 24),
-         (const GLdouble *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_MultiTexCoord3fvARB(GLbyte * pc)
-{
-    CALL_MultiTexCoord3fvARB( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-         (const GLfloat *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_MultiTexCoord3ivARB(GLbyte * pc)
-{
-    CALL_MultiTexCoord3ivARB( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-         (const GLint *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_MultiTexCoord3svARB(GLbyte * pc)
-{
-    CALL_MultiTexCoord3svARB( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-         (const GLshort *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_MultiTexCoord4dvARB(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 36);
-        pc -= 4;
-    }
-#endif
-
-    CALL_MultiTexCoord4dvARB( GET_DISPATCH(), (
-        *(GLenum   *)(pc + 32),
-         (const GLdouble *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_MultiTexCoord4fvARB(GLbyte * pc)
-{
-    CALL_MultiTexCoord4fvARB( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-         (const GLfloat *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_MultiTexCoord4ivARB(GLbyte * pc)
-{
-    CALL_MultiTexCoord4ivARB( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-         (const GLint *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_MultiTexCoord4svARB(GLbyte * pc)
-{
-    CALL_MultiTexCoord4svARB( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-         (const GLshort *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_SampleCoverageARB(GLbyte * pc)
-{
-    CALL_SampleCoverageARB( GET_DISPATCH(), (
-        *(GLclampf *)(pc +  0),
-        *(GLboolean *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_CompressedTexImage1DARB(GLbyte * pc)
-{
-    const GLsizei imageSize = *(GLsizei  *)(pc + 20);
-
-    CALL_CompressedTexImage1DARB( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLint    *)(pc +  4),
-        *(GLenum   *)(pc +  8),
-        *(GLsizei  *)(pc + 12),
-        *(GLint    *)(pc + 16),
-        imageSize,
-         (const GLvoid *)(pc + 24)
-    ) );
-}
-
-void __glXDisp_CompressedTexImage2DARB(GLbyte * pc)
-{
-    const GLsizei imageSize = *(GLsizei  *)(pc + 24);
-
-    CALL_CompressedTexImage2DARB( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLint    *)(pc +  4),
-        *(GLenum   *)(pc +  8),
-        *(GLsizei  *)(pc + 12),
-        *(GLsizei  *)(pc + 16),
-        *(GLint    *)(pc + 20),
-        imageSize,
-         (const GLvoid *)(pc + 28)
-    ) );
-}
-
-void __glXDisp_CompressedTexImage3DARB(GLbyte * pc)
-{
-    const GLsizei imageSize = *(GLsizei  *)(pc + 28);
-
-    CALL_CompressedTexImage3DARB( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLint    *)(pc +  4),
-        *(GLenum   *)(pc +  8),
-        *(GLsizei  *)(pc + 12),
-        *(GLsizei  *)(pc + 16),
-        *(GLsizei  *)(pc + 20),
-        *(GLint    *)(pc + 24),
-        imageSize,
-         (const GLvoid *)(pc + 32)
-    ) );
-}
-
-void __glXDisp_CompressedTexSubImage1DARB(GLbyte * pc)
-{
-    const GLsizei imageSize = *(GLsizei  *)(pc + 20);
-
-    CALL_CompressedTexSubImage1DARB( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLint    *)(pc +  4),
-        *(GLint    *)(pc +  8),
-        *(GLsizei  *)(pc + 12),
-        *(GLenum   *)(pc + 16),
-        imageSize,
-         (const GLvoid *)(pc + 24)
-    ) );
-}
-
-void __glXDisp_CompressedTexSubImage2DARB(GLbyte * pc)
-{
-    const GLsizei imageSize = *(GLsizei  *)(pc + 28);
-
-    CALL_CompressedTexSubImage2DARB( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLint    *)(pc +  4),
-        *(GLint    *)(pc +  8),
-        *(GLint    *)(pc + 12),
-        *(GLsizei  *)(pc + 16),
-        *(GLsizei  *)(pc + 20),
-        *(GLenum   *)(pc + 24),
-        imageSize,
-         (const GLvoid *)(pc + 32)
-    ) );
-}
-
-void __glXDisp_CompressedTexSubImage3DARB(GLbyte * pc)
-{
-    const GLsizei imageSize = *(GLsizei  *)(pc + 36);
-
-    CALL_CompressedTexSubImage3DARB( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLint    *)(pc +  4),
-        *(GLint    *)(pc +  8),
-        *(GLint    *)(pc + 12),
-        *(GLint    *)(pc + 16),
-        *(GLsizei  *)(pc + 20),
-        *(GLsizei  *)(pc + 24),
-        *(GLsizei  *)(pc + 28),
-        *(GLenum   *)(pc + 32),
-        imageSize,
-         (const GLvoid *)(pc + 40)
-    ) );
-}
-
-int __glXDisp_GetProgramEnvParameterdvARB(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLdouble params[4];
-        CALL_GetProgramEnvParameterdvARB( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            *(GLuint   *)(pc +  4),
-            params
-        ) );
-        __glXSendReply(cl->client, params, 4, 8, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetProgramEnvParameterfvARB(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLfloat params[4];
-        CALL_GetProgramEnvParameterfvARB( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            *(GLuint   *)(pc +  4),
-            params
-        ) );
-        __glXSendReply(cl->client, params, 4, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetProgramLocalParameterdvARB(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLdouble params[4];
-        CALL_GetProgramLocalParameterdvARB( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            *(GLuint   *)(pc +  4),
-            params
-        ) );
-        __glXSendReply(cl->client, params, 4, 8, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetProgramLocalParameterfvARB(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLfloat params[4];
-        CALL_GetProgramLocalParameterfvARB( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            *(GLuint   *)(pc +  4),
-            params
-        ) );
-        __glXSendReply(cl->client, params, 4, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetProgramivARB(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetProgramivARB_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetProgramivARB( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetVertexAttribdvARB(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetVertexAttribdvARB_size(pname);
-        GLdouble answerBuffer[200];
-        GLdouble * params = __glXGetAnswerBuffer(cl, compsize * 8, answerBuffer, sizeof(answerBuffer), 8);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetVertexAttribdvARB( GET_DISPATCH(), (
-            *(GLuint   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 8, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetVertexAttribfvARB(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetVertexAttribfvARB_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetVertexAttribfvARB( GET_DISPATCH(), (
-            *(GLuint   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetVertexAttribivARB(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetVertexAttribivARB_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetVertexAttribivARB( GET_DISPATCH(), (
-            *(GLuint   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-void __glXDisp_ProgramEnvParameter4dvARB(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 40);
-        pc -= 4;
-    }
-#endif
-
-    CALL_ProgramEnvParameter4dvARB( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLuint   *)(pc +  4),
-         (const GLdouble *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_ProgramEnvParameter4fvARB(GLbyte * pc)
-{
-    CALL_ProgramEnvParameter4fvARB( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLuint   *)(pc +  4),
-         (const GLfloat *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_ProgramLocalParameter4dvARB(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 40);
-        pc -= 4;
-    }
-#endif
-
-    CALL_ProgramLocalParameter4dvARB( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLuint   *)(pc +  4),
-         (const GLdouble *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_ProgramLocalParameter4fvARB(GLbyte * pc)
-{
-    CALL_ProgramLocalParameter4fvARB( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLuint   *)(pc +  4),
-         (const GLfloat *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_ProgramStringARB(GLbyte * pc)
-{
-    const GLsizei len = *(GLsizei  *)(pc +  8);
-
-    CALL_ProgramStringARB( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLenum   *)(pc +  4),
-        len,
-         (const GLvoid *)(pc + 12)
-    ) );
-}
-
-void __glXDisp_VertexAttrib1dvARB(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 12);
-        pc -= 4;
-    }
-#endif
-
-    CALL_VertexAttrib1dvARB( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-         (const GLdouble *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_VertexAttrib1fvARB(GLbyte * pc)
-{
-    CALL_VertexAttrib1fvARB( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-         (const GLfloat *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_VertexAttrib1svARB(GLbyte * pc)
-{
-    CALL_VertexAttrib1svARB( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-         (const GLshort *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_VertexAttrib2dvARB(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 20);
-        pc -= 4;
-    }
-#endif
-
-    CALL_VertexAttrib2dvARB( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-         (const GLdouble *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_VertexAttrib2fvARB(GLbyte * pc)
-{
-    CALL_VertexAttrib2fvARB( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-         (const GLfloat *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_VertexAttrib2svARB(GLbyte * pc)
-{
-    CALL_VertexAttrib2svARB( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-         (const GLshort *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_VertexAttrib3dvARB(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 28);
-        pc -= 4;
-    }
-#endif
-
-    CALL_VertexAttrib3dvARB( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-         (const GLdouble *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_VertexAttrib3fvARB(GLbyte * pc)
-{
-    CALL_VertexAttrib3fvARB( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-         (const GLfloat *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_VertexAttrib3svARB(GLbyte * pc)
-{
-    CALL_VertexAttrib3svARB( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-         (const GLshort *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_VertexAttrib4NbvARB(GLbyte * pc)
-{
-    CALL_VertexAttrib4NbvARB( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-         (const GLbyte *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_VertexAttrib4NivARB(GLbyte * pc)
-{
-    CALL_VertexAttrib4NivARB( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-         (const GLint *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_VertexAttrib4NsvARB(GLbyte * pc)
-{
-    CALL_VertexAttrib4NsvARB( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-         (const GLshort *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_VertexAttrib4NubvARB(GLbyte * pc)
-{
-    CALL_VertexAttrib4NubvARB( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-         (const GLubyte *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_VertexAttrib4NuivARB(GLbyte * pc)
-{
-    CALL_VertexAttrib4NuivARB( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-         (const GLuint *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_VertexAttrib4NusvARB(GLbyte * pc)
-{
-    CALL_VertexAttrib4NusvARB( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-         (const GLushort *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_VertexAttrib4bvARB(GLbyte * pc)
-{
-    CALL_VertexAttrib4bvARB( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-         (const GLbyte *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_VertexAttrib4dvARB(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 36);
-        pc -= 4;
-    }
-#endif
-
-    CALL_VertexAttrib4dvARB( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-         (const GLdouble *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_VertexAttrib4fvARB(GLbyte * pc)
-{
-    CALL_VertexAttrib4fvARB( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-         (const GLfloat *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_VertexAttrib4ivARB(GLbyte * pc)
-{
-    CALL_VertexAttrib4ivARB( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-         (const GLint *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_VertexAttrib4svARB(GLbyte * pc)
-{
-    CALL_VertexAttrib4svARB( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-         (const GLshort *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_VertexAttrib4ubvARB(GLbyte * pc)
-{
-    CALL_VertexAttrib4ubvARB( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-         (const GLubyte *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_VertexAttrib4uivARB(GLbyte * pc)
-{
-    CALL_VertexAttrib4uivARB( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-         (const GLuint *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_VertexAttrib4usvARB(GLbyte * pc)
-{
-    CALL_VertexAttrib4usvARB( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-         (const GLushort *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_BeginQueryARB(GLbyte * pc)
-{
-    CALL_BeginQueryARB( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLuint   *)(pc +  4)
-    ) );
-}
-
-int __glXDisp_DeleteQueriesARB(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLsizei n = *(GLsizei  *)(pc +  0);
-
-        CALL_DeleteQueriesARB( GET_DISPATCH(), (
-            n,
-             (const GLuint *)(pc +  4)
-        ) );
-        error = Success;
-    }
-
-    return error;
-}
-
-void __glXDisp_EndQueryARB(GLbyte * pc)
-{
-    CALL_EndQueryARB( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0)
-    ) );
-}
-
-int __glXDisp_GenQueriesARB(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLsizei n = *(GLsizei  *)(pc +  0);
-
-        GLuint answerBuffer[200];
-        GLuint * ids = __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer), 4);
-        CALL_GenQueriesARB( GET_DISPATCH(), (
-            n,
-            ids
-        ) );
-        __glXSendReply(cl->client, ids, n, 4, GL_TRUE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetQueryObjectivARB(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetQueryObjectivARB_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetQueryObjectivARB( GET_DISPATCH(), (
-            *(GLuint   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetQueryObjectuivARB(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetQueryObjectuivARB_size(pname);
-        GLuint answerBuffer[200];
-        GLuint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetQueryObjectuivARB( GET_DISPATCH(), (
-            *(GLuint   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetQueryivARB(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetQueryivARB_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetQueryivARB( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_IsQueryARB(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLboolean retval;
-        retval = CALL_IsQueryARB( GET_DISPATCH(), (
-            *(GLuint   *)(pc +  0)
-        ) );
-        __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-void __glXDisp_DrawBuffersARB(GLbyte * pc)
-{
-    const GLsizei n = *(GLsizei  *)(pc +  0);
-
-    CALL_DrawBuffersARB( GET_DISPATCH(), (
-        n,
-         (const GLenum *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_SampleMaskSGIS(GLbyte * pc)
-{
-    CALL_SampleMaskSGIS( GET_DISPATCH(), (
-        *(GLclampf *)(pc +  0),
-        *(GLboolean *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_SamplePatternSGIS(GLbyte * pc)
-{
-    CALL_SamplePatternSGIS( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_PointParameterfEXT(GLbyte * pc)
-{
-    CALL_PointParameterfEXT( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLfloat  *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_PointParameterfvEXT(GLbyte * pc)
-{
-    const GLenum pname = *(GLenum   *)(pc +  0);
-    const GLfloat * params;
-
-    params = (const GLfloat *) (pc + 4);
-
-    CALL_PointParameterfvEXT( GET_DISPATCH(), (
-        pname,
-        params
-    ) );
-}
-
-void __glXDisp_SecondaryColor3bvEXT(GLbyte * pc)
-{
-    CALL_SecondaryColor3bvEXT( GET_DISPATCH(), (
-         (const GLbyte *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_SecondaryColor3dvEXT(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 24);
-        pc -= 4;
-    }
-#endif
-
-    CALL_SecondaryColor3dvEXT( GET_DISPATCH(), (
-         (const GLdouble *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_SecondaryColor3fvEXT(GLbyte * pc)
-{
-    CALL_SecondaryColor3fvEXT( GET_DISPATCH(), (
-         (const GLfloat *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_SecondaryColor3ivEXT(GLbyte * pc)
-{
-    CALL_SecondaryColor3ivEXT( GET_DISPATCH(), (
-         (const GLint *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_SecondaryColor3svEXT(GLbyte * pc)
-{
-    CALL_SecondaryColor3svEXT( GET_DISPATCH(), (
-         (const GLshort *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_SecondaryColor3ubvEXT(GLbyte * pc)
-{
-    CALL_SecondaryColor3ubvEXT( GET_DISPATCH(), (
-         (const GLubyte *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_SecondaryColor3uivEXT(GLbyte * pc)
-{
-    CALL_SecondaryColor3uivEXT( GET_DISPATCH(), (
-         (const GLuint *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_SecondaryColor3usvEXT(GLbyte * pc)
-{
-    CALL_SecondaryColor3usvEXT( GET_DISPATCH(), (
-         (const GLushort *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_FogCoorddvEXT(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 8);
-        pc -= 4;
-    }
-#endif
-
-    CALL_FogCoorddvEXT( GET_DISPATCH(), (
-         (const GLdouble *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_FogCoordfvEXT(GLbyte * pc)
-{
-    CALL_FogCoordfvEXT( GET_DISPATCH(), (
-         (const GLfloat *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_BlendFuncSeparateEXT(GLbyte * pc)
-{
-    CALL_BlendFuncSeparateEXT( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLenum   *)(pc +  4),
-        *(GLenum   *)(pc +  8),
-        *(GLenum   *)(pc + 12)
-    ) );
-}
-
-void __glXDisp_WindowPos3fvMESA(GLbyte * pc)
-{
-    CALL_WindowPos3fvMESA( GET_DISPATCH(), (
-         (const GLfloat *)(pc +  0)
-    ) );
-}
-
-int __glXDisp_AreProgramsResidentNV(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLsizei n = *(GLsizei  *)(pc +  0);
-
-        GLboolean retval;
-        GLboolean answerBuffer[200];
-        GLboolean * residences = __glXGetAnswerBuffer(cl, n, answerBuffer, sizeof(answerBuffer), 1);
-        retval = CALL_AreProgramsResidentNV( GET_DISPATCH(), (
-            n,
-             (const GLuint *)(pc +  4),
-            residences
-        ) );
-        __glXSendReply(cl->client, residences, n, 1, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-void __glXDisp_BindProgramNV(GLbyte * pc)
-{
-    CALL_BindProgramNV( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLuint   *)(pc +  4)
-    ) );
-}
-
-int __glXDisp_DeleteProgramsNV(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLsizei n = *(GLsizei  *)(pc +  0);
-
-        CALL_DeleteProgramsNV( GET_DISPATCH(), (
-            n,
-             (const GLuint *)(pc +  4)
-        ) );
-        error = Success;
-    }
-
-    return error;
-}
-
-void __glXDisp_ExecuteProgramNV(GLbyte * pc)
-{
-    CALL_ExecuteProgramNV( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLuint   *)(pc +  4),
-         (const GLfloat *)(pc +  8)
-    ) );
-}
-
-int __glXDisp_GenProgramsNV(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLsizei n = *(GLsizei  *)(pc +  0);
-
-        GLuint answerBuffer[200];
-        GLuint * programs = __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer), 4);
-        CALL_GenProgramsNV( GET_DISPATCH(), (
-            n,
-            programs
-        ) );
-        __glXSendReply(cl->client, programs, n, 4, GL_TRUE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetProgramParameterdvNV(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLdouble params[4];
-        CALL_GetProgramParameterdvNV( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            *(GLuint   *)(pc +  4),
-            *(GLenum   *)(pc +  8),
-            params
-        ) );
-        __glXSendReply(cl->client, params, 4, 8, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetProgramParameterfvNV(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLfloat params[4];
-        CALL_GetProgramParameterfvNV( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            *(GLuint   *)(pc +  4),
-            *(GLenum   *)(pc +  8),
-            params
-        ) );
-        __glXSendReply(cl->client, params, 4, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetProgramivNV(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetProgramivNV_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetProgramivNV( GET_DISPATCH(), (
-            *(GLuint   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetTrackMatrixivNV(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLint params[1];
-        CALL_GetTrackMatrixivNV( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            *(GLuint   *)(pc +  4),
-            *(GLenum   *)(pc +  8),
-            params
-        ) );
-        __glXSendReply(cl->client, params, 1, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetVertexAttribdvNV(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetVertexAttribdvNV_size(pname);
-        GLdouble answerBuffer[200];
-        GLdouble * params = __glXGetAnswerBuffer(cl, compsize * 8, answerBuffer, sizeof(answerBuffer), 8);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetVertexAttribdvNV( GET_DISPATCH(), (
-            *(GLuint   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 8, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetVertexAttribfvNV(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetVertexAttribfvNV_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetVertexAttribfvNV( GET_DISPATCH(), (
-            *(GLuint   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetVertexAttribivNV(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname = *(GLenum   *)(pc +  4);
-
-        const GLuint compsize = __glGetVertexAttribivNV_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetVertexAttribivNV( GET_DISPATCH(), (
-            *(GLuint   *)(pc +  0),
-            pname,
-            params
-        ) );
-        __glXSendReply(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_IsProgramNV(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLboolean retval;
-        retval = CALL_IsProgramNV( GET_DISPATCH(), (
-            *(GLuint   *)(pc +  0)
-        ) );
-        __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-void __glXDisp_LoadProgramNV(GLbyte * pc)
-{
-    const GLsizei len = *(GLsizei  *)(pc +  8);
-
-    CALL_LoadProgramNV( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLuint   *)(pc +  4),
-        len,
-         (const GLubyte *)(pc + 12)
-    ) );
-}
-
-void __glXDisp_ProgramParameters4dvNV(GLbyte * pc)
-{
-    const GLuint num = *(GLuint   *)(pc +  8);
-
-#ifdef __GLX_ALIGN64
-    const GLuint cmdlen = 16 + __GLX_PAD((num * 32)) - 4;
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, cmdlen);
-        pc -= 4;
-    }
-#endif
-
-    CALL_ProgramParameters4dvNV( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLuint   *)(pc +  4),
-        num,
-         (const GLdouble *)(pc + 12)
-    ) );
-}
-
-void __glXDisp_ProgramParameters4fvNV(GLbyte * pc)
-{
-    const GLuint num = *(GLuint   *)(pc +  8);
-
-    CALL_ProgramParameters4fvNV( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLuint   *)(pc +  4),
-        num,
-         (const GLfloat *)(pc + 12)
-    ) );
-}
-
-void __glXDisp_RequestResidentProgramsNV(GLbyte * pc)
-{
-    const GLsizei n = *(GLsizei  *)(pc +  0);
-
-    CALL_RequestResidentProgramsNV( GET_DISPATCH(), (
-        n,
-         (const GLuint *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_TrackMatrixNV(GLbyte * pc)
-{
-    CALL_TrackMatrixNV( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLuint   *)(pc +  4),
-        *(GLenum   *)(pc +  8),
-        *(GLenum   *)(pc + 12)
-    ) );
-}
-
-void __glXDisp_VertexAttrib1dvNV(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 12);
-        pc -= 4;
-    }
-#endif
-
-    CALL_VertexAttrib1dvNV( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-         (const GLdouble *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_VertexAttrib1fvNV(GLbyte * pc)
-{
-    CALL_VertexAttrib1fvNV( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-         (const GLfloat *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_VertexAttrib1svNV(GLbyte * pc)
-{
-    CALL_VertexAttrib1svNV( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-         (const GLshort *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_VertexAttrib2dvNV(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 20);
-        pc -= 4;
-    }
-#endif
-
-    CALL_VertexAttrib2dvNV( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-         (const GLdouble *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_VertexAttrib2fvNV(GLbyte * pc)
-{
-    CALL_VertexAttrib2fvNV( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-         (const GLfloat *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_VertexAttrib2svNV(GLbyte * pc)
-{
-    CALL_VertexAttrib2svNV( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-         (const GLshort *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_VertexAttrib3dvNV(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 28);
-        pc -= 4;
-    }
-#endif
-
-    CALL_VertexAttrib3dvNV( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-         (const GLdouble *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_VertexAttrib3fvNV(GLbyte * pc)
-{
-    CALL_VertexAttrib3fvNV( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-         (const GLfloat *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_VertexAttrib3svNV(GLbyte * pc)
-{
-    CALL_VertexAttrib3svNV( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-         (const GLshort *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_VertexAttrib4dvNV(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 36);
-        pc -= 4;
-    }
-#endif
-
-    CALL_VertexAttrib4dvNV( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-         (const GLdouble *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_VertexAttrib4fvNV(GLbyte * pc)
-{
-    CALL_VertexAttrib4fvNV( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-         (const GLfloat *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_VertexAttrib4svNV(GLbyte * pc)
-{
-    CALL_VertexAttrib4svNV( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-         (const GLshort *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_VertexAttrib4ubvNV(GLbyte * pc)
-{
-    CALL_VertexAttrib4ubvNV( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-         (const GLubyte *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_VertexAttribs1dvNV(GLbyte * pc)
-{
-    const GLsizei n = *(GLsizei  *)(pc +  4);
-
-#ifdef __GLX_ALIGN64
-    const GLuint cmdlen = 12 + __GLX_PAD((n * 8)) - 4;
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, cmdlen);
-        pc -= 4;
-    }
-#endif
-
-    CALL_VertexAttribs1dvNV( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-        n,
-         (const GLdouble *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_VertexAttribs1fvNV(GLbyte * pc)
-{
-    const GLsizei n = *(GLsizei  *)(pc +  4);
-
-    CALL_VertexAttribs1fvNV( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-        n,
-         (const GLfloat *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_VertexAttribs1svNV(GLbyte * pc)
-{
-    const GLsizei n = *(GLsizei  *)(pc +  4);
-
-    CALL_VertexAttribs1svNV( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-        n,
-         (const GLshort *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_VertexAttribs2dvNV(GLbyte * pc)
-{
-    const GLsizei n = *(GLsizei  *)(pc +  4);
-
-#ifdef __GLX_ALIGN64
-    const GLuint cmdlen = 12 + __GLX_PAD((n * 16)) - 4;
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, cmdlen);
-        pc -= 4;
-    }
-#endif
-
-    CALL_VertexAttribs2dvNV( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-        n,
-         (const GLdouble *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_VertexAttribs2fvNV(GLbyte * pc)
-{
-    const GLsizei n = *(GLsizei  *)(pc +  4);
-
-    CALL_VertexAttribs2fvNV( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-        n,
-         (const GLfloat *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_VertexAttribs2svNV(GLbyte * pc)
-{
-    const GLsizei n = *(GLsizei  *)(pc +  4);
-
-    CALL_VertexAttribs2svNV( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-        n,
-         (const GLshort *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_VertexAttribs3dvNV(GLbyte * pc)
-{
-    const GLsizei n = *(GLsizei  *)(pc +  4);
-
-#ifdef __GLX_ALIGN64
-    const GLuint cmdlen = 12 + __GLX_PAD((n * 24)) - 4;
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, cmdlen);
-        pc -= 4;
-    }
-#endif
-
-    CALL_VertexAttribs3dvNV( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-        n,
-         (const GLdouble *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_VertexAttribs3fvNV(GLbyte * pc)
-{
-    const GLsizei n = *(GLsizei  *)(pc +  4);
-
-    CALL_VertexAttribs3fvNV( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-        n,
-         (const GLfloat *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_VertexAttribs3svNV(GLbyte * pc)
-{
-    const GLsizei n = *(GLsizei  *)(pc +  4);
-
-    CALL_VertexAttribs3svNV( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-        n,
-         (const GLshort *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_VertexAttribs4dvNV(GLbyte * pc)
-{
-    const GLsizei n = *(GLsizei  *)(pc +  4);
-
-#ifdef __GLX_ALIGN64
-    const GLuint cmdlen = 12 + __GLX_PAD((n * 32)) - 4;
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, cmdlen);
-        pc -= 4;
-    }
-#endif
-
-    CALL_VertexAttribs4dvNV( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-        n,
-         (const GLdouble *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_VertexAttribs4fvNV(GLbyte * pc)
-{
-    const GLsizei n = *(GLsizei  *)(pc +  4);
-
-    CALL_VertexAttribs4fvNV( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-        n,
-         (const GLfloat *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_VertexAttribs4svNV(GLbyte * pc)
-{
-    const GLsizei n = *(GLsizei  *)(pc +  4);
-
-    CALL_VertexAttribs4svNV( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-        n,
-         (const GLshort *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_VertexAttribs4ubvNV(GLbyte * pc)
-{
-    const GLsizei n = *(GLsizei  *)(pc +  4);
-
-    CALL_VertexAttribs4ubvNV( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-        n,
-         (const GLubyte *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_PointParameteriNV(GLbyte * pc)
-{
-    CALL_PointParameteriNV( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLint    *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_PointParameterivNV(GLbyte * pc)
-{
-    const GLenum pname = *(GLenum   *)(pc +  0);
-    const GLint * params;
-
-    params = (const GLint *) (pc + 4);
-
-    CALL_PointParameterivNV( GET_DISPATCH(), (
-        pname,
-        params
-    ) );
-}
-
-void __glXDisp_ActiveStencilFaceEXT(GLbyte * pc)
-{
-    CALL_ActiveStencilFaceEXT( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0)
-    ) );
-}
-
-int __glXDisp_GetProgramNamedParameterdvNV(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLsizei len = *(GLsizei  *)(pc +  4);
-
-        GLdouble params[4];
-        CALL_GetProgramNamedParameterdvNV( GET_DISPATCH(), (
-            *(GLuint   *)(pc +  0),
-            len,
-             (const GLubyte *)(pc +  8),
-            params
-        ) );
-        __glXSendReply(cl->client, params, 4, 8, GL_TRUE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetProgramNamedParameterfvNV(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLsizei len = *(GLsizei  *)(pc +  4);
-
-        GLfloat params[4];
-        CALL_GetProgramNamedParameterfvNV( GET_DISPATCH(), (
-            *(GLuint   *)(pc +  0),
-            len,
-             (const GLubyte *)(pc +  8),
-            params
-        ) );
-        __glXSendReply(cl->client, params, 4, 4, GL_TRUE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-void __glXDisp_ProgramNamedParameter4dvNV(GLbyte * pc)
-{
-    const GLsizei len = *(GLsizei  *)(pc + 36);
-
-#ifdef __GLX_ALIGN64
-    const GLuint cmdlen = 44 + __GLX_PAD(len) - 4;
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, cmdlen);
-        pc -= 4;
-    }
-#endif
-
-    CALL_ProgramNamedParameter4dvNV( GET_DISPATCH(), (
-        *(GLuint   *)(pc + 32),
-        len,
-         (const GLubyte *)(pc + 40),
-         (const GLdouble *)(pc +  0)
-    ) );
-}
-
-void __glXDisp_ProgramNamedParameter4fvNV(GLbyte * pc)
-{
-    const GLsizei len = *(GLsizei  *)(pc +  4);
-
-    CALL_ProgramNamedParameter4fvNV( GET_DISPATCH(), (
-        *(GLuint   *)(pc +  0),
-        len,
-         (const GLubyte *)(pc + 24),
-         (const GLfloat *)(pc +  8)
-    ) );
-}
-
-void __glXDisp_BlendEquationSeparateEXT(GLbyte * pc)
-{
-    CALL_BlendEquationSeparateEXT( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLenum   *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_BindFramebufferEXT(GLbyte * pc)
-{
-    CALL_BindFramebufferEXT( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLuint   *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_BindRenderbufferEXT(GLbyte * pc)
-{
-    CALL_BindRenderbufferEXT( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLuint   *)(pc +  4)
-    ) );
-}
-
-int __glXDisp_CheckFramebufferStatusEXT(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLenum retval;
-        retval = CALL_CheckFramebufferStatusEXT( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0)
-        ) );
-        __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-void __glXDisp_DeleteFramebuffersEXT(GLbyte * pc)
-{
-    const GLsizei n = *(GLsizei  *)(pc +  0);
-
-    CALL_DeleteFramebuffersEXT( GET_DISPATCH(), (
-        n,
-         (const GLuint *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_DeleteRenderbuffersEXT(GLbyte * pc)
-{
-    const GLsizei n = *(GLsizei  *)(pc +  0);
-
-    CALL_DeleteRenderbuffersEXT( GET_DISPATCH(), (
-        n,
-         (const GLuint *)(pc +  4)
-    ) );
-}
-
-void __glXDisp_FramebufferRenderbufferEXT(GLbyte * pc)
-{
-    CALL_FramebufferRenderbufferEXT( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLenum   *)(pc +  4),
-        *(GLenum   *)(pc +  8),
-        *(GLuint   *)(pc + 12)
-    ) );
-}
-
-void __glXDisp_FramebufferTexture1DEXT(GLbyte * pc)
-{
-    CALL_FramebufferTexture1DEXT( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLenum   *)(pc +  4),
-        *(GLenum   *)(pc +  8),
-        *(GLuint   *)(pc + 12),
-        *(GLint    *)(pc + 16)
-    ) );
-}
-
-void __glXDisp_FramebufferTexture2DEXT(GLbyte * pc)
-{
-    CALL_FramebufferTexture2DEXT( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLenum   *)(pc +  4),
-        *(GLenum   *)(pc +  8),
-        *(GLuint   *)(pc + 12),
-        *(GLint    *)(pc + 16)
-    ) );
-}
-
-void __glXDisp_FramebufferTexture3DEXT(GLbyte * pc)
-{
-    CALL_FramebufferTexture3DEXT( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLenum   *)(pc +  4),
-        *(GLenum   *)(pc +  8),
-        *(GLuint   *)(pc + 12),
-        *(GLint    *)(pc + 16),
-        *(GLint    *)(pc + 20)
-    ) );
-}
-
-int __glXDisp_GenFramebuffersEXT(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLsizei n = *(GLsizei  *)(pc +  0);
-
-        GLuint answerBuffer[200];
-        GLuint * framebuffers = __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer), 4);
-        CALL_GenFramebuffersEXT( GET_DISPATCH(), (
-            n,
-            framebuffers
-        ) );
-        __glXSendReply(cl->client, framebuffers, n, 4, GL_TRUE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GenRenderbuffersEXT(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLsizei n = *(GLsizei  *)(pc +  0);
-
-        GLuint answerBuffer[200];
-        GLuint * renderbuffers = __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer), 4);
-        CALL_GenRenderbuffersEXT( GET_DISPATCH(), (
-            n,
-            renderbuffers
-        ) );
-        __glXSendReply(cl->client, renderbuffers, n, 4, GL_TRUE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-void __glXDisp_GenerateMipmapEXT(GLbyte * pc)
-{
-    CALL_GenerateMipmapEXT( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0)
-    ) );
-}
-
-int __glXDisp_GetFramebufferAttachmentParameterivEXT(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLint params[1];
-        CALL_GetFramebufferAttachmentParameterivEXT( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            *(GLenum   *)(pc +  4),
-            *(GLenum   *)(pc +  8),
-            params
-        ) );
-        __glXSendReply(cl->client, params, 1, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_GetRenderbufferParameterivEXT(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLint params[1];
-        CALL_GetRenderbufferParameterivEXT( GET_DISPATCH(), (
-            *(GLenum   *)(pc +  0),
-            *(GLenum   *)(pc +  4),
-            params
-        ) );
-        __glXSendReply(cl->client, params, 1, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_IsFramebufferEXT(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLboolean retval;
-        retval = CALL_IsFramebufferEXT( GET_DISPATCH(), (
-            *(GLuint   *)(pc +  0)
-        ) );
-        __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDisp_IsRenderbufferEXT(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLboolean retval;
-        retval = CALL_IsRenderbufferEXT( GET_DISPATCH(), (
-            *(GLuint   *)(pc +  0)
-        ) );
-        __glXSendReply(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-void __glXDisp_RenderbufferStorageEXT(GLbyte * pc)
-{
-    CALL_RenderbufferStorageEXT( GET_DISPATCH(), (
-        *(GLenum   *)(pc +  0),
-        *(GLenum   *)(pc +  4),
-        *(GLsizei  *)(pc +  8),
-        *(GLsizei  *)(pc + 12)
-    ) );
-}
-
diff --git a/GL/glx/indirect_dispatch.h b/GL/glx/indirect_dispatch.h
deleted file mode 100644
index e81c382f0..000000000
--- a/GL/glx/indirect_dispatch.h
+++ /dev/null
@@ -1,1047 +0,0 @@
-/* DO NOT EDIT - This file generated automatically by glX_proto_recv.py (from Mesa) script */
-
-/*
- * (C) Copyright IBM Corporation 2005
- * All Rights Reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sub license,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
- * IBM,
- * AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#if !defined( _INDIRECT_DISPATCH_H_ )
-#  define _INDIRECT_DISPATCH_H_
-
-#  if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__)
-#    define HIDDEN  __attribute__((visibility("hidden")))
-#  else
-#    define HIDDEN
-#  endif
-struct __GLXclientStateRec;
-
-extern HIDDEN void __glXDisp_MapGrid1d(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_MapGrid1d(GLbyte * pc);
-extern HIDDEN void __glXDisp_MapGrid1f(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_MapGrid1f(GLbyte * pc);
-extern HIDDEN int __glXDisp_NewList(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_NewList(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_LoadIdentity(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_LoadIdentity(GLbyte * pc);
-extern HIDDEN void __glXDisp_SampleCoverageARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_SampleCoverageARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_ConvolutionFilter1D(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_ConvolutionFilter1D(GLbyte * pc);
-extern HIDDEN void __glXDisp_BeginQueryARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_BeginQueryARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_RasterPos3dv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_RasterPos3dv(GLbyte * pc);
-extern HIDDEN void __glXDisp_PointParameteriNV(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_PointParameteriNV(GLbyte * pc);
-extern HIDDEN void __glXDisp_TexCoord1iv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_TexCoord1iv(GLbyte * pc);
-extern HIDDEN void __glXDisp_TexCoord4sv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_TexCoord4sv(GLbyte * pc);
-extern HIDDEN void __glXDisp_ActiveTextureARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_ActiveTextureARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_VertexAttrib4ubvNV(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttrib4ubvNV(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetProgramNamedParameterdvNV(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetProgramNamedParameterdvNV(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_Histogram(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Histogram(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetMapfv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetMapfv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_RasterPos4dv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_RasterPos4dv(GLbyte * pc);
-extern HIDDEN void __glXDisp_PolygonStipple(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_PolygonStipple(GLbyte * pc);
-extern HIDDEN void __glXDisp_BlendEquationSeparateEXT(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_BlendEquationSeparateEXT(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetPixelMapfv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetPixelMapfv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_Color3uiv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Color3uiv(GLbyte * pc);
-extern HIDDEN int __glXDisp_IsEnabled(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_IsEnabled(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_VertexAttrib4svNV(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttrib4svNV(GLbyte * pc);
-extern HIDDEN void __glXDisp_EvalCoord2fv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_EvalCoord2fv(GLbyte * pc);
-extern HIDDEN int __glXDisp_DestroyPixmap(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_DestroyPixmap(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetMapiv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetMapiv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_SwapBuffers(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_SwapBuffers(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_Indexubv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Indexubv(GLbyte * pc);
-extern HIDDEN int __glXDisp_Render(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_Render(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetQueryivARB(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetQueryivARB(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_TexImage3D(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_TexImage3D(GLbyte * pc);
-extern HIDDEN int __glXDisp_MakeContextCurrent(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_MakeContextCurrent(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetFBConfigs(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetFBConfigs(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_Color3ubv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Color3ubv(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetQueryObjectivARB(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetQueryObjectivARB(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_Vertex3dv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Vertex3dv(GLbyte * pc);
-extern HIDDEN void __glXDisp_CompressedTexSubImage2DARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_CompressedTexSubImage2DARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_LightModeliv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_LightModeliv(GLbyte * pc);
-extern HIDDEN void __glXDisp_VertexAttrib1svARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttrib1svARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_VertexAttribs1dvNV(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttribs1dvNV(GLbyte * pc);
-extern HIDDEN void __glXDisp_Normal3bv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Normal3bv(GLbyte * pc);
-extern HIDDEN int __glXDisp_VendorPrivate(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_VendorPrivate(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_CreateGLXPixmapWithConfigSGIX(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_CreateGLXPixmapWithConfigSGIX(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_VertexAttrib1fvNV(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttrib1fvNV(GLbyte * pc);
-extern HIDDEN void __glXDisp_Vertex3iv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Vertex3iv(GLbyte * pc);
-extern HIDDEN void __glXDisp_CopyConvolutionFilter1D(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_CopyConvolutionFilter1D(GLbyte * pc);
-extern HIDDEN void __glXDisp_BlendColor(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_BlendColor(GLbyte * pc);
-extern HIDDEN void __glXDisp_Scalef(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Scalef(GLbyte * pc);
-extern HIDDEN void __glXDisp_Normal3iv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Normal3iv(GLbyte * pc);
-extern HIDDEN void __glXDisp_PassThrough(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_PassThrough(GLbyte * pc);
-extern HIDDEN void __glXDisp_Viewport(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Viewport(GLbyte * pc);
-extern HIDDEN void __glXDisp_VertexAttrib4NusvARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttrib4NusvARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_CopyTexSubImage2D(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_CopyTexSubImage2D(GLbyte * pc);
-extern HIDDEN void __glXDisp_DepthRange(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_DepthRange(GLbyte * pc);
-extern HIDDEN void __glXDisp_ResetHistogram(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_ResetHistogram(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetProgramNamedParameterfvNV(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetProgramNamedParameterfvNV(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_PointParameterfEXT(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_PointParameterfEXT(GLbyte * pc);
-extern HIDDEN void __glXDisp_TexCoord2sv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_TexCoord2sv(GLbyte * pc);
-extern HIDDEN void __glXDisp_Vertex4dv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Vertex4dv(GLbyte * pc);
-extern HIDDEN void __glXDisp_CompressedTexImage3DARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_CompressedTexImage3DARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_Color3sv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Color3sv(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetConvolutionParameteriv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetConvolutionParameteriv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetConvolutionParameterivEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetConvolutionParameterivEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_Vertex2dv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Vertex2dv(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetVisualConfigs(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetVisualConfigs(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_MultiTexCoord1fvARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_MultiTexCoord1fvARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_TexCoord3iv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_TexCoord3iv(GLbyte * pc);
-extern HIDDEN int __glXDisp_CopyContext(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_CopyContext(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_Color3fv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Color3fv(GLbyte * pc);
-extern HIDDEN void __glXDisp_PointSize(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_PointSize(GLbyte * pc);
-extern HIDDEN void __glXDisp_PopName(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_PopName(GLbyte * pc);
-extern HIDDEN void __glXDisp_VertexAttrib4NbvARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttrib4NbvARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_Vertex4sv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Vertex4sv(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetTexEnvfv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetTexEnvfv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_LineStipple(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_LineStipple(GLbyte * pc);
-extern HIDDEN void __glXDisp_TexEnvi(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_TexEnvi(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetClipPlane(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetClipPlane(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_VertexAttribs3dvNV(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttribs3dvNV(GLbyte * pc);
-extern HIDDEN void __glXDisp_LightModeli(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_LightModeli(GLbyte * pc);
-extern HIDDEN void __glXDisp_VertexAttribs4fvNV(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttribs4fvNV(GLbyte * pc);
-extern HIDDEN void __glXDisp_Scaled(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Scaled(GLbyte * pc);
-extern HIDDEN void __glXDisp_CallLists(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_CallLists(GLbyte * pc);
-extern HIDDEN void __glXDisp_AlphaFunc(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_AlphaFunc(GLbyte * pc);
-extern HIDDEN void __glXDisp_TexCoord2iv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_TexCoord2iv(GLbyte * pc);
-extern HIDDEN void __glXDisp_CompressedTexImage1DARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_CompressedTexImage1DARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_Rotated(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Rotated(GLbyte * pc);
-extern HIDDEN int __glXDisp_ReadPixels(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_ReadPixels(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_EdgeFlagv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_EdgeFlagv(GLbyte * pc);
-extern HIDDEN void __glXDisp_TexParameterf(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_TexParameterf(GLbyte * pc);
-extern HIDDEN void __glXDisp_TexParameteri(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_TexParameteri(GLbyte * pc);
-extern HIDDEN int __glXDisp_DestroyContext(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_DestroyContext(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_DrawPixels(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_DrawPixels(GLbyte * pc);
-extern HIDDEN void __glXDisp_MultiTexCoord2svARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_MultiTexCoord2svARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_VertexAttribs3fvNV(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttribs3fvNV(GLbyte * pc);
-extern HIDDEN void __glXDisp_GenerateMipmapEXT(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_GenerateMipmapEXT(GLbyte * pc);
-extern HIDDEN int __glXDisp_GenLists(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GenLists(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_MapGrid2d(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_MapGrid2d(GLbyte * pc);
-extern HIDDEN void __glXDisp_MapGrid2f(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_MapGrid2f(GLbyte * pc);
-extern HIDDEN void __glXDisp_Scissor(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Scissor(GLbyte * pc);
-extern HIDDEN void __glXDisp_Fogf(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Fogf(GLbyte * pc);
-extern HIDDEN void __glXDisp_TexSubImage1D(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_TexSubImage1D(GLbyte * pc);
-extern HIDDEN void __glXDisp_Color4usv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Color4usv(GLbyte * pc);
-extern HIDDEN void __glXDisp_Fogi(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Fogi(GLbyte * pc);
-extern HIDDEN void __glXDisp_RasterPos3iv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_RasterPos3iv(GLbyte * pc);
-extern HIDDEN void __glXDisp_PixelMapfv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_PixelMapfv(GLbyte * pc);
-extern HIDDEN void __glXDisp_Color3usv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Color3usv(GLbyte * pc);
-extern HIDDEN int __glXDisp_AreTexturesResident(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_AreTexturesResident(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_AreTexturesResidentEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_AreTexturesResidentEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_IsRenderbufferEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_IsRenderbufferEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_PointParameterfvEXT(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_PointParameterfvEXT(GLbyte * pc);
-extern HIDDEN void __glXDisp_Color3bv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Color3bv(GLbyte * pc);
-extern HIDDEN void __glXDisp_SecondaryColor3bvEXT(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_SecondaryColor3bvEXT(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetProgramLocalParameterfvARB(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetProgramLocalParameterfvARB(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_RenderbufferStorageEXT(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_RenderbufferStorageEXT(GLbyte * pc);
-extern HIDDEN void __glXDisp_ColorTable(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_ColorTable(GLbyte * pc);
-extern HIDDEN void __glXDisp_Accum(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Accum(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetTexImage(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetTexImage(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_ConvolutionFilter2D(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_ConvolutionFilter2D(GLbyte * pc);
-extern HIDDEN int __glXDisp_Finish(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_Finish(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_ClearStencil(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_ClearStencil(GLbyte * pc);
-extern HIDDEN void __glXDisp_VertexAttrib3dvARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttrib3dvARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_VertexAttribs4ubvNV(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttribs4ubvNV(GLbyte * pc);
-extern HIDDEN void __glXDisp_ConvolutionParameteriv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_ConvolutionParameteriv(GLbyte * pc);
-extern HIDDEN void __glXDisp_RasterPos2fv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_RasterPos2fv(GLbyte * pc);
-extern HIDDEN void __glXDisp_TexCoord1fv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_TexCoord1fv(GLbyte * pc);
-extern HIDDEN void __glXDisp_ProgramEnvParameter4fvARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_ProgramEnvParameter4fvARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_RasterPos4fv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_RasterPos4fv(GLbyte * pc);
-extern HIDDEN void __glXDisp_ClearIndex(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_ClearIndex(GLbyte * pc);
-extern HIDDEN void __glXDisp_LoadMatrixd(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_LoadMatrixd(GLbyte * pc);
-extern HIDDEN void __glXDisp_PushMatrix(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_PushMatrix(GLbyte * pc);
-extern HIDDEN void __glXDisp_ConvolutionParameterfv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_ConvolutionParameterfv(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetTexGendv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetTexGendv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_LoadProgramNV(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_LoadProgramNV(GLbyte * pc);
-extern HIDDEN int __glXDisp_EndList(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_EndList(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_VertexAttrib4fvNV(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttrib4fvNV(GLbyte * pc);
-extern HIDDEN void __glXDisp_EvalCoord1fv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_EvalCoord1fv(GLbyte * pc);
-extern HIDDEN void __glXDisp_EvalMesh2(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_EvalMesh2(GLbyte * pc);
-extern HIDDEN void __glXDisp_Vertex4fv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Vertex4fv(GLbyte * pc);
-extern HIDDEN int __glXDisp_CheckFramebufferStatusEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_CheckFramebufferStatusEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetVertexAttribivARB(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetVertexAttribivARB(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetFBConfigsSGIX(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetFBConfigsSGIX(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_CreateNewContext(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_CreateNewContext(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetMinmax(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetMinmax(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetMinmaxEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetMinmaxEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetVertexAttribdvNV(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetVertexAttribdvNV(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_Normal3fv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Normal3fv(GLbyte * pc);
-extern HIDDEN void __glXDisp_ProgramEnvParameter4dvARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_ProgramEnvParameter4dvARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_VertexAttrib4ivARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttrib4ivARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_End(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_End(GLbyte * pc);
-extern HIDDEN void __glXDisp_VertexAttribs2dvNV(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttribs2dvNV(GLbyte * pc);
-extern HIDDEN void __glXDisp_MultiTexCoord3fvARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_MultiTexCoord3fvARB(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetProgramParameterfvNV(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetProgramParameterfvNV(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_BindTexture(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_BindTexture(GLbyte * pc);
-extern HIDDEN void __glXDisp_TexSubImage2D(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_TexSubImage2D(GLbyte * pc);
-extern HIDDEN void __glXDisp_DeleteRenderbuffersEXT(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_DeleteRenderbuffersEXT(GLbyte * pc);
-extern HIDDEN void __glXDisp_TexGenfv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_TexGenfv(GLbyte * pc);
-extern HIDDEN void __glXDisp_VertexAttrib4bvARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttrib4bvARB(GLbyte * pc);
-extern HIDDEN int __glXDisp_CreateContextWithConfigSGIX(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_CreateContextWithConfigSGIX(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_FramebufferTexture3DEXT(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_FramebufferTexture3DEXT(GLbyte * pc);
-extern HIDDEN int __glXDisp_CopySubBufferMESA(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_CopySubBufferMESA(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_BlendEquation(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_BlendEquation(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetError(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetError(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_TexCoord3dv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_TexCoord3dv(GLbyte * pc);
-extern HIDDEN void __glXDisp_Indexdv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Indexdv(GLbyte * pc);
-extern HIDDEN void __glXDisp_PushName(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_PushName(GLbyte * pc);
-extern HIDDEN void __glXDisp_MultiTexCoord2dvARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_MultiTexCoord2dvARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_ProgramNamedParameter4fvNV(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_ProgramNamedParameter4fvNV(GLbyte * pc);
-extern HIDDEN void __glXDisp_VertexAttrib4fvARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttrib4fvARB(GLbyte * pc);
-extern HIDDEN int __glXDisp_CreateGLXPbufferSGIX(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_CreateGLXPbufferSGIX(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_MultiTexCoord1svARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_MultiTexCoord1svARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_EndQueryARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_EndQueryARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_DepthMask(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_DepthMask(GLbyte * pc);
-extern HIDDEN void __glXDisp_Color4iv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Color4iv(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetMaterialiv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetMaterialiv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_StencilOp(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_StencilOp(GLbyte * pc);
-extern HIDDEN void __glXDisp_MultiTexCoord3svARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_MultiTexCoord3svARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_TexEnvfv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_TexEnvfv(GLbyte * pc);
-extern HIDDEN int __glXDisp_QueryServerString(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_QueryServerString(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_LoadMatrixf(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_LoadMatrixf(GLbyte * pc);
-extern HIDDEN void __glXDisp_Color4bv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Color4bv(GLbyte * pc);
-extern HIDDEN void __glXDisp_SecondaryColor3usvEXT(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_SecondaryColor3usvEXT(GLbyte * pc);
-extern HIDDEN void __glXDisp_VertexAttrib2fvNV(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttrib2fvNV(GLbyte * pc);
-extern HIDDEN void __glXDisp_ProgramLocalParameter4dvARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_ProgramLocalParameter4dvARB(GLbyte * pc);
-extern HIDDEN int __glXDisp_DeleteLists(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_DeleteLists(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_LogicOp(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_LogicOp(GLbyte * pc);
-extern HIDDEN void __glXDisp_TexCoord4fv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_TexCoord4fv(GLbyte * pc);
-extern HIDDEN int __glXDisp_WaitX(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_WaitX(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_SecondaryColor3uivEXT(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_SecondaryColor3uivEXT(GLbyte * pc);
-extern HIDDEN void __glXDisp_FramebufferRenderbufferEXT(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_FramebufferRenderbufferEXT(GLbyte * pc);
-extern HIDDEN void __glXDisp_VertexAttrib1dvNV(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttrib1dvNV(GLbyte * pc);
-extern HIDDEN int __glXDisp_GenTextures(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GenTextures(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GenTexturesEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GenTexturesEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_FramebufferTexture1DEXT(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_FramebufferTexture1DEXT(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetDrawableAttributes(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetDrawableAttributes(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_RasterPos2sv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_RasterPos2sv(GLbyte * pc);
-extern HIDDEN void __glXDisp_Color4ubv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Color4ubv(GLbyte * pc);
-extern HIDDEN void __glXDisp_DrawBuffer(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_DrawBuffer(GLbyte * pc);
-extern HIDDEN void __glXDisp_TexCoord2fv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_TexCoord2fv(GLbyte * pc);
-extern HIDDEN void __glXDisp_TexCoord1sv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_TexCoord1sv(GLbyte * pc);
-extern HIDDEN void __glXDisp_TexGeniv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_TexGeniv(GLbyte * pc);
-extern HIDDEN void __glXDisp_DepthFunc(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_DepthFunc(GLbyte * pc);
-extern HIDDEN void __glXDisp_PixelMapusv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_PixelMapusv(GLbyte * pc);
-extern HIDDEN void __glXDisp_PointParameterivNV(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_PointParameterivNV(GLbyte * pc);
-extern HIDDEN void __glXDisp_BlendFunc(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_BlendFunc(GLbyte * pc);
-extern HIDDEN int __glXDisp_WaitGL(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_WaitGL(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_MultiTexCoord3dvARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_MultiTexCoord3dvARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_ProgramNamedParameter4dvNV(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_ProgramNamedParameter4dvNV(GLbyte * pc);
-extern HIDDEN int __glXDisp_Flush(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_Flush(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_Color4uiv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Color4uiv(GLbyte * pc);
-extern HIDDEN void __glXDisp_RasterPos3sv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_RasterPos3sv(GLbyte * pc);
-extern HIDDEN void __glXDisp_BindFramebufferEXT(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_BindFramebufferEXT(GLbyte * pc);
-extern HIDDEN void __glXDisp_PushAttrib(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_PushAttrib(GLbyte * pc);
-extern HIDDEN int __glXDisp_DestroyPbuffer(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_DestroyPbuffer(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_TexParameteriv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_TexParameteriv(GLbyte * pc);
-extern HIDDEN void __glXDisp_WindowPos3fvMESA(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_WindowPos3fvMESA(GLbyte * pc);
-extern HIDDEN void __glXDisp_VertexAttrib1svNV(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttrib1svNV(GLbyte * pc);
-extern HIDDEN int __glXDisp_QueryExtensionsString(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_QueryExtensionsString(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_RasterPos3fv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_RasterPos3fv(GLbyte * pc);
-extern HIDDEN void __glXDisp_CopyTexSubImage3D(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_CopyTexSubImage3D(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetColorTable(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetColorTable(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetColorTableSGI(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetColorTableSGI(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_Indexiv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Indexiv(GLbyte * pc);
-extern HIDDEN int __glXDisp_CreateContext(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_CreateContext(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_CopyColorTable(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_CopyColorTable(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetHistogramParameterfv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetHistogramParameterfv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetHistogramParameterfvEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetHistogramParameterfvEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_Frustum(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Frustum(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetString(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetString(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_CreateGLXPixmap(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_CreateGLXPixmap(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_TexEnvf(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_TexEnvf(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetProgramStringARB(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetProgramStringARB(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_MultiTexCoord3ivARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_MultiTexCoord3ivARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_VertexAttrib1dvARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttrib1dvARB(GLbyte * pc);
-extern HIDDEN int __glXDisp_DeleteTextures(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_DeleteTextures(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_DeleteTexturesEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_DeleteTexturesEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetTexLevelParameteriv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetTexLevelParameteriv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_ClearAccum(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_ClearAccum(GLbyte * pc);
-extern HIDDEN int __glXDisp_QueryVersion(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_QueryVersion(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetVertexAttribfvARB(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetVertexAttribfvARB(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_SecondaryColor3ivEXT(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_SecondaryColor3ivEXT(GLbyte * pc);
-extern HIDDEN void __glXDisp_TexCoord4iv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_TexCoord4iv(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetDrawableAttributesSGIX(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetDrawableAttributesSGIX(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_SampleMaskSGIS(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_SampleMaskSGIS(GLbyte * pc);
-extern HIDDEN void __glXDisp_ColorTableParameteriv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_ColorTableParameteriv(GLbyte * pc);
-extern HIDDEN void __glXDisp_VertexAttrib4ubvARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttrib4ubvARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_CopyTexImage2D(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_CopyTexImage2D(GLbyte * pc);
-extern HIDDEN void __glXDisp_Lightfv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Lightfv(GLbyte * pc);
-extern HIDDEN void __glXDisp_ClearDepth(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_ClearDepth(GLbyte * pc);
-extern HIDDEN void __glXDisp_ColorSubTable(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_ColorSubTable(GLbyte * pc);
-extern HIDDEN void __glXDisp_Color4fv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Color4fv(GLbyte * pc);
-extern HIDDEN void __glXDisp_MultiTexCoord4ivARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_MultiTexCoord4ivARB(GLbyte * pc);
-extern HIDDEN int __glXDisp_CreatePixmap(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_CreatePixmap(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_Lightiv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Lightiv(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetQueryObjectuivARB(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetQueryObjectuivARB(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetTexParameteriv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetTexParameteriv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GenRenderbuffersEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GenRenderbuffersEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_VertexAttrib2dvARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttrib2dvARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_VertexAttribs2svNV(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttribs2svNV(GLbyte * pc);
-extern HIDDEN void __glXDisp_Rectdv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Rectdv(GLbyte * pc);
-extern HIDDEN void __glXDisp_VertexAttrib4NivARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttrib4NivARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_Materialiv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Materialiv(GLbyte * pc);
-extern HIDDEN void __glXDisp_SecondaryColor3fvEXT(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_SecondaryColor3fvEXT(GLbyte * pc);
-extern HIDDEN void __glXDisp_PolygonMode(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_PolygonMode(GLbyte * pc);
-extern HIDDEN void __glXDisp_CompressedTexSubImage1DARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_CompressedTexSubImage1DARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_VertexAttrib2dvNV(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttrib2dvNV(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetVertexAttribivNV(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetVertexAttribivNV(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_IsQueryARB(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_IsQueryARB(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_TexGeni(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_TexGeni(GLbyte * pc);
-extern HIDDEN void __glXDisp_TexGenf(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_TexGenf(GLbyte * pc);
-extern HIDDEN void __glXDisp_TexGend(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_TexGend(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetPolygonStipple(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetPolygonStipple(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetVertexAttribfvNV(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetVertexAttribfvNV(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_VertexAttrib2svNV(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttrib2svNV(GLbyte * pc);
-extern HIDDEN void __glXDisp_VertexAttribs1fvNV(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttribs1fvNV(GLbyte * pc);
-extern HIDDEN void __glXDisp_VertexAttrib4NuivARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttrib4NuivARB(GLbyte * pc);
-extern HIDDEN int __glXDisp_DestroyWindow(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_DestroyWindow(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_Color4sv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Color4sv(GLbyte * pc);
-extern HIDDEN int __glXDisp_IsProgramNV(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_IsProgramNV(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_PixelZoom(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_PixelZoom(GLbyte * pc);
-extern HIDDEN void __glXDisp_ColorTableParameterfv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_ColorTableParameterfv(GLbyte * pc);
-extern HIDDEN void __glXDisp_PixelMapuiv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_PixelMapuiv(GLbyte * pc);
-extern HIDDEN void __glXDisp_Color3dv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Color3dv(GLbyte * pc);
-extern HIDDEN int __glXDisp_IsTexture(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_IsTexture(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_IsTextureEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_IsTextureEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_DeleteQueriesARB(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_DeleteQueriesARB(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetMapdv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetMapdv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_DestroyGLXPixmap(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_DestroyGLXPixmap(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_SamplePatternSGIS(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_SamplePatternSGIS(GLbyte * pc);
-extern HIDDEN int __glXDisp_PixelStoref(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_PixelStoref(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_PrioritizeTextures(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_PrioritizeTextures(GLbyte * pc);
-extern HIDDEN int __glXDisp_PixelStorei(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_PixelStorei(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_VertexAttrib4usvARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttrib4usvARB(GLbyte * pc);
-extern HIDDEN int __glXDisp_DestroyGLXPbufferSGIX(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_DestroyGLXPbufferSGIX(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_EvalCoord2dv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_EvalCoord2dv(GLbyte * pc);
-extern HIDDEN void __glXDisp_VertexAttrib3svARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttrib3svARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_ColorMaterial(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_ColorMaterial(GLbyte * pc);
-extern HIDDEN void __glXDisp_CompressedTexSubImage3DARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_CompressedTexSubImage3DARB(GLbyte * pc);
-extern HIDDEN int __glXDisp_IsFramebufferEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_IsFramebufferEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetVertexAttribdvARB(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetVertexAttribdvARB(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetSeparableFilter(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetSeparableFilter(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetSeparableFilterEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetSeparableFilterEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_RequestResidentProgramsNV(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_RequestResidentProgramsNV(GLbyte * pc);
-extern HIDDEN int __glXDisp_FeedbackBuffer(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_FeedbackBuffer(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_RasterPos2iv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_RasterPos2iv(GLbyte * pc);
-extern HIDDEN void __glXDisp_TexImage1D(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_TexImage1D(GLbyte * pc);
-extern HIDDEN void __glXDisp_FrontFace(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_FrontFace(GLbyte * pc);
-extern HIDDEN int __glXDisp_RenderLarge(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_RenderLarge(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_VertexAttrib4dvARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttrib4dvARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_PolygonOffset(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_PolygonOffset(GLbyte * pc);
-extern HIDDEN void __glXDisp_ExecuteProgramNV(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_ExecuteProgramNV(GLbyte * pc);
-extern HIDDEN void __glXDisp_Normal3dv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Normal3dv(GLbyte * pc);
-extern HIDDEN void __glXDisp_Lightf(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Lightf(GLbyte * pc);
-extern HIDDEN void __glXDisp_MatrixMode(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_MatrixMode(GLbyte * pc);
-extern HIDDEN void __glXDisp_FramebufferTexture2DEXT(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_FramebufferTexture2DEXT(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetPixelMapusv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetPixelMapusv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_Lighti(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Lighti(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetFramebufferAttachmentParameterivEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetFramebufferAttachmentParameterivEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_ChangeDrawableAttributesSGIX(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_ChangeDrawableAttributesSGIX(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_MultiTexCoord4dvARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_MultiTexCoord4dvARB(GLbyte * pc);
-extern HIDDEN int __glXDisp_CreatePbuffer(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_CreatePbuffer(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetDoublev(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetDoublev(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_MultMatrixd(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_MultMatrixd(GLbyte * pc);
-extern HIDDEN void __glXDisp_MultMatrixf(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_MultMatrixf(GLbyte * pc);
-extern HIDDEN void __glXDisp_MultiTexCoord4fvARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_MultiTexCoord4fvARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_TrackMatrixNV(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_TrackMatrixNV(GLbyte * pc);
-extern HIDDEN void __glXDisp_RasterPos4sv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_RasterPos4sv(GLbyte * pc);
-extern HIDDEN void __glXDisp_VertexAttrib4NsvARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttrib4NsvARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_VertexAttrib3fvARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttrib3fvARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_ClearColor(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_ClearColor(GLbyte * pc);
-extern HIDDEN int __glXDisp_IsDirect(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_IsDirect(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_DeleteFramebuffersEXT(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_DeleteFramebuffersEXT(GLbyte * pc);
-extern HIDDEN void __glXDisp_TexEnviv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_TexEnviv(GLbyte * pc);
-extern HIDDEN void __glXDisp_TexSubImage3D(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_TexSubImage3D(GLbyte * pc);
-extern HIDDEN int __glXDisp_SwapIntervalSGI(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_SwapIntervalSGI(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetColorTableParameterfv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetColorTableParameterfv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetColorTableParameterfvSGI(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetColorTableParameterfvSGI(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_Bitmap(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Bitmap(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetTexLevelParameterfv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetTexLevelParameterfv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GenFramebuffersEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GenFramebuffersEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetProgramParameterdvNV(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetProgramParameterdvNV(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_Vertex2sv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Vertex2sv(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetIntegerv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetIntegerv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetProgramEnvParameterfvARB(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetProgramEnvParameterfvARB(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetTrackMatrixivNV(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetTrackMatrixivNV(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_VertexAttrib3svNV(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttrib3svNV(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetTexEnviv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetTexEnviv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_VendorPrivateWithReply(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_VendorPrivateWithReply(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_SeparableFilter2D(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_SeparableFilter2D(GLbyte * pc);
-extern HIDDEN void __glXDisp_Map1d(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Map1d(GLbyte * pc);
-extern HIDDEN void __glXDisp_Map1f(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Map1f(GLbyte * pc);
-extern HIDDEN void __glXDisp_CompressedTexImage2DARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_CompressedTexImage2DARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_TexImage2D(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_TexImage2D(GLbyte * pc);
-extern HIDDEN void __glXDisp_ProgramParameters4fvNV(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_ProgramParameters4fvNV(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetProgramivNV(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetProgramivNV(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_ChangeDrawableAttributes(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_ChangeDrawableAttributes(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetMinmaxParameteriv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetMinmaxParameteriv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetMinmaxParameterivEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetMinmaxParameterivEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_PixelTransferf(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_PixelTransferf(GLbyte * pc);
-extern HIDDEN void __glXDisp_CopyTexImage1D(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_CopyTexImage1D(GLbyte * pc);
-extern HIDDEN void __glXDisp_RasterPos2dv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_RasterPos2dv(GLbyte * pc);
-extern HIDDEN void __glXDisp_Fogiv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Fogiv(GLbyte * pc);
-extern HIDDEN void __glXDisp_TexCoord1dv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_TexCoord1dv(GLbyte * pc);
-extern HIDDEN void __glXDisp_PixelTransferi(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_PixelTransferi(GLbyte * pc);
-extern HIDDEN void __glXDisp_SecondaryColor3ubvEXT(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_SecondaryColor3ubvEXT(GLbyte * pc);
-extern HIDDEN void __glXDisp_VertexAttrib3fvNV(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttrib3fvNV(GLbyte * pc);
-extern HIDDEN void __glXDisp_Clear(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Clear(GLbyte * pc);
-extern HIDDEN void __glXDisp_ReadBuffer(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_ReadBuffer(GLbyte * pc);
-extern HIDDEN void __glXDisp_ConvolutionParameteri(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_ConvolutionParameteri(GLbyte * pc);
-extern HIDDEN void __glXDisp_Ortho(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Ortho(GLbyte * pc);
-extern HIDDEN void __glXDisp_ListBase(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_ListBase(GLbyte * pc);
-extern HIDDEN void __glXDisp_ConvolutionParameterf(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_ConvolutionParameterf(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetColorTableParameteriv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetColorTableParameteriv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetColorTableParameterivSGI(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetColorTableParameterivSGI(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_ReleaseTexImageEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_ReleaseTexImageEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_CallList(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_CallList(GLbyte * pc);
-extern HIDDEN void __glXDisp_VertexAttribs2fvNV(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttribs2fvNV(GLbyte * pc);
-extern HIDDEN void __glXDisp_Rectiv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Rectiv(GLbyte * pc);
-extern HIDDEN void __glXDisp_SecondaryColor3dvEXT(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_SecondaryColor3dvEXT(GLbyte * pc);
-extern HIDDEN void __glXDisp_Vertex2fv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Vertex2fv(GLbyte * pc);
-extern HIDDEN void __glXDisp_BindRenderbufferEXT(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_BindRenderbufferEXT(GLbyte * pc);
-extern HIDDEN void __glXDisp_Vertex3sv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Vertex3sv(GLbyte * pc);
-extern HIDDEN int __glXDisp_BindTexImageEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_BindTexImageEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_ProgramLocalParameter4fvARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_ProgramLocalParameter4fvARB(GLbyte * pc);
-extern HIDDEN int __glXDisp_DeleteProgramsNV(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_DeleteProgramsNV(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_EvalMesh1(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_EvalMesh1(GLbyte * pc);
-extern HIDDEN void __glXDisp_MultiTexCoord1dvARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_MultiTexCoord1dvARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_Vertex2iv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Vertex2iv(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetProgramStringNV(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetProgramStringNV(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_LineWidth(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_LineWidth(GLbyte * pc);
-extern HIDDEN void __glXDisp_VertexAttrib2fvARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttrib2fvARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_TexGendv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_TexGendv(GLbyte * pc);
-extern HIDDEN void __glXDisp_ResetMinmax(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_ResetMinmax(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetConvolutionParameterfv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetConvolutionParameterfv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetConvolutionParameterfvEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetConvolutionParameterfvEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_VertexAttribs4dvNV(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttribs4dvNV(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetMaterialfv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetMaterialfv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_UseXFont(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_UseXFont(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_ShadeModel(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_ShadeModel(GLbyte * pc);
-extern HIDDEN void __glXDisp_Materialfv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Materialfv(GLbyte * pc);
-extern HIDDEN void __glXDisp_TexCoord3fv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_TexCoord3fv(GLbyte * pc);
-extern HIDDEN void __glXDisp_FogCoordfvEXT(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_FogCoordfvEXT(GLbyte * pc);
-extern HIDDEN void __glXDisp_MultiTexCoord1ivARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_MultiTexCoord1ivARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_MultiTexCoord2ivARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_MultiTexCoord2ivARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_DrawArrays(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_DrawArrays(GLbyte * pc);
-extern HIDDEN void __glXDisp_Color3iv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Color3iv(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetProgramLocalParameterdvARB(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetProgramLocalParameterdvARB(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetHistogramParameteriv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetHistogramParameteriv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetHistogramParameterivEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetHistogramParameterivEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_Rotatef(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Rotatef(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetProgramivARB(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetProgramivARB(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_BlendFuncSeparateEXT(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_BlendFuncSeparateEXT(GLbyte * pc);
-extern HIDDEN void __glXDisp_ProgramParameters4dvNV(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_ProgramParameters4dvNV(GLbyte * pc);
-extern HIDDEN void __glXDisp_EvalPoint2(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_EvalPoint2(GLbyte * pc);
-extern HIDDEN void __glXDisp_EvalPoint1(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_EvalPoint1(GLbyte * pc);
-extern HIDDEN void __glXDisp_PopMatrix(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_PopMatrix(GLbyte * pc);
-extern HIDDEN int __glXDisp_MakeCurrentReadSGI(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_MakeCurrentReadSGI(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetTexGeniv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetTexGeniv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_MakeCurrent(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_MakeCurrent(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_Map2d(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Map2d(GLbyte * pc);
-extern HIDDEN void __glXDisp_Map2f(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Map2f(GLbyte * pc);
-extern HIDDEN void __glXDisp_ProgramStringARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_ProgramStringARB(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetConvolutionFilter(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetConvolutionFilter(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetConvolutionFilterEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetConvolutionFilterEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetCompressedTexImageARB(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetCompressedTexImageARB(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetTexGenfv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetTexGenfv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetHistogram(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetHistogram(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetHistogramEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetHistogramEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_ActiveStencilFaceEXT(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_ActiveStencilFaceEXT(GLbyte * pc);
-extern HIDDEN void __glXDisp_Materialf(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Materialf(GLbyte * pc);
-extern HIDDEN void __glXDisp_Materiali(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Materiali(GLbyte * pc);
-extern HIDDEN void __glXDisp_Indexsv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Indexsv(GLbyte * pc);
-extern HIDDEN void __glXDisp_MultiTexCoord4svARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_MultiTexCoord4svARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_LightModelfv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_LightModelfv(GLbyte * pc);
-extern HIDDEN void __glXDisp_TexCoord2dv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_TexCoord2dv(GLbyte * pc);
-extern HIDDEN int __glXDisp_GenQueriesARB(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GenQueriesARB(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_EvalCoord1dv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_EvalCoord1dv(GLbyte * pc);
-extern HIDDEN void __glXDisp_Translated(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Translated(GLbyte * pc);
-extern HIDDEN void __glXDisp_Translatef(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Translatef(GLbyte * pc);
-extern HIDDEN void __glXDisp_StencilMask(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_StencilMask(GLbyte * pc);
-extern HIDDEN int __glXDisp_CreateWindow(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_CreateWindow(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetLightiv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetLightiv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_IsList(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_IsList(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_RenderMode(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_RenderMode(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_DrawBuffersARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_DrawBuffersARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_LoadName(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_LoadName(GLbyte * pc);
-extern HIDDEN void __glXDisp_CopyTexSubImage1D(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_CopyTexSubImage1D(GLbyte * pc);
-extern HIDDEN void __glXDisp_CullFace(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_CullFace(GLbyte * pc);
-extern HIDDEN int __glXDisp_QueryContextInfoEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_QueryContextInfoEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_VertexAttribs3svNV(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttribs3svNV(GLbyte * pc);
-extern HIDDEN void __glXDisp_StencilFunc(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_StencilFunc(GLbyte * pc);
-extern HIDDEN void __glXDisp_CopyPixels(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_CopyPixels(GLbyte * pc);
-extern HIDDEN void __glXDisp_Rectsv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Rectsv(GLbyte * pc);
-extern HIDDEN void __glXDisp_CopyConvolutionFilter2D(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_CopyConvolutionFilter2D(GLbyte * pc);
-extern HIDDEN void __glXDisp_TexParameterfv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_TexParameterfv(GLbyte * pc);
-extern HIDDEN void __glXDisp_VertexAttrib4uivARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttrib4uivARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_ClipPlane(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_ClipPlane(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetPixelMapuiv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetPixelMapuiv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_Indexfv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Indexfv(GLbyte * pc);
-extern HIDDEN int __glXDisp_QueryContext(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_QueryContext(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_SecondaryColor3svEXT(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_SecondaryColor3svEXT(GLbyte * pc);
-extern HIDDEN void __glXDisp_IndexMask(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_IndexMask(GLbyte * pc);
-extern HIDDEN void __glXDisp_BindProgramNV(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_BindProgramNV(GLbyte * pc);
-extern HIDDEN void __glXDisp_VertexAttrib4svARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttrib4svARB(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetFloatv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetFloatv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_TexCoord3sv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_TexCoord3sv(GLbyte * pc);
-extern HIDDEN void __glXDisp_PopAttrib(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_PopAttrib(GLbyte * pc);
-extern HIDDEN void __glXDisp_Fogfv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Fogfv(GLbyte * pc);
-extern HIDDEN void __glXDisp_InitNames(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_InitNames(GLbyte * pc);
-extern HIDDEN void __glXDisp_Normal3sv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Normal3sv(GLbyte * pc);
-extern HIDDEN void __glXDisp_Minmax(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Minmax(GLbyte * pc);
-extern HIDDEN void __glXDisp_FogCoorddvEXT(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_FogCoorddvEXT(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetBooleanv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetBooleanv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_Hint(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Hint(GLbyte * pc);
-extern HIDDEN void __glXDisp_Color4dv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Color4dv(GLbyte * pc);
-extern HIDDEN void __glXDisp_VertexAttrib2svARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttrib2svARB(GLbyte * pc);
-extern HIDDEN int __glXDisp_AreProgramsResidentNV(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_AreProgramsResidentNV(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_CopyColorSubTable(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_CopyColorSubTable(GLbyte * pc);
-extern HIDDEN void __glXDisp_VertexAttrib4NubvARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttrib4NubvARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_VertexAttrib3dvNV(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttrib3dvNV(GLbyte * pc);
-extern HIDDEN void __glXDisp_Vertex4iv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Vertex4iv(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetProgramEnvParameterdvARB(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetProgramEnvParameterdvARB(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_TexCoord4dv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_TexCoord4dv(GLbyte * pc);
-extern HIDDEN void __glXDisp_Begin(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Begin(GLbyte * pc);
-extern HIDDEN int __glXDisp_ClientInfo(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_ClientInfo(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_Rectfv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Rectfv(GLbyte * pc);
-extern HIDDEN void __glXDisp_LightModelf(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_LightModelf(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetTexParameterfv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetTexParameterfv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetLightfv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetLightfv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_Disable(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Disable(GLbyte * pc);
-extern HIDDEN void __glXDisp_MultiTexCoord2fvARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_MultiTexCoord2fvARB(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetRenderbufferParameterivEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetRenderbufferParameterivEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_SelectBuffer(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_SelectBuffer(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_ColorMask(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_ColorMask(GLbyte * pc);
-extern HIDDEN void __glXDisp_RasterPos4iv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_RasterPos4iv(GLbyte * pc);
-extern HIDDEN void __glXDisp_Enable(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Enable(GLbyte * pc);
-extern HIDDEN void __glXDisp_VertexAttribs4svNV(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttribs4svNV(GLbyte * pc);
-extern HIDDEN int __glXDisp_GetMinmaxParameterfv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetMinmaxParameterfv(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_GetMinmaxParameterfvEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GetMinmaxParameterfvEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_VertexAttrib1fvARB(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttrib1fvARB(GLbyte * pc);
-extern HIDDEN void __glXDisp_VertexAttribs1svNV(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttribs1svNV(GLbyte * pc);
-extern HIDDEN void __glXDisp_Vertex3fv(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_Vertex3fv(GLbyte * pc);
-extern HIDDEN int __glXDisp_GenProgramsNV(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_GenProgramsNV(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN void __glXDisp_VertexAttrib4dvNV(GLbyte * pc);
-extern HIDDEN void __glXDispSwap_VertexAttrib4dvNV(GLbyte * pc);
-
-#  undef HIDDEN
-
-#endif /* !defined( _INDIRECT_DISPATCH_H_ ) */
diff --git a/GL/glx/indirect_dispatch_swap.c b/GL/glx/indirect_dispatch_swap.c
deleted file mode 100644
index f137cbe98..000000000
--- a/GL/glx/indirect_dispatch_swap.c
+++ /dev/null
@@ -1,6051 +0,0 @@
-/* DO NOT EDIT - This file generated automatically by glX_proto_recv.py (from Mesa) script */
-
-/*
- * (C) Copyright IBM Corporation 2005
- * All Rights Reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sub license,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
- * IBM,
- * AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <X11/Xmd.h>
-#include <GL/gl.h>
-#include <GL/glxproto.h>
-#include <inttypes.h>
-#include "indirect_size.h"
-#include "indirect_size_get.h"
-#include "indirect_dispatch.h"
-#include "glxserver.h"
-#include "glxbyteorder.h"
-#include "indirect_util.h"
-#include "singlesize.h"
-#include "glapitable.h"
-#include "glapi.h"
-#include "glthread.h"
-#include "dispatch.h"
-
-#define __GLX_PAD(x)  (((x) + 3) & ~3)
-
-typedef struct {
-    __GLX_PIXEL_3D_HDR;
-} __GLXpixel3DHeader;
-
-extern GLboolean __glXErrorOccured( void );
-extern void __glXClearErrorOccured( void );
-
-static const unsigned dummy_answer[2] = {0, 0};
-
-static GLsizei
-bswap_CARD32( const void * src )
-{
-    union { uint32_t dst; GLsizei ret; } x;
-    x.dst = bswap_32( *(uint32_t *) src );
-    return x.ret;
-}
-
-static GLshort
-bswap_CARD16( const void * src )
-{
-    union { uint16_t dst; GLshort ret; } x;
-    x.dst = bswap_16( *(uint16_t *) src );
-    return x.ret;
-}
-
-static GLenum
-bswap_ENUM( const void * src )
-{
-    union { uint32_t dst; GLenum ret; } x;
-    x.dst = bswap_32( *(uint32_t *) src );
-    return x.ret;
-}
-
-static GLdouble
-bswap_FLOAT64( const void * src )
-{
-    union { uint64_t dst; GLdouble ret; } x;
-    x.dst = bswap_64( *(uint64_t *) src );
-    return x.ret;
-}
-
-static GLfloat
-bswap_FLOAT32( const void * src )
-{
-    union { uint32_t dst; GLfloat ret; } x;
-    x.dst = bswap_32( *(uint32_t *) src );
-    return x.ret;
-}
-
-static void *
-bswap_16_array( uint16_t * src, unsigned count )
-{
-    unsigned  i;
-
-    for ( i = 0 ; i < count ; i++ ) {
-        uint16_t temp = bswap_16( src[i] );
-        src[i] = temp;
-    }
-
-    return src;
-}
-
-static void *
-bswap_32_array( uint32_t * src, unsigned count )
-{
-    unsigned  i;
-
-    for ( i = 0 ; i < count ; i++ ) {
-        uint32_t temp = bswap_32( src[i] );
-        src[i] = temp;
-    }
-
-    return src;
-}
-
-static void *
-bswap_64_array( uint64_t * src, unsigned count )
-{
-    unsigned  i;
-
-    for ( i = 0 ; i < count ; i++ ) {
-        uint64_t temp = bswap_64( src[i] );
-        src[i] = temp;
-    }
-
-    return src;
-}
-
-int __glXDispSwap_NewList(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        CALL_NewList( GET_DISPATCH(), (
-             (GLuint  )bswap_CARD32 ( pc +  0 ),
-             (GLenum  )bswap_ENUM   ( pc +  4 )
-        ) );
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_EndList(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        CALL_EndList( GET_DISPATCH(), () );
-        error = Success;
-    }
-
-    return error;
-}
-
-void __glXDispSwap_CallList(GLbyte * pc)
-{
-    CALL_CallList( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 )
-    ) );
-}
-
-void __glXDispSwap_CallLists(GLbyte * pc)
-{
-    const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  0 );
-    const GLenum type =  (GLenum  )bswap_ENUM   ( pc +  4 );
-    const GLvoid * lists;
-
-    switch(type) {
-    case GL_BYTE:
-    case GL_UNSIGNED_BYTE:
-    case GL_2_BYTES:
-    case GL_3_BYTES:
-    case GL_4_BYTES:
-        lists = (const GLvoid *) (pc + 8); break;
-    case GL_SHORT:
-    case GL_UNSIGNED_SHORT:
-        lists = (const GLvoid *) bswap_16_array( (uint16_t *) (pc + 8), n ); break;
-    case GL_INT:
-    case GL_UNSIGNED_INT:
-    case GL_FLOAT:
-        lists = (const GLvoid *) bswap_32_array( (uint32_t *) (pc + 8), n ); break;
-    default:
-        return;
-    }
-
-    CALL_CallLists( GET_DISPATCH(), (
-        n,
-        type,
-        lists
-    ) );
-}
-
-int __glXDispSwap_DeleteLists(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        CALL_DeleteLists( GET_DISPATCH(), (
-             (GLuint  )bswap_CARD32 ( pc +  0 ),
-             (GLsizei )bswap_CARD32 ( pc +  4 )
-        ) );
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GenLists(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLuint retval;
-        retval = CALL_GenLists( GET_DISPATCH(), (
-             (GLsizei )bswap_CARD32 ( pc +  0 )
-        ) );
-        __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-void __glXDispSwap_ListBase(GLbyte * pc)
-{
-    CALL_ListBase( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 )
-    ) );
-}
-
-void __glXDispSwap_Begin(GLbyte * pc)
-{
-    CALL_Begin( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 )
-    ) );
-}
-
-void __glXDispSwap_Bitmap(GLbyte * pc)
-{
-    const GLubyte * const bitmap = (const GLubyte *) (pc + 44);
-    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
-
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) bswap_CARD32( & hdr->rowLength )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) bswap_CARD32( & hdr->skipRows )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) bswap_CARD32( & hdr->skipPixels )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) bswap_CARD32( & hdr->alignment )) );
-
-    CALL_Bitmap( GET_DISPATCH(), (
-         (GLsizei )bswap_CARD32 ( pc + 20 ),
-         (GLsizei )bswap_CARD32 ( pc + 24 ),
-         (GLfloat )bswap_FLOAT32( pc + 28 ),
-         (GLfloat )bswap_FLOAT32( pc + 32 ),
-         (GLfloat )bswap_FLOAT32( pc + 36 ),
-         (GLfloat )bswap_FLOAT32( pc + 40 ),
-        bitmap
-    ) );
-}
-
-void __glXDispSwap_Color3bv(GLbyte * pc)
-{
-    CALL_Color3bv( GET_DISPATCH(), (
-         (const GLbyte *)(pc +  0)
-    ) );
-}
-
-void __glXDispSwap_Color3dv(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 24);
-        pc -= 4;
-    }
-#endif
-
-    CALL_Color3dv( GET_DISPATCH(), (
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 3 )
-    ) );
-}
-
-void __glXDispSwap_Color3fv(GLbyte * pc)
-{
-    CALL_Color3fv( GET_DISPATCH(), (
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 3 )
-    ) );
-}
-
-void __glXDispSwap_Color3iv(GLbyte * pc)
-{
-    CALL_Color3iv( GET_DISPATCH(), (
-         (const GLint *)bswap_32_array( (uint32_t *) (pc +  0), 3 )
-    ) );
-}
-
-void __glXDispSwap_Color3sv(GLbyte * pc)
-{
-    CALL_Color3sv( GET_DISPATCH(), (
-         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  0), 3 )
-    ) );
-}
-
-void __glXDispSwap_Color3ubv(GLbyte * pc)
-{
-    CALL_Color3ubv( GET_DISPATCH(), (
-         (const GLubyte *)(pc +  0)
-    ) );
-}
-
-void __glXDispSwap_Color3uiv(GLbyte * pc)
-{
-    CALL_Color3uiv( GET_DISPATCH(), (
-         (const GLuint *)bswap_32_array( (uint32_t *) (pc +  0), 3 )
-    ) );
-}
-
-void __glXDispSwap_Color3usv(GLbyte * pc)
-{
-    CALL_Color3usv( GET_DISPATCH(), (
-         (const GLushort *)bswap_16_array( (uint16_t *) (pc +  0), 3 )
-    ) );
-}
-
-void __glXDispSwap_Color4bv(GLbyte * pc)
-{
-    CALL_Color4bv( GET_DISPATCH(), (
-         (const GLbyte *)(pc +  0)
-    ) );
-}
-
-void __glXDispSwap_Color4dv(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 32);
-        pc -= 4;
-    }
-#endif
-
-    CALL_Color4dv( GET_DISPATCH(), (
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 4 )
-    ) );
-}
-
-void __glXDispSwap_Color4fv(GLbyte * pc)
-{
-    CALL_Color4fv( GET_DISPATCH(), (
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 4 )
-    ) );
-}
-
-void __glXDispSwap_Color4iv(GLbyte * pc)
-{
-    CALL_Color4iv( GET_DISPATCH(), (
-         (const GLint *)bswap_32_array( (uint32_t *) (pc +  0), 4 )
-    ) );
-}
-
-void __glXDispSwap_Color4sv(GLbyte * pc)
-{
-    CALL_Color4sv( GET_DISPATCH(), (
-         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  0), 4 )
-    ) );
-}
-
-void __glXDispSwap_Color4ubv(GLbyte * pc)
-{
-    CALL_Color4ubv( GET_DISPATCH(), (
-         (const GLubyte *)(pc +  0)
-    ) );
-}
-
-void __glXDispSwap_Color4uiv(GLbyte * pc)
-{
-    CALL_Color4uiv( GET_DISPATCH(), (
-         (const GLuint *)bswap_32_array( (uint32_t *) (pc +  0), 4 )
-    ) );
-}
-
-void __glXDispSwap_Color4usv(GLbyte * pc)
-{
-    CALL_Color4usv( GET_DISPATCH(), (
-         (const GLushort *)bswap_16_array( (uint16_t *) (pc +  0), 4 )
-    ) );
-}
-
-void __glXDispSwap_EdgeFlagv(GLbyte * pc)
-{
-    CALL_EdgeFlagv( GET_DISPATCH(), (
-         (const GLboolean *)(pc +  0)
-    ) );
-}
-
-void __glXDispSwap_End(GLbyte * pc)
-{
-    CALL_End( GET_DISPATCH(), () );
-}
-
-void __glXDispSwap_Indexdv(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 8);
-        pc -= 4;
-    }
-#endif
-
-    CALL_Indexdv( GET_DISPATCH(), (
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 1 )
-    ) );
-}
-
-void __glXDispSwap_Indexfv(GLbyte * pc)
-{
-    CALL_Indexfv( GET_DISPATCH(), (
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 1 )
-    ) );
-}
-
-void __glXDispSwap_Indexiv(GLbyte * pc)
-{
-    CALL_Indexiv( GET_DISPATCH(), (
-         (const GLint *)bswap_32_array( (uint32_t *) (pc +  0), 1 )
-    ) );
-}
-
-void __glXDispSwap_Indexsv(GLbyte * pc)
-{
-    CALL_Indexsv( GET_DISPATCH(), (
-         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  0), 1 )
-    ) );
-}
-
-void __glXDispSwap_Normal3bv(GLbyte * pc)
-{
-    CALL_Normal3bv( GET_DISPATCH(), (
-         (const GLbyte *)(pc +  0)
-    ) );
-}
-
-void __glXDispSwap_Normal3dv(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 24);
-        pc -= 4;
-    }
-#endif
-
-    CALL_Normal3dv( GET_DISPATCH(), (
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 3 )
-    ) );
-}
-
-void __glXDispSwap_Normal3fv(GLbyte * pc)
-{
-    CALL_Normal3fv( GET_DISPATCH(), (
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 3 )
-    ) );
-}
-
-void __glXDispSwap_Normal3iv(GLbyte * pc)
-{
-    CALL_Normal3iv( GET_DISPATCH(), (
-         (const GLint *)bswap_32_array( (uint32_t *) (pc +  0), 3 )
-    ) );
-}
-
-void __glXDispSwap_Normal3sv(GLbyte * pc)
-{
-    CALL_Normal3sv( GET_DISPATCH(), (
-         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  0), 3 )
-    ) );
-}
-
-void __glXDispSwap_RasterPos2dv(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 16);
-        pc -= 4;
-    }
-#endif
-
-    CALL_RasterPos2dv( GET_DISPATCH(), (
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 2 )
-    ) );
-}
-
-void __glXDispSwap_RasterPos2fv(GLbyte * pc)
-{
-    CALL_RasterPos2fv( GET_DISPATCH(), (
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 2 )
-    ) );
-}
-
-void __glXDispSwap_RasterPos2iv(GLbyte * pc)
-{
-    CALL_RasterPos2iv( GET_DISPATCH(), (
-         (const GLint *)bswap_32_array( (uint32_t *) (pc +  0), 2 )
-    ) );
-}
-
-void __glXDispSwap_RasterPos2sv(GLbyte * pc)
-{
-    CALL_RasterPos2sv( GET_DISPATCH(), (
-         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  0), 2 )
-    ) );
-}
-
-void __glXDispSwap_RasterPos3dv(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 24);
-        pc -= 4;
-    }
-#endif
-
-    CALL_RasterPos3dv( GET_DISPATCH(), (
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 3 )
-    ) );
-}
-
-void __glXDispSwap_RasterPos3fv(GLbyte * pc)
-{
-    CALL_RasterPos3fv( GET_DISPATCH(), (
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 3 )
-    ) );
-}
-
-void __glXDispSwap_RasterPos3iv(GLbyte * pc)
-{
-    CALL_RasterPos3iv( GET_DISPATCH(), (
-         (const GLint *)bswap_32_array( (uint32_t *) (pc +  0), 3 )
-    ) );
-}
-
-void __glXDispSwap_RasterPos3sv(GLbyte * pc)
-{
-    CALL_RasterPos3sv( GET_DISPATCH(), (
-         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  0), 3 )
-    ) );
-}
-
-void __glXDispSwap_RasterPos4dv(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 32);
-        pc -= 4;
-    }
-#endif
-
-    CALL_RasterPos4dv( GET_DISPATCH(), (
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 4 )
-    ) );
-}
-
-void __glXDispSwap_RasterPos4fv(GLbyte * pc)
-{
-    CALL_RasterPos4fv( GET_DISPATCH(), (
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 4 )
-    ) );
-}
-
-void __glXDispSwap_RasterPos4iv(GLbyte * pc)
-{
-    CALL_RasterPos4iv( GET_DISPATCH(), (
-         (const GLint *)bswap_32_array( (uint32_t *) (pc +  0), 4 )
-    ) );
-}
-
-void __glXDispSwap_RasterPos4sv(GLbyte * pc)
-{
-    CALL_RasterPos4sv( GET_DISPATCH(), (
-         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  0), 4 )
-    ) );
-}
-
-void __glXDispSwap_Rectdv(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 32);
-        pc -= 4;
-    }
-#endif
-
-    CALL_Rectdv( GET_DISPATCH(), (
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 2 ),
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc + 16), 2 )
-    ) );
-}
-
-void __glXDispSwap_Rectfv(GLbyte * pc)
-{
-    CALL_Rectfv( GET_DISPATCH(), (
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 2 ),
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  8), 2 )
-    ) );
-}
-
-void __glXDispSwap_Rectiv(GLbyte * pc)
-{
-    CALL_Rectiv( GET_DISPATCH(), (
-         (const GLint *)bswap_32_array( (uint32_t *) (pc +  0), 2 ),
-         (const GLint *)bswap_32_array( (uint32_t *) (pc +  8), 2 )
-    ) );
-}
-
-void __glXDispSwap_Rectsv(GLbyte * pc)
-{
-    CALL_Rectsv( GET_DISPATCH(), (
-         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  0), 2 ),
-         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  4), 2 )
-    ) );
-}
-
-void __glXDispSwap_TexCoord1dv(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 8);
-        pc -= 4;
-    }
-#endif
-
-    CALL_TexCoord1dv( GET_DISPATCH(), (
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 1 )
-    ) );
-}
-
-void __glXDispSwap_TexCoord1fv(GLbyte * pc)
-{
-    CALL_TexCoord1fv( GET_DISPATCH(), (
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 1 )
-    ) );
-}
-
-void __glXDispSwap_TexCoord1iv(GLbyte * pc)
-{
-    CALL_TexCoord1iv( GET_DISPATCH(), (
-         (const GLint *)bswap_32_array( (uint32_t *) (pc +  0), 1 )
-    ) );
-}
-
-void __glXDispSwap_TexCoord1sv(GLbyte * pc)
-{
-    CALL_TexCoord1sv( GET_DISPATCH(), (
-         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  0), 1 )
-    ) );
-}
-
-void __glXDispSwap_TexCoord2dv(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 16);
-        pc -= 4;
-    }
-#endif
-
-    CALL_TexCoord2dv( GET_DISPATCH(), (
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 2 )
-    ) );
-}
-
-void __glXDispSwap_TexCoord2fv(GLbyte * pc)
-{
-    CALL_TexCoord2fv( GET_DISPATCH(), (
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 2 )
-    ) );
-}
-
-void __glXDispSwap_TexCoord2iv(GLbyte * pc)
-{
-    CALL_TexCoord2iv( GET_DISPATCH(), (
-         (const GLint *)bswap_32_array( (uint32_t *) (pc +  0), 2 )
-    ) );
-}
-
-void __glXDispSwap_TexCoord2sv(GLbyte * pc)
-{
-    CALL_TexCoord2sv( GET_DISPATCH(), (
-         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  0), 2 )
-    ) );
-}
-
-void __glXDispSwap_TexCoord3dv(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 24);
-        pc -= 4;
-    }
-#endif
-
-    CALL_TexCoord3dv( GET_DISPATCH(), (
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 3 )
-    ) );
-}
-
-void __glXDispSwap_TexCoord3fv(GLbyte * pc)
-{
-    CALL_TexCoord3fv( GET_DISPATCH(), (
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 3 )
-    ) );
-}
-
-void __glXDispSwap_TexCoord3iv(GLbyte * pc)
-{
-    CALL_TexCoord3iv( GET_DISPATCH(), (
-         (const GLint *)bswap_32_array( (uint32_t *) (pc +  0), 3 )
-    ) );
-}
-
-void __glXDispSwap_TexCoord3sv(GLbyte * pc)
-{
-    CALL_TexCoord3sv( GET_DISPATCH(), (
-         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  0), 3 )
-    ) );
-}
-
-void __glXDispSwap_TexCoord4dv(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 32);
-        pc -= 4;
-    }
-#endif
-
-    CALL_TexCoord4dv( GET_DISPATCH(), (
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 4 )
-    ) );
-}
-
-void __glXDispSwap_TexCoord4fv(GLbyte * pc)
-{
-    CALL_TexCoord4fv( GET_DISPATCH(), (
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 4 )
-    ) );
-}
-
-void __glXDispSwap_TexCoord4iv(GLbyte * pc)
-{
-    CALL_TexCoord4iv( GET_DISPATCH(), (
-         (const GLint *)bswap_32_array( (uint32_t *) (pc +  0), 4 )
-    ) );
-}
-
-void __glXDispSwap_TexCoord4sv(GLbyte * pc)
-{
-    CALL_TexCoord4sv( GET_DISPATCH(), (
-         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  0), 4 )
-    ) );
-}
-
-void __glXDispSwap_Vertex2dv(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 16);
-        pc -= 4;
-    }
-#endif
-
-    CALL_Vertex2dv( GET_DISPATCH(), (
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 2 )
-    ) );
-}
-
-void __glXDispSwap_Vertex2fv(GLbyte * pc)
-{
-    CALL_Vertex2fv( GET_DISPATCH(), (
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 2 )
-    ) );
-}
-
-void __glXDispSwap_Vertex2iv(GLbyte * pc)
-{
-    CALL_Vertex2iv( GET_DISPATCH(), (
-         (const GLint *)bswap_32_array( (uint32_t *) (pc +  0), 2 )
-    ) );
-}
-
-void __glXDispSwap_Vertex2sv(GLbyte * pc)
-{
-    CALL_Vertex2sv( GET_DISPATCH(), (
-         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  0), 2 )
-    ) );
-}
-
-void __glXDispSwap_Vertex3dv(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 24);
-        pc -= 4;
-    }
-#endif
-
-    CALL_Vertex3dv( GET_DISPATCH(), (
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 3 )
-    ) );
-}
-
-void __glXDispSwap_Vertex3fv(GLbyte * pc)
-{
-    CALL_Vertex3fv( GET_DISPATCH(), (
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 3 )
-    ) );
-}
-
-void __glXDispSwap_Vertex3iv(GLbyte * pc)
-{
-    CALL_Vertex3iv( GET_DISPATCH(), (
-         (const GLint *)bswap_32_array( (uint32_t *) (pc +  0), 3 )
-    ) );
-}
-
-void __glXDispSwap_Vertex3sv(GLbyte * pc)
-{
-    CALL_Vertex3sv( GET_DISPATCH(), (
-         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  0), 3 )
-    ) );
-}
-
-void __glXDispSwap_Vertex4dv(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 32);
-        pc -= 4;
-    }
-#endif
-
-    CALL_Vertex4dv( GET_DISPATCH(), (
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 4 )
-    ) );
-}
-
-void __glXDispSwap_Vertex4fv(GLbyte * pc)
-{
-    CALL_Vertex4fv( GET_DISPATCH(), (
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 4 )
-    ) );
-}
-
-void __glXDispSwap_Vertex4iv(GLbyte * pc)
-{
-    CALL_Vertex4iv( GET_DISPATCH(), (
-         (const GLint *)bswap_32_array( (uint32_t *) (pc +  0), 4 )
-    ) );
-}
-
-void __glXDispSwap_Vertex4sv(GLbyte * pc)
-{
-    CALL_Vertex4sv( GET_DISPATCH(), (
-         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  0), 4 )
-    ) );
-}
-
-void __glXDispSwap_ClipPlane(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 36);
-        pc -= 4;
-    }
-#endif
-
-    CALL_ClipPlane( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc + 32 ),
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 4 )
-    ) );
-}
-
-void __glXDispSwap_ColorMaterial(GLbyte * pc)
-{
-    CALL_ColorMaterial( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLenum  )bswap_ENUM   ( pc +  4 )
-    ) );
-}
-
-void __glXDispSwap_CullFace(GLbyte * pc)
-{
-    CALL_CullFace( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 )
-    ) );
-}
-
-void __glXDispSwap_Fogf(GLbyte * pc)
-{
-    CALL_Fogf( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLfloat )bswap_FLOAT32( pc +  4 )
-    ) );
-}
-
-void __glXDispSwap_Fogfv(GLbyte * pc)
-{
-    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  0 );
-    const GLfloat * params;
-
-    params = (const GLfloat *) bswap_32_array( (uint32_t *) (pc + 4), __glFogfv_size(pname) );
-
-    CALL_Fogfv( GET_DISPATCH(), (
-        pname,
-        params
-    ) );
-}
-
-void __glXDispSwap_Fogi(GLbyte * pc)
-{
-    CALL_Fogi( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLint   )bswap_CARD32 ( pc +  4 )
-    ) );
-}
-
-void __glXDispSwap_Fogiv(GLbyte * pc)
-{
-    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  0 );
-    const GLint * params;
-
-    params = (const GLint *) bswap_32_array( (uint32_t *) (pc + 4), __glFogiv_size(pname) );
-
-    CALL_Fogiv( GET_DISPATCH(), (
-        pname,
-        params
-    ) );
-}
-
-void __glXDispSwap_FrontFace(GLbyte * pc)
-{
-    CALL_FrontFace( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 )
-    ) );
-}
-
-void __glXDispSwap_Hint(GLbyte * pc)
-{
-    CALL_Hint( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLenum  )bswap_ENUM   ( pc +  4 )
-    ) );
-}
-
-void __glXDispSwap_Lightf(GLbyte * pc)
-{
-    CALL_Lightf( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLenum  )bswap_ENUM   ( pc +  4 ),
-         (GLfloat )bswap_FLOAT32( pc +  8 )
-    ) );
-}
-
-void __glXDispSwap_Lightfv(GLbyte * pc)
-{
-    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-    const GLfloat * params;
-
-    params = (const GLfloat *) bswap_32_array( (uint32_t *) (pc + 8), __glLightfv_size(pname) );
-
-    CALL_Lightfv( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-        pname,
-        params
-    ) );
-}
-
-void __glXDispSwap_Lighti(GLbyte * pc)
-{
-    CALL_Lighti( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLenum  )bswap_ENUM   ( pc +  4 ),
-         (GLint   )bswap_CARD32 ( pc +  8 )
-    ) );
-}
-
-void __glXDispSwap_Lightiv(GLbyte * pc)
-{
-    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-    const GLint * params;
-
-    params = (const GLint *) bswap_32_array( (uint32_t *) (pc + 8), __glLightiv_size(pname) );
-
-    CALL_Lightiv( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-        pname,
-        params
-    ) );
-}
-
-void __glXDispSwap_LightModelf(GLbyte * pc)
-{
-    CALL_LightModelf( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLfloat )bswap_FLOAT32( pc +  4 )
-    ) );
-}
-
-void __glXDispSwap_LightModelfv(GLbyte * pc)
-{
-    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  0 );
-    const GLfloat * params;
-
-    params = (const GLfloat *) bswap_32_array( (uint32_t *) (pc + 4), __glLightModelfv_size(pname) );
-
-    CALL_LightModelfv( GET_DISPATCH(), (
-        pname,
-        params
-    ) );
-}
-
-void __glXDispSwap_LightModeli(GLbyte * pc)
-{
-    CALL_LightModeli( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLint   )bswap_CARD32 ( pc +  4 )
-    ) );
-}
-
-void __glXDispSwap_LightModeliv(GLbyte * pc)
-{
-    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  0 );
-    const GLint * params;
-
-    params = (const GLint *) bswap_32_array( (uint32_t *) (pc + 4), __glLightModeliv_size(pname) );
-
-    CALL_LightModeliv( GET_DISPATCH(), (
-        pname,
-        params
-    ) );
-}
-
-void __glXDispSwap_LineStipple(GLbyte * pc)
-{
-    CALL_LineStipple( GET_DISPATCH(), (
-         (GLint   )bswap_CARD32 ( pc +  0 ),
-         (GLushort)bswap_CARD16 ( pc +  4 )
-    ) );
-}
-
-void __glXDispSwap_LineWidth(GLbyte * pc)
-{
-    CALL_LineWidth( GET_DISPATCH(), (
-         (GLfloat )bswap_FLOAT32( pc +  0 )
-    ) );
-}
-
-void __glXDispSwap_Materialf(GLbyte * pc)
-{
-    CALL_Materialf( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLenum  )bswap_ENUM   ( pc +  4 ),
-         (GLfloat )bswap_FLOAT32( pc +  8 )
-    ) );
-}
-
-void __glXDispSwap_Materialfv(GLbyte * pc)
-{
-    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-    const GLfloat * params;
-
-    params = (const GLfloat *) bswap_32_array( (uint32_t *) (pc + 8), __glMaterialfv_size(pname) );
-
-    CALL_Materialfv( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-        pname,
-        params
-    ) );
-}
-
-void __glXDispSwap_Materiali(GLbyte * pc)
-{
-    CALL_Materiali( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLenum  )bswap_ENUM   ( pc +  4 ),
-         (GLint   )bswap_CARD32 ( pc +  8 )
-    ) );
-}
-
-void __glXDispSwap_Materialiv(GLbyte * pc)
-{
-    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-    const GLint * params;
-
-    params = (const GLint *) bswap_32_array( (uint32_t *) (pc + 8), __glMaterialiv_size(pname) );
-
-    CALL_Materialiv( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-        pname,
-        params
-    ) );
-}
-
-void __glXDispSwap_PointSize(GLbyte * pc)
-{
-    CALL_PointSize( GET_DISPATCH(), (
-         (GLfloat )bswap_FLOAT32( pc +  0 )
-    ) );
-}
-
-void __glXDispSwap_PolygonMode(GLbyte * pc)
-{
-    CALL_PolygonMode( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLenum  )bswap_ENUM   ( pc +  4 )
-    ) );
-}
-
-void __glXDispSwap_PolygonStipple(GLbyte * pc)
-{
-    const GLubyte * const mask = (const GLubyte *) (pc + 20);
-    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
-
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) bswap_CARD32( & hdr->rowLength )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) bswap_CARD32( & hdr->skipRows )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) bswap_CARD32( & hdr->skipPixels )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) bswap_CARD32( & hdr->alignment )) );
-
-    CALL_PolygonStipple( GET_DISPATCH(), (
-        mask
-    ) );
-}
-
-void __glXDispSwap_Scissor(GLbyte * pc)
-{
-    CALL_Scissor( GET_DISPATCH(), (
-         (GLint   )bswap_CARD32 ( pc +  0 ),
-         (GLint   )bswap_CARD32 ( pc +  4 ),
-         (GLsizei )bswap_CARD32 ( pc +  8 ),
-         (GLsizei )bswap_CARD32 ( pc + 12 )
-    ) );
-}
-
-void __glXDispSwap_ShadeModel(GLbyte * pc)
-{
-    CALL_ShadeModel( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 )
-    ) );
-}
-
-void __glXDispSwap_TexParameterf(GLbyte * pc)
-{
-    CALL_TexParameterf( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLenum  )bswap_ENUM   ( pc +  4 ),
-         (GLfloat )bswap_FLOAT32( pc +  8 )
-    ) );
-}
-
-void __glXDispSwap_TexParameterfv(GLbyte * pc)
-{
-    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-    const GLfloat * params;
-
-    params = (const GLfloat *) bswap_32_array( (uint32_t *) (pc + 8), __glTexParameterfv_size(pname) );
-
-    CALL_TexParameterfv( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-        pname,
-        params
-    ) );
-}
-
-void __glXDispSwap_TexParameteri(GLbyte * pc)
-{
-    CALL_TexParameteri( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLenum  )bswap_ENUM   ( pc +  4 ),
-         (GLint   )bswap_CARD32 ( pc +  8 )
-    ) );
-}
-
-void __glXDispSwap_TexParameteriv(GLbyte * pc)
-{
-    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-    const GLint * params;
-
-    params = (const GLint *) bswap_32_array( (uint32_t *) (pc + 8), __glTexParameteriv_size(pname) );
-
-    CALL_TexParameteriv( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-        pname,
-        params
-    ) );
-}
-
-void __glXDispSwap_TexImage1D(GLbyte * pc)
-{
-    const GLvoid * const pixels = (const GLvoid *) (pc + 52);
-    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
-
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) bswap_CARD32( & hdr->rowLength )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) bswap_CARD32( & hdr->skipRows )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) bswap_CARD32( & hdr->skipPixels )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) bswap_CARD32( & hdr->alignment )) );
-
-    CALL_TexImage1D( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc + 20 ),
-         (GLint   )bswap_CARD32 ( pc + 24 ),
-         (GLint   )bswap_CARD32 ( pc + 28 ),
-         (GLsizei )bswap_CARD32 ( pc + 32 ),
-         (GLint   )bswap_CARD32 ( pc + 40 ),
-         (GLenum  )bswap_ENUM   ( pc + 44 ),
-         (GLenum  )bswap_ENUM   ( pc + 48 ),
-        pixels
-    ) );
-}
-
-void __glXDispSwap_TexImage2D(GLbyte * pc)
-{
-    const GLvoid * const pixels = (const GLvoid *) (pc + 52);
-    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
-
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) bswap_CARD32( & hdr->rowLength )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) bswap_CARD32( & hdr->skipRows )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) bswap_CARD32( & hdr->skipPixels )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) bswap_CARD32( & hdr->alignment )) );
-
-    CALL_TexImage2D( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc + 20 ),
-         (GLint   )bswap_CARD32 ( pc + 24 ),
-         (GLint   )bswap_CARD32 ( pc + 28 ),
-         (GLsizei )bswap_CARD32 ( pc + 32 ),
-         (GLsizei )bswap_CARD32 ( pc + 36 ),
-         (GLint   )bswap_CARD32 ( pc + 40 ),
-         (GLenum  )bswap_ENUM   ( pc + 44 ),
-         (GLenum  )bswap_ENUM   ( pc + 48 ),
-        pixels
-    ) );
-}
-
-void __glXDispSwap_TexEnvf(GLbyte * pc)
-{
-    CALL_TexEnvf( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLenum  )bswap_ENUM   ( pc +  4 ),
-         (GLfloat )bswap_FLOAT32( pc +  8 )
-    ) );
-}
-
-void __glXDispSwap_TexEnvfv(GLbyte * pc)
-{
-    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-    const GLfloat * params;
-
-    params = (const GLfloat *) bswap_32_array( (uint32_t *) (pc + 8), __glTexEnvfv_size(pname) );
-
-    CALL_TexEnvfv( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-        pname,
-        params
-    ) );
-}
-
-void __glXDispSwap_TexEnvi(GLbyte * pc)
-{
-    CALL_TexEnvi( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLenum  )bswap_ENUM   ( pc +  4 ),
-         (GLint   )bswap_CARD32 ( pc +  8 )
-    ) );
-}
-
-void __glXDispSwap_TexEnviv(GLbyte * pc)
-{
-    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-    const GLint * params;
-
-    params = (const GLint *) bswap_32_array( (uint32_t *) (pc + 8), __glTexEnviv_size(pname) );
-
-    CALL_TexEnviv( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-        pname,
-        params
-    ) );
-}
-
-void __glXDispSwap_TexGend(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 16);
-        pc -= 4;
-    }
-#endif
-
-    CALL_TexGend( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  8 ),
-         (GLenum  )bswap_ENUM   ( pc + 12 ),
-         (GLdouble)bswap_FLOAT64( pc +  0 )
-    ) );
-}
-
-void __glXDispSwap_TexGendv(GLbyte * pc)
-{
-    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-    const GLdouble * params;
-
-#ifdef __GLX_ALIGN64
-    const GLuint compsize = __glTexGendv_size(pname);
-    const GLuint cmdlen = 12 + __GLX_PAD((compsize * 8)) - 4;
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, cmdlen);
-        pc -= 4;
-    }
-#endif
-
-    params = (const GLdouble *) bswap_64_array( (uint64_t *) (pc + 8), __glTexGendv_size(pname) );
-
-    CALL_TexGendv( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-        pname,
-        params
-    ) );
-}
-
-void __glXDispSwap_TexGenf(GLbyte * pc)
-{
-    CALL_TexGenf( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLenum  )bswap_ENUM   ( pc +  4 ),
-         (GLfloat )bswap_FLOAT32( pc +  8 )
-    ) );
-}
-
-void __glXDispSwap_TexGenfv(GLbyte * pc)
-{
-    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-    const GLfloat * params;
-
-    params = (const GLfloat *) bswap_32_array( (uint32_t *) (pc + 8), __glTexGenfv_size(pname) );
-
-    CALL_TexGenfv( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-        pname,
-        params
-    ) );
-}
-
-void __glXDispSwap_TexGeni(GLbyte * pc)
-{
-    CALL_TexGeni( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLenum  )bswap_ENUM   ( pc +  4 ),
-         (GLint   )bswap_CARD32 ( pc +  8 )
-    ) );
-}
-
-void __glXDispSwap_TexGeniv(GLbyte * pc)
-{
-    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-    const GLint * params;
-
-    params = (const GLint *) bswap_32_array( (uint32_t *) (pc + 8), __glTexGeniv_size(pname) );
-
-    CALL_TexGeniv( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-        pname,
-        params
-    ) );
-}
-
-void __glXDispSwap_InitNames(GLbyte * pc)
-{
-    CALL_InitNames( GET_DISPATCH(), () );
-}
-
-void __glXDispSwap_LoadName(GLbyte * pc)
-{
-    CALL_LoadName( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 )
-    ) );
-}
-
-void __glXDispSwap_PassThrough(GLbyte * pc)
-{
-    CALL_PassThrough( GET_DISPATCH(), (
-         (GLfloat )bswap_FLOAT32( pc +  0 )
-    ) );
-}
-
-void __glXDispSwap_PopName(GLbyte * pc)
-{
-    CALL_PopName( GET_DISPATCH(), () );
-}
-
-void __glXDispSwap_PushName(GLbyte * pc)
-{
-    CALL_PushName( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 )
-    ) );
-}
-
-void __glXDispSwap_DrawBuffer(GLbyte * pc)
-{
-    CALL_DrawBuffer( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 )
-    ) );
-}
-
-void __glXDispSwap_Clear(GLbyte * pc)
-{
-    CALL_Clear( GET_DISPATCH(), (
-         (GLbitfield)bswap_CARD32 ( pc +  0 )
-    ) );
-}
-
-void __glXDispSwap_ClearAccum(GLbyte * pc)
-{
-    CALL_ClearAccum( GET_DISPATCH(), (
-         (GLfloat )bswap_FLOAT32( pc +  0 ),
-         (GLfloat )bswap_FLOAT32( pc +  4 ),
-         (GLfloat )bswap_FLOAT32( pc +  8 ),
-         (GLfloat )bswap_FLOAT32( pc + 12 )
-    ) );
-}
-
-void __glXDispSwap_ClearIndex(GLbyte * pc)
-{
-    CALL_ClearIndex( GET_DISPATCH(), (
-         (GLfloat )bswap_FLOAT32( pc +  0 )
-    ) );
-}
-
-void __glXDispSwap_ClearColor(GLbyte * pc)
-{
-    CALL_ClearColor( GET_DISPATCH(), (
-         (GLclampf)bswap_FLOAT32( pc +  0 ),
-         (GLclampf)bswap_FLOAT32( pc +  4 ),
-         (GLclampf)bswap_FLOAT32( pc +  8 ),
-         (GLclampf)bswap_FLOAT32( pc + 12 )
-    ) );
-}
-
-void __glXDispSwap_ClearStencil(GLbyte * pc)
-{
-    CALL_ClearStencil( GET_DISPATCH(), (
-         (GLint   )bswap_CARD32 ( pc +  0 )
-    ) );
-}
-
-void __glXDispSwap_ClearDepth(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 8);
-        pc -= 4;
-    }
-#endif
-
-    CALL_ClearDepth( GET_DISPATCH(), (
-         (GLclampd)bswap_FLOAT64( pc +  0 )
-    ) );
-}
-
-void __glXDispSwap_StencilMask(GLbyte * pc)
-{
-    CALL_StencilMask( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 )
-    ) );
-}
-
-void __glXDispSwap_ColorMask(GLbyte * pc)
-{
-    CALL_ColorMask( GET_DISPATCH(), (
-        *(GLboolean *)(pc +  0),
-        *(GLboolean *)(pc +  1),
-        *(GLboolean *)(pc +  2),
-        *(GLboolean *)(pc +  3)
-    ) );
-}
-
-void __glXDispSwap_DepthMask(GLbyte * pc)
-{
-    CALL_DepthMask( GET_DISPATCH(), (
-        *(GLboolean *)(pc +  0)
-    ) );
-}
-
-void __glXDispSwap_IndexMask(GLbyte * pc)
-{
-    CALL_IndexMask( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 )
-    ) );
-}
-
-void __glXDispSwap_Accum(GLbyte * pc)
-{
-    CALL_Accum( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLfloat )bswap_FLOAT32( pc +  4 )
-    ) );
-}
-
-void __glXDispSwap_Disable(GLbyte * pc)
-{
-    CALL_Disable( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 )
-    ) );
-}
-
-void __glXDispSwap_Enable(GLbyte * pc)
-{
-    CALL_Enable( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 )
-    ) );
-}
-
-void __glXDispSwap_PopAttrib(GLbyte * pc)
-{
-    CALL_PopAttrib( GET_DISPATCH(), () );
-}
-
-void __glXDispSwap_PushAttrib(GLbyte * pc)
-{
-    CALL_PushAttrib( GET_DISPATCH(), (
-         (GLbitfield)bswap_CARD32 ( pc +  0 )
-    ) );
-}
-
-void __glXDispSwap_MapGrid1d(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 20);
-        pc -= 4;
-    }
-#endif
-
-    CALL_MapGrid1d( GET_DISPATCH(), (
-         (GLint   )bswap_CARD32 ( pc + 16 ),
-         (GLdouble)bswap_FLOAT64( pc +  0 ),
-         (GLdouble)bswap_FLOAT64( pc +  8 )
-    ) );
-}
-
-void __glXDispSwap_MapGrid1f(GLbyte * pc)
-{
-    CALL_MapGrid1f( GET_DISPATCH(), (
-         (GLint   )bswap_CARD32 ( pc +  0 ),
-         (GLfloat )bswap_FLOAT32( pc +  4 ),
-         (GLfloat )bswap_FLOAT32( pc +  8 )
-    ) );
-}
-
-void __glXDispSwap_MapGrid2d(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 40);
-        pc -= 4;
-    }
-#endif
-
-    CALL_MapGrid2d( GET_DISPATCH(), (
-         (GLint   )bswap_CARD32 ( pc + 32 ),
-         (GLdouble)bswap_FLOAT64( pc +  0 ),
-         (GLdouble)bswap_FLOAT64( pc +  8 ),
-         (GLint   )bswap_CARD32 ( pc + 36 ),
-         (GLdouble)bswap_FLOAT64( pc + 16 ),
-         (GLdouble)bswap_FLOAT64( pc + 24 )
-    ) );
-}
-
-void __glXDispSwap_MapGrid2f(GLbyte * pc)
-{
-    CALL_MapGrid2f( GET_DISPATCH(), (
-         (GLint   )bswap_CARD32 ( pc +  0 ),
-         (GLfloat )bswap_FLOAT32( pc +  4 ),
-         (GLfloat )bswap_FLOAT32( pc +  8 ),
-         (GLint   )bswap_CARD32 ( pc + 12 ),
-         (GLfloat )bswap_FLOAT32( pc + 16 ),
-         (GLfloat )bswap_FLOAT32( pc + 20 )
-    ) );
-}
-
-void __glXDispSwap_EvalCoord1dv(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 8);
-        pc -= 4;
-    }
-#endif
-
-    CALL_EvalCoord1dv( GET_DISPATCH(), (
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 1 )
-    ) );
-}
-
-void __glXDispSwap_EvalCoord1fv(GLbyte * pc)
-{
-    CALL_EvalCoord1fv( GET_DISPATCH(), (
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 1 )
-    ) );
-}
-
-void __glXDispSwap_EvalCoord2dv(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 16);
-        pc -= 4;
-    }
-#endif
-
-    CALL_EvalCoord2dv( GET_DISPATCH(), (
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 2 )
-    ) );
-}
-
-void __glXDispSwap_EvalCoord2fv(GLbyte * pc)
-{
-    CALL_EvalCoord2fv( GET_DISPATCH(), (
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 2 )
-    ) );
-}
-
-void __glXDispSwap_EvalMesh1(GLbyte * pc)
-{
-    CALL_EvalMesh1( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLint   )bswap_CARD32 ( pc +  4 ),
-         (GLint   )bswap_CARD32 ( pc +  8 )
-    ) );
-}
-
-void __glXDispSwap_EvalPoint1(GLbyte * pc)
-{
-    CALL_EvalPoint1( GET_DISPATCH(), (
-         (GLint   )bswap_CARD32 ( pc +  0 )
-    ) );
-}
-
-void __glXDispSwap_EvalMesh2(GLbyte * pc)
-{
-    CALL_EvalMesh2( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLint   )bswap_CARD32 ( pc +  4 ),
-         (GLint   )bswap_CARD32 ( pc +  8 ),
-         (GLint   )bswap_CARD32 ( pc + 12 ),
-         (GLint   )bswap_CARD32 ( pc + 16 )
-    ) );
-}
-
-void __glXDispSwap_EvalPoint2(GLbyte * pc)
-{
-    CALL_EvalPoint2( GET_DISPATCH(), (
-         (GLint   )bswap_CARD32 ( pc +  0 ),
-         (GLint   )bswap_CARD32 ( pc +  4 )
-    ) );
-}
-
-void __glXDispSwap_AlphaFunc(GLbyte * pc)
-{
-    CALL_AlphaFunc( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLclampf)bswap_FLOAT32( pc +  4 )
-    ) );
-}
-
-void __glXDispSwap_BlendFunc(GLbyte * pc)
-{
-    CALL_BlendFunc( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLenum  )bswap_ENUM   ( pc +  4 )
-    ) );
-}
-
-void __glXDispSwap_LogicOp(GLbyte * pc)
-{
-    CALL_LogicOp( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 )
-    ) );
-}
-
-void __glXDispSwap_StencilFunc(GLbyte * pc)
-{
-    CALL_StencilFunc( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLint   )bswap_CARD32 ( pc +  4 ),
-         (GLuint  )bswap_CARD32 ( pc +  8 )
-    ) );
-}
-
-void __glXDispSwap_StencilOp(GLbyte * pc)
-{
-    CALL_StencilOp( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLenum  )bswap_ENUM   ( pc +  4 ),
-         (GLenum  )bswap_ENUM   ( pc +  8 )
-    ) );
-}
-
-void __glXDispSwap_DepthFunc(GLbyte * pc)
-{
-    CALL_DepthFunc( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 )
-    ) );
-}
-
-void __glXDispSwap_PixelZoom(GLbyte * pc)
-{
-    CALL_PixelZoom( GET_DISPATCH(), (
-         (GLfloat )bswap_FLOAT32( pc +  0 ),
-         (GLfloat )bswap_FLOAT32( pc +  4 )
-    ) );
-}
-
-void __glXDispSwap_PixelTransferf(GLbyte * pc)
-{
-    CALL_PixelTransferf( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLfloat )bswap_FLOAT32( pc +  4 )
-    ) );
-}
-
-void __glXDispSwap_PixelTransferi(GLbyte * pc)
-{
-    CALL_PixelTransferi( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLint   )bswap_CARD32 ( pc +  4 )
-    ) );
-}
-
-int __glXDispSwap_PixelStoref(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        CALL_PixelStoref( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-             (GLfloat )bswap_FLOAT32( pc +  4 )
-        ) );
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_PixelStorei(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        CALL_PixelStorei( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-             (GLint   )bswap_CARD32 ( pc +  4 )
-        ) );
-        error = Success;
-    }
-
-    return error;
-}
-
-void __glXDispSwap_PixelMapfv(GLbyte * pc)
-{
-    const GLsizei mapsize =  (GLsizei )bswap_CARD32 ( pc +  4 );
-
-    CALL_PixelMapfv( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-        mapsize,
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  8), 0 )
-    ) );
-}
-
-void __glXDispSwap_PixelMapuiv(GLbyte * pc)
-{
-    const GLsizei mapsize =  (GLsizei )bswap_CARD32 ( pc +  4 );
-
-    CALL_PixelMapuiv( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-        mapsize,
-         (const GLuint *)bswap_32_array( (uint32_t *) (pc +  8), 0 )
-    ) );
-}
-
-void __glXDispSwap_PixelMapusv(GLbyte * pc)
-{
-    const GLsizei mapsize =  (GLsizei )bswap_CARD32 ( pc +  4 );
-
-    CALL_PixelMapusv( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-        mapsize,
-         (const GLushort *)bswap_16_array( (uint16_t *) (pc +  8), 0 )
-    ) );
-}
-
-void __glXDispSwap_ReadBuffer(GLbyte * pc)
-{
-    CALL_ReadBuffer( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 )
-    ) );
-}
-
-void __glXDispSwap_CopyPixels(GLbyte * pc)
-{
-    CALL_CopyPixels( GET_DISPATCH(), (
-         (GLint   )bswap_CARD32 ( pc +  0 ),
-         (GLint   )bswap_CARD32 ( pc +  4 ),
-         (GLsizei )bswap_CARD32 ( pc +  8 ),
-         (GLsizei )bswap_CARD32 ( pc + 12 ),
-         (GLenum  )bswap_ENUM   ( pc + 16 )
-    ) );
-}
-
-void __glXDispSwap_DrawPixels(GLbyte * pc)
-{
-    const GLvoid * const pixels = (const GLvoid *) (pc + 36);
-    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
-
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) bswap_CARD32( & hdr->rowLength )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) bswap_CARD32( & hdr->skipRows )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) bswap_CARD32( & hdr->skipPixels )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) bswap_CARD32( & hdr->alignment )) );
-
-    CALL_DrawPixels( GET_DISPATCH(), (
-         (GLsizei )bswap_CARD32 ( pc + 20 ),
-         (GLsizei )bswap_CARD32 ( pc + 24 ),
-         (GLenum  )bswap_ENUM   ( pc + 28 ),
-         (GLenum  )bswap_ENUM   ( pc + 32 ),
-        pixels
-    ) );
-}
-
-int __glXDispSwap_GetBooleanv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  0 );
-
-        const GLuint compsize = __glGetBooleanv_size(pname);
-        GLboolean answerBuffer[200];
-        GLboolean * params = __glXGetAnswerBuffer(cl, compsize, answerBuffer, sizeof(answerBuffer), 1);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetBooleanv( GET_DISPATCH(), (
-            pname,
-            params
-        ) );
-        __glXSendReplySwap(cl->client, params, compsize, 1, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetClipPlane(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLdouble equation[4];
-        CALL_GetClipPlane( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-            equation
-        ) );
-        (void) bswap_64_array( (uint64_t *) equation, 4 );
-        __glXSendReplySwap(cl->client, equation, 4, 8, GL_TRUE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetDoublev(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  0 );
-
-        const GLuint compsize = __glGetDoublev_size(pname);
-        GLdouble answerBuffer[200];
-        GLdouble * params = __glXGetAnswerBuffer(cl, compsize * 8, answerBuffer, sizeof(answerBuffer), 8);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetDoublev( GET_DISPATCH(), (
-            pname,
-            params
-        ) );
-        (void) bswap_64_array( (uint64_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 8, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetError(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLenum retval;
-        retval = CALL_GetError( GET_DISPATCH(), () );
-        __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetFloatv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  0 );
-
-        const GLuint compsize = __glGetFloatv_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetFloatv( GET_DISPATCH(), (
-            pname,
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetIntegerv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  0 );
-
-        const GLuint compsize = __glGetIntegerv_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetIntegerv( GET_DISPATCH(), (
-            pname,
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetLightfv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetLightfv_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetLightfv( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-            pname,
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetLightiv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetLightiv_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetLightiv( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-            pname,
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetMapdv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum target =  (GLenum  )bswap_ENUM   ( pc +  0 );
-        const GLenum query =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetMapdv_size(target,query);
-        GLdouble answerBuffer[200];
-        GLdouble * v = __glXGetAnswerBuffer(cl, compsize * 8, answerBuffer, sizeof(answerBuffer), 8);
-
-        if (v == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetMapdv( GET_DISPATCH(), (
-            target,
-            query,
-            v
-        ) );
-        (void) bswap_64_array( (uint64_t *) v, compsize );
-        __glXSendReplySwap(cl->client, v, compsize, 8, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetMapfv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum target =  (GLenum  )bswap_ENUM   ( pc +  0 );
-        const GLenum query =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetMapfv_size(target,query);
-        GLfloat answerBuffer[200];
-        GLfloat * v = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (v == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetMapfv( GET_DISPATCH(), (
-            target,
-            query,
-            v
-        ) );
-        (void) bswap_32_array( (uint32_t *) v, compsize );
-        __glXSendReplySwap(cl->client, v, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetMapiv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum target =  (GLenum  )bswap_ENUM   ( pc +  0 );
-        const GLenum query =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetMapiv_size(target,query);
-        GLint answerBuffer[200];
-        GLint * v = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (v == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetMapiv( GET_DISPATCH(), (
-            target,
-            query,
-            v
-        ) );
-        (void) bswap_32_array( (uint32_t *) v, compsize );
-        __glXSendReplySwap(cl->client, v, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetMaterialfv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetMaterialfv_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetMaterialfv( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-            pname,
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetMaterialiv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetMaterialiv_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetMaterialiv( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-            pname,
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetPixelMapfv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum map =  (GLenum  )bswap_ENUM   ( pc +  0 );
-
-        const GLuint compsize = __glGetPixelMapfv_size(map);
-        GLfloat answerBuffer[200];
-        GLfloat * values = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (values == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetPixelMapfv( GET_DISPATCH(), (
-            map,
-            values
-        ) );
-        (void) bswap_32_array( (uint32_t *) values, compsize );
-        __glXSendReplySwap(cl->client, values, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetPixelMapuiv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum map =  (GLenum  )bswap_ENUM   ( pc +  0 );
-
-        const GLuint compsize = __glGetPixelMapuiv_size(map);
-        GLuint answerBuffer[200];
-        GLuint * values = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (values == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetPixelMapuiv( GET_DISPATCH(), (
-            map,
-            values
-        ) );
-        (void) bswap_32_array( (uint32_t *) values, compsize );
-        __glXSendReplySwap(cl->client, values, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetPixelMapusv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum map =  (GLenum  )bswap_ENUM   ( pc +  0 );
-
-        const GLuint compsize = __glGetPixelMapusv_size(map);
-        GLushort answerBuffer[200];
-        GLushort * values = __glXGetAnswerBuffer(cl, compsize * 2, answerBuffer, sizeof(answerBuffer), 2);
-
-        if (values == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetPixelMapusv( GET_DISPATCH(), (
-            map,
-            values
-        ) );
-        (void) bswap_16_array( (uint16_t *) values, compsize );
-        __glXSendReplySwap(cl->client, values, compsize, 2, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetTexEnvfv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetTexEnvfv_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetTexEnvfv( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-            pname,
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetTexEnviv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetTexEnviv_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetTexEnviv( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-            pname,
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetTexGendv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetTexGendv_size(pname);
-        GLdouble answerBuffer[200];
-        GLdouble * params = __glXGetAnswerBuffer(cl, compsize * 8, answerBuffer, sizeof(answerBuffer), 8);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetTexGendv( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-            pname,
-            params
-        ) );
-        (void) bswap_64_array( (uint64_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 8, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetTexGenfv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetTexGenfv_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetTexGenfv( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-            pname,
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetTexGeniv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetTexGeniv_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetTexGeniv( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-            pname,
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetTexParameterfv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetTexParameterfv_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetTexParameterfv( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-            pname,
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetTexParameteriv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetTexParameteriv_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetTexParameteriv( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-            pname,
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetTexLevelParameterfv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  8 );
-
-        const GLuint compsize = __glGetTexLevelParameterfv_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetTexLevelParameterfv( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-             (GLint   )bswap_CARD32 ( pc +  4 ),
-            pname,
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetTexLevelParameteriv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  8 );
-
-        const GLuint compsize = __glGetTexLevelParameteriv_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetTexLevelParameteriv( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-             (GLint   )bswap_CARD32 ( pc +  4 ),
-            pname,
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_IsEnabled(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLboolean retval;
-        retval = CALL_IsEnabled( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 )
-        ) );
-        __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_IsList(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLboolean retval;
-        retval = CALL_IsList( GET_DISPATCH(), (
-             (GLuint  )bswap_CARD32 ( pc +  0 )
-        ) );
-        __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-void __glXDispSwap_DepthRange(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 16);
-        pc -= 4;
-    }
-#endif
-
-    CALL_DepthRange( GET_DISPATCH(), (
-         (GLclampd)bswap_FLOAT64( pc +  0 ),
-         (GLclampd)bswap_FLOAT64( pc +  8 )
-    ) );
-}
-
-void __glXDispSwap_Frustum(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 48);
-        pc -= 4;
-    }
-#endif
-
-    CALL_Frustum( GET_DISPATCH(), (
-         (GLdouble)bswap_FLOAT64( pc +  0 ),
-         (GLdouble)bswap_FLOAT64( pc +  8 ),
-         (GLdouble)bswap_FLOAT64( pc + 16 ),
-         (GLdouble)bswap_FLOAT64( pc + 24 ),
-         (GLdouble)bswap_FLOAT64( pc + 32 ),
-         (GLdouble)bswap_FLOAT64( pc + 40 )
-    ) );
-}
-
-void __glXDispSwap_LoadIdentity(GLbyte * pc)
-{
-    CALL_LoadIdentity( GET_DISPATCH(), () );
-}
-
-void __glXDispSwap_LoadMatrixf(GLbyte * pc)
-{
-    CALL_LoadMatrixf( GET_DISPATCH(), (
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 16 )
-    ) );
-}
-
-void __glXDispSwap_LoadMatrixd(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 128);
-        pc -= 4;
-    }
-#endif
-
-    CALL_LoadMatrixd( GET_DISPATCH(), (
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 16 )
-    ) );
-}
-
-void __glXDispSwap_MatrixMode(GLbyte * pc)
-{
-    CALL_MatrixMode( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 )
-    ) );
-}
-
-void __glXDispSwap_MultMatrixf(GLbyte * pc)
-{
-    CALL_MultMatrixf( GET_DISPATCH(), (
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 16 )
-    ) );
-}
-
-void __glXDispSwap_MultMatrixd(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 128);
-        pc -= 4;
-    }
-#endif
-
-    CALL_MultMatrixd( GET_DISPATCH(), (
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 16 )
-    ) );
-}
-
-void __glXDispSwap_Ortho(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 48);
-        pc -= 4;
-    }
-#endif
-
-    CALL_Ortho( GET_DISPATCH(), (
-         (GLdouble)bswap_FLOAT64( pc +  0 ),
-         (GLdouble)bswap_FLOAT64( pc +  8 ),
-         (GLdouble)bswap_FLOAT64( pc + 16 ),
-         (GLdouble)bswap_FLOAT64( pc + 24 ),
-         (GLdouble)bswap_FLOAT64( pc + 32 ),
-         (GLdouble)bswap_FLOAT64( pc + 40 )
-    ) );
-}
-
-void __glXDispSwap_PopMatrix(GLbyte * pc)
-{
-    CALL_PopMatrix( GET_DISPATCH(), () );
-}
-
-void __glXDispSwap_PushMatrix(GLbyte * pc)
-{
-    CALL_PushMatrix( GET_DISPATCH(), () );
-}
-
-void __glXDispSwap_Rotated(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 32);
-        pc -= 4;
-    }
-#endif
-
-    CALL_Rotated( GET_DISPATCH(), (
-         (GLdouble)bswap_FLOAT64( pc +  0 ),
-         (GLdouble)bswap_FLOAT64( pc +  8 ),
-         (GLdouble)bswap_FLOAT64( pc + 16 ),
-         (GLdouble)bswap_FLOAT64( pc + 24 )
-    ) );
-}
-
-void __glXDispSwap_Rotatef(GLbyte * pc)
-{
-    CALL_Rotatef( GET_DISPATCH(), (
-         (GLfloat )bswap_FLOAT32( pc +  0 ),
-         (GLfloat )bswap_FLOAT32( pc +  4 ),
-         (GLfloat )bswap_FLOAT32( pc +  8 ),
-         (GLfloat )bswap_FLOAT32( pc + 12 )
-    ) );
-}
-
-void __glXDispSwap_Scaled(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 24);
-        pc -= 4;
-    }
-#endif
-
-    CALL_Scaled( GET_DISPATCH(), (
-         (GLdouble)bswap_FLOAT64( pc +  0 ),
-         (GLdouble)bswap_FLOAT64( pc +  8 ),
-         (GLdouble)bswap_FLOAT64( pc + 16 )
-    ) );
-}
-
-void __glXDispSwap_Scalef(GLbyte * pc)
-{
-    CALL_Scalef( GET_DISPATCH(), (
-         (GLfloat )bswap_FLOAT32( pc +  0 ),
-         (GLfloat )bswap_FLOAT32( pc +  4 ),
-         (GLfloat )bswap_FLOAT32( pc +  8 )
-    ) );
-}
-
-void __glXDispSwap_Translated(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 24);
-        pc -= 4;
-    }
-#endif
-
-    CALL_Translated( GET_DISPATCH(), (
-         (GLdouble)bswap_FLOAT64( pc +  0 ),
-         (GLdouble)bswap_FLOAT64( pc +  8 ),
-         (GLdouble)bswap_FLOAT64( pc + 16 )
-    ) );
-}
-
-void __glXDispSwap_Translatef(GLbyte * pc)
-{
-    CALL_Translatef( GET_DISPATCH(), (
-         (GLfloat )bswap_FLOAT32( pc +  0 ),
-         (GLfloat )bswap_FLOAT32( pc +  4 ),
-         (GLfloat )bswap_FLOAT32( pc +  8 )
-    ) );
-}
-
-void __glXDispSwap_Viewport(GLbyte * pc)
-{
-    CALL_Viewport( GET_DISPATCH(), (
-         (GLint   )bswap_CARD32 ( pc +  0 ),
-         (GLint   )bswap_CARD32 ( pc +  4 ),
-         (GLsizei )bswap_CARD32 ( pc +  8 ),
-         (GLsizei )bswap_CARD32 ( pc + 12 )
-    ) );
-}
-
-void __glXDispSwap_BindTexture(GLbyte * pc)
-{
-    CALL_BindTexture( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLuint  )bswap_CARD32 ( pc +  4 )
-    ) );
-}
-
-void __glXDispSwap_Indexubv(GLbyte * pc)
-{
-    CALL_Indexubv( GET_DISPATCH(), (
-         (const GLubyte *)(pc +  0)
-    ) );
-}
-
-void __glXDispSwap_PolygonOffset(GLbyte * pc)
-{
-    CALL_PolygonOffset( GET_DISPATCH(), (
-         (GLfloat )bswap_FLOAT32( pc +  0 ),
-         (GLfloat )bswap_FLOAT32( pc +  4 )
-    ) );
-}
-
-int __glXDispSwap_AreTexturesResident(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  0 );
-
-        GLboolean retval;
-        GLboolean answerBuffer[200];
-        GLboolean * residences = __glXGetAnswerBuffer(cl, n, answerBuffer, sizeof(answerBuffer), 1);
-        retval = CALL_AreTexturesResident( GET_DISPATCH(), (
-            n,
-             (const GLuint *)bswap_32_array( (uint32_t *) (pc +  4), 0 ),
-            residences
-        ) );
-        __glXSendReplySwap(cl->client, residences, n, 1, GL_TRUE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_AreTexturesResidentEXT(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  0 );
-
-        GLboolean retval;
-        GLboolean answerBuffer[200];
-        GLboolean * residences = __glXGetAnswerBuffer(cl, n, answerBuffer, sizeof(answerBuffer), 1);
-        retval = CALL_AreTexturesResident( GET_DISPATCH(), (
-            n,
-             (const GLuint *)bswap_32_array( (uint32_t *) (pc +  4), 0 ),
-            residences
-        ) );
-        __glXSendReplySwap(cl->client, residences, n, 1, GL_TRUE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-void __glXDispSwap_CopyTexImage1D(GLbyte * pc)
-{
-    CALL_CopyTexImage1D( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLint   )bswap_CARD32 ( pc +  4 ),
-         (GLenum  )bswap_ENUM   ( pc +  8 ),
-         (GLint   )bswap_CARD32 ( pc + 12 ),
-         (GLint   )bswap_CARD32 ( pc + 16 ),
-         (GLsizei )bswap_CARD32 ( pc + 20 ),
-         (GLint   )bswap_CARD32 ( pc + 24 )
-    ) );
-}
-
-void __glXDispSwap_CopyTexImage2D(GLbyte * pc)
-{
-    CALL_CopyTexImage2D( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLint   )bswap_CARD32 ( pc +  4 ),
-         (GLenum  )bswap_ENUM   ( pc +  8 ),
-         (GLint   )bswap_CARD32 ( pc + 12 ),
-         (GLint   )bswap_CARD32 ( pc + 16 ),
-         (GLsizei )bswap_CARD32 ( pc + 20 ),
-         (GLsizei )bswap_CARD32 ( pc + 24 ),
-         (GLint   )bswap_CARD32 ( pc + 28 )
-    ) );
-}
-
-void __glXDispSwap_CopyTexSubImage1D(GLbyte * pc)
-{
-    CALL_CopyTexSubImage1D( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLint   )bswap_CARD32 ( pc +  4 ),
-         (GLint   )bswap_CARD32 ( pc +  8 ),
-         (GLint   )bswap_CARD32 ( pc + 12 ),
-         (GLint   )bswap_CARD32 ( pc + 16 ),
-         (GLsizei )bswap_CARD32 ( pc + 20 )
-    ) );
-}
-
-void __glXDispSwap_CopyTexSubImage2D(GLbyte * pc)
-{
-    CALL_CopyTexSubImage2D( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLint   )bswap_CARD32 ( pc +  4 ),
-         (GLint   )bswap_CARD32 ( pc +  8 ),
-         (GLint   )bswap_CARD32 ( pc + 12 ),
-         (GLint   )bswap_CARD32 ( pc + 16 ),
-         (GLint   )bswap_CARD32 ( pc + 20 ),
-         (GLsizei )bswap_CARD32 ( pc + 24 ),
-         (GLsizei )bswap_CARD32 ( pc + 28 )
-    ) );
-}
-
-int __glXDispSwap_DeleteTextures(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  0 );
-
-        CALL_DeleteTextures( GET_DISPATCH(), (
-            n,
-             (const GLuint *)bswap_32_array( (uint32_t *) (pc +  4), 0 )
-        ) );
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_DeleteTexturesEXT(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  0 );
-
-        CALL_DeleteTextures( GET_DISPATCH(), (
-            n,
-             (const GLuint *)bswap_32_array( (uint32_t *) (pc +  4), 0 )
-        ) );
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GenTextures(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  0 );
-
-        GLuint answerBuffer[200];
-        GLuint * textures = __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer), 4);
-        CALL_GenTextures( GET_DISPATCH(), (
-            n,
-            textures
-        ) );
-        (void) bswap_32_array( (uint32_t *) textures, n );
-        __glXSendReplySwap(cl->client, textures, n, 4, GL_TRUE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GenTexturesEXT(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  0 );
-
-        GLuint answerBuffer[200];
-        GLuint * textures = __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer), 4);
-        CALL_GenTextures( GET_DISPATCH(), (
-            n,
-            textures
-        ) );
-        (void) bswap_32_array( (uint32_t *) textures, n );
-        __glXSendReplySwap(cl->client, textures, n, 4, GL_TRUE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_IsTexture(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLboolean retval;
-        retval = CALL_IsTexture( GET_DISPATCH(), (
-             (GLuint  )bswap_CARD32 ( pc +  0 )
-        ) );
-        __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_IsTextureEXT(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLboolean retval;
-        retval = CALL_IsTexture( GET_DISPATCH(), (
-             (GLuint  )bswap_CARD32 ( pc +  0 )
-        ) );
-        __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-void __glXDispSwap_PrioritizeTextures(GLbyte * pc)
-{
-    const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  0 );
-
-    CALL_PrioritizeTextures( GET_DISPATCH(), (
-        n,
-         (const GLuint *)bswap_32_array( (uint32_t *) (pc +  4), 0 ),
-         (const GLclampf *)bswap_32_array( (uint32_t *) (pc +  4), 0 )
-    ) );
-}
-
-void __glXDispSwap_TexSubImage1D(GLbyte * pc)
-{
-    const CARD32 ptr_is_null = *(CARD32 *)(pc + 52);
-    const GLvoid * const pixels = (const GLvoid *) (ptr_is_null != 0) ? NULL : (pc + 56);
-    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
-
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) bswap_CARD32( & hdr->rowLength )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) bswap_CARD32( & hdr->skipRows )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) bswap_CARD32( & hdr->skipPixels )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) bswap_CARD32( & hdr->alignment )) );
-
-    CALL_TexSubImage1D( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc + 20 ),
-         (GLint   )bswap_CARD32 ( pc + 24 ),
-         (GLint   )bswap_CARD32 ( pc + 28 ),
-         (GLsizei )bswap_CARD32 ( pc + 36 ),
-         (GLenum  )bswap_ENUM   ( pc + 44 ),
-         (GLenum  )bswap_ENUM   ( pc + 48 ),
-        pixels
-    ) );
-}
-
-void __glXDispSwap_TexSubImage2D(GLbyte * pc)
-{
-    const CARD32 ptr_is_null = *(CARD32 *)(pc + 52);
-    const GLvoid * const pixels = (const GLvoid *) (ptr_is_null != 0) ? NULL : (pc + 56);
-    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
-
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) bswap_CARD32( & hdr->rowLength )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) bswap_CARD32( & hdr->skipRows )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) bswap_CARD32( & hdr->skipPixels )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) bswap_CARD32( & hdr->alignment )) );
-
-    CALL_TexSubImage2D( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc + 20 ),
-         (GLint   )bswap_CARD32 ( pc + 24 ),
-         (GLint   )bswap_CARD32 ( pc + 28 ),
-         (GLint   )bswap_CARD32 ( pc + 32 ),
-         (GLsizei )bswap_CARD32 ( pc + 36 ),
-         (GLsizei )bswap_CARD32 ( pc + 40 ),
-         (GLenum  )bswap_ENUM   ( pc + 44 ),
-         (GLenum  )bswap_ENUM   ( pc + 48 ),
-        pixels
-    ) );
-}
-
-void __glXDispSwap_BlendColor(GLbyte * pc)
-{
-    CALL_BlendColor( GET_DISPATCH(), (
-         (GLclampf)bswap_FLOAT32( pc +  0 ),
-         (GLclampf)bswap_FLOAT32( pc +  4 ),
-         (GLclampf)bswap_FLOAT32( pc +  8 ),
-         (GLclampf)bswap_FLOAT32( pc + 12 )
-    ) );
-}
-
-void __glXDispSwap_BlendEquation(GLbyte * pc)
-{
-    CALL_BlendEquation( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 )
-    ) );
-}
-
-void __glXDispSwap_ColorTable(GLbyte * pc)
-{
-    const GLvoid * const table = (const GLvoid *) (pc + 40);
-    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
-
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) bswap_CARD32( & hdr->rowLength )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) bswap_CARD32( & hdr->skipRows )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) bswap_CARD32( & hdr->skipPixels )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) bswap_CARD32( & hdr->alignment )) );
-
-    CALL_ColorTable( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc + 20 ),
-         (GLenum  )bswap_ENUM   ( pc + 24 ),
-         (GLsizei )bswap_CARD32 ( pc + 28 ),
-         (GLenum  )bswap_ENUM   ( pc + 32 ),
-         (GLenum  )bswap_ENUM   ( pc + 36 ),
-        table
-    ) );
-}
-
-void __glXDispSwap_ColorTableParameterfv(GLbyte * pc)
-{
-    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-    const GLfloat * params;
-
-    params = (const GLfloat *) bswap_32_array( (uint32_t *) (pc + 8), __glColorTableParameterfv_size(pname) );
-
-    CALL_ColorTableParameterfv( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-        pname,
-        params
-    ) );
-}
-
-void __glXDispSwap_ColorTableParameteriv(GLbyte * pc)
-{
-    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-    const GLint * params;
-
-    params = (const GLint *) bswap_32_array( (uint32_t *) (pc + 8), __glColorTableParameteriv_size(pname) );
-
-    CALL_ColorTableParameteriv( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-        pname,
-        params
-    ) );
-}
-
-void __glXDispSwap_CopyColorTable(GLbyte * pc)
-{
-    CALL_CopyColorTable( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLenum  )bswap_ENUM   ( pc +  4 ),
-         (GLint   )bswap_CARD32 ( pc +  8 ),
-         (GLint   )bswap_CARD32 ( pc + 12 ),
-         (GLsizei )bswap_CARD32 ( pc + 16 )
-    ) );
-}
-
-int __glXDispSwap_GetColorTableParameterfv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetColorTableParameterfv_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetColorTableParameterfv( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-            pname,
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetColorTableParameterfvSGI(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetColorTableParameterfv_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetColorTableParameterfv( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-            pname,
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetColorTableParameteriv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetColorTableParameteriv_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetColorTableParameteriv( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-            pname,
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetColorTableParameterivSGI(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetColorTableParameteriv_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetColorTableParameteriv( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-            pname,
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-void __glXDispSwap_ColorSubTable(GLbyte * pc)
-{
-    const GLvoid * const data = (const GLvoid *) (pc + 40);
-    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
-
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) bswap_CARD32( & hdr->rowLength )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) bswap_CARD32( & hdr->skipRows )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) bswap_CARD32( & hdr->skipPixels )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) bswap_CARD32( & hdr->alignment )) );
-
-    CALL_ColorSubTable( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc + 20 ),
-         (GLsizei )bswap_CARD32 ( pc + 24 ),
-         (GLsizei )bswap_CARD32 ( pc + 28 ),
-         (GLenum  )bswap_ENUM   ( pc + 32 ),
-         (GLenum  )bswap_ENUM   ( pc + 36 ),
-        data
-    ) );
-}
-
-void __glXDispSwap_CopyColorSubTable(GLbyte * pc)
-{
-    CALL_CopyColorSubTable( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLsizei )bswap_CARD32 ( pc +  4 ),
-         (GLint   )bswap_CARD32 ( pc +  8 ),
-         (GLint   )bswap_CARD32 ( pc + 12 ),
-         (GLsizei )bswap_CARD32 ( pc + 16 )
-    ) );
-}
-
-void __glXDispSwap_ConvolutionFilter1D(GLbyte * pc)
-{
-    const GLvoid * const image = (const GLvoid *) (pc + 44);
-    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
-
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) bswap_CARD32( & hdr->rowLength )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) bswap_CARD32( & hdr->skipRows )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) bswap_CARD32( & hdr->skipPixels )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) bswap_CARD32( & hdr->alignment )) );
-
-    CALL_ConvolutionFilter1D( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc + 20 ),
-         (GLenum  )bswap_ENUM   ( pc + 24 ),
-         (GLsizei )bswap_CARD32 ( pc + 28 ),
-         (GLenum  )bswap_ENUM   ( pc + 36 ),
-         (GLenum  )bswap_ENUM   ( pc + 40 ),
-        image
-    ) );
-}
-
-void __glXDispSwap_ConvolutionFilter2D(GLbyte * pc)
-{
-    const GLvoid * const image = (const GLvoid *) (pc + 44);
-    __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
-
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) bswap_CARD32( & hdr->rowLength )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) bswap_CARD32( & hdr->skipRows )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) bswap_CARD32( & hdr->skipPixels )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) bswap_CARD32( & hdr->alignment )) );
-
-    CALL_ConvolutionFilter2D( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc + 20 ),
-         (GLenum  )bswap_ENUM   ( pc + 24 ),
-         (GLsizei )bswap_CARD32 ( pc + 28 ),
-         (GLsizei )bswap_CARD32 ( pc + 32 ),
-         (GLenum  )bswap_ENUM   ( pc + 36 ),
-         (GLenum  )bswap_ENUM   ( pc + 40 ),
-        image
-    ) );
-}
-
-void __glXDispSwap_ConvolutionParameterf(GLbyte * pc)
-{
-    CALL_ConvolutionParameterf( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLenum  )bswap_ENUM   ( pc +  4 ),
-         (GLfloat )bswap_FLOAT32( pc +  8 )
-    ) );
-}
-
-void __glXDispSwap_ConvolutionParameterfv(GLbyte * pc)
-{
-    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-    const GLfloat * params;
-
-    params = (const GLfloat *) bswap_32_array( (uint32_t *) (pc + 8), __glConvolutionParameterfv_size(pname) );
-
-    CALL_ConvolutionParameterfv( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-        pname,
-        params
-    ) );
-}
-
-void __glXDispSwap_ConvolutionParameteri(GLbyte * pc)
-{
-    CALL_ConvolutionParameteri( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLenum  )bswap_ENUM   ( pc +  4 ),
-         (GLint   )bswap_CARD32 ( pc +  8 )
-    ) );
-}
-
-void __glXDispSwap_ConvolutionParameteriv(GLbyte * pc)
-{
-    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-    const GLint * params;
-
-    params = (const GLint *) bswap_32_array( (uint32_t *) (pc + 8), __glConvolutionParameteriv_size(pname) );
-
-    CALL_ConvolutionParameteriv( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-        pname,
-        params
-    ) );
-}
-
-void __glXDispSwap_CopyConvolutionFilter1D(GLbyte * pc)
-{
-    CALL_CopyConvolutionFilter1D( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLenum  )bswap_ENUM   ( pc +  4 ),
-         (GLint   )bswap_CARD32 ( pc +  8 ),
-         (GLint   )bswap_CARD32 ( pc + 12 ),
-         (GLsizei )bswap_CARD32 ( pc + 16 )
-    ) );
-}
-
-void __glXDispSwap_CopyConvolutionFilter2D(GLbyte * pc)
-{
-    CALL_CopyConvolutionFilter2D( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLenum  )bswap_ENUM   ( pc +  4 ),
-         (GLint   )bswap_CARD32 ( pc +  8 ),
-         (GLint   )bswap_CARD32 ( pc + 12 ),
-         (GLsizei )bswap_CARD32 ( pc + 16 ),
-         (GLsizei )bswap_CARD32 ( pc + 20 )
-    ) );
-}
-
-int __glXDispSwap_GetConvolutionParameterfv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetConvolutionParameterfv_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetConvolutionParameterfv( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-            pname,
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetConvolutionParameterfvEXT(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetConvolutionParameterfv_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetConvolutionParameterfv( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-            pname,
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetConvolutionParameteriv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetConvolutionParameteriv_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetConvolutionParameteriv( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-            pname,
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetConvolutionParameterivEXT(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetConvolutionParameteriv_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetConvolutionParameteriv( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-            pname,
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetHistogramParameterfv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetHistogramParameterfv_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetHistogramParameterfv( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-            pname,
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetHistogramParameterfvEXT(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetHistogramParameterfv_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetHistogramParameterfv( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-            pname,
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetHistogramParameteriv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetHistogramParameteriv_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetHistogramParameteriv( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-            pname,
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetHistogramParameterivEXT(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetHistogramParameteriv_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetHistogramParameteriv( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-            pname,
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetMinmaxParameterfv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetMinmaxParameterfv_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetMinmaxParameterfv( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-            pname,
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetMinmaxParameterfvEXT(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetMinmaxParameterfv_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetMinmaxParameterfv( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-            pname,
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetMinmaxParameteriv(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetMinmaxParameteriv_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetMinmaxParameteriv( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-            pname,
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetMinmaxParameterivEXT(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetMinmaxParameteriv_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetMinmaxParameteriv( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-            pname,
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-void __glXDispSwap_Histogram(GLbyte * pc)
-{
-    CALL_Histogram( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLsizei )bswap_CARD32 ( pc +  4 ),
-         (GLenum  )bswap_ENUM   ( pc +  8 ),
-        *(GLboolean *)(pc + 12)
-    ) );
-}
-
-void __glXDispSwap_Minmax(GLbyte * pc)
-{
-    CALL_Minmax( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLenum  )bswap_ENUM   ( pc +  4 ),
-        *(GLboolean *)(pc +  8)
-    ) );
-}
-
-void __glXDispSwap_ResetHistogram(GLbyte * pc)
-{
-    CALL_ResetHistogram( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 )
-    ) );
-}
-
-void __glXDispSwap_ResetMinmax(GLbyte * pc)
-{
-    CALL_ResetMinmax( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 )
-    ) );
-}
-
-void __glXDispSwap_TexImage3D(GLbyte * pc)
-{
-    const CARD32 ptr_is_null = *(CARD32 *)(pc + 76);
-    const GLvoid * const pixels = (const GLvoid *) (ptr_is_null != 0) ? NULL : (pc + 80);
-    __GLXpixel3DHeader * const hdr = (__GLXpixel3DHeader *)(pc);
-
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) bswap_CARD32( & hdr->rowLength )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_IMAGE_HEIGHT, (GLint) bswap_CARD32( & hdr->imageHeight )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) bswap_CARD32( & hdr->skipRows )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_IMAGES,  (GLint) bswap_CARD32( & hdr->skipImages )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) bswap_CARD32( & hdr->skipPixels )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) bswap_CARD32( & hdr->alignment )) );
-
-    CALL_TexImage3D( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc + 36 ),
-         (GLint   )bswap_CARD32 ( pc + 40 ),
-         (GLint   )bswap_CARD32 ( pc + 44 ),
-         (GLsizei )bswap_CARD32 ( pc + 48 ),
-         (GLsizei )bswap_CARD32 ( pc + 52 ),
-         (GLsizei )bswap_CARD32 ( pc + 56 ),
-         (GLint   )bswap_CARD32 ( pc + 64 ),
-         (GLenum  )bswap_ENUM   ( pc + 68 ),
-         (GLenum  )bswap_ENUM   ( pc + 72 ),
-        pixels
-    ) );
-}
-
-void __glXDispSwap_TexSubImage3D(GLbyte * pc)
-{
-    const CARD32 ptr_is_null = *(CARD32 *)(pc + 84);
-    const GLvoid * const pixels = (const GLvoid *) (ptr_is_null != 0) ? NULL : (pc + 88);
-    __GLXpixel3DHeader * const hdr = (__GLXpixel3DHeader *)(pc);
-
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES,   hdr->swapBytes) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST,    hdr->lsbFirst) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH,   (GLint) bswap_CARD32( & hdr->rowLength )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_IMAGE_HEIGHT, (GLint) bswap_CARD32( & hdr->imageHeight )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS,    (GLint) bswap_CARD32( & hdr->skipRows )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_IMAGES,  (GLint) bswap_CARD32( & hdr->skipImages )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS,  (GLint) bswap_CARD32( & hdr->skipPixels )) );
-    CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT,    (GLint) bswap_CARD32( & hdr->alignment )) );
-
-    CALL_TexSubImage3D( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc + 36 ),
-         (GLint   )bswap_CARD32 ( pc + 40 ),
-         (GLint   )bswap_CARD32 ( pc + 44 ),
-         (GLint   )bswap_CARD32 ( pc + 48 ),
-         (GLint   )bswap_CARD32 ( pc + 52 ),
-         (GLsizei )bswap_CARD32 ( pc + 60 ),
-         (GLsizei )bswap_CARD32 ( pc + 64 ),
-         (GLsizei )bswap_CARD32 ( pc + 68 ),
-         (GLenum  )bswap_ENUM   ( pc + 76 ),
-         (GLenum  )bswap_ENUM   ( pc + 80 ),
-        pixels
-    ) );
-}
-
-void __glXDispSwap_CopyTexSubImage3D(GLbyte * pc)
-{
-    CALL_CopyTexSubImage3D( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLint   )bswap_CARD32 ( pc +  4 ),
-         (GLint   )bswap_CARD32 ( pc +  8 ),
-         (GLint   )bswap_CARD32 ( pc + 12 ),
-         (GLint   )bswap_CARD32 ( pc + 16 ),
-         (GLint   )bswap_CARD32 ( pc + 20 ),
-         (GLint   )bswap_CARD32 ( pc + 24 ),
-         (GLsizei )bswap_CARD32 ( pc + 28 ),
-         (GLsizei )bswap_CARD32 ( pc + 32 )
-    ) );
-}
-
-void __glXDispSwap_ActiveTextureARB(GLbyte * pc)
-{
-    CALL_ActiveTextureARB( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 )
-    ) );
-}
-
-void __glXDispSwap_MultiTexCoord1dvARB(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 12);
-        pc -= 4;
-    }
-#endif
-
-    CALL_MultiTexCoord1dvARB( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  8 ),
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 1 )
-    ) );
-}
-
-void __glXDispSwap_MultiTexCoord1fvARB(GLbyte * pc)
-{
-    CALL_MultiTexCoord1fvARB( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  4), 1 )
-    ) );
-}
-
-void __glXDispSwap_MultiTexCoord1ivARB(GLbyte * pc)
-{
-    CALL_MultiTexCoord1ivARB( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (const GLint *)bswap_32_array( (uint32_t *) (pc +  4), 1 )
-    ) );
-}
-
-void __glXDispSwap_MultiTexCoord1svARB(GLbyte * pc)
-{
-    CALL_MultiTexCoord1svARB( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  4), 1 )
-    ) );
-}
-
-void __glXDispSwap_MultiTexCoord2dvARB(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 20);
-        pc -= 4;
-    }
-#endif
-
-    CALL_MultiTexCoord2dvARB( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc + 16 ),
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 2 )
-    ) );
-}
-
-void __glXDispSwap_MultiTexCoord2fvARB(GLbyte * pc)
-{
-    CALL_MultiTexCoord2fvARB( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  4), 2 )
-    ) );
-}
-
-void __glXDispSwap_MultiTexCoord2ivARB(GLbyte * pc)
-{
-    CALL_MultiTexCoord2ivARB( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (const GLint *)bswap_32_array( (uint32_t *) (pc +  4), 2 )
-    ) );
-}
-
-void __glXDispSwap_MultiTexCoord2svARB(GLbyte * pc)
-{
-    CALL_MultiTexCoord2svARB( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  4), 2 )
-    ) );
-}
-
-void __glXDispSwap_MultiTexCoord3dvARB(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 28);
-        pc -= 4;
-    }
-#endif
-
-    CALL_MultiTexCoord3dvARB( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc + 24 ),
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 3 )
-    ) );
-}
-
-void __glXDispSwap_MultiTexCoord3fvARB(GLbyte * pc)
-{
-    CALL_MultiTexCoord3fvARB( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  4), 3 )
-    ) );
-}
-
-void __glXDispSwap_MultiTexCoord3ivARB(GLbyte * pc)
-{
-    CALL_MultiTexCoord3ivARB( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (const GLint *)bswap_32_array( (uint32_t *) (pc +  4), 3 )
-    ) );
-}
-
-void __glXDispSwap_MultiTexCoord3svARB(GLbyte * pc)
-{
-    CALL_MultiTexCoord3svARB( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  4), 3 )
-    ) );
-}
-
-void __glXDispSwap_MultiTexCoord4dvARB(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 36);
-        pc -= 4;
-    }
-#endif
-
-    CALL_MultiTexCoord4dvARB( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc + 32 ),
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 4 )
-    ) );
-}
-
-void __glXDispSwap_MultiTexCoord4fvARB(GLbyte * pc)
-{
-    CALL_MultiTexCoord4fvARB( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  4), 4 )
-    ) );
-}
-
-void __glXDispSwap_MultiTexCoord4ivARB(GLbyte * pc)
-{
-    CALL_MultiTexCoord4ivARB( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (const GLint *)bswap_32_array( (uint32_t *) (pc +  4), 4 )
-    ) );
-}
-
-void __glXDispSwap_MultiTexCoord4svARB(GLbyte * pc)
-{
-    CALL_MultiTexCoord4svARB( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  4), 4 )
-    ) );
-}
-
-void __glXDispSwap_SampleCoverageARB(GLbyte * pc)
-{
-    CALL_SampleCoverageARB( GET_DISPATCH(), (
-         (GLclampf)bswap_FLOAT32( pc +  0 ),
-        *(GLboolean *)(pc +  4)
-    ) );
-}
-
-void __glXDispSwap_CompressedTexImage1DARB(GLbyte * pc)
-{
-    const GLsizei imageSize =  (GLsizei )bswap_CARD32 ( pc + 20 );
-
-    CALL_CompressedTexImage1DARB( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLint   )bswap_CARD32 ( pc +  4 ),
-         (GLenum  )bswap_ENUM   ( pc +  8 ),
-         (GLsizei )bswap_CARD32 ( pc + 12 ),
-         (GLint   )bswap_CARD32 ( pc + 16 ),
-        imageSize,
-         (const GLvoid *)(pc + 24)
-    ) );
-}
-
-void __glXDispSwap_CompressedTexImage2DARB(GLbyte * pc)
-{
-    const GLsizei imageSize =  (GLsizei )bswap_CARD32 ( pc + 24 );
-
-    CALL_CompressedTexImage2DARB( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLint   )bswap_CARD32 ( pc +  4 ),
-         (GLenum  )bswap_ENUM   ( pc +  8 ),
-         (GLsizei )bswap_CARD32 ( pc + 12 ),
-         (GLsizei )bswap_CARD32 ( pc + 16 ),
-         (GLint   )bswap_CARD32 ( pc + 20 ),
-        imageSize,
-         (const GLvoid *)(pc + 28)
-    ) );
-}
-
-void __glXDispSwap_CompressedTexImage3DARB(GLbyte * pc)
-{
-    const GLsizei imageSize =  (GLsizei )bswap_CARD32 ( pc + 28 );
-
-    CALL_CompressedTexImage3DARB( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLint   )bswap_CARD32 ( pc +  4 ),
-         (GLenum  )bswap_ENUM   ( pc +  8 ),
-         (GLsizei )bswap_CARD32 ( pc + 12 ),
-         (GLsizei )bswap_CARD32 ( pc + 16 ),
-         (GLsizei )bswap_CARD32 ( pc + 20 ),
-         (GLint   )bswap_CARD32 ( pc + 24 ),
-        imageSize,
-         (const GLvoid *)(pc + 32)
-    ) );
-}
-
-void __glXDispSwap_CompressedTexSubImage1DARB(GLbyte * pc)
-{
-    const GLsizei imageSize =  (GLsizei )bswap_CARD32 ( pc + 20 );
-
-    CALL_CompressedTexSubImage1DARB( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLint   )bswap_CARD32 ( pc +  4 ),
-         (GLint   )bswap_CARD32 ( pc +  8 ),
-         (GLsizei )bswap_CARD32 ( pc + 12 ),
-         (GLenum  )bswap_ENUM   ( pc + 16 ),
-        imageSize,
-         (const GLvoid *)(pc + 24)
-    ) );
-}
-
-void __glXDispSwap_CompressedTexSubImage2DARB(GLbyte * pc)
-{
-    const GLsizei imageSize =  (GLsizei )bswap_CARD32 ( pc + 28 );
-
-    CALL_CompressedTexSubImage2DARB( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLint   )bswap_CARD32 ( pc +  4 ),
-         (GLint   )bswap_CARD32 ( pc +  8 ),
-         (GLint   )bswap_CARD32 ( pc + 12 ),
-         (GLsizei )bswap_CARD32 ( pc + 16 ),
-         (GLsizei )bswap_CARD32 ( pc + 20 ),
-         (GLenum  )bswap_ENUM   ( pc + 24 ),
-        imageSize,
-         (const GLvoid *)(pc + 32)
-    ) );
-}
-
-void __glXDispSwap_CompressedTexSubImage3DARB(GLbyte * pc)
-{
-    const GLsizei imageSize =  (GLsizei )bswap_CARD32 ( pc + 36 );
-
-    CALL_CompressedTexSubImage3DARB( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLint   )bswap_CARD32 ( pc +  4 ),
-         (GLint   )bswap_CARD32 ( pc +  8 ),
-         (GLint   )bswap_CARD32 ( pc + 12 ),
-         (GLint   )bswap_CARD32 ( pc + 16 ),
-         (GLsizei )bswap_CARD32 ( pc + 20 ),
-         (GLsizei )bswap_CARD32 ( pc + 24 ),
-         (GLsizei )bswap_CARD32 ( pc + 28 ),
-         (GLenum  )bswap_ENUM   ( pc + 32 ),
-        imageSize,
-         (const GLvoid *)(pc + 40)
-    ) );
-}
-
-int __glXDispSwap_GetProgramEnvParameterdvARB(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLdouble params[4];
-        CALL_GetProgramEnvParameterdvARB( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-             (GLuint  )bswap_CARD32 ( pc +  4 ),
-            params
-        ) );
-        (void) bswap_64_array( (uint64_t *) params, 4 );
-        __glXSendReplySwap(cl->client, params, 4, 8, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetProgramEnvParameterfvARB(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLfloat params[4];
-        CALL_GetProgramEnvParameterfvARB( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-             (GLuint  )bswap_CARD32 ( pc +  4 ),
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, 4 );
-        __glXSendReplySwap(cl->client, params, 4, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetProgramLocalParameterdvARB(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLdouble params[4];
-        CALL_GetProgramLocalParameterdvARB( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-             (GLuint  )bswap_CARD32 ( pc +  4 ),
-            params
-        ) );
-        (void) bswap_64_array( (uint64_t *) params, 4 );
-        __glXSendReplySwap(cl->client, params, 4, 8, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetProgramLocalParameterfvARB(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLfloat params[4];
-        CALL_GetProgramLocalParameterfvARB( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-             (GLuint  )bswap_CARD32 ( pc +  4 ),
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, 4 );
-        __glXSendReplySwap(cl->client, params, 4, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetProgramivARB(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetProgramivARB_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetProgramivARB( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-            pname,
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetVertexAttribdvARB(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetVertexAttribdvARB_size(pname);
-        GLdouble answerBuffer[200];
-        GLdouble * params = __glXGetAnswerBuffer(cl, compsize * 8, answerBuffer, sizeof(answerBuffer), 8);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetVertexAttribdvARB( GET_DISPATCH(), (
-             (GLuint  )bswap_CARD32 ( pc +  0 ),
-            pname,
-            params
-        ) );
-        (void) bswap_64_array( (uint64_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 8, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetVertexAttribfvARB(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetVertexAttribfvARB_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetVertexAttribfvARB( GET_DISPATCH(), (
-             (GLuint  )bswap_CARD32 ( pc +  0 ),
-            pname,
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetVertexAttribivARB(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetVertexAttribivARB_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetVertexAttribivARB( GET_DISPATCH(), (
-             (GLuint  )bswap_CARD32 ( pc +  0 ),
-            pname,
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-void __glXDispSwap_ProgramEnvParameter4dvARB(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 40);
-        pc -= 4;
-    }
-#endif
-
-    CALL_ProgramEnvParameter4dvARB( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLuint  )bswap_CARD32 ( pc +  4 ),
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  8), 4 )
-    ) );
-}
-
-void __glXDispSwap_ProgramEnvParameter4fvARB(GLbyte * pc)
-{
-    CALL_ProgramEnvParameter4fvARB( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLuint  )bswap_CARD32 ( pc +  4 ),
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  8), 4 )
-    ) );
-}
-
-void __glXDispSwap_ProgramLocalParameter4dvARB(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 40);
-        pc -= 4;
-    }
-#endif
-
-    CALL_ProgramLocalParameter4dvARB( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLuint  )bswap_CARD32 ( pc +  4 ),
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  8), 4 )
-    ) );
-}
-
-void __glXDispSwap_ProgramLocalParameter4fvARB(GLbyte * pc)
-{
-    CALL_ProgramLocalParameter4fvARB( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLuint  )bswap_CARD32 ( pc +  4 ),
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  8), 4 )
-    ) );
-}
-
-void __glXDispSwap_ProgramStringARB(GLbyte * pc)
-{
-    const GLsizei len =  (GLsizei )bswap_CARD32 ( pc +  8 );
-
-    CALL_ProgramStringARB( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLenum  )bswap_ENUM   ( pc +  4 ),
-        len,
-         (const GLvoid *)(pc + 12)
-    ) );
-}
-
-void __glXDispSwap_VertexAttrib1dvARB(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 12);
-        pc -= 4;
-    }
-#endif
-
-    CALL_VertexAttrib1dvARB( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  4), 1 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttrib1fvARB(GLbyte * pc)
-{
-    CALL_VertexAttrib1fvARB( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  4), 1 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttrib1svARB(GLbyte * pc)
-{
-    CALL_VertexAttrib1svARB( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  4), 1 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttrib2dvARB(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 20);
-        pc -= 4;
-    }
-#endif
-
-    CALL_VertexAttrib2dvARB( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  4), 2 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttrib2fvARB(GLbyte * pc)
-{
-    CALL_VertexAttrib2fvARB( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  4), 2 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttrib2svARB(GLbyte * pc)
-{
-    CALL_VertexAttrib2svARB( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  4), 2 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttrib3dvARB(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 28);
-        pc -= 4;
-    }
-#endif
-
-    CALL_VertexAttrib3dvARB( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  4), 3 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttrib3fvARB(GLbyte * pc)
-{
-    CALL_VertexAttrib3fvARB( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  4), 3 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttrib3svARB(GLbyte * pc)
-{
-    CALL_VertexAttrib3svARB( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  4), 3 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttrib4NbvARB(GLbyte * pc)
-{
-    CALL_VertexAttrib4NbvARB( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-         (const GLbyte *)(pc +  4)
-    ) );
-}
-
-void __glXDispSwap_VertexAttrib4NivARB(GLbyte * pc)
-{
-    CALL_VertexAttrib4NivARB( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-         (const GLint *)bswap_32_array( (uint32_t *) (pc +  4), 4 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttrib4NsvARB(GLbyte * pc)
-{
-    CALL_VertexAttrib4NsvARB( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  4), 4 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttrib4NubvARB(GLbyte * pc)
-{
-    CALL_VertexAttrib4NubvARB( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-         (const GLubyte *)(pc +  4)
-    ) );
-}
-
-void __glXDispSwap_VertexAttrib4NuivARB(GLbyte * pc)
-{
-    CALL_VertexAttrib4NuivARB( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-         (const GLuint *)bswap_32_array( (uint32_t *) (pc +  4), 4 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttrib4NusvARB(GLbyte * pc)
-{
-    CALL_VertexAttrib4NusvARB( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-         (const GLushort *)bswap_16_array( (uint16_t *) (pc +  4), 4 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttrib4bvARB(GLbyte * pc)
-{
-    CALL_VertexAttrib4bvARB( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-         (const GLbyte *)(pc +  4)
-    ) );
-}
-
-void __glXDispSwap_VertexAttrib4dvARB(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 36);
-        pc -= 4;
-    }
-#endif
-
-    CALL_VertexAttrib4dvARB( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  4), 4 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttrib4fvARB(GLbyte * pc)
-{
-    CALL_VertexAttrib4fvARB( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  4), 4 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttrib4ivARB(GLbyte * pc)
-{
-    CALL_VertexAttrib4ivARB( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-         (const GLint *)bswap_32_array( (uint32_t *) (pc +  4), 4 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttrib4svARB(GLbyte * pc)
-{
-    CALL_VertexAttrib4svARB( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  4), 4 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttrib4ubvARB(GLbyte * pc)
-{
-    CALL_VertexAttrib4ubvARB( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-         (const GLubyte *)(pc +  4)
-    ) );
-}
-
-void __glXDispSwap_VertexAttrib4uivARB(GLbyte * pc)
-{
-    CALL_VertexAttrib4uivARB( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-         (const GLuint *)bswap_32_array( (uint32_t *) (pc +  4), 4 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttrib4usvARB(GLbyte * pc)
-{
-    CALL_VertexAttrib4usvARB( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-         (const GLushort *)bswap_16_array( (uint16_t *) (pc +  4), 4 )
-    ) );
-}
-
-void __glXDispSwap_BeginQueryARB(GLbyte * pc)
-{
-    CALL_BeginQueryARB( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLuint  )bswap_CARD32 ( pc +  4 )
-    ) );
-}
-
-int __glXDispSwap_DeleteQueriesARB(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  0 );
-
-        CALL_DeleteQueriesARB( GET_DISPATCH(), (
-            n,
-             (const GLuint *)bswap_32_array( (uint32_t *) (pc +  4), 0 )
-        ) );
-        error = Success;
-    }
-
-    return error;
-}
-
-void __glXDispSwap_EndQueryARB(GLbyte * pc)
-{
-    CALL_EndQueryARB( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 )
-    ) );
-}
-
-int __glXDispSwap_GenQueriesARB(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  0 );
-
-        GLuint answerBuffer[200];
-        GLuint * ids = __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer), 4);
-        CALL_GenQueriesARB( GET_DISPATCH(), (
-            n,
-            ids
-        ) );
-        (void) bswap_32_array( (uint32_t *) ids, n );
-        __glXSendReplySwap(cl->client, ids, n, 4, GL_TRUE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetQueryObjectivARB(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetQueryObjectivARB_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetQueryObjectivARB( GET_DISPATCH(), (
-             (GLuint  )bswap_CARD32 ( pc +  0 ),
-            pname,
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetQueryObjectuivARB(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetQueryObjectuivARB_size(pname);
-        GLuint answerBuffer[200];
-        GLuint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetQueryObjectuivARB( GET_DISPATCH(), (
-             (GLuint  )bswap_CARD32 ( pc +  0 ),
-            pname,
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetQueryivARB(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetQueryivARB_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetQueryivARB( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-            pname,
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_IsQueryARB(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXSingleReq * const req = (xGLXSingleReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_SINGLE_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLboolean retval;
-        retval = CALL_IsQueryARB( GET_DISPATCH(), (
-             (GLuint  )bswap_CARD32 ( pc +  0 )
-        ) );
-        __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-void __glXDispSwap_DrawBuffersARB(GLbyte * pc)
-{
-    const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  0 );
-
-    CALL_DrawBuffersARB( GET_DISPATCH(), (
-        n,
-         (const GLenum *)bswap_32_array( (uint32_t *) (pc +  4), 0 )
-    ) );
-}
-
-void __glXDispSwap_SampleMaskSGIS(GLbyte * pc)
-{
-    CALL_SampleMaskSGIS( GET_DISPATCH(), (
-         (GLclampf)bswap_FLOAT32( pc +  0 ),
-        *(GLboolean *)(pc +  4)
-    ) );
-}
-
-void __glXDispSwap_SamplePatternSGIS(GLbyte * pc)
-{
-    CALL_SamplePatternSGIS( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 )
-    ) );
-}
-
-void __glXDispSwap_PointParameterfEXT(GLbyte * pc)
-{
-    CALL_PointParameterfEXT( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLfloat )bswap_FLOAT32( pc +  4 )
-    ) );
-}
-
-void __glXDispSwap_PointParameterfvEXT(GLbyte * pc)
-{
-    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  0 );
-    const GLfloat * params;
-
-    params = (const GLfloat *) bswap_32_array( (uint32_t *) (pc + 4), __glPointParameterfvEXT_size(pname) );
-
-    CALL_PointParameterfvEXT( GET_DISPATCH(), (
-        pname,
-        params
-    ) );
-}
-
-void __glXDispSwap_SecondaryColor3bvEXT(GLbyte * pc)
-{
-    CALL_SecondaryColor3bvEXT( GET_DISPATCH(), (
-         (const GLbyte *)(pc +  0)
-    ) );
-}
-
-void __glXDispSwap_SecondaryColor3dvEXT(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 24);
-        pc -= 4;
-    }
-#endif
-
-    CALL_SecondaryColor3dvEXT( GET_DISPATCH(), (
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 3 )
-    ) );
-}
-
-void __glXDispSwap_SecondaryColor3fvEXT(GLbyte * pc)
-{
-    CALL_SecondaryColor3fvEXT( GET_DISPATCH(), (
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 3 )
-    ) );
-}
-
-void __glXDispSwap_SecondaryColor3ivEXT(GLbyte * pc)
-{
-    CALL_SecondaryColor3ivEXT( GET_DISPATCH(), (
-         (const GLint *)bswap_32_array( (uint32_t *) (pc +  0), 3 )
-    ) );
-}
-
-void __glXDispSwap_SecondaryColor3svEXT(GLbyte * pc)
-{
-    CALL_SecondaryColor3svEXT( GET_DISPATCH(), (
-         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  0), 3 )
-    ) );
-}
-
-void __glXDispSwap_SecondaryColor3ubvEXT(GLbyte * pc)
-{
-    CALL_SecondaryColor3ubvEXT( GET_DISPATCH(), (
-         (const GLubyte *)(pc +  0)
-    ) );
-}
-
-void __glXDispSwap_SecondaryColor3uivEXT(GLbyte * pc)
-{
-    CALL_SecondaryColor3uivEXT( GET_DISPATCH(), (
-         (const GLuint *)bswap_32_array( (uint32_t *) (pc +  0), 3 )
-    ) );
-}
-
-void __glXDispSwap_SecondaryColor3usvEXT(GLbyte * pc)
-{
-    CALL_SecondaryColor3usvEXT( GET_DISPATCH(), (
-         (const GLushort *)bswap_16_array( (uint16_t *) (pc +  0), 3 )
-    ) );
-}
-
-void __glXDispSwap_FogCoorddvEXT(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 8);
-        pc -= 4;
-    }
-#endif
-
-    CALL_FogCoorddvEXT( GET_DISPATCH(), (
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 1 )
-    ) );
-}
-
-void __glXDispSwap_FogCoordfvEXT(GLbyte * pc)
-{
-    CALL_FogCoordfvEXT( GET_DISPATCH(), (
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 1 )
-    ) );
-}
-
-void __glXDispSwap_BlendFuncSeparateEXT(GLbyte * pc)
-{
-    CALL_BlendFuncSeparateEXT( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLenum  )bswap_ENUM   ( pc +  4 ),
-         (GLenum  )bswap_ENUM   ( pc +  8 ),
-         (GLenum  )bswap_ENUM   ( pc + 12 )
-    ) );
-}
-
-void __glXDispSwap_WindowPos3fvMESA(GLbyte * pc)
-{
-    CALL_WindowPos3fvMESA( GET_DISPATCH(), (
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  0), 3 )
-    ) );
-}
-
-int __glXDispSwap_AreProgramsResidentNV(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  0 );
-
-        GLboolean retval;
-        GLboolean answerBuffer[200];
-        GLboolean * residences = __glXGetAnswerBuffer(cl, n, answerBuffer, sizeof(answerBuffer), 1);
-        retval = CALL_AreProgramsResidentNV( GET_DISPATCH(), (
-            n,
-             (const GLuint *)bswap_32_array( (uint32_t *) (pc +  4), 0 ),
-            residences
-        ) );
-        __glXSendReplySwap(cl->client, residences, n, 1, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-void __glXDispSwap_BindProgramNV(GLbyte * pc)
-{
-    CALL_BindProgramNV( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLuint  )bswap_CARD32 ( pc +  4 )
-    ) );
-}
-
-int __glXDispSwap_DeleteProgramsNV(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  0 );
-
-        CALL_DeleteProgramsNV( GET_DISPATCH(), (
-            n,
-             (const GLuint *)bswap_32_array( (uint32_t *) (pc +  4), 0 )
-        ) );
-        error = Success;
-    }
-
-    return error;
-}
-
-void __glXDispSwap_ExecuteProgramNV(GLbyte * pc)
-{
-    CALL_ExecuteProgramNV( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLuint  )bswap_CARD32 ( pc +  4 ),
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  8), 4 )
-    ) );
-}
-
-int __glXDispSwap_GenProgramsNV(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  0 );
-
-        GLuint answerBuffer[200];
-        GLuint * programs = __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer), 4);
-        CALL_GenProgramsNV( GET_DISPATCH(), (
-            n,
-            programs
-        ) );
-        (void) bswap_32_array( (uint32_t *) programs, n );
-        __glXSendReplySwap(cl->client, programs, n, 4, GL_TRUE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetProgramParameterdvNV(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLdouble params[4];
-        CALL_GetProgramParameterdvNV( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-             (GLuint  )bswap_CARD32 ( pc +  4 ),
-             (GLenum  )bswap_ENUM   ( pc +  8 ),
-            params
-        ) );
-        (void) bswap_64_array( (uint64_t *) params, 4 );
-        __glXSendReplySwap(cl->client, params, 4, 8, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetProgramParameterfvNV(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLfloat params[4];
-        CALL_GetProgramParameterfvNV( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-             (GLuint  )bswap_CARD32 ( pc +  4 ),
-             (GLenum  )bswap_ENUM   ( pc +  8 ),
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, 4 );
-        __glXSendReplySwap(cl->client, params, 4, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetProgramivNV(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetProgramivNV_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetProgramivNV( GET_DISPATCH(), (
-             (GLuint  )bswap_CARD32 ( pc +  0 ),
-            pname,
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetTrackMatrixivNV(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLint params[1];
-        CALL_GetTrackMatrixivNV( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-             (GLuint  )bswap_CARD32 ( pc +  4 ),
-             (GLenum  )bswap_ENUM   ( pc +  8 ),
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, 1 );
-        __glXSendReplySwap(cl->client, params, 1, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetVertexAttribdvNV(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetVertexAttribdvNV_size(pname);
-        GLdouble answerBuffer[200];
-        GLdouble * params = __glXGetAnswerBuffer(cl, compsize * 8, answerBuffer, sizeof(answerBuffer), 8);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetVertexAttribdvNV( GET_DISPATCH(), (
-             (GLuint  )bswap_CARD32 ( pc +  0 ),
-            pname,
-            params
-        ) );
-        (void) bswap_64_array( (uint64_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 8, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetVertexAttribfvNV(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetVertexAttribfvNV_size(pname);
-        GLfloat answerBuffer[200];
-        GLfloat * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetVertexAttribfvNV( GET_DISPATCH(), (
-             (GLuint  )bswap_CARD32 ( pc +  0 ),
-            pname,
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetVertexAttribivNV(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  4 );
-
-        const GLuint compsize = __glGetVertexAttribivNV_size(pname);
-        GLint answerBuffer[200];
-        GLint * params = __glXGetAnswerBuffer(cl, compsize * 4, answerBuffer, sizeof(answerBuffer), 4);
-
-        if (params == NULL) return BadAlloc;
-        __glXClearErrorOccured();
-
-        CALL_GetVertexAttribivNV( GET_DISPATCH(), (
-             (GLuint  )bswap_CARD32 ( pc +  0 ),
-            pname,
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, compsize );
-        __glXSendReplySwap(cl->client, params, compsize, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_IsProgramNV(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLboolean retval;
-        retval = CALL_IsProgramNV( GET_DISPATCH(), (
-             (GLuint  )bswap_CARD32 ( pc +  0 )
-        ) );
-        __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-void __glXDispSwap_LoadProgramNV(GLbyte * pc)
-{
-    const GLsizei len =  (GLsizei )bswap_CARD32 ( pc +  8 );
-
-    CALL_LoadProgramNV( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLuint  )bswap_CARD32 ( pc +  4 ),
-        len,
-         (const GLubyte *)(pc + 12)
-    ) );
-}
-
-void __glXDispSwap_ProgramParameters4dvNV(GLbyte * pc)
-{
-    const GLuint num =  (GLuint  )bswap_CARD32 ( pc +  8 );
-
-#ifdef __GLX_ALIGN64
-    const GLuint cmdlen = 16 + __GLX_PAD((num * 32)) - 4;
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, cmdlen);
-        pc -= 4;
-    }
-#endif
-
-    CALL_ProgramParameters4dvNV( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLuint  )bswap_CARD32 ( pc +  4 ),
-        num,
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc + 12), 0 )
-    ) );
-}
-
-void __glXDispSwap_ProgramParameters4fvNV(GLbyte * pc)
-{
-    const GLuint num =  (GLuint  )bswap_CARD32 ( pc +  8 );
-
-    CALL_ProgramParameters4fvNV( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLuint  )bswap_CARD32 ( pc +  4 ),
-        num,
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc + 12), 0 )
-    ) );
-}
-
-void __glXDispSwap_RequestResidentProgramsNV(GLbyte * pc)
-{
-    const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  0 );
-
-    CALL_RequestResidentProgramsNV( GET_DISPATCH(), (
-        n,
-         (const GLuint *)bswap_32_array( (uint32_t *) (pc +  4), 0 )
-    ) );
-}
-
-void __glXDispSwap_TrackMatrixNV(GLbyte * pc)
-{
-    CALL_TrackMatrixNV( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLuint  )bswap_CARD32 ( pc +  4 ),
-         (GLenum  )bswap_ENUM   ( pc +  8 ),
-         (GLenum  )bswap_ENUM   ( pc + 12 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttrib1dvNV(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 12);
-        pc -= 4;
-    }
-#endif
-
-    CALL_VertexAttrib1dvNV( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  4), 1 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttrib1fvNV(GLbyte * pc)
-{
-    CALL_VertexAttrib1fvNV( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  4), 1 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttrib1svNV(GLbyte * pc)
-{
-    CALL_VertexAttrib1svNV( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  4), 1 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttrib2dvNV(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 20);
-        pc -= 4;
-    }
-#endif
-
-    CALL_VertexAttrib2dvNV( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  4), 2 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttrib2fvNV(GLbyte * pc)
-{
-    CALL_VertexAttrib2fvNV( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  4), 2 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttrib2svNV(GLbyte * pc)
-{
-    CALL_VertexAttrib2svNV( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  4), 2 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttrib3dvNV(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 28);
-        pc -= 4;
-    }
-#endif
-
-    CALL_VertexAttrib3dvNV( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  4), 3 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttrib3fvNV(GLbyte * pc)
-{
-    CALL_VertexAttrib3fvNV( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  4), 3 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttrib3svNV(GLbyte * pc)
-{
-    CALL_VertexAttrib3svNV( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  4), 3 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttrib4dvNV(GLbyte * pc)
-{
-#ifdef __GLX_ALIGN64
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, 36);
-        pc -= 4;
-    }
-#endif
-
-    CALL_VertexAttrib4dvNV( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  4), 4 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttrib4fvNV(GLbyte * pc)
-{
-    CALL_VertexAttrib4fvNV( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  4), 4 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttrib4svNV(GLbyte * pc)
-{
-    CALL_VertexAttrib4svNV( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  4), 4 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttrib4ubvNV(GLbyte * pc)
-{
-    CALL_VertexAttrib4ubvNV( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-         (const GLubyte *)(pc +  4)
-    ) );
-}
-
-void __glXDispSwap_VertexAttribs1dvNV(GLbyte * pc)
-{
-    const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  4 );
-
-#ifdef __GLX_ALIGN64
-    const GLuint cmdlen = 12 + __GLX_PAD((n * 8)) - 4;
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, cmdlen);
-        pc -= 4;
-    }
-#endif
-
-    CALL_VertexAttribs1dvNV( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-        n,
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  8), 0 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttribs1fvNV(GLbyte * pc)
-{
-    const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  4 );
-
-    CALL_VertexAttribs1fvNV( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-        n,
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  8), 0 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttribs1svNV(GLbyte * pc)
-{
-    const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  4 );
-
-    CALL_VertexAttribs1svNV( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-        n,
-         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  8), 0 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttribs2dvNV(GLbyte * pc)
-{
-    const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  4 );
-
-#ifdef __GLX_ALIGN64
-    const GLuint cmdlen = 12 + __GLX_PAD((n * 16)) - 4;
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, cmdlen);
-        pc -= 4;
-    }
-#endif
-
-    CALL_VertexAttribs2dvNV( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-        n,
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  8), 0 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttribs2fvNV(GLbyte * pc)
-{
-    const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  4 );
-
-    CALL_VertexAttribs2fvNV( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-        n,
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  8), 0 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttribs2svNV(GLbyte * pc)
-{
-    const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  4 );
-
-    CALL_VertexAttribs2svNV( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-        n,
-         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  8), 0 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttribs3dvNV(GLbyte * pc)
-{
-    const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  4 );
-
-#ifdef __GLX_ALIGN64
-    const GLuint cmdlen = 12 + __GLX_PAD((n * 24)) - 4;
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, cmdlen);
-        pc -= 4;
-    }
-#endif
-
-    CALL_VertexAttribs3dvNV( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-        n,
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  8), 0 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttribs3fvNV(GLbyte * pc)
-{
-    const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  4 );
-
-    CALL_VertexAttribs3fvNV( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-        n,
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  8), 0 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttribs3svNV(GLbyte * pc)
-{
-    const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  4 );
-
-    CALL_VertexAttribs3svNV( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-        n,
-         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  8), 0 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttribs4dvNV(GLbyte * pc)
-{
-    const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  4 );
-
-#ifdef __GLX_ALIGN64
-    const GLuint cmdlen = 12 + __GLX_PAD((n * 32)) - 4;
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, cmdlen);
-        pc -= 4;
-    }
-#endif
-
-    CALL_VertexAttribs4dvNV( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-        n,
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  8), 0 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttribs4fvNV(GLbyte * pc)
-{
-    const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  4 );
-
-    CALL_VertexAttribs4fvNV( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-        n,
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  8), 0 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttribs4svNV(GLbyte * pc)
-{
-    const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  4 );
-
-    CALL_VertexAttribs4svNV( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-        n,
-         (const GLshort *)bswap_16_array( (uint16_t *) (pc +  8), 0 )
-    ) );
-}
-
-void __glXDispSwap_VertexAttribs4ubvNV(GLbyte * pc)
-{
-    const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  4 );
-
-    CALL_VertexAttribs4ubvNV( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-        n,
-         (const GLubyte *)(pc +  8)
-    ) );
-}
-
-void __glXDispSwap_PointParameteriNV(GLbyte * pc)
-{
-    CALL_PointParameteriNV( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLint   )bswap_CARD32 ( pc +  4 )
-    ) );
-}
-
-void __glXDispSwap_PointParameterivNV(GLbyte * pc)
-{
-    const GLenum pname =  (GLenum  )bswap_ENUM   ( pc +  0 );
-    const GLint * params;
-
-    params = (const GLint *) bswap_32_array( (uint32_t *) (pc + 4), __glPointParameterivNV_size(pname) );
-
-    CALL_PointParameterivNV( GET_DISPATCH(), (
-        pname,
-        params
-    ) );
-}
-
-void __glXDispSwap_ActiveStencilFaceEXT(GLbyte * pc)
-{
-    CALL_ActiveStencilFaceEXT( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 )
-    ) );
-}
-
-int __glXDispSwap_GetProgramNamedParameterdvNV(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLsizei len =  (GLsizei )bswap_CARD32 ( pc +  4 );
-
-        GLdouble params[4];
-        CALL_GetProgramNamedParameterdvNV( GET_DISPATCH(), (
-             (GLuint  )bswap_CARD32 ( pc +  0 ),
-            len,
-             (const GLubyte *)(pc +  8),
-            params
-        ) );
-        (void) bswap_64_array( (uint64_t *) params, 4 );
-        __glXSendReplySwap(cl->client, params, 4, 8, GL_TRUE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetProgramNamedParameterfvNV(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLsizei len =  (GLsizei )bswap_CARD32 ( pc +  4 );
-
-        GLfloat params[4];
-        CALL_GetProgramNamedParameterfvNV( GET_DISPATCH(), (
-             (GLuint  )bswap_CARD32 ( pc +  0 ),
-            len,
-             (const GLubyte *)(pc +  8),
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, 4 );
-        __glXSendReplySwap(cl->client, params, 4, 4, GL_TRUE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-void __glXDispSwap_ProgramNamedParameter4dvNV(GLbyte * pc)
-{
-    const GLsizei len =  (GLsizei )bswap_CARD32 ( pc + 36 );
-
-#ifdef __GLX_ALIGN64
-    const GLuint cmdlen = 44 + __GLX_PAD(len) - 4;
-    if ((unsigned long)(pc) & 7) {
-        (void) memmove(pc-4, pc, cmdlen);
-        pc -= 4;
-    }
-#endif
-
-    CALL_ProgramNamedParameter4dvNV( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc + 32 ),
-        len,
-         (const GLubyte *)(pc + 40),
-         (const GLdouble *)bswap_64_array( (uint64_t *) (pc +  0), 4 )
-    ) );
-}
-
-void __glXDispSwap_ProgramNamedParameter4fvNV(GLbyte * pc)
-{
-    const GLsizei len =  (GLsizei )bswap_CARD32 ( pc +  4 );
-
-    CALL_ProgramNamedParameter4fvNV( GET_DISPATCH(), (
-         (GLuint  )bswap_CARD32 ( pc +  0 ),
-        len,
-         (const GLubyte *)(pc + 24),
-         (const GLfloat *)bswap_32_array( (uint32_t *) (pc +  8), 4 )
-    ) );
-}
-
-void __glXDispSwap_BlendEquationSeparateEXT(GLbyte * pc)
-{
-    CALL_BlendEquationSeparateEXT( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLenum  )bswap_ENUM   ( pc +  4 )
-    ) );
-}
-
-void __glXDispSwap_BindFramebufferEXT(GLbyte * pc)
-{
-    CALL_BindFramebufferEXT( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLuint  )bswap_CARD32 ( pc +  4 )
-    ) );
-}
-
-void __glXDispSwap_BindRenderbufferEXT(GLbyte * pc)
-{
-    CALL_BindRenderbufferEXT( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLuint  )bswap_CARD32 ( pc +  4 )
-    ) );
-}
-
-int __glXDispSwap_CheckFramebufferStatusEXT(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLenum retval;
-        retval = CALL_CheckFramebufferStatusEXT( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 )
-        ) );
-        __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-void __glXDispSwap_DeleteFramebuffersEXT(GLbyte * pc)
-{
-    const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  0 );
-
-    CALL_DeleteFramebuffersEXT( GET_DISPATCH(), (
-        n,
-         (const GLuint *)bswap_32_array( (uint32_t *) (pc +  4), 0 )
-    ) );
-}
-
-void __glXDispSwap_DeleteRenderbuffersEXT(GLbyte * pc)
-{
-    const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  0 );
-
-    CALL_DeleteRenderbuffersEXT( GET_DISPATCH(), (
-        n,
-         (const GLuint *)bswap_32_array( (uint32_t *) (pc +  4), 0 )
-    ) );
-}
-
-void __glXDispSwap_FramebufferRenderbufferEXT(GLbyte * pc)
-{
-    CALL_FramebufferRenderbufferEXT( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLenum  )bswap_ENUM   ( pc +  4 ),
-         (GLenum  )bswap_ENUM   ( pc +  8 ),
-         (GLuint  )bswap_CARD32 ( pc + 12 )
-    ) );
-}
-
-void __glXDispSwap_FramebufferTexture1DEXT(GLbyte * pc)
-{
-    CALL_FramebufferTexture1DEXT( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLenum  )bswap_ENUM   ( pc +  4 ),
-         (GLenum  )bswap_ENUM   ( pc +  8 ),
-         (GLuint  )bswap_CARD32 ( pc + 12 ),
-         (GLint   )bswap_CARD32 ( pc + 16 )
-    ) );
-}
-
-void __glXDispSwap_FramebufferTexture2DEXT(GLbyte * pc)
-{
-    CALL_FramebufferTexture2DEXT( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLenum  )bswap_ENUM   ( pc +  4 ),
-         (GLenum  )bswap_ENUM   ( pc +  8 ),
-         (GLuint  )bswap_CARD32 ( pc + 12 ),
-         (GLint   )bswap_CARD32 ( pc + 16 )
-    ) );
-}
-
-void __glXDispSwap_FramebufferTexture3DEXT(GLbyte * pc)
-{
-    CALL_FramebufferTexture3DEXT( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLenum  )bswap_ENUM   ( pc +  4 ),
-         (GLenum  )bswap_ENUM   ( pc +  8 ),
-         (GLuint  )bswap_CARD32 ( pc + 12 ),
-         (GLint   )bswap_CARD32 ( pc + 16 ),
-         (GLint   )bswap_CARD32 ( pc + 20 )
-    ) );
-}
-
-int __glXDispSwap_GenFramebuffersEXT(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  0 );
-
-        GLuint answerBuffer[200];
-        GLuint * framebuffers = __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer), 4);
-        CALL_GenFramebuffersEXT( GET_DISPATCH(), (
-            n,
-            framebuffers
-        ) );
-        (void) bswap_32_array( (uint32_t *) framebuffers, n );
-        __glXSendReplySwap(cl->client, framebuffers, n, 4, GL_TRUE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GenRenderbuffersEXT(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        const GLsizei n =  (GLsizei )bswap_CARD32 ( pc +  0 );
-
-        GLuint answerBuffer[200];
-        GLuint * renderbuffers = __glXGetAnswerBuffer(cl, n * 4, answerBuffer, sizeof(answerBuffer), 4);
-        CALL_GenRenderbuffersEXT( GET_DISPATCH(), (
-            n,
-            renderbuffers
-        ) );
-        (void) bswap_32_array( (uint32_t *) renderbuffers, n );
-        __glXSendReplySwap(cl->client, renderbuffers, n, 4, GL_TRUE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-void __glXDispSwap_GenerateMipmapEXT(GLbyte * pc)
-{
-    CALL_GenerateMipmapEXT( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 )
-    ) );
-}
-
-int __glXDispSwap_GetFramebufferAttachmentParameterivEXT(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLint params[1];
-        CALL_GetFramebufferAttachmentParameterivEXT( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-             (GLenum  )bswap_ENUM   ( pc +  4 ),
-             (GLenum  )bswap_ENUM   ( pc +  8 ),
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, 1 );
-        __glXSendReplySwap(cl->client, params, 1, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_GetRenderbufferParameterivEXT(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLint params[1];
-        CALL_GetRenderbufferParameterivEXT( GET_DISPATCH(), (
-             (GLenum  )bswap_ENUM   ( pc +  0 ),
-             (GLenum  )bswap_ENUM   ( pc +  4 ),
-            params
-        ) );
-        (void) bswap_32_array( (uint32_t *) params, 1 );
-        __glXSendReplySwap(cl->client, params, 1, 4, GL_FALSE, 0);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_IsFramebufferEXT(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLboolean retval;
-        retval = CALL_IsFramebufferEXT( GET_DISPATCH(), (
-             (GLuint  )bswap_CARD32 ( pc +  0 )
-        ) );
-        __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-int __glXDispSwap_IsRenderbufferEXT(__GLXclientState *cl, GLbyte *pc)
-{
-    xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;
-    int error;
-    __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);
-
-    pc += __GLX_VENDPRIV_HDR_SIZE;
-    if ( cx != NULL ) {
-        GLboolean retval;
-        retval = CALL_IsRenderbufferEXT( GET_DISPATCH(), (
-             (GLuint  )bswap_CARD32 ( pc +  0 )
-        ) );
-        __glXSendReplySwap(cl->client, dummy_answer, 0, 0, GL_FALSE, retval);
-        error = Success;
-    }
-
-    return error;
-}
-
-void __glXDispSwap_RenderbufferStorageEXT(GLbyte * pc)
-{
-    CALL_RenderbufferStorageEXT( GET_DISPATCH(), (
-         (GLenum  )bswap_ENUM   ( pc +  0 ),
-         (GLenum  )bswap_ENUM   ( pc +  4 ),
-         (GLsizei )bswap_CARD32 ( pc +  8 ),
-         (GLsizei )bswap_CARD32 ( pc + 12 )
-    ) );
-}
-
diff --git a/GL/glx/indirect_reqsize.c b/GL/glx/indirect_reqsize.c
deleted file mode 100644
index 954eecd97..000000000
--- a/GL/glx/indirect_reqsize.c
+++ /dev/null
@@ -1,832 +0,0 @@
-/* DO NOT EDIT - This file generated automatically by glX_proto_size.py (from Mesa) script */
-
-/*
- * (C) Copyright IBM Corporation 2005
- * All Rights Reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sub license,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
- * IBM,
- * AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-
-#include <GL/gl.h>
-#include "glxserver.h"
-#include "glxbyteorder.h"
-#include "indirect_size.h"
-#include "indirect_reqsize.h"
-
-#define __GLX_PAD(x)  (((x) + 3) & ~3)
-
-#if defined(__CYGWIN__) || defined(__MINGW32__)
-#  undef HAVE_ALIAS
-#endif
-#ifdef HAVE_ALIAS
-#  define ALIAS2(from,to) \
-    GLint __glX ## from ## ReqSize( const GLbyte * pc, Bool swap ) \
-        __attribute__ ((alias( # to )));
-#  define ALIAS(from,to) ALIAS2( from, __glX ## to ## ReqSize )
-#else
-#  define ALIAS(from,to) \
-    GLint __glX ## from ## ReqSize( const GLbyte * pc, Bool swap ) \
-    { return __glX ## to ## ReqSize( pc, swap ); }
-#endif
-
-
-int
-__glXCallListsReqSize(const GLbyte *pc, Bool swap)
-{
-    GLsizei n = *(GLsizei *) (pc + 0);
-    GLenum type = *(GLenum *) (pc + 4);
-    GLsizei compsize;
-
-    if (swap) {
-        n = bswap_32(n);
-        type = bswap_32(type);
-    }
-
-    compsize = __glCallLists_size(type);
-    return __GLX_PAD((compsize * n));
-}
-
-int
-__glXBitmapReqSize(const GLbyte *pc, Bool swap)
-{
-    GLint row_length = *(GLint *) (pc + 4);
-    GLint image_height = 0;
-    GLint skip_images = 0;
-    GLint skip_rows = *(GLint *) (pc + 8);
-    GLint alignment = *(GLint *) (pc + 16);
-    GLsizei width = *(GLsizei *) (pc + 20);
-    GLsizei height = *(GLsizei *) (pc + 24);
-
-    if (swap) {
-        row_length = bswap_32(row_length);
-        skip_rows = bswap_32(skip_rows);
-        alignment = bswap_32(alignment);
-        width = bswap_32(width);
-        height = bswap_32(height);
-    }
-
-    return __glXImageSize(GL_COLOR_INDEX, GL_BITMAP, 0, width, height, 1,
-                          image_height, row_length, skip_images,
-                          skip_rows, alignment);
-}
-
-int
-__glXFogfvReqSize(const GLbyte *pc, Bool swap)
-{
-    GLenum pname = *(GLenum *) (pc + 0);
-    GLsizei compsize;
-
-    if (swap) {
-        pname = bswap_32(pname);
-    }
-
-    compsize = __glFogfv_size(pname);
-    return __GLX_PAD((compsize * 4));
-}
-
-int
-__glXLightfvReqSize(const GLbyte *pc, Bool swap)
-{
-    GLenum pname = *(GLenum *) (pc + 4);
-    GLsizei compsize;
-
-    if (swap) {
-        pname = bswap_32(pname);
-    }
-
-    compsize = __glLightfv_size(pname);
-    return __GLX_PAD((compsize * 4));
-}
-
-int
-__glXLightModelfvReqSize(const GLbyte *pc, Bool swap)
-{
-    GLenum pname = *(GLenum *) (pc + 0);
-    GLsizei compsize;
-
-    if (swap) {
-        pname = bswap_32(pname);
-    }
-
-    compsize = __glLightModelfv_size(pname);
-    return __GLX_PAD((compsize * 4));
-}
-
-int
-__glXMaterialfvReqSize(const GLbyte *pc, Bool swap)
-{
-    GLenum pname = *(GLenum *) (pc + 4);
-    GLsizei compsize;
-
-    if (swap) {
-        pname = bswap_32(pname);
-    }
-
-    compsize = __glMaterialfv_size(pname);
-    return __GLX_PAD((compsize * 4));
-}
-
-int
-__glXPolygonStippleReqSize(const GLbyte *pc, Bool swap)
-{
-    GLint row_length = *(GLint *) (pc + 4);
-    GLint image_height = 0;
-    GLint skip_images = 0;
-    GLint skip_rows = *(GLint *) (pc + 8);
-    GLint alignment = *(GLint *) (pc + 16);
-
-    if (swap) {
-        row_length = bswap_32(row_length);
-        skip_rows = bswap_32(skip_rows);
-        alignment = bswap_32(alignment);
-    }
-
-    return __glXImageSize(GL_COLOR_INDEX, GL_BITMAP, 0, 32, 32, 1,
-                          image_height, row_length, skip_images,
-                          skip_rows, alignment);
-}
-
-int
-__glXTexParameterfvReqSize(const GLbyte *pc, Bool swap)
-{
-    GLenum pname = *(GLenum *) (pc + 4);
-    GLsizei compsize;
-
-    if (swap) {
-        pname = bswap_32(pname);
-    }
-
-    compsize = __glTexParameterfv_size(pname);
-    return __GLX_PAD((compsize * 4));
-}
-
-int
-__glXTexImage1DReqSize(const GLbyte *pc, Bool swap)
-{
-    GLint row_length = *(GLint *) (pc + 4);
-    GLint image_height = 0;
-    GLint skip_images = 0;
-    GLint skip_rows = *(GLint *) (pc + 8);
-    GLint alignment = *(GLint *) (pc + 16);
-    GLenum target = *(GLenum *) (pc + 20);
-    GLsizei width = *(GLsizei *) (pc + 32);
-    GLenum format = *(GLenum *) (pc + 44);
-    GLenum type = *(GLenum *) (pc + 48);
-
-    if (swap) {
-        row_length = bswap_32(row_length);
-        skip_rows = bswap_32(skip_rows);
-        alignment = bswap_32(alignment);
-        target = bswap_32(target);
-        width = bswap_32(width);
-        format = bswap_32(format);
-        type = bswap_32(type);
-    }
-
-    return __glXImageSize(format, type, target, width, 1, 1,
-                          image_height, row_length, skip_images,
-                          skip_rows, alignment);
-}
-
-int
-__glXTexImage2DReqSize(const GLbyte *pc, Bool swap)
-{
-    GLint row_length = *(GLint *) (pc + 4);
-    GLint image_height = 0;
-    GLint skip_images = 0;
-    GLint skip_rows = *(GLint *) (pc + 8);
-    GLint alignment = *(GLint *) (pc + 16);
-    GLenum target = *(GLenum *) (pc + 20);
-    GLsizei width = *(GLsizei *) (pc + 32);
-    GLsizei height = *(GLsizei *) (pc + 36);
-    GLenum format = *(GLenum *) (pc + 44);
-    GLenum type = *(GLenum *) (pc + 48);
-
-    if (swap) {
-        row_length = bswap_32(row_length);
-        skip_rows = bswap_32(skip_rows);
-        alignment = bswap_32(alignment);
-        target = bswap_32(target);
-        width = bswap_32(width);
-        height = bswap_32(height);
-        format = bswap_32(format);
-        type = bswap_32(type);
-    }
-
-    return __glXImageSize(format, type, target, width, height, 1,
-                          image_height, row_length, skip_images,
-                          skip_rows, alignment);
-}
-
-int
-__glXTexEnvfvReqSize(const GLbyte *pc, Bool swap)
-{
-    GLenum pname = *(GLenum *) (pc + 4);
-    GLsizei compsize;
-
-    if (swap) {
-        pname = bswap_32(pname);
-    }
-
-    compsize = __glTexEnvfv_size(pname);
-    return __GLX_PAD((compsize * 4));
-}
-
-int
-__glXTexGendvReqSize(const GLbyte *pc, Bool swap)
-{
-    GLenum pname = *(GLenum *) (pc + 4);
-    GLsizei compsize;
-
-    if (swap) {
-        pname = bswap_32(pname);
-    }
-
-    compsize = __glTexGendv_size(pname);
-    return __GLX_PAD((compsize * 8));
-}
-
-int
-__glXTexGenfvReqSize(const GLbyte *pc, Bool swap)
-{
-    GLenum pname = *(GLenum *) (pc + 4);
-    GLsizei compsize;
-
-    if (swap) {
-        pname = bswap_32(pname);
-    }
-
-    compsize = __glTexGenfv_size(pname);
-    return __GLX_PAD((compsize * 4));
-}
-
-int
-__glXPixelMapfvReqSize(const GLbyte *pc, Bool swap)
-{
-    GLsizei mapsize = *(GLsizei *) (pc + 4);
-
-    if (swap) {
-        mapsize = bswap_32(mapsize);
-    }
-
-    return __GLX_PAD((mapsize * 4));
-}
-
-int
-__glXPixelMapusvReqSize(const GLbyte *pc, Bool swap)
-{
-    GLsizei mapsize = *(GLsizei *) (pc + 4);
-
-    if (swap) {
-        mapsize = bswap_32(mapsize);
-    }
-
-    return __GLX_PAD((mapsize * 2));
-}
-
-int
-__glXDrawPixelsReqSize(const GLbyte *pc, Bool swap)
-{
-    GLint row_length = *(GLint *) (pc + 4);
-    GLint image_height = 0;
-    GLint skip_images = 0;
-    GLint skip_rows = *(GLint *) (pc + 8);
-    GLint alignment = *(GLint *) (pc + 16);
-    GLsizei width = *(GLsizei *) (pc + 20);
-    GLsizei height = *(GLsizei *) (pc + 24);
-    GLenum format = *(GLenum *) (pc + 28);
-    GLenum type = *(GLenum *) (pc + 32);
-
-    if (swap) {
-        row_length = bswap_32(row_length);
-        skip_rows = bswap_32(skip_rows);
-        alignment = bswap_32(alignment);
-        width = bswap_32(width);
-        height = bswap_32(height);
-        format = bswap_32(format);
-        type = bswap_32(type);
-    }
-
-    return __glXImageSize(format, type, 0, width, height, 1,
-                          image_height, row_length, skip_images,
-                          skip_rows, alignment);
-}
-
-int
-__glXPrioritizeTexturesReqSize(const GLbyte *pc, Bool swap)
-{
-    GLsizei n = *(GLsizei *) (pc + 0);
-
-    if (swap) {
-        n = bswap_32(n);
-    }
-
-    return __GLX_PAD((n * 4) + (n * 4));
-}
-
-int
-__glXTexSubImage1DReqSize(const GLbyte *pc, Bool swap)
-{
-    GLint row_length = *(GLint *) (pc + 4);
-    GLint image_height = 0;
-    GLint skip_images = 0;
-    GLint skip_rows = *(GLint *) (pc + 8);
-    GLint alignment = *(GLint *) (pc + 16);
-    GLenum target = *(GLenum *) (pc + 20);
-    GLsizei width = *(GLsizei *) (pc + 36);
-    GLenum format = *(GLenum *) (pc + 44);
-    GLenum type = *(GLenum *) (pc + 48);
-
-    if (swap) {
-        row_length = bswap_32(row_length);
-        skip_rows = bswap_32(skip_rows);
-        alignment = bswap_32(alignment);
-        target = bswap_32(target);
-        width = bswap_32(width);
-        format = bswap_32(format);
-        type = bswap_32(type);
-    }
-
-    return __glXImageSize(format, type, target, width, 1, 1,
-                          image_height, row_length, skip_images,
-                          skip_rows, alignment);
-}
-
-int
-__glXTexSubImage2DReqSize(const GLbyte *pc, Bool swap)
-{
-    GLint row_length = *(GLint *) (pc + 4);
-    GLint image_height = 0;
-    GLint skip_images = 0;
-    GLint skip_rows = *(GLint *) (pc + 8);
-    GLint alignment = *(GLint *) (pc + 16);
-    GLenum target = *(GLenum *) (pc + 20);
-    GLsizei width = *(GLsizei *) (pc + 36);
-    GLsizei height = *(GLsizei *) (pc + 40);
-    GLenum format = *(GLenum *) (pc + 44);
-    GLenum type = *(GLenum *) (pc + 48);
-
-    if (swap) {
-        row_length = bswap_32(row_length);
-        skip_rows = bswap_32(skip_rows);
-        alignment = bswap_32(alignment);
-        target = bswap_32(target);
-        width = bswap_32(width);
-        height = bswap_32(height);
-        format = bswap_32(format);
-        type = bswap_32(type);
-    }
-
-    return __glXImageSize(format, type, target, width, height, 1,
-                          image_height, row_length, skip_images,
-                          skip_rows, alignment);
-}
-
-int
-__glXColorTableReqSize(const GLbyte *pc, Bool swap)
-{
-    GLint row_length = *(GLint *) (pc + 4);
-    GLint image_height = 0;
-    GLint skip_images = 0;
-    GLint skip_rows = *(GLint *) (pc + 8);
-    GLint alignment = *(GLint *) (pc + 16);
-    GLenum target = *(GLenum *) (pc + 20);
-    GLsizei width = *(GLsizei *) (pc + 28);
-    GLenum format = *(GLenum *) (pc + 32);
-    GLenum type = *(GLenum *) (pc + 36);
-
-    if (swap) {
-        row_length = bswap_32(row_length);
-        skip_rows = bswap_32(skip_rows);
-        alignment = bswap_32(alignment);
-        target = bswap_32(target);
-        width = bswap_32(width);
-        format = bswap_32(format);
-        type = bswap_32(type);
-    }
-
-    return __glXImageSize(format, type, target, width, 1, 1,
-                          image_height, row_length, skip_images,
-                          skip_rows, alignment);
-}
-
-int
-__glXColorTableParameterfvReqSize(const GLbyte *pc, Bool swap)
-{
-    GLenum pname = *(GLenum *) (pc + 4);
-    GLsizei compsize;
-
-    if (swap) {
-        pname = bswap_32(pname);
-    }
-
-    compsize = __glColorTableParameterfv_size(pname);
-    return __GLX_PAD((compsize * 4));
-}
-
-int
-__glXColorSubTableReqSize(const GLbyte *pc, Bool swap)
-{
-    GLint row_length = *(GLint *) (pc + 4);
-    GLint image_height = 0;
-    GLint skip_images = 0;
-    GLint skip_rows = *(GLint *) (pc + 8);
-    GLint alignment = *(GLint *) (pc + 16);
-    GLenum target = *(GLenum *) (pc + 20);
-    GLsizei count = *(GLsizei *) (pc + 28);
-    GLenum format = *(GLenum *) (pc + 32);
-    GLenum type = *(GLenum *) (pc + 36);
-
-    if (swap) {
-        row_length = bswap_32(row_length);
-        skip_rows = bswap_32(skip_rows);
-        alignment = bswap_32(alignment);
-        target = bswap_32(target);
-        count = bswap_32(count);
-        format = bswap_32(format);
-        type = bswap_32(type);
-    }
-
-    return __glXImageSize(format, type, target, count, 1, 1,
-                          image_height, row_length, skip_images,
-                          skip_rows, alignment);
-}
-
-int
-__glXConvolutionFilter1DReqSize(const GLbyte *pc, Bool swap)
-{
-    GLint row_length = *(GLint *) (pc + 4);
-    GLint image_height = 0;
-    GLint skip_images = 0;
-    GLint skip_rows = *(GLint *) (pc + 8);
-    GLint alignment = *(GLint *) (pc + 16);
-    GLenum target = *(GLenum *) (pc + 20);
-    GLsizei width = *(GLsizei *) (pc + 28);
-    GLenum format = *(GLenum *) (pc + 36);
-    GLenum type = *(GLenum *) (pc + 40);
-
-    if (swap) {
-        row_length = bswap_32(row_length);
-        skip_rows = bswap_32(skip_rows);
-        alignment = bswap_32(alignment);
-        target = bswap_32(target);
-        width = bswap_32(width);
-        format = bswap_32(format);
-        type = bswap_32(type);
-    }
-
-    return __glXImageSize(format, type, target, width, 1, 1,
-                          image_height, row_length, skip_images,
-                          skip_rows, alignment);
-}
-
-int
-__glXConvolutionFilter2DReqSize(const GLbyte *pc, Bool swap)
-{
-    GLint row_length = *(GLint *) (pc + 4);
-    GLint image_height = 0;
-    GLint skip_images = 0;
-    GLint skip_rows = *(GLint *) (pc + 8);
-    GLint alignment = *(GLint *) (pc + 16);
-    GLenum target = *(GLenum *) (pc + 20);
-    GLsizei width = *(GLsizei *) (pc + 28);
-    GLsizei height = *(GLsizei *) (pc + 32);
-    GLenum format = *(GLenum *) (pc + 36);
-    GLenum type = *(GLenum *) (pc + 40);
-
-    if (swap) {
-        row_length = bswap_32(row_length);
-        skip_rows = bswap_32(skip_rows);
-        alignment = bswap_32(alignment);
-        target = bswap_32(target);
-        width = bswap_32(width);
-        height = bswap_32(height);
-        format = bswap_32(format);
-        type = bswap_32(type);
-    }
-
-    return __glXImageSize(format, type, target, width, height, 1,
-                          image_height, row_length, skip_images,
-                          skip_rows, alignment);
-}
-
-int
-__glXConvolutionParameterfvReqSize(const GLbyte *pc, Bool swap)
-{
-    GLenum pname = *(GLenum *) (pc + 4);
-    GLsizei compsize;
-
-    if (swap) {
-        pname = bswap_32(pname);
-    }
-
-    compsize = __glConvolutionParameterfv_size(pname);
-    return __GLX_PAD((compsize * 4));
-}
-
-int
-__glXTexImage3DReqSize(const GLbyte *pc, Bool swap)
-{
-    GLint row_length = *(GLint *) (pc + 4);
-    GLint image_height = *(GLint *) (pc + 8);
-    GLint skip_rows = *(GLint *) (pc + 16);
-    GLint skip_images = *(GLint *) (pc + 20);
-    GLint alignment = *(GLint *) (pc + 32);
-    GLenum target = *(GLenum *) (pc + 36);
-    GLsizei width = *(GLsizei *) (pc + 48);
-    GLsizei height = *(GLsizei *) (pc + 52);
-    GLsizei depth = *(GLsizei *) (pc + 56);
-    GLenum format = *(GLenum *) (pc + 68);
-    GLenum type = *(GLenum *) (pc + 72);
-
-    if (swap) {
-        row_length = bswap_32(row_length);
-        image_height = bswap_32(image_height);
-        skip_rows = bswap_32(skip_rows);
-        skip_images = bswap_32(skip_images);
-        alignment = bswap_32(alignment);
-        target = bswap_32(target);
-        width = bswap_32(width);
-        height = bswap_32(height);
-        depth = bswap_32(depth);
-        format = bswap_32(format);
-        type = bswap_32(type);
-    }
-
-    return __glXImageSize(format, type, target, width, height, depth,
-                          image_height, row_length, skip_images,
-                          skip_rows, alignment);
-}
-
-int
-__glXTexSubImage3DReqSize(const GLbyte *pc, Bool swap)
-{
-    GLint row_length = *(GLint *) (pc + 4);
-    GLint image_height = *(GLint *) (pc + 8);
-    GLint skip_rows = *(GLint *) (pc + 16);
-    GLint skip_images = *(GLint *) (pc + 20);
-    GLint alignment = *(GLint *) (pc + 32);
-    GLenum target = *(GLenum *) (pc + 36);
-    GLsizei width = *(GLsizei *) (pc + 60);
-    GLsizei height = *(GLsizei *) (pc + 64);
-    GLsizei depth = *(GLsizei *) (pc + 68);
-    GLenum format = *(GLenum *) (pc + 76);
-    GLenum type = *(GLenum *) (pc + 80);
-
-    if (swap) {
-        row_length = bswap_32(row_length);
-        image_height = bswap_32(image_height);
-        skip_rows = bswap_32(skip_rows);
-        skip_images = bswap_32(skip_images);
-        alignment = bswap_32(alignment);
-        target = bswap_32(target);
-        width = bswap_32(width);
-        height = bswap_32(height);
-        depth = bswap_32(depth);
-        format = bswap_32(format);
-        type = bswap_32(type);
-    }
-
-    return __glXImageSize(format, type, target, width, height, depth,
-                          image_height, row_length, skip_images,
-                          skip_rows, alignment);
-}
-
-int
-__glXCompressedTexImage1DARBReqSize(const GLbyte *pc, Bool swap)
-{
-    GLsizei imageSize = *(GLsizei *) (pc + 20);
-
-    if (swap) {
-        imageSize = bswap_32(imageSize);
-    }
-
-    return __GLX_PAD(imageSize);
-}
-
-int
-__glXCompressedTexImage2DARBReqSize(const GLbyte *pc, Bool swap)
-{
-    GLsizei imageSize = *(GLsizei *) (pc + 24);
-
-    if (swap) {
-        imageSize = bswap_32(imageSize);
-    }
-
-    return __GLX_PAD(imageSize);
-}
-
-int
-__glXCompressedTexImage3DARBReqSize(const GLbyte *pc, Bool swap)
-{
-    GLsizei imageSize = *(GLsizei *) (pc + 28);
-
-    if (swap) {
-        imageSize = bswap_32(imageSize);
-    }
-
-    return __GLX_PAD(imageSize);
-}
-
-int
-__glXCompressedTexSubImage3DARBReqSize(const GLbyte *pc, Bool swap)
-{
-    GLsizei imageSize = *(GLsizei *) (pc + 36);
-
-    if (swap) {
-        imageSize = bswap_32(imageSize);
-    }
-
-    return __GLX_PAD(imageSize);
-}
-
-int
-__glXProgramStringARBReqSize(const GLbyte *pc, Bool swap)
-{
-    GLsizei len = *(GLsizei *) (pc + 8);
-
-    if (swap) {
-        len = bswap_32(len);
-    }
-
-    return __GLX_PAD(len);
-}
-
-int
-__glXDrawBuffersARBReqSize(const GLbyte *pc, Bool swap)
-{
-    GLsizei n = *(GLsizei *) (pc + 0);
-
-    if (swap) {
-        n = bswap_32(n);
-    }
-
-    return __GLX_PAD((n * 4));
-}
-
-int
-__glXPointParameterfvEXTReqSize(const GLbyte *pc, Bool swap)
-{
-    GLenum pname = *(GLenum *) (pc + 0);
-    GLsizei compsize;
-
-    if (swap) {
-        pname = bswap_32(pname);
-    }
-
-    compsize = __glPointParameterfvEXT_size(pname);
-    return __GLX_PAD((compsize * 4));
-}
-
-int
-__glXProgramParameters4dvNVReqSize(const GLbyte *pc, Bool swap)
-{
-    GLuint num = *(GLuint *) (pc + 8);
-
-    if (swap) {
-        num = bswap_32(num);
-    }
-
-    return __GLX_PAD((num * 32));
-}
-
-int
-__glXProgramParameters4fvNVReqSize(const GLbyte *pc, Bool swap)
-{
-    GLuint num = *(GLuint *) (pc + 8);
-
-    if (swap) {
-        num = bswap_32(num);
-    }
-
-    return __GLX_PAD((num * 16));
-}
-
-int
-__glXVertexAttribs1dvNVReqSize(const GLbyte *pc, Bool swap)
-{
-    GLsizei n = *(GLsizei *) (pc + 4);
-
-    if (swap) {
-        n = bswap_32(n);
-    }
-
-    return __GLX_PAD((n * 8));
-}
-
-int
-__glXVertexAttribs2dvNVReqSize(const GLbyte *pc, Bool swap)
-{
-    GLsizei n = *(GLsizei *) (pc + 4);
-
-    if (swap) {
-        n = bswap_32(n);
-    }
-
-    return __GLX_PAD((n * 16));
-}
-
-int
-__glXVertexAttribs3dvNVReqSize(const GLbyte *pc, Bool swap)
-{
-    GLsizei n = *(GLsizei *) (pc + 4);
-
-    if (swap) {
-        n = bswap_32(n);
-    }
-
-    return __GLX_PAD((n * 24));
-}
-
-int
-__glXVertexAttribs3fvNVReqSize(const GLbyte *pc, Bool swap)
-{
-    GLsizei n = *(GLsizei *) (pc + 4);
-
-    if (swap) {
-        n = bswap_32(n);
-    }
-
-    return __GLX_PAD((n * 12));
-}
-
-int
-__glXVertexAttribs3svNVReqSize(const GLbyte *pc, Bool swap)
-{
-    GLsizei n = *(GLsizei *) (pc + 4);
-
-    if (swap) {
-        n = bswap_32(n);
-    }
-
-    return __GLX_PAD((n * 6));
-}
-
-int
-__glXVertexAttribs4dvNVReqSize(const GLbyte *pc, Bool swap)
-{
-    GLsizei n = *(GLsizei *) (pc + 4);
-
-    if (swap) {
-        n = bswap_32(n);
-    }
-
-    return __GLX_PAD((n * 32));
-}
-
-int
-__glXProgramNamedParameter4fvNVReqSize(const GLbyte *pc, Bool swap)
-{
-    GLsizei len = *(GLsizei *) (pc + 4);
-
-    if (swap) {
-        len = bswap_32(len);
-    }
-
-    return __GLX_PAD(len);
-}
-
-ALIAS(Fogiv, Fogfv)
-    ALIAS(Lightiv, Lightfv)
-    ALIAS(LightModeliv, LightModelfv)
-    ALIAS(Materialiv, Materialfv)
-    ALIAS(TexParameteriv, TexParameterfv)
-    ALIAS(TexEnviv, TexEnvfv)
-    ALIAS(TexGeniv, TexGenfv)
-    ALIAS(PixelMapuiv, PixelMapfv)
-    ALIAS(ColorTableParameteriv, ColorTableParameterfv)
-    ALIAS(ConvolutionParameteriv, ConvolutionParameterfv)
-    ALIAS(CompressedTexSubImage1DARB, CompressedTexImage1DARB)
-    ALIAS(CompressedTexSubImage2DARB, CompressedTexImage3DARB)
-    ALIAS(LoadProgramNV, ProgramStringARB)
-    ALIAS(RequestResidentProgramsNV, DrawBuffersARB)
-    ALIAS(VertexAttribs1fvNV, PixelMapfv)
-    ALIAS(VertexAttribs1svNV, PixelMapusv)
-    ALIAS(VertexAttribs2fvNV, VertexAttribs1dvNV)
-    ALIAS(VertexAttribs2svNV, PixelMapfv)
-    ALIAS(VertexAttribs4fvNV, VertexAttribs2dvNV)
-    ALIAS(VertexAttribs4svNV, VertexAttribs1dvNV)
-    ALIAS(VertexAttribs4ubvNV, PixelMapfv)
-    ALIAS(PointParameterivNV, PointParameterfvEXT)
-    ALIAS(ProgramNamedParameter4dvNV, CompressedTexSubImage3DARB)
-    ALIAS(DeleteFramebuffersEXT, DrawBuffersARB)
-    ALIAS(DeleteRenderbuffersEXT, DrawBuffersARB)
diff --git a/GL/glx/indirect_reqsize.h b/GL/glx/indirect_reqsize.h
deleted file mode 100644
index 26211ee5c..000000000
--- a/GL/glx/indirect_reqsize.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* DO NOT EDIT - This file generated automatically by glX_proto_size.py (from Mesa) script */
-
-/*
- * (C) Copyright IBM Corporation 2005
- * All Rights Reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sub license,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
- * IBM,
- * AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#if !defined( _INDIRECT_REQSIZE_H_ )
-#  define _INDIRECT_REQSIZE_H_
-
-#  if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__)
-#    define HIDDEN  __attribute__((visibility("hidden")))
-#  else
-#    define HIDDEN
-#  endif
-
-#  if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
-#    define PURE __attribute__((pure))
-#  else
-#    define PURE
-#  endif
-
-extern PURE HIDDEN int __glXCallListsReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXBitmapReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXFogfvReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXFogivReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXLightfvReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXLightivReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXLightModelfvReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXLightModelivReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXMaterialfvReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXMaterialivReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXPolygonStippleReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXTexParameterfvReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXTexParameterivReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXTexImage1DReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXTexImage2DReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXTexEnvfvReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXTexEnvivReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXTexGendvReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXTexGenfvReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXTexGenivReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXMap1dReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXMap1fReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXMap2dReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXMap2fReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXPixelMapfvReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXPixelMapuivReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXPixelMapusvReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXDrawPixelsReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXDrawArraysReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXPrioritizeTexturesReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXTexSubImage1DReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXTexSubImage2DReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXColorTableReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXColorTableParameterfvReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXColorTableParameterivReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXColorSubTableReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXConvolutionFilter1DReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXConvolutionFilter2DReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXConvolutionParameterfvReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXConvolutionParameterivReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXSeparableFilter2DReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXTexImage3DReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXTexSubImage3DReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXCompressedTexImage1DARBReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXCompressedTexImage2DARBReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXCompressedTexImage3DARBReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXCompressedTexSubImage1DARBReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXCompressedTexSubImage2DARBReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXCompressedTexSubImage3DARBReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXProgramStringARBReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXDrawBuffersARBReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXPointParameterfvEXTReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXLoadProgramNVReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXProgramParameters4dvNVReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXProgramParameters4fvNVReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXRequestResidentProgramsNVReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXVertexAttribs1dvNVReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXVertexAttribs1fvNVReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXVertexAttribs1svNVReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXVertexAttribs2dvNVReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXVertexAttribs2fvNVReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXVertexAttribs2svNVReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXVertexAttribs3dvNVReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXVertexAttribs3fvNVReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXVertexAttribs3svNVReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXVertexAttribs4dvNVReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXVertexAttribs4fvNVReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXVertexAttribs4svNVReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXVertexAttribs4ubvNVReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXPointParameterivNVReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXProgramNamedParameter4dvNVReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXProgramNamedParameter4fvNVReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXDeleteFramebuffersEXTReqSize(const GLbyte *pc, Bool swap);
-extern PURE HIDDEN int __glXDeleteRenderbuffersEXTReqSize(const GLbyte *pc, Bool swap);
-
-#  undef HIDDEN
-#  undef PURE
-
-#endif /* !defined( _INDIRECT_REQSIZE_H_ ) */
diff --git a/GL/glx/indirect_size_get.c b/GL/glx/indirect_size_get.c
deleted file mode 100644
index e7eaf97cb..000000000
--- a/GL/glx/indirect_size_get.c
+++ /dev/null
@@ -1,1206 +0,0 @@
-/* DO NOT EDIT - This file generated automatically by glX_proto_size.py (from Mesa) script */
-
-/*
- * (C) Copyright IBM Corporation 2004
- * All Rights Reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sub license,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
- * IBM,
- * AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-
-#include <GL/gl.h>
-#include "indirect_size_get.h"
-#include "glxserver.h"
-#include "indirect_util.h"
-#include "indirect_size.h"
-
-#  if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
-#    define PURE __attribute__((pure))
-#  else
-#    define PURE
-#  endif
-
-#  if defined(__i386__) && defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__)
-#    define FASTCALL __attribute__((fastcall))
-#  else
-#    define FASTCALL
-#  endif
-
-#  if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__)
-#    define INTERNAL  __attribute__((visibility("internal")))
-#  else
-#    define INTERNAL
-#  endif
-
-
-#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__APPLE__)
-#  undef HAVE_ALIAS
-#endif
-#ifdef HAVE_ALIAS
-#  define ALIAS2(from,to) \
-    INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \
-        __attribute__ ((alias( # to )));
-#  define ALIAS(from,to) ALIAS2( from, __gl ## to ## _size )
-#else
-#  define ALIAS(from,to) \
-    INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \
-    { return __gl ## to ## _size( e ); }
-#endif
-
-
-INTERNAL PURE FASTCALL GLint
-__glCallLists_size(GLenum e)
-{
-    switch (e) {
-    case GL_BYTE:
-    case GL_UNSIGNED_BYTE:
-        return 1;
-    case GL_SHORT:
-    case GL_UNSIGNED_SHORT:
-    case GL_2_BYTES:
-        return 2;
-    case GL_3_BYTES:
-        return 3;
-    case GL_INT:
-    case GL_UNSIGNED_INT:
-    case GL_FLOAT:
-    case GL_4_BYTES:
-        return 4;
-    default:
-        return 0;
-    }
-}
-
-INTERNAL PURE FASTCALL GLint
-__glFogfv_size(GLenum e)
-{
-    switch (e) {
-    case GL_FOG_INDEX:
-    case GL_FOG_DENSITY:
-    case GL_FOG_START:
-    case GL_FOG_END:
-    case GL_FOG_MODE:
-    case GL_FOG_OFFSET_VALUE_SGIX:
-    case GL_FOG_DISTANCE_MODE_NV:
-        return 1;
-    case GL_FOG_COLOR:
-        return 4;
-    default:
-        return 0;
-    }
-}
-
-INTERNAL PURE FASTCALL GLint
-__glLightfv_size(GLenum e)
-{
-    switch (e) {
-    case GL_SPOT_EXPONENT:
-    case GL_SPOT_CUTOFF:
-    case GL_CONSTANT_ATTENUATION:
-    case GL_LINEAR_ATTENUATION:
-    case GL_QUADRATIC_ATTENUATION:
-        return 1;
-    case GL_SPOT_DIRECTION:
-        return 3;
-    case GL_AMBIENT:
-    case GL_DIFFUSE:
-    case GL_SPECULAR:
-    case GL_POSITION:
-        return 4;
-    default:
-        return 0;
-    }
-}
-
-INTERNAL PURE FASTCALL GLint
-__glLightModelfv_size(GLenum e)
-{
-    switch (e) {
-    case GL_LIGHT_MODEL_LOCAL_VIEWER:
-    case GL_LIGHT_MODEL_TWO_SIDE:
-    case GL_LIGHT_MODEL_COLOR_CONTROL:
-/*      case GL_LIGHT_MODEL_COLOR_CONTROL_EXT:*/
-        return 1;
-    case GL_LIGHT_MODEL_AMBIENT:
-        return 4;
-    default:
-        return 0;
-    }
-}
-
-INTERNAL PURE FASTCALL GLint
-__glMaterialfv_size(GLenum e)
-{
-    switch (e) {
-    case GL_SHININESS:
-        return 1;
-    case GL_COLOR_INDEXES:
-        return 3;
-    case GL_AMBIENT:
-    case GL_DIFFUSE:
-    case GL_SPECULAR:
-    case GL_EMISSION:
-    case GL_AMBIENT_AND_DIFFUSE:
-        return 4;
-    default:
-        return 0;
-    }
-}
-
-INTERNAL PURE FASTCALL GLint
-__glTexParameterfv_size(GLenum e)
-{
-    switch (e) {
-    case GL_TEXTURE_MAG_FILTER:
-    case GL_TEXTURE_MIN_FILTER:
-    case GL_TEXTURE_WRAP_S:
-    case GL_TEXTURE_WRAP_T:
-    case GL_TEXTURE_PRIORITY:
-    case GL_TEXTURE_WRAP_R:
-    case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:
-/*      case GL_SHADOW_AMBIENT_SGIX:*/
-    case GL_TEXTURE_MIN_LOD:
-    case GL_TEXTURE_MAX_LOD:
-    case GL_TEXTURE_BASE_LEVEL:
-    case GL_TEXTURE_MAX_LEVEL:
-    case GL_TEXTURE_CLIPMAP_FRAME_SGIX:
-    case GL_TEXTURE_LOD_BIAS_S_SGIX:
-    case GL_TEXTURE_LOD_BIAS_T_SGIX:
-    case GL_TEXTURE_LOD_BIAS_R_SGIX:
-    case GL_GENERATE_MIPMAP:
-/*      case GL_GENERATE_MIPMAP_SGIS:*/
-    case GL_TEXTURE_COMPARE_SGIX:
-    case GL_TEXTURE_COMPARE_OPERATOR_SGIX:
-    case GL_TEXTURE_MAX_CLAMP_S_SGIX:
-    case GL_TEXTURE_MAX_CLAMP_T_SGIX:
-    case GL_TEXTURE_MAX_CLAMP_R_SGIX:
-    case GL_TEXTURE_MAX_ANISOTROPY_EXT:
-    case GL_TEXTURE_LOD_BIAS:
-/*      case GL_TEXTURE_LOD_BIAS_EXT:*/
-    case GL_DEPTH_TEXTURE_MODE:
-/*      case GL_DEPTH_TEXTURE_MODE_ARB:*/
-    case GL_TEXTURE_COMPARE_MODE:
-/*      case GL_TEXTURE_COMPARE_MODE_ARB:*/
-    case GL_TEXTURE_COMPARE_FUNC:
-/*      case GL_TEXTURE_COMPARE_FUNC_ARB:*/
-    case GL_TEXTURE_UNSIGNED_REMAP_MODE_NV:
-        return 1;
-    case GL_TEXTURE_CLIPMAP_CENTER_SGIX:
-    case GL_TEXTURE_CLIPMAP_OFFSET_SGIX:
-        return 2;
-    case GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX:
-        return 3;
-    case GL_TEXTURE_BORDER_COLOR:
-    case GL_POST_TEXTURE_FILTER_BIAS_SGIX:
-    case GL_POST_TEXTURE_FILTER_SCALE_SGIX:
-        return 4;
-    default:
-        return 0;
-    }
-}
-
-INTERNAL PURE FASTCALL GLint
-__glTexEnvfv_size(GLenum e)
-{
-    switch (e) {
-    case GL_ALPHA_SCALE:
-    case GL_TEXTURE_ENV_MODE:
-    case GL_TEXTURE_LOD_BIAS:
-    case GL_COMBINE_RGB:
-    case GL_COMBINE_ALPHA:
-    case GL_RGB_SCALE:
-    case GL_SOURCE0_RGB:
-    case GL_SOURCE1_RGB:
-    case GL_SOURCE2_RGB:
-    case GL_SOURCE3_RGB_NV:
-    case GL_SOURCE0_ALPHA:
-    case GL_SOURCE1_ALPHA:
-    case GL_SOURCE2_ALPHA:
-    case GL_SOURCE3_ALPHA_NV:
-    case GL_OPERAND0_RGB:
-    case GL_OPERAND1_RGB:
-    case GL_OPERAND2_RGB:
-    case GL_OPERAND3_RGB_NV:
-    case GL_OPERAND0_ALPHA:
-    case GL_OPERAND1_ALPHA:
-    case GL_OPERAND2_ALPHA:
-    case GL_OPERAND3_ALPHA_NV:
-    case GL_COORD_REPLACE_ARB:
-/*      case GL_COORD_REPLACE_NV:*/
-        return 1;
-    case GL_TEXTURE_ENV_COLOR:
-        return 4;
-    default:
-        return 0;
-    }
-}
-
-INTERNAL PURE FASTCALL GLint
-__glTexGendv_size(GLenum e)
-{
-    switch (e) {
-    case GL_TEXTURE_GEN_MODE:
-        return 1;
-    case GL_OBJECT_PLANE:
-    case GL_EYE_PLANE:
-        return 4;
-    default:
-        return 0;
-    }
-}
-
-INTERNAL PURE FASTCALL GLint
-__glMap1d_size(GLenum e)
-{
-    switch (e) {
-    case GL_MAP1_INDEX:
-    case GL_MAP1_TEXTURE_COORD_1:
-        return 1;
-    case GL_MAP1_TEXTURE_COORD_2:
-        return 2;
-    case GL_MAP1_NORMAL:
-    case GL_MAP1_TEXTURE_COORD_3:
-    case GL_MAP1_VERTEX_3:
-        return 3;
-    case GL_MAP1_COLOR_4:
-    case GL_MAP1_TEXTURE_COORD_4:
-    case GL_MAP1_VERTEX_4:
-        return 4;
-    default:
-        return 0;
-    }
-}
-
-INTERNAL PURE FASTCALL GLint
-__glMap2d_size(GLenum e)
-{
-    switch (e) {
-    case GL_MAP2_INDEX:
-    case GL_MAP2_TEXTURE_COORD_1:
-        return 1;
-    case GL_MAP2_TEXTURE_COORD_2:
-        return 2;
-    case GL_MAP2_NORMAL:
-    case GL_MAP2_TEXTURE_COORD_3:
-    case GL_MAP2_VERTEX_3:
-        return 3;
-    case GL_MAP2_COLOR_4:
-    case GL_MAP2_TEXTURE_COORD_4:
-    case GL_MAP2_VERTEX_4:
-        return 4;
-    default:
-        return 0;
-    }
-}
-
-INTERNAL PURE FASTCALL GLint
-__glGetBooleanv_size(GLenum e)
-{
-    switch (e) {
-    case GL_CURRENT_INDEX:
-    case GL_CURRENT_RASTER_INDEX:
-    case GL_CURRENT_RASTER_POSITION_VALID:
-    case GL_CURRENT_RASTER_DISTANCE:
-    case GL_POINT_SMOOTH:
-    case GL_POINT_SIZE:
-    case GL_SMOOTH_POINT_SIZE_GRANULARITY:
-    case GL_LINE_SMOOTH:
-    case GL_LINE_WIDTH:
-    case GL_LINE_WIDTH_GRANULARITY:
-    case GL_LINE_STIPPLE:
-    case GL_LINE_STIPPLE_PATTERN:
-    case GL_LINE_STIPPLE_REPEAT:
-    case GL_LIST_MODE:
-    case GL_MAX_LIST_NESTING:
-    case GL_LIST_BASE:
-    case GL_LIST_INDEX:
-    case GL_POLYGON_SMOOTH:
-    case GL_POLYGON_STIPPLE:
-    case GL_EDGE_FLAG:
-    case GL_CULL_FACE:
-    case GL_CULL_FACE_MODE:
-    case GL_FRONT_FACE:
-    case GL_LIGHTING:
-    case GL_LIGHT_MODEL_LOCAL_VIEWER:
-    case GL_LIGHT_MODEL_TWO_SIDE:
-    case GL_SHADE_MODEL:
-    case GL_COLOR_MATERIAL_FACE:
-    case GL_COLOR_MATERIAL_PARAMETER:
-    case GL_COLOR_MATERIAL:
-    case GL_FOG:
-    case GL_FOG_INDEX:
-    case GL_FOG_DENSITY:
-    case GL_FOG_START:
-    case GL_FOG_END:
-    case GL_FOG_MODE:
-    case GL_DEPTH_TEST:
-    case GL_DEPTH_WRITEMASK:
-    case GL_DEPTH_CLEAR_VALUE:
-    case GL_DEPTH_FUNC:
-    case GL_STENCIL_TEST:
-    case GL_STENCIL_CLEAR_VALUE:
-    case GL_STENCIL_FUNC:
-    case GL_STENCIL_VALUE_MASK:
-    case GL_STENCIL_FAIL:
-    case GL_STENCIL_PASS_DEPTH_FAIL:
-    case GL_STENCIL_PASS_DEPTH_PASS:
-    case GL_STENCIL_REF:
-    case GL_STENCIL_WRITEMASK:
-    case GL_MATRIX_MODE:
-    case GL_NORMALIZE:
-    case GL_MODELVIEW_STACK_DEPTH:
-    case GL_PROJECTION_STACK_DEPTH:
-    case GL_TEXTURE_STACK_DEPTH:
-    case GL_ATTRIB_STACK_DEPTH:
-    case GL_CLIENT_ATTRIB_STACK_DEPTH:
-    case GL_ALPHA_TEST:
-    case GL_ALPHA_TEST_FUNC:
-    case GL_ALPHA_TEST_REF:
-    case GL_DITHER:
-    case GL_BLEND_DST:
-    case GL_BLEND_SRC:
-    case GL_BLEND:
-    case GL_LOGIC_OP_MODE:
-    case GL_LOGIC_OP:
-    case GL_AUX_BUFFERS:
-    case GL_DRAW_BUFFER:
-    case GL_READ_BUFFER:
-    case GL_SCISSOR_TEST:
-    case GL_INDEX_CLEAR_VALUE:
-    case GL_INDEX_WRITEMASK:
-    case GL_INDEX_MODE:
-    case GL_RGBA_MODE:
-    case GL_DOUBLEBUFFER:
-    case GL_STEREO:
-    case GL_RENDER_MODE:
-    case GL_PERSPECTIVE_CORRECTION_HINT:
-    case GL_POINT_SMOOTH_HINT:
-    case GL_LINE_SMOOTH_HINT:
-    case GL_POLYGON_SMOOTH_HINT:
-    case GL_FOG_HINT:
-    case GL_TEXTURE_GEN_S:
-    case GL_TEXTURE_GEN_T:
-    case GL_TEXTURE_GEN_R:
-    case GL_TEXTURE_GEN_Q:
-    case GL_PIXEL_MAP_I_TO_I:
-    case GL_PIXEL_MAP_I_TO_I_SIZE:
-    case GL_PIXEL_MAP_S_TO_S_SIZE:
-    case GL_PIXEL_MAP_I_TO_R_SIZE:
-    case GL_PIXEL_MAP_I_TO_G_SIZE:
-    case GL_PIXEL_MAP_I_TO_B_SIZE:
-    case GL_PIXEL_MAP_I_TO_A_SIZE:
-    case GL_PIXEL_MAP_R_TO_R_SIZE:
-    case GL_PIXEL_MAP_G_TO_G_SIZE:
-    case GL_PIXEL_MAP_B_TO_B_SIZE:
-    case GL_PIXEL_MAP_A_TO_A_SIZE:
-    case GL_UNPACK_SWAP_BYTES:
-    case GL_UNPACK_LSB_FIRST:
-    case GL_UNPACK_ROW_LENGTH:
-    case GL_UNPACK_SKIP_ROWS:
-    case GL_UNPACK_SKIP_PIXELS:
-    case GL_UNPACK_ALIGNMENT:
-    case GL_PACK_SWAP_BYTES:
-    case GL_PACK_LSB_FIRST:
-    case GL_PACK_ROW_LENGTH:
-    case GL_PACK_SKIP_ROWS:
-    case GL_PACK_SKIP_PIXELS:
-    case GL_PACK_ALIGNMENT:
-    case GL_MAP_COLOR:
-    case GL_MAP_STENCIL:
-    case GL_INDEX_SHIFT:
-    case GL_INDEX_OFFSET:
-    case GL_RED_SCALE:
-    case GL_RED_BIAS:
-    case GL_ZOOM_X:
-    case GL_ZOOM_Y:
-    case GL_GREEN_SCALE:
-    case GL_GREEN_BIAS:
-    case GL_BLUE_SCALE:
-    case GL_BLUE_BIAS:
-    case GL_ALPHA_SCALE:
-    case GL_ALPHA_BIAS:
-    case GL_DEPTH_SCALE:
-    case GL_DEPTH_BIAS:
-    case GL_MAX_EVAL_ORDER:
-    case GL_MAX_LIGHTS:
-    case GL_MAX_CLIP_PLANES:
-    case GL_MAX_TEXTURE_SIZE:
-    case GL_MAX_PIXEL_MAP_TABLE:
-    case GL_MAX_ATTRIB_STACK_DEPTH:
-    case GL_MAX_MODELVIEW_STACK_DEPTH:
-    case GL_MAX_NAME_STACK_DEPTH:
-    case GL_MAX_PROJECTION_STACK_DEPTH:
-    case GL_MAX_TEXTURE_STACK_DEPTH:
-    case GL_MAX_CLIENT_ATTRIB_STACK_DEPTH:
-    case GL_SUBPIXEL_BITS:
-    case GL_INDEX_BITS:
-    case GL_RED_BITS:
-    case GL_GREEN_BITS:
-    case GL_BLUE_BITS:
-    case GL_ALPHA_BITS:
-    case GL_DEPTH_BITS:
-    case GL_STENCIL_BITS:
-    case GL_ACCUM_RED_BITS:
-    case GL_ACCUM_GREEN_BITS:
-    case GL_ACCUM_BLUE_BITS:
-    case GL_ACCUM_ALPHA_BITS:
-    case GL_NAME_STACK_DEPTH:
-    case GL_AUTO_NORMAL:
-    case GL_MAP1_COLOR_4:
-    case GL_MAP1_INDEX:
-    case GL_MAP1_NORMAL:
-    case GL_MAP1_TEXTURE_COORD_1:
-    case GL_MAP1_TEXTURE_COORD_2:
-    case GL_MAP1_TEXTURE_COORD_3:
-    case GL_MAP1_TEXTURE_COORD_4:
-    case GL_MAP1_VERTEX_3:
-    case GL_MAP1_VERTEX_4:
-    case GL_MAP2_COLOR_4:
-    case GL_MAP2_INDEX:
-    case GL_MAP2_NORMAL:
-    case GL_MAP2_TEXTURE_COORD_1:
-    case GL_MAP2_TEXTURE_COORD_2:
-    case GL_MAP2_TEXTURE_COORD_3:
-    case GL_MAP2_TEXTURE_COORD_4:
-    case GL_MAP2_VERTEX_3:
-    case GL_MAP2_VERTEX_4:
-    case GL_MAP1_GRID_SEGMENTS:
-    case GL_TEXTURE_1D:
-    case GL_TEXTURE_2D:
-    case GL_POLYGON_OFFSET_UNITS:
-    case GL_CLIP_PLANE0:
-    case GL_CLIP_PLANE1:
-    case GL_CLIP_PLANE2:
-    case GL_CLIP_PLANE3:
-    case GL_CLIP_PLANE4:
-    case GL_CLIP_PLANE5:
-    case GL_LIGHT0:
-    case GL_LIGHT1:
-    case GL_LIGHT2:
-    case GL_LIGHT3:
-    case GL_LIGHT4:
-    case GL_LIGHT5:
-    case GL_LIGHT6:
-    case GL_LIGHT7:
-    case GL_BLEND_EQUATION:
-/*      case GL_BLEND_EQUATION_EXT:*/
-    case GL_CONVOLUTION_1D:
-    case GL_CONVOLUTION_2D:
-    case GL_SEPARABLE_2D:
-    case GL_MAX_CONVOLUTION_WIDTH:
-/*      case GL_MAX_CONVOLUTION_WIDTH_EXT:*/
-    case GL_MAX_CONVOLUTION_HEIGHT:
-/*      case GL_MAX_CONVOLUTION_HEIGHT_EXT:*/
-    case GL_POST_CONVOLUTION_RED_SCALE:
-/*      case GL_POST_CONVOLUTION_RED_SCALE_EXT:*/
-    case GL_POST_CONVOLUTION_GREEN_SCALE:
-/*      case GL_POST_CONVOLUTION_GREEN_SCALE_EXT:*/
-    case GL_POST_CONVOLUTION_BLUE_SCALE:
-/*      case GL_POST_CONVOLUTION_BLUE_SCALE_EXT:*/
-    case GL_POST_CONVOLUTION_ALPHA_SCALE:
-/*      case GL_POST_CONVOLUTION_ALPHA_SCALE_EXT:*/
-    case GL_POST_CONVOLUTION_RED_BIAS:
-/*      case GL_POST_CONVOLUTION_RED_BIAS_EXT:*/
-    case GL_POST_CONVOLUTION_GREEN_BIAS:
-/*      case GL_POST_CONVOLUTION_GREEN_BIAS_EXT:*/
-    case GL_POST_CONVOLUTION_BLUE_BIAS:
-/*      case GL_POST_CONVOLUTION_BLUE_BIAS_EXT:*/
-    case GL_POST_CONVOLUTION_ALPHA_BIAS:
-/*      case GL_POST_CONVOLUTION_ALPHA_BIAS_EXT:*/
-    case GL_HISTOGRAM:
-    case GL_MINMAX:
-    case GL_POLYGON_OFFSET_FACTOR:
-    case GL_RESCALE_NORMAL:
-/*      case GL_RESCALE_NORMAL_EXT:*/
-    case GL_TEXTURE_BINDING_1D:
-    case GL_TEXTURE_BINDING_2D:
-    case GL_TEXTURE_BINDING_3D:
-    case GL_PACK_SKIP_IMAGES:
-    case GL_PACK_IMAGE_HEIGHT:
-    case GL_UNPACK_SKIP_IMAGES:
-    case GL_UNPACK_IMAGE_HEIGHT:
-    case GL_TEXTURE_3D:
-    case GL_MAX_3D_TEXTURE_SIZE:
-    case GL_VERTEX_ARRAY:
-    case GL_NORMAL_ARRAY:
-    case GL_COLOR_ARRAY:
-    case GL_INDEX_ARRAY:
-    case GL_TEXTURE_COORD_ARRAY:
-    case GL_EDGE_FLAG_ARRAY:
-    case GL_VERTEX_ARRAY_SIZE:
-    case GL_VERTEX_ARRAY_TYPE:
-    case GL_VERTEX_ARRAY_STRIDE:
-    case GL_NORMAL_ARRAY_TYPE:
-    case GL_NORMAL_ARRAY_STRIDE:
-    case GL_COLOR_ARRAY_SIZE:
-    case GL_COLOR_ARRAY_TYPE:
-    case GL_COLOR_ARRAY_STRIDE:
-    case GL_INDEX_ARRAY_TYPE:
-    case GL_INDEX_ARRAY_STRIDE:
-    case GL_TEXTURE_COORD_ARRAY_SIZE:
-    case GL_TEXTURE_COORD_ARRAY_TYPE:
-    case GL_TEXTURE_COORD_ARRAY_STRIDE:
-    case GL_EDGE_FLAG_ARRAY_STRIDE:
-    case GL_MULTISAMPLE:
-/*      case GL_MULTISAMPLE_ARB:*/
-    case GL_SAMPLE_ALPHA_TO_COVERAGE:
-/*      case GL_SAMPLE_ALPHA_TO_COVERAGE_ARB:*/
-    case GL_SAMPLE_ALPHA_TO_ONE:
-/*      case GL_SAMPLE_ALPHA_TO_ONE_ARB:*/
-    case GL_SAMPLE_COVERAGE:
-/*      case GL_SAMPLE_COVERAGE_ARB:*/
-    case GL_SAMPLE_BUFFERS:
-/*      case GL_SAMPLE_BUFFERS_ARB:*/
-    case GL_SAMPLES:
-/*      case GL_SAMPLES_ARB:*/
-    case GL_SAMPLE_COVERAGE_VALUE:
-/*      case GL_SAMPLE_COVERAGE_VALUE_ARB:*/
-    case GL_SAMPLE_COVERAGE_INVERT:
-/*      case GL_SAMPLE_COVERAGE_INVERT_ARB:*/
-    case GL_COLOR_MATRIX_STACK_DEPTH:
-    case GL_MAX_COLOR_MATRIX_STACK_DEPTH:
-    case GL_POST_COLOR_MATRIX_RED_SCALE:
-    case GL_POST_COLOR_MATRIX_GREEN_SCALE:
-    case GL_POST_COLOR_MATRIX_BLUE_SCALE:
-    case GL_POST_COLOR_MATRIX_ALPHA_SCALE:
-    case GL_POST_COLOR_MATRIX_RED_BIAS:
-    case GL_POST_COLOR_MATRIX_GREEN_BIAS:
-    case GL_POST_COLOR_MATRIX_BLUE_BIAS:
-    case GL_POST_COLOR_MATRIX_ALPHA_BIAS:
-    case GL_BLEND_DST_RGB:
-    case GL_BLEND_SRC_RGB:
-    case GL_BLEND_DST_ALPHA:
-    case GL_BLEND_SRC_ALPHA:
-    case GL_COLOR_TABLE:
-    case GL_POST_CONVOLUTION_COLOR_TABLE:
-    case GL_POST_COLOR_MATRIX_COLOR_TABLE:
-    case GL_MAX_ELEMENTS_VERTICES:
-    case GL_MAX_ELEMENTS_INDICES:
-    case GL_CLIP_VOLUME_CLIPPING_HINT_EXT:
-    case GL_OCCLUSION_TEST_HP:
-    case GL_OCCLUSION_TEST_RESULT_HP:
-    case GL_LIGHT_MODEL_COLOR_CONTROL:
-    case GL_CURRENT_FOG_COORD:
-    case GL_FOG_COORDINATE_ARRAY_TYPE:
-    case GL_FOG_COORDINATE_ARRAY_STRIDE:
-    case GL_FOG_COORD_ARRAY:
-    case GL_COLOR_SUM_ARB:
-    case GL_SECONDARY_COLOR_ARRAY_SIZE:
-    case GL_SECONDARY_COLOR_ARRAY_TYPE:
-    case GL_SECONDARY_COLOR_ARRAY_STRIDE:
-    case GL_SECONDARY_COLOR_ARRAY:
-    case GL_ACTIVE_TEXTURE:
-/*      case GL_ACTIVE_TEXTURE_ARB:*/
-    case GL_CLIENT_ACTIVE_TEXTURE:
-/*      case GL_CLIENT_ACTIVE_TEXTURE_ARB:*/
-    case GL_MAX_TEXTURE_UNITS:
-/*      case GL_MAX_TEXTURE_UNITS_ARB:*/
-    case GL_MAX_RENDERBUFFER_SIZE_EXT:
-    case GL_TEXTURE_COMPRESSION_HINT:
-/*      case GL_TEXTURE_COMPRESSION_HINT_ARB:*/
-    case GL_TEXTURE_RECTANGLE_ARB:
-/*      case GL_TEXTURE_RECTANGLE_NV:*/
-    case GL_TEXTURE_BINDING_RECTANGLE_ARB:
-/*      case GL_TEXTURE_BINDING_RECTANGLE_NV:*/
-    case GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB:
-/*      case GL_MAX_RECTANGLE_TEXTURE_SIZE_NV:*/
-    case GL_MAX_TEXTURE_LOD_BIAS:
-    case GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT:
-    case GL_MAX_SHININESS_NV:
-    case GL_MAX_SPOT_EXPONENT_NV:
-    case GL_TEXTURE_CUBE_MAP:
-/*      case GL_TEXTURE_CUBE_MAP_ARB:*/
-    case GL_TEXTURE_BINDING_CUBE_MAP:
-/*      case GL_TEXTURE_BINDING_CUBE_MAP_ARB:*/
-    case GL_MAX_CUBE_MAP_TEXTURE_SIZE:
-/*      case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB:*/
-    case GL_MULTISAMPLE_FILTER_HINT_NV:
-    case GL_FOG_DISTANCE_MODE_NV:
-    case GL_VERTEX_PROGRAM_ARB:
-    case GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB:
-    case GL_MAX_PROGRAM_MATRICES_ARB:
-    case GL_CURRENT_MATRIX_STACK_DEPTH_ARB:
-    case GL_VERTEX_PROGRAM_POINT_SIZE_ARB:
-    case GL_VERTEX_PROGRAM_TWO_SIDE_ARB:
-    case GL_PROGRAM_ERROR_POSITION_ARB:
-    case GL_DEPTH_CLAMP_NV:
-    case GL_NUM_COMPRESSED_TEXTURE_FORMATS:
-/*      case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB:*/
-    case GL_MAX_VERTEX_UNITS_ARB:
-    case GL_ACTIVE_VERTEX_UNITS_ARB:
-    case GL_WEIGHT_SUM_UNITY_ARB:
-    case GL_VERTEX_BLEND_ARB:
-    case GL_CURRENT_WEIGHT_ARB:
-    case GL_WEIGHT_ARRAY_TYPE_ARB:
-    case GL_WEIGHT_ARRAY_STRIDE_ARB:
-    case GL_WEIGHT_ARRAY_SIZE_ARB:
-    case GL_WEIGHT_ARRAY_ARB:
-    case GL_PACK_INVERT_MESA:
-    case GL_STENCIL_BACK_FUNC_ATI:
-    case GL_STENCIL_BACK_FAIL_ATI:
-    case GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI:
-    case GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI:
-    case GL_FRAGMENT_PROGRAM_ARB:
-    case GL_MAX_DRAW_BUFFERS_ARB:
-/*      case GL_MAX_DRAW_BUFFERS_ATI:*/
-    case GL_DRAW_BUFFER0_ARB:
-/*      case GL_DRAW_BUFFER0_ATI:*/
-    case GL_DRAW_BUFFER1_ARB:
-/*      case GL_DRAW_BUFFER1_ATI:*/
-    case GL_DRAW_BUFFER2_ARB:
-/*      case GL_DRAW_BUFFER2_ATI:*/
-    case GL_DRAW_BUFFER3_ARB:
-/*      case GL_DRAW_BUFFER3_ATI:*/
-    case GL_DRAW_BUFFER4_ARB:
-/*      case GL_DRAW_BUFFER4_ATI:*/
-    case GL_DRAW_BUFFER5_ARB:
-/*      case GL_DRAW_BUFFER5_ATI:*/
-    case GL_DRAW_BUFFER6_ARB:
-/*      case GL_DRAW_BUFFER6_ATI:*/
-    case GL_DRAW_BUFFER7_ARB:
-/*      case GL_DRAW_BUFFER7_ATI:*/
-    case GL_DRAW_BUFFER8_ARB:
-/*      case GL_DRAW_BUFFER8_ATI:*/
-    case GL_DRAW_BUFFER9_ARB:
-/*      case GL_DRAW_BUFFER9_ATI:*/
-    case GL_DRAW_BUFFER10_ARB:
-/*      case GL_DRAW_BUFFER10_ATI:*/
-    case GL_DRAW_BUFFER11_ARB:
-/*      case GL_DRAW_BUFFER11_ATI:*/
-    case GL_DRAW_BUFFER12_ARB:
-/*      case GL_DRAW_BUFFER12_ATI:*/
-    case GL_DRAW_BUFFER13_ARB:
-/*      case GL_DRAW_BUFFER13_ATI:*/
-    case GL_DRAW_BUFFER14_ARB:
-/*      case GL_DRAW_BUFFER14_ATI:*/
-    case GL_DRAW_BUFFER15_ARB:
-/*      case GL_DRAW_BUFFER15_ATI:*/
-    case GL_BLEND_EQUATION_ALPHA_EXT:
-    case GL_MATRIX_PALETTE_ARB:
-    case GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB:
-    case GL_MAX_PALETTE_MATRICES_ARB:
-    case GL_CURRENT_PALETTE_MATRIX_ARB:
-    case GL_MATRIX_INDEX_ARRAY_ARB:
-    case GL_CURRENT_MATRIX_INDEX_ARB:
-    case GL_MATRIX_INDEX_ARRAY_SIZE_ARB:
-    case GL_MATRIX_INDEX_ARRAY_TYPE_ARB:
-    case GL_MATRIX_INDEX_ARRAY_STRIDE_ARB:
-    case GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT:
-    case GL_POINT_SPRITE_ARB:
-/*      case GL_POINT_SPRITE_NV:*/
-    case GL_POINT_SPRITE_R_MODE_NV:
-    case GL_MAX_VERTEX_ATTRIBS_ARB:
-    case GL_MAX_TEXTURE_COORDS_ARB:
-    case GL_MAX_TEXTURE_IMAGE_UNITS_ARB:
-    case GL_DEPTH_BOUNDS_TEST_EXT:
-    case GL_MAX_ARRAY_TEXTURE_LAYERS_EXT:
-    case GL_STENCIL_TEST_TWO_SIDE_EXT:
-    case GL_ACTIVE_STENCIL_FACE_EXT:
-    case GL_TEXTURE_BINDING_1D_ARRAY_EXT:
-    case GL_TEXTURE_BINDING_2D_ARRAY_EXT:
-    case GL_DRAW_FRAMEBUFFER_BINDING_EXT:
-    case GL_RENDERBUFFER_BINDING_EXT:
-    case GL_READ_FRAMEBUFFER_BINDING_EXT:
-    case GL_MAX_COLOR_ATTACHMENTS_EXT:
-    case GL_RASTER_POSITION_UNCLIPPED_IBM:
-        return 1;
-    case GL_SMOOTH_POINT_SIZE_RANGE:
-    case GL_LINE_WIDTH_RANGE:
-    case GL_POLYGON_MODE:
-    case GL_DEPTH_RANGE:
-    case GL_MAX_VIEWPORT_DIMS:
-    case GL_MAP1_GRID_DOMAIN:
-    case GL_MAP2_GRID_SEGMENTS:
-    case GL_ALIASED_POINT_SIZE_RANGE:
-    case GL_ALIASED_LINE_WIDTH_RANGE:
-    case GL_DEPTH_BOUNDS_EXT:
-        return 2;
-    case GL_CURRENT_NORMAL:
-        return 3;
-    case GL_CURRENT_COLOR:
-    case GL_CURRENT_TEXTURE_COORDS:
-    case GL_CURRENT_RASTER_COLOR:
-    case GL_CURRENT_RASTER_TEXTURE_COORDS:
-    case GL_CURRENT_RASTER_POSITION:
-    case GL_LIGHT_MODEL_AMBIENT:
-    case GL_FOG_COLOR:
-    case GL_ACCUM_CLEAR_VALUE:
-    case GL_VIEWPORT:
-    case GL_SCISSOR_BOX:
-    case GL_COLOR_CLEAR_VALUE:
-    case GL_COLOR_WRITEMASK:
-    case GL_MAP2_GRID_DOMAIN:
-    case GL_BLEND_COLOR:
-/*      case GL_BLEND_COLOR_EXT:*/
-    case GL_CURRENT_SECONDARY_COLOR:
-        return 4;
-    case GL_MODELVIEW_MATRIX:
-    case GL_PROJECTION_MATRIX:
-    case GL_TEXTURE_MATRIX:
-    case GL_MODELVIEW0_ARB:
-    case GL_COLOR_MATRIX:
-    case GL_MODELVIEW1_ARB:
-    case GL_CURRENT_MATRIX_ARB:
-    case GL_MODELVIEW2_ARB:
-    case GL_MODELVIEW3_ARB:
-    case GL_MODELVIEW4_ARB:
-    case GL_MODELVIEW5_ARB:
-    case GL_MODELVIEW6_ARB:
-    case GL_MODELVIEW7_ARB:
-    case GL_MODELVIEW8_ARB:
-    case GL_MODELVIEW9_ARB:
-    case GL_MODELVIEW10_ARB:
-    case GL_MODELVIEW11_ARB:
-    case GL_MODELVIEW12_ARB:
-    case GL_MODELVIEW13_ARB:
-    case GL_MODELVIEW14_ARB:
-    case GL_MODELVIEW15_ARB:
-    case GL_MODELVIEW16_ARB:
-    case GL_MODELVIEW17_ARB:
-    case GL_MODELVIEW18_ARB:
-    case GL_MODELVIEW19_ARB:
-    case GL_MODELVIEW20_ARB:
-    case GL_MODELVIEW21_ARB:
-    case GL_MODELVIEW22_ARB:
-    case GL_MODELVIEW23_ARB:
-    case GL_MODELVIEW24_ARB:
-    case GL_MODELVIEW25_ARB:
-    case GL_MODELVIEW26_ARB:
-    case GL_MODELVIEW27_ARB:
-    case GL_MODELVIEW28_ARB:
-    case GL_MODELVIEW29_ARB:
-    case GL_MODELVIEW30_ARB:
-    case GL_MODELVIEW31_ARB:
-    case GL_TRANSPOSE_CURRENT_MATRIX_ARB:
-        return 16;
-    case GL_FOG_COORDINATE_SOURCE:
-    case GL_COMPRESSED_TEXTURE_FORMATS:
-        return __glGetBooleanv_variable_size(e);
-    default:
-        return 0;
-    }
-}
-
-INTERNAL PURE FASTCALL GLint
-__glGetTexParameterfv_size(GLenum e)
-{
-    switch (e) {
-    case GL_TEXTURE_MAG_FILTER:
-    case GL_TEXTURE_MIN_FILTER:
-    case GL_TEXTURE_WRAP_S:
-    case GL_TEXTURE_WRAP_T:
-    case GL_TEXTURE_PRIORITY:
-    case GL_TEXTURE_RESIDENT:
-    case GL_TEXTURE_WRAP_R:
-    case GL_TEXTURE_COMPARE_FAIL_VALUE_ARB:
-/*      case GL_SHADOW_AMBIENT_SGIX:*/
-    case GL_TEXTURE_MIN_LOD:
-    case GL_TEXTURE_MAX_LOD:
-    case GL_TEXTURE_BASE_LEVEL:
-    case GL_TEXTURE_MAX_LEVEL:
-    case GL_TEXTURE_CLIPMAP_FRAME_SGIX:
-    case GL_TEXTURE_LOD_BIAS_S_SGIX:
-    case GL_TEXTURE_LOD_BIAS_T_SGIX:
-    case GL_TEXTURE_LOD_BIAS_R_SGIX:
-    case GL_GENERATE_MIPMAP:
-/*      case GL_GENERATE_MIPMAP_SGIS:*/
-    case GL_TEXTURE_COMPARE_SGIX:
-    case GL_TEXTURE_COMPARE_OPERATOR_SGIX:
-    case GL_TEXTURE_MAX_CLAMP_S_SGIX:
-    case GL_TEXTURE_MAX_CLAMP_T_SGIX:
-    case GL_TEXTURE_MAX_CLAMP_R_SGIX:
-    case GL_TEXTURE_MAX_ANISOTROPY_EXT:
-    case GL_TEXTURE_LOD_BIAS:
-/*      case GL_TEXTURE_LOD_BIAS_EXT:*/
-    case GL_DEPTH_TEXTURE_MODE:
-/*      case GL_DEPTH_TEXTURE_MODE_ARB:*/
-    case GL_TEXTURE_COMPARE_MODE:
-/*      case GL_TEXTURE_COMPARE_MODE_ARB:*/
-    case GL_TEXTURE_COMPARE_FUNC:
-/*      case GL_TEXTURE_COMPARE_FUNC_ARB:*/
-    case GL_TEXTURE_UNSIGNED_REMAP_MODE_NV:
-        return 1;
-    case GL_TEXTURE_CLIPMAP_CENTER_SGIX:
-    case GL_TEXTURE_CLIPMAP_OFFSET_SGIX:
-        return 2;
-    case GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX:
-        return 3;
-    case GL_TEXTURE_BORDER_COLOR:
-    case GL_POST_TEXTURE_FILTER_BIAS_SGIX:
-    case GL_POST_TEXTURE_FILTER_SCALE_SGIX:
-        return 4;
-    default:
-        return 0;
-    }
-}
-
-INTERNAL PURE FASTCALL GLint
-__glGetTexLevelParameterfv_size(GLenum e)
-{
-    switch (e) {
-    case GL_TEXTURE_WIDTH:
-    case GL_TEXTURE_HEIGHT:
-    case GL_TEXTURE_COMPONENTS:
-    case GL_TEXTURE_BORDER:
-    case GL_TEXTURE_RED_SIZE:
-/*      case GL_TEXTURE_RED_SIZE_EXT:*/
-    case GL_TEXTURE_GREEN_SIZE:
-/*      case GL_TEXTURE_GREEN_SIZE_EXT:*/
-    case GL_TEXTURE_BLUE_SIZE:
-/*      case GL_TEXTURE_BLUE_SIZE_EXT:*/
-    case GL_TEXTURE_ALPHA_SIZE:
-/*      case GL_TEXTURE_ALPHA_SIZE_EXT:*/
-    case GL_TEXTURE_LUMINANCE_SIZE:
-/*      case GL_TEXTURE_LUMINANCE_SIZE_EXT:*/
-    case GL_TEXTURE_INTENSITY_SIZE:
-/*      case GL_TEXTURE_INTENSITY_SIZE_EXT:*/
-    case GL_TEXTURE_DEPTH:
-    case GL_TEXTURE_INDEX_SIZE_EXT:
-    case GL_TEXTURE_COMPRESSED_IMAGE_SIZE:
-/*      case GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB:*/
-    case GL_TEXTURE_COMPRESSED:
-/*      case GL_TEXTURE_COMPRESSED_ARB:*/
-    case GL_TEXTURE_DEPTH_SIZE:
-/*      case GL_TEXTURE_DEPTH_SIZE_ARB:*/
-        return 1;
-    default:
-        return 0;
-    }
-}
-
-INTERNAL PURE FASTCALL GLint
-__glColorTableParameterfv_size(GLenum e)
-{
-    switch (e) {
-    case GL_COLOR_TABLE_SCALE:
-    case GL_COLOR_TABLE_BIAS:
-        return 4;
-    default:
-        return 0;
-    }
-}
-
-INTERNAL PURE FASTCALL GLint
-__glGetColorTableParameterfv_size(GLenum e)
-{
-    switch (e) {
-    case GL_COLOR_TABLE_FORMAT:
-/*      case GL_COLOR_TABLE_FORMAT_EXT:*/
-    case GL_COLOR_TABLE_WIDTH:
-/*      case GL_COLOR_TABLE_WIDTH_EXT:*/
-    case GL_COLOR_TABLE_RED_SIZE:
-/*      case GL_COLOR_TABLE_RED_SIZE_EXT:*/
-    case GL_COLOR_TABLE_GREEN_SIZE:
-/*      case GL_COLOR_TABLE_GREEN_SIZE_EXT:*/
-    case GL_COLOR_TABLE_BLUE_SIZE:
-/*      case GL_COLOR_TABLE_BLUE_SIZE_EXT:*/
-    case GL_COLOR_TABLE_ALPHA_SIZE:
-/*      case GL_COLOR_TABLE_ALPHA_SIZE_EXT:*/
-    case GL_COLOR_TABLE_LUMINANCE_SIZE:
-/*      case GL_COLOR_TABLE_LUMINANCE_SIZE_EXT:*/
-    case GL_COLOR_TABLE_INTENSITY_SIZE:
-/*      case GL_COLOR_TABLE_INTENSITY_SIZE_EXT:*/
-        return 1;
-    case GL_COLOR_TABLE_SCALE:
-    case GL_COLOR_TABLE_BIAS:
-        return 4;
-    default:
-        return 0;
-    }
-}
-
-INTERNAL PURE FASTCALL GLint
-__glConvolutionParameterfv_size(GLenum e)
-{
-    switch (e) {
-    case GL_CONVOLUTION_BORDER_MODE:
-/*      case GL_CONVOLUTION_BORDER_MODE_EXT:*/
-        return 1;
-    case GL_CONVOLUTION_FILTER_SCALE:
-/*      case GL_CONVOLUTION_FILTER_SCALE_EXT:*/
-    case GL_CONVOLUTION_FILTER_BIAS:
-/*      case GL_CONVOLUTION_FILTER_BIAS_EXT:*/
-    case GL_CONVOLUTION_BORDER_COLOR:
-/*      case GL_CONVOLUTION_BORDER_COLOR_HP:*/
-        return 4;
-    default:
-        return 0;
-    }
-}
-
-INTERNAL PURE FASTCALL GLint
-__glGetConvolutionParameterfv_size(GLenum e)
-{
-    switch (e) {
-    case GL_CONVOLUTION_BORDER_MODE:
-/*      case GL_CONVOLUTION_BORDER_MODE_EXT:*/
-    case GL_CONVOLUTION_FORMAT:
-/*      case GL_CONVOLUTION_FORMAT_EXT:*/
-    case GL_CONVOLUTION_WIDTH:
-/*      case GL_CONVOLUTION_WIDTH_EXT:*/
-    case GL_CONVOLUTION_HEIGHT:
-/*      case GL_CONVOLUTION_HEIGHT_EXT:*/
-    case GL_MAX_CONVOLUTION_WIDTH:
-/*      case GL_MAX_CONVOLUTION_WIDTH_EXT:*/
-    case GL_MAX_CONVOLUTION_HEIGHT:
-/*      case GL_MAX_CONVOLUTION_HEIGHT_EXT:*/
-        return 1;
-    case GL_CONVOLUTION_FILTER_SCALE:
-/*      case GL_CONVOLUTION_FILTER_SCALE_EXT:*/
-    case GL_CONVOLUTION_FILTER_BIAS:
-/*      case GL_CONVOLUTION_FILTER_BIAS_EXT:*/
-    case GL_CONVOLUTION_BORDER_COLOR:
-/*      case GL_CONVOLUTION_BORDER_COLOR_HP:*/
-        return 4;
-    default:
-        return 0;
-    }
-}
-
-INTERNAL PURE FASTCALL GLint
-__glGetHistogramParameterfv_size(GLenum e)
-{
-    switch (e) {
-    case GL_HISTOGRAM_WIDTH:
-    case GL_HISTOGRAM_FORMAT:
-    case GL_HISTOGRAM_RED_SIZE:
-    case GL_HISTOGRAM_GREEN_SIZE:
-    case GL_HISTOGRAM_BLUE_SIZE:
-    case GL_HISTOGRAM_ALPHA_SIZE:
-    case GL_HISTOGRAM_LUMINANCE_SIZE:
-    case GL_HISTOGRAM_SINK:
-        return 1;
-    default:
-        return 0;
-    }
-}
-
-INTERNAL PURE FASTCALL GLint
-__glGetMinmaxParameterfv_size(GLenum e)
-{
-    switch (e) {
-    case GL_MINMAX_FORMAT:
-    case GL_MINMAX_SINK:
-        return 1;
-    default:
-        return 0;
-    }
-}
-
-INTERNAL PURE FASTCALL GLint
-__glGetProgramivARB_size(GLenum e)
-{
-    switch (e) {
-    case GL_PROGRAM_LENGTH_ARB:
-    case GL_PROGRAM_BINDING_ARB:
-    case GL_PROGRAM_ALU_INSTRUCTIONS_ARB:
-    case GL_PROGRAM_TEX_INSTRUCTIONS_ARB:
-    case GL_PROGRAM_TEX_INDIRECTIONS_ARB:
-    case GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB:
-    case GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB:
-    case GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB:
-    case GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB:
-    case GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB:
-    case GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB:
-    case GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB:
-    case GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB:
-    case GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB:
-    case GL_PROGRAM_FORMAT_ARB:
-    case GL_PROGRAM_INSTRUCTIONS_ARB:
-    case GL_MAX_PROGRAM_INSTRUCTIONS_ARB:
-    case GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB:
-    case GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB:
-    case GL_PROGRAM_TEMPORARIES_ARB:
-    case GL_MAX_PROGRAM_TEMPORARIES_ARB:
-    case GL_PROGRAM_NATIVE_TEMPORARIES_ARB:
-    case GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB:
-    case GL_PROGRAM_PARAMETERS_ARB:
-    case GL_MAX_PROGRAM_PARAMETERS_ARB:
-    case GL_PROGRAM_NATIVE_PARAMETERS_ARB:
-    case GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB:
-    case GL_PROGRAM_ATTRIBS_ARB:
-    case GL_MAX_PROGRAM_ATTRIBS_ARB:
-    case GL_PROGRAM_NATIVE_ATTRIBS_ARB:
-    case GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB:
-    case GL_PROGRAM_ADDRESS_REGISTERS_ARB:
-    case GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB:
-    case GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB:
-    case GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB:
-    case GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB:
-    case GL_MAX_PROGRAM_ENV_PARAMETERS_ARB:
-    case GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB:
-    case GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV:
-    case GL_MAX_PROGRAM_CALL_DEPTH_NV:
-    case GL_MAX_PROGRAM_IF_DEPTH_NV:
-    case GL_MAX_PROGRAM_LOOP_DEPTH_NV:
-    case GL_MAX_PROGRAM_LOOP_COUNT_NV:
-        return 1;
-    default:
-        return 0;
-    }
-}
-
-INTERNAL PURE FASTCALL GLint
-__glGetVertexAttribdvARB_size(GLenum e)
-{
-    switch (e) {
-    case GL_VERTEX_PROGRAM_ARB:
-    case GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB:
-    case GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB:
-    case GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB:
-    case GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB:
-    case GL_CURRENT_VERTEX_ATTRIB_ARB:
-        return 1;
-    default:
-        return 0;
-    }
-}
-
-INTERNAL PURE FASTCALL GLint
-__glGetQueryObjectivARB_size(GLenum e)
-{
-    switch (e) {
-    case GL_QUERY_RESULT_ARB:
-    case GL_QUERY_RESULT_AVAILABLE_ARB:
-        return 1;
-    default:
-        return 0;
-    }
-}
-
-INTERNAL PURE FASTCALL GLint
-__glGetQueryivARB_size(GLenum e)
-{
-    switch (e) {
-    case GL_QUERY_COUNTER_BITS_ARB:
-    case GL_CURRENT_QUERY_ARB:
-        return 1;
-    default:
-        return 0;
-    }
-}
-
-INTERNAL PURE FASTCALL GLint
-__glPointParameterfvEXT_size(GLenum e)
-{
-    switch (e) {
-    case GL_POINT_SIZE_MIN:
-/*      case GL_POINT_SIZE_MIN_ARB:*/
-/*      case GL_POINT_SIZE_MIN_SGIS:*/
-    case GL_POINT_SIZE_MAX:
-/*      case GL_POINT_SIZE_MAX_ARB:*/
-/*      case GL_POINT_SIZE_MAX_SGIS:*/
-    case GL_POINT_FADE_THRESHOLD_SIZE:
-/*      case GL_POINT_FADE_THRESHOLD_SIZE_ARB:*/
-/*      case GL_POINT_FADE_THRESHOLD_SIZE_SGIS:*/
-    case GL_POINT_SPRITE_R_MODE_NV:
-    case GL_POINT_SPRITE_COORD_ORIGIN:
-        return 1;
-    case GL_POINT_DISTANCE_ATTENUATION:
-/*      case GL_POINT_DISTANCE_ATTENUATION_ARB:*/
-/*      case GL_POINT_DISTANCE_ATTENUATION_SGIS:*/
-        return 3;
-    default:
-        return 0;
-    }
-}
-
-INTERNAL PURE FASTCALL GLint
-__glGetProgramivNV_size(GLenum e)
-{
-    switch (e) {
-    case GL_PROGRAM_LENGTH_NV:
-    case GL_PROGRAM_TARGET_NV:
-    case GL_PROGRAM_RESIDENT_NV:
-        return 1;
-    default:
-        return 0;
-    }
-}
-
-INTERNAL PURE FASTCALL GLint
-__glGetVertexAttribdvNV_size(GLenum e)
-{
-    switch (e) {
-    case GL_ATTRIB_ARRAY_SIZE_NV:
-    case GL_ATTRIB_ARRAY_STRIDE_NV:
-    case GL_ATTRIB_ARRAY_TYPE_NV:
-    case GL_CURRENT_ATTRIB_NV:
-        return 1;
-    default:
-        return 0;
-    }
-}
-
-INTERNAL PURE FASTCALL GLint
-__glGetFramebufferAttachmentParameterivEXT_size(GLenum e)
-{
-    switch (e) {
-    case GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT:
-    case GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT:
-    case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT:
-    case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT:
-    case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT:
-        return 1;
-    default:
-        return 0;
-    }
-}
-
-ALIAS(Fogiv, Fogfv)
-    ALIAS(Lightiv, Lightfv)
-    ALIAS(LightModeliv, LightModelfv)
-    ALIAS(Materialiv, Materialfv)
-    ALIAS(TexParameteriv, TexParameterfv)
-    ALIAS(TexEnviv, TexEnvfv)
-    ALIAS(TexGenfv, TexGendv)
-    ALIAS(TexGeniv, TexGendv)
-    ALIAS(Map1f, Map1d)
-    ALIAS(Map2f, Map2d)
-    ALIAS(GetDoublev, GetBooleanv)
-    ALIAS(GetFloatv, GetBooleanv)
-    ALIAS(GetIntegerv, GetBooleanv)
-    ALIAS(GetLightfv, Lightfv)
-    ALIAS(GetLightiv, Lightfv)
-    ALIAS(GetMaterialfv, Materialfv)
-    ALIAS(GetMaterialiv, Materialfv)
-    ALIAS(GetTexEnvfv, TexEnvfv)
-    ALIAS(GetTexEnviv, TexEnvfv)
-    ALIAS(GetTexGendv, TexGendv)
-    ALIAS(GetTexGenfv, TexGendv)
-    ALIAS(GetTexGeniv, TexGendv)
-    ALIAS(GetTexParameteriv, GetTexParameterfv)
-    ALIAS(GetTexLevelParameteriv, GetTexLevelParameterfv)
-    ALIAS(ColorTableParameteriv, ColorTableParameterfv)
-    ALIAS(GetColorTableParameteriv, GetColorTableParameterfv)
-    ALIAS(ConvolutionParameteriv, ConvolutionParameterfv)
-    ALIAS(GetConvolutionParameteriv, GetConvolutionParameterfv)
-    ALIAS(GetHistogramParameteriv, GetHistogramParameterfv)
-    ALIAS(GetMinmaxParameteriv, GetMinmaxParameterfv)
-    ALIAS(GetVertexAttribfvARB, GetVertexAttribdvARB)
-    ALIAS(GetVertexAttribivARB, GetVertexAttribdvARB)
-    ALIAS(GetQueryObjectuivARB, GetQueryObjectivARB)
-    ALIAS(GetVertexAttribfvNV, GetVertexAttribdvNV)
-    ALIAS(GetVertexAttribivNV, GetVertexAttribdvNV)
-    ALIAS(PointParameterivNV, PointParameterfvEXT)
-#  undef PURE
-#  undef FASTCALL
-#  undef INTERNAL
diff --git a/GL/glx/indirect_size_get.h b/GL/glx/indirect_size_get.h
deleted file mode 100644
index 4fcb55b4e..000000000
--- a/GL/glx/indirect_size_get.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* DO NOT EDIT - This file generated automatically by glX_proto_size.py (from Mesa) script */
-
-/*
- * (C) Copyright IBM Corporation 2004
- * All Rights Reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sub license,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
- * IBM,
- * AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#if !defined( _INDIRECT_SIZE_GET_H_ )
-#  define _INDIRECT_SIZE_GET_H_
-
-/**
- * \file
- * Prototypes for functions used to determine the number of data elements in
- * various GLX protocol messages.
- *
- * \author Ian Romanick <idr@us.ibm.com>
- */
-
-#  if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
-#    define PURE __attribute__((pure))
-#  else
-#    define PURE
-#  endif
-
-#  if defined(__i386__) && defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__)
-#    define FASTCALL __attribute__((fastcall))
-#  else
-#    define FASTCALL
-#  endif
-
-#  if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__)
-#    define INTERNAL  __attribute__((visibility("internal")))
-#  else
-#    define INTERNAL
-#  endif
-
-extern INTERNAL PURE FASTCALL GLint __glGetBooleanv_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint __glGetDoublev_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint __glGetFloatv_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint __glGetIntegerv_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint __glGetLightfv_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint __glGetLightiv_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint __glGetMaterialfv_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint __glGetMaterialiv_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint __glGetTexEnvfv_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint __glGetTexEnviv_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint __glGetTexGendv_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint __glGetTexGenfv_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint __glGetTexGeniv_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint __glGetTexParameterfv_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint __glGetTexParameteriv_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint __glGetTexLevelParameterfv_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint __glGetTexLevelParameteriv_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint __glGetColorTableParameterfv_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint __glGetColorTableParameteriv_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint
-__glGetConvolutionParameterfv_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint
-__glGetConvolutionParameteriv_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint __glGetHistogramParameterfv_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint __glGetHistogramParameteriv_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint __glGetMinmaxParameterfv_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint __glGetMinmaxParameteriv_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint __glGetProgramivARB_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint __glGetVertexAttribdvARB_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint __glGetVertexAttribfvARB_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint __glGetVertexAttribivARB_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint __glGetQueryObjectivARB_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint __glGetQueryObjectuivARB_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint __glGetQueryivARB_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint __glGetProgramivNV_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint __glGetVertexAttribdvNV_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint __glGetVertexAttribfvNV_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint __glGetVertexAttribivNV_size(GLenum);
-extern INTERNAL PURE FASTCALL GLint
-__glGetFramebufferAttachmentParameterivEXT_size(GLenum);
-
-#  undef PURE
-#  undef FASTCALL
-#  undef INTERNAL
-
-#endif /* !defined( _INDIRECT_SIZE_GET_H_ ) */
diff --git a/GL/glx/indirect_table.c b/GL/glx/indirect_table.c
deleted file mode 100644
index cb3202605..000000000
--- a/GL/glx/indirect_table.c
+++ /dev/null
@@ -1,1596 +0,0 @@
-/* DO NOT EDIT - This file generated automatically by glX_server_table.py (from Mesa) script */
-
-/*
- * (C) Copyright IBM Corporation 2005, 2006
- * All Rights Reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sub license,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
- * IBM,
- * AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
- * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <inttypes.h>
-#include "glxserver.h"
-#include "glxext.h"
-#include "indirect_dispatch.h"
-#include "indirect_reqsize.h"
-#include "g_disptab.h"
-#include "indirect_table.h"
-
-/*****************************************************************/
-/* tree depth = 3 */
-static const int_fast16_t Single_dispatch_tree[24] = {
-    /* [0] -> opcode range [0, 256], node depth 1 */
-    2,
-    5,
-    13,
-    16,
-    EMPTY_LEAF,
-
-    /* [5] -> opcode range [0, 64], node depth 2 */
-    2,
-    LEAF(0),
-    LEAF(16),
-    10,
-    EMPTY_LEAF,
-
-    /* [10] -> opcode range [32, 48], node depth 3 */
-    1,
-    LEAF(32),
-    EMPTY_LEAF,
-
-    /* [13] -> opcode range [64, 128], node depth 2 */
-    1,
-    EMPTY_LEAF,
-    LEAF(40),
-
-    /* [16] -> opcode range [128, 192], node depth 2 */
-    2,
-    LEAF(72),
-    LEAF(88),
-    21,
-    EMPTY_LEAF,
-
-    /* [21] -> opcode range [160, 176], node depth 3 */
-    1,
-    LEAF(104),
-    EMPTY_LEAF,
-
-};
-
-static const void *Single_function_table[112][2] = {
-    /* [  0] =     0 */ {NULL, NULL},
-    /* [  1] =     1 */ {__glXDisp_Render, __glXDispSwap_Render},
-    /* [  2] =     2 */ {__glXDisp_RenderLarge, __glXDispSwap_RenderLarge},
-    /* [  3] =     3 */ {__glXDisp_CreateContext, __glXDispSwap_CreateContext},
-    /* [  4] =     4 */ {__glXDisp_DestroyContext, __glXDispSwap_DestroyContext},
-    /* [  5] =     5 */ {__glXDisp_MakeCurrent, __glXDispSwap_MakeCurrent},
-    /* [  6] =     6 */ {__glXDisp_IsDirect, __glXDispSwap_IsDirect},
-    /* [  7] =     7 */ {__glXDisp_QueryVersion, __glXDispSwap_QueryVersion},
-    /* [  8] =     8 */ {__glXDisp_WaitGL, __glXDispSwap_WaitGL},
-    /* [  9] =     9 */ {__glXDisp_WaitX, __glXDispSwap_WaitX},
-    /* [ 10] =    10 */ {__glXDisp_CopyContext, __glXDispSwap_CopyContext},
-    /* [ 11] =    11 */ {__glXDisp_SwapBuffers, __glXDispSwap_SwapBuffers},
-    /* [ 12] =    12 */ {__glXDisp_UseXFont, __glXDispSwap_UseXFont},
-    /* [ 13] =    13 */ {__glXDisp_CreateGLXPixmap, __glXDispSwap_CreateGLXPixmap},
-    /* [ 14] =    14 */ {__glXDisp_GetVisualConfigs, __glXDispSwap_GetVisualConfigs},
-    /* [ 15] =    15 */ {__glXDisp_DestroyGLXPixmap, __glXDispSwap_DestroyGLXPixmap},
-    /* [ 16] =    16 */ {__glXDisp_VendorPrivate, __glXDispSwap_VendorPrivate},
-    /* [ 17] =    17 */ {__glXDisp_VendorPrivateWithReply, __glXDispSwap_VendorPrivateWithReply},
-    /* [ 18] =    18 */ {__glXDisp_QueryExtensionsString, __glXDispSwap_QueryExtensionsString},
-    /* [ 19] =    19 */ {__glXDisp_QueryServerString, __glXDispSwap_QueryServerString},
-    /* [ 20] =    20 */ {__glXDisp_ClientInfo, __glXDispSwap_ClientInfo},
-    /* [ 21] =    21 */ {__glXDisp_GetFBConfigs, __glXDispSwap_GetFBConfigs},
-    /* [ 22] =    22 */ {__glXDisp_CreatePixmap, __glXDispSwap_CreatePixmap},
-    /* [ 23] =    23 */ {__glXDisp_DestroyPixmap, __glXDispSwap_DestroyPixmap},
-    /* [ 24] =    24 */ {__glXDisp_CreateNewContext, __glXDispSwap_CreateNewContext},
-    /* [ 25] =    25 */ {__glXDisp_QueryContext, __glXDispSwap_QueryContext},
-    /* [ 26] =    26 */ {__glXDisp_MakeContextCurrent, __glXDispSwap_MakeContextCurrent},
-    /* [ 27] =    27 */ {__glXDisp_CreatePbuffer, __glXDispSwap_CreatePbuffer},
-    /* [ 28] =    28 */ {__glXDisp_DestroyPbuffer, __glXDispSwap_DestroyPbuffer},
-    /* [ 29] =    29 */ {__glXDisp_GetDrawableAttributes, __glXDispSwap_GetDrawableAttributes},
-    /* [ 30] =    30 */ {__glXDisp_ChangeDrawableAttributes, __glXDispSwap_ChangeDrawableAttributes},
-    /* [ 31] =    31 */ {__glXDisp_CreateWindow, __glXDispSwap_CreateWindow},
-    /* [ 32] =    32 */ {__glXDisp_DestroyWindow, __glXDispSwap_DestroyWindow},
-    /* [ 33] =    33 */ {NULL, NULL},
-    /* [ 34] =    34 */ {NULL, NULL},
-    /* [ 35] =    35 */ {NULL, NULL},
-    /* [ 36] =    36 */ {NULL, NULL},
-    /* [ 37] =    37 */ {NULL, NULL},
-    /* [ 38] =    38 */ {NULL, NULL},
-    /* [ 39] =    39 */ {NULL, NULL},
-    /* [ 40] =    96 */ {NULL, NULL},
-    /* [ 41] =    97 */ {NULL, NULL},
-    /* [ 42] =    98 */ {NULL, NULL},
-    /* [ 43] =    99 */ {NULL, NULL},
-    /* [ 44] =   100 */ {NULL, NULL},
-    /* [ 45] =   101 */ {__glXDisp_NewList, __glXDispSwap_NewList},
-    /* [ 46] =   102 */ {__glXDisp_EndList, __glXDispSwap_EndList},
-    /* [ 47] =   103 */ {__glXDisp_DeleteLists, __glXDispSwap_DeleteLists},
-    /* [ 48] =   104 */ {__glXDisp_GenLists, __glXDispSwap_GenLists},
-    /* [ 49] =   105 */ {__glXDisp_FeedbackBuffer, __glXDispSwap_FeedbackBuffer},
-    /* [ 50] =   106 */ {__glXDisp_SelectBuffer, __glXDispSwap_SelectBuffer},
-    /* [ 51] =   107 */ {__glXDisp_RenderMode, __glXDispSwap_RenderMode},
-    /* [ 52] =   108 */ {__glXDisp_Finish, __glXDispSwap_Finish},
-    /* [ 53] =   109 */ {__glXDisp_PixelStoref, __glXDispSwap_PixelStoref},
-    /* [ 54] =   110 */ {__glXDisp_PixelStorei, __glXDispSwap_PixelStorei},
-    /* [ 55] =   111 */ {__glXDisp_ReadPixels, __glXDispSwap_ReadPixels},
-    /* [ 56] =   112 */ {__glXDisp_GetBooleanv, __glXDispSwap_GetBooleanv},
-    /* [ 57] =   113 */ {__glXDisp_GetClipPlane, __glXDispSwap_GetClipPlane},
-    /* [ 58] =   114 */ {__glXDisp_GetDoublev, __glXDispSwap_GetDoublev},
-    /* [ 59] =   115 */ {__glXDisp_GetError, __glXDispSwap_GetError},
-    /* [ 60] =   116 */ {__glXDisp_GetFloatv, __glXDispSwap_GetFloatv},
-    /* [ 61] =   117 */ {__glXDisp_GetIntegerv, __glXDispSwap_GetIntegerv},
-    /* [ 62] =   118 */ {__glXDisp_GetLightfv, __glXDispSwap_GetLightfv},
-    /* [ 63] =   119 */ {__glXDisp_GetLightiv, __glXDispSwap_GetLightiv},
-    /* [ 64] =   120 */ {__glXDisp_GetMapdv, __glXDispSwap_GetMapdv},
-    /* [ 65] =   121 */ {__glXDisp_GetMapfv, __glXDispSwap_GetMapfv},
-    /* [ 66] =   122 */ {__glXDisp_GetMapiv, __glXDispSwap_GetMapiv},
-    /* [ 67] =   123 */ {__glXDisp_GetMaterialfv, __glXDispSwap_GetMaterialfv},
-    /* [ 68] =   124 */ {__glXDisp_GetMaterialiv, __glXDispSwap_GetMaterialiv},
-    /* [ 69] =   125 */ {__glXDisp_GetPixelMapfv, __glXDispSwap_GetPixelMapfv},
-    /* [ 70] =   126 */ {__glXDisp_GetPixelMapuiv, __glXDispSwap_GetPixelMapuiv},
-    /* [ 71] =   127 */ {__glXDisp_GetPixelMapusv, __glXDispSwap_GetPixelMapusv},
-    /* [ 72] =   128 */ {__glXDisp_GetPolygonStipple, __glXDispSwap_GetPolygonStipple},
-    /* [ 73] =   129 */ {__glXDisp_GetString, __glXDispSwap_GetString},
-    /* [ 74] =   130 */ {__glXDisp_GetTexEnvfv, __glXDispSwap_GetTexEnvfv},
-    /* [ 75] =   131 */ {__glXDisp_GetTexEnviv, __glXDispSwap_GetTexEnviv},
-    /* [ 76] =   132 */ {__glXDisp_GetTexGendv, __glXDispSwap_GetTexGendv},
-    /* [ 77] =   133 */ {__glXDisp_GetTexGenfv, __glXDispSwap_GetTexGenfv},
-    /* [ 78] =   134 */ {__glXDisp_GetTexGeniv, __glXDispSwap_GetTexGeniv},
-    /* [ 79] =   135 */ {__glXDisp_GetTexImage, __glXDispSwap_GetTexImage},
-    /* [ 80] =   136 */ {__glXDisp_GetTexParameterfv, __glXDispSwap_GetTexParameterfv},
-    /* [ 81] =   137 */ {__glXDisp_GetTexParameteriv, __glXDispSwap_GetTexParameteriv},
-    /* [ 82] =   138 */ {__glXDisp_GetTexLevelParameterfv, __glXDispSwap_GetTexLevelParameterfv},
-    /* [ 83] =   139 */ {__glXDisp_GetTexLevelParameteriv, __glXDispSwap_GetTexLevelParameteriv},
-    /* [ 84] =   140 */ {__glXDisp_IsEnabled, __glXDispSwap_IsEnabled},
-    /* [ 85] =   141 */ {__glXDisp_IsList, __glXDispSwap_IsList},
-    /* [ 86] =   142 */ {__glXDisp_Flush, __glXDispSwap_Flush},
-    /* [ 87] =   143 */ {__glXDisp_AreTexturesResident, __glXDispSwap_AreTexturesResident},
-    /* [ 88] =   144 */ {__glXDisp_DeleteTextures, __glXDispSwap_DeleteTextures},
-    /* [ 89] =   145 */ {__glXDisp_GenTextures, __glXDispSwap_GenTextures},
-    /* [ 90] =   146 */ {__glXDisp_IsTexture, __glXDispSwap_IsTexture},
-    /* [ 91] =   147 */ {__glXDisp_GetColorTable, __glXDispSwap_GetColorTable},
-    /* [ 92] =   148 */ {__glXDisp_GetColorTableParameterfv, __glXDispSwap_GetColorTableParameterfv},
-    /* [ 93] =   149 */ {__glXDisp_GetColorTableParameteriv, __glXDispSwap_GetColorTableParameteriv},
-    /* [ 94] =   150 */ {__glXDisp_GetConvolutionFilter, __glXDispSwap_GetConvolutionFilter},
-    /* [ 95] =   151 */ {__glXDisp_GetConvolutionParameterfv, __glXDispSwap_GetConvolutionParameterfv},
-    /* [ 96] =   152 */ {__glXDisp_GetConvolutionParameteriv, __glXDispSwap_GetConvolutionParameteriv},
-    /* [ 97] =   153 */ {__glXDisp_GetSeparableFilter, __glXDispSwap_GetSeparableFilter},
-    /* [ 98] =   154 */ {__glXDisp_GetHistogram, __glXDispSwap_GetHistogram},
-    /* [ 99] =   155 */ {__glXDisp_GetHistogramParameterfv, __glXDispSwap_GetHistogramParameterfv},
-    /* [ 100] =   156 */ {__glXDisp_GetHistogramParameteriv, __glXDispSwap_GetHistogramParameteriv},
-    /* [ 101] =   157 */ {__glXDisp_GetMinmax, __glXDispSwap_GetMinmax},
-    /* [ 102] =   158 */ {__glXDisp_GetMinmaxParameterfv, __glXDispSwap_GetMinmaxParameterfv},
-    /* [ 103] =   159 */ {__glXDisp_GetMinmaxParameteriv, __glXDispSwap_GetMinmaxParameteriv},
-    /* [ 104] =   160 */ {__glXDisp_GetCompressedTexImageARB, __glXDispSwap_GetCompressedTexImageARB},
-    /* [ 105] =   161 */ {__glXDisp_DeleteQueriesARB, __glXDispSwap_DeleteQueriesARB},
-    /* [ 106] =   162 */ {__glXDisp_GenQueriesARB, __glXDispSwap_GenQueriesARB},
-    /* [ 107] =   163 */ {__glXDisp_IsQueryARB, __glXDispSwap_IsQueryARB},
-    /* [ 108] =   164 */ {__glXDisp_GetQueryivARB, __glXDispSwap_GetQueryivARB},
-    /* [ 109] =   165 */ {__glXDisp_GetQueryObjectivARB, __glXDispSwap_GetQueryObjectivARB},
-    /* [ 110] =   166 */ {__glXDisp_GetQueryObjectuivARB, __glXDispSwap_GetQueryObjectuivARB},
-    /* [ 111] =   167 */ {NULL, NULL},
-};
-
-const struct __glXDispatchInfo Single_dispatch_info = {
-    8,
-    Single_dispatch_tree,
-    Single_function_table,
-    NULL,
-    NULL
-};
-
-/*****************************************************************/
-/* tree depth = 8 */
-static const int_fast16_t Render_dispatch_tree[95] = {
-    /* [0] -> opcode range [0, 8192], node depth 1 */
-    2,
-    5,
-    31,
-    54,
-    EMPTY_LEAF,
-
-    /* [5] -> opcode range [0, 2048], node depth 2 */
-    1,
-    8,
-    EMPTY_LEAF,
-
-    /* [8] -> opcode range [0, 1024], node depth 3 */
-    1,
-    11,
-    EMPTY_LEAF,
-
-    /* [11] -> opcode range [0, 512], node depth 4 */
-    1,
-    14,
-    EMPTY_LEAF,
-
-    /* [14] -> opcode range [0, 256], node depth 5 */
-    4,
-    LEAF(0),
-    LEAF(16),
-    LEAF(32),
-    LEAF(48),
-    LEAF(64),
-    LEAF(80),
-    LEAF(96),
-    LEAF(112),
-    LEAF(128),
-    LEAF(144),
-    LEAF(160),
-    LEAF(176),
-    LEAF(192),
-    LEAF(208),
-    LEAF(224),
-    EMPTY_LEAF,
-
-    /* [31] -> opcode range [2048, 4096], node depth 2 */
-    1,
-    34,
-    EMPTY_LEAF,
-
-    /* [34] -> opcode range [2048, 3072], node depth 3 */
-    1,
-    37,
-    EMPTY_LEAF,
-
-    /* [37] -> opcode range [2048, 2560], node depth 4 */
-    1,
-    40,
-    EMPTY_LEAF,
-
-    /* [40] -> opcode range [2048, 2304], node depth 5 */
-    1,
-    43,
-    EMPTY_LEAF,
-
-    /* [43] -> opcode range [2048, 2176], node depth 6 */
-    1,
-    46,
-    EMPTY_LEAF,
-
-    /* [46] -> opcode range [2048, 2112], node depth 7 */
-    1,
-    49,
-    EMPTY_LEAF,
-
-    /* [49] -> opcode range [2048, 2080], node depth 8 */
-    2,
-    LEAF(240),
-    LEAF(248),
-    LEAF(256),
-    EMPTY_LEAF,
-
-    /* [54] -> opcode range [4096, 6144], node depth 2 */
-    1,
-    57,
-    EMPTY_LEAF,
-
-    /* [57] -> opcode range [4096, 5120], node depth 3 */
-    1,
-    60,
-    EMPTY_LEAF,
-
-    /* [60] -> opcode range [4096, 4608], node depth 4 */
-    1,
-    63,
-    EMPTY_LEAF,
-
-    /* [63] -> opcode range [4096, 4352], node depth 5 */
-    4,
-    LEAF(264),
-    LEAF(280),
-    80,
-    EMPTY_LEAF,
-    EMPTY_LEAF,
-    LEAF(296),
-    LEAF(312),
-    LEAF(328),
-    LEAF(344),
-    EMPTY_LEAF,
-    83,
-    86,
-    EMPTY_LEAF,
-    89,
-    92,
-    EMPTY_LEAF,
-
-    /* [80] -> opcode range [4128, 4144], node depth 6 */
-    1,
-    LEAF(360),
-    EMPTY_LEAF,
-
-    /* [83] -> opcode range [4256, 4272], node depth 6 */
-    1,
-    EMPTY_LEAF,
-    LEAF(368),
-
-    /* [86] -> opcode range [4272, 4288], node depth 6 */
-    1,
-    LEAF(376),
-    EMPTY_LEAF,
-
-    /* [89] -> opcode range [4304, 4320], node depth 6 */
-    1,
-    EMPTY_LEAF,
-    LEAF(384),
-
-    /* [92] -> opcode range [4320, 4336], node depth 6 */
-    1,
-    LEAF(392),
-    EMPTY_LEAF,
-
-};
-
-static const void *Render_function_table[400][2] = {
-    /* [  0] =     0 */ {NULL, NULL},
-    /* [  1] =     1 */ {__glXDisp_CallList, __glXDispSwap_CallList},
-    /* [  2] =     2 */ {__glXDisp_CallLists, __glXDispSwap_CallLists},
-    /* [  3] =     3 */ {__glXDisp_ListBase, __glXDispSwap_ListBase},
-    /* [  4] =     4 */ {__glXDisp_Begin, __glXDispSwap_Begin},
-    /* [  5] =     5 */ {__glXDisp_Bitmap, __glXDispSwap_Bitmap},
-    /* [  6] =     6 */ {__glXDisp_Color3bv, __glXDispSwap_Color3bv},
-    /* [  7] =     7 */ {__glXDisp_Color3dv, __glXDispSwap_Color3dv},
-    /* [  8] =     8 */ {__glXDisp_Color3fv, __glXDispSwap_Color3fv},
-    /* [  9] =     9 */ {__glXDisp_Color3iv, __glXDispSwap_Color3iv},
-    /* [ 10] =    10 */ {__glXDisp_Color3sv, __glXDispSwap_Color3sv},
-    /* [ 11] =    11 */ {__glXDisp_Color3ubv, __glXDispSwap_Color3ubv},
-    /* [ 12] =    12 */ {__glXDisp_Color3uiv, __glXDispSwap_Color3uiv},
-    /* [ 13] =    13 */ {__glXDisp_Color3usv, __glXDispSwap_Color3usv},
-    /* [ 14] =    14 */ {__glXDisp_Color4bv, __glXDispSwap_Color4bv},
-    /* [ 15] =    15 */ {__glXDisp_Color4dv, __glXDispSwap_Color4dv},
-    /* [ 16] =    16 */ {__glXDisp_Color4fv, __glXDispSwap_Color4fv},
-    /* [ 17] =    17 */ {__glXDisp_Color4iv, __glXDispSwap_Color4iv},
-    /* [ 18] =    18 */ {__glXDisp_Color4sv, __glXDispSwap_Color4sv},
-    /* [ 19] =    19 */ {__glXDisp_Color4ubv, __glXDispSwap_Color4ubv},
-    /* [ 20] =    20 */ {__glXDisp_Color4uiv, __glXDispSwap_Color4uiv},
-    /* [ 21] =    21 */ {__glXDisp_Color4usv, __glXDispSwap_Color4usv},
-    /* [ 22] =    22 */ {__glXDisp_EdgeFlagv, __glXDispSwap_EdgeFlagv},
-    /* [ 23] =    23 */ {__glXDisp_End, __glXDispSwap_End},
-    /* [ 24] =    24 */ {__glXDisp_Indexdv, __glXDispSwap_Indexdv},
-    /* [ 25] =    25 */ {__glXDisp_Indexfv, __glXDispSwap_Indexfv},
-    /* [ 26] =    26 */ {__glXDisp_Indexiv, __glXDispSwap_Indexiv},
-    /* [ 27] =    27 */ {__glXDisp_Indexsv, __glXDispSwap_Indexsv},
-    /* [ 28] =    28 */ {__glXDisp_Normal3bv, __glXDispSwap_Normal3bv},
-    /* [ 29] =    29 */ {__glXDisp_Normal3dv, __glXDispSwap_Normal3dv},
-    /* [ 30] =    30 */ {__glXDisp_Normal3fv, __glXDispSwap_Normal3fv},
-    /* [ 31] =    31 */ {__glXDisp_Normal3iv, __glXDispSwap_Normal3iv},
-    /* [ 32] =    32 */ {__glXDisp_Normal3sv, __glXDispSwap_Normal3sv},
-    /* [ 33] =    33 */ {__glXDisp_RasterPos2dv, __glXDispSwap_RasterPos2dv},
-    /* [ 34] =    34 */ {__glXDisp_RasterPos2fv, __glXDispSwap_RasterPos2fv},
-    /* [ 35] =    35 */ {__glXDisp_RasterPos2iv, __glXDispSwap_RasterPos2iv},
-    /* [ 36] =    36 */ {__glXDisp_RasterPos2sv, __glXDispSwap_RasterPos2sv},
-    /* [ 37] =    37 */ {__glXDisp_RasterPos3dv, __glXDispSwap_RasterPos3dv},
-    /* [ 38] =    38 */ {__glXDisp_RasterPos3fv, __glXDispSwap_RasterPos3fv},
-    /* [ 39] =    39 */ {__glXDisp_RasterPos3iv, __glXDispSwap_RasterPos3iv},
-    /* [ 40] =    40 */ {__glXDisp_RasterPos3sv, __glXDispSwap_RasterPos3sv},
-    /* [ 41] =    41 */ {__glXDisp_RasterPos4dv, __glXDispSwap_RasterPos4dv},
-    /* [ 42] =    42 */ {__glXDisp_RasterPos4fv, __glXDispSwap_RasterPos4fv},
-    /* [ 43] =    43 */ {__glXDisp_RasterPos4iv, __glXDispSwap_RasterPos4iv},
-    /* [ 44] =    44 */ {__glXDisp_RasterPos4sv, __glXDispSwap_RasterPos4sv},
-    /* [ 45] =    45 */ {__glXDisp_Rectdv, __glXDispSwap_Rectdv},
-    /* [ 46] =    46 */ {__glXDisp_Rectfv, __glXDispSwap_Rectfv},
-    /* [ 47] =    47 */ {__glXDisp_Rectiv, __glXDispSwap_Rectiv},
-    /* [ 48] =    48 */ {__glXDisp_Rectsv, __glXDispSwap_Rectsv},
-    /* [ 49] =    49 */ {__glXDisp_TexCoord1dv, __glXDispSwap_TexCoord1dv},
-    /* [ 50] =    50 */ {__glXDisp_TexCoord1fv, __glXDispSwap_TexCoord1fv},
-    /* [ 51] =    51 */ {__glXDisp_TexCoord1iv, __glXDispSwap_TexCoord1iv},
-    /* [ 52] =    52 */ {__glXDisp_TexCoord1sv, __glXDispSwap_TexCoord1sv},
-    /* [ 53] =    53 */ {__glXDisp_TexCoord2dv, __glXDispSwap_TexCoord2dv},
-    /* [ 54] =    54 */ {__glXDisp_TexCoord2fv, __glXDispSwap_TexCoord2fv},
-    /* [ 55] =    55 */ {__glXDisp_TexCoord2iv, __glXDispSwap_TexCoord2iv},
-    /* [ 56] =    56 */ {__glXDisp_TexCoord2sv, __glXDispSwap_TexCoord2sv},
-    /* [ 57] =    57 */ {__glXDisp_TexCoord3dv, __glXDispSwap_TexCoord3dv},
-    /* [ 58] =    58 */ {__glXDisp_TexCoord3fv, __glXDispSwap_TexCoord3fv},
-    /* [ 59] =    59 */ {__glXDisp_TexCoord3iv, __glXDispSwap_TexCoord3iv},
-    /* [ 60] =    60 */ {__glXDisp_TexCoord3sv, __glXDispSwap_TexCoord3sv},
-    /* [ 61] =    61 */ {__glXDisp_TexCoord4dv, __glXDispSwap_TexCoord4dv},
-    /* [ 62] =    62 */ {__glXDisp_TexCoord4fv, __glXDispSwap_TexCoord4fv},
-    /* [ 63] =    63 */ {__glXDisp_TexCoord4iv, __glXDispSwap_TexCoord4iv},
-    /* [ 64] =    64 */ {__glXDisp_TexCoord4sv, __glXDispSwap_TexCoord4sv},
-    /* [ 65] =    65 */ {__glXDisp_Vertex2dv, __glXDispSwap_Vertex2dv},
-    /* [ 66] =    66 */ {__glXDisp_Vertex2fv, __glXDispSwap_Vertex2fv},
-    /* [ 67] =    67 */ {__glXDisp_Vertex2iv, __glXDispSwap_Vertex2iv},
-    /* [ 68] =    68 */ {__glXDisp_Vertex2sv, __glXDispSwap_Vertex2sv},
-    /* [ 69] =    69 */ {__glXDisp_Vertex3dv, __glXDispSwap_Vertex3dv},
-    /* [ 70] =    70 */ {__glXDisp_Vertex3fv, __glXDispSwap_Vertex3fv},
-    /* [ 71] =    71 */ {__glXDisp_Vertex3iv, __glXDispSwap_Vertex3iv},
-    /* [ 72] =    72 */ {__glXDisp_Vertex3sv, __glXDispSwap_Vertex3sv},
-    /* [ 73] =    73 */ {__glXDisp_Vertex4dv, __glXDispSwap_Vertex4dv},
-    /* [ 74] =    74 */ {__glXDisp_Vertex4fv, __glXDispSwap_Vertex4fv},
-    /* [ 75] =    75 */ {__glXDisp_Vertex4iv, __glXDispSwap_Vertex4iv},
-    /* [ 76] =    76 */ {__glXDisp_Vertex4sv, __glXDispSwap_Vertex4sv},
-    /* [ 77] =    77 */ {__glXDisp_ClipPlane, __glXDispSwap_ClipPlane},
-    /* [ 78] =    78 */ {__glXDisp_ColorMaterial, __glXDispSwap_ColorMaterial},
-    /* [ 79] =    79 */ {__glXDisp_CullFace, __glXDispSwap_CullFace},
-    /* [ 80] =    80 */ {__glXDisp_Fogf, __glXDispSwap_Fogf},
-    /* [ 81] =    81 */ {__glXDisp_Fogfv, __glXDispSwap_Fogfv},
-    /* [ 82] =    82 */ {__glXDisp_Fogi, __glXDispSwap_Fogi},
-    /* [ 83] =    83 */ {__glXDisp_Fogiv, __glXDispSwap_Fogiv},
-    /* [ 84] =    84 */ {__glXDisp_FrontFace, __glXDispSwap_FrontFace},
-    /* [ 85] =    85 */ {__glXDisp_Hint, __glXDispSwap_Hint},
-    /* [ 86] =    86 */ {__glXDisp_Lightf, __glXDispSwap_Lightf},
-    /* [ 87] =    87 */ {__glXDisp_Lightfv, __glXDispSwap_Lightfv},
-    /* [ 88] =    88 */ {__glXDisp_Lighti, __glXDispSwap_Lighti},
-    /* [ 89] =    89 */ {__glXDisp_Lightiv, __glXDispSwap_Lightiv},
-    /* [ 90] =    90 */ {__glXDisp_LightModelf, __glXDispSwap_LightModelf},
-    /* [ 91] =    91 */ {__glXDisp_LightModelfv, __glXDispSwap_LightModelfv},
-    /* [ 92] =    92 */ {__glXDisp_LightModeli, __glXDispSwap_LightModeli},
-    /* [ 93] =    93 */ {__glXDisp_LightModeliv, __glXDispSwap_LightModeliv},
-    /* [ 94] =    94 */ {__glXDisp_LineStipple, __glXDispSwap_LineStipple},
-    /* [ 95] =    95 */ {__glXDisp_LineWidth, __glXDispSwap_LineWidth},
-    /* [ 96] =    96 */ {__glXDisp_Materialf, __glXDispSwap_Materialf},
-    /* [ 97] =    97 */ {__glXDisp_Materialfv, __glXDispSwap_Materialfv},
-    /* [ 98] =    98 */ {__glXDisp_Materiali, __glXDispSwap_Materiali},
-    /* [ 99] =    99 */ {__glXDisp_Materialiv, __glXDispSwap_Materialiv},
-    /* [ 100] =   100 */ {__glXDisp_PointSize, __glXDispSwap_PointSize},
-    /* [ 101] =   101 */ {__glXDisp_PolygonMode, __glXDispSwap_PolygonMode},
-    /* [ 102] =   102 */ {__glXDisp_PolygonStipple, __glXDispSwap_PolygonStipple},
-    /* [ 103] =   103 */ {__glXDisp_Scissor, __glXDispSwap_Scissor},
-    /* [ 104] =   104 */ {__glXDisp_ShadeModel, __glXDispSwap_ShadeModel},
-    /* [ 105] =   105 */ {__glXDisp_TexParameterf, __glXDispSwap_TexParameterf},
-    /* [ 106] =   106 */ {__glXDisp_TexParameterfv, __glXDispSwap_TexParameterfv},
-    /* [ 107] =   107 */ {__glXDisp_TexParameteri, __glXDispSwap_TexParameteri},
-    /* [ 108] =   108 */ {__glXDisp_TexParameteriv, __glXDispSwap_TexParameteriv},
-    /* [ 109] =   109 */ {__glXDisp_TexImage1D, __glXDispSwap_TexImage1D},
-    /* [ 110] =   110 */ {__glXDisp_TexImage2D, __glXDispSwap_TexImage2D},
-    /* [ 111] =   111 */ {__glXDisp_TexEnvf, __glXDispSwap_TexEnvf},
-    /* [ 112] =   112 */ {__glXDisp_TexEnvfv, __glXDispSwap_TexEnvfv},
-    /* [ 113] =   113 */ {__glXDisp_TexEnvi, __glXDispSwap_TexEnvi},
-    /* [ 114] =   114 */ {__glXDisp_TexEnviv, __glXDispSwap_TexEnviv},
-    /* [ 115] =   115 */ {__glXDisp_TexGend, __glXDispSwap_TexGend},
-    /* [ 116] =   116 */ {__glXDisp_TexGendv, __glXDispSwap_TexGendv},
-    /* [ 117] =   117 */ {__glXDisp_TexGenf, __glXDispSwap_TexGenf},
-    /* [ 118] =   118 */ {__glXDisp_TexGenfv, __glXDispSwap_TexGenfv},
-    /* [ 119] =   119 */ {__glXDisp_TexGeni, __glXDispSwap_TexGeni},
-    /* [ 120] =   120 */ {__glXDisp_TexGeniv, __glXDispSwap_TexGeniv},
-    /* [ 121] =   121 */ {__glXDisp_InitNames, __glXDispSwap_InitNames},
-    /* [ 122] =   122 */ {__glXDisp_LoadName, __glXDispSwap_LoadName},
-    /* [ 123] =   123 */ {__glXDisp_PassThrough, __glXDispSwap_PassThrough},
-    /* [ 124] =   124 */ {__glXDisp_PopName, __glXDispSwap_PopName},
-    /* [ 125] =   125 */ {__glXDisp_PushName, __glXDispSwap_PushName},
-    /* [ 126] =   126 */ {__glXDisp_DrawBuffer, __glXDispSwap_DrawBuffer},
-    /* [ 127] =   127 */ {__glXDisp_Clear, __glXDispSwap_Clear},
-    /* [ 128] =   128 */ {__glXDisp_ClearAccum, __glXDispSwap_ClearAccum},
-    /* [ 129] =   129 */ {__glXDisp_ClearIndex, __glXDispSwap_ClearIndex},
-    /* [ 130] =   130 */ {__glXDisp_ClearColor, __glXDispSwap_ClearColor},
-    /* [ 131] =   131 */ {__glXDisp_ClearStencil, __glXDispSwap_ClearStencil},
-    /* [ 132] =   132 */ {__glXDisp_ClearDepth, __glXDispSwap_ClearDepth},
-    /* [ 133] =   133 */ {__glXDisp_StencilMask, __glXDispSwap_StencilMask},
-    /* [ 134] =   134 */ {__glXDisp_ColorMask, __glXDispSwap_ColorMask},
-    /* [ 135] =   135 */ {__glXDisp_DepthMask, __glXDispSwap_DepthMask},
-    /* [ 136] =   136 */ {__glXDisp_IndexMask, __glXDispSwap_IndexMask},
-    /* [ 137] =   137 */ {__glXDisp_Accum, __glXDispSwap_Accum},
-    /* [ 138] =   138 */ {__glXDisp_Disable, __glXDispSwap_Disable},
-    /* [ 139] =   139 */ {__glXDisp_Enable, __glXDispSwap_Enable},
-    /* [ 140] =   140 */ {NULL, NULL},
-    /* [ 141] =   141 */ {__glXDisp_PopAttrib, __glXDispSwap_PopAttrib},
-    /* [ 142] =   142 */ {__glXDisp_PushAttrib, __glXDispSwap_PushAttrib},
-    /* [ 143] =   143 */ {__glXDisp_Map1d, __glXDispSwap_Map1d},
-    /* [ 144] =   144 */ {__glXDisp_Map1f, __glXDispSwap_Map1f},
-    /* [ 145] =   145 */ {__glXDisp_Map2d, __glXDispSwap_Map2d},
-    /* [ 146] =   146 */ {__glXDisp_Map2f, __glXDispSwap_Map2f},
-    /* [ 147] =   147 */ {__glXDisp_MapGrid1d, __glXDispSwap_MapGrid1d},
-    /* [ 148] =   148 */ {__glXDisp_MapGrid1f, __glXDispSwap_MapGrid1f},
-    /* [ 149] =   149 */ {__glXDisp_MapGrid2d, __glXDispSwap_MapGrid2d},
-    /* [ 150] =   150 */ {__glXDisp_MapGrid2f, __glXDispSwap_MapGrid2f},
-    /* [ 151] =   151 */ {__glXDisp_EvalCoord1dv, __glXDispSwap_EvalCoord1dv},
-    /* [ 152] =   152 */ {__glXDisp_EvalCoord1fv, __glXDispSwap_EvalCoord1fv},
-    /* [ 153] =   153 */ {__glXDisp_EvalCoord2dv, __glXDispSwap_EvalCoord2dv},
-    /* [ 154] =   154 */ {__glXDisp_EvalCoord2fv, __glXDispSwap_EvalCoord2fv},
-    /* [ 155] =   155 */ {__glXDisp_EvalMesh1, __glXDispSwap_EvalMesh1},
-    /* [ 156] =   156 */ {__glXDisp_EvalPoint1, __glXDispSwap_EvalPoint1},
-    /* [ 157] =   157 */ {__glXDisp_EvalMesh2, __glXDispSwap_EvalMesh2},
-    /* [ 158] =   158 */ {__glXDisp_EvalPoint2, __glXDispSwap_EvalPoint2},
-    /* [ 159] =   159 */ {__glXDisp_AlphaFunc, __glXDispSwap_AlphaFunc},
-    /* [ 160] =   160 */ {__glXDisp_BlendFunc, __glXDispSwap_BlendFunc},
-    /* [ 161] =   161 */ {__glXDisp_LogicOp, __glXDispSwap_LogicOp},
-    /* [ 162] =   162 */ {__glXDisp_StencilFunc, __glXDispSwap_StencilFunc},
-    /* [ 163] =   163 */ {__glXDisp_StencilOp, __glXDispSwap_StencilOp},
-    /* [ 164] =   164 */ {__glXDisp_DepthFunc, __glXDispSwap_DepthFunc},
-    /* [ 165] =   165 */ {__glXDisp_PixelZoom, __glXDispSwap_PixelZoom},
-    /* [ 166] =   166 */ {__glXDisp_PixelTransferf, __glXDispSwap_PixelTransferf},
-    /* [ 167] =   167 */ {__glXDisp_PixelTransferi, __glXDispSwap_PixelTransferi},
-    /* [ 168] =   168 */ {__glXDisp_PixelMapfv, __glXDispSwap_PixelMapfv},
-    /* [ 169] =   169 */ {__glXDisp_PixelMapuiv, __glXDispSwap_PixelMapuiv},
-    /* [ 170] =   170 */ {__glXDisp_PixelMapusv, __glXDispSwap_PixelMapusv},
-    /* [ 171] =   171 */ {__glXDisp_ReadBuffer, __glXDispSwap_ReadBuffer},
-    /* [ 172] =   172 */ {__glXDisp_CopyPixels, __glXDispSwap_CopyPixels},
-    /* [ 173] =   173 */ {__glXDisp_DrawPixels, __glXDispSwap_DrawPixels},
-    /* [ 174] =   174 */ {__glXDisp_DepthRange, __glXDispSwap_DepthRange},
-    /* [ 175] =   175 */ {__glXDisp_Frustum, __glXDispSwap_Frustum},
-    /* [ 176] =   176 */ {__glXDisp_LoadIdentity, __glXDispSwap_LoadIdentity},
-    /* [ 177] =   177 */ {__glXDisp_LoadMatrixf, __glXDispSwap_LoadMatrixf},
-    /* [ 178] =   178 */ {__glXDisp_LoadMatrixd, __glXDispSwap_LoadMatrixd},
-    /* [ 179] =   179 */ {__glXDisp_MatrixMode, __glXDispSwap_MatrixMode},
-    /* [ 180] =   180 */ {__glXDisp_MultMatrixf, __glXDispSwap_MultMatrixf},
-    /* [ 181] =   181 */ {__glXDisp_MultMatrixd, __glXDispSwap_MultMatrixd},
-    /* [ 182] =   182 */ {__glXDisp_Ortho, __glXDispSwap_Ortho},
-    /* [ 183] =   183 */ {__glXDisp_PopMatrix, __glXDispSwap_PopMatrix},
-    /* [ 184] =   184 */ {__glXDisp_PushMatrix, __glXDispSwap_PushMatrix},
-    /* [ 185] =   185 */ {__glXDisp_Rotated, __glXDispSwap_Rotated},
-    /* [ 186] =   186 */ {__glXDisp_Rotatef, __glXDispSwap_Rotatef},
-    /* [ 187] =   187 */ {__glXDisp_Scaled, __glXDispSwap_Scaled},
-    /* [ 188] =   188 */ {__glXDisp_Scalef, __glXDispSwap_Scalef},
-    /* [ 189] =   189 */ {__glXDisp_Translated, __glXDispSwap_Translated},
-    /* [ 190] =   190 */ {__glXDisp_Translatef, __glXDispSwap_Translatef},
-    /* [ 191] =   191 */ {__glXDisp_Viewport, __glXDispSwap_Viewport},
-    /* [ 192] =   192 */ {__glXDisp_PolygonOffset, __glXDispSwap_PolygonOffset},
-    /* [ 193] =   193 */ {__glXDisp_DrawArrays, __glXDispSwap_DrawArrays},
-    /* [ 194] =   194 */ {__glXDisp_Indexubv, __glXDispSwap_Indexubv},
-    /* [ 195] =   195 */ {__glXDisp_ColorSubTable, __glXDispSwap_ColorSubTable},
-    /* [ 196] =   196 */ {__glXDisp_CopyColorSubTable, __glXDispSwap_CopyColorSubTable},
-    /* [ 197] =   197 */ {__glXDisp_ActiveTextureARB, __glXDispSwap_ActiveTextureARB},
-    /* [ 198] =   198 */ {__glXDisp_MultiTexCoord1dvARB, __glXDispSwap_MultiTexCoord1dvARB},
-    /* [ 199] =   199 */ {__glXDisp_MultiTexCoord1fvARB, __glXDispSwap_MultiTexCoord1fvARB},
-    /* [ 200] =   200 */ {__glXDisp_MultiTexCoord1ivARB, __glXDispSwap_MultiTexCoord1ivARB},
-    /* [ 201] =   201 */ {__glXDisp_MultiTexCoord1svARB, __glXDispSwap_MultiTexCoord1svARB},
-    /* [ 202] =   202 */ {__glXDisp_MultiTexCoord2dvARB, __glXDispSwap_MultiTexCoord2dvARB},
-    /* [ 203] =   203 */ {__glXDisp_MultiTexCoord2fvARB, __glXDispSwap_MultiTexCoord2fvARB},
-    /* [ 204] =   204 */ {__glXDisp_MultiTexCoord2ivARB, __glXDispSwap_MultiTexCoord2ivARB},
-    /* [ 205] =   205 */ {__glXDisp_MultiTexCoord2svARB, __glXDispSwap_MultiTexCoord2svARB},
-    /* [ 206] =   206 */ {__glXDisp_MultiTexCoord3dvARB, __glXDispSwap_MultiTexCoord3dvARB},
-    /* [ 207] =   207 */ {__glXDisp_MultiTexCoord3fvARB, __glXDispSwap_MultiTexCoord3fvARB},
-    /* [ 208] =   208 */ {__glXDisp_MultiTexCoord3ivARB, __glXDispSwap_MultiTexCoord3ivARB},
-    /* [ 209] =   209 */ {__glXDisp_MultiTexCoord3svARB, __glXDispSwap_MultiTexCoord3svARB},
-    /* [ 210] =   210 */ {__glXDisp_MultiTexCoord4dvARB, __glXDispSwap_MultiTexCoord4dvARB},
-    /* [ 211] =   211 */ {__glXDisp_MultiTexCoord4fvARB, __glXDispSwap_MultiTexCoord4fvARB},
-    /* [ 212] =   212 */ {__glXDisp_MultiTexCoord4ivARB, __glXDispSwap_MultiTexCoord4ivARB},
-    /* [ 213] =   213 */ {__glXDisp_MultiTexCoord4svARB, __glXDispSwap_MultiTexCoord4svARB},
-    /* [ 214] =   214 */ {__glXDisp_CompressedTexImage1DARB, __glXDispSwap_CompressedTexImage1DARB},
-    /* [ 215] =   215 */ {__glXDisp_CompressedTexImage2DARB, __glXDispSwap_CompressedTexImage2DARB},
-    /* [ 216] =   216 */ {__glXDisp_CompressedTexImage3DARB, __glXDispSwap_CompressedTexImage3DARB},
-    /* [ 217] =   217 */ {__glXDisp_CompressedTexSubImage1DARB, __glXDispSwap_CompressedTexSubImage1DARB},
-    /* [ 218] =   218 */ {__glXDisp_CompressedTexSubImage2DARB, __glXDispSwap_CompressedTexSubImage2DARB},
-    /* [ 219] =   219 */ {__glXDisp_CompressedTexSubImage3DARB, __glXDispSwap_CompressedTexSubImage3DARB},
-    /* [ 220] =   220 */ {NULL, NULL},
-    /* [ 221] =   221 */ {NULL, NULL},
-    /* [ 222] =   222 */ {NULL, NULL},
-    /* [ 223] =   223 */ {NULL, NULL},
-    /* [ 224] =   224 */ {NULL, NULL},
-    /* [ 225] =   225 */ {NULL, NULL},
-    /* [ 226] =   226 */ {NULL, NULL},
-    /* [ 227] =   227 */ {NULL, NULL},
-    /* [ 228] =   228 */ {NULL, NULL},
-    /* [ 229] =   229 */ {__glXDisp_SampleCoverageARB, __glXDispSwap_SampleCoverageARB},
-    /* [ 230] =   230 */ {__glXDisp_WindowPos3fvMESA, __glXDispSwap_WindowPos3fvMESA},
-    /* [ 231] =   231 */ {__glXDisp_BeginQueryARB, __glXDispSwap_BeginQueryARB},
-    /* [ 232] =   232 */ {__glXDisp_EndQueryARB, __glXDispSwap_EndQueryARB},
-    /* [ 233] =   233 */ {__glXDisp_DrawBuffersARB, __glXDispSwap_DrawBuffersARB},
-    /* [ 234] =   234 */ {NULL, NULL},
-    /* [ 235] =   235 */ {NULL, NULL},
-    /* [ 236] =   236 */ {NULL, NULL},
-    /* [ 237] =   237 */ {NULL, NULL},
-    /* [ 238] =   238 */ {NULL, NULL},
-    /* [ 239] =   239 */ {NULL, NULL},
-    /* [ 240] =  2048 */ {__glXDisp_SampleMaskSGIS, __glXDispSwap_SampleMaskSGIS},
-    /* [ 241] =  2049 */ {__glXDisp_SamplePatternSGIS, __glXDispSwap_SamplePatternSGIS},
-    /* [ 242] =  2050 */ {NULL, NULL},
-    /* [ 243] =  2051 */ {NULL, NULL},
-    /* [ 244] =  2052 */ {NULL, NULL},
-    /* [ 245] =  2053 */ {__glXDisp_ColorTable, __glXDispSwap_ColorTable},
-    /* [ 246] =  2054 */ {__glXDisp_ColorTableParameterfv, __glXDispSwap_ColorTableParameterfv},
-    /* [ 247] =  2055 */ {__glXDisp_ColorTableParameteriv, __glXDispSwap_ColorTableParameteriv},
-    /* [ 248] =  2056 */ {__glXDisp_CopyColorTable, __glXDispSwap_CopyColorTable},
-    /* [ 249] =  2057 */ {NULL, NULL},
-    /* [ 250] =  2058 */ {NULL, NULL},
-    /* [ 251] =  2059 */ {NULL, NULL},
-    /* [ 252] =  2060 */ {NULL, NULL},
-    /* [ 253] =  2061 */ {NULL, NULL},
-    /* [ 254] =  2062 */ {NULL, NULL},
-    /* [ 255] =  2063 */ {NULL, NULL},
-    /* [ 256] =  2064 */ {NULL, NULL},
-    /* [ 257] =  2065 */ {__glXDisp_PointParameterfEXT, __glXDispSwap_PointParameterfEXT},
-    /* [ 258] =  2066 */ {__glXDisp_PointParameterfvEXT, __glXDispSwap_PointParameterfvEXT},
-    /* [ 259] =  2067 */ {NULL, NULL},
-    /* [ 260] =  2068 */ {NULL, NULL},
-    /* [ 261] =  2069 */ {NULL, NULL},
-    /* [ 262] =  2070 */ {NULL, NULL},
-    /* [ 263] =  2071 */ {NULL, NULL},
-    /* [ 264] =  4096 */ {__glXDisp_BlendColor, __glXDispSwap_BlendColor},
-    /* [ 265] =  4097 */ {__glXDisp_BlendEquation, __glXDispSwap_BlendEquation},
-    /* [ 266] =  4098 */ {NULL, NULL},
-    /* [ 267] =  4099 */ {__glXDisp_TexSubImage1D, __glXDispSwap_TexSubImage1D},
-    /* [ 268] =  4100 */ {__glXDisp_TexSubImage2D, __glXDispSwap_TexSubImage2D},
-    /* [ 269] =  4101 */ {__glXDisp_ConvolutionFilter1D, __glXDispSwap_ConvolutionFilter1D},
-    /* [ 270] =  4102 */ {__glXDisp_ConvolutionFilter2D, __glXDispSwap_ConvolutionFilter2D},
-    /* [ 271] =  4103 */ {__glXDisp_ConvolutionParameterf, __glXDispSwap_ConvolutionParameterf},
-    /* [ 272] =  4104 */ {__glXDisp_ConvolutionParameterfv, __glXDispSwap_ConvolutionParameterfv},
-    /* [ 273] =  4105 */ {__glXDisp_ConvolutionParameteri, __glXDispSwap_ConvolutionParameteri},
-    /* [ 274] =  4106 */ {__glXDisp_ConvolutionParameteriv, __glXDispSwap_ConvolutionParameteriv},
-    /* [ 275] =  4107 */ {__glXDisp_CopyConvolutionFilter1D, __glXDispSwap_CopyConvolutionFilter1D},
-    /* [ 276] =  4108 */ {__glXDisp_CopyConvolutionFilter2D, __glXDispSwap_CopyConvolutionFilter2D},
-    /* [ 277] =  4109 */ {__glXDisp_SeparableFilter2D, __glXDispSwap_SeparableFilter2D},
-    /* [ 278] =  4110 */ {__glXDisp_Histogram, __glXDispSwap_Histogram},
-    /* [ 279] =  4111 */ {__glXDisp_Minmax, __glXDispSwap_Minmax},
-    /* [ 280] =  4112 */ {__glXDisp_ResetHistogram, __glXDispSwap_ResetHistogram},
-    /* [ 281] =  4113 */ {__glXDisp_ResetMinmax, __glXDispSwap_ResetMinmax},
-    /* [ 282] =  4114 */ {__glXDisp_TexImage3D, __glXDispSwap_TexImage3D},
-    /* [ 283] =  4115 */ {__glXDisp_TexSubImage3D, __glXDispSwap_TexSubImage3D},
-    /* [ 284] =  4116 */ {NULL, NULL},
-    /* [ 285] =  4117 */ {__glXDisp_BindTexture, __glXDispSwap_BindTexture},
-    /* [ 286] =  4118 */ {__glXDisp_PrioritizeTextures, __glXDispSwap_PrioritizeTextures},
-    /* [ 287] =  4119 */ {__glXDisp_CopyTexImage1D, __glXDispSwap_CopyTexImage1D},
-    /* [ 288] =  4120 */ {__glXDisp_CopyTexImage2D, __glXDispSwap_CopyTexImage2D},
-    /* [ 289] =  4121 */ {__glXDisp_CopyTexSubImage1D, __glXDispSwap_CopyTexSubImage1D},
-    /* [ 290] =  4122 */ {__glXDisp_CopyTexSubImage2D, __glXDispSwap_CopyTexSubImage2D},
-    /* [ 291] =  4123 */ {__glXDisp_CopyTexSubImage3D, __glXDispSwap_CopyTexSubImage3D},
-    /* [ 292] =  4124 */ {__glXDisp_FogCoordfvEXT, __glXDispSwap_FogCoordfvEXT},
-    /* [ 293] =  4125 */ {__glXDisp_FogCoorddvEXT, __glXDispSwap_FogCoorddvEXT},
-    /* [ 294] =  4126 */ {__glXDisp_SecondaryColor3bvEXT, __glXDispSwap_SecondaryColor3bvEXT},
-    /* [ 295] =  4127 */ {__glXDisp_SecondaryColor3svEXT, __glXDispSwap_SecondaryColor3svEXT},
-    /* [ 296] =  4176 */ {NULL, NULL},
-    /* [ 297] =  4177 */ {NULL, NULL},
-    /* [ 298] =  4178 */ {NULL, NULL},
-    /* [ 299] =  4179 */ {NULL, NULL},
-    /* [ 300] =  4180 */ {__glXDisp_BindProgramNV, __glXDispSwap_BindProgramNV},
-    /* [ 301] =  4181 */ {__glXDisp_ExecuteProgramNV, __glXDispSwap_ExecuteProgramNV},
-    /* [ 302] =  4182 */ {__glXDisp_RequestResidentProgramsNV, __glXDispSwap_RequestResidentProgramsNV},
-    /* [ 303] =  4183 */ {__glXDisp_LoadProgramNV, __glXDispSwap_LoadProgramNV},
-    /* [ 304] =  4184 */ {__glXDisp_ProgramEnvParameter4fvARB, __glXDispSwap_ProgramEnvParameter4fvARB},
-    /* [ 305] =  4185 */ {__glXDisp_ProgramEnvParameter4dvARB, __glXDispSwap_ProgramEnvParameter4dvARB},
-    /* [ 306] =  4186 */ {__glXDisp_ProgramParameters4fvNV, __glXDispSwap_ProgramParameters4fvNV},
-    /* [ 307] =  4187 */ {__glXDisp_ProgramParameters4dvNV, __glXDispSwap_ProgramParameters4dvNV},
-    /* [ 308] =  4188 */ {__glXDisp_TrackMatrixNV, __glXDispSwap_TrackMatrixNV},
-    /* [ 309] =  4189 */ {__glXDisp_VertexAttrib1svARB, __glXDispSwap_VertexAttrib1svARB},
-    /* [ 310] =  4190 */ {__glXDisp_VertexAttrib2svARB, __glXDispSwap_VertexAttrib2svARB},
-    /* [ 311] =  4191 */ {__glXDisp_VertexAttrib3svARB, __glXDispSwap_VertexAttrib3svARB},
-    /* [ 312] =  4192 */ {__glXDisp_VertexAttrib4svARB, __glXDispSwap_VertexAttrib4svARB},
-    /* [ 313] =  4193 */ {__glXDisp_VertexAttrib1fvARB, __glXDispSwap_VertexAttrib1fvARB},
-    /* [ 314] =  4194 */ {__glXDisp_VertexAttrib2fvARB, __glXDispSwap_VertexAttrib2fvARB},
-    /* [ 315] =  4195 */ {__glXDisp_VertexAttrib3fvARB, __glXDispSwap_VertexAttrib3fvARB},
-    /* [ 316] =  4196 */ {__glXDisp_VertexAttrib4fvARB, __glXDispSwap_VertexAttrib4fvARB},
-    /* [ 317] =  4197 */ {__glXDisp_VertexAttrib1dvARB, __glXDispSwap_VertexAttrib1dvARB},
-    /* [ 318] =  4198 */ {__glXDisp_VertexAttrib2dvARB, __glXDispSwap_VertexAttrib2dvARB},
-    /* [ 319] =  4199 */ {__glXDisp_VertexAttrib3dvARB, __glXDispSwap_VertexAttrib3dvARB},
-    /* [ 320] =  4200 */ {__glXDisp_VertexAttrib4dvARB, __glXDispSwap_VertexAttrib4dvARB},
-    /* [ 321] =  4201 */ {__glXDisp_VertexAttrib4NubvARB, __glXDispSwap_VertexAttrib4NubvARB},
-    /* [ 322] =  4202 */ {__glXDisp_VertexAttribs1svNV, __glXDispSwap_VertexAttribs1svNV},
-    /* [ 323] =  4203 */ {__glXDisp_VertexAttribs2svNV, __glXDispSwap_VertexAttribs2svNV},
-    /* [ 324] =  4204 */ {__glXDisp_VertexAttribs3svNV, __glXDispSwap_VertexAttribs3svNV},
-    /* [ 325] =  4205 */ {__glXDisp_VertexAttribs4svNV, __glXDispSwap_VertexAttribs4svNV},
-    /* [ 326] =  4206 */ {__glXDisp_VertexAttribs1fvNV, __glXDispSwap_VertexAttribs1fvNV},
-    /* [ 327] =  4207 */ {__glXDisp_VertexAttribs2fvNV, __glXDispSwap_VertexAttribs2fvNV},
-    /* [ 328] =  4208 */ {__glXDisp_VertexAttribs3fvNV, __glXDispSwap_VertexAttribs3fvNV},
-    /* [ 329] =  4209 */ {__glXDisp_VertexAttribs4fvNV, __glXDispSwap_VertexAttribs4fvNV},
-    /* [ 330] =  4210 */ {__glXDisp_VertexAttribs1dvNV, __glXDispSwap_VertexAttribs1dvNV},
-    /* [ 331] =  4211 */ {__glXDisp_VertexAttribs2dvNV, __glXDispSwap_VertexAttribs2dvNV},
-    /* [ 332] =  4212 */ {__glXDisp_VertexAttribs3dvNV, __glXDispSwap_VertexAttribs3dvNV},
-    /* [ 333] =  4213 */ {__glXDisp_VertexAttribs4dvNV, __glXDispSwap_VertexAttribs4dvNV},
-    /* [ 334] =  4214 */ {__glXDisp_VertexAttribs4ubvNV, __glXDispSwap_VertexAttribs4ubvNV},
-    /* [ 335] =  4215 */ {__glXDisp_ProgramLocalParameter4fvARB, __glXDispSwap_ProgramLocalParameter4fvARB},
-    /* [ 336] =  4216 */ {__glXDisp_ProgramLocalParameter4dvARB, __glXDispSwap_ProgramLocalParameter4dvARB},
-    /* [ 337] =  4217 */ {__glXDisp_ProgramStringARB, __glXDispSwap_ProgramStringARB},
-    /* [ 338] =  4218 */ {__glXDisp_ProgramNamedParameter4fvNV, __glXDispSwap_ProgramNamedParameter4fvNV},
-    /* [ 339] =  4219 */ {__glXDisp_ProgramNamedParameter4dvNV, __glXDispSwap_ProgramNamedParameter4dvNV},
-    /* [ 340] =  4220 */ {__glXDisp_ActiveStencilFaceEXT, __glXDispSwap_ActiveStencilFaceEXT},
-    /* [ 341] =  4221 */ {__glXDisp_PointParameteriNV, __glXDispSwap_PointParameteriNV},
-    /* [ 342] =  4222 */ {__glXDisp_PointParameterivNV, __glXDispSwap_PointParameterivNV},
-    /* [ 343] =  4223 */ {NULL, NULL},
-    /* [ 344] =  4224 */ {NULL, NULL},
-    /* [ 345] =  4225 */ {NULL, NULL},
-    /* [ 346] =  4226 */ {NULL, NULL},
-    /* [ 347] =  4227 */ {NULL, NULL},
-    /* [ 348] =  4228 */ {__glXDisp_BlendEquationSeparateEXT, __glXDispSwap_BlendEquationSeparateEXT},
-    /* [ 349] =  4229 */ {NULL, NULL},
-    /* [ 350] =  4230 */ {__glXDisp_VertexAttrib4bvARB, __glXDispSwap_VertexAttrib4bvARB},
-    /* [ 351] =  4231 */ {__glXDisp_VertexAttrib4ivARB, __glXDispSwap_VertexAttrib4ivARB},
-    /* [ 352] =  4232 */ {__glXDisp_VertexAttrib4ubvARB, __glXDispSwap_VertexAttrib4ubvARB},
-    /* [ 353] =  4233 */ {__glXDisp_VertexAttrib4usvARB, __glXDispSwap_VertexAttrib4usvARB},
-    /* [ 354] =  4234 */ {__glXDisp_VertexAttrib4uivARB, __glXDispSwap_VertexAttrib4uivARB},
-    /* [ 355] =  4235 */ {__glXDisp_VertexAttrib4NbvARB, __glXDispSwap_VertexAttrib4NbvARB},
-    /* [ 356] =  4236 */ {__glXDisp_VertexAttrib4NsvARB, __glXDispSwap_VertexAttrib4NsvARB},
-    /* [ 357] =  4237 */ {__glXDisp_VertexAttrib4NivARB, __glXDispSwap_VertexAttrib4NivARB},
-    /* [ 358] =  4238 */ {__glXDisp_VertexAttrib4NusvARB, __glXDispSwap_VertexAttrib4NusvARB},
-    /* [ 359] =  4239 */ {__glXDisp_VertexAttrib4NuivARB, __glXDispSwap_VertexAttrib4NuivARB},
-    /* [ 360] =  4128 */ {__glXDisp_SecondaryColor3ivEXT, __glXDispSwap_SecondaryColor3ivEXT},
-    /* [ 361] =  4129 */ {__glXDisp_SecondaryColor3fvEXT, __glXDispSwap_SecondaryColor3fvEXT},
-    /* [ 362] =  4130 */ {__glXDisp_SecondaryColor3dvEXT, __glXDispSwap_SecondaryColor3dvEXT},
-    /* [ 363] =  4131 */ {__glXDisp_SecondaryColor3ubvEXT, __glXDispSwap_SecondaryColor3ubvEXT},
-    /* [ 364] =  4132 */ {__glXDisp_SecondaryColor3usvEXT, __glXDispSwap_SecondaryColor3usvEXT},
-    /* [ 365] =  4133 */ {__glXDisp_SecondaryColor3uivEXT, __glXDispSwap_SecondaryColor3uivEXT},
-    /* [ 366] =  4134 */ {__glXDisp_BlendFuncSeparateEXT, __glXDispSwap_BlendFuncSeparateEXT},
-    /* [ 367] =  4135 */ {NULL, NULL},
-    /* [ 368] =  4264 */ {NULL, NULL},
-    /* [ 369] =  4265 */ {__glXDisp_VertexAttrib1svNV, __glXDispSwap_VertexAttrib1svNV},
-    /* [ 370] =  4266 */ {__glXDisp_VertexAttrib2svNV, __glXDispSwap_VertexAttrib2svNV},
-    /* [ 371] =  4267 */ {__glXDisp_VertexAttrib3svNV, __glXDispSwap_VertexAttrib3svNV},
-    /* [ 372] =  4268 */ {__glXDisp_VertexAttrib4svNV, __glXDispSwap_VertexAttrib4svNV},
-    /* [ 373] =  4269 */ {__glXDisp_VertexAttrib1fvNV, __glXDispSwap_VertexAttrib1fvNV},
-    /* [ 374] =  4270 */ {__glXDisp_VertexAttrib2fvNV, __glXDispSwap_VertexAttrib2fvNV},
-    /* [ 375] =  4271 */ {__glXDisp_VertexAttrib3fvNV, __glXDispSwap_VertexAttrib3fvNV},
-    /* [ 376] =  4272 */ {__glXDisp_VertexAttrib4fvNV, __glXDispSwap_VertexAttrib4fvNV},
-    /* [ 377] =  4273 */ {__glXDisp_VertexAttrib1dvNV, __glXDispSwap_VertexAttrib1dvNV},
-    /* [ 378] =  4274 */ {__glXDisp_VertexAttrib2dvNV, __glXDispSwap_VertexAttrib2dvNV},
-    /* [ 379] =  4275 */ {__glXDisp_VertexAttrib3dvNV, __glXDispSwap_VertexAttrib3dvNV},
-    /* [ 380] =  4276 */ {__glXDisp_VertexAttrib4dvNV, __glXDispSwap_VertexAttrib4dvNV},
-    /* [ 381] =  4277 */ {__glXDisp_VertexAttrib4ubvNV, __glXDispSwap_VertexAttrib4ubvNV},
-    /* [ 382] =  4278 */ {NULL, NULL},
-    /* [ 383] =  4279 */ {NULL, NULL},
-    /* [ 384] =  4312 */ {NULL, NULL},
-    /* [ 385] =  4313 */ {NULL, NULL},
-    /* [ 386] =  4314 */ {NULL, NULL},
-    /* [ 387] =  4315 */ {NULL, NULL},
-    /* [ 388] =  4316 */ {__glXDisp_BindRenderbufferEXT, __glXDispSwap_BindRenderbufferEXT},
-    /* [ 389] =  4317 */ {__glXDisp_DeleteRenderbuffersEXT, __glXDispSwap_DeleteRenderbuffersEXT},
-    /* [ 390] =  4318 */ {__glXDisp_RenderbufferStorageEXT, __glXDispSwap_RenderbufferStorageEXT},
-    /* [ 391] =  4319 */ {__glXDisp_BindFramebufferEXT, __glXDispSwap_BindFramebufferEXT},
-    /* [ 392] =  4320 */ {__glXDisp_DeleteFramebuffersEXT, __glXDispSwap_DeleteFramebuffersEXT},
-    /* [ 393] =  4321 */ {__glXDisp_FramebufferTexture1DEXT, __glXDispSwap_FramebufferTexture1DEXT},
-    /* [ 394] =  4322 */ {__glXDisp_FramebufferTexture2DEXT, __glXDispSwap_FramebufferTexture2DEXT},
-    /* [ 395] =  4323 */ {__glXDisp_FramebufferTexture3DEXT, __glXDispSwap_FramebufferTexture3DEXT},
-    /* [ 396] =  4324 */ {__glXDisp_FramebufferRenderbufferEXT, __glXDispSwap_FramebufferRenderbufferEXT},
-    /* [ 397] =  4325 */ {__glXDisp_GenerateMipmapEXT, __glXDispSwap_GenerateMipmapEXT},
-    /* [ 398] =  4326 */ {NULL, NULL},
-    /* [ 399] =  4327 */ {NULL, NULL},
-};
-
-static const int_fast16_t Render_size_table[400][2] = {
-    /* [  0] =     0 */ {  0, ~0},
-    /* [  1] =     1 */ {  8, ~0},
-    /* [  2] =     2 */ { 12,  0},
-    /* [  3] =     3 */ {  8, ~0},
-    /* [  4] =     4 */ {  8, ~0},
-    /* [  5] =     5 */ { 48,  1},
-    /* [  6] =     6 */ {  8, ~0},
-    /* [  7] =     7 */ { 28, ~0},
-    /* [  8] =     8 */ { 16, ~0},
-    /* [  9] =     9 */ { 16, ~0},
-    /* [ 10] =    10 */ { 12, ~0},
-    /* [ 11] =    11 */ {  8, ~0},
-    /* [ 12] =    12 */ { 16, ~0},
-    /* [ 13] =    13 */ { 12, ~0},
-    /* [ 14] =    14 */ {  8, ~0},
-    /* [ 15] =    15 */ { 36, ~0},
-    /* [ 16] =    16 */ { 20, ~0},
-    /* [ 17] =    17 */ { 20, ~0},
-    /* [ 18] =    18 */ { 12, ~0},
-    /* [ 19] =    19 */ {  8, ~0},
-    /* [ 20] =    20 */ { 20, ~0},
-    /* [ 21] =    21 */ { 12, ~0},
-    /* [ 22] =    22 */ {  8, ~0},
-    /* [ 23] =    23 */ {  4, ~0},
-    /* [ 24] =    24 */ { 12, ~0},
-    /* [ 25] =    25 */ {  8, ~0},
-    /* [ 26] =    26 */ {  8, ~0},
-    /* [ 27] =    27 */ {  8, ~0},
-    /* [ 28] =    28 */ {  8, ~0},
-    /* [ 29] =    29 */ { 28, ~0},
-    /* [ 30] =    30 */ { 16, ~0},
-    /* [ 31] =    31 */ { 16, ~0},
-    /* [ 32] =    32 */ { 12, ~0},
-    /* [ 33] =    33 */ { 20, ~0},
-    /* [ 34] =    34 */ { 12, ~0},
-    /* [ 35] =    35 */ { 12, ~0},
-    /* [ 36] =    36 */ {  8, ~0},
-    /* [ 37] =    37 */ { 28, ~0},
-    /* [ 38] =    38 */ { 16, ~0},
-    /* [ 39] =    39 */ { 16, ~0},
-    /* [ 40] =    40 */ { 12, ~0},
-    /* [ 41] =    41 */ { 36, ~0},
-    /* [ 42] =    42 */ { 20, ~0},
-    /* [ 43] =    43 */ { 20, ~0},
-    /* [ 44] =    44 */ { 12, ~0},
-    /* [ 45] =    45 */ { 36, ~0},
-    /* [ 46] =    46 */ { 20, ~0},
-    /* [ 47] =    47 */ { 20, ~0},
-    /* [ 48] =    48 */ { 12, ~0},
-    /* [ 49] =    49 */ { 12, ~0},
-    /* [ 50] =    50 */ {  8, ~0},
-    /* [ 51] =    51 */ {  8, ~0},
-    /* [ 52] =    52 */ {  8, ~0},
-    /* [ 53] =    53 */ { 20, ~0},
-    /* [ 54] =    54 */ { 12, ~0},
-    /* [ 55] =    55 */ { 12, ~0},
-    /* [ 56] =    56 */ {  8, ~0},
-    /* [ 57] =    57 */ { 28, ~0},
-    /* [ 58] =    58 */ { 16, ~0},
-    /* [ 59] =    59 */ { 16, ~0},
-    /* [ 60] =    60 */ { 12, ~0},
-    /* [ 61] =    61 */ { 36, ~0},
-    /* [ 62] =    62 */ { 20, ~0},
-    /* [ 63] =    63 */ { 20, ~0},
-    /* [ 64] =    64 */ { 12, ~0},
-    /* [ 65] =    65 */ { 20, ~0},
-    /* [ 66] =    66 */ { 12, ~0},
-    /* [ 67] =    67 */ { 12, ~0},
-    /* [ 68] =    68 */ {  8, ~0},
-    /* [ 69] =    69 */ { 28, ~0},
-    /* [ 70] =    70 */ { 16, ~0},
-    /* [ 71] =    71 */ { 16, ~0},
-    /* [ 72] =    72 */ { 12, ~0},
-    /* [ 73] =    73 */ { 36, ~0},
-    /* [ 74] =    74 */ { 20, ~0},
-    /* [ 75] =    75 */ { 20, ~0},
-    /* [ 76] =    76 */ { 12, ~0},
-    /* [ 77] =    77 */ { 40, ~0},
-    /* [ 78] =    78 */ { 12, ~0},
-    /* [ 79] =    79 */ {  8, ~0},
-    /* [ 80] =    80 */ { 12, ~0},
-    /* [ 81] =    81 */ {  8,  2},
-    /* [ 82] =    82 */ { 12, ~0},
-    /* [ 83] =    83 */ {  8,  3},
-    /* [ 84] =    84 */ {  8, ~0},
-    /* [ 85] =    85 */ { 12, ~0},
-    /* [ 86] =    86 */ { 16, ~0},
-    /* [ 87] =    87 */ { 12,  4},
-    /* [ 88] =    88 */ { 16, ~0},
-    /* [ 89] =    89 */ { 12,  5},
-    /* [ 90] =    90 */ { 12, ~0},
-    /* [ 91] =    91 */ {  8,  6},
-    /* [ 92] =    92 */ { 12, ~0},
-    /* [ 93] =    93 */ {  8,  7},
-    /* [ 94] =    94 */ { 12, ~0},
-    /* [ 95] =    95 */ {  8, ~0},
-    /* [ 96] =    96 */ { 16, ~0},
-    /* [ 97] =    97 */ { 12,  8},
-    /* [ 98] =    98 */ { 16, ~0},
-    /* [ 99] =    99 */ { 12,  9},
-    /* [100] =   100 */ {  8, ~0},
-    /* [101] =   101 */ { 12, ~0},
-    /* [102] =   102 */ { 24, 10},
-    /* [103] =   103 */ { 20, ~0},
-    /* [104] =   104 */ {  8, ~0},
-    /* [105] =   105 */ { 16, ~0},
-    /* [106] =   106 */ { 12, 11},
-    /* [107] =   107 */ { 16, ~0},
-    /* [108] =   108 */ { 12, 12},
-    /* [109] =   109 */ { 56, 13},
-    /* [110] =   110 */ { 56, 14},
-    /* [111] =   111 */ { 16, ~0},
-    /* [112] =   112 */ { 12, 15},
-    /* [113] =   113 */ { 16, ~0},
-    /* [114] =   114 */ { 12, 16},
-    /* [115] =   115 */ { 20, ~0},
-    /* [116] =   116 */ { 12, 17},
-    /* [117] =   117 */ { 16, ~0},
-    /* [118] =   118 */ { 12, 18},
-    /* [119] =   119 */ { 16, ~0},
-    /* [120] =   120 */ { 12, 19},
-    /* [121] =   121 */ {  4, ~0},
-    /* [122] =   122 */ {  8, ~0},
-    /* [123] =   123 */ {  8, ~0},
-    /* [124] =   124 */ {  4, ~0},
-    /* [125] =   125 */ {  8, ~0},
-    /* [126] =   126 */ {  8, ~0},
-    /* [127] =   127 */ {  8, ~0},
-    /* [128] =   128 */ { 20, ~0},
-    /* [129] =   129 */ {  8, ~0},
-    /* [130] =   130 */ { 20, ~0},
-    /* [131] =   131 */ {  8, ~0},
-    /* [132] =   132 */ { 12, ~0},
-    /* [133] =   133 */ {  8, ~0},
-    /* [134] =   134 */ {  8, ~0},
-    /* [135] =   135 */ {  8, ~0},
-    /* [136] =   136 */ {  8, ~0},
-    /* [137] =   137 */ { 12, ~0},
-    /* [138] =   138 */ {  8, ~0},
-    /* [139] =   139 */ {  8, ~0},
-    /* [140] =   140 */ {  0, ~0},
-    /* [141] =   141 */ {  4, ~0},
-    /* [142] =   142 */ {  8, ~0},
-    /* [143] =   143 */ { 28, 20},
-    /* [144] =   144 */ { 20, 21},
-    /* [145] =   145 */ { 48, 22},
-    /* [146] =   146 */ { 32, 23},
-    /* [147] =   147 */ { 24, ~0},
-    /* [148] =   148 */ { 16, ~0},
-    /* [149] =   149 */ { 44, ~0},
-    /* [150] =   150 */ { 28, ~0},
-    /* [151] =   151 */ { 12, ~0},
-    /* [152] =   152 */ {  8, ~0},
-    /* [153] =   153 */ { 20, ~0},
-    /* [154] =   154 */ { 12, ~0},
-    /* [155] =   155 */ { 16, ~0},
-    /* [156] =   156 */ {  8, ~0},
-    /* [157] =   157 */ { 24, ~0},
-    /* [158] =   158 */ { 12, ~0},
-    /* [159] =   159 */ { 12, ~0},
-    /* [160] =   160 */ { 12, ~0},
-    /* [161] =   161 */ {  8, ~0},
-    /* [162] =   162 */ { 16, ~0},
-    /* [163] =   163 */ { 16, ~0},
-    /* [164] =   164 */ {  8, ~0},
-    /* [165] =   165 */ { 12, ~0},
-    /* [166] =   166 */ { 12, ~0},
-    /* [167] =   167 */ { 12, ~0},
-    /* [168] =   168 */ { 12, 24},
-    /* [169] =   169 */ { 12, 25},
-    /* [170] =   170 */ { 12, 26},
-    /* [171] =   171 */ {  8, ~0},
-    /* [172] =   172 */ { 24, ~0},
-    /* [173] =   173 */ { 40, 27},
-    /* [174] =   174 */ { 20, ~0},
-    /* [175] =   175 */ { 52, ~0},
-    /* [176] =   176 */ {  4, ~0},
-    /* [177] =   177 */ { 68, ~0},
-    /* [178] =   178 */ {132, ~0},
-    /* [179] =   179 */ {  8, ~0},
-    /* [180] =   180 */ { 68, ~0},
-    /* [181] =   181 */ {132, ~0},
-    /* [182] =   182 */ { 52, ~0},
-    /* [183] =   183 */ {  4, ~0},
-    /* [184] =   184 */ {  4, ~0},
-    /* [185] =   185 */ { 36, ~0},
-    /* [186] =   186 */ { 20, ~0},
-    /* [187] =   187 */ { 28, ~0},
-    /* [188] =   188 */ { 16, ~0},
-    /* [189] =   189 */ { 28, ~0},
-    /* [190] =   190 */ { 16, ~0},
-    /* [191] =   191 */ { 20, ~0},
-    /* [192] =   192 */ { 12, ~0},
-    /* [193] =   193 */ { 16, 28},
-    /* [194] =   194 */ {  8, ~0},
-    /* [195] =   195 */ { 44, 29},
-    /* [196] =   196 */ { 24, ~0},
-    /* [197] =   197 */ {  8, ~0},
-    /* [198] =   198 */ { 16, ~0},
-    /* [199] =   199 */ { 12, ~0},
-    /* [200] =   200 */ { 12, ~0},
-    /* [201] =   201 */ { 12, ~0},
-    /* [202] =   202 */ { 24, ~0},
-    /* [203] =   203 */ { 16, ~0},
-    /* [204] =   204 */ { 16, ~0},
-    /* [205] =   205 */ { 12, ~0},
-    /* [206] =   206 */ { 32, ~0},
-    /* [207] =   207 */ { 20, ~0},
-    /* [208] =   208 */ { 20, ~0},
-    /* [209] =   209 */ { 16, ~0},
-    /* [210] =   210 */ { 40, ~0},
-    /* [211] =   211 */ { 24, ~0},
-    /* [212] =   212 */ { 24, ~0},
-    /* [213] =   213 */ { 16, ~0},
-    /* [214] =   214 */ { 28, 30},
-    /* [215] =   215 */ { 32, 31},
-    /* [216] =   216 */ { 36, 32},
-    /* [217] =   217 */ { 28, 33},
-    /* [218] =   218 */ { 36, 34},
-    /* [219] =   219 */ { 44, 35},
-    /* [220] =   220 */ {  0, ~0},
-    /* [221] =   221 */ {  0, ~0},
-    /* [222] =   222 */ {  0, ~0},
-    /* [223] =   223 */ {  0, ~0},
-    /* [224] =   224 */ {  0, ~0},
-    /* [225] =   225 */ {  0, ~0},
-    /* [226] =   226 */ {  0, ~0},
-    /* [227] =   227 */ {  0, ~0},
-    /* [228] =   228 */ {  0, ~0},
-    /* [229] =   229 */ { 12, ~0},
-    /* [230] =   230 */ { 16, ~0},
-    /* [231] =   231 */ { 12, ~0},
-    /* [232] =   232 */ {  8, ~0},
-    /* [233] =   233 */ {  8, 36},
-    /* [234] =   234 */ {  0, ~0},
-    /* [235] =   235 */ {  0, ~0},
-    /* [236] =   236 */ {  0, ~0},
-    /* [237] =   237 */ {  0, ~0},
-    /* [238] =   238 */ {  0, ~0},
-    /* [239] =   239 */ {  0, ~0},
-    /* [240] =  2048 */ { 12, ~0},
-    /* [241] =  2049 */ {  8, ~0},
-    /* [242] =  2050 */ {  0, ~0},
-    /* [243] =  2051 */ {  0, ~0},
-    /* [244] =  2052 */ {  0, ~0},
-    /* [245] =  2053 */ { 44, 37},
-    /* [246] =  2054 */ { 12, 38},
-    /* [247] =  2055 */ { 12, 39},
-    /* [248] =  2056 */ { 24, ~0},
-    /* [249] =  2057 */ {  0, ~0},
-    /* [250] =  2058 */ {  0, ~0},
-    /* [251] =  2059 */ {  0, ~0},
-    /* [252] =  2060 */ {  0, ~0},
-    /* [253] =  2061 */ {  0, ~0},
-    /* [254] =  2062 */ {  0, ~0},
-    /* [255] =  2063 */ {  0, ~0},
-    /* [256] =  2064 */ {  0, ~0},
-    /* [257] =  2065 */ { 12, ~0},
-    /* [258] =  2066 */ {  8, 40},
-    /* [259] =  2067 */ {  0, ~0},
-    /* [260] =  2068 */ {  0, ~0},
-    /* [261] =  2069 */ {  0, ~0},
-    /* [262] =  2070 */ {  0, ~0},
-    /* [263] =  2071 */ {  0, ~0},
-    /* [264] =  4096 */ { 20, ~0},
-    /* [265] =  4097 */ {  8, ~0},
-    /* [266] =  4098 */ {  0, ~0},
-    /* [267] =  4099 */ { 60, 41},
-    /* [268] =  4100 */ { 60, 42},
-    /* [269] =  4101 */ { 48, 43},
-    /* [270] =  4102 */ { 48, 44},
-    /* [271] =  4103 */ { 16, ~0},
-    /* [272] =  4104 */ { 12, 45},
-    /* [273] =  4105 */ { 16, ~0},
-    /* [274] =  4106 */ { 12, 46},
-    /* [275] =  4107 */ { 24, ~0},
-    /* [276] =  4108 */ { 28, ~0},
-    /* [277] =  4109 */ { 32, 47},
-    /* [278] =  4110 */ { 20, ~0},
-    /* [279] =  4111 */ { 16, ~0},
-    /* [280] =  4112 */ {  8, ~0},
-    /* [281] =  4113 */ {  8, ~0},
-    /* [282] =  4114 */ { 84, 48},
-    /* [283] =  4115 */ { 92, 49},
-    /* [284] =  4116 */ {  0, ~0},
-    /* [285] =  4117 */ { 12, ~0},
-    /* [286] =  4118 */ {  8, 50},
-    /* [287] =  4119 */ { 32, ~0},
-    /* [288] =  4120 */ { 36, ~0},
-    /* [289] =  4121 */ { 28, ~0},
-    /* [290] =  4122 */ { 36, ~0},
-    /* [291] =  4123 */ { 40, ~0},
-    /* [292] =  4124 */ {  8, ~0},
-    /* [293] =  4125 */ { 12, ~0},
-    /* [294] =  4126 */ {  8, ~0},
-    /* [295] =  4127 */ { 12, ~0},
-    /* [296] =  4176 */ {  0, ~0},
-    /* [297] =  4177 */ {  0, ~0},
-    /* [298] =  4178 */ {  0, ~0},
-    /* [299] =  4179 */ {  0, ~0},
-    /* [300] =  4180 */ { 12, ~0},
-    /* [301] =  4181 */ { 28, ~0},
-    /* [302] =  4182 */ {  8, 51},
-    /* [303] =  4183 */ { 16, 52},
-    /* [304] =  4184 */ { 28, ~0},
-    /* [305] =  4185 */ { 44, ~0},
-    /* [306] =  4186 */ { 16, 53},
-    /* [307] =  4187 */ { 16, 54},
-    /* [308] =  4188 */ { 20, ~0},
-    /* [309] =  4189 */ { 12, ~0},
-    /* [310] =  4190 */ { 12, ~0},
-    /* [311] =  4191 */ { 16, ~0},
-    /* [312] =  4192 */ { 16, ~0},
-    /* [313] =  4193 */ { 12, ~0},
-    /* [314] =  4194 */ { 16, ~0},
-    /* [315] =  4195 */ { 20, ~0},
-    /* [316] =  4196 */ { 24, ~0},
-    /* [317] =  4197 */ { 16, ~0},
-    /* [318] =  4198 */ { 24, ~0},
-    /* [319] =  4199 */ { 32, ~0},
-    /* [320] =  4200 */ { 40, ~0},
-    /* [321] =  4201 */ { 12, ~0},
-    /* [322] =  4202 */ { 12, 55},
-    /* [323] =  4203 */ { 12, 56},
-    /* [324] =  4204 */ { 12, 57},
-    /* [325] =  4205 */ { 12, 58},
-    /* [326] =  4206 */ { 12, 59},
-    /* [327] =  4207 */ { 12, 60},
-    /* [328] =  4208 */ { 12, 61},
-    /* [329] =  4209 */ { 12, 62},
-    /* [330] =  4210 */ { 12, 63},
-    /* [331] =  4211 */ { 12, 64},
-    /* [332] =  4212 */ { 12, 65},
-    /* [333] =  4213 */ { 12, 66},
-    /* [334] =  4214 */ { 12, 67},
-    /* [335] =  4215 */ { 28, ~0},
-    /* [336] =  4216 */ { 44, ~0},
-    /* [337] =  4217 */ { 16, 68},
-    /* [338] =  4218 */ { 28, 69},
-    /* [339] =  4219 */ { 44, 70},
-    /* [340] =  4220 */ {  8, ~0},
-    /* [341] =  4221 */ { 12, ~0},
-    /* [342] =  4222 */ {  8, 71},
-    /* [343] =  4223 */ {  0, ~0},
-    /* [344] =  4224 */ {  0, ~0},
-    /* [345] =  4225 */ {  0, ~0},
-    /* [346] =  4226 */ {  0, ~0},
-    /* [347] =  4227 */ {  0, ~0},
-    /* [348] =  4228 */ { 12, ~0},
-    /* [349] =  4229 */ {  0, ~0},
-    /* [350] =  4230 */ { 12, ~0},
-    /* [351] =  4231 */ { 24, ~0},
-    /* [352] =  4232 */ { 12, ~0},
-    /* [353] =  4233 */ { 16, ~0},
-    /* [354] =  4234 */ { 24, ~0},
-    /* [355] =  4235 */ { 12, ~0},
-    /* [356] =  4236 */ { 16, ~0},
-    /* [357] =  4237 */ { 24, ~0},
-    /* [358] =  4238 */ { 16, ~0},
-    /* [359] =  4239 */ { 24, ~0},
-    /* [360] =  4128 */ { 16, ~0},
-    /* [361] =  4129 */ { 16, ~0},
-    /* [362] =  4130 */ { 28, ~0},
-    /* [363] =  4131 */ {  8, ~0},
-    /* [364] =  4132 */ { 12, ~0},
-    /* [365] =  4133 */ { 16, ~0},
-    /* [366] =  4134 */ { 20, ~0},
-    /* [367] =  4135 */ {  0, ~0},
-    /* [368] =  4264 */ {  0, ~0},
-    /* [369] =  4265 */ { 12, ~0},
-    /* [370] =  4266 */ { 12, ~0},
-    /* [371] =  4267 */ { 16, ~0},
-    /* [372] =  4268 */ { 16, ~0},
-    /* [373] =  4269 */ { 12, ~0},
-    /* [374] =  4270 */ { 16, ~0},
-    /* [375] =  4271 */ { 20, ~0},
-    /* [376] =  4272 */ { 24, ~0},
-    /* [377] =  4273 */ { 16, ~0},
-    /* [378] =  4274 */ { 24, ~0},
-    /* [379] =  4275 */ { 32, ~0},
-    /* [380] =  4276 */ { 40, ~0},
-    /* [381] =  4277 */ { 12, ~0},
-    /* [382] =  4278 */ {  0, ~0},
-    /* [383] =  4279 */ {  0, ~0},
-    /* [384] =  4312 */ {  0, ~0},
-    /* [385] =  4313 */ {  0, ~0},
-    /* [386] =  4314 */ {  0, ~0},
-    /* [387] =  4315 */ {  0, ~0},
-    /* [388] =  4316 */ { 12, ~0},
-    /* [389] =  4317 */ {  8, 72},
-    /* [390] =  4318 */ { 20, ~0},
-    /* [391] =  4319 */ { 12, ~0},
-    /* [392] =  4320 */ {  8, 73},
-    /* [393] =  4321 */ { 24, ~0},
-    /* [394] =  4322 */ { 24, ~0},
-    /* [395] =  4323 */ { 28, ~0},
-    /* [396] =  4324 */ { 20, ~0},
-    /* [397] =  4325 */ {  8, ~0},
-    /* [398] =  4326 */ {  0, ~0},
-    /* [399] =  4327 */ {  0, ~0},
-};
-
-static const gl_proto_size_func Render_size_func_table[74] = {
-   __glXCallListsReqSize,
-   __glXBitmapReqSize,
-   __glXFogfvReqSize,
-   __glXFogivReqSize,
-   __glXLightfvReqSize,
-   __glXLightivReqSize,
-   __glXLightModelfvReqSize,
-   __glXLightModelivReqSize,
-   __glXMaterialfvReqSize,
-   __glXMaterialivReqSize,
-   __glXPolygonStippleReqSize,
-   __glXTexParameterfvReqSize,
-   __glXTexParameterivReqSize,
-   __glXTexImage1DReqSize,
-   __glXTexImage2DReqSize,
-   __glXTexEnvfvReqSize,
-   __glXTexEnvivReqSize,
-   __glXTexGendvReqSize,
-   __glXTexGenfvReqSize,
-   __glXTexGenivReqSize,
-   __glXMap1dReqSize,
-   __glXMap1fReqSize,
-   __glXMap2dReqSize,
-   __glXMap2fReqSize,
-   __glXPixelMapfvReqSize,
-   __glXPixelMapuivReqSize,
-   __glXPixelMapusvReqSize,
-   __glXDrawPixelsReqSize,
-   __glXDrawArraysReqSize,
-   __glXColorSubTableReqSize,
-   __glXCompressedTexImage1DARBReqSize,
-   __glXCompressedTexImage2DARBReqSize,
-   __glXCompressedTexImage3DARBReqSize,
-   __glXCompressedTexSubImage1DARBReqSize,
-   __glXCompressedTexSubImage2DARBReqSize,
-   __glXCompressedTexSubImage3DARBReqSize,
-   __glXDrawBuffersARBReqSize,
-   __glXColorTableReqSize,
-   __glXColorTableParameterfvReqSize,
-   __glXColorTableParameterivReqSize,
-   __glXPointParameterfvEXTReqSize,
-   __glXTexSubImage1DReqSize,
-   __glXTexSubImage2DReqSize,
-   __glXConvolutionFilter1DReqSize,
-   __glXConvolutionFilter2DReqSize,
-   __glXConvolutionParameterfvReqSize,
-   __glXConvolutionParameterivReqSize,
-   __glXSeparableFilter2DReqSize,
-   __glXTexImage3DReqSize,
-   __glXTexSubImage3DReqSize,
-   __glXPrioritizeTexturesReqSize,
-   __glXRequestResidentProgramsNVReqSize,
-   __glXLoadProgramNVReqSize,
-   __glXProgramParameters4fvNVReqSize,
-   __glXProgramParameters4dvNVReqSize,
-   __glXVertexAttribs1svNVReqSize,
-   __glXVertexAttribs2svNVReqSize,
-   __glXVertexAttribs3svNVReqSize,
-   __glXVertexAttribs4svNVReqSize,
-   __glXVertexAttribs1fvNVReqSize,
-   __glXVertexAttribs2fvNVReqSize,
-   __glXVertexAttribs3fvNVReqSize,
-   __glXVertexAttribs4fvNVReqSize,
-   __glXVertexAttribs1dvNVReqSize,
-   __glXVertexAttribs2dvNVReqSize,
-   __glXVertexAttribs3dvNVReqSize,
-   __glXVertexAttribs4dvNVReqSize,
-   __glXVertexAttribs4ubvNVReqSize,
-   __glXProgramStringARBReqSize,
-   __glXProgramNamedParameter4fvNVReqSize,
-   __glXProgramNamedParameter4dvNVReqSize,
-   __glXPointParameterivNVReqSize,
-   __glXDeleteRenderbuffersEXTReqSize,
-   __glXDeleteFramebuffersEXTReqSize,
-};
-
-const struct __glXDispatchInfo Render_dispatch_info = {
-    13,
-    Render_dispatch_tree,
-    Render_function_table,
-    Render_size_table,
-    Render_size_func_table
-};
-
-/*****************************************************************/
-/* tree depth = 12 */
-static const int_fast16_t VendorPriv_dispatch_tree[152] = {
-    /* [0] -> opcode range [0, 131072], node depth 1 */
-    2,
-    5,
-    EMPTY_LEAF,
-    119,
-    EMPTY_LEAF,
-
-    /* [5] -> opcode range [0, 32768], node depth 2 */
-    1,
-    8,
-    EMPTY_LEAF,
-
-    /* [8] -> opcode range [0, 16384], node depth 3 */
-    1,
-    11,
-    EMPTY_LEAF,
-
-    /* [11] -> opcode range [0, 8192], node depth 4 */
-    2,
-    16,
-    EMPTY_LEAF,
-    78,
-    EMPTY_LEAF,
-
-    /* [16] -> opcode range [0, 2048], node depth 5 */
-    2,
-    21,
-    EMPTY_LEAF,
-    36,
-    EMPTY_LEAF,
-
-    /* [21] -> opcode range [0, 512], node depth 6 */
-    1,
-    24,
-    EMPTY_LEAF,
-
-    /* [24] -> opcode range [0, 256], node depth 7 */
-    1,
-    27,
-    EMPTY_LEAF,
-
-    /* [27] -> opcode range [0, 128], node depth 8 */
-    1,
-    30,
-    EMPTY_LEAF,
-
-    /* [30] -> opcode range [0, 64], node depth 9 */
-    1,
-    33,
-    EMPTY_LEAF,
-
-    /* [33] -> opcode range [0, 32], node depth 10 */
-    1,
-    LEAF(0),
-    EMPTY_LEAF,
-
-    /* [36] -> opcode range [1024, 1536], node depth 6 */
-    2,
-    41,
-    EMPTY_LEAF,
-    53,
-    67,
-
-    /* [41] -> opcode range [1024, 1152], node depth 7 */
-    1,
-    44,
-    EMPTY_LEAF,
-
-    /* [44] -> opcode range [1024, 1088], node depth 8 */
-    1,
-    47,
-    EMPTY_LEAF,
-
-    /* [47] -> opcode range [1024, 1056], node depth 9 */
-    1,
-    50,
-    EMPTY_LEAF,
-
-    /* [50] -> opcode range [1024, 1040], node depth 10 */
-    1,
-    LEAF(16),
-    EMPTY_LEAF,
-
-    /* [53] -> opcode range [1280, 1408], node depth 7 */
-    1,
-    56,
-    EMPTY_LEAF,
-
-    /* [56] -> opcode range [1280, 1344], node depth 8 */
-    2,
-    61,
-    LEAF(24),
-    EMPTY_LEAF,
-    64,
-
-    /* [61] -> opcode range [1280, 1296], node depth 9 */
-    1,
-    EMPTY_LEAF,
-    LEAF(40),
-
-    /* [64] -> opcode range [1328, 1344], node depth 9 */
-    1,
-    LEAF(48),
-    EMPTY_LEAF,
-
-    /* [67] -> opcode range [1408, 1536], node depth 7 */
-    1,
-    70,
-    EMPTY_LEAF,
-
-    /* [70] -> opcode range [1408, 1472], node depth 8 */
-    1,
-    73,
-    EMPTY_LEAF,
-
-    /* [73] -> opcode range [1408, 1440], node depth 9 */
-    2,
-    EMPTY_LEAF,
-    LEAF(56),
-    LEAF(64),
-    EMPTY_LEAF,
-
-    /* [78] -> opcode range [4096, 6144], node depth 5 */
-    2,
-    83,
-    EMPTY_LEAF,
-    101,
-    EMPTY_LEAF,
-
-    /* [83] -> opcode range [4096, 4608], node depth 6 */
-    1,
-    86,
-    EMPTY_LEAF,
-
-    /* [86] -> opcode range [4096, 4352], node depth 7 */
-    1,
-    89,
-    EMPTY_LEAF,
-
-    /* [89] -> opcode range [4096, 4224], node depth 8 */
-    1,
-    92,
-    EMPTY_LEAF,
-
-    /* [92] -> opcode range [4096, 4160], node depth 9 */
-    1,
-    95,
-    EMPTY_LEAF,
-
-    /* [95] -> opcode range [4096, 4128], node depth 10 */
-    1,
-    98,
-    EMPTY_LEAF,
-
-    /* [98] -> opcode range [4096, 4112], node depth 11 */
-    1,
-    LEAF(72),
-    EMPTY_LEAF,
-
-    /* [101] -> opcode range [5120, 5632], node depth 6 */
-    1,
-    104,
-    EMPTY_LEAF,
-
-    /* [104] -> opcode range [5120, 5376], node depth 7 */
-    1,
-    107,
-    EMPTY_LEAF,
-
-    /* [107] -> opcode range [5120, 5248], node depth 8 */
-    1,
-    110,
-    EMPTY_LEAF,
-
-    /* [110] -> opcode range [5120, 5184], node depth 9 */
-    1,
-    EMPTY_LEAF,
-    113,
-
-    /* [113] -> opcode range [5152, 5184], node depth 10 */
-    1,
-    116,
-    EMPTY_LEAF,
-
-    /* [116] -> opcode range [5152, 5168], node depth 11 */
-    1,
-    LEAF(80),
-    EMPTY_LEAF,
-
-    /* [119] -> opcode range [65536, 98304], node depth 2 */
-    1,
-    122,
-    EMPTY_LEAF,
-
-    /* [122] -> opcode range [65536, 81920], node depth 3 */
-    1,
-    125,
-    EMPTY_LEAF,
-
-    /* [125] -> opcode range [65536, 73728], node depth 4 */
-    1,
-    128,
-    EMPTY_LEAF,
-
-    /* [128] -> opcode range [65536, 69632], node depth 5 */
-    1,
-    131,
-    EMPTY_LEAF,
-
-    /* [131] -> opcode range [65536, 67584], node depth 6 */
-    1,
-    134,
-    EMPTY_LEAF,
-
-    /* [134] -> opcode range [65536, 66560], node depth 7 */
-    1,
-    137,
-    EMPTY_LEAF,
-
-    /* [137] -> opcode range [65536, 66048], node depth 8 */
-    1,
-    140,
-    EMPTY_LEAF,
-
-    /* [140] -> opcode range [65536, 65792], node depth 9 */
-    1,
-    143,
-    EMPTY_LEAF,
-
-    /* [143] -> opcode range [65536, 65664], node depth 10 */
-    1,
-    146,
-    EMPTY_LEAF,
-
-    /* [146] -> opcode range [65536, 65600], node depth 11 */
-    1,
-    149,
-    EMPTY_LEAF,
-
-    /* [149] -> opcode range [65536, 65568], node depth 12 */
-    1,
-    LEAF(88),
-    EMPTY_LEAF,
-
-};
-
-static const void *VendorPriv_function_table[104][2] = {
-    /* [  0] =     0 */ {NULL, NULL},
-    /* [  1] =     1 */ {__glXDisp_GetConvolutionFilterEXT, __glXDispSwap_GetConvolutionFilterEXT},
-    /* [  2] =     2 */ {__glXDisp_GetConvolutionParameterfvEXT, __glXDispSwap_GetConvolutionParameterfvEXT},
-    /* [  3] =     3 */ {__glXDisp_GetConvolutionParameterivEXT, __glXDispSwap_GetConvolutionParameterivEXT},
-    /* [  4] =     4 */ {__glXDisp_GetSeparableFilterEXT, __glXDispSwap_GetSeparableFilterEXT},
-    /* [  5] =     5 */ {__glXDisp_GetHistogramEXT, __glXDispSwap_GetHistogramEXT},
-    /* [  6] =     6 */ {__glXDisp_GetHistogramParameterfvEXT, __glXDispSwap_GetHistogramParameterfvEXT},
-    /* [  7] =     7 */ {__glXDisp_GetHistogramParameterivEXT, __glXDispSwap_GetHistogramParameterivEXT},
-    /* [  8] =     8 */ {__glXDisp_GetMinmaxEXT, __glXDispSwap_GetMinmaxEXT},
-    /* [  9] =     9 */ {__glXDisp_GetMinmaxParameterfvEXT, __glXDispSwap_GetMinmaxParameterfvEXT},
-    /* [ 10] =    10 */ {__glXDisp_GetMinmaxParameterivEXT, __glXDispSwap_GetMinmaxParameterivEXT},
-    /* [ 11] =    11 */ {__glXDisp_AreTexturesResidentEXT, __glXDispSwap_AreTexturesResidentEXT},
-    /* [ 12] =    12 */ {__glXDisp_DeleteTexturesEXT, __glXDispSwap_DeleteTexturesEXT},
-    /* [ 13] =    13 */ {__glXDisp_GenTexturesEXT, __glXDispSwap_GenTexturesEXT},
-    /* [ 14] =    14 */ {__glXDisp_IsTextureEXT, __glXDispSwap_IsTextureEXT},
-    /* [ 15] =    15 */ {NULL, NULL},
-    /* [ 16] =  1024 */ {__glXDisp_QueryContextInfoEXT, __glXDispSwap_QueryContextInfoEXT},
-    /* [ 17] =  1025 */ {NULL, NULL},
-    /* [ 18] =  1026 */ {NULL, NULL},
-    /* [ 19] =  1027 */ {NULL, NULL},
-    /* [ 20] =  1028 */ {NULL, NULL},
-    /* [ 21] =  1029 */ {NULL, NULL},
-    /* [ 22] =  1030 */ {NULL, NULL},
-    /* [ 23] =  1031 */ {NULL, NULL},
-    /* [ 24] =  1296 */ {__glXDisp_GetProgramEnvParameterfvARB, __glXDispSwap_GetProgramEnvParameterfvARB},
-    /* [ 25] =  1297 */ {__glXDisp_GetProgramEnvParameterdvARB, __glXDispSwap_GetProgramEnvParameterdvARB},
-    /* [ 26] =  1298 */ {__glXDisp_GetProgramivNV, __glXDispSwap_GetProgramivNV},
-    /* [ 27] =  1299 */ {__glXDisp_GetProgramStringNV, __glXDispSwap_GetProgramStringNV},
-    /* [ 28] =  1300 */ {__glXDisp_GetTrackMatrixivNV, __glXDispSwap_GetTrackMatrixivNV},
-    /* [ 29] =  1301 */ {__glXDisp_GetVertexAttribdvARB, __glXDispSwap_GetVertexAttribdvARB},
-    /* [ 30] =  1302 */ {__glXDisp_GetVertexAttribfvNV, __glXDispSwap_GetVertexAttribfvNV},
-    /* [ 31] =  1303 */ {__glXDisp_GetVertexAttribivNV, __glXDispSwap_GetVertexAttribivNV},
-    /* [ 32] =  1304 */ {__glXDisp_IsProgramNV, __glXDispSwap_IsProgramNV},
-    /* [ 33] =  1305 */ {__glXDisp_GetProgramLocalParameterfvARB, __glXDispSwap_GetProgramLocalParameterfvARB},
-    /* [ 34] =  1306 */ {__glXDisp_GetProgramLocalParameterdvARB, __glXDispSwap_GetProgramLocalParameterdvARB},
-    /* [ 35] =  1307 */ {__glXDisp_GetProgramivARB, __glXDispSwap_GetProgramivARB},
-    /* [ 36] =  1308 */ {__glXDisp_GetProgramStringARB, __glXDispSwap_GetProgramStringARB},
-    /* [ 37] =  1309 */ {NULL, NULL},
-    /* [ 38] =  1310 */ {__glXDisp_GetProgramNamedParameterfvNV, __glXDispSwap_GetProgramNamedParameterfvNV},
-    /* [ 39] =  1311 */ {__glXDisp_GetProgramNamedParameterdvNV, __glXDispSwap_GetProgramNamedParameterdvNV},
-    /* [ 40] =  1288 */ {NULL, NULL},
-    /* [ 41] =  1289 */ {NULL, NULL},
-    /* [ 42] =  1290 */ {NULL, NULL},
-    /* [ 43] =  1291 */ {NULL, NULL},
-    /* [ 44] =  1292 */ {NULL, NULL},
-    /* [ 45] =  1293 */ {__glXDisp_AreProgramsResidentNV, __glXDispSwap_AreProgramsResidentNV},
-    /* [ 46] =  1294 */ {__glXDisp_DeleteProgramsNV, __glXDispSwap_DeleteProgramsNV},
-    /* [ 47] =  1295 */ {__glXDisp_GenProgramsNV, __glXDispSwap_GenProgramsNV},
-    /* [ 48] =  1328 */ {NULL, NULL},
-    /* [ 49] =  1329 */ {NULL, NULL},
-    /* [ 50] =  1330 */ {__glXDisp_BindTexImageEXT, __glXDispSwap_BindTexImageEXT},
-    /* [ 51] =  1331 */ {__glXDisp_ReleaseTexImageEXT, __glXDispSwap_ReleaseTexImageEXT},
-    /* [ 52] =  1332 */ {NULL, NULL},
-    /* [ 53] =  1333 */ {NULL, NULL},
-    /* [ 54] =  1334 */ {NULL, NULL},
-    /* [ 55] =  1335 */ {NULL, NULL},
-    /* [ 56] =  1416 */ {NULL, NULL},
-    /* [ 57] =  1417 */ {NULL, NULL},
-    /* [ 58] =  1418 */ {NULL, NULL},
-    /* [ 59] =  1419 */ {NULL, NULL},
-    /* [ 60] =  1420 */ {NULL, NULL},
-    /* [ 61] =  1421 */ {NULL, NULL},
-    /* [ 62] =  1422 */ {__glXDisp_IsRenderbufferEXT, __glXDispSwap_IsRenderbufferEXT},
-    /* [ 63] =  1423 */ {__glXDisp_GenRenderbuffersEXT, __glXDispSwap_GenRenderbuffersEXT},
-    /* [ 64] =  1424 */ {__glXDisp_GetRenderbufferParameterivEXT, __glXDispSwap_GetRenderbufferParameterivEXT},
-    /* [ 65] =  1425 */ {__glXDisp_IsFramebufferEXT, __glXDispSwap_IsFramebufferEXT},
-    /* [ 66] =  1426 */ {__glXDisp_GenFramebuffersEXT, __glXDispSwap_GenFramebuffersEXT},
-    /* [ 67] =  1427 */ {__glXDisp_CheckFramebufferStatusEXT, __glXDispSwap_CheckFramebufferStatusEXT},
-    /* [ 68] =  1428 */ {__glXDisp_GetFramebufferAttachmentParameterivEXT, __glXDispSwap_GetFramebufferAttachmentParameterivEXT},
-    /* [ 69] =  1429 */ {NULL, NULL},
-    /* [ 70] =  1430 */ {NULL, NULL},
-    /* [ 71] =  1431 */ {NULL, NULL},
-    /* [ 72] =  4096 */ {NULL, NULL},
-    /* [ 73] =  4097 */ {NULL, NULL},
-    /* [ 74] =  4098 */ {__glXDisp_GetColorTableSGI, __glXDispSwap_GetColorTableSGI},
-    /* [ 75] =  4099 */ {__glXDisp_GetColorTableParameterfvSGI, __glXDispSwap_GetColorTableParameterfvSGI},
-    /* [ 76] =  4100 */ {__glXDisp_GetColorTableParameterivSGI, __glXDispSwap_GetColorTableParameterivSGI},
-    /* [ 77] =  4101 */ {NULL, NULL},
-    /* [ 78] =  4102 */ {NULL, NULL},
-    /* [ 79] =  4103 */ {NULL, NULL},
-    /* [ 80] =  5152 */ {NULL, NULL},
-    /* [ 81] =  5153 */ {NULL, NULL},
-    /* [ 82] =  5154 */ {__glXDisp_CopySubBufferMESA, __glXDispSwap_CopySubBufferMESA},
-    /* [ 83] =  5155 */ {NULL, NULL},
-    /* [ 84] =  5156 */ {NULL, NULL},
-    /* [ 85] =  5157 */ {NULL, NULL},
-    /* [ 86] =  5158 */ {NULL, NULL},
-    /* [ 87] =  5159 */ {NULL, NULL},
-    /* [ 88] = 65536 */ {__glXDisp_SwapIntervalSGI, __glXDispSwap_SwapIntervalSGI},
-    /* [ 89] = 65537 */ {__glXDisp_MakeCurrentReadSGI, __glXDispSwap_MakeCurrentReadSGI},
-    /* [ 90] = 65538 */ {NULL, NULL},
-    /* [ 91] = 65539 */ {NULL, NULL},
-    /* [ 92] = 65540 */ {__glXDisp_GetFBConfigsSGIX, __glXDispSwap_GetFBConfigsSGIX},
-    /* [ 93] = 65541 */ {__glXDisp_CreateContextWithConfigSGIX, __glXDispSwap_CreateContextWithConfigSGIX},
-    /* [ 94] = 65542 */ {__glXDisp_CreateGLXPixmapWithConfigSGIX, __glXDispSwap_CreateGLXPixmapWithConfigSGIX},
-    /* [ 95] = 65543 */ {__glXDisp_CreateGLXPbufferSGIX, __glXDispSwap_CreateGLXPbufferSGIX},
-    /* [ 96] = 65544 */ {__glXDisp_DestroyGLXPbufferSGIX, __glXDispSwap_DestroyGLXPbufferSGIX},
-    /* [ 97] = 65545 */ {__glXDisp_ChangeDrawableAttributesSGIX, __glXDispSwap_ChangeDrawableAttributesSGIX},
-    /* [ 98] = 65546 */ {__glXDisp_GetDrawableAttributesSGIX, __glXDispSwap_GetDrawableAttributesSGIX},
-    /* [ 99] = 65547 */ {NULL, NULL},
-    /* [ 100] = 65548 */ {NULL, NULL},
-    /* [ 101] = 65549 */ {NULL, NULL},
-    /* [ 102] = 65550 */ {NULL, NULL},
-    /* [ 103] = 65551 */ {NULL, NULL},
-};
-
-const struct __glXDispatchInfo VendorPriv_dispatch_info = {
-    17,
-    VendorPriv_dispatch_tree,
-    VendorPriv_function_table,
-    NULL,
-    NULL
-};
-
diff --git a/GL/symlink-mesa.sh b/GL/symlink-mesa.sh
index 0cfe1c9b6..af9adbd94 100755
--- a/GL/symlink-mesa.sh
+++ b/GL/symlink-mesa.sh
@@ -229,6 +229,14 @@ symlink_glx() {
     action indirect_size.h
     action glcontextmodes.c
     action glcontextmodes.h
+    action indirect_dispatch.c
+    action indirect_dispatch.h
+    action indirect_dispatch_swap.c
+    action indirect_reqsize.c
+    action indirect_reqsize.h
+    action indirect_size_get.c
+    action indirect_size_get.h
+    action indirect_table.c
 
     src_dir src/mesa/glapi
 

From 1bec6ad8977cefa49cc297a310f5eb0b7cd0b8bc Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <arjan@infradead.org>
Date: Mon, 18 Feb 2008 17:46:04 +1030
Subject: [PATCH 518/552] xfree86: plug memory leak in xf86LogInit()

xf86LogInit allocates a piece of memory, stores it in lf. LogInit() will then
effectively strdup it, but lf is never freed again.

Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
---
 hw/xfree86/common/xf86Helper.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index 1368d04ab..0d2471aa1 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -1353,7 +1353,7 @@ xf86ErrorF(const char *format, ...)
 void
 xf86LogInit()
 {
-    char *lf;
+    char *lf = NULL;
 
 #define LOGSUFFIX ".log"
 #define LOGOLDSUFFIX ".old"
@@ -1377,6 +1377,8 @@ xf86LogInit()
 
 #undef LOGSUFFIX
 #undef LOGOLDSUFFIX
+
+    free(lf);
 }
 
 void

From 6dc71f6b2c7ff49adb504426b4cd206e4745e1e3 Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <arjan@infradead.org>
Date: Mon, 18 Feb 2008 17:52:37 +1030
Subject: [PATCH 519/552] xfree86: plug memory leak in InitPathList.

All the failure paths were very diligent in freeing the "fullpath" temporary
string, but the success case was not. All the content only got strdup()d, so
it's not live memory anymore.

Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
---
 hw/xfree86/loader/loadmod.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c
index 650dcf35c..7f3bbe49c 100644
--- a/hw/xfree86/loader/loadmod.c
+++ b/hw/xfree86/loader/loadmod.c
@@ -177,6 +177,7 @@ InitPathList(const char *path)
     }
     if (list)
 	list[n] = NULL;
+    xfree(fullpath);
     return list;
 }
 

From 3abce3ea2b1f43bd111664d4a57e5ccd282acab0 Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <arjan@infradead.org>
Date: Mon, 18 Feb 2008 18:13:10 +1030
Subject: [PATCH 520/552] xfree86: plug a memory leak in xf86LoadModules.

LoadModule() returns the only reference to a fresh piece of memory (a
ModuleDescPtr). Sadly, xf86LoadModules dropped the return value on the floor
leaking memory for each module it loaded.

Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
---
 hw/xfree86/common/xf86Init.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 41cf1d17c..0d90b9d43 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -1922,6 +1922,7 @@ xf86LoadModules(char **list, pointer *optlist)
     int i;
     char *name;
     Bool failed = FALSE;
+    ModuleDescPtr desc;
 
     if (!list)
 	return TRUE;
@@ -1945,11 +1946,15 @@ xf86LoadModules(char **list, pointer *optlist)
 	else
 	    opt = NULL;
 
-        if (!LoadModule(name, NULL, NULL, NULL, opt, NULL, &errmaj, &errmin)) {
+	desc = LoadModule(name, NULL, NULL, NULL, opt, NULL, &errmaj,
+		&errmin);
+	if (!desc) {
 	    LoaderErrorMsg(NULL, name, errmaj, errmin);
 	    failed = TRUE;
 	}
 	xfree(name);
+	xfree(desc->name);
+	xfree(desc);
     }
     return !failed;
 }

From 6cbaf15e6109ba77819c4070f5b46c78237ec460 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue, 19 Feb 2008 12:02:22 +1030
Subject: [PATCH 521/552] xfree86: guard against NULL-pointer dereferences in
 xf86LoadModules.

Should have been part of 3abce3ea2b1f43bd111664d4a57e5ccd282acab0, but I
forgot to git-update-index before I committed.

Thanks to Bill Crawford for pointing it out.
---
 hw/xfree86/common/xf86Init.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 0d90b9d43..7bcfdff40 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -1951,10 +1951,11 @@ xf86LoadModules(char **list, pointer *optlist)
 	if (!desc) {
 	    LoaderErrorMsg(NULL, name, errmaj, errmin);
 	    failed = TRUE;
+	} else {
+	    xfree(desc->name);
+	    xfree(desc);
 	}
 	xfree(name);
-	xfree(desc->name);
-	xfree(desc);
     }
     return !failed;
 }

From 5f5ec5db35e82ddd9659763875e5d6c63cf1b691 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@tifa.local>
Date: Tue, 19 Feb 2008 00:00:11 -0800
Subject: [PATCH 522/552] XQuartz: unsetenv("DISPLAY") before startx if X11.app
 can't connect to it. Also fix casting to silence warning. (cherry picked from
 commit a5cbf78471ec6e6ad672dc00118fc7edbd6ddc7c)

---
 hw/xquartz/bundle/bundle-main.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/hw/xquartz/bundle/bundle-main.c b/hw/xquartz/bundle/bundle-main.c
index 54d01368d..e97770a55 100644
--- a/hw/xquartz/bundle/bundle-main.c
+++ b/hw/xquartz/bundle/bundle-main.c
@@ -45,6 +45,7 @@ static char *command_from_prefs(const char *key, const char *default_value);
 
 int main(int argc, char **argv) {
     Display *display;
+    const char *s;
 
     size_t i;
     fprintf(stderr, "X11.app: main(): argc=%d\n", argc);
@@ -72,7 +73,12 @@ int main(int argc, char **argv) {
     }
 
     /* Start the server */
-    fprintf(stderr, "X11.app: Could not connect to server.  Starting X server.");
+    if(s = getenv("DISPLAY")) {
+        fprintf(stderr, "X11.app: Could not connect to server (DISPLAY=\"%s\", unsetting).  Starting X server.\n", s);
+        unsetenv("DISPLAY");
+    } else {
+        fprintf(stderr, "X11.app: Could not connect to server (DISPLAY is not set).  Starting X server.\n");
+    }
     return execute(command_from_prefs("startx_script", DEFAULT_STARTX));
 }
 
@@ -93,7 +99,7 @@ static int execute(const char *command) {
         fprintf(stderr, "\targv[%d] = %s\n", s - newargv, *s);
     }
 
-    execvp (newargv[0], (const char **) newargv);
+    execvp (newargv[0], (char * const *) newargv);
     perror ("X11.app: Couldn't exec.");
     return(1);
 }

From 67a78e84a81571cedaf7fd214a21ce1bbdc4fb3b Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue, 19 Feb 2008 21:31:50 +1030
Subject: [PATCH 523/552] Revert "xfree86: plug a memory leak in
 xf86LoadModules."

This reverts commit 3abce3ea2b1f43bd111664d4a57e5ccd282acab0 and
6cbaf15e6109ba77819c4070f5b46c78237ec460.

The memory returned to xf86LoadModule was allocated in doLoadModule, which
calls the respective module's PreInit. As it turns out, input and output
drivers store a pointer to the module elswhere, so freeing it in
xf86LoadModule is a bad idea.

For further reference: hw/xfree86/common/xf86Helper.c
    Input drivers: xf86InputDriverList[blah]->module = module;
    Output drivers: xf86DriverList[blah]->module = module;

Unloading the module would not look pretty then.
---
 hw/xfree86/common/xf86Init.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 7bcfdff40..41cf1d17c 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -1922,7 +1922,6 @@ xf86LoadModules(char **list, pointer *optlist)
     int i;
     char *name;
     Bool failed = FALSE;
-    ModuleDescPtr desc;
 
     if (!list)
 	return TRUE;
@@ -1946,14 +1945,9 @@ xf86LoadModules(char **list, pointer *optlist)
 	else
 	    opt = NULL;
 
-	desc = LoadModule(name, NULL, NULL, NULL, opt, NULL, &errmaj,
-		&errmin);
-	if (!desc) {
+        if (!LoadModule(name, NULL, NULL, NULL, opt, NULL, &errmaj, &errmin)) {
 	    LoaderErrorMsg(NULL, name, errmaj, errmin);
 	    failed = TRUE;
-	} else {
-	    xfree(desc->name);
-	    xfree(desc);
 	}
 	xfree(name);
     }

From 5cb9e15562a32c1f102d94d5e15d5fd298baff3f Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Wed, 20 Feb 2008 10:36:06 -0800
Subject: [PATCH 524/552] EXA: Fix Render acceleration in copy and tiling
 cases.

Code shuffling in a634c9b03494ba80aeec28be19662ac96657cc23 broke this by
leaving pSrcPixmap = NULL.
---
 exa/exa_render.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/exa/exa_render.c b/exa/exa_render.c
index a510e54f6..6df2a23c8 100644
--- a/exa/exa_render.c
+++ b/exa/exa_render.c
@@ -587,7 +587,6 @@ exaComposite(CARD8	op,
     int ret = -1;
     Bool saveSrcRepeat = pSrc->repeat;
     Bool saveMaskRepeat = pMask ? pMask->repeat : 0;
-    PixmapPtr pSrcPixmap = NULL;
     RegionRec region;
 
     /* We currently don't support acceleration of gradients, or other pictures
@@ -624,7 +623,9 @@ exaComposite(CARD8	op,
 		if (ret == 1)
 		    goto done;
 	    }
-	    else if (pSrcPixmap && !pSrc->repeat && !pSrc->transform)
+	    else if (pSrc->pDrawable != NULL &&
+		     !pSrc->repeat &&
+		     !pSrc->transform)
 	    {
 		xDst += pDst->pDrawable->x;
 		yDst += pDst->pDrawable->y;
@@ -644,7 +645,9 @@ exaComposite(CARD8	op,
 		REGION_UNINIT(pDst->pDrawable->pScreen, &region);
 		goto done;
 	    }
-	    else if (pSrcPixmap && !pSrc->transform &&
+	    else if (pSrc->pDrawable != NULL &&
+		     pSrc->pDrawable->type == DRAWABLE_PIXMAP &&
+		     !pSrc->transform &&
 		     pSrc->repeatType == RepeatNormal)
 	    {
 		DDXPointRec srcOrg;
@@ -671,10 +674,11 @@ exaComposite(CARD8	op,
 					       width, height))
 		    goto done;
 
-		srcOrg.x = (xSrc - xDst) % pSrcPixmap->drawable.width;
-		srcOrg.y = (ySrc - yDst) % pSrcPixmap->drawable.height;
+		srcOrg.x = (xSrc - xDst) % pSrc->pDrawable->width;
+		srcOrg.y = (ySrc - yDst) % pSrc->pDrawable->height;
 
-		ret = exaFillRegionTiled(pDst->pDrawable, &region, pSrcPixmap,
+		ret = exaFillRegionTiled(pDst->pDrawable, &region,
+					 (PixmapPtr)pSrc->pDrawable,
 					 &srcOrg, FB_ALLONES, GXcopy);
 
 		REGION_UNINIT(pDst->pDrawable->pScreen, &region);

From 7c2f0a8befb310707ea923dbcdfde84521e52c88 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 15 Feb 2008 19:17:40 -0500
Subject: [PATCH 525/552] Remove COMPOSITE ifdefs around WindowRec bitfield as
 it has no ABI effect.

---
 dix/window.c        | 2 --
 include/windowstr.h | 4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/dix/window.c b/dix/window.c
index b896ef742..70e32fbcf 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -290,9 +290,7 @@ SetWindowToDefaults(WindowPtr pWin)
     pWin->deliverableEvents = 0;
     pWin->dontPropagate = 0;
     pWin->forcedBS = FALSE;
-#ifdef COMPOSITE
     pWin->redirectDraw = RedirectDrawNone;
-#endif
 }
 
 static void
diff --git a/include/windowstr.h b/include/windowstr.h
index 4359481cd..a16132458 100644
--- a/include/windowstr.h
+++ b/include/windowstr.h
@@ -158,9 +158,7 @@ typedef struct _Window {
     unsigned		viewable:1;	/* realized && InputOutput */
     unsigned		dontPropagate:3;/* index into DontPropagateMasks */
     unsigned		forcedBS:1;	/* system-supplied backingStore */
-#ifdef COMPOSITE
-    unsigned		redirectDraw:2;	/* rendering is redirected from here */
-#endif
+    unsigned		redirectDraw:2;	/* COMPOSITE rendering redirect */
 } WindowRec;
 
 /*

From f343265a289724c81017f089c024a7618267c4e3 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Fri, 15 Feb 2008 19:53:45 -0500
Subject: [PATCH 526/552] XACE: Make the default window background state
 configurable per-window.

To recap: the original XC-SECURITY extension disallowed background "None" if
the window was untrusted.  XACE 1.0 preserved this check as a hook function.
XACE pre-2.0 removed the hook and first abolished background "None entirely,
then restored it as a global on/off switch in response to Bug #13683.
Now it's back to being per-window, via a flag instead of a hook function.
---
 Xext/security.c     | 5 +++++
 Xext/xace.h         | 4 ++--
 dix/window.c        | 9 +++++----
 include/windowstr.h | 1 +
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/Xext/security.c b/Xext/security.c
index a3cde2cec..27ef38205 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -810,6 +810,11 @@ SecurityResource(CallbackListPtr *pcbl, pointer unused, pointer calldata)
     subj = dixLookupPrivate(&rec->client->devPrivates, stateKey);
     obj = dixLookupPrivate(&clients[cid]->devPrivates, stateKey);
 
+    /* disable background None for untrusted windows */
+    if ((requested & DixCreateAccess) && (rec->rtype == RT_WINDOW))
+	if (subj->haveState && subj->trustLevel != XSecurityClientTrusted)
+	    ((WindowPtr)rec->res)->forcedBG = TRUE;
+
     /* special checks for server-owned resources */
     if (cid == 0) {
 	if (rec->rtype & RC_DRAWABLE)
diff --git a/Xext/xace.h b/Xext/xace.h
index 2016ca322..1f07d9fd2 100644
--- a/Xext/xace.h
+++ b/Xext/xace.h
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "property.h"
 
 /* Default window background */
-#define XaceBackgroundNoneState		None
+#define XaceBackgroundNoneState(w) ((w)->forcedBG ? BackgroundPixel : None)
 
 /* security hooks */
 /* Constants used to identify the available security hooks
@@ -100,7 +100,7 @@ extern void XaceCensorImage(
 #else /* XACE */
 
 /* Default window background */
-#define XaceBackgroundNoneState		None
+#define XaceBackgroundNoneState(w)		None
 
 /* Define calls away when XACE is not being built. */
 
diff --git a/dix/window.c b/dix/window.c
index 70e32fbcf..9975b5eec 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -291,6 +291,7 @@ SetWindowToDefaults(WindowPtr pWin)
     pWin->dontPropagate = 0;
     pWin->forcedBS = FALSE;
     pWin->redirectDraw = RedirectDrawNone;
+    pWin->forcedBG = FALSE;
 }
 
 static void
@@ -702,8 +703,8 @@ CreateWindow(Window wid, WindowPtr pParent, int x, int y, unsigned w,
 	return NullWindow;
     }
 
-    pWin->backgroundState = XaceBackgroundNoneState;
-    pWin->background.pixel = 0;
+    pWin->backgroundState = XaceBackgroundNoneState(pWin);
+    pWin->background.pixel = pScreen->whitePixel;
 
     pWin->borderIsPixel = pParent->borderIsPixel;
     pWin->border = pParent->border;
@@ -1014,8 +1015,8 @@ ChangeWindowAttributes(WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client)
 		if (!pWin->parent)
 		    MakeRootTile(pWin);
 		else {
-		    pWin->backgroundState = XaceBackgroundNoneState;
-		    pWin->background.pixel = 0;
+		    pWin->backgroundState = XaceBackgroundNoneState(pWin);
+		    pWin->background.pixel = pScreen->whitePixel;
 		}
 	    }
 	    else if (pixID == ParentRelative)
diff --git a/include/windowstr.h b/include/windowstr.h
index a16132458..e06a2f1bd 100644
--- a/include/windowstr.h
+++ b/include/windowstr.h
@@ -159,6 +159,7 @@ typedef struct _Window {
     unsigned		dontPropagate:3;/* index into DontPropagateMasks */
     unsigned		forcedBS:1;	/* system-supplied backingStore */
     unsigned		redirectDraw:2;	/* COMPOSITE rendering redirect */
+    unsigned		forcedBG:1;	/* must have an opaque background */
 } WindowRec;
 
 /*

From 437c78ef9ff1177e04b3d6781b5805d89b2ab81a Mon Sep 17 00:00:00 2001
From: Dodji Seketeli <dodji@seketeli.org>
Date: Thu, 21 Feb 2008 15:29:27 +0100
Subject: [PATCH 527/552] [Xephyr/GL] don't crash when the host returns a NULL
 server string

---
 hw/kdrive/ephyr/ephyrglxext.c  | 14 ++++++++++++--
 hw/kdrive/ephyr/ephyrhostglx.c |  9 +++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/hw/kdrive/ephyr/ephyrglxext.c b/hw/kdrive/ephyr/ephyrglxext.c
index 381c9d7ed..43a634d24 100644
--- a/hw/kdrive/ephyr/ephyrglxext.c
+++ b/hw/kdrive/ephyr/ephyrglxext.c
@@ -362,7 +362,7 @@ ephyrGLXQueryServerString(__GLXclientState *a_cl, GLbyte *a_pc)
     ClientPtr client = a_cl->client;
     xGLXQueryServerStringReq *req = (xGLXQueryServerStringReq *) a_pc;
     xGLXQueryServerStringReply reply;
-    char *server_string=NULL ;
+    char *server_string=NULL, *buf=NULL;
     int length=0 ;
 
     EPHYR_LOG ("enter\n") ;
@@ -379,9 +379,15 @@ ephyrGLXQueryServerString(__GLXclientState *a_cl, GLbyte *a_pc)
     reply.sequenceNumber = client->sequence ;
     reply.length = __GLX_PAD (length) >> 2 ;
     reply.n = length ;
+    buf = xcalloc (reply.length << 2, 1);
+    if (!buf) {
+        EPHYR_LOG_ERROR ("failed to allocate string\n;");
+        return BadAlloc;
+    }
+    memcpy (buf, server_string, length);
 
     WriteToClient(client, sz_xGLXQueryServerStringReply, (char*)&reply);
-    WriteToClient(client, (int)length, server_string);
+    WriteToClient(client, (int)(reply.length << 2), server_string);
 
     res = Success ;
 
@@ -391,6 +397,10 @@ out:
         xfree (server_string) ;
         server_string = NULL;
     }
+    if (buf) {
+        xfree (buf);
+        buf = NULL;
+    }
     return res ;
 }
 
diff --git a/hw/kdrive/ephyr/ephyrhostglx.c b/hw/kdrive/ephyr/ephyrhostglx.c
index 5d9a482e8..f5db5be16 100644
--- a/hw/kdrive/ephyr/ephyrhostglx.c
+++ b/hw/kdrive/ephyr/ephyrhostglx.c
@@ -151,6 +151,7 @@ ephyrHostGLXGetStringFromServer (int a_screen_number,
 {
     Bool is_ok=FALSE ;
     Display *dpy = hostx_get_display () ;
+    int default_screen = DefaultScreen (dpy);
     xGLXGenericGetStringReq *req=NULL;
     xGLXSingleReply reply;
     int length=0, numbytes=0, major_opcode=0, get_string_op=0;
@@ -188,13 +189,17 @@ ephyrHostGLXGetStringFromServer (int a_screen_number,
     GetReq (GLXGenericGetString, req);
     req->reqType = major_opcode;
     req->glxCode = get_string_op;
-    req->for_whom = DefaultScreen (dpy);
+    req->for_whom = default_screen;
     req->name = a_string_name;
 
     _XReply (dpy, (xReply *)&reply, 0, False);
 
     length = reply.length * 4;
-    numbytes = reply.size;
+    if (!length) {
+        numbytes = 0;
+    } else {
+        numbytes = reply.size;
+    }
     EPHYR_LOG ("going to get a string of size:%d\n", numbytes) ;
 
     *a_string = (char *) Xmalloc (numbytes +1);

From c14fd2a5cb3f45d5c4502e09f55f5e3732c5e698 Mon Sep 17 00:00:00 2001
From: Dodji Seketeli <dodji@seketeli.org>
Date: Thu, 21 Feb 2008 15:33:02 +0100
Subject: [PATCH 528/552] [Xephyr/GL] properly route expose event on GL
 drawables

When an expose event happens on an host GL window paired with an
internal drawable, route that expose event to the clients listening
to the expose event on the internal drawable.
---
 hw/kdrive/ephyr/ephyr.c       | 51 +++++++++++++++++++++++++++++++--
 hw/kdrive/ephyr/ephyrdriext.c | 24 +++++++++++++---
 hw/kdrive/ephyr/ephyrdriext.h | 10 +++++++
 hw/kdrive/ephyr/hostx.c       | 54 +++++++++++++++++++++++++++++------
 hw/kdrive/ephyr/hostx.h       |  7 ++++-
 5 files changed, 130 insertions(+), 16 deletions(-)

diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c
index 6ec95d631..738704e40 100644
--- a/hw/kdrive/ephyr/ephyr.c
+++ b/hw/kdrive/ephyr/ephyr.c
@@ -841,6 +841,37 @@ miPointerScreenFuncRec ephyrPointerScreenFuncs =
   ephyrWarpCursor
 };
 
+/**
+ * find if the remote window denoted by a_remote
+ * is paired with an internal Window within the Xephyr server.
+ * If the remove window is paired with an internal window, send an
+ * expose event to the client insterested in the internal window expose event.
+ *
+ * Pairing happens when a drawable inside Xephyr is associated with
+ * a GL surface in a DRI environment.
+ * Look at the function ProcXF86DRICreateDrawable in ephyrdriext.c to
+ * know a paired window is created.
+ *
+ * This is useful to make GL drawables (only windows for now) handle
+ * expose events and send those events to clients.
+ */
+static void
+ephyrExposePairedWindow (int a_remote)
+{
+    EphyrWindowPair *pair = NULL;
+    RegionRec reg;
+    ScreenPtr screen;
+
+    if (!findWindowPairFromRemote (a_remote, &pair)) {
+	EPHYR_LOG ("did not find a pair for this window\n");
+	return;
+    }
+    screen = pair->local->drawable.pScreen;
+    REGION_NULL (screen, &reg);
+    REGION_COPY (screen, &reg, &pair->local->clipList);
+    screen->WindowExposures (pair->local, &reg, NullRegion);
+    REGION_UNINIT (screen, &reg);
+}
 
 void
 ephyrPoll(void)
@@ -861,9 +892,13 @@ ephyrPoll(void)
             if (ephyrCurScreen != ev.data.mouse_motion.screen)
               {
                   EPHYR_LOG ("warping mouse cursor:%d\n", ephyrCurScreen) ;
-                  ephyrWarpCursor(screenInfo.screens[ev.data.mouse_motion.screen],
-                                   ev.data.mouse_motion.x,
-                                   ev.data.mouse_motion.y );
+                  if (ev.data.mouse_motion.screen >= 0)
+                    {
+                      ephyrWarpCursor
+                            (screenInfo.screens[ev.data.mouse_motion.screen],
+                             ev.data.mouse_motion.x,
+                             ev.data.mouse_motion.y );
+                    }
               }
             else
               {
@@ -913,6 +948,16 @@ ephyrPoll(void)
 	  KdEnqueueKeyboardEvent (ephyrKbd, ev.data.key_up.scancode, TRUE);
 	  break;
 
+	case EPHYR_EV_EXPOSE:
+	  /*
+	   * We only receive expose events when the expose event have
+	   * be generated for a drawable that is a host X window managed
+	   * by Xephyr. Host X windows managed by Xephyr exists for instance
+	   * when Xephyr is asked to create a GL drawable in a DRI environment.
+	   */
+	  ephyrExposePairedWindow (ev.data.expose.window);
+	  break;
+
 	default:
 	  break;
 	}
diff --git a/hw/kdrive/ephyr/ephyrdriext.c b/hw/kdrive/ephyr/ephyrdriext.c
index 1b9dce5c8..fafe56d1f 100644
--- a/hw/kdrive/ephyr/ephyrdriext.c
+++ b/hw/kdrive/ephyr/ephyrdriext.c
@@ -59,10 +59,6 @@
 #define _HAVE_XALLOC_DECLS
 #include "ephyrlog.h"
 
-typedef struct {
-    WindowPtr local ;
-    int remote ;
-} EphyrWindowPair;
 
 typedef struct {
     int foo;
@@ -950,6 +946,26 @@ findWindowPairFromLocal (WindowPtr a_local,
     return FALSE ;
 }
 
+Bool
+findWindowPairFromRemote (int a_remote,
+                          EphyrWindowPair **a_pair)
+{
+    int i=0 ;
+
+    EPHYR_RETURN_VAL_IF_FAIL (a_pair, FALSE) ;
+
+    for (i=0; i < NUM_WINDOW_PAIRS; i++) {
+        if (window_pairs[i].remote == a_remote) {
+            *a_pair = &window_pairs[i] ;
+            EPHYR_LOG ("found (%p, %d)\n",
+                       (*a_pair)->local,
+                       (*a_pair)->remote) ;
+            return TRUE ;
+        }
+    }
+    return FALSE ;
+}
+
 static Bool
 createHostPeerWindow (const WindowPtr a_win,
                       int *a_peer_win)
diff --git a/hw/kdrive/ephyr/ephyrdriext.h b/hw/kdrive/ephyr/ephyrdriext.h
index 66af833b9..01c9421fb 100644
--- a/hw/kdrive/ephyr/ephyrdriext.h
+++ b/hw/kdrive/ephyr/ephyrdriext.h
@@ -27,6 +27,16 @@
  */
 #ifndef __EPHYRDRIEXT_H__
 #define __EPHYRDRIEXT_H__
+
+typedef struct {
+    WindowPtr local ;
+    int remote ;
+} EphyrWindowPair;
+
 Bool ephyrDRIExtensionInit (ScreenPtr a_screen) ;
+
+Bool findWindowPairFromRemote (int a_remote,
+			       EphyrWindowPair **a_pair);
+
 #endif /*__EPHYRDRIEXT_H__*/
 
diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c
index a5413b876..ae1bb4bf9 100644
--- a/hw/kdrive/ephyr/hostx.c
+++ b/hw/kdrive/ephyr/hostx.c
@@ -839,16 +839,38 @@ hostx_load_keymap(void)
 static struct EphyrHostScreen *
 host_screen_from_window (Window w)
 {
-  int index;
+  int index = 0;
+  struct EphyrHostScreen *result  = NULL;
+#if 0
+  unsigned int num_children = 0;
+  Window root = None, parent = None, *children = NULL;
+#endif
 
   for (index = 0 ; index < HostX.n_screens ; index++)
     {
       if (HostX.screens[index].win == w)
         {
-          return &HostX.screens[index];
+          result = &HostX.screens[index];
+          goto out;
         }
     }
-  return NULL;
+#if 0
+  XQueryTree (hostx_get_display (), w, &root, &parent,
+              &children, &num_children);
+  if (parent == root || parent == None)
+      goto out;
+  result = host_screen_from_window (parent);
+#endif
+
+out:
+#if 0
+  if (children)
+      {
+        XFree (children);
+        children = NULL;
+      }
+#endif
+  return result;
 }
 
 int
@@ -870,9 +892,19 @@ hostx_get_event(EphyrHostXEvent *ev)
 	  {
 	    struct EphyrHostScreen *host_screen =
                 host_screen_from_window (xev.xexpose.window);
-	    hostx_paint_rect (host_screen->info, 0, 0, 0, 0,
-                              host_screen->win_width,
-                              host_screen->win_height);
+            if (host_screen)
+              {
+                hostx_paint_rect (host_screen->info, 0, 0, 0, 0,
+                                  host_screen->win_width,
+                                  host_screen->win_height);
+              }
+            else
+              {
+                EPHYR_LOG_ERROR ("failed to get host screen\n");
+                ev->type = EPHYR_EV_EXPOSE;
+                ev->data.expose.window = xev.xexpose.window;
+                return 1;
+              }
 	  }
 	  return 0;
 
@@ -1113,12 +1145,18 @@ hostx_create_window (int a_screen_number,
                                                   visual_info->screen),
                                       visual_info->visual,
                                       AllocNone) ;
-    winmask = CWColormap;
+    attrs.event_mask = ButtonPressMask
+                       |ButtonReleaseMask
+                       |PointerMotionMask
+                       |KeyPressMask
+                       |KeyReleaseMask
+                       |ExposureMask;
+    winmask = CWColormap|CWEventMask;
 
     win = XCreateWindow (dpy, hostx_get_window (a_screen_number),
                          a_geometry->x, a_geometry->y,
                          a_geometry->width, a_geometry->height, 0,
-                         visual_info->depth, InputOutput,
+                         visual_info->depth, CopyFromParent,
                          visual_info->visual, winmask, &attrs) ;
     if (win == None) {
         EPHYR_LOG_ERROR ("failed to create peer window\n") ;
diff --git a/hw/kdrive/ephyr/hostx.h b/hw/kdrive/ephyr/hostx.h
index 3caa466a7..f72cfe700 100644
--- a/hw/kdrive/ephyr/hostx.h
+++ b/hw/kdrive/ephyr/hostx.h
@@ -47,7 +47,8 @@ typedef enum EphyrHostXEventType
   EPHYR_EV_MOUSE_PRESS,
   EPHYR_EV_MOUSE_RELEASE,
   EPHYR_EV_KEY_PRESS,
-  EPHYR_EV_KEY_RELEASE
+  EPHYR_EV_KEY_RELEASE,
+  EPHYR_EV_EXPOSE
 } 
 EphyrHostXEventType;
 
@@ -87,6 +88,10 @@ struct EphyrHostXEvent
       int scancode;
     } key_down;
 
+    struct expose {
+      int window;
+    } expose;
+
   } data;
 
   int key_state;

From a4202b898f07dd733590ae5adb21e48775369781 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Fri, 22 Feb 2008 18:22:58 +0100
Subject: [PATCH 529/552] XKB: Actually use the keymap we compile at startup

During XkbInitKeyboardDevice, we compiled a keymap and promptly threw it away;
brief inspection revealed the embarassingly simple problem.  Sorry.
---
 xkb/xkbInit.c | 116 +++++++++++++++++++++++++++++++++-----------------
 1 file changed, 77 insertions(+), 39 deletions(-)

diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
index 37dd94019..2b5f1fb68 100644
--- a/xkb/xkbInit.c
+++ b/xkb/xkbInit.c
@@ -138,6 +138,8 @@ static char *		XkbLayoutUsed=	NULL;
 static char *		XkbVariantUsed=	NULL;
 static char *		XkbOptionsUsed=	NULL;
 
+static XkbDescPtr       xkb_cached_map = NULL;
+
 _X_EXPORT Bool		noXkbExtension=		XKB_DFLT_DISABLED;
 static Bool		XkbWantRulesProp=	XKB_DFLT_RULES_PROP;
 
@@ -284,6 +286,9 @@ XkbSetRulesDflts(char *rulesFile,char *model,char *layout,
 static Bool
 XkbInitKeyTypes(XkbDescPtr xkb)
 {
+    if (xkb->defined & XkmTypesMask)
+        return True;
+
     initTypeNames(NULL);
     if (XkbAllocClientMap(xkb,XkbKeyTypesMask,num_dflt_types)!=Success)
 	return False;
@@ -310,6 +315,9 @@ XkbInitCompatStructs(XkbDescPtr xkb)
 register int 	i;
 XkbCompatMapPtr	compat;
 
+    if (xkb->defined & XkmCompatMapMask)
+        return True;
+
     if (XkbAllocCompatMap(xkb,XkbAllCompatMask,num_dfltSI)!=Success)
 	return BadAlloc;
     compat = xkb->compat;
@@ -358,28 +366,33 @@ Atom		unknown;
     if (names->symbols==None)		names->symbols= unknown;
     if (names->types==None)		names->types= unknown;
     if (names->compat==None)		names->compat= unknown;
-    if (names->vmods[vmod_NumLock]==None)
-        names->vmods[vmod_NumLock]= CREATE_ATOM("NumLock");
-    if (names->vmods[vmod_Alt]==None)
-        names->vmods[vmod_Alt]= CREATE_ATOM("Alt");
-    if (names->vmods[vmod_AltGr]==None)
-        names->vmods[vmod_AltGr]= CREATE_ATOM("ModeSwitch");
+    if (!(xkb->defined & XkmVirtualModsMask)) {
+        if (names->vmods[vmod_NumLock]==None)
+            names->vmods[vmod_NumLock]= CREATE_ATOM("NumLock");
+        if (names->vmods[vmod_Alt]==None)
+            names->vmods[vmod_Alt]= CREATE_ATOM("Alt");
+        if (names->vmods[vmod_AltGr]==None)
+            names->vmods[vmod_AltGr]= CREATE_ATOM("ModeSwitch");
+    }
 
-    initIndicatorNames(NULL,xkb);
-    if (names->indicators[LED_CAPS-1]==None)
-        names->indicators[LED_CAPS-1] = CREATE_ATOM("Caps Lock");
-    if (names->indicators[LED_NUM-1]==None)
-        names->indicators[LED_NUM-1] = CREATE_ATOM("Num Lock");
-    if (names->indicators[LED_SCROLL-1]==None)
-        names->indicators[LED_SCROLL-1] = CREATE_ATOM("Scroll Lock");
+    if (!(xkb->defined & XkmIndicatorsMask)) {
+        initIndicatorNames(NULL,xkb);
+        if (names->indicators[LED_CAPS-1]==None)
+            names->indicators[LED_CAPS-1] = CREATE_ATOM("Caps Lock");
+        if (names->indicators[LED_NUM-1]==None)
+            names->indicators[LED_NUM-1] = CREATE_ATOM("Num Lock");
+        if (names->indicators[LED_SCROLL-1]==None)
+            names->indicators[LED_SCROLL-1] = CREATE_ATOM("Scroll Lock");
 #ifdef LED_COMPOSE
-    if (names->indicators[LED_COMPOSE-1]==None)
-        names->indicators[LED_COMPOSE-1] = CREATE_ATOM("Compose");
+        if (names->indicators[LED_COMPOSE-1]==None)
+            names->indicators[LED_COMPOSE-1] = CREATE_ATOM("Compose");
 #endif
+    }
 
     if (xkb->geom!=NULL)
 	 names->geometry= xkb->geom->name;
     else names->geometry= unknown;
+
     return Success;
 }
 
@@ -393,27 +406,31 @@ XkbSrvLedInfoPtr	sli;
     xkb= xkbi->desc;
     if (XkbAllocIndicatorMaps(xkb)!=Success)
 	return BadAlloc;
-    map= xkb->indicators;
-    map->phys_indicators = PHYS_LEDS;
-    map->maps[LED_CAPS-1].flags= XkbIM_NoExplicit;
-    map->maps[LED_CAPS-1].which_mods= XkbIM_UseLocked;
-    map->maps[LED_CAPS-1].mods.mask= LockMask;
-    map->maps[LED_CAPS-1].mods.real_mods= LockMask;
 
-    map->maps[LED_NUM-1].flags= XkbIM_NoExplicit;
-    map->maps[LED_NUM-1].which_mods= XkbIM_UseLocked;
-    map->maps[LED_NUM-1].mods.mask= 0;
-    map->maps[LED_NUM-1].mods.real_mods= 0;
-    map->maps[LED_NUM-1].mods.vmods= vmod_NumLockMask;
+    if (!(xkb->defined & XkmIndicatorsMask)) {
+        map= xkb->indicators;
+        map->phys_indicators = PHYS_LEDS;
+        map->maps[LED_CAPS-1].flags= XkbIM_NoExplicit;
+        map->maps[LED_CAPS-1].which_mods= XkbIM_UseLocked;
+        map->maps[LED_CAPS-1].mods.mask= LockMask;
+        map->maps[LED_CAPS-1].mods.real_mods= LockMask;
 
-    map->maps[LED_SCROLL-1].flags= XkbIM_NoExplicit;
-    map->maps[LED_SCROLL-1].which_mods= XkbIM_UseLocked;
-    map->maps[LED_SCROLL-1].mods.mask= Mod3Mask;
-    map->maps[LED_SCROLL-1].mods.real_mods= Mod3Mask;
+        map->maps[LED_NUM-1].flags= XkbIM_NoExplicit;
+        map->maps[LED_NUM-1].which_mods= XkbIM_UseLocked;
+        map->maps[LED_NUM-1].mods.mask= 0;
+        map->maps[LED_NUM-1].mods.real_mods= 0;
+        map->maps[LED_NUM-1].mods.vmods= vmod_NumLockMask;
+
+        map->maps[LED_SCROLL-1].flags= XkbIM_NoExplicit;
+        map->maps[LED_SCROLL-1].which_mods= XkbIM_UseLocked;
+        map->maps[LED_SCROLL-1].mods.mask= Mod3Mask;
+        map->maps[LED_SCROLL-1].mods.real_mods= Mod3Mask;
+    }
 
     sli= XkbFindSrvLedInfo(xkbi->device,XkbDfltXIClass,XkbDfltXIId,0);
     if (sli)
 	XkbCheckIndicatorMaps(xkbi->device,sli,XkbAllIndicatorsMask);
+
     return Success;
 }
 
@@ -428,7 +445,8 @@ XkbControlsPtr	ctrls;
     if (XkbAllocControls(xkb,XkbAllControlsMask)!=Success)
 	FatalError("Couldn't allocate keyboard controls\n");
     ctrls= xkb->ctrls;
-    ctrls->num_groups = 1;
+    if (!(xkb->defined & XkmSymbolsMask))
+        ctrls->num_groups = 1;
     ctrls->groups_wrap = XkbSetGroupInfo(1,XkbWrapIntoRange,0);
     ctrls->internal.mask = 0;
     ctrls->internal.real_mods = 0;
@@ -458,11 +476,18 @@ XkbEventCauseRec	cause;
     pXDev->key->xkbInfo= xkbi= _XkbTypedCalloc(1,XkbSrvInfoRec);
     if ( xkbi ) {
 	XkbDescPtr	xkb;
-        xkbi->desc= XkbAllocKeyboard();
-	if (!xkbi->desc)
-	    FatalError("Couldn't allocate keyboard description\n");
-	xkbi->desc->min_key_code = pXDev->key->curKeySyms.minKeyCode;
-	xkbi->desc->max_key_code = pXDev->key->curKeySyms.maxKeyCode;
+
+        if (xkb_cached_map) {
+            xkbi->desc = xkb_cached_map;
+            xkb_cached_map = NULL;
+        }
+        else {
+            xkbi->desc= XkbAllocKeyboard();
+            if (!xkbi->desc)
+                FatalError("Couldn't allocate keyboard description\n");
+            xkbi->desc->min_key_code = pXDev->key->curKeySyms.minKeyCode;
+            xkbi->desc->max_key_code = pXDev->key->curKeySyms.maxKeyCode;
+        }
 	xkb= xkbi->desc;
 	if (xkb->min_key_code == 0)
 	    xkb->min_key_code = pXDev->key->curKeySyms.minKeyCode;
@@ -494,14 +519,23 @@ XkbEventCauseRec	cause;
 
 	XkbInitControls(pXDev,xkbi);
 
-        memcpy(xkb->map->modmap,pXDev->key->modifierMap,xkb->max_key_code+1);
+        if (xkb->defined & XkmSymbolsMask)
+            memcpy(pXDev->key->modifierMap, xkb->map->modmap,
+                   xkb->max_key_code + 1);
+        else
+            memcpy(xkb->map->modmap, pXDev->key->modifierMap,
+                   xkb->max_key_code + 1);
 
 	XkbInitIndicatorMap(xkbi);
 
 	XkbDDXInitDevice(pXDev);
 
-        XkbUpdateKeyTypesFromCore(pXDev,xkb->min_key_code,XkbNumKeys(xkb),
-                                  &changes);
+        if (xkb->defined & XkmSymbolsMask)
+            XkbUpdateKeyTypesFromCore(pXDev, xkb->min_key_code,
+                                      XkbNumKeys(xkb), &changes);
+        else
+            XkbUpdateCoreDescription(pXDev, True);
+
 	XkbSetCauseUnknown(&cause);
 	XkbUpdateActions(pXDev,xkb->min_key_code, XkbNumKeys(xkb),&changes,
 								&check,&cause);
@@ -632,11 +666,15 @@ XkbDescPtr              xkb;
 		pMods= tmpMods;
 	    }
 	}
+        /* Store the map here so we can pick it back up in XkbInitDevice.
+         * Sigh. */
+        xkb_cached_map = xkb;
     }
     else {
 	LogMessage(X_WARNING, "Couldn't load XKB keymap, falling back to pre-XKB keymap\n");
     }
     ok= InitKeyboardDeviceStruct((DevicePtr)dev,pSyms,pMods,bellProc,ctrlProc);
+    xkb_cached_map = NULL;
     if ((pSyms==&tmpSyms)&&(pSyms->map!=NULL)) {
 	_XkbFree(pSyms->map);
 	pSyms->map= NULL;

From ee21aba6be0078949204e315ddfffd99de60c2f1 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Mon, 24 Dec 2007 13:13:19 -0500
Subject: [PATCH 530/552] Fix Xinerama's consolidated visual handling.

Formerly the code claimed it could only handle up to 256 visuals, which
was true.  Also true, but not explicitly stated, was that it could only
handle visuals with VID < 256.  If you have enough screens, and subsystems
that add lots of visuals, you can easily run off the end.  (Made worse
because we allocate visual IDs from the same pool as XIDs.)  If your app
then chooses a visual > 256, then the Xinerama code would throw BadMatch
on CreateColormap and your app wouldn't start.

With this change, PanoramiXVisualTable is gone.  Other subsystems that
were using it as a translation table between each screen's visuals now
use a PanoramiXTranslateVisual() helper.
---
 Xext/panoramiX.c           | 252 +++++++++++++++++++------------------
 Xext/panoramiXprocs.c      |   7 +-
 Xext/panoramiXsrv.h        |   2 +-
 Xext/saver.c               |   3 +-
 hw/dmx/glxProxy/glxcmds.c  |  11 +-
 hw/xfree86/loader/extsym.c |   2 -
 6 files changed, 138 insertions(+), 139 deletions(-)

diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index 75277beaa..d8ec588aa 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -81,9 +81,6 @@ static DepthPtr		PanoramiXDepths;
 static int		PanoramiXNumVisuals;
 static VisualPtr	PanoramiXVisuals;
 
-/* We support at most 256 visuals */
-_X_EXPORT XID		*PanoramiXVisualTable = NULL;
-
 _X_EXPORT unsigned long XRC_DRAWABLE;
 _X_EXPORT unsigned long XRT_WINDOW;
 _X_EXPORT unsigned long XRT_PIXMAP;
@@ -702,143 +699,133 @@ Bool PanoramiXCreateConnectionBlock(void)
     return TRUE;
 }
 
-extern
-void PanoramiXConsolidate(void)
+/*
+ * This isn't just memcmp(), bitsPerRGBValue is skipped.  markv made that
+ * change way back before xf86 4.0, but the comment for _why_ is a bit
+ * opaque, so I'm not going to question it for now.
+ *
+ * This is probably better done as a screen hook so DBE/EVI/GLX can add
+ * their own tests, and adding privates to VisualRec so they don't have to
+ * do their own back-mapping.
+ */
+static Bool
+VisualsEqual(VisualPtr a, VisualPtr b)
 {
-    int 	i, j, k;
-    VisualPtr   pVisual, pVisual2;
-    ScreenPtr   pScreen, pScreen2;
-    DepthPtr    pDepth, pDepth2;
-    PanoramiXRes *root, *defmap, *saver;
-    Bool        foundDepth, missingDepth;
+    return ((a->class == b->class) &&
+	(a->ColormapEntries == b->ColormapEntries) &&
+	(a->nplanes == b->nplanes) &&
+	(a->redMask == b->redMask) &&
+	(a->greenMask == b->greenMask) &&
+	(a->blueMask == b->blueMask) &&
+	(a->offsetRed == b->offsetRed) &&
+	(a->offsetGreen == b->offsetGreen) &&
+	(a->offsetBlue == b->offsetBlue));
+}
 
-    if(!PanoramiXVisualTable)
-	PanoramiXVisualTable = xcalloc(256 * MAXSCREENS, sizeof(XID));
+static void
+PanoramiXMaybeAddDepth(DepthPtr pDepth)
+{
+    ScreenPtr pScreen;
+    int j, k;
+    Bool found = FALSE;
 
-    pScreen = screenInfo.screens[0];
-    pVisual = pScreen->visuals; 
-    pDepth  = pScreen->allowedDepths;
-
-    PanoramiXNumDepths = 0;
-    PanoramiXDepths = xcalloc(pScreen->numDepths,sizeof(DepthRec));
-    PanoramiXNumVisuals = 0;
-    PanoramiXVisuals = xcalloc(pScreen->numVisuals,sizeof(VisualRec));
-
-    for (i = 0; i < pScreen->numDepths; i++, pDepth++) {
-        missingDepth = FALSE;
-        for (j = 1; j < PanoramiXNumScreens; j++) {
-             pScreen2 = screenInfo.screens[j];
-             pDepth2 = pScreen2->allowedDepths;
-
-             foundDepth = FALSE;
-             for (k = 0; k < pScreen2->numDepths; k++, pDepth2++) {
-                 if(pDepth2->depth == pDepth->depth) {
-                     foundDepth = TRUE;
-                     break;
-                 }
-             }
-
-             if(!foundDepth) {
-                missingDepth = TRUE;
-                break;
-             }
-        }
-          
-        if(!missingDepth) {
-            PanoramiXDepths[PanoramiXNumDepths].depth = pDepth->depth;
-            PanoramiXDepths[PanoramiXNumDepths].numVids = 0;
-            if(pDepth->numVids)
-                PanoramiXDepths[PanoramiXNumDepths].vids = 
-                      xalloc(sizeof(VisualID) * pDepth->numVids);      
-            else
-                PanoramiXDepths[PanoramiXNumDepths].vids = NULL;
-            PanoramiXNumDepths++;
-        }
+    for (j = 1; j < PanoramiXNumScreens; j++) {
+	pScreen = screenInfo.screens[j];
+	for (k = 0; k < pScreen->numDepths; k++) {
+	    if (pScreen->allowedDepths[k].depth == pDepth->depth) {
+		found = TRUE;
+		break;
+	    }
+	}
     }
 
-    for (i = 0; i < pScreen->numVisuals; i++, pVisual++) {
-	PanoramiXVisualTable[pVisual->vid * MAXSCREENS] = pVisual->vid;
+    if (!found)
+	return;
 
-	/* check if the visual exists on all screens */
-	for (j = 1; j < PanoramiXNumScreens; j++) {
-	    pScreen2 = screenInfo.screens[j];
+    j = PanoramiXNumDepths;
+    PanoramiXNumDepths++;
+    PanoramiXDepths = xrealloc(PanoramiXDepths,
+	    PanoramiXNumDepths * sizeof(DepthRec));
+    PanoramiXDepths[j].depth = pDepth->depth;
+    PanoramiXDepths[j].numVids = 0;
+    /* XXX suboptimal, should grow these dynamically */
+    if(pDepth->numVids)
+	PanoramiXDepths[j].vids = xalloc(sizeof(VisualID) * pDepth->numVids);
+    else
+	PanoramiXDepths[j].vids = NULL;
+}
 
+static void
+PanoramiXMaybeAddVisual(VisualPtr pVisual)
+{
+    ScreenPtr pScreen;
+    VisualPtr candidate = NULL;
+    int j, k;
+    Bool found = FALSE;
+
+    for (j = 1; j < PanoramiXNumScreens; j++) {
+	pScreen = screenInfo.screens[j];
+	found = FALSE;
+
+	candidate = pScreen->visuals;
+	for (k = 0; k < pScreen->numVisuals; k++) {
+	    candidate++;
+	    if (VisualsEqual(pVisual, candidate)
 #ifdef GLXPROXY
-	    pVisual2 = glxMatchVisual(pScreen, pVisual, pScreen2);
-	    if (pVisual2) {
-		PanoramiXVisualTable[(pVisual->vid * MAXSCREENS) + j] =
-		    pVisual2->vid;
-		continue;
-	    } else if (glxMatchVisual(pScreen, pVisual, pScreen)) {
-		PanoramiXVisualTable[(pVisual->vid * MAXSCREENS) + j] = 0;
-		break;
-	    }
+		&& glxMatchVisual(screenInfo.screens[0], pVisual, pScreen)
 #endif
-	    pVisual2 = pScreen2->visuals;
-
-	    for (k = 0; k < pScreen2->numVisuals; k++, pVisual2++) {
-		if ((pVisual->class == pVisual2->class) &&
-		    (pVisual->ColormapEntries == pVisual2->ColormapEntries) &&
-		    (pVisual->nplanes == pVisual2->nplanes) &&
-		    (pVisual->redMask == pVisual2->redMask) &&
-		    (pVisual->greenMask == pVisual2->greenMask) &&
-		    (pVisual->blueMask == pVisual2->blueMask) &&
-		    (pVisual->offsetRed == pVisual2->offsetRed) &&
-		    (pVisual->offsetGreen == pVisual2->offsetGreen) &&
-		    (pVisual->offsetBlue == pVisual2->offsetBlue))
-		{
-                /* We merely assign the first visual that matches.  OpenGL
-                   will need to get involved at some point if you want
-                   match GLX visuals */
-			PanoramiXVisualTable[(pVisual->vid * MAXSCREENS) + j] =
-					 pVisual2->vid;
-			break;
-		}
-	    }
-	}
-	
-	/* if it doesn't exist on all screens we can't use it */
-	for (j = 0; j < PanoramiXNumScreens; j++) {
-	    if (!PanoramiXVisualTable[(pVisual->vid * MAXSCREENS) + j]) {
-		PanoramiXVisualTable[pVisual->vid * MAXSCREENS] = 0;
+		    ) {
+		found = TRUE;
 		break;
 	    }
 	}
 
-	/* if it does, make sure it's in the list of supported depths and visuals */
-	if(PanoramiXVisualTable[pVisual->vid * MAXSCREENS]) {
-	    PanoramiXVisuals[PanoramiXNumVisuals].vid = pVisual->vid;
-	    PanoramiXVisuals[PanoramiXNumVisuals].class = pVisual->class;
-	    PanoramiXVisuals[PanoramiXNumVisuals].bitsPerRGBValue = pVisual->bitsPerRGBValue;
-	    PanoramiXVisuals[PanoramiXNumVisuals].ColormapEntries = pVisual->ColormapEntries;
-	    PanoramiXVisuals[PanoramiXNumVisuals].nplanes = pVisual->nplanes;
-	    PanoramiXVisuals[PanoramiXNumVisuals].redMask = pVisual->redMask;
-	    PanoramiXVisuals[PanoramiXNumVisuals].greenMask = pVisual->greenMask;
-	    PanoramiXVisuals[PanoramiXNumVisuals].blueMask = pVisual->blueMask;
-	    PanoramiXVisuals[PanoramiXNumVisuals].offsetRed = pVisual->offsetRed;
-	    PanoramiXVisuals[PanoramiXNumVisuals].offsetGreen = pVisual->offsetGreen;
-	    PanoramiXVisuals[PanoramiXNumVisuals].offsetBlue = pVisual->offsetBlue;
-	    PanoramiXNumVisuals++;	
+	if (!found)
+	    return;
+    }
 
-	    for (j = 0; j < PanoramiXNumDepths; j++) {
-	        if (PanoramiXDepths[j].depth == pVisual->nplanes) {
-		    PanoramiXDepths[j].vids[PanoramiXDepths[j].numVids] = pVisual->vid;
-		    PanoramiXDepths[j].numVids++;
-		    break;
-		}	
-	    }   
-	}
-    } 
+    /* found a matching visual on all screens, add it to the subset list */
+    j = PanoramiXNumVisuals;
+    PanoramiXNumVisuals++;
+    PanoramiXVisuals = xrealloc(PanoramiXVisuals,
+	    PanoramiXNumVisuals * sizeof(VisualRec));
 
+    memcpy(&PanoramiXVisuals[j], pVisual, sizeof(VisualRec));
 
-    root = (PanoramiXRes *) xalloc(sizeof(PanoramiXRes));
+    for (k = 0; k < PanoramiXNumDepths; k++) {
+	if (PanoramiXDepths[k].depth == pVisual->nplanes) {
+	    PanoramiXDepths[k].vids[PanoramiXDepths[k].numVids] = pVisual->vid;
+	    PanoramiXDepths[k].numVids++;
+	    break;
+	}	
+    }   
+}
+
+extern void
+PanoramiXConsolidate(void)
+{
+    int 	i;
+    PanoramiXRes *root, *defmap, *saver;
+    ScreenPtr   pScreen = screenInfo.screens[0];
+    DepthPtr    pDepth = pScreen->allowedDepths;
+    VisualPtr   pVisual = pScreen->visuals;
+
+    PanoramiXNumDepths = 0;
+    PanoramiXNumVisuals = 0;
+
+    for (i = 0; i < pScreen->numDepths; i++)
+	PanoramiXMaybeAddDepth(pDepth++);
+
+    for (i = 0; i < pScreen->numVisuals; i++)
+	PanoramiXMaybeAddVisual(pVisual++);
+
+    root = xalloc(sizeof(PanoramiXRes));
     root->type = XRT_WINDOW;
-    defmap = (PanoramiXRes *) xalloc(sizeof(PanoramiXRes));
+    defmap = xalloc(sizeof(PanoramiXRes));
     defmap->type = XRT_COLORMAP;
-    saver = (PanoramiXRes *) xalloc(sizeof(PanoramiXRes));
+    saver = xalloc(sizeof(PanoramiXRes));
     saver->type = XRT_WINDOW;
 
-
     for (i =  0; i < PanoramiXNumScreens; i++) {
 	root->info[i].id = WindowTable[i]->drawable.id;
 	root->u.win.class = InputOutput;
@@ -854,6 +841,31 @@ void PanoramiXConsolidate(void)
     AddResource(defmap->info[0].id, XRT_COLORMAP, defmap);
 }
 
+_X_EXPORT VisualID
+PanoramiXTranslateVisualID(int screen, VisualID orig)
+{
+    VisualPtr pVisual = NULL;
+    int i, j;
+
+    for (i = 0; i < PanoramiXNumVisuals; i++) {
+	if (orig == PanoramiXVisuals[i].vid) {
+	    pVisual = &PanoramiXVisuals[i];
+	    break;
+	}
+    }
+
+    if (!pVisual)
+	return 0;
+
+    /* found the original, now translate it relative to the backend screen */
+    for (i = 0; i < PanoramiXNumScreens; i++)
+	for (j = 0; j < screenInfo.screens[i]->numVisuals; j++)
+	    if (VisualsEqual(pVisual, &screenInfo.screens[i]->visuals[j]))
+		return screenInfo.screens[i]->visuals[j].vid;
+    
+    return 0;
+}
+
 
 /*
  *	PanoramiXResetProc()
diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c
index f9a579625..d19b3039a 100644
--- a/Xext/panoramiXprocs.c
+++ b/Xext/panoramiXprocs.c
@@ -150,7 +150,7 @@ int PanoramiXCreateWindow(ClientPtr client)
 	if (cmap)
 	    *((CARD32 *) &stuff[1] + cmap_offset) = cmap->info[j].id;
 	if ( orig_visual != CopyFromParent ) 
-	    stuff->visual = PanoramiXVisualTable[(orig_visual*MAXSCREENS) + j];
+	    stuff->visual = PanoramiXTranslateVisualID(j, orig_visual);
         result = (*SavedProcVector[X_CreateWindow])(client);
         if(result != Success) break;
     }
@@ -2077,9 +2077,6 @@ int PanoramiXCreateColormap(ClientPtr client)
 		client, stuff->window, XRT_WINDOW, DixReadAccess)))
 	return BadWindow;    
 
-    if(!stuff->visual || (stuff->visual > 255)) 
-	return BadValue;
-
     if(!(newCmap = (PanoramiXRes *) xalloc(sizeof(PanoramiXRes))))
         return BadAlloc;
 
@@ -2092,7 +2089,7 @@ int PanoramiXCreateColormap(ClientPtr client)
     FOR_NSCREENS_BACKWARD(j){
 	stuff->mid = newCmap->info[j].id;
 	stuff->window = win->info[j].id;
-	stuff->visual = PanoramiXVisualTable[(orig_visual * MAXSCREENS) + j];
+	stuff->visual = PanoramiXTranslateVisualID(j, orig_visual);
 	result = (* SavedProcVector[X_CreateColormap])(client);
 	if(result != Success) break;
     }
diff --git a/Xext/panoramiXsrv.h b/Xext/panoramiXsrv.h
index ae9024418..6d556e963 100644
--- a/Xext/panoramiXsrv.h
+++ b/Xext/panoramiXsrv.h
@@ -12,8 +12,8 @@ extern int PanoramiXNumScreens;
 extern PanoramiXData *panoramiXdataPtr;
 extern int PanoramiXPixWidth;
 extern int PanoramiXPixHeight;
-extern XID *PanoramiXVisualTable;
 
+extern VisualID PanoramiXTranslateVisualID(int screen, VisualID orig);
 extern void PanoramiXConsolidate(void);
 extern Bool PanoramiXCreateConnectionBlock(void);
 extern PanoramiXRes * PanoramiXFindIDByScrnum(RESTYPE, XID, int);
diff --git a/Xext/saver.c b/Xext/saver.c
index 9a6dd7757..feab972e2 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -1346,8 +1346,7 @@ ProcScreenSaverSetAttributes (ClientPtr client)
              *((CARD32 *) &stuff[1] + cmap_offset) = cmap->info[i].id;
 
           if (orig_visual != CopyFromParent) 
-            stuff->visualID = 
-                     PanoramiXVisualTable[(orig_visual*MAXSCREENS) + i];
+            stuff->visualID = PanoramiXTranslateVisualID(i, orig_visual);
 
           status = ScreenSaverSetAttributes(client);
        }
diff --git a/hw/dmx/glxProxy/glxcmds.c b/hw/dmx/glxProxy/glxcmds.c
index 6771cf1de..85e0f8701 100644
--- a/hw/dmx/glxProxy/glxcmds.c
+++ b/hw/dmx/glxProxy/glxcmds.c
@@ -66,7 +66,6 @@
 
 #ifdef PANORAMIX
 #include "panoramiXsrv.h"
-extern XID *PanoramiXVisualTable;
 #endif
 
 extern __GLXFBConfig **__glXFBConfigs;
@@ -2824,14 +2823,8 @@ int __glXGetFBConfigs(__GLXclientState *cl, GLbyte *pc)
 #ifdef PANORAMIX
 	   else if (!noPanoramiXExtension) {
 	      /* convert the associated visualId to the panoramix one */
-              for (v=0; v<255; v++) {
-		 if ( PanoramiXVisualTable[ v * MAXSCREENS + screen ] ==
-		      associatedVisualId ) {
-		    associatedVisualId = v;
-		    break;
-		 } 
-	      }
-	      pFBConfig->associatedVisualId = associatedVisualId;
+	      pFBConfig->associatedVisualId =
+		  PanoramiXTranslateVisualID(screen, v);
 	   }
 #endif
 	}
diff --git a/hw/xfree86/loader/extsym.c b/hw/xfree86/loader/extsym.c
index e09e9c084..1bdff9482 100644
--- a/hw/xfree86/loader/extsym.c
+++ b/hw/xfree86/loader/extsym.c
@@ -44,7 +44,6 @@ extern RESTYPE ShmSegType, ShmPixType;
 extern Bool noPanoramiXExtension;
 extern int PanoramiXNumScreens;
 extern PanoramiXData *panoramiXdataPtr;
-extern XID *PanoramiXVisualTable;
 extern unsigned long XRT_WINDOW;
 extern unsigned long XRT_PIXMAP;
 extern unsigned long XRT_GC;
@@ -69,7 +68,6 @@ _X_HIDDEN void *extLookupTab[] = {
     SYMFUNC(XineramaDeleteResource)
     SYMVAR(PanoramiXNumScreens)
     SYMVAR(panoramiXdataPtr)
-    SYMVAR(PanoramiXVisualTable)
     SYMVAR(XRT_WINDOW)
     SYMVAR(XRT_PIXMAP)
     SYMVAR(XRT_GC)

From 24bebdded44a9e184455b4fee7800257fee81efb Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Mon, 24 Dec 2007 15:07:49 -0500
Subject: [PATCH 531/552] fbFillRegionTiled() is now dead code.

Only ever called from the old PaintWindow* screen hooks, but those are
gone now.  As a pleasant side effect, fb loses its #ifdef PANORAMIX.
---
 fb/fb.h             |  5 ----
 fb/fbwindow.c       | 65 ---------------------------------------------
 fb/wfbrename.h      |  1 -
 hw/kdrive/src/kaa.c | 12 ---------
 4 files changed, 83 deletions(-)

diff --git a/fb/fb.h b/fb/fb.h
index 5b56d96a2..01000d79c 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -2087,11 +2087,6 @@ fbFillRegionSolid (DrawablePtr	pDrawable,
 		   FbBits	and,
 		   FbBits	xor);
 
-void
-fbFillRegionTiled (DrawablePtr	pDrawable,
-		   RegionPtr	pRegion,
-		   PixmapPtr	pTile);
-
 pixman_image_t *image_from_pict (PicturePtr pict,
 				 Bool       has_clip);
 void free_pixman_pict (PicturePtr, pixman_image_t *);
diff --git a/fb/fbwindow.c b/fb/fbwindow.c
index 89f601f29..f6fe8aa83 100644
--- a/fb/fbwindow.c
+++ b/fb/fbwindow.c
@@ -250,68 +250,3 @@ fbFillRegionSolid (DrawablePtr	pDrawable,
     
     fbFinishAccess (pDrawable);
 }
-
-#ifdef PANORAMIX
-#include "panoramiX.h"
-#include "panoramiXsrv.h"
-#endif
-
-void
-fbFillRegionTiled (DrawablePtr	pDrawable,
-		   RegionPtr	pRegion,
-		   PixmapPtr	pTile)
-{
-    FbBits	*dst;
-    FbStride	dstStride;
-    int		dstBpp;
-    int		dstXoff, dstYoff;
-    FbBits	*tile;
-    FbStride	tileStride;
-    int		tileBpp;
-    int		tileXoff, tileYoff; /* XXX assumed to be zero */
-    int		tileWidth, tileHeight;
-    int		n = REGION_NUM_RECTS(pRegion);
-    BoxPtr	pbox = REGION_RECTS(pRegion);
-    int		xRot = pDrawable->x;
-    int		yRot = pDrawable->y;
-    
-#ifdef PANORAMIX
-    if(!noPanoramiXExtension) 
-    {
-	int index = pDrawable->pScreen->myNum;
-	if(&WindowTable[index]->drawable == pDrawable) 
-	{
-	    xRot -= panoramiXdataPtr[index].x;
-	    yRot -= panoramiXdataPtr[index].y;
-	}
-    }
-#endif
-    fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
-    fbGetDrawable (&pTile->drawable, tile, tileStride, tileBpp, tileXoff, tileYoff);
-    tileWidth = pTile->drawable.width;
-    tileHeight = pTile->drawable.height;
-    xRot += dstXoff;
-    yRot += dstYoff;
-    
-    while (n--)
-    {
-	fbTile (dst + (pbox->y1 + dstYoff) * dstStride,
-		dstStride,
-		(pbox->x1 + dstXoff) * dstBpp,
-		(pbox->x2 - pbox->x1) * dstBpp,
-		pbox->y2 - pbox->y1,
-		tile,
-		tileStride,
-		tileWidth * dstBpp,
-		tileHeight,
-		GXcopy,
-		FB_ALLONES,
-		dstBpp,
-		xRot * dstBpp,
-		yRot - (pbox->y1 + dstYoff));
-	pbox++;
-    }
-
-    fbFinishAccess (&pTile->drawable);
-    fbFinishAccess (pDrawable);
-}
diff --git a/fb/wfbrename.h b/fb/wfbrename.h
index 93822442f..dc0528559 100644
--- a/fb/wfbrename.h
+++ b/fb/wfbrename.h
@@ -79,7 +79,6 @@
 #define fbExpandDirectColors wfbExpandDirectColors
 #define fbFill wfbFill
 #define fbFillRegionSolid wfbFillRegionSolid
-#define fbFillRegionTiled wfbFillRegionTiled
 #define fbFillSpans wfbFillSpans
 #define fbFixCoordModePrevious wfbFixCoordModePrevious
 #define fbGCFuncs wfbGCFuncs
diff --git a/hw/kdrive/src/kaa.c b/hw/kdrive/src/kaa.c
index e75b08399..db09e9dba 100644
--- a/hw/kdrive/src/kaa.c
+++ b/hw/kdrive/src/kaa.c
@@ -996,18 +996,6 @@ kaaFillRegionSolid (DrawablePtr	pDrawable,
     kaaDrawableDirty (pDrawable);
 }
 
-#if 0
-static void
-kaaFillRegionTiled (DrawablePtr pDrawable,
-		    RegionPtr	pRegion,
-		    Pixmap	pTile)
-{
-    else
-    {
-	kaaWaitSync
-}
-#endif
-
 Bool
 kaaDrawInit (ScreenPtr		pScreen,
 	     KaaScreenInfoPtr	pScreenInfo)

From 060a66b6e2feddba43ed207b6fcf2cf1f7fe39fd Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Mon, 24 Dec 2007 15:55:58 -0500
Subject: [PATCH 532/552] Normalize swapped dispatch for
 Fixes{ChangeSaveSet,SelectSelectionInput}

---
 xfixes/saveset.c | 2 +-
 xfixes/select.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xfixes/saveset.c b/xfixes/saveset.c
index e6e297638..31664ab65 100755
--- a/xfixes/saveset.c
+++ b/xfixes/saveset.c
@@ -72,5 +72,5 @@ SProcXFixesChangeSaveSet(ClientPtr client)
 
     swaps(&stuff->length, n);
     swapl(&stuff->window, n);
-    return ProcXFixesChangeSaveSet(client);
+    return (*ProcXFixesVector[stuff->xfixesReqType])(client);
 }
diff --git a/xfixes/select.c b/xfixes/select.c
index 415257ec1..12a165fd0 100755
--- a/xfixes/select.c
+++ b/xfixes/select.c
@@ -224,7 +224,7 @@ SProcXFixesSelectSelectionInput (ClientPtr client)
     swapl(&stuff->window, n);
     swapl(&stuff->selection, n);
     swapl(&stuff->eventMask, n);
-    return ProcXFixesSelectSelectionInput(client);
+    return (*ProcXFixesVector[stuff->xfixesReqType])(client);
 }
     
 void

From 69f782676797744815ff76b8a11b11178066f501 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 22 Feb 2008 16:04:35 -0500
Subject: [PATCH 533/552] Match Xephyr DRI definitions to the ones in xf86dri.h

---
 hw/kdrive/ephyr/XF86dri.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/kdrive/ephyr/XF86dri.c b/hw/kdrive/ephyr/XF86dri.c
index c11da0634..506d7bed8 100644
--- a/hw/kdrive/ephyr/XF86dri.c
+++ b/hw/kdrive/ephyr/XF86dri.c
@@ -385,7 +385,7 @@ Bool XF86DRICreateContext(dpy, screen, visual, context, hHWContext)
 					   context, hHWContext );
 }
 
-Bool XF86DRIDestroyContext( __DRInativeDisplay * ndpy, int screen, __DRIid context)
+GLboolean XF86DRIDestroyContext( __DRInativeDisplay * ndpy, int screen, __DRIid context)
 {
     Display * const dpy = (Display *) ndpy;
     XExtDisplayInfo *info = find_display (dpy);
@@ -406,7 +406,7 @@ Bool XF86DRIDestroyContext( __DRInativeDisplay * ndpy, int screen, __DRIid conte
     return True;
 }
 
-Bool
+GLboolean
 XF86DRICreateDrawable (__DRInativeDisplay * ndpy, int screen,
                        __DRIid drawable, drm_drawable_t * hHWDrawable)
 {
@@ -437,7 +437,7 @@ XF86DRICreateDrawable (__DRInativeDisplay * ndpy, int screen,
     return True;
 }
 
-Bool XF86DRIDestroyDrawable( __DRInativeDisplay * ndpy, int screen,
+GLboolean XF86DRIDestroyDrawable( __DRInativeDisplay * ndpy, int screen,
     __DRIid drawable )
 {
     Display * const dpy = (Display *) ndpy;

From 347db49ebe4596db16455ea8a1a608cfa826c5c7 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 22 Feb 2008 16:05:33 -0500
Subject: [PATCH 534/552] s/via/openchrome/ in the autoconfig logic.

Xorg's via driver is effectively dead anyway.
---
 hw/xfree86/common/xf86AutoConfig.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
index c6e197216..da6c3f38d 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
@@ -184,7 +184,7 @@ videoPtrToDriverName(struct pci_device *dev)
 	case 0x3d3d:		    return "glint";
 	case 0x1023:		    return "trident";
 	case 0x100c:		    return "tseng";
-	case 0x1106:		    return "via";
+	case 0x1106:		    return "openchrome";
 	case 0x15ad:		    return "vmware";
 	default: break;
     }

From e6a4cde16dc99ea02ac93da1d1b9517b1073d159 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 22 Feb 2008 18:36:29 -0500
Subject: [PATCH 535/552] Use the client-side XKB headers for the config
 utilities

---
 hw/xfree86/utils/xorgcfg/text-mode.c     | 2 +-
 hw/xfree86/utils/xorgconfig/xorgconfig.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/xfree86/utils/xorgcfg/text-mode.c b/hw/xfree86/utils/xorgcfg/text-mode.c
index c1fa67ed7..0b6e65482 100644
--- a/hw/xfree86/utils/xorgcfg/text-mode.c
+++ b/hw/xfree86/utils/xorgcfg/text-mode.c
@@ -39,7 +39,7 @@
 #endif
 #include <ctype.h>
 #include <X11/Xlib.h>
-#include "xkbstr.h"
+#include <X11/extensions/XKBstr.h>
 #include <X11/extensions/XKBrules.h>
 #include "cards.h"
 #include "config.h"
diff --git a/hw/xfree86/utils/xorgconfig/xorgconfig.c b/hw/xfree86/utils/xorgconfig/xorgconfig.c
index d537abac4..30eb83182 100644
--- a/hw/xfree86/utils/xorgconfig/xorgconfig.c
+++ b/hw/xfree86/utils/xorgconfig/xorgconfig.c
@@ -106,7 +106,7 @@
 #include <sys/stat.h>
 
 #include <X11/Xlib.h>
-#include "xkbstr.h"
+#include <X11/extensions/XKBstr.h>
 #include <X11/extensions/XKBrules.h>
 #define MAX_XKBOPTIONS	5
 

From 6dc369028d3ca741de57ad78febf2f5f82e0696e Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremy@tifa.local>
Date: Sat, 23 Feb 2008 00:01:02 -0800
Subject: [PATCH 536/552] XQuartz: Quit now properly warns the user (cherry
 picked from commit ed3d7b3959c2a0cb63e37210455bcc6cf195b807)

---
 .../English.lproj/main.nib/designable.nib     |  42 +++++++++---------
 .../English.lproj/main.nib/keyedobjects.nib   | Bin 35529 -> 35571 bytes
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/hw/xquartz/bundle/English.lproj/main.nib/designable.nib b/hw/xquartz/bundle/English.lproj/main.nib/designable.nib
index b5cfcf682..ea3a0daa8 100644
--- a/hw/xquartz/bundle/English.lproj/main.nib/designable.nib
+++ b/hw/xquartz/bundle/English.lproj/main.nib/designable.nib
@@ -2,14 +2,14 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.02">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">9B18</string>
+		<string key="IBDocument.SystemVersion">9C31</string>
 		<string key="IBDocument.InterfaceBuilderVersion">639</string>
-		<string key="IBDocument.AppKitVersion">949</string>
-		<string key="IBDocument.HIToolboxVersion">343.00</string>
+		<string key="IBDocument.AppKitVersion">949.26</string>
+		<string key="IBDocument.HIToolboxVersion">352.00</string>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
+			<integer value="57"/>
 			<integer value="285"/>
-			<integer value="29"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -448,7 +448,7 @@
 			<object class="NSWindowTemplate" id="124913468">
 				<int key="NSWindowStyleMask">3</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{479, 459}, {481, 345}}</string>
+				<string key="NSWindowRect">{{319, 294}, {481, 345}}</string>
 				<int key="NSWTFlags">1350041600</int>
 				<string key="NSWindowTitle">X11 Preferences</string>
 				<string key="NSWindowClass">NSPanel</string>
@@ -993,7 +993,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 					</object>
 					<string key="NSFrameSize">{481, 345}</string>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
 				<string key="NSMinSize">{213, 129}</string>
 				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
 				<string key="NSFrameAutosaveName">x11_prefs</string>
@@ -1001,7 +1001,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 			<object class="NSWindowTemplate" id="604417141">
 				<int key="NSWindowStyleMask">11</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{537, 554}, {454, 311}}</string>
+				<string key="NSWindowRect">{{361, 362}, {454, 311}}</string>
 				<int key="NSWTFlags">1350041600</int>
 				<string key="NSWindowTitle">X11 Application Menu</string>
 				<string key="NSWindowClass">NSPanel</string>
@@ -1355,7 +1355,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 					<string key="NSFrameSize">{454, 311}</string>
 					<reference key="NSSuperview"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
 				<string key="NSMinSize">{320, 262}</string>
 				<string key="NSFrameAutosaveName">x11_apps</string>
 			</object>
@@ -1865,14 +1865,6 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 					</object>
 					<int key="connectionID">300332</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">quit:</string>
-						<reference key="source" ref="485884620"/>
-						<reference key="destination" ref="274138642"/>
-					</object>
-					<int key="connectionID">300333</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">menu</string>
@@ -1881,6 +1873,14 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 					</object>
 					<int key="connectionID">300334</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">terminate:</string>
+						<reference key="source" ref="815810918"/>
+						<reference key="destination" ref="274138642"/>
+					</object>
+					<int key="connectionID">300336</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -3075,6 +3075,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 					<string>545.ImportedFromIB2</string>
 					<string>56.IBPluginDependency</string>
 					<string>56.ImportedFromIB2</string>
+					<string>57.IBEditorWindowLastContentRect</string>
 					<string>57.IBPluginDependency</string>
 					<string>57.ImportedFromIB2</string>
 					<string>57.editorWindowContentRectSynchronizationRect</string>
@@ -3168,11 +3169,11 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 					<string>{{100, 746}, {155, 33}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<string>{{537, 554}, {454, 311}}</string>
+					<string>{{537, 545}, {454, 311}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<reference ref="9"/>
-					<string>{{537, 554}, {454, 311}}</string>
+					<string>{{537, 545}, {454, 311}}</string>
 					<reference ref="9"/>
 					<string>{{433, 406}, {486, 327}}</string>
 					<object class="NSDictionary">
@@ -3194,7 +3195,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 					<string>{320, 240}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<string>{{0, 1114}, {336, 20}}</string>
+					<string>{{0, 836}, {336, 20}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>{{67, 819}, {336, 20}}</string>
@@ -3319,6 +3320,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
+					<string>{{12, 633}, {218, 203}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>{{79, 616}, {218, 203}}</string>
@@ -3354,7 +3356,7 @@ d2hpY2ggbWF5IHByZXZlbnQgWDExIGFwcGxpY2F0aW9ucyBmcm9tIGxhdW5jaGluZy4</string>
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">300334</int>
+			<int key="maxID">300336</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
diff --git a/hw/xquartz/bundle/English.lproj/main.nib/keyedobjects.nib b/hw/xquartz/bundle/English.lproj/main.nib/keyedobjects.nib
index 5223c9a95ecc5ed438a02c3f6aff0a65e6f8360f..f60dcbacb0385caa8292cd06bd178d709632566b 100644
GIT binary patch
literal 35571
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

literal 35529
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


From 4b50e71bf127c8e0f289e3b76c786f0398effe65 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Sun, 24 Feb 2008 20:25:13 -0500
Subject: [PATCH 537/552] Bug #13736: Fix %bx in VBEGetPixelClock to match
 spec.

Reported by Yannick Henault.
---
 hw/xfree86/vbe/vbe.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/vbe/vbe.c
index 06559bbd5..8af1727cc 100644
--- a/hw/xfree86/vbe/vbe.c
+++ b/hw/xfree86/vbe/vbe.c
@@ -1019,7 +1019,7 @@ VBEGetPixelClock(vbeInfoPtr pVbe, int mode, int clock)
     /*
     Input:
 	AX := 4F0Bh VBE Get Pixel Clock
-	BL := 01h Get Pixel Clock
+	BL := 00h Get Pixel Clock
 	ECX := pixel clock in units of Hz
         DX := mode number
      
@@ -1030,7 +1030,7 @@ VBEGetPixelClock(vbeInfoPtr pVbe, int mode, int clock)
 
     pVbe->pInt10->num = 0x10;
     pVbe->pInt10->ax = 0x4f0b;
-    pVbe->pInt10->bx = 0x01;
+    pVbe->pInt10->bx = 0x00;
     pVbe->pInt10->cx = clock;
     pVbe->pInt10->dx = mode;
     xf86ExecX86int10(pVbe->pInt10);

From f19f7b8e53ed6609fc1fdd272de5521417946209 Mon Sep 17 00:00:00 2001
From: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Mon, 25 Feb 2008 17:07:07 -0300
Subject: [PATCH 538/552] Clean some garbage caused when pciaccess was merged:

    FindPCIVideoInfo() function isn't need anymore.

    xf86scanpci() is being called only once so we don't need permanent
    (static) variables there.

    restorePciState() is not used for now (until we find why multiple
    cards aren't working).
---
 hw/xfree86/common/xf86pciBus.c  | 241 ++++++++++++++++----------------
 hw/xfree86/os-support/bus/Pci.c |  13 +-
 2 files changed, 118 insertions(+), 136 deletions(-)

diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
index 13e13e980..d5ae75b3a 100644
--- a/hw/xfree86/common/xf86pciBus.c
+++ b/hw/xfree86/common/xf86pciBus.c
@@ -107,127 +107,6 @@ xf86FormatPciBusNumber(int busnum, char *buffer)
 	sprintf(buffer, "%d@%d", busnum & 0x00ff, busnum >> 8);
 }
 
-static void
-FindPCIVideoInfo(void)
-{
-    int i = 0, k;
-    int num = 0;
-    struct pci_device *info;
-    struct pci_device_iterator *iter;
-
-
-    if (!xf86scanpci()) {
-	xf86PciVideoInfo = NULL;
-	return;
-    }
-
-    iter = pci_slot_match_iterator_create(& xf86IsolateDevice);
-    while ((info = pci_device_next(iter)) != NULL) {
-	if (PCIINFOCLASSES(info->device_class)) {
-	    num++;
-	    xf86PciVideoInfo = xnfrealloc(xf86PciVideoInfo,
-					  (sizeof(struct pci_device *)
-					   * (num + 1)));
-	    xf86PciVideoInfo[num] = NULL;
-	    xf86PciVideoInfo[num - 1] = info;
-
-	    pci_device_probe(info);
-	    info->user_data = 0;
-	}
-    }
-
-
-    /* If we haven't found a primary device try a different heuristic */
-    if (primaryBus.type == BUS_NONE && num) {
-	for (i = 0; i < num; i++) {
-	    uint16_t  command;
-
-	    info = xf86PciVideoInfo[i];
-	    pci_device_cfg_read_u16(info, & command, 4);
-
-	    if ((command & PCI_CMD_MEM_ENABLE) 
-		&& ((num == 1) || IS_VGA(info->device_class))) {
-		if (primaryBus.type == BUS_NONE) {
-		    primaryBus.type = BUS_PCI;
-		    primaryBus.id.pci = info;
-		} else {
-		    xf86Msg(X_NOTICE,
-			    "More than one possible primary device found\n");
-		    primaryBus.type ^= (BusType)(-1);
-		}
-	    }
-	}
-    }
-    
-    /* Print a summary of the video devices found */
-    for (k = 0; k < num; k++) {
-	const char *vendorname = NULL, *chipname = NULL;
-	const char *prim = " ";
-	Bool memdone = FALSE, iodone = FALSE;
-
-
-	info = xf86PciVideoInfo[k];
-
-	vendorname = pci_device_get_vendor_name( info );
-	chipname = pci_device_get_device_name( info );
-
-	if ((!vendorname || !chipname) &&
-	    !PCIALWAYSPRINTCLASSES(info->device_class))
-	    continue;
-
-	if (xf86IsPrimaryPci(info))
-	    prim = "*";
-
-	xf86Msg( X_PROBED, "PCI:%s(%u@%u:%u:%u) ", prim, info->domain,
-		 info->bus, info->dev, info->func );
-
-	if (vendorname)
-	    xf86ErrorF("%s ", vendorname);
-	else
-	    xf86ErrorF("unknown vendor (0x%04x) ", info->vendor_id);
-
-	if (chipname)
-	    xf86ErrorF("%s ", chipname);
-	else
-	    xf86ErrorF("unknown chipset (0x%04x) ", info->device_id);
-
-	xf86ErrorF("rev %d", info->revision);
-
-	for (i = 0; i < 6; i++) {
-	    struct pci_mem_region * r = & info->regions[i];
-
-	    if ( r->size && ! r->is_IO ) {
-		if (!memdone) {
-		    xf86ErrorF(", Mem @ ");
-		    memdone = TRUE;
-		} else
-		    xf86ErrorF(", ");
-		xf86ErrorF("0x%08lx/%ld", r->base_addr, r->size);
-	    }
-	}
-
-	for (i = 0; i < 6; i++) {
-	    struct pci_mem_region * r = & info->regions[i];
-
-	    if ( r->size && r->is_IO ) {
-		if (!iodone) {
-		    xf86ErrorF(", I/O @ ");
-		    iodone = TRUE;
-		} else
-		    xf86ErrorF(", ");
-		xf86ErrorF("0x%08lx/%ld", r->base_addr, r->size);
-	    }
-	}
-
-	if ( info->rom_size ) {
-	    xf86ErrorF(", BIOS @ 0x\?\?\?\?\?\?\?\?/%ld", info->rom_size);
-	}
-
-	xf86ErrorF("\n");
-    }
-}
-
-
 /*
  * IO enable/disable related routines for PCI
  */
@@ -401,10 +280,10 @@ savePciState( struct pci_device * dev, pciSavePtr ptr )
 }
 
 /* move to OS layer */
+#if 0
 static void
 restorePciState( struct pci_device * dev, pciSavePtr ptr)
 {
-#if 0
     int i;
     
     /* disable card before setting anything */
@@ -419,8 +298,8 @@ restorePciState( struct pci_device * dev, pciSavePtr ptr)
     }
 
     pci_device_cfg_write_u32(dev, ptr->command, PCI_CMD_STAT_REG);
-#endif
 }
+#endif
 
 /* move to OS layer */
 static void
@@ -470,7 +349,121 @@ restorePciBusState(BusAccPtr ptr)
 void
 xf86PciProbe(void)
 {
-    FindPCIVideoInfo();
+    int i = 0, k;
+    int num = 0;
+    struct pci_device *info;
+    struct pci_device_iterator *iter;
+
+
+    if (!xf86scanpci()) {
+	xf86PciVideoInfo = NULL;
+	return;
+    }
+
+    iter = pci_slot_match_iterator_create(& xf86IsolateDevice);
+    while ((info = pci_device_next(iter)) != NULL) {
+	if (PCIINFOCLASSES(info->device_class)) {
+	    num++;
+	    xf86PciVideoInfo = xnfrealloc(xf86PciVideoInfo,
+					  (sizeof(struct pci_device *)
+					   * (num + 1)));
+	    xf86PciVideoInfo[num] = NULL;
+	    xf86PciVideoInfo[num - 1] = info;
+
+	    pci_device_probe(info);
+	    info->user_data = 0;
+	}
+    }
+
+
+    /* If we haven't found a primary device try a different heuristic */
+    if (primaryBus.type == BUS_NONE && num) {
+	for (i = 0; i < num; i++) {
+	    uint16_t  command;
+
+	    info = xf86PciVideoInfo[i];
+	    pci_device_cfg_read_u16(info, & command, 4);
+
+	    if ((command & PCI_CMD_MEM_ENABLE) 
+		&& ((num == 1) || IS_VGA(info->device_class))) {
+		if (primaryBus.type == BUS_NONE) {
+		    primaryBus.type = BUS_PCI;
+		    primaryBus.id.pci = info;
+		} else {
+		    xf86Msg(X_NOTICE,
+			    "More than one possible primary device found\n");
+		    primaryBus.type ^= (BusType)(-1);
+		}
+	    }
+	}
+    }
+    
+    /* Print a summary of the video devices found */
+    for (k = 0; k < num; k++) {
+	const char *vendorname = NULL, *chipname = NULL;
+	const char *prim = " ";
+	Bool memdone = FALSE, iodone = FALSE;
+
+
+	info = xf86PciVideoInfo[k];
+
+	vendorname = pci_device_get_vendor_name( info );
+	chipname = pci_device_get_device_name( info );
+
+	if ((!vendorname || !chipname) &&
+	    !PCIALWAYSPRINTCLASSES(info->device_class))
+	    continue;
+
+	if (xf86IsPrimaryPci(info))
+	    prim = "*";
+
+	xf86Msg( X_PROBED, "PCI:%s(%u@%u:%u:%u) ", prim, info->domain,
+		 info->bus, info->dev, info->func );
+
+	if (vendorname)
+	    xf86ErrorF("%s ", vendorname);
+	else
+	    xf86ErrorF("unknown vendor (0x%04x) ", info->vendor_id);
+
+	if (chipname)
+	    xf86ErrorF("%s ", chipname);
+	else
+	    xf86ErrorF("unknown chipset (0x%04x) ", info->device_id);
+
+	xf86ErrorF("rev %d", info->revision);
+
+	for (i = 0; i < 6; i++) {
+	    struct pci_mem_region * r = & info->regions[i];
+
+	    if ( r->size && ! r->is_IO ) {
+		if (!memdone) {
+		    xf86ErrorF(", Mem @ ");
+		    memdone = TRUE;
+		} else
+		    xf86ErrorF(", ");
+		xf86ErrorF("0x%08lx/%ld", r->base_addr, r->size);
+	    }
+	}
+
+	for (i = 0; i < 6; i++) {
+	    struct pci_mem_region * r = & info->regions[i];
+
+	    if ( r->size && r->is_IO ) {
+		if (!iodone) {
+		    xf86ErrorF(", I/O @ ");
+		    iodone = TRUE;
+		} else
+		    xf86ErrorF(", ");
+		xf86ErrorF("0x%08lx/%ld", r->base_addr, r->size);
+	    }
+	}
+
+	if ( info->rom_size ) {
+	    xf86ErrorF(", BIOS @ 0x\?\?\?\?\?\?\?\?/%ld", info->rom_size);
+	}
+
+	xf86ErrorF("\n");
+    }
 }
 
 void
diff --git a/hw/xfree86/os-support/bus/Pci.c b/hw/xfree86/os-support/bus/Pci.c
index a34ed99d0..1ca0bd07a 100644
--- a/hw/xfree86/os-support/bus/Pci.c
+++ b/hw/xfree86/os-support/bus/Pci.c
@@ -268,18 +268,7 @@ pciAddrNOOP(PCITAG tag, PciAddrType type, ADDRESS addr)
 _X_EXPORT Bool
 xf86scanpci(void)
 {
-    static Bool  done = FALSE;
-    static Bool  success = FALSE;
-
-    /*
-     * if we haven't found PCI devices checking for pci_devp may
-     * result in an endless recursion if platform/OS specific PCI
-     * bus probing code calls this function from with in it.
-     */
-    if (done)
-	return success;
-
-    done = TRUE;
+    Bool  success = FALSE;
 
     success = (pci_system_init() == 0);
     pciInit();

From 9727db88d57089be6483104de435626cdbad883a Mon Sep 17 00:00:00 2001
From: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Mon, 25 Feb 2008 17:08:07 -0300
Subject: [PATCH 539/552] No more "-scanpci" given that we already have it in
 libpciaccess.

(Yeah, lets nuke dead code!)
---
 hw/xfree86/common/Makefile.am        |   2 +-
 hw/xfree86/common/xf86DoScanPci.c    | 147 ---------------------------
 hw/xfree86/common/xf86Init.c         |   5 -
 hw/xfree86/common/xf86PciInfo.h      |   5 +-
 hw/xfree86/common/xf86Priv.h         |   4 -
 hw/xfree86/doc/devel/Registry        |   1 -
 hw/xfree86/doc/man/Xorg.man.pre      |   7 --
 hw/xfree86/doc/man/xorg.conf.man.pre |   6 +-
 hw/xfree86/dummylib/Makefile.am      |   2 +-
 hw/xfree86/modes/Makefile.am         |   2 +-
 hw/xgl/glx/xglxorg.c                 |   2 -
 11 files changed, 7 insertions(+), 176 deletions(-)
 delete mode 100644 hw/xfree86/common/xf86DoScanPci.c

diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
index c060b73f0..4f0a2d6b3 100644
--- a/hw/xfree86/common/Makefile.am
+++ b/hw/xfree86/common/Makefile.am
@@ -31,7 +31,7 @@ BUILT_SOURCES = xf86DefModeSet.c
 AM_LDFLAGS = -r
 libcommon_la_SOURCES = xf86Configure.c xf86Bus.c xf86Config.c \
                       xf86Cursor.c xf86cvt.c xf86DGA.c xf86DPMS.c \
-                      xf86DoProbe.c xf86DoScanPci.c xf86Events.c \
+                      xf86DoProbe.c xf86Events.c \
                       xf86Globals.c xf86AutoConfig.c \
                       xf86MiscExt.c xf86Option.c \
                       xf86VidMode.c xf86fbman.c xf86cmap.c \
diff --git a/hw/xfree86/common/xf86DoScanPci.c b/hw/xfree86/common/xf86DoScanPci.c
deleted file mode 100644
index 51892f041..000000000
--- a/hw/xfree86/common/xf86DoScanPci.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (c) 1999-2002 by The XFree86 Project, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of the copyright holder(s)
- * and author(s) shall not be used in advertising or otherwise to promote
- * the sale, use or other dealings in this Software without prior written
- * authorization from the copyright holder(s) and author(s).
- */
-
-/*
- * Finish setting up the server.
- * Call the functions from the scanpci module.
- */
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include <pciaccess.h>
-#include "os.h"
-#include "xf86.h"
-#include "xf86Priv.h"
-#include "xf86Pci.h"
-#include "Pci.h"
-#include "xf86_OSproc.h"
-
-static void ScanPciDisplayPCICardInfo(void);
-
-void
-ScanPciDisplayPCICardInfo(void)
-{
-    struct pci_id_match   match;
-    struct pci_device_iterator *iter;
-    const struct pci_device *dev;
-
-    xf86EnableIO();
-
-    if (! xf86scanpci()) {
-        xf86MsgVerb(X_NONE, 0, "No PCI info available\n");
-	return;
-    }
-    xf86MsgVerb(X_NONE, 0,
-		"Probing for PCI devices (Bus:Device:Function)\n\n");
-
-    iter = pci_id_match_iterator_create(NULL);
-    while ((dev = pci_device_next(iter)) != NULL) {
-	const char *svendorname = NULL, *subsysname = NULL;
-	const char *vendorname = NULL, *devicename = NULL;
-
-
-	xf86MsgVerb(X_NONE, 0, "(%d:%d:%d) ",
-		    PCI_MAKE_BUS(dev->domain, dev->bus), dev->dev, dev->func);
-
-	/*
-	 * Lookup as much as we can about the device.
-	 */
-	match.vendor_id = dev->vendor_id;
-	match.device_id = dev->device_id;
-	match.subvendor_id = (dev->subvendor_id != 0)
-	  ? dev->subvendor_id : PCI_MATCH_ANY;
-	match.subdevice_id = (dev->subdevice_id != 0)
-	  ? dev->subdevice_id : PCI_MATCH_ANY;
-	match.device_class = 0;
-	match.device_class_mask = 0;
-
-	pci_get_strings(& match, & vendorname, & devicename,
-			& svendorname, & subsysname);
-
-	if ((dev->subvendor_id != 0) || (dev->subdevice_id != 0)) {
-	    xf86MsgVerb(X_NONE, 0, "%s %s (0x%04x / 0x%04x) using ",
-			(svendorname == NULL) ? "unknown vendor" : svendorname,
-			(subsysname == NULL) ? "unknown card" : subsysname,
-			dev->subvendor_id, dev->subdevice_id);
-	}
-
-	xf86MsgVerb(X_NONE, 0, "%s %s (0x%04x / 0x%04x)\n",
-		    (vendorname == NULL) ? "unknown vendor" : vendorname,
-		    (devicename == NULL) ? "unknown chip" : devicename,
-		    dev->vendor_id, dev->device_id);
-    }
-
-    pci_iterator_destroy(iter);
-}
-
-
-void DoScanPci(int argc, char **argv, int i)
-{
-  int j,skip,globalVerbose;
-
-  /*
-   * first we need to finish setup of the OS so that we can call other
-   * functions in the server
-   */
-  OsInit();
-
-  /*
-   * The old verbosity processing that was here isn't useful anymore, but
-   * for compatibility purposes, ignore verbosity changes after the -scanpci
-   * flag.
-   */
-  globalVerbose = xf86Verbose;
-
-  /*
-   * next we process the arguments that are remaining on the command line,
-   * so that things like the module path can be set there
-   */
-  for ( j = i+1; j < argc; j++ ) {
-    if ((skip = ddxProcessArgument(argc, argv, j)))
-	j += (skip - 1);
-  } 
-
-  /*
-   * Was the verbosity level increased?  If so, set it back.
-   */
-  if (xf86Verbose > globalVerbose)
-    xf86SetVerbosity(globalVerbose);
-
-  ScanPciDisplayPCICardInfo();
-
-  /*
-   * That's it; we really should clean things up, but a simple
-   * exit seems to be all we need.
-   */
-  exit(0);
-}
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 41cf1d17c..7121b027b 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -1668,10 +1668,6 @@ ddxProcessArgument(int argc, char **argv, int i)
     return 1;
   }
 #endif
-  if (!strcmp(argv[i], "-scanpci"))
-  {
-    DoScanPci(argc, argv, i);
-  }
   if (!strcmp(argv[i], "-probe"))
   {
     xf86DoProbe = TRUE;
@@ -1734,7 +1730,6 @@ ddxUseMsg()
   ErrorF("-config file           specify a configuration file, relative to the\n");
   ErrorF("                       "__XCONFIGFILE__" search path, only root can use absolute\n");
   ErrorF("-probeonly             probe for devices, then exit\n");
-  ErrorF("-scanpci               execute the scanpci module and exit\n");
   ErrorF("-verbose [n]           verbose startup messages\n");
   ErrorF("-logverbose [n]        verbose log messages\n");
   ErrorF("-quiet                 minimal startup messages\n");
diff --git a/hw/xfree86/common/xf86PciInfo.h b/hw/xfree86/common/xf86PciInfo.h
index 0630cfa82..356c7db4d 100644
--- a/hw/xfree86/common/xf86PciInfo.h
+++ b/hw/xfree86/common/xf86PciInfo.h
@@ -40,9 +40,8 @@
  * or for non-video devices unless they're needed by a driver or elsewhere.
  * A comprehensive set of PCI vendor, device and subsystem data is
  * auto-generated from the ../etc/pci.ids file using the pciids2c.pl script,
- * and is used in both the scanpci module and the scanpci utility.  Don't
- * modify the pci.ids file.  If new/corrected entries are required, add them
- * to ../etc/extrapci.ids.
+ * and is used in scanpci utility.  Don't modify the pci.ids file.  If 
+ * new/corrected entries are required, add them to ../etc/extrapci.ids.
  */
 
 #ifndef _XF86_PCIINFO_H
diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
index 32801cb3f..fb9ecaea8 100644
--- a/hw/xfree86/common/xf86Priv.h
+++ b/hw/xfree86/common/xf86Priv.h
@@ -155,10 +155,6 @@ Bool xf86PathIsSafe(const char *path);
 
 extern DisplayModeRec xf86DefaultModes [];
 
-/* xf86DoScanPci.c */
-
-void DoScanPci(int argc, char **argv, int i);
-
 /* xf86DoProbe.c */
 void DoProbe(void);
 void DoConfigure(void);
diff --git a/hw/xfree86/doc/devel/Registry b/hw/xfree86/doc/devel/Registry
index d76622157..1fec230e8 100644
--- a/hw/xfree86/doc/devel/Registry
+++ b/hw/xfree86/doc/devel/Registry
@@ -75,7 +75,6 @@ rendition
 s3
 s3virge
 savage
-scanpci
 shadow
 shadowfb
 siliconmotion
diff --git a/hw/xfree86/doc/man/Xorg.man.pre b/hw/xfree86/doc/man/Xorg.man.pre
index c950e326b..405efda55 100644
--- a/hw/xfree86/doc/man/Xorg.man.pre
+++ b/hw/xfree86/doc/man/Xorg.man.pre
@@ -378,13 +378,6 @@ and
 .B \-ggamma
 options.
 .TP 8
-.B \-scanpci
-When this option is specified, the
-.B __xservername__
-server scans the PCI bus, and prints out some information about each
-device that was detected.  See also scanpci(__appmansuffix__) 
-and pcitweak(__appmansuffix__).
-.TP 8
 .BI \-screen " screen-name"
 Use the __xconfigfile__(__filemansuffix__) file
 .B Screen
diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
index 96f30c4bd..9f3980879 100644
--- a/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -994,10 +994,8 @@ In multi-head configurations, or when using a secondary graphics card in a
 single-head configuration, this entry is mandatory.
 Its main purpose is to make an unambiguous connection between the device
 section and the hardware it is representing.
-This information can usually be found by running the __xservername__ server
-with the
-.B \-scanpci
-command line option.
+This information can usually be found by running the pciaccess tool
+scanpci.
 .TP 7
 .BI "Screen  " number
 This option is mandatory for cards where a single PCI entity can drive more
diff --git a/hw/xfree86/dummylib/Makefile.am b/hw/xfree86/dummylib/Makefile.am
index ad3f1ea12..85a1d03dd 100644
--- a/hw/xfree86/dummylib/Makefile.am
+++ b/hw/xfree86/dummylib/Makefile.am
@@ -1,6 +1,6 @@
 # libdummy.a contains just those bits used in the server itself
 # libdummy-nonserver.a contains additional routines normally found in the
-# server for use in building the utilities like scanpci & the config tools
+# server for use in building the utilities like config tools
 
 noinst_LIBRARIES = libdummy-nonserver.a
 
diff --git a/hw/xfree86/modes/Makefile.am b/hw/xfree86/modes/Makefile.am
index 1f82068b3..6ee85757a 100644
--- a/hw/xfree86/modes/Makefile.am
+++ b/hw/xfree86/modes/Makefile.am
@@ -16,7 +16,7 @@ libxf86modes_a_SOURCES = \
 
 INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
 	   -I$(srcdir)/../loader -I$(srcdir)/../rac -I$(srcdir)/../parser \
-           -I$(srcdir)/../scanpci -I$(srcdir)/../vbe -I$(srcdir)/../int10 \
+	   -I$(srcdir)/../vbe -I$(srcdir)/../int10 \
 	   -I$(srcdir)/../vgahw -I$(srcdir)/../ramdac \
 	   -I$(srcdir)/../dixmods/extmod
 
diff --git a/hw/xgl/glx/xglxorg.c b/hw/xgl/glx/xglxorg.c
index 984c50ee2..1d6fc9a30 100644
--- a/hw/xgl/glx/xglxorg.c
+++ b/hw/xgl/glx/xglxorg.c
@@ -253,8 +253,6 @@ xglxArgRec xorgUidArgs[] = {
 xglxArgRec xorgArgs[] = {
     ARG (xglxProcessXorgWaitExitArgument, "-probeonly",
 	 "             probe for devices, then exit"),
-    ARG (xglxProcessXorgWaitExitArgument, "-scanpci",
-	 "               execute the scanpci module and exit"),
     XORG_UARG ("-verbose", " [n]           verbose startup messages", 2),
     XORG_UARG ("-logverbose", " [n]        verbose log messages", 2),
     XORG_UARG ("-quiet", "                 minimal startup messages", 1),

From 7c582dd6de27d2f4fedf73319d2dea2bfb240efa Mon Sep 17 00:00:00 2001
From: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Mon, 25 Feb 2008 17:31:37 -0300
Subject: [PATCH 540/552] remove lnxPciInit() unused function.

---
 hw/xfree86/os-support/linux/lnx_pci.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/hw/xfree86/os-support/linux/lnx_pci.c b/hw/xfree86/os-support/linux/lnx_pci.c
index 53818f2dc..8eedfa49f 100644
--- a/hw/xfree86/os-support/linux/lnx_pci.c
+++ b/hw/xfree86/os-support/linux/lnx_pci.c
@@ -25,8 +25,6 @@
 #define PCIADDR_FMT		"%lx"
 #endif
 
-int lnxPciInit(void);
-
 struct pci_dev {
     unsigned int domain;
     unsigned int bus;
@@ -139,14 +137,6 @@ static struct pci_dev *xf86OSLinuxGetPciDevs(void) {
     return ret;
 }
 
-/* not to be confused with linuxPciInit (i.e. ARCH_PCI_INIT), found in
- * os-support/bus/linuxPci.c. */
-int lnxPciInit(void) {
-    if (!xf86OSLinuxPCIDevs)
-        xf86OSLinuxPCIDevs = xf86OSLinuxGetPciDevs();
-    return xf86OSLinuxNumPciDevs;
-}
-
 /* Query the kvirt address (64bit) of a BAR range from size for a given TAG */
 unsigned long
 xf86GetOSOffsetFromPCI(PCITAG tag, int space, unsigned long base)

From 81272f7ec9a3465e1d102c2ce627a45f92268857 Mon Sep 17 00:00:00 2001
From: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Mon, 25 Feb 2008 17:39:33 -0300
Subject: [PATCH 541/552] Some doc clean up:     clean up legacy things in
 os-support/bus/Pci.c.

    Put InitOutput() comment to its right place.
---
 hw/xfree86/common/xf86Init.c    | 14 +++----
 hw/xfree86/os-support/bus/Pci.c | 69 ---------------------------------
 2 files changed, 6 insertions(+), 77 deletions(-)

diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 7121b027b..d1603c081 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -198,13 +198,6 @@ xf86CreateRootWindow(WindowPtr pWin)
 }
 
 
-/*
- * InitOutput --
- *	Initialize screenInfo for all actually accessible framebuffers.
- *      That includes vt-manager setup, querying all possible devices and
- *      collecting the pixmap formats.
- */
-
 static void
 PostConfigInit(void)
 {
@@ -467,7 +460,12 @@ xf86CallDriverProbe( DriverPtr drv, Bool detect_only )
     return foundScreen;
 }
 
-
+/*
+ * InitOutput --
+ *	Initialize screenInfo for all actually accessible framebuffers.
+ *      That includes vt-manager setup, querying all possible devices and
+ *      collecting the pixmap formats.
+ */
 void
 InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
 {
diff --git a/hw/xfree86/os-support/bus/Pci.c b/hw/xfree86/os-support/bus/Pci.c
index 1ca0bd07a..2d3f748e7 100644
--- a/hw/xfree86/os-support/bus/Pci.c
+++ b/hw/xfree86/os-support/bus/Pci.c
@@ -1,64 +1,3 @@
-/*
- * Pci.c - New server PCI access functions
- *
- * The XFree86 server PCI access functions have been reimplemented as a
- * framework that allows each supported platform/OS to have their own
- * platform/OS specific pci driver.
- *
- * All of the public PCI access functions exported to the other parts of
- * the server are declared in Pci.h and defined herein.  These include:
- *	pciInit()              - Initialize PCI access functions
- *	pciReadLong()          - Read a 32 bit value from a device's cfg space
- *	pciReadWord()          - Read a 16 bit value from a device's cfg space
- *	pciReadByte()          - Read an 8 bit value from a device's cfg space
- *	pciWriteLong()         - Write a 32 bit value to a device's cfg space
- *	pciWriteWord()         - Write a 16 bit value to a device's cfg space
- *	pciWriteByte()         - Write an 8 bit value to a device's cfg space
- *	pciSetBitsLong()       - Write a 32 bit value against a mask
- *	pciSetBitsByte()       - Write an 8 bit value against a mask
- *	pciTag()               - Return tag for a given PCI bus, device, &
- *                               function
- *	pciBusAddrToHostAddr() - Convert a PCI address to a host address
- *	xf86scanpci()          - Return info about all PCI devices
- *	xf86MapDomainMemory()  - Like xf86MapPciMem() but can handle
- *                               domain/host address translation
- *	xf86MapLegacyIO()      - Maps PCI I/O spaces
- *
- * The actual PCI backend driver is selected by the pciInit() function
- * (see below)  using either compile time definitions, run-time checks,
- * or both.
- *
- * Certain generic functions are provided that make the implementation
- * of certain well behaved platforms (e.g. those supporting PCI config
- * mechanism 1 or some thing close to it) very easy.
- *
- * Less well behaved platforms/OS's can roll their own functions.
- *
- * To add support for another platform/OS, add a call to fooPciInit() within
- * pciInit() below under the correct compile time definition or run-time
- * conditional.
- *
- * The fooPciInit() procedure must do three things:
- *	1) Initialize the pciBusTable[] for all primary PCI buses including
- *	   the per domain PCI access functions (readLong, writeLong,
- *	   addrBusToHost, and addrHostToBus).
- *
- *	2) Add entries to pciBusTable[] for configured secondary buses.  This
- *	   step may be skipped if a platform is using the generic findFirst/
- *	   findNext functions because these procedures will automatically
- *	   discover and add secondary buses dynamically.
- *
- *      3) Overide default settings for global PCI access functions if
- *	   required. These include pciFindFirstFP, pciFindNextFP,
- *	   Of course, if you choose not to use one of the generic
- *	   functions, you will need to provide a platform specifc replacement.
- *
- * Gary Barton
- * Concurrent Computer Corporation
- * garyb@gate.net
- *
- */
-
 /*
  * Copyright 1998 by Concurrent Computer Corporation
  *
@@ -197,14 +136,6 @@
 
 #include <pciaccess.h>
 
-#if 0
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#endif
-
 #define PCI_MFDEV_SUPPORT   1 /* Include PCI multifunction device support */
 #define PCI_BRIDGE_SUPPORT  1 /* Include support for PCI-to-PCI bridges */
 

From a9050d54249ed9f54c6fe59143b846c9c7548f59 Mon Sep 17 00:00:00 2001
From: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Mon, 25 Feb 2008 18:10:18 -0300
Subject: [PATCH 542/552] Jesus, pciInit() was called 32 times in my machine
 without need!

xf86scanpci() will always call pciInit() before any other function, so
there's no need to guarantee it after.
---
 hw/xfree86/os-support/bus/Pci.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/hw/xfree86/os-support/bus/Pci.c b/hw/xfree86/os-support/bus/Pci.c
index 2d3f748e7..8b21fad59 100644
--- a/hw/xfree86/os-support/bus/Pci.c
+++ b/hw/xfree86/os-support/bus/Pci.c
@@ -154,11 +154,6 @@ int            pciMaxBusNum = MAX_PCI_BUSES;
 static void
 pciInit(void)
 {
-    static int pciInitialized = 0;
-
-    if (!pciInitialized) {
-	pciInitialized = 1;
-
 	/* XXX */
 #if defined(DEBUGPCI)
 	if (DEBUGPCI >= xf86Verbose) {
@@ -167,7 +162,6 @@ pciInit(void)
 #endif
 
 	ARCH_PCI_INIT();
-    }
 }
 
 _X_EXPORT ADDRESS
@@ -175,8 +169,6 @@ pciBusAddrToHostAddr(PCITAG tag, PciAddrType type, ADDRESS addr)
 {
   int bus = PCI_BUS_FROM_TAG(tag);
 
-  pciInit();
-
   if ((bus >= 0) && (bus < pciNumBuses) && pciBusInfo[bus] &&
 	pciBusInfo[bus]->funcs->pciAddrBusToHost)
 	  return (*pciBusInfo[bus]->funcs->pciAddrBusToHost)(tag, type, addr);

From c46f7b62d2bf9f35937cfef98325ed904895396a Mon Sep 17 00:00:00 2001
From: Tiago Vignatti <vignatti@c3sl.ufpr.br>
Date: Mon, 25 Feb 2008 18:14:08 -0300
Subject: [PATCH 543/552] Fine, we don't need pciInit() anymore. Nuke, nuke,
 nuke...

---
 hw/xfree86/os-support/bus/Pci.c | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/hw/xfree86/os-support/bus/Pci.c b/hw/xfree86/os-support/bus/Pci.c
index 8b21fad59..064533c77 100644
--- a/hw/xfree86/os-support/bus/Pci.c
+++ b/hw/xfree86/os-support/bus/Pci.c
@@ -148,22 +148,6 @@ _X_EXPORT int            pciNumBuses = 0;     /* Actual number of PCI buses */
 int            pciMaxBusNum = MAX_PCI_BUSES;
 
 
-/*
- * pciInit - choose correct platform/OS specific PCI init routine
- */
-static void
-pciInit(void)
-{
-	/* XXX */
-#if defined(DEBUGPCI)
-	if (DEBUGPCI >= xf86Verbose) {
-	    xf86Verbose = DEBUGPCI;
-	}
-#endif
-
-	ARCH_PCI_INIT();
-}
-
 _X_EXPORT ADDRESS
 pciBusAddrToHostAddr(PCITAG tag, PciAddrType type, ADDRESS addr)
 {
@@ -194,7 +178,16 @@ xf86scanpci(void)
     Bool  success = FALSE;
 
     success = (pci_system_init() == 0);
-    pciInit();
+
+	/* XXX */
+#if defined(DEBUGPCI)
+	if (DEBUGPCI >= xf86Verbose) {
+	    xf86Verbose = DEBUGPCI;
+	}
+#endif
+
+    /* choose correct platform/OS specific PCI init routine */
+	ARCH_PCI_INIT();
 
     return success;
 }

From dcc077c753137f37aa58231f1df3c4adb92b2c4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel@tungstengraphics.com>
Date: Tue, 26 Feb 2008 12:13:06 +0100
Subject: [PATCH 544/552] AIGLX: Switch to server context for calling
 DamageDamageRegion().

Fixes https://bugs.freedesktop.org/show_bug.cgi?id=14518 .
---
 GL/glx/glxdri.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c
index 304fed2bd..f51a5310d 100644
--- a/GL/glx/glxdri.c
+++ b/GL/glx/glxdri.c
@@ -798,10 +798,14 @@ static void __glXReportDamage(__DRIdrawable *driDraw,
     DrawablePtr pDraw = drawable->base.pDraw;
     RegionRec region;
 
+    __glXenterServer(GL_FALSE);
+
     REGION_INIT(pDraw->pScreen, &region, (BoxPtr) rects, num_rects);
     REGION_TRANSLATE(pScreen, &region, pDraw->x, pDraw->y);
     DamageDamageRegion(pDraw, &region);
     REGION_UNINIT(pDraw->pScreen, &region);
+
+    __glXleaveServer(GL_FALSE);
 }
 
 /* Table of functions that we export to the driver. */

From d12b7b6632fb4cf41d2e28c7792eaa503f25404a Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Wed, 27 Feb 2008 07:08:00 +1000
Subject: [PATCH 545/552] xf86Crtc: add higher level modesetting entry point.

For kernel modesetting work we need a bigger stick to beat the modesetting path
---
 hw/xfree86/modes/xf86Crtc.c | 3 +++
 hw/xfree86/modes/xf86Crtc.h | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 4ecf4b3d7..266e08195 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -236,6 +236,9 @@ xf86CrtcSetMode (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
     int			saved_x, saved_y;
     Rotation		saved_rotation;
 
+    if (crtc->funcs->set_mode_major)
+	return crtc->funcs->set_mode_major(crtc, mode, rotation, x, y);
+	
     crtc->enabled = xf86CrtcInUse (crtc);
     
     if (!crtc->enabled)
diff --git a/hw/xfree86/modes/xf86Crtc.h b/hw/xfree86/modes/xf86Crtc.h
index 62d85bbc9..cc045b229 100644
--- a/hw/xfree86/modes/xf86Crtc.h
+++ b/hw/xfree86/modes/xf86Crtc.h
@@ -206,6 +206,13 @@ typedef struct _xf86CrtcFuncs {
      */
     void
     (*destroy) (xf86CrtcPtr	crtc);
+
+    /**
+     * Less fine-grained mode setting entry point for kernel modesetting
+     */
+    Bool
+    (*set_mode_major)(xf86CrtcPtr crtc, DisplayModePtr mode,
+		      Rotation rotation, int x, int y);
 } xf86CrtcFuncsRec, *xf86CrtcFuncsPtr;
 
 struct _xf86Crtc {

From c8e979b3b800e4c58be454daa0213285d4ee6510 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 26 Feb 2008 21:34:22 -0500
Subject: [PATCH 546/552] security: Register resource names in the server-side
 name registry.

---
 Xext/security.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Xext/security.c b/Xext/security.c
index 27ef38205..cd67120d9 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -1105,6 +1105,8 @@ SecurityExtensionInit(INITARGS)
 	return;
 
     RTEventClient |= RC_NEVERRETAIN;
+    RegisterResourceName(SecurityAuthorizationResType, "SecurityAuthorization");
+    RegisterResourceName(RTEventClient, "SecurityEventClient");
 
     /* Allocate the private storage */
     if (!dixRequestPrivate(stateKey, sizeof(SecurityStateRec)))

From 4632ea22580c31d44b0786321668d9e78f02900e Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 26 Feb 2008 22:00:52 -0500
Subject: [PATCH 547/552] xselinux: Rip out the selection code in advance of
 polyinstantiation support.

This resolves an issue where BadWindow errors were being thrown.
---
 Xext/xselinux.c | 31 -------------------------------
 1 file changed, 31 deletions(-)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 5aa2ad3fa..60ec8d494 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -951,42 +951,11 @@ static void
 SELinuxSelectionState(CallbackListPtr *pcbl, pointer unused, pointer calldata)
 {
     SelectionInfoRec *rec = calldata;
-    SELinuxSubjectRec *subj;
-    SELinuxObjectRec *obj;
 
     switch (rec->kind) {
     case SelectionSetOwner:
-	/* save off the "real" owner of the selection */
-	rec->selection->alt_client = rec->selection->client;
-	rec->selection->alt_window = rec->selection->window;
-
-	/* figure out the new label for the content */
-	subj = dixLookupPrivate(&rec->client->devPrivates, subjectKey);
-	obj = dixLookupPrivate(&rec->selection->devPrivates, objectKey);
-	sidput(obj->sid);
-
-	if (avc_compute_create(subj->sid, subj->sid, SECCLASS_X_SELECTION,
-			       &obj->sid) < 0) {
-	    ErrorF("SELinux: a compute_create call failed!\n");
-	    obj->sid = unlabeled_sid;
-	}
-	break;
-
     case SelectionGetOwner:
-	/* restore the real owner */
-	rec->selection->window = rec->selection->alt_window;
-	break;
-
     case SelectionConvertSelection:
-	/* redirect the convert request if necessary */
-	if (securityManager && securityManager != rec->client) {
-	    rec->selection->client = securityManager;
-	    rec->selection->window = securityWindow;
-	} else {
-	    rec->selection->client = rec->selection->alt_client;
-	    rec->selection->window = rec->selection->alt_window;
-	}
-	break;
     default:
 	break;
     }

From 3f0681fb0b2d0744c2ef892883ae5359b43a4a9a Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue, 26 Feb 2008 23:14:29 -0500
Subject: [PATCH 548/552] xselinux: Stub out selection protocol requests.

---
 Xext/xselinux.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++
 Xext/xselinux.h |  3 +++
 2 files changed, 55 insertions(+)

diff --git a/Xext/xselinux.c b/Xext/xselinux.c
index 60ec8d494..d3fe86b3a 100644
--- a/Xext/xselinux.c
+++ b/Xext/xselinux.c
@@ -1282,6 +1282,24 @@ ProcSELinuxGetWindowContext(ClientPtr client)
     return client->noClientException;
 }
 
+static int
+ProcSELinuxSetSelectionCreateContext(ClientPtr client)
+{
+    return Success;
+}
+
+static int
+ProcSELinuxGetSelectionCreateContext(ClientPtr client)
+{
+    return Success;
+}
+
+static int
+ProcSELinuxGetSelectionContext(ClientPtr client)
+{
+    return Success;
+}
+
 static int
 ProcSELinuxDispatch(ClientPtr client)
 {
@@ -1313,6 +1331,12 @@ ProcSELinuxDispatch(ClientPtr client)
 	return ProcSELinuxGetWindowCreateContext(client);
     case X_SELinuxGetWindowContext:
 	return ProcSELinuxGetWindowContext(client);
+    case X_SELinuxSetSelectionCreateContext:
+	return ProcSELinuxSetSelectionCreateContext(client);
+    case X_SELinuxGetSelectionCreateContext:
+	return ProcSELinuxGetSelectionCreateContext(client);
+    case X_SELinuxGetSelectionContext:
+	return ProcSELinuxGetSelectionContext(client);
     default:
 	return BadRequest;
     }
@@ -1420,6 +1444,28 @@ SProcSELinuxGetWindowContext(ClientPtr client)
     return ProcSELinuxGetWindowContext(client);
 }
 
+static int
+SProcSELinuxSetSelectionCreateContext(ClientPtr client)
+{
+    REQUEST(SELinuxSetCreateContextReq);
+    int n;
+
+    REQUEST_AT_LEAST_SIZE(SELinuxSetCreateContextReq);
+    swaps(&stuff->context_len, n);
+    return ProcSELinuxSetSelectionCreateContext(client);
+}
+
+static int
+SProcSELinuxGetSelectionContext(ClientPtr client)
+{
+    REQUEST(SELinuxGetContextReq);
+    int n;
+
+    REQUEST_SIZE_MATCH(SELinuxGetContextReq);
+    swapl(&stuff->id, n);
+    return ProcSELinuxGetSelectionContext(client);
+}
+
 static int
 SProcSELinuxDispatch(ClientPtr client)
 {
@@ -1455,6 +1501,12 @@ SProcSELinuxDispatch(ClientPtr client)
 	return ProcSELinuxGetWindowCreateContext(client);
     case X_SELinuxGetWindowContext:
 	return SProcSELinuxGetWindowContext(client);
+    case X_SELinuxSetSelectionCreateContext:
+	return SProcSELinuxSetSelectionCreateContext(client);
+    case X_SELinuxGetSelectionCreateContext:
+	return ProcSELinuxGetSelectionCreateContext(client);
+    case X_SELinuxGetSelectionContext:
+	return SProcSELinuxGetSelectionContext(client);
     default:
 	return BadRequest;
     }
diff --git a/Xext/xselinux.h b/Xext/xselinux.h
index 7eeea5046..480276154 100644
--- a/Xext/xselinux.h
+++ b/Xext/xselinux.h
@@ -43,6 +43,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define X_SELinuxSetWindowCreateContext		10
 #define X_SELinuxGetWindowCreateContext		11
 #define X_SELinuxGetWindowContext		12
+#define X_SELinuxSetSelectionCreateContext	13
+#define X_SELinuxGetSelectionCreateContext	14
+#define X_SELinuxGetSelectionContext		15
 
 typedef struct {
     CARD8   reqType;

From 2257e20900460d85254734b595238e7ad5ee55c8 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed, 27 Feb 2008 17:15:28 +1030
Subject: [PATCH 549/552] dix: set dev->key to NULL after freeing it in
 CloseDevice. (Bug #12830)

Otherwise XkbRemoveResourceClient may try to dereference it lateron.

X.Org Bug 12830 <http://bugs.freedesktop.org/show_bug.cgi?id=12830>
---
 dix/devices.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dix/devices.c b/dix/devices.c
index bdcca5aba..4b20655c6 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -529,6 +529,7 @@ CloseDevice(DeviceIntPtr dev)
 	xfree(dev->key->curKeySyms.map);
 	xfree(dev->key->modifierKeyMap);
 	xfree(dev->key);
+        dev->key = NULL;
     }
 
     if (dev->valuator) {

From d74b0327e8355546e6b41e8ce684f461d65fa9dc Mon Sep 17 00:00:00 2001
From: Dodji Seketeli <dodji@openedhand.com>
Date: Wed, 27 Feb 2008 09:48:10 +0100
Subject: [PATCH 550/552] [Xephyr/GL] unbreak the build

Don't touch Xephyr DRI stuff when not compiling in a DRI environment.
---
 hw/kdrive/ephyr/ephyr.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c
index 738704e40..e95001dcd 100644
--- a/hw/kdrive/ephyr/ephyr.c
+++ b/hw/kdrive/ephyr/ephyr.c
@@ -841,6 +841,7 @@ miPointerScreenFuncRec ephyrPointerScreenFuncs =
   ephyrWarpCursor
 };
 
+#ifdef XEPHYR_DRI
 /**
  * find if the remote window denoted by a_remote
  * is paired with an internal Window within the Xephyr server.
@@ -872,6 +873,7 @@ ephyrExposePairedWindow (int a_remote)
     screen->WindowExposures (pair->local, &reg, NullRegion);
     REGION_UNINIT (screen, &reg);
 }
+#endif /*XEPHYR_DRI*/
 
 void
 ephyrPoll(void)
@@ -948,6 +950,7 @@ ephyrPoll(void)
 	  KdEnqueueKeyboardEvent (ephyrKbd, ev.data.key_up.scancode, TRUE);
 	  break;
 
+#ifdef XEPHYR_DRI
 	case EPHYR_EV_EXPOSE:
 	  /*
 	   * We only receive expose events when the expose event have
@@ -957,6 +960,7 @@ ephyrPoll(void)
 	   */
 	  ephyrExposePairedWindow (ev.data.expose.window);
 	  break;
+#endif /*XEPHYR_DRI*/
 
 	default:
 	  break;

From 43e46a654fa7cf69f0c8bcb7f583008d96a98686 Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@tungstengraphics.com>
Date: Wed, 27 Feb 2008 16:58:21 +0000
Subject: [PATCH 551/552] Fix context sharing between direct/indirect contexts

---
 GL/glx/glxdri.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c
index f51a5310d..613ac05f1 100644
--- a/GL/glx/glxdri.c
+++ b/GL/glx/glxdri.c
@@ -614,6 +614,9 @@ __glXDRIscreenCreateContext(__GLXscreen *baseScreen,
     else
 	driShare = NULL;
 
+    if (baseShareContext && baseShareContext->isDirect)
+        return NULL;
+
     context = xalloc(sizeof *context);
     if (context == NULL)
 	return NULL;
@@ -649,6 +652,11 @@ __glXDRIscreenCreateContext(__GLXscreen *baseScreen,
 					   hwContext,
 					   &context->driContext);
 
+    if (context->driContext.private == NULL) {
+	xfree(context);
+	return NULL;
+    }
+
     return &context->base;
 }
 

From 41aea6194bd29ab34cc166b3fd90eee64299ddf8 Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@tungstengraphics.com>
Date: Wed, 27 Feb 2008 17:06:27 +0000
Subject: [PATCH 552/552] More checking for failed contexts/drawables

---
 GL/glx/glxdri.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c
index 613ac05f1..f9b28e427 100644
--- a/GL/glx/glxdri.c
+++ b/GL/glx/glxdri.c
@@ -653,6 +653,9 @@ __glXDRIscreenCreateContext(__GLXscreen *baseScreen,
 					   &context->driContext);
 
     if (context->driContext.private == NULL) {
+    	__glXenterServer(GL_FALSE);
+	retval = DRIDestroyContext(baseScreen->pScreen, context->hwContextID);
+    	__glXleaveServer(GL_FALSE);
 	xfree(context);
 	return NULL;
     }
@@ -703,6 +706,14 @@ __glXDRIscreenCreateDrawable(__GLXscreen *screen,
 						 &private->driDrawable,
 						 hwDrawable, 0, NULL);
 
+    if (private->driDrawable.private == NULL) {
+	__glXenterServer(GL_FALSE);
+	DRIDestroyDrawable(screen->pScreen, serverClient, pDraw);
+	__glXleaveServer(GL_FALSE);
+	xfree(private);
+	return NULL;
+    }
+
     return &private->base;
 }