frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

barriers: Increment event ID on hit box leave 

We eventually want to send a new notify event on hitbox leave,
which signifies the dawn of a new barrier event ID, so it's
convenient if we can put the code here.

Signed-off-by: Jasper St. Pierre <jstpierre@mecheye.net>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
This commit is contained in:
Jasper St. Pierre 2012-11-26 20:37:56 -05:00 committed by Peter Hutterer
parent e3a734d081
commit dac9e13a6c
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Xi/xibarriers.c
View File

@ -418,8 +418,16 @@ input_constrain_cursor(DeviceIntPtr dev, ScreenPtr screen,
xorg_list_for_each_entry(c, &cs->barriers, entry) { xorg_list_for_each_entry(c, &cs->barriers, entry) {
c->seen = FALSE; c->seen = FALSE;
if (c->hit && !barrier_inside_hit_box(&c->barrier, x, y)) if (!c->hit)
c->hit = FALSE; continue;
if (barrier_inside_hit_box(&c->barrier, x, y))
continue;
c->hit = FALSE;
/* If we've left the hit box, this is the
* start of a new event ID. */
c->barrier_event_id++;
} }
out: out:
@ -486,7 +494,7 @@ CreatePointerBarrierClient(ClientPtr client,
} }
ret->id = stuff->barrier; ret->id = stuff->barrier;
ret->barrier_event_id = 0; ret->barrier_event_id = 1;
ret->release_event_id = 0; ret->release_event_id = 0;
ret->hit = FALSE; ret->hit = FALSE;
ret->seen = FALSE; ret->seen = FALSE;