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
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 45fb3a934dFixes #1611
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1256 >
2024-09-01 23:12:28 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
a66f99515a
Revert "dix: unexport AttachOutputGPU() and DetachOutputGPU()"
...
This reverts commit 1277bb7143https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1371 >
2024-09-01 20:38:01 +00:00
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
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
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: d568221710https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1518 >
2024-09-01 20:08:30 +00:00
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
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
69905a0a28
os: utils: drop unused NO_OUTPUT_PIPES
...
This hasn't been used/enabled for over 20 years, so there's probably
no reason for keeping it even 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
6153b89d19
os: utils: minor code formatting cleanup
...
Just correcting some small indention issues, no actual change.
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
3d3d148039
os: unexport WaitForSomething()
...
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/1584 >
2024-09-01 19:53:43 +00:00
2cec3cfbf1
include: move private definitions out of input.h
...
It's not good having the public server api headers clobbered with private
definitions, so cleaning them up.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1354 >
2024-09-01 17:59:23 +00:00
646831cda2
include: dixfontstr.h: drop silent dependency on libxfont2
...
This header includes libxfont2.h, but the dependency isn't stated anywhere,
causing some drivers to FTBS (when libxont2.h is in non-standard location).
Since this header doesn't seem to need including libxfont2.h at all, just
stop including it, instead of adding yet another dependency to server SDK.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1610 >
2024-09-01 17:45:13 +00:00
62c9f52e41
Remove remnants of support for SVR4 systems other than Solaris & illumos
...
Most of the support for such OS'es was removed in 2010 for
xorg-server-1.10.0, but a few bits lingered on.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1667 >
2024-09-01 02:14:10 +00:00
f35951d83e
Remove remnants of support for SysV versions before SVR4
...
Most of the support for such OS'es was removed in 2010 for
xorg-server-1.10.0, but a few bits lingered on, and a few
comments were left out-of-date.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1667 >
2024-09-01 02:14:10 +00:00
12f71ede8a
Xnest: use Xorg's TRUE/FALSE instead of Xlib's True/False
...
Use Xserver's defines instead of Xlib's ones. The values are the same.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1657 >
2024-09-01 00:48:52 +00:00
0d3ae98661
Xnest: split off event handler
...
Tidy it up a bit and split the actual request handler from the request
reading loop, making upcoming reworks easier to review (smaller diffs).
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1661 >
2024-09-01 00:38:30 +00:00
3597323d48
Xnest: xnestCollectEvents(): scope local variables
...
Make the code easier to read/understand by scoping variables to where
exactly they're needed. Also a preparation for subsequent reworks
(keep the diff smaller and thus easier to review)
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1661 >
2024-09-01 00:38:30 +00:00
e1c47ad123
Xnest: fix broken exposure events
...
Xnest fails to properly pass through expose events: the coordinates are
miscalculated in xnestCollectExposures(), before miSendExposures() is called.
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1735
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1634 >
2024-08-31 23:45:26 +00:00
ea042cd6ef
Xnest: Display.h: fix missing include of colormap.h
...
Needs some types (eg. Pixel) from colormap.h
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1660 >
2024-08-31 23:32:54 +00:00
4db1da86fc
Xnest: XNGC.h: add missing includes
...
This header makes use of types and functions defined in gcstruct.h and
privates.h. It should include them, instead of demanding it's consumers
having done that before including this file.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1659 >
2024-08-31 23:21:21 +00:00
eafd687c47
Xnest: add guards to Xnest.h
...
protect it from duplicate inclusion.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1658 >
2024-08-31 23:09:30 +00:00
1bea5ddfce
test: dix_input_valuator_masks(): use fixed array instead of VLA
...
The array size is determined on compile time, so no need to use a vla
which always has the same size anyways.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1663 >
2024-08-31 22:42:36 +00:00
Peter Hutterer
Matthieu Herrb
moozcheng
Enrico Weigelt, metux IT consult
Alan Coopersmith