Enrico Weigelt, metux IT consult
6c7c4fdc7e
dix: drop superfluous XineramaGetCursorScreen()
...
It's only used for record extension, no external callers, thus doesn't
need to be exported. Since it's just for retrieving one struct value,
it's not needed at all - we can do this directly (just like we do in
many other places)
Note: the check on noPanoramixExtensions is superfluous, since the only
call site already does it.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1345 >
2024-09-02 16:43:29 +00:00
Enrico Weigelt, metux IT consult
eb81769b58
dix: unexport GetSpritePosition()
...
This function isn't used in any external modules, thus no need to export it.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1345 >
2024-09-02 16:43:29 +00:00
Enrico Weigelt, metux IT consult
9673886fac
dix: unexport PointerConfinedToScreen()
...
It's not used by external modules, so no need to export it.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1345 >
2024-09-02 16:43:29 +00:00
Enrico Weigelt, metux IT consult
bd3c252710
dix: unexport NewCurrentScreen()
...
It's not used by external modules/drivers, so no need to export it.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1345 >
2024-09-02 16:43:29 +00:00
Enrico Weigelt, metux IT consult
24d1c08441
dix: unexport CheckCursorConfinement()
...
This function isn't used by any external module, so no need to export it.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1345 >
2024-09-02 16:43:29 +00:00
Enrico Weigelt, metux IT consult
0c354e9166
dix: unexport CursorMetricsFromGlyph()
...
This function isn't used by external modules, thus no need to export it.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1345 >
2024-09-02 16:43:29 +00:00
Enrico Weigelt, metux IT consult
974cd2b5f2
dix: unexport ServerBitsFromGlyph()
...
This function isn't used by external modules/drivers, so no need to export it.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1345 >
2024-09-02 16:43:29 +00:00
Enrico Weigelt, metux IT consult
24f3c4a508
dix: unexport cursor allocation functions
...
These functions aren't used by external modules, so no need to export them.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1345 >
2024-09-02 16:43:29 +00:00
Enrico Weigelt, metux IT consult
4aadbeb8aa
dix: unexport cursor refcounting functions
...
These aren't used externally (drivers/modules), thus no need to export them.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1345 >
2024-09-02 16:43:29 +00:00
Enrico Weigelt, metux IT consult
a2f72755a9
dix: unexport rootCursor
...
This field is only used by DIX and XI, thus no need to export it.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1345 >
2024-09-02 16:43:29 +00:00
Enrico Weigelt, metux IT consult
1d7cb4b2c3
os: unexport CloseDownConnection()
...
Not used by any drivers, so no need to export it.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1582 >
2024-09-02 16:02:39 +00:00
Olivier Fourdan
8fe15a60c5
build: Fix DRI3 on DragonFly and OpenBSD
...
Commit 96bdc156
added a check for <sys/eventfd.h> to enable DRI3.
DragonFly and OpenBSD however rely on epoll-shim for <sys/eventfd.h>,
so that must be added as a dependency for the <sys/eventfd.h> check.
Fixes: commit 96bdc156
- xwayland: Do not enable DRI3 without eventfd
Suggested-by: Jan Beich <jbeich@freebsd.org>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1642 >
2024-09-02 11:52:26 +00:00
Olivier Fourdan
7bcf2bcafc
build: Add epoll to Xwayland for DragonFly and OpenBSD
...
DragonFly and OpenBSD rely on epoll-shim for <sys/eventfd>, add a
optional dependency to build Xwayland.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1642 >
2024-09-02 11:52:26 +00:00
Olivier Fourdan
673b56e61c
build: Move epoll dependency check
...
DragonFly and OpenBSD rely on epoll-shim to provide eventfd.
Move the check for epoll dependency to the root meson.build script so
that we can use that for the <sys/evenfd.h> check as well.
This is preparation work for the following commits, no functional change
intended at this point.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1642 >
2024-09-02 11:52:26 +00:00
Matthieu Herrb
fbc034e847
Fix a double-free on syntax error without a new line.
...
$ echo "#foo\nfoo" > custom_config $ X -config custom_config
will trigger the double free because the contents of xf86_lex_val.str
have been realloc()ed aready when free is called in read.c:209.
This copies the lex token and adds all the necessary free() calls to
avoid leaking it
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1176 >
2024-09-01 23:28:20 +00:00
Peter Hutterer
e7c876ab0b
Xi: when removing a master search for a disabled paired device
...
If either the master pointer or keyboard was disabled, the respective
GetMaster() call returns NULL, causing a segfault later accessing the
deviceid.
Fix this by looking in the off_devices list for any master
device of the type we're looking for. Master devices lose the pairing
when disabled (on enabling a keyboard we simply pair with the first
available unpaired pointer).
And for readability, split the device we get from the protocol request
into a new "dev" variable instead of re-using ptr.
Fixes #1611
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1256 >
2024-09-01 23:12:28 +00:00
Peter Hutterer
9b983fecf9
dix: don't push the XKB state to a non-existing master keyboard
...
If our master keyboard is disabled, GetMaster() returns NULL and
we segfault in XkbPushLockedStateToSlaves().
Fixes 45fb3a934d
Fixes #1611
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1256 >
2024-09-01 23:12:28 +00:00
Matthieu Herrb
59f5445a7f
Return NULL in *cmdname if the client argv or argv[0] is NULL
...
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/995 >
2024-09-01 22:59:26 +00:00
Matthieu Herrb
a8512146ba
Don't crash if the client argv or argv[0] is NULL.
...
Report from bauerm at pestilenz dot org.
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/995 >
2024-09-01 22:59:26 +00:00
moozcheng
96079f8c68
dix: fix a misused const pointer in cursor.c
...
`const CursorPtr` actually means `struct _Cursor *const`, a constant pointer, which does not prevent you from accidentally modifying the value it points to, like the cursor refcnt.
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1140 >
2024-09-01 22:46:05 +00:00
Enrico Weigelt, metux IT consult
080fd7821b
dix: fix duplicate typedef of CallbackListPtr
...
fix warning on duplicated typedef:
> In file included from ../dix/main.c:86:
> ../dix/callback_priv.h:10:31: warning: redefinition of typedef 'CallbackListPtr' is a C11 feature [-Wtypedef-redefinition]
> typedef struct _CallbackList *CallbackListPtr;
> ^
> ../include/callback.h:60:31: note: previous definition is here
> typedef struct _CallbackList *CallbackListPtr; /* also in misc.h */
> ^
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1427 >
2024-09-01 22:32:49 +00:00
Enrico Weigelt, metux IT consult
415df761d5
dix: fix duplicate typedef of MotionTracker and *MotionTrackerPtr
...
fix warning on duplicate typedef:
> In file included from ../hw/xfree86/common/xf86Xinput.c:59:
> ../dix/ptrveloc_priv.h:33:3: warning: redefinition of typedef 'MotionTracker' is a C11 feature [-Wtypedef-redefinition]
> } MotionTracker, *MotionTrackerPtr;
> ^
> ../include/ptrveloc.h:54:31: note: previous definition is here
> typedef struct _MotionTracker MotionTracker, *MotionTrackerPtr;
> ^
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1427 >
2024-09-01 22:32:49 +00:00
Enrico Weigelt, metux IT consult
df5047fa46
dix: fix duplicate typedef of PointerAccelerationProfileFunc
...
fix warning:
> ../dix/ptrveloc_priv.h:20:18: warning: redefinition of typedef 'PointerAccelerationProfileFunc' is a C11 feature [-Wtypedef-redefinition]
> typedef double (*PointerAccelerationProfileFunc)
> ^
> ../include/ptrveloc.h:50:18: note: previous definition is here
> typedef double (*PointerAccelerationProfileFunc)
> ^
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1427 >
2024-09-01 22:32:49 +00:00
Enrico Weigelt, metux IT consult
8a3cce0101
dix: fix duplicate typedef of *ScreenPtr
...
fix warning:
> In file included from ../hw/xfree86/common/xf86Init.c:53:
> In file included from ../include/input.h:51:
> ../include/screenint.h:55:25: warning: redefinition of typedef 'ScreenPtr' is a C11 feature [-Wtypedef-redefinition]
> typedef struct _Screen *ScreenPtr;
> ^
> ../dix/screenint_priv.h:11:25: note: previous definition is here
> typedef struct _Screen *ScreenPtr;
> ^
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1427 >
2024-09-01 22:32:49 +00:00
Enrico Weigelt, metux IT consult
03eb593460
include: unexport XIstubs.h
...
The functions declared here aren't used by any driver, so no need to keep
them in the public driver API. Since the whole file isn't included by anybody
outside the xserver tree itself, it doesn't need to be installed at all,
so making it internal and move it to Xi directory.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1325 >
2024-09-01 22:21:12 +00:00
Enrico Weigelt, metux IT consult
1bfa4876f6
dix: move colormap flags into colormap_priv.h and rename them
...
These aren't used by any drivers/modules, so no need to keep them exported.
As already touching them, give them a proper name prefix for clarity.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1581 >
2024-09-01 22:06:50 +00:00
Enrico Weigelt, metux IT consult
7ba3fc3a54
dix: move internal defines into colormap.c
...
These are really internal to colormap.c, so move them there.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1581 >
2024-09-01 22:06:50 +00:00
Enrico Weigelt, metux IT consult
cbf5d88352
include: colormap.h: drop unused defines
...
These aren't used anywhere, so we can drop them.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1581 >
2024-09-01 22:06:50 +00:00
Enrico Weigelt, metux IT consult
7c03549134
include: colormap.h: drop unused typedef colorResourcePtr
...
This typedef isn't used anywhere, so can be dropped.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1581 >
2024-09-01 22:06:50 +00:00
Enrico Weigelt, metux IT consult
a3ec1a829d
dix: unexport IsMapInstalled()
...
Not used by any driver/module, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1581 >
2024-09-01 22:06:50 +00:00
Enrico Weigelt, metux IT consult
5eca51a5d2
dix: unexport StoreColors()
...
Not used by any driver/module, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1581 >
2024-09-01 22:06:50 +00:00
Enrico Weigelt, metux IT consult
6809621985
dix: unexport FreeColors()
...
Not used by any driver/module, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1581 >
2024-09-01 22:06:50 +00:00
Enrico Weigelt, metux IT consult
c2e49c82be
dix: unexport AllocColorPlanes()
...
Not used by any driver/module, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1581 >
2024-09-01 22:06:50 +00:00
Enrico Weigelt, metux IT consult
b7e280e163
dix: unexport AllocColorCells()
...
Not used by any driver/module, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1581 >
2024-09-01 22:06:50 +00:00
Enrico Weigelt, metux IT consult
3964510fb8
dix: unexport FreeClientPixels()
...
Not used by any driver/module, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1581 >
2024-09-01 22:06:50 +00:00
Enrico Weigelt, metux IT consult
5dc5d2965b
dix: unexport QueryColors()
...
Not used by any driver/module, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1581 >
2024-09-01 22:06:50 +00:00
Enrico Weigelt, metux IT consult
968cb9c7fa
dix: unexport FakeFreeColor()
...
Not used by any driver/module, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1581 >
2024-09-01 22:06:49 +00:00
Enrico Weigelt, metux IT consult
989c46fc9d
dix: unexport FakeAllocColor()
...
Not used by any driver/module, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1581 >
2024-09-01 22:06:49 +00:00
Enrico Weigelt, metux IT consult
b48e4a9cb7
dix: unexport AllocColor()
...
Not used by any driver/module, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1581 >
2024-09-01 22:06:49 +00:00
Enrico Weigelt, metux IT consult
3874fced31
dix: unexport CopyColormapAndFree()
...
Not used by any driver/module, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1581 >
2024-09-01 22:06:49 +00:00
Enrico Weigelt, metux IT consult
de4db967e0
dix: unexport TellGainedMap()
...
Not used by any driver/module, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1581 >
2024-09-01 22:06:49 +00:00
Enrico Weigelt, metux IT consult
ece72f50fe
dix: unexport TellLostMap()
...
Not used by any driver/module, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1581 >
2024-09-01 22:06:49 +00:00
Enrico Weigelt, metux IT consult
a1902f2029
dix: unexport FreeColormap()
...
Not used by any driver/module, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1581 >
2024-09-01 22:06:49 +00:00
Enrico Weigelt, metux IT consult
7ce67a99bc
dix: unexport CreateColormap()
...
Not used by any driver/module, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1581 >
2024-09-01 22:06:49 +00:00
Enrico Weigelt, metux IT consult
a66f99515a
Revert "dix: unexport AttachOutputGPU() and DetachOutputGPU()"
...
This reverts commit 1277bb7143
.
Nvidia driver needs them for PRIME handling.
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1371 >
2024-09-01 20:38:01 +00:00
Enrico Weigelt, metux IT consult
811977228b
os: unexport screen saver timer functions
...
These functions aren't supposed to be used by drivers, so move them
out of the public API.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1583 >
2024-09-01 20:23:10 +00:00
Enrico Weigelt, metux IT consult
aef17edd92
os: utils: drop obsolete REMOVE_ENV_LD conditional
...
This always had been set since it's incarnation back two decades
ago, on XFree86 4.3.0.1. Probably no need to keep that around anymore.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1518 >
2024-09-01 20:08:30 +00:00
Enrico Weigelt, metux IT consult
4b94e4fa08
os: utils: drop unused USE_ISPRINT
...
This always had been disabled since it's incarnation XFree86 4.3.0.1,
back two decades ago, so there's likely no need for it.
Fixes: d568221710
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1518 >
2024-09-01 20:08:30 +00:00
Enrico Weigelt, metux IT consult
b5d897d126
os: utils: drop REMOVE_LONG_ENV conditional
...
This always had been enabled since it's incarnation back two decades ago,
so it doesn't seem to be necessary keeping that conditional any longer.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1518 >
2024-09-01 20:08:30 +00:00
Enrico Weigelt, metux IT consult
6c6944be14
os: utils: drop unused VENDORSUPPORT
...
This doesn't seem to be used anymore for two decades now,
so there's probably no need to keep it any longer.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1518 >
2024-09-01 20:08:30 +00:00