frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,676 Commits 293 Branches 13 Tags 61 MiB
Commit Graph

1036 Commits

Author SHA1 Message Date
Enrico Weigelt, metux IT consult e5c8b664d3 os: unexport ddx callbacks 
The DDX callbacks (where core/DIX calls into DDX) aren't supposed to be
called by drivers directly, so unexport them.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1332>
 2024-05-08 09:37:35 +02:00
Olivier Fourdan a7ba1e9fe4 xquartz: Remove invalid Unicode sequence 
This is flagged by the automatic scanning tools.

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1673
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1524>
 2024-05-07 22:26:34 +00:00
Enrico Weigelt, metux IT consult 33350ef8ff include: move private definitions out of extinit.h 
Public server module API shouldn't be clobbered with private definitions,
thus move them out to extinit_priv.h.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1289>
 2024-04-30 00:47:38 +00:00
Enrico Weigelt, metux IT consult 5057c716eb Fix missing include of sys/stat.h 
Instead of relying on very indirect includes, it's more more clean when
everybody explicitly includes what he really needs.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1417>
 2024-04-17 10:55:10 +02:00
Enrico Weigelt, metux IT consult be4c8444eb os: unexport Os*() functions 
These aren't called (and suited for being called) by drivers,
thus drop them from the public module API.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1381>
 2024-04-16 14:20:30 +02:00
Enrico Weigelt, metux IT consult 232cad9ec3 prevent name clash on Windows w/ RT_* defines 
Windows' native headers using some our RT_* define's names for other things.
Since the naming isn't very nice anyways, introducing some new ones
(X11_RESTYPE_NONE, X11_RESTYPE_FONT, X11_RESTYPE_CURSOR) and define the old
ones as an alias to them, in case some out-of-tree code still uses them.

With thins change, we don't need to be so extremely careful about include
ordering and have explicit #undef's in order to prevent name clashes on
Win32 targets.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1355>
 2024-04-15 18:59:23 -07:00
Alan Coopersmith 6c684d035c Xquartz: ProcAppleDRICreatePixmap needs to use unswapped length to send reply 
CVE-2024-31082

Fixes: 14205ade0 ("XQuartz: appledri: Fix byte swapping in replies")
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1463>
 2024-04-02 19:19:40 -07:00
Enrico Weigelt, metux IT consult 94e5252365 xquartz: fix missing include of <errno.h> 
It's much cleaner to always include directly what one needs,
instead of relying on very indirect including.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1435>
 2024-03-21 17:32:30 +01:00
Peter Hutterer 924939c886 Revert "Fix missing includes of <errno.h>" 
Removing errno from xf86_OSlib.h breaks the xf86-input-mouse driver
build. And xf86_OSlib.h itself relies on errno anyway in the SYSCALL
macro provided by this header.

This reverts commit f6a367102c.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1423>
 2024-03-19 00:33:26 +00:00
Enrico Weigelt, metux IT consult f6a367102c Fix missing includes of <errno.h> 
It's much cleaner to always include directly what one needs,
instead of relying on very indirect including.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1416>
 2024-03-18 22:58:32 +00:00
Enrico Weigelt, metux IT consult eed0697ec9 os: consolidate busfault handling 
The symbols HAVE_SIGACTION and BUSFAULT are set under the same conditions,
so can be consolidated into one. Also define dummies when HAVE_SIGACTION
is not set, so a few #ifdef's less clutterig the code.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1297>
 2024-02-23 23:15:12 +00:00
Jeremy Huddleston Sequoia 2567388a29 xquartz: Disable COMPOSITE at runtime 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
 2023-01-17 15:17:45 -08:00
Jeremy Huddleston Sequoia 15077090d3 xquartz: Update the about box copyright to 2023 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
 2023-01-17 07:33:38 -08:00
Jeremy Huddleston Sequoia d1a9a50792
xquartz: Use xorg_backtrace() instead of rolling our own for debugging 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
 2022-12-21 01:21:52 -08:00
Jeremy Huddleston Sequoia 9a66690eaf
xquartz: Ignore SIGPIPE at process launch 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
 2022-12-21 01:21:50 -08:00
Jeremy Huddleston Sequoia f73c489771
xquartz: Fix some formatting 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
 2022-12-14 00:17:59 -08:00
