svn merge ^/branches/released .

6 files changed, 27 insertions, 11 deletions

diff --git a/xorg-server/include/exevents.h b/xorg-server/include/exevents.h
index b972cbedf..2b859a3bd 100644
--- a/xorg-server/include/exevents.h
+++ b/xorg-server/include/exevents.h
@@ -307,6 +307,6 @@ XISetEventMask(DeviceIntPtr dev, WindowPtr win, ClientPtr client,
                            unsigned int len, unsigned char* mask);

 

 extern int

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

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

 

 #endif /* EXEVENTS_H */

diff --git a/xorg-server/include/input.h b/xorg-server/include/input.h
index a7fdc6671..31aad9aa4 100644
--- a/xorg-server/include/input.h
+++ b/xorg-server/include/input.h
@@ -532,6 +532,18 @@ void FixUpEventFromWindow(DeviceIntPtr pDev,
                           WindowPtr pWin,

                           Window child,

                           Bool calcChild);

+extern int EventIsDeliverable(DeviceIntPtr dev, InternalEvent* event,

+                              WindowPtr win);

+/**

+ * Return masks for EventIsDeliverable.

+ * @defgroup EventIsDeliverable return flags

+ * @{

+ */

+#define XI_MASK                 (1 << 0) /**< XI mask set on window */

+#define CORE_MASK               (1 << 1) /**< Core mask set on window */

+#define DONT_PROPAGATE_MASK     (1 << 2) /**< DontPropagate mask set on window */

+#define XI2_MASK                (1 << 3) /**< XI2 mask set on window */

+/* @} */

 

 /* Implemented by the DDX. */

 extern _X_EXPORT int NewInputDeviceRequest(

@@ -554,7 +566,6 @@ extern _X_HIDDEN void valuator_set_mode(DeviceIntPtr dev, int axis, int mode);
    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,

@@ -563,5 +574,12 @@ extern _X_EXPORT void valuator_mask_set(ValuatorMask *mask,
                                         int valuator,

                                         int data);

 extern _X_EXPORT void valuator_mask_zero(ValuatorMask *mask);

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

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

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

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

+extern _X_EXPORT void valuator_mask_copy(ValuatorMask *dest,

+                                         const ValuatorMask *src);

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

 

 #endif /* INPUT_H */

diff --git a/xorg-server/include/inpututils.h b/xorg-server/include/inpututils.h
index e59bf2860..af07afeb0 100644
--- a/xorg-server/include/inpututils.h
+++ b/xorg-server/include/inpututils.h
@@ -37,12 +37,4 @@ struct _ValuatorMask {
     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/resource.h b/xorg-server/include/resource.h
index 202bfb67d..82068fe0e 100644
--- a/xorg-server/include/resource.h
+++ b/xorg-server/include/resource.h
@@ -121,6 +121,8 @@ typedef unsigned long RESTYPE;
 

 #define BAD_RESOURCE 0xe0000000

 

+#define rClient(obj) (clients[CLIENT_ID((obj)->resource)])

+

 /* Resource state callback */

 extern _X_EXPORT CallbackListPtr ResourceStateCallback;

 

diff --git a/xorg-server/include/scrnintstr.h b/xorg-server/include/scrnintstr.h
index a65b63a03..055354ee4 100644
--- a/xorg-server/include/scrnintstr.h
+++ b/xorg-server/include/scrnintstr.h
@@ -135,7 +135,8 @@ typedef    void (* SourceValidateProcPtr)(
 	int /*x*/,

 	int /*y*/,

 	int /*width*/,

-	int /*height*/);

+	int /*height*/,

+	unsigned int /*subWindowMode*/);

 

 typedef    Bool (* CreateWindowProcPtr)(

 	WindowPtr /*pWindow*/);

diff --git a/xorg-server/include/windowstr.h b/xorg-server/include/windowstr.h
index 79628710d..19d8b597e 100644
--- a/xorg-server/include/windowstr.h
+++ b/xorg-server/include/windowstr.h
@@ -167,6 +167,9 @@ typedef struct _Window {
 #ifdef ROOTLESS

     unsigned		rootlessUnhittable:1;	/* doesn't hit-test */

 #endif

+#ifdef COMPOSITE

+    unsigned		damagedDescendants:1;	/* some descendants are damaged */

+#endif

 } WindowRec;

 

 /*