More changes from reviewxi2.1-new

Signed-off-by: Chase Douglas <chase.douglas@canonical.com>

1 files changed, 17 insertions, 7 deletions

diff --git a/XI2proto.txt b/XI2proto.txt
index 6976683..344d719 100644
--- a/XI2proto.txt
+++ b/XI2proto.txt
@@ -205,10 +205,20 @@ location of a cursor.
 
 Touch events are broadcast to all clients registered for touch events on a
 set of windows. The window set is determined at the beginning of each touch
-and depend on whether the touch device is a direct or dependent device.
+and depends on whether the touch device is a direct or dependent device.
 
-Direct device window sets contain the windows from the root to the child
-in which the touch originated.
+Window sets for direct device touches contain the windows from the root to the
+child in which the touch originated.
+
+Dependent device window sets depend on whether other touches are active. For
+the first dependent touch on a device, the window set is the current window
+underneath the pointer position up to the root window. The pointer position is
+the location of the master device pointer attached to this touch slave device.
+For subsequent touches on this device, the window set is identical to the
+window set of the first touch. Once all touches have been released, the window
+set is reset and re-calculated on the first subsequent touch.
+
+No touches from a dependent device may begin while the device is floating.
 
 Dependent device window sets depend on whether other touches are active. If
 other touches are active, the window set of the other touches is used. In this
@@ -1639,7 +1649,7 @@ EVENTHEADER { type:                       BYTE
     XI 2.1: The event type may also be TouchBegin, TouchMotion, or TouchEnd.
 
     detail
-        The button number or key code, or 0.
+        The button number, key code, touch ID, or 0.
     root
     event
     child
@@ -1716,9 +1726,9 @@ EVENTHEADER { type:                       BYTE
 
     Touch tracking IDs are provided in the detail field of touch events. Its
     value is always provided in every touch event. Tracking IDs are
-    represented as unsigned 32-bit values and are required to increase in
-    value for each new touch. Values will wrap back to 0 upon reaching the
-    numerical limit of IDs.
+    represented as unsigned 32-bit values and must increase in value for each
+    new touch. Values will wrap back to 0 upon reaching the numerical limit of
+    IDs.
 
     Touch events do not generate enter/leave events.