xserver pixman libX11 libXext 14/11/2010

9 files changed, 637 insertions, 600 deletions

diff --git a/xorg-server/include/Makefile.am b/xorg-server/include/Makefile.am
index e76de05c3..21f9358d5 100644
--- a/xorg-server/include/Makefile.am
+++ b/xorg-server/include/Makefile.am
@@ -1,72 +1,72 @@
-if XORG
-sdk_HEADERS =		\
-	XIstubs.h	\
-	bstore.h	\
-	bstorestr.h	\
-	callback.h	\
-	closestr.h	\
-	closure.h	\
-	colormap.h	\
-	colormapst.h	\
-	hotplug.h	\
-	cursor.h	\
-	cursorstr.h	\
-	dix.h		\
-	dixaccess.h	\
-	dixevents.h	\
-	dixfont.h	\
-	dixfontstr.h	\
-	dixgrabs.h	\
-	dixstruct.h	\
-	events.h	\
-	exevents.h	\
-	extension.h	\
-	extinit.h	\
-	extnsionst.h	\
-	gc.h		\
-	gcstruct.h	\
-	globals.h	\
-	input.h		\
-	inputstr.h	\
-	list.h		\
-	misc.h		\
-	miscstruct.h	\
-	opaque.h	\
-	os.h		\
-	pixmap.h	\
-	pixmapstr.h	\
-	privates.h	\
-	property.h	\
-	propertyst.h	\
-	ptrveloc.h  \
-	region.h	\
-	regionstr.h	\
-	registry.h	\
-	resource.h	\
-	rgb.h		\
-	screenint.h	\
-	scrnintstr.h	\
-	selection.h	\
-	servermd.h	\
-	site.h		\
-	swaprep.h	\
-	swapreq.h	\
-	validate.h	\
-	window.h	\
-	windowstr.h	\
-	xkbfile.h	\
-	xkbsrv.h	\
-	xkbstr.h        \
-	xkbrules.h      \
-	xserver-properties.h
-
-nodist_sdk_HEADERS = xorg-server.h
-endif
-
-AM_CFLAGS = $(DIX_CFLAGS)
-
-EXTRA_DIST = 	\
-	dix-config-apple-verbatim.h \
-	eventconvert.h eventstr.h \
-	protocol-versions.h \
-	xsha1.h
+if XORG

+sdk_HEADERS =		\

+	XIstubs.h	\

+	bstore.h	\

+	bstorestr.h	\

+	callback.h	\

+	closestr.h	\

+	closure.h	\

+	colormap.h	\

+	colormapst.h	\

+	hotplug.h	\

+	cursor.h	\

+	cursorstr.h	\

+	dix.h		\

+	dixaccess.h	\

+	dixevents.h	\

+	dixfont.h	\

+	dixfontstr.h	\

+	dixgrabs.h	\

+	dixstruct.h	\

+	events.h	\

+	exevents.h	\

+	extension.h	\

+	extinit.h	\

+	extnsionst.h	\

+	gc.h		\

+	gcstruct.h	\

+	globals.h	\

+	input.h		\

+	inputstr.h	\

+	list.h		\

+	misc.h		\

+	miscstruct.h	\

+	opaque.h	\

+	os.h		\

+	pixmap.h	\

+	pixmapstr.h	\

+	privates.h	\

+	property.h	\

+	propertyst.h	\

+	ptrveloc.h  \

+	region.h	\

+	regionstr.h	\

+	registry.h	\

+	resource.h	\

+	rgb.h		\

+	screenint.h	\

+	scrnintstr.h	\

+	selection.h	\

+	servermd.h	\

+	site.h		\

+	swaprep.h	\

+	swapreq.h	\

+	validate.h	\

+	window.h	\

+	windowstr.h	\

+	xkbfile.h	\

+	xkbsrv.h	\

+	xkbstr.h        \

+	xkbrules.h      \

+	xserver-properties.h

+

+nodist_sdk_HEADERS = xorg-server.h

+endif

+

+AM_CFLAGS = $(DIX_CFLAGS)

+

+EXTRA_DIST = 	\

+	dix-config-apple-verbatim.h \

+	eventconvert.h eventstr.h inpututils.h \

+	protocol-versions.h \

+	xsha1.h

diff --git a/xorg-server/include/XIstubs.h b/xorg-server/include/XIstubs.h
index ba2f861cd..380f8d8f2 100644
--- a/xorg-server/include/XIstubs.h
+++ b/xorg-server/include/XIstubs.h
@@ -1,63 +1,49 @@
-/************************************************************
-
-Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of the above listed
-copyright holder(s) not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.
-
-THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
-LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-********************************************************/
-
-#ifndef XI_STUBS_H
-#define XI_STUBS_H 1
-
-extern _X_EXPORT void
-CloseInputDevice (
-	DeviceIntPtr           /* d */,
-	ClientPtr              /* client */);
-
-extern _X_EXPORT void
-AddOtherInputDevices (void);
-
-extern _X_EXPORT void
-OpenInputDevice (
-	DeviceIntPtr           /* dev */,
-	ClientPtr              /* client */,
-	int *                  /* status */);
-
-extern _X_EXPORT int
-SetDeviceMode (
-	ClientPtr              /* client */,
-	DeviceIntPtr           /* dev */,
-	int                    /* mode */);
-
-extern _X_EXPORT int
-SetDeviceValuators (
-	ClientPtr              /* client */,
-	DeviceIntPtr           /* dev */,
-	int *                  /* valuators */,
-	int                    /* first_valuator */,
-	int                    /* num_valuators */);
-
-extern _X_EXPORT int
-ChangeDeviceControl (
-	ClientPtr             /* client */,
-	DeviceIntPtr          /* dev */,
-	xDeviceCtl *          /* control */);
-
-#endif /* XI_STUBS_H */
+/************************************************************

+

+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>

+

+                        All Rights Reserved

+

+Permission to use, copy, modify, and distribute this software and its

+documentation for any purpose and without fee is hereby granted,

+provided that the above copyright notice appear in all copies and that

+both that copyright notice and this permission notice appear in

+supporting documentation, and that the name of the above listed

+copyright holder(s) not be used in advertising or publicity pertaining

+to distribution of the software without specific, written prior

+permission.

+

+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD

+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY

+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE

+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+

+********************************************************/

