The following changes since commit b51a1bd2766e7dc975ca8f1cacc3f8bd0e1a68a3:
Merge remote-tracking branch 'whot/for-keith' (2012-11-30 09:31:46 -0800) are available in the git repository at: git://people.freedesktop.org/~whot/xserver barriers for you to fetch changes up to 1fe6c2ef09bd7422e20ef7f7f8d38f2d773d842b: Xi: if a MD is removed, send a barrier leave event (if applicable) (2012-12-17 15:04:11 +1000) ---------------------------------------------------------------- Jasper St. Pierre (14): cursor: Move pointer barrier code over to XI barriers: Don't loop over the server to destroy a barrier barriers: Switch to an explicit hook for barrier constrainment barriers: Switch to finding the nearest barrier client barriers: Reindent the constrainment hook Add support for XI2.3: Pointer barrier events and releases. barriers: Add support for edge cases when releasing barriers barriers: Add a couple pixels of elbow room for the hit detection barriers: Increment event ID on hit box leave barriers: Send a BarrierLeave event when we leave the hitbox barriers: Clean up code barriers: Send an XI_BarrierLeave event when a barrier is destroyed barriers: Replace complex intersection test with simpler math barriers: Support line and ray barriers Peter Hutterer (19): include: fix comment barriers: Don't allow destroying other client's barriers barriers: Don't allow releasing the pointer on other client's barriers Pass the event list through to the pointer barrier code to return it Xi: fill in barrier root x/y after clamping to RandR outputs dix: skip delivery if it's not the right pointer barrier client dix: handle barrier events properly when converting to core/XI 1.x dix: ignore barrier events in FixUpEventFromWindow Xi: deliver barrier events as grabbed events where necessary Xi: if the device is currently grabbed, flag the barrier event mi: rename mipointer's internal event list Require inputproto 2.2.99.1 tests/xi2: at protocol conversion test for barrier events Xi: swap sequence number and evtype in barrier events Xi: fix swapping for barrier events dix: don't copy the wrong event mask when activating a passive grab Xi: fix per-device barrier handling Xi: don't store the window pointer in barriers, store the window ID Xi: if a MD is removed, send a barrier leave event (if applicable) Xi/Makefile.am | 2 + Xi/exevents.c | 47 ++ Xi/extinit.c | 41 +- Xi/xibarriers.c | 916 +++++++++++++++++++++++++++++++++++++++ Xi/xibarriers.h | 48 ++ Xi/xichangehierarchy.c | 6 + configure.ac | 2 +- dix/eventconvert.c | 43 ++ dix/events.c | 24 + dix/getevents.c | 15 +- dix/grabs.c | 5 +- include/events.h | 1 + include/eventstr.h | 24 +- include/input.h | 6 + include/inputstr.h | 2 +- mi/mieq.c | 4 + mi/mipointer.c | 54 ++- mi/mipointer.h | 3 +- test/fixes.c | 26 ++ test/xi2/protocol-eventconvert.c | 216 +++++++++ xfixes/cursor.c | 432 +----------------- xfixes/xfixes.h | 17 +- 22 files changed, 1469 insertions(+), 465 deletions(-) create mode 100644 Xi/xibarriers.c create mode 100644 Xi/xibarriers.h
pgpmhYAGYtqAB.pgp
Description: PGP signature
_______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel