[PULL] XI 2.2 and multitouch patches

[Peter Hutterer]

Keith,

Please pull the XI 2.2 work into master. This bumps the input ABI to 15, but
I also hope that we don't need another bump this cycle. Carlos found the
one known outstanding active grab bug that has now been fixed.

This patchset should not affect normal pointer/keyboard behaviour, any such
bugs will be treated with priority.

There are two patches that don't have a reviewed-by tag that I smuggled in
today - one adds a test for ownership events, the other one removes some
printfs from the test.

commit 2bb282cd45cb8149b39d72397ef5bbcfebca11d2

The following changes since commit 7528a6b88eb32098af4369a8bd9d70a808fa6f1c:

  Merge branch 'for-whot' of git://people.freedesktop.org/~alanc/xserver into for-keith (2011-12-13 14:19:54 +1000)

are available in the git repository at:

  git://people.freedesktop.org/~whot/xserver multitouch

Carlos Garnacho (2):
      Xi: assign correct grab_mode/other_device_mode in XI2 passive grabs
      dix: fix xi2 mask/filter when delivering grabbed events

Chase Douglas (1):
      dix: add TouchGetPointerEventType helper function

Daniel Stone (8):
      Add the touch input API stubs
      input: add a TouchClassRec to the devices
      dix: add GetTouchOwnership event API
      dix: generate touchpoints from driver-submitted data
      Xi: allow selecting for touch events
      dix: add helper functions to build up/verify the sprite trace
      dix: when a window disappears, remove it from the touch sprite trace
      dix: Remove touch grabs if the grab disappears

Peter Hutterer (39):
      configure: split the required modules up
      include: fix BUG_WARN_MSG for constant messages only
      dix: split positionSprite into scale_to_desktop and positionSprite
      Xi: split ProcessOtherEvent into ProcessDeviceEvent
      Xi: add a FIXME
      Require inputproto 2.1.99.3
      tests: update for touch support
      include: RawTouchEnd is the last event now
      include: add a bunch of flags for GetTouchEvent processing
      Hook up TouchBegin/Update/End events
      Xi: process raw touch events
      Hook up the ownership events
      xfree86: bump the input ABI for the touch changes
      dix: add helper functions to create DDX touch recs
      dix: if we run out of space for new touch events, resize the queue
      dix: add DIX API to create touchpoints
      dix: handle DIX-submitted touch events
      Support XI 2.2 officially
      dix: add touch event history helper functions
      dix: add helper functions for adding/removing touch listeners
      dix: add TouchResourceIsOwner helper function
      Xi: make UpdateDeviceState aware of touch events
      dix: set core and button state based on the touch state
      Process and deliver touch events
      dix: add real_event parameter to ActivatePassiveGrab
      dix: add touch to pointer event conversion helper
      Xi: hook up pointer emulation for emulating touches
      Xi: hook up touch ownership handling
      Xi: handle grab accept/reject requests
      Xi: add the hooks for passive touch grabs
      dix: hook up passive grabs and pointer emulated passive grabs
      mi: split move to new screen logic to a helper function
      mi: handle screen switching on pointer emulated touch events
      dix: button state must show the logical buttons, not physical buttons
      dix: don't retrieve the syncEvents tail on an empty list
      dix: remove requirement for client_id be the first element
      test: drop printfs from protocol-eventconvert.c
      test: add a basic test for ownership event values
      Xi: only activate the device grab if we don't already have one

 Xi/exevents.c                           |  951 +++++++++++++++++++++++++++++-
 Xi/extinit.c                            |   26 +
 Xi/xiallowev.c                          |   53 ++-
 Xi/xipassivegrab.c                      |   27 +-
 Xi/xiquerydevice.c                      |   39 ++
 Xi/xiquerydevice.h                      |    1 +
 Xi/xiselectev.c                         |   48 ++-
 configure.ac                            |   18 +-
 dix/Makefile.am                         |    1 +
 dix/devices.c                           |   87 +++-
 dix/eventconvert.c                      |   63 ++-
 dix/events.c                            |   69 ++-
 dix/getevents.c                         |  352 +++++++++++-
 dix/grabs.c                             |    3 +
 dix/inpututils.c                        |    7 +-
 dix/touch.c                             |  982 +++++++++++++++++++++++++++++++
 dix/window.c                            |    9 +-
 hw/xfree86/common/xf86Module.h          |    2 +-
 hw/xfree86/common/xf86Xinput.c          |   24 +
 hw/xfree86/common/xf86Xinput.h          |    3 +
 include/dix.h                           |    7 +
 include/events.h                        |    1 +
 include/eventstr.h                      |   30 +-
 include/exevents.h                      |   12 +
 include/input.h                         |   87 +++-
 include/inputstr.h                      |   55 ++-
 include/misc.h                          |    4 +-
 include/protocol-versions.h             |    2 +-
 mi/mieq.c                               |   37 +-
 test/Makefile.am                        |    3 +-
 test/touch.c                            |  270 +++++++++
 test/xi2/protocol-eventconvert.c        |  102 +++-
 test/xi2/protocol-xipassivegrabdevice.c |    2 +-
 test/xi2/protocol-xiselectevents.c      |   38 +-
 34 files changed, 3319 insertions(+), 96 deletions(-)
 create mode 100644 dix/touch.c
 create mode 100644 test/touch.c
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20111221/7990c4ba/attachment.pgp>