[PULL] input cleanups and alanc's branch

[Keith Packard]

On Tue, 13 Dec 2011 15:15:22 +1000, Peter Hutterer <peter.hutterer at who-t.net> wrote:

> 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

Merged.
   b79de3f..7da7aa9  master -> master

-- 
keith.packard at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 827 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20111214/0dbe33d8/attachment.pgp>