Updated to fix the kdrive compilation issue. and a few patches on top for test cases, fp3232 etc.
I've pushed the kdrive fix down before the InputOption rec so the server
stays bisectable
Commit a41214bc9a0f326c6dc129e4a6382efb8b826862
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 (16):
kdrive: switch to new InputOption API.
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
test: fix test with new double -> fp3232 conversion functions
Use new FP1616/FP3232 conversion functions
kdrive: check for null memory, fix OOB
Xi/exevents.c | 20 ++++-
Xi/xiquerydevice.c | 7 +-
dix/devices.c | 2 +-
dix/eventconvert.c | 67 +++++++++++++++---
dix/getevents.c | 10 ++--
dix/inpututils.c | 34 +++++----
dix/ptrveloc.c | 4 +-
hw/kdrive/src/kinput.c | 139 +++++++++++++++++++++----------------
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 | 27 ++++++-
xkb/xkbActions.c | 7 ++-
24 files changed, 265 insertions(+), 169 deletions(-)
create mode 100644 include/optionstr.h
pgpRt2AwauZDJ.pgp
Description: PGP signature
_______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
