summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-03-24XQuartz: Uncrustifyserver-1.13-apple-indentJeremy Huddleston68-8162/+9452
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-03-23Fixup X11Application.mJeremy Huddleston1-2/+2
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-03-23XCode FormattingJeremy Huddleston59-4433/+4487
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-03-17Debug tabletserver-1.13-apple-pre-indentJeremy Huddleston1-4/+4
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-03-17fb: Revert fb changes that broke XQuartzJeremy Huddleston3-80/+44
http://bugs.freedesktop.org/show_bug.cgi?id=26124 Revert "Fix source pictures getting random transforms after 2d6a8f668342a5190cdf43b5." Revert "fb: Adjust transform or composite coordinates for pixman operations" http://bugs.freedesktop.org/26124 This reverts commit a72c65e9176c51de95db2fdbf4c5d946a4911695. This reverts commit a6bd5d2e482a5aa84acb3d4932e2a166d8670ef1. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-03-17Workaround the GC clipping problem in miPaintWindow and add some debugging ↵Jeremy Huddleston1-11/+94
output. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-03-17sdksyms.sh: Use CPPFLAGS, not CFLAGSJeremy Huddleston1-2/+2
CFLAGS can include flags which are not useful to the preprocessor or can even cause it to fail. This fixes a build issue on darwin when building for more than one architecture. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Keith Packard <keithp@keithp.com>
2012-03-17XQuartz: Detect FatalErrors on startup to prevent tight crash loopsJeremy Huddleston4-1/+48
If a FatalError occurs before the server finishes launching, it will not have drained the launchd-owned DISPLAY socket, so launchd will just relaunch it. This can cause the server to crash in a tight loop which will spam the user with CrashReporter windows that claim focus on appearance. This allows users stuck in this loop to "deal" with the problem without popping up a crash report every 10 seconds. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-03-17os: Pass the FatalError message to OsVendorFatalErrorJeremy Huddleston11-18/+19
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2012-03-17XQuartz: Add a defaults option to disable the RENDER extensionJeremy Huddleston2-0/+5
RENDER has some ugly issues on XQuartz, so add an option to disable RENDER. Enables workaround for: https://bugs.freedesktop.org/show_bug.cgi?id=26124 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-03-17XQuartz: Use doubles for input valuatorsJeremy Huddleston2-48/+45
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-03-17XQuartz: Xi: darwinPointer is now RelativeJeremy Huddleston1-2/+2
There is really no real reason why this should be necessary, but wine developers are stuborn, so doing this to try to work around this wine issue: http://bugs.winehq.org/show_bug.cgi?id=29732 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-03-17XQuartz: Move our logs into an X11 subdirectoryJeremy Huddleston1-1/+10
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-03-14Bump version number to 1.12.99.0Keith Packard1-2/+2
Now that 1.12 has branched, reset the version on master to a development number. Signed-off-by: Keith Packard <keithp@keithp.com>
2012-03-04Version bumped to 1.12xorg-server-1.12.0Keith 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)xorg-server-1.11.99.903Keith 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>
2012-02-03Stop including <sys/proc.h> from xf86_OSlib.h on SolarisAlan Coopersmith1-1/+1
We don't need anything from that header (which defines /proc & kernel structures for process information), and it causes some namespace conflicts. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Keith Packard <keithp@keithp.com>
2012-01-30XQuartz: Release all buttons and keys when deactivatingJeremy Huddleston3-17/+32
http://xquartz.macosforge.org/trac/ticket/486 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2012-01-29XQuartz: Toggle off fullscreen mode when XQuartz is hiddenJeremy Huddleston1-0/+7
http://xquartz.macosforge.org/trac/ticket/478 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-01-29XQuartz: Localization UpdatesJeremy Huddleston60-18346/+47072
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-01-27Bump version to 1.11.99.902 (1.12 RC2)xorg-server-1.11.99.902Keith Packard1-2/+2
Signed-off-by: Keith Packard <keithp@keithp.com>
2012-01-27XQuartz: Bump bundle version to 2.7.2Jeremy Huddleston1-4/+4
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-01-27hw/xwin: Fix spelling of 'Canadian' in winkeybd.hColin Harrison1-1/+1
The Mounties always get their typo Signed-off-by: Colin Harrison <colin.harrison@virgin.net> Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2012-01-27hw/xwin: Fix winEnqueueMotion() for change in miPointerSetPosition()Colin Harrison1-3/+0
Commit 3b36fd1b49030ead44358945f62e5abe7f4609ce changed miPointerSetPosition() to take co-ordinates as doubles, not ints, so this code as it stands is now wrong (if it ever was correct in the first place :-)) It's unclear that we can safely promote x,y to doubles, apply miPointerSetPosition() which potentially constrains the cursor, and then convert back to ints. Fortunately, this whole dance seems to be unnecessary, and we can simply remove the call to miPointerSetPosition() entirely, and just QueuePointerEvents() like any other input driver. Signed-off-by: Colin Harrison <colin.harrison@virgin.net> Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2012-01-26hw/xwin: Ignore WM_DISPLAYCHANGE messages with 0 bppColin Harrison1-0/+4
Ignore WM_DISPLAYCHANGE messages which indicate bpp is changing to 0. That has no defined meaning I can find, but some graphics card drivers appear to generate it on suspend/resume or screensaver activate/deactivate. Signed-off-by: Colin Harrison <colin.harrison@virgin.net> Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-08 00:27:00 +0000