fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-20 09:20:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
17018 commits 90 branches 540 tags 81 MiB
Commit graph

993 commits

Author SHA1 Message Date
Jeremy Huddleston Sequoia
17c61dee83 XQuartz: Improve type safety for X11Controller's application menu editor 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 4cfdc5af31)
 2022-07-02 14:50:04 -07:00
Jeremy Huddleston Sequoia
9c48c39d9f xquartz: Fix a possible crash when editing the Application menu due to mutaing immutable arrays 
Crashing on exception: -[__NSCFArray replaceObjectAtIndex:withObject:]: mutating method sent to immutable object

Application Specific Backtrace 0:
0   CoreFoundation                      0x00007ff80d2c5e9b __exceptionPreprocess + 242
1   libobjc.A.dylib                     0x00007ff80d027e48 objc_exception_throw + 48
2   CoreFoundation                      0x00007ff80d38167b _CFThrowFormattedException + 194
3   CoreFoundation                      0x00007ff80d382a25 -[__NSCFArray removeObjectAtIndex:].cold.1 + 0
4   CoreFoundation                      0x00007ff80d2e6c0b -[__NSCFArray replaceObjectAtIndex:withObject:] + 119
5   X11.bin                             0x00000001003180f9 -[X11Controller tableView:setObjectValue:forTableColumn:row:] + 169

Fixes: https://github.com/XQuartz/XQuartz/issues/267
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit dfd057996b)
 2022-07-02 14:50:04 -07:00
Jeremy Huddleston Sequoia
bc01ee9d34 XQuartz: Add TCC reason keys to Info.plist 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 51c5364dab6b6c94ddebc304a0dd477dd37a572c)
 2022-07-02 14:50:04 -07:00
Jeremy Huddleston Sequoia
8d951f53b5 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-07-02 14:50:04 -07:00
Jeremy Huddleston Sequoia
5c81f52659 xquartz: Fold spaces related preferences into NSUserDefaults+XQuartzDefaults 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
 2022-07-02 14:50:04 -07:00
Jeremy Huddleston Sequoia
df7ca162d9 xquartz pbproxy: Adopt NSUserDefaults+XQuartzDefaults for preferences 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
 2022-07-02 14:50:04 -07:00
Jeremy Huddleston Sequoia
a7c8a46f29 xquartz: Create a separate category for organizing user preferences 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
 2022-06-14 22:08:45 -07:00
Jeremy Huddleston Sequoia
b5a3b100fc 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-13 22:03:54 -07:00
Jeremy Huddleston Sequoia
7bf4777116 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>
(cherry picked from commit 4ae36f418e)
 2021-06-14 22:26:43 +00:00
Jeremy Huddleston Sequoia
3ef6e7b766 xquartz: Fix appFlags build failure with macOS 10.15+ SDKs 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit e59848548a)
 2021-06-14 22:26:43 +00:00
Jeremy Huddleston Sequoia
8890c44a75 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>
(cherry picked from commit 5ae47a9d579e8cb0fbe938455faea53ed75d7098)
 2021-02-22 09:22:32 -08:00
Jeremy Huddleston Sequoia
3c3680c366 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>
(cherry picked from commit b960675257d301605def6008bddcccb0980a3c4c)
 2021-02-22 09:22:32 -08:00
Jeremy Huddleston Sequoia
e1fdc856ae 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>
(cherry picked from commit 694724e42c4a3eadb32891220084b03504f9586b)
 2021-02-22 09:22:32 -08:00
Jeremy Huddleston Sequoia
8f8e9c53e7 xquartz: Don't process AppKit events if we haven't finished initializing 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 25035229b7)
 2021-02-20 21:06:15 -08:00
Jeremy Huddleston Sequoia
aa6f84021a 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
CC: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 487286d472)
 2021-02-20 17:30:45 -08:00
Jeremy Huddleston Sequoia
7aa51bb572 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>
(cherry picked from commit 6a83fb51b7)
 2021-02-20 15:21:37 -08:00
Jeremy Huddleston Sequoia
d751c46bd7 xquartz: Fix build with sparkle enabled 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit a3ddcdd56c)
 2021-02-19 16:33:04 -08:00
Jeremy Huddleston Sequoia
03c2e12a82 xquartz: Silence a compiler warning about missing internal methods on NSApplication 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 279bcbd9cf)
 2021-02-18 22:35:03 -08:00
Jeremy Huddleston Sequoia
fcbd57367e 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>
(cherry picked from commit fe89c70e47)
 2021-02-18 22:35:03 -08:00
Jeremy Huddleston Sequoia
b27c6602b3 xquartz: Convert X11Controller ivars into @properties 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 41aed8f696)
 2021-02-18 22:35:03 -08:00
Jeremy Huddleston Sequoia
625c7e4dec xquartz: Convert X11Application ivars into @properties 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit c2750e1fab)
 2021-02-18 22:35:03 -08:00
Jeremy Huddleston Sequoia
3017fec605 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>
(cherry picked from commit f51b97b0de)
 2021-02-18 22:35:03 -08:00
Jeremy Huddleston Sequoia
bdaff44f98 xquartz: Fold away some unnecessary hops to X11Controller through X11Application 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 4b4500c48f)
 2021-02-18 22:35:03 -08:00
Jeremy Huddleston Sequoia
7d22031a6b xquartz: Fold away array_with_strings_and_numbers and simplify with more modern Objective-C 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 39c0e1c0ab)
 2021-02-18 22:35:03 -08:00
