feat(InputPlumber): Get target device type, keep device default target on first boot

Author: pastaq

core/global/launch_manager.gd

@@ -185,7 +185,6 @@ func _init() -> void:
 
 	in_game_state.state_entered.connect(on_game_state_entered)
 	in_game_state.state_exited.connect(on_game_state_exited)
-	set_gamepad_profile("")
 
 
 # Loads persistent data like recent games launched, etc.
@@ -217,8 +216,12 @@ func setup(input_manager: InputManager):
 	if not input_manager:
 		logger.error("No input manager found.")
 		return
+	if not is_instance_valid(input_manager):
+		logger.error("Input Manager instance is not valid")
+		return
 
 	_input_manager = input_manager
+	set_gamepad_profile("")
 
 
 ## Launches the given application and switches to the in-game state. Returns a
@@ -491,43 +494,47 @@ func set_app_gamepad_profile(app: RunningApp) -> void:
 
 
 ## Sets the gamepad profile for the running app with the given profile
-func set_gamepad_profile(path: String, target_gamepad: String = "") -> void:
+func set_gamepad_profile(profile_path: String, target_gamepad: String = "") -> void:
 	# Discover the currently set gamepad to properly add additional capabilities based on that gamepad
-	var profile_modifier := target_gamepad
 	if target_gamepad.is_empty():
-		profile_modifier = settings_manager.get_value("input", "gamepad_profile_target", "gamepad") as String
+		# First, find the currently set gamepad on the composite device
+		for device: CompositeDevice in input_plumber.get_composite_devices():
+			var targets = device.get_target_devices()
+			for target in targets:
+				var target_dbus_path: String = target.get("dbus_path")
+				if not target_dbus_path.contains("target/gamepad"):
+					continue
+				target_gamepad = target.get("device_type")
+				break
+			if not target_gamepad.is_empty():
+				break
+		# Then, if overriden by settings, use that instead
+		target_gamepad = settings_manager.get_value("input", "gamepad_profile_target", target_gamepad) as String
 
 	# If no profile was specified, unset the gamepad profiles
-	if path == "":
+	if profile_path == "":
 		# Get the input manager default path
-		var default_path = ""
-		if _input_manager:
-			default_path =  _input_manager.get_default_global_profile_path()
+		if is_instance_valid(_input_manager):
+			profile_path = _input_manager.get_default_global_profile_path()
 
 		# Try check to see if there is a global gamepad setting
-		path = settings_manager.get_value("input", "gamepad_profile", default_path) as String
+		profile_path = settings_manager.get_value("input", "gamepad_profile", profile_path) as String
 
 		# Verify can load a valid profile, or fallback.
-		if not path.ends_with(".json") or not FileAccess.file_exists(path):
-			if default_path == "":
-				logger.warn("Unable to set default gamepad profile path from input manager.")
+		if not profile_path.ends_with(".json") or not FileAccess.file_exists(profile_path):
+				logger.warn("Profile path is not valid: \"" + profile_path + "\"")
 				return
-			path = default_path
-
-	logger.info("Loading gamepad profile: " + path)
-	if not FileAccess.file_exists(path):
-		logger.warn("Gamepad profile not found: " + path)
-		return
 
 	# Load the profile to get its name
-	var profile := InputPlumberProfile.load(path)
+	logger.info("Loading gamepad profile: " + profile_path)
+	var profile := InputPlumberProfile.load(profile_path)
 	if not profile:
-		logger.warn("Failed to load gamepad profile: " + path)
+		logger.warn("Failed to load gamepad profile: " + profile_path)
 		return
 
 	# TODO: Save profiles for individual controllers?
 	for gamepad in input_plumber.get_composite_devices():
-		InputPlumber.load_target_modified_profile(gamepad, path, profile_modifier)
+		InputPlumber.load_target_modified_profile(gamepad, profile_path, target_gamepad)
 
 		# Set the target gamepad if one was specified
 		if not target_gamepad.is_empty():

core/systems/input/input_plumber_profile.gd

@@ -140,6 +140,8 @@ static func get_target_device(target_device_str: String) -> TargetDevice:
 			target_device = TargetDevice.DualSense
 		"ds5-edge":
 			target_device = TargetDevice.DualSenseEdge
+		"deck":
+			target_device = TargetDevice.SteamDeck
 		"deck-uhid":
 			target_device = TargetDevice.SteamDeck
 		"hori-steam":

core/ui/card_ui/card_ui.tscn

@@ -94,6 +94,8 @@ grow_horizontal = 2
 grow_vertical = 2
 script = ExtResource("1_f8851")
 
+[node name="InputManager" parent="." instance=ExtResource("1_34t85")]
+
 [node name="InputIconProcessor" type="Node" parent="."]
 script = ExtResource("3_y116l")
 