+

+#ifndef XI_STUBS_H

+#define XI_STUBS_H 1

+

+extern _X_EXPORT int

+SetDeviceMode (

+	ClientPtr              /* client */,

+	DeviceIntPtr           /* dev */,

+	int                    /* mode */);

+

+extern _X_EXPORT int

+SetDeviceValuators (

+	ClientPtr              /* client */,

+	DeviceIntPtr           /* dev */,

+	int *                  /* valuators */,

+	int                    /* first_valuator */,

+	int                    /* num_valuators */);

+

+extern _X_EXPORT int

+ChangeDeviceControl (

+	ClientPtr             /* client */,

+	DeviceIntPtr          /* dev */,

+	xDeviceCtl *          /* control */);

+

+#endif /* XI_STUBS_H */

diff --git a/xorg-server/include/exevents.h b/xorg-server/include/exevents.h
index 39e1c70fe..b972cbedf 100644
--- a/xorg-server/include/exevents.h
+++ b/xorg-server/include/exevents.h
@@ -1,315 +1,312 @@
-/************************************************************
-
-Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of the above listed
-copyright holder(s) not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.
-
-THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) 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.
-
-********************************************************/
-
-/********************************************************************
- * Interface of 'exevents.c'
- */
-
-#ifndef EXEVENTS_H
-#define EXEVENTS_H
-
-#include <X11/extensions/XIproto.h>
-#include "inputstr.h"
-
-/***************************************************************
- *              Interface available to drivers                 *
- ***************************************************************/
-
-extern _X_EXPORT int InitProximityClassDeviceStruct(
-	DeviceIntPtr           /* dev */);
-
-extern _X_EXPORT void InitValuatorAxisStruct(
-	DeviceIntPtr           /* dev */,
-	int                    /* axnum */,
-	Atom                   /* label */,
-	int                    /* minval */,
-	int                    /* maxval */,
-	int                    /* resolution */,
-	int                    /* min_res */,
-	int                    /* max_res */);
-
-/* Input device properties */
-extern _X_EXPORT void XIDeleteAllDeviceProperties(
-        DeviceIntPtr            /* device */
-);
-
-extern _X_EXPORT int XIDeleteDeviceProperty(
-        DeviceIntPtr            /* device */,
-        Atom                    /* property */,
-        Bool                    /* fromClient */
-);
-
-extern _X_EXPORT int XIChangeDeviceProperty(
-        DeviceIntPtr            /* dev */,
-        Atom                    /* property */,
-        Atom                    /* type */,
-        int                     /* format*/,
-        int                     /* mode*/,
-        unsigned long           /* len*/,
-        pointer                 /* value*/,
-        Bool                    /* sendevent*/
-        );
-
-extern _X_EXPORT int XIGetDeviceProperty(
-        DeviceIntPtr            /* dev */,
-        Atom                    /* property */,
-        XIPropertyValuePtr*     /* value */
-);
-
-extern _X_EXPORT int XISetDevicePropertyDeletable(
-        DeviceIntPtr            /* dev */,
-        Atom                    /* property */,
-        Bool                    /* deletable */
-);
-
-extern _X_EXPORT long XIRegisterPropertyHandler(
-        DeviceIntPtr         dev,
-        int (*SetProperty) (DeviceIntPtr dev,
-                            Atom property,
-                            XIPropertyValuePtr prop,
-                            BOOL checkonly),
-        int (*GetProperty) (DeviceIntPtr dev,
-                            Atom property),
-        int (*DeleteProperty) (DeviceIntPtr dev,
-                               Atom property)
-);
-
-extern _X_EXPORT void XIUnregisterPropertyHandler(
-        DeviceIntPtr          dev,
-        long                  id
-);
-
-extern _X_EXPORT Atom XIGetKnownProperty(
-        char*                 name
-);
-
-extern _X_EXPORT DeviceIntPtr XIGetDevice(xEvent *ev);
-
-extern _X_EXPORT int XIPropToInt(
-        XIPropertyValuePtr val,
-        int *nelem_return,
-        int **buf_return
-);
-
-extern _X_EXPORT int XIPropToFloat(
-        XIPropertyValuePtr val,
-        int *nelem_return,
-        float **buf_return
-);
-
-/****************************************************************************
- *                      End of driver interface                             *
- ****************************************************************************/
-
-
-/**
- * Attached to the devPrivates of each client. Specifies the version number as
- * supported by the client.
- */
-typedef struct _XIClientRec {
-        int major_version;
-        int minor_version;
-} XIClientRec, *XIClientPtr;
-
-
-typedef struct _GrabParameters {
-    int                 grabtype;               /* GRABTYPE_CORE, etc. */
-    unsigned int        ownerEvents;
-    unsigned int        this_device_mode;
-    unsigned int        other_devices_mode;
-    Window              grabWindow;
-    Window              confineTo;
-    Cursor              cursor;
-    unsigned int        modifiers;
-} GrabParameters;
-
-
-extern void
-RegisterOtherDevice (
-	DeviceIntPtr           /* device */);
-
-extern int
-UpdateDeviceState (
-	DeviceIntPtr           /* device */,
-	DeviceEvent*           /*  xE    */);
-
-extern void
-ProcessOtherEvent (
-	InternalEvent*         /* ev */,
-	DeviceIntPtr           /* other */);
-
-extern void
-DeviceFocusEvent(
-	DeviceIntPtr           /* dev */,
-	int                    /* type */,
-	int                    /* mode */,
-	int                    /* detail */,
-	WindowPtr              /* pWin */);
-
-extern int
-CheckGrabValues(
-        ClientPtr              /* client */,
-        GrabParameters*        /* param */);
-
-extern int
-GrabButton(
-	ClientPtr              /* client */,
-	DeviceIntPtr           /* dev */,
-	DeviceIntPtr           /* modifier_device */,
-	int                    /* button */,
-        GrabParameters*        /* param */,
-        GrabType               /* grabtype */,
-	GrabMask*              /* eventMask */);
-
-extern int
-GrabKey(
-	ClientPtr              /* client */,
-	DeviceIntPtr           /* dev */,
-	DeviceIntPtr           /* modifier_device */,
-	int                    /* key */,
-        GrabParameters*        /* param */,
-        GrabType               /* grabtype */,
-	GrabMask*              /* eventMask */);
-
-extern int
-GrabWindow(
-	ClientPtr              /* client */,
-	DeviceIntPtr           /* dev */,
-	int                    /* type */,
-	GrabParameters*        /* param */,
-	GrabMask*              /* eventMask */);
-
-extern int
-SelectForWindow(
-	DeviceIntPtr           /* dev */,
-	WindowPtr              /* pWin */,
-	ClientPtr              /* client */,
-	Mask                   /* mask */,
-	Mask                   /* exclusivemasks */);
-
-extern int
-AddExtensionClient (
-	WindowPtr              /* pWin */,
-	ClientPtr              /* client */,
-	Mask                   /* mask */,
-	int                    /* mskidx */);
-
-extern void
-RecalculateDeviceDeliverableEvents(
-	WindowPtr              /* pWin */);
-
-extern int
-InputClientGone(
-	WindowPtr              /* pWin */,
-	XID                    /* id */);
-
-extern int
-SendEvent (
-	ClientPtr              /* client */,
-	DeviceIntPtr           /* d */,
-	Window                 /* dest */,
-	Bool                   /* propagate */,
-	xEvent *               /* ev */,
-	Mask                   /* mask */,
-	int                    /* count */);
-
-extern int
-SetButtonMapping (
-	ClientPtr              /* client */,
-	DeviceIntPtr           /* dev */,
-	int                    /* nElts */,
-	BYTE *                 /* map */);
-
-extern int
-ChangeKeyMapping(
-	ClientPtr              /* client */,
-	DeviceIntPtr           /* dev */,
-	unsigned               /* len */,
-	int                    /* type */,
-	KeyCode                /* firstKeyCode */,
-	CARD8                  /* keyCodes */,
-	CARD8                  /* keySymsPerKeyCode */,
-	KeySym *               /* map */);
-
-extern void
-DeleteWindowFromAnyExtEvents(
-	WindowPtr              /* pWin */,
-	Bool                   /* freeResources */);
-
-extern int
-MaybeSendDeviceMotionNotifyHint (
-	deviceKeyButtonPointer * /* pEvents */,
-	Mask                   /* mask */);
-
-extern void
-CheckDeviceGrabAndHintWindow (
-	WindowPtr              /* pWin */,
-	int                    /* type */,
-	deviceKeyButtonPointer * /* xE */,
-	GrabPtr                /* grab */,
-	ClientPtr              /* client */,
-	Mask                   /* deliveryMask */);
-
-extern void
-MaybeStopDeviceHint(
-	DeviceIntPtr           /* dev */,
-	ClientPtr              /* client */);
-
-extern int
-DeviceEventSuppressForWindow(
-	WindowPtr              /* pWin */,
-	ClientPtr              /* client */,
-	Mask                   /* mask */,
-	int                    /* maskndx */);
-
-extern void
-SendEventToAllWindows(
-        DeviceIntPtr           /* dev */,
-        Mask                   /* mask */,
-        xEvent *               /* ev */,
-        int                    /* count */);
-
-extern _X_HIDDEN void XI2EventSwap(
-        xGenericEvent  *              /* from */,
-        xGenericEvent  *              /* to */);
-
-/* For an event such as MappingNotify which affects client interpretation
- * of input events sent by device dev, should we notify the client, or
- * would it merely be irrelevant and confusing? */
-extern int
-XIShouldNotify(ClientPtr client, DeviceIntPtr dev);
-
-extern void
-XISendDeviceChangedEvent(DeviceIntPtr device, DeviceIntPtr master,
-                         DeviceChangedEvent *dce);
-
-extern int
-XISetEventMask(DeviceIntPtr dev, WindowPtr win, ClientPtr client,
-                           unsigned int len, unsigned char* mask);
-
-extern int
-XICheckInvalidMaskBits(unsigned char *mask, int len);
-
-#endif /* EXEVENTS_H */
+/************************************************************

+

+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>

+

+                        All Rights Reserved

+

+Permission to use, copy, modify, and distribute this software and its

+documentation for any purpose and without fee is hereby granted,

+provided that the above copyright notice appear in all copies and that

+both that copyright notice and this permission notice appear in

+supporting documentation, and that the name of the above listed

+copyright holder(s) not be used in advertising or publicity pertaining

+to distribution of the software without specific, written prior

+permission.

+

+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD

+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY

+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) 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.

+

+********************************************************/

