xserver: Branch 'master' - 3 commits

[Keith Packard]

 Xi/xibarriers.c |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit dd4ab8b572956f9457616869d6e383c8ed964c73
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue Mar 5 10:14:29 2013 +1000

    Xi: force dtime to 0 on the first BarrierHit
    
    dtime to the previous event is 0 on the first BarrierHit event.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Jasper St. Pierre <jstpierre at mecheye.net>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/Xi/xibarriers.c b/Xi/xibarriers.c
index a225cbc..fccab86 100644
--- a/Xi/xibarriers.c
+++ b/Xi/xibarriers.c
@@ -435,6 +435,7 @@ input_constrain_cursor(DeviceIntPtr dev, ScreenPtr screen,
     dir = barrier_get_direction(current_x, current_y, x, y);
 
     while (dir != 0) {
+        int new_sequence;
         struct PointerBarrierDevice *pbd;
 
         c = barrier_find_nearest(cs, master, dir, current_x, current_y, x, y);
@@ -444,6 +445,8 @@ input_constrain_cursor(DeviceIntPtr dev, ScreenPtr screen,
         nearest = &c->barrier;
 
         pbd = GetBarrierDevice(c, master->id);
+        new_sequence = !pbd->hit;
+
         pbd->seen = TRUE;
         pbd->hit = TRUE;
 
@@ -466,7 +469,7 @@ input_constrain_cursor(DeviceIntPtr dev, ScreenPtr screen,
         ev.event_id = pbd->barrier_event_id;
         ev.barrierid = c->id;
 
-        ev.dt = ms - pbd->last_timestamp;
+        ev.dt = new_sequence ? 0 : ms - pbd->last_timestamp;
         ev.window = c->window;
         pbd->last_timestamp = ms;
 
commit 604169af8b67afc74a292cdb9070a3a1f2d7c536
Merge: 8f4640b 6ea59dc
Author: Keith Packard <keithp at keithp.com>
Date:   Mon Mar 4 21:09:59 2013 -0800

    Merge commit '6ea59dc2d8887102bfd8d7c838d2e7ab17645aec'

commit 6ea59dc2d8887102bfd8d7c838d2e7ab17645aec
Author: Jasper St. Pierre <jstpierre at mecheye.net>
Date:   Sun Mar 3 04:50:55 2013 -0500

    xibarriers: Remove accidental use of the comma operator
    
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/Xi/xibarriers.c b/Xi/xibarriers.c
index 7b7b83f..a225cbc 100644
--- a/Xi/xibarriers.c
+++ b/Xi/xibarriers.c
@@ -676,8 +676,8 @@ BarrierFreeBarrier(void *data, XID id)
             continue;
 
         ev.deviceid = dev->id;
-        ev.event_id = pbd->barrier_event_id,
-        ev.dt = ms - pbd->last_timestamp,
+        ev.event_id = pbd->barrier_event_id;
+        ev.dt = ms - pbd->last_timestamp;
 
         GetSpritePosition(dev, &root_x, &root_y);
         ev.root_x = root_x;