libX11 pixman mesa xserver git update 27 sep 2011

1 files changed, 182 insertions, 182 deletions

diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.h b/xorg-server/hw/xfree86/common/xf86Xinput.h
index 84683168c..a4d9e58a5 100644
--- a/xorg-server/hw/xfree86/common/xf86Xinput.h
+++ b/xorg-server/hw/xfree86/common/xf86Xinput.h
@@ -1,182 +1,182 @@
-/*

- * Copyright 1995-1999 by Frederic Lepied, France. <Lepied@XFree86.org>

- *                                                                            

- * 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  Frederic   Lepied not  be  used  in

- * advertising or publicity pertaining to distribution of the software without

- * specific,  written      prior  permission.     Frederic  Lepied   makes  no

- * representations about the suitability of this software for any purpose.  It

- * is provided "as is" without express or implied warranty.                   

- *                                                                            

- * FREDERIC  LEPIED DISCLAIMS ALL   WARRANTIES WITH REGARD  TO  THIS SOFTWARE,

- * INCLUDING ALL IMPLIED   WARRANTIES OF MERCHANTABILITY  AND   FITNESS, IN NO

- * EVENT  SHALL FREDERIC  LEPIED 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.

- *

- */

-

-/*

- * Copyright (c) 2000-2002 by The XFree86 Project, Inc.

- *

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

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

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

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be included in

- * all copies or substantial portions of the Software.

- *

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

- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

- * OTHER DEALINGS IN THE SOFTWARE.

- *

- * Except as contained in this notice, the name of the copyright holder(s)

- * and author(s) shall not be used in advertising or otherwise to promote

- * the sale, use or other dealings in this Software without prior written

- * authorization from the copyright holder(s) and author(s).

- */

-

-

-#ifndef _xf86Xinput_h

-#define _xf86Xinput_h

-

-#include "xf86str.h"

-#include "inputstr.h"

-#include <X11/extensions/XI.h>

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

-#include "XIstubs.h"

-

-/* Input device flags */

-#define XI86_ALWAYS_CORE	0x04 /* device always controls the pointer */

-/* the device sends Xinput and core pointer events */

-#define XI86_SEND_CORE_EVENTS	XI86_ALWAYS_CORE

-

-/* This holds the input driver entry and module information. */

-typedef struct _InputDriverRec {

-    int			    driverVersion;

-    char *		    driverName;

-    void		    (*Identify)(int flags);

-    int			    (*PreInit)(struct _InputDriverRec *drv,

-				       struct _InputInfoRec* pInfo, int flags);

-    void		    (*UnInit)(struct _InputDriverRec *drv,

-				      struct _InputInfoRec *pInfo,

-				      int flags);

-    pointer		    module;

-    char **		    default_options;

-} InputDriverRec, *InputDriverPtr;

-

-/* This is to input devices what the ScrnInfoRec is to screens. */

-

-typedef struct _InputInfoRec {

-    struct _InputInfoRec *next;

-    char *		    name;

-    char *		    driver;

-

-    int			    flags;

-

-    Bool		    (*device_control)(DeviceIntPtr device, int what);

-    void		    (*read_input)(struct _InputInfoRec *local);

-    int			    (*control_proc)(struct _InputInfoRec *local,

-					   xDeviceCtl *control);

-    int			    (*switch_mode)(ClientPtr client, DeviceIntPtr dev,

-					  int mode);

-    int                     (*set_device_valuators)

-				(struct _InputInfoRec *local,

-				 int *valuators, int first_valuator,

-				 int num_valuators);

-

-    int			    fd;

-    DeviceIntPtr	    dev;

-    pointer		    private;

-    char *		    type_name;

-    InputDriverPtr	    drv;

-    pointer		    module;

-    pointer		    options;

-    InputAttributes         *attrs;

-} *InputInfoPtr;

-

-/* xf86Globals.c */

-extern InputInfoPtr xf86InputDevs;

-

-/* xf86Xinput.c */

-extern _X_EXPORT void xf86PostMotionEvent(DeviceIntPtr device, int is_absolute,

-			 int first_valuator, int num_valuators, ...);

-extern _X_EXPORT void xf86PostMotionEventP(DeviceIntPtr device, int is_absolute,

-			 int first_valuator, int num_valuators, const int *valuators);

