[PULL] input cleanups and alanc's branch

[Peter Hutterer]

This is all the rework foundation for the touch support and the branch alan
posted yesterday.

commit 7528a6b88eb32098af4369a8bd9d70a808fa6f1c

The following changes since commit 372a6f10dc2d74d2d179e8b92449e9b8636a99ef:

  Change disable_clientpointer return type to void (2011-12-09 14:55:37 -0800)

are available in the git repository at:
  git://people.freedesktop.org/~whot/xserver for-keith

Alan Coopersmith (4):
      Include client name if available in PrintDeviceGrabInfo
      Fix deconstifying cast warning in xi2_get_type
      Use const cast in BitIsOn macro to avoid angering gcc
      verify_internal_event: preserve constness of data pointer

Chase Douglas (3):
      include: Add an InputLevel enum
      dix: Move grab check and activation logic to CheckPassiveGrab()
      dix: Split ActivatePassiveGrab() from CheckPassiveGrab()

Peter Hutterer (23):
      include: add GetXI2MaskByte and GetXI2EventFilterMask to headers
      Change GetXI2/XI/CoreType to just take a type argument
      dix: deduplicate event delivery code
      dix: replace conversion errors with BUG_WARN_MSG
      dix: split grab event conversion and delivery into a helper function
      dix: deduplicate callers of DeliverDeviceEvents in DeliverGrabbedEvents
      Xi: deduplicate button motion mask setting
      Xi: split updating button count and state into helper functions
      dix: move EventDeliveryState into a header file, we'll need it elsewhere
      dix: remove event type check
      dix: compare the grab type, not the tempGrab type
      dix: split core grab interference check into helper function
      dix: move grab matching code into a helper function
      dix: split out core state and event state setting into helper functions
      dix: move delivery stop condition out of event mask
      Add GrabIsPointerGrab and GrabIsKeyboardGrab helpers
      input: replace GRABTYPE_* with the InputLevel enums
      dix: always allocate and set the grab's sync.event
      dix: move storing last.valuators into a helper function
      dix: switch EventIsDeliverable to take the event type only
      dix: move event filter retrieval helpers to inpututils.c
      dix: add a MAXEVENTS define for the number of core + extension events
      Merge branch 'for-whot' of git://people.freedesktop.org/~alanc/xserver into for-keith

 Xi/exevents.c                           |  147 +++---
 Xi/grabdev.c                            |    2 +-
 Xi/grabdevb.c                           |    4 +-
 Xi/grabdevk.c                           |    4 +-
 Xi/ungrdev.c                            |    2 +-
 Xi/ungrdevb.c                           |    2 +-
 Xi/ungrdevk.c                           |    2 +-
 Xi/xigrabdev.c                          |    4 +-
 Xi/xipassivegrab.c                      |    8 +-
 dix/devices.c                           |    1 +
 dix/eventconvert.c                      |   16 +-
 dix/events.c                            |  812 +++++++++++++++++--------------
 dix/extension.c                         |    3 +-
 dix/getevents.c                         |   38 +-
 dix/grabs.c                             |   82 +++-
 dix/inpututils.c                        |   60 +++-
 dix/tables.c                            |    2 +-
 hw/xfree86/common/xf86DGA.c             |    4 +-
 include/dix.h                           |    5 +
 include/dixgrabs.h                      |    4 +-
 include/eventconvert.h                  |    7 +-
 include/exevents.h                      |    6 +-
 include/input.h                         |   20 +-
 include/inputstr.h                      |   10 +-
 include/inpututils.h                    |    6 +
 include/misc.h                          |    2 +
 test/input.c                            |  130 +++---
 test/xi2/protocol-eventconvert.c        |    6 +-
 test/xi2/protocol-xipassivegrabdevice.c |    4 +-
 29 files changed, 801 insertions(+), 592 deletions(-)
-------------- 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/20111213/a4492022/attachment.pgp>