Julian Orth
2c80c8a433
Merge branch 'jorth/keymap' into 'master'
...
xwayland: don't allow clients to modify the keymap
See merge request xorg/xserver!1953
2026-01-16 11:13:12 +01:00
kohnish
0060b91b49
Revert "dix: unexport dixLookupProperty()"
...
This reverts commit fb697dd644 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2101 >
2025-11-17 21:33:26 +01:00
kohnish
9a4c322c4b
Revert "dix: unexport DeleteAllWindowProperties()"
...
This reverts commit b0272692a1 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2101 >
2025-11-17 21:33:26 +01:00
Alan Coopersmith
d9389873d6
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 >
2025-10-05 11:56:48 -07:00
Alan Coopersmith
b644922366
Revert "dix: unexport rootCursor"
...
This reverts commit a2f72755a9 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2058 >
2025-09-06 17:01:39 +00:00
Alan Coopersmith
b858cb5ccd
Revert "dix: unexport cursor refcounting functions"
...
This reverts commit 4aadbeb8aa .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2058 >
2025-09-06 17:01:39 +00:00
Alan Coopersmith
1d2a590cfb
Revert "dix: unexport cursor allocation functions"
...
This reverts commit 24f3c4a508 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2058 >
2025-09-06 17:01:39 +00:00
Alan Coopersmith
cfdcd22199
Revert "dix: unexport ServerBitsFromGlyph()"
...
This reverts commit 974cd2b5f2 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2058 >
2025-09-06 17:01:38 +00:00
Alan Coopersmith
e85fe61714
Revert "dix: unexport CursorMetricsFromGlyph()"
...
This reverts commit 0c354e9166 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2058 >
2025-09-06 17:01:38 +00:00
Alan Coopersmith
7b87dff067
Revert "dix: unexport CheckCursorConfinement()"
...
This reverts commit 24d1c08441 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2058 >
2025-09-06 17:01:38 +00:00
Alan Coopersmith
774da7dfc0
Revert "dix: unexport NewCurrentScreen()"
...
This reverts commit bd3c252710 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2058 >
2025-09-06 17:01:37 +00:00
Alan Coopersmith
b75173a283
Revert "dix: unexport PointerConfinedToScreen()"
...
This reverts commit 9673886fac .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2058 >
2025-09-06 17:01:37 +00:00
Alan Coopersmith
066b377fc9
Revert "dix: unexport GetSpritePosition()"
...
This reverts commit eb81769b58 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2058 >
2025-09-06 17:01:37 +00:00
Alan Coopersmith
372ca9114c
Revert "dix: drop superfluous XineramaGetCursorScreen()"
...
This reverts commit 6c7c4fdc7e .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2058 >
2025-09-06 17:01:36 +00:00
Alan Coopersmith
bf867b4658
Revert "os: unexport Os*() functions"
...
OsBlockSignals & OsReleaseSignals are required by libint10.so
This reverts commit be4c8444eb .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2049 >
2025-07-20 12:41:06 -07:00
Alan Coopersmith
e923310d2f
Revert "dix: unexport MakePredeclaredAtoms()"
...
This reverts commit b3ec0bf58a .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2048 >
2025-07-16 17:14:21 -07:00
Alan Coopersmith
122345d484
Revert "xkb: move XkbConvertGetByNameComponents and make it static"
...
This reverts commit 114c1c84b1 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2046 >
2025-07-12 11:47:06 -07:00
Alan Coopersmith
d0d62a791b
Revert "xkb: unexport functions from xkbfmisc.c"
...
This reverts commit 5d98664ec1 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2046 >
2025-07-12 11:47:06 -07:00
Alan Coopersmith
f508575818
Revert "xkb: unexport functions from xkbout.c"
...
This reverts commit 660657a2c3 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2046 >
2025-07-12 11:47:06 -07:00
Alan Coopersmith
f666efd73a
Revert "xkb: unexport remaining internal declarations"
...
This reverts commit 3f8a5475c9 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2046 >
2025-07-12 11:47:06 -07:00
Alan Coopersmith
8540bda07a
Revert "include: drop now empty xkbfile.h"
...
This reverts commit f8fc46cbbf .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2046 >
2025-07-12 11:47:06 -07:00
Alan Coopersmith
d8aedc5cfc
Revert "xkb: drop unused XkbRF_LoadRulesByName()"
...
This reverts commit e38eeb4718 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2046 >
2025-07-12 11:47:06 -07:00
Alan Coopersmith
f21c9b9fc3
Revert "xkb: drop unused _XKB_RF_NAMES_PROP_MAXLEN define"
...
This reverts commit 975aed300e .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2046 >
2025-07-12 11:47:06 -07:00
Alan Coopersmith
d74398ef1d
Revert "xkb: drop unused XkbRF_Invalid define from xkbrules.h"
...
This reverts commit 5030f23f94 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2046 >
2025-07-12 11:47:06 -07:00
Alan Coopersmith
9cac71e660
Revert "xkb: move _XKB_RF_NAMES_PROP_ATOM define into xkbInit.c"
...
This reverts commit 1a9592ea4b .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2046 >
2025-07-12 11:47:06 -07:00
Alan Coopersmith
adf0fa5b19
Revert "xkb: move XkbRF_* defines into xkb/maprules.c"
...
This reverts commit b535fd7a4c .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2046 >
2025-07-12 11:47:06 -07:00
Alan Coopersmith
ef329d6a5c
Revert "xkb: unexport XkbRF_GetComponents()"
...
This reverts commit d3b328ba4a .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2046 >
2025-07-12 11:47:06 -07:00
Alan Coopersmith
fef268f680
Revert "xkb: unexport XkbRF_LoadRules()"
...
This reverts commit c376cd2c3d .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2046 >
2025-07-12 11:47:06 -07:00
Alan Coopersmith
cb285e18c0
Revert "xkb: unexport XkbRF_Create()"
...
This reverts commit 89475cbed4 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2046 >
2025-07-12 11:47:06 -07:00
Alan Coopersmith
dafa74fa1b
Revert "xkb: unexport XkbRF_Free()"
...
This reverts commit 34372cb3da .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2046 >
2025-07-12 11:47:06 -07:00
Alan Coopersmith
01fa00fb90
Revert "xkb: unexport XkbRF_RulesRec struct"
...
This reverts commit 043dc8041c .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2046 >
2025-07-12 11:47:06 -07:00
Alan Coopersmith
396e3e7a54
Revert "xkb: unexport XkbRF_GroupRec struct"
...
This reverts commit 83c8a90a61 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2046 >
2025-07-12 11:47:06 -07:00
Alan Coopersmith
033936539b
Revert "xkb: unexport XkbRF_RuleRec struct"
...
This reverts commit a82fa00835 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2046 >
2025-07-12 11:47:06 -07:00
Alan Coopersmith
4916da381b
Revert "os: log: make LogVMessageVerb() signal safe"
...
This reverts commit 5962211612 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2036 >
2025-06-24 23:40:51 +00:00
Alan Coopersmith
6a9b2f37bb
Revert "os: log: replace LogMessageVerbSigSafe() by LogMessageVerb()"
...
This reverts commit dd37cc4855 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2036 >
2025-06-24 23:40:51 +00:00
Alan Coopersmith
8ff12a8e53
Revert "os: log: replace ErrorFSigSafe() by ErrorF()"
...
This reverts commit 2d18c353b4 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2036 >
2025-06-24 23:40:50 +00:00
Alan Coopersmith
6dc94cb934
Revert "os: log: replace VErrorFSigSafe() by VErrorF()"
...
This reverts commit da22bc9ae0 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2036 >
2025-06-24 23:40:50 +00:00
Alan Coopersmith
ebcec3629c
Revert "os: log: replace VErrorF() by LogVMessageVerb()"
...
This reverts commit f4eb217f11 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2036 >
2025-06-24 23:40:49 +00:00
Aaron Plattner
1bec46dda1
Revert "os: unexport SetCriticalOutputPending()"
...
The NVIDIA driver uses this function.
This reverts commit d973c43810 .
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
2025-06-24 11:23:14 -07:00
Aaron Plattner
c4470c3dca
Revert "os: drop unused TimerCheck()"
...
The NVIDIA driver uses this function.
This reverts commit 1dc648b1b7 .
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
2025-06-24 11:23:14 -07:00
Aaron Plattner
3d05f2b8a8
Revert "dix: unexport AllocColor()"
...
libwfb.so has a reference to this function:
$ nm -D ./build.debug/hw/xfree86/dixmods/libwfb.so | grep AllocColor
U AllocColor
This reverts commit b48e4a9cb7 .
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
2025-06-24 11:23:10 -07:00
Alan Coopersmith
bfd15d6e5a
Revert "xvmc: move over protocol version defines into xvmc.c"
...
This reverts commit a33639f975
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2034 >
2025-06-22 09:17:25 -07:00
Alan Coopersmith
33a11228cf
Revert "include: unexport no*Extension flags"
...
This reverts commit e3cbde9914 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2022 >
2025-06-17 20:54:49 +00:00
Alan Coopersmith
e48b1aaa97
Revert "dix: add in-code docs for dixDestroyPixmap()"
...
This reverts commit b61647f3a1 .
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2020 >
2025-06-17 20:02:16 +00:00
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
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
Julian Orth
fc8e14a5bb
xwayland: don't allow clients to modify the keymap
...
Xwayland has no way to affect the keymap of the compositor. If clients
modify the keymap, it will stay out of sync with the compositor until
some unspecified time in the future when the compositor sends the keymap
again, which might be never, requiring Xwayland to be restarted.
Signed-off-by: Julian Orth <ju.orth@gmail.com>
2025-05-08 15:00:56 +02:00
Alan Coopersmith
4b5d410591
dix-config.h: define HAVE_STRUCT_SOCKADDR_STORAGE for xtrans 1.6
...
xtrans 1.6 will use struct sockaddr_storage if HAVE_STRUCT_SOCKADDR_STORAGE
is defined, even if IPv6 is disabled, unlike previous versions which tied
it to the IPv6 #define.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1864 >
2025-03-14 22:38:36 +00:00