mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-24 12:25:07 +00:00
split KdInitInput for Xephyr
Signed-off-by: squishypinkelephant <squishypinkelephant@gmail.com>
This commit is contained in:
committed by
Enrico Weigelt
parent
a331b96ab0
commit
71c1556125
@@ -64,7 +64,7 @@ void
|
||||
InitInput(int argc, char **argv)
|
||||
{
|
||||
KdOsAddInputDrivers();
|
||||
KdInitInput();
|
||||
kdInitInputPre();
|
||||
}
|
||||
|
||||
void
|
||||
|
||||
@@ -472,6 +472,8 @@ void
|
||||
/* kinput.c */
|
||||
void
|
||||
KdInitInput(void);
|
||||
void
|
||||
kdInitInputPre(void);
|
||||
void
|
||||
KdCloseInput(void);
|
||||
|
||||
|
||||
@@ -1386,6 +1386,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)
|
||||
{
|
||||
@@ -1402,18 +1419,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)
|
||||
|
||||
Reference in New Issue
Block a user