~thopiekar/xorg-server/+git/xorg-server-salsa.debian:upstream-1.11+input

Last commit made on 2012-04-19
Get this branch:
git clone -b upstream-1.11+input https://git.launchpad.net/~thopiekar/xorg-server/+git/xorg-server-salsa.debian

Branch merges

Branch information

Name:
upstream-1.11+input
Repository:
lp:~thopiekar/xorg-server/+git/xorg-server-salsa.debian

Recent commits

cc5bf30... by Chase Douglas

Implement passive touch ungrabbing

Whoops. Forgot to implement this. The code currently generates an error
due to the unhandled grab type.

X.Org Bug 48069 <https://bugs.freedesktop.org/show_bug.cgi?id=48069>

Signed-off-by: Chase Douglas <email address hidden>
Reviewed-by: Peter Hutterer <email address hidden>
Signed-off-by: Keith Packard <email address hidden>
(cherry picked from commit 1110facdfeb95b1ad47d03c0ca3d73933b86dbd6)
(cherry picked from commit 259aa5a69b69aa72be3fb7402b68560f9a6b05d6)

Conflicts:

 Xi/xipassivegrab.c

Signed-off-by: Chase Douglas <email address hidden>

447cabb... by Peter Hutterer

dix: set raw event values before adding up relative values (#46976)

Regression introduced in 4e52cc0ef48145134cd58d357fb7289e6f8bb709

Raw event values are values as-is from the driver, modified only be
transformation or acceleration. 4e52cc caused the mask to be updated from
relative to absolute coordinates which then got written into the raw events.

Move the raw event update into the respective branches for absolute/relative
events.

X.Org Bug 46976 <http://bugs.freedesktop.org/show_bug.cgi?id=46976>

Signed-off-by: Peter Hutterer <email address hidden>
Reviewed-by: Chase Douglas <email address hidden>
Reviewed-by: Daniel Stone <email address hidden>
Tested-by: Sven Arvidsson <email address hidden>
Reviewed-by: Simon Thum <email address hidden>
(cherry picked from commit 908ab3d580188533168c8cdfd2cab9dc689b4218)
(cherry picked from commit 5eb20062208177172ff3443e522096a2e8f2f1e8)

Conflicts:

 dix/getevents.c

Signed-off-by: Chase Douglas <email address hidden>

d4880e6... by Peter Hutterer

dix: fix compiler warning "unused variable 'scr'"

getevents.c: In function 'updateSlaveDeviceCoords':
getevents.c:326:15: warning: unused variable 'scr' [-Wunused-variable]

Signed-off-by: Peter Hutterer <email address hidden>
(cherry picked from commit 9c3bd3ae652af386b6821b197d24528f20ba867d)
(cherry picked from commit a095f7ae96a353073add83e78f88f29d854d289d)

Signed-off-by: Chase Douglas <email address hidden>

8cb6ac5... by Chase Douglas

Use a new sprite trace for indirect touches when all touches have physically ended

All touches of an indirect device, such as a trackpad, are sent to the
same window set. When there are no active touches, a new window set is
created; otherwise, the window set of an existing touch is copied.

The current code checks for any logically active touches. This includes
touches that have physically ended but are still logically active due to
unhandled touch grabs. Instead, we want a new window set whenever there
are no physically active touches.

This change skips over logically active but pending end touches, which
are touches that have physically ended.

Signed-off-by: Chase Douglas <email address hidden>
Reviewed-by: Peter Hutterer <email address hidden>
Signed-off-by: Peter Hutterer <email address hidden>
(cherry picked from commit 31df08a449cf9b6e1740e1c02257997490630d93)
(cherry picked from commit f8446ad3d71cdf9c2200f5584bd156c629fe3c90)

Signed-off-by: Chase Douglas <email address hidden>

cd3981c... by Chase Douglas

Xi: Fix TouchEnd to TouchUpdate change for one accepted grab

If there is only one listener of a touch, the listener is a grab, and is
accepted before the touch has ended, the current code will not end the
touch record when the touch does end.

This change adds a listener state for when a touch is accepted but has
not yet ended. We now keep the touch record alive in this state, but end
it when the touch ends.

Signed-off-by: Chase Douglas <email address hidden>
Reviewed-by: Peter Hutterer <email address hidden>
Signed-off-by: Peter Hutterer <email address hidden>
(cherry picked from commit 58427e08a4a36ce9e213e4b4fe5249d5db2c764d)
(cherry picked from commit 5a3ec826e653377e8b70e7553d1f0ca72210447c)

Conflicts:

 Xi/exevents.c

Signed-off-by: Chase Douglas <email address hidden>

b3677a3... by Peter Hutterer

dix: when rescaling from master, rescale from desktop dimensions (#46657)

master->last.valuators[] is in desktop dimensions, so use those as
rescale axis ranges, not the screen. Otherwise, a rescale on any screen
not the top-left will cause out-of-bounds coordinates which will always
map to the bottom-right screen, causing the device to be stuck on that
screen.

X.Org Bug 46657 <http://bugs.freedesktop.org/show_bug.cgi?id=46657>

Signed-off-by: Peter Hutterer <email address hidden>
Reviewed-by: Chase Douglas <email address hidden>
(cherry picked from commit eb84c154ed38194c32651727b6dfe2d1bde4c599)
(cherry picked from commit a8c9a93c66edce893af3ba460d728fe2bc48c2af)

Signed-off-by: Chase Douglas <email address hidden>
(cherry picked from commit 43782cb0eb49b0e9528f7e4655c52829ebe97c70)

Signed-off-by: Chase Douglas <email address hidden>

8474de3... by Peter Hutterer

Xext: return BadAccess if PickPointer fails (#45796)

PickPointer or PickKeyboard return NULL, all MDs are currently disabled and
we cannot emulate a core event. This wasn't anticipated by the protocol, so
we don't really have an error code we may use here - BadAccess is simply the
least bad of the possible ones.

And returning BadAccess beats crashing the server.

X.Org Bug 45796 <http://bugs.freedesktop.org/show_bug.cgi?id=45796>

Signed-off-by: Peter Hutterer <email address hidden>
(cherry picked from commit 6b6afd3d013e3f4910fae3520d1d786df2b0e47a)
(cherry picked from commit bc8dc7183b50800470080eaa9c04cfd6ecc3591b)

Signed-off-by: Chase Douglas <email address hidden>
(cherry picked from commit 10f83ac92fce51fbbe892d0a3619a29d08cb1d40)

Signed-off-by: Chase Douglas <email address hidden>

86af9c2... by Chase Douglas

Merge commit '0e7b1080415c85f55462ad863de36df7011bf869' into upstream-1.11+input

Due to me updating this branch on multiple computers and forgeting to
push the result to the repo, I had to diverged heads. Merging the old
branch in should fix things.

c3eea98... by Chase Douglas

Revert "xfree86: use NewInputDeviceRequest for xorg.conf devices too"

This commit uses the new 1.12 input option abi. We are sticking with the
1.11 option abi. This ends up causing memory corruption and segfaults.

This reverts commit 7ee1621364d2b6230bb1c02bbdb5b6abb74ad2ff.

Signed-off-by: Chase Douglas <email address hidden>

f9a799a... by Chase Douglas

Revert "xfree86: duplicate name and driver from pInfo for NewInputDeviceRequest"

This commit uses the new 1.12 input option abi. We are sticking with the
1.11 option abi. This ends up causing memory corruption and segfaults.

This reverts commit 4b7dd4523c11ef4952b78e4164b2fa7b34588867.

Signed-off-by: Chase Douglas <email address hidden>