[PULL] device changed events, input device init fixes

[Peter Hutterer]

commit a7b75651cad0d208a2add480a074050c8e96bb44

The following changes since commit af3f64fb77c13180e513ee99d1fd9a1b624fd8ea:

  Merge remote-tracking branch 'hramrach/pull' (2011-10-19 17:33:07 -0700)

are available in the git repository at:

  git://people.freedesktop.org/~whot/xserver for-keith

Andreas Wettstein (1):
      xkb: Support noLock and noUnlock flags for LockMods

Peter Hutterer (12):
      input: switch InputOption to use XF86OptionRec storage.
      xfree86: use xf86AddNewOption instead of xf86addNewOption
      xfree86: Fix a comment, the old function doesn't exist anymore
      dix: move #if statement to stop compiler warning
      xfree86: use NewInputDeviceRequest for xorg.conf devices too
      xfree86 doc: replace driver "keyboard" with "kbd"
      dix: add ScrollInfo to DeviceChangedEvents
      dix: drop unused argument from XISendDeviceChangedEvent
      dix: pass the flags into the CreateClassesChangedEvent
      Xi: ensure the deviceid for DeviceChangedEvents is always the right one
      dix: accept a NULL master for CreateClassesChangedEvent
      Xi: send DeviceChangedEvents when the scroll valuators change value

 Xi/exevents.c                     |   20 +++++++++++---
 dix/devices.c                     |    2 +-
 dix/eventconvert.c                |   53 +++++++++++++++++++++++++++++++++++++
 dix/getevents.c                   |   10 +++---
 dix/inpututils.c                  |   34 ++++++++++++-----------
 dix/ptrveloc.c                    |    4 +-
 hw/xfree86/common/xf86Config.c    |   16 ++++++++---
 hw/xfree86/common/xf86Init.c      |   29 +-------------------
 hw/xfree86/common/xf86Option.c    |    3 +-
 hw/xfree86/common/xf86Optionstr.h |   13 +-------
 hw/xfree86/common/xf86Xinput.c    |    5 ++-
 hw/xfree86/doc/ddxDesign.xml      |    4 +-
 hw/xfree86/parser/Flags.c         |    5 ++-
 hw/xfree86/parser/Layout.c        |    2 +-
 include/eventstr.h                |    1 +
 include/exevents.h                |    3 +-
 include/input.h                   |    3 +-
 include/inputstr.h                |    7 -----
 include/list.h                    |   12 ++++++++
 include/optionstr.h               |   14 ++++++++++
 test/xi2/protocol-eventconvert.c  |   20 ++++++++++++++
 xkb/xkbActions.c                  |    7 +++-
 22 files changed, 176 insertions(+), 91 deletions(-)
 create mode 100644 include/optionstr.h
-------------- 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/20111021/cc2e69e0/attachment.pgp>