-extern _X_EXPORT void xf86PostMotionEventM(DeviceIntPtr device, int is_absolute,

-			 const ValuatorMask *mask);

-extern _X_EXPORT void xf86PostProximityEvent(DeviceIntPtr device, int is_in,

-			    int first_valuator, int num_valuators, ...);

-extern _X_EXPORT void xf86PostProximityEventP(DeviceIntPtr device, int is_in, int first_valuator,

-			     int num_valuators, const int *valuators);

-extern _X_EXPORT void xf86PostProximityEventM(DeviceIntPtr device, int is_in,

-			 const ValuatorMask *mask);

-extern _X_EXPORT void xf86PostButtonEvent(DeviceIntPtr device, int is_absolute, int button,

-		    	 int is_down, int first_valuator, int num_valuators,

-			 ...);

-extern _X_EXPORT void xf86PostButtonEventP(DeviceIntPtr device, int is_absolute, int button,

-			  int is_down, int first_valuator, int num_valuators,

-			  const int *valuators);

-extern _X_EXPORT void xf86PostButtonEventM(DeviceIntPtr device, int is_absolute, int button,

-			  int is_down, const ValuatorMask *mask);

-extern _X_EXPORT void xf86PostKeyEvent(DeviceIntPtr device, unsigned int key_code, int is_down,

-		      int is_absolute, int first_valuator, int num_valuators,

-		      ...);

-extern _X_EXPORT void xf86PostKeyEventM(DeviceIntPtr device, unsigned int key_code, int is_down,

-		       int is_absolute, const ValuatorMask *mask);

-extern _X_EXPORT void xf86PostKeyEventP(DeviceIntPtr device, unsigned int key_code, int is_down,

-		       int is_absolute, int first_valuator, int num_valuators,

-		       const int *valuators);

-extern _X_EXPORT void xf86PostKeyboardEvent(DeviceIntPtr device, unsigned int key_code,

-                           int is_down);

-extern _X_EXPORT InputInfoPtr xf86FirstLocalDevice(void);

-extern _X_EXPORT int xf86ScaleAxis(int Cx, int to_max, int to_min, int from_max, int from_min);

-extern _X_EXPORT void xf86XInputSetScreen(InputInfoPtr pInfo, int screen_number, int x, int y);

-extern _X_EXPORT void xf86ProcessCommonOptions(InputInfoPtr pInfo, pointer options);

-extern _X_EXPORT void xf86InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, Atom label, int minval,

-				int maxval, int resolution, int min_res,

-				int max_res, int mode);

-extern _X_EXPORT void xf86InitValuatorDefaults(DeviceIntPtr dev, int axnum);

-extern _X_EXPORT void xf86AddEnabledDevice(InputInfoPtr pInfo);

-extern _X_EXPORT void xf86RemoveEnabledDevice(InputInfoPtr pInfo);

-extern _X_EXPORT void xf86DisableDevice(DeviceIntPtr dev, Bool panic);

-extern _X_EXPORT void xf86EnableDevice(DeviceIntPtr dev);

-/* not exported */

-int xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL is_auto);

-InputInfoPtr xf86AllocateInput(void);

-

-/* xf86Helper.c */

-extern _X_EXPORT void xf86AddInputDriver(InputDriverPtr driver, pointer module, int flags);

-extern _X_EXPORT void xf86DeleteInputDriver(int drvIndex);

-extern _X_EXPORT InputDriverPtr xf86LookupInputDriver(const char *name);

-extern _X_EXPORT InputInfoPtr xf86LookupInput(const char *name);

-extern _X_EXPORT void xf86DeleteInput(InputInfoPtr pInp, int flags);

-extern _X_EXPORT void xf86MotionHistoryAllocate(InputInfoPtr pInfo);

-extern _X_EXPORT void xf86IDrvMsgVerb(InputInfoPtr dev,

-				      MessageType type, int verb,

-				      const char *format, ...) _X_ATTRIBUTE_PRINTF(4,5);

-extern _X_EXPORT void xf86IDrvMsg(InputInfoPtr dev,

-				  MessageType type,

-				  const char *format, ...) _X_ATTRIBUTE_PRINTF(3,4);

