6bb98fc62d
xquartz: Update autotools-based builds of XQuartz to account for recent changes
...
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2022-06-21 11:54:06 -07:00
a6a20a7c40
meson: Provide options to set CFBundleVersion and CFBundleVersionString in XQuartz
...
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 4f5999826a
2022-06-19 23:10:48 -07:00
37285e6252
xquartz: Update copyright for 2022
...
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit b12f5dc62d
2022-06-19 22:23:40 -07:00
96e7b55c5d
xquartz: Update Sparkle configuration to use SUPublicEDKey
...
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 1d90bef30c
2022-06-19 22:23:40 -07:00
e48acd9c40
XQuartz: Ensure scroll events are delivered to a single window (not both X11 and AppKit)
...
Fixes: https://github.com/XQuartz/XQuartz/issues/130
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 4532b696c6
2022-06-16 07:27:38 -07:00
140d9a0f75
xquartz: Fold spaces related preferences into NSUserDefaults+XQuartzDefaults
...
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit f40610e0b4
2022-06-14 23:36:40 -07:00
03ec5b132f
xquartz pbproxy: Adopt NSUserDefaults+XQuartzDefaults for preferences
...
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 6134c73aeb
2022-06-14 23:36:39 -07:00
6df6178bb9
xquartz: Create a separate category for organizing user preferences
...
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 963ba6d9ad
2022-06-14 23:36:39 -07:00
663af2f17e
X11Application: Ensure TIS operations are done on the main thread
...
Fixes: https://github.com/XQuartz/XQuartz/issues/205
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit b1afcecc61
2022-06-14 23:36:39 -07:00
199f278a1b
French text in Preferences Pane Review
2021-04-07 16:19:24 -07:00
65b27d82f2
xquartz: Call PseudoramiXExtensionInit() through InitOutput() just like xwin
...
Fixes: https://github.com/XQuartz/XQuartz/issues/140
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2021-04-07 16:11:59 -07:00
4ae36f418e
xquartz: Ensure the mouse pointer is shown when switching to a native macOS alert or window
...
Fixes: https://github.com/XQuartz/XQuartz/issues/100
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2021-03-08 21:03:57 -08:00
15a413e11d
xquartz: Update meson build to remove deleted files
...
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2021-03-05 23:17:21 -08:00
e59848548a
xquartz: Fix appFlags build failure with macOS 10.15+ SDKs
...
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2021-03-05 23:17:21 -08:00
9d329a0fb1
xquartz: Remove a check for NSAppKitVersionNumber >= NSAppKitVersionNumber10_7
...
This check is always true on our supported systems.
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2021-02-22 09:20:25 -08:00
839b49ac05
xquartz: Don't include strndup.c any more since we no longer support 10.8 and older
...
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2021-02-22 09:20:25 -08:00
677eb6827b
xquartz: Add a launch trampoline to better integrate with modern versions of macOS
...
Fixes: https://github.com/XQuartz/XQuartz/issues/6
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2021-02-22 09:20:25 -08:00
25035229b7
xquartz: Don't process AppKit events if we haven't finished initializing
...
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2021-02-20 21:04:25 -08:00
487286d472
xquartz: Allocate each fbconfig separately
...
A change during the 1.20 development cycle resulted in fbconfigs being walked
and deallocated individually during __glXScreenDestroy. This change
now avoids a use-after-free caused by that change.
==50859==ERROR: AddressSanitizer: heap-use-after-free on address 0x00010d3819c8 at pc 0x0001009d4230 bp 0x00016feca7a0 sp 0x00016feca798
READ of size 8 at 0x00010d3819c8 thread T5
#0 0x1009d422c in __glXScreenDestroy glxscreens.c:448
#1 0x10091cc98 in __glXAquaScreenDestroy indirect.c:510
#2 0x1009d2734 in glxCloseScreen glxscreens.c:169
#3 0x100740a24 in dix_main main.c:325
#4 0x10023ed50 in server_thread quartzStartup.c:65
#5 0x199ae7fd0 in _pthread_start+0x13c (libsystem_pthread.dylib:arm64e+0x6fd0)
#6 0x199ae2d38 in thread_start+0x4 (libsystem_pthread.dylib:arm64e+0x1d38)
0x00010d3819c8 is located 200 bytes inside of 12800-byte region [0x00010d381900,0x00010d384b00)
freed by thread T5 here:
#0 0x101477ba8 in wrap_free+0x98 (libclang_rt.asan_osx_dynamic.dylib:arm64e+0x3fba8)
#1 0x1009d4240 in __glXScreenDestroy glxscreens.c:449
#2 0x10091cc98 in __glXAquaScreenDestroy indirect.c:510
#3 0x1009d2734 in glxCloseScreen glxscreens.c:169
#4 0x100740a24 in dix_main main.c:325
#5 0x10023ed50 in server_thread quartzStartup.c:65
#6 0x199ae7fd0 in _pthread_start+0x13c (libsystem_pthread.dylib:arm64e+0x6fd0)
#7 0x199ae2d38 in thread_start+0x4 (libsystem_pthread.dylib:arm64e+0x1d38)
previously allocated by thread T5 here:
#0 0x101477e38 in wrap_calloc+0x9c (libclang_rt.asan_osx_dynamic.dylib:arm64e+0x3fe38)
#1 0x100925a40 in __glXAquaCreateVisualConfigs visualConfigs.c:116
#2 0x10091cb24 in __glXAquaScreenProbe+0x224 (X11.bin:arm64+0x100730b24)
#3 0x1009cd840 in xorgGlxServerInit glxext.c:528
#4 0x10074539c in _CallCallbacks dixutils.c:743
#5 0x100932a70 in CallCallbacks callback.h:83
#6 0x100932478 in GlxExtensionInit vndext.c:244
#7 0x10020a364 in InitExtensions miinitext.c:267
#8 0x10073fe7c in dix_main main.c:197
#9 0x10023ed50 in server_thread quartzStartup.c:65
#10 0x199ae7fd0 in _pthread_start+0x13c (libsystem_pthread.dylib:arm64e+0x6fd0)
#11 0x199ae2d38 in thread_start+0x4 (libsystem_pthread.dylib:arm64e+0x1d38)
Regressed-in: 4b0a3cbab1
2021-02-20 17:29:40 -08:00
6a83fb51b7
xquartz: Fix a compiler warning about const incompatible pointer assignment
...
driWrap.c:541:30: error: assigning to 'GCOps *' (aka 'struct _GCOps *') from 'const GCOps *' (aka 'const struct _GCOps *') discards
qualifiers [-Werror,-Wincompatible-pointer-types-discards-qualifiers]
pGCPriv->originalOps = pGC->ops;
^ ~~~~~~~~
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2021-02-20 15:18:47 -08:00
a3ddcdd56c
xquartz: Fix build with sparkle enabled
...
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2021-02-18 23:16:32 -08:00
279bcbd9cf
xquartz: Silence a compiler warning about missing internal methods on NSApplication
...
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2021-02-18 22:34:14 -08:00
fe89c70e47
xquartz: Rewrite Window menu handling to not depend on X11App.windowsMenu.numberOfItems being correct in -awakeFromNib
...
Fixes: https://github.com/XQuartz/XQuartz/issues/56
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2021-02-18 22:32:14 -08:00
41aed8f696
xquartz: Convert X11Controller ivars into @properties
...
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2021-02-18 22:32:14 -08:00
c2750e1fab
xquartz: Convert X11Application ivars into @properties
...
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2021-02-18 22:32:14 -08:00
f51b97b0de
xquartz: Fold quartzCommon.h into quartz.h
...
Everything declared in it comes from quartz.c, so match reality.
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2021-02-18 22:32:14 -08:00
4b4500c48f
xquartz: Fold away some unnecessary hops to X11Controller through X11Application
...
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2021-02-18 22:32:14 -08:00
39c0e1c0ab
xquartz: Fold away array_with_strings_and_numbers and simplify with more modern Objective-C
...
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2021-02-18 22:32:14 -08:00
87f8fe1f74
xqaurtz: Remove message_kit_thread() and use dispatch instead
...
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2021-02-18 22:32:14 -08:00
94e4e17348
xquartz: Use objc_autoreleasePoolPush / objc_autoreleasePoolPop directly in QuartzBlockHandler
...
It violates @autoreleasepool best practices, and this helps collapse quartzCocoa.m into quartz.c
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2021-02-18 22:32:14 -08:00
fba421f700
xquartz: Minor code modernization -- @autoreleasepool adoption
...
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2021-02-18 22:32:14 -08:00
318f8a4a8a
xquartz: Remove some dead code for compatibility with older nibs
...
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2021-02-18 22:32:14 -08:00
72a39dccf9
xquartz: Remove a workaround for AppKit versions older than Lion
...
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2021-02-18 22:32:14 -08:00
7e28750358
xquartz: Fix applications menu table background color for dark mode
...
Fixes: https://github.com/XQuartz/XQuartz/issues/32
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2021-02-17 16:24:08 -08:00
85beee9885
xquartz: Apply Xcode 12.4 automatic updates to nibs
...
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2021-02-17 16:24:06 -08:00
4e892aa6e1
xquartz: Update the about box copyright to 2021
...
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2021-02-17 13:38:31 -08:00
c9a3b14c14
xquartz: Ensure we call into TIS on the main thread
...
There is a place where this code was called on the main thread.
We're using a rather nasty anti-pattern to just call a block inline rather
than synchonously calling it on the main thread if we're already on the main
thread. This code could use a good overhaul, but I don't have time to rip
it apart right now. This will address the immediate issue.
Fixes: https://github.com/XQuartz/XQuartz/issues/40
Fixes: https://github.com/XQuartz/XQuartz/issues/48
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2021-02-17 09:53:33 -08:00
520e7a1310
xquartz: Ensure that NSRunAlertPanel() is run on the main thread
...
Fixes: https://github.com/XQuartz/XQuartz/issues/30
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2021-02-02 00:46:26 +00:00
7d0bb7ed06
xquartz: Remove support for older versions of libXplugin
...
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2021-02-01 16:21:39 -08:00
5e7c0762e6
xquartz: Remove unused include of AvailabilityMacros.h from various sources
...
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2021-02-01 16:21:39 -08:00
59f22341a8
xquartz: Remove support for building for i386
...
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2021-02-01 16:21:39 -08:00
aea15a7659
xquartz: Remove support for Mountain Lion and earlier versions of macOS
...
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2021-02-01 16:21:39 -08:00
c0b2d3e099
xquartz: Remove support for Lion and earlier versions of macOS
...
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2021-02-01 16:21:39 -08:00
cc9cf6f085
xquartz: Remove support for SnowLeopard and earlier versions of macOS
...
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2021-02-01 16:21:39 -08:00
f699aac2ea
xquartz: Remove check for libdispatch now that we don't support pre-SnowLeopard
...
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2021-02-01 16:21:39 -08:00
5ad4910272
xquartz: Remove support for Leopard and earlier versions of macOS
...
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2021-02-01 16:21:39 -08:00
6e6db055f8
xquartz: Remove support for Tiger and earlier versions of macOS
...
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2021-02-01 16:21:39 -08:00
74aef85bd8
xquartz: Remove support for Panther and earlier versions of macOS
...
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2021-02-01 16:21:39 -08:00
0e272ac458
Fix typo "XQaurtz" in Xquartz.man
2021-02-01 16:21:39 -08:00
3cdac5ba07
mi: List extensions in usage message
...
Not all extensions can be enabled or disabled at runtime, list the
extensions which can from the help message rather than on error only.
v2:
* Print the header message in the ListStaticExtensions() (Peter
Hutterer)
* Do not export ListStaticExtensions() as Xserver API
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
2021-01-29 12:52:09 +00:00
Jeremy Huddleston Sequoia
Edouard Gaulué
Jim DeLaHunt
Olivier Fourdan