summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-03-27xwayland: also free output stuffCorentin Chary3-14/+30
Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
2012-03-27xwayland: stop leaking memory and fix server resetCorentin Chary4-23/+122
Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
2012-03-27xwayland: don't force input devices when using xwaylandCorentin Chary1-3/+4
Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
2012-03-27xwayland: fix input devices initializationCorentin Chary2-15/+38
Use a dummy timer to register first input devices. The timer will only fire once all layer (including extensions and input) are initialized. Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
2012-03-27s/hosted/xwayland/Corentin Chary15-490/+442
Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
2012-03-27hosted: Track wayland changesKristian Høgsberg4-20/+53
2012-03-27hosted: Copy drm.xml into hosted and generate protocol codeKristian Høgsberg5-0/+52
Since the drm interface got moved into mesa, we need to include the drm protocol description and generate code ourselves. For now, we just include a copy of drm.xml from mesa.
2012-03-27hosted: Reset modifiers mask before computink new maskKristian Høgsberg1-0/+1
2012-03-27hosted: fix two crashes, don't leak buffersCorentin Chary1-12/+17
Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
2012-03-27hosted: remove unneeded memset()Corentin Chary1-1/+0
Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
2012-03-27hosted: make it work againCorentin Chary10-105/+241
- resync with wayland - split drm code and make it optional - don't create input device too early - use calloc instead of malloc - always set a geometry when initializing output Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
2012-03-27hosted: Track Wayland API changes, add cursor forwardingKristian Høgsberg5-42/+235
2012-03-27Rename xorgWayland global to xorgHostedKristian Høgsberg5-11/+6
2012-03-27Define XORG_HOSTED in xorg-server.h when availableKristian Høgsberg2-1/+4
2012-03-27hosted: Enable rootless flag when the command line argument is setKristian Høgsberg1-0/+6
2012-03-27Add missing hosted.hKristian Høgsberg1-0/+61
2012-03-27Start splitting out hosted backend codeKristian Høgsberg5-343/+526
2012-03-27Xorg hostedKristian Høgsberg5-3/+1118
2012-03-27Add flag to toggle rootlessKristian Høgsberg3-0/+16
2012-03-27Add redirect window for input device featureKristian Høgsberg5-2/+24
2012-03-27Disble autoAddDevices when in wayland modeKristian Høgsberg1-0/+4
2012-03-27Add and export AddSelectionKristian Høgsberg2-16/+31
2012-03-27Export CompositeRedirectSubwindowsKristian Høgsberg2-0/+8
2012-03-04Version bumped to 1.12Keith Packard1-2/+2
Signed-off-by: Keith Packard <keithp@keithp.com>
2012-03-04test: add new test cases to .gitignoreGaetan Nadon2-0/+2
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Keith Packard <keithp@keithp.com>
2012-02-27dix: avoid NULL-pointer dereference on button-only devices (#38313)Peter Hutterer1-4/+15
And for such devices simply take the last.valuators[] which must be valid at all times anyway. UpdateSlaveDeviceCoords takes care of that. X.Org Bug 38313 <http://bugs.freedesktop.org/show_bug.cgi?id=38313> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
2012-02-22Revert "dix: don't XWarpPointer through the last slave anymore (#38313)"Jeremy Huddleston1-14/+7
This reverts commit 2bfb802839688ecf328119c4c6979390fc60348d. This commit caused a regression. See: http://xquartz.macosforge.org/trac/ticket/517#comment:10 Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
2012-02-22XQuartz: Short-circuit activateX:Jeremy Huddleston1-0/+3
This also avoids a deadlock when calling activateX: before the server thread has initialized Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-02-22XQuartz: Actually install the new localesJeremy Huddleston1-1/+1
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-02-22Merge remote-tracking branch 'whot/for-keith'Keith Packard2-12/+20
2012-02-15Keep virtual core pointer touch class around if new slave doesn't have oneChase Douglas1-6/+3
The VCP may have active touch grabs. The touch records must be kept so these touch grabs may be accepted/rejected in the future. This means the touch class list will not represent the touch class of the attached slave device if it does not have a touch class, but we already were breaking that assumption by keeping a separate touches array for the VCP. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2012-02-15Don't clobber virtual core pointer touches array lengthPeter Hutterer1-5/+13
The VCP has its own touches array, don't overwrite it when the class is copied from the SD to the master. Reported-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
2012-02-15Don't dereference a touch after it has been ended when punting to next ownerChase Douglas1-0/+1
In this case, we have ended the touch because the last owner has rejected it. We need to return from the function right now so we don't attempt to dereference another touch client for early acceptance processing. Signed-off-by: Chase Douglas <chase.douglas@ubuntu.com> Reviewed-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2012-02-15Focus event button state must show the logical buttons, not physical buttonsChase Douglas1-1/+1
Similar to the fix in fcda98c48610fd507ca0b89c6006a5497d9dc1c9. This ensures we show the correct logical state of the buttons in device focus events too. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2012-02-14dix: reset last.scroll when resetting the valuator (#45611)Peter Hutterer1-0/+2
last.scroll remained on the last-submitted scrolling value but last.valuator was changed whenever the slave device changed. The first scrolling delta after a switch was then calculated as (last.scroll - new abs value), causing erroneous scrolling events. Test case: - synaptics with a scrolling method enabled, other device with 3+ axes (e.g. wacom) - scroll on touchpad - use other device - scroll on touchpad The second scroll caused erroneous button press/release events. X.Org Bug 45611 <http://bugs.freedesktop.org/show_bug.cgi?id=45611> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
2012-02-13XQuartz: Build fix for possible conflict of BOOL typeJeremy Huddleston1-2/+5
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-02-11Bump to version 1.11.99.903 (1.12 RC3)Keith Packard1-2/+2
Signed-off-by: Keith Packard <keithp@keithp.com>
2012-02-11Merge remote-tracking branch 'alanc/master'Keith Packard11-212/+212
2012-02-11Xi: handle new XIAllowEvents request in inputproto 2.1.99.6Peter Hutterer2-7/+36
grab_window and touchid were removed from the struct for ABI compatibility reasons, we need to pull in the new, XI 2.2-specific struct. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2012-02-09Xi: handle new XIAllowEvents request in inputproto 2.1.99.6Peter Hutterer2-7/+36
grab_window and touchid were removed from the struct for ABI compatibility reasons, we need to pull in the new, XI 2.2-specific struct. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2012-02-08dix: fix an out-of-memory crashBenjamin Otte1-0/+3
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2012-02-08Implement touch early acceptChase Douglas3-6/+32
This doesn't really implement early accept as it should. Ideally, the server should send end events to all subsequent touch clients as soon as an early accept comes in. However, this implementation is still protocol compliant. We can always improve it later. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2012-02-08Implement early touch rejectChase Douglas1-1/+8
Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2012-02-08Check for proper window ID when processing touch allow requestsChase Douglas3-8/+14
Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2012-02-08Move AllowTouch to dix/touch.c, and rename to TouchAcceptRejectChase Douglas3-44/+49
Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2012-02-08Export TouchEventRejected as TouchRejectedChase Douglas2-11/+34
This function is mostly correct for early reject usage. With a small change to pass the client resource explicitly and making the TouchOwnership event optional, it is usable for all rejection scenarios. This change exports it for use outside Xi/exevents.c and modifies the name accordingly. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2012-02-08Factor out TouchEnd generation and deliveryChase Douglas1-66/+37
The server often needs to generate and deliver TouchEnd events for circumstances including touch grab acceptance and rejection. This change refactors the code so it can be used more easily. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2012-02-08Store window pointer in touch listener recordChase Douglas3-7/+13
Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2012-02-08Revert "dix: deduplicate callers of DeliverDeviceEvents in DeliverGrabbedEvents"Peter Hutterer1-10/+8
This call was supposed to have no functional changes but in some cases DeliverDeviceEvents() was called with a uninitialised win variable. Revert, safer than trying to sort this out otherwise. This reverts commit 6eff14a789341d366b3013c5aa020e959c954651. Reported-by: Mathieu Taillefumier <mathieu.taillefumier@free.fr> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Keith Packard <keithp@keithp.com>
2012-02-03Namespace list api to reduce conflicts with similar system headersAlan Coopersmith10-211/+211
Rename functions/macros from list_* to xorg_list_* Rename struct from struct list to struct xorg_list. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Keith Packard <keithp@keithp.com> In-sed-I-trust: Peter Hutterer <peter.hutterer@who-t.net>