-extern _X_EXPORT void xf86VIDrvMsgVerb(InputInfoPtr dev,

-				       MessageType type,

-				       int verb,

-				       const char *format,

-				       va_list args);

-

-/* xf86Option.c */

-extern _X_EXPORT void xf86CollectInputOptions(InputInfoPtr pInfo, const char **defaultOpts);

-

-#endif /* _xf86Xinput_h */

+/*
+ * Copyright 1995-1999 by Frederic Lepied, France. <Lepied@XFree86.org>
+ *                                                                            
+ * 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  Frederic   Lepied not  be  used  in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific,  written      prior  permission.     Frederic  Lepied   makes  no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.                   
+ *                                                                            
+ * FREDERIC  LEPIED DISCLAIMS ALL   WARRANTIES WITH REGARD  TO  THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED   WARRANTIES OF MERCHANTABILITY  AND   FITNESS, IN NO
+ * EVENT  SHALL FREDERIC  LEPIED 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.
+ *
+ */
+
+/*
+ * Copyright (c) 2000-2002 by The XFree86 Project, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name of the copyright holder(s)
+ * and author(s) shall not be used in advertising or otherwise to promote
+ * the sale, use or other dealings in this Software without prior written
+ * authorization from the copyright holder(s) and author(s).
+ */
+
+
+#ifndef _xf86Xinput_h
+#define _xf86Xinput_h
+
+#include "xf86str.h"
+#include "inputstr.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include "XIstubs.h"
+
+/* Input device flags */
+#define XI86_ALWAYS_CORE	0x04 /* device always controls the pointer */
+/* the device sends Xinput and core pointer events */
+#define XI86_SEND_CORE_EVENTS	XI86_ALWAYS_CORE
+
+/* This holds the input driver entry and module information. */
+typedef struct _InputDriverRec {
+    int			    driverVersion;
+    char *		    driverName;
+    void		    (*Identify)(int flags);
+    int			    (*PreInit)(struct _InputDriverRec *drv,
+				       struct _InputInfoRec* pInfo, int flags);
+    void		    (*UnInit)(struct _InputDriverRec *drv,
+				      struct _InputInfoRec *pInfo,
+				      int flags);
+    pointer		    module;
+    char **		    default_options;
+} InputDriverRec, *InputDriverPtr;
+
+/* This is to input devices what the ScrnInfoRec is to screens. */
+
+typedef struct _InputInfoRec {
+    struct _InputInfoRec *next;
+    char *		    name;
+    char *		    driver;
+
+    int			    flags;
+
+    Bool		    (*device_control)(DeviceIntPtr device, int what);
+    void		    (*read_input)(struct _InputInfoRec *local);
+    int			    (*control_proc)(struct _InputInfoRec *local,
+					   xDeviceCtl *control);
+    int			    (*switch_mode)(ClientPtr client, DeviceIntPtr dev,
+					  int mode);
+    int                     (*set_device_valuators)
+				(struct _InputInfoRec *local,
+				 int *valuators, int first_valuator,
+				 int num_valuators);
+
+    int			    fd;
+    DeviceIntPtr	    dev;
+    pointer		    private;
+    char *		    type_name;
+    InputDriverPtr	    drv;
+    pointer		    module;
+    XF86OptionPtr	    options;
+    InputAttributes         *attrs;
+} *InputInfoPtr;
+
+/* xf86Globals.c */
+extern InputInfoPtr xf86InputDevs;
+
+/* xf86Xinput.c */
+extern _X_EXPORT void xf86PostMotionEvent(DeviceIntPtr device, int is_absolute,
+			 int first_valuator, int num_valuators, ...);
+extern _X_EXPORT void xf86PostMotionEventP(DeviceIntPtr device, int is_absolute,
+			 int first_valuator, int num_valuators, const int *valuators);
+extern _X_EXPORT void xf86PostMotionEventM(DeviceIntPtr device, int is_absolute,
+			 const ValuatorMask *mask);
+extern _X_EXPORT void xf86PostProximityEvent(DeviceIntPtr device, int is_in,
+			    int first_valuator, int num_valuators, ...);
+extern _X_EXPORT void xf86PostProximityEventP(DeviceIntPtr device, int is_in, int first_valuator,
+			     int num_valuators, const int *valuators);
+extern _X_EXPORT void xf86PostProximityEventM(DeviceIntPtr device, int is_in,
+			 const ValuatorMask *mask);
+extern _X_EXPORT void xf86PostButtonEvent(DeviceIntPtr device, int is_absolute, int button,
+		    	 int is_down, int first_valuator, int num_valuators,
+			 ...);
+extern _X_EXPORT void xf86PostButtonEventP(DeviceIntPtr device, int is_absolute, int button,
+			  int is_down, int first_valuator, int num_valuators,
+			  const int *valuators);
+extern _X_EXPORT void xf86PostButtonEventM(DeviceIntPtr device, int is_absolute, int button,
+			  int is_down, const ValuatorMask *mask);
+extern _X_EXPORT void xf86PostKeyEvent(DeviceIntPtr device, unsigned int key_code, int is_down,
+		      int is_absolute, int first_valuator, int num_valuators,
+		      ...);
+extern _X_EXPORT void xf86PostKeyEventM(DeviceIntPtr device, unsigned int key_code, int is_down,
+		       int is_absolute, const ValuatorMask *mask);
+extern _X_EXPORT void xf86PostKeyEventP(DeviceIntPtr device, unsigned int key_code, int is_down,
+		       int is_absolute, int first_valuator, int num_valuators,
+		       const int *valuators);
+extern _X_EXPORT void xf86PostKeyboardEvent(DeviceIntPtr device, unsigned int key_code,
+                           int is_down);
+extern _X_EXPORT InputInfoPtr xf86FirstLocalDevice(void);
+extern _X_EXPORT int xf86ScaleAxis(int Cx, int to_max, int to_min, int from_max, int from_min);
+extern _X_EXPORT void xf86XInputSetScreen(InputInfoPtr pInfo, int screen_number, int x, int y);
+extern _X_EXPORT void xf86ProcessCommonOptions(InputInfoPtr pInfo, XF86OptionPtr options);
+extern _X_EXPORT void xf86InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, Atom label, int minval,
+				int maxval, int resolution, int min_res,
+				int max_res, int mode);
+extern _X_EXPORT void xf86InitValuatorDefaults(DeviceIntPtr dev, int axnum);
+extern _X_EXPORT void xf86AddEnabledDevice(InputInfoPtr pInfo);
+extern _X_EXPORT void xf86RemoveEnabledDevice(InputInfoPtr pInfo);
+extern _X_EXPORT void xf86DisableDevice(DeviceIntPtr dev, Bool panic);
+extern _X_EXPORT void xf86EnableDevice(DeviceIntPtr dev);
+/* not exported */
+int xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL is_auto);
+InputInfoPtr xf86AllocateInput(void);
+
+/* xf86Helper.c */
+extern _X_EXPORT void xf86AddInputDriver(InputDriverPtr driver, pointer module, int flags);
+extern _X_EXPORT void xf86DeleteInputDriver(int drvIndex);
+extern _X_EXPORT InputDriverPtr xf86LookupInputDriver(const char *name);
+extern _X_EXPORT InputInfoPtr xf86LookupInput(const char *name);
+extern _X_EXPORT void xf86DeleteInput(InputInfoPtr pInp, int flags);
+extern _X_EXPORT void xf86MotionHistoryAllocate(InputInfoPtr pInfo);
+extern _X_EXPORT void xf86IDrvMsgVerb(InputInfoPtr dev,
+				      MessageType type, int verb,
+				      const char *format, ...) _X_ATTRIBUTE_PRINTF(4,5);
+extern _X_EXPORT void xf86IDrvMsg(InputInfoPtr dev,
+				  MessageType type,
+				  const char *format, ...) _X_ATTRIBUTE_PRINTF(3,4);
+extern _X_EXPORT void xf86VIDrvMsgVerb(InputInfoPtr dev,
+				       MessageType type,
+				       int verb,
+				       const char *format,
+				       va_list args);
+
+/* xf86Option.c */
+extern _X_EXPORT void xf86CollectInputOptions(InputInfoPtr pInfo, const char **defaultOpts);
+
+#endif /* _xf86Xinput_h */