@@ -369,8 +371,6 @@ grow_vertical = 2
 stream = ExtResource("21_s3peg")
 autoplay = true
 
-[node name="InputManager" parent="." instance=ExtResource("1_34t85")]
-
 [node name="PowerSaver" parent="." instance=ExtResource("8_hyc1j")]
 
 [editable path="AlwaysVisibleContent/OnScreenKeyboard"]

core/ui/card_ui/gamepad/gamepad_settings.gd

@@ -2,7 +2,6 @@ extends Control
 
 const USER_TEMPLATES := "user://data/gamepad/templates"
 const USER_PROFILES := "user://data/gamepad/profiles"
-const GLOBAL_PROFILE_PATH := "user://data/gamepad/profiles/global.json"
 
 var change_input_state := preload("res://assets/state/states/gamepad_change_input.tres") as State
 var gamepad_state := load("res://assets/state/states/gamepad_settings.tres") as State
@@ -74,8 +73,16 @@ func _ready() -> void:
 	# Load the default profile
 	var profile_path = settings_manager.get_value("input", "gamepad_profile", "")
 	self.profile_gamepad = settings_manager.get_value("input", "gamepad_profile_target", "")
-	for composite_device in input_plumber.get_composite_devices():
-			_set_gamepad_profile(composite_device, profile_path)
+	if not self.profile_gamepad:
+		# Set the current profile_gamepad type to the currently configured CompositeDevice target gamepad
+		var targets = gamepad.get_target_devices()
+		for target in targets:
+			var target_dbus_path: String = target.get("dbus_path")
+			if not target_dbus_path.contains("target/gamepad"):
+				continue
+			self.profile_gamepad = target.get("device_type")
+			break
+	_set_gamepad_profile(gamepad, profile_path)
 
 	# Grab focus when the mapper exits
 	var on_state_changed := func(_from: State, to: State):
@@ -131,7 +138,7 @@ func _on_state_entered(_from: State) -> void:
 
 	# Set the gamepad name label
 	gamepad_label.text = self.gamepad.name
-	
+
 	# Populate the menu with the source inputs for the given gamepad
 	populate_mappings_for(self.gamepad)
 
@@ -146,17 +153,31 @@ func _on_state_entered(_from: State) -> void:
 	if not self.library_item:
 		self.library_item = launch_manager.get_current_app_library_item()
 
+	# Set the current profile_gamepad type to the currently configured CompositeDevice target gamepad
+	var targets = gamepad.get_target_devices()
+	for target in targets:
+		var target_dbus_path: String = target.get("dbus_path")
+		if not target_dbus_path.contains("target/gamepad"):
+			continue
+		self.profile_gamepad = target.get("device_type")
+		break
+
 	# If no library item was set with the state, then configure the OGUI profile
 	var profile_path: String
 	if not self.library_item:
 		self.profile_label.text = "Global"
 		profile_path = settings_manager.get_value("input", "gamepad_profile", input_manager.get_default_global_profile_path()) as String
+		# Check if we have a profile target, otherwise use the currently set one
+		self.profile_gamepad = settings_manager.get_value("input", "gamepad_profile_target", self.profile_gamepad)
 	else:
 		self.profile_label.text = self.library_item.name
 		profile_path = settings_manager.get_library_value(self.library_item, "gamepad_profile", "") as String
-		self.profile_gamepad = settings_manager.get_library_value(self.library_item, "gamepad_profile_target", "") as String
+		# Check if we have a profile target, otherwise use the currently set one
+		self.profile_gamepad = settings_manager.get_library_value(self.library_item, "gamepad_profile_target", self.profile_gamepad) as String
 
 	self.profile = _load_profile(profile_path)
+	logger.debug("Set profile target gamepad to " + self.profile_gamepad)
+
 	_update_mapping_elements()
 
 	# Clear focus
@@ -196,7 +217,7 @@ func populate_mappings_for(gamepad: CompositeDevice) -> void:
 	# Sort the capabilities
 	capabilities = InputPlumberEvent.sort_capabilities(capabilities)
 	capabilities.reverse()
-	logger.debug("Found capabilities for gamepad: " + str(capabilities))
+	logger.debug("Found capabilities for " + gamepad_name + ": " + str(capabilities))
 
 	# Delete any old UI elements
 	for child in container.get_children():
