Merged. ec6de52..07069f5 server-1.14-branch -> server-1.14-branch
On 10/22/2013 12:04 AM, Peter Hutterer wrote: > The following changes since commit ec6de521161d5c45885c8751c250d3fabcbc2194: > > Merge commit 'a1985e892f5b5f0959235a631d8bcf676b78bfbc' into > server-1.14-branch (2013-10-21 21:03:29 -0600) > > are available in the git repository at: > > > git://people.freedesktop.org/~whot/xserver server-1.14-branch > > for you to fetch changes up to 07069f5d71dd0869fe9a6f9ab87c467e7ec75011: > > sync: split updating and triggering a counter up (2013-10-22 15:44:02 +1000) > > ---------------------------------------------------------------- > Egbert Eich (1): > DIX/Xi: Pass correct client to CheckDeviceGrabAndHintWindow() > > Peter Hutterer (14): > test: fix the gcc diagnostics pragma > dix: check for grab type before checking XI2 mask > Xi: allow for XIAllowEvent requests larger than XI < 2.2 size (#68554) > dix: only allow button and key events to freeze a sync'd pointer > include: change grabtypes to start at 1 > dix: don't attempt to deliver an event for a different grabtype > dix: only deliver for the current grab type > sync: compress two if statements > sync: always call BracketValues when recalculating upper/lower brackets > sync: supply the counter from IdleTimeBlockHandler > dix: provide accessor methods for the last device event time > sync: if the idle time was reset, force alarms to trigger (#70476) > sync: always set the brackets (#59644) > sync: split updating and triggering a counter up > > Xext/saver.c | 6 +-- > Xext/sync.c | 139 > ++++++++++++++++++++++++++++++++------------------ > Xi/xiallowev.c | 2 +- > dix/events.c | 120 +++++++++++++++++++++++++++++++------------ > dix/globals.c | 1 - > dix/window.c | 4 +- > include/dix.h | 11 ++++ > include/dixstruct.h | 1 - > include/input.h | 6 +-- > os/WaitFor.c | 2 +- > os/xdmcp.c | 2 +- > test/signal-logging.c | 3 +- > 12 files changed, 200 insertions(+), 97 deletions(-) > -- Matt Dew <[email protected]> Key signature: 0xF7C3 BEC3 Fingerprint: FDB1 9D94 C573 DC29 BCCB 2F9F A6BF 3771 F7C3 BEC3
signature.asc
Description: OpenPGP digital signature
_______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
