Alan Coopersmith
5106461e31
meson: replace join_paths() with / operator
...
Requires meson 0.49.0, well below our current minimum of 0.60.0
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2150 >
2026-03-28 10:02:41 -07:00
Jeremy Huddleston Sequoia
fbff1312ce
xquartz: Bump copyrights in Info.plist to 2026
...
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2026-03-25 23:47:00 -07:00
Diego Viola
e8f4522312
Fix typos
...
Signed-off-by: Diego Viola <diego.viola@gmail.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2134 >
2026-03-03 06:50:01 -03:00
Alan Coopersmith
224cee1022
Strip trailing whitespace from source files
...
Performed with: `git ls-files | xargs perl -i -p -e 's{[ \t]+$}{}'`
`git diff -w` & `git diff -b` show no diffs from this change
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2074 >
(cherry picked from commit d9389873d6 )
2026-01-25 10:40:02 -08:00
Alan Coopersmith
1176228c0b
man pages: remove extraneous PP macros
...
Clears warnings from `mandoc -T lint` of the forms:
mandoc: Xorg.man:26:2: WARNING: skipping paragraph macro: PP after SH
mandoc: Xorg.man:40:2: WARNING: skipping paragraph macro: PP empty
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2009 >
(cherry picked from commit bd08e04fcb )
2026-01-25 10:40:01 -08:00
Alan Coopersmith
40bca15705
man pages: use .BR to mark up man page references
...
The name of a man page is typeset in bold and the section in roman
(see man-pages(7)).
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1875 >
(cherry picked from commit 5ac0a19e7f )
2026-01-25 10:40:01 -08:00
Aki Sakurai
f27942078f
xquartz: fix inverted tablet pen Y tilt on macOS
...
On macOS, the y tilt behavior is inverted; an increase in the tilt
value corresponds to tilting the device away from the user.
see https://chromium-review.googlesource.com/c/chromium/src/+/2348544
see 0f128fd7c5/src/plugins/platforms/cocoa/qnsview_tablet.mm (L63)
Fixes #792
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1779 >
(cherry picked from commit 3562298068 )
2026-01-25 10:40:00 -08:00
Aki Sakurai
a49a8a3cf9
xquartz: fix compilation
...
Fixes #1788
Fixes: 21df7a77d ("xquartz: fix length checking with bigreq")
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1777 >
(cherry picked from commit da0de21b72 )
2026-01-25 10:40:00 -08:00
Enrico Weigelt, metux IT consult
126c901200
xquartz: drop swapping request length fields
...
The request struct's length fields aren't used anymore - we have the
client->req_len field instead, which also is bigreq-compatible.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1639 >
(cherry picked from commit 65224a2f9a )
2026-01-25 10:39:59 -08:00
Enrico Weigelt, metux IT consult
f5a24358bf
xquartz: fix length checking with bigreq
...
The authorative source of the request frame size is client->req_len,
especially with big requests larger than 2^18 bytes.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1639 >
(cherry picked from commit ef396a28b7 )
2026-01-25 10:39:58 -08:00
Enrico Weigelt, metux IT consult
e2ce0aec71
xquartz: drop unused code
...
These code pieces have been commented out since their introduction back
almost two decades ago, so probably no need for them anymore.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1603 >
(cherry picked from commit 78d420870f )
2026-01-25 10:39:57 -08:00
Enrico Weigelt, metux IT consult
8cde76988b
fix missing includes of <X11/Xfuncproto.h>
...
Several places using _X_ATTRIBUTE_PRINTF macro from X11/Xfuncproto.h
but missing to include it, so it depends on other headers whether it's
included by mere accident, which quickly causes trouble if include order
changes. Cleaning that up by adding explicit include statements.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1580 >
(cherry picked from commit b30edf326b )
2026-01-25 10:39:55 -08:00
Alan Coopersmith
1a4c3b3dac
Move sizeof to second argument in calloc calls
...
Clears -Wcalloc-transposed-args warnings from gcc 14.1, such as:
../dix/main.c:165:42: warning: ‘calloc’ sizes specified with ‘sizeof’ in the
earlier argument and not in the later argument [-Wcalloc-transposed-args]
165 | serverClient = calloc(sizeof(ClientRec), 1);
| ^~~~~~~~~
../dix/main.c:165:42: note: earlier argument should specify number of
elements, later size of each element
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1606 >
(cherry picked from commit 522f469fe9 )
2026-01-25 10:39:55 -08:00
Olivier Fourdan
4efeff2830
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 >
(cherry picked from commit a7ba1e9fe4 )
2026-01-25 10:39:53 -08:00
Enrico Weigelt, metux IT consult
e59cbdbdc4
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 >
(cherry picked from commit 5057c716eb )
2026-01-19 12:48:30 -08:00
Enrico Weigelt, metux IT consult
ca361681f8
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 >
(cherry picked from commit 232cad9ec3 )
2026-01-19 12:48:30 -08:00
Alan Coopersmith
ef605f4c14
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 >
(cherry picked from commit 6c684d035c )
2026-01-19 12:32:24 -08:00
Enrico Weigelt, metux IT consult
90c7f8dc93
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 >
(cherry picked from commit 94e5252365 )
2026-01-19 12:32:23 -08: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