svn merge ^/branches/released .

5 files changed, 103 insertions, 87 deletions

diff --git a/xorg-server/include/input.h b/xorg-server/include/input.h
index 2bf38d31d..ec915b37e 100644
--- a/xorg-server/include/input.h
+++ b/xorg-server/include/input.h
@@ -106,6 +106,8 @@ typedef struct _ClassesRec *ClassesPtr;
 typedef struct _SpriteRec *SpritePtr;

 typedef union _GrabMask GrabMask;

 

+typedef struct _ValuatorMask ValuatorMask;

+

 typedef struct _EventList {

     xEvent* event;

     int evlen; /* length of allocated memory for event in bytes.  This is not

@@ -141,11 +143,9 @@ typedef void (*DeviceUnwrapProc)(
 

 /* pointer acceleration handling */

 typedef void (*PointerAccelSchemeProc)(

-    DeviceIntPtr /*pDev*/,

-    int /*first_valuator*/,

-    int /*num_valuators*/,

-    int* /*valuators*/,

-    int /*evtime*/);

+    DeviceIntPtr /*device*/,

+    ValuatorMask* /*valuators*/,

+    CARD32 /*evtime*/);

 

 typedef void (*DeviceCallbackProc)(

               DeviceIntPtr /*pDev*/);

@@ -163,8 +163,6 @@ 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;

diff --git a/xorg-server/include/misc.h b/xorg-server/include/misc.h
index 044a5740b..02790d38e 100644
--- a/xorg-server/include/misc.h
+++ b/xorg-server/include/misc.h
@@ -79,6 +79,7 @@ OF THIS SOFTWARE.
 #include <X11/Xdefs.h>

 

 #include <stddef.h>

+#include <stdint.h>

 #include <unistd.h>

 

 #ifdef _MSC_VER

@@ -96,7 +97,7 @@ OF THIS SOFTWARE.
 #define EXTENSION_EVENT_BASE 64

 #define EXTENSION_BASE 128

 

-typedef unsigned long ATOM;

+typedef uint32_t ATOM;

 

 #ifndef TRUE

 #define TRUE 1

@@ -183,6 +184,17 @@ typedef struct _xReq *xReqPtr;
 

 #endif

 

+#ifndef PATH_MAX

+#include <sys/param.h>

+#ifndef PATH_MAX

+#ifdef MAXPATHLEN

+#define PATH_MAX MAXPATHLEN

+#else

+#define PATH_MAX 1024

+#endif

+#endif

+#endif

+

 /**

  * Calculate the number of bytes needed to hold bits.

  * @param bits The minimum number of bits needed.

diff --git a/xorg-server/include/propertyst.h b/xorg-server/include/propertyst.h
index fd1148eb7..fd3e0118d 100644
--- a/xorg-server/include/propertyst.h
+++ b/xorg-server/include/propertyst.h
@@ -1,68 +1,68 @@
-/***********************************************************
-
-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 PROPERTYSTRUCT_H
-#define PROPERTYSTRUCT_H 
-#include "misc.h"
-#include "property.h"
-#include "privates.h"
-/* 
- *   PROPERTY -- property element
- */
-
-typedef struct _Property {
-        struct _Property       *next;
-	ATOM 		propertyName;
-	ATOM		type;       /* ignored by server */
-	short		format;     /* format of data for swapping - 8,16,32 */
-	long		size;       /* size of data in (format/8) bytes */
-	pointer         data;       /* private to client */
-	PrivateRec	*devPrivates;
-} PropertyRec;
-
-#endif /* PROPERTYSTRUCT_H */
-
+/***********************************************************

+

+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 PROPERTYSTRUCT_H

+#define PROPERTYSTRUCT_H 

+#include "misc.h"

+#include "property.h"

+#include "privates.h"

+/* 

+ *   PROPERTY -- property element

+ */

+

+typedef struct _Property {

+        struct _Property       *next;

+	ATOM 		propertyName;

+	ATOM		type;       /* ignored by server */

+	uint32_t	format;     /* format of data for swapping - 8,16,32 */

+	uint32_t	size;       /* size of data in (format/8) bytes */

+	pointer         data;       /* private to client */

+	PrivateRec	*devPrivates;

+} PropertyRec;

+

+#endif /* PROPERTYSTRUCT_H */

+

diff --git a/xorg-server/include/ptrveloc.h b/xorg-server/include/ptrveloc.h
index 520498942..1198146f1 100644
--- a/xorg-server/include/ptrveloc.h
+++ b/xorg-server/include/ptrveloc.h
@@ -1,6 +1,6 @@
 /*

  *

- * Copyright © 2006-2009 Simon Thum             simon dot thum at gmx dot de

+ * Copyright © 2006-2011 Simon Thum             simon dot thum at gmx dot de

  *

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

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

@@ -25,7 +25,7 @@
 #ifndef POINTERVELOCITY_H

 #define POINTERVELOCITY_H

 

-#include <input.h> /* DeviceIntPtr */

+#include <input.h>

 

 /* constants for acceleration profiles */

 

@@ -62,9 +62,6 @@ typedef struct _MotionTracker {
     int dir;        /* initial direction bitfield */

 } MotionTracker, *MotionTrackerPtr;

 

-/* number of properties for predictable acceleration */

-#define NPROPS_PREDICTABLE_ACCEL 4

-

 /**

  * Contains all data needed to implement mouse ballistics

  */

@@ -91,9 +88,18 @@ typedef struct _DeviceVelocityRec {
     struct {   /* to be able to query this information */

         int     profile_number;

     } statistics;

-    long    prop_handlers[NPROPS_PREDICTABLE_ACCEL];

 } DeviceVelocityRec, *DeviceVelocityPtr;

 

+/**

+ * contains the run-time data for the predictable scheme, that is, a

+ * DeviceVelocityPtr and the property handlers.

+ */

+typedef struct _PredictableAccelSchemeRec {

+    DeviceVelocityPtr vel;

+    long* prop_handlers;

+    int num_prop_handlers;

+} PredictableAccelSchemeRec, *PredictableAccelSchemePtr;

+

 extern _X_EXPORT void

 InitVelocityData(DeviceVelocityPtr vel);

 

@@ -128,11 +134,11 @@ InitPredictableAccelerationScheme(DeviceIntPtr dev,
 				  struct _ValuatorAccelerationRec* protoScheme);

 

 extern _X_INTERNAL void

-acceleratePointerPredictable(DeviceIntPtr dev, int first_valuator,

-                             int num_valuators, int *valuators, int evtime);

+acceleratePointerPredictable(DeviceIntPtr dev, ValuatorMask* val,

+                             CARD32 evtime);

 

 extern _X_INTERNAL void

-acceleratePointerLightweight(DeviceIntPtr dev, int first_valuator,

-                             int num_valuators, int *valuators, int ignored);

+acceleratePointerLightweight(DeviceIntPtr dev, ValuatorMask* val,

+                             CARD32 evtime);

 

 #endif  /* POINTERVELOCITY_H */

diff --git a/xorg-server/include/resource.h b/xorg-server/include/resource.h
index 95e34a9b8..2bed80577 100644
--- a/xorg-server/include/resource.h
+++ b/xorg-server/include/resource.h
@@ -56,7 +56,7 @@ SOFTWARE.
 

 /* classes for Resource routines */

 

-typedef unsigned long RESTYPE;

+typedef uint32_t RESTYPE;

 

 #define RC_VANILLA	((RESTYPE)0)

 #define RC_CACHED	((RESTYPE)1<<31)