diff options
| author | marha <marha@users.sourceforge.net> | 2013-03-06 08:37:36 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-03-06 08:37:36 +0100 |
| commit | 84798668341b15890d625e3bffbbc2d19f434568 (patch) | |
| tree | 50cb332dfbdac780fb24daa6cb0ca03cc8b297fc /xorg-server/Xi | |
| parent | d4d629b77742e60caac3d120ff40e9f386380af2 (diff) | |
| download | vcxsrv-84798668341b15890d625e3bffbbc2d19f434568.tar.gz vcxsrv-84798668341b15890d625e3bffbbc2d19f434568.tar.bz2 vcxsrv-84798668341b15890d625e3bffbbc2d19f434568.zip | |
fontconfig libfontenc mesa xserver git update 6 Mar 2013
xserver commit 103b77c59e3638a45179bf6d7908f5c738d2d872
libfontenc commit 624508365ec3279bc74ce523d024533e062629e1
fontconfig commit e96d7760886a3781a46b3271c76af99e15cb0146
mesa commit 88b20d58344ed336b146799c0bf1149a932dc2d7
Diffstat (limited to 'xorg-server/Xi')
| -rw-r--r-- | xorg-server/Xi/xibarriers.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/xorg-server/Xi/xibarriers.c b/xorg-server/Xi/xibarriers.c index 7b7b83f1c..fccab8615 100644 --- a/xorg-server/Xi/xibarriers.c +++ b/xorg-server/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; @@ -676,8 +679,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; |