[PULL] input abi 12
Peter Hutterer
peter.hutterer at who-t.net
Wed Nov 10 19:16:01 PST 2010
On Wed, Nov 10, 2010 at 03:59:52PM -0800, Keith Packard wrote:
> On Mon, 1 Nov 2010 10:03:06 +1000, Peter Hutterer <peter.hutterer at who-t.net> wrote:
> > Keith,
> >
> > Please pull the input ABI 12 branch. It contains a whole bunch of cleanup
> > work to the input API to streamline the initialization process.
>
> Sorry I've been travelling for the last week and haven't been merging
> code. This doesn't apply today...
Master pulled in, a few minor conflicts, no biggies. Please try to pull
again.
The following changes since commit 4ed4915bc0fbe9b4419ca4a0d4e43c2fee032ae9:
Merge remote branch 'whot/for-keith' (2010-11-10 16:58:21 -0800)
are available in the git repository at:
git://people.freedesktop.org/~whot/xserver.git input-api
Chase Douglas (2):
Add CountBits() to the server.
Add support for per-axis valuator modes (Relative/Absolute)
Jesse Adkins (1):
xfree86: Purge kbdCustomKeycodes from xf86Info.
Peter Hutterer (58):
xfree86: rework driver PreInit API - XInput ABI 12
config: expose config_info as an input option.
xfree86: make xf86ActivateDevice static.
xfree86: remove superflous assignments.
input: Purge Register*Device() functions.
xfree86: purge some unused defines.
xfree86: remove XI86_CONFIGURED flag.
xfree86: purge SendDragEvents support.
input: set XKB extension for all new devices, not just xfree86 ones.
xfree86: return the device from xf86ActivateDevice.
xfree86: move xf86AllocateInput and xf86DeleteInput to xf86Xinput.c
xfree86: add xf86IDrvMsg and friends for input driver logging.
xfree86: remove LocalDeviceRec/Ptr definition.
xfree86: remove unused DeviceAssocRec struct.
xfree86: purge superfluous includes from xf86Xinput.c
input: remove OpenInputDevice and CloseInputDevice DDX hooks.
input: Purge AddOtherInputDevices DDX hook.
xfree86: Purge old_x/old_y from InputInfoRec.
xfree86: remove private_flags from InputInfoRec.
xfree86: remove first/last from InputInfoRec.
xfree86: remove always_core_feedback from InputInfoRec.
xfree86: remove history_size
input: constify valuators passed in by input drivers.
Remove atom field from InputInfoRec.
xfree86: remove conversion procs and close proc from InputInfoRec.
xfree86: skip a few NULL initialization, calloc does it for us.
xfree86: minor comment fix. HAL → config backend
xfree86: move a declaration down to the block it is used in.
xfree86: remove some ifdef 0 code.
xfree86: remove extraOptions field from IDevRec.
xfree86: Remove extraOptions parameter from xf86CollectInputOptions.
xfree86: plug minor memory leak.
xfree86: remove IDevRec, replace with InputInfoRec.
xfree86: update comment for xf86DeleteInput
xfree86: remove XI_PRIVATE macro, unused.
xfree86: don't export xf86InputDevs.
xfree86: remove {Dont}SendCoreEvents defines
xfree86: remove TS_Raw and TS_Scaled defines.
xfree86: move XI_VERIFY_VALUATORS to the source file it's used in.
xfree86: add a hook to replace the new console handler.
xfree86: add xf86OptionListDuplicate()
Merge branch 'master' into input-api
Abstract valuator masks through a set of APIs.
dix: get rid of the now-superfluous valuator arrays in GPE and friends.
xfree86: convert xf86Post{Motion|Key|Button|Proximity}Event to masks
dix: remove valuator_mask_copy_valuators, not needed anymore.
test: valuator_mask tests.
dix: send proximity events if one or more axes are Absolute.
input: add valuator_get_mode() helper.
dix: populate motion history only if the mode matches the first axis.
dix: clip absolute axes depending on their mode.
dmx: clarify a valuator mode condition.
input: move proximity state into ProximityClassRec.
input: remove "mode" field from ValuatorClassRec.
Convert some leftover axes->mode access to valuator_get_mode()
test: valuator_mode tests.
Re-export xf86CollectInputOptions.
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-api
Simon Thum (1):
xfree86: Fix xf86 backend-specific input initialization
Thomas Hellstrom (1):
linux: Don't lose console events on non-evdev drivers (#29969)
Xext/xtest.c | 10 +-
Xi/closedev.c | 1 -
Xi/exevents.c | 21 +-
Xi/listdev.c | 10 +-
Xi/opendev.c | 1 -
Xi/queryst.c | 3 +-
Xi/setmode.c | 2 +-
Xi/stubs.c | 90 -----
Xi/xiquerydevice.c | 2 +-
config/hal.c | 6 +-
config/udev.c | 7 +-
dix/devices.c | 50 ++-
dix/eventconvert.c | 14 +-
dix/getevents.c | 312 ++++++++++--------
dix/inpututils.c | 130 ++++++++
doc/xml/Xserver-spec.xml | 25 --
hw/dmx/doc/dmx.xml | 14 +-
hw/dmx/input/dmxevents.c | 53 ++--
hw/dmx/input/dmxinputinit.c | 16 +-
hw/dmx/input/dmxmotion.c | 7 +-
hw/dmx/input/dmxxinput.c | 17 -
hw/kdrive/src/kinput.c | 39 +--
hw/vfb/InitInput.c | 2 -
hw/xfree86/common/xf86.h | 1 +
hw/xfree86/common/xf86Config.c | 98 +++----
hw/xfree86/common/xf86Events.c | 20 ++
hw/xfree86/common/xf86Globals.c | 1 -
hw/xfree86/common/xf86Helper.c | 107 +++----
hw/xfree86/common/xf86InPriv.h | 3 -
hw/xfree86/common/xf86Init.c | 2 +-
hw/xfree86/common/xf86Module.h | 2 +-
hw/xfree86/common/xf86Opt.h | 1 +
hw/xfree86/common/xf86Option.c | 61 ++---
hw/xfree86/common/xf86Privstr.h | 1 -
hw/xfree86/common/xf86Xinput.c | 553 +++++++++++++++++---------------
hw/xfree86/common/xf86Xinput.h | 122 +++-----
hw/xfree86/common/xf86str.h | 12 +-
hw/xfree86/doc/devel/Registry | 1 -
hw/xfree86/doc/man/xorg.conf.man.pre | 3 -
hw/xfree86/os-support/linux/lnx_init.c | 4 +-
hw/xnest/Events.c | 14 +-
hw/xquartz/darwin.c | 19 +-
hw/xquartz/darwinEvents.c | 9 +-
hw/xquartz/darwinXinput.c | 72 ----
hw/xwin/InitInput.c | 4 -
hw/xwin/winmouse.c | 8 +-
include/Makefile.am | 2 +-
include/XIstubs.h | 14 -
include/exevents.h | 7 +-
include/input.h | 34 ++-
include/inputstr.h | 5 +-
include/inpututils.h | 48 +++
mi/mipointer.c | 6 +-
test/input.c | 112 +++++++-
xkb/xkbActions.c | 13 +-
55 files changed, 1104 insertions(+), 1087 deletions(-)
create mode 100644 include/inpututils.h
More information about the xorg-devel
mailing list