+

+/********************************************************************

+ * Interface of 'exevents.c'

+ */

+

+#ifndef EXEVENTS_H

+#define EXEVENTS_H

+

+#include <X11/extensions/XIproto.h>

+#include "inputstr.h"

+

+/***************************************************************

+ *              Interface available to drivers                 *

+ ***************************************************************/

+

+extern _X_EXPORT int InitProximityClassDeviceStruct(

+	DeviceIntPtr           /* dev */);

+

+extern _X_EXPORT void InitValuatorAxisStruct(

+	DeviceIntPtr           /* dev */,

+	int                    /* axnum */,

+	Atom                   /* label */,

+	int                    /* minval */,

+	int                    /* maxval */,

+	int                    /* resolution */,

+	int                    /* min_res */,

+	int                    /* max_res */,

+	int                    /* mode */);

+

+/* Input device properties */

+extern _X_EXPORT void XIDeleteAllDeviceProperties(

+        DeviceIntPtr            /* device */

+);

+

+extern _X_EXPORT int XIDeleteDeviceProperty(

+        DeviceIntPtr            /* device */,

+        Atom                    /* property */,

+        Bool                    /* fromClient */

+);

+

+extern _X_EXPORT int XIChangeDeviceProperty(

+        DeviceIntPtr            /* dev */,

+        Atom                    /* property */,

+        Atom                    /* type */,

+        int                     /* format*/,

+        int                     /* mode*/,

+        unsigned long           /* len*/,

+        pointer                 /* value*/,

+        Bool                    /* sendevent*/

+        );

