Changeset 101298 in vbox for trunk

Timestamp:

Sep 27, 2023 3:51:21 PM (16 months ago)

Author:

vboxsync

Message:

DrvKeyboardQueue: Added a compile time option to not pass along any HID Consumer/Desktop Control usage page keys.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Devices/Input/DrvKeyboardQueue.cpp (modified) (1 diff)
• src/VBox/Devices/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -746 +746 @@
  VBOX_WITH_LIBTPMS = 1
 endif
+# Disable keyboard HID Consumer/Desktop control keys passthrough
+# VBOX_WITHOUT_KEYBOARD_HID_CC_DC_PASSTHROUGH = 1
 ## @}
 

trunk/src/VBox/Devices/Input/DrvKeyboardQueue.cpp

@@ -125 +125 @@
 /* Keyboard usage page (07h). */
 #define KB(key)     (RT_MAKE_U32(0, USB_HID_KB_PAGE) | (uint16_t)key)
-/* Consumer Control usage page (0Ch). */
-#define CC(key)     (RT_MAKE_U32(0, USB_HID_CC_PAGE) | (uint16_t)key)
-/* Generic Desktop Control usage page (01h). */
-#define DC(key)     (RT_MAKE_U32(0, USB_HID_DC_PAGE) | (uint16_t)key)
-/* Untranslated/unised, shouldn't be encountered. */
+
+#ifndef VBOX_DISABLE_HID_CC_DC_PASSTHROUGH
+ /* Consumer Control usage page (0Ch). */
+ #define CC(key)     (RT_MAKE_U32(0, USB_HID_CC_PAGE) | (uint16_t)key)
+ /* Generic Desktop Control usage page (01h). */
+ #define DC(key)     (RT_MAKE_U32(0, USB_HID_DC_PAGE) | (uint16_t)key)
+#else
+ /* Do not pass through Consumer/Generic Desktop Control usage page. */
+ #define CC(key)     0
+ #define DC(key)     0
+#endif
+
+/* Untranslated/unused, shouldn't be encountered. */
 #define XX(key)     0
 

trunk/src/VBox/Devices/Makefile.kmk

@@ -528 +528 @@
  endif
 
+ ifdef VBOX_WITHOUT_KEYBOARD_HID_CC_DC_PASSTHROUGH
+  VBoxDD_DEFS += VBOX_DISABLE_HID_CC_DC_PASSTHROUGH
+ endif # VBOX_WITHOUT_KEYBOARD_HID_CC_DC_PASSTHROUGH
+
  # --- Networking bits. ---