[PULL] input -next

Peter Hutterer peter.hutterer at who-t.net
Thu Sep 8 21:17:28 PDT 2011


Note: I'd rather you not pull this until you're ready to pull
smooth-scrolling and two-screen-coordinates as well. smooth scrolling has
another ABI break and I prefer to have those in one set of patches.

This is the accumulated set of changes I had in my next branch. The main
chungs of code here are several janitorial and restructuring efforts in the
input event generation code, the conversion to doubles where we used ints
+ fracs before, multiseat support, the change to typesave option lists and
the addition of another linked list macro set

commit: d40d395d3d2551b6d2d8f1f5ee8d656c371535ac

Cheers,
  Peter

The following changes since commit 0caeef6146bee5fb1827ab25db191685dde9d4b4:

  Version bumped to 1.11 (2011-08-26 16:46:13 -0700)

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

Carlos Garnacho (1):
      Xi: Fix passive XI2 ungrabs on XIAll[Master]Devices

Daniel Kurtz (4):
      os/log: Pull LogMessageTypeVerbString out of LogVMessageVerb
      os/log: Add LogVHdrMessageVerb and friends
      xf86Helper: use LogHdrMessageVerb in xf86VIDrvMsgVerb
      xf86Helper: use LogHdrMessageVerb in xf86VDrvMsgVerb

Daniel Stone (25):
      Input: Add flags to DeviceEvent
      Input: Add flags to RawDeviceEvent
      Input: Convert ValuatorMask to double-precision internally
      Input: Add double-precision valuator_mask API
      Input: Store clipped absolute axes in the mask
      Input: Prepare moveAbsolute for conversion to double
      Input: Prepare moveRelative for conversion to double
      Input: Convert clipAxis, moveAbsolute and moveRelative to double
      Input: Convert transformAbsolute to work on doubles
      Input: Set fractional member in set_raw_valuators
      Input: Use trunc instead of lrintf in acceleration code
      Input: Widen pointer acceleration types to double
      Input: Convert acceleration code to using ValuatorMask
      Input: Remove x and y from moveAbsolute/moveRelative
      Input: Convert rescaleValuatorAxis to double
      Input: Don't call positionSprite for non-pointer devices
      Input: Convert positionSprite and GetPointerEvents to double
      Input: Modify mask in-place in positionSprite
      Input: Make RawDeviceEvent use doubles internally
      Input: Make DeviceEvent use doubles internally
      Input: Convert DeviceIntRec::last to use doubles
      Input: Set last valuators in GetPointerEvents only
      Input: Split GetPointerEvents body into a helper function
      Input: Add vertical and horizontal scroll axes
      Input: Add POINTER_EMULATED flag to GetPointerEvents

Lennart Poettering (1):
      config: add udev/systemd multi-seat support

Nobuhiro Iwamatsu (1):
      Disable check of double-aligned in test/input.c on Renesas SH