+

+extern _X_EXPORT int XIGetDeviceProperty(

+        DeviceIntPtr            /* dev */,

+        Atom                    /* property */,

+        XIPropertyValuePtr*     /* value */

+);

+

+extern _X_EXPORT int XISetDevicePropertyDeletable(

+        DeviceIntPtr            /* dev */,

+        Atom                    /* property */,

+        Bool                    /* deletable */

+);

+

+extern _X_EXPORT long XIRegisterPropertyHandler(

+        DeviceIntPtr         dev,

+        int (*SetProperty) (DeviceIntPtr dev,

+                            Atom property,

+                            XIPropertyValuePtr prop,

+                            BOOL checkonly),

+        int (*GetProperty) (DeviceIntPtr dev,

+                            Atom property),

+        int (*DeleteProperty) (DeviceIntPtr dev,

+                               Atom property)

+);

+

+extern _X_EXPORT void XIUnregisterPropertyHandler(

+        DeviceIntPtr          dev,

+        long                  id

+);

+

+extern _X_EXPORT Atom XIGetKnownProperty(

+        char*                 name

+);

+

+extern _X_EXPORT DeviceIntPtr XIGetDevice(xEvent *ev);

+

+extern _X_EXPORT int XIPropToInt(

+        XIPropertyValuePtr val,

+        int *nelem_return,

+        int **buf_return

+);

+

+extern _X_EXPORT int XIPropToFloat(

+        XIPropertyValuePtr val,

+        int *nelem_return,

+        float **buf_return

+);

+

+/****************************************************************************

+ *                      End of driver interface                             *

+ ****************************************************************************/

+

+

+/**

+ * Attached to the devPrivates of each client. Specifies the version number as

+ * supported by the client.

+ */

+typedef struct _XIClientRec {

+        int major_version;

+        int minor_version;

+} XIClientRec, *XIClientPtr;

+

+

+typedef struct _GrabParameters {

+    int                 grabtype;               /* GRABTYPE_CORE, etc. */

+    unsigned int        ownerEvents;

+    unsigned int        this_device_mode;

+    unsigned int        other_devices_mode;

+    Window              grabWindow;

+    Window              confineTo;

+    Cursor              cursor;

+    unsigned int        modifiers;

+} GrabParameters;

+

+

+extern int

+UpdateDeviceState (

+	DeviceIntPtr           /* device */,

+	DeviceEvent*           /*  xE    */);

+

+extern void

+ProcessOtherEvent (

+	InternalEvent*         /* ev */,

+	DeviceIntPtr           /* other */);

+

+extern void

