svn merge ^/branches/released .

18 files changed, 5209 insertions, 5090 deletions

diff --git a/libX11/src/XlibInt.c b/libX11/src/XlibInt.c
index b5ed3fc8d..305670214 100644
--- a/libX11/src/XlibInt.c
+++ b/libX11/src/XlibInt.c
@@ -1,2165 +1,2177 @@
-/*
-
-Copyright 1985, 1986, 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.
-
-*/
-
-/*
- *	XlibInt.c - Internal support routines for the C subroutine
- *	interface library (Xlib) to the X Window System Protocol V11.0.
- */
-
-#ifdef WIN32
-#define _XLIBINT_
-#include <X11\Xw32defs.h>
-#endif
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "Xlibint.h"
-#include "Xprivate.h"
-#include <X11/Xpoll.h>
-#include <assert.h>
-#include <stdio.h>
-#ifdef WIN32
-#include <direct.h>
-#endif
-
-#ifdef XTHREADS
-#include "locking.h"
-
-/* these pointers get initialized by XInitThreads */
-LockInfoPtr _Xglobal_lock = NULL;
-void (*_XCreateMutex_fn)(LockInfoPtr) = NULL;
-/* struct _XCVList *(*_XCreateCVL_fn)() = NULL; */
-void (*_XFreeMutex_fn)(LockInfoPtr) = NULL;
-void (*_XLockMutex_fn)(
-    LockInfoPtr /* lock */
-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
-    , char * /* file */
-    , int /* line */
-#endif
-    ) = NULL;
-void (*_XUnlockMutex_fn)(
-    LockInfoPtr /* lock */
-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
-    , char * /* file */
-    , int /* line */
-#endif
-    ) = NULL;
-xthread_t (*_Xthread_self_fn)(void) = NULL;
-
-#define XThread_Self()	((*_Xthread_self_fn)())
-
-#endif /* XTHREADS */
-
-/* check for both EAGAIN and EWOULDBLOCK, because some supposedly POSIX
- * systems are broken and return EWOULDBLOCK when they should return EAGAIN
- */
-#ifdef WIN32
-#define ETEST() (WSAGetLastError() == WSAEWOULDBLOCK)
-#else
-#ifdef __CYGWIN__ /* Cygwin uses ENOBUFS to signal socket is full */
-#define ETEST() (errno == EAGAIN || errno == EWOULDBLOCK || errno == ENOBUFS)
-#else
-#if defined(EAGAIN) && defined(EWOULDBLOCK)
-#define ETEST() (errno == EAGAIN || errno == EWOULDBLOCK)
-#else
-#ifdef EAGAIN
-#define ETEST() (errno == EAGAIN)
-#else
-#define ETEST() (errno == EWOULDBLOCK)
-#endif /* EAGAIN */
-#endif /* EAGAIN && EWOULDBLOCK */
-#endif /* __CYGWIN__ */
-#endif /* WIN32 */
-
-#ifdef WIN32
-#define ECHECK(err) (WSAGetLastError() == err)
-#define ESET(val) WSASetLastError(val)
-#else
-#ifdef __UNIXOS2__
-#define ECHECK(err) (errno == err)
-#define ESET(val)
-#else
-#define ECHECK(err) (errno == err)
-#define ESET(val) errno = val
-#endif
-#endif
-
-#if defined(LOCALCONN) || defined(LACHMAN)
-#ifdef EMSGSIZE
-#define ESZTEST() (ECHECK(EMSGSIZE) || ECHECK(ERANGE))
-#else
-#define ESZTEST() ECHECK(ERANGE)
-#endif
-#else
-#ifdef EMSGSIZE
-#define ESZTEST() ECHECK(EMSGSIZE)
-#endif
-#endif
-
-#ifdef __UNIXOS2__
-#include <limits.h>
-#define MAX_PATH _POSIX_PATH_MAX
-#endif
-
-/*
- * The following routines are internal routines used by Xlib for protocol
- * packet transmission and reception.
- *
- * _XIOError(Display *) will be called if any sort of system call error occurs.
- * This is assumed to be a fatal condition, i.e., XIOError should not return.
- *
- * _XError(Display *, xError *) will be called whenever an X_Error event is
- * received.  This is not assumed to be a fatal condition, i.e., it is
- * acceptable for this procedure to return.  However, XError should NOT
- * perform any operations (directly or indirectly) on the DISPLAY.
- *
- * Routines declared with a return type of 'Status' return 0 on failure,
- * and non 0 on success.  Routines with no declared return type don't
- * return anything.  Whenever possible routines that create objects return
- * the object they have created.
- */
-
-#define POLLFD_CACHE_SIZE 5
-
-#if _WIN32_WINNT < _WIN32_WINNT_VISTA
-struct pollfd {
-
-    SOCKET  fd;
-    SHORT   events;
-    SHORT   revents;
-
-};
-#define POLLRDNORM  0x0100
-#define POLLRDBAND  0x0200
-#define POLLIN      (POLLRDNORM | POLLRDBAND)
-#endif
-
-/* initialize the struct array passed to poll() below */
-Bool _XPollfdCacheInit(
-    Display *dpy)
-{
-#ifdef USE_POLL
-    struct pollfd *pfp;
-
-    pfp = (struct pollfd *)Xmalloc(POLLFD_CACHE_SIZE * sizeof(struct pollfd));
-    if (!pfp)
-	return False;
-    pfp[0].fd = dpy->fd;
-    pfp[0].events = POLLIN;
-
-    dpy->filedes = (XPointer)pfp;
-#endif
-    return True;
-}
-
-void _XPollfdCacheAdd(
-    Display *dpy,
-    int fd)
-{
-#ifdef USE_POLL
-    struct pollfd *pfp = (struct pollfd *)dpy->filedes;
-
-    if (dpy->im_fd_length <= POLLFD_CACHE_SIZE) {
-	pfp[dpy->im_fd_length].fd = fd;
-	pfp[dpy->im_fd_length].events = POLLIN;
-    }
-#endif
-}
-
-/* ARGSUSED */
-void _XPollfdCacheDel(
-    Display *dpy,
-    int fd)			/* not used */
-{
-#ifdef USE_POLL
-    struct pollfd *pfp = (struct pollfd *)dpy->filedes;
-    struct _XConnectionInfo *conni;
-
-    /* just recalculate whole list */
-    if (dpy->im_fd_length <= POLLFD_CACHE_SIZE) {
-	int loc = 1;
-	for (conni = dpy->im_fd_info; conni; conni=conni->next) {
-	    pfp[loc].fd = conni->fd;
-	    pfp[loc].events = POLLIN;
-	    loc++;
-	}
-    }
-#endif
-}
-
-#ifdef _MSC_VER
-#undef min
-#define min __min
-#endif
-
-static int sync_hazard(Display *dpy)
-{
-    unsigned long span = dpy->request - dpy->last_request_read;
-    unsigned long hazard = min((dpy->bufmax - dpy->buffer) / SIZEOF(xReq), 65535 - 10);
-    return span >= 65535 - hazard - 10;
-}
-
-static
-void sync_while_locked(Display *dpy)
-{
-#ifdef XTHREADS
-    if (dpy->lock)
-        (*dpy->lock->user_lock_display)(dpy);
-#endif
-    UnlockDisplay(dpy);
-    SyncHandle();
-    InternalLockDisplay(dpy, /* don't skip user locks */ 0);
-#ifdef XTHREADS
-    if (dpy->lock)
-        (*dpy->lock->user_unlock_display)(dpy);
-#endif
-}
-
-void _XSeqSyncFunction(
-    register Display *dpy)
-{
-    xGetInputFocusReply rep;
-    register xReq *req;
-
-    if ((dpy->request - dpy->last_request_read) >= (65535 - BUFSIZE/SIZEOF(xReq))) {
-	GetEmptyReq(GetInputFocus, req);
-	(void) _XReply (dpy, (xReply *)&rep, 0, xTrue);
-	sync_while_locked(dpy);
-    } else if (sync_hazard(dpy))
-	_XSetPrivSyncFunction(dpy);
-}
-
-/* NOTE: only called if !XTHREADS, or when XInitThreads wasn't called. */
-static int
-_XPrivSyncFunction (Display *dpy)
-{
-#ifdef XTHREADS
-    assert(!dpy->lock_fns);
-#endif
-    assert(dpy->synchandler == _XPrivSyncFunction);
-    assert((dpy->flags & XlibDisplayPrivSync) != 0);
-    dpy->synchandler = dpy->savedsynchandler;
-    dpy->savedsynchandler = NULL;
-    dpy->flags &= ~XlibDisplayPrivSync;
-    if(dpy->synchandler)
-        dpy->synchandler(dpy);
-    _XIDHandler(dpy);
-    _XSeqSyncFunction(dpy);
-    return 0;
-}
-
-void _XSetPrivSyncFunction(Display *dpy)
-{
-#ifdef XTHREADS
-    if (dpy->lock_fns)
-        return;
-#endif
-    if (!(dpy->flags & XlibDisplayPrivSync)) {
-	dpy->savedsynchandler = dpy->synchandler;
-	dpy->synchandler = _XPrivSyncFunction;
-	dpy->flags |= XlibDisplayPrivSync;
-    }
-}
-
-void _XSetSeqSyncFunction(Display *dpy)
-{
-    if (sync_hazard(dpy))
-	_XSetPrivSyncFunction (dpy);
-}
-
-#ifdef LONG64
-void _XRead32(
-    Display *dpy,
-    register long *data,
-    long len)
-{
-    register int *buf;
-    register long i;
-
-    if (len) {
-	(void) _XRead(dpy, (char *)data, len);
-	i = len >> 2;
-	buf = (int *)data + i;
-	data += i;
-	while (--i >= 0)
-	    *--data = *--buf;
-    }
-}
-#endif /* LONG64 */
-
-#ifdef WORD64
-
-/*
- * XXX This is a *really* stupid way of doing this....
- * PACKBUFFERSIZE must be a multiple of 4.
- */
-
-#define PACKBUFFERSIZE 4096
-
-
-/*
- * _XRead32 - Read bytes from the socket unpacking each 32 bits
- *            into a long (64 bits on a CRAY computer).
- *
- */
-static void _doXRead32(
-        register Display *dpy,
-        register long *data
-        register long size,
-	register char *packbuffer)
-{
- long *lpack,*lp;
- long mask32 = 0x00000000ffffffff;
- long maskw, nwords, i, bits;
-
-        _XReadPad (dpy, packbuffer, size);
-
-        lp = data;
-        lpack = (long *) packbuffer;
-        nwords = size >> 2;
-        bits = 32;
-
-        for(i=0;i<nwords;i++){
-            maskw = mask32 << bits;
-           *lp++ = ( *lpack & maskw ) >> bits;
-            bits = bits ^32;
-            if(bits){
-               lpack++;
-            }
-        }
-}
-
-void _XRead32(
-    Display *dpy,
-    long *data,
-    long len)
-{
-    char packbuffer[PACKBUFFERSIZE];
-    unsigned nunits = PACKBUFFERSIZE >> 2;
-
-    for (; len > PACKBUFFERSIZE; len -= PACKBUFFERSIZE, data += nunits) {
-	_doXRead32 (dpy, data, PACKBUFFERSIZE, packbuffer);
-    }
-    if (len) _doXRead32 (dpy, data, len, packbuffer);
-}
-
-
-
-/*
- * _XRead16 - Read bytes from the socket unpacking each 16 bits
- *            into a long (64 bits on a CRAY computer).
- *
- */
-static _doXRead16(
-        register Display *dpy,
-        register short *data,
-        register long size,
-	char *packbuffer)
-{
-	long *lpack,*lp;
-	long mask16 = 0x000000000000ffff;
-	long maskw, nwords, i, bits;
-
-        (void) _XRead(dpy,packbuffer,size);	/* don't do a padded read... */
-
-        lp = (long *) data;
-        lpack = (long *) packbuffer;
-        nwords = size >> 1;  /* number of 16 bit words to be unpacked */
-        bits = 48;
-        for(i=0;i<nwords;i++){
-            maskw = mask16 << bits;
-           *lp++ = ( *lpack & maskw ) >> bits;
-            bits -= 16;
-            if(bits < 0){
-               lpack++;
-               bits = 48;
-            }
-        }
-}
-
-void _XRead16(
-    Display *dpy,
-    short *data,
-    long len)
-{
-    char packbuffer[PACKBUFFERSIZE];
-    unsigned nunits = PACKBUFFERSIZE >> 1;
-
-    for (; len > PACKBUFFERSIZE; len -= PACKBUFFERSIZE, data += nunits) {
-	_doXRead16 (dpy, data, PACKBUFFERSIZE, packbuffer);
-    }
-    if (len) _doXRead16 (dpy, data, len, packbuffer);
-}
-
-void _XRead16Pad(
-    Display *dpy,
-    short *data,
-    long size)
-{
-    int slop = (size & 3);
-    short slopbuf[3];
-
-    _XRead16 (dpy, data, size);
-    if (slop > 0) {
-	_XRead16 (dpy, slopbuf, 4 - slop);
-    }
-}
-#endif /* WORD64 */
-
-/*
- * The hard part about this is that we only get 16 bits from a reply.
- * We have three values that will march along, with the following invariant:
- *	dpy->last_request_read <= rep->sequenceNumber <= dpy->request
- * We have to keep
- *	dpy->request - dpy->last_request_read < 2^16
- * or else we won't know for sure what value to use in events.  We do this
- * by forcing syncs when we get close.
- */
-
-unsigned long
-_XSetLastRequestRead(
-    register Display *dpy,
-    register xGenericReply *rep)
-{
-    register unsigned long	newseq, lastseq;
-
-    lastseq = dpy->last_request_read;
-    /*
-     * KeymapNotify has no sequence number, but is always guaranteed
-     * to immediately follow another event, except when generated via
-     * SendEvent (hmmm).
-     */
-    if ((rep->type & 0x7f) == KeymapNotify)
-	return(lastseq);
-
-    newseq = (lastseq & ~((unsigned long)0xffff)) | rep->sequenceNumber;
-
-    if (newseq < lastseq) {
-	newseq += 0x10000;
-	if (newseq > dpy->request) {
-	    (void) fprintf (stderr,
-	    "Xlib: sequence lost (0x%lx > 0x%lx) in reply type 0x%x!\n",
-			    newseq, dpy->request,
-			    (unsigned int) rep->type);
-	    newseq -= 0x10000;
-	}
-    }
-
-    dpy->last_request_read = newseq;
-    return(newseq);
-}
-
-/*
- * Support for internal connections, such as an IM might use.
- * By Stephen Gildea, X Consortium, September 1993
- */
-
-/* _XRegisterInternalConnection
- * Each IM (or Xlib extension) that opens a file descriptor that Xlib should
- * include in its select/poll mask must call this function to register the
- * fd with Xlib.  Any XConnectionWatchProc registered by XAddConnectionWatch
- * will also be called.
- *
- * Whenever Xlib detects input available on fd, it will call callback
- * with call_data to process it.  If non-Xlib code calls select/poll
- * and detects input available, it must call XProcessInternalConnection,
- * which will call the associated callback.
- *
- * Non-Xlib code can learn about these additional fds by calling
- * XInternalConnectionNumbers or, more typically, by registering
- * a XConnectionWatchProc with XAddConnectionWatch
- * to be called when fds are registered or unregistered.
- *
- * Returns True if registration succeeded, False if not, typically
- * because could not allocate memory.
- * Assumes Display locked when called.
- */
-Status
-_XRegisterInternalConnection(
-    Display* dpy,
-    int fd,
-    _XInternalConnectionProc callback,
-    XPointer call_data
-)
-{
-    struct _XConnectionInfo *new_conni, **iptr;
-    struct _XConnWatchInfo *watchers;
-    XPointer *wd;
-
-    new_conni = (struct _XConnectionInfo*)Xmalloc(sizeof(struct _XConnectionInfo));
-    if (!new_conni)
-	return 0;
-    new_conni->watch_data = (XPointer *)Xmalloc(dpy->watcher_count * sizeof(XPointer));
-    if (!new_conni->watch_data) {
-	Xfree(new_conni);
-	return 0;
-    }
-    new_conni->fd = fd;
-    new_conni->read_callback = callback;
-    new_conni->call_data = call_data;
-    new_conni->next = NULL;
-    /* link new structure onto end of list */
-    for (iptr = &dpy->im_fd_info; *iptr; iptr = &(*iptr)->next)
-	;
-    *iptr = new_conni;
-    dpy->im_fd_length++;
-    _XPollfdCacheAdd(dpy, fd);
-
-    for (watchers=dpy->conn_watchers, wd=new_conni->watch_data;
-	 watchers;
-	 watchers=watchers->next, wd++) {
-	*wd = NULL;		/* for cleanliness */
-	(*watchers->fn) (dpy, watchers->client_data, fd, True, wd);
-    }
-
-    return 1;
-}
-
-/* _XUnregisterInternalConnection
- * Each IM (or Xlib extension) that closes a file descriptor previously
- * registered with _XRegisterInternalConnection must call this function.
- * Any XConnectionWatchProc registered by XAddConnectionWatch
- * will also be called.
- *
- * Assumes Display locked when called.
- */
-void
-_XUnregisterInternalConnection(
-    Display* dpy,
-    int fd
-)
-{
-    struct _XConnectionInfo *info_list, **prev;
-    struct _XConnWatchInfo *watch;
-    XPointer *wd;
-
-    for (prev = &dpy->im_fd_info; (info_list = *prev);
-	 prev = &info_list->next) {
-	if (info_list->fd == fd) {
-	    *prev = info_list->next;
-	    dpy->im_fd_length--;
-	    for (watch=dpy->conn_watchers, wd=info_list->watch_data;
-		 watch;
-		 watch=watch->next, wd++) {
-		(*watch->fn) (dpy, watch->client_data, fd, False, wd);
-	    }
-	    if (info_list->watch_data)
-		Xfree (info_list->watch_data);
-	    Xfree (info_list);
-	    break;
-	}
-    }
-    _XPollfdCacheDel(dpy, fd);
-}
-
-/* XInternalConnectionNumbers
- * Returns an array of fds and an array of corresponding call data.
- * Typically a XConnectionWatchProc registered with XAddConnectionWatch
- * will be used instead of this function to discover
- * additional fds to include in the select/poll mask.
- *
- * The list is allocated with Xmalloc and should be freed by the caller
- * with Xfree;
- */
-Status
-XInternalConnectionNumbers(
-    Display *dpy,
-    int **fd_return,
-    int *count_return
-)
-{
-    int count;
-    struct _XConnectionInfo *info_list;
-    int *fd_list;
-
-    LockDisplay(dpy);
-    count = 0;
-    for (info_list=dpy->im_fd_info; info_list; info_list=info_list->next)
-	count++;
-    fd_list = (int*) Xmalloc (count * sizeof(int));
-    if (!fd_list) {
-	UnlockDisplay(dpy);
-	return 0;
-    }
-    count = 0;
-    for (info_list=dpy->im_fd_info; info_list; info_list=info_list->next) {
-	fd_list[count] = info_list->fd;
-	count++;
-    }
-    UnlockDisplay(dpy);
-
-    *fd_return = fd_list;
-    *count_return = count;
-    return 1;
-}
-
-void _XProcessInternalConnection(
-    Display *dpy,
-    struct _XConnectionInfo *conn_info)
-{
-    dpy->flags |= XlibDisplayProcConni;
-    UnlockDisplay(dpy);
-    (*conn_info->read_callback) (dpy, conn_info->fd, conn_info->call_data);
-    LockDisplay(dpy);
-    dpy->flags &= ~XlibDisplayProcConni;
-}
-
-/* XProcessInternalConnection
- * Call the _XInternalConnectionProc registered by _XRegisterInternalConnection
- * for this fd.
- * The Display is NOT locked during the call.
- */
-void
-XProcessInternalConnection(
-    Display* dpy,
-    int fd
-)
-{
-    struct _XConnectionInfo *info_list;
-
-    LockDisplay(dpy);
-    for (info_list=dpy->im_fd_info; info_list; info_list=info_list->next) {
-	if (info_list->fd == fd) {
-	    _XProcessInternalConnection(dpy, info_list);
-	    break;
-	}
-    }
-    UnlockDisplay(dpy);
-}
-
-/* XAddConnectionWatch
- * Register a callback to be called whenever _XRegisterInternalConnection
- * or _XUnregisterInternalConnection is called.
- * Callbacks are called with the Display locked.
- * If any connections are already registered, the callback is immediately
- * called for each of them.
- */
-Status
-XAddConnectionWatch(
-    Display* dpy,
-    XConnectionWatchProc callback,
-    XPointer client_data
-)
-{
-    struct _XConnWatchInfo *new_watcher, **wptr;
-    struct _XConnectionInfo *info_list;
-    XPointer *wd_array;
-
-    LockDisplay(dpy);
-
-    /* allocate new watch data */
-    for (info_list=dpy->im_fd_info; info_list; info_list=info_list->next) {
-	wd_array = (XPointer *)Xrealloc((char *)info_list->watch_data,
-					(dpy->watcher_count + 1) *
-					sizeof(XPointer));
-	if (!wd_array) {
-	    UnlockDisplay(dpy);
-	    return 0;
-	}
-	info_list->watch_data = wd_array;
-	wd_array[dpy->watcher_count] = NULL;	/* for cleanliness */
-    }
-
-    new_watcher = (struct _XConnWatchInfo*)Xmalloc(sizeof(struct _XConnWatchInfo));
-    if (!new_watcher) {
-	UnlockDisplay(dpy);
-	return 0;
-    }
-    new_watcher->fn = callback;
-    new_watcher->client_data = client_data;
-    new_watcher->next = NULL;
-
-    /* link new structure onto end of list */
-    for (wptr = &dpy->conn_watchers; *wptr; wptr = &(*wptr)->next)
-	;
-    *wptr = new_watcher;
-    dpy->watcher_count++;
-
-    /* call new watcher on all currently registered fds */
-    for (info_list=dpy->im_fd_info; info_list; info_list=info_list->next) {
-	(*callback) (dpy, client_data, info_list->fd, True,
-		     info_list->watch_data + dpy->watcher_count - 1);
-    }
-
-    UnlockDisplay(dpy);
-    return 1;
-}
-
-/* XRemoveConnectionWatch
- * Unregister a callback registered by XAddConnectionWatch.
- * Both callback and client_data must match what was passed to
- * XAddConnectionWatch.
- */
-void
-XRemoveConnectionWatch(
-    Display* dpy,
-    XConnectionWatchProc callback,
-    XPointer client_data
-)
-{
-    struct _XConnWatchInfo *watch;
-    struct _XConnWatchInfo *previous = NULL;
-    struct _XConnectionInfo *conni;
-    int counter = 0;
-
-    LockDisplay(dpy);
-    for (watch=dpy->conn_watchers; watch; watch=watch->next) {
-	if (watch->fn == callback  &&  watch->client_data == client_data) {
-	    if (previous)
-		previous->next = watch->next;
-	    else
-		dpy->conn_watchers = watch->next;
-	    Xfree (watch);
-	    dpy->watcher_count--;
-	    /* remove our watch_data for each connection */
-	    for (conni=dpy->im_fd_info; conni; conni=conni->next) {
-		/* don't bother realloc'ing; these arrays are small anyway */
-		/* overlapping */
-		memmove(conni->watch_data+counter,
-			conni->watch_data+counter+1,
-			dpy->watcher_count - counter);
-	    }
-	    break;
-	}
-	previous = watch;
-	counter++;
-    }
-    UnlockDisplay(dpy);
-}
-
-/* end of internal connections support */
-
-/* Cookie jar implementation
-   dpy->cookiejar is a linked list. _XEnq receives the events but leaves
-   them in the normal EQ. _XStoreEvent returns the cookie event (minus
-   data pointer) and adds it to the cookiejar. _XDeq just removes
-   the entry like any other event but resets the data pointer for
-   cookie events (to avoid double-free, the memory is re-used by Xlib).
-
-   _XFetchEventCookie (called from XGetEventData) removes a cookie from the
-   jar. _XFreeEventCookies removes all unclaimed cookies from the jar
-   (called by XNextEvent).
-
-   _XFreeDisplayStructure calls _XFreeEventCookies for each cookie in the
-   normal EQ.
- */
-
-#include "utlist.h"
-struct stored_event {
-    XGenericEventCookie ev;
-    struct stored_event *prev;
-    struct stored_event *next;
-};
-
-Bool
-_XIsEventCookie(Display *dpy, XEvent *ev)
-{
-    return (ev->xcookie.type == GenericEvent &&
-	    dpy->generic_event_vec[ev->xcookie.extension & 0x7F] != NULL);
-}
-
-/**
- * Free all events in the event list.
- */
-void
-_XFreeEventCookies(Display *dpy)
-{
-    struct stored_event **head, *e, *tmp;
-
-    if (!dpy->cookiejar)
-        return;
-
-    head = (struct stored_event**)&dpy->cookiejar;
-
-    DL_FOREACH_SAFE(*head, e, tmp) {
-        if (dpy->cookiejar == e)
-            dpy->cookiejar = NULL;
-        XFree(e->ev.data);
-        XFree(e);
-    }
-}
-
-/**
- * Add an event to the display's event list. This event must be freed on the
- * next call to XNextEvent().
- */
-void
-_XStoreEventCookie(Display *dpy, XEvent *event)
-{
-    XGenericEventCookie* cookie = &event->xcookie;
-    struct stored_event **head, *add;
-
-    if (!_XIsEventCookie(dpy, event))
-        return;
-
-    head = (struct stored_event**)(&dpy->cookiejar);
-
-    add = Xmalloc(sizeof(struct stored_event));
-    if (!add) {
-        ESET(ENOMEM);
-        _XIOError(dpy);
-    }
-    add->ev = *cookie;
-    DL_APPEND(*head, add);
-    cookie->data = NULL; /* don't return data yet, must be claimed */
-}
-
-/**
- * Return the event with the given cookie and remove it from the list.
- */
-Bool
-_XFetchEventCookie(Display *dpy, XGenericEventCookie* ev)
-{
-    Bool ret = False;
-    struct stored_event **head, *event;
-    head = (struct stored_event**)&dpy->cookiejar;
-
-    if (!_XIsEventCookie(dpy, (XEvent*)ev))
-        return ret;
-
-    DL_FOREACH(*head, event) {
-        if (event->ev.cookie == ev->cookie &&
-            event->ev.extension == ev->extension &&
-            event->ev.evtype == ev->evtype) {
-            *ev = event->ev;
-            DL_DELETE(*head, event);
-            Xfree(event);
-            ret = True;
-            break;
-        }
-    }
-
-    return ret;
-}
-
-Bool
-_XCopyEventCookie(Display *dpy, XGenericEventCookie *in, XGenericEventCookie *out)
-{
-    Bool ret = False;
-    int extension;
-
-    if (!_XIsEventCookie(dpy, (XEvent*)in) || !out)
-        return ret;
-
-    extension = in->extension & 0x7F;
-
-    if (!dpy->generic_event_copy_vec[extension])
-        return ret;
-
-    ret = ((*dpy->generic_event_copy_vec[extension])(dpy, in, out));
-    out->cookie = ret ? ++dpy->next_cookie  : 0;
-    return ret;
-}
-
-
-/*
- * _XEnq - Place event packets on the display's queue.
- * note that no squishing of move events in V11, since there
- * is pointer motion hints....
- */
-void _XEnq(
-	register Display *dpy,
-	register xEvent *event)
-{
-	register _XQEvent *qelt;
-	int type, extension;
-
-	if ((qelt = dpy->qfree)) {
-		/* If dpy->qfree is non-NULL do this, else malloc a new one. */
-		dpy->qfree = qelt->next;
-	}
-	else if ((qelt =
-	    (_XQEvent *) Xmalloc((unsigned)sizeof(_XQEvent))) == NULL) {
-		/* Malloc call failed! */
-		ESET(ENOMEM);
-		_XIOError(dpy);
-	}
-	qelt->next = NULL;
-
-	type = event->u.u.type & 0177;
-	extension = ((xGenericEvent*)event)->extension;
-
-	qelt->event.type = type;
-	/* If an extension has registerd a generic_event_vec handler, then
-	 * it can handle event cookies. Otherwise, proceed with the normal
-	 * event handlers.
-	 *
-	 * If the generic_event_vec is called, qelt->event is a event cookie
-	 * with the data pointer and the "free" pointer set. Data pointer is
-	 * some memory allocated by the extension.
-	 */
-        if (type == GenericEvent && dpy->generic_event_vec[extension & 0x7F]) {
-	    XGenericEventCookie *cookie = &qelt->event.xcookie;
-	    (*dpy->generic_event_vec[extension & 0x7F])(dpy, cookie, event);
-	    cookie->cookie = ++dpy->next_cookie;
-
-	    qelt->qserial_num = dpy->next_event_serial_num++;
-	    if (dpy->tail)	dpy->tail->next = qelt;
-	    else		dpy->head = qelt;
-
-	    dpy->tail = qelt;
-	    dpy->qlen++;
-	} else if ((*dpy->event_vec[type])(dpy, &qelt->event, event)) {
-	    qelt->qserial_num = dpy->next_event_serial_num++;
-	    if (dpy->tail)	dpy->tail->next = qelt;
-	    else 		dpy->head = qelt;
-
-	    dpy->tail = qelt;
-	    dpy->qlen++;
-	} else {
-	    /* ignored, or stashed away for many-to-one compression */
-	    qelt->next = dpy->qfree;
-	    dpy->qfree = qelt;
-	}
-}
-
-/*
- * _XDeq - Remove event packet from the display's queue.
- */
-void _XDeq(
-    register Display *dpy,
-    register _XQEvent *prev,	/* element before qelt */
-    register _XQEvent *qelt)	/* element to be unlinked */
-{
-    if (prev) {
-	if ((prev->next = qelt->next) == NULL)
-	    dpy->tail = prev;
-    } else {
-	/* no prev, so removing first elt */
-	if ((dpy->head = qelt->next) == NULL)
-	    dpy->tail = NULL;
-    }
-    qelt->qserial_num = 0;
-    qelt->next = dpy->qfree;
-    dpy->qfree = qelt;
-    dpy->qlen--;
-
-    if (_XIsEventCookie(dpy, &qelt->event)) {
-	XGenericEventCookie* cookie = &qelt->event.xcookie;
-	/* dpy->qfree is re-used, reset memory to avoid double free on
-	 * _XFreeDisplayStructure */
-	cookie->data = NULL;
-    }
-}
-
-/*
- * EventToWire in separate file in that often not needed.
- */
-
-/*ARGSUSED*/
-Bool
-_XUnknownWireEvent(
-    register Display *dpy,	/* pointer to display structure */
-    register XEvent *re,	/* pointer to where event should be reformatted */
-    register xEvent *event)	/* wire protocol event */
-{
-#ifdef notdef
-	(void) fprintf(stderr,
-	    "Xlib: unhandled wire event! event number = %d, display = %x\n.",
-			event->u.u.type, dpy);
-#endif
-	return(False);
-}
-
-Bool
-_XUnknownWireEventCookie(
-    Display *dpy,	/* pointer to display structure */
-    XGenericEventCookie *re,	/* pointer to where event should be reformatted */
-    xEvent *event)	/* wire protocol event */
-{
-#ifdef notdef
-	fprintf(stderr,
-	    "Xlib: unhandled wire cookie event! extension number = %d, display = %x\n.",
-			((xGenericEvent*)event)->extension, dpy);
-#endif
-	return(False);
-}
-
-Bool
-_XUnknownCopyEventCookie(
-    Display *dpy,	/* pointer to display structure */
-    XGenericEventCookie *in,	/* source */
-    XGenericEventCookie *out)	/* destination */
-{
-#ifdef notdef
-	fprintf(stderr,
-	    "Xlib: unhandled cookie event copy! extension number = %d, display = %x\n.",
-			in->extension, dpy);
-#endif
-	return(False);
-}
-
-/*ARGSUSED*/
-Status
-_XUnknownNativeEvent(
-    register Display *dpy,	/* pointer to display structure */
-    register XEvent *re,	/* pointer to where event should be reformatted */
-    register xEvent *event)	/* wire protocol event */
-{
-#ifdef notdef
-	(void) fprintf(stderr,
- 	   "Xlib: unhandled native event! event number = %d, display = %x\n.",
-			re->type, dpy);
-#endif
-	return(0);
-}
-/*
- * reformat a wire event into an XEvent structure of the right type.
- */
-Bool
-_XWireToEvent(
-    register Display *dpy,	/* pointer to display structure */
-    register XEvent *re,	/* pointer to where event should be reformatted */
-    register xEvent *event)	/* wire protocol event */
-{
-
-	re->type = event->u.u.type & 0x7f;
-	((XAnyEvent *)re)->serial = _XSetLastRequestRead(dpy,
-					(xGenericReply *)event);
-	((XAnyEvent *)re)->send_event = ((event->u.u.type & 0x80) != 0);
-	((XAnyEvent *)re)->display = dpy;
-
-	/* Ignore the leading bit of the event type since it is set when a
-		client sends an event rather than the server. */
-
-	switch (event-> u.u.type & 0177) {
-	      case KeyPress:
-	      case KeyRelease:
-	        {
-			register XKeyEvent *ev = (XKeyEvent*) re;
-			ev->root 	= event->u.keyButtonPointer.root;
-			ev->window 	= event->u.keyButtonPointer.event;
-			ev->subwindow 	= event->u.keyButtonPointer.child;
-			ev->time 	= event->u.keyButtonPointer.time;
-			ev->x 		= cvtINT16toInt(event->u.keyButtonPointer.eventX);
-			ev->y 		= cvtINT16toInt(event->u.keyButtonPointer.eventY);
-			ev->x_root 	= cvtINT16toInt(event->u.keyButtonPointer.rootX);
-			ev->y_root 	= cvtINT16toInt(event->u.keyButtonPointer.rootY);
-			ev->state	= event->u.keyButtonPointer.state;
-			ev->same_screen	= event->u.keyButtonPointer.sameScreen;
-			ev->keycode 	= event->u.u.detail;
-		}
-	      	break;
-	      case ButtonPress:
-	      case ButtonRelease:
-	        {
-			register XButtonEvent *ev =  (XButtonEvent *) re;
-			ev->root 	= event->u.keyButtonPointer.root;
-			ev->window 	= event->u.keyButtonPointer.event;
-			ev->subwindow 	= event->u.keyButtonPointer.child;
-			ev->time 	= event->u.keyButtonPointer.time;
-			ev->x 		= cvtINT16toInt(event->u.keyButtonPointer.eventX);
-			ev->y 		= cvtINT16toInt(event->u.keyButtonPointer.eventY);
-			ev->x_root 	= cvtINT16toInt(event->u.keyButtonPointer.rootX);
-			ev->y_root 	= cvtINT16toInt(event->u.keyButtonPointer.rootY);
-			ev->state	= event->u.keyButtonPointer.state;
-			ev->same_screen	= event->u.keyButtonPointer.sameScreen;
-			ev->button 	= event->u.u.detail;
-		}
-	        break;
-	      case MotionNotify:
-	        {
-			register XMotionEvent *ev =   (XMotionEvent *)re;
-			ev->root 	= event->u.keyButtonPointer.root;
-			ev->window 	= event->u.keyButtonPointer.event;
-			ev->subwindow 	= event->u.keyButtonPointer.child;
-			ev->time 	= event->u.keyButtonPointer.time;
-			ev->x 		= cvtINT16toInt(event->u.keyButtonPointer.eventX);
-			ev->y 		= cvtINT16toInt(event->u.keyButtonPointer.eventY);
-			ev->x_root 	= cvtINT16toInt(event->u.keyButtonPointer.rootX);
-			ev->y_root 	= cvtINT16toInt(event->u.keyButtonPointer.rootY);
-			ev->state	= event->u.keyButtonPointer.state;
-			ev->same_screen	= event->u.keyButtonPointer.sameScreen;
-			ev->is_hint 	= event->u.u.detail;
-		}
-	        break;
-	      case EnterNotify:
-	      case LeaveNotify:
-		{
-			register XCrossingEvent *ev   = (XCrossingEvent *) re;
-			ev->root	= event->u.enterLeave.root;
-			ev->window	= event->u.enterLeave.event;
-			ev->subwindow	= event->u.enterLeave.child;
-			ev->time	= event->u.enterLeave.time;
-			ev->x		= cvtINT16toInt(event->u.enterLeave.eventX);
-			ev->y		= cvtINT16toInt(event->u.enterLeave.eventY);
-			ev->x_root	= cvtINT16toInt(event->u.enterLeave.rootX);
-			ev->y_root	= cvtINT16toInt(event->u.enterLeave.rootY);
-			ev->state	= event->u.enterLeave.state;
-			ev->mode	= event->u.enterLeave.mode;
-			ev->same_screen = (event->u.enterLeave.flags &
-				ELFlagSameScreen) && True;
-			ev->focus	= (event->u.enterLeave.flags &
-			  	ELFlagFocus) && True;
-			ev->detail	= event->u.u.detail;
-		}
-		  break;
-	      case FocusIn:
-	      case FocusOut:
-		{
-			register XFocusChangeEvent *ev = (XFocusChangeEvent *) re;
-			ev->window 	= event->u.focus.window;
-			ev->mode	= event->u.focus.mode;
-			ev->detail	= event->u.u.detail;
-		}
-		  break;
-	      case KeymapNotify:
-		{
-			register XKeymapEvent *ev = (XKeymapEvent *) re;
-			ev->window	= None;
-			memcpy(&ev->key_vector[1],
-			       (char *)((xKeymapEvent *) event)->map,
-			       sizeof (((xKeymapEvent *) event)->map));
-		}
-		break;
-	      case Expose:
-		{
-			register XExposeEvent *ev = (XExposeEvent *) re;
-			ev->window	= event->u.expose.window;
-			ev->x		= event->u.expose.x;
-			ev->y		= event->u.expose.y;
-			ev->width	= event->u.expose.width;
-			ev->height	= event->u.expose.height;
-			ev->count	= event->u.expose.count;
-		}
-		break;
-	      case GraphicsExpose:
-		{
-		    register XGraphicsExposeEvent *ev =
-			(XGraphicsExposeEvent *) re;
-		    ev->drawable	= event->u.graphicsExposure.drawable;
-		    ev->x		= event->u.graphicsExposure.x;
-		    ev->y		= event->u.graphicsExposure.y;
-		    ev->width		= event->u.graphicsExposure.width;
-		    ev->height		= event->u.graphicsExposure.height;
-		    ev->count		= event->u.graphicsExposure.count;
-		    ev->major_code	= event->u.graphicsExposure.majorEvent;
-		    ev->minor_code	= event->u.graphicsExposure.minorEvent;
-		}
-		break;
-	      case NoExpose:
-		{
-		    register XNoExposeEvent *ev = (XNoExposeEvent *) re;
-		    ev->drawable	= event->u.noExposure.drawable;
-		    ev->major_code	= event->u.noExposure.majorEvent;
-		    ev->minor_code	= event->u.noExposure.minorEvent;
-		}
-		break;
-	      case VisibilityNotify:
-		{
-		    register XVisibilityEvent *ev = (XVisibilityEvent *) re;
-		    ev->window		= event->u.visibility.window;
-		    ev->state		= event->u.visibility.state;
-		}
-		break;
-	      case CreateNotify:
-		{
-		    register XCreateWindowEvent *ev =
-			 (XCreateWindowEvent *) re;
-		    ev->window		= event->u.createNotify.window;
-		    ev->parent		= event->u.createNotify.parent;
-		    ev->x		= cvtINT16toInt(event->u.createNotify.x);
-		    ev->y		= cvtINT16toInt(event->u.createNotify.y);
-		    ev->width		= event->u.createNotify.width;
-		    ev->height		= event->u.createNotify.height;
-		    ev->border_width	= event->u.createNotify.borderWidth;
-		    ev->override_redirect	= event->u.createNotify.override;
-		}
-		break;
-	      case DestroyNotify:
-		{
-		    register XDestroyWindowEvent *ev =
-				(XDestroyWindowEvent *) re;
-		    ev->window		= event->u.destroyNotify.window;
-		    ev->event		= event->u.destroyNotify.event;
-		}
-		break;
-	      case UnmapNotify:
-		{
-		    register XUnmapEvent *ev = (XUnmapEvent *) re;
-		    ev->window		= event->u.unmapNotify.window;
-		    ev->event		= event->u.unmapNotify.event;
-		    ev->from_configure	= event->u.unmapNotify.fromConfigure;
-		}
-		break;
-	      case MapNotify:
-		{
-		    register XMapEvent *ev = (XMapEvent *) re;
-		    ev->window		= event->u.mapNotify.window;
-		    ev->event		= event->u.mapNotify.event;
-		    ev->override_redirect	= event->u.mapNotify.override;
-		}
-		break;
-	      case MapRequest:
-		{
-		    register XMapRequestEvent *ev = (XMapRequestEvent *) re;
-		    ev->window		= event->u.mapRequest.window;
-		    ev->parent		= event->u.mapRequest.parent;
-		}
-		break;
-	      case ReparentNotify:
-		{
-		    register XReparentEvent *ev = (XReparentEvent *) re;
-		    ev->event		= event->u.reparent.event;
-		    ev->window		= event->u.reparent.window;
-		    ev->parent		= event->u.reparent.parent;
-		    ev->x		= cvtINT16toInt(event->u.reparent.x);
-		    ev->y		= cvtINT16toInt(event->u.reparent.y);
-		    ev->override_redirect	= event->u.reparent.override;
-		}
-		break;
-	      case ConfigureNotify:
-		{
-		    register XConfigureEvent *ev = (XConfigureEvent *) re;
-		    ev->event	= event->u.configureNotify.event;
-		    ev->window	= event->u.configureNotify.window;
-		    ev->above	= event->u.configureNotify.aboveSibling;
-		    ev->x	= cvtINT16toInt(event->u.configureNotify.x);
-		    ev->y	= cvtINT16toInt(event->u.configureNotify.y);
-		    ev->width	= event->u.configureNotify.width;
-		    ev->height	= event->u.configureNotify.height;
-		    ev->border_width  = event->u.configureNotify.borderWidth;
-		    ev->override_redirect = event->u.configureNotify.override;
-		}
-		break;
-	      case ConfigureRequest:
-		{
-		    register XConfigureRequestEvent *ev =
-		        (XConfigureRequestEvent *) re;
-		    ev->window		= event->u.configureRequest.window;
-		    ev->parent		= event->u.configureRequest.parent;
-		    ev->above		= event->u.configureRequest.sibling;
-		    ev->x		= cvtINT16toInt(event->u.configureRequest.x);
-		    ev->y		= cvtINT16toInt(event->u.configureRequest.y);
-		    ev->width		= event->u.configureRequest.width;
-		    ev->height		= event->u.configureRequest.height;
-		    ev->border_width	= event->u.configureRequest.borderWidth;
-		    ev->value_mask	= event->u.configureRequest.valueMask;
-		    ev->detail  	= event->u.u.detail;
-		}
-		break;
-	      case GravityNotify:
-		{
-		    register XGravityEvent *ev = (XGravityEvent *) re;
-		    ev->window		= event->u.gravity.window;
-		    ev->event		= event->u.gravity.event;
-		    ev->x		= cvtINT16toInt(event->u.gravity.x);
-		    ev->y		= cvtINT16toInt(event->u.gravity.y);
-		}
-		break;
-	      case ResizeRequest:
-		{
-		    register XResizeRequestEvent *ev =
-			(XResizeRequestEvent *) re;
-		    ev->window		= event->u.resizeRequest.window;
-		    ev->width		= event->u.resizeRequest.width;
-		    ev->height		= event->u.resizeRequest.height;
-		}
-		break;
-	      case CirculateNotify:
-		{
-		    register XCirculateEvent *ev = (XCirculateEvent *) re;
-		    ev->window		= event->u.circulate.window;
-		    ev->event		= event->u.circulate.event;
-		    ev->place		= event->u.circulate.place;
-		}
-		break;
-	      case CirculateRequest:
-		{
-		    register XCirculateRequestEvent *ev =
-		        (XCirculateRequestEvent *) re;
-		    ev->window		= event->u.circulate.window;
-		    ev->parent		= event->u.circulate.event;
-		    ev->place		= event->u.circulate.place;
-		}
-		break;
-	      case PropertyNotify:
-		{
-		    register XPropertyEvent *ev = (XPropertyEvent *) re;
-		    ev->window		= event->u.property.window;
-		    ev->atom		= event->u.property.atom;
-		    ev->time		= event->u.property.time;
-		    ev->state		= event->u.property.state;
-		}
-		break;
-	      case SelectionClear:
-		{
-		    register XSelectionClearEvent *ev =
-			 (XSelectionClearEvent *) re;
-		    ev->window		= event->u.selectionClear.window;
-		    ev->selection	= event->u.selectionClear.atom;
-		    ev->time		= event->u.selectionClear.time;
-		}
-		break;
-	      case SelectionRequest:
-		{
-		    register XSelectionRequestEvent *ev =
-		        (XSelectionRequestEvent *) re;
-		    ev->owner		= event->u.selectionRequest.owner;
-		    ev->requestor	= event->u.selectionRequest.requestor;
-		    ev->selection	= event->u.selectionRequest.selection;
-		    ev->target		= event->u.selectionRequest.target;
-		    ev->property	= event->u.selectionRequest.property;
-		    ev->time		= event->u.selectionRequest.time;
-		}
-		break;
-	      case SelectionNotify:
-		{
-		    register XSelectionEvent *ev = (XSelectionEvent *) re;
-		    ev->requestor	= event->u.selectionNotify.requestor;
-		    ev->selection	= event->u.selectionNotify.selection;
-		    ev->target		= event->u.selectionNotify.target;
-		    ev->property	= event->u.selectionNotify.property;
-		    ev->time		= event->u.selectionNotify.time;
-		}
-		break;
-	      case ColormapNotify:
-		{
-		    register XColormapEvent *ev = (XColormapEvent *) re;
-		    ev->window		= event->u.colormap.window;
-		    ev->colormap	= event->u.colormap.colormap;
-		    ev->new		= event->u.colormap.new;
-		    ev->state		= event->u.colormap.state;
-	        }
-		break;
-	      case ClientMessage:
-		{
-		   register int i;
-		   register XClientMessageEvent *ev
-		   			= (XClientMessageEvent *) re;
-		   ev->window		= event->u.clientMessage.window;
-		   ev->format		= event->u.u.detail;
-		   switch (ev->format) {
-			case 8:
-			   ev->message_type = event->u.clientMessage.u.b.type;
-			   for (i = 0; i < 20; i++)
-			     ev->data.b[i] = event->u.clientMessage.u.b.bytes[i];
-			   break;
-			case 16:
-			   ev->message_type = event->u.clientMessage.u.s.type;
-			   ev->data.s[0] = cvtINT16toShort(event->u.clientMessage.u.s.shorts0);
-			   ev->data.s[1] = cvtINT16toShort(event->u.clientMessage.u.s.shorts1);
-			   ev->data.s[2] = cvtINT16toShort(event->u.clientMessage.u.s.shorts2);
-			   ev->data.s[3] = cvtINT16toShort(event->u.clientMessage.u.s.shorts3);
-			   ev->data.s[4] = cvtINT16toShort(event->u.clientMessage.u.s.shorts4);
-			   ev->data.s[5] = cvtINT16toShort(event->u.clientMessage.u.s.shorts5);
-			   ev->data.s[6] = cvtINT16toShort(event->u.clientMessage.u.s.shorts6);
-			   ev->data.s[7] = cvtINT16toShort(event->u.clientMessage.u.s.shorts7);
-			   ev->data.s[8] = cvtINT16toShort(event->u.clientMessage.u.s.shorts8);
-			   ev->data.s[9] = cvtINT16toShort(event->u.clientMessage.u.s.shorts9);
-			   break;
-			case 32:
-			   ev->message_type = event->u.clientMessage.u.l.type;
-			   ev->data.l[0] = cvtINT32toLong(event->u.clientMessage.u.l.longs0);
-			   ev->data.l[1] = cvtINT32toLong(event->u.clientMessage.u.l.longs1);
-			   ev->data.l[2] = cvtINT32toLong(event->u.clientMessage.u.l.longs2);
-			   ev->data.l[3] = cvtINT32toLong(event->u.clientMessage.u.l.longs3);
-			   ev->data.l[4] = cvtINT32toLong(event->u.clientMessage.u.l.longs4);
-			   break;
-			default: /* XXX should never occur */
-				break;
-		    }
-	        }
-		break;
-	      case MappingNotify:
-		{
-		   register XMappingEvent *ev = (XMappingEvent *)re;
-		   ev->window		= 0;
-		   ev->first_keycode 	= event->u.mappingNotify.firstKeyCode;
-		   ev->request 		= event->u.mappingNotify.request;
-		   ev->count 		= event->u.mappingNotify.count;
-		}
-		break;
-	      default:
-		return(_XUnknownWireEvent(dpy, re, event));
-	}
-	return(True);
-}
-
-
-/*
- * _XDefaultIOError - Default fatal system error reporting routine.  Called
- * when an X internal system error is encountered.
- */
-int _XDefaultIOError(
-	Display *dpy)
-{
-	if (ECHECK(EPIPE)) {
-	    (void) fprintf (stderr,
-	"X connection to %s broken (explicit kill or server shutdown).\r\n",
-			    DisplayString (dpy));
-	} else {
-	    (void) fprintf (stderr,
-			"XIO:  fatal IO error %d (%s) on X server \"%s\"\r\n",
-#ifdef WIN32
-			WSAGetLastError(), strerror(WSAGetLastError()),
-#else
-			errno, strerror (errno),
-#endif
-			DisplayString (dpy));
-	    (void) fprintf (stderr,
-	 "      after %lu requests (%lu known processed) with %d events remaining.\r\n",
-			NextRequest(dpy) - 1, LastKnownRequestProcessed(dpy),
-			QLength(dpy));
-
-	}
-	exit(1);
-        return(0); /* dummy - function should never return */
-}
-
-
-static int _XPrintDefaultError(
-    Display *dpy,
-    XErrorEvent *event,
-    FILE *fp)
-{
-    char buffer[BUFSIZ];
-    char mesg[BUFSIZ];
-    char number[32];
-    const char *mtype = "XlibMessage";
-    register _XExtension *ext = (_XExtension *)NULL;
-    _XExtension *bext = (_XExtension *)NULL;
-    XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
-    XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
-    (void) fprintf(fp, "%s:  %s\n  ", mesg, buffer);
-    XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d",
-	mesg, BUFSIZ);
-    (void) fprintf(fp, mesg, event->request_code);
-    if (event->request_code < 128) {
-	sprintf(number, "%d", event->request_code);
-	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
-    } else {
-	for (ext = dpy->ext_procs;
-	     ext && (ext->codes.major_opcode != event->request_code);
-	     ext = ext->next)
-	  ;
-	if (ext) {
-	    strncpy(buffer, ext->name, BUFSIZ);
-	    buffer[BUFSIZ - 1] = '\0';
-        } else
-	    buffer[0] = '\0';
-    }
-    (void) fprintf(fp, " (%s)\n", buffer);
-    if (event->request_code >= 128) {
-	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
-			      mesg, BUFSIZ);
-	fputs("  ", fp);
-	(void) fprintf(fp, mesg, event->minor_code);
-	if (ext) {
-	    sprintf(mesg, "%s.%d", ext->name, event->minor_code);
-	    XGetErrorDatabaseText(dpy, "XRequest", mesg, "", buffer, BUFSIZ);
-	    (void) fprintf(fp, " (%s)", buffer);
-	}
-	fputs("\n", fp);
-    }
-    if (event->error_code >= 128) {
-	/* kludge, try to find the extension that caused it */
-	buffer[0] = '\0';
-	for (ext = dpy->ext_procs; ext; ext = ext->next) {
-	    if (ext->error_string)
-		(*ext->error_string)(dpy, event->error_code, &ext->codes,
-				     buffer, BUFSIZ);
-	    if (buffer[0]) {
-		bext = ext;
-		break;
-	    }
-	    if (ext->codes.first_error &&
-		ext->codes.first_error < (int)event->error_code &&
-		(!bext || ext->codes.first_error > bext->codes.first_error))
-		bext = ext;
-	}
-	if (bext)
-	    sprintf(buffer, "%s.%d", bext->name,
-		    event->error_code - bext->codes.first_error);
-	else
-	    strcpy(buffer, "Value");
-	XGetErrorDatabaseText(dpy, mtype, buffer, "", mesg, BUFSIZ);
-	if (mesg[0]) {
-	    fputs("  ", fp);
-	    (void) fprintf(fp, mesg, event->resourceid);
-	    fputs("\n", fp);
-	}
-	/* let extensions try to print the values */
-	for (ext = dpy->ext_procs; ext; ext = ext->next) {
-	    if (ext->error_values)
-		(*ext->error_values)(dpy, event, fp);
-	}
-    } else if ((event->error_code == BadWindow) ||
-	       (event->error_code == BadPixmap) ||
-	       (event->error_code == BadCursor) ||
-	       (event->error_code == BadFont) ||
-	       (event->error_code == BadDrawable) ||
-	       (event->error_code == BadColor) ||
-	       (event->error_code == BadGC) ||
-	       (event->error_code == BadIDChoice) ||
-	       (event->error_code == BadValue) ||
-	       (event->error_code == BadAtom)) {
-	if (event->error_code == BadValue)
-	    XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
-				  mesg, BUFSIZ);
-	else if (event->error_code == BadAtom)
-	    XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
-				  mesg, BUFSIZ);
-	else
-	    XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
-				  mesg, BUFSIZ);
-	fputs("  ", fp);
-	(void) fprintf(fp, mesg, event->resourceid);
-	fputs("\n", fp);
-    }
-    XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
-			  mesg, BUFSIZ);
-    fputs("  ", fp);
-    (void) fprintf(fp, mesg, event->serial);
-    XGetErrorDatabaseText(dpy, mtype, "CurrentSerial", "Current Serial #%d",
-			  mesg, BUFSIZ);
-    fputs("\n  ", fp);
-    (void) fprintf(fp, mesg, dpy->request);
-    fputs("\n", fp);
-    if (event->error_code == BadImplementation) return 0;
-    return 1;
-}
-
-int _XDefaultError(
-	Display *dpy,
-	XErrorEvent *event)
-{
-    if (_XPrintDefaultError (dpy, event, stderr) == 0) return 0;
-    exit(1);
-    /*NOTREACHED*/
-}
-
-/*ARGSUSED*/
-Bool _XDefaultWireError(Display *display, XErrorEvent *he, xError *we)
-{
-    return True;
-}
-
-/*
- * _XError - upcall internal or user protocol error handler
- */
-int _XError (
-    Display *dpy,
-    register xError *rep)
-{
-    /*
-     * X_Error packet encountered!  We need to unpack the error before
-     * giving it to the user.
-     */
-    XEvent event; /* make it a large event */
-    register _XAsyncHandler *async, *next;
-
-    event.xerror.serial = _XSetLastRequestRead(dpy, (xGenericReply *)rep);
-
-    for (async = dpy->async_handlers; async; async = next) {
-	next = async->next;
-	if ((*async->handler)(dpy, (xReply *)rep,
-			      (char *)rep, SIZEOF(xError), async->data))
-	    return 0;
-    }
-
-    event.xerror.display = dpy;
-    event.xerror.type = X_Error;
-    event.xerror.resourceid = rep->resourceID;
-    event.xerror.error_code = rep->errorCode;
-    event.xerror.request_code = rep->majorCode;
-    event.xerror.minor_code = rep->minorCode;
-    if (dpy->error_vec &&
-	!(*dpy->error_vec[rep->errorCode])(dpy, &event.xerror, rep))
-	return 0;
-    if (_XErrorFunction != NULL) {
-	return (*_XErrorFunction)(dpy, (XErrorEvent *)&event); /* upcall */
-    } else {
-	return _XDefaultError(dpy, (XErrorEvent *)&event);
-    }
-}
-
-/*
- * _XIOError - call user connection error handler and exit
- */
-int
-_XIOError (
-    Display *dpy)
-{
-    dpy->flags |= XlibDisplayIOError;
-#ifdef WIN32
-    errno = WSAGetLastError();
-#endif
-
-    /* This assumes that the thread calling exit will call any atexit handlers.
-     * If this does not hold, then an alternate solution would involve
-     * registering an atexit handler to take over the lock, which would only
-     * assume that the same thread calls all the atexit handlers. */
-#ifdef XTHREADS
-    if (dpy->lock)
-	(*dpy->lock->user_lock_display)(dpy);
-#endif
-    UnlockDisplay(dpy);
-
-    if (_XIOErrorFunction != NULL)
-	(*_XIOErrorFunction)(dpy);
-    else
-	_XDefaultIOError(dpy);
-    exit (1);
-    return 0;
-}
-
-
-/*
- * This routine can be used to (cheaply) get some memory within a single
- * Xlib routine for scratch space.  A single buffer is reused each time
- * if possible.  To be MT safe, you can only call this between a call to
- * GetReq* and a call to Data* or _XSend*, or in a context when the thread
- * is guaranteed to not unlock the display.
- */
-char *_XAllocScratch(
-	register Display *dpy,
-	unsigned long nbytes)
-{
-	if (nbytes > dpy->scratch_length) {
-	    if (dpy->scratch_buffer) Xfree (dpy->scratch_buffer);
-	    if ((dpy->scratch_buffer = Xmalloc((unsigned) nbytes)))
-		dpy->scratch_length = nbytes;
-	    else dpy->scratch_length = 0;
-	}
-	return (dpy->scratch_buffer);
-}
-
-/*
- * Scratch space allocator you can call any time, multiple times, and be
- * MT safe, but you must hand the buffer back with _XFreeTemp.
- */
-char *_XAllocTemp(
-    register Display *dpy,
-    unsigned long nbytes)
-{
-    char *buf;
-
-    buf = _XAllocScratch(dpy, nbytes);
-    dpy->scratch_buffer = NULL;
-    dpy->scratch_length = 0;
-    return buf;
-}
-
-void _XFreeTemp(
-    register Display *dpy,
-    char *buf,
-    unsigned long nbytes)
-{
-    if (dpy->scratch_buffer)
-	Xfree(dpy->scratch_buffer);
-    dpy->scratch_buffer = buf;
-    dpy->scratch_length = nbytes;
-}
-
-/*
- * Given a visual id, find the visual structure for this id on this display.
- */
-Visual *_XVIDtoVisual(
-	Display *dpy,
-	VisualID id)
-{
-	register int i, j, k;
-	register Screen *sp;
-	register Depth *dp;
-	register Visual *vp;
-	for (i = 0; i < dpy->nscreens; i++) {
-		sp = &dpy->screens[i];
-		for (j = 0; j < sp->ndepths; j++) {
-			dp = &sp->depths[j];
-			/* if nvisuals == 0 then visuals will be NULL */
-			for (k = 0; k < dp->nvisuals; k++) {
-				vp = &dp->visuals[k];
-				if (vp->visualid == id) return (vp);
-			}
-		}
-	}
-	return (NULL);
-}
-
-int
-XFree (void *data)
-{
-	Xfree (data);
-	return 1;
-}
-
-#ifdef _XNEEDBCOPYFUNC
-void _Xbcopy(b1, b2, length)
-    register char *b1, *b2;
-    register length;
-{
-    if (b1 < b2) {
-	b2 += length;
-	b1 += length;
-	while (length--)
-	    *--b2 = *--b1;
-    } else {
-	while (length--)
-	    *b2++ = *b1++;
-    }
-}
-#endif
-
-#ifdef DataRoutineIsProcedure
-void Data(
-	Display *dpy,
-	char *data,
-	long len)
-{
-	if (dpy->bufptr + (len) <= dpy->bufmax) {
-		memcpy(dpy->bufptr, data, (int)len);
-		dpy->bufptr += ((len) + 3) & ~3;
-	} else {
-		_XSend(dpy, data, len);
-	}
-}
-#endif /* DataRoutineIsProcedure */
-
-
-#ifdef LONG64
-int
-_XData32(
-    Display *dpy,
-    register long *data,
-    unsigned len)
-{
-    register int *buf;
-    register long i;
-
-    while (len) {
-	buf = (int *)dpy->bufptr;
-	i = dpy->bufmax - (char *)buf;
-	if (!i) {
-	    _XFlush(dpy);
-	    continue;
-	}
-	if (len < i)
-	    i = len;
-	dpy->bufptr = (char *)buf + i;
-	len -= i;
-	i >>= 2;
-	while (--i >= 0)
-	    *buf++ = *data++;
-    }
-    return 0;
-}
-#endif /* LONG64 */
-
-#ifdef WORD64
-
-/*
- * XXX This is a *really* stupid way of doing this.  It should just use
- * dpy->bufptr directly, taking into account where in the word it is.
- */
-
-/*
- * Data16 - Place 16 bit data in the buffer.
- *
- * "dpy" is a pointer to a Display.
- * "data" is a pointer to the data.
- * "len" is the length in bytes of the data.
- */
-
-static doData16(
-    register Display *dpy,
-    short *data,
-    unsigned len,
-    char *packbuffer)
-{
-    long *lp,*lpack;
-    long i, nwords,bits;
-    long mask16 = 0x000000000000ffff;
-
-        lp = (long *)data;
-        lpack = (long *)packbuffer;
-
-/*  nwords is the number of 16 bit values to be packed,
- *  the low order 16 bits of each word will be packed
- *  into 64 bit words
- */
-        nwords = len >> 1;
-        bits = 48;
-
-        for(i=0;i<nwords;i++){
-	   if (bits == 48) *lpack = 0;
-           *lpack ^= (*lp & mask16) << bits;
-           bits -= 16 ;
-           lp++;
-           if(bits < 0){
-               lpack++;
-               bits = 48;
-           }
-        }
-        Data(dpy, packbuffer, len);
-}
-
-_XData16 (
-    Display *dpy,
-    short *data,
-    unsigned len)
-{
-    char packbuffer[PACKBUFFERSIZE];
-    unsigned nunits = PACKBUFFERSIZE >> 1;
-
-    for (; len > PACKBUFFERSIZE; len -= PACKBUFFERSIZE, data += nunits) {
-	doData16 (dpy, data, PACKBUFFERSIZE, packbuffer);
-    }
-    if (len) doData16 (dpy, data, len, packbuffer);
-}
-
-/*
- * Data32 - Place 32 bit data in the buffer.
- *
- * "dpy" is a pointer to a Display.
- * "data" is a pointer to the data.
- * "len" is the length in bytes of the data.
- */
-
-static doData32(
-    register Display *dpy
-    long *data,
-    unsigned len,
-    char *packbuffer)
-{
-    long *lp,*lpack;
-    long i,bits,nwords;
-    long mask32 = 0x00000000ffffffff;
-
-        lpack = (long *) packbuffer;
-        lp = data;
-
-/*  nwords is the number of 32 bit values to be packed
- *  the low order 32 bits of each word will be packed
- *  into 64 bit words
- */
-        nwords = len >> 2;
-        bits = 32;
-
-        for(i=0;i<nwords;i++){
-	   if (bits == 32) *lpack = 0;
-           *lpack ^= (*lp & mask32) << bits;
-           bits = bits ^32;
-           lp++;
-           if(bits)
-              lpack++;
-        }
-        Data(dpy, packbuffer, len);
-}
-
-void _XData32(
-    Display *dpy,
-    long *data,
-    unsigned len)
-{
-    char packbuffer[PACKBUFFERSIZE];
-    unsigned nunits = PACKBUFFERSIZE >> 2;
-
-    for (; len > PACKBUFFERSIZE; len -= PACKBUFFERSIZE, data += nunits) {
-	doData32 (dpy, data, PACKBUFFERSIZE, packbuffer);
-    }
-    if (len) doData32 (dpy, data, len, packbuffer);
-}
-
-#endif /* WORD64 */
-
-
-/* Make sure this produces the same string as DefineLocal/DefineSelf in xdm.
- * Otherwise, Xau will not be able to find your cookies in the Xauthority file.
- *
- * Note: POSIX says that the ``nodename'' member of utsname does _not_ have
- *       to have sufficient information for interfacing to the network,
- *       and so, you may be better off using gethostname (if it exists).
- */
-
-#if (defined(_POSIX_SOURCE) && !defined(AIXV3) && !defined(__QNX__)) || defined(hpux) || defined(SVR4)
-#define NEED_UTSNAME
-#include <sys/utsname.h>
-#else
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#endif
-
-/*
- * _XGetHostname - similar to gethostname but allows special processing.
- */
-int _XGetHostname (
-    char *buf,
-    int maxlen)
-{
-    int len;
-
-#ifdef NEED_UTSNAME
-    struct utsname name;
-
-    if (maxlen <= 0 || buf == NULL)
-	return 0;
-
-    uname (&name);
-    len = strlen (name.nodename);
-    if (len >= maxlen) len = maxlen - 1;
-    strncpy (buf, name.nodename, len);
-    buf[len] = '\0';
-#else
-    if (maxlen <= 0 || buf == NULL)
-	return 0;
-
-    buf[0] = '\0';
-    (void) gethostname (buf, maxlen);
-    buf [maxlen - 1] = '\0';
-    len = strlen(buf);
-#endif /* NEED_UTSNAME */
-    return len;
-}
-
-
-/*
- * _XScreenOfWindow - get the Screen of a given window
- */
-
-Screen *_XScreenOfWindow(Display *dpy, Window w)
-{
-    register int i;
-    Window root;
-    int x, y;				/* dummy variables */
-    unsigned int width, height, bw, depth;  /* dummy variables */
-
-    if (XGetGeometry (dpy, w, &root, &x, &y, &width, &height,
-		      &bw, &depth) == False) {
-	return NULL;
-    }
-    for (i = 0; i < ScreenCount (dpy); i++) {	/* find root from list */
-	if (root == RootWindow (dpy, i)) {
-	    return ScreenOfDisplay (dpy, i);
-	}
-    }
-    return NULL;
-}
-
-
-#if defined(WIN32)
-
-/*
- * These functions are intended to be used internally to Xlib only.
- * These functions will always prefix the path with a DOS drive in the
- * form "<drive-letter>:". As such, these functions are only suitable
- * for use by Xlib function that supply a root-based path to some
- * particular file, e.g. <ProjectRoot>/lib/X11/locale/locale.dir will
- * be converted to "C:/usr/X11R6.3/lib/X11/locale/locale.dir".
- */
-
-static int access_file (path, pathbuf, len_pathbuf, pathret)
-    char* path;
-    char* pathbuf;
-    int len_pathbuf;
-    char** pathret;
-{
-    if (access (path, F_OK) == 0) {
-	if (strlen (path) < len_pathbuf)
-	    *pathret = pathbuf;
-	else
-	    *pathret = Xmalloc (strlen (path) + 1);
-	if (*pathret) {
-	    strcpy (*pathret, path);
-	    return 1;
-	}
-    }
-    return 0;
-}
-
-static int AccessFile (path, pathbuf, len_pathbuf, pathret)
-    char* path;
-    char* pathbuf;
-    int len_pathbuf;
-    char** pathret;
-{
-    unsigned long drives;
-    int i, len;
-    char* drive;
-    char buf[MAX_PATH];
-    char* bufp;
-
-    /* just try the "raw" name first and see if it works */
-    if (access_file (path, pathbuf, len_pathbuf, pathret))
-	return 1;
-
-    /* try the places set in the environment */
-    drive = getenv ("_XBASEDRIVE");
-#ifdef __UNIXOS2__
-    if (!drive)
-	drive = getenv ("X11ROOT");
-#endif
-    if (!drive)
-	drive = "C:";
-    len = strlen (drive) + strlen (path);
-    if (len < MAX_PATH) bufp = buf;
-    else bufp = Xmalloc (len + 1);
-    strcpy (bufp, drive);
-    strcat (bufp, path);
-    if (access_file (bufp, pathbuf, len_pathbuf, pathret)) {
-	if (bufp != buf) Xfree (bufp);
-	return 1;
-    }
-
-#ifndef __UNIXOS2__
-    /* one last place to look */
-    drive = getenv ("HOMEDRIVE");
-    if (drive) {
-	len = strlen (drive) + strlen (path);
-	if (len < MAX_PATH) bufp = buf;
-	else bufp = Xmalloc (len + 1);
-	strcpy (bufp, drive);
-	strcat (bufp, path);
-	if (access_file (bufp, pathbuf, len_pathbuf, pathret)) {
-	    if (bufp != buf) Xfree (bufp);
-	    return 1;
-	}
-    }
-
-    /* tried everywhere else, go fishing */
-#define C_DRIVE ('C' - 'A')
-#define Z_DRIVE ('Z' - 'A')
-    /* does OS/2 (with or with gcc-emx) have getdrives? */
-    drives = _getdrives ();
-    for (i = C_DRIVE; i <= Z_DRIVE; i++) { /* don't check on A: or B: */
-	if ((1 << i) & drives) {
-	    len = 2 + strlen (path);
-	    if (len < MAX_PATH) bufp = buf;
-	    else bufp = Xmalloc (len + 1);
-	    *bufp = 'A' + i;
-	    *(bufp + 1) = ':';
-	    *(bufp + 2) = '\0';
-	    strcat (bufp, path);
-	    if (access_file (bufp, pathbuf, len_pathbuf, pathret)) {
-		if (bufp != buf) Xfree (bufp);
-		return 1;
-	    }
-	}
-    }
-#endif
-    return 0;
-}
-
-int _XOpenFile(path, flags)
-    _Xconst char* path;
-    int flags;
-{
-    char buf[MAX_PATH];
-    char* bufp = NULL;
-    int ret = -1;
-    UINT olderror = SetErrorMode (SEM_FAILCRITICALERRORS);
-
-    if (AccessFile (path, buf, MAX_PATH, &bufp))
-	ret = open (bufp, flags);
-
-    (void) SetErrorMode (olderror);
-
-    if (bufp != buf) Xfree (bufp);
-
-    return ret;
-}
-
-int _XOpenFileMode(path, flags, mode)
-    _Xconst char* path;
-    int flags;
-    mode_t mode;
-{
-    char buf[MAX_PATH];
-    char* bufp = NULL;
-    int ret = -1;
-    UINT olderror = SetErrorMode (SEM_FAILCRITICALERRORS);
-
-    if (AccessFile (path, buf, MAX_PATH, &bufp))
-	ret = open (bufp, flags, mode);
-
-    (void) SetErrorMode (olderror);
-
-    if (bufp != buf) Xfree (bufp);
-
-    return ret;
-}
-
-void* _XFopenFile(path, mode)
-    _Xconst char* path;
-    _Xconst char* mode;
-{
-    char buf[MAX_PATH];
-    char* bufp = NULL;
-    void* ret = NULL;
-    UINT olderror = SetErrorMode (SEM_FAILCRITICALERRORS);
-
-    if (AccessFile (path, buf, MAX_PATH, &bufp))
-	ret = fopen (bufp, mode);
-
-    (void) SetErrorMode (olderror);
-
-    if (bufp != buf) Xfree (bufp);
-
-    return ret;
-}
-
-int _XAccessFile(path)
-    _Xconst char* path;
-{
-    char buf[MAX_PATH];
-    char* bufp;
-    int ret = -1;
-    UINT olderror = SetErrorMode (SEM_FAILCRITICALERRORS);
-
-    ret = AccessFile (path, buf, MAX_PATH, &bufp);
-
-    (void) SetErrorMode (olderror);
-
-    if (bufp != buf) Xfree (bufp);
-
-    return ret;
-}
-
-#endif
-
-#ifdef WIN32
-#undef _Xdebug
-int _Xdebug = 0;
-int *_Xdebug_p = &_Xdebug;
-void (**_XCreateMutex_fn_p)(LockInfoPtr) = &_XCreateMutex_fn;
-void (**_XFreeMutex_fn_p)(LockInfoPtr) = &_XFreeMutex_fn;
-void (**_XLockMutex_fn_p)(LockInfoPtr
-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
-    , char * /* file */
-    , int /* line */
-#endif
-        ) = &_XLockMutex_fn;
-void (**_XUnlockMutex_fn_p)(LockInfoPtr
-#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
-    , char * /* file */
-    , int /* line */
-#endif
-        ) = &_XUnlockMutex_fn;
-LockInfoPtr *_Xglobal_lock_p = &_Xglobal_lock;
-#endif
+/*

+

+Copyright 1985, 1986, 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.

+

+*/

+

+/*

+ *	XlibInt.c - Internal support routines for the C subroutine

+ *	interface library (Xlib) to the X Window System Protocol V11.0.

+ */

+

+#ifdef WIN32

+#define _XLIBINT_

+#include <X11\Xw32defs.h>

+#endif

+#ifdef HAVE_CONFIG_H

+#include <config.h>

+#endif

+#include "Xlibint.h"

+#include "Xprivate.h"

+#include <X11/Xpoll.h>

+#include <assert.h>

+#include <stdio.h>

+#ifdef WIN32

+#include <direct.h>

+#endif

+

+#ifdef XTHREADS

+#include "locking.h"

+

+/* these pointers get initialized by XInitThreads */

+LockInfoPtr _Xglobal_lock = NULL;

+void (*_XCreateMutex_fn)(LockInfoPtr) = NULL;

+/* struct _XCVList *(*_XCreateCVL_fn)() = NULL; */

+void (*_XFreeMutex_fn)(LockInfoPtr) = NULL;

+void (*_XLockMutex_fn)(

+    LockInfoPtr /* lock */

+#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)

+    , char * /* file */

+    , int /* line */

+#endif

+    ) = NULL;

+void (*_XUnlockMutex_fn)(

+    LockInfoPtr /* lock */

+#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)

+    , char * /* file */

+    , int /* line */

+#endif

+    ) = NULL;

+xthread_t (*_Xthread_self_fn)(void) = NULL;

+

+#define XThread_Self()	((*_Xthread_self_fn)())

+

+#endif /* XTHREADS */

+

+/* check for both EAGAIN and EWOULDBLOCK, because some supposedly POSIX

+ * systems are broken and return EWOULDBLOCK when they should return EAGAIN

+ */

+#ifdef WIN32

+#define ETEST() (WSAGetLastError() == WSAEWOULDBLOCK)

+#else

+#ifdef __CYGWIN__ /* Cygwin uses ENOBUFS to signal socket is full */

+#define ETEST() (errno == EAGAIN || errno == EWOULDBLOCK || errno == ENOBUFS)

+#else

+#if defined(EAGAIN) && defined(EWOULDBLOCK)

+#define ETEST() (errno == EAGAIN || errno == EWOULDBLOCK)

+#else

+#ifdef EAGAIN

+#define ETEST() (errno == EAGAIN)

+#else

+#define ETEST() (errno == EWOULDBLOCK)

+#endif /* EAGAIN */

+#endif /* EAGAIN && EWOULDBLOCK */

+#endif /* __CYGWIN__ */

+#endif /* WIN32 */

+

+#ifdef WIN32

+#define ECHECK(err) (WSAGetLastError() == err)

+#define ESET(val) WSASetLastError(val)

+#else

+#ifdef __UNIXOS2__

+#define ECHECK(err) (errno == err)

+#define ESET(val)

+#else

+#define ECHECK(err) (errno == err)

+#define ESET(val) errno = val

+#endif

+#endif

+

+#if defined(LOCALCONN) || defined(LACHMAN)

+#ifdef EMSGSIZE

+#define ESZTEST() (ECHECK(EMSGSIZE) || ECHECK(ERANGE))

+#else

+#define ESZTEST() ECHECK(ERANGE)

+#endif

+#else

+#ifdef EMSGSIZE

+#define ESZTEST() ECHECK(EMSGSIZE)

+#endif

+#endif

+

+#ifdef __UNIXOS2__

+#include <limits.h>

+#define MAX_PATH _POSIX_PATH_MAX

+#endif

+

+/*

+ * The following routines are internal routines used by Xlib for protocol

+ * packet transmission and reception.

+ *

+ * _XIOError(Display *) will be called if any sort of system call error occurs.

+ * This is assumed to be a fatal condition, i.e., XIOError should not return.

+ *

+ * _XError(Display *, xError *) will be called whenever an X_Error event is

+ * received.  This is not assumed to be a fatal condition, i.e., it is

+ * acceptable for this procedure to return.  However, XError should NOT

+ * perform any operations (directly or indirectly) on the DISPLAY.

+ *

+ * Routines declared with a return type of 'Status' return 0 on failure,

+ * and non 0 on success.  Routines with no declared return type don't

+ * return anything.  Whenever possible routines that create objects return

+ * the object they have created.

+ */

+

+#define POLLFD_CACHE_SIZE 5

+

+#if _WIN32_WINNT < _WIN32_WINNT_VISTA

+struct pollfd {

+

+    SOCKET  fd;

+    SHORT   events;

+    SHORT   revents;

+

+};

+#define POLLRDNORM  0x0100

+#define POLLRDBAND  0x0200

+#define POLLIN      (POLLRDNORM | POLLRDBAND)

+#endif

+

+/* initialize the struct array passed to poll() below */

+Bool _XPollfdCacheInit(

+    Display *dpy)

+{

+#ifdef USE_POLL

+    struct pollfd *pfp;

+

+    pfp = (struct pollfd *)Xmalloc(POLLFD_CACHE_SIZE * sizeof(struct pollfd));

+    if (!pfp)

+	return False;

+    pfp[0].fd = dpy->fd;

+    pfp[0].events = POLLIN;

+

+    dpy->filedes = (XPointer)pfp;

+#endif

+    return True;

+}

+

+void _XPollfdCacheAdd(

+    Display *dpy,

+    int fd)

+{

+#ifdef USE_POLL

+    struct pollfd *pfp = (struct pollfd *)dpy->filedes;

+

+    if (dpy->im_fd_length <= POLLFD_CACHE_SIZE) {

+	pfp[dpy->im_fd_length].fd = fd;

+	pfp[dpy->im_fd_length].events = POLLIN;

+    }

+#endif

+}

+

+/* ARGSUSED */

+void _XPollfdCacheDel(

+    Display *dpy,

+    int fd)			/* not used */

+{

+#ifdef USE_POLL

+    struct pollfd *pfp = (struct pollfd *)dpy->filedes;

+    struct _XConnectionInfo *conni;

+

+    /* just recalculate whole list */

+    if (dpy->im_fd_length <= POLLFD_CACHE_SIZE) {

+	int loc = 1;

+	for (conni = dpy->im_fd_info; conni; conni=conni->next) {

+	    pfp[loc].fd = conni->fd;

+	    pfp[loc].events = POLLIN;

+	    loc++;

+	}

+    }

+#endif

+}

+

+#ifdef _MSC_VER

+#undef min

+#define min __min

+#endif

+

+static int sync_hazard(Display *dpy)

+{

+    unsigned long span = dpy->request - dpy->last_request_read;

+    unsigned long hazard = min((dpy->bufmax - dpy->buffer) / SIZEOF(xReq), 65535 - 10);

+    return span >= 65535 - hazard - 10;

+}

+

+static

+void sync_while_locked(Display *dpy)

+{

+#ifdef XTHREADS

+    if (dpy->lock)

+        (*dpy->lock->user_lock_display)(dpy);

+#endif

+    UnlockDisplay(dpy);

+    SyncHandle();

+    InternalLockDisplay(dpy, /* don't skip user locks */ 0);

+#ifdef XTHREADS

+    if (dpy->lock)

+        (*dpy->lock->user_unlock_display)(dpy);

+#endif

+}

+

+void _XSeqSyncFunction(

+    register Display *dpy)

+{

+    xGetInputFocusReply rep;

+    register xReq *req;

+

+    if ((dpy->request - dpy->last_request_read) >= (65535 - BUFSIZE/SIZEOF(xReq))) {

+	GetEmptyReq(GetInputFocus, req);

+	(void) _XReply (dpy, (xReply *)&rep, 0, xTrue);

+	sync_while_locked(dpy);

+    } else if (sync_hazard(dpy))

+	_XSetPrivSyncFunction(dpy);

+}

+

+/* NOTE: only called if !XTHREADS, or when XInitThreads wasn't called. */

+static int

+_XPrivSyncFunction (Display *dpy)

+{

+#ifdef XTHREADS

+    assert(!dpy->lock_fns);

+#endif

+    assert(dpy->synchandler == _XPrivSyncFunction);

+    assert((dpy->flags & XlibDisplayPrivSync) != 0);

+    dpy->synchandler = dpy->savedsynchandler;

+    dpy->savedsynchandler = NULL;

+    dpy->flags &= ~XlibDisplayPrivSync;

+    if(dpy->synchandler)

+        dpy->synchandler(dpy);

+    _XIDHandler(dpy);

+    _XSeqSyncFunction(dpy);

+    return 0;

+}

+

+void _XSetPrivSyncFunction(Display *dpy)

+{

+#ifdef XTHREADS

+    if (dpy->lock_fns)

+        return;

+#endif

+    if (!(dpy->flags & XlibDisplayPrivSync)) {

+	dpy->savedsynchandler = dpy->synchandler;

+	dpy->synchandler = _XPrivSyncFunction;

+	dpy->flags |= XlibDisplayPrivSync;

+    }

+}

+

+void _XSetSeqSyncFunction(Display *dpy)

+{

+    if (sync_hazard(dpy))

+	_XSetPrivSyncFunction (dpy);

+}

+

+#ifdef LONG64

+void _XRead32(

+    Display *dpy,

+    register long *data,

+    long len)

+{

+    register int *buf;

+    register long i;

+

+    if (len) {

+	(void) _XRead(dpy, (char *)data, len);

+	i = len >> 2;

+	buf = (int *)data + i;

+	data += i;

+	while (--i >= 0)

+	    *--data = *--buf;

+    }

+}

+#endif /* LONG64 */

+

+#ifdef WORD64

+

+/*

+ * XXX This is a *really* stupid way of doing this....

+ * PACKBUFFERSIZE must be a multiple of 4.

+ */

+

+#define PACKBUFFERSIZE 4096

+

+

+/*

+ * _XRead32 - Read bytes from the socket unpacking each 32 bits

+ *            into a long (64 bits on a CRAY computer).

+ *

+ */

+static void _doXRead32(

+        register Display *dpy,

+        register long *data

+        register long size,

+	register char *packbuffer)

+{

+ long *lpack,*lp;

+ long mask32 = 0x00000000ffffffff;

+ long maskw, nwords, i, bits;

+

+        _XReadPad (dpy, packbuffer, size);

+

+        lp = data;

+        lpack = (long *) packbuffer;

+        nwords = size >> 2;

+        bits = 32;

+

+        for(i=0;i<nwords;i++){

+            maskw = mask32 << bits;

+           *lp++ = ( *lpack & maskw ) >> bits;

+            bits = bits ^32;

+            if(bits){

+               lpack++;

+            }

+        }

+}

+

+void _XRead32(

+    Display *dpy,

+    long *data,

+    long len)

+{

+    char packbuffer[PACKBUFFERSIZE];

+    unsigned nunits = PACKBUFFERSIZE >> 2;

+

+    for (; len > PACKBUFFERSIZE; len -= PACKBUFFERSIZE, data += nunits) {

+	_doXRead32 (dpy, data, PACKBUFFERSIZE, packbuffer);

+    }

+    if (len) _doXRead32 (dpy, data, len, packbuffer);

+}

+

+

+

+/*

+ * _XRead16 - Read bytes from the socket unpacking each 16 bits

+ *            into a long (64 bits on a CRAY computer).

+ *

+ */

+static _doXRead16(

+        register Display *dpy,

+        register short *data,

+        register long size,

+	char *packbuffer)

+{

+	long *lpack,*lp;

+	long mask16 = 0x000000000000ffff;

+	long maskw, nwords, i, bits;

+

+        (void) _XRead(dpy,packbuffer,size);	/* don't do a padded read... */

+

+        lp = (long *) data;

+        lpack = (long *) packbuffer;

+        nwords = size >> 1;  /* number of 16 bit words to be unpacked */

+        bits = 48;

+        for(i=0;i<nwords;i++){

+            maskw = mask16 << bits;

+           *lp++ = ( *lpack & maskw ) >> bits;

+            bits -= 16;

+            if(bits < 0){

+               lpack++;

+               bits = 48;

+            }

+        }

+}

+

+void _XRead16(

+    Display *dpy,

+    short *data,

+    long len)

+{

+    char packbuffer[PACKBUFFERSIZE];

+    unsigned nunits = PACKBUFFERSIZE >> 1;

+

+    for (; len > PACKBUFFERSIZE; len -= PACKBUFFERSIZE, data += nunits) {

+	_doXRead16 (dpy, data, PACKBUFFERSIZE, packbuffer);

+    }

+    if (len) _doXRead16 (dpy, data, len, packbuffer);

+}

+

+void _XRead16Pad(

+    Display *dpy,

+    short *data,

+    long size)

+{

+    int slop = (size & 3);

+    short slopbuf[3];

+

+    _XRead16 (dpy, data, size);

+    if (slop > 0) {

+	_XRead16 (dpy, slopbuf, 4 - slop);

+    }

+}

+#endif /* WORD64 */

+

+/*

+ * The hard part about this is that we only get 16 bits from a reply.

+ * We have three values that will march along, with the following invariant:

+ *	dpy->last_request_read <= rep->sequenceNumber <= dpy->request

+ * We have to keep

+ *	dpy->request - dpy->last_request_read < 2^16

+ * or else we won't know for sure what value to use in events.  We do this

+ * by forcing syncs when we get close.

+ */

+

+unsigned long

+_XSetLastRequestRead(

+    register Display *dpy,

+    register xGenericReply *rep)

+{

+    register unsigned long	newseq, lastseq;

+

+    lastseq = dpy->last_request_read;

+    /*

+     * KeymapNotify has no sequence number, but is always guaranteed

+     * to immediately follow another event, except when generated via

+     * SendEvent (hmmm).

+     */

+    if ((rep->type & 0x7f) == KeymapNotify)

+	return(lastseq);

+

+    newseq = (lastseq & ~((unsigned long)0xffff)) | rep->sequenceNumber;

+

+    if (newseq < lastseq) {

+	newseq += 0x10000;

+	if (newseq > dpy->request) {

+	    (void) fprintf (stderr,

+	    "Xlib: sequence lost (0x%lx > 0x%lx) in reply type 0x%x!\n",

+			    newseq, dpy->request,

+			    (unsigned int) rep->type);

+	    newseq -= 0x10000;

+	}

+    }

+

+    dpy->last_request_read = newseq;

+    return(newseq);

+}

+

+/*

+ * Support for internal connections, such as an IM might use.

+ * By Stephen Gildea, X Consortium, September 1993

+ */

+

+/* _XRegisterInternalConnection

+ * Each IM (or Xlib extension) that opens a file descriptor that Xlib should

+ * include in its select/poll mask must call this function to register the

+ * fd with Xlib.  Any XConnectionWatchProc registered by XAddConnectionWatch

+ * will also be called.

+ *

+ * Whenever Xlib detects input available on fd, it will call callback

+ * with call_data to process it.  If non-Xlib code calls select/poll

+ * and detects input available, it must call XProcessInternalConnection,

+ * which will call the associated callback.

+ *

+ * Non-Xlib code can learn about these additional fds by calling

+ * XInternalConnectionNumbers or, more typically, by registering

+ * a XConnectionWatchProc with XAddConnectionWatch

+ * to be called when fds are registered or unregistered.

+ *

+ * Returns True if registration succeeded, False if not, typically

+ * because could not allocate memory.

+ * Assumes Display locked when called.

+ */

+Status

+_XRegisterInternalConnection(

+    Display* dpy,

+    int fd,

+    _XInternalConnectionProc callback,

+    XPointer call_data

+)

+{

+    struct _XConnectionInfo *new_conni, **iptr;

+    struct _XConnWatchInfo *watchers;

+    XPointer *wd;

+

+    new_conni = (struct _XConnectionInfo*)Xmalloc(sizeof(struct _XConnectionInfo));

+    if (!new_conni)

+	return 0;

+    new_conni->watch_data = (XPointer *)Xmalloc(dpy->watcher_count * sizeof(XPointer));

+    if (!new_conni->watch_data) {

+	Xfree(new_conni);

+	return 0;

+    }

+    new_conni->fd = fd;

+    new_conni->read_callback = callback;

+    new_conni->call_data = call_data;

+    new_conni->next = NULL;

+    /* link new structure onto end of list */

+    for (iptr = &dpy->im_fd_info; *iptr; iptr = &(*iptr)->next)

+	;

+    *iptr = new_conni;

+    dpy->im_fd_length++;

+    _XPollfdCacheAdd(dpy, fd);

+

+    for (watchers=dpy->conn_watchers, wd=new_conni->watch_data;

+	 watchers;

+	 watchers=watchers->next, wd++) {

+	*wd = NULL;		/* for cleanliness */

+	(*watchers->fn) (dpy, watchers->client_data, fd, True, wd);

+    }

+

+    return 1;

+}

+

+/* _XUnregisterInternalConnection

+ * Each IM (or Xlib extension) that closes a file descriptor previously

+ * registered with _XRegisterInternalConnection must call this function.

+ * Any XConnectionWatchProc registered by XAddConnectionWatch

+ * will also be called.

+ *

+ * Assumes Display locked when called.

+ */

+void

+_XUnregisterInternalConnection(

+    Display* dpy,

+    int fd

+)

+{

+    struct _XConnectionInfo *info_list, **prev;

+    struct _XConnWatchInfo *watch;

+    XPointer *wd;

+

+    for (prev = &dpy->im_fd_info; (info_list = *prev);

+	 prev = &info_list->next) {

+	if (info_list->fd == fd) {

+	    *prev = info_list->next;

+	    dpy->im_fd_length--;

+	    for (watch=dpy->conn_watchers, wd=info_list->watch_data;

+		 watch;

+		 watch=watch->next, wd++) {

+		(*watch->fn) (dpy, watch->client_data, fd, False, wd);

+	    }

+	    if (info_list->watch_data)

+		Xfree (info_list->watch_data);

+	    Xfree (info_list);

+	    break;

+	}

+    }

+    _XPollfdCacheDel(dpy, fd);

+}

+

+/* XInternalConnectionNumbers

+ * Returns an array of fds and an array of corresponding call data.

+ * Typically a XConnectionWatchProc registered with XAddConnectionWatch

+ * will be used instead of this function to discover

+ * additional fds to include in the select/poll mask.

+ *

+ * The list is allocated with Xmalloc and should be freed by the caller

+ * with Xfree;

+ */

+Status

+XInternalConnectionNumbers(

+    Display *dpy,

+    int **fd_return,

+    int *count_return

+)

+{

+    int count;

+    struct _XConnectionInfo *info_list;

+    int *fd_list;

+

+    LockDisplay(dpy);

+    count = 0;

+    for (info_list=dpy->im_fd_info; info_list; info_list=info_list->next)

+	count++;

+    fd_list = (int*) Xmalloc (count * sizeof(int));

+    if (!fd_list) {

+	UnlockDisplay(dpy);

+	return 0;

+    }

+    count = 0;

+    for (info_list=dpy->im_fd_info; info_list; info_list=info_list->next) {

+	fd_list[count] = info_list->fd;

+	count++;

+    }

+    UnlockDisplay(dpy);

+

+    *fd_return = fd_list;

+    *count_return = count;

+    return 1;

+}

+

+void _XProcessInternalConnection(

+    Display *dpy,

+    struct _XConnectionInfo *conn_info)

+{

+    dpy->flags |= XlibDisplayProcConni;

+    UnlockDisplay(dpy);

+    (*conn_info->read_callback) (dpy, conn_info->fd, conn_info->call_data);

+    LockDisplay(dpy);

+    dpy->flags &= ~XlibDisplayProcConni;

+}

+

+/* XProcessInternalConnection

+ * Call the _XInternalConnectionProc registered by _XRegisterInternalConnection

+ * for this fd.

+ * The Display is NOT locked during the call.

+ */

+void

+XProcessInternalConnection(

+    Display* dpy,

+    int fd

+)

+{

+    struct _XConnectionInfo *info_list;

+

+    LockDisplay(dpy);

+    for (info_list=dpy->im_fd_info; info_list; info_list=info_list->next) {

+	if (info_list->fd == fd) {

+	    _XProcessInternalConnection(dpy, info_list);

+	    break;

+	}

+    }

+    UnlockDisplay(dpy);

+}

+

+/* XAddConnectionWatch

+ * Register a callback to be called whenever _XRegisterInternalConnection

+ * or _XUnregisterInternalConnection is called.

+ * Callbacks are called with the Display locked.

+ * If any connections are already registered, the callback is immediately

+ * called for each of them.

+ */

+Status

+XAddConnectionWatch(

+    Display* dpy,

+    XConnectionWatchProc callback,

+    XPointer client_data

+)

+{

+    struct _XConnWatchInfo *new_watcher, **wptr;

+    struct _XConnectionInfo *info_list;

+    XPointer *wd_array;

+

+    LockDisplay(dpy);

+

+    /* allocate new watch data */

+    for (info_list=dpy->im_fd_info; info_list; info_list=info_list->next) {

+	wd_array = (XPointer *)Xrealloc((char *)info_list->watch_data,

+					(dpy->watcher_count + 1) *

+					sizeof(XPointer));

+	if (!wd_array) {

+	    UnlockDisplay(dpy);

+	    return 0;

+	}

+	info_list->watch_data = wd_array;

+	wd_array[dpy->watcher_count] = NULL;	/* for cleanliness */

+    }

+

+    new_watcher = (struct _XConnWatchInfo*)Xmalloc(sizeof(struct _XConnWatchInfo));

+    if (!new_watcher) {

+	UnlockDisplay(dpy);

+	return 0;

+    }

+    new_watcher->fn = callback;

+    new_watcher->client_data = client_data;

+    new_watcher->next = NULL;

+

+    /* link new structure onto end of list */

+    for (wptr = &dpy->conn_watchers; *wptr; wptr = &(*wptr)->next)

+	;

+    *wptr = new_watcher;

+    dpy->watcher_count++;

+

+    /* call new watcher on all currently registered fds */

+    for (info_list=dpy->im_fd_info; info_list; info_list=info_list->next) {

+	(*callback) (dpy, client_data, info_list->fd, True,

+		     info_list->watch_data + dpy->watcher_count - 1);

+    }

+

+    UnlockDisplay(dpy);

+    return 1;

+}

+

+/* XRemoveConnectionWatch

+ * Unregister a callback registered by XAddConnectionWatch.

+ * Both callback and client_data must match what was passed to

+ * XAddConnectionWatch.

+ */

+void

+XRemoveConnectionWatch(

+    Display* dpy,

+    XConnectionWatchProc callback,

+    XPointer client_data

+)

+{

+    struct _XConnWatchInfo *watch;

+    struct _XConnWatchInfo *previous = NULL;

+    struct _XConnectionInfo *conni;

+    int counter = 0;

+

+    LockDisplay(dpy);

+    for (watch=dpy->conn_watchers; watch; watch=watch->next) {

+	if (watch->fn == callback  &&  watch->client_data == client_data) {

+	    if (previous)

+		previous->next = watch->next;

+	    else

+		dpy->conn_watchers = watch->next;

+	    Xfree (watch);

+	    dpy->watcher_count--;

+	    /* remove our watch_data for each connection */

+	    for (conni=dpy->im_fd_info; conni; conni=conni->next) {

+		/* don't bother realloc'ing; these arrays are small anyway */

+		/* overlapping */

+		memmove(conni->watch_data+counter,

+			conni->watch_data+counter+1,

+			dpy->watcher_count - counter);

+	    }

+	    break;

+	}

+	previous = watch;

+	counter++;

+    }

+    UnlockDisplay(dpy);

+}

+

+/* end of internal connections support */

+

+/* Cookie jar implementation

+   dpy->cookiejar is a linked list. _XEnq receives the events but leaves

+   them in the normal EQ. _XStoreEvent returns the cookie event (minus

+   data pointer) and adds it to the cookiejar. _XDeq just removes

+   the entry like any other event but resets the data pointer for

+   cookie events (to avoid double-free, the memory is re-used by Xlib).

+

+   _XFetchEventCookie (called from XGetEventData) removes a cookie from the

+   jar. _XFreeEventCookies removes all unclaimed cookies from the jar

+   (called by XNextEvent).

+

+   _XFreeDisplayStructure calls _XFreeEventCookies for each cookie in the

+   normal EQ.

+ */

+

+#include "utlist.h"

+struct stored_event {

+    XGenericEventCookie ev;

+    struct stored_event *prev;

+    struct stored_event *next;

+};

+

+Bool

+_XIsEventCookie(Display *dpy, XEvent *ev)

+{

+    return (ev->xcookie.type == GenericEvent &&

+	    dpy->generic_event_vec[ev->xcookie.extension & 0x7F] != NULL);

+}

+

+/**

+ * Free all events in the event list.

+ */

+void

+_XFreeEventCookies(Display *dpy)

+{

+    struct stored_event **head, *e, *tmp;

+

+    if (!dpy->cookiejar)

+        return;

+

+    head = (struct stored_event**)&dpy->cookiejar;

+

+    DL_FOREACH_SAFE(*head, e, tmp) {

+        if (dpy->cookiejar == e)

+            dpy->cookiejar = NULL;

+        XFree(e->ev.data);

+        XFree(e);

+    }

+}

+

+/**

+ * Add an event to the display's event list. This event must be freed on the

+ * next call to XNextEvent().

+ */

+void

+_XStoreEventCookie(Display *dpy, XEvent *event)

+{

+    XGenericEventCookie* cookie = &event->xcookie;

+    struct stored_event **head, *add;

+

+    if (!_XIsEventCookie(dpy, event))

+        return;

+

+    head = (struct stored_event**)(&dpy->cookiejar);

+

+    add = Xmalloc(sizeof(struct stored_event));

+    if (!add) {

+        ESET(ENOMEM);

+        _XIOError(dpy);

+    }

+    add->ev = *cookie;

+    DL_APPEND(*head, add);

+    cookie->data = NULL; /* don't return data yet, must be claimed */

+}

+

+/**

+ * Return the event with the given cookie and remove it from the list.

+ */

+Bool

+_XFetchEventCookie(Display *dpy, XGenericEventCookie* ev)

+{

+    Bool ret = False;

+    struct stored_event **head, *event;

+    head = (struct stored_event**)&dpy->cookiejar;

+

+    if (!_XIsEventCookie(dpy, (XEvent*)ev))

+        return ret;

+

+    DL_FOREACH(*head, event) {

+        if (event->ev.cookie == ev->cookie &&

+            event->ev.extension == ev->extension &&

+            event->ev.evtype == ev->evtype) {

+            *ev = event->ev;

+            DL_DELETE(*head, event);

+            Xfree(event);

+            ret = True;

+            break;

+        }

+    }

+

+    return ret;

+}

+

+Bool

+_XCopyEventCookie(Display *dpy, XGenericEventCookie *in, XGenericEventCookie *out)

+{

+    Bool ret = False;

+    int extension;

+

+    if (!_XIsEventCookie(dpy, (XEvent*)in) || !out)

+        return ret;

+

+    extension = in->extension & 0x7F;

+

+    if (!dpy->generic_event_copy_vec[extension])

+        return ret;

+

+    ret = ((*dpy->generic_event_copy_vec[extension])(dpy, in, out));

+    out->cookie = ret ? ++dpy->next_cookie  : 0;

+    return ret;

+}

+

+

+/*

+ * _XEnq - Place event packets on the display's queue.

+ * note that no squishing of move events in V11, since there

+ * is pointer motion hints....

+ */

+void _XEnq(

+	register Display *dpy,

+	register xEvent *event)

+{

+	register _XQEvent *qelt;

+	int type, extension;

+

+	if ((qelt = dpy->qfree)) {

+		/* If dpy->qfree is non-NULL do this, else malloc a new one. */

+		dpy->qfree = qelt->next;

+	}

+	else if ((qelt =

+	    (_XQEvent *) Xmalloc((unsigned)sizeof(_XQEvent))) == NULL) {

+		/* Malloc call failed! */

+		ESET(ENOMEM);

+		_XIOError(dpy);

+	}

+	qelt->next = NULL;

+

+	type = event->u.u.type & 0177;

+	extension = ((xGenericEvent*)event)->extension;

+

+	qelt->event.type = type;

+	/* If an extension has registerd a generic_event_vec handler, then

+	 * it can handle event cookies. Otherwise, proceed with the normal

+	 * event handlers.

+	 *

+	 * If the generic_event_vec is called, qelt->event is a event cookie

+	 * with the data pointer and the "free" pointer set. Data pointer is

+	 * some memory allocated by the extension.

+	 */

+        if (type == GenericEvent && dpy->generic_event_vec[extension & 0x7F]) {

+	    XGenericEventCookie *cookie = &qelt->event.xcookie;

+	    (*dpy->generic_event_vec[extension & 0x7F])(dpy, cookie, event);

+	    cookie->cookie = ++dpy->next_cookie;

+

+	    qelt->qserial_num = dpy->next_event_serial_num++;

+	    if (dpy->tail)	dpy->tail->next = qelt;

+	    else		dpy->head = qelt;

+

+	    dpy->tail = qelt;

+	    dpy->qlen++;

+	} else if ((*dpy->event_vec[type])(dpy, &qelt->event, event)) {

+	    qelt->qserial_num = dpy->next_event_serial_num++;

+	    if (dpy->tail)	dpy->tail->next = qelt;

+	    else 		dpy->head = qelt;

+

+	    dpy->tail = qelt;

+	    dpy->qlen++;

+	} else {

+	    /* ignored, or stashed away for many-to-one compression */

+	    qelt->next = dpy->qfree;

+	    dpy->qfree = qelt;

+	}

+}

+

+/*

+ * _XDeq - Remove event packet from the display's queue.

+ */

+void _XDeq(

+    register Display *dpy,

+    register _XQEvent *prev,	/* element before qelt */

+    register _XQEvent *qelt)	/* element to be unlinked */

+{

+    if (prev) {

+	if ((prev->next = qelt->next) == NULL)

+	    dpy->tail = prev;

+    } else {

+	/* no prev, so removing first elt */

+	if ((dpy->head = qelt->next) == NULL)

+	    dpy->tail = NULL;

+    }

+    qelt->qserial_num = 0;

+    qelt->next = dpy->qfree;

+    dpy->qfree = qelt;

+    dpy->qlen--;

+

+    if (_XIsEventCookie(dpy, &qelt->event)) {

+	XGenericEventCookie* cookie = &qelt->event.xcookie;

+	/* dpy->qfree is re-used, reset memory to avoid double free on

+	 * _XFreeDisplayStructure */

+	cookie->data = NULL;

+    }

+}

+

+/*

+ * EventToWire in separate file in that often not needed.

+ */

+

+/*ARGSUSED*/

+Bool

+_XUnknownWireEvent(

+    register Display *dpy,	/* pointer to display structure */

+    register XEvent *re,	/* pointer to where event should be reformatted */

+    register xEvent *event)	/* wire protocol event */

+{

+#ifdef notdef

+	(void) fprintf(stderr,

+	    "Xlib: unhandled wire event! event number = %d, display = %x\n.",

+			event->u.u.type, dpy);

+#endif

+	return(False);

+}

+

+Bool

+_XUnknownWireEventCookie(

+    Display *dpy,	/* pointer to display structure */

+    XGenericEventCookie *re,	/* pointer to where event should be reformatted */

+    xEvent *event)	/* wire protocol event */

+{

+#ifdef notdef

+	fprintf(stderr,

+	    "Xlib: unhandled wire cookie event! extension number = %d, display = %x\n.",

+			((xGenericEvent*)event)->extension, dpy);

+#endif

+	return(False);

+}

+

+Bool

+_XUnknownCopyEventCookie(

+    Display *dpy,	/* pointer to display structure */

+    XGenericEventCookie *in,	/* source */

+    XGenericEventCookie *out)	/* destination */

+{

+#ifdef notdef

+	fprintf(stderr,

+	    "Xlib: unhandled cookie event copy! extension number = %d, display = %x\n.",

+			in->extension, dpy);

+#endif

+	return(False);

+}

+

+/*ARGSUSED*/

+Status

+_XUnknownNativeEvent(

+    register Display *dpy,	/* pointer to display structure */

+    register XEvent *re,	/* pointer to where event should be reformatted */

+    register xEvent *event)	/* wire protocol event */

+{

+#ifdef notdef

+	(void) fprintf(stderr,

+ 	   "Xlib: unhandled native event! event number = %d, display = %x\n.",

+			re->type, dpy);

+#endif

+	return(0);

+}

+/*

+ * reformat a wire event into an XEvent structure of the right type.

+ */

+Bool

+_XWireToEvent(

+    register Display *dpy,	/* pointer to display structure */

+    register XEvent *re,	/* pointer to where event should be reformatted */

+    register xEvent *event)	/* wire protocol event */

+{

+

+	re->type = event->u.u.type & 0x7f;

+	((XAnyEvent *)re)->serial = _XSetLastRequestRead(dpy,

+					(xGenericReply *)event);

+	((XAnyEvent *)re)->send_event = ((event->u.u.type & 0x80) != 0);

+	((XAnyEvent *)re)->display = dpy;

+

+	/* Ignore the leading bit of the event type since it is set when a

+		client sends an event rather than the server. */

+

+	switch (event-> u.u.type & 0177) {

+	      case KeyPress:

+	      case KeyRelease:

+	        {

+			register XKeyEvent *ev = (XKeyEvent*) re;

+			ev->root 	= event->u.keyButtonPointer.root;

+			ev->window 	= event->u.keyButtonPointer.event;

+			ev->subwindow 	= event->u.keyButtonPointer.child;

+			ev->time 	= event->u.keyButtonPointer.time;

+			ev->x 		= cvtINT16toInt(event->u.keyButtonPointer.eventX);

+			ev->y 		= cvtINT16toInt(event->u.keyButtonPointer.eventY);

+			ev->x_root 	= cvtINT16toInt(event->u.keyButtonPointer.rootX);

+			ev->y_root 	= cvtINT16toInt(event->u.keyButtonPointer.rootY);

+			ev->state	= event->u.keyButtonPointer.state;

+			ev->same_screen	= event->u.keyButtonPointer.sameScreen;

+			ev->keycode 	= event->u.u.detail;

+		}

+	      	break;

+	      case ButtonPress:

+	      case ButtonRelease:

+	        {

+			register XButtonEvent *ev =  (XButtonEvent *) re;

+			ev->root 	= event->u.keyButtonPointer.root;

+			ev->window 	= event->u.keyButtonPointer.event;

+			ev->subwindow 	= event->u.keyButtonPointer.child;

+			ev->time 	= event->u.keyButtonPointer.time;

+			ev->x 		= cvtINT16toInt(event->u.keyButtonPointer.eventX);

+			ev->y 		= cvtINT16toInt(event->u.keyButtonPointer.eventY);

+			ev->x_root 	= cvtINT16toInt(event->u.keyButtonPointer.rootX);

+			ev->y_root 	= cvtINT16toInt(event->u.keyButtonPointer.rootY);

+			ev->state	= event->u.keyButtonPointer.state;

+			ev->same_screen	= event->u.keyButtonPointer.sameScreen;

+			ev->button 	= event->u.u.detail;

+		}

+	        break;

+	      case MotionNotify:

+	        {

+			register XMotionEvent *ev =   (XMotionEvent *)re;

+			ev->root 	= event->u.keyButtonPointer.root;

+			ev->window 	= event->u.keyButtonPointer.event;

+			ev->subwindow 	= event->u.keyButtonPointer.child;

+			ev->time 	= event->u.keyButtonPointer.time;

+			ev->x 		= cvtINT16toInt(event->u.keyButtonPointer.eventX);

+			ev->y 		= cvtINT16toInt(event->u.keyButtonPointer.eventY);

+			ev->x_root 	= cvtINT16toInt(event->u.keyButtonPointer.rootX);

+			ev->y_root 	= cvtINT16toInt(event->u.keyButtonPointer.rootY);

+			ev->state	= event->u.keyButtonPointer.state;

+			ev->same_screen	= event->u.keyButtonPointer.sameScreen;

+			ev->is_hint 	= event->u.u.detail;

+		}

+	        break;

+	      case EnterNotify:

+	      case LeaveNotify:

+		{

+			register XCrossingEvent *ev   = (XCrossingEvent *) re;

+			ev->root	= event->u.enterLeave.root;

+			ev->window	= event->u.enterLeave.event;

+			ev->subwindow	= event->u.enterLeave.child;

+			ev->time	= event->u.enterLeave.time;

+			ev->x		= cvtINT16toInt(event->u.enterLeave.eventX);

+			ev->y		= cvtINT16toInt(event->u.enterLeave.eventY);

+			ev->x_root	= cvtINT16toInt(event->u.enterLeave.rootX);

+			ev->y_root	= cvtINT16toInt(event->u.enterLeave.rootY);

+			ev->state	= event->u.enterLeave.state;

+			ev->mode	= event->u.enterLeave.mode;

+			ev->same_screen = (event->u.enterLeave.flags &

+				ELFlagSameScreen) && True;

+			ev->focus	= (event->u.enterLeave.flags &

+			  	ELFlagFocus) && True;

+			ev->detail	= event->u.u.detail;

+		}

+		  break;

+	      case FocusIn:

+	      case FocusOut:

+		{

+			register XFocusChangeEvent *ev = (XFocusChangeEvent *) re;

+			ev->window 	= event->u.focus.window;

+			ev->mode	= event->u.focus.mode;

+			ev->detail	= event->u.u.detail;

+		}

+		  break;

+	      case KeymapNotify:

+		{

+			register XKeymapEvent *ev = (XKeymapEvent *) re;

+			ev->window	= None;

+			memcpy(&ev->key_vector[1],

+			       (char *)((xKeymapEvent *) event)->map,

+			       sizeof (((xKeymapEvent *) event)->map));

+		}

+		break;

+	      case Expose:

+		{

+			register XExposeEvent *ev = (XExposeEvent *) re;

+			ev->window	= event->u.expose.window;

+			ev->x		= event->u.expose.x;

+			ev->y		= event->u.expose.y;

+			ev->width	= event->u.expose.width;

+			ev->height	= event->u.expose.height;

+			ev->count	= event->u.expose.count;

+		}

+		break;

+	      case GraphicsExpose:

+		{

+		    register XGraphicsExposeEvent *ev =

+			(XGraphicsExposeEvent *) re;

+		    ev->drawable	= event->u.graphicsExposure.drawable;

+		    ev->x		= event->u.graphicsExposure.x;

+		    ev->y		= event->u.graphicsExposure.y;

+		    ev->width		= event->u.graphicsExposure.width;

+		    ev->height		= event->u.graphicsExposure.height;

+		    ev->count		= event->u.graphicsExposure.count;

+		    ev->major_code	= event->u.graphicsExposure.majorEvent;

+		    ev->minor_code	= event->u.graphicsExposure.minorEvent;

+		}

+		break;

+	      case NoExpose:

+		{

+		    register XNoExposeEvent *ev = (XNoExposeEvent *) re;

+		    ev->drawable	= event->u.noExposure.drawable;

+		    ev->major_code	= event->u.noExposure.majorEvent;

+		    ev->minor_code	= event->u.noExposure.minorEvent;

+		}

+		break;

+	      case VisibilityNotify:

+		{

+		    register XVisibilityEvent *ev = (XVisibilityEvent *) re;

+		    ev->window		= event->u.visibility.window;

+		    ev->state		= event->u.visibility.state;

+		}

+		break;

+	      case CreateNotify:

+		{

+		    register XCreateWindowEvent *ev =

+			 (XCreateWindowEvent *) re;

+		    ev->window		= event->u.createNotify.window;

+		    ev->parent		= event->u.createNotify.parent;

+		    ev->x		= cvtINT16toInt(event->u.createNotify.x);

+		    ev->y		= cvtINT16toInt(event->u.createNotify.y);

+		    ev->width		= event->u.createNotify.width;

+		    ev->height		= event->u.createNotify.height;

+		    ev->border_width	= event->u.createNotify.borderWidth;

+		    ev->override_redirect	= event->u.createNotify.override;

+		}

+		break;

+	      case DestroyNotify:

+		{

+		    register XDestroyWindowEvent *ev =

+				(XDestroyWindowEvent *) re;

+		    ev->window		= event->u.destroyNotify.window;

+		    ev->event		= event->u.destroyNotify.event;

+		}

+		break;

+	      case UnmapNotify:

+		{

+		    register XUnmapEvent *ev = (XUnmapEvent *) re;

+		    ev->window		= event->u.unmapNotify.window;

+		    ev->event		= event->u.unmapNotify.event;

+		    ev->from_configure	= event->u.unmapNotify.fromConfigure;

+		}

+		break;

+	      case MapNotify:

+		{

+		    register XMapEvent *ev = (XMapEvent *) re;

+		    ev->window		= event->u.mapNotify.window;

+		    ev->event		= event->u.mapNotify.event;

+		    ev->override_redirect	= event->u.mapNotify.override;

+		}

+		break;

+	      case MapRequest:

+		{

+		    register XMapRequestEvent *ev = (XMapRequestEvent *) re;

+		    ev->window		= event->u.mapRequest.window;

+		    ev->parent		= event->u.mapRequest.parent;

+		}

+		break;

+	      case ReparentNotify:

+		{

+		    register XReparentEvent *ev = (XReparentEvent *) re;

+		    ev->event		= event->u.reparent.event;

+		    ev->window		= event->u.reparent.window;

+		    ev->parent		= event->u.reparent.parent;

+		    ev->x		= cvtINT16toInt(event->u.reparent.x);

+		    ev->y		= cvtINT16toInt(event->u.reparent.y);

+		    ev->override_redirect	= event->u.reparent.override;

+		}

+		break;

+	      case ConfigureNotify:

+		{

+		    register XConfigureEvent *ev = (XConfigureEvent *) re;

+		    ev->event	= event->u.configureNotify.event;

+		    ev->window	= event->u.configureNotify.window;

+		    ev->above	= event->u.configureNotify.aboveSibling;

+		    ev->x	= cvtINT16toInt(event->u.configureNotify.x);

+		    ev->y	= cvtINT16toInt(event->u.configureNotify.y);

+		    ev->width	= event->u.configureNotify.width;

+		    ev->height	= event->u.configureNotify.height;

+		    ev->border_width  = event->u.configureNotify.borderWidth;

+		    ev->override_redirect = event->u.configureNotify.override;

+		}

+		break;

+	      case ConfigureRequest:

+		{

+		    register XConfigureRequestEvent *ev =

+		        (XConfigureRequestEvent *) re;

+		    ev->window		= event->u.configureRequest.window;

+		    ev->parent		= event->u.configureRequest.parent;

+		    ev->above		= event->u.configureRequest.sibling;

+		    ev->x		= cvtINT16toInt(event->u.configureRequest.x);

+		    ev->y		= cvtINT16toInt(event->u.configureRequest.y);

+		    ev->width		= event->u.configureRequest.width;

+		    ev->height		= event->u.configureRequest.height;

+		    ev->border_width	= event->u.configureRequest.borderWidth;

+		    ev->value_mask	= event->u.configureRequest.valueMask;

+		    ev->detail  	= event->u.u.detail;

+		}

+		break;

+	      case GravityNotify:

+		{

+		    register XGravityEvent *ev = (XGravityEvent *) re;

+		    ev->window		= event->u.gravity.window;

+		    ev->event		= event->u.gravity.event;

+		    ev->x		= cvtINT16toInt(event->u.gravity.x);

+		    ev->y		= cvtINT16toInt(event->u.gravity.y);

+		}

+		break;

+	      case ResizeRequest:

+		{

+		    register XResizeRequestEvent *ev =

+			(XResizeRequestEvent *) re;

+		    ev->window		= event->u.resizeRequest.window;

+		    ev->width		= event->u.resizeRequest.width;

+		    ev->height		= event->u.resizeRequest.height;

+		}

+		break;

+	      case CirculateNotify:

+		{

+		    register XCirculateEvent *ev = (XCirculateEvent *) re;

+		    ev->window		= event->u.circulate.window;

+		    ev->event		= event->u.circulate.event;

+		    ev->place		= event->u.circulate.place;

+		}

+		break;

+	      case CirculateRequest:

+		{

+		    register XCirculateRequestEvent *ev =

+		        (XCirculateRequestEvent *) re;

+		    ev->window		= event->u.circulate.window;

+		    ev->parent		= event->u.circulate.event;

+		    ev->place		= event->u.circulate.place;

+		}

+		break;

+	      case PropertyNotify:

+		{

+		    register XPropertyEvent *ev = (XPropertyEvent *) re;

+		    ev->window		= event->u.property.window;

+		    ev->atom		= event->u.property.atom;

+		    ev->time		= event->u.property.time;

+		    ev->state		= event->u.property.state;

+		}

+		break;

+	      case SelectionClear:

+		{

+		    register XSelectionClearEvent *ev =

+			 (XSelectionClearEvent *) re;

+		    ev->window		= event->u.selectionClear.window;

+		    ev->selection	= event->u.selectionClear.atom;

+		    ev->time		= event->u.selectionClear.time;

+		}

+		break;

+	      case SelectionRequest:

+		{

+		    register XSelectionRequestEvent *ev =

+		        (XSelectionRequestEvent *) re;

+		    ev->owner		= event->u.selectionRequest.owner;

+		    ev->requestor	= event->u.selectionRequest.requestor;

+		    ev->selection	= event->u.selectionRequest.selection;

+		    ev->target		= event->u.selectionRequest.target;

+		    ev->property	= event->u.selectionRequest.property;

+		    ev->time		= event->u.selectionRequest.time;

+		}

+		break;

+	      case SelectionNotify:

+		{

+		    register XSelectionEvent *ev = (XSelectionEvent *) re;

+		    ev->requestor	= event->u.selectionNotify.requestor;

+		    ev->selection	= event->u.selectionNotify.selection;

+		    ev->target		= event->u.selectionNotify.target;

+		    ev->property	= event->u.selectionNotify.property;

+		    ev->time		= event->u.selectionNotify.time;

+		}

+		break;

+	      case ColormapNotify:

+		{

+		    register XColormapEvent *ev = (XColormapEvent *) re;

+		    ev->window		= event->u.colormap.window;

+		    ev->colormap	= event->u.colormap.colormap;

+		    ev->new		= event->u.colormap.new;

+		    ev->state		= event->u.colormap.state;

+	        }

+		break;

+	      case ClientMessage:

+		{

+		   register int i;

+		   register XClientMessageEvent *ev

+		   			= (XClientMessageEvent *) re;

+		   ev->window		= event->u.clientMessage.window;

+		   ev->format		= event->u.u.detail;

+		   switch (ev->format) {

+			case 8:

+			   ev->message_type = event->u.clientMessage.u.b.type;

+			   for (i = 0; i < 20; i++)

+			     ev->data.b[i] = event->u.clientMessage.u.b.bytes[i];

+			   break;

+			case 16:

+			   ev->message_type = event->u.clientMessage.u.s.type;

+			   ev->data.s[0] = cvtINT16toShort(event->u.clientMessage.u.s.shorts0);

+			   ev->data.s[1] = cvtINT16toShort(event->u.clientMessage.u.s.shorts1);

+			   ev->data.s[2] = cvtINT16toShort(event->u.clientMessage.u.s.shorts2);

+			   ev->data.s[3] = cvtINT16toShort(event->u.clientMessage.u.s.shorts3);

+			   ev->data.s[4] = cvtINT16toShort(event->u.clientMessage.u.s.shorts4);

+			   ev->data.s[5] = cvtINT16toShort(event->u.clientMessage.u.s.shorts5);

+			   ev->data.s[6] = cvtINT16toShort(event->u.clientMessage.u.s.shorts6);

+			   ev->data.s[7] = cvtINT16toShort(event->u.clientMessage.u.s.shorts7);

+			   ev->data.s[8] = cvtINT16toShort(event->u.clientMessage.u.s.shorts8);

+			   ev->data.s[9] = cvtINT16toShort(event->u.clientMessage.u.s.shorts9);

+			   break;

+			case 32:

+			   ev->message_type = event->u.clientMessage.u.l.type;

+			   ev->data.l[0] = cvtINT32toLong(event->u.clientMessage.u.l.longs0);

+			   ev->data.l[1] = cvtINT32toLong(event->u.clientMessage.u.l.longs1);

+			   ev->data.l[2] = cvtINT32toLong(event->u.clientMessage.u.l.longs2);

+			   ev->data.l[3] = cvtINT32toLong(event->u.clientMessage.u.l.longs3);

+			   ev->data.l[4] = cvtINT32toLong(event->u.clientMessage.u.l.longs4);

+			   break;

+			default: /* XXX should never occur */

+				break;

+		    }

+	        }

+		break;

+	      case MappingNotify:

+		{

+		   register XMappingEvent *ev = (XMappingEvent *)re;

+		   ev->window		= 0;

+		   ev->first_keycode 	= event->u.mappingNotify.firstKeyCode;

+		   ev->request 		= event->u.mappingNotify.request;

+		   ev->count 		= event->u.mappingNotify.count;

+		}

+		break;

+	      default:

+		return(_XUnknownWireEvent(dpy, re, event));

+	}

+	return(True);

+}

+

+

+/*

+ * _XDefaultIOError - Default fatal system error reporting routine.  Called

+ * when an X internal system error is encountered.

+ */

+int _XDefaultIOError(

+	Display *dpy)

+{

+	if (ECHECK(EPIPE)) {

+	    (void) fprintf (stderr,

+	"X connection to %s broken (explicit kill or server shutdown).\r\n",

+			    DisplayString (dpy));

+	} else {

+	    (void) fprintf (stderr,

+			"XIO:  fatal IO error %d (%s) on X server \"%s\"\r\n",

+#ifdef WIN32

+			WSAGetLastError(), strerror(WSAGetLastError()),

+#else

+			errno, strerror (errno),

+#endif

+			DisplayString (dpy));

+	    (void) fprintf (stderr,

+	 "      after %lu requests (%lu known processed) with %d events remaining.\r\n",

+			NextRequest(dpy) - 1, LastKnownRequestProcessed(dpy),

+			QLength(dpy));

+

+	}

+	exit(1);

+        return(0); /* dummy - function should never return */

+}

+

+

+static int _XPrintDefaultError(

+    Display *dpy,

+    XErrorEvent *event,

+    FILE *fp)

+{

+    char buffer[BUFSIZ];

+    char mesg[BUFSIZ];

+    char number[32];

+    const char *mtype = "XlibMessage";

+    register _XExtension *ext = (_XExtension *)NULL;

+    _XExtension *bext = (_XExtension *)NULL;

+    XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);

+    XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);

+    (void) fprintf(fp, "%s:  %s\n  ", mesg, buffer);

+    XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d",

+	mesg, BUFSIZ);

+    (void) fprintf(fp, mesg, event->request_code);

+    if (event->request_code < 128) {

+	sprintf(number, "%d", event->request_code);

+	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);

+    } else {

+	for (ext = dpy->ext_procs;

+	     ext && (ext->codes.major_opcode != event->request_code);

+	     ext = ext->next)

+	  ;

+	if (ext) {

+	    strncpy(buffer, ext->name, BUFSIZ);

+	    buffer[BUFSIZ - 1] = '\0';

+        } else

+	    buffer[0] = '\0';

+    }

+    (void) fprintf(fp, " (%s)\n", buffer);

+    if (event->request_code >= 128) {

+	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",

+			      mesg, BUFSIZ);

+	fputs("  ", fp);

+	(void) fprintf(fp, mesg, event->minor_code);

+	if (ext) {

+	    sprintf(mesg, "%s.%d", ext->name, event->minor_code);

+	    XGetErrorDatabaseText(dpy, "XRequest", mesg, "", buffer, BUFSIZ);

+	    (void) fprintf(fp, " (%s)", buffer);

+	}

+	fputs("\n", fp);

+    }

+    if (event->error_code >= 128) {

+	/* kludge, try to find the extension that caused it */

+	buffer[0] = '\0';

+	for (ext = dpy->ext_procs; ext; ext = ext->next) {

+	    if (ext->error_string)

+		(*ext->error_string)(dpy, event->error_code, &ext->codes,

+				     buffer, BUFSIZ);

+	    if (buffer[0]) {

+		bext = ext;

+		break;

+	    }

+	    if (ext->codes.first_error &&

+		ext->codes.first_error < (int)event->error_code &&

+		(!bext || ext->codes.first_error > bext->codes.first_error))

+		bext = ext;

+	}

+	if (bext)

+	    sprintf(buffer, "%s.%d", bext->name,

+		    event->error_code - bext->codes.first_error);

+	else

+	    strcpy(buffer, "Value");

+	XGetErrorDatabaseText(dpy, mtype, buffer, "", mesg, BUFSIZ);

+	if (mesg[0]) {

+	    fputs("  ", fp);

+	    (void) fprintf(fp, mesg, event->resourceid);

+	    fputs("\n", fp);

+	}

+	/* let extensions try to print the values */

+	for (ext = dpy->ext_procs; ext; ext = ext->next) {

+	    if (ext->error_values)

+		(*ext->error_values)(dpy, event, fp);

+	}

+    } else if ((event->error_code == BadWindow) ||

+	       (event->error_code == BadPixmap) ||

+	       (event->error_code == BadCursor) ||

+	       (event->error_code == BadFont) ||

+	       (event->error_code == BadDrawable) ||

+	       (event->error_code == BadColor) ||

+	       (event->error_code == BadGC) ||

+	       (event->error_code == BadIDChoice) ||

+	       (event->error_code == BadValue) ||

+	       (event->error_code == BadAtom)) {

+	if (event->error_code == BadValue)

+	    XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",

+				  mesg, BUFSIZ);

+	else if (event->error_code == BadAtom)

+	    XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",

+				  mesg, BUFSIZ);

+	else

+	    XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",

+				  mesg, BUFSIZ);

+	fputs("  ", fp);

+	(void) fprintf(fp, mesg, event->resourceid);

+	fputs("\n", fp);

+    }

+    XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",

+			  mesg, BUFSIZ);

+    fputs("  ", fp);

+    (void) fprintf(fp, mesg, event->serial);

+    XGetErrorDatabaseText(dpy, mtype, "CurrentSerial", "Current Serial #%d",

+			  mesg, BUFSIZ);

+    fputs("\n  ", fp);

+    (void) fprintf(fp, mesg, dpy->request);

+    fputs("\n", fp);

+    if (event->error_code == BadImplementation) return 0;

+    return 1;

+}

+

+int _XDefaultError(

+	Display *dpy,

+	XErrorEvent *event)

+{

+    if (_XPrintDefaultError (dpy, event, stderr) == 0) return 0;

+    exit(1);

+    /*NOTREACHED*/

+}

+

+/*ARGSUSED*/

+Bool _XDefaultWireError(Display *display, XErrorEvent *he, xError *we)

+{

+    return True;

+}

+

+/*

+ * _XError - upcall internal or user protocol error handler

+ */

+int _XError (

+    Display *dpy,

+    register xError *rep)

+{

+    /*

+     * X_Error packet encountered!  We need to unpack the error before

+     * giving it to the user.

+     */

+    XEvent event; /* make it a large event */

+    register _XAsyncHandler *async, *next;

+

+    event.xerror.serial = _XSetLastRequestRead(dpy, (xGenericReply *)rep);

+

+    for (async = dpy->async_handlers; async; async = next) {

+	next = async->next;

+	if ((*async->handler)(dpy, (xReply *)rep,

+			      (char *)rep, SIZEOF(xError), async->data))

+	    return 0;

+    }

+

+    event.xerror.display = dpy;

+    event.xerror.type = X_Error;

+    event.xerror.resourceid = rep->resourceID;

+    event.xerror.error_code = rep->errorCode;

+    event.xerror.request_code = rep->majorCode;

+    event.xerror.minor_code = rep->minorCode;

+    if (dpy->error_vec &&

+	!(*dpy->error_vec[rep->errorCode])(dpy, &event.xerror, rep))

+	return 0;

+    if (_XErrorFunction != NULL) {

+	int rtn_val;

+#ifdef XTHREADS

+	if (dpy->lock)

+	    (*dpy->lock->user_lock_display)(dpy);

+	UnlockDisplay(dpy);

+#endif

+	rtn_val = (*_XErrorFunction)(dpy, (XErrorEvent *)&event); /* upcall */

+#ifdef XTHREADS

+	LockDisplay(dpy);

+	if (dpy->lock)

+	    (*dpy->lock->user_unlock_display)(dpy);

+#endif

+	return rtn_val;

+    } else {

+	return _XDefaultError(dpy, (XErrorEvent *)&event);

+    }

+}

+

+/*

+ * _XIOError - call user connection error handler and exit

+ */

+int

+_XIOError (

+    Display *dpy)

+{

+    dpy->flags |= XlibDisplayIOError;

+#ifdef WIN32

+    errno = WSAGetLastError();

+#endif

+

+    /* This assumes that the thread calling exit will call any atexit handlers.

+     * If this does not hold, then an alternate solution would involve

+     * registering an atexit handler to take over the lock, which would only

+     * assume that the same thread calls all the atexit handlers. */

+#ifdef XTHREADS

+    if (dpy->lock)

+	(*dpy->lock->user_lock_display)(dpy);

+#endif

+    UnlockDisplay(dpy);

+

+    if (_XIOErrorFunction != NULL)

+	(*_XIOErrorFunction)(dpy);

+    else

+	_XDefaultIOError(dpy);

+    exit (1);

+    return 0;

+}

+

+

+/*

+ * This routine can be used to (cheaply) get some memory within a single

+ * Xlib routine for scratch space.  A single buffer is reused each time

+ * if possible.  To be MT safe, you can only call this between a call to

+ * GetReq* and a call to Data* or _XSend*, or in a context when the thread

+ * is guaranteed to not unlock the display.

+ */

+char *_XAllocScratch(

+	register Display *dpy,

+	unsigned long nbytes)

+{

+	if (nbytes > dpy->scratch_length) {

+	    if (dpy->scratch_buffer) Xfree (dpy->scratch_buffer);

+	    if ((dpy->scratch_buffer = Xmalloc((unsigned) nbytes)))

+		dpy->scratch_length = nbytes;

+	    else dpy->scratch_length = 0;

+	}

+	return (dpy->scratch_buffer);

+}

+

+/*

+ * Scratch space allocator you can call any time, multiple times, and be

+ * MT safe, but you must hand the buffer back with _XFreeTemp.

+ */

+char *_XAllocTemp(

+    register Display *dpy,

+    unsigned long nbytes)

+{

+    char *buf;

+

+    buf = _XAllocScratch(dpy, nbytes);

+    dpy->scratch_buffer = NULL;

+    dpy->scratch_length = 0;

+    return buf;

+}

+

+void _XFreeTemp(

+    register Display *dpy,

+    char *buf,

+    unsigned long nbytes)

+{

+    if (dpy->scratch_buffer)

+	Xfree(dpy->scratch_buffer);

+    dpy->scratch_buffer = buf;

+    dpy->scratch_length = nbytes;

+}

+

+/*

+ * Given a visual id, find the visual structure for this id on this display.

+ */

+Visual *_XVIDtoVisual(

+	Display *dpy,

+	VisualID id)

+{

+	register int i, j, k;

+	register Screen *sp;

+	register Depth *dp;

+	register Visual *vp;

+	for (i = 0; i < dpy->nscreens; i++) {

+		sp = &dpy->screens[i];

+		for (j = 0; j < sp->ndepths; j++) {

+			dp = &sp->depths[j];

+			/* if nvisuals == 0 then visuals will be NULL */

+			for (k = 0; k < dp->nvisuals; k++) {

+				vp = &dp->visuals[k];

+				if (vp->visualid == id) return (vp);

+			}

+		}

+	}

+	return (NULL);

+}

+

+int

+XFree (void *data)

+{

+	Xfree (data);

+	return 1;

+}

+

+#ifdef _XNEEDBCOPYFUNC

+void _Xbcopy(b1, b2, length)

+    register char *b1, *b2;

+    register length;

+{

+    if (b1 < b2) {

+	b2 += length;

+	b1 += length;

+	while (length--)

+	    *--b2 = *--b1;

+    } else {

+	while (length--)

+	    *b2++ = *b1++;

+    }

+}

+#endif

+

+#ifdef DataRoutineIsProcedure

+void Data(

+	Display *dpy,

+	char *data,

+	long len)

+{

+	if (dpy->bufptr + (len) <= dpy->bufmax) {

+		memcpy(dpy->bufptr, data, (int)len);

+		dpy->bufptr += ((len) + 3) & ~3;

+	} else {

+		_XSend(dpy, data, len);

+	}

+}

+#endif /* DataRoutineIsProcedure */

+

+

+#ifdef LONG64

+int

+_XData32(

+    Display *dpy,

+    register long *data,

+    unsigned len)

+{

+    register int *buf;

+    register long i;

+

+    while (len) {

+	buf = (int *)dpy->bufptr;

+	i = dpy->bufmax - (char *)buf;

+	if (!i) {

+	    _XFlush(dpy);

+	    continue;

+	}

+	if (len < i)

+	    i = len;

+	dpy->bufptr = (char *)buf + i;

+	len -= i;

+	i >>= 2;

+	while (--i >= 0)

+	    *buf++ = *data++;

+    }

+    return 0;

+}

+#endif /* LONG64 */

+

+#ifdef WORD64

+

+/*

+ * XXX This is a *really* stupid way of doing this.  It should just use

+ * dpy->bufptr directly, taking into account where in the word it is.

+ */

+

+/*

+ * Data16 - Place 16 bit data in the buffer.

+ *

+ * "dpy" is a pointer to a Display.

+ * "data" is a pointer to the data.

+ * "len" is the length in bytes of the data.

+ */

+

+static doData16(

+    register Display *dpy,

+    short *data,

+    unsigned len,

+    char *packbuffer)

+{

+    long *lp,*lpack;

+    long i, nwords,bits;

+    long mask16 = 0x000000000000ffff;

+

+        lp = (long *)data;

+        lpack = (long *)packbuffer;

+

+/*  nwords is the number of 16 bit values to be packed,

+ *  the low order 16 bits of each word will be packed

+ *  into 64 bit words

+ */

+        nwords = len >> 1;

+        bits = 48;

+

+        for(i=0;i<nwords;i++){

+	   if (bits == 48) *lpack = 0;

+           *lpack ^= (*lp & mask16) << bits;

+           bits -= 16 ;

+           lp++;

+           if(bits < 0){

+               lpack++;

+               bits = 48;

+           }

+        }

+        Data(dpy, packbuffer, len);

+}

+

+_XData16 (

+    Display *dpy,

+    short *data,

+    unsigned len)

+{

+    char packbuffer[PACKBUFFERSIZE];

+    unsigned nunits = PACKBUFFERSIZE >> 1;

+

+    for (; len > PACKBUFFERSIZE; len -= PACKBUFFERSIZE, data += nunits) {

+	doData16 (dpy, data, PACKBUFFERSIZE, packbuffer);

+    }

+    if (len) doData16 (dpy, data, len, packbuffer);

+}

+

+/*

+ * Data32 - Place 32 bit data in the buffer.

+ *

+ * "dpy" is a pointer to a Display.

+ * "data" is a pointer to the data.

+ * "len" is the length in bytes of the data.

+ */

+

+static doData32(

+    register Display *dpy

+    long *data,

+    unsigned len,

+    char *packbuffer)

+{

+    long *lp,*lpack;

+    long i,bits,nwords;

+    long mask32 = 0x00000000ffffffff;

+

+        lpack = (long *) packbuffer;

+        lp = data;

+

+/*  nwords is the number of 32 bit values to be packed

+ *  the low order 32 bits of each word will be packed

+ *  into 64 bit words

+ */

+        nwords = len >> 2;

+        bits = 32;

+

+        for(i=0;i<nwords;i++){

+	   if (bits == 32) *lpack = 0;

+           *lpack ^= (*lp & mask32) << bits;

+           bits = bits ^32;

+           lp++;

+           if(bits)

+              lpack++;

+        }

+        Data(dpy, packbuffer, len);

+}

+

+void _XData32(

+    Display *dpy,

+    long *data,

+    unsigned len)

+{

+    char packbuffer[PACKBUFFERSIZE];

+    unsigned nunits = PACKBUFFERSIZE >> 2;

+

+    for (; len > PACKBUFFERSIZE; len -= PACKBUFFERSIZE, data += nunits) {

+	doData32 (dpy, data, PACKBUFFERSIZE, packbuffer);

+    }

+    if (len) doData32 (dpy, data, len, packbuffer);

+}

+

+#endif /* WORD64 */

+

+

+/* Make sure this produces the same string as DefineLocal/DefineSelf in xdm.

+ * Otherwise, Xau will not be able to find your cookies in the Xauthority file.

+ *

+ * Note: POSIX says that the ``nodename'' member of utsname does _not_ have

+ *       to have sufficient information for interfacing to the network,

+ *       and so, you may be better off using gethostname (if it exists).

+ */

+

+#if (defined(_POSIX_SOURCE) && !defined(AIXV3) && !defined(__QNX__)) || defined(hpux) || defined(SVR4)

+#define NEED_UTSNAME

+#include <sys/utsname.h>

+#else

+#ifdef HAVE_UNISTD_H

+#include <unistd.h>

+#endif

+#endif

+

+/*

+ * _XGetHostname - similar to gethostname but allows special processing.

+ */

+int _XGetHostname (

+    char *buf,

+    int maxlen)

+{

+    int len;

+

+#ifdef NEED_UTSNAME

+    struct utsname name;

+

+    if (maxlen <= 0 || buf == NULL)

+	return 0;

+

+    uname (&name);

+    len = strlen (name.nodename);

+    if (len >= maxlen) len = maxlen - 1;

+    strncpy (buf, name.nodename, len);

+    buf[len] = '\0';

+#else

+    if (maxlen <= 0 || buf == NULL)

+	return 0;

+

+    buf[0] = '\0';

+    (void) gethostname (buf, maxlen);

+    buf [maxlen - 1] = '\0';

+    len = strlen(buf);

+#endif /* NEED_UTSNAME */

+    return len;

+}

+

+

+/*

+ * _XScreenOfWindow - get the Screen of a given window

+ */

+

+Screen *_XScreenOfWindow(Display *dpy, Window w)

+{

+    register int i;

+    Window root;

+    int x, y;				/* dummy variables */

+    unsigned int width, height, bw, depth;  /* dummy variables */

+

+    if (XGetGeometry (dpy, w, &root, &x, &y, &width, &height,

+		      &bw, &depth) == False) {

+	return NULL;

+    }

+    for (i = 0; i < ScreenCount (dpy); i++) {	/* find root from list */

+	if (root == RootWindow (dpy, i)) {

+	    return ScreenOfDisplay (dpy, i);

+	}

+    }

+    return NULL;

+}

+

+

+#if defined(WIN32)

+

+/*

+ * These functions are intended to be used internally to Xlib only.

+ * These functions will always prefix the path with a DOS drive in the

+ * form "<drive-letter>:". As such, these functions are only suitable

+ * for use by Xlib function that supply a root-based path to some

+ * particular file, e.g. <ProjectRoot>/lib/X11/locale/locale.dir will

+ * be converted to "C:/usr/X11R6.3/lib/X11/locale/locale.dir".

+ */

+

+static int access_file (path, pathbuf, len_pathbuf, pathret)

+    char* path;

+    char* pathbuf;

+    int len_pathbuf;

+    char** pathret;

+{

+    if (access (path, F_OK) == 0) {

+	if (strlen (path) < len_pathbuf)

+	    *pathret = pathbuf;

+	else

+	    *pathret = Xmalloc (strlen (path) + 1);

+	if (*pathret) {

+	    strcpy (*pathret, path);

+	    return 1;

+	}

+    }

+    return 0;

+}

+

+static int AccessFile (path, pathbuf, len_pathbuf, pathret)

+    char* path;

+    char* pathbuf;

+    int len_pathbuf;

+    char** pathret;

+{

+    unsigned long drives;

+    int i, len;

+    char* drive;

+    char buf[MAX_PATH];

+    char* bufp;

+

+    /* just try the "raw" name first and see if it works */

+    if (access_file (path, pathbuf, len_pathbuf, pathret))

+	return 1;

+

+    /* try the places set in the environment */

+    drive = getenv ("_XBASEDRIVE");

+#ifdef __UNIXOS2__

+    if (!drive)

+	drive = getenv ("X11ROOT");

+#endif

+    if (!drive)

+	drive = "C:";

+    len = strlen (drive) + strlen (path);

+    if (len < MAX_PATH) bufp = buf;

+    else bufp = Xmalloc (len + 1);

+    strcpy (bufp, drive);

+    strcat (bufp, path);

+    if (access_file (bufp, pathbuf, len_pathbuf, pathret)) {

+	if (bufp != buf) Xfree (bufp);

+	return 1;

+    }

+

+#ifndef __UNIXOS2__

+    /* one last place to look */

+    drive = getenv ("HOMEDRIVE");

+    if (drive) {

+	len = strlen (drive) + strlen (path);

+	if (len < MAX_PATH) bufp = buf;

+	else bufp = Xmalloc (len + 1);

+	strcpy (bufp, drive);

+	strcat (bufp, path);

+	if (access_file (bufp, pathbuf, len_pathbuf, pathret)) {

+	    if (bufp != buf) Xfree (bufp);

+	    return 1;

+	}

+    }

+

+    /* tried everywhere else, go fishing */

+#define C_DRIVE ('C' - 'A')

+#define Z_DRIVE ('Z' - 'A')

+    /* does OS/2 (with or with gcc-emx) have getdrives? */

+    drives = _getdrives ();

+    for (i = C_DRIVE; i <= Z_DRIVE; i++) { /* don't check on A: or B: */

+	if ((1 << i) & drives) {

+	    len = 2 + strlen (path);

+	    if (len < MAX_PATH) bufp = buf;

+	    else bufp = Xmalloc (len + 1);

+	    *bufp = 'A' + i;

+	    *(bufp + 1) = ':';

+	    *(bufp + 2) = '\0';

+	    strcat (bufp, path);

+	    if (access_file (bufp, pathbuf, len_pathbuf, pathret)) {

+		if (bufp != buf) Xfree (bufp);

+		return 1;

+	    }

+	}

+    }

+#endif

+    return 0;

+}

+

+int _XOpenFile(path, flags)

+    _Xconst char* path;

+    int flags;

+{

+    char buf[MAX_PATH];

+    char* bufp = NULL;

+    int ret = -1;

+    UINT olderror = SetErrorMode (SEM_FAILCRITICALERRORS);

+

+    if (AccessFile (path, buf, MAX_PATH, &bufp))

+	ret = open (bufp, flags);

+

+    (void) SetErrorMode (olderror);

+

+    if (bufp != buf) Xfree (bufp);

+

+    return ret;

+}

+

+int _XOpenFileMode(path, flags, mode)

+    _Xconst char* path;

+    int flags;

+    mode_t mode;

+{

+    char buf[MAX_PATH];

+    char* bufp = NULL;

+    int ret = -1;

+    UINT olderror = SetErrorMode (SEM_FAILCRITICALERRORS);

+

+    if (AccessFile (path, buf, MAX_PATH, &bufp))

+	ret = open (bufp, flags, mode);

+

+    (void) SetErrorMode (olderror);

+

+    if (bufp != buf) Xfree (bufp);

+

+    return ret;

+}

+

+void* _XFopenFile(path, mode)

+    _Xconst char* path;

+    _Xconst char* mode;

+{

+    char buf[MAX_PATH];

+    char* bufp = NULL;

+    void* ret = NULL;

+    UINT olderror = SetErrorMode (SEM_FAILCRITICALERRORS);

+

+    if (AccessFile (path, buf, MAX_PATH, &bufp))

+	ret = fopen (bufp, mode);

+

+    (void) SetErrorMode (olderror);

+

+    if (bufp != buf) Xfree (bufp);

+

+    return ret;

+}

+

+int _XAccessFile(path)

+    _Xconst char* path;

+{

+    char buf[MAX_PATH];

+    char* bufp;

+    int ret = -1;

+    UINT olderror = SetErrorMode (SEM_FAILCRITICALERRORS);

+

+    ret = AccessFile (path, buf, MAX_PATH, &bufp);

+

+    (void) SetErrorMode (olderror);

+

+    if (bufp != buf) Xfree (bufp);

+

+    return ret;

+}

+

+#endif

+

+#ifdef WIN32

+#undef _Xdebug

+int _Xdebug = 0;

+int *_Xdebug_p = &_Xdebug;

+void (**_XCreateMutex_fn_p)(LockInfoPtr) = &_XCreateMutex_fn;

+void (**_XFreeMutex_fn_p)(LockInfoPtr) = &_XFreeMutex_fn;

+void (**_XLockMutex_fn_p)(LockInfoPtr

+#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)

+    , char * /* file */

+    , int /* line */

+#endif

+        ) = &_XLockMutex_fn;

+void (**_XUnlockMutex_fn_p)(LockInfoPtr

+#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)

+    , char * /* file */

+    , int /* line */

+#endif

+        ) = &_XUnlockMutex_fn;

+LockInfoPtr *_Xglobal_lock_p = &_Xglobal_lock;

+#endif

diff --git a/mesalib/src/glsl/Makefile b/mesalib/src/glsl/Makefile
index 8059bb472..b63307f53 100644
--- a/mesalib/src/glsl/Makefile
+++ b/mesalib/src/glsl/Makefile
@@ -204,7 +204,7 @@ glcpp/glcpp-parse.c: glcpp/glcpp-parse.y
 	bison -v -o "$@" --defines=glcpp/glcpp-parse.h $<

 

 builtin_compiler: $(GLSL2_OBJECTS) $(OBJECTS) builtin_stubs.o

-	$(APP_CXX) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(GLSL2_OBJECTS) builtin_stubs.o -o $@

+	$(APP_CXX) $(INCLUDES) $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(GLSL2_OBJECTS) builtin_stubs.o -o $@

 

 builtin_function.cpp: builtins/profiles/* builtins/ir/* builtins/tools/generate_builtins.py builtins/tools/texture_builtins.py builtin_compiler

 	@echo Regenerating builtin_function.cpp...

diff --git a/mesalib/src/glsl/ast_to_hir.cpp b/mesalib/src/glsl/ast_to_hir.cpp
index b8a812d94..344d76b57 100644
--- a/mesalib/src/glsl/ast_to_hir.cpp
+++ b/mesalib/src/glsl/ast_to_hir.cpp
@@ -603,7 +603,8 @@ shift_result_type(const struct glsl_type *type_a,
  */

 ir_rvalue *

 validate_assignment(struct _mesa_glsl_parse_state *state,

-		    const glsl_type *lhs_type, ir_rvalue *rhs)

+		    const glsl_type *lhs_type, ir_rvalue *rhs,

+		    bool is_initializer)

 {

    /* If there is already some error in the RHS, just return it.  Anything

     * else will lead to an avalanche of error message back to the user.

@@ -617,12 +618,13 @@ validate_assignment(struct _mesa_glsl_parse_state *state,
       return rhs;

 

    /* If the array element types are the same and the size of the LHS is zero,

-    * the assignment is okay.

+    * the assignment is okay for initializers embedded in variable

+    * declarations.

     *

     * Note: Whole-array assignments are not permitted in GLSL 1.10, but this

     * is handled by ir_dereference::is_lvalue.

     */

-   if (lhs_type->is_array() && rhs->type->is_array()

+   if (is_initializer && lhs_type->is_array() && rhs->type->is_array()

        && (lhs_type->element_type() == rhs->type->element_type())

        && (lhs_type->array_size() == 0)) {

       return rhs;

@@ -639,7 +641,7 @@ validate_assignment(struct _mesa_glsl_parse_state *state,
 

 ir_rvalue *

 do_assignment(exec_list *instructions, struct _mesa_glsl_parse_state *state,

-	      ir_rvalue *lhs, ir_rvalue *rhs,

+	      ir_rvalue *lhs, ir_rvalue *rhs, bool is_initializer,

 	      YYLTYPE lhs_loc)

 {

    void *ctx = state;

@@ -665,7 +667,8 @@ do_assignment(exec_list *instructions, struct _mesa_glsl_parse_state *state,
       }

    }

 

-   ir_rvalue *new_rhs = validate_assignment(state, lhs->type, rhs);

+   ir_rvalue *new_rhs =

+      validate_assignment(state, lhs->type, rhs, is_initializer);

    if (new_rhs == NULL) {

       _mesa_glsl_error(& lhs_loc, state, "type mismatch");

    } else {

@@ -918,7 +921,7 @@ ast_expression::hir(exec_list *instructions,
       op[0] = this->subexpressions[0]->hir(instructions, state);

       op[1] = this->subexpressions[1]->hir(instructions, state);

 

-      result = do_assignment(instructions, state, op[0], op[1],

+      result = do_assignment(instructions, state, op[0], op[1], false,

 			     this->subexpressions[0]->get_location());

       error_emitted = result->type->is_error();

       type = result->type;

@@ -1245,7 +1248,7 @@ ast_expression::hir(exec_list *instructions,
 						   op[0], op[1]);

 

       result = do_assignment(instructions, state,

-			     op[0]->clone(ctx, NULL), temp_rhs,

+			     op[0]->clone(ctx, NULL), temp_rhs, false,

 			     this->subexpressions[0]->get_location());

       type = result->type;

       error_emitted = (op[0]->type->is_error());

@@ -1271,7 +1274,7 @@ ast_expression::hir(exec_list *instructions,
 					op[0], op[1]);

 

       result = do_assignment(instructions, state,

-			     op[0]->clone(ctx, NULL), temp_rhs,

+			     op[0]->clone(ctx, NULL), temp_rhs, false,

 			     this->subexpressions[0]->get_location());

       type = result->type;

       error_emitted = type->is_error();

@@ -1287,7 +1290,7 @@ ast_expression::hir(exec_list *instructions,
       ir_rvalue *temp_rhs = new(ctx) ir_expression(operations[this->oper],

                                                    type, op[0], op[1]);

       result = do_assignment(instructions, state, op[0]->clone(ctx, NULL),

-                             temp_rhs,

+                             temp_rhs, false,

                              this->subexpressions[0]->get_location());

       error_emitted = op[0]->type->is_error() || op[1]->type->is_error();

       break;

@@ -1303,7 +1306,7 @@ ast_expression::hir(exec_list *instructions,
       ir_rvalue *temp_rhs = new(ctx) ir_expression(operations[this->oper],

                                                    type, op[0], op[1]);

       result = do_assignment(instructions, state, op[0]->clone(ctx, NULL),

-                             temp_rhs,

+                             temp_rhs, false,

                              this->subexpressions[0]->get_location());

       error_emitted = op[0]->type->is_error() || op[1]->type->is_error();

       break;

@@ -1419,7 +1422,7 @@ ast_expression::hir(exec_list *instructions,
 					op[0], op[1]);

 

       result = do_assignment(instructions, state,

-			     op[0]->clone(ctx, NULL), temp_rhs,

+			     op[0]->clone(ctx, NULL), temp_rhs, false,

 			     this->subexpressions[0]->get_location());

       type = result->type;

       error_emitted = op[0]->type->is_error();

@@ -1448,7 +1451,7 @@ ast_expression::hir(exec_list *instructions,
       result = get_lvalue_copy(instructions, op[0]->clone(ctx, NULL));

 

       (void)do_assignment(instructions, state,

-			  op[0]->clone(ctx, NULL), temp_rhs,

+			  op[0]->clone(ctx, NULL), temp_rhs, false,

 			  this->subexpressions[0]->get_location());

 

       type = result->type;

@@ -2234,7 +2237,7 @@ process_initializer(ir_variable *var, ast_declaration *decl,
     */

    if (type->qualifier.flags.q.constant

        || type->qualifier.flags.q.uniform) {

-      ir_rvalue *new_rhs = validate_assignment(state, var->type, rhs);

+      ir_rvalue *new_rhs = validate_assignment(state, var->type, rhs, true);

       if (new_rhs != NULL) {

 	 rhs = new_rhs;

 

@@ -2276,7 +2279,7 @@ process_initializer(ir_variable *var, ast_declaration *decl,
       const glsl_type *initializer_type;

       if (!type->qualifier.flags.q.uniform) {

 	 result = do_assignment(initializer_instructions, state,

-				lhs, rhs,

+				lhs, rhs, true,

 				type->get_location());

 	 initializer_type = result->type;

       } else

diff --git a/mesalib/src/glsl/glsl_symbol_table.cpp b/mesalib/src/glsl/glsl_symbol_table.cpp
index 9714384eb..fa6458df5 100644
--- a/mesalib/src/glsl/glsl_symbol_table.cpp
+++ b/mesalib/src/glsl/glsl_symbol_table.cpp
@@ -1,168 +1,169 @@
-/* -*- c++ -*- */
-/*
- * Copyright © 2010 Intel Corporation
- *
- * 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 (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 NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS 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 "glsl_symbol_table.h"
-
-class symbol_table_entry {
-public:
-   /* Callers of this ralloc-based new need not call delete. It's
-    * easier to just ralloc_free 'ctx' (or any of its ancestors). */
-   static void* operator new(size_t size, void *ctx)
-   {
-      void *entry = ralloc_size(ctx, size);
-      assert(entry != NULL);
-      return entry;
-   }
-
-   /* If the user *does* call delete, that's OK, we will just ralloc_free. */
-   static void operator delete(void *entry, void *ctx)
-   {
-      ralloc_free(entry);
-   }
-   static void operator delete(void *entry)
-   {
-      ralloc_free(entry);
-   }
-
-   symbol_table_entry(ir_variable *v)                     : v(v), f(0), t(0) {}
-   symbol_table_entry(ir_function *f)                     : v(0), f(f), t(0) {}
-   symbol_table_entry(const glsl_type *t)                 : v(0), f(0), t(t) {}
-
-   ir_variable *v;
-   ir_function *f;
-   const glsl_type *t;
-};
-
-glsl_symbol_table::glsl_symbol_table()
-{
-   this->language_version = 120;
-   this->table = _mesa_symbol_table_ctor();
-   this->mem_ctx = ralloc_context(NULL);
-}
-
-glsl_symbol_table::~glsl_symbol_table()
-{
-   _mesa_symbol_table_dtor(table);
-   ralloc_free(mem_ctx);
-}
-
-void glsl_symbol_table::push_scope()
-{
-   _mesa_symbol_table_push_scope(table);
-}
-
-void glsl_symbol_table::pop_scope()
-{
-   _mesa_symbol_table_pop_scope(table);
-}
-
-bool glsl_symbol_table::name_declared_this_scope(const char *name)
-{
-   return _mesa_symbol_table_symbol_scope(table, -1, name) == 0;
-}
-
-bool glsl_symbol_table::add_variable(ir_variable *v)
-{
-   if (this->language_version == 110) {
-      /* In 1.10, functions and variables have separate namespaces. */
-      symbol_table_entry *existing = get_entry(v->name);
-      if (name_declared_this_scope(v->name)) {
-	 /* If there's already an existing function (not a constructor!) in
-	  * the current scope, just update the existing entry to include 'v'.
-	  */
-	 if (existing->v == NULL && existing->t == NULL) {
-	    existing->v = v;
-	    return true;
-	 }
-      } else {
-	 /* If not declared at this scope, add a new entry.  But if an existing
-	  * entry includes a function, propagate that to this block - otherwise
-	  * the new variable declaration would shadow the function.
-	  */
-	 symbol_table_entry *entry = new(mem_ctx) symbol_table_entry(v);
-	 if (existing != NULL)
-	    entry->f = existing->f;
-	 int added = _mesa_symbol_table_add_symbol(table, -1, v->name, entry);
-	 assert(added == 0);
-	 (void)added;
-	 return true;
-      }
-      return false;
-   }
-
-   /* 1.20+ rules: */
-   symbol_table_entry *entry = new(mem_ctx) symbol_table_entry(v);
-   return _mesa_symbol_table_add_symbol(table, -1, v->name, entry) == 0;
-}
-
-bool glsl_symbol_table::add_type(const char *name, const glsl_type *t)
-{
-   symbol_table_entry *entry = new(mem_ctx) symbol_table_entry(t);
-   return _mesa_symbol_table_add_symbol(table, -1, name, entry) == 0;
-}
-
-bool glsl_symbol_table::add_function(ir_function *f)
-{
-   if (this->language_version == 110 && name_declared_this_scope(f->name)) {
-      /* In 1.10, functions and variables have separate namespaces. */
-      symbol_table_entry *existing = get_entry(f->name);
-      if ((existing->f == NULL) && (existing->t == NULL)) {
-	 existing->f = f;
-	 return true;
-      }
-   }
-   symbol_table_entry *entry = new(mem_ctx) symbol_table_entry(f);
-   return _mesa_symbol_table_add_symbol(table, -1, f->name, entry) == 0;
-}
-
-void glsl_symbol_table::add_global_function(ir_function *f)
-{
-   symbol_table_entry *entry = new(mem_ctx) symbol_table_entry(f);
-   int added = _mesa_symbol_table_add_global_symbol(table, -1, f->name, entry);
-   assert(added == 0);
-}
-
-ir_variable *glsl_symbol_table::get_variable(const char *name)
-{
-   symbol_table_entry *entry = get_entry(name);
-   return entry != NULL ? entry->v : NULL;
-}
-
-const glsl_type *glsl_symbol_table::get_type(const char *name)
-{
-   symbol_table_entry *entry = get_entry(name);
-   return entry != NULL ? entry->t : NULL;
-}
-
-ir_function *glsl_symbol_table::get_function(const char *name)
-{
-   symbol_table_entry *entry = get_entry(name);
-   return entry != NULL ? entry->f : NULL;
-}
-
-symbol_table_entry *glsl_symbol_table::get_entry(const char *name)
-{
-   return (symbol_table_entry *)
-      _mesa_symbol_table_find_symbol(table, -1, name);
-}
+/* -*- c++ -*- */

+/*

+ * Copyright © 2010 Intel Corporation

+ *

+ * 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 (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 NONINFRINGEMENT.  IN NO EVENT SHALL

+ * THE AUTHORS OR COPYRIGHT HOLDERS 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 "glsl_symbol_table.h"

+

+class symbol_table_entry {

+public:

+   /* Callers of this ralloc-based new need not call delete. It's

+    * easier to just ralloc_free 'ctx' (or any of its ancestors). */

+   static void* operator new(size_t size, void *ctx)

+   {

+      void *entry = ralloc_size(ctx, size);

+      assert(entry != NULL);

+      return entry;

+   }

+

+   /* If the user *does* call delete, that's OK, we will just ralloc_free. */

+   static void operator delete(void *entry, void *ctx)

+   {

+      ralloc_free(entry);

+   }

+   static void operator delete(void *entry)

+   {

+      ralloc_free(entry);

+   }

+

+   symbol_table_entry(ir_variable *v)                     : v(v), f(0), t(0) {}

+   symbol_table_entry(ir_function *f)                     : v(0), f(f), t(0) {}

+   symbol_table_entry(const glsl_type *t)                 : v(0), f(0), t(t) {}

+

+   ir_variable *v;

+   ir_function *f;

+   const glsl_type *t;

+};

+

+glsl_symbol_table::glsl_symbol_table()

+{

+   this->language_version = 120;

+   this->table = _mesa_symbol_table_ctor();

+   this->mem_ctx = ralloc_context(NULL);

+}

+

+glsl_symbol_table::~glsl_symbol_table()

+{

+   _mesa_symbol_table_dtor(table);

+   ralloc_free(mem_ctx);

+}

+

+void glsl_symbol_table::push_scope()

+{

+   _mesa_symbol_table_push_scope(table);

+}

+

+void glsl_symbol_table::pop_scope()

+{

+   _mesa_symbol_table_pop_scope(table);

+}

+

+bool glsl_symbol_table::name_declared_this_scope(const char *name)

+{

+   return _mesa_symbol_table_symbol_scope(table, -1, name) == 0;

+}

+

+bool glsl_symbol_table::add_variable(ir_variable *v)

+{

+   if (this->language_version == 110) {

+      /* In 1.10, functions and variables have separate namespaces. */

+      symbol_table_entry *existing = get_entry(v->name);

+      if (name_declared_this_scope(v->name)) {

+	 /* If there's already an existing function (not a constructor!) in

+	  * the current scope, just update the existing entry to include 'v'.

+	  */

+	 if (existing->v == NULL && existing->t == NULL) {

+	    existing->v = v;

+	    return true;

+	 }

+      } else {

+	 /* If not declared at this scope, add a new entry.  But if an existing

+	  * entry includes a function, propagate that to this block - otherwise

+	  * the new variable declaration would shadow the function.

+	  */

+	 symbol_table_entry *entry = new(mem_ctx) symbol_table_entry(v);

+	 if (existing != NULL)

+	    entry->f = existing->f;

+	 int added = _mesa_symbol_table_add_symbol(table, -1, v->name, entry);

+	 assert(added == 0);

+	 (void)added;

+	 return true;

+      }

+      return false;

+   }

+

+   /* 1.20+ rules: */

+   symbol_table_entry *entry = new(mem_ctx) symbol_table_entry(v);

+   return _mesa_symbol_table_add_symbol(table, -1, v->name, entry) == 0;

+}

+

+bool glsl_symbol_table::add_type(const char *name, const glsl_type *t)

+{

+   symbol_table_entry *entry = new(mem_ctx) symbol_table_entry(t);

+   return _mesa_symbol_table_add_symbol(table, -1, name, entry) == 0;

+}

+

+bool glsl_symbol_table::add_function(ir_function *f)

+{

+   if (this->language_version == 110 && name_declared_this_scope(f->name)) {

+      /* In 1.10, functions and variables have separate namespaces. */

+      symbol_table_entry *existing = get_entry(f->name);

+      if ((existing->f == NULL) && (existing->t == NULL)) {

+	 existing->f = f;

+	 return true;

+      }

+   }

+   symbol_table_entry *entry = new(mem_ctx) symbol_table_entry(f);

+   return _mesa_symbol_table_add_symbol(table, -1, f->name, entry) == 0;

+}

+

+void glsl_symbol_table::add_global_function(ir_function *f)

+{

+   symbol_table_entry *entry = new(mem_ctx) symbol_table_entry(f);

+   int added = _mesa_symbol_table_add_global_symbol(table, -1, f->name, entry);

+   assert(added == 0);

+   (void)added;

+}

+

+ir_variable *glsl_symbol_table::get_variable(const char *name)

+{

+   symbol_table_entry *entry = get_entry(name);

+   return entry != NULL ? entry->v : NULL;

+}

+

+const glsl_type *glsl_symbol_table::get_type(const char *name)

+{

+   symbol_table_entry *entry = get_entry(name);

+   return entry != NULL ? entry->t : NULL;

+}

+

+ir_function *glsl_symbol_table::get_function(const char *name)

+{

+   symbol_table_entry *entry = get_entry(name);

+   return entry != NULL ? entry->f : NULL;

+}

+

+symbol_table_entry *glsl_symbol_table::get_entry(const char *name)

+{

+   return (symbol_table_entry *)

+      _mesa_symbol_table_find_symbol(table, -1, name);

+}

diff --git a/mesalib/src/glsl/ir.cpp b/mesalib/src/glsl/ir.cpp
index ceb989110..7ee07f3c6 100644
--- a/mesalib/src/glsl/ir.cpp
+++ b/mesalib/src/glsl/ir.cpp
@@ -1157,7 +1157,7 @@ ir_texture::set_sampler(ir_dereference *sampler, const glsl_type *type)
    this->sampler = sampler;

    this->type = type;

 

-   assert(sampler->type->sampler_type == type->base_type);

+   assert(sampler->type->sampler_type == (int) type->base_type);

    if (sampler->type->sampler_shadow)

       assert(type->vector_elements == 4 || type->vector_elements == 1);

    else

diff --git a/mesalib/src/mesa/Makefile b/mesalib/src/mesa/Makefile
index 2eb8a18c9..eaba09dcf 100644
--- a/mesalib/src/mesa/Makefile
+++ b/mesalib/src/mesa/Makefile
@@ -43,7 +43,7 @@ endef
 

 define mesa-cxx-c

 	@mkdir -p $(dir $@)

-	$(CXX) -c -o $@ $< $($(1)_CPPFLAGS) $($(1)_CFLAGS) $($(1)_CXXFLAGS)

+	$(CXX) -c -o $@ $< $($(1)_CPPFLAGS) $($(1)_CXXFLAGS)

 endef

 

 $(MESA_OBJ_DIR)/%.o: %.c

diff --git a/mesalib/src/mesa/main/extensions.c b/mesalib/src/mesa/main/extensions.c
index ea8262086..6de672e92 100644
--- a/mesalib/src/mesa/main/extensions.c
+++ b/mesalib/src/mesa/main/extensions.c
@@ -56,6 +56,10 @@ struct extension {
 

    /** Set of API's in which the extension exists, as a bitset. */

    uint8_t api_set;

+

+   /** Year the extension was proposed or approved.  Used to sort the 

+    * extension string chronologically. */

+   uint16_t year;

 };

 

 

@@ -73,229 +77,229 @@ struct extension {
  */

 static const struct extension extension_table[] = {

    /* ARB Extensions */

-   { "GL_ARB_ES2_compatibility",                   o(ARB_ES2_compatibility),                   GL             },

-   { "GL_ARB_blend_func_extended",                 o(ARB_blend_func_extended),                 GL             },

-   { "GL_ARB_copy_buffer",                         o(ARB_copy_buffer),                         GL             },

-   { "GL_ARB_depth_buffer_float",                  o(ARB_depth_buffer_float),                  GL             },

-   { "GL_ARB_depth_clamp",                         o(ARB_depth_clamp),                         GL             },

-   { "GL_ARB_depth_texture",                       o(ARB_depth_texture),                       GL             },

-   { "GL_ARB_draw_buffers",                        o(ARB_draw_buffers),                        GL             },

-   { "GL_ARB_draw_buffers_blend",                  o(ARB_draw_buffers_blend),                  GL             },

-   { "GL_ARB_draw_elements_base_vertex",           o(ARB_draw_elements_base_vertex),           GL             },

-   { "GL_ARB_draw_instanced",                      o(ARB_draw_instanced),                      GL             },

-   { "GL_ARB_explicit_attrib_location",            o(ARB_explicit_attrib_location),            GL             },

-   { "GL_ARB_fragment_coord_conventions",          o(ARB_fragment_coord_conventions),          GL             },

-   { "GL_ARB_fragment_program",                    o(ARB_fragment_program),                    GL             },

-   { "GL_ARB_fragment_program_shadow",             o(ARB_fragment_program_shadow),             GL             },

-   { "GL_ARB_fragment_shader",                     o(ARB_fragment_shader),                     GL             },

-   { "GL_ARB_framebuffer_object",                  o(ARB_framebuffer_object),                  GL             },

-   { "GL_ARB_framebuffer_sRGB",                    o(EXT_framebuffer_sRGB),                    GL             },

-   { "GL_ARB_half_float_pixel",                    o(ARB_half_float_pixel),                    GL             },

-   { "GL_ARB_half_float_vertex",                   o(ARB_half_float_vertex),                   GL             },

-   { "GL_ARB_instanced_arrays",                    o(ARB_instanced_arrays),                    GL             },

-   { "GL_ARB_map_buffer_range",                    o(ARB_map_buffer_range),                    GL             },

-   { "GL_ARB_multisample",                         o(ARB_multisample),                         GL             },

-   { "GL_ARB_multitexture",                        o(ARB_multitexture),                        GL             },

-   { "GL_ARB_occlusion_query2",                    o(ARB_occlusion_query2),                    GL             },

-   { "GL_ARB_occlusion_query",                     o(ARB_occlusion_query),                     GL             },

-   { "GL_ARB_pixel_buffer_object",                 o(EXT_pixel_buffer_object),                 GL             },

-   { "GL_ARB_point_parameters",                    o(EXT_point_parameters),                    GL             },

-   { "GL_ARB_point_sprite",                        o(ARB_point_sprite),                        GL             },

-   { "GL_ARB_provoking_vertex",                    o(EXT_provoking_vertex),                    GL             },

-   { "GL_ARB_sampler_objects",                     o(ARB_sampler_objects),                     GL             },

-   { "GL_ARB_seamless_cube_map",                   o(ARB_seamless_cube_map),                   GL             },

-   { "GL_ARB_shader_objects",                      o(ARB_shader_objects),                      GL             },

-   { "GL_ARB_shader_stencil_export",               o(ARB_shader_stencil_export),               GL             },

-   { "GL_ARB_shading_language_100",                o(ARB_shading_language_100),                GL             },

-   { "GL_ARB_shadow_ambient",                      o(ARB_shadow_ambient),                      GL             },

-   { "GL_ARB_shadow",                              o(ARB_shadow),                              GL             },

-   { "GL_ARB_sync",                                o(ARB_sync),                                GL             },

-   { "GL_ARB_texture_border_clamp",                o(ARB_texture_border_clamp),                GL             },

-   { "GL_ARB_texture_buffer_object",               o(ARB_texture_buffer_object),               GL             },

-   { "GL_ARB_texture_compression",                 o(ARB_texture_compression),                 GL             },

-   { "GL_ARB_texture_compression_rgtc",            o(ARB_texture_compression_rgtc),            GL             },

-   { "GL_ARB_texture_cube_map",                    o(ARB_texture_cube_map),                    GL             },

-   { "GL_ARB_texture_env_add",                     o(EXT_texture_env_add),                     GL             },

-   { "GL_ARB_texture_env_combine",                 o(ARB_texture_env_combine),                 GL             },

-   { "GL_ARB_texture_env_crossbar",                o(ARB_texture_env_crossbar),                GL             },

-   { "GL_ARB_texture_env_dot3",                    o(ARB_texture_env_dot3),                    GL             },

-   { "GL_ARB_texture_mirrored_repeat",             o(ARB_texture_mirrored_repeat),             GL             },

-   { "GL_ARB_texture_multisample",                 o(ARB_texture_multisample),                 GL             },

-   { "GL_ARB_texture_non_power_of_two",            o(ARB_texture_non_power_of_two),            GL             },

-   { "GL_ARB_texture_rectangle",                   o(NV_texture_rectangle),                    GL             },

-   { "GL_ARB_texture_rgb10_a2ui",                  o(ARB_texture_rgb10_a2ui),                  GL             },

-   { "GL_ARB_texture_rg",                          o(ARB_texture_rg),                          GL             },

-   { "GL_ARB_texture_swizzle",                     o(EXT_texture_swizzle),                     GL             },

-   { "GL_ARB_transform_feedback2",                 o(ARB_transform_feedback2),                 GL             },

-   { "GL_ARB_transpose_matrix",                    o(ARB_transpose_matrix),                    GL             },

-   { "GL_ARB_uniform_buffer_object",               o(ARB_uniform_buffer_object),               GL             },

-   { "GL_ARB_vertex_array_bgra",                   o(EXT_vertex_array_bgra),                   GL             },

-   { "GL_ARB_vertex_array_object",                 o(ARB_vertex_array_object),                 GL             },

-   { "GL_ARB_vertex_buffer_object",                o(ARB_vertex_buffer_object),                GL             },

-   { "GL_ARB_vertex_program",                      o(ARB_vertex_program),                      GL             },

-   { "GL_ARB_vertex_shader",                       o(ARB_vertex_shader),                       GL             },

-   { "GL_ARB_vertex_type_2_10_10_10_rev",          o(ARB_vertex_type_2_10_10_10_rev),          GL             },

-   { "GL_ARB_window_pos",                          o(ARB_window_pos),                          GL             },

+   { "GL_ARB_ES2_compatibility",                   o(ARB_ES2_compatibility),                   GL,             2009 },

+   { "GL_ARB_blend_func_extended",                 o(ARB_blend_func_extended),                 GL,             2009 },

+   { "GL_ARB_copy_buffer",                         o(ARB_copy_buffer),                         GL,             2008 },

+   { "GL_ARB_depth_buffer_float",                  o(ARB_depth_buffer_float),                  GL,             2008 },

+   { "GL_ARB_depth_clamp",                         o(ARB_depth_clamp),                         GL,             2003 },

+   { "GL_ARB_depth_texture",                       o(ARB_depth_texture),                       GL,             2001 },

+   { "GL_ARB_draw_buffers",                        o(ARB_draw_buffers),                        GL,             2002 },

+   { "GL_ARB_draw_buffers_blend",                  o(ARB_draw_buffers_blend),                  GL,             2009 },

+   { "GL_ARB_draw_elements_base_vertex",           o(ARB_draw_elements_base_vertex),           GL,             2009 },

+   { "GL_ARB_draw_instanced",                      o(ARB_draw_instanced),                      GL,             2008 },

+   { "GL_ARB_explicit_attrib_location",            o(ARB_explicit_attrib_location),            GL,             2009 },

+   { "GL_ARB_fragment_coord_conventions",          o(ARB_fragment_coord_conventions),          GL,             2009 },

+   { "GL_ARB_fragment_program",                    o(ARB_fragment_program),                    GL,             2002 },

+   { "GL_ARB_fragment_program_shadow",             o(ARB_fragment_program_shadow),             GL,             2003 },

+   { "GL_ARB_fragment_shader",                     o(ARB_fragment_shader),                     GL,             2002 },

+   { "GL_ARB_framebuffer_object",                  o(ARB_framebuffer_object),                  GL,             2005 },

+   { "GL_ARB_framebuffer_sRGB",                    o(EXT_framebuffer_sRGB),                    GL,             1998 },

+   { "GL_ARB_half_float_pixel",                    o(ARB_half_float_pixel),                    GL,             2003 },

+   { "GL_ARB_half_float_vertex",                   o(ARB_half_float_vertex),                   GL,             2008 },

+   { "GL_ARB_instanced_arrays",                    o(ARB_instanced_arrays),                    GL,             2008 },

+   { "GL_ARB_map_buffer_range",                    o(ARB_map_buffer_range),                    GL,             2008 },

+   { "GL_ARB_multisample",                         o(ARB_multisample),                         GL,             1994 },

+   { "GL_ARB_multitexture",                        o(ARB_multitexture),                        GL,             1998 },

+   { "GL_ARB_occlusion_query2",                    o(ARB_occlusion_query2),                    GL,             2003 },

+   { "GL_ARB_occlusion_query",                     o(ARB_occlusion_query),                     GL,             2001 },

+   { "GL_ARB_pixel_buffer_object",                 o(EXT_pixel_buffer_object),                 GL,             2004 },

+   { "GL_ARB_point_parameters",                    o(EXT_point_parameters),                    GL,             1997 },

+   { "GL_ARB_point_sprite",                        o(ARB_point_sprite),                        GL,             2003 },

+   { "GL_ARB_provoking_vertex",                    o(EXT_provoking_vertex),                    GL,             2009 },

+   { "GL_ARB_sampler_objects",                     o(ARB_sampler_objects),                     GL,             2009 },

+   { "GL_ARB_seamless_cube_map",                   o(ARB_seamless_cube_map),                   GL,             2009 },

+   { "GL_ARB_shader_objects",                      o(ARB_shader_objects),                      GL,             2002 },

+   { "GL_ARB_shader_stencil_export",               o(ARB_shader_stencil_export),               GL,             2009 },

+   { "GL_ARB_shading_language_100",                o(ARB_shading_language_100),                GL,             2003 },

+   { "GL_ARB_shadow_ambient",                      o(ARB_shadow_ambient),                      GL,             2001 },

+   { "GL_ARB_shadow",                              o(ARB_shadow),                              GL,             2001 },

+   { "GL_ARB_sync",                                o(ARB_sync),                                GL,             2003 },

+   { "GL_ARB_texture_border_clamp",                o(ARB_texture_border_clamp),                GL,             2000 },

+   { "GL_ARB_texture_buffer_object",               o(ARB_texture_buffer_object),               GL,             2008 },

+   { "GL_ARB_texture_compression",                 o(ARB_texture_compression),                 GL,             2000 },

+   { "GL_ARB_texture_compression_rgtc",            o(ARB_texture_compression_rgtc),            GL,             2004 },

+   { "GL_ARB_texture_cube_map",                    o(ARB_texture_cube_map),                    GL,             1999 },

+   { "GL_ARB_texture_env_add",                     o(EXT_texture_env_add),                     GL,             1999 },

+   { "GL_ARB_texture_env_combine",                 o(ARB_texture_env_combine),                 GL,             2001 },

+   { "GL_ARB_texture_env_crossbar",                o(ARB_texture_env_crossbar),                GL,             2001 },

+   { "GL_ARB_texture_env_dot3",                    o(ARB_texture_env_dot3),                    GL,             2001 },

+   { "GL_ARB_texture_mirrored_repeat",             o(ARB_texture_mirrored_repeat),             GL,             2001 },

+   { "GL_ARB_texture_multisample",                 o(ARB_texture_multisample),                 GL,             2009 },

+   { "GL_ARB_texture_non_power_of_two",            o(ARB_texture_non_power_of_two),            GL,             2003 },

+   { "GL_ARB_texture_rectangle",                   o(NV_texture_rectangle),                    GL,             2004 },

+   { "GL_ARB_texture_rgb10_a2ui",                  o(ARB_texture_rgb10_a2ui),                  GL,             2009 },

+   { "GL_ARB_texture_rg",                          o(ARB_texture_rg),                          GL,             2008 },

+   { "GL_ARB_texture_swizzle",                     o(EXT_texture_swizzle),                     GL,             2008 },

+   { "GL_ARB_transform_feedback2",                 o(ARB_transform_feedback2),                 GL,             2010 },

+   { "GL_ARB_transpose_matrix",                    o(ARB_transpose_matrix),                    GL,             1999 },

+   { "GL_ARB_uniform_buffer_object",               o(ARB_uniform_buffer_object),               GL,             2002 },

+   { "GL_ARB_vertex_array_bgra",                   o(EXT_vertex_array_bgra),                   GL,             2008 },

+   { "GL_ARB_vertex_array_object",                 o(ARB_vertex_array_object),                 GL,             2006 },

+   { "GL_ARB_vertex_buffer_object",                o(ARB_vertex_buffer_object),                GL,             2003 },

+   { "GL_ARB_vertex_program",                      o(ARB_vertex_program),                      GL,             2002 },

+   { "GL_ARB_vertex_shader",                       o(ARB_vertex_shader),                       GL,             2002 },

+   { "GL_ARB_vertex_type_2_10_10_10_rev",          o(ARB_vertex_type_2_10_10_10_rev),          GL,             2009 },

+   { "GL_ARB_window_pos",                          o(ARB_window_pos),                          GL,             2001 },

 

    /* EXT extensions */

-   { "GL_EXT_abgr",                                o(EXT_abgr),                                GL             },

-   { "GL_EXT_bgra",                                o(EXT_bgra),                                GL             },

-   { "GL_EXT_blend_color",                         o(EXT_blend_color),                         GL             },

-   { "GL_EXT_blend_equation_separate",             o(EXT_blend_equation_separate),             GL             },

-   { "GL_EXT_blend_func_separate",                 o(EXT_blend_func_separate),                 GL             },

-   { "GL_EXT_blend_logic_op",                      o(EXT_blend_logic_op),                      GL             },

-   { "GL_EXT_blend_minmax",                        o(EXT_blend_minmax),                        GL | ES1 | ES2 },

-   { "GL_EXT_blend_subtract",                      o(EXT_blend_subtract),                      GL             },

-   { "GL_EXT_clip_volume_hint",                    o(EXT_clip_volume_hint),                    GL             },

-   { "GL_EXT_compiled_vertex_array",               o(EXT_compiled_vertex_array),               GL             },

-   { "GL_EXT_copy_texture",                        o(EXT_copy_texture),                        GL             },

-   { "GL_EXT_depth_bounds_test",                   o(EXT_depth_bounds_test),                   GL             },

-   { "GL_EXT_draw_buffers2",                       o(EXT_draw_buffers2),                       GL             },

-   { "GL_EXT_draw_instanced",                      o(ARB_draw_instanced),                      GL             },

-   { "GL_EXT_draw_range_elements",                 o(EXT_draw_range_elements),                 GL             },

-   { "GL_EXT_fog_coord",                           o(EXT_fog_coord),                           GL             },

-   { "GL_EXT_framebuffer_blit",                    o(EXT_framebuffer_blit),                    GL             },

-   { "GL_EXT_framebuffer_multisample",             o(EXT_framebuffer_multisample),             GL             },

-   { "GL_EXT_framebuffer_object",                  o(EXT_framebuffer_object),                  GL             },

-   { "GL_EXT_framebuffer_sRGB",                    o(EXT_framebuffer_sRGB),                    GL             },

-   { "GL_EXT_gpu_program_parameters",              o(EXT_gpu_program_parameters),              GL             },

-   { "GL_EXT_gpu_shader4",                         o(EXT_gpu_shader4),                         GL             },

-   { "GL_EXT_multi_draw_arrays",                   o(EXT_multi_draw_arrays),                   GL | ES1 | ES2 },

-   { "GL_EXT_packed_depth_stencil",                o(EXT_packed_depth_stencil),                GL             },

-   { "GL_EXT_packed_float",                        o(EXT_packed_float),                        GL             },

-   { "GL_EXT_packed_pixels",                       o(EXT_packed_pixels),                       GL             },

-   { "GL_EXT_paletted_texture",                    o(EXT_paletted_texture),                    GL             },

-   { "GL_EXT_pixel_buffer_object",                 o(EXT_pixel_buffer_object),                 GL             },

-   { "GL_EXT_point_parameters",                    o(EXT_point_parameters),                    GL             },

-   { "GL_EXT_polygon_offset",                      o(EXT_polygon_offset),                      GL             },

-   { "GL_EXT_provoking_vertex",                    o(EXT_provoking_vertex),                    GL             },

-   { "GL_EXT_rescale_normal",                      o(EXT_rescale_normal),                      GL             },

-   { "GL_EXT_secondary_color",                     o(EXT_secondary_color),                     GL             },

-   { "GL_EXT_separate_shader_objects",             o(EXT_separate_shader_objects),             GL             },

-   { "GL_EXT_separate_specular_color",             o(EXT_separate_specular_color),             GL             },

-   { "GL_EXT_shadow_funcs",                        o(EXT_shadow_funcs),                        GL             },

-   { "GL_EXT_shared_texture_palette",              o(EXT_shared_texture_palette),              GL             },

-   { "GL_EXT_stencil_two_side",                    o(EXT_stencil_two_side),                    GL             },

-   { "GL_EXT_stencil_wrap",                        o(EXT_stencil_wrap),                        GL             },

-   { "GL_EXT_subtexture",                          o(EXT_subtexture),                          GL             },

-   { "GL_EXT_texture3D",                           o(EXT_texture3D),                           GL             },

-   { "GL_EXT_texture_array",                       o(EXT_texture_array),                       GL             },

-   { "GL_EXT_texture_compression_dxt1",            o(EXT_texture_compression_s3tc),            GL | ES1 | ES2 },

-   { "GL_EXT_texture_compression_latc",            o(EXT_texture_compression_latc),            GL             },

-   { "GL_EXT_texture_compression_rgtc",            o(ARB_texture_compression_rgtc),            GL             },

-   { "GL_EXT_texture_compression_s3tc",            o(EXT_texture_compression_s3tc),            GL             },

-   { "GL_EXT_texture_cube_map",                    o(ARB_texture_cube_map),                    GL             },

-   { "GL_EXT_texture_edge_clamp",                  o(SGIS_texture_edge_clamp),                 GL             },

-   { "GL_EXT_texture_env_add",                     o(EXT_texture_env_add),                     GL             },

-   { "GL_EXT_texture_env_combine",                 o(EXT_texture_env_combine),                 GL             },

-   { "GL_EXT_texture_env_dot3",                    o(EXT_texture_env_dot3),                    GL             },

-   { "GL_EXT_texture_filter_anisotropic",          o(EXT_texture_filter_anisotropic),          GL | ES1 | ES2 },

-   { "GL_EXT_texture_format_BGRA8888",             o(EXT_texture_format_BGRA8888),                  ES1 | ES2 },

-   { "GL_EXT_texture_integer",                     o(EXT_texture_integer),                     GL             },

-   { "GL_EXT_texture_lod_bias",                    o(EXT_texture_lod_bias),                    GL | ES1       },

-   { "GL_EXT_texture_mirror_clamp",                o(EXT_texture_mirror_clamp),                GL             },

-   { "GL_EXT_texture_object",                      o(EXT_texture_object),                      GL             },

-   { "GL_EXT_texture",                             o(EXT_texture),                             GL             },

-   { "GL_EXT_texture_rectangle",                   o(NV_texture_rectangle),                    GL             },

-   { "GL_EXT_texture_shared_exponent",             o(EXT_texture_shared_exponent),             GL             },

-   { "GL_EXT_texture_sRGB",                        o(EXT_texture_sRGB),                        GL             },

-   { "GL_EXT_texture_sRGB_decode",                 o(EXT_texture_sRGB_decode),                        GL             },

-   { "GL_EXT_texture_swizzle",                     o(EXT_texture_swizzle),                     GL             },

-   { "GL_EXT_texture_type_2_10_10_10_REV",         o(dummy_true),                                         ES2 },

-   { "GL_EXT_timer_query",                         o(EXT_timer_query),                         GL             },

-   { "GL_EXT_transform_feedback",                  o(EXT_transform_feedback),                  GL             },

-   { "GL_EXT_vertex_array_bgra",                   o(EXT_vertex_array_bgra),                   GL             },

-   { "GL_EXT_vertex_array",                        o(EXT_vertex_array),                        GL             },

-   { "GL_EXT_vertex_array_set",                    o(EXT_vertex_array_set),                    GL             },

+   { "GL_EXT_abgr",                                o(EXT_abgr),                                GL,             1995 },

+   { "GL_EXT_bgra",                                o(EXT_bgra),                                GL,             1995 },

+   { "GL_EXT_blend_color",                         o(EXT_blend_color),                         GL,             1995 },

+   { "GL_EXT_blend_equation_separate",             o(EXT_blend_equation_separate),             GL,             2003 },

+   { "GL_EXT_blend_func_separate",                 o(EXT_blend_func_separate),                 GL,             1999 },

+   { "GL_EXT_blend_logic_op",                      o(EXT_blend_logic_op),                      GL,             1995 },

+   { "GL_EXT_blend_minmax",                        o(EXT_blend_minmax),                        GL | ES1 | ES2, 1995 },

+   { "GL_EXT_blend_subtract",                      o(EXT_blend_subtract),                      GL,             1995 },

+   { "GL_EXT_clip_volume_hint",                    o(EXT_clip_volume_hint),                    GL,             1996 },

+   { "GL_EXT_compiled_vertex_array",               o(EXT_compiled_vertex_array),               GL,             1996 },

+   { "GL_EXT_copy_texture",                        o(EXT_copy_texture),                        GL,             1995 },

+   { "GL_EXT_depth_bounds_test",                   o(EXT_depth_bounds_test),                   GL,             2002 },

+   { "GL_EXT_draw_buffers2",                       o(EXT_draw_buffers2),                       GL,             2006 },

+   { "GL_EXT_draw_instanced",                      o(ARB_draw_instanced),                      GL,             2006 },

+   { "GL_EXT_draw_range_elements",                 o(EXT_draw_range_elements),                 GL,             1997 },

+   { "GL_EXT_fog_coord",                           o(EXT_fog_coord),                           GL,             1999 },

+   { "GL_EXT_framebuffer_blit",                    o(EXT_framebuffer_blit),                    GL,             2005 },

+   { "GL_EXT_framebuffer_multisample",             o(EXT_framebuffer_multisample),             GL,             2005 },

+   { "GL_EXT_framebuffer_object",                  o(EXT_framebuffer_object),                  GL,             2000 },

+   { "GL_EXT_framebuffer_sRGB",                    o(EXT_framebuffer_sRGB),                    GL,             1998 },

+   { "GL_EXT_gpu_program_parameters",              o(EXT_gpu_program_parameters),              GL,             2006 },

+   { "GL_EXT_gpu_shader4",                         o(EXT_gpu_shader4),                         GL,             2006 },

+   { "GL_EXT_multi_draw_arrays",                   o(EXT_multi_draw_arrays),                   GL | ES1 | ES2, 1999 },

+   { "GL_EXT_packed_depth_stencil",                o(EXT_packed_depth_stencil),                GL,             2005 },

+   { "GL_EXT_packed_float",                        o(EXT_packed_float),                        GL,             2004 },

+   { "GL_EXT_packed_pixels",                       o(EXT_packed_pixels),                       GL,             1997 },

+   { "GL_EXT_paletted_texture",                    o(EXT_paletted_texture),                    GL,             1995 },

+   { "GL_EXT_pixel_buffer_object",                 o(EXT_pixel_buffer_object),                 GL,             2004 },

+   { "GL_EXT_point_parameters",                    o(EXT_point_parameters),                    GL,             1997 },

+   { "GL_EXT_polygon_offset",                      o(EXT_polygon_offset),                      GL,             1995 },

+   { "GL_EXT_provoking_vertex",                    o(EXT_provoking_vertex),                    GL,             2009 },

+   { "GL_EXT_rescale_normal",                      o(EXT_rescale_normal),                      GL,             1997 },

+   { "GL_EXT_secondary_color",                     o(EXT_secondary_color),                     GL,             1999 },

+   { "GL_EXT_separate_shader_objects",             o(EXT_separate_shader_objects),             GL,             2008 },

+   { "GL_EXT_separate_specular_color",             o(EXT_separate_specular_color),             GL,             1997 },

+   { "GL_EXT_shadow_funcs",                        o(EXT_shadow_funcs),                        GL,             2002 },

+   { "GL_EXT_shared_texture_palette",              o(EXT_shared_texture_palette),              GL,             2000 },

+   { "GL_EXT_stencil_two_side",                    o(EXT_stencil_two_side),                    GL,             2001 },

+   { "GL_EXT_stencil_wrap",                        o(EXT_stencil_wrap),                        GL,             2002 },

+   { "GL_EXT_subtexture",                          o(EXT_subtexture),                          GL,             1995 },

+   { "GL_EXT_texture3D",                           o(EXT_texture3D),                           GL,             1996 },

+   { "GL_EXT_texture_array",                       o(EXT_texture_array),                       GL,             2006 },

+   { "GL_EXT_texture_compression_dxt1",            o(EXT_texture_compression_s3tc),            GL | ES1 | ES2, 2004 },

+   { "GL_EXT_texture_compression_latc",            o(EXT_texture_compression_latc),            GL,             2006 },

+   { "GL_EXT_texture_compression_rgtc",            o(ARB_texture_compression_rgtc),            GL,             2004 },

+   { "GL_EXT_texture_compression_s3tc",            o(EXT_texture_compression_s3tc),            GL,             2000 },

+   { "GL_EXT_texture_cube_map",                    o(ARB_texture_cube_map),                    GL,             2001 },

+   { "GL_EXT_texture_edge_clamp",                  o(SGIS_texture_edge_clamp),                 GL,             1997 },

+   { "GL_EXT_texture_env_add",                     o(EXT_texture_env_add),                     GL,             1999 },

+   { "GL_EXT_texture_env_combine",                 o(EXT_texture_env_combine),                 GL,             2006 },

+   { "GL_EXT_texture_env_dot3",                    o(EXT_texture_env_dot3),                    GL,             2000 },

+   { "GL_EXT_texture_filter_anisotropic",          o(EXT_texture_filter_anisotropic),          GL | ES1 | ES2, 1999 },

+   { "GL_EXT_texture_format_BGRA8888",             o(EXT_texture_format_BGRA8888),                  ES1 | ES2, 2009 },

+   { "GL_EXT_texture_integer",                     o(EXT_texture_integer),                     GL,             2006 },

+   { "GL_EXT_texture_lod_bias",                    o(EXT_texture_lod_bias),                    GL | ES1,       1999 },

+   { "GL_EXT_texture_mirror_clamp",                o(EXT_texture_mirror_clamp),                GL,             2004 },

+   { "GL_EXT_texture_object",                      o(EXT_texture_object),                      GL,             1995 },

+   { "GL_EXT_texture",                             o(EXT_texture),                             GL,             1996 },

+   { "GL_EXT_texture_rectangle",                   o(NV_texture_rectangle),                    GL,             2004 },

+   { "GL_EXT_texture_shared_exponent",             o(EXT_texture_shared_exponent),             GL,             2004 },

+   { "GL_EXT_texture_sRGB",                        o(EXT_texture_sRGB),                        GL,             2004 },

+   { "GL_EXT_texture_sRGB_decode",                 o(EXT_texture_sRGB_decode),                        GL,      2006 },

+   { "GL_EXT_texture_swizzle",                     o(EXT_texture_swizzle),                     GL,             2008 },

+   { "GL_EXT_texture_type_2_10_10_10_REV",         o(dummy_true),                                         ES2, 2008 },

+   { "GL_EXT_timer_query",                         o(EXT_timer_query),                         GL,             2006 },

+   { "GL_EXT_transform_feedback",                  o(EXT_transform_feedback),                  GL,             2011 },

+   { "GL_EXT_vertex_array_bgra",                   o(EXT_vertex_array_bgra),                   GL,             2008 },

+   { "GL_EXT_vertex_array",                        o(EXT_vertex_array),                        GL,             1995 },

+   { "GL_EXT_vertex_array_set",                    o(EXT_vertex_array_set),                    GL,             1997 },

 

    /* OES extensions */

-   { "GL_OES_blend_equation_separate",             o(EXT_blend_equation_separate),                  ES1       },

-   { "GL_OES_blend_func_separate",                 o(EXT_blend_func_separate),                      ES1       },

-   { "GL_OES_blend_subtract",                      o(EXT_blend_subtract),                           ES1       },

-   { "GL_OES_byte_coordinates",                    o(dummy_true),                                   ES1       },

-   { "GL_OES_compressed_paletted_texture",         o(dummy_false),                     DISABLE                },

-   { "GL_OES_depth24",                             o(EXT_framebuffer_object),                       ES1 | ES2 },

-   { "GL_OES_depth32",                             o(dummy_false),                     DISABLE                },

-   { "GL_OES_depth_texture",                       o(ARB_depth_texture),                                  ES2 },

+   { "GL_OES_blend_equation_separate",             o(EXT_blend_equation_separate),                  ES1,       2009 },

+   { "GL_OES_blend_func_separate",                 o(EXT_blend_func_separate),                      ES1,       2009 },

+   { "GL_OES_blend_subtract",                      o(EXT_blend_subtract),                           ES1,       2009 },

+   { "GL_OES_byte_coordinates",                    o(dummy_true),                                   ES1,       2002 },

+   { "GL_OES_compressed_paletted_texture",         o(dummy_false),                     DISABLE,                2003 },

+   { "GL_OES_depth24",                             o(EXT_framebuffer_object),                       ES1 | ES2, 2005 },

+   { "GL_OES_depth32",                             o(dummy_false),                     DISABLE,                2005 },

+   { "GL_OES_depth_texture",                       o(ARB_depth_texture),                                  ES2, 2006 },

 #if FEATURE_OES_draw_texture

-   { "GL_OES_draw_texture",                        o(OES_draw_texture),                             ES1 | ES2 },

+   { "GL_OES_draw_texture",                        o(OES_draw_texture),                             ES1 | ES2, 2004 },

 #endif

 #if FEATURE_OES_EGL_image

    /*  FIXME: Mesa expects GL_OES_EGL_image to be available in OpenGL contexts. */

-   { "GL_OES_EGL_image",                           o(OES_EGL_image),                           GL | ES1 | ES2 },

-#endif

-   { "GL_OES_element_index_uint",                  o(EXT_vertex_array),                             ES1 | ES2 },

-   { "GL_OES_fbo_render_mipmap",                   o(EXT_framebuffer_object),                       ES1 | ES2 },

-   { "GL_OES_fixed_point",                         o(dummy_true),                                   ES1       },

-   { "GL_OES_framebuffer_object",                  o(EXT_framebuffer_object),                       ES1       },

-   { "GL_OES_mapbuffer",                           o(ARB_vertex_buffer_object),                     ES1 | ES2 },

-   { "GL_OES_matrix_get",                          o(dummy_true),                                   ES1       },

-   { "GL_OES_packed_depth_stencil",                o(EXT_packed_depth_stencil),                     ES1 | ES2 },

-   { "GL_OES_point_size_array",                    o(dummy_true),                                   ES1       },

-   { "GL_OES_point_sprite",                        o(ARB_point_sprite),                             ES1       },

-   { "GL_OES_query_matrix",                        o(dummy_true),                                   ES1       },

-   { "GL_OES_read_format",                         o(OES_read_format),                         GL | ES1       },

-   { "GL_OES_rgb8_rgba8",                          o(EXT_framebuffer_object),                       ES1 | ES2 },

-   { "GL_OES_single_precision",                    o(dummy_true),                                   ES1       },

-   { "GL_OES_standard_derivatives",                o(OES_standard_derivatives),                           ES2 },

-   { "GL_OES_stencil1",                            o(dummy_false),                     DISABLE                },

-   { "GL_OES_stencil4",                            o(dummy_false),                     DISABLE                },

-   { "GL_OES_stencil8",                            o(EXT_framebuffer_object),                       ES1 | ES2 },

-   { "GL_OES_stencil_wrap",                        o(EXT_stencil_wrap),                             ES1       },

-   { "GL_OES_texture_3D",                          o(EXT_texture3D),                                      ES2 },

-   { "GL_OES_texture_cube_map",                    o(ARB_texture_cube_map),                         ES1       },

-   { "GL_OES_texture_env_crossbar",                o(ARB_texture_env_crossbar),                     ES1       },

-   { "GL_OES_texture_mirrored_repeat",             o(ARB_texture_mirrored_repeat),                  ES1       },

-   { "GL_OES_texture_npot",                        o(ARB_texture_non_power_of_two),                       ES2 },

+   { "GL_OES_EGL_image",                           o(OES_EGL_image),                           GL | ES1 | ES2, 2006 },

+#endif

+   { "GL_OES_element_index_uint",                  o(EXT_vertex_array),                             ES1 | ES2, 2005 },

+   { "GL_OES_fbo_render_mipmap",                   o(EXT_framebuffer_object),                       ES1 | ES2, 2005 },

+   { "GL_OES_fixed_point",                         o(dummy_true),                                   ES1,       2002 },

+   { "GL_OES_framebuffer_object",                  o(EXT_framebuffer_object),                       ES1,       2005 },

+   { "GL_OES_mapbuffer",                           o(ARB_vertex_buffer_object),                     ES1 | ES2, 2005 },

+   { "GL_OES_matrix_get",                          o(dummy_true),                                   ES1,       2004 },

+   { "GL_OES_packed_depth_stencil",                o(EXT_packed_depth_stencil),                     ES1 | ES2, 2007 },

+   { "GL_OES_point_size_array",                    o(dummy_true),                                   ES1,       2004 },

+   { "GL_OES_point_sprite",                        o(ARB_point_sprite),                             ES1,       2004 },

+   { "GL_OES_query_matrix",                        o(dummy_true),                                   ES1,       2003 },

+   { "GL_OES_read_format",                         o(OES_read_format),                         GL | ES1,       2003 },

+   { "GL_OES_rgb8_rgba8",                          o(EXT_framebuffer_object),                       ES1 | ES2, 2005 },

+   { "GL_OES_single_precision",                    o(dummy_true),                                   ES1,       2003 },

+   { "GL_OES_standard_derivatives",                o(OES_standard_derivatives),                           ES2, 2005 },

+   { "GL_OES_stencil1",                            o(dummy_false),                     DISABLE,                2005 },

+   { "GL_OES_stencil4",                            o(dummy_false),                     DISABLE,                2005 },

+   { "GL_OES_stencil8",                            o(EXT_framebuffer_object),                       ES1 | ES2, 2005 },

+   { "GL_OES_stencil_wrap",                        o(EXT_stencil_wrap),                             ES1,       2002 },

+   { "GL_OES_texture_3D",                          o(EXT_texture3D),                                      ES2, 2005 },

+   { "GL_OES_texture_cube_map",                    o(ARB_texture_cube_map),                         ES1,       2007 },

+   { "GL_OES_texture_env_crossbar",                o(ARB_texture_env_crossbar),                     ES1,       2005 },

+   { "GL_OES_texture_mirrored_repeat",             o(ARB_texture_mirrored_repeat),                  ES1,       2005 },

+   { "GL_OES_texture_npot",                        o(ARB_texture_non_power_of_two),                       ES2, 2005 },

 

    /* Vendor extensions */

-   { "GL_3DFX_texture_compression_FXT1",           o(TDFX_texture_compression_FXT1),           GL             },

-   { "GL_AMD_conservative_depth",                  o(AMD_conservative_depth),                  GL             },

-   { "GL_APPLE_client_storage",                    o(APPLE_client_storage),                    GL             },

-   { "GL_APPLE_object_purgeable",                  o(APPLE_object_purgeable),                  GL             },

-   { "GL_APPLE_packed_pixels",                     o(APPLE_packed_pixels),                     GL             },

-   { "GL_APPLE_vertex_array_object",               o(APPLE_vertex_array_object),               GL             },

-   { "GL_ATI_blend_equation_separate",             o(EXT_blend_equation_separate),             GL             },

-   { "GL_ATI_envmap_bumpmap",                      o(ATI_envmap_bumpmap),                      GL             },

-   { "GL_ATI_fragment_shader",                     o(ATI_fragment_shader),                     GL             },

-   { "GL_ATI_separate_stencil",                    o(ATI_separate_stencil),                    GL             },

-   { "GL_ATI_texture_compression_3dc",             o(ATI_texture_compression_3dc),             GL             },

-   { "GL_ATI_texture_env_combine3",                o(ATI_texture_env_combine3),                GL             },

-   { "GL_ATI_texture_mirror_once",                 o(ATI_texture_mirror_once),                 GL             },

-   { "GL_IBM_multimode_draw_arrays",               o(IBM_multimode_draw_arrays),               GL             },

-   { "GL_IBM_rasterpos_clip",                      o(IBM_rasterpos_clip),                      GL             },

-   { "GL_IBM_texture_mirrored_repeat",             o(ARB_texture_mirrored_repeat),             GL             },

-   { "GL_INGR_blend_func_separate",                o(EXT_blend_func_separate),                 GL             },

-   { "GL_MESA_pack_invert",                        o(MESA_pack_invert),                        GL             },

-   { "GL_MESA_resize_buffers",                     o(MESA_resize_buffers),                     GL             },

-   { "GL_MESA_texture_array",                      o(MESA_texture_array),                      GL             },

-   { "GL_MESA_texture_signed_rgba",                o(MESA_texture_signed_rgba),                GL             },

-   { "GL_MESA_window_pos",                         o(ARB_window_pos),                          GL             },

-   { "GL_MESAX_texture_float",                     o(ARB_texture_float),                       GL             },

-   { "GL_MESA_ycbcr_texture",                      o(MESA_ycbcr_texture),                      GL             },

-   { "GL_NV_blend_square",                         o(NV_blend_square),                         GL             },

-   { "GL_NV_conditional_render",                   o(NV_conditional_render),                   GL             },

-   { "GL_NV_depth_clamp",                          o(ARB_depth_clamp),                         GL             },

-   { "GL_NV_fragment_program",                     o(NV_fragment_program),                     GL             },

-   { "GL_NV_fragment_program_option",              o(NV_fragment_program_option),              GL             },

-   { "GL_NV_light_max_exponent",                   o(NV_light_max_exponent),                   GL             },

-   { "GL_NV_packed_depth_stencil",                 o(EXT_packed_depth_stencil),                GL             },

-   { "GL_NV_point_sprite",                         o(NV_point_sprite),                         GL             },

-   { "GL_NV_primitive_restart",                    o(NV_primitive_restart),                    GL             },

-   { "GL_NV_texgen_reflection",                    o(NV_texgen_reflection),                    GL             },

-   { "GL_NV_texture_barrier",                      o(NV_texture_barrier),                      GL             },

-   { "GL_NV_texture_env_combine4",                 o(NV_texture_env_combine4),                 GL             },

-   { "GL_NV_texture_rectangle",                    o(NV_texture_rectangle),                    GL             },

-   { "GL_NV_vertex_program1_1",                    o(NV_vertex_program1_1),                    GL             },

-   { "GL_NV_vertex_program",                       o(NV_vertex_program),                       GL             },

-   { "GL_S3_s3tc",                                 o(S3_s3tc),                                 GL             },

-   { "GL_SGIS_generate_mipmap",                    o(SGIS_generate_mipmap),                    GL             },

-   { "GL_SGIS_texture_border_clamp",               o(ARB_texture_border_clamp),                GL             },

-   { "GL_SGIS_texture_edge_clamp",                 o(SGIS_texture_edge_clamp),                 GL             },

-   { "GL_SGIS_texture_lod",                        o(SGIS_texture_lod),                        GL             },

-   { "GL_SUN_multi_draw_arrays",                   o(EXT_multi_draw_arrays),                   GL             },

-

-   { 0, 0, 0 },

+   { "GL_3DFX_texture_compression_FXT1",           o(TDFX_texture_compression_FXT1),           GL,             1999 },

+   { "GL_AMD_conservative_depth",                  o(AMD_conservative_depth),                  GL,             2009 },

+   { "GL_APPLE_client_storage",                    o(APPLE_client_storage),                    GL,             2002 },

+   { "GL_APPLE_object_purgeable",                  o(APPLE_object_purgeable),                  GL,             2006 },

+   { "GL_APPLE_packed_pixels",                     o(APPLE_packed_pixels),                     GL,             2002 },

+   { "GL_APPLE_vertex_array_object",               o(APPLE_vertex_array_object),               GL,             2002 },

+   { "GL_ATI_blend_equation_separate",             o(EXT_blend_equation_separate),             GL,             2003 },

+   { "GL_ATI_envmap_bumpmap",                      o(ATI_envmap_bumpmap),                      GL,             2001 },

+   { "GL_ATI_fragment_shader",                     o(ATI_fragment_shader),                     GL,             2001 },

+   { "GL_ATI_separate_stencil",                    o(ATI_separate_stencil),                    GL,             2006 },

+   { "GL_ATI_texture_compression_3dc",             o(ATI_texture_compression_3dc),             GL,             2004 },

+   { "GL_ATI_texture_env_combine3",                o(ATI_texture_env_combine3),                GL,             2002 },

+   { "GL_ATI_texture_mirror_once",                 o(ATI_texture_mirror_once),                 GL,             2006 },

+   { "GL_IBM_multimode_draw_arrays",               o(IBM_multimode_draw_arrays),               GL,             1998 },

+   { "GL_IBM_rasterpos_clip",                      o(IBM_rasterpos_clip),                      GL,             1996 },

+   { "GL_IBM_texture_mirrored_repeat",             o(ARB_texture_mirrored_repeat),             GL,             1998 },

+   { "GL_INGR_blend_func_separate",                o(EXT_blend_func_separate),                 GL,             1999 },

+   { "GL_MESA_pack_invert",                        o(MESA_pack_invert),                        GL,             2002 },

+   { "GL_MESA_resize_buffers",                     o(MESA_resize_buffers),                     GL,             1999 },

+   { "GL_MESA_texture_array",                      o(MESA_texture_array),                      GL,             2007 },

+   { "GL_MESA_texture_signed_rgba",                o(MESA_texture_signed_rgba),                GL,             2009 },

+   { "GL_MESA_window_pos",                         o(ARB_window_pos),                          GL,             2000 },

+   { "GL_MESAX_texture_float",                     o(ARB_texture_float),                       GL,             2009 },

+   { "GL_MESA_ycbcr_texture",                      o(MESA_ycbcr_texture),                      GL,             2002 },

+   { "GL_NV_blend_square",                         o(NV_blend_square),                         GL,             1999 },

+   { "GL_NV_conditional_render",                   o(NV_conditional_render),                   GL,             2008 },

+   { "GL_NV_depth_clamp",                          o(ARB_depth_clamp),                         GL,             2001 },

+   { "GL_NV_fragment_program",                     o(NV_fragment_program),                     GL,             2001 },

+   { "GL_NV_fragment_program_option",              o(NV_fragment_program_option),              GL,             2005 },

+   { "GL_NV_light_max_exponent",                   o(NV_light_max_exponent),                   GL,             1999 },

+   { "GL_NV_packed_depth_stencil",                 o(EXT_packed_depth_stencil),                GL,             2000 },

+   { "GL_NV_point_sprite",                         o(NV_point_sprite),                         GL,             2001 },

+   { "GL_NV_primitive_restart",                    o(NV_primitive_restart),                    GL,             2002 },

+   { "GL_NV_texgen_reflection",                    o(NV_texgen_reflection),                    GL,             1999 },

+   { "GL_NV_texture_barrier",                      o(NV_texture_barrier),                      GL,             2009 },

+   { "GL_NV_texture_env_combine4",                 o(NV_texture_env_combine4),                 GL,             1999 },

+   { "GL_NV_texture_rectangle",                    o(NV_texture_rectangle),                    GL,             2000 },

+   { "GL_NV_vertex_program1_1",                    o(NV_vertex_program1_1),                    GL,             2001 },

+   { "GL_NV_vertex_program",                       o(NV_vertex_program),                       GL,             2000 },

+   { "GL_S3_s3tc",                                 o(S3_s3tc),                                 GL,             1999 },

+   { "GL_SGIS_generate_mipmap",                    o(SGIS_generate_mipmap),                    GL,             1997 },

+   { "GL_SGIS_texture_border_clamp",               o(ARB_texture_border_clamp),                GL,             1997 },

+   { "GL_SGIS_texture_edge_clamp",                 o(SGIS_texture_edge_clamp),                 GL,             1997 },

+   { "GL_SGIS_texture_lod",                        o(SGIS_texture_lod),                        GL,             1997 },

+   { "GL_SUN_multi_draw_arrays",                   o(EXT_multi_draw_arrays),                   GL,             1999 },

+

+   { 0, 0, 0, 0 },

 };

 

 

@@ -823,6 +827,34 @@ _mesa_init_extensions( struct gl_context *ctx )
 }

 

 

+typedef unsigned short extension_index;

+

+

+/**

+ * Compare two entries of the extensions table.  Sorts first by year,

+ * then by name.

+ *

+ * Arguments are indices into extension_table.

+ */

+static int

+extension_compare(const void *p1, const void *p2)

+{

+   extension_index i1 = * (const extension_index *) p1;

+   extension_index i2 = * (const extension_index *) p2;

+   const struct extension *e1 = &extension_table[i1];

+   const struct extension *e2 = &extension_table[i2];

+   int res;

+

+   res = (int)e1->year - (int)e2->year;

+

+   if (res == 0) {

+      res = strcmp(e1->name, e2->name);

+   }

+

+   return res;

+}

+

+

 /**

  * Construct the GL_EXTENSIONS string.  Called the first time that

  * glGetString(GL_EXTENSIONS) is called.

@@ -834,15 +866,23 @@ _mesa_make_extension_string(struct gl_context *ctx)
    char *exts = 0;

    /* Length of extension string. */

    size_t length = 0;

+   /* Number of extensions */

+   unsigned count;

+   /* Indices of the extensions sorted by year */

+   extension_index *extension_indices;

    /* String of extra extensions. */

    char *extra_extensions = get_extension_override(ctx);

    GLboolean *base = (GLboolean *) &ctx->Extensions;

    const struct extension *i;

+   unsigned j;

+

 

    /* Compute length of the extension string. */

+   count = 0;

    for (i = extension_table; i->name != 0; ++i) {

       if (base[i->offset] && (i->api_set & (1 << ctx->API))) {

 	 length += strlen(i->name) + 1; /* +1 for space */

+	 ++count;

       }

    }

    if (extra_extensions != NULL)

@@ -854,13 +894,35 @@ _mesa_make_extension_string(struct gl_context *ctx)
       return NULL;

    }

 

-   /* Build the extension string.*/

+   extension_indices = malloc(count * sizeof extension_indices);

+   if (extension_indices == NULL) {

+      free(exts);

+      free(extra_extensions);

+      return NULL;

+   }

+

+   /* Sort extensions in chronological order because certain old applications (e.g.,

+    * Quake3 demo) store the extension list in a static size buffer so chronologically

+    * order ensure that the extensions that such applications expect will fit into

+    * that buffer.

+    */

+   j = 0;

    for (i = extension_table; i->name != 0; ++i) {

       if (base[i->offset] && (i->api_set & (1 << ctx->API))) {

-         strcat(exts, i->name);

-         strcat(exts, " ");

+         extension_indices[j++] = i - extension_table;

       }

    }

+   assert(j == count);

+   qsort(extension_indices, count, sizeof *extension_indices, extension_compare);

+

+   /* Build the extension string.*/

+   for (j = 0; j < count; ++j) {

+      i = &extension_table[extension_indices[j]];

+      assert(base[i->offset] && (i->api_set & (1 << ctx->API)));

+      strcat(exts, i->name);

+      strcat(exts, " ");

+   }

+   free(extension_indices);

    if (extra_extensions != 0) {

       strcat(exts, extra_extensions);

       free(extra_extensions);

diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h
index 51589aaa8..c6678b85c 100644
--- a/mesalib/src/mesa/main/mtypes.h
+++ b/mesalib/src/mesa/main/mtypes.h
@@ -85,7 +85,7 @@
 typedef GLuint64 GLbitfield64;

 

 /** Set a single bit */

-#define BITFIELD64_BIT(b)      (1ULL << (b))

+#define BITFIELD64_BIT(b)      ((GLbitfield64)1 << (b))

 

 

 /**

diff --git a/mesalib/src/mesa/main/texobj.c b/mesalib/src/mesa/main/texobj.c
index c1fc05c44..fa45cfb17 100644
--- a/mesalib/src/mesa/main/texobj.c
+++ b/mesalib/src/mesa/main/texobj.c
@@ -39,6 +39,7 @@
 #include "macros.h"

 #include "teximage.h"

 #include "texobj.h"

+#include "texstate.h"

 #include "mtypes.h"

 #include "program/prog_instruction.h"

 

@@ -1013,11 +1014,9 @@ void GLAPIENTRY
 _mesa_BindTexture( GLenum target, GLuint texName )

 {

    GET_CURRENT_CONTEXT(ctx);

-   const GLuint unit = ctx->Texture.CurrentUnit;

-   struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];

-   struct gl_texture_object *newTexObj = NULL, *defaultTexObj = NULL;

+   struct gl_texture_unit *texUnit = _mesa_get_current_tex_unit(ctx);

+   struct gl_texture_object *newTexObj = NULL;

    GLint targetIndex;

-   GLboolean early_out = GL_FALSE;

    ASSERT_OUTSIDE_BEGIN_END(ctx);

 

    if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))

@@ -1030,13 +1029,13 @@ _mesa_BindTexture( GLenum target, GLuint texName )
       return;

    }

    assert(targetIndex < NUM_TEXTURE_TARGETS);

-   defaultTexObj = ctx->Shared->DefaultTex[targetIndex];

 

    /*

     * Get pointer to new texture object (newTexObj)

     */

    if (texName == 0) {

-      newTexObj = defaultTexObj;

+      /* Use a default texture object */

+      newTexObj = ctx->Shared->DefaultTex[targetIndex];

    }

    else {

       /* non-default texture object */

@@ -1071,15 +1070,18 @@ _mesa_BindTexture( GLenum target, GLuint texName )
 

    assert(valid_texture_object(newTexObj));

 

-   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);

-   if ((ctx->Shared->RefCount == 1)

-       && (newTexObj == texUnit->CurrentTex[targetIndex])) {

-      early_out = GL_TRUE;

-   }

-   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);

-

-   if (early_out) {

-      return;

+   /* Check if this texture is only used by this context and is already bound.

+    * If so, just return.

+    */

+   {

+      GLboolean early_out;

+      _glthread_LOCK_MUTEX(ctx->Shared->Mutex);

+      early_out = ((ctx->Shared->RefCount == 1)

+                   && (newTexObj == texUnit->CurrentTex[targetIndex]));

+      _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);

+      if (early_out) {

+         return;

+      }

    }

 

    /* flush before changing binding */

diff --git a/mesalib/src/mesa/program/program.c b/mesalib/src/mesa/program/program.c
index 6c97787e8..e0bffc7c6 100644
--- a/mesalib/src/mesa/program/program.c
+++ b/mesalib/src/mesa/program/program.c
@@ -811,7 +811,7 @@ _mesa_combine_programs(struct gl_context *ctx,
       /* Connect color outputs of fprogA to color inputs of fprogB, via a

        * new temporary register.

        */

-      if ((progA->OutputsWritten & (1 << FRAG_RESULT_COLOR)) &&

+      if ((progA->OutputsWritten & BITFIELD64_BIT(FRAG_RESULT_COLOR)) &&

           (progB_inputsRead & FRAG_BIT_COL0)) {

          GLint tempReg = _mesa_find_free_register(usedTemps, MAX_PROGRAM_TEMPS,

                                                   firstTemp);

@@ -834,7 +834,7 @@ _mesa_combine_programs(struct gl_context *ctx,
 

       /* compute combined program's InputsRead */

       inputsB = progB_inputsRead;

-      if (progA->OutputsWritten & (1 << FRAG_RESULT_COLOR)) {

+      if (progA->OutputsWritten & BITFIELD64_BIT(FRAG_RESULT_COLOR)) {

          inputsB &= ~(1 << FRAG_ATTRIB_COL0);

       }

       newProg->InputsRead = progA->InputsRead | inputsB;

diff --git a/mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c b/mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c
index 98be6ab75..e0a1cba2b 100644
--- a/mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c
+++ b/mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c
@@ -187,7 +187,7 @@ get_pixel_transfer_program(struct gl_context *ctx, const struct state_key *key)
    inst[ic].TexSrcTarget = TEXTURE_2D_INDEX;

    ic++;

    fp->Base.InputsRead = (1 << FRAG_ATTRIB_TEX0);

-   fp->Base.OutputsWritten = (1 << FRAG_RESULT_COLOR);

+   fp->Base.OutputsWritten = BITFIELD64_BIT(FRAG_RESULT_COLOR);

    fp->Base.SamplersUsed = 0x1;  /* sampler 0 (bit 0) is used */

 

    if (key->scaleAndBias) {

diff --git a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
index 5c95eddd0..2909d9d95 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -213,9 +213,9 @@ st_make_drawpix_z_stencil_program(struct st_context *st,
    p->InputsRead = FRAG_BIT_TEX0 | FRAG_BIT_COL0;

    p->OutputsWritten = 0;

    if (write_depth)

-      p->OutputsWritten |= (1 << FRAG_RESULT_DEPTH);

+      p->OutputsWritten |= BITFIELD64_BIT(FRAG_RESULT_DEPTH);

    if (write_stencil)

-      p->OutputsWritten |= (1 << FRAG_RESULT_STENCIL);

+      p->OutputsWritten |= BITFIELD64_BIT(FRAG_RESULT_STENCIL);

 

    p->SamplersUsed =  0x1;  /* sampler 0 (bit 0) is used */

    if (write_stencil)

diff --git a/mesalib/src/mesa/state_tracker/st_program.c b/mesalib/src/mesa/state_tracker/st_program.c
index e5c26c563..1efc58799 100644
--- a/mesalib/src/mesa/state_tracker/st_program.c
+++ b/mesalib/src/mesa/state_tracker/st_program.c
@@ -798,7 +798,7 @@ st_translate_geometry_program(struct st_context *st,
     * mapping and the semantic information for each output.

     */

    for (attr = 0; attr < GEOM_RESULT_MAX; attr++) {

-      if (stgp->Base.Base.OutputsWritten & (1 << attr)) {

+      if (stgp->Base.Base.OutputsWritten & BITFIELD64_BIT(attr)) {

          GLuint slot;

 

          slot = gs_num_outputs;

diff --git a/xorg-server/hw/xfree86/man/xorg.conf.man b/xorg-server/hw/xfree86/man/xorg.conf.man
index e3fd0eadf..ce0c177bc 100644
--- a/xorg-server/hw/xfree86/man/xorg.conf.man
+++ b/xorg-server/hw/xfree86/man/xorg.conf.man
@@ -1,2478 +1,2485 @@
-.\" shorthand for double quote that works everywhere.
-.ds q \N'34'
-.TH __xconfigfile__ __filemansuffix__ __vendorversion__
-.SH NAME
-__xconfigfile__ and __xconfigdir__ \- configuration files for
-__xservername__ X server
-.SH INTRODUCTION
-.B __xservername__
-supports several mechanisms for supplying/obtaining configuration and
-run-time parameters: command line options, environment variables, the
-__xconfigfile__ and __xconfigdir__ configuration files, auto-detection,
-and fallback defaults. When the same information is supplied in more
-than one way, the highest precedence mechanism is used. The list of
-mechanisms is ordered from highest precedence to lowest. Note that not
-all parameters can be supplied via all methods. The available command
-line options and environment variables (and some defaults) are
-described in the Xserver(__appmansuffix__) and
-__xservername__(__appmansuffix__) manual pages. Most configuration file
-parameters, with their defaults, are described below. Driver and module
-specific configuration parameters are described in the relevant driver
-or module manual page.
-.SH DESCRIPTION
-.B __xservername__
-uses a configuration file called
-.I __xconfigfile__
-and files ending in the suffix
-.I .conf
-from the directory
-.I __xconfigdir__
-for its initial setup.
-The
-.I __xconfigfile__
-configuration file is searched for in the following places when the
-server is started as a normal user:
-.PP
-.RS 4
-.nf
-.IR /etc/X11/ <cmdline>
-.IR __projectroot__/etc/X11/ <cmdline>
-.IB /etc/X11/ $XORGCONFIG
-.IB __projectroot__/etc/X11/ $XORGCONFIG
-.I /etc/X11/__xconfigfile__
-.I /etc/__xconfigfile__
-.IR __projectroot__/etc/X11/__xconfigfile__. <hostname>
-.I __projectroot__/etc/X11/__xconfigfile__
-.IR __projectroot__/lib/X11/__xconfigfile__. <hostname>
-.I __projectroot__/lib/X11/__xconfigfile__
-.fi
-.RE
-.PP
-where
-.I <cmdline>
-is a relative path (with no \(lq..\(rq components) specified with the
-.B \-config
-command line option,
-.B $XORGCONFIG
-is the relative path (with no \(lq..\(rq components) specified by that
-environment variable, and
-.I <hostname>
-is the machine's hostname as reported by
-.BR gethostname (__libmansuffix__).
-.PP
-When the __xservername__ server is started by the \(lqroot\(rq user, the config file
-search locations are as follows:
-.PP
-.RS 4
-.nf
-<cmdline>
-.IR /etc/X11/ <cmdline>
-.IR __projectroot__/etc/X11/ <cmdline>
-.B $XORGCONFIG
-.IB /etc/X11/ $XORGCONFIG
-.IB __projectroot__/etc/X11/ $XORGCONFIG
-.I /etc/X11/__xconfigfile__
-.I /etc/__xconfigfile__
-.IR __projectroot__/etc/X11/__xconfigfile__. <hostname>
-.I __projectroot__/etc/X11/__xconfigfile__
-.IR __projectroot__/lib/X11/__xconfigfile__. <hostname>
-.I __projectroot__/lib/X11/__xconfigfile__
-.fi
-.RE
-.PP
-where
-.I <cmdline>
-is the path specified with the
-.B \-config
-command line option (which may be absolute or relative),
-.B $XORGCONFIG
-is the path specified by that
-environment variable (absolute or relative),
-.B $HOME
-is the path specified by that environment variable (usually the home
-directory), and
-.I <hostname>
-is the machine's hostname as reported by
-.BR gethostname (__libmansuffix__).
-.PP
-Additional configuration files are searched for in the following
-directories when the server is started as a normal user:
-.PP
-.RS 4
-.nf
-.IR /etc/X11/ <cmdline>
-.IR __sysconfdir__/X11/ <cmdline>
-.I /etc/X11/__xconfigdir__
-.I __sysconfdir__/X11/__xconfigdir__
-.fi
-.RE
-.PP
-where
-.I <cmdline>
-is a relative path (with no \(lq..\(rq components) specified with the
-.B \-configdir
-command line option.
-.PP
-When the __xservername__ server is started by the \(lqroot\(rq user, the
-config directory search locations are as follows:
-.PP
-.RS 4
-.nf
-<cmdline>
-.IR /etc/X11/ <cmdline>
-.IR __sysconfdir__/X11/ <cmdline>
-.I /etc/X11/__xconfigdir__
-.I __sysconfdir__/X11/__xconfigdir__
-.fi
-.RE
-.PP
-where
-.I <cmdline>
-is the path specified with the
-.B \-configdir
-command line option (which may be absolute or relative).
-.PP
-Finally, configuration files will also be searched for in directories
-reserved for system use. These are to separate configuration files from
-the vendor or 3rd party packages from those of local administration.
-These files are found in the following directories:
-.PP
-.RS 4
-.nf
-.I /usr/share/X11/__xconfigdir__
-.I __datadir__/X11/__xconfigdir__
-.fi
-.RE
-.PP
-The
-.I __xconfigfile__
-and
-.I __xconfigdir__
-files are composed of a number of sections which may be present in any order,
-or omitted to use default configuration values.
-Each section has the form:
-.PP
-.RS 4
-.nf
-.BI "Section  \*q" SectionName \*q
-.RI "    " SectionEntry
-    ...
-.B EndSection
-.fi
-.RE
-.PP
-The section names are:
-.PP
-.RS 4
-.nf
-.BR "Files          " "File pathnames"
-.BR "ServerFlags    " "Server flags"
-.BR "Module         " "Dynamic module loading"
-.BR "Extensions     " "Extension enabling"
-.BR "InputDevice    " "Input device description"
-.BR "InputClass     " "Input class description"
-.BR "Device         " "Graphics device description"
-.BR "VideoAdaptor   " "Xv video adaptor description"
-.BR "Monitor        " "Monitor description"
-.BR "Modes          " "Video modes descriptions"
-.BR "Screen         " "Screen configuration"
-.BR "ServerLayout   " "Overall layout"
-.BR "DRI            " "DRI\-specific configuration"
-.BR "Vendor         " "Vendor\-specific configuration"
-.fi
-.RE
-.PP
-The following obsolete section names are still recognised for compatibility
-purposes.
-In new config files, the
-.B InputDevice
-section should be used instead.
-.PP
-.RS 4
-.nf
-.BR "Keyboard       " "Keyboard configuration"
-.BR "Pointer        " "Pointer/mouse configuration"
-.fi
-.RE
-.PP
-The old
-.B XInput
-section is no longer recognised.
-.PP
-The
-.B ServerLayout
-sections are at the highest level.
-They bind together the input and output devices that will be used in a session.
-The input devices are described in the
-.B InputDevice
-sections.
-Output devices usually consist of multiple independent components (e.g.,
-a graphics board and a monitor).
-These multiple components are bound together in the
-.B Screen
-sections, and it is these that are referenced by the
-.B ServerLayout
-section.
-Each
-.B Screen
-section binds together a graphics board and a monitor.
-The graphics boards are described in the
-.B Device
-sections, and the monitors are described in the
-.B Monitor
-sections.
-.PP
-Config file keywords are case\-insensitive, and \(lq_\(rq characters are
-ignored.
-Most strings (including
-.B Option
-names) are also case-insensitive, and insensitive to white space and
-\(lq_\(rq characters.
-.PP
-Each config file entry usually takes up a single line in the file.  They
-consist of a keyword, which is possibly followed by one or more arguments,
-with the number and types of the arguments depending on the keyword.
-The argument types are:
-.PP
-.RS 4
-.nf
-.BR "Integer     " "an integer number in decimal, hex or octal"
-.BR "Real        " "a floating point number"
-.BR "String      " "a string enclosed in double quote marks (\*q)"
-.fi
-.RE
-.PP
-Note: hex integer values must be prefixed with \(lq0x\(rq, and octal values
-with \(lq0\(rq.
-.PP
-A special keyword called
-.B Option
-may be used to provide free\-form data to various components of the server.
-The
-.B Option
-keyword takes either one or two string arguments.
-The first is the option name, and the optional second argument is the
-option value.
-Some commonly used option value types include:
-.PP
-.RS 4
-.nf
-.BR "Integer     " "an integer number in decimal, hex or octal"
-.BR "Real        " "a floating point number"
-.BR "String      " "a sequence of characters"
-.BR "Boolean     " "a boolean value (see below)"
-.BR "Frequency   " "a frequency value (see below)"
-.fi
-.RE
-.PP
-Note that
-.I all
-.B Option
-values, not just strings, must be enclosed in quotes.
-.PP
-Boolean options may optionally have a value specified.
-When no value is specified, the option's value is
-.BR TRUE .
-The following boolean option values are recognised as
-.BR TRUE :
-.PP
-.RS 4
-.BR 1 ,
-.BR on ,
-.BR true ,
-.B yes
-.RE
-.PP
-and the following boolean option values are recognised as
-.BR FALSE :
-.PP
-.RS 4
-.BR 0 ,
-.BR off ,
-.BR false ,
-.B no
-.RE
-.PP
-If an option name is prefixed with
-.RB \*q No \*q,
-then the option value is negated.
-.PP
-Example: the following option entries are equivalent:
-.PP
-.RS 4
-.nf
-.B "Option \*qAccel\*q   \*qOff\*q"
-.B "Option \*qNoAccel\*q"
-.B "Option \*qNoAccel\*q \*qOn\*q"
-.B "Option \*qAccel\*q   \*qfalse\*q"
-.B "Option \*qAccel\*q   \*qno\*q"
-.fi
-.RE
-.PP
-Frequency option values consist of a real number that is optionally
-followed by one of the following frequency units:
-.PP
-.RS 4
-.BR Hz ,
-.BR k ,
-.BR kHz ,
-.BR M ,
-.B MHz
-.RE
-.PP
-When the unit name is omitted, the correct units will be determined from
-the value and the expectations of the appropriate range of the value.
-It is recommended that the units always be specified when using frequency
-option values to avoid any errors in determining the value.
-.SH "FILES SECTION"
-The
-.B Files
-section is used to specify some path names required by the server.
-Some of these paths can also be set from the command line (see
-.BR Xserver (__appmansuffix__)
-and
-.BR __xservername__ (__appmansuffix__)).
-The command line settings override the values specified in the config
-file.
-The
-.B Files
-section is optional, as are all of the entries that may appear in it.
-.PP
-The entries that can appear in this section are:
-.TP 7
-.BI "FontPath \*q" path \*q
-sets the search path for fonts.
-This path is a comma separated list of font path elements which the __xservername__
-server searches for font databases.
-Multiple
-.B FontPath
-entries may be specified, and they will be concatenated to build up the
-fontpath used by the server.  Font path elements can be absolute
-directory paths, catalogue directories or a font server identifier. The
-formats of the later two are explained below:
-.PP
-.RS 7
-Catalogue directories:
-.PP
-.RS 4
-Catalogue directories can be specified using the prefix \fBcatalogue:\fR
-before the directory name. The directory can then be populated with
-symlinks pointing to the real font directories, using the following
-syntax in the symlink name:
-.PP
-.RS 4
-.IR <identifier> : [attribute]: pri= <priority>
-.RE
-.PP
-where
-.I <identifier>
-is an alphanumeric identifier,
-.I [attribute]
-is an attribute which will be passed to the underlying FPE and
-.I <priority>
-is a number used to order the fontfile FPEs. Examples:
-.PP
-.RS 4
-.nf
-.I 75dpi:unscaled:pri=20  -> /usr/share/X11/fonts/75dpi
-.I gscript:pri=60 -> /usr/share/fonts/default/ghostscript
-.I misc:unscaled:pri=10 \-> /usr/share/X11/fonts/misc
-.fi
-.PP
-.RE .RE .RE
-.PP
-.RS 7
-Font server identifiers:
-.PP
-.RS 4
-Font server identifiers have the form:
-.RS 4
-.PP
-.IR <trans> / <hostname> : <port\-number>
-.RE
-.PP
-where
-.I <trans>
-is the transport type to use to connect to the font server (e.g.,
-.B unix
-for UNIX\-domain sockets or
-.B tcp
-for a TCP/IP connection),
-.I <hostname>
-is the hostname of the machine running the font server, and
-.I <port\-number>
-is the port number that the font server is listening on (usually 7100).
-.RE
-.PP
-When this entry is not specified in the config file, the server falls back
-to the compiled\-in default font path, which contains the following
-font path elements (which can be set inside a catalogue directory):
-.PP
-.RS 4
-.nf
-.I __datadir__/fonts/X11/misc/
-.I __datadir__/fonts/X11/TTF/
-.I __datadir__/fonts/X11/OTF/
-.I __datadir__/fonts/X11/Type1/
-.I __datadir__/fonts/X11/100dpi/
-.I __datadir__/fonts/X11/75dpi/
-.fi
-.RE
-.PP
-Font path elements that are found to be invalid are removed from the
-font path when the server starts up.
-.RE
-.TP 7
-.BI "ModulePath \*q" path \*q
-sets the search path for loadable __xservername__ server modules.
-This path is a comma separated list of directories which the __xservername__ server
-searches for loadable modules loading in the order specified.
-Multiple
-.B ModulePath
-entries may be specified, and they will be concatenated to build the
-module search path used by the server.  The default module path is
-.PP
-.RS 11
-__modulepath__
-.RE
-.\" The LogFile keyword is not currently implemented
-.ig
-.TP 7
-.BI "LogFile \*q" path \*q
-sets the name of the __xservername__ server log file.
-The default log file name is
-.PP
-.RS 11
-.RI __logdir__/__xservername__. <n> .log
-.RE
-.PP
-.RS 7
-where
-.I <n>
-is the display number for the __xservername__ server.
-..
-.TP 7
-.BI "XkbDir \*q" path \*q
-sets the base directory for keyboard layout files.  The
-.B \-xkbdir
-command line option can be used to override this.  The default directory is
-.PP
-.RS 11
-__xkbdir__
-.RE
-.SH "SERVERFLAGS SECTION"
-In addition to options specific to this section (described below), the
-.B ServerFlags
-section is used to specify some global
-__xservername__ server options.
-All of the entries in this section are
-.BR Options ,
-although for compatibility purposes some of the old style entries are
-still recognised.
-Those old style entries are not documented here, and using them is
-discouraged.
-The
-.B ServerFlags
-section is optional, as are the entries that may be specified in it.
-.PP
-.B Options
-specified in this section (with the exception of the
-.B \*qDefaultServerLayout\*q
-.BR Option )
-may be overridden by
-.B Options
-specified in the active
-.B ServerLayout
-section.
-Options with command line equivalents are overridden when their command
-line equivalent is used.
-The options recognised by this section are:
-.TP 7
-.BI "Option \*qDefaultServerLayout\*q  \*q" layout\-id \*q
-This specifies the default
-.B ServerLayout
-section to use in the absence of the
-.B \-layout
-command line option.
-.TP 7
-.BI "Option \*qNoTrapSignals\*q  \*q" boolean \*q
-This prevents the __xservername__ server from trapping a range of unexpected fatal
-signals and exiting cleanly.
-Instead, the __xservername__ server will die and drop core where the fault occurred.
-The default behaviour is for the __xservername__ server to exit cleanly, but still drop a
-core file.
-In general you never want to use this option unless you are debugging an __xservername__
-server problem and know how to deal with the consequences.
-.TP 7
-.BI "Option \*qUseSIGIO\*q  \*q" boolean \*q
-This controls whether the __xservername__ server requests that events from
-input devices be reported via a SIGIO signal handler (also known as SIGPOLL
-on some platforms), or only reported via the standard select(3) loop.
-The default behaviour is platform specific.   In general you do not want to
-use this option unless you are debugging the __xservername__ server, or
-working around a specific bug until it is fixed, and understand the
-consequences.
-.TP 7
-.BI "Option \*qDontVTSwitch\*q  \*q" boolean \*q
-This disallows the use of the
-.BI Ctrl+Alt+F n
-sequence (where
-.RI F n
-refers to one of the numbered function keys).
-That sequence is normally used to switch to another \*qvirtual terminal\*q
-on operating systems that have this feature.
-When this option is enabled, that key sequence has no special meaning and
-is passed to clients.
-Default: off.
-.TP 7
-.BI "Option \*qDontZap\*q  \*q" boolean \*q
-This disallows the use of the
-.B Terminate_Server
-XKB action (usually on Ctrl+Alt+Backspace, depending on XKB options).
-This action is normally used to terminate the __xservername__ server.
-When this option is enabled, the action has no effect.
-Default: off.
-.TP 7
-.BI "Option \*qDontZoom\*q  \*q" boolean \*q
-This disallows the use of the
-.B Ctrl+Alt+Keypad\-Plus
-and
-.B Ctrl+Alt+Keypad\-Minus
-sequences.
-These sequences allows you to switch between video modes.
-When this option is enabled, those key sequences have no special meaning
-and are passed to clients.
-Default: off.
-.TP 7
-.BI "Option \*qDisableVidModeExtension\*q  \*q" boolean \*q
-This disables the parts of the VidMode extension used by the xvidtune client
-that can be used to change the video modes.
-Default: the VidMode extension is enabled.
-.TP 7
-.BI "Option \*qAllowNonLocalXvidtune\*q  \*q" boolean \*q
-This allows the xvidtune client (and other clients that use the VidMode
-extension) to connect from another host.
-Default: off.
-.TP 7
-.BI "Option \*qAllowMouseOpenFail\*q  \*q" boolean \*q
-This tells the mousedrv(__drivermansuffix__) and vmmouse(__drivermansuffix__)
-drivers to not report failure if the mouse device can't be opened/initialised.
-It has no effect on the evdev(__drivermansuffix__) or other drivers.
-Default: false.
-.TP 7
-.BI "Option \*qVTSysReq\*q  \*q" boolean \*q
-enables the SYSV\-style VT switch sequence for non\-SYSV systems
-which support VT switching.
-This sequence is
-.B Alt\-SysRq
-followed by a function key
-.RB ( Fn ).
-This prevents the __xservername__ server trapping the
-keys used for the default VT switch sequence, which means that clients can
-access them.
-Default: off.
-.TP 7
-.BI "Option \*qBlankTime\*q  \*q" time \*q
-sets the inactivity timeout for the
-.B blank
-phase of the screensaver.
-.I time
-is in minutes.
-This is equivalent to the __xservername__ server's
-.B \-s
-flag, and the value can be changed at run\-time with
-.BR xset(__appmansuffix__).
-Default: 10 minutes.
-.TP 7
-.BI "Option \*qStandbyTime\*q  \*q" time \*q
-sets the inactivity timeout for the
-.B standby
-phase of DPMS mode.
-.I time
-is in minutes, and the value can be changed at run\-time with
-.BR xset(__appmansuffix__).
-Default: 10 minutes.
-This is only suitable for VESA DPMS compatible monitors, and may not be
-supported by all video drivers.
-It is only enabled for screens that have the
-.B \*qDPMS\*q
-option set (see the MONITOR section below).
-.TP 7
-.BI "Option \*qSuspendTime\*q  \*q" time \*q
-sets the inactivity timeout for the
-.B suspend
-phase of DPMS mode.
-.I time
-is in minutes, and the value can be changed at run\-time with
-.BR xset(__appmansuffix__).
-Default: 10 minutes.
-This is only suitable for VESA DPMS compatible monitors, and may not be
-supported by all video drivers.
-It is only enabled for screens that have the
-.B \*qDPMS\*q
-option set (see the MONITOR section below).
-.TP 7
-.BI "Option \*qOffTime\*q  \*q" time \*q
-sets the inactivity timeout for the
-.B off
-phase of DPMS mode.
-.I time
-is in minutes, and the value can be changed at run\-time with
-.BR xset(__appmansuffix__).
-Default: 10 minutes.
-This is only suitable for VESA DPMS compatible monitors, and may not be
-supported by all video drivers.
-It is only enabled for screens that have the
-.B \*qDPMS\*q
-option set (see the MONITOR section below).
-.TP 7
-.BI "Option \*qPixmap\*q  \*q" bpp \*q
-This sets the pixmap format to use for depth 24.
-Allowed values for
-.I bpp
-are 24 and 32.
-Default: 32 unless driver constraints don't allow this (which is rare).
-Note: some clients don't behave well when this value is set to 24.
-.TP 7
-.BI "Option \*qPC98\*q  \*q" boolean \*q
-Specify that the machine is a Japanese PC\-98 machine.
-This should not be enabled for anything other than the Japanese\-specific
-PC\-98 architecture.
-Default: auto\-detected.
-.TP 7
-.BI "Option \*qNoPM\*q  \*q" boolean \*q
-Disables something to do with power management events.
-Default: PM enabled on platforms that support it.
-.TP 7
-.BI "Option \*qXinerama\*q  \*q" boolean \*q
-enable or disable XINERAMA extension.
-Default is disabled.
-.TP 7
-.BI "Option \*qAIGLX\*q \*q" boolean \*q
-enable or disable AIGLX. AIGLX is enabled by default.
-.TP 7
-.BI "Option \*qDRI2\*q \*q" boolean \*q
-enable or disable DRI2. DRI2 is disabled by default.
-.TP 7
-.BI "Option \*qGlxVisuals\*q \*q" string \*q
-This option controls how many GLX visuals the GLX modules sets up.
-The default value is
-.BR "typical" ,
-which will setup up a typical subset of
-the GLXFBConfigs provided by the driver as GLX visuals.  Other options are
-.BR "minimal" ,
-which will set up the minimal set allowed by the GLX specification and
-.BR "all"
-which will setup GLX visuals for all GLXFBConfigs.
-.TP 7
-.BI "Option \*qUseDefaultFontPath\*q \*q" boolean \*q
-Include the default font path even if other paths are specified in
-xorg.conf. If enabled, other font paths are included as well. Enabled by
-default.
-.TP 7
-.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 \*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.
-.TP 7
-.BI "Option \*qLog\*q \*q" string \*q
-This option controls whether the log is flushed and/or synced to disk after
-each message.
-Possible values are
-.B flush
-or
-.BR sync .
-Unset by default.
-.SH "MODULE SECTION"
-The
-.B Module
-section is used to specify which __xservername__ server modules should be loaded.
-This section is ignored when the __xservername__ server is built in static form.
-The type of modules normally loaded in this section are __xservername__ server
-extension modules.
-Most other module types are loaded automatically when they are needed via
-other mechanisms.
-The
-.B Module
-section is optional, as are all of the entries that may be specified in
-it.
-.PP
-Entries in this section may be in two forms.
-The first and most commonly used form is an entry that uses the
-.B Load
-keyword, as described here:
-.TP 7
-.BI "Load  \*q" modulename \*q
-This instructs the server to load the module called
-.IR modulename .
-The module name given should be the module's standard name, not the
-module file name.
-The standard name is case\-sensitive, and does not include the \(lqlib\(rq
-prefix, or the \(lq.a\(rq, \(lq.o\(rq, or \(lq.so\(rq suffixes.
-.PP
-.RS 7
-Example: the DRI extension module can be loaded with the following entry:
-.PP
-.RS 4
-.B "Load \*qdri\*q"
-.RE
-.RE
-.TP 7
-.BI "Disable  \*q" modulename \*q
-This instructs the server to not load the module called
-.IR modulename .
-Some modules are loaded by default in the server, and this overrides that
-default. If a
-.B Load
-instruction is given for the same module, it overrides the
-.B Disable
-instruction and the module is loaded. The module name given should be the
-module's standard name, not the module file name. As with the
-.B Load
-instruction, the standard name is case-sensitive, and does not include the
-"lib" prefix, or the ".a", ".o", or ".so" suffixes.
-.PP
-The second form of entry is a
-.BR SubSection,
-with the subsection name being the module name, and the contents of the
-.B SubSection
-being
-.B Options
-that are passed to the module when it is loaded.
-.PP
-Example: the extmod module (which contains a miscellaneous group of
-server extensions) can be loaded, with the XFree86\-DGA extension
-disabled by using the following entry:
-.PP
-.RS 4
-.nf
-.B "SubSection \*qextmod\*q"
-.B "   Option  \*qomit XFree86\-DGA\*q"
-.B EndSubSection
-.fi
-.RE
-.PP
-Modules are searched for in each directory specified in the
-.B ModulePath
-search path, and in the drivers, extensions, input, internal, and
-multimedia subdirectories of each of those directories.
-In addition to this, operating system specific subdirectories of all
-the above are searched first if they exist.
-.PP
-To see what extension modules are available, check the extensions
-subdirectory under:
-.PP
-.RS 4
-.nf
-__modulepath__
-.fi
-.RE
-.PP
-The \(lqextmod\(rq, \(lqdbe\(rq, \(lqdri\(rq, \(lqdri2\(rq, \(lqglx\(rq,
-and \(lqrecord\(rq extension modules are loaded automatically, if they
-are present, unless disabled with \*qDisable\*q entries.
-It is recommended
-that at very least the \(lqextmod\(rq extension module be loaded.
-If it isn't, some commonly used server extensions (like the SHAPE
-extension) will not be available.
-.SH "EXTENSIONS SECTION"
-The
-.B Extensions
-section is used to specify which X11 protocol extensions should be enabled
-or disabled.
-The
-.B Extensions
-section is optional, as are all of the entries that may be specified in
-it.
-.PP
-Entries in this section are listed as Option statements with the name of
-the extension as the first argument, and a boolean value as the second.
-The extension name is case\-sensitive, and matches the form shown in the output
-of \*qXorg -extension ?\*q.
-.PP
-.RS 7
-Example: the MIT-SHM extension can be disabled with the following entry:
-.PP
-.RS 4
-.nf
-.B "Section \*qExtensions\*q"
-.B "    Option \*qMIT-SHM\*q \*qDisable\*q"
-.B "EndSection"
-.fi
-.RE
-.RE
-.SH "INPUTDEVICE SECTION"
-The config file may have multiple
-.B InputDevice
-sections.
-Recent X servers employ input hotplugging to add input devices, with the HAL
-backend being the default backend for X servers since 1.4. It is usually not
-necessary to provide
-.B InputDevice
-sections in the xorg.conf if hotplugging is enabled.
-.PP
-If hotplugging is disabled, there will normally
-be at least two: one for the core (primary) keyboard
-and one for the core pointer.
-If either of these two is missing, a default configuration for the missing
-ones will be used. In the absence of an explicitly specified core input
-device, the first
-.B InputDevice
-marked as
-.B CorePointer
-(or
-.BR CoreKeyboard )
-is used.
-If there is no match there, the first
-.B InputDevice
-that uses the \(lqmouse\(rq (or \(lqkbd\(rq) driver is used.
-The final fallback is to use built\-in default configurations.
-Currently the default configuration may not work as expected on all platforms.
-.PP
-.B InputDevice
-sections have the following format:
-.PP
-.RS 4
-.nf
-.B  "Section \*qInputDevice\*q"
-.BI "    Identifier \*q" name \*q
-.BI "    Driver     \*q" inputdriver \*q
-.I  "    options"
-.I  "    ..."
-.B  "EndSection"
-.fi
-.RE
-.PP
-The
-.B Identifier
-and
-.B Driver
-entries are required in all
-.B InputDevice
-sections.
-All other entries are optional.
-.PP
-The
-.B Identifier
-entry specifies the unique name for this input device.
-The
-.B Driver
-entry specifies the name of the driver to use for this input device.
-When using the loadable server, the input driver module
-.RI \*q inputdriver \*q
-will be loaded for each active
-.B InputDevice
-section.
-An
-.B InputDevice
-section is considered active if it is referenced by an active
-.B ServerLayout
-section, if it is referenced by the
-.B \-keyboard
-or
-.B \-pointer
-command line options, or if it is selected implicitly as the core pointer
-or keyboard device in the absence of such explicit references.
-The most commonly used input drivers are
-.BR evdev (__drivermansuffix__)
-on Linux systems, and
-.BR kbd (__drivermansuffix__)
-and
-.BR mousedrv (__drivermansuffix__)
-on other platforms.
-.PP
-.PP
-.B InputDevice
-sections recognise some driver\-independent
-.BR Options ,
-which are described here.
-See the individual input driver manual pages for a description of the
-device\-specific options.
-.TP 7
-.BI "Option \*qAutoServerLayout\*q  \*q" boolean \*q
-Always add the device to the ServerLayout section used by this instance of
-the server. This affects implied layouts as well as explicit layouts
-specified in the configuration and/or on the command line.
-.TP 7
-.BI "Option \*qCorePointer\*q"
-Deprecated, see
-.B Floating
-.TP 7
-.BI "Option \*qCoreKeyboard\*q"
-Deprecated, see
-.B Floating
-.TP 7
-.BI "Option \*qAlwaysCore\*q  \*q" boolean \*q
-Deprecated, see
-.B Floating
-.TP 7
-.BI "Option \*qSendCoreEvents\*q  \*q" boolean \*q
-Deprecated, see
-.B Floating
-
-.TP 7
-.BI "Option \*qFloating\*q  \*q" boolean \*q
-When enabled, the input device is set up floating and does not
-report events through any master device or control a cursor. The device is
-only available to clients using the X Input Extension API. This option is
-disabled by default.
-The options
-.B CorePointer,
-.B CoreKeyboard,
-.B AlwaysCore,
-and
-.B SendCoreEvents,
-are the inverse of option
-.B Floating
-(i.e.
-.B SendCoreEvents \*qon\*q
-is equivalent to
-.B Floating \*qoff\*q
-).
-
-This option controls the startup behavior only, a device
-may be reattached or set floating at runtime.
-.PP
-For pointing devices, the following options control how the pointer
-is accelerated or decelerated with respect to physical device motion. Most of
-these can be adjusted at runtime, see the xinput(1) man page for details. Only
-the most important acceleration options are discussed here.
-.TP 7
-.BI "Option \*qAccelerationProfile\*q  \*q" integer \*q
-Select the profile. In layman's terms, the profile constitutes the "feeling" of
-the acceleration. More formally, it defines how the transfer function (actual
-acceleration as a function of current device velocity and acceleration controls)
-is constructed. This is mainly a matter of personal preference.
-.PP
-.RS 6
-.nf
-.B  " 0      classic (mostly compatible)"
-.B  "-1      none (only constant deceleration is applied)"
-.B  " 1      device-dependent"
-.B  " 2      polynomial (polynomial function)"
-.B  " 3      smooth linear (soft knee, then linear)"
-.B  " 4      simple (normal when slow, otherwise accelerated)"
-.B  " 5      power (power function)"
-.B  " 6      linear (more speed, more acceleration)"
-.B  " 7      limited (like linear, but maxes out at threshold)"
-.fi
-.RE
-.TP 7
-.BI "Option \*qConstantDeceleration\*q  \*q" real \*q
-Makes the pointer go
-.B deceleration
-times slower than normal. Most useful for high-resolution devices.
-.TP 7
-.BI "Option \*qAdaptiveDeceleration\*q  \*q" real \*q
-Allows to actually decelerate the pointer when going slow. At most, it will be
-.B adaptive deceleration
-times slower. Enables precise pointer placement without sacrificing speed.
-.TP 7
-.BI "Option \*qAccelerationScheme\*q  \*q" string \*q
-Selects the scheme, which is the underlying algorithm.
-.PP
-.RS 7
-.nf
-.B  "predictable   default algorithm (behaving more predictable)"
-.B  "lightweight   old acceleration code (as specified in the X protocol spec)"
-.B  "none          no acceleration or deceleration"
-.fi
-.RE
-.TP 7
-.BI "Option \*qAccelerationNumerator\*q  \*q" integer \*q
-.TP 7
-.BI "Option \*qAccelerationDenominator\*q  \*q" integer \*q
-Set numerator and denominator of the acceleration factor. The acceleration
-factor is a rational which, together with threshold, can be used to tweak
-profiles to suit the users needs. The
-.B simple
-and
-.B limited
-profiles use it directly (i.e. they accelerate by the factor), for other
-profiles it should hold that a higher acceleration factor leads to a faster
-pointer. Typically, 1 is unaccelerated and values up to 5 are sensible.
-.TP 7
-.BI "Option \*qAccelerationThreshold\*q  \*q" integer \*q
-Set the threshold, which is roughly the velocity (usually device units per 10
-ms) required for acceleration to become effective. The precise effect varies
-with the profile however.
-
-.SH "INPUTCLASS SECTION"
-The config file may have multiple
-.B InputClass
-sections.
-These sections are optional and are used to provide configuration for a
-class of input devices as they are automatically added. An input device can
-match more than one
-.B InputClass
-section. Each class can override settings from a previous class, so it is
-best to arrange the sections with the most generic matches first.
-.PP
-.B InputClass
-sections have the following format:
-.PP
-.RS 4
-.nf
-.B  "Section \*qInputClass\*q"
-.BI "    Identifier  \*q" name \*q
-.I  "    entries"
-.I  "    ..."
-.I  "    options"
-.I  "    ..."
-.B  "EndSection"
-.fi
-.RE
-.PP
-The
-.B Identifier
-entry is required in all
-.B InputClass
-sections.
-All other entries are optional.
-.PP
-The
-.B Identifier
-entry specifies the unique name for this input class.
-The
-.B Driver
-entry specifies the name of the driver to use for this input device.
-After all classes have been examined, the
-.RI \*q inputdriver \*q
-module from the first
-.B Driver
-entry will be enabled when using the loadable server.
-.PP
-When an input device is automatically added, its characteristics are
-checked against all
-.B InputClass
-sections. Each section can contain optional entries to narrow the match
-of the class. If none of the optional entries appear, the
-.B InputClass
-section is generic and will match any input device. If more than one of
-these entries appear, they all must match for the configuration to apply.
-.PP
-There are two types of match entries used in
-.B InputClass
-sections. The first allows various tokens to be matched against attributes
-of the device. An entry can be constructed to match attributes from different
-devices by separating arguments with a '|' character. Multiple entries of the
-same type may be supplied to add multiple matching conditions on the same
-attribute. For example:
-.PP
-.RS 4
-.nf
-.B  "Section \*qInputClass\*q"
-.B  "    Identifier   \*qMy Class\*q"
-.B  "    # product string must contain example and
-.B  "    # either gizmo or gadget
-.B  "    MatchProduct \*qexample\*q
-.B  "    MatchProduct \*qgizmo|gadget\*q
-.I  "    ..."
-.B  "EndSection"
-.fi
-.RE
-.TP 7
-.BI "MatchProduct  \*q" matchproduct \*q
-This entry can be used to check if the substring
-.RI \*q matchproduct \*q
-occurs in the device's product name.
-.TP 7
-.BI "MatchVendor  \*q" matchvendor \*q
-This entry can be used to check if the substring
-.RI \*q matchvendor \*q
-occurs in the device's vendor name.
-.TP 7
-.BI "MatchDevicePath \*q" matchdevice \*q
-This entry can be used to check if the device file matches the
-.RI \*q matchdevice \*q
-pathname pattern.
-.TP 7
-.BI "MatchOS \*q" matchos \*q
-This entry can be used to check if the operating system matches the
-case-insensitive
-.RI \*q matchos \*q
-string. This entry is only supported on platforms providing the
-.BR uname (2)
-system call.
-.TP 7
-.BI "MatchPnPID \*q" matchpnp \*q
-The device's Plug and Play (PnP) ID can be checked against the
-.RI \*q matchpnp \*q
-shell wildcard pattern.
-.TP 7
-.BI "MatchUSBID \*q" matchusb \*q
-The device's USB ID can be checked against the
-.RI \*q matchusb \*q
-shell wildcard pattern. The ID is constructed as lowercase hexadecimal numbers
-separated by a ':'. This is the same format as the
-.BR lsusb (8)
-program.
-.TP 7
-.BI "MatchDriver \*q" matchdriver \*q
-Check the case-sensitive string
-.RI \*q matchdriver \*q
-against the currently configured driver of the device. Ordering of sections
-using this entry is important since it will not match unless the driver has
-been set by the config backend or a previous
-.B InputClass
-section.
-.TP 7
-.BI "MatchTag \*q" matchtag \*q
-This entry can be used to check if tags assigned by the config backend
-matches the
-.RI \*q matchtag \*q
-pattern. A match is found if at least one of the tags given in
-.RI \*q matchtag \*q
-matches at least one of the tags assigned by the backend.
-.PP
-The second type of entry is used to match device types. These entries take a
-boolean argument similar to
-.B Option
-entries.
-.TP 7
-.BI "MatchIsKeyboard     \*q" bool \*q
-.TP 7
-.BI "MatchIsPointer      \*q" bool \*q
-.TP 7
-.BI "MatchIsJoystick     \*q" bool \*q
-.TP 7
-.BI "MatchIsTablet       \*q" bool \*q
-.TP 7
-.BI "MatchIsTouchpad     \*q" bool \*q
-.TP 7
-.BI "MatchIsTouchscreen  \*q" bool \*q
-.PP
-When an input device has been matched to the
-.B InputClass
-section, any
-.B Option
-entries are applied to the device. One
-.B InputClass
-specific
-.B Option
-is recognized. See the
-.B InputDevice
-section above for a description of the remaining
-.B Option
-entries.
-.TP 7
-.BI "Option \*qIgnore\*q \*q" boolean \*q
-This optional entry specifies that the device should be ignored entirely,
-and not added to the server. This can be useful when the device is handled
-by another program and no X events should be generated.
-.SH "DEVICE SECTION"
-The config file may have multiple
-.B Device
-sections.
-There must be at least one, for the video card being used.
-.PP
-.B Device
-sections have the following format:
-.PP
-.RS 4
-.nf
-.B  "Section \*qDevice\*q"
-.BI "    Identifier \*q" name \*q
-.BI "    Driver     \*q" driver \*q
-.I  "    entries"
-.I  "    ..."
-.B  "EndSection"
-.fi
-.RE
-.PP
-The
-.B Identifier
-and
-.B Driver
-entries are required in all
-.B Device
-sections.  All other entries are optional.
-.PP
-The
-.B Identifier
-entry specifies the unique name for this graphics device.
-The
-.B Driver
-entry specifies the name of the driver to use for this graphics device.
-When using the loadable server, the driver module
-.RI \*q driver \*q
-will be loaded for each active
-.B Device
-section.
-A
-.B Device
-section is considered active if it is referenced by an active
-.B Screen
-section.
-.PP
-.B Device
-sections recognise some driver\-independent entries and
-.BR Options ,
-which are described here.
-Not all drivers make use of these
-driver\-independent entries, and many of those that do don't require them
-to be specified because the information is auto\-detected.
-See the individual graphics driver manual pages for further information
-about this, and for a description of the device\-specific options.
-Note that most of the
-.B Options
-listed here (but not the other entries) may be specified in the
-.B Screen
-section instead of here in the
-.B Device
-section.
-.TP 7
-.BI "BusID  \*q" bus\-id \*q
-This specifies the bus location of the graphics card.
-For PCI/AGP cards,
-the
-.I bus\-id
-string has the form
-.BI PCI: bus : device : function
-(e.g., \(lqPCI:1:0:0\(rq might be appropriate for an AGP card).
-This field is usually optional in single-head configurations when using
-the primary graphics card.
-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 pciaccess tool
-scanpci.
-.TP 7
-.BI "Screen  " number
-This option is mandatory for cards where a single PCI entity can drive more
-than one display (i.e., multiple CRTCs sharing a single graphics accelerator
-and video memory).
-One
-.B Device
-section is required for each head, and this
-parameter determines which head each of the
-.B Device
-sections applies to.
-The legal values of
-.I number
-range from 0 to one less than the total number of heads per entity.
-Most drivers require that the primary screen (0) be present.
-.TP 7
-.BI "Chipset  \*q" chipset \*q
-This usually optional entry specifies the chipset used on the graphics
-board.
-In most cases this entry is not required because the drivers will probe the
-hardware to determine the chipset type.
-Don't specify it unless the driver-specific documentation recommends that you
-do.
-.TP 7
-.BI "Ramdac  \*q" ramdac\-type \*q
-This optional entry specifies the type of RAMDAC used on the graphics
-board.
-This is only used by a few of the drivers, and in most cases it is not
-required because the drivers will probe the hardware to determine the
-RAMDAC type where possible.
-Don't specify it unless the driver-specific documentation recommends that you
-do.
-.TP 7
-.BI "DacSpeed  " speed
-.TP 7
-.BI "DacSpeed  " "speed\-8 speed\-16 speed\-24 speed\-32"
-This optional entry specifies the RAMDAC speed rating (which is usually
-printed on the RAMDAC chip).
-The speed is in MHz.
-When one value is given, it applies to all framebuffer pixel sizes.
-When multiple values are given, they apply to the framebuffer pixel sizes
-8, 16, 24 and 32 respectively.
-This is not used by many drivers, and only needs to be specified when the
-speed rating of the RAMDAC is different from the defaults built in to
-driver, or when the driver can't auto-detect the correct defaults.
-Don't specify it unless the driver-specific documentation recommends that you
-do.
-.TP 7
-.BI "Clocks  " "clock ..."
-specifies the pixel that are on your graphics board.
-The clocks are in MHz, and may be specified as a floating point number.
-The value is stored internally to the nearest kHz.
-The ordering of the clocks is important.
-It must match the order in which they are selected on the graphics board.
-Multiple
-.B Clocks
-lines may be specified, and each is concatenated to form the list.
-Most drivers do not use this entry, and it is only required for some older
-boards with non-programmable clocks.
-Don't specify this entry unless the driver-specific documentation explicitly
-recommends that you do.
-.TP
-.BI "ClockChip  \*q" clockchip\-type \*q
-This optional entry is used to specify the clock chip type on graphics
-boards which have a programmable clock generator.
-Only a few __xservername__ drivers support programmable clock chips.
-For details, see the appropriate driver manual page.
-.TP 7
-.BI "VideoRam  " "mem"
-This optional entry specifies the amount of video ram that is installed
-on the graphics board.
-This is measured in kBytes.
-In most cases this is not required because the __xservername__ server probes
-the graphics board to determine this quantity.
-The driver-specific documentation should indicate when it might be needed.
-.TP 7
-.BI "BiosBase  " "baseaddress"
-This optional entry specifies the base address of the video BIOS for
-the VGA board.
-This address is normally auto-detected, and should only be specified if the
-driver-specific documentation recommends it.
-.TP 7
-.BI "MemBase  " "baseaddress"
-This optional entry specifies the memory base address of a graphics
-board's linear frame buffer.
-This entry is not used by many drivers, and it should only be specified if
-the driver-specific documentation recommends it.
-.TP 7
-.BI "IOBase  " "baseaddress"
-This optional entry specifies the IO base address.
-This entry is not used by many drivers, and it should only be specified if
-the driver-specific documentation recommends it.
-.TP 7
-.BI "ChipID  " "id"
-This optional entry specifies a numerical ID representing the chip type.
-For PCI cards, it is usually the device ID.
-This can be used to override the auto-detection, but that should only be done
-when the driver-specific documentation recommends it.
-.TP 7
-.BI "ChipRev  " "rev"
-This optional entry specifies the chip revision number.
-This can be used to override the auto-detection, but that should only be done
-when the driver-specific documentation recommends it.
-.TP 7
-.BI "TextClockFreq  " "freq"
-This optional entry specifies the pixel clock frequency that is used
-for the regular text mode.
-The frequency is specified in MHz.
-This is rarely used.
-.TP 7
-.BI "Option \*qModeDebug\*q \*q" boolean \*q
-Enable printing of additional debugging information about modesetting to
-the server log.
-.ig
-.TP 7
-This optional entry allows an IRQ number to be specified.
-..
-.TP 7
-.B Options
-Option flags may be specified in the
-.B Device
-sections.
-These include driver\-specific options and driver\-independent options.
-The former are described in the driver\-specific documentation.
-Some of the latter are described below in the section about the
-.B Screen
-section, and they may also be included here.
-
-.SH "VIDEOADAPTOR SECTION"
-Nobody wants to say how this works.
-Maybe nobody knows ...
-
-.SH "MONITOR SECTION"
-The config file may have multiple
-.B Monitor
-sections.
-There should normally be at least one, for the monitor being used,
-but a default configuration will be created when one isn't specified.
-.PP
-.B Monitor
-sections have the following format:
-.PP
-.RS 4
-.nf
-.B  "Section \*qMonitor\*q"
-.BI "    Identifier \*q" name \*q
-.I  "    entries"
-.I  "    ..."
-.B  "EndSection"
-.fi
-.RE
-.PP
-The only mandatory entry in a
-.B Monitor
-section is the
-.B Identifier
-entry.
-.PP
-The
-.B Identifier
-entry specifies the unique name for this monitor.
-The
-.B Monitor
-section may be used to provide information about the specifications of the
-monitor, monitor-specific
-.BR Options ,
-and information about the video modes to use with the monitor.
-.PP
-With RandR 1.2-enabled drivers, monitor sections may be tied to specific
-outputs of the video card.  Using the name of the output defined by the video
-driver plus the identifier of a monitor section, one associates a monitor
-section with an output by adding an option to the Device section in the
-following format:
-
-.B Option \*qMonitor-outputname\*q \*qmonitorsection\*q
-
-(for example,
-.B Option \*qMonitor-VGA\*q \*qVGA monitor\*q
-for a VGA output)
-.PP
-In the absence of specific association of monitor sections to outputs, if a
-monitor section is present the server will associate it with an output to
-preserve compatibility for previous single-head configurations.
-.PP
-Specifying video modes is optional because the server will use the DDC or other
-information provided by the monitor to automatically configure the list of
-modes available.
-When modes are specified explicitly in the
-.B Monitor
-section (with the
-.BR Modes ,
-.BR ModeLine ,
-or
-.B UseModes
-keywords), built-in modes with the same names are not included.
-Built-in modes with different names are, however, still implicitly included,
-when they meet the requirements of the monitor.
-.PP
-The entries that may be used in
-.B Monitor
-sections are described below.
-.TP 7
-.BI "VendorName  \*q" vendor \*q
-This optional entry specifies the monitor's manufacturer.
-.TP 7
-.BI "ModelName  \*q" model \*q
-This optional entry specifies the monitor's model.
-.TP 7
-.BI "HorizSync  " "horizsync\-range"
-gives the range(s) of horizontal sync frequencies supported by the
-monitor.
-.I horizsync\-range
-may be a comma separated list of either discrete values or ranges of
-values.
-A range of values is two values separated by a dash.
-By default the values are in units of kHz.
-They may be specified in MHz or Hz
-if
-.B MHz
-or
-.B Hz
-is added to the end of the line.
-The data given here is used by the __xservername__ server to determine if video
-modes are within the specifications of the monitor.
-This information should be available in the monitor's handbook.
-If this entry is omitted, a default range of 28\-33kHz is used.
-.TP 7
-.BI "VertRefresh  " "vertrefresh\-range"
-gives the range(s) of vertical refresh frequencies supported by the
-monitor.
-.I vertrefresh\-range
-may be a comma separated list of either discrete values or ranges of
-values.
-A range of values is two values separated by a dash.
-By default the values are in units of Hz.
-They may be specified in MHz or kHz
-if
-.B MHz
-or
-.B kHz
-is added to the end of the line.
-The data given here is used by the __xservername__ server to determine if video
-modes are within the specifications of the monitor.
-This information should be available in the monitor's handbook.
-If this entry is omitted, a default range of 43\-72Hz is used.
-.TP 7
-.BI "DisplaySize  " "width height"
-This optional entry gives the width and height, in millimetres, of the
-picture area of the monitor.
-If given this is used to calculate the horizontal and vertical pitch (DPI) of
-the screen.
-.TP 7
-.BI "Gamma  " "gamma\-value"
-.TP 7
-.BI "Gamma  " "red\-gamma green\-gamma blue\-gamma"
-This is an optional entry that can be used to specify the gamma correction
-for the monitor.
-It may be specified as either a single value or as three separate RGB values.
-The values should be in the range 0.1 to 10.0, and the default is 1.0.
-Not all drivers are capable of using this information.
-.TP 7
-.BI "UseModes  \*q" modesection\-id \*q
-Include the set of modes listed in the
-.B Modes
-section called
-.IR modesection\-id.
-This makes all of the modes defined in that section available for use by
-this monitor.
-.TP 7
-.BI "Mode  \*q" name \*q
-This is an optional multi-line entry that can be used to provide
-definitions for video modes for the monitor.
-In most cases this isn't necessary because the built-in set of VESA standard
-modes will be sufficient.
-The
-.B Mode
-keyword indicates the start of a multi-line video mode description.
-The mode description is terminated with the
-.B EndMode
-keyword.
-The mode description consists of the following entries:
-.RS 7
-.TP 4
-.BI "DotClock  " clock
-is the dot (pixel) clock rate to be used for the mode.
-.TP 4
-.BI "HTimings  " "hdisp hsyncstart hsyncend htotal"
-specifies the horizontal timings for the mode.
-.TP 4
-.BI "VTimings  " "vdisp vsyncstart vsyncend vtotal"
-specifies the vertical timings for the mode.
-.TP 4
-.BI "Flags  \*q" flag \*q " ..."
-specifies an optional set of mode flags, each of which is a separate
-string in double quotes.
-.B \*qInterlace\*q
-indicates that the mode is interlaced.
-.B \*qDoubleScan\*q
-indicates a mode where each scanline is doubled.
-.B \*q+HSync\*q
-and
-.B \*q\-HSync\*q
-can be used to select the polarity of the HSync signal.
-.B \*q+VSync\*q
-and
-.B \*q\-VSync\*q
-can be used to select the polarity of the VSync signal.
-.B \*qComposite\*q
-can be used to specify composite sync on hardware where this is supported.
-Additionally, on some hardware,
-.B \*q+CSync\*q
-and
-.B \*q\-CSync\*q
-may be used to select the composite sync polarity.
-.TP 4
-.BI "HSkew  " hskew
-specifies the number of pixels (towards the right edge of the screen) by
-which the display enable signal is to be skewed.
-Not all drivers use this information.
-This option might become necessary to override the default value supplied
-by the server (if any).
-\(lqRoving\(rq horizontal lines indicate this value needs to be increased.
-If the last few pixels on a scan line appear on the left of the screen,
-this value should be decreased.
-.TP 4
-.BI "VScan  " vscan
-specifies the number of times each scanline is painted on the screen.
-Not all drivers use this information.
-Values less than 1 are treated as 1, which is the default.
-Generally, the
-.B \*qDoubleScan\*q
-.B Flag
-mentioned above doubles this value.
-.RE
-.TP 7
-.BI "ModeLine  \*q" name \*q " mode\-description"
-This entry is a more compact version of the
-.B Mode
-entry, and it also can be used to specify video modes for the monitor.
-is a single line format for specifying video modes.
-In most cases this isn't necessary because the built\-in set of VESA
-standard modes will be sufficient.
-.PP
-.RS 7
-The
-.I mode\-description
-is in four sections, the first three of which are mandatory.
-The first is the dot (pixel) clock.
-This is a single number specifying the pixel clock rate for the mode in
-MHz.
-The second section is a list of four numbers specifying the horizontal
-timings.
-These numbers are the
-.IR hdisp ,
-.IR hsyncstart ,
-.IR hsyncend ,
-and
-.I htotal
-values.
-The third section is a list of four numbers specifying the vertical
-timings.
-These numbers are the
-.IR vdisp ,
-.IR vsyncstart ,
-.IR vsyncend ,
-and
-.I vtotal
-values.
-The final section is a list of flags specifying other characteristics of
-the mode.
-.B Interlace
-indicates that the mode is interlaced.
-.B DoubleScan
-indicates a mode where each scanline is doubled.
-.B +HSync
-and
-.B \-HSync
-can be used to select the polarity of the HSync signal.
-.B +VSync
-and
-.B \-VSync
-can be used to select the polarity of the VSync signal.
-.B Composite
-can be used to specify composite sync on hardware where this is supported.
-Additionally, on some hardware,
-.B +CSync
-and
-.B \-CSync
-may be used to select the composite sync polarity.
-The
-.B HSkew
-and
-.B VScan
-options mentioned above in the
-.B Modes
-entry description can also be used here.
-.RE
-.TP 7
-.BI "Option " "\*qDPMS\*q  " \*qbool\*q
-This option controls whether the server should enable the DPMS extension
-for power management for this screen.  The default is to enable the
-extension.
-.TP 7
-.BI "Option " "\*qSyncOnGreen\*q  " \*qbool\*q
-This option controls whether the video card should drive the sync signal
-on the green color pin.  Not all cards support this option, and most
-monitors do not require it.  The default is off.
-.TP 7
-.BI "Option " "\*qPrimary\*q  " \*qbool\*q
-This optional entry specifies that the monitor should be treated as the primary
-monitor. (RandR 1.2-supporting drivers only)
-.TP 7
-.BI "Option " "\*qPreferredMode\*q  " \*qstring\*q
-This optional entry specifies a mode to be marked as the preferred initial mode
-of the monitor.
-(RandR 1.2-supporting drivers only)
-.TP 7
-.BI "Option " "\*qPosition\*q  " "\*qx y\*q"
-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  " \*qoutput\*q
-This optional entry specifies that the monitor should be positioned to the
-left of the output (not monitor) of the given name.
-(RandR 1.2-supporting drivers only)
-.TP 7
-.BI "Option " "\*qRightOf\*q  " \*qoutput\*q
-This optional entry specifies that the monitor should be positioned to the
-right of the output (not monitor) of the given name.
-(RandR 1.2-supporting drivers only)
-.TP 7
-.BI "Option " "\*qAbove\*q  " \*qoutput\*q
-This optional entry specifies that the monitor should be positioned above the
-output (not monitor) of the given name.
-(RandR 1.2-supporting drivers only)
-.TP 7
-.BI "Option " "\*qBelow\*q  " \*qoutput\*q
-This optional entry specifies that the monitor should be positioned below the
-output (not monitor) of the given name.
-(RandR 1.2-supporting drivers only)
-.TP 7
-.BI "Option " "\*qEnable\*q  " \*qbool\*q
-This optional entry specifies whether the monitor should be turned on
-at startup.  By default, the server will attempt to enable all connected
-monitors.
-(RandR 1.2-supporting drivers only)
-.TP 7
-.BI "Option " "\*qDefaultModes\*q  " \*qbool\*q
-This optional entry specifies whether the server should add supported default
-modes to the list of modes offered on this monitor. By default, the server
-will add default modes; you should only disable this if you can guarantee
-that EDID will be available at all times, or if you have added custom modelines
-which the server can use.
-(RandR 1.2-supporting drivers only)
-.TP 7
-.BI "Option " "\*qMinClock\*q  " \*qfrequency\*q
-This optional entry specifies the minimum dot clock, in kHz, that is supported
-by the monitor.
-.TP 7
-.BI "Option " "\*qMaxClock\*q  " \*qfrequency\*q
-This optional entry specifies the maximum dot clock, in kHz, that is supported
-by the monitor.
-.TP 7
-.BI "Option " "\*qIgnore\*q  " \*qbool\*q
-This optional entry specifies that the monitor should be ignored entirely,
-and not reported through RandR.  This is useful if the hardware reports the
-presence of outputs that don't exist.
-(RandR 1.2-supporting drivers only)
-.TP 7
-.BI "Option " "\*qRotate\*q  " \*qrotation\*q
-This optional entry specifies the initial rotation of the given monitor.
-Valid values for rotation are \*qnormal\*q, \*qleft\*q, \*qright\*q, and
-\*qinverted\*q.
-(RandR 1.2-supporting drivers only)
-
-.SH "MODES SECTION"
-The config file may have multiple
-.B Modes
-sections, or none.
-These sections provide a way of defining sets of video modes independently
-of the
-.B Monitor
-sections.
-.B Monitor
-sections may include the definitions provided in these sections by
-using the
-.B UseModes
-keyword.
-In most cases the
-.B Modes
-sections are not necessary because the built\-in set of VESA standard modes
-will be sufficient.
-.PP
-.B Modes
-sections have the following format:
-.PP
-.RS 4
-.nf
-.B  "Section \*qModes\*q"
-.BI "    Identifier \*q" name \*q
-.I  "    entries"
-.I  "    ..."
-.B  "EndSection"
-.fi
-.RE
-.PP
-The
-.B Identifier
-entry specifies the unique name for this set of mode descriptions.
-The other entries permitted in
-.B Modes
-sections are the
-.B Mode
-and
-.B ModeLine
-entries that are described above in the
-.B Monitor
-section.
-.SH "SCREEN SECTION"
-The config file may have multiple
-.B Screen
-sections.
-There must be at least one, for the \(lqscreen\(rq being used.
-A \(lqscreen\(rq represents the binding of a graphics device
-.RB ( Device
-section) and a monitor
-.RB ( Monitor
-section).
-A
-.B Screen
-section is considered \(lqactive\(rq if it is referenced by an active
-.B ServerLayout
-section or by the
-.B \-screen
-command line option.
-If neither of those is present, the first
-.B Screen
-section found in the config file is considered the active one.
-.PP
-.B Screen
-sections have the following format:
-.PP
-.RS 4
-.nf
-.B  "Section \*qScreen\*q"
-.BI "    Identifier \*q" name \*q
-.BI "    Device     \*q" devid \*q
-.BI "    Monitor    \*q" monid \*q
-.I  "    entries"
-.I  "    ..."
-.BI "    SubSection \*qDisplay\*q"
-.I  "       entries"
-.I  "       ...
-.B  "    EndSubSection"
-.I  "    ..."
-.B  "EndSection"
-.fi
-.RE
-.PP
-The
-.B Identifier
-and
-.B Device
-entries are mandatory.
-All others are optional.
-.PP
-The
-.B Identifier
-entry specifies the unique name for this screen.
-The
-.B Screen
-section provides information specific to the whole screen, including
-screen\-specific
-.BR Options .
-In multi\-head configurations, there will be multiple active
-.B Screen
-sections, one for each head.
-The entries available
-for this section are:
-.TP 7
-.BI "Device  \*q" device\-id \*q
-This mandatory entry specifies the
-.B Device
-section to be used for this screen.
-This is what ties a specific graphics card to a screen.
-The
-.I device\-id
-must match the
-.B Identifier
-of a
-.B Device
-section in the config file.
-.TP 7
-.BI "Monitor  \*q" monitor\-id \*q
-specifies which monitor description is to be used for this screen.
-If a
-.B Monitor
-name is not specified, a default configuration is used.
-Currently the default configuration may not function as expected on all
-platforms.
-.TP 7
-.BI "VideoAdaptor  \*q" xv\-id \*q
-specifies an optional Xv video adaptor description to be used with this
-screen.
-.TP 7
-.BI "DefaultDepth  " depth
-specifies which color depth the server should use by default.
-The
-.B \-depth
-command line option can be used to override this.
-If neither is specified, the default depth is driver\-specific, but in most
-cases is 8.
-.TP 7
-.BI "DefaultFbBpp  " bpp
-specifies which framebuffer layout to use by default.
-The
-.B \-fbbpp
-command line option can be used to override this.
-In most cases the driver will chose the best default value for this.
-The only case where there is even a choice in this value is for depth 24,
-where some hardware supports both a packed 24 bit framebuffer layout and a
-sparse 32 bit framebuffer layout.
-.TP 7
-.B Options
-Various
-.B Option
-flags may be specified in the
-.B Screen
-section.
-Some are driver\-specific and are described in the driver documentation.
-Others are driver\-independent, and will eventually be described here.
-.\" XXX These should really be in an xaa man page.
-.TP 7
-.BI "Option \*qAccel\*q"
-Enables XAA (X Acceleration Architecture), a mechanism that makes video cards'
-2D hardware acceleration available to the  __xservername__ server.
-This option is on by default, but it may be necessary to turn it off if
-there are bugs in the driver.
-There are many options to disable specific accelerated operations, listed
-below.
-Note that disabling an operation will have no effect if the operation is
-not accelerated (whether due to lack of support in the hardware or in the
-driver).
-.TP 7
-.BI "Option \*qInitPrimary\*q \*q" boolean \*q
-Use the Int10 module to initialize the primary graphics card.
-Normally, only secondary cards are soft-booted using the Int10 module, as the
-primary card has already been initialized by the BIOS at boot time.
-Default: false.
-.TP 7
-.BI "Option \*qNoInt10\*q \*q" boolean \*q
-Disables the Int10 module, a module that uses the int10 call to the BIOS
-of the graphics card to initialize it.
-Default: false.
-.TP 7
-.BI "Option \*qNoMTRR\*q"
-Disables MTRR (Memory Type Range Register) support, a feature of modern
-processors which can improve video performance by a factor of up to 2.5.
-Some hardware has buggy MTRR support, and some video drivers have been
-known to exhibit problems when MTRR's are used.
-.TP 7
-.BI "Option \*qXaaNoCPUToScreenColorExpandFill\*q"
-Disables accelerated rectangular expansion blits from source patterns
-stored in system memory (using a memory\-mapped aperture).
-.TP 7
-.BI "Option \*qXaaNoColor8x8PatternFillRect\*q"
-Disables accelerated fills of a rectangular region with a full\-color
-pattern.
-.TP 7
-.BI "Option \*qXaaNoColor8x8PatternFillTrap\*q"
-Disables accelerated fills of a trapezoidal region with a full\-color
-pattern.
-.TP 7
-.BI "Option \*qXaaNoDashedBresenhamLine\*q"
-Disables accelerated dashed Bresenham line draws.
-.TP 7
-.BI "Option \*qXaaNoDashedTwoPointLine\*q"
-Disables accelerated dashed line draws between two arbitrary points.
-.TP 7
-.BI "Option \*qXaaNoImageWriteRect\*q"
-Disables accelerated transfers of full\-color rectangular patterns from
-system memory to video memory (using a memory\-mapped aperture).
-.TP 7
-.BI "Option \*qXaaNoMono8x8PatternFillRect\*q"
-Disables accelerated fills of a rectangular region with a monochrome
-pattern.
-.TP 7
-.BI "Option \*qXaaNoMono8x8PatternFillTrap\*q"
-Disables accelerated fills of a trapezoidal region with a monochrome
-pattern.
-.TP 7
-.BI "Option \*qXaaNoOffscreenPixmaps\*q"
-Disables accelerated draws into pixmaps stored in offscreen video memory.
-.TP 7
-.BI "Option \*qXaaNoPixmapCache\*q"
-Disables caching of patterns in offscreen video memory.
-.TP 7
-.BI "Option \*qXaaNoScanlineCPUToScreenColorExpandFill\*q"
-Disables accelerated rectangular expansion blits from source patterns
-stored in system memory (one scan line at a time).
-.TP 7
-.BI "Option \*qXaaNoScanlineImageWriteRect\*q"
-Disables accelerated transfers of full\-color rectangular patterns from
-system memory to video memory (one scan line at a time).
-.TP 7
-.BI "Option \*qXaaNoScreenToScreenColorExpandFill\*q"
-Disables accelerated rectangular expansion blits from source patterns
-stored in offscreen video memory.
-.TP 7
-.BI "Option \*qXaaNoScreenToScreenCopy\*q"
-Disables accelerated copies of rectangular regions from one part of
-video memory to another part of video memory.
-.TP 7
-.BI "Option \*qXaaNoSolidBresenhamLine\*q"
-Disables accelerated solid Bresenham line draws.
-.TP 7
-.BI "Option \*qXaaNoSolidFillRect\*q"
-Disables accelerated solid\-color fills of rectangles.
-.TP 7
-.BI "Option \*qXaaNoSolidFillTrap\*q"
-Disables accelerated solid\-color fills of Bresenham trapezoids.
-.TP 7
-.BI "Option \*qXaaNoSolidHorVertLine\*q"
-Disables accelerated solid horizontal and vertical line draws.
-.TP 7
-.BI "Option \*qXaaNoSolidTwoPointLine\*q"
-Disables accelerated solid line draws between two arbitrary points.
-.PP
-Each
-.B Screen
-section may optionally contain one or more
-.B Display
-subsections.
-Those subsections provide depth/fbbpp specific configuration information,
-and the one chosen depends on the depth and/or fbbpp that is being used for
-the screen.
-The
-.B Display
-subsection format is described in the section below.
-
-.SH "DISPLAY SUBSECTION"
-Each
-.B Screen
-section may have multiple
-.B Display
-subsections.
-The \(lqactive\(rq
-.B Display
-subsection is the first that matches the depth and/or fbbpp values being
-used, or failing that, the first that has neither a depth or fbbpp value
-specified.
-The
-.B Display
-subsections are optional.
-When there isn't one that matches the depth and/or fbbpp values being used,
-all the parameters that can be specified here fall back to their defaults.
-.PP
-.B Display
-subsections have the following format:
-.PP
-.RS 4
-.nf
-.B  "    SubSection \*qDisplay\*q"
-.BI "        Depth  " depth
-.I  "        entries"
-.I  "        ..."
-.B  "    EndSubSection"
-.fi
-.RE
-.TP 7
-.BI "Depth  " depth
-This entry specifies what colour depth the
-.B Display
-subsection is to be used for.
-This entry is usually specified, but it may be omitted to create a match\-all
-.B Display
-subsection or when wishing to match only against the
-.B FbBpp
-parameter.
-The range of
-.I depth
-values that are allowed depends on the driver.
-Most drivers support 8, 15, 16 and 24.
-Some also support 1 and/or 4, and some may support other values (like 30).
-Note:
-.I depth
-means the number of bits in a pixel that are actually used to determine
-the pixel colour.
-32 is not a valid
-.I depth
-value.
-Most hardware that uses 32 bits per pixel only uses 24 of them to hold the
-colour information, which means that the colour depth is 24, not 32.
-.TP 7
-.BI "FbBpp  " bpp
-This entry specifies the framebuffer format this
-.B Display
-subsection is to be used for.
-This entry is only needed when providing depth 24 configurations that allow
-a choice between a 24 bpp packed framebuffer format and a 32bpp sparse
-framebuffer format.
-In most cases this entry should not be used.
-.TP 7
-.BI "Weight  " "red\-weight green\-weight blue\-weight"
-This optional entry specifies the relative RGB weighting to be used
-for a screen is being used at depth 16 for drivers that allow multiple
-formats.
-This may also be specified from the command line with the
-.B \-weight
-option (see
-.BR __xservername__(__appmansuffix__)).
-.TP 7
-.BI "Virtual  " "xdim ydim"
-This optional entry specifies the virtual screen resolution to be used.
-.I xdim
-must be a multiple of either 8 or 16 for most drivers, and a multiple
-of 32 when running in monochrome mode.
-The given value will be rounded down if this is not the case.
-Video modes which are too large for the specified virtual size will be
-rejected.
-If this entry is not present, the virtual screen resolution will be set to
-accommodate all the valid video modes given in the
-.B Modes
-entry.
-Some drivers/hardware combinations do not support virtual screens.
-Refer to the appropriate driver\-specific documentation for details.
-.TP 7
-.BI "ViewPort  " "x0 y0"
-This optional entry sets the upper left corner of the initial display.
-This is only relevant when the virtual screen resolution is different
-from the resolution of the initial video mode.
-If this entry is not given, then the initial display will be centered in
-the virtual display area.
-.TP 7
-.BI "Modes  \*q" mode\-name \*q " ..."
-This optional entry specifies the list of video modes to use.
-Each
-.I mode\-name
-specified must be in double quotes.
-They must correspond to those specified or referenced in the appropriate
-.B Monitor
-section (including implicitly referenced built\-in VESA standard modes).
-The server will delete modes from this list which don't satisfy various
-requirements.
-The first valid mode in this list will be the default display mode for
-startup.
-The list of valid modes is converted internally into a circular list.
-It is possible to switch to the next mode with
-.B Ctrl+Alt+Keypad\-Plus
-and to the previous mode with
-.BR Ctrl+Alt+Keypad\-Minus .
-When this entry is omitted, the valid modes referenced by the appropriate
-.B Monitor
-section will be used.  If the
-.B Monitor
-section contains no modes, then the selection will be taken from the
-built-in VESA standard modes.
-.TP 7
-.BI "Visual  \*q" visual\-name \*q
-This optional entry sets the default root visual type.
-This may also be specified from the command line (see the
-.BR Xserver(__appmansuffix__)
-man page).
-The visual types available for depth 8 are (default is
-.BR PseudoColor ):
-.PP
-.RS 11
-.nf
-.B StaticGray
-.B GrayScale
-.B StaticColor
-.B PseudoColor
-.B TrueColor
-.B DirectColor
-.fi
-.RE
-.PP
-.RS 7
-The visual type available for the depths 15, 16 and 24 are (default is
-.BR TrueColor ):
-.PP
-.RS 4
-.nf
-.B TrueColor
-.B DirectColor
-.fi
-.RE
-.PP
-Not all drivers support
-.B DirectColor
-at these depths.
-.PP
-The visual types available for the depth 4 are (default is
-.BR StaticColor ):
-.PP
-.RS 4
-.nf
-.B StaticGray
-.B GrayScale
-.B StaticColor
-.B PseudoColor
-.fi
-.RE
-.PP
-The visual type available for the depth 1 (monochrome) is
-.BR StaticGray .
-.RE
-.TP 7
-.BI "Black  " "red green blue"
-This optional entry allows the \(lqblack\(rq colour to be specified.
-This is only supported at depth 1.
-The default is black.
-.TP 7
-.BI "White  " "red green blue"
-This optional entry allows the \(lqwhite\(rq colour to be specified.
-This is only supported at depth 1.
-The default is white.
-.TP 7
-.B Options
-Option flags may be specified in the
-.B Display
-subsections.
-These may include driver\-specific options and driver\-independent options.
-The former are described in the driver\-specific documentation.
-Some of the latter are described above in the section about the
-.B Screen
-section, and they may also be included here.
-.SH "SERVERLAYOUT SECTION"
-The config file may have multiple
-.B ServerLayout
-sections.
-A \(lqserver layout\(rq represents the binding of one or more screens
-.RB ( Screen
-sections) and one or more input devices
-.RB ( InputDevice
-sections) to form a complete configuration.
-In multi\-head configurations, it also specifies the relative layout of the
-heads.
-A
-.B ServerLayout
-section is considered \(lqactive\(rq if it is referenced by the
-.B \-layout
-command line option or by an
-.B "Option \*qDefaultServerLayout\*q"
-entry in the
-.B ServerFlags
-section (the former takes precedence over the latter).
-If those options are not used, the first
-.B ServerLayout
-section found in the config file is considered the active one.
-If no
-.B ServerLayout
-sections are present, the single active screen and two active (core)
-input devices are selected as described in the relevant sections above.
-.PP
-.B ServerLayout
-sections have the following format:
-.PP
-.RS 4
-.nf
-.B  "Section \*qServerLayout\*q"
-.BI "    Identifier   \*q" name \*q
-.BI "    Screen       \*q" screen\-id \*q
-.I  "    ..."
-.BI "    InputDevice  \*q" idev\-id \*q
-.I  "    ..."
-.I  "    options"
-.I  "    ..."
-.B  "EndSection"
-.fi
-.RE
-.PP
-Each
-.B ServerLayout
-section must have an
-.B Identifier
-entry and at least one
-.B Screen
-entry.
-.PP
-The
-.B Identifier
-entry specifies the unique name for this server layout.
-The
-.B ServerLayout
-section provides information specific to the whole session, including
-session\-specific
-.BR Options .
-The
-.B ServerFlags
-options (described above) may be specified here, and ones given here
-override those given in the
-.B ServerFlags
-section.
-.PP
-The entries that may be used in this section are described here.
-.TP 7
-.BI "Screen  " "screen\-num" " \*qscreen\-id\*q " "position\-information"
-One of these entries must be given for each screen being used in
-a session.
-The
-.I screen\-id
-field is mandatory, and specifies the
-.B Screen
-section being referenced.
-The
-.I screen\-num
-field is optional, and may be used to specify the screen number
-in multi\-head configurations.
-When this field is omitted, the screens will be numbered in the order that
-they are listed in.
-The numbering starts from 0, and must be consecutive.
-The
-.I position\-information
-field describes the way multiple screens are positioned.
-There are a number of different ways that this information can be provided:
-.RS 7
-.TP 4
-.I  "x y"
-.TP 4
-.BI "Absolute  " "x y"
-These both specify that the upper left corner's coordinates are
-.RI ( x , y ).
-The
-.B Absolute
-keyword is optional.
-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
-.BI "RightOf   \*q" screen\-id \*q
-.TP 4
-.BI "LeftOf    \*q" screen\-id \*q
-.TP 4
-.BI "Above     \*q" screen\-id \*q
-.TP 4
-.BI "Below     \*q" screen\-id \*q
-.TP 4
-.BI "Relative  \*q" screen\-id \*q " x y"
-These give the screen's location relative to another screen.
-The first four position the screen immediately to the right, left, above or
-below the other screen.
-When positioning to the right or left, the top edges are aligned.
-When positioning above or below, the left edges are aligned.
-The
-.B Relative
-form specifies the offset of the screen's origin (upper left corner)
-relative to the origin of another screen.
-.RE
-.TP 7
-.BI "InputDevice  \*q" idev\-id "\*q \*q" option \*q " ..."
-One of these entries should be given for each input device being used in
-a session.
-Normally at least two are required, one each for the core pointer and
-keyboard devices.
-If either of those is missing, suitable
-.B InputDevice
-entries are searched for using the method described above in the
-.B INPUTDEVICE
-section.  The
-.I idev\-id
-field is mandatory, and specifies the name of the
-.B InputDevice
-section being referenced.
-Multiple
-.I option
-fields may be specified, each in double quotes.
-The options permitted here are any that may also be given in the
-.B InputDevice
-sections.
-Normally only session\-specific input device options would be used here.
-The most commonly used options are:
-.PP
-.RS 11
-.nf
-.B \*qCorePointer\*q
-.B \*qCoreKeyboard\*q
-.B \*qSendCoreEvents\*q
-.fi
-.RE
-.PP
-.RS 7
-and the first two should normally be used to indicate the core pointer
-and core keyboard devices respectively.
-.RE
-.TP 7
-.B Options
-In addition to the following, any option permitted in the
-.B ServerFlags
-section may also be specified here.
-When the same option appears in both places, the value given here overrides
-the one given in the
-.B ServerFlags
-section.
-.TP 7
-.BI "Option \*qIsolateDevice\*q  \*q" bus\-id \*q
-Restrict device resets to the specified
-.IR bus\-id .
-See the
-.B BusID
-option (described in
-.BR "DEVICE SECTION" ,
-above) for the format of the
-.I bus\-id
-parameter.
-This option overrides
-.BR SingleCard ,
-if specified.
-At present, only PCI devices can be isolated in this manner.
-.TP 7
-.BI "Option \*qSingleCard\*q  \*q" boolean \*q
-As
-.BR IsolateDevice ,
-except that the bus ID of the first device in the layout is used.
-.PP
-Here is an example of a
-.B ServerLayout
-section for a dual headed configuration with two mice:
-.PP
-.RS 4
-.nf
-.B "Section \*qServerLayout\*q"
-.B "    Identifier  \*qLayout 1\*q"
-.B "    Screen      \*qMGA 1\*q"
-.B "    Screen      \*qMGA 2\*q RightOf \*qMGA 1\*q"
-.B "    InputDevice \*qKeyboard 1\*q \*qCoreKeyboard\*q"
-.B "    InputDevice \*qMouse 1\*q    \*qCorePointer\*q"
-.B "    InputDevice \*qMouse 2\*q    \*qSendCoreEvents\*q"
-.B "    Option      \*qBlankTime\*q  \*q5\*q"
-.B "EndSection"
-.fi
-.RE
-.SH "DRI SECTION"
-This optional section is used to provide some information for the
-Direct Rendering Infrastructure.
-Details about the format of this section can be found on-line at
-.IR <http://dri.freedesktop.org/> .
-.SH "VENDOR SECTION"
-The optional
-.B Vendor
-section may be used to provide vendor\-specific configuration information.
-Multiple
-.B Vendor
-sections may be present, and they may contain an
-.B Identifier
-entry and multiple
-.B Option
-flags.
-The data therein is not used in this release.
-.PP
-.SH "SEE ALSO"
-General:
-.BR X (__miscmansuffix__),
-.BR Xserver (__appmansuffix__),
-.BR __xservername__ (__appmansuffix__),
-.BR cvt (__appmansuffix__),
-.BR gtf (__appmansuffix__).
-.PP
-.B "Not all modules or interfaces are available on all platforms."
-.PP
-Display drivers:
-.BR apm (__drivermansuffix__),
-.BR ati (__drivermansuffix__),
-.BR chips (__drivermansuffix__),
-.BR cirrus (__drivermansuffix__),
-.BR cyrix (__drivermansuffix__),
-.BR fbdev (__drivermansuffix__),
-.BR glide (__drivermansuffix__),
-.BR glint (__drivermansuffix__),
-.BR i128 (__drivermansuffix__),
-.BR i740 (__drivermansuffix__),
-.BR imstt (__drivermansuffix__),
-.BR intel (__drivermansuffix__),
-.BR mga (__drivermansuffix__),
-.BR neomagic (__drivermansuffix__),
-.BR nv (__drivermansuffix__),
-.BR openchrome (__drivermansuffix__),
-.BR r128 (__drivermansuffix__),
-.BR radeon (__drivermansuffix__),
-.BR rendition (__drivermansuffix__),
-.BR savage (__drivermansuffix__),
-.BR s3virge (__drivermansuffix__),
-.BR siliconmotion (__drivermansuffix__),
-.BR sis (__drivermansuffix__),
-.BR sisusb (__drivermansuffix__),
-.BR sunbw2 (__drivermansuffix__),
-.BR suncg14 (__drivermansuffix__),
-.BR suncg3 (__drivermansuffix__),
-.BR suncg6 (__drivermansuffix__),
-.BR sunffb (__drivermansuffix__),
-.BR sunleo (__drivermansuffix__),
-.BR suntcx (__drivermansuffix__),
-.BR tdfx (__drivermansuffix__),
-.\" .BR tga (__drivermansuffix__),
-.BR trident (__drivermansuffix__),
-.BR tseng (__drivermansuffix__),
-.BR vesa (__drivermansuffix__),
-.BR vmware (__drivermansuffix__),
-.BR voodoo (__drivermansuffix__),
-.BR wsfb (__drivermansuffix__),
-.BR xgi (__drivermansuffix__),
-.BR xgixp (__drivermansuffix__).
-.PP
-Input drivers:
-.BR acecad (__drivermansuffix__),
-.BR citron (__drivermansuffix__),
-.BR elographics (__drivermansuffix__),
-.BR evdev (__drivermansuffix__),
-.BR fpit (__drivermansuffix__),
-.BR joystick (__drivermansuffix__),
-.BR kbd (__drivermansuffix__),
-.BR mousedrv (__drivermansuffix__),
-.BR mutouch (__drivermansuffix__),
-.BR penmount (__drivermansuffix__),
-.BR synaptics (__drivermansuffix__),
-.BR vmmouse (__drivermansuffix__),
-.BR void (__drivermansuffix__),
-.BR wacom (__drivermansuffix__).
-.PP
-Other modules and interfaces:
-.BR exa (__drivermansuffix__),
-.BR fbdevhw (__drivermansuffix__),
-.\" .BR shadowfb (__drivermansuffix__),
-.BR v4l (__drivermansuffix__).
-.br
-.SH AUTHORS
-This manual page was largely rewritten by David Dawes
-.IR <dawes@xfree86.org> .
+.\" shorthand for double quote that works everywhere.

+.ds q \N'34'

+.TH __xconfigfile__ __filemansuffix__ __vendorversion__

+.SH NAME

+__xconfigfile__ and __xconfigdir__ \- configuration files for

+__xservername__ X server

+.SH INTRODUCTION

+.B __xservername__

+supports several mechanisms for supplying/obtaining configuration and

+run-time parameters: command line options, environment variables, the

+__xconfigfile__ and __xconfigdir__ configuration files, auto-detection,

+and fallback defaults. When the same information is supplied in more

+than one way, the highest precedence mechanism is used. The list of

+mechanisms is ordered from highest precedence to lowest. Note that not

+all parameters can be supplied via all methods. The available command

+line options and environment variables (and some defaults) are

+described in the Xserver(__appmansuffix__) and

+__xservername__(__appmansuffix__) manual pages. Most configuration file

+parameters, with their defaults, are described below. Driver and module

+specific configuration parameters are described in the relevant driver

+or module manual page.

+.SH DESCRIPTION

+.B __xservername__

+uses a configuration file called

+.I __xconfigfile__

+and files ending in the suffix

+.I .conf

+from the directory

+.I __xconfigdir__

+for its initial setup.

+The

+.I __xconfigfile__

+configuration file is searched for in the following places when the

+server is started as a normal user:

+.PP

+.RS 4

+.nf

+.IR /etc/X11/ <cmdline>

+.IR __projectroot__/etc/X11/ <cmdline>

+.IB /etc/X11/ $XORGCONFIG

+.IB __projectroot__/etc/X11/ $XORGCONFIG

+.I /etc/X11/__xconfigfile__

+.I /etc/__xconfigfile__

+.IR __projectroot__/etc/X11/__xconfigfile__. <hostname>

+.I __projectroot__/etc/X11/__xconfigfile__

+.IR __projectroot__/lib/X11/__xconfigfile__. <hostname>

+.I __projectroot__/lib/X11/__xconfigfile__

+.fi

+.RE

+.PP

+where

+.I <cmdline>

+is a relative path (with no \(lq..\(rq components) specified with the

+.B \-config

+command line option,

+.B $XORGCONFIG

+is the relative path (with no \(lq..\(rq components) specified by that

+environment variable, and

+.I <hostname>

+is the machine's hostname as reported by

+.BR gethostname (__libmansuffix__).

+.PP

+When the __xservername__ server is started by the \(lqroot\(rq user, the config file

+search locations are as follows:

+.PP

+.RS 4

+.nf

+<cmdline>

+.IR /etc/X11/ <cmdline>

+.IR __projectroot__/etc/X11/ <cmdline>

+.B $XORGCONFIG

+.IB /etc/X11/ $XORGCONFIG

+.IB __projectroot__/etc/X11/ $XORGCONFIG

+.I /etc/X11/__xconfigfile__

+.I /etc/__xconfigfile__

+.IR __projectroot__/etc/X11/__xconfigfile__. <hostname>

+.I __projectroot__/etc/X11/__xconfigfile__

+.IR __projectroot__/lib/X11/__xconfigfile__. <hostname>

+.I __projectroot__/lib/X11/__xconfigfile__

+.fi

+.RE

+.PP

+where

+.I <cmdline>

+is the path specified with the

+.B \-config

+command line option (which may be absolute or relative),

+.B $XORGCONFIG

+is the path specified by that

+environment variable (absolute or relative),

+.B $HOME

+is the path specified by that environment variable (usually the home

+directory), and

+.I <hostname>

+is the machine's hostname as reported by

+.BR gethostname (__libmansuffix__).

+.PP

+Additional configuration files are searched for in the following

+directories when the server is started as a normal user:

+.PP

+.RS 4

+.nf

+.IR /etc/X11/ <cmdline>

+.IR __sysconfdir__/X11/ <cmdline>

+.I /etc/X11/__xconfigdir__

+.I __sysconfdir__/X11/__xconfigdir__

+.fi

+.RE

+.PP

+where

+.I <cmdline>

+is a relative path (with no \(lq..\(rq components) specified with the

+.B \-configdir

+command line option.

+.PP

+When the __xservername__ server is started by the \(lqroot\(rq user, the

+config directory search locations are as follows:

+.PP

+.RS 4

+.nf

+<cmdline>

+.IR /etc/X11/ <cmdline>

+.IR __sysconfdir__/X11/ <cmdline>

+.I /etc/X11/__xconfigdir__

+.I __sysconfdir__/X11/__xconfigdir__

+.fi

+.RE

+.PP

+where

+.I <cmdline>

+is the path specified with the

+.B \-configdir

+command line option (which may be absolute or relative).

+.PP

+Finally, configuration files will also be searched for in directories

+reserved for system use. These are to separate configuration files from

+the vendor or 3rd party packages from those of local administration.

+These files are found in the following directories:

+.PP

+.RS 4

+.nf

+.I /usr/share/X11/__xconfigdir__

+.I __datadir__/X11/__xconfigdir__

+.fi

+.RE

+.PP

+The

+.I __xconfigfile__

+and

+.I __xconfigdir__

+files are composed of a number of sections which may be present in any order,

+or omitted to use default configuration values.

+Each section has the form:

+.PP

+.RS 4

+.nf

+.BI "Section  \*q" SectionName \*q

+.RI "    " SectionEntry

+    ...

+.B EndSection

+.fi

+.RE

+.PP

+The section names are:

+.PP

+.RS 4

+.nf

+.BR "Files          " "File pathnames"

+.BR "ServerFlags    " "Server flags"

+.BR "Module         " "Dynamic module loading"

+.BR "Extensions     " "Extension enabling"

+.BR "InputDevice    " "Input device description"

+.BR "InputClass     " "Input class description"

+.BR "Device         " "Graphics device description"

+.BR "VideoAdaptor   " "Xv video adaptor description"

+.BR "Monitor        " "Monitor description"

+.BR "Modes          " "Video modes descriptions"

+.BR "Screen         " "Screen configuration"

+.BR "ServerLayout   " "Overall layout"

+.BR "DRI            " "DRI\-specific configuration"

+.BR "Vendor         " "Vendor\-specific configuration"

+.fi

+.RE

+.PP

+The following obsolete section names are still recognised for compatibility

+purposes.

+In new config files, the

+.B InputDevice

+section should be used instead.

+.PP

+.RS 4

+.nf

+.BR "Keyboard       " "Keyboard configuration"

+.BR "Pointer        " "Pointer/mouse configuration"

+.fi

+.RE

+.PP

+The old

+.B XInput

+section is no longer recognised.

+.PP

+The

+.B ServerLayout

+sections are at the highest level.

+They bind together the input and output devices that will be used in a session.

+The input devices are described in the

+.B InputDevice

+sections.

+Output devices usually consist of multiple independent components (e.g.,

+a graphics board and a monitor).

+These multiple components are bound together in the

+.B Screen

+sections, and it is these that are referenced by the

+.B ServerLayout

+section.

+Each

+.B Screen

+section binds together a graphics board and a monitor.

+The graphics boards are described in the

+.B Device

+sections, and the monitors are described in the

+.B Monitor

+sections.

+.PP

+Config file keywords are case\-insensitive, and \(lq_\(rq characters are

+ignored.

+Most strings (including

+.B Option

+names) are also case-insensitive, and insensitive to white space and

+\(lq_\(rq characters.

+.PP

+Each config file entry usually takes up a single line in the file.  They

+consist of a keyword, which is possibly followed by one or more arguments,

+with the number and types of the arguments depending on the keyword.

+The argument types are:

+.PP

+.RS 4

+.nf

+.BR "Integer     " "an integer number in decimal, hex or octal"

+.BR "Real        " "a floating point number"

+.BR "String      " "a string enclosed in double quote marks (\*q)"

+.fi

+.RE

+.PP

+Note: hex integer values must be prefixed with \(lq0x\(rq, and octal values

+with \(lq0\(rq.

+.PP

+A special keyword called

+.B Option

+may be used to provide free\-form data to various components of the server.

+The

+.B Option

+keyword takes either one or two string arguments.

+The first is the option name, and the optional second argument is the

+option value.

+Some commonly used option value types include:

+.PP

+.RS 4

+.nf

+.BR "Integer     " "an integer number in decimal, hex or octal"

+.BR "Real        " "a floating point number"

+.BR "String      " "a sequence of characters"

+.BR "Boolean     " "a boolean value (see below)"

+.BR "Frequency   " "a frequency value (see below)"

+.fi

+.RE

+.PP

+Note that

+.I all

+.B Option

+values, not just strings, must be enclosed in quotes.

+.PP

+Boolean options may optionally have a value specified.

+When no value is specified, the option's value is

+.BR TRUE .

+The following boolean option values are recognised as

+.BR TRUE :

+.PP

+.RS 4

+.BR 1 ,

+.BR on ,

+.BR true ,

+.B yes

+.RE

+.PP

+and the following boolean option values are recognised as

+.BR FALSE :

+.PP

+.RS 4

+.BR 0 ,

+.BR off ,

+.BR false ,

+.B no

+.RE

+.PP

+If an option name is prefixed with

+.RB \*q No \*q,

+then the option value is negated.

+.PP

+Example: the following option entries are equivalent:

+.PP

+.RS 4

+.nf

+.B "Option \*qAccel\*q   \*qOff\*q"

+.B "Option \*qNoAccel\*q"

+.B "Option \*qNoAccel\*q \*qOn\*q"

+.B "Option \*qAccel\*q   \*qfalse\*q"

+.B "Option \*qAccel\*q   \*qno\*q"

+.fi

+.RE

+.PP

+Frequency option values consist of a real number that is optionally

+followed by one of the following frequency units:

+.PP

+.RS 4

+.BR Hz ,

+.BR k ,

+.BR kHz ,

+.BR M ,

+.B MHz

+.RE

+.PP

+When the unit name is omitted, the correct units will be determined from

+the value and the expectations of the appropriate range of the value.

+It is recommended that the units always be specified when using frequency

+option values to avoid any errors in determining the value.

+.SH "FILES SECTION"

+The

+.B Files

+section is used to specify some path names required by the server.

+Some of these paths can also be set from the command line (see

+.BR Xserver (__appmansuffix__)

+and

+.BR __xservername__ (__appmansuffix__)).

+The command line settings override the values specified in the config

+file.

+The

+.B Files

+section is optional, as are all of the entries that may appear in it.

+.PP

+The entries that can appear in this section are:

+.TP 7

+.BI "FontPath \*q" path \*q

+sets the search path for fonts.

+This path is a comma separated list of font path elements which the __xservername__

+server searches for font databases.

+Multiple

+.B FontPath

+entries may be specified, and they will be concatenated to build up the

+fontpath used by the server.  Font path elements can be absolute

+directory paths, catalogue directories or a font server identifier. The

+formats of the later two are explained below:

+.PP

+.RS 7

+Catalogue directories:

+.PP

+.RS 4

+Catalogue directories can be specified using the prefix \fBcatalogue:\fR

+before the directory name. The directory can then be populated with

+symlinks pointing to the real font directories, using the following

+syntax in the symlink name:

+.PP

+.RS 4

+.IR <identifier> : [attribute]: pri= <priority>

+.RE

+.PP

+where

+.I <identifier>

+is an alphanumeric identifier,

+.I [attribute]

+is an attribute which will be passed to the underlying FPE and

+.I <priority>

+is a number used to order the fontfile FPEs. Examples:

+.PP

+.RS 4

+.nf

+.I 75dpi:unscaled:pri=20  -> /usr/share/X11/fonts/75dpi

+.I gscript:pri=60 -> /usr/share/fonts/default/ghostscript

+.I misc:unscaled:pri=10 \-> /usr/share/X11/fonts/misc

+.fi

+.PP

+.RE .RE .RE

+.PP

+.RS 7

+Font server identifiers:

+.PP

+.RS 4

+Font server identifiers have the form:

+.RS 4

+.PP

+.IR <trans> / <hostname> : <port\-number>

+.RE

+.PP

+where

+.I <trans>

+is the transport type to use to connect to the font server (e.g.,

+.B unix

+for UNIX\-domain sockets or

+.B tcp

+for a TCP/IP connection),

+.I <hostname>

+is the hostname of the machine running the font server, and

+.I <port\-number>

+is the port number that the font server is listening on (usually 7100).

+.RE

+.PP

+When this entry is not specified in the config file, the server falls back

+to the compiled\-in default font path, which contains the following

+font path elements (which can be set inside a catalogue directory):

+.PP

+.RS 4

+.nf

+.I __datadir__/fonts/X11/misc/

+.I __datadir__/fonts/X11/TTF/

+.I __datadir__/fonts/X11/OTF/

+.I __datadir__/fonts/X11/Type1/

+.I __datadir__/fonts/X11/100dpi/

+.I __datadir__/fonts/X11/75dpi/

+.fi

+.RE

+.PP

+Font path elements that are found to be invalid are removed from the

+font path when the server starts up.

+.RE

+.TP 7

+.BI "ModulePath \*q" path \*q

+sets the search path for loadable __xservername__ server modules.

+This path is a comma separated list of directories which the __xservername__ server

+searches for loadable modules loading in the order specified.

+Multiple

+.B ModulePath

+entries may be specified, and they will be concatenated to build the

+module search path used by the server.  The default module path is

+.PP

+.RS 11

+__modulepath__

+.RE

+.\" The LogFile keyword is not currently implemented

+.ig

+.TP 7

+.BI "LogFile \*q" path \*q

+sets the name of the __xservername__ server log file.

+The default log file name is

+.PP

+.RS 11

+.RI __logdir__/__xservername__. <n> .log

+.RE

+.PP

+.RS 7

+where

+.I <n>

+is the display number for the __xservername__ server.

+..

+.TP 7

+.BI "XkbDir \*q" path \*q

+sets the base directory for keyboard layout files.  The

+.B \-xkbdir

+command line option can be used to override this.  The default directory is

+.PP

+.RS 11

+__xkbdir__

+.RE

+.SH "SERVERFLAGS SECTION"

+In addition to options specific to this section (described below), the

+.B ServerFlags

+section is used to specify some global

+__xservername__ server options.

+All of the entries in this section are

+.BR Options ,

+although for compatibility purposes some of the old style entries are

+still recognised.

+Those old style entries are not documented here, and using them is

+discouraged.

+The

+.B ServerFlags

+section is optional, as are the entries that may be specified in it.

+.PP

+.B Options

+specified in this section (with the exception of the

+.B \*qDefaultServerLayout\*q

+.BR Option )

+may be overridden by

+.B Options

+specified in the active

+.B ServerLayout

+section.

+Options with command line equivalents are overridden when their command

+line equivalent is used.

+The options recognised by this section are:

+.TP 7

+.BI "Option \*qDefaultServerLayout\*q  \*q" layout\-id \*q

+This specifies the default

+.B ServerLayout

+section to use in the absence of the

+.B \-layout

+command line option.

+.TP 7

+.BI "Option \*qNoTrapSignals\*q  \*q" boolean \*q

+This prevents the __xservername__ server from trapping a range of unexpected fatal

+signals and exiting cleanly.

+Instead, the __xservername__ server will die and drop core where the fault occurred.

+The default behaviour is for the __xservername__ server to exit cleanly, but still drop a

+core file.

+In general you never want to use this option unless you are debugging an __xservername__

+server problem and know how to deal with the consequences.

+.TP 7

+.BI "Option \*qUseSIGIO\*q  \*q" boolean \*q

+This controls whether the __xservername__ server requests that events from

+input devices be reported via a SIGIO signal handler (also known as SIGPOLL

+on some platforms), or only reported via the standard select(3) loop.

+The default behaviour is platform specific.   In general you do not want to

+use this option unless you are debugging the __xservername__ server, or

+working around a specific bug until it is fixed, and understand the

+consequences.

+.TP 7

+.BI "Option \*qDontVTSwitch\*q  \*q" boolean \*q

+This disallows the use of the

+.BI Ctrl+Alt+F n

+sequence (where

+.RI F n

+refers to one of the numbered function keys).

+That sequence is normally used to switch to another \*qvirtual terminal\*q

+on operating systems that have this feature.

+When this option is enabled, that key sequence has no special meaning and

+is passed to clients.

+Default: off.

+.TP 7

+.BI "Option \*qDontZap\*q  \*q" boolean \*q

+This disallows the use of the

+.B Terminate_Server

+XKB action (usually on Ctrl+Alt+Backspace, depending on XKB options).

+This action is normally used to terminate the __xservername__ server.

+When this option is enabled, the action has no effect.

+Default: off.

+.TP 7

+.BI "Option \*qDontZoom\*q  \*q" boolean \*q

+This disallows the use of the

+.B Ctrl+Alt+Keypad\-Plus

+and

+.B Ctrl+Alt+Keypad\-Minus

+sequences.

+These sequences allows you to switch between video modes.

+When this option is enabled, those key sequences have no special meaning

+and are passed to clients.

+Default: off.

+.TP 7

+.BI "Option \*qDisableVidModeExtension\*q  \*q" boolean \*q

+This disables the parts of the VidMode extension used by the xvidtune client

+that can be used to change the video modes.

+Default: the VidMode extension is enabled.

+.TP 7

+.BI "Option \*qAllowNonLocalXvidtune\*q  \*q" boolean \*q

+This allows the xvidtune client (and other clients that use the VidMode

+extension) to connect from another host.

+Default: off.

+.TP 7

+.BI "Option \*qAllowMouseOpenFail\*q  \*q" boolean \*q

+This tells the mousedrv(__drivermansuffix__) and vmmouse(__drivermansuffix__)

+drivers to not report failure if the mouse device can't be opened/initialised.

+It has no effect on the evdev(__drivermansuffix__) or other drivers.

+Default: false.

+.TP 7

+.BI "Option \*qVTSysReq\*q  \*q" boolean \*q

+enables the SYSV\-style VT switch sequence for non\-SYSV systems

+which support VT switching.

+This sequence is

+.B Alt\-SysRq

+followed by a function key

+.RB ( Fn ).

+This prevents the __xservername__ server trapping the

+keys used for the default VT switch sequence, which means that clients can

+access them.

+Default: off.

+.TP 7

+.BI "Option \*qBlankTime\*q  \*q" time \*q

+sets the inactivity timeout for the

+.B blank

+phase of the screensaver.

+.I time

+is in minutes.

+This is equivalent to the __xservername__ server's

+.B \-s

+flag, and the value can be changed at run\-time with

+.BR xset(__appmansuffix__).

+Default: 10 minutes.

+.TP 7

+.BI "Option \*qStandbyTime\*q  \*q" time \*q

+sets the inactivity timeout for the

+.B standby

+phase of DPMS mode.

+.I time

+is in minutes, and the value can be changed at run\-time with

+.BR xset(__appmansuffix__).

+Default: 10 minutes.

+This is only suitable for VESA DPMS compatible monitors, and may not be

+supported by all video drivers.

+It is only enabled for screens that have the

+.B \*qDPMS\*q

+option set (see the MONITOR section below).

+.TP 7

+.BI "Option \*qSuspendTime\*q  \*q" time \*q

+sets the inactivity timeout for the

+.B suspend

+phase of DPMS mode.

+.I time

+is in minutes, and the value can be changed at run\-time with

+.BR xset(__appmansuffix__).

+Default: 10 minutes.

+This is only suitable for VESA DPMS compatible monitors, and may not be

+supported by all video drivers.

+It is only enabled for screens that have the

+.B \*qDPMS\*q

+option set (see the MONITOR section below).

+.TP 7

+.BI "Option \*qOffTime\*q  \*q" time \*q

+sets the inactivity timeout for the

+.B off

+phase of DPMS mode.

+.I time

+is in minutes, and the value can be changed at run\-time with

+.BR xset(__appmansuffix__).

+Default: 10 minutes.

+This is only suitable for VESA DPMS compatible monitors, and may not be

+supported by all video drivers.

+It is only enabled for screens that have the

+.B \*qDPMS\*q

+option set (see the MONITOR section below).

+.TP 7

+.BI "Option \*qPixmap\*q  \*q" bpp \*q

+This sets the pixmap format to use for depth 24.

+Allowed values for

+.I bpp

+are 24 and 32.

+Default: 32 unless driver constraints don't allow this (which is rare).

+Note: some clients don't behave well when this value is set to 24.

+.TP 7

+.BI "Option \*qPC98\*q  \*q" boolean \*q

+Specify that the machine is a Japanese PC\-98 machine.

+This should not be enabled for anything other than the Japanese\-specific

+PC\-98 architecture.

+Default: auto\-detected.

+.TP 7

+.BI "Option \*qNoPM\*q  \*q" boolean \*q

+Disables something to do with power management events.

+Default: PM enabled on platforms that support it.

+.TP 7

+.BI "Option \*qXinerama\*q  \*q" boolean \*q

+enable or disable XINERAMA extension.

+Default is disabled.

+.TP 7

+.BI "Option \*qAIGLX\*q \*q" boolean \*q

+enable or disable AIGLX. AIGLX is enabled by default.

+.TP 7

+.BI "Option \*qDRI2\*q \*q" boolean \*q

+enable or disable DRI2. DRI2 is disabled by default.

+.TP 7

+.BI "Option \*qGlxVisuals\*q \*q" string \*q

+This option controls how many GLX visuals the GLX modules sets up.

+The default value is

+.BR "typical" ,

+which will setup up a typical subset of

+the GLXFBConfigs provided by the driver as GLX visuals.  Other options are

+.BR "minimal" ,

+which will set up the minimal set allowed by the GLX specification and

+.BR "all"

+which will setup GLX visuals for all GLXFBConfigs.

+.TP 7

+.BI "Option \*qUseDefaultFontPath\*q \*q" boolean \*q

+Include the default font path even if other paths are specified in

+xorg.conf. If enabled, other font paths are included as well. Enabled by

+default.

+.TP 7

+.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 \*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.

+.TP 7

+.BI "Option \*qLog\*q \*q" string \*q

+This option controls whether the log is flushed and/or synced to disk after

+each message.

+Possible values are

+.B flush

+or

+.BR sync .

+Unset by default.

+.SH "MODULE SECTION"

+The

+.B Module

+section is used to specify which __xservername__ server modules should be loaded.

+This section is ignored when the __xservername__ server is built in static form.

+The type of modules normally loaded in this section are __xservername__ server

+extension modules.

+Most other module types are loaded automatically when they are needed via

+other mechanisms.

+The

+.B Module

+section is optional, as are all of the entries that may be specified in

+it.

+.PP

+Entries in this section may be in two forms.

+The first and most commonly used form is an entry that uses the

+.B Load

+keyword, as described here:

+.TP 7

+.BI "Load  \*q" modulename \*q

+This instructs the server to load the module called

+.IR modulename .

+The module name given should be the module's standard name, not the

+module file name.

+The standard name is case\-sensitive, and does not include the \(lqlib\(rq

+prefix, or the \(lq.a\(rq, \(lq.o\(rq, or \(lq.so\(rq suffixes.

+.PP

+.RS 7

+Example: the DRI extension module can be loaded with the following entry:

+.PP

+.RS 4

+.B "Load \*qdri\*q"

+.RE

+.RE

+.TP 7

+.BI "Disable  \*q" modulename \*q

+This instructs the server to not load the module called

+.IR modulename .

+Some modules are loaded by default in the server, and this overrides that

+default. If a

+.B Load

+instruction is given for the same module, it overrides the

+.B Disable

+instruction and the module is loaded. The module name given should be the

+module's standard name, not the module file name. As with the

+.B Load

+instruction, the standard name is case-sensitive, and does not include the

+"lib" prefix, or the ".a", ".o", or ".so" suffixes.

+.PP

+The second form of entry is a

+.BR SubSection,

+with the subsection name being the module name, and the contents of the

+.B SubSection

+being

+.B Options

+that are passed to the module when it is loaded.

+.PP

+Example: the extmod module (which contains a miscellaneous group of

+server extensions) can be loaded, with the XFree86\-DGA extension

+disabled by using the following entry:

+.PP

+.RS 4

+.nf

+.B "SubSection \*qextmod\*q"

+.B "   Option  \*qomit XFree86\-DGA\*q"

+.B EndSubSection

+.fi

+.RE

+.PP

+Modules are searched for in each directory specified in the

+.B ModulePath

+search path, and in the drivers, extensions, input, internal, and

+multimedia subdirectories of each of those directories.

+In addition to this, operating system specific subdirectories of all

+the above are searched first if they exist.

+.PP

+To see what extension modules are available, check the extensions

+subdirectory under:

+.PP

+.RS 4

+.nf

+__modulepath__

+.fi

+.RE

+.PP

+The \(lqextmod\(rq, \(lqdbe\(rq, \(lqdri\(rq, \(lqdri2\(rq, \(lqglx\(rq,

+and \(lqrecord\(rq extension modules are loaded automatically, if they

+are present, unless disabled with \*qDisable\*q entries.

+It is recommended

+that at very least the \(lqextmod\(rq extension module be loaded.

+If it isn't, some commonly used server extensions (like the SHAPE

+extension) will not be available.

+.SH "EXTENSIONS SECTION"

+The

+.B Extensions

+section is used to specify which X11 protocol extensions should be enabled

+or disabled.

+The

+.B Extensions

+section is optional, as are all of the entries that may be specified in

+it.

+.PP

+Entries in this section are listed as Option statements with the name of

+the extension as the first argument, and a boolean value as the second.

+The extension name is case\-sensitive, and matches the form shown in the output

+of \*qXorg -extension ?\*q.

+.PP

+.RS 7

+Example: the MIT-SHM extension can be disabled with the following entry:

+.PP

+.RS 4

+.nf

+.B "Section \*qExtensions\*q"

+.B "    Option \*qMIT-SHM\*q \*qDisable\*q"

+.B "EndSection"

+.fi

+.RE

+.RE

+.SH "INPUTDEVICE SECTION"

+The config file may have multiple

+.B InputDevice

+sections.

+Recent X servers employ HAL or udev backends for input device enumeration

+and input hotplugging. It is usually not

+necessary to provide

+.B InputDevice

+sections in the xorg.conf if hotplugging is in use. If hotplugging is

+enabled,

+.B InputDevice

+sections using the

+.B mouse, kbd

+and

+.B vmmouse

+driver will be ignored.

+.PP

+If hotplugging is disabled, there will normally

+be at least two: one for the core (primary) keyboard

+and one for the core pointer.

+If either of these two is missing, a default configuration for the missing

+ones will be used. In the absence of an explicitly specified core input

+device, the first

+.B InputDevice

+marked as

+.B CorePointer

+(or

+.BR CoreKeyboard )

+is used.

+If there is no match there, the first

+.B InputDevice

+that uses the \(lqmouse\(rq (or \(lqkbd\(rq) driver is used.

+The final fallback is to use built\-in default configurations.

+Currently the default configuration may not work as expected on all platforms.

+.PP

+.B InputDevice

+sections have the following format:

+.PP

+.RS 4

+.nf

+.B  "Section \*qInputDevice\*q"

+.BI "    Identifier \*q" name \*q

+.BI "    Driver     \*q" inputdriver \*q

+.I  "    options"

+.I  "    ..."

+.B  "EndSection"

+.fi

+.RE

+.PP

+The

+.B Identifier

+and

+.B Driver

+entries are required in all

+.B InputDevice

+sections.

+All other entries are optional.

+.PP

+The

+.B Identifier

+entry specifies the unique name for this input device.

+The

+.B Driver

+entry specifies the name of the driver to use for this input device.

+When using the loadable server, the input driver module

+.RI \*q inputdriver \*q

+will be loaded for each active

+.B InputDevice

+section.

+An

+.B InputDevice

+section is considered active if it is referenced by an active

+.B ServerLayout

+section, if it is referenced by the

+.B \-keyboard

+or

+.B \-pointer

+command line options, or if it is selected implicitly as the core pointer

+or keyboard device in the absence of such explicit references.

+The most commonly used input drivers are

+.BR evdev (__drivermansuffix__)

+on Linux systems, and

+.BR kbd (__drivermansuffix__)

+and

+.BR mousedrv (__drivermansuffix__)

+on other platforms.

+.PP

+.PP

+.B InputDevice

+sections recognise some driver\-independent

+.BR Options ,

+which are described here.

+See the individual input driver manual pages for a description of the

+device\-specific options.

+.TP 7

+.BI "Option \*qAutoServerLayout\*q  \*q" boolean \*q

+Always add the device to the ServerLayout section used by this instance of

+the server. This affects implied layouts as well as explicit layouts

+specified in the configuration and/or on the command line.

+.TP 7

+.BI "Option \*qCorePointer\*q"

+Deprecated, see

+.B Floating

+.TP 7

+.BI "Option \*qCoreKeyboard\*q"

+Deprecated, see

+.B Floating

+.TP 7

+.BI "Option \*qAlwaysCore\*q  \*q" boolean \*q

+Deprecated, see

+.B Floating

+.TP 7

+.BI "Option \*qSendCoreEvents\*q  \*q" boolean \*q

+Deprecated, see

+.B Floating

+

+.TP 7

+.BI "Option \*qFloating\*q  \*q" boolean \*q

+When enabled, the input device is set up floating and does not

+report events through any master device or control a cursor. The device is

+only available to clients using the X Input Extension API. This option is

+disabled by default.

+The options

+.B CorePointer,

+.B CoreKeyboard,

+.B AlwaysCore,

+and

+.B SendCoreEvents,

+are the inverse of option

+.B Floating

+(i.e.

+.B SendCoreEvents \*qon\*q

+is equivalent to

+.B Floating \*qoff\*q

+).

+

+This option controls the startup behavior only, a device

+may be reattached or set floating at runtime.

+.PP

+For pointing devices, the following options control how the pointer

+is accelerated or decelerated with respect to physical device motion. Most of

+these can be adjusted at runtime, see the xinput(1) man page for details. Only

+the most important acceleration options are discussed here.

+.TP 7

+.BI "Option \*qAccelerationProfile\*q  \*q" integer \*q

+Select the profile. In layman's terms, the profile constitutes the "feeling" of

+the acceleration. More formally, it defines how the transfer function (actual

+acceleration as a function of current device velocity and acceleration controls)

+is constructed. This is mainly a matter of personal preference.

+.PP

+.RS 6

+.nf

+.B  " 0      classic (mostly compatible)"

+.B  "-1      none (only constant deceleration is applied)"

+.B  " 1      device-dependent"

+.B  " 2      polynomial (polynomial function)"

+.B  " 3      smooth linear (soft knee, then linear)"

+.B  " 4      simple (normal when slow, otherwise accelerated)"

+.B  " 5      power (power function)"

+.B  " 6      linear (more speed, more acceleration)"

+.B  " 7      limited (like linear, but maxes out at threshold)"

+.fi

+.RE

+.TP 7

+.BI "Option \*qConstantDeceleration\*q  \*q" real \*q

+Makes the pointer go

+.B deceleration

+times slower than normal. Most useful for high-resolution devices.

+.TP 7

+.BI "Option \*qAdaptiveDeceleration\*q  \*q" real \*q

+Allows to actually decelerate the pointer when going slow. At most, it will be

+.B adaptive deceleration

+times slower. Enables precise pointer placement without sacrificing speed.

+.TP 7

+.BI "Option \*qAccelerationScheme\*q  \*q" string \*q

+Selects the scheme, which is the underlying algorithm.

+.PP

+.RS 7

+.nf

+.B  "predictable   default algorithm (behaving more predictable)"

+.B  "lightweight   old acceleration code (as specified in the X protocol spec)"

+.B  "none          no acceleration or deceleration"

+.fi

+.RE

+.TP 7

+.BI "Option \*qAccelerationNumerator\*q  \*q" integer \*q

+.TP 7

+.BI "Option \*qAccelerationDenominator\*q  \*q" integer \*q

+Set numerator and denominator of the acceleration factor. The acceleration

+factor is a rational which, together with threshold, can be used to tweak

+profiles to suit the users needs. The

+.B simple

+and

+.B limited

+profiles use it directly (i.e. they accelerate by the factor), for other

+profiles it should hold that a higher acceleration factor leads to a faster

+pointer. Typically, 1 is unaccelerated and values up to 5 are sensible.

+.TP 7

+.BI "Option \*qAccelerationThreshold\*q  \*q" integer \*q

+Set the threshold, which is roughly the velocity (usually device units per 10

+ms) required for acceleration to become effective. The precise effect varies

+with the profile however.

+

+.SH "INPUTCLASS SECTION"

+The config file may have multiple

+.B InputClass

+sections.

+These sections are optional and are used to provide configuration for a

+class of input devices as they are automatically added. An input device can

+match more than one

+.B InputClass

+section. Each class can override settings from a previous class, so it is

+best to arrange the sections with the most generic matches first.

+.PP

+.B InputClass

+sections have the following format:

+.PP

+.RS 4

+.nf

+.B  "Section \*qInputClass\*q"

+.BI "    Identifier  \*q" name \*q

+.I  "    entries"

+.I  "    ..."

+.I  "    options"

+.I  "    ..."

+.B  "EndSection"

+.fi

+.RE

+.PP

+The

+.B Identifier

+entry is required in all

+.B InputClass

+sections.

+All other entries are optional.

+.PP

+The

+.B Identifier

+entry specifies the unique name for this input class.

+The

+.B Driver

+entry specifies the name of the driver to use for this input device.

+After all classes have been examined, the

+.RI \*q inputdriver \*q

+module from the first

+.B Driver

+entry will be enabled when using the loadable server.

+.PP

+When an input device is automatically added, its characteristics are

+checked against all

+.B InputClass

+sections. Each section can contain optional entries to narrow the match

+of the class. If none of the optional entries appear, the

+.B InputClass

+section is generic and will match any input device. If more than one of

+these entries appear, they all must match for the configuration to apply.

+.PP

+There are two types of match entries used in

+.B InputClass

+sections. The first allows various tokens to be matched against attributes

+of the device. An entry can be constructed to match attributes from different

+devices by separating arguments with a '|' character. Multiple entries of the

+same type may be supplied to add multiple matching conditions on the same

+attribute. For example:

+.PP

+.RS 4

+.nf

+.B  "Section \*qInputClass\*q"

+.B  "    Identifier   \*qMy Class\*q"

+.B  "    # product string must contain example and

+.B  "    # either gizmo or gadget

+.B  "    MatchProduct \*qexample\*q

+.B  "    MatchProduct \*qgizmo|gadget\*q

+.I  "    ..."

+.B  "EndSection"

+.fi

+.RE

+.TP 7

+.BI "MatchProduct  \*q" matchproduct \*q

+This entry can be used to check if the substring

+.RI \*q matchproduct \*q

+occurs in the device's product name.

+.TP 7

+.BI "MatchVendor  \*q" matchvendor \*q

+This entry can be used to check if the substring

+.RI \*q matchvendor \*q

+occurs in the device's vendor name.

+.TP 7

+.BI "MatchDevicePath \*q" matchdevice \*q

+This entry can be used to check if the device file matches the

+.RI \*q matchdevice \*q

+pathname pattern.

+.TP 7

+.BI "MatchOS \*q" matchos \*q

+This entry can be used to check if the operating system matches the

+case-insensitive

+.RI \*q matchos \*q

+string. This entry is only supported on platforms providing the

+.BR uname (2)

+system call.

+.TP 7

+.BI "MatchPnPID \*q" matchpnp \*q

+The device's Plug and Play (PnP) ID can be checked against the

+.RI \*q matchpnp \*q

+shell wildcard pattern.

+.TP 7

+.BI "MatchUSBID \*q" matchusb \*q

+The device's USB ID can be checked against the

+.RI \*q matchusb \*q

+shell wildcard pattern. The ID is constructed as lowercase hexadecimal numbers

+separated by a ':'. This is the same format as the

+.BR lsusb (8)

+program.

+.TP 7

+.BI "MatchDriver \*q" matchdriver \*q

+Check the case-sensitive string

+.RI \*q matchdriver \*q

+against the currently configured driver of the device. Ordering of sections

+using this entry is important since it will not match unless the driver has

+been set by the config backend or a previous

+.B InputClass

+section.

+.TP 7

+.BI "MatchTag \*q" matchtag \*q

+This entry can be used to check if tags assigned by the config backend

+matches the

+.RI \*q matchtag \*q

+pattern. A match is found if at least one of the tags given in

+.RI \*q matchtag \*q

+matches at least one of the tags assigned by the backend.

+.PP

+The second type of entry is used to match device types. These entries take a

+boolean argument similar to

+.B Option

+entries.

+.TP 7

+.BI "MatchIsKeyboard     \*q" bool \*q

+.TP 7

+.BI "MatchIsPointer      \*q" bool \*q

+.TP 7

+.BI "MatchIsJoystick     \*q" bool \*q

+.TP 7

+.BI "MatchIsTablet       \*q" bool \*q

+.TP 7

+.BI "MatchIsTouchpad     \*q" bool \*q

+.TP 7

+.BI "MatchIsTouchscreen  \*q" bool \*q

+.PP

+When an input device has been matched to the

+.B InputClass

+section, any

+.B Option

+entries are applied to the device. One

+.B InputClass

+specific

+.B Option

+is recognized. See the

+.B InputDevice

+section above for a description of the remaining

+.B Option

+entries.

+.TP 7

+.BI "Option \*qIgnore\*q \*q" boolean \*q

+This optional entry specifies that the device should be ignored entirely,

+and not added to the server. This can be useful when the device is handled

+by another program and no X events should be generated.

+.SH "DEVICE SECTION"

+The config file may have multiple

+.B Device

+sections.

+There must be at least one, for the video card being used.

+.PP

+.B Device

+sections have the following format:

+.PP

+.RS 4

+.nf

+.B  "Section \*qDevice\*q"

+.BI "    Identifier \*q" name \*q

+.BI "    Driver     \*q" driver \*q

+.I  "    entries"

+.I  "    ..."

+.B  "EndSection"

+.fi

+.RE

+.PP

+The

+.B Identifier

+and

+.B Driver

+entries are required in all

+.B Device

+sections.  All other entries are optional.

+.PP

+The

+.B Identifier

+entry specifies the unique name for this graphics device.

+The

+.B Driver

+entry specifies the name of the driver to use for this graphics device.

+When using the loadable server, the driver module

+.RI \*q driver \*q

+will be loaded for each active

+.B Device

+section.

+A

+.B Device

+section is considered active if it is referenced by an active

+.B Screen

+section.

+.PP

+.B Device

+sections recognise some driver\-independent entries and

+.BR Options ,

+which are described here.

+Not all drivers make use of these

+driver\-independent entries, and many of those that do don't require them

+to be specified because the information is auto\-detected.

+See the individual graphics driver manual pages for further information

+about this, and for a description of the device\-specific options.

+Note that most of the

+.B Options

+listed here (but not the other entries) may be specified in the

+.B Screen

+section instead of here in the

+.B Device

+section.

+.TP 7

+.BI "BusID  \*q" bus\-id \*q

+This specifies the bus location of the graphics card.

+For PCI/AGP cards,

+the

+.I bus\-id

+string has the form

+.BI PCI: bus : device : function

+(e.g., \(lqPCI:1:0:0\(rq might be appropriate for an AGP card).

+This field is usually optional in single-head configurations when using

+the primary graphics card.

+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 pciaccess tool

+scanpci.

+.TP 7

+.BI "Screen  " number

+This option is mandatory for cards where a single PCI entity can drive more

+than one display (i.e., multiple CRTCs sharing a single graphics accelerator

+and video memory).

+One

+.B Device

+section is required for each head, and this

+parameter determines which head each of the

+.B Device

+sections applies to.

+The legal values of

+.I number

+range from 0 to one less than the total number of heads per entity.

+Most drivers require that the primary screen (0) be present.

+.TP 7

+.BI "Chipset  \*q" chipset \*q

+This usually optional entry specifies the chipset used on the graphics

+board.

+In most cases this entry is not required because the drivers will probe the

+hardware to determine the chipset type.

+Don't specify it unless the driver-specific documentation recommends that you

+do.

+.TP 7

+.BI "Ramdac  \*q" ramdac\-type \*q

+This optional entry specifies the type of RAMDAC used on the graphics

+board.

+This is only used by a few of the drivers, and in most cases it is not

+required because the drivers will probe the hardware to determine the

+RAMDAC type where possible.

+Don't specify it unless the driver-specific documentation recommends that you

+do.

+.TP 7

+.BI "DacSpeed  " speed

+.TP 7

+.BI "DacSpeed  " "speed\-8 speed\-16 speed\-24 speed\-32"

+This optional entry specifies the RAMDAC speed rating (which is usually

+printed on the RAMDAC chip).

+The speed is in MHz.

+When one value is given, it applies to all framebuffer pixel sizes.

+When multiple values are given, they apply to the framebuffer pixel sizes

+8, 16, 24 and 32 respectively.

+This is not used by many drivers, and only needs to be specified when the

+speed rating of the RAMDAC is different from the defaults built in to

+driver, or when the driver can't auto-detect the correct defaults.

+Don't specify it unless the driver-specific documentation recommends that you

+do.

+.TP 7

+.BI "Clocks  " "clock ..."

+specifies the pixel that are on your graphics board.

+The clocks are in MHz, and may be specified as a floating point number.

+The value is stored internally to the nearest kHz.

+The ordering of the clocks is important.

+It must match the order in which they are selected on the graphics board.

+Multiple

+.B Clocks

+lines may be specified, and each is concatenated to form the list.

+Most drivers do not use this entry, and it is only required for some older

+boards with non-programmable clocks.

+Don't specify this entry unless the driver-specific documentation explicitly

+recommends that you do.

+.TP

+.BI "ClockChip  \*q" clockchip\-type \*q

+This optional entry is used to specify the clock chip type on graphics

+boards which have a programmable clock generator.

+Only a few __xservername__ drivers support programmable clock chips.

+For details, see the appropriate driver manual page.

+.TP 7

+.BI "VideoRam  " "mem"

+This optional entry specifies the amount of video ram that is installed

+on the graphics board.

+This is measured in kBytes.

+In most cases this is not required because the __xservername__ server probes

+the graphics board to determine this quantity.

+The driver-specific documentation should indicate when it might be needed.

+.TP 7

+.BI "BiosBase  " "baseaddress"

+This optional entry specifies the base address of the video BIOS for

+the VGA board.

+This address is normally auto-detected, and should only be specified if the

+driver-specific documentation recommends it.

+.TP 7

+.BI "MemBase  " "baseaddress"

+This optional entry specifies the memory base address of a graphics

+board's linear frame buffer.

+This entry is not used by many drivers, and it should only be specified if

+the driver-specific documentation recommends it.

+.TP 7

+.BI "IOBase  " "baseaddress"

+This optional entry specifies the IO base address.

+This entry is not used by many drivers, and it should only be specified if

+the driver-specific documentation recommends it.

+.TP 7

+.BI "ChipID  " "id"

+This optional entry specifies a numerical ID representing the chip type.

+For PCI cards, it is usually the device ID.

+This can be used to override the auto-detection, but that should only be done

+when the driver-specific documentation recommends it.

+.TP 7

+.BI "ChipRev  " "rev"

+This optional entry specifies the chip revision number.

+This can be used to override the auto-detection, but that should only be done

+when the driver-specific documentation recommends it.

+.TP 7

+.BI "TextClockFreq  " "freq"

+This optional entry specifies the pixel clock frequency that is used

+for the regular text mode.

+The frequency is specified in MHz.

+This is rarely used.

+.TP 7

+.BI "Option \*qModeDebug\*q \*q" boolean \*q

+Enable printing of additional debugging information about modesetting to

+the server log.

+.ig

+.TP 7

+This optional entry allows an IRQ number to be specified.

+..

+.TP 7

+.B Options

+Option flags may be specified in the

+.B Device

+sections.

+These include driver\-specific options and driver\-independent options.

+The former are described in the driver\-specific documentation.

+Some of the latter are described below in the section about the

+.B Screen

+section, and they may also be included here.

+

+.SH "VIDEOADAPTOR SECTION"

+Nobody wants to say how this works.

+Maybe nobody knows ...

+

+.SH "MONITOR SECTION"

+The config file may have multiple

+.B Monitor

+sections.

+There should normally be at least one, for the monitor being used,

+but a default configuration will be created when one isn't specified.

+.PP

+.B Monitor

+sections have the following format:

+.PP

+.RS 4

+.nf

+.B  "Section \*qMonitor\*q"

+.BI "    Identifier \*q" name \*q

+.I  "    entries"

+.I  "    ..."

+.B  "EndSection"

+.fi

+.RE

+.PP

+The only mandatory entry in a

+.B Monitor

+section is the

+.B Identifier

+entry.

+.PP

+The

+.B Identifier

+entry specifies the unique name for this monitor.

+The

+.B Monitor

+section may be used to provide information about the specifications of the

+monitor, monitor-specific

+.BR Options ,

+and information about the video modes to use with the monitor.

+.PP

+With RandR 1.2-enabled drivers, monitor sections may be tied to specific

+outputs of the video card.  Using the name of the output defined by the video

+driver plus the identifier of a monitor section, one associates a monitor

+section with an output by adding an option to the Device section in the

+following format:

+

+.B Option \*qMonitor-outputname\*q \*qmonitorsection\*q

+

+(for example,

+.B Option \*qMonitor-VGA\*q \*qVGA monitor\*q

+for a VGA output)

+.PP

+In the absence of specific association of monitor sections to outputs, if a

+monitor section is present the server will associate it with an output to

+preserve compatibility for previous single-head configurations.

+.PP

+Specifying video modes is optional because the server will use the DDC or other

+information provided by the monitor to automatically configure the list of

+modes available.

+When modes are specified explicitly in the

+.B Monitor

+section (with the

+.BR Modes ,

+.BR ModeLine ,

+or

+.B UseModes

+keywords), built-in modes with the same names are not included.

+Built-in modes with different names are, however, still implicitly included,

+when they meet the requirements of the monitor.

+.PP

+The entries that may be used in

+.B Monitor

+sections are described below.

+.TP 7

+.BI "VendorName  \*q" vendor \*q

+This optional entry specifies the monitor's manufacturer.

+.TP 7

+.BI "ModelName  \*q" model \*q

+This optional entry specifies the monitor's model.

+.TP 7

+.BI "HorizSync  " "horizsync\-range"

+gives the range(s) of horizontal sync frequencies supported by the

+monitor.

+.I horizsync\-range

+may be a comma separated list of either discrete values or ranges of

+values.

+A range of values is two values separated by a dash.

+By default the values are in units of kHz.

+They may be specified in MHz or Hz

+if

+.B MHz

+or

+.B Hz

+is added to the end of the line.

+The data given here is used by the __xservername__ server to determine if video

+modes are within the specifications of the monitor.

+This information should be available in the monitor's handbook.

+If this entry is omitted, a default range of 28\-33kHz is used.

+.TP 7

+.BI "VertRefresh  " "vertrefresh\-range"

+gives the range(s) of vertical refresh frequencies supported by the

+monitor.

+.I vertrefresh\-range

+may be a comma separated list of either discrete values or ranges of

+values.

+A range of values is two values separated by a dash.

+By default the values are in units of Hz.

+They may be specified in MHz or kHz

+if

+.B MHz

+or

+.B kHz

+is added to the end of the line.

+The data given here is used by the __xservername__ server to determine if video

+modes are within the specifications of the monitor.

+This information should be available in the monitor's handbook.

+If this entry is omitted, a default range of 43\-72Hz is used.

+.TP 7

+.BI "DisplaySize  " "width height"

+This optional entry gives the width and height, in millimetres, of the

+picture area of the monitor.

+If given this is used to calculate the horizontal and vertical pitch (DPI) of

+the screen.

+.TP 7

+.BI "Gamma  " "gamma\-value"

+.TP 7

+.BI "Gamma  " "red\-gamma green\-gamma blue\-gamma"

+This is an optional entry that can be used to specify the gamma correction

+for the monitor.

+It may be specified as either a single value or as three separate RGB values.

+The values should be in the range 0.1 to 10.0, and the default is 1.0.

+Not all drivers are capable of using this information.

+.TP 7

+.BI "UseModes  \*q" modesection\-id \*q

+Include the set of modes listed in the

+.B Modes

+section called

+.IR modesection\-id.

+This makes all of the modes defined in that section available for use by

+this monitor.

+.TP 7

+.BI "Mode  \*q" name \*q

+This is an optional multi-line entry that can be used to provide

+definitions for video modes for the monitor.

+In most cases this isn't necessary because the built-in set of VESA standard

+modes will be sufficient.

+The

+.B Mode

+keyword indicates the start of a multi-line video mode description.

+The mode description is terminated with the

+.B EndMode

+keyword.

+The mode description consists of the following entries:

+.RS 7

+.TP 4

+.BI "DotClock  " clock

+is the dot (pixel) clock rate to be used for the mode.

+.TP 4

+.BI "HTimings  " "hdisp hsyncstart hsyncend htotal"

+specifies the horizontal timings for the mode.

+.TP 4

+.BI "VTimings  " "vdisp vsyncstart vsyncend vtotal"

+specifies the vertical timings for the mode.

+.TP 4

+.BI "Flags  \*q" flag \*q " ..."

+specifies an optional set of mode flags, each of which is a separate

+string in double quotes.

+.B \*qInterlace\*q

+indicates that the mode is interlaced.

+.B \*qDoubleScan\*q

+indicates a mode where each scanline is doubled.

+.B \*q+HSync\*q

+and

+.B \*q\-HSync\*q

+can be used to select the polarity of the HSync signal.

+.B \*q+VSync\*q

+and

+.B \*q\-VSync\*q

+can be used to select the polarity of the VSync signal.

+.B \*qComposite\*q

+can be used to specify composite sync on hardware where this is supported.

+Additionally, on some hardware,

+.B \*q+CSync\*q

+and

+.B \*q\-CSync\*q

+may be used to select the composite sync polarity.

+.TP 4

+.BI "HSkew  " hskew

+specifies the number of pixels (towards the right edge of the screen) by

+which the display enable signal is to be skewed.

+Not all drivers use this information.

+This option might become necessary to override the default value supplied

+by the server (if any).

+\(lqRoving\(rq horizontal lines indicate this value needs to be increased.

+If the last few pixels on a scan line appear on the left of the screen,

+this value should be decreased.

+.TP 4

+.BI "VScan  " vscan

+specifies the number of times each scanline is painted on the screen.

+Not all drivers use this information.

+Values less than 1 are treated as 1, which is the default.

+Generally, the

+.B \*qDoubleScan\*q

+.B Flag

+mentioned above doubles this value.

+.RE

+.TP 7

+.BI "ModeLine  \*q" name \*q " mode\-description"

+This entry is a more compact version of the

+.B Mode

+entry, and it also can be used to specify video modes for the monitor.

+is a single line format for specifying video modes.

+In most cases this isn't necessary because the built\-in set of VESA

+standard modes will be sufficient.

+.PP

+.RS 7

+The

+.I mode\-description

+is in four sections, the first three of which are mandatory.

+The first is the dot (pixel) clock.

+This is a single number specifying the pixel clock rate for the mode in

+MHz.

+The second section is a list of four numbers specifying the horizontal

+timings.

+These numbers are the

+.IR hdisp ,

+.IR hsyncstart ,

+.IR hsyncend ,

+and

+.I htotal

+values.

+The third section is a list of four numbers specifying the vertical

+timings.

+These numbers are the

+.IR vdisp ,

+.IR vsyncstart ,

+.IR vsyncend ,

+and

+.I vtotal

+values.

+The final section is a list of flags specifying other characteristics of

+the mode.

+.B Interlace

+indicates that the mode is interlaced.

+.B DoubleScan

+indicates a mode where each scanline is doubled.

+.B +HSync

+and

+.B \-HSync

+can be used to select the polarity of the HSync signal.

+.B +VSync

+and

+.B \-VSync

+can be used to select the polarity of the VSync signal.

+.B Composite

+can be used to specify composite sync on hardware where this is supported.

+Additionally, on some hardware,

+.B +CSync

+and

+.B \-CSync

+may be used to select the composite sync polarity.

+The

+.B HSkew

+and

+.B VScan

+options mentioned above in the

+.B Modes

+entry description can also be used here.

+.RE

+.TP 7

+.BI "Option " "\*qDPMS\*q  " \*qbool\*q

+This option controls whether the server should enable the DPMS extension

+for power management for this screen.  The default is to enable the

+extension.

+.TP 7

+.BI "Option " "\*qSyncOnGreen\*q  " \*qbool\*q

+This option controls whether the video card should drive the sync signal

+on the green color pin.  Not all cards support this option, and most

+monitors do not require it.  The default is off.

+.TP 7

+.BI "Option " "\*qPrimary\*q  " \*qbool\*q

+This optional entry specifies that the monitor should be treated as the primary

+monitor. (RandR 1.2-supporting drivers only)

+.TP 7

+.BI "Option " "\*qPreferredMode\*q  " \*qstring\*q

+This optional entry specifies a mode to be marked as the preferred initial mode

+of the monitor.

+(RandR 1.2-supporting drivers only)

+.TP 7

+.BI "Option " "\*qPosition\*q  " "\*qx y\*q"

+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  " \*qoutput\*q

+This optional entry specifies that the monitor should be positioned to the

+left of the output (not monitor) of the given name.

+(RandR 1.2-supporting drivers only)

+.TP 7

+.BI "Option " "\*qRightOf\*q  " \*qoutput\*q

+This optional entry specifies that the monitor should be positioned to the

+right of the output (not monitor) of the given name.

+(RandR 1.2-supporting drivers only)

+.TP 7

+.BI "Option " "\*qAbove\*q  " \*qoutput\*q

+This optional entry specifies that the monitor should be positioned above the

+output (not monitor) of the given name.

+(RandR 1.2-supporting drivers only)

+.TP 7

+.BI "Option " "\*qBelow\*q  " \*qoutput\*q

+This optional entry specifies that the monitor should be positioned below the

+output (not monitor) of the given name.

+(RandR 1.2-supporting drivers only)

+.TP 7

+.BI "Option " "\*qEnable\*q  " \*qbool\*q

+This optional entry specifies whether the monitor should be turned on

+at startup.  By default, the server will attempt to enable all connected

+monitors.

+(RandR 1.2-supporting drivers only)

+.TP 7

+.BI "Option " "\*qDefaultModes\*q  " \*qbool\*q

+This optional entry specifies whether the server should add supported default

+modes to the list of modes offered on this monitor. By default, the server

+will add default modes; you should only disable this if you can guarantee

+that EDID will be available at all times, or if you have added custom modelines

+which the server can use.

+(RandR 1.2-supporting drivers only)

+.TP 7

+.BI "Option " "\*qMinClock\*q  " \*qfrequency\*q

+This optional entry specifies the minimum dot clock, in kHz, that is supported

+by the monitor.

+.TP 7

+.BI "Option " "\*qMaxClock\*q  " \*qfrequency\*q

+This optional entry specifies the maximum dot clock, in kHz, that is supported

+by the monitor.

+.TP 7

+.BI "Option " "\*qIgnore\*q  " \*qbool\*q

+This optional entry specifies that the monitor should be ignored entirely,

+and not reported through RandR.  This is useful if the hardware reports the

+presence of outputs that don't exist.

+(RandR 1.2-supporting drivers only)

+.TP 7

+.BI "Option " "\*qRotate\*q  " \*qrotation\*q

+This optional entry specifies the initial rotation of the given monitor.

+Valid values for rotation are \*qnormal\*q, \*qleft\*q, \*qright\*q, and

+\*qinverted\*q.

+(RandR 1.2-supporting drivers only)

+

+.SH "MODES SECTION"

+The config file may have multiple

+.B Modes

+sections, or none.

+These sections provide a way of defining sets of video modes independently

+of the

+.B Monitor

+sections.

+.B Monitor

+sections may include the definitions provided in these sections by

+using the

+.B UseModes

+keyword.

+In most cases the

+.B Modes

+sections are not necessary because the built\-in set of VESA standard modes

+will be sufficient.

+.PP

+.B Modes

+sections have the following format:

+.PP

+.RS 4

+.nf

+.B  "Section \*qModes\*q"

+.BI "    Identifier \*q" name \*q

+.I  "    entries"

+.I  "    ..."

+.B  "EndSection"

+.fi

+.RE

+.PP

+The

+.B Identifier

+entry specifies the unique name for this set of mode descriptions.

+The other entries permitted in

+.B Modes

+sections are the

+.B Mode

+and

+.B ModeLine

+entries that are described above in the

+.B Monitor

+section.

+.SH "SCREEN SECTION"

+The config file may have multiple

+.B Screen

+sections.

+There must be at least one, for the \(lqscreen\(rq being used.

+A \(lqscreen\(rq represents the binding of a graphics device

+.RB ( Device

+section) and a monitor

+.RB ( Monitor

+section).

+A

+.B Screen

+section is considered \(lqactive\(rq if it is referenced by an active

+.B ServerLayout

+section or by the

+.B \-screen

+command line option.

+If neither of those is present, the first

+.B Screen

+section found in the config file is considered the active one.

+.PP

+.B Screen

+sections have the following format:

+.PP

+.RS 4

+.nf

+.B  "Section \*qScreen\*q"

+.BI "    Identifier \*q" name \*q

+.BI "    Device     \*q" devid \*q

+.BI "    Monitor    \*q" monid \*q

+.I  "    entries"

+.I  "    ..."

+.BI "    SubSection \*qDisplay\*q"

+.I  "       entries"

+.I  "       ...

+.B  "    EndSubSection"

+.I  "    ..."

+.B  "EndSection"

+.fi

+.RE

+.PP

+The

+.B Identifier

+and

+.B Device

+entries are mandatory.

+All others are optional.

+.PP

+The

+.B Identifier

+entry specifies the unique name for this screen.

+The

+.B Screen

+section provides information specific to the whole screen, including

+screen\-specific

+.BR Options .

+In multi\-head configurations, there will be multiple active

+.B Screen

+sections, one for each head.

+The entries available

+for this section are:

+.TP 7

+.BI "Device  \*q" device\-id \*q

+This mandatory entry specifies the

+.B Device

+section to be used for this screen.

+This is what ties a specific graphics card to a screen.

+The

+.I device\-id

+must match the

+.B Identifier

+of a

+.B Device

+section in the config file.

+.TP 7

+.BI "Monitor  \*q" monitor\-id \*q

+specifies which monitor description is to be used for this screen.

+If a

+.B Monitor

+name is not specified, a default configuration is used.

+Currently the default configuration may not function as expected on all

+platforms.

+.TP 7

+.BI "VideoAdaptor  \*q" xv\-id \*q

+specifies an optional Xv video adaptor description to be used with this

+screen.

+.TP 7

+.BI "DefaultDepth  " depth

+specifies which color depth the server should use by default.

+The

+.B \-depth

+command line option can be used to override this.

+If neither is specified, the default depth is driver\-specific, but in most

+cases is 8.

+.TP 7

+.BI "DefaultFbBpp  " bpp

+specifies which framebuffer layout to use by default.

+The

+.B \-fbbpp

+command line option can be used to override this.

+In most cases the driver will chose the best default value for this.

+The only case where there is even a choice in this value is for depth 24,

+where some hardware supports both a packed 24 bit framebuffer layout and a

+sparse 32 bit framebuffer layout.

+.TP 7

+.B Options

+Various

+.B Option

+flags may be specified in the

+.B Screen

+section.

+Some are driver\-specific and are described in the driver documentation.

+Others are driver\-independent, and will eventually be described here.

+.\" XXX These should really be in an xaa man page.

+.TP 7

+.BI "Option \*qAccel\*q"

+Enables XAA (X Acceleration Architecture), a mechanism that makes video cards'

+2D hardware acceleration available to the  __xservername__ server.

+This option is on by default, but it may be necessary to turn it off if

+there are bugs in the driver.

+There are many options to disable specific accelerated operations, listed

+below.

+Note that disabling an operation will have no effect if the operation is

+not accelerated (whether due to lack of support in the hardware or in the

+driver).

+.TP 7

+.BI "Option \*qInitPrimary\*q \*q" boolean \*q

+Use the Int10 module to initialize the primary graphics card.

+Normally, only secondary cards are soft-booted using the Int10 module, as the

+primary card has already been initialized by the BIOS at boot time.

+Default: false.

+.TP 7

+.BI "Option \*qNoInt10\*q \*q" boolean \*q

+Disables the Int10 module, a module that uses the int10 call to the BIOS

+of the graphics card to initialize it.

+Default: false.

+.TP 7

+.BI "Option \*qNoMTRR\*q"

+Disables MTRR (Memory Type Range Register) support, a feature of modern

+processors which can improve video performance by a factor of up to 2.5.

+Some hardware has buggy MTRR support, and some video drivers have been

+known to exhibit problems when MTRR's are used.

+.TP 7

+.BI "Option \*qXaaNoCPUToScreenColorExpandFill\*q"

+Disables accelerated rectangular expansion blits from source patterns

+stored in system memory (using a memory\-mapped aperture).

+.TP 7

+.BI "Option \*qXaaNoColor8x8PatternFillRect\*q"

+Disables accelerated fills of a rectangular region with a full\-color

+pattern.

+.TP 7

+.BI "Option \*qXaaNoColor8x8PatternFillTrap\*q"

+Disables accelerated fills of a trapezoidal region with a full\-color

+pattern.

+.TP 7

+.BI "Option \*qXaaNoDashedBresenhamLine\*q"

+Disables accelerated dashed Bresenham line draws.

+.TP 7

+.BI "Option \*qXaaNoDashedTwoPointLine\*q"

+Disables accelerated dashed line draws between two arbitrary points.

+.TP 7

+.BI "Option \*qXaaNoImageWriteRect\*q"

+Disables accelerated transfers of full\-color rectangular patterns from

+system memory to video memory (using a memory\-mapped aperture).

+.TP 7

+.BI "Option \*qXaaNoMono8x8PatternFillRect\*q"

+Disables accelerated fills of a rectangular region with a monochrome

+pattern.

+.TP 7

+.BI "Option \*qXaaNoMono8x8PatternFillTrap\*q"

+Disables accelerated fills of a trapezoidal region with a monochrome

+pattern.

+.TP 7

+.BI "Option \*qXaaNoOffscreenPixmaps\*q"

+Disables accelerated draws into pixmaps stored in offscreen video memory.

+.TP 7

+.BI "Option \*qXaaNoPixmapCache\*q"

+Disables caching of patterns in offscreen video memory.

+.TP 7

+.BI "Option \*qXaaNoScanlineCPUToScreenColorExpandFill\*q"

+Disables accelerated rectangular expansion blits from source patterns

+stored in system memory (one scan line at a time).

+.TP 7

+.BI "Option \*qXaaNoScanlineImageWriteRect\*q"

+Disables accelerated transfers of full\-color rectangular patterns from

+system memory to video memory (one scan line at a time).

+.TP 7

+.BI "Option \*qXaaNoScreenToScreenColorExpandFill\*q"

+Disables accelerated rectangular expansion blits from source patterns

+stored in offscreen video memory.

+.TP 7

+.BI "Option \*qXaaNoScreenToScreenCopy\*q"

+Disables accelerated copies of rectangular regions from one part of

+video memory to another part of video memory.

+.TP 7

+.BI "Option \*qXaaNoSolidBresenhamLine\*q"

+Disables accelerated solid Bresenham line draws.

+.TP 7

+.BI "Option \*qXaaNoSolidFillRect\*q"

+Disables accelerated solid\-color fills of rectangles.

+.TP 7

+.BI "Option \*qXaaNoSolidFillTrap\*q"

+Disables accelerated solid\-color fills of Bresenham trapezoids.

+.TP 7

+.BI "Option \*qXaaNoSolidHorVertLine\*q"

+Disables accelerated solid horizontal and vertical line draws.

+.TP 7

+.BI "Option \*qXaaNoSolidTwoPointLine\*q"

+Disables accelerated solid line draws between two arbitrary points.

+.PP

+Each

+.B Screen

+section may optionally contain one or more

+.B Display

+subsections.

+Those subsections provide depth/fbbpp specific configuration information,

+and the one chosen depends on the depth and/or fbbpp that is being used for

+the screen.

+The

+.B Display

+subsection format is described in the section below.

+

+.SH "DISPLAY SUBSECTION"

+Each

+.B Screen

+section may have multiple

+.B Display

+subsections.

+The \(lqactive\(rq

+.B Display

+subsection is the first that matches the depth and/or fbbpp values being

+used, or failing that, the first that has neither a depth or fbbpp value

+specified.

+The

+.B Display

+subsections are optional.

+When there isn't one that matches the depth and/or fbbpp values being used,

+all the parameters that can be specified here fall back to their defaults.

+.PP

+.B Display

+subsections have the following format:

+.PP

+.RS 4

+.nf

+.B  "    SubSection \*qDisplay\*q"

+.BI "        Depth  " depth

+.I  "        entries"

+.I  "        ..."

+.B  "    EndSubSection"

+.fi

+.RE

+.TP 7

+.BI "Depth  " depth

+This entry specifies what colour depth the

+.B Display

+subsection is to be used for.

+This entry is usually specified, but it may be omitted to create a match\-all

+.B Display

+subsection or when wishing to match only against the

+.B FbBpp

+parameter.

+The range of

+.I depth

+values that are allowed depends on the driver.

+Most drivers support 8, 15, 16 and 24.

+Some also support 1 and/or 4, and some may support other values (like 30).

+Note:

+.I depth

+means the number of bits in a pixel that are actually used to determine

+the pixel colour.

+32 is not a valid

+.I depth

+value.

+Most hardware that uses 32 bits per pixel only uses 24 of them to hold the

+colour information, which means that the colour depth is 24, not 32.

+.TP 7

+.BI "FbBpp  " bpp

+This entry specifies the framebuffer format this

+.B Display

+subsection is to be used for.

+This entry is only needed when providing depth 24 configurations that allow

+a choice between a 24 bpp packed framebuffer format and a 32bpp sparse

+framebuffer format.

+In most cases this entry should not be used.

+.TP 7

+.BI "Weight  " "red\-weight green\-weight blue\-weight"

+This optional entry specifies the relative RGB weighting to be used

+for a screen is being used at depth 16 for drivers that allow multiple

+formats.

+This may also be specified from the command line with the

+.B \-weight

+option (see

+.BR __xservername__(__appmansuffix__)).

+.TP 7

+.BI "Virtual  " "xdim ydim"

+This optional entry specifies the virtual screen resolution to be used.

+.I xdim

+must be a multiple of either 8 or 16 for most drivers, and a multiple

+of 32 when running in monochrome mode.

+The given value will be rounded down if this is not the case.

+Video modes which are too large for the specified virtual size will be

+rejected.

+If this entry is not present, the virtual screen resolution will be set to

+accommodate all the valid video modes given in the

+.B Modes

+entry.

+Some drivers/hardware combinations do not support virtual screens.

+Refer to the appropriate driver\-specific documentation for details.

+.TP 7

+.BI "ViewPort  " "x0 y0"

+This optional entry sets the upper left corner of the initial display.

+This is only relevant when the virtual screen resolution is different

+from the resolution of the initial video mode.

+If this entry is not given, then the initial display will be centered in

+the virtual display area.

+.TP 7

+.BI "Modes  \*q" mode\-name \*q " ..."

+This optional entry specifies the list of video modes to use.

+Each

+.I mode\-name

+specified must be in double quotes.

+They must correspond to those specified or referenced in the appropriate

+.B Monitor

+section (including implicitly referenced built\-in VESA standard modes).

+The server will delete modes from this list which don't satisfy various

+requirements.

+The first valid mode in this list will be the default display mode for

+startup.

+The list of valid modes is converted internally into a circular list.

+It is possible to switch to the next mode with

+.B Ctrl+Alt+Keypad\-Plus

+and to the previous mode with

+.BR Ctrl+Alt+Keypad\-Minus .

+When this entry is omitted, the valid modes referenced by the appropriate

+.B Monitor

+section will be used.  If the

+.B Monitor

+section contains no modes, then the selection will be taken from the

+built-in VESA standard modes.

+.TP 7

+.BI "Visual  \*q" visual\-name \*q

+This optional entry sets the default root visual type.

+This may also be specified from the command line (see the

+.BR Xserver(__appmansuffix__)

+man page).

+The visual types available for depth 8 are (default is

+.BR PseudoColor ):

+.PP

+.RS 11

+.nf

+.B StaticGray

+.B GrayScale

+.B StaticColor

+.B PseudoColor

+.B TrueColor

+.B DirectColor

+.fi

+.RE

+.PP

+.RS 7

+The visual type available for the depths 15, 16 and 24 are (default is

+.BR TrueColor ):

+.PP

+.RS 4

+.nf

+.B TrueColor

+.B DirectColor

+.fi

+.RE

+.PP

+Not all drivers support

+.B DirectColor

+at these depths.

+.PP

+The visual types available for the depth 4 are (default is

+.BR StaticColor ):

+.PP

+.RS 4

+.nf

+.B StaticGray

+.B GrayScale

+.B StaticColor

+.B PseudoColor

+.fi

+.RE

+.PP

+The visual type available for the depth 1 (monochrome) is

+.BR StaticGray .

+.RE

+.TP 7

+.BI "Black  " "red green blue"

+This optional entry allows the \(lqblack\(rq colour to be specified.

+This is only supported at depth 1.

+The default is black.

+.TP 7

+.BI "White  " "red green blue"

+This optional entry allows the \(lqwhite\(rq colour to be specified.

+This is only supported at depth 1.

+The default is white.

+.TP 7

+.B Options

+Option flags may be specified in the

+.B Display

+subsections.

+These may include driver\-specific options and driver\-independent options.

+The former are described in the driver\-specific documentation.

+Some of the latter are described above in the section about the

+.B Screen

+section, and they may also be included here.

+.SH "SERVERLAYOUT SECTION"

+The config file may have multiple

+.B ServerLayout

+sections.

+A \(lqserver layout\(rq represents the binding of one or more screens

+.RB ( Screen

+sections) and one or more input devices

+.RB ( InputDevice

+sections) to form a complete configuration.

+In multi\-head configurations, it also specifies the relative layout of the

+heads.

+A

+.B ServerLayout

+section is considered \(lqactive\(rq if it is referenced by the

+.B \-layout

+command line option or by an

+.B "Option \*qDefaultServerLayout\*q"

+entry in the

+.B ServerFlags

+section (the former takes precedence over the latter).

+If those options are not used, the first

+.B ServerLayout

+section found in the config file is considered the active one.

+If no

+.B ServerLayout

+sections are present, the single active screen and two active (core)

+input devices are selected as described in the relevant sections above.

+.PP

+.B ServerLayout

+sections have the following format:

+.PP

+.RS 4

+.nf

+.B  "Section \*qServerLayout\*q"

+.BI "    Identifier   \*q" name \*q

+.BI "    Screen       \*q" screen\-id \*q

+.I  "    ..."

+.BI "    InputDevice  \*q" idev\-id \*q

+.I  "    ..."

+.I  "    options"

+.I  "    ..."

+.B  "EndSection"

+.fi

+.RE

+.PP

+Each

+.B ServerLayout

+section must have an

+.B Identifier

+entry and at least one

+.B Screen

+entry.

+.PP

+The

+.B Identifier

+entry specifies the unique name for this server layout.

+The

+.B ServerLayout

+section provides information specific to the whole session, including

+session\-specific

+.BR Options .

+The

+.B ServerFlags

+options (described above) may be specified here, and ones given here

+override those given in the

+.B ServerFlags

+section.

+.PP

+The entries that may be used in this section are described here.

+.TP 7

+.BI "Screen  " "screen\-num" " \*qscreen\-id\*q " "position\-information"

+One of these entries must be given for each screen being used in

+a session.

+The

+.I screen\-id

+field is mandatory, and specifies the

+.B Screen

+section being referenced.

+The

+.I screen\-num

+field is optional, and may be used to specify the screen number

+in multi\-head configurations.

+When this field is omitted, the screens will be numbered in the order that

+they are listed in.

+The numbering starts from 0, and must be consecutive.

+The

+.I position\-information

+field describes the way multiple screens are positioned.

+There are a number of different ways that this information can be provided:

+.RS 7

+.TP 4

+.I  "x y"

+.TP 4

+.BI "Absolute  " "x y"

+These both specify that the upper left corner's coordinates are

+.RI ( x , y ).

+The

+.B Absolute

+keyword is optional.

+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

+.BI "RightOf   \*q" screen\-id \*q

+.TP 4

+.BI "LeftOf    \*q" screen\-id \*q

+.TP 4

+.BI "Above     \*q" screen\-id \*q

+.TP 4

+.BI "Below     \*q" screen\-id \*q

+.TP 4

+.BI "Relative  \*q" screen\-id \*q " x y"

+These give the screen's location relative to another screen.

+The first four position the screen immediately to the right, left, above or

+below the other screen.

+When positioning to the right or left, the top edges are aligned.

+When positioning above or below, the left edges are aligned.

+The

+.B Relative

+form specifies the offset of the screen's origin (upper left corner)

+relative to the origin of another screen.

+.RE

+.TP 7

+.BI "InputDevice  \*q" idev\-id "\*q \*q" option \*q " ..."

+One of these entries should be given for each input device being used in

+a session.

+Normally at least two are required, one each for the core pointer and

+keyboard devices.

+If either of those is missing, suitable

+.B InputDevice

+entries are searched for using the method described above in the

+.B INPUTDEVICE

+section.  The

+.I idev\-id

+field is mandatory, and specifies the name of the

+.B InputDevice

+section being referenced.

+Multiple

+.I option

+fields may be specified, each in double quotes.

+The options permitted here are any that may also be given in the

+.B InputDevice

+sections.

+Normally only session\-specific input device options would be used here.

+The most commonly used options are:

+.PP

+.RS 11

+.nf

+.B \*qCorePointer\*q

+.B \*qCoreKeyboard\*q

+.B \*qSendCoreEvents\*q

+.fi

+.RE

+.PP

+.RS 7

+and the first two should normally be used to indicate the core pointer

+and core keyboard devices respectively.

+.RE

+.TP 7

+.B Options

+In addition to the following, any option permitted in the

+.B ServerFlags

+section may also be specified here.

+When the same option appears in both places, the value given here overrides

+the one given in the

+.B ServerFlags

+section.

+.TP 7

+.BI "Option \*qIsolateDevice\*q  \*q" bus\-id \*q

+Restrict device resets to the specified

+.IR bus\-id .

+See the

+.B BusID

+option (described in

+.BR "DEVICE SECTION" ,

+above) for the format of the

+.I bus\-id

+parameter.

+This option overrides

+.BR SingleCard ,

+if specified.

+At present, only PCI devices can be isolated in this manner.

+.TP 7

+.BI "Option \*qSingleCard\*q  \*q" boolean \*q

+As

+.BR IsolateDevice ,

+except that the bus ID of the first device in the layout is used.

+.PP

+Here is an example of a

+.B ServerLayout

+section for a dual headed configuration with two mice:

+.PP

+.RS 4

+.nf

+.B "Section \*qServerLayout\*q"

+.B "    Identifier  \*qLayout 1\*q"

+.B "    Screen      \*qMGA 1\*q"

+.B "    Screen      \*qMGA 2\*q RightOf \*qMGA 1\*q"

+.B "    InputDevice \*qKeyboard 1\*q \*qCoreKeyboard\*q"

+.B "    InputDevice \*qMouse 1\*q    \*qCorePointer\*q"

+.B "    InputDevice \*qMouse 2\*q    \*qSendCoreEvents\*q"

+.B "    Option      \*qBlankTime\*q  \*q5\*q"

+.B "EndSection"

+.fi

+.RE

+.SH "DRI SECTION"

+This optional section is used to provide some information for the

+Direct Rendering Infrastructure.

+Details about the format of this section can be found on-line at

+.IR <http://dri.freedesktop.org/> .

+.SH "VENDOR SECTION"

+The optional

+.B Vendor

+section may be used to provide vendor\-specific configuration information.

+Multiple

+.B Vendor

+sections may be present, and they may contain an

+.B Identifier

+entry and multiple

+.B Option

+flags.

+The data therein is not used in this release.

+.PP

+.SH "SEE ALSO"

+General:

+.BR X (__miscmansuffix__),

+.BR Xserver (__appmansuffix__),

+.BR __xservername__ (__appmansuffix__),

+.BR cvt (__appmansuffix__),

+.BR gtf (__appmansuffix__).

+.PP

+.B "Not all modules or interfaces are available on all platforms."

+.PP

+Display drivers:

+.BR apm (__drivermansuffix__),

+.BR ati (__drivermansuffix__),

+.BR chips (__drivermansuffix__),

+.BR cirrus (__drivermansuffix__),

+.BR cyrix (__drivermansuffix__),

+.BR fbdev (__drivermansuffix__),

+.BR glide (__drivermansuffix__),

+.BR glint (__drivermansuffix__),

+.BR i128 (__drivermansuffix__),

+.BR i740 (__drivermansuffix__),

+.BR imstt (__drivermansuffix__),

+.BR intel (__drivermansuffix__),

+.BR mga (__drivermansuffix__),

+.BR neomagic (__drivermansuffix__),

+.BR nv (__drivermansuffix__),

+.BR openchrome (__drivermansuffix__),

+.BR r128 (__drivermansuffix__),

+.BR radeon (__drivermansuffix__),

+.BR rendition (__drivermansuffix__),

+.BR savage (__drivermansuffix__),

+.BR s3virge (__drivermansuffix__),

+.BR siliconmotion (__drivermansuffix__),

+.BR sis (__drivermansuffix__),

+.BR sisusb (__drivermansuffix__),

+.BR sunbw2 (__drivermansuffix__),

+.BR suncg14 (__drivermansuffix__),

+.BR suncg3 (__drivermansuffix__),

+.BR suncg6 (__drivermansuffix__),

+.BR sunffb (__drivermansuffix__),

+.BR sunleo (__drivermansuffix__),

+.BR suntcx (__drivermansuffix__),

+.BR tdfx (__drivermansuffix__),

+.\" .BR tga (__drivermansuffix__),

+.BR trident (__drivermansuffix__),

+.BR tseng (__drivermansuffix__),

+.BR vesa (__drivermansuffix__),

+.BR vmware (__drivermansuffix__),

+.BR voodoo (__drivermansuffix__),

+.BR wsfb (__drivermansuffix__),

+.BR xgi (__drivermansuffix__),

+.BR xgixp (__drivermansuffix__).

+.PP

+Input drivers:

+.BR acecad (__drivermansuffix__),

+.BR citron (__drivermansuffix__),

+.BR elographics (__drivermansuffix__),

+.BR evdev (__drivermansuffix__),

+.BR fpit (__drivermansuffix__),

+.BR joystick (__drivermansuffix__),

+.BR kbd (__drivermansuffix__),

+.BR mousedrv (__drivermansuffix__),

+.BR mutouch (__drivermansuffix__),

+.BR penmount (__drivermansuffix__),

+.BR synaptics (__drivermansuffix__),

+.BR vmmouse (__drivermansuffix__),

+.BR void (__drivermansuffix__),

+.BR wacom (__drivermansuffix__).

+.PP

+Other modules and interfaces:

+.BR exa (__drivermansuffix__),

+.BR fbdevhw (__drivermansuffix__),

+.\" .BR shadowfb (__drivermansuffix__),

+.BR v4l (__drivermansuffix__).

+.br

+.SH AUTHORS

+This manual page was largely rewritten by David Dawes

+.IR <dawes@xfree86.org> .

diff --git a/xorg-server/include/xkbsrv.h b/xorg-server/include/xkbsrv.h
index 8257c54a6..9f7945e22 100644
--- a/xorg-server/include/xkbsrv.h
+++ b/xorg-server/include/xkbsrv.h
@@ -447,6 +447,11 @@ extern _X_EXPORT void	XkbFreeKeyboard(
 	Bool			/* freeDesc */

 );

 

+extern _X_EXPORT void	XkbFreeComponentNames(

+	XkbComponentNamesPtr	/* names */,

+	Bool			/* freeNames */

+);

+

 extern _X_EXPORT  void XkbSetActionKeyMods(

 	XkbDescPtr		/* xkb */,

 	XkbAction *		/* act */,

diff --git a/xorg-server/xkb/XKBAlloc.c b/xorg-server/xkb/XKBAlloc.c
index 8c439ba0b..89ba5fb4a 100644
--- a/xorg-server/xkb/XKBAlloc.c
+++ b/xorg-server/xkb/XKBAlloc.c
@@ -333,3 +333,22 @@ XkbFreeKeyboard(XkbDescPtr xkb,unsigned which,Bool freeAll)
 	free(xkb);

     return;

 }

+

+

+/***====================================================================***/

+

+void

+XkbFreeComponentNames(XkbComponentNamesPtr names, Bool freeNames)

+{

+    if (names)

+    {

+        free(names->keycodes);

+        free(names->types);

+        free(names->compat);

+        free(names->symbols);

+        free(names->geometry);

+        memset(names, 0, sizeof(XkbComponentNamesRec));

+    }

+    if (freeNames)

+        free(names);

+}

diff --git a/xorg-server/xkb/ddxLoad.c b/xorg-server/xkb/ddxLoad.c
index 8b3dab56d..13d2d6f1b 100644
--- a/xorg-server/xkb/ddxLoad.c
+++ b/xorg-server/xkb/ddxLoad.c
@@ -451,23 +451,23 @@ XkbRMLVOtoKcCGST(DeviceIntPtr dev, XkbRMLVOSet *rmlvo, XkbComponentNamesPtr kccg
 static XkbDescPtr

 XkbCompileKeymapForDevice(DeviceIntPtr dev, XkbRMLVOSet *rmlvo, int need)

 {

-    XkbDescPtr xkb;

+    XkbDescPtr xkb = NULL;

     unsigned int provided;

-    XkbComponentNamesRec kccgst;

+    XkbComponentNamesRec kccgst = {0};

     char name[PATH_MAX];

 

-    if (!XkbRMLVOtoKcCGST(dev, rmlvo, &kccgst))

-        return NULL;

-

-    provided = XkbDDXLoadKeymapByNames(dev, &kccgst, XkmAllIndicesMask, need,

-                                       &xkb, name, PATH_MAX);

-    if ((need & provided) != need) {

-        if (xkb) {

-            XkbFreeKeyboard(xkb, 0, TRUE);

-            xkb = NULL;

+    if (XkbRMLVOtoKcCGST(dev, rmlvo, &kccgst)) {

+        provided = XkbDDXLoadKeymapByNames(dev, &kccgst, XkmAllIndicesMask, need,

+                                           &xkb, name, PATH_MAX);

+        if ((need & provided) != need) {

+            if (xkb) {

+                XkbFreeKeyboard(xkb, 0, TRUE);

+                xkb = NULL;

+            }

         }

     }

 

+    XkbFreeComponentNames(&kccgst, FALSE);

     return xkb;

 }

 

diff --git a/xorg-server/xkb/xkb.c b/xorg-server/xkb/xkb.c
index 9d6c4d4f6..136d3ac45 100644
--- a/xorg-server/xkb/xkb.c
+++ b/xorg-server/xkb/xkb.c
@@ -4307,10 +4307,21 @@ ProcXkbSetNames(ClientPtr client)
 

 #define	XkbSizeCountedString(s)  ((s)?((((2+strlen(s))+3)/4)*4):4)

 

+/**

+ * Write the zero-terminated string str into wire as a pascal string with a

+ * 16-bit length field prefixed before the actual string.

+ *

+ * @param wire The destination array, usually the wire struct

+ * @param str The source string as zero-terminated C string

+ * @param swap If TRUE, the length field is swapped.

+ *

+ * @return The input string in the format <string length><string> with a

+ * (swapped) 16 bit string length, non-zero terminated.

+ */

 static char *

 XkbWriteCountedString(char *wire,char *str,Bool swap)

 {

-    CARD16 len,*pLen;

+    CARD16 len,*pLen, paddedLen;

 

     if (!str)

         return wire;

@@ -4322,8 +4333,9 @@ XkbWriteCountedString(char *wire,char *str,Bool swap)
 	register int n;

 	swaps(pLen,n);

     }

-    memcpy(&wire[2],str,len);

-    wire+= ((2+len+3)/4)*4;

+    paddedLen= pad_to_int32(sizeof(len)+len)-sizeof(len);

+    strncpy(&wire[sizeof(len)],str,paddedLen);

+    wire+= sizeof(len)+paddedLen;

     return wire;

 }

 

@@ -4434,6 +4446,7 @@ xkbShapeWireDesc *	shapeWire;
 	if (shape->approx!=NULL)

 	     shapeWire->approxNdx= XkbOutlineIndex(shape,shape->approx);

 	else shapeWire->approxNdx= XkbNoShape;

+	shapeWire->pad= 0;

 	if (swap) {

 	    register int n;

 	    swapl(&shapeWire->name,n);

@@ -4446,6 +4459,7 @@ xkbShapeWireDesc *	shapeWire;
 	    olWire= (xkbOutlineWireDesc *)wire;

 	    olWire->nPoints= ol->num_points;

 	    olWire->cornerRadius= ol->corner_radius;

+	    olWire->pad= 0;

 	    wire= (char *)&olWire[1];

 	    ptWire= (xkbPointWireDesc *)wire;

 	    for (p=0,pt=ol->points;p<ol->num_points;p++,pt++) {

@@ -4559,6 +4573,8 @@ xkbOverlayWireDesc *	olWire;
    olWire= (xkbOverlayWireDesc *)wire;

    olWire->name= ol->name;

    olWire->nRows= ol->num_rows;

+   olWire->pad1= 0;

+   olWire->pad2= 0;

    if (swap) {

 	register int n;

 	swapl(&olWire->name,n);

@@ -4571,6 +4587,7 @@ xkbOverlayWireDesc *	olWire;
 	rowWire= (xkbOverlayRowWireDesc *)wire;

 	rowWire->rowUnder= row->row_under;

 	rowWire->nKeys= row->num_keys;

+	rowWire->pad1= 0;

 	wire= (char *)&rowWire[1];

 	for (k=0,key=row->keys;k<row->num_keys;k++,key++) {

 	    xkbOverlayKeyWireDesc *	keyWire;

@@ -5897,16 +5914,7 @@ ProcXkbGetKbdByName(ClientPtr client)
 	XkbFreeKeyboard(new,XkbAllComponentsMask,TRUE);

 	new= NULL;

     }

-    free(names.keycodes);

-    names.keycodes = NULL;

-    free(names.types);

-    names.types = NULL;

-    free(names.compat);

-    names.compat = NULL;

-    free(names.symbols);

-    names.symbols = NULL;

-    free(names.geometry);

-    names.geometry = NULL;

+    XkbFreeComponentNames(&names, FALSE);

     return Success;

 }