fix(CompositeDevice): create target devices outside of composite devices

ShadowBlip · Feb 16, 2024 · 4d2a2ed · 4d2a2ed
1 parent 51b6a3c
commit 4d2a2ed
Show file tree

Hide file tree

Showing 18 changed files with 509 additions and 220 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/rootfs/usr/share/inputplumber/devices/gamepads.yaml b/rootfs/usr/share/inputplumber/devices/gamepads.yaml
@@ -20,9 +20,11 @@ source_devices:
     evdev:
       handler: js*
 
+# The target input device(s) that the virtual device profile can use
+target_devices:
+  - gamepad
+  - mouse
+  - keyboard
+
 # The ID of a device event mapping in the 'event_maps' folder
 event_map_id: xb360
-
-# The default output device that the virtual device profile should use if
-# 'auto' is selected.
-output_device: gamepad
diff --git a/rootfs/usr/share/inputplumber/devices/onexplayer_amd.yaml b/rootfs/usr/share/inputplumber/devices/onexplayer_amd.yaml
@@ -45,9 +45,11 @@ source_devices:
       name: AT Translated Set 2 keyboard
       phys_path: isa0060/serio0/input0
 
+# The target input device(s) that the virtual device profile can use
+target_devices:
+  - gamepad
+  - mouse
+  - keyboard
+
 # The ID of a device event mapping in the 'event_maps' folder
 event_map_id: oxp2
-
-# The default output device that the virtual device profile should use if
-# 'auto' is selected.
-output_device: gamepad
diff --git a/rootfs/usr/share/inputplumber/devices/onexplayer_intel.yaml b/rootfs/usr/share/inputplumber/devices/onexplayer_intel.yaml
@@ -33,8 +33,11 @@ source_devices:
       name: AT Translated Set 2 keyboard
       phys_path: isa0060/serio0/input0
 
+# The target input device(s) that the virtual device profile can use
+target_devices:
+  - gamepad
+  - mouse
+  - keyboard
+
 # The ID of a device event mapping in the 'event_maps' folder
 event_map_id: oxp1
-
-# Default output device
-output_device: gamepad
diff --git a/rootfs/usr/share/inputplumber/devices/onexplayer_mini_a07.yaml b/rootfs/usr/share/inputplumber/devices/onexplayer_mini_a07.yaml
@@ -29,5 +29,11 @@ source_devices:
       name: AT Translated Set 2 keyboard
       phys_path: isa0060/serio0/input0
 
+# The target input device(s) that the virtual device profile can use
+target_devices:
+  - gamepad
+  - mouse
+  - keyboard
+
 # The ID of a device event mapping in the 'event_maps' folder
 event_map_id: oxp3
diff --git a/rootfs/usr/share/inputplumber/devices/steam_deck.yaml b/rootfs/usr/share/inputplumber/devices/steam_deck.yaml
@@ -26,9 +26,11 @@ source_devices:
       product_id: 0x1205
       interface_num: 2
 
+# The target input device(s) that the virtual device profile can use
+target_devices:
+  - gamepad
+  - mouse
+  - keyboard
+
 # The ID of a device event mapping in the 'event_maps' folder
 event_map_id: deck
-
-# The default output device that the virtual device profile should use if
-# 'auto' is selected.
-output_device: gamepad
diff --git a/rootfs/usr/share/inputplumber/devices/xbox360.yaml b/rootfs/usr/share/inputplumber/devices/xbox360.yaml
@@ -20,9 +20,11 @@ source_devices:
     evdev:
       name: Xbox 360 Wireless Receiver (XBOX)
 
+# The target input device(s) that the virtual device profile can use
+target_devices:
+  - gamepad
+  - mouse
+  - keyboard
+
 # The ID of a device event mapping in the 'event_maps' folder
 event_map_id: xb360
-
-# The default output device that the virtual device profile should use if
-# 'auto' is selected.
-output_device: gamepad
diff --git a/rootfs/usr/share/inputplumber/schema/composite_device_v1.json b/rootfs/usr/share/inputplumber/schema/composite_device_v1.json
@@ -37,13 +37,18 @@
           "description": "The ID of a device event mapping in the 'event_maps' directory",
           "type": "string"
         },
-        "output_device": {
-          "description": "Output device to emulate",
-          "type": "string",
-          "enum": [
-            "gamepad",
-            "xb360"
-          ]
+        "target_devices": {
+          "description": "Target input device(s) to emulate. Can be one of ['mouse', 'keyboard', 'gamepad', 'xb360'].",
+          "type": "array",
+          "items": {
+            "type": "string",
+            "enum": [
+              "mouse",
+              "keyboard",
+              "gamepad",
+              "xb360"
+            ]
+          }
         }
       },
       "required": [

diff --git a/src/config/mod.rs b/src/config/mod.rs
@@ -89,9 +89,9 @@ pub struct CompositeDeviceConfig {
     pub kind: String,
     pub name: String,
     pub matches: Vec<Match>,
-    pub source_devices: Vec<SourceDevice>,
     pub event_map_id: String,
-    pub output_device: Option<String>,
+    pub source_devices: Vec<SourceDevice>,
+    pub target_devices: Option<Vec<String>>,
 }
 
 impl CompositeDeviceConfig {

diff --git a/src/constants.rs b/src/constants.rs
@@ -1,2 +1,4 @@
 pub const BUS_NAME: &str = "org.shadowblip.InputPlumber";
 pub const BUS_PREFIX: &str = "/org/shadowblip/InputPlumber";
+pub const BUS_SOURCES_PREFIX: &str = "/org/shadowblip/InputPlumber/devices/source";
+pub const BUS_TARGETS_PREFIX: &str = "/org/shadowblip/InputPlumber/devices/target";