+DeviceFocusEvent(

+	DeviceIntPtr           /* dev */,

+	int                    /* type */,

+	int                    /* mode */,

+	int                    /* detail */,

+	WindowPtr              /* pWin */);

+

+extern int

+CheckGrabValues(

+        ClientPtr              /* client */,

+        GrabParameters*        /* param */);

+

+extern int

+GrabButton(

+	ClientPtr              /* client */,

+	DeviceIntPtr           /* dev */,

+	DeviceIntPtr           /* modifier_device */,

+	int                    /* button */,

+        GrabParameters*        /* param */,

+        GrabType               /* grabtype */,

+	GrabMask*              /* eventMask */);

+

+extern int

+GrabKey(

+	ClientPtr              /* client */,

+	DeviceIntPtr           /* dev */,

+	DeviceIntPtr           /* modifier_device */,

+	int                    /* key */,

+        GrabParameters*        /* param */,

+        GrabType               /* grabtype */,

+	GrabMask*              /* eventMask */);

+

+extern int

+GrabWindow(

+	ClientPtr              /* client */,

+	DeviceIntPtr           /* dev */,

+	int                    /* type */,

+	GrabParameters*        /* param */,

+	GrabMask*              /* eventMask */);

+

+extern int

+SelectForWindow(

+	DeviceIntPtr           /* dev */,

+	WindowPtr              /* pWin */,

+	ClientPtr              /* client */,

+	Mask                   /* mask */,

+	Mask                   /* exclusivemasks */);

+

+extern int

+AddExtensionClient (

+	WindowPtr              /* pWin */,

+	ClientPtr              /* client */,

+	Mask                   /* mask */,

+	int                    /* mskidx */);

+

+extern void

+RecalculateDeviceDeliverableEvents(

+	WindowPtr              /* pWin */);

+

+extern int

+InputClientGone(

+	WindowPtr              /* pWin */,

+	XID                    /* id */);

+

+extern int

+SendEvent (

+	ClientPtr              /* client */,

+	DeviceIntPtr           /* d */,

+	Window                 /* dest */,

+	Bool                   /* propagate */,

+	xEvent *               /* ev */,

+	Mask                   /* mask */,

+	int                    /* count */);

+

+extern int

+SetButtonMapping (

+	ClientPtr              /* client */,

+	DeviceIntPtr           /* dev */,

+	int                    /* nElts */,

+	BYTE *                 /* map */);

+

+extern int

+ChangeKeyMapping(

+	ClientPtr              /* client */,

+	DeviceIntPtr           /* dev */,

+	unsigned               /* len */,

+	int                    /* type */,

+	KeyCode                /* firstKeyCode */,

+	CARD8                  /* keyCodes */,

+	CARD8                  /* keySymsPerKeyCode */,

+	KeySym *               /* map */);

+

+extern void

+DeleteWindowFromAnyExtEvents(

+	WindowPtr              /* pWin */,

+	Bool                   /* freeResources */);

+

+extern int

+MaybeSendDeviceMotionNotifyHint (

+	deviceKeyButtonPointer * /* pEvents */,

+	Mask                   /* mask */);

+

+extern void

+CheckDeviceGrabAndHintWindow (

+	WindowPtr              /* pWin */,

+	int                    /* type */,

+	deviceKeyButtonPointer * /* xE */,

+	GrabPtr                /* grab */,

+	ClientPtr              /* client */,

+	Mask                   /* deliveryMask */);

+

+extern void

+MaybeStopDeviceHint(

+	DeviceIntPtr           /* dev */,

+	ClientPtr              /* client */);

+

+extern int

+DeviceEventSuppressForWindow(

+	WindowPtr              /* pWin */,

+	ClientPtr              /* client */,

+	Mask                   /* mask */,

+	int                    /* maskndx */);

+

+extern void

+SendEventToAllWindows(

+        DeviceIntPtr           /* dev */,

+        Mask                   /* mask */,

+        xEvent *               /* ev */,

+        int                    /* count */);

+

+extern _X_HIDDEN void XI2EventSwap(

+        xGenericEvent  *              /* from */,

+        xGenericEvent  *              /* to */);

+

+/* For an event such as MappingNotify which affects client interpretation

+ * of input events sent by device dev, should we notify the client, or

+ * would it merely be irrelevant and confusing? */

+extern int

+XIShouldNotify(ClientPtr client, DeviceIntPtr dev);

+

+extern void

+XISendDeviceChangedEvent(DeviceIntPtr device, DeviceIntPtr master,

+                         DeviceChangedEvent *dce);

+

+extern int

+XISetEventMask(DeviceIntPtr dev, WindowPtr win, ClientPtr client,

+                           unsigned int len, unsigned char* mask);

+

+extern int

+XICheckInvalidMaskBits(unsigned char *mask, int len);

+

+#endif /* EXEVENTS_H */

diff --git a/xorg-server/include/input.h b/xorg-server/include/input.h
index 1930a308b..a7fdc6671 100644
--- a/xorg-server/include/input.h
+++ b/xorg-server/include/input.h
@@ -157,6 +157,8 @@ typedef struct _DeviceRec {
     Bool	on;			/* used by DDX to keep state */

 } DeviceRec, *DevicePtr;

 

+typedef struct _ValuatorMask ValuatorMask;

