XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 03:44:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

split KdInitInput for Xephyr

Browse Source
This commit is contained in:
squishypinkelephant
2026-01-07 16:08:39 -06:00
committed by Enrico Weigelt
parent afc8ec2475
commit 80112b61ba
3 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hw/kdrive/fbdev/fbinit.c
View File

@@ -51,7 +51,7 @@ void
InitInput(int argc, char **argv)
{
KdOsAddInputDrivers();
KdInitInput();
kdInitInputPre();
}
void

2
hw/kdrive/src/kdrive.h
View File

@@ -472,6 +472,8 @@ void
/* kinput.c */
void
KdInitInput(void);
void
kdInitInputPre(void);
void
KdCloseInput(void);

29
hw/kdrive/src/kinput.c
View File

@@ -1309,6 +1309,23 @@ KdPointerInfo *KdParsePointer(const char *arg)
return pi;
}
void
kdInitInputPre(void)
{
#ifdef KDRIVE_KBD
if (!kdConfigKeyboards) {
KdAddConfigKeyboard("keyboard");
}
#endif
#ifdef KDRIVE_MOUSE
if (!kdConfigPointers) {
KdAddConfigPointer("mouse");
}
#endif
KdInitInput();
}
void
KdInitInput(void)
{
@@ -1321,18 +1338,6 @@ KdInitInput(void)
kdInputEnabled = TRUE;
#ifdef KDRIVE_KBD
if (!kdConfigKeyboards) {
KdAddConfigKeyboard("keyboard");
}
#endif
#ifdef KDRIVE_MOUSE
if (!kdConfigPointers) {
KdAddConfigPointer("mouse");
}
#endif
for (dev = kdConfigPointers; dev; dev = dev->next) {
pi = KdParsePointer(dev->line);
if (!pi)