@@ -390,9 +411,10 @@ func _add_group_for_capability(gamepad_name: String, capability: String, parent:
 
 ## Syncs the UI to the given profile
 func _update_mapping_elements() -> void:
-	if not profile:
+	if not self.profile:
 		return
-	profile_label.text = profile.name
+
+	self.profile_label.text = self.profile.name
 
 	# Update the dropdown based on the profile's target gamepad type
 	if not self.profile_gamepad.is_empty():
@@ -634,7 +656,7 @@ func _save_profile() -> void:
 		logger.debug("No library item loaded to associate profile with")
 		# Save the profile
 		@warning_ignore("confusable_local_declaration")
-		var path := GLOBAL_PROFILE_PATH
+		var path := input_manager.get_default_global_profile_path()
 		if profile.save(path) != OK:
 			logger.error("Failed to save global gamepad profile to: " + path)
 			notify.text = "Failed to save global gamepad profile"
@@ -646,8 +668,8 @@ func _save_profile() -> void:
 		settings_manager.set_value("input", "gamepad_profile", path)
 		settings_manager.set_value("input", "gamepad_profile_target", self.profile_gamepad)
 
-		for gamepad in input_plumber.get_composite_devices():
-			_set_gamepad_profile(gamepad, path)
+		for device: CompositeDevice in input_plumber.get_composite_devices():
+			_set_gamepad_profile(device, path)
 
 		logger.debug("Saved global gamepad profile to: " + path)
 		notify.text = "Global gamepad profile saved"

core/ui/card_ui_overlay_mode/card_ui_overlay_mode.tscn

@@ -27,6 +27,8 @@ grow_vertical = 2
 theme = ExtResource("1_0qmlq")
 script = ExtResource("2_3ptao")
 
+[node name="InputManager" parent="." instance=ExtResource("3_klhmb")]
+
 [node name="InputIconProcessor" type="Node" parent="."]
 script = ExtResource("4_6rltg")
 
@@ -94,5 +96,3 @@ anchor_right = 0.5
 anchor_bottom = 0.5
 grow_horizontal = 2
 grow_vertical = 2
-
-[node name="InputManager" parent="." instance=ExtResource("3_klhmb")]

extensions/core/src/dbus/inputplumber.rs

@@ -1,6 +1,8 @@
 pub mod composite_device;
 pub mod dbus_device;
 pub mod event_device;
+pub mod gamepad;
 pub mod input_manager;
 pub mod keyboard;
 pub mod mouse;
+pub mod target;

extensions/core/src/dbus/inputplumber/target.rs

@@ -0,0 +1,36 @@
+//! # D-Bus interface proxy for: `org.shadowblip.Input.Gamepad`
+//!
+//! This code was generated by `zbus-xmlgen` `4.1.0` from D-Bus introspection data.
+//! Source: `Interface '/org/shadowblip/InputPlumber/devices/target/gamepad0' from service 'org.shadowblip.InputPlumber' on system bus`.
+//!
+//! You may prefer to adapt it, instead of using it verbatim.
+//!
+//! More information can be found in the [Writing a client proxy] section of the zbus
+//! documentation.
+//!
+//! This type implements the [D-Bus standard interfaces], (`org.freedesktop.DBus.*`) for which the
+//! following zbus API can be used:
+//!
+//! * [`zbus::fdo::PeerProxy`]
+//! * [`zbus::fdo::PropertiesProxy`]
+//! * [`zbus::fdo::IntrospectableProxy`]
+//!
+//! Consequently `zbus-xmlgen` did not generate code for the above interfaces.
+//!
+//! [Writing a client proxy]: https://dbus2.github.io/zbus/client.html
+//! [D-Bus standard interfaces]: https://dbus.freedesktop.org/doc/dbus-specification.html#standard-interfaces,
+use zbus::proxy;
+#[proxy(
+    interface = "org.shadowblip.Input.Target",
+    default_service = "org.shadowblip.InputPlumber",
+    default_path = "/org/shadowblip/InputPlumber/devices/target/gamepad0"
+)]
+pub trait Target {
+    /// Name property
+    #[zbus(property)]
+    fn name(&self) -> zbus::Result<String>;
+
+    /// Name property
+    #[zbus(property)]
+    fn device_type(&self) -> zbus::Result<String>;
+}

extensions/core/src/input/inputplumber.rs

@@ -1,6 +1,7 @@
 pub mod composite_device;
 pub mod dbus_device;
 pub mod event_device;
+pub mod gamepad_device;
 pub mod keyboard_device;
 pub mod mouse_device;
 

extensions/core/src/input/inputplumber/composite_device.rs

@@ -5,6 +5,7 @@ use godot::classes::{ProjectSettings, Resource, ResourceLoader};
 use crate::dbus::inputplumber::composite_device::CompositeDeviceProxyBlocking;
 use crate::dbus::DBusVariant;
 use crate::get_dbus_system_blocking;
+use crate::input::inputplumber::gamepad_device::GamepadDevice;
 
 use super::dbus_device::DBusDevice;
 use super::keyboard_device::KeyboardDevice;
@@ -237,7 +238,8 @@ impl CompositeDevice {
         // Build the Godot object based on the path
         for path in values {
             if path.contains("gamepad") {
-                // TODO
+                let device = GamepadDevice::new(path.as_str());
+                target_devices.push(&device.to_variant());
                 continue;
             }
             if path.contains("keyboard") {