Alan Coopersmith
3bdb541e04
Revert "os: move BUG_*() macros to own private header"
...
This reverts commit 346d5f5c35 .
That commit did not handle copyright/license notices correctly.
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2019 >
2025-06-13 17:13:54 -07:00
Alan Coopersmith
538a6dd76f
Revert "xfree86: mark LoaderShouldIgnoreABI() and LoaderGetABIVersion() deprecated"
...
This reverts commit 4f2c6c98b7 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2017 >
2025-06-13 22:48:22 +00:00
Alan Coopersmith
c7b69f1acb
Revert "misc.h: drop LengthRestB() macro"
...
This reverts commit a6b2eb3780
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2015 >
2025-06-13 22:30:27 +00:00
Alan Coopersmith
cd583932a1
Revert "misc.h: move out checked_int64_(add|subtract)"
...
This reverts commit de0aed0543
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2014 >
2025-06-13 22:13:22 +00:00
Alan Coopersmith
55ad737a9f
Revert "misc.h: move out MAXEXTENSIONS to geext.c"
...
This reverts commit 80593ab279 .
This is a fundamental property of the X11 core protocol,
there is no benefit to hiding it, it can't change.
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2013 >
2025-06-13 22:03:45 +00:00
Marge Bot
ff8d250589
Merge branch 'xrandr-reverts' into 'master'
...
Revert "randr cleanups"
See merge request xorg/xserver!2012
2025-06-13 21:58:15 +00:00
Alan Coopersmith
e3d0666386
Revert "randr: let SProc*'s call their Proc*'s directly"
...
This reverts commit ed17224403 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2012 >
2025-06-11 13:44:43 -07:00
Alan Coopersmith
c35a285398
Revert "randr: use explicit case statement instead of ProcRandrVector table"
...
This reverts commit 42677ae1e3 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2012 >
2025-06-11 13:44:30 -07:00
Alan Coopersmith
bc76e25994
Revert "randr: use explicit case statement instead of SProcRandrVector table"
...
This reverts commit 058815bed1 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2012 >
2025-06-11 13:44:17 -07:00
Alan Coopersmith
9f72353a51
Revert "randr: RRCrtcCreate(): drop unnecessary zero assigments"
...
This reverts commit 6d2c42d0c8 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2012 >
2025-06-11 13:44:02 -07:00
Alan Coopersmith
160abf285c
Revert "randr: use struct initializer for reply structs"
...
This reverts commit 7eff742ef2 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2012 >
2025-06-11 13:43:47 -07:00
Alan Coopersmith
9c53c6cf76
Revert "randr: ProcRRGetCrtcInfo(): use locally scoped variables"
...
This reverts commit 90abc95c85 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2012 >
2025-06-11 13:43:36 -07:00
Alan Coopersmith
c371d11af0
Revert "randr: ProcRRGetCrtcTransform(): split reply header and payload"
...
This reverts commit c6f1b8a735 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2012 >
2025-06-11 13:43:23 -07:00
Alan Coopersmith
9b753c3970
Revert "randr: ProcRRGetMonitors() use SwapLongs instead of callbacks"
...
This reverts commit 203f59c6d3 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2012 >
2025-06-11 13:43:00 -07:00
Alan Coopersmith
a205917752
Revert "randr: ProcRRGetMonitors(): collect reply payload in temporary buffer"
...
This reverts commit 1bc6ca30a9 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2012 >
2025-06-11 13:42:33 -07:00
Alan Coopersmith
896d9d3be8
Revert "randr: RROutputCreate(): use calloc()"
...
This reverts commit 3d3137513a .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2012 >
2025-06-11 13:42:13 -07:00
Alan Coopersmith
9f2b9adbe3
Revert "randr: RRCreateProviderProperty(): use calloc()"
...
This reverts commit 05188ccec1 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2012 >
2025-06-11 13:41:53 -07:00
Alan Coopersmith
e77b465eb6
Revert "randr: ProcRRGetOutputProperty(): rename reply struct to "rep""
...
This reverts commit 53d43bd8dc .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2012 >
2025-06-11 13:41:29 -07:00
Alan Coopersmith
01914b1c53
Revert "randr: ProcRRGetOutputProperty(): use SwapShort()/SwapLong()"
...
This reverts commit 8789be52a4 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2012 >
2025-06-11 13:41:13 -07:00
Alan Coopersmith
3a76d12ef0
Revert "randr: ProcRRGetProviderProperty(): use SwapShort()/SwapLong()"
...
This reverts commit 62b8497999 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2012 >
2025-06-11 13:40:33 -07:00
Alan Coopersmith
bddafe4001
Revert "randr: ProcRRGetCrtcGamma(): use SwapShort()/SwapLong()"
...
This reverts commit d9863f7cb0 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2012 >
2025-06-11 13:38:23 -07:00
Alan Coopersmith
6a0c430b25
Revert "randr: ProcRRListOutputProperties(): use SwapShort()/SwapLong()"
...
This reverts commit e3001b71b3 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2012 >
2025-06-11 13:38:12 -07:00
Alan Coopersmith
8650028e59
Revert "randr: ProcRRQueryOutputProperty(): use SwapShort()/SwapLong()"
...
This reverts commit 73467faeb2 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2012 >
2025-06-11 13:37:57 -07:00
Alan Coopersmith
fc7858a458
Revert "randr: RRScreenInit(): drop unnecessary zero'ing"
...
This reverts commit 6fad884ce7 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2012 >
2025-06-11 13:36:45 -07:00
Alan Coopersmith
36af7a5f9c
Revert "randr: fix RRGetCrtcTransform reply length"
...
This reverts commit 0ca5aaba50 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2012 >
2025-06-11 13:36:22 -07:00
Alan Coopersmith
eca05b85f9
Revert "randr: fix RRGetCrtcTransform reply length, part 2"
...
This reverts commit 53876f1ef1 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2012 >
2025-06-11 13:35:44 -07:00
Olivier Fourdan
8cb078f8b6
xwayland: Do not pretend leaving the X11 surface if buttons are down
...
Xwayland has its own XYToWindow() handler to account for the case when
the pointer leaves an X11 surface to enter another Wayland native
window.
When that occurs, Xwayland will treat it as if the pointer had entered
the root window so that the X11 clients receive an appropriate leave
event.
When the pointer leaves the X11 surface, Xwayland will call
CheckMotion() to update the sprite coordinates and possibly the cursor.
However, if we left the surface with a button down, it means the wayland
compositor has grabbed the pointer so we will not get button release
events from the compositor.
Once the button is released, Xwayland will get a pointer enter event from
the compositor, and Xwayland will clear up the buttons pressed.
But that might confuse Xwayland in thinking the pointer has crossed the
windows and leave the wrong cursor showing in the X11 surface.
To avoid the issue, if buttons are down, do not pretend the cursor has
left the X11 surface for the root window.
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1811
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com >
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2008 >
2025-06-05 07:29:03 +00:00
Olivier Fourdan
8a77ab083f
Revert "xwayland: Update sprite prior to clearing the focus window"
...
This breaks regular toplevel enter/leave events when crossing to/from a
native Wayland window.
A better fix for the original issue follows.
This reverts commit b97b459c06 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2008 >
2025-06-05 07:29:03 +00:00
Alan Coopersmith
0d2213ec44
Xephyr.man: Use \- to get ASCII hyphens instead of Unicode dashes
...
Used in command-line arguments and email addresses
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com >
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2009 >
point-of-fork
2025-05-31 15:15:13 -07:00
Alan Coopersmith
ff4f2f718b
man pages: don't use .BI macro with a single argument
...
Clears warnings from groff -rCHECKSTYLE=10:
an.tmac: Xephyr.man:53: style: .BI expects at least 2 arguments, got 1
an.tmac: Xephyr.man:55: style: .BI expects at least 2 arguments, got 1
an.tmac: Xwayland.man:151: style: .BI expects at least 2 arguments, got 1
an.tmac: Xwayland.man:166: style: .BI expects at least 2 arguments, got 1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com >
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2009 >
2025-05-31 15:10:35 -07:00
Alan Coopersmith
286578e83e
XWin.man: fix typos in font change escapes
...
Fixes warnings from `mandoc -T lint`:
mandoc: XWin.man:332:28: WARNING: invalid escape sequence: \fp
mandoc: XWin.man:397:1: WARNING: invalid escape sequence: \fX
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com >
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2009 >
2025-05-31 15:06:23 -07:00
Alan Coopersmith
bd08e04fcb
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 >
2025-05-31 15:01:49 -07:00
Alan Coopersmith
6dfe3e7db6
man pages: strip trailing whitespace
...
Gets rid of many warnings from `mandoc -T lint` of the form:
mandoc: ./man/Xserver.man:621:7: STYLE: whitespace at end of input line
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com >
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2009 >
2025-05-31 14:51:24 -07:00
Alan Coopersmith
7aa1f121e4
mi: use common implementation of bit counting function
...
Reduce a bit of unexplained magic, and use ISA extensions where available
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com >
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1984 >
2025-05-20 00:34:23 +00:00
Enrico Weigelt, metux IT consult
73f3c47608
randr: fix unconditional byte-swap in ProcRRGetProviderInfo()
...
The list of the associated provider's capabilities was always swapped
unconditionally, while it should only be in case of client having
opposite endianess.
Fixes: 426bc0a28e
Reported-By: dasha_uwu
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net >
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1977 >
2025-05-18 23:42:19 +00:00
Enrico Weigelt, metux IT consult
f0fd9f8bf4
dix: fix warning on redefinition of typedefs
...
| ../dix/input_priv.h:56:29: warning: redefinition of typedef 'InputOption' is a C11 feature [-Wtypedef-redefinition]
| 56 | typedef struct _InputOption InputOption;
| | ^
| ../include/input.h:255:29: note: previous definition is here
| 255 | typedef struct _InputOption InputOption;
| | ^
| In file included from ../hw/xfree86/common/xf86Cursor.c:36:
| ../dix/input_priv.h:57:25: warning: redefinition of typedef 'XI2Mask' is a C11 feature [-Wtypedef-redefinition]
| 57 | typedef struct _XI2Mask XI2Mask;
| | ^
| ../include/input.h:256:25: note: previous definition is here
| 256 | typedef struct _XI2Mask XI2Mask;
| | ^
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net >
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1978 >
2025-05-18 17:35:31 +00:00
Olivier Fourdan
b97b459c06
xwayland: Update sprite prior to clearing the focus window
...
Xwayland has its own XYToWindow() handler to account for the case when
the pointer leaves an X11 surface to enter another Wayland native window
(which of course are unknown to Xwayland).
When that occurs, Xwayland will treat it as if the pointer had entered
the root window so that the X11 clients receive an appropriate leave
event.
When the pointer leaves the X11 surface, Xwayland will call
CheckMotion() to update the sprite coordinates and possibly the cursor.
However, CheckMotion() will call back into the XYToWindow() handler,
which will then pretend the window has entered the root window, and that
may cause the wrong cursor to be applied.
To avoid the issue, change the order we do things, by calling
CheckMotion() first prior to clear up the internal focus window so that
the first call to XYToWindow() will return the correct X11 window so we
get to update the cursor correctly.
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1811
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com >
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1915 >
2025-05-16 10:02:53 +00:00
Alan Coopersmith
37b7ea8f8a
render: miindex.c does not need header guard macros
...
Clears warning from clang 19.1.7:
render/miindex.c:27:9: warning: macro is not used [-Wunused-macros]
27 | #define _MIINDEX_H_
| ^
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com >
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1910 >
2025-04-19 17:02:16 +00:00
Alan Coopersmith
f988558348
os: remove unused definition of BUGADDRESS
...
We stopped including this in error messages back in 2008
Clears warning from clang 19.1.7:
os/utils.c:1338:9: warning: macro is not used [-Wunused-macros]
1338 | #define BUGADDRESS BUILDERADDR
| ^
Fixes: ef77e4c44 ("Remove useless commentary from environment and argument processing.")
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com >
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1910 >
2025-04-19 17:02:16 +00:00
Alan Coopersmith
d1cc5a599f
test: remove extra return
...
Clears warning from clang 19.1.7:
test/misc.c:239:12: warning: 'return' will never be executed
[-Wunreachable-code-return]
239 | return 0;
Fixes: 46b579e8d ("test: switch the unit tests to something resembling a test suite")
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com >
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1910 >
2025-04-19 17:02:15 +00:00
Alan Coopersmith
14e202d6a0
xfixes: cursor.c should include header for CursorVisible & EnableCursor
...
Clears warnings from clang 19.1.7:
xfixes/cursor.c:132:6: warning: no previous extern declaration for
non-static variable 'CursorVisible' [-Wmissing-variable-declarations]
132 | Bool CursorVisible = FALSE;
| ^
xfixes/cursor.c:133:6: warning: no previous extern declaration for
non-static variable 'EnableCursor' [-Wmissing-variable-declarations]
133 | Bool EnableCursor = TRUE;
| ^
Fixes: 2cec3cfbf ("include: move private definitions out of input.h")
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com >
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1910 >
2025-04-19 17:02:15 +00:00
Alan Coopersmith
b490578242
os: connection.c should include header that defines GrabInProgress
...
Clears warning from clang 19.1.7:
os/connection.c:133:5: warning: no previous extern declaration for
non-static variable 'GrabInProgress' [-Wmissing-variable-declarations]
133 | int GrabInProgress = 0;
| ^
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com >
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1910 >
2025-04-19 17:02:15 +00:00
Alan Coopersmith
0fefdc6e29
dix: tables.c should include header that defines InitialVector
...
Clears warning from clang 19.1.7:
dix/tables.c:59:7: warning: no previous extern declaration for non-static
variable 'InitialVector' [-Wmissing-variable-declarations]
59 | int (*InitialVector[3]) (ClientPtr /* client */) = {
| ^
Fixes: bae6cbc8c ("include: move private defs to dixstruct_priv.h")
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com >
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1910 >
2025-04-19 17:02:15 +00:00
Alan Coopersmith
062c339519
modesetting: fix typo in XF86ModuleVersionInfo initialization
...
Found by clang 19.1.7:
hw/xfree86/drivers/modesetting/driver.c:163:21:
warning: initializer overrides prior initialization of this subobject
[-Winitializer-overrides]
163 | ._modinfo1_ = MODINFOSTRING2,
| ^~~~~~~~~~~~~~
hw/xfree86/drivers/modesetting/driver.c:162:21:
note: previous initialization is here
162 | ._modinfo1_ = MODINFOSTRING1,
| ^~~~~~~~~~~~~~
Fixes: 2a10eff6c ("xfree86: modsetting: use explicit field initializers for XF86ModuleData")
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com >
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1910 >
2025-04-19 17:02:15 +00:00
Alan Coopersmith
3eaa19d74b
test: remove stray semi-colons after functions
...
Clears warnings from clang 19.1.7:
test/list.c:95:2: warning: extra ';' outside of a function [-Wextra-semi]
95 | };
| ^
test/list.c:137:2: warning: extra ';' outside of a function [-Wextra-semi]
137 | };
| ^
Fixes: 92788e677 ("test: add some tests for basic list manipulation.")
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com >
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1910 >
2025-04-19 17:02:15 +00:00
Alan Coopersmith
f9d25189fa
xfree86: make modeline2c.awk put a newline at the end of xf86DefModeSet.c
...
Clears warning from clang 19.1.7:
hw/xfree86/common/xf86DefModeSet.c:288:62:
warning: no newline at end of file [-Wnewline-eof]
288 | const int xf86NumDefaultModes = ARRAY_SIZE(xf86DefaultModes);
| ^
Fixes: 3bf7ff703 ("Size xf86DefaultModes explicitly.")
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com >
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1910 >
2025-04-19 17:02:15 +00:00
Peter Harris
dfbc672e85
Update mailmap for Peter Harris
...
My division was acquired by Rocket Software. The opentext.com email
address is no longer active.
Ref: https://investors.opentext.com/press-releases/press-releases-details/2024/OpenText-Completes-Divestiture-of-Application-Modernization-and-Connectivity-AMC-Business-to-Rocket-Software-for-2.275B/default.aspx
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1914 >
2025-04-15 13:49:13 -04:00
Alan Coopersmith
845c4ae518
Xserver.man: correct list of available authorization protocols
...
XDM-AUTHORIZATION-2 (IPv6 capable version of -1) was never merged.
SUN-DES-1 was removed by commit 71b207a2e in 2024
MIT-KERBEROS-5 was removed by commit dfbe32b5b in 2007
Fixes: 71b207a2e ("os: drop SUN-DES-1 authentication")
Fixes: dfbe32b5b ("Remove the old Kerberos 5 authentication code.")
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com >
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1913 >
2025-04-14 18:47:05 -07:00
Alan Coopersmith
80ad8a2c6d
Xserver.man: add Xwayland(1) to list of server-specific man pages
...
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com >
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1913 >
2025-04-14 15:56:34 -07:00
Alan Coopersmith
b9c31cc9bc
Xserver.man: allow line breaks in default font path
...
Allows nroff to insert a line break between iterm in the font path
instead of displaying it as a single, very overlength line.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com >
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1891 >
2025-04-12 17:18:37 +00:00