+

 typedef struct {

     int			click, bell, bell_pitch, bell_duration;

     Bool		autoRepeat;

@@ -274,12 +276,6 @@ extern _X_EXPORT int RemoveDevice(
 

 extern _X_EXPORT int NumMotionEvents(void);

 

-extern void RegisterPointerDevice(

-    DeviceIntPtr /*device*/);

-

-extern void RegisterKeyboardDevice(

-    DeviceIntPtr /*device*/);

-

 extern _X_EXPORT int dixLookupDevice(

     DeviceIntPtr *         /* dev */,

     int                    /* id */,

@@ -451,9 +447,7 @@ extern _X_EXPORT int GetPointerEvents(
     int type,

     int buttons,

     int flags,

-    int first_valuator,

-    int num_valuators,

-    int *valuators);

+    const ValuatorMask *mask);

 

 extern _X_EXPORT int GetKeyboardEvents(

     EventListPtr events,

@@ -466,17 +460,13 @@ extern int GetKeyboardValuatorEvents(
     DeviceIntPtr pDev,

     int type,

     int key_code,

-    int first_valuator,

-    int num_valuator,

-    int *valuators);

+    const ValuatorMask *mask);

 

 extern int GetProximityEvents(

     EventListPtr events,

     DeviceIntPtr pDev,

     int type,

-    int first_valuator,

-    int num_valuators,

-    int *valuators);

+    const ValuatorMask *mask);

 

 extern void PostSyntheticMotion(

     DeviceIntPtr pDev,

@@ -556,8 +546,22 @@ extern _X_EXPORT void DDXRingBell(
     int pitch,

     int duration);

 

+#define VALUATOR_MODE_ALL_AXES -1

+extern _X_HIDDEN int valuator_get_mode(DeviceIntPtr dev, int axis);

+extern _X_HIDDEN void valuator_set_mode(DeviceIntPtr dev, int axis, int mode);

+

 /* Set to TRUE by default - os/utils.c sets it to FALSE on user request,

    xfixes/cursor.c uses it to determine if the cursor is enabled */

 extern Bool EnableCursor;

 

+/* For server-internal functions, see inpututil.h */

+extern _X_EXPORT ValuatorMask  *valuator_mask_new(int num_valuators);

+extern _X_EXPORT void valuator_mask_set_range(ValuatorMask *mask,

+                                       int first_valuator, int num_valuators,

+                                       const int* valuators);

+extern _X_EXPORT void valuator_mask_set(ValuatorMask *mask,

+                                        int valuator,

+                                        int data);

+extern _X_EXPORT void valuator_mask_zero(ValuatorMask *mask);

+

 #endif /* INPUT_H */

diff --git a/xorg-server/include/inputstr.h b/xorg-server/include/inputstr.h
index c37f30073..edb7988c3 100644
--- a/xorg-server/include/inputstr.h
+++ b/xorg-server/include/inputstr.h
@@ -60,6 +60,7 @@ SOFTWARE.
 #define BitIsOn(ptr, bit) (((BYTE *) (ptr))[(bit)>>3] & (1 << ((bit) & 7)))

 #define SetBit(ptr, bit)  (((BYTE *) (ptr))[(bit)>>3] |= (1 << ((bit) & 7)))

 #define ClearBit(ptr, bit) (((BYTE *)(ptr))[(bit)>>3] &= ~(1 << ((bit) & 7)))

+extern _X_EXPORT int CountBits(const uint8_t *mask, int len);

 

 #define SameClient(obj,client) \

 	(CLIENT_BITS((obj)->resource) == (client)->clientAsMask)

@@ -217,6 +218,7 @@ typedef struct _AxisInfo {
     int		min_value;

     int		max_value;

     Atom	label;

+    CARD8	mode;

 } AxisInfo, *AxisInfoPtr;

 

 typedef struct _ValuatorAccelerationRec {

@@ -238,7 +240,6 @@ typedef struct _ValuatorClassRec {
     AxisInfoPtr 	  axes;

     unsigned short	  numAxes;

     double		  *axisVal; /* always absolute, but device-coord system */

-    CARD8	 	  mode;

     ValuatorAccelerationRec	accelScheme;

 } ValuatorClassRec, *ValuatorClassPtr;

 

@@ -271,7 +272,7 @@ typedef struct _FocusClassRec {
 

 typedef struct _ProximityClassRec {

     int		sourceid;

-    char	pad;

+    char	in_proximity;

 } ProximityClassRec, *ProximityClassPtr;

 

 typedef struct _AbsoluteClassRec {

diff --git a/xorg-server/include/inpututils.h b/xorg-server/include/inpututils.h
new file mode 100644
index 000000000..e59bf2860
--- /dev/null
+++ b/xorg-server/include/inpututils.h
@@ -0,0 +1,48 @@
+/*

+ * Copyright © 2010 Red Hat, Inc.

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

+ * 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.

+ *

+ */

+

+#ifdef HAVE_DIX_CONFIG_H

+#include "dix-config.h"

+#endif

+

+#ifndef INPUTUTILS_H

+#define INPUTUTILS_H

+

+#include "input.h"

+

+struct _ValuatorMask {

+    int8_t      last_bit; /* highest bit set in mask */

+    uint8_t     mask[(MAX_VALUATORS + 7)/8];

+    int         valuators[MAX_VALUATORS]; /* valuator data */

+};

+

+/* server-internal */

+extern _X_HIDDEN int valuator_mask_size(const ValuatorMask *mask);

+extern _X_HIDDEN int valuator_mask_isset(const ValuatorMask *mask, int bit);

+extern _X_HIDDEN void valuator_mask_unset(ValuatorMask *mask, int bit);

+extern _X_HIDDEN int valuator_mask_num_valuators(const ValuatorMask *mask);

+extern _X_HIDDEN void valuator_mask_copy(ValuatorMask *dest, const ValuatorMask *src);

+extern _X_HIDDEN int valuator_mask_get(const ValuatorMask *mask, int valnum);

+

+#endif

diff --git a/xorg-server/include/opaque.h b/xorg-server/include/opaque.h
index 877eef68b..5c2e9166c 100644
--- a/xorg-server/include/opaque.h
+++ b/xorg-server/include/opaque.h
@@ -56,9 +56,6 @@ extern _X_EXPORT Bool disableBackingStore;
 extern _X_EXPORT Bool enableBackingStore;

 extern _X_EXPORT Bool PartialNetwork;

 extern _X_EXPORT Bool RunFromSigStopParent;

-#ifndef NOLOGOHACK

-extern _X_EXPORT int logoScreenSaver;

-#endif

 #ifdef RLIMIT_DATA

 extern _X_EXPORT int limitDataSpace;

 #endif

@@ -72,6 +69,7 @@ extern _X_EXPORT Bool defeatAccessControl;
 extern _X_EXPORT long maxBigRequestSize;

 extern _X_EXPORT Bool party_like_its_1989;

 extern _X_EXPORT Bool whiteRoot;

+extern _X_EXPORT Bool bgNoneRoot;

 

 extern _X_EXPORT Bool CoreDump;

 

diff --git a/xorg-server/include/scrnintstr.h b/xorg-server/include/scrnintstr.h
index 4c7dcb712..a213058e2 100644
--- a/xorg-server/include/scrnintstr.h
+++ b/xorg-server/include/scrnintstr.h
@@ -601,6 +601,12 @@ typedef struct _Screen {
     /* Device cursor procedures */

     DeviceCursorInitializeProcPtr DeviceCursorInitialize;

     DeviceCursorCleanupProcPtr    DeviceCursorCleanup;

+

+    /* set it in driver side if X server can copy the framebuffer content.

+     * Meant to be used together with '-background none' option, avoiding

+     * malicious users to steal framebuffer's content if that would be the

+     * default */

+    Bool		canDoBGNoneRoot;

 } ScreenRec;

 

 static inline RegionPtr BitmapToRegion(ScreenPtr _pScreen, PixmapPtr pPix) {

diff --git a/xorg-server/include/site.h b/xorg-server/include/site.h
index b13421231..07d7db543 100644
--- a/xorg-server/include/site.h
+++ b/xorg-server/include/site.h
@@ -1,130 +1,127 @@
-/************************************************************
-
-Copyright 1987, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-********************************************************/
-
-#ifndef SITE_H
-#define SITE_H
-/*
- * The vendor string identifies the vendor responsible for the
- * server executable.
- */
-#ifndef VENDOR_STRING
-#define VENDOR_STRING "The X.Org Foundation"
-#endif
-
-/*
- * The vendor release number identifies, for the purpose of submitting
- * traceable bug reports, the release number of software produced
- * by the vendor.
- */
-#ifndef VENDOR_RELEASE
-#define VENDOR_RELEASE	6600
-#endif
-
-/*
- * The following constants are provided solely as a last line of defense.  The
- * normal build ALWAYS overrides them using a special rule given in
- * server/dix/Imakefile.  If you want to change either of these constants, 
- * you should set the DefaultFontPath or DefaultRGBDatabase configuration 
- * parameters.
- * DO NOT CHANGE THESE VALUES OR THE DIX IMAKEFILE!
- */
-#ifndef COMPILEDDEFAULTFONTPATH
-#define COMPILEDDEFAULTFONTPATH	"/usr/share/fonts/X11/misc/"
-#endif
-
-/*
- * The following constants contain default values for all of the variables 
- * that can be initialized on the server command line or in the environment.
- */
-#define COMPILEDDEFAULTFONT	"fixed"
-#define COMPILEDCURSORFONT	"cursor"
-#ifndef COMPILEDDISPLAYCLASS
-#define COMPILEDDISPLAYCLASS	"MIT-unspecified"
-#endif
-#define DEFAULT_TIMEOUT		60	/* seconds */
-#define DEFAULT_KEYBOARD_CLICK 	0
-#define DEFAULT_BELL		50
-#define DEFAULT_BELL_PITCH	400
-#define DEFAULT_BELL_DURATION	100
-#define DEFAULT_AUTOREPEAT	TRUE
-#define DEFAULT_AUTOREPEATS	{\
-        0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\
-        0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
-
-#define DEFAULT_LEDS		0x0        /* all off */
-#define DEFAULT_LEDS_MASK	0xffffffff /* 32 */
-#define DEFAULT_INT_RESOLUTION		1000
-#define DEFAULT_INT_MIN_VALUE		0
-#define DEFAULT_INT_MAX_VALUE		100
-#define DEFAULT_INT_DISPLAYED		0
-
-#define DEFAULT_PTR_NUMERATOR	2
-#define DEFAULT_PTR_DENOMINATOR	1
-#define DEFAULT_PTR_THRESHOLD	4
-
-#define DEFAULT_SCREEN_SAVER_TIME (10 * (60 * 1000))
-#define DEFAULT_SCREEN_SAVER_INTERVAL (10 * (60 * 1000))
-#define DEFAULT_SCREEN_SAVER_BLANKING PreferBlanking
-#define DEFAULT_SCREEN_SAVER_EXPOSURES AllowExposures
-#ifndef NOLOGOHACK
-#define DEFAULT_LOGO_SCREEN_SAVER 1
-#endif
-#ifndef DEFAULT_ACCESS_CONTROL
-#define DEFAULT_ACCESS_CONTROL TRUE
-#endif
-
-/* Default logging parameters. */
-#ifndef DEFAULT_LOG_VERBOSITY
-#define DEFAULT_LOG_VERBOSITY		0
-#endif
-#ifndef DEFAULT_LOG_FILE_VERBOSITY
-#define DEFAULT_LOG_FILE_VERBOSITY	3
-#endif
-
-#endif /* SITE_H */
+/************************************************************

+

+Copyright 1987, 1998  The Open Group

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation.

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of The Open Group shall not be

+used in advertising or otherwise to promote the sale, use or other dealings

+in this Software without prior written authorization from The Open Group.

+

+

+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.

+

+                        All Rights Reserved

+

+Permission to use, copy, modify, and distribute this software and its 

+documentation for any purpose and without fee is hereby granted, 

+provided that the above copyright notice appear in all copies and that

+both that copyright notice and this permission notice appear in 

+supporting documentation, and that the name of Digital not be

+used in advertising or publicity pertaining to distribution of the

+software without specific, written prior permission.  

+

+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL

+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR

+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,

+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,

+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

+SOFTWARE.

+

+********************************************************/

+

+#ifndef SITE_H

+#define SITE_H

+/*

+ * The vendor string identifies the vendor responsible for the

+ * server executable.

+ */

+#ifndef VENDOR_STRING

+#define VENDOR_STRING "The X.Org Foundation"

+#endif

+

+/*

+ * The vendor release number identifies, for the purpose of submitting

+ * traceable bug reports, the release number of software produced

+ * by the vendor.

+ */

+#ifndef VENDOR_RELEASE

+#define VENDOR_RELEASE	6600

+#endif

+

+/*

+ * The following constants are provided solely as a last line of defense.  The

+ * normal build ALWAYS overrides them using a special rule given in

+ * server/dix/Imakefile.  If you want to change either of these constants, 

+ * you should set the DefaultFontPath or DefaultRGBDatabase configuration 

+ * parameters.

+ * DO NOT CHANGE THESE VALUES OR THE DIX IMAKEFILE!

+ */

+#ifndef COMPILEDDEFAULTFONTPATH

+#define COMPILEDDEFAULTFONTPATH	"/usr/share/fonts/X11/misc/"

+#endif

+

+/*

+ * The following constants contain default values for all of the variables 

+ * that can be initialized on the server command line or in the environment.

+ */

+#define COMPILEDDEFAULTFONT	"fixed"

+#define COMPILEDCURSORFONT	"cursor"

+#ifndef COMPILEDDISPLAYCLASS

+#define COMPILEDDISPLAYCLASS	"MIT-unspecified"

+#endif

+#define DEFAULT_TIMEOUT		60	/* seconds */

+#define DEFAULT_KEYBOARD_CLICK 	0

+#define DEFAULT_BELL		50

+#define DEFAULT_BELL_PITCH	400

+#define DEFAULT_BELL_DURATION	100

+#define DEFAULT_AUTOREPEAT	TRUE

+#define DEFAULT_AUTOREPEATS	{\

+        0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\

+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\

+        0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\

+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}

+

+#define DEFAULT_LEDS		0x0        /* all off */

+#define DEFAULT_LEDS_MASK	0xffffffff /* 32 */

+#define DEFAULT_INT_RESOLUTION		1000

+#define DEFAULT_INT_MIN_VALUE		0

+#define DEFAULT_INT_MAX_VALUE		100

+#define DEFAULT_INT_DISPLAYED		0

+

+#define DEFAULT_PTR_NUMERATOR	2

+#define DEFAULT_PTR_DENOMINATOR	1

+#define DEFAULT_PTR_THRESHOLD	4

+

+#define DEFAULT_SCREEN_SAVER_TIME (10 * (60 * 1000))

+#define DEFAULT_SCREEN_SAVER_INTERVAL (10 * (60 * 1000))

+#define DEFAULT_SCREEN_SAVER_BLANKING PreferBlanking

+#define DEFAULT_SCREEN_SAVER_EXPOSURES AllowExposures

+#ifndef DEFAULT_ACCESS_CONTROL

+#define DEFAULT_ACCESS_CONTROL TRUE

+#endif

+

+/* Default logging parameters. */

+#ifndef DEFAULT_LOG_VERBOSITY

+#define DEFAULT_LOG_VERBOSITY		0

+#endif

+#ifndef DEFAULT_LOG_FILE_VERBOSITY

+#define DEFAULT_LOG_FILE_VERBOSITY	3

+#endif

+

+#endif /* SITE_H */