xserver: Branch 'master' - 2 commits

[Keith Packard]

 include/xserver-properties.h |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 4621bb270a36d35d4ab67f1d7fb47674683dfc5b
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Wed May 18 15:00:54 2011 +1000

    Add a property for device/product ID.
    
    In some cases, knowing about the device model number and the device's vendor
    is important to activate product-specific settings. Since this is
    nonetheless driver-specific, only provide the property but don't do anything
    with it.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Daniel Stone <daniel at fooishbar.org>

diff --git a/include/xserver-properties.h b/include/xserver-properties.h
index a49291b..2b1feab 100644
--- a/include/xserver-properties.h
+++ b/include/xserver-properties.h
@@ -35,6 +35,11 @@
 /* BOOL. If present, device is a virtual XTEST device */
 #define XI_PROP_XTEST_DEVICE  "XTEST Device"
 
+/* CARD32, 2 values, vendor, product.
+ * This property is set by the driver and may not be available for some
+ * drivers. Read-Only */
+#define XI_PROP_PRODUCT_ID "Device Product ID"
+
 /* Coordinate transformation matrix for absolute input devices
  * FLOAT, 9 values in row-major order, coordinates in 0..1 range:
  * [c0 c1 c2]   [x]
commit f26a5b9a994a980ab309bc7f3b4295a4992d81c2
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Mon Jan 31 14:43:01 2011 +1000

    Xi: add device node property to known properties.
    
    Since the server has little choice (or even knowledge) of the actual device
    node used by the driver, this property is merely provided for
    standardisation. It is up to the driver to set it to the appropriate value,
    usually a device node in the form of /dev/input/event0 or similar.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Acked-by: Dan Nicholson <dbn.lists at gmail.com>

diff --git a/include/xserver-properties.h b/include/xserver-properties.h
index c6259ae..a49291b 100644
--- a/include/xserver-properties.h
+++ b/include/xserver-properties.h
@@ -42,6 +42,9 @@
  * [c6 c7 c8]   [1] */
 #define XI_PROP_TRANSFORM "Coordinate Transformation Matrix"
 
+/* STRING. Device node path of device */
+#define XI_PROP_DEVICE_NODE "Device Node"
+
 /* Pointer acceleration properties */
 /* INTEGER of any format */
 #define ACCEL_PROP_PROFILE_NUMBER "Device Accel Profile"