John D Pell 3fd87692e8
XQuartz: stub: Call LSOpenApplication instead of fork()/exec() 
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
 2022-12-14 00:17:57 -08:00
Jeremy Huddleston Sequoia e654de80ed
xquartz: Move default applications list outside of the main executable 
This will allow side-wide customization.

Fixes: https://github.com/XQuartz/XQuartz/issues/274
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
 2022-11-24 11:15:44 -08:00
Jeremy Huddleston Sequoia 3dbd809c0e
xquartz: Remove unused macro (X11LIBDIR) 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
 2022-11-24 11:15:42 -08:00
Jeremy Huddleston Sequoia 4cfdc5af31 XQuartz: Improve type safety for X11Controller's application menu editor 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
 2022-07-02 14:24:43 -07:00
Jeremy Huddleston Sequoia dfd057996b 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>
 2022-07-02 14:24:42 -07:00
Jeremy Huddleston Sequoia aa636b97c6 xquartz: Use correct defines when building to support Sparkle updates 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
 2022-07-01 14:28:54 -07:00
Jeremy Huddleston Sequoia 9ce7264889 XQuartz: Add TCC reason keys to Info.plist 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
 2022-06-26 13:25:03 -07:00
Jeremy Huddleston Sequoia b00cf4aef8 XQuartz: Build the bundle trampoline when using meson 
This brings the change for e1fdc856ae into meson based builds

Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
 2022-06-26 02:43:38 -07:00
Jeremy Huddleston Sequoia 4f5999826a meson: Provide options to set CFBundleVersion and CFBundleVersionString in XQuartz 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
 2022-06-19 23:10:00 -07:00
Jeremy Huddleston Sequoia b12f5dc62d xquartz: Update copyright for 2022 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
 2022-06-19 22:20:26 -07:00
Jeremy Huddleston Sequoia 1d90bef30c xquartz: Update Sparkle configuration to use SUPublicEDKey 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
 2022-06-19 22:20:26 -07:00
Jeremy Huddleston Sequoia 4532b696c6 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>
 2022-06-16 07:27:03 -07:00
Jeremy Huddleston Sequoia f40610e0b4 xquartz: Fold spaces related preferences into NSUserDefaults+XQuartzDefaults 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
 2022-06-14 22:23:35 -07:00
Jeremy Huddleston Sequoia 6134c73aeb xquartz pbproxy: Adopt NSUserDefaults+XQuartzDefaults for preferences 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
 2022-06-14 22:23:33 -07:00
Jeremy Huddleston Sequoia 963ba6d9ad xquartz: Create a separate category for organizing user preferences 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
 2022-06-14 22:20:11 -07:00
Jeremy Huddleston Sequoia b1afcecc61 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>
 2022-06-13 22:01:06 -07:00
Alan Coopersmith 6f9fce0360 Replace "the the" with a single "the" in docs & comments 
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Martin Roukala <martin.roukala@mupuf.org>
 2022-03-31 13:27:57 -07:00
Povilas Kanapickas c97397dc47 Remove autotools support 
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
 2021-10-27 13:15:40 +03:00
Edouard Gaulué 199f278a1b French text in Preferences Pane Review 2021-04-07 16:19:24 -07:00
Jeremy Huddleston Sequoia 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
Jeremy Huddleston Sequoia 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
Jeremy Huddleston Sequoia 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
Jeremy Huddleston Sequoia 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
Jeremy Huddleston Sequoia 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
Jeremy Huddleston Sequoia 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
Jeremy Huddleston Sequoia 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
Jeremy Huddleston Sequoia 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
Jeremy Huddleston Sequoia 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
CC: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
 2021-02-20 17:29:40 -08:00
Jeremy Huddleston Sequoia 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
Jeremy Huddleston Sequoia a3ddcdd56c xquartz: Fix build with sparkle enabled 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
 2021-02-18 23:16:32 -08:00
Jeremy Huddleston Sequoia 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
Jeremy Huddleston Sequoia 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
Jeremy Huddleston Sequoia 41aed8f696 xquartz: Convert X11Controller ivars into @properties 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
 2021-02-18 22:32:14 -08:00
Jeremy Huddleston Sequoia c2750e1fab xquartz: Convert X11Application ivars into @properties 
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
 2021-02-18 22:32:14 -08:00