Jeremy Huddleston Sequoia
937b63ff44 xqaurtz: Remove message_kit_thread() and use dispatch instead 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 87f8fe1f74)
 2021-02-18 22:35:03 -08:00
Jeremy Huddleston Sequoia
e531d3a4cb 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>
(cherry picked from commit 94e4e17348)
 2021-02-18 22:35:03 -08:00
Jeremy Huddleston Sequoia
08cf6c90fd xquartz: Minor code modernization -- @autoreleasepool adoption 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit fba421f700)
 2021-02-18 22:35:03 -08:00
Jeremy Huddleston Sequoia
26e0c59a97 xquartz: Remove some dead code for compatibility with older nibs 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 318f8a4a8a)
 2021-02-18 22:35:03 -08:00
Jeremy Huddleston Sequoia
2853f38965 xquartz: Remove a workaround for AppKit versions older than Lion 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 72a39dccf9)
 2021-02-18 22:35:03 -08:00
Jeremy Huddleston Sequoia
1edc9b980b xquartz: Apply spell check fixes from master for easier cherry-picking of changes in xquartz 
See also: 23e83724df
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
 2021-02-18 22:26:08 -08:00
Jeremy Huddleston Sequoia
67f25cc187 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>
(cherry picked from commit 7e28750358)
 2021-02-17 16:27:03 -08:00
Jeremy Huddleston Sequoia
4028c2ad14 xquartz: Apply Xcode 12.4 automatic updates to nibs 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 85beee9885)
 2021-02-17 16:27:00 -08:00
Jeremy Huddleston Sequoia
ff1c8e2f72 xquartz: Update the about box copyright to 2021 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 4e892aa6e1)
 2021-02-17 13:38:49 -08:00
Jeremy Huddleston Sequoia
a16df60284 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>
(cherry picked from commit c9a3b14c14)
 2021-02-17 09:56:15 -08:00
Jeremy Huddleston Sequoia
2087b7782c 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>
(cherry picked from commit 520e7a1310)
 2021-02-01 23:10:35 -08:00
Jeremy Huddleston Sequoia
2fe5bf4bad xquartz: Remove support for older versions of libXplugin 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 7d0bb7ed06)
 2021-02-01 23:10:35 -08:00
Jeremy Huddleston Sequoia
bc1a2a0d83 xquartz: Remove unused include of AvailabilityMacros.h from various sources 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 5e7c0762e6)
 2021-02-01 23:10:35 -08:00
Jeremy Huddleston Sequoia
393da8b439 xquartz: Remove support for building for i386 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 59f22341a8)
 2021-02-01 23:10:32 -08:00
Jeremy Huddleston Sequoia
43aaa10931 xquartz: Remove support for Mountain Lion and earlier versions of macOS 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit aea15a7659)
 2021-02-01 23:09:54 -08:00
Jeremy Huddleston Sequoia
fb492686d7 xquartz: Remove support for Lion and earlier versions of macOS 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit c0b2d3e099)
 2021-02-01 23:09:54 -08:00
Jeremy Huddleston Sequoia
34784415ad xquartz: Remove support for SnowLeopard and earlier versions of macOS 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit cc9cf6f085)
 2021-02-01 23:09:54 -08:00
Jeremy Huddleston Sequoia
d3f81ecaf9 xquartz: Remove check for libdispatch now that we don't support pre-SnowLeopard 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit f699aac2ea)
 2021-02-01 23:09:54 -08:00
Jeremy Huddleston Sequoia
739c5bd32f xquartz: Remove support for Leopard and earlier versions of macOS 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 5ad4910272)
 2021-02-01 23:09:54 -08:00
Jeremy Huddleston Sequoia
2d7eb82499 xquartz: Remove support for Tiger and earlier versions of macOS 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 6e6db055f8)
 2021-02-01 23:09:52 -08:00
Jeremy Huddleston Sequoia
be9d2fd871 xquartz: Remove support for Panther and earlier versions of macOS 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 74aef85bd8)
 2021-02-01 23:07:26 -08:00
Jim DeLaHunt
d39eb58409 Fix typo "XQaurtz" in Xquartz.man 
(cherry picked from commit 0e272ac458)
 2021-02-01 23:07:11 -08:00
Christopher Chavez
1f2b73176f XQuartz: recognize F16-F20 and Menu keys 
Signed-off-by: Christopher Chavez <chrischavez@gmx.us>
(cherry picked from commit 462beb5338)
 2021-02-01 23:06:42 -08:00
Jon Turney
ecc4ebf535 xquartz: Add stub ddxInputThread() 
Omitted from 4ad21c32

(cherry picked from commit f013979507)
 2021-01-27 14:43:48 -08:00
Alan Coopersmith
0679d46605 Update URL's in man pages 
Mostly http->https conversions, but also replaces gitweb.fd.o
with gitlab.fd.o, and xquartz.macosforge.org with xquartz.org.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
(cherry picked from commit a5151f58cf)
 2020-08-18 04:12:08 +00:00
Michel Dänzer
fcac9b10c9 glx,xquartz: Fix make distcheck 
Guard BUILT_SOURCES and CLEANFILES by XWIN_GLX_WINDOWS/XQUARTZ.

(cherry picked from commit f9bbc9d5ea)
 2019-02-25 13:06:58 -05:00