From 18e544e399591f605d44fb54a18d1a3f4d0fff41 Mon Sep 17 00:00:00 2001 From: stefan11111 Date: Sun, 6 Jul 2025 16:48:00 +0300 Subject: [PATCH] kdrive: add code needed for the future kdrive input drivers All the code if behind #if's that are never satisfied, so this commit has no functional changes. In preparation for adding the Xfbdev X11 kdrive server. Signed-off-by: stefan11111 --- hw/kdrive/src/kinput.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c index 6c4d7062a3..124bfc19b4 100644 --- a/hw/kdrive/src/kinput.c +++ b/hw/kdrive/src/kinput.c @@ -1122,6 +1122,16 @@ KdParseKbdOptions(KdKeyboardInfo * ki) ErrorF("Kbd option key (%s) of value (%s) not assigned!\n", key, value); } + +#ifdef KDRIVE_EVDEV + if (!ki->driver && ki->path != NULL && + strncasecmp(ki->path, + DEV_INPUT_EVENT_PREFIX, + DEV_INPUT_EVENT_PREFIX_LEN) == 0) { + ki->driver = KdFindKeyboardDriver("evdev"); + ki->options = input_option_new(ki->options, "driver", "evdev"); + } +#endif } KdKeyboardInfo *KdParseKeyboard(const char *arg) @@ -1231,6 +1241,16 @@ KdParsePointerOptions(KdPointerInfo * pi) ErrorF("Pointer option key (%s) of value (%s) not assigned!\n", key, value); } + +#ifdef KDRIVE_EVDEV + if (!pi->driver && pi->path != NULL && + strncasecmp(pi->path, + DEV_INPUT_EVENT_PREFIX, + DEV_INPUT_EVENT_PREFIX_LEN) == 0) { + pi->driver = KdFindPointerDriver("evdev"); + pi->options = input_option_new(pi->options, "driver", "evdev"); + } +#endif } /* @@ -1331,6 +1351,18 @@ 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)