[PULL RESEND] input -next, smooth scrolling, screen crossing fixes
Peter Hutterer
peter.hutterer at who-t.net
Thu Sep 22 00:36:04 PDT 2011
This is a resend of the pull request
http://lists.freedesktop.org/archives/xorg-devel/2011-September/024938.html
This time all three (smooth scrolling, -next and two-screen-coordinates) in
one branch. Neither smooth scrolling nor two-screen-coordinates has reviews
but I've stopped caring now. If we find issues, we can fix them then.
I don't know if screenInfo is part of the video ABI (ajax hinted it may be).
If so, please bump the ABI after the merge, it has two more fields added to
it.
commit 82adee7f82251772ce54760d4b380c95bfed8060
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 (26):
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
Input: Add smooth-scrolling support 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 (57):
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
input: allow for max < min for relative axes on InitValuatorAxisStruct
dix: don't allow keyboard devices to submit motion or button events.
dix: fill out root_x/y for keyboard events
dix: warn about keyboard events with valuator masks
dix: NewCurrentScreen must work on pointers where possible
Move pointOnScreen to inpututils.c
xfree86: remove xf86XInputSetScreen
Store desktop dimensions in screenInfo.
input: switch miPointerSetPosition to expect desktop-wide coordinates.
xfree86: fix comment typo
xfree86: use subheader for Pointer Acceleration parts in xorg.conf(5)
xfree86: expose Option "TransformationMatrix"
dix: fix copy/paste error in valuator scaling
input: support the new XIScrollClass to mark axes as scrolling axes
dix: add extra check for valid valuator mask in emulate_scroll_events
dix: loop until the delta is below incr
Merge branch 'smooth-scrolling' into next-all
Merge branch 'two-screen-coordinates' into next
Sam Spilsbury (1):
Remove the SendEvent bit (0x80) before doing range checks on event type.
vdb at picaros.org (1):
xfree86: .BI style: monitor section in xorg.conf man page
Xi/exevents.c | 69 +++-
Xi/xipassivegrab.c | 13 +-
Xi/xiproperty.c | 5 +
Xi/xiquerydevice.c | 70 +++-
Xi/xiquerydevice.h | 1 +
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 | 45 ++-
dix/dispatch.c | 2 +
dix/eventconvert.c | 20 +-
dix/events.c | 291 +++++++++-----
dix/getevents.c | 686 ++++++++++++++++++------------
dix/grabs.c | 2 +-
dix/inpututils.c | 213 +++++++++-
dix/ptrveloc.c | 259 +++++-------
hw/xfree86/common/xf86.h | 2 +-
hw/xfree86/common/xf86Config.c | 161 +++-----
hw/xfree86/common/xf86Cursor.c | 2 +
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/xf86RandR.c | 3 +
hw/xfree86/common/xf86Xinput.c | 92 +++--
hw/xfree86/common/xf86Xinput.h | 7 +-
hw/xfree86/doc/ddxDesign.xml | 14 +-
hw/xfree86/man/xorg.conf.man | 51 ++-
hw/xfree86/modes/xf86RandR12.c | 2 +
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/exevents.h | 25 +-
include/globals.h | 2 +-
include/input.h | 26 +-
include/inputstr.h | 35 ++-
include/inpututils.h | 3 +-
include/list.h | 160 +++++++
include/os.h | 13 +
include/protocol-versions.h | 2 +-
include/ptrveloc.h | 32 +-
include/scrnintstr.h | 2 +
include/xserver-properties.h | 5 +
man/Xserver.man | 6 +
mi/mi.h | 2 +-
mi/mieq.c | 19 +-
mi/mipointer.c | 23 +-
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 | 245 +++++++++++-
test/list.c | 164 +++++++
test/xfree86.c | 81 ++++
test/xi2/protocol-common.c | 63 +++-
test/xi2/protocol-eventconvert.c | 40 ++-
test/xi2/protocol-xiquerydevice.c | 49 ++-
xkb/xkbAccessX.c | 8 +-
66 files changed, 2543 insertions(+), 1125 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/20110922/ce44b709/attachment.pgp>
More information about the xorg-devel
mailing list