This is my -next branch with a bunch of misc fixes, merged with the input API dtrace, merged with the per-device idle counters (and matching cleanups) All patches were rebased on top of the indentation cleanups.
Commit a7eac500e652f30deffd9dc5e623fab701077738.
The following changes since commit ab3a815a75ab5695753fa37a98b0ea5293d4cb91:
Indentation: Change '& stuff' to '&stuff' (2012-03-21 14:02:30 -0700)
are available in the git repository at:
git://people.freedesktop.org/~whot/xserver for-keith
Andreas Wettstein (1):
XKB: Redirect actions defunct with Gtk3 (XInput?)
Chase Douglas (2):
Xi: Fix TouchEnd to TouchUpdate change for one accepted grab
Use a new sprite trace for indirect touches when all touches have
physically ended
Jamey Sharp (1):
sync: Use a linked list instead of an array for SysCounterList.
Peter Hutterer (23):
Xext: return BadAccess if PickPointer fails (#45796)
dix: when rescaling from master, rescale from desktop dimensions (#46657)
Xi: prohibit multiple XIQueryVersion requests with different versions
dix: IsFloating() on master devices is always false
xfree86: remove out-of-date comment
Xext: drop InitServertime() declaration.
include: add an X_DEBUG message type
Xext: typedef QueryValue and BracketValue prototypes
dix: fix compiler warning "unused variable 'scr'"
Xext: remove needless /* parameter */ comments in declaration
dix: set raw event values before adding up relative values (#46976)
Xext: SyncCreateSystemCounter returns a SyncCounter*
dix: add dtrace probes to input API
Merge branch 'dtrace-input-abi' into for-keith
Xext: localise use of IdleTimeCounter
Xext: localise pIdleTimeValueLess/Greater
Xext: add a private field to SyncSystemCounters
Xext: pass the counter into block/wakeup handlers
Xext: store the bracket values for idle counters in the private
Xext: strdup() the SystemSyncCounter name
Change lastDeviceIdleTime to be per-device
Xext: Add per-device SyncCounters
Merge branch 'per-device-sync-counters' into for-keith
Xext/saver.c | 7 +-
Xext/sync.c | 202 +++++++++++++++++++-------------
Xext/syncsrv.h | 58 ++++-----
Xext/xtest.c | 10 ++
Xi/exevents.c | 26 +++--
Xi/xiqueryversion.c | 9 ++
dix/Xserver-dtrace.h.in | 7 +-
dix/Xserver.d | 2 +
dix/devices.c | 8 ++
dix/events.c | 15 ++-
dix/getevents.c | 58 ++++++++-
dix/globals.c | 2 +-
dix/touch.c | 3 +-
dix/window.c | 4 +-
doc/dtrace/Xserver-DTrace.xml | 153 ++++++++++++++++++++++++-
hw/kdrive/src/kinput.c | 3 +-
hw/xfree86/os-support/linux/lnx_init.c | 3 -
include/dix.h | 3 +-
include/dixstruct.h | 2 +-
include/input.h | 3 +-
include/inputstr.h | 2 +
include/os.h | 1 +
os/WaitFor.c | 2 +-
os/log.c | 5 +
os/xdmcp.c | 2 +-
xkb/xkbActions.c | 26 ++++-
26 files changed, 457 insertions(+), 159 deletions(-)
pgpjk8bstGkYp.pgp
Description: PGP signature
_______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
