xserver: Branch 'server-1.14-branch' - 5 commits

[Matt Dew]

 Xi/exevents.c      |    1 +
 configure.ac       |    2 +-
 dix/touch.c        |    3 ++-
 include/list.h     |    2 +-
 xfixes/xfixesint.h |    2 ++
 5 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 2eec013569f6daa952482ac5d9db8acc71fe01aa
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Mon Feb 25 11:13:52 2013 +1000

    dix: fix a comment
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Keith Packard <keithp at keithp.com>
    (cherry picked from commit 11bead1fa205a1353e6a33c6024c7e8ace80be7c)

diff --git a/dix/touch.c b/dix/touch.c
index 0db842c..891cc78 100644
--- a/dix/touch.c
+++ b/dix/touch.c
@@ -902,7 +902,8 @@ TouchSetupListeners(DeviceIntPtr dev, TouchPointInfoPtr ti, InternalEvent *ev)
 }
 
 /**
- * Remove the touch pointer grab from the device. Called from AllowSome()
+ * Remove the touch pointer grab from the device. Called from
+ * DeactivatePointerGrab()
  */
 void
 TouchRemovePointerGrab(DeviceIntPtr dev)
commit bce06afc99ce1d948f9002e0c5c7bc29d66425da
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Thu Feb 28 10:43:05 2013 +1000

    Xi: add a comment to make a condition a bit clearer
    
    The commit message to 676447190190d8546165e21be242cf16dd69f5ae explains it,
    but that doesn't stop the WTF moment when reading the code.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Keith Packard <keithp at keithp.com>
    (cherry picked from commit 2967391c6d35f03121afa8003e0fb94b62495129)

diff --git a/Xi/exevents.c b/Xi/exevents.c
index 609b126..f05e03d 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -1896,6 +1896,7 @@ DeliverTouchEndEvent(DeviceIntPtr dev, TouchPointInfoPtr ti, InternalEvent *ev,
         goto out;
     }
 
+    /* A client is waiting for the begin, don't give it a TouchEnd */
     if (listener->state == LISTENER_AWAITING_BEGIN) {
         listener->state = LISTENER_HAS_END;
         goto out;
commit 8e16c2e3038c1c17cae73d8d9681dccce0fd402a
Author: Robert Morell <rmorell at nvidia.com>
Date:   Tue Mar 12 09:40:16 2013 -0700

    list.h: Make xorg_list_init inline
    
    Otherwise this file is emitted in every unit that includes it.
    
    Signed-off-by: Robert Morell <rmorell at nvidia.com>
    Reviewed-by: Jamey Sharp <jamey at minilop.net>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    (cherry picked from commit 7050aae69c2a55dfdbb5c6af7882307e90ba4275)

diff --git a/include/list.h b/include/list.h
index 067c679..11de7c5 100644
--- a/include/list.h
+++ b/include/list.h
@@ -119,7 +119,7 @@ struct xorg_list {
  *
  * @param The list to initialized.
  */
-static void
+static inline void
 xorg_list_init(struct xorg_list *list)
 {
     list->next = list->prev = list;
commit 44def3caf002f9fc53b971014e4e2d62afe39435
Author: Robert Morell <rmorell at nvidia.com>
Date:   Tue Mar 12 09:37:43 2013 -0700

    configure.ac: Require inputproto 2.3
    
    This picks up support for Xi pointer barriers in the protocol.
    
    Signed-off-by: Robert Morell <rmorell at nvidia.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    (cherry picked from commit 31595b528645a7e4903eb81da0fc332d78407f25)

diff --git a/configure.ac b/configure.ac
index 6e1ff65..44982b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -788,7 +788,7 @@ XPROTO="xproto >= 7.0.22"
 RANDRPROTO="randrproto >= 1.4.0"
 RENDERPROTO="renderproto >= 0.11"
 XEXTPROTO="xextproto >= 7.1.99"
-INPUTPROTO="inputproto >= 2.2.99.1"
+INPUTPROTO="inputproto >= 2.3"
 KBPROTO="kbproto >= 1.0.3"
 FONTSPROTO="fontsproto"
 FIXESPROTO="fixesproto >= 5.0"
commit 27a49db31a146b8e2f1133c23262ecadc5ff4157
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Sat Mar 9 17:12:53 2013 +1000

    xfixes: ifdef PanoramiXFixes* (#62015)
    
    Fixes build failure with --disable-xinerama introduced by
    482e0cb cursor: Move pointer barrier code over to XI
    
    Reason is new include order: sdksyms.sh includes xfixes.h, which previously
    did not include xfixesint.h.
    
    As of 482e0cb xfixes.h includes xibarriers.h which includes xfixesint.h
    
    X.Org Bug 62015 <http://bugs.freedesktop.org/show_bug.cgi?id=62015>
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Tested-by: Daniel Martin <consume.noise at gmail.com>
    (cherry picked from commit 3ac2e61705432951f9e1b96b42b4214e7f748f94)

diff --git a/xfixes/xfixesint.h b/xfixes/xfixesint.h
index 334c71f..44e8890 100644
--- a/xfixes/xfixesint.h
+++ b/xfixes/xfixesint.h
@@ -291,8 +291,10 @@ int
  SProcXFixesDestroyPointerBarrier(ClientPtr client);
 
 /* Xinerama */
+#ifdef PANORAMIX
 extern int (*PanoramiXSaveXFixesVector[XFixesNumberRequests]) (ClientPtr);
 void PanoramiXFixesInit(void);
 void PanoramiXFixesReset(void);
+#endif
 
 #endif                          /* _XFIXESINT_H_ */