Peter Hutterer (39):
      xfree86: don't warn about duplicate core devices
      xfree86: when implicitly choosing a core device, set the option to a value
      test: add a option duplication test
      xfree86: improve readability of synthesized device.
      xfree86: nest loops instead of 0x1 pointers.
      xfree86: update comment for InitInput
      xfree86: factor out adding/removing a device from the input device array
      xfree86: use xf86AllocateInput for implicit devices too
      Revert "Attempt to add the 'mouse' driver in more situations."
      config: fix a log message
      config: return the new InputOption from add_option.
      config: use add_option for '_source' too
      dix: avoid using the VCP as modifier device
      dix: ignore devices when adding passive core grabs to list (#39545)
      dix: rename mieqSwitchScreen argument fromDix → set_dequeue_screen, document
      mi: fix comment typo, whitespace in miPointerSetPosition
      test: add a test for GetMaster() behaviour
      dix: add KEYBOARD_OR_FLOAT and POINTER_OR_FLOAT to GetMaster()
      Xi: silence compiler warnings (set but not used)
      mi: fix compiler warnings ("foo" set but not used)
      dix: fix compiler warnings ("foo" set but not used)
      input: provide a single function to init DeviceEvents to 0
      dix: don't use the pointer as modifier device in UngrabKey.
      dix: abstract XI2 filter mask lookup
      dix: use helper functions in EventIsDeliverable
      dix: don't XWarpPointer through the last slave anymore (#38313)
      xfree86: comment typo fix
      Add null-terminated list interface.
      input: make InputOption opaque, provide interface functions.
      xfree86: switch options from pointer to XF86OptionPtr
      Support (and require) XI 2.1
      dix: split client list retrieval out of DeliverEventToClients
      dix: rename DeliverEventsToClients to DeliverEventsToWindowMask
      dix: split DeliverEventToWindowMask up a bit more.
      Xi: use temporary variable for filter.
      dix: rename ProcessRawEvents to dix/events.c:DeliverRawEvent
      input: deliver raw events unconditionally for XI 2.1 clients.
      dix: use 'rc' for return code in DeliverRawEvent
      Merge branch 'raw-events' into next

 Xi/exevents.c                            |   11 +-
 Xi/xipassivegrab.c                       |   13 +-
 Xi/xiproperty.c                          |    5 +
 Xi/xiwarppointer.c                       |    2 -
 config/config-backends.h                 |    2 +-
 config/config.c                          |   15 -
 config/dbus.c                            |   60 +---
 config/hal.c                             |   44 +--
 config/udev.c                            |   59 ++--
 configure.ac                             |    2 +-
 dix/devices.c                            |   33 ++-
 dix/eventconvert.c                       |   20 +-
 dix/events.c                             |  252 +++++++++++-----
 dix/getevents.c                          |  481 +++++++++++++-----------------
 dix/grabs.c                              |    2 +-
 dix/inpututils.c                         |  187 +++++++++++-
 dix/ptrveloc.c                           |  259 +++++++----------
 hw/xfree86/common/xf86.h                 |    2 +-
 hw/xfree86/common/xf86Config.c           |  161 ++++-------
 hw/xfree86/common/xf86Helper.c           |   53 ++--
 hw/xfree86/common/xf86Init.c             |   26 ++-
 hw/xfree86/common/xf86Module.h           |    2 +-
 hw/xfree86/common/xf86Opt.h              |   68 +++--
 hw/xfree86/common/xf86Option.c           |  111 ++++----
 hw/xfree86/common/xf86Xinput.c           |   34 +--
 hw/xfree86/common/xf86Xinput.h           |    4 +-
 hw/xfree86/doc/ddxDesign.xml             |   14 +-
 hw/xfree86/os-support/shared/posix_tty.c |    4 +-
 hw/xfree86/os-support/xf86_OSproc.h      |    6 +-
 hw/xfree86/parser/xf86Optrec.h           |    5 +-
 include/eventstr.h                       |   11 +-
 include/globals.h                        |    2 +-
 include/input.h                          |   23 ++-
 include/inputstr.h                       |   15 +-
 include/inpututils.h                     |    3 +-
 include/list.h                           |  160 ++++++++++
 include/os.h                             |   13 +
 include/protocol-versions.h              |    2 +-
 include/ptrveloc.h                       |   32 +-
 include/xserver-properties.h             |    5 +
 man/Xserver.man                          |    6 +
 mi/mi.h                                  |    2 +-
 mi/mieq.c                                |   19 +-
 mi/mipointer.c                           |   10 +-
 mi/mipointer.h                           |    2 +-
 mi/misprite.c                            |    5 -
 mi/mivaltree.c                           |    2 -
 os/log.c                                 |  161 +++++++---
 os/utils.c                               |   10 +
 test/Makefile.am                         |    3 +-
 test/input.c                             |  188 +++++++++++-
 test/list.c                              |  164 ++++++++++
 test/xfree86.c                           |   81 +++++
 test/xi2/protocol-eventconvert.c         |   40 ++-
 xkb/xkbAccessX.c                         |    8 +-
 55 files changed, 1858 insertions(+), 1046 deletions(-)
 create mode 100644 test/xfree86.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/20110909/14ffccdc/attachment.pgp>


More information about the xorg-devel mailing list