aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/include
diff options
context:
space:
mode:
Diffstat (limited to 'nx-X11/include')
-rw-r--r--nx-X11/include/Xpoll.h.in.NX.original299
-rw-r--r--nx-X11/include/Xpoll.h.in.X.original255
-rw-r--r--nx-X11/include/extensions/XKBsrv.h.NX.original1192
-rw-r--r--nx-X11/include/extensions/XKBsrv.h.X.original1187
4 files changed, 0 insertions, 2933 deletions
diff --git a/nx-X11/include/Xpoll.h.in.NX.original b/nx-X11/include/Xpoll.h.in.NX.original
deleted file mode 100644
index dcea39c60..000000000
--- a/nx-X11/include/Xpoll.h.in.NX.original
+++ /dev/null
@@ -1,299 +0,0 @@
-/* $Xorg: Xpoll.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */
-
-/*
-
-Copyright 1994, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-/*
- * Copyright © 2005 Daniel Stone
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Daniel Stone not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission. Daniel Stone makes no representations about the
- * suitability of this software for any purpose. It is provided "as is"
- * without express or implied warranty.
- *
- * DANIEL STONE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * DANIEL STONE BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
- * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-
-/* $XFree86: xc/include/Xpoll.h,v 3.8 2001/01/17 17:53:11 dawes Exp $ */
-
-/**************************************************************************/
-/* */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */
-/* */
-/* NX-X11, NX protocol compression and NX extensions to this software */
-/* are copyright of NoMachine. Redistribution and use of the present */
-/* software is allowed according to terms specified in the file LICENSE */
-/* which comes in the source distribution. */
-/* */
-/* Check http://www.nomachine.com/licensing.html for applicability. */
-/* */
-/* NX and NoMachine are trademarks of Medialogic S.p.A. */
-/* */
-/* All rights reserved. */
-/* */
-/**************************************************************************/
-
-#ifndef _XPOLL_H_
-#define _XPOLL_H_
-
-#ifndef WIN32
-
-#ifndef USE_POLL
-
-#include <X11/Xos.h>
-
-/* Below is the monster branch from hell. Basically, most systems will drop to
- * 'the branch below is the fallthrough for halfway modern systems', and include
- * <sys/select.h>, so we get the FD_* macros. */
-#if !defined(DGUX)
-# if (defined(SVR4) || defined(CRAY) || defined(AIXV3)) && !defined(FD_SETSIZE)
-# include <sys/select.h>
-# ifdef luna
-# include <sysent.h>
-# endif
-# else /* not SVR4/CRAY/AIXv3 */
-# if defined(AIXV4) /* AIX 4.2 fubar-ed <sys/select.h>, so try really hard. */
-# if !defined(NFDBITS)
-# include <sys/select.h>
-# endif
-# else /* the branch below is the fallthrough for halfway modern systems */
-# ifdef __QNX__ /* Make sure we get 256 bit select masks */
-# define FD_SETSIZE 256
-# endif
-# include <sys/select.h>
-# endif
-# endif
-#else /* DGUX -- No sys/select in Intel DG/ux */
-# include <sys/time.h>
-# include <sys/types.h>
-# include <unistd.h>
-#endif
-
-#include <X11/Xmd.h>
-
-#ifdef CSRG_BASED
-#include <sys/param.h>
-# if BSD < 199103
-typedef long fd_mask;
-# endif
-#endif
-
-#define XFD_SETSIZE 256
-
-#ifndef FD_SETSIZE
-#define FD_SETSIZE XFD_SETSIZE
-#endif
-
-#ifndef NBBY
-#define NBBY 8 /* number of bits in a byte */
-#endif
-
-#ifndef NFDBITS
-#define NFDBITS (sizeof(fd_mask) * NBBY) /* bits per mask */
-#endif
-
-#ifndef howmany
-#define howmany(x,y) (((x)+((y)-1))/(y))
-#endif
-
-#if defined(BSD) && BSD < 198911 && !defined(luna)
-typedef struct fd_set {
- fd_mask fds_bits[howmany(FD_SETSIZE, NFDBITS)];
-} fd_set;
-#endif
-
-/*
- * Replace the standard Select with a version giving NX a
- * chance to check its own descriptors. This doesn't cover
- * the cases where the system is using poll or when system-
- * specific defines override the Select definition (OS/2).
- * See XlibInt.c for _XSelect().
- */
-
-#ifdef NX_TRANS_SOCKET
-
-extern int _XSelect(int maxfds, fd_set *readfds, fd_set *writefds,
- fd_set *exceptfds, struct timeval *timeout);
-
-#ifndef hpux /* and perhaps old BSD ??? */
-# define Select(n,r,w,e,t) _XSelect(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t)
-#else
-# ifndef _XPG4_EXTENDED /* HPUX 9.x and earlier */
-# define Select(n,r,w,e,t) _XSelect(n,(int*)r,(int*)w,(int*)e,(struct timeval*)t)
-# else
-# define Select(n,r,w,e,t) _XSelect(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t)
-# endif
-#endif
-
-#else /* #ifdef NX_TRANS_SOCKET */
-
-#ifndef hpux /* and perhaps old BSD ??? */
-# define Select(n,r,w,e,t) select(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t)
-#else
-# ifndef _XPG4_EXTENDED /* HPUX 9.x and earlier */
-# define Select(n,r,w,e,t) select(n,(int*)r,(int*)w,(int*)e,(struct timeval*)t)
-# else
-# define Select(n,r,w,e,t) select(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t)
-# endif
-#endif
-
-#endif /* #ifdef NX_TRANS_SOCKET */
-
-#define __X_FDS_BITS @USE_FDS_BITS@
-
-#ifndef __FDS_BITS
-# define __FDS_BITS(p) ((p)->__X_FDS_BITS)
-#endif
-
-#define __XFDS_BITS(p, n) (__FDS_BITS(p))[n]
-
-#ifndef FD_SET
-#define FD_SET(n, p) (__XFDS_BITS(p, ((n)/NFDBITS)) |= ((fd_mask)1 << ((n) % NFDBITS)))
-#endif
-#ifndef FD_CLR
-#define FD_CLR(n, p) (__XFDS_BITS((p), ((n)/NFDBITS)) &= ~((fd_mask)1 << ((n) % NFDBITS)))
-#endif
-#ifndef FD_ISSET
-#define FD_ISSET(n, p) ((__XFDS_BITS((p), ((n)/NFDBITS))) & ((fd_mask)1 << ((n) % NFDBITS)))
-#endif
-#ifndef FD_ZERO
-#define FD_ZERO(p) bzero((char *)(p), sizeof(*(p)))
-#endif
-
-/*
- * The howmany(FD_SETSIZE, NFDBITS) computes the number of elements in the
- * array. before accessing an element in the array we check it exists.
- * If it does not exist then the compiler discards the code to access it.
- */
-#define XFD_ANYSET(p) \
- ((howmany(FD_SETSIZE, NFDBITS) > 0 && (__XFDS_BITS(p, 0))) || \
- (howmany(FD_SETSIZE, NFDBITS) > 1 && (__XFDS_BITS(p, 1))) || \
- (howmany(FD_SETSIZE, NFDBITS) > 2 && (__XFDS_BITS(p, 2))) || \
- (howmany(FD_SETSIZE, NFDBITS) > 3 && (__XFDS_BITS(p, 3))) || \
- (howmany(FD_SETSIZE, NFDBITS) > 4 && (__XFDS_BITS(p, 4))) || \
- (howmany(FD_SETSIZE, NFDBITS) > 5 && (__XFDS_BITS(p, 5))) || \
- (howmany(FD_SETSIZE, NFDBITS) > 6 && (__XFDS_BITS(p, 6))) || \
- (howmany(FD_SETSIZE, NFDBITS) > 7 && (__XFDS_BITS(p, 7))))
-
-#define XFD_COPYSET(src,dst) { \
- int __i__; \
- for (__i__ = 0; __i__ < howmany(FD_SETSIZE, NFDBITS); __i__++) \
- __XFDS_BITS((dst), __i__) = __XFDS_BITS((src), __i__); \
- }
-#define XFD_ANDSET(dst,b1,b2) { \
- int __i__; \
- for (__i__ = 0; __i__ < howmany(FD_SETSIZE, NFDBITS); __i__++) \
- __XFDS_BITS((dst), __i__) = ((__XFDS_BITS((b1), __i__)) & (__XFDS_BITS((b2), __i__))); \
- }
-#define XFD_ORSET(dst,b1,b2) { \
- int __i__; \
- for (__i__ = 0; __i__ < howmany(FD_SETSIZE, NFDBITS); __i__++) \
- __XFDS_BITS((dst), __i__) = ((__XFDS_BITS((b1), __i__)) | (__XFDS_BITS((b2), __i__))); \
- }
-#define XFD_UNSET(dst,b1) { \
- int __i__; \
- for (__i__ = 0; __i__ < howmany(FD_SETSIZE, NFDBITS); __i__++) \
- __XFDS_BITS((dst), __i__) &= ~(__XFDS_BITS((b1), __i__)); \
- }
-
-#else /* USE_POLL */
-#include <sys/poll.h>
-#endif /* USE_POLL */
-
-#else /* WIN32 */
-
-#define XFD_SETSIZE 256
-#ifndef FD_SETSIZE
-#define FD_SETSIZE XFD_SETSIZE
-#endif
-#include <X11/Xwinsock.h>
-
-#define Select(n,r,w,e,t) select(0,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t)
-
-#define XFD_SETCOUNT(p) (((fd_set FAR *)(p))->fd_count)
-#define XFD_FD(p,i) (((fd_set FAR *)(p))->fd_array[i])
-#define XFD_ANYSET(p) XFD_SETCOUNT(p)
-
-#define XFD_COPYSET(src,dst) { \
- u_int __i; \
- FD_ZERO(dst); \
- for (__i = 0; __i < XFD_SETCOUNT(src) ; __i++) { \
- XFD_FD(dst,__i) = XFD_FD(src,__i); \
- } \
- XFD_SETCOUNT(dst) = XFD_SETCOUNT(src); \
-}
-
-#define XFD_ANDSET(dst,b1,b2) { \
- u_int __i; \
- FD_ZERO(dst); \
- for (__i = 0; __i < XFD_SETCOUNT(b1) ; __i++) { \
- if (FD_ISSET(XFD_FD(b1,__i), b2)) \
- FD_SET(XFD_FD(b1,__i), dst); \
- } \
-}
-
-#define XFD_ORSET(dst,b1,b2) { \
- u_int __i; \
- if (dst != b1) XFD_COPYSET(b1,dst); \
- for (__i = 0; __i < XFD_SETCOUNT(b2) ; __i++) { \
- if (!FD_ISSET(XFD_FD(b2,__i), dst)) \
- FD_SET(XFD_FD(b2,__i), dst); \
- } \
-}
-
-/* this one is really sub-optimal */
-#define XFD_UNSET(dst,b1) { \
- u_int __i; \
- for (__i = 0; __i < XFD_SETCOUNT(b1) ; __i++) { \
- FD_CLR(XFD_FD(b1,__i), dst); \
- } \
-}
-
-/* we have to pay the price of having an array here, unlike with bitmasks
- calling twice FD_SET with the same fd is not transparent, so be careful */
-#undef FD_SET
-#define FD_SET(fd,set) do { \
- if (XFD_SETCOUNT(set) < FD_SETSIZE && !FD_ISSET(fd,set)) \
- XFD_FD(set,XFD_SETCOUNT(set)++)=(fd); \
-} while(0)
-
-#define getdtablesize() FD_SETSIZE
-
-#endif /* WIN32 */
-
-#endif /* _XPOLL_H_ */
diff --git a/nx-X11/include/Xpoll.h.in.X.original b/nx-X11/include/Xpoll.h.in.X.original
deleted file mode 100644
index 33fdad477..000000000
--- a/nx-X11/include/Xpoll.h.in.X.original
+++ /dev/null
@@ -1,255 +0,0 @@
-/* $Xorg: Xpoll.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */
-
-/*
-
-Copyright 1994, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-/*
- * Copyright © 2005 Daniel Stone
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Daniel Stone not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission. Daniel Stone makes no representations about the
- * suitability of this software for any purpose. It is provided "as is"
- * without express or implied warranty.
- *
- * DANIEL STONE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * DANIEL STONE BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
- * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-
-/* $XFree86: xc/include/Xpoll.h,v 3.8 2001/01/17 17:53:11 dawes Exp $ */
-
-#ifndef _XPOLL_H_
-#define _XPOLL_H_
-
-#ifndef WIN32
-
-#ifndef USE_POLL
-
-#include <X11/Xos.h>
-
-/* Below is the monster branch from hell. Basically, most systems will drop to
- * 'the branch below is the fallthrough for halfway modern systems', and include
- * <sys/select.h>, so we get the FD_* macros. */
-#if !defined(DGUX)
-# if (defined(SVR4) || defined(CRAY) || defined(AIXV3)) && !defined(FD_SETSIZE)
-# include <sys/select.h>
-# ifdef luna
-# include <sysent.h>
-# endif
-# else /* not SVR4/CRAY/AIXv3 */
-# if defined(AIXV4) /* AIX 4.2 fubar-ed <sys/select.h>, so try really hard. */
-# if !defined(NFDBITS)
-# include <sys/select.h>
-# endif
-# else /* the branch below is the fallthrough for halfway modern systems */
-# ifdef __QNX__ /* Make sure we get 256 bit select masks */
-# define FD_SETSIZE 256
-# endif
-# include <sys/select.h>
-# endif
-# endif
-#else /* DGUX -- No sys/select in Intel DG/ux */
-# include <sys/time.h>
-# include <sys/types.h>
-# include <unistd.h>
-#endif
-
-#include <X11/Xmd.h>
-
-#ifdef CSRG_BASED
-#include <sys/param.h>
-# if BSD < 199103
-typedef long fd_mask;
-# endif
-#endif
-
-#define XFD_SETSIZE 256
-
-#ifndef FD_SETSIZE
-#define FD_SETSIZE XFD_SETSIZE
-#endif
-
-#ifndef NBBY
-#define NBBY 8 /* number of bits in a byte */
-#endif
-
-#ifndef NFDBITS
-#define NFDBITS (sizeof(fd_mask) * NBBY) /* bits per mask */
-#endif
-
-#ifndef howmany
-#define howmany(x,y) (((x)+((y)-1))/(y))
-#endif
-
-#if defined(BSD) && BSD < 198911 && !defined(luna)
-typedef struct fd_set {
- fd_mask fds_bits[howmany(FD_SETSIZE, NFDBITS)];
-} fd_set;
-#endif
-
-#ifndef hpux /* and perhaps old BSD ??? */
-# define Select(n,r,w,e,t) select(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t)
-#else
-# ifndef _XPG4_EXTENDED /* HPUX 9.x and earlier */
-# define Select(n,r,w,e,t) select(n,(int*)r,(int*)w,(int*)e,(struct timeval*)t)
-# else
-# define Select(n,r,w,e,t) select(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t)
-# endif
-#endif
-
-#define __X_FDS_BITS @USE_FDS_BITS@
-
-#ifndef __FDS_BITS
-# define __FDS_BITS(p) ((p)->__X_FDS_BITS)
-#endif
-
-#define __XFDS_BITS(p, n) (__FDS_BITS(p))[n]
-
-#ifndef FD_SET
-#define FD_SET(n, p) (__XFDS_BITS(p, ((n)/NFDBITS)) |= ((fd_mask)1 << ((n) % NFDBITS)))
-#endif
-#ifndef FD_CLR
-#define FD_CLR(n, p) (__XFDS_BITS((p), ((n)/NFDBITS)) &= ~((fd_mask)1 << ((n) % NFDBITS)))
-#endif
-#ifndef FD_ISSET
-#define FD_ISSET(n, p) ((__XFDS_BITS((p), ((n)/NFDBITS))) & ((fd_mask)1 << ((n) % NFDBITS)))
-#endif
-#ifndef FD_ZERO
-#define FD_ZERO(p) bzero((char *)(p), sizeof(*(p)))
-#endif
-
-/*
- * The howmany(FD_SETSIZE, NFDBITS) computes the number of elements in the
- * array. before accessing an element in the array we check it exists.
- * If it does not exist then the compiler discards the code to access it.
- */
-#define XFD_ANYSET(p) \
- ((howmany(FD_SETSIZE, NFDBITS) > 0 && (__XFDS_BITS(p, 0))) || \
- (howmany(FD_SETSIZE, NFDBITS) > 1 && (__XFDS_BITS(p, 1))) || \
- (howmany(FD_SETSIZE, NFDBITS) > 2 && (__XFDS_BITS(p, 2))) || \
- (howmany(FD_SETSIZE, NFDBITS) > 3 && (__XFDS_BITS(p, 3))) || \
- (howmany(FD_SETSIZE, NFDBITS) > 4 && (__XFDS_BITS(p, 4))) || \
- (howmany(FD_SETSIZE, NFDBITS) > 5 && (__XFDS_BITS(p, 5))) || \
- (howmany(FD_SETSIZE, NFDBITS) > 6 && (__XFDS_BITS(p, 6))) || \
- (howmany(FD_SETSIZE, NFDBITS) > 7 && (__XFDS_BITS(p, 7))))
-
-#define XFD_COPYSET(src,dst) { \
- int __i__; \
- for (__i__ = 0; __i__ < howmany(FD_SETSIZE, NFDBITS); __i__++) \
- __XFDS_BITS((dst), __i__) = __XFDS_BITS((src), __i__); \
- }
-#define XFD_ANDSET(dst,b1,b2) { \
- int __i__; \
- for (__i__ = 0; __i__ < howmany(FD_SETSIZE, NFDBITS); __i__++) \
- __XFDS_BITS((dst), __i__) = ((__XFDS_BITS((b1), __i__)) & (__XFDS_BITS((b2), __i__))); \
- }
-#define XFD_ORSET(dst,b1,b2) { \
- int __i__; \
- for (__i__ = 0; __i__ < howmany(FD_SETSIZE, NFDBITS); __i__++) \
- __XFDS_BITS((dst), __i__) = ((__XFDS_BITS((b1), __i__)) | (__XFDS_BITS((b2), __i__))); \
- }
-#define XFD_UNSET(dst,b1) { \
- int __i__; \
- for (__i__ = 0; __i__ < howmany(FD_SETSIZE, NFDBITS); __i__++) \
- __XFDS_BITS((dst), __i__) &= ~(__XFDS_BITS((b1), __i__)); \
- }
-
-#else /* USE_POLL */
-#include <sys/poll.h>
-#endif /* USE_POLL */
-
-#else /* WIN32 */
-
-#define XFD_SETSIZE 256
-#ifndef FD_SETSIZE
-#define FD_SETSIZE XFD_SETSIZE
-#endif
-#include <X11/Xwinsock.h>
-
-#define Select(n,r,w,e,t) select(0,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t)
-
-#define XFD_SETCOUNT(p) (((fd_set FAR *)(p))->fd_count)
-#define XFD_FD(p,i) (((fd_set FAR *)(p))->fd_array[i])
-#define XFD_ANYSET(p) XFD_SETCOUNT(p)
-
-#define XFD_COPYSET(src,dst) { \
- u_int __i; \
- FD_ZERO(dst); \
- for (__i = 0; __i < XFD_SETCOUNT(src) ; __i++) { \
- XFD_FD(dst,__i) = XFD_FD(src,__i); \
- } \
- XFD_SETCOUNT(dst) = XFD_SETCOUNT(src); \
-}
-
-#define XFD_ANDSET(dst,b1,b2) { \
- u_int __i; \
- FD_ZERO(dst); \
- for (__i = 0; __i < XFD_SETCOUNT(b1) ; __i++) { \
- if (FD_ISSET(XFD_FD(b1,__i), b2)) \
- FD_SET(XFD_FD(b1,__i), dst); \
- } \
-}
-
-#define XFD_ORSET(dst,b1,b2) { \
- u_int __i; \
- if (dst != b1) XFD_COPYSET(b1,dst); \
- for (__i = 0; __i < XFD_SETCOUNT(b2) ; __i++) { \
- if (!FD_ISSET(XFD_FD(b2,__i), dst)) \
- FD_SET(XFD_FD(b2,__i), dst); \
- } \
-}
-
-/* this one is really sub-optimal */
-#define XFD_UNSET(dst,b1) { \
- u_int __i; \
- for (__i = 0; __i < XFD_SETCOUNT(b1) ; __i++) { \
- FD_CLR(XFD_FD(b1,__i), dst); \
- } \
-}
-
-/* we have to pay the price of having an array here, unlike with bitmasks
- calling twice FD_SET with the same fd is not transparent, so be careful */
-#undef FD_SET
-#define FD_SET(fd,set) do { \
- if (XFD_SETCOUNT(set) < FD_SETSIZE && !FD_ISSET(fd,set)) \
- XFD_FD(set,XFD_SETCOUNT(set)++)=(fd); \
-} while(0)
-
-#define getdtablesize() FD_SETSIZE
-
-#endif /* WIN32 */
-
-#endif /* _XPOLL_H_ */
diff --git a/nx-X11/include/extensions/XKBsrv.h.NX.original b/nx-X11/include/extensions/XKBsrv.h.NX.original
deleted file mode 100644
index 4a9d8edcb..000000000
--- a/nx-X11/include/extensions/XKBsrv.h.NX.original
+++ /dev/null
@@ -1,1192 +0,0 @@
-/* $Xorg: XKBsrv.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */
-/* $XdotOrg: xc/include/extensions/XKBsrv.h,v 1.5 2005/09/01 19:56:14 krh Exp $ */
-/************************************************************
-Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be
-used in advertising or publicity pertaining to distribution
-of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability
-of this software for any purpose. It is provided "as is"
-without any express or implied warranty.
-
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-********************************************************/
-/* $XFree86: xc/include/extensions/XKBsrv.h,v 3.22 2002/11/20 04:49:01 dawes Exp $ */
-
-#ifndef _XKBSRV_H_
-#define _XKBSRV_H_
-
-#ifdef XKB_IN_SERVER
-#define XkbAllocClientMap SrvXkbAllocClientMap
-#define XkbAllocServerMap SrvXkbAllocServerMap
-#define XkbChangeTypesOfKey SrvXkbChangeTypesOfKey
-#define XkbAddKeyType SrvXkbAddKeyType
-#define XkbCopyKeyType SrvXkbCopyKeyType
-#define XkbCopyKeyTypes SrvXkbCopyKeyTypes
-#define XkbFreeClientMap SrvXkbFreeClientMap
-#define XkbFreeServerMap SrvXkbFreeServerMap
-#define XkbInitCanonicalKeyTypes SrvXkbInitCanonicalKeyTypes
-#define XkbKeyTypesForCoreSymbols SrvXkbKeyTypesForCoreSymbols
-#define XkbApplyCompatMapToKey SrvXkbApplyCompatMapToKey
-#define XkbUpdateMapFromCore SrvXkbUpdateMapFromCore
-#define XkbResizeKeyActions SrvXkbResizeKeyActions
-#define XkbResizeKeySyms SrvXkbResizeKeySyms
-#define XkbResizeKeyType SrvXkbResizeKeyType
-#define XkbAllocCompatMap SrvXkbAllocCompatMap
-#define XkbAllocControls SrvXkbAllocControls
-#define XkbAllocIndicatorMaps SrvXkbAllocIndicatorMaps
-#define XkbAllocKeyboard SrvXkbAllocKeyboard
-#define XkbAllocNames SrvXkbAllocNames
-#define XkbFreeCompatMap SrvXkbFreeCompatMap
-#define XkbFreeControls SrvXkbFreeControls
-#define XkbFreeIndicatorMaps SrvXkbFreeIndicatorMaps
-#define XkbFreeKeyboard SrvXkbFreeKeyboard
-#define XkbFreeNames SrvXkbFreeNames
-#define XkbAddDeviceLedInfo SrvXkbAddDeviceLedInfo
-#define XkbAllocDeviceInfo SrvXkbAllocDeviceInfo
-#define XkbFreeDeviceInfo SrvXkbFreeDeviceInfo
-#define XkbResizeDeviceButtonActions SrvXkbResizeDeviceButtonActions
-#define XkbLatchModifiers SrvXkbLatchModifiers
-#define XkbLatchGroup SrvXkbLatchGroup
-#define XkbVirtualModsToReal SrvXkbVirtualModsToReal
-#define XkbChangeKeycodeRange SrvXkbChangeKeycodeRange
-#define XkbApplyVirtualModChanges SrvXkbApplyVirtualModChanges
-#define XkbUpdateActionVirtualMods SrvXkbUpdateActionVirtualMods
-#define XkbUpdateKeyTypeVirtualMods SrvXkbUpdateKeyTypeVirtualMods
-#endif
-
-#include <X11/extensions/XKBstr.h>
-#include <X11/extensions/XKBproto.h>
-#include "inputstr.h"
-
-#ifdef NXAGENT_SERVER
-extern char *_NXGetXkbBasePath(const char *path);
-extern char *_NXGetXkbCompPath(const char *path);
-#endif
-
-typedef struct _XkbInterest {
- DeviceIntPtr dev;
- ClientPtr client;
- XID resource;
- struct _XkbInterest * next;
- CARD16 extDevNotifyMask;
- CARD16 stateNotifyMask;
- CARD16 namesNotifyMask;
- CARD32 ctrlsNotifyMask;
- CARD8 compatNotifyMask;
- BOOL bellNotifyMask;
- BOOL actionMessageMask;
- CARD16 accessXNotifyMask;
- CARD32 iStateNotifyMask;
- CARD32 iMapNotifyMask;
- CARD16 altSymsNotifyMask;
- CARD32 autoCtrls;
- CARD32 autoCtrlValues;
-} XkbInterestRec,*XkbInterestPtr;
-
-typedef struct _XkbRadioGroup {
- CARD8 flags;
- CARD8 nMembers;
- CARD8 dfltDown;
- CARD8 currentDown;
- CARD8 members[XkbRGMaxMembers];
-} XkbRadioGroupRec, *XkbRadioGroupPtr;
-
-typedef struct _XkbEventCause {
- CARD8 kc;
- CARD8 event;
- CARD8 mjr;
- CARD8 mnr;
- ClientPtr client;
-} XkbEventCauseRec,*XkbEventCausePtr;
-#define XkbSetCauseKey(c,k,e) { (c)->kc= (k),(c)->event= (e),\
- (c)->mjr= (c)->mnr= 0; \
- (c)->client= NULL; }
-#define XkbSetCauseReq(c,j,n,cl) { (c)->kc= (c)->event= 0,\
- (c)->mjr= (j),(c)->mnr= (n);\
- (c)->client= (cl); }
-#define XkbSetCauseCoreReq(c,e,cl) XkbSetCauseReq(c,e,0,cl)
-#define XkbSetCauseXkbReq(c,e,cl) XkbSetCauseReq(c,XkbReqCode,e,cl)
-#define XkbSetCauseUnknown(c) XkbSetCauseKey(c,0,0)
-
-#define _OFF_TIMER 0
-#define _KRG_WARN_TIMER 1
-#define _KRG_TIMER 2
-#define _SK_TIMEOUT_TIMER 3
-#define _ALL_TIMEOUT_TIMER 4
-
-#define _BEEP_NONE 0
-#define _BEEP_FEATURE_ON 1
-#define _BEEP_FEATURE_OFF 2
-#define _BEEP_FEATURE_CHANGE 3
-#define _BEEP_SLOW_WARN 4
-#define _BEEP_SLOW_PRESS 5
-#define _BEEP_SLOW_ACCEPT 6
-#define _BEEP_SLOW_REJECT 7
-#define _BEEP_SLOW_RELEASE 8
-#define _BEEP_STICKY_LATCH 9
-#define _BEEP_STICKY_LOCK 10
-#define _BEEP_STICKY_UNLOCK 11
-#define _BEEP_LED_ON 12
-#define _BEEP_LED_OFF 13
-#define _BEEP_LED_CHANGE 14
-#define _BEEP_BOUNCE_REJECT 15
-
-typedef struct _XkbSrvInfo {
- XkbStateRec prev_state;
- XkbStateRec state;
- XkbDescPtr desc;
-
- DeviceIntPtr device;
- KbdCtrlProcPtr kbdProc;
-
- XkbRadioGroupPtr radioGroups;
- CARD8 nRadioGroups;
- CARD8 clearMods;
- CARD8 setMods;
- INT16 groupChange;
-
- CARD16 dfltPtrDelta;
-
- double mouseKeysCurve;
- double mouseKeysCurveFactor;
- INT16 mouseKeysDX;
- INT16 mouseKeysDY;
- CARD8 mouseKeysFlags;
- Bool mouseKeysAccel;
- CARD8 mouseKeysCounter;
-
- CARD8 lockedPtrButtons;
- CARD8 shiftKeyCount;
- KeyCode mouseKey;
- KeyCode inactiveKey;
- KeyCode slowKey;
- KeyCode repeatKey;
- CARD8 krgTimerActive;
- CARD8 beepType;
- CARD8 beepCount;
-
- CARD32 flags;
- CARD32 lastPtrEventTime;
- CARD32 lastShiftEventTime;
- OsTimerPtr beepTimer;
- OsTimerPtr mouseKeyTimer;
- OsTimerPtr slowKeysTimer;
- OsTimerPtr bounceKeysTimer;
- OsTimerPtr repeatKeyTimer;
- OsTimerPtr krgTimer;
-} XkbSrvInfoRec, *XkbSrvInfoPtr;
-
-#define XkbSLI_IsDefault (1L<<0)
-#define XkbSLI_HasOwnState (1L<<1)
-
-typedef struct _XkbSrvLedInfo {
- CARD16 flags;
- CARD16 class;
- CARD16 id;
- union {
- KbdFeedbackPtr kf;
- LedFeedbackPtr lf;
- } fb;
-
- CARD32 physIndicators;
- CARD32 autoState;
- CARD32 explicitState;
- CARD32 effectiveState;
-
- CARD32 mapsPresent;
- CARD32 namesPresent;
- XkbIndicatorMapPtr maps;
- Atom * names;
-
- CARD32 usesBase;
- CARD32 usesLatched;
- CARD32 usesLocked;
- CARD32 usesEffective;
- CARD32 usesCompat;
- CARD32 usesControls;
-
- CARD32 usedComponents;
-} XkbSrvLedInfoRec, *XkbSrvLedInfoPtr;
-
-/*
- * Settings for xkbClientFlags field (used by DIX)
- * These flags _must_ not overlap with XkbPCF_*
- */
-#define _XkbClientInitialized (1<<15)
-
-#define _XkbWantsDetectableAutoRepeat(c)\
- ((c)->xkbClientFlags&XkbPCF_DetectableAutoRepeatMask)
-
-/*
- * Settings for flags field
- */
-#define _XkbStateNotifyInProgress (1<<0)
-
-typedef struct
-{
- ProcessInputProc processInputProc;
- ProcessInputProc realInputProc;
- DeviceUnwrapProc unwrapProc;
-} xkbDeviceInfoRec, *xkbDeviceInfoPtr;
-
-#define WRAP_PROCESS_INPUT_PROC(device, oldprocs, proc, unwrapproc) \
- device->public.processInputProc = proc; \
- oldprocs->processInputProc = \
- oldprocs->realInputProc = device->public.realInputProc; \
- device->public.realInputProc = proc; \
- oldprocs->unwrapProc = device->unwrapProc; \
- device->unwrapProc = unwrapproc;
-
-#define COND_WRAP_PROCESS_INPUT_PROC(device, oldprocs, proc, unwrapproc) \
- if (device->public.processInputProc == device->public.realInputProc)\
- device->public.processInputProc = proc; \
- oldprocs->processInputProc = \
- oldprocs->realInputProc = device->public.realInputProc; \
- device->public.realInputProc = proc; \
- oldprocs->unwrapProc = device->unwrapProc; \
- device->unwrapProc = unwrapproc;
-
-#define UNWRAP_PROCESS_INPUT_PROC(device, oldprocs) \
- device->public.processInputProc = oldprocs->processInputProc; \
- device->public.realInputProc = oldprocs->realInputProc; \
- device->unwrapProc = oldprocs->unwrapProc;
-
-#define XKBDEVICEINFO(dev) ((xkbDeviceInfoPtr) (dev)->devPrivates[xkbDevicePrivateIndex].ptr)
-
-/***====================================================================***/
-
-
-/***====================================================================***/
-
-#define XkbAX_KRGMask (XkbSlowKeysMask|XkbBounceKeysMask)
-#define XkbAllFilteredEventsMask \
- (XkbAccessXKeysMask|XkbRepeatKeysMask|XkbMouseKeysAccelMask|XkbAX_KRGMask)
-
-/***====================================================================***/
-
-extern int XkbReqCode;
-extern int XkbEventBase;
-extern int XkbKeyboardErrorCode;
-extern int XkbDisableLockActions;
-extern char * XkbBaseDirectory;
-extern char * XkbBinDirectory;
-extern char * XkbInitialMap;
-extern int _XkbClientMajor;
-extern int _XkbClientMinor;
-extern unsigned int XkbXIUnsupported;
-
-extern char * XkbModelUsed,*XkbLayoutUsed,*XkbVariantUsed,*XkbOptionsUsed;
-extern Bool noXkbExtension;
-extern Bool XkbWantRulesProp;
-
-extern pointer XkbLastRepeatEvent;
-
-extern CARD32 xkbDebugFlags;
-extern CARD32 xkbDebugCtrls;
-
-#define _XkbAlloc(s) xalloc((s))
-#define _XkbCalloc(n,s) Xcalloc((n)*(s))
-#define _XkbRealloc(o,s) Xrealloc((o),(s))
-#define _XkbTypedAlloc(t) ((t *)xalloc(sizeof(t)))
-#define _XkbTypedCalloc(n,t) ((t *)Xcalloc((n)*sizeof(t)))
-#define _XkbTypedRealloc(o,n,t) \
- ((o)?(t *)Xrealloc((o),(n)*sizeof(t)):_XkbTypedCalloc(n,t))
-#define _XkbClearElems(a,f,l,t) bzero(&(a)[f],((l)-(f)+1)*sizeof(t))
-#define _XkbFree(p) Xfree(p)
-
-#define _XkbLibError(c,l,d) \
- { _XkbErrCode= (c); _XkbErrLocation= (l); _XkbErrData= (d); }
-#define _XkbErrCode2(a,b) ((XID)((((unsigned int)(a))<<24)|((b)&0xffffff)))
-#define _XkbErrCode3(a,b,c) _XkbErrCode2(a,(((unsigned int)(b))<<16)|(c))
-#define _XkbErrCode4(a,b,c,d) _XkbErrCode3(a,b,((((unsigned int)(c))<<8)|(d)))
-
-extern int DeviceKeyPress,DeviceKeyRelease;
-extern int DeviceButtonPress,DeviceButtonRelease;
-
-#ifdef XINPUT
-#define _XkbIsPressEvent(t) (((t)==KeyPress)||((t)==DeviceKeyPress))
-#define _XkbIsReleaseEvent(t) (((t)==KeyRelease)||((t)==DeviceKeyRelease))
-#else
-#define _XkbIsPressEvent(t) ((t)==KeyPress)
-#define _XkbIsReleaseEvent(t) ((t)==KeyRelease)
-#endif
-
-#define _XkbCoreKeycodeInRange(c,k) (((k)>=(c)->curKeySyms.minKeyCode)&&\
- ((k)<=(c)->curKeySyms.maxKeyCode))
-#define _XkbCoreNumKeys(c) ((c)->curKeySyms.maxKeyCode-\
- (c)->curKeySyms.minKeyCode+1)
-
-#define XConvertCase(s,l,u) XkbConvertCase(s,l,u)
-#undef IsKeypadKey
-#define IsKeypadKey(s) XkbKSIsKeypad(s)
-
-#define Status int
-#define XPointer pointer
-#define Display struct _XDisplay
-
-#ifndef True
-#define True 1
-#define False 0
-#endif
-
-#ifndef PATH_MAX
-#ifdef MAXPATHLEN
-#define PATH_MAX MAXPATHLEN
-#else
-#define PATH_MAX 1024
-#endif
-#endif
-
-_XFUNCPROTOBEGIN
-
-extern void XkbUseMsg(
- void
-);
-
-extern int XkbProcessArguments(
- int /* argc */,
- char ** /* argv */,
- int /* i */
-);
-
-extern void XkbSetExtension(DeviceIntPtr device, ProcessInputProc proc);
-
-extern void XkbFreeCompatMap(
- XkbDescPtr /* xkb */,
- unsigned int /* which */,
- Bool /* freeMap */
-);
-
-extern void XkbFreeNames(
- XkbDescPtr /* xkb */,
- unsigned int /* which */,
- Bool /* freeMap */
-);
-
-extern DeviceIntPtr _XkbLookupAnyDevice(
- int /* id */,
- int * /* why_rtrn */
-);
-
-extern DeviceIntPtr _XkbLookupKeyboard(
- int /* id */,
- int * /* why_rtrn */
-);
-
-extern DeviceIntPtr _XkbLookupBellDevice(
- int /* id */,
- int * /* why_rtrn */
-);
-
-extern DeviceIntPtr _XkbLookupLedDevice(
- int /* id */,
- int * /* why_rtrn */
-);
-
-extern DeviceIntPtr _XkbLookupButtonDevice(
- int /* id */,
- int * /* why_rtrn */
-);
-
-extern XkbDescPtr XkbAllocKeyboard(
- void
-);
-
-extern Status XkbAllocClientMap(
- XkbDescPtr /* xkb */,
- unsigned int /* which */,
- unsigned int /* nTypes */
-);
-
-extern Status XkbAllocServerMap(
- XkbDescPtr /* xkb */,
- unsigned int /* which */,
- unsigned int /* nNewActions */
-);
-
-extern void XkbFreeClientMap(
- XkbDescPtr /* xkb */,
- unsigned int /* what */,
- Bool /* freeMap */
-);
-
-extern void XkbFreeServerMap(
- XkbDescPtr /* xkb */,
- unsigned int /* what */,
- Bool /* freeMap */
-);
-
-extern Status XkbAllocIndicatorMaps(
- XkbDescPtr /* xkb */
-);
-
-extern Status XkbAllocCompatMap(
- XkbDescPtr /* xkb */,
- unsigned int /* which */,
- unsigned int /* nInterpret */
-);
-
-extern Status XkbAllocNames(
- XkbDescPtr /* xkb */,
- unsigned int /* which */,
- int /* nTotalRG */,
- int /* nTotalAliases */
-);
-
-extern Status XkbAllocControls(
- XkbDescPtr /* xkb */,
- unsigned int /* which*/
-);
-
-extern Status XkbCopyKeyType(
- XkbKeyTypePtr /* from */,
- XkbKeyTypePtr /* into */
-);
-
-extern Status XkbCopyKeyTypes(
- XkbKeyTypePtr /* from */,
- XkbKeyTypePtr /* into */,
- int /* num_types */
-);
-
-extern Status XkbResizeKeyType(
- XkbDescPtr /* xkb */,
- int /* type_ndx */,
- int /* map_count */,
- Bool /* want_preserve */,
- int /* new_num_lvls */
-);
-
-extern void XkbFreeKeyboard(
- XkbDescPtr /* xkb */,
- unsigned int /* which */,
- Bool /* freeDesc */
-);
-
-extern void XkbSetActionKeyMods(
- XkbDescPtr /* xkb */,
- XkbAction * /* act */,
- unsigned int /* mods */
-);
-
-extern Bool XkbCheckActionVMods(
- XkbDescPtr /* xkb */,
- XkbAction * /* act */,
- unsigned int /* changed */
-);
-
-extern Bool XkbApplyVModChanges(
- XkbSrvInfoPtr /* xkbi */,
- unsigned int /* changed */,
- XkbChangesPtr /* pChanges */,
- unsigned int * /* needChecksRtrn */,
- XkbEventCausePtr /* cause */
-);
-
-extern void XkbApplyVModChangesToAllDevices(
- DeviceIntPtr /* dev */,
- XkbDescPtr /* xkb */,
- unsigned int /* changed */,
- XkbEventCausePtr /* cause */
-);
-
-extern unsigned int XkbMaskForVMask(
- XkbDescPtr /* xkb */,
- unsigned int /* vmask */
-);
-
-extern Bool XkbVirtualModsToReal(
- XkbDescPtr /* xkb */,
- unsigned int /* virtua_mask */,
- unsigned int * /* mask_rtrn */
-);
-
-extern unsigned int XkbAdjustGroup(
- int /* group */,
- XkbControlsPtr /* ctrls */
-);
-
-extern KeySym *XkbResizeKeySyms(
- XkbDescPtr /* xkb */,
- int /* key */,
- int /* needed */
-);
-
-extern XkbAction *XkbResizeKeyActions(
- XkbDescPtr /* xkb */,
- int /* key */,
- int /* needed */
-);
-
-extern void XkbUpdateKeyTypesFromCore(
- DeviceIntPtr /* pXDev */,
- KeyCode /* first */,
- CARD8 /* num */,
- XkbChangesPtr /* pChanges */
-);
-
-extern void XkbUpdateDescActions(
- XkbDescPtr /* xkb */,
- KeyCode /* first */,
- CARD8 /* num */,
- XkbChangesPtr /* changes */
-);
-
-extern void XkbUpdateActions(
- DeviceIntPtr /* pXDev */,
- KeyCode /* first */,
- CARD8 /* num */,
- XkbChangesPtr /* pChanges */,
- unsigned int * /* needChecksRtrn */,
- XkbEventCausePtr /* cause */
-);
-
-extern void XkbUpdateCoreDescription(
- DeviceIntPtr /* keybd */,
- Bool /* resize */
-);
-
-extern void XkbApplyMappingChange(
- DeviceIntPtr /* pXDev */,
- CARD8 /* request */,
- KeyCode /* firstKey */,
- CARD8 /* num */,
- ClientPtr /* client */
-);
-
-extern void XkbSetIndicators(
- DeviceIntPtr /* pXDev */,
- CARD32 /* affect */,
- CARD32 /* values */,
- XkbEventCausePtr /* cause */
-);
-
-extern void XkbUpdateIndicators(
- DeviceIntPtr /* keybd */,
- CARD32 /* changed */,
- Bool /* check_edevs */,
- XkbChangesPtr /* pChanges */,
- XkbEventCausePtr /* cause */
-);
-
-extern XkbSrvLedInfoPtr XkbAllocSrvLedInfo(
- DeviceIntPtr /* dev */,
- KbdFeedbackPtr /* kf */,
- LedFeedbackPtr /* lf */,
- unsigned int /* needed_parts */
-);
-
-extern XkbSrvLedInfoPtr XkbFindSrvLedInfo(
- DeviceIntPtr /* dev */,
- unsigned int /* class */,
- unsigned int /* id */,
- unsigned int /* needed_parts */
-);
-
-extern void XkbApplyLedNameChanges(
- DeviceIntPtr /* dev */,
- XkbSrvLedInfoPtr /* sli */,
- unsigned int /* changed_names */,
- xkbExtensionDeviceNotify * /* ed */,
- XkbChangesPtr /* changes */,
- XkbEventCausePtr /* cause */
-);
-
-extern void XkbApplyLedMapChanges(
- DeviceIntPtr /* dev */,
- XkbSrvLedInfoPtr /* sli */,
- unsigned int /* changed_maps */,
- xkbExtensionDeviceNotify * /* ed */,
- XkbChangesPtr /* changes */,
- XkbEventCausePtr /* cause */
-);
-
-extern void XkbApplyLedStateChanges(
- DeviceIntPtr /* dev */,
- XkbSrvLedInfoPtr /* sli */,
- unsigned int /* changed_leds */,
- xkbExtensionDeviceNotify * /* ed */,
- XkbChangesPtr /* changes */,
- XkbEventCausePtr /* cause */
-);
-
-extern void XkbUpdateLedAutoState(
- DeviceIntPtr /* dev */,
- XkbSrvLedInfoPtr /* sli */,
- unsigned int /* maps_to_check */,
- xkbExtensionDeviceNotify * /* ed */,
- XkbChangesPtr /* changes */,
- XkbEventCausePtr /* cause */
-);
-
-extern void XkbFlushLedEvents(
- DeviceIntPtr /* dev */,
- DeviceIntPtr /* kbd */,
- XkbSrvLedInfoPtr /* sli */,
- xkbExtensionDeviceNotify * /* ed */,
- XkbChangesPtr /* changes */,
- XkbEventCausePtr /* cause */
-);
-
-extern void XkbUpdateAllDeviceIndicators(
- XkbChangesPtr /* changes */,
- XkbEventCausePtr /* cause */
-);
-
-extern unsigned int XkbIndicatorsToUpdate(
- DeviceIntPtr /* dev */,
- unsigned long /* state_changes */,
- Bool /* enabled_ctrl_changes */
-);
-
-extern void XkbComputeDerivedState(
- XkbSrvInfoPtr /* xkbi */
-);
-
-extern void XkbCheckSecondaryEffects(
- XkbSrvInfoPtr /* xkbi */,
- unsigned int /* which */,
- XkbChangesPtr /* changes */,
- XkbEventCausePtr /* cause */
-);
-
-extern void XkbCheckIndicatorMaps(
- DeviceIntPtr /* dev */,
- XkbSrvLedInfoPtr /* sli */,
- unsigned int /* which */
-);
-
-extern unsigned int XkbStateChangedFlags(
- XkbStatePtr /* old */,
- XkbStatePtr /* new */
-);
-
-extern void XkbSendStateNotify(
- DeviceIntPtr /* kbd */,
- xkbStateNotify * /* pSN */
-);
-
-extern void XkbSendMapNotify(
- DeviceIntPtr /* kbd */,
- xkbMapNotify * /* ev */
-);
-
-extern int XkbComputeControlsNotify(
- DeviceIntPtr /* kbd */,
- XkbControlsPtr /* old */,
- XkbControlsPtr /* new */,
- xkbControlsNotify * /* pCN */,
- Bool /* forceCtrlProc */
-);
-
-extern void XkbSendControlsNotify(
- DeviceIntPtr /* kbd */,
- xkbControlsNotify * /* ev */
-);
-
-extern void XkbSendCompatMapNotify(
- DeviceIntPtr /* kbd */,
- xkbCompatMapNotify * /* ev */
-);
-
-extern void XkbSendIndicatorNotify(
- DeviceIntPtr /* kbd */,
- int /* xkbType */,
- xkbIndicatorNotify * /* ev */
-);
-
-extern void XkbHandleBell(
- BOOL /* force */,
- BOOL /* eventOnly */,
- DeviceIntPtr /* kbd */,
- CARD8 /* percent */,
- pointer /* ctrl */,
- CARD8 /* class */,
- Atom /* name */,
- WindowPtr /* pWin */,
- ClientPtr /* pClient */
-);
-
-extern void XkbSendAccessXNotify(
- DeviceIntPtr /* kbd */,
- xkbAccessXNotify * /* pEv */
-);
-
-extern void XkbSendNamesNotify(
- DeviceIntPtr /* kbd */,
- xkbNamesNotify * /* ev */
-);
-
-extern void XkbSendCompatNotify(
- DeviceIntPtr /* kbd */,
- xkbCompatMapNotify * /* ev */
-);
-
-extern void XkbSendActionMessage(
- DeviceIntPtr /* kbd */,
- xkbActionMessage * /* ev */
-);
-
-extern void XkbSendExtensionDeviceNotify(
- DeviceIntPtr /* kbd */,
- ClientPtr /* client */,
- xkbExtensionDeviceNotify * /* ev */
-);
-
-extern void XkbSendNotification(
- DeviceIntPtr /* kbd */,
- XkbChangesPtr /* pChanges */,
- XkbEventCausePtr /* cause */
-);
-
-extern void XkbProcessKeyboardEvent(
- struct _xEvent * /* xE */,
- DeviceIntPtr /* keybd */,
- int /* count */
-);
-
-extern void XkbProcessOtherEvent(
- struct _xEvent * /* xE */,
- DeviceIntPtr /* keybd */,
- int /* count */
-);
-
-extern void XkbHandleActions(
- DeviceIntPtr /* dev */,
- DeviceIntPtr /* kbd */,
- struct _xEvent * /* xE */,
- int /* count */
-);
-
-extern Bool XkbEnableDisableControls(
- XkbSrvInfoPtr /* xkbi */,
- unsigned long /* change */,
- unsigned long /* newValues */,
- XkbChangesPtr /* changes */,
- XkbEventCausePtr /* cause */
-);
-
-extern void AccessXInit(
- DeviceIntPtr /* dev */
-);
-
-extern Bool AccessXFilterPressEvent(
- register struct _xEvent * /* xE */,
- register DeviceIntPtr /* keybd */,
- int /* count */
-);
-
-extern Bool AccessXFilterReleaseEvent(
- register struct _xEvent * /* xE */,
- register DeviceIntPtr /* keybd */,
- int /* count */
-);
-
-extern void AccessXCancelRepeatKey(
- XkbSrvInfoPtr /* xkbi */,
- KeyCode /* key */
-);
-
-extern void AccessXComputeCurveFactor(
- XkbSrvInfoPtr /* xkbi */,
- XkbControlsPtr /* ctrls */
-);
-
-extern XkbDeviceLedInfoPtr XkbAddDeviceLedInfo(
- XkbDeviceInfoPtr /* devi */,
- unsigned int /* ledClass */,
- unsigned int /* ledId */
-);
-
-extern XkbDeviceInfoPtr XkbAllocDeviceInfo(
- unsigned int /* deviceSpec */,
- unsigned int /* nButtons */,
- unsigned int /* szLeds */
-);
-
-extern void XkbFreeDeviceInfo(
- XkbDeviceInfoPtr /* devi */,
- unsigned int /* which */,
- Bool /* freeDevI */
-);
-
-extern Status XkbResizeDeviceButtonActions(
- XkbDeviceInfoPtr /* devi */,
- unsigned int /* newTotal */
-);
-
-extern XkbInterestPtr XkbFindClientResource(
- DevicePtr /* inDev */,
- ClientPtr /* client */
-);
-
-extern XkbInterestPtr XkbAddClientResource(
- DevicePtr /* inDev */,
- ClientPtr /* client */,
- XID /* id */
-);
-
-extern int XkbRemoveClient(
- DevicePtr /* inDev */,
- ClientPtr /* client */
-);
-
-extern int XkbRemoveResourceClient(
- DevicePtr /* inDev */,
- XID /* id */
-);
-
-extern int XkbDDXInitDevice(
- DeviceIntPtr /* dev */
-);
-
-extern int XkbDDXAccessXBeep(
- DeviceIntPtr /* dev */,
- unsigned int /* what */,
- unsigned int /* which */
-);
-
-extern void XkbDDXKeyClick(
- DeviceIntPtr /* dev */,
- int /* keycode */,
- int /* synthetic */
-);
-
-extern int XkbDDXUsesSoftRepeat(
- DeviceIntPtr /* dev */
-);
-
-extern void XkbDDXKeybdCtrlProc(
- DeviceIntPtr /* dev */,
- KeybdCtrl * /* ctrl */
-);
-
-extern void XkbDDXChangeControls(
- DeviceIntPtr /* dev */,
- XkbControlsPtr /* old */,
- XkbControlsPtr /* new */
-);
-
-extern void XkbDDXUpdateIndicators(
- DeviceIntPtr /* keybd */,
- CARD32 /* newState */
-);
-
-extern void XkbDDXUpdateDeviceIndicators(
- DeviceIntPtr /* dev */,
- XkbSrvLedInfoPtr /* sli */,
- CARD32 /* newState */
-);
-
-extern void XkbDDXFakePointerButton(
- int /* event */,
- int /* button */
-);
-
-extern void XkbDDXFakePointerMotion(
- unsigned int /* flags */,
- int /* x */,
- int /* y */
-);
-
-extern void XkbDDXFakeDeviceButton(
- DeviceIntPtr /* dev */,
- Bool /* press */,
- int /* button */
-);
-
-extern int XkbDDXTerminateServer(
- DeviceIntPtr /* dev */,
- KeyCode /* key */,
- XkbAction * /* act */
-);
-
-extern int XkbDDXSwitchScreen(
- DeviceIntPtr /* dev */,
- KeyCode /* key */,
- XkbAction * /* act */
-);
-
-extern int XkbDDXPrivate(
- DeviceIntPtr /* dev */,
- KeyCode /* key */,
- XkbAction * /* act */
-);
-
-extern void XkbDisableComputedAutoRepeats(
- DeviceIntPtr /* pXDev */,
- unsigned int /* key */
-);
-
-extern void XkbSetRepeatKeys(
- DeviceIntPtr /* pXDev */,
- int /* key */,
- int /* onoff */
-);
-
-extern int XkbLatchModifiers(
- DeviceIntPtr /* pXDev */,
- CARD8 /* mask */,
- CARD8 /* latches */
-);
-
-extern int XkbLatchGroup(
- DeviceIntPtr /* pXDev */,
- int /* group */
-);
-
-extern void XkbClearAllLatchesAndLocks(
- DeviceIntPtr /* dev */,
- XkbSrvInfoPtr /* xkbi */,
- Bool /* genEv */,
- XkbEventCausePtr /* cause */
-);
-
-extern void XkbSetRulesDflts(
- char * /* rulesFile */,
- char * /* model */,
- char * /* layout */,
- char * /* variant */,
- char * /* options */
-);
-
-extern void XkbInitDevice(
- DeviceIntPtr /* pXDev */
-);
-
-extern Bool XkbInitKeyboardDeviceStruct(
- DeviceIntPtr /* pXDev */,
- XkbComponentNamesPtr /* pNames */,
- KeySymsPtr /* pSyms */,
- CARD8 /* pMods */[],
- BellProcPtr /* bellProc */,
- KbdCtrlProcPtr /* ctrlProc */
-);
-
-extern int SProcXkbDispatch(
- ClientPtr /* client */
-);
-
-extern XkbGeometryPtr XkbLookupNamedGeometry(
- DeviceIntPtr /* dev */,
- Atom /* name */,
- Bool * /* shouldFree */
-);
-
-extern char * _XkbDupString(
- char * /* str */
-);
-
-extern void XkbConvertCase(
- KeySym /* sym */,
- KeySym * /* lower */,
- KeySym * /* upper */
-);
-
-extern Status XkbChangeKeycodeRange(
- XkbDescPtr /* xkb */,
- int /* minKC */,
- int /* maxKC */,
- XkbChangesPtr /* changes */
-);
-
-extern int XkbFinishDeviceInit(
- DeviceIntPtr /* pXDev */
-);
-
-extern void XkbFreeSrvLedInfo(
- XkbSrvLedInfoPtr /* sli */
-);
-
-extern void XkbFreeInfo(
- XkbSrvInfoPtr /* xkbi */
-);
-
-extern Status XkbChangeTypesOfKey(
- XkbDescPtr /* xkb */,
- int /* key */,
- int /* nGroups */,
- unsigned int /* groups */,
- int * /* newTypesIn */,
- XkbMapChangesPtr /* changes */
-);
-
-extern XkbKeyTypePtr XkbAddKeyType(
- XkbDescPtr /* xkb */,
- Atom /* name */,
- int /* map_count */,
- Bool /* want_preserve */,
- int /* num_lvls */
-);
-
-extern Status XkbInitCanonicalKeyTypes(
- XkbDescPtr /* xkb */,
- unsigned int /* which */,
- int /* keypadVMod */
-);
-
-extern int XkbKeyTypesForCoreSymbols(
- XkbDescPtr /* xkb */,
- int /* map_width */,
- KeySym * /* core_syms */,
- unsigned int /* protected */,
- int * /* types_inout */,
- KeySym * /* xkb_syms_rtrn */
-);
-
-extern Bool XkbApplyCompatMapToKey(
- XkbDescPtr /* xkb */,
- KeyCode /* key */,
- XkbChangesPtr /* changes */
-);
-
-extern Bool XkbUpdateMapFromCore(
- XkbDescPtr /* xkb */,
- KeyCode /* first_key */,
- int /* num_keys */,
- int /* map_width */,
- KeySym * /* core_keysyms */,
- XkbChangesPtr /* changes */
-);
-
-extern void XkbFreeControls(
- XkbDescPtr /* xkb */,
- unsigned int /* which */,
- Bool /* freeMap */
-);
-
-extern void XkbFreeIndicatorMaps(
- XkbDescPtr /* xkb */
-);
-
-extern Bool XkbApplyVirtualModChanges(
- XkbDescPtr /* xkb */,
- unsigned int /* changed */,
- XkbChangesPtr /* changes */
-);
-
-extern Bool XkbUpdateActionVirtualMods(
- XkbDescPtr /* xkb */,
- XkbAction * /* act */,
- unsigned int /* changed */
-);
-
-extern void XkbUpdateKeyTypeVirtualMods(
- XkbDescPtr /* xkb */,
- XkbKeyTypePtr /* type */,
- unsigned int /* changed */,
- XkbChangesPtr /* changes */
-);
-
-extern void XkbSendNewKeyboardNotify(
- DeviceIntPtr /* kbd */,
- xkbNewKeyboardNotify * /* pNKN */
-);
-
-#ifdef XKBSRV_NEED_FILE_FUNCS
-
-#include <X11/extensions/XKMformat.h>
-#include <X11/extensions/XKBfile.h>
-#include <X11/extensions/XKBrules.h>
-
-#define _XkbListKeymaps 0
-#define _XkbListKeycodes 1
-#define _XkbListTypes 2
-#define _XkbListCompat 3
-#define _XkbListSymbols 4
-#define _XkbListGeometry 5
-#define _XkbListNumComponents 6
-
-typedef struct _XkbSrvListInfo {
- int szPool;
- int nPool;
- char * pool;
-
- int maxRtrn;
- int nTotal;
-
- char * pattern[_XkbListNumComponents];
- int nFound[_XkbListNumComponents];
-} XkbSrvListInfoRec,*XkbSrvListInfoPtr;
-
-char *
-XkbGetRulesDflts(
- XkbRF_VarDefsPtr /* defs */
-);
-
-extern void XkbSetRulesUsed(
- XkbRF_VarDefsPtr /* defs */
-);
-
-
-extern Status XkbDDXList(
- DeviceIntPtr /* dev */,
- XkbSrvListInfoPtr /* listing */,
- ClientPtr /* client */
-);
-
-extern unsigned int XkbDDXLoadKeymapByNames(
- DeviceIntPtr /* keybd */,
- XkbComponentNamesPtr /* names */,
- unsigned int /* want */,
- unsigned int /* need */,
- XkbFileInfoPtr /* finfoRtrn */,
- char * /* keymapNameRtrn */,
- int /* keymapNameRtrnLen */
-);
-
-extern Bool XkbDDXNamesFromRules(
- DeviceIntPtr /* keybd */,
- char * /* rules */,
- XkbRF_VarDefsPtr /* defs */,
- XkbComponentNamesPtr /* names */
-);
-
-extern FILE *XkbDDXOpenConfigFile(
- char * /* mapName */,
- char * /* fileNameRtrn */,
- int /* fileNameRtrnLen */
-);
-
-extern Bool XkbDDXApplyConfig(
- XPointer /* cfg_in */,
- XkbSrvInfoPtr /* xkbi */
-);
-
-extern XPointer XkbDDXPreloadConfig(
- char ** /* rulesFileRtrn */,
- XkbRF_VarDefsPtr /* defs */,
- XkbComponentNamesPtr /* names */,
- DeviceIntPtr /* dev */
-);
-
-extern int _XkbStrCaseCmp(
- char * /* str1 */,
- char * /* str2 */
-);
-
-#endif /* XKBSRV_NEED_FILE_FUNCS */
-
-
-_XFUNCPROTOEND
-
-#define XkbAtomGetString(d,s) NameForAtom(s)
-
-#endif /* _XKBSRV_H_ */
-
-
diff --git a/nx-X11/include/extensions/XKBsrv.h.X.original b/nx-X11/include/extensions/XKBsrv.h.X.original
deleted file mode 100644
index b04264de8..000000000
--- a/nx-X11/include/extensions/XKBsrv.h.X.original
+++ /dev/null
@@ -1,1187 +0,0 @@
-/* $Xorg: XKBsrv.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */
-/* $XdotOrg: xc/include/extensions/XKBsrv.h,v 1.5 2005/09/01 19:56:14 krh Exp $ */
-/************************************************************
-Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be
-used in advertising or publicity pertaining to distribution
-of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability
-of this software for any purpose. It is provided "as is"
-without any express or implied warranty.
-
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-********************************************************/
-/* $XFree86: xc/include/extensions/XKBsrv.h,v 3.22 2002/11/20 04:49:01 dawes Exp $ */
-
-#ifndef _XKBSRV_H_
-#define _XKBSRV_H_
-
-#ifdef XKB_IN_SERVER
-#define XkbAllocClientMap SrvXkbAllocClientMap
-#define XkbAllocServerMap SrvXkbAllocServerMap
-#define XkbChangeTypesOfKey SrvXkbChangeTypesOfKey
-#define XkbAddKeyType SrvXkbAddKeyType
-#define XkbCopyKeyType SrvXkbCopyKeyType
-#define XkbCopyKeyTypes SrvXkbCopyKeyTypes
-#define XkbFreeClientMap SrvXkbFreeClientMap
-#define XkbFreeServerMap SrvXkbFreeServerMap
-#define XkbInitCanonicalKeyTypes SrvXkbInitCanonicalKeyTypes
-#define XkbKeyTypesForCoreSymbols SrvXkbKeyTypesForCoreSymbols
-#define XkbApplyCompatMapToKey SrvXkbApplyCompatMapToKey
-#define XkbUpdateMapFromCore SrvXkbUpdateMapFromCore
-#define XkbResizeKeyActions SrvXkbResizeKeyActions
-#define XkbResizeKeySyms SrvXkbResizeKeySyms
-#define XkbResizeKeyType SrvXkbResizeKeyType
-#define XkbAllocCompatMap SrvXkbAllocCompatMap
-#define XkbAllocControls SrvXkbAllocControls
-#define XkbAllocIndicatorMaps SrvXkbAllocIndicatorMaps
-#define XkbAllocKeyboard SrvXkbAllocKeyboard
-#define XkbAllocNames SrvXkbAllocNames
-#define XkbFreeCompatMap SrvXkbFreeCompatMap
-#define XkbFreeControls SrvXkbFreeControls
-#define XkbFreeIndicatorMaps SrvXkbFreeIndicatorMaps
-#define XkbFreeKeyboard SrvXkbFreeKeyboard
-#define XkbFreeNames SrvXkbFreeNames
-#define XkbAddDeviceLedInfo SrvXkbAddDeviceLedInfo
-#define XkbAllocDeviceInfo SrvXkbAllocDeviceInfo
-#define XkbFreeDeviceInfo SrvXkbFreeDeviceInfo
-#define XkbResizeDeviceButtonActions SrvXkbResizeDeviceButtonActions
-#define XkbLatchModifiers SrvXkbLatchModifiers
-#define XkbLatchGroup SrvXkbLatchGroup
-#define XkbVirtualModsToReal SrvXkbVirtualModsToReal
-#define XkbChangeKeycodeRange SrvXkbChangeKeycodeRange
-#define XkbApplyVirtualModChanges SrvXkbApplyVirtualModChanges
-#define XkbUpdateActionVirtualMods SrvXkbUpdateActionVirtualMods
-#define XkbUpdateKeyTypeVirtualMods SrvXkbUpdateKeyTypeVirtualMods
-#endif
-
-#include <X11/extensions/XKBstr.h>
-#include <X11/extensions/XKBproto.h>
-#include "inputstr.h"
-
-typedef struct _XkbInterest {
- DeviceIntPtr dev;
- ClientPtr client;
- XID resource;
- struct _XkbInterest * next;
- CARD16 extDevNotifyMask;
- CARD16 stateNotifyMask;
- CARD16 namesNotifyMask;
- CARD32 ctrlsNotifyMask;
- CARD8 compatNotifyMask;
- BOOL bellNotifyMask;
- BOOL actionMessageMask;
- CARD16 accessXNotifyMask;
- CARD32 iStateNotifyMask;
- CARD32 iMapNotifyMask;
- CARD16 altSymsNotifyMask;
- CARD32 autoCtrls;
- CARD32 autoCtrlValues;
-} XkbInterestRec,*XkbInterestPtr;
-
-typedef struct _XkbRadioGroup {
- CARD8 flags;
- CARD8 nMembers;
- CARD8 dfltDown;
- CARD8 currentDown;
- CARD8 members[XkbRGMaxMembers];
-} XkbRadioGroupRec, *XkbRadioGroupPtr;
-
-typedef struct _XkbEventCause {
- CARD8 kc;
- CARD8 event;
- CARD8 mjr;
- CARD8 mnr;
- ClientPtr client;
-} XkbEventCauseRec,*XkbEventCausePtr;
-#define XkbSetCauseKey(c,k,e) { (c)->kc= (k),(c)->event= (e),\
- (c)->mjr= (c)->mnr= 0; \
- (c)->client= NULL; }
-#define XkbSetCauseReq(c,j,n,cl) { (c)->kc= (c)->event= 0,\
- (c)->mjr= (j),(c)->mnr= (n);\
- (c)->client= (cl); }
-#define XkbSetCauseCoreReq(c,e,cl) XkbSetCauseReq(c,e,0,cl)
-#define XkbSetCauseXkbReq(c,e,cl) XkbSetCauseReq(c,XkbReqCode,e,cl)
-#define XkbSetCauseUnknown(c) XkbSetCauseKey(c,0,0)
-
-#define _OFF_TIMER 0
-#define _KRG_WARN_TIMER 1
-#define _KRG_TIMER 2
-#define _SK_TIMEOUT_TIMER 3
-#define _ALL_TIMEOUT_TIMER 4
-
-#define _BEEP_NONE 0
-#define _BEEP_FEATURE_ON 1
-#define _BEEP_FEATURE_OFF 2
-#define _BEEP_FEATURE_CHANGE 3
-#define _BEEP_SLOW_WARN 4
-#define _BEEP_SLOW_PRESS 5
-#define _BEEP_SLOW_ACCEPT 6
-#define _BEEP_SLOW_REJECT 7
-#define _BEEP_SLOW_RELEASE 8
-#define _BEEP_STICKY_LATCH 9
-#define _BEEP_STICKY_LOCK 10
-#define _BEEP_STICKY_UNLOCK 11
-#define _BEEP_LED_ON 12
-#define _BEEP_LED_OFF 13
-#define _BEEP_LED_CHANGE 14
-#define _BEEP_BOUNCE_REJECT 15
-
-typedef struct _XkbSrvInfo {
- XkbStateRec prev_state;
- XkbStateRec state;
- XkbDescPtr desc;
-
- DeviceIntPtr device;
- KbdCtrlProcPtr kbdProc;
-
- XkbRadioGroupPtr radioGroups;
- CARD8 nRadioGroups;
- CARD8 clearMods;
- CARD8 setMods;
- INT16 groupChange;
-
- CARD16 dfltPtrDelta;
-
- double mouseKeysCurve;
- double mouseKeysCurveFactor;
- INT16 mouseKeysDX;
- INT16 mouseKeysDY;
- CARD8 mouseKeysFlags;
- Bool mouseKeysAccel;
- CARD8 mouseKeysCounter;
-
- CARD8 lockedPtrButtons;
- CARD8 shiftKeyCount;
- KeyCode mouseKey;
- KeyCode inactiveKey;
- KeyCode slowKey;
- KeyCode repeatKey;
- CARD8 krgTimerActive;
- CARD8 beepType;
- CARD8 beepCount;
-
- CARD32 flags;
- CARD32 lastPtrEventTime;
- CARD32 lastShiftEventTime;
- OsTimerPtr beepTimer;
- OsTimerPtr mouseKeyTimer;
- OsTimerPtr slowKeysTimer;
- OsTimerPtr bounceKeysTimer;
- OsTimerPtr repeatKeyTimer;
- OsTimerPtr krgTimer;
-} XkbSrvInfoRec, *XkbSrvInfoPtr;
-
-#define XkbSLI_IsDefault (1L<<0)
-#define XkbSLI_HasOwnState (1L<<1)
-
-typedef struct _XkbSrvLedInfo {
- CARD16 flags;
- CARD16 class;
- CARD16 id;
- union {
- KbdFeedbackPtr kf;
- LedFeedbackPtr lf;
- } fb;
-
- CARD32 physIndicators;
- CARD32 autoState;
- CARD32 explicitState;
- CARD32 effectiveState;
-
- CARD32 mapsPresent;
- CARD32 namesPresent;
- XkbIndicatorMapPtr maps;
- Atom * names;
-
- CARD32 usesBase;
- CARD32 usesLatched;
- CARD32 usesLocked;
- CARD32 usesEffective;
- CARD32 usesCompat;
- CARD32 usesControls;
-
- CARD32 usedComponents;
-} XkbSrvLedInfoRec, *XkbSrvLedInfoPtr;
-
-/*
- * Settings for xkbClientFlags field (used by DIX)
- * These flags _must_ not overlap with XkbPCF_*
- */
-#define _XkbClientInitialized (1<<15)
-
-#define _XkbWantsDetectableAutoRepeat(c)\
- ((c)->xkbClientFlags&XkbPCF_DetectableAutoRepeatMask)
-
-/*
- * Settings for flags field
- */
-#define _XkbStateNotifyInProgress (1<<0)
-
-typedef struct
-{
- ProcessInputProc processInputProc;
- ProcessInputProc realInputProc;
- DeviceUnwrapProc unwrapProc;
-} xkbDeviceInfoRec, *xkbDeviceInfoPtr;
-
-#define WRAP_PROCESS_INPUT_PROC(device, oldprocs, proc, unwrapproc) \
- device->public.processInputProc = proc; \
- oldprocs->processInputProc = \
- oldprocs->realInputProc = device->public.realInputProc; \
- device->public.realInputProc = proc; \
- oldprocs->unwrapProc = device->unwrapProc; \
- device->unwrapProc = unwrapproc;
-
-#define COND_WRAP_PROCESS_INPUT_PROC(device, oldprocs, proc, unwrapproc) \
- if (device->public.processInputProc == device->public.realInputProc)\
- device->public.processInputProc = proc; \
- oldprocs->processInputProc = \
- oldprocs->realInputProc = device->public.realInputProc; \
- device->public.realInputProc = proc; \
- oldprocs->unwrapProc = device->unwrapProc; \
- device->unwrapProc = unwrapproc;
-
-#define UNWRAP_PROCESS_INPUT_PROC(device, oldprocs) \
- device->public.processInputProc = oldprocs->processInputProc; \
- device->public.realInputProc = oldprocs->realInputProc; \
- device->unwrapProc = oldprocs->unwrapProc;
-
-#define XKBDEVICEINFO(dev) ((xkbDeviceInfoPtr) (dev)->devPrivates[xkbDevicePrivateIndex].ptr)
-
-/***====================================================================***/
-
-
-/***====================================================================***/
-
-#define XkbAX_KRGMask (XkbSlowKeysMask|XkbBounceKeysMask)
-#define XkbAllFilteredEventsMask \
- (XkbAccessXKeysMask|XkbRepeatKeysMask|XkbMouseKeysAccelMask|XkbAX_KRGMask)
-
-/***====================================================================***/
-
-extern int XkbReqCode;
-extern int XkbEventBase;
-extern int XkbKeyboardErrorCode;
-extern int XkbDisableLockActions;
-extern char * XkbBaseDirectory;
-extern char * XkbBinDirectory;
-extern char * XkbInitialMap;
-extern int _XkbClientMajor;
-extern int _XkbClientMinor;
-extern unsigned int XkbXIUnsupported;
-
-extern char * XkbModelUsed,*XkbLayoutUsed,*XkbVariantUsed,*XkbOptionsUsed;
-extern Bool noXkbExtension;
-extern Bool XkbWantRulesProp;
-
-extern pointer XkbLastRepeatEvent;
-
-extern CARD32 xkbDebugFlags;
-extern CARD32 xkbDebugCtrls;
-
-#define _XkbAlloc(s) xalloc((s))
-#define _XkbCalloc(n,s) Xcalloc((n)*(s))
-#define _XkbRealloc(o,s) Xrealloc((o),(s))
-#define _XkbTypedAlloc(t) ((t *)xalloc(sizeof(t)))
-#define _XkbTypedCalloc(n,t) ((t *)Xcalloc((n)*sizeof(t)))
-#define _XkbTypedRealloc(o,n,t) \
- ((o)?(t *)Xrealloc((o),(n)*sizeof(t)):_XkbTypedCalloc(n,t))
-#define _XkbClearElems(a,f,l,t) bzero(&(a)[f],((l)-(f)+1)*sizeof(t))
-#define _XkbFree(p) Xfree(p)
-
-#define _XkbLibError(c,l,d) \
- { _XkbErrCode= (c); _XkbErrLocation= (l); _XkbErrData= (d); }
-#define _XkbErrCode2(a,b) ((XID)((((unsigned int)(a))<<24)|((b)&0xffffff)))
-#define _XkbErrCode3(a,b,c) _XkbErrCode2(a,(((unsigned int)(b))<<16)|(c))
-#define _XkbErrCode4(a,b,c,d) _XkbErrCode3(a,b,((((unsigned int)(c))<<8)|(d)))
-
-extern int DeviceKeyPress,DeviceKeyRelease;
-extern int DeviceButtonPress,DeviceButtonRelease;
-
-#ifdef XINPUT
-#define _XkbIsPressEvent(t) (((t)==KeyPress)||((t)==DeviceKeyPress))
-#define _XkbIsReleaseEvent(t) (((t)==KeyRelease)||((t)==DeviceKeyRelease))
-#else
-#define _XkbIsPressEvent(t) ((t)==KeyPress)
-#define _XkbIsReleaseEvent(t) ((t)==KeyRelease)
-#endif
-
-#define _XkbCoreKeycodeInRange(c,k) (((k)>=(c)->curKeySyms.minKeyCode)&&\
- ((k)<=(c)->curKeySyms.maxKeyCode))
-#define _XkbCoreNumKeys(c) ((c)->curKeySyms.maxKeyCode-\
- (c)->curKeySyms.minKeyCode+1)
-
-#define XConvertCase(s,l,u) XkbConvertCase(s,l,u)
-#undef IsKeypadKey
-#define IsKeypadKey(s) XkbKSIsKeypad(s)
-
-#define Status int
-#define XPointer pointer
-#define Display struct _XDisplay
-
-#ifndef True
-#define True 1
-#define False 0
-#endif
-
-#ifndef PATH_MAX
-#ifdef MAXPATHLEN
-#define PATH_MAX MAXPATHLEN
-#else
-#define PATH_MAX 1024
-#endif
-#endif
-
-_XFUNCPROTOBEGIN
-
-extern void XkbUseMsg(
- void
-);
-
-extern int XkbProcessArguments(
- int /* argc */,
- char ** /* argv */,
- int /* i */
-);
-
-extern void XkbSetExtension(DeviceIntPtr device, ProcessInputProc proc);
-
-extern void XkbFreeCompatMap(
- XkbDescPtr /* xkb */,
- unsigned int /* which */,
- Bool /* freeMap */
-);
-
-extern void XkbFreeNames(
- XkbDescPtr /* xkb */,
- unsigned int /* which */,
- Bool /* freeMap */
-);
-
-extern DeviceIntPtr _XkbLookupAnyDevice(
- int /* id */,
- int * /* why_rtrn */
-);
-
-extern DeviceIntPtr _XkbLookupKeyboard(
- int /* id */,
- int * /* why_rtrn */
-);
-
-extern DeviceIntPtr _XkbLookupBellDevice(
- int /* id */,
- int * /* why_rtrn */
-);
-
-extern DeviceIntPtr _XkbLookupLedDevice(
- int /* id */,
- int * /* why_rtrn */
-);
-
-extern DeviceIntPtr _XkbLookupButtonDevice(
- int /* id */,
- int * /* why_rtrn */
-);
-
-extern XkbDescPtr XkbAllocKeyboard(
- void
-);
-
-extern Status XkbAllocClientMap(
- XkbDescPtr /* xkb */,
- unsigned int /* which */,
- unsigned int /* nTypes */
-);
-
-extern Status XkbAllocServerMap(
- XkbDescPtr /* xkb */,
- unsigned int /* which */,
- unsigned int /* nNewActions */
-);
-
-extern void XkbFreeClientMap(
- XkbDescPtr /* xkb */,
- unsigned int /* what */,
- Bool /* freeMap */
-);
-
-extern void XkbFreeServerMap(
- XkbDescPtr /* xkb */,
- unsigned int /* what */,
- Bool /* freeMap */
-);
-
-extern Status XkbAllocIndicatorMaps(
- XkbDescPtr /* xkb */
-);
-
-extern Status XkbAllocCompatMap(
- XkbDescPtr /* xkb */,
- unsigned int /* which */,
- unsigned int /* nInterpret */
-);
-
-extern Status XkbAllocNames(
- XkbDescPtr /* xkb */,
- unsigned int /* which */,
- int /* nTotalRG */,
- int /* nTotalAliases */
-);
-
-extern Status XkbAllocControls(
- XkbDescPtr /* xkb */,
- unsigned int /* which*/
-);
-
-extern Status XkbCopyKeyType(
- XkbKeyTypePtr /* from */,
- XkbKeyTypePtr /* into */
-);
-
-extern Status XkbCopyKeyTypes(
- XkbKeyTypePtr /* from */,
- XkbKeyTypePtr /* into */,
- int /* num_types */
-);
-
-extern Status XkbResizeKeyType(
- XkbDescPtr /* xkb */,
- int /* type_ndx */,
- int /* map_count */,
- Bool /* want_preserve */,
- int /* new_num_lvls */
-);
-
-extern void XkbFreeKeyboard(
- XkbDescPtr /* xkb */,
- unsigned int /* which */,
- Bool /* freeDesc */
-);
-
-extern void XkbSetActionKeyMods(
- XkbDescPtr /* xkb */,
- XkbAction * /* act */,
- unsigned int /* mods */
-);
-
-extern Bool XkbCheckActionVMods(
- XkbDescPtr /* xkb */,
- XkbAction * /* act */,
- unsigned int /* changed */
-);
-
-extern Bool XkbApplyVModChanges(
- XkbSrvInfoPtr /* xkbi */,
- unsigned int /* changed */,
- XkbChangesPtr /* pChanges */,
- unsigned int * /* needChecksRtrn */,
- XkbEventCausePtr /* cause */
-);
-
-extern void XkbApplyVModChangesToAllDevices(
- DeviceIntPtr /* dev */,
- XkbDescPtr /* xkb */,
- unsigned int /* changed */,
- XkbEventCausePtr /* cause */
-);
-
-extern unsigned int XkbMaskForVMask(
- XkbDescPtr /* xkb */,
- unsigned int /* vmask */
-);
-
-extern Bool XkbVirtualModsToReal(
- XkbDescPtr /* xkb */,
- unsigned int /* virtua_mask */,
- unsigned int * /* mask_rtrn */
-);
-
-extern unsigned int XkbAdjustGroup(
- int /* group */,
- XkbControlsPtr /* ctrls */
-);
-
-extern KeySym *XkbResizeKeySyms(
- XkbDescPtr /* xkb */,
- int /* key */,
- int /* needed */
-);
-
-extern XkbAction *XkbResizeKeyActions(
- XkbDescPtr /* xkb */,
- int /* key */,
- int /* needed */
-);
-
-extern void XkbUpdateKeyTypesFromCore(
- DeviceIntPtr /* pXDev */,
- KeyCode /* first */,
- CARD8 /* num */,
- XkbChangesPtr /* pChanges */
-);
-
-extern void XkbUpdateDescActions(
- XkbDescPtr /* xkb */,
- KeyCode /* first */,
- CARD8 /* num */,
- XkbChangesPtr /* changes */
-);
-
-extern void XkbUpdateActions(
- DeviceIntPtr /* pXDev */,
- KeyCode /* first */,
- CARD8 /* num */,
- XkbChangesPtr /* pChanges */,
- unsigned int * /* needChecksRtrn */,
- XkbEventCausePtr /* cause */
-);
-
-extern void XkbUpdateCoreDescription(
- DeviceIntPtr /* keybd */,
- Bool /* resize */
-);
-
-extern void XkbApplyMappingChange(
- DeviceIntPtr /* pXDev */,
- CARD8 /* request */,
- KeyCode /* firstKey */,
- CARD8 /* num */,
- ClientPtr /* client */
-);
-
-extern void XkbSetIndicators(
- DeviceIntPtr /* pXDev */,
- CARD32 /* affect */,
- CARD32 /* values */,
- XkbEventCausePtr /* cause */
-);
-
-extern void XkbUpdateIndicators(
- DeviceIntPtr /* keybd */,
- CARD32 /* changed */,
- Bool /* check_edevs */,
- XkbChangesPtr /* pChanges */,
- XkbEventCausePtr /* cause */
-);
-
-extern XkbSrvLedInfoPtr XkbAllocSrvLedInfo(
- DeviceIntPtr /* dev */,
- KbdFeedbackPtr /* kf */,
- LedFeedbackPtr /* lf */,
- unsigned int /* needed_parts */
-);
-
-extern XkbSrvLedInfoPtr XkbFindSrvLedInfo(
- DeviceIntPtr /* dev */,
- unsigned int /* class */,
- unsigned int /* id */,
- unsigned int /* needed_parts */
-);
-
-extern void XkbApplyLedNameChanges(
- DeviceIntPtr /* dev */,
- XkbSrvLedInfoPtr /* sli */,
- unsigned int /* changed_names */,
- xkbExtensionDeviceNotify * /* ed */,
- XkbChangesPtr /* changes */,
- XkbEventCausePtr /* cause */
-);
-
-extern void XkbApplyLedMapChanges(
- DeviceIntPtr /* dev */,
- XkbSrvLedInfoPtr /* sli */,
- unsigned int /* changed_maps */,
- xkbExtensionDeviceNotify * /* ed */,
- XkbChangesPtr /* changes */,
- XkbEventCausePtr /* cause */
-);
-
-extern void XkbApplyLedStateChanges(
- DeviceIntPtr /* dev */,
- XkbSrvLedInfoPtr /* sli */,
- unsigned int /* changed_leds */,
- xkbExtensionDeviceNotify * /* ed */,
- XkbChangesPtr /* changes */,
- XkbEventCausePtr /* cause */
-);
-
-extern void XkbUpdateLedAutoState(
- DeviceIntPtr /* dev */,
- XkbSrvLedInfoPtr /* sli */,
- unsigned int /* maps_to_check */,
- xkbExtensionDeviceNotify * /* ed */,
- XkbChangesPtr /* changes */,
- XkbEventCausePtr /* cause */
-);
-
-extern void XkbFlushLedEvents(
- DeviceIntPtr /* dev */,
- DeviceIntPtr /* kbd */,
- XkbSrvLedInfoPtr /* sli */,
- xkbExtensionDeviceNotify * /* ed */,
- XkbChangesPtr /* changes */,
- XkbEventCausePtr /* cause */
-);
-
-extern void XkbUpdateAllDeviceIndicators(
- XkbChangesPtr /* changes */,
- XkbEventCausePtr /* cause */
-);
-
-extern unsigned int XkbIndicatorsToUpdate(
- DeviceIntPtr /* dev */,
- unsigned long /* state_changes */,
- Bool /* enabled_ctrl_changes */
-);
-
-extern void XkbComputeDerivedState(
- XkbSrvInfoPtr /* xkbi */
-);
-
-extern void XkbCheckSecondaryEffects(
- XkbSrvInfoPtr /* xkbi */,
- unsigned int /* which */,
- XkbChangesPtr /* changes */,
- XkbEventCausePtr /* cause */
-);
-
-extern void XkbCheckIndicatorMaps(
- DeviceIntPtr /* dev */,
- XkbSrvLedInfoPtr /* sli */,
- unsigned int /* which */
-);
-
-extern unsigned int XkbStateChangedFlags(
- XkbStatePtr /* old */,
- XkbStatePtr /* new */
-);
-
-extern void XkbSendStateNotify(
- DeviceIntPtr /* kbd */,
- xkbStateNotify * /* pSN */
-);
-
-extern void XkbSendMapNotify(
- DeviceIntPtr /* kbd */,
- xkbMapNotify * /* ev */
-);
-
-extern int XkbComputeControlsNotify(
- DeviceIntPtr /* kbd */,
- XkbControlsPtr /* old */,
- XkbControlsPtr /* new */,
- xkbControlsNotify * /* pCN */,
- Bool /* forceCtrlProc */
-);
-
-extern void XkbSendControlsNotify(
- DeviceIntPtr /* kbd */,
- xkbControlsNotify * /* ev */
-);
-
-extern void XkbSendCompatMapNotify(
- DeviceIntPtr /* kbd */,
- xkbCompatMapNotify * /* ev */
-);
-
-extern void XkbSendIndicatorNotify(
- DeviceIntPtr /* kbd */,
- int /* xkbType */,
- xkbIndicatorNotify * /* ev */
-);
-
-extern void XkbHandleBell(
- BOOL /* force */,
- BOOL /* eventOnly */,
- DeviceIntPtr /* kbd */,
- CARD8 /* percent */,
- pointer /* ctrl */,
- CARD8 /* class */,
- Atom /* name */,
- WindowPtr /* pWin */,
- ClientPtr /* pClient */
-);
-
-extern void XkbSendAccessXNotify(
- DeviceIntPtr /* kbd */,
- xkbAccessXNotify * /* pEv */
-);
-
-extern void XkbSendNamesNotify(
- DeviceIntPtr /* kbd */,
- xkbNamesNotify * /* ev */
-);
-
-extern void XkbSendCompatNotify(
- DeviceIntPtr /* kbd */,
- xkbCompatMapNotify * /* ev */
-);
-
-extern void XkbSendActionMessage(
- DeviceIntPtr /* kbd */,
- xkbActionMessage * /* ev */
-);
-
-extern void XkbSendExtensionDeviceNotify(
- DeviceIntPtr /* kbd */,
- ClientPtr /* client */,
- xkbExtensionDeviceNotify * /* ev */
-);
-
-extern void XkbSendNotification(
- DeviceIntPtr /* kbd */,
- XkbChangesPtr /* pChanges */,
- XkbEventCausePtr /* cause */
-);
-
-extern void XkbProcessKeyboardEvent(
- struct _xEvent * /* xE */,
- DeviceIntPtr /* keybd */,
- int /* count */
-);
-
-extern void XkbProcessOtherEvent(
- struct _xEvent * /* xE */,
- DeviceIntPtr /* keybd */,
- int /* count */
-);
-
-extern void XkbHandleActions(
- DeviceIntPtr /* dev */,
- DeviceIntPtr /* kbd */,
- struct _xEvent * /* xE */,
- int /* count */
-);
-
-extern Bool XkbEnableDisableControls(
- XkbSrvInfoPtr /* xkbi */,
- unsigned long /* change */,
- unsigned long /* newValues */,
- XkbChangesPtr /* changes */,
- XkbEventCausePtr /* cause */
-);
-
-extern void AccessXInit(
- DeviceIntPtr /* dev */
-);
-
-extern Bool AccessXFilterPressEvent(
- register struct _xEvent * /* xE */,
- register DeviceIntPtr /* keybd */,
- int /* count */
-);
-
-extern Bool AccessXFilterReleaseEvent(
- register struct _xEvent * /* xE */,
- register DeviceIntPtr /* keybd */,
- int /* count */
-);
-
-extern void AccessXCancelRepeatKey(
- XkbSrvInfoPtr /* xkbi */,
- KeyCode /* key */
-);
-
-extern void AccessXComputeCurveFactor(
- XkbSrvInfoPtr /* xkbi */,
- XkbControlsPtr /* ctrls */
-);
-
-extern XkbDeviceLedInfoPtr XkbAddDeviceLedInfo(
- XkbDeviceInfoPtr /* devi */,
- unsigned int /* ledClass */,
- unsigned int /* ledId */
-);
-
-extern XkbDeviceInfoPtr XkbAllocDeviceInfo(
- unsigned int /* deviceSpec */,
- unsigned int /* nButtons */,
- unsigned int /* szLeds */
-);
-
-extern void XkbFreeDeviceInfo(
- XkbDeviceInfoPtr /* devi */,
- unsigned int /* which */,
- Bool /* freeDevI */
-);
-
-extern Status XkbResizeDeviceButtonActions(
- XkbDeviceInfoPtr /* devi */,
- unsigned int /* newTotal */
-);
-
-extern XkbInterestPtr XkbFindClientResource(
- DevicePtr /* inDev */,
- ClientPtr /* client */
-);
-
-extern XkbInterestPtr XkbAddClientResource(
- DevicePtr /* inDev */,
- ClientPtr /* client */,
- XID /* id */
-);
-
-extern int XkbRemoveClient(
- DevicePtr /* inDev */,
- ClientPtr /* client */
-);
-
-extern int XkbRemoveResourceClient(
- DevicePtr /* inDev */,
- XID /* id */
-);
-
-extern int XkbDDXInitDevice(
- DeviceIntPtr /* dev */
-);
-
-extern int XkbDDXAccessXBeep(
- DeviceIntPtr /* dev */,
- unsigned int /* what */,
- unsigned int /* which */
-);
-
-extern void XkbDDXKeyClick(
- DeviceIntPtr /* dev */,
- int /* keycode */,
- int /* synthetic */
-);
-
-extern int XkbDDXUsesSoftRepeat(
- DeviceIntPtr /* dev */
-);
-
-extern void XkbDDXKeybdCtrlProc(
- DeviceIntPtr /* dev */,
- KeybdCtrl * /* ctrl */
-);
-
-extern void XkbDDXChangeControls(
- DeviceIntPtr /* dev */,
- XkbControlsPtr /* old */,
- XkbControlsPtr /* new */
-);
-
-extern void XkbDDXUpdateIndicators(
- DeviceIntPtr /* keybd */,
- CARD32 /* newState */
-);
-
-extern void XkbDDXUpdateDeviceIndicators(
- DeviceIntPtr /* dev */,
- XkbSrvLedInfoPtr /* sli */,
- CARD32 /* newState */
-);
-
-extern void XkbDDXFakePointerButton(
- int /* event */,
- int /* button */
-);
-
-extern void XkbDDXFakePointerMotion(
- unsigned int /* flags */,
- int /* x */,
- int /* y */
-);
-
-extern void XkbDDXFakeDeviceButton(
- DeviceIntPtr /* dev */,
- Bool /* press */,
- int /* button */
-);
-
-extern int XkbDDXTerminateServer(
- DeviceIntPtr /* dev */,
- KeyCode /* key */,
- XkbAction * /* act */
-);
-
-extern int XkbDDXSwitchScreen(
- DeviceIntPtr /* dev */,
- KeyCode /* key */,
- XkbAction * /* act */
-);
-
-extern int XkbDDXPrivate(
- DeviceIntPtr /* dev */,
- KeyCode /* key */,
- XkbAction * /* act */
-);
-
-extern void XkbDisableComputedAutoRepeats(
- DeviceIntPtr /* pXDev */,
- unsigned int /* key */
-);
-
-extern void XkbSetRepeatKeys(
- DeviceIntPtr /* pXDev */,
- int /* key */,
- int /* onoff */
-);
-
-extern int XkbLatchModifiers(
- DeviceIntPtr /* pXDev */,
- CARD8 /* mask */,
- CARD8 /* latches */
-);
-
-extern int XkbLatchGroup(
- DeviceIntPtr /* pXDev */,
- int /* group */
-);
-
-extern void XkbClearAllLatchesAndLocks(
- DeviceIntPtr /* dev */,
- XkbSrvInfoPtr /* xkbi */,
- Bool /* genEv */,
- XkbEventCausePtr /* cause */
-);
-
-extern void XkbSetRulesDflts(
- char * /* rulesFile */,
- char * /* model */,
- char * /* layout */,
- char * /* variant */,
- char * /* options */
-);
-
-extern void XkbInitDevice(
- DeviceIntPtr /* pXDev */
-);
-
-extern Bool XkbInitKeyboardDeviceStruct(
- DeviceIntPtr /* pXDev */,
- XkbComponentNamesPtr /* pNames */,
- KeySymsPtr /* pSyms */,
- CARD8 /* pMods */[],
- BellProcPtr /* bellProc */,
- KbdCtrlProcPtr /* ctrlProc */
-);
-
-extern int SProcXkbDispatch(
- ClientPtr /* client */
-);
-
-extern XkbGeometryPtr XkbLookupNamedGeometry(
- DeviceIntPtr /* dev */,
- Atom /* name */,
- Bool * /* shouldFree */
-);
-
-extern char * _XkbDupString(
- char * /* str */
-);
-
-extern void XkbConvertCase(
- KeySym /* sym */,
- KeySym * /* lower */,
- KeySym * /* upper */
-);
-
-extern Status XkbChangeKeycodeRange(
- XkbDescPtr /* xkb */,
- int /* minKC */,
- int /* maxKC */,
- XkbChangesPtr /* changes */
-);
-
-extern int XkbFinishDeviceInit(
- DeviceIntPtr /* pXDev */
-);
-
-extern void XkbFreeSrvLedInfo(
- XkbSrvLedInfoPtr /* sli */
-);
-
-extern void XkbFreeInfo(
- XkbSrvInfoPtr /* xkbi */
-);
-
-extern Status XkbChangeTypesOfKey(
- XkbDescPtr /* xkb */,
- int /* key */,
- int /* nGroups */,
- unsigned int /* groups */,
- int * /* newTypesIn */,
- XkbMapChangesPtr /* changes */
-);
-
-extern XkbKeyTypePtr XkbAddKeyType(
- XkbDescPtr /* xkb */,
- Atom /* name */,
- int /* map_count */,
- Bool /* want_preserve */,
- int /* num_lvls */
-);
-
-extern Status XkbInitCanonicalKeyTypes(
- XkbDescPtr /* xkb */,
- unsigned int /* which */,
- int /* keypadVMod */
-);
-
-extern int XkbKeyTypesForCoreSymbols(
- XkbDescPtr /* xkb */,
- int /* map_width */,
- KeySym * /* core_syms */,
- unsigned int /* protected */,
- int * /* types_inout */,
- KeySym * /* xkb_syms_rtrn */
-);
-
-extern Bool XkbApplyCompatMapToKey(
- XkbDescPtr /* xkb */,
- KeyCode /* key */,
- XkbChangesPtr /* changes */
-);
-
-extern Bool XkbUpdateMapFromCore(
- XkbDescPtr /* xkb */,
- KeyCode /* first_key */,
- int /* num_keys */,
- int /* map_width */,
- KeySym * /* core_keysyms */,
- XkbChangesPtr /* changes */
-);
-
-extern void XkbFreeControls(
- XkbDescPtr /* xkb */,
- unsigned int /* which */,
- Bool /* freeMap */
-);
-
-extern void XkbFreeIndicatorMaps(
- XkbDescPtr /* xkb */
-);
-
-extern Bool XkbApplyVirtualModChanges(
- XkbDescPtr /* xkb */,
- unsigned int /* changed */,
- XkbChangesPtr /* changes */
-);
-
-extern Bool XkbUpdateActionVirtualMods(
- XkbDescPtr /* xkb */,
- XkbAction * /* act */,
- unsigned int /* changed */
-);
-
-extern void XkbUpdateKeyTypeVirtualMods(
- XkbDescPtr /* xkb */,
- XkbKeyTypePtr /* type */,
- unsigned int /* changed */,
- XkbChangesPtr /* changes */
-);
-
-extern void XkbSendNewKeyboardNotify(
- DeviceIntPtr /* kbd */,
- xkbNewKeyboardNotify * /* pNKN */
-);
-
-#ifdef XKBSRV_NEED_FILE_FUNCS
-
-#include <X11/extensions/XKMformat.h>
-#include <X11/extensions/XKBfile.h>
-#include <X11/extensions/XKBrules.h>
-
-#define _XkbListKeymaps 0
-#define _XkbListKeycodes 1
-#define _XkbListTypes 2
-#define _XkbListCompat 3
-#define _XkbListSymbols 4
-#define _XkbListGeometry 5
-#define _XkbListNumComponents 6
-
-typedef struct _XkbSrvListInfo {
- int szPool;
- int nPool;
- char * pool;
-
- int maxRtrn;
- int nTotal;
-
- char * pattern[_XkbListNumComponents];
- int nFound[_XkbListNumComponents];
-} XkbSrvListInfoRec,*XkbSrvListInfoPtr;
-
-char *
-XkbGetRulesDflts(
- XkbRF_VarDefsPtr /* defs */
-);
-
-extern void XkbSetRulesUsed(
- XkbRF_VarDefsPtr /* defs */
-);
-
-
-extern Status XkbDDXList(
- DeviceIntPtr /* dev */,
- XkbSrvListInfoPtr /* listing */,
- ClientPtr /* client */
-);
-
-extern unsigned int XkbDDXLoadKeymapByNames(
- DeviceIntPtr /* keybd */,
- XkbComponentNamesPtr /* names */,
- unsigned int /* want */,
- unsigned int /* need */,
- XkbFileInfoPtr /* finfoRtrn */,
- char * /* keymapNameRtrn */,
- int /* keymapNameRtrnLen */
-);
-
-extern Bool XkbDDXNamesFromRules(
- DeviceIntPtr /* keybd */,
- char * /* rules */,
- XkbRF_VarDefsPtr /* defs */,
- XkbComponentNamesPtr /* names */
-);
-
-extern FILE *XkbDDXOpenConfigFile(
- char * /* mapName */,
- char * /* fileNameRtrn */,
- int /* fileNameRtrnLen */
-);
-
-extern Bool XkbDDXApplyConfig(
- XPointer /* cfg_in */,
- XkbSrvInfoPtr /* xkbi */
-);
-
-extern XPointer XkbDDXPreloadConfig(
- char ** /* rulesFileRtrn */,
- XkbRF_VarDefsPtr /* defs */,
- XkbComponentNamesPtr /* names */,
- DeviceIntPtr /* dev */
-);
-
-extern int _XkbStrCaseCmp(
- char * /* str1 */,
- char * /* str2 */
-);
-
-#endif /* XKBSRV_NEED_FILE_FUNCS */
-
-
-_XFUNCPROTOEND
-
-#define XkbAtomGetString(d,s) NameForAtom(s)
-
-#endif /* _XKBSRV_H_ */
-
-