fix(Default Profiles): Seperate overlay and full session defualt profiles

Author: pastaq

assets/gamepad/profiles/default_overlay.json

@@ -0,0 +1,80 @@
+{
+	"version": 1,
+	"kind": "DeviceProfile",
+	"name": "OpenGamepadUI Default",
+	"mapping": [
+		{
+			"name": "LeftTop",
+			"source_event": {
+				"gamepad": {
+					"button": "LeftTop"
+				}
+			},
+			"target_events": [
+				{
+					"gamepad": {
+						"button": "Guide"
+					}
+				},
+				{
+					"gamepad": {
+						"button": "North"
+					}
+				}
+			]
+		},
+		{
+			"name": "RightTop",
+			"source_event": {
+				"gamepad": {
+					"button": "RightTop"
+				}
+			},
+			"target_events": [
+				{
+					"gamepad": {
+						"button": "Guide"
+					}
+				},
+				{
+					"gamepad": {
+						"button": "East"
+					}
+				}
+			]
+		},
+		{
+			"name": "Keyboard",
+			"source_event": {
+				"gamepad": {
+					"button": "Keyboard"
+				}
+			},
+			"target_events": [
+				{
+					"dbus": "ui_osk"
+				}
+			]
+		},
+		{
+			"name": "QuickAccess2",
+			"source_event": {
+				"gamepad": {
+					"button": "QuickAccess2"
+				}
+			},
+			"target_events": [
+				{
+					"gamepad": {
+						"button": "Guide"
+					}
+				},
+				{
+					"gamepad": {
+						"button": "East"
+					}
+				}
+			]
+		},
+	]
+}

core/global/launch_manager.gd

@@ -66,7 +66,7 @@ var _ogui_window_id := 0
 var should_manage_overlay := true
 var logger := Log.get_logger("LaunchManager", Log.LEVEL.INFO)
 var _focused_app_id := 0
-
+var _input_manager: InputManager
 
 # Connect to Gamescope signals
 func _init() -> void:
@@ -212,6 +212,11 @@ func _save_persist_data():
 	file.flush()
 
 
+# Get access to nodes from the scene tree and other goodies
+func setup(input_manager: InputManager):
+	_input_manager = input_manager
+
+
 ## Launches the given application and switches to the in-game state. Returns a
 ## [RunningApp] instance of the application.
 func launch(app: LibraryLaunchItem) -> RunningApp:
@@ -491,10 +496,10 @@ func set_gamepad_profile(path: String, target_gamepad: String = "") -> void:
 	# If no profile was specified, unset the gamepad profiles
 	if path == "":
 		# Try check to see if there is a global gamepad setting
-		path = settings_manager.get_value("input", "gamepad_profile", InputPlumber.DEFAULT_GLOBAL_PROFILE) as String
+		path = settings_manager.get_value("input", "gamepad_profile", _input_manager.get_default_global_profile_path()) as String
 		# Verify we loaded a valid profile, or fallback.
 		if not path.ends_with(".json") or not FileAccess.file_exists(path):
-			path = InputPlumber.DEFAULT_GLOBAL_PROFILE
+			path = _input_manager.get_default_global_profile_path()
 
 	logger.info("Loading gamepad profile: " + path)
 	if not FileAccess.file_exists(path):

core/systems/input/input_manager.gd

@@ -42,10 +42,29 @@ var current_touches := 0
 ## Will show logger events with the prefix InputManager
 var logger := Log.get_logger("InputManager", Log.LEVEL.INFO)
 
+const PROFILES_DIR := "user://data/gamepad/profiles"
+
+
+func _init() -> void:
+	# Ensure the default global profile exists in the user directory.
+	var default_global_profile := get_default_global_profile_path()
+	var default_profile := _get_default_profile_path()
+	if FileAccess.file_exists(default_global_profile):
+		return
+
+	var file := FileAccess.open(default_profile, FileAccess.READ)
+	var content := file.get_as_text()
+	file.close()
+	if DirAccess.make_dir_recursive_absolute(PROFILES_DIR) != OK:
+		var logger := Log.get_logger("InputPlumber", Log.LEVEL.DEBUG)
+		logger.error("Failed to create gamepad profiles directory")
+	var new_file := FileAccess.open(default_global_profile, FileAccess.WRITE)
+	new_file.store_string(content)
+	new_file.close()
+
 
 # Called when the node enters the scene tree for the first time.
 func _ready() -> void:
-	add_to_group("InputManager")
 	input_plumber.composite_device_added.connect(_watch_dbus_device)
 	input_plumber.started.connect(_init_inputplumber)
 	_init_inputplumber()
@@ -55,6 +74,13 @@ func _init_inputplumber() -> void:
 	for device in input_plumber.get_composite_devices():
 		_watch_dbus_device(device)
 
+func _get_default_profile_path() -> String:
+	return "res://assets/gamepad/profiles/default.json"
+
+func get_default_global_profile_path() -> String:
+	return "user://data/gamepad/profiles/global_default.json"
+	
+
 
 ## Returns true if the given event is an InputPlumber event
 static func is_inputplumber_event(event: InputEvent) -> bool:

core/systems/input/input_manager.tscn

@@ -4,7 +4,7 @@
 [ext_resource type="Script" uid="uid://blpngehu3py28" path="res://core/systems/input/input_plumber.gd" id="2_v1kl3"]
 [ext_resource type="InputPlumberInstance" uid="uid://e2bevy4j4rx2" path="res://core/systems/input/input_plumber.tres" id="3_eclcy"]
 
-[node name="InputManager" type="Node"]
+[node name="InputManager" type="Node" groups=["input_manager"]]
 script = ExtResource("1_3s67x")
 
 [node name="InputPlumber" type="Node" parent="."]

core/systems/input/input_plumber.gd

@@ -7,30 +7,12 @@ class_name InputPlumber
 ## The InputPlumberManager class is responsible for handling dbus messages to and
 ## from the InputPlumber input manager daemon.
 
-const DEFAULT_PROFILE := "res://assets/gamepad/profiles/default.json"
-const DEFAULT_GLOBAL_PROFILE := "user://data/gamepad/profiles/global_default.json"
-const PROFILES_DIR := "user://data/gamepad/profiles"
-
 @export var instance: InputPlumberInstance = load("res://core/systems/input/input_plumber.tres")
 
 # Keep a reference to dbus devices so they are not cleaned up automatically
 var _dbus_devices := {}
 
 
-func _init() -> void:
-	# Ensure the default global profile exists in the user directory.
-	if not FileAccess.file_exists(DEFAULT_GLOBAL_PROFILE):
-		var file := FileAccess.open(DEFAULT_PROFILE, FileAccess.READ)
-		var content := file.get_as_text()
-		file.close()
-		if DirAccess.make_dir_recursive_absolute(PROFILES_DIR) != OK:
-			var logger := Log.get_logger("InputPlumber", Log.LEVEL.DEBUG)
-			logger.error("Failed to create gamepad profiles directory")
-		var new_file := FileAccess.open(DEFAULT_GLOBAL_PROFILE, FileAccess.WRITE)
-		new_file.store_string(content)
-		new_file.close()
-
-
 func _ready() -> void:
 	# Add listeners for any new devices
 	var on_device_added := func(device: CompositeDevice):

core/systems/input/overlay_mode_input_manager.gd

@@ -1,5 +1,5 @@
 @icon("res://assets/editor-icons/material-symbols-joystick.svg")
-extends Node
+extends InputManager
 class_name OverlayInputManager
 
 ## Manages global input while ion overlay mode
@@ -11,33 +11,11 @@ class_name OverlayInputManager
 ## To include this functionality, add this as a node to the root node in the
 ## scene tree.
 
-## The audio manager to use to adjust the audio when audio input events happen.
-var audio_manager := load("res://core/global/audio_manager.tres") as AudioManager
-## InputPlumber receives and sends DBus input events.
-var input_plumber := load("res://core/systems/input/input_plumber.tres") as InputPlumberInstance
-## LaunchManager provides context on the currently running app so we can switch profiles
-var launch_manager := load("res://core/global/launch_manager.tres") as LaunchManager
-## The Global State Machine
-var state_machine := load("res://assets/state/state_machines/global_state_machine.tres") as StateMachine
-## State machine to use to switch menu states in response to input events.
-var popup_state_machine := (
-	preload("res://assets/state/state_machines/popup_state_machine.tres") as StateMachine
-)
 var menu_state_machine := preload("res://assets/state/state_machines/menu_state_machine.tres") as StateMachine
-var in_game_menu_state := preload("res://assets/state/states/in_game_menu.tres") as State
-var main_menu_state := preload("res://assets/state/states/main_menu.tres") as State
-var quick_bar_state := preload("res://assets/state/states/quick_bar_menu.tres") as State
 var base_state = preload("res://assets/state/states/in_game.tres") as State
 
-var actions_pressed := {}
-
-## Will show logger events with the prefix InputManager(Overlay Mode)
-var logger := Log.get_logger("InputManager(Overlay Mode)", Log.LEVEL.INFO)
-
-
 # Called when the node enters the scene tree for the first time.
 func _ready() -> void:
-	add_to_group("InputManager")
 	input_plumber.composite_device_added.connect(_watch_dbus_device)
 	input_plumber.started.connect(_init_inputplumber)
 	_init_inputplumber()
@@ -48,6 +26,14 @@ func _init_inputplumber() -> void:
 		_watch_dbus_device(device)
 
 
+func _get_default_profile_path() -> String:
+	return "res://assets/gamepad/profiles/default_overlay.json"
+
+
+func get_default_global_profile_path() -> String:
+	return "user://data/gamepad/profiles/global_default_overlay.json"
+
+
 ## Queue a release event for the given action
 func action_release(dbus_path: String, action: String, strength: float = 1.0) -> void:
 	Input.action_release(action)

core/systems/input/overlay_mode_input_manager.tscn

@@ -3,7 +3,7 @@
 [ext_resource type="Script" uid="uid://cwuxmp5lmsvgt" path="res://core/systems/input/overlay_mode_input_manager.gd" id="1_fvwoc"]
 [ext_resource type="Script" uid="uid://blpngehu3py28" path="res://core/systems/input/input_plumber.gd" id="2_vf8uv"]
 
-[node name="InputManager" type="Node"]
+[node name="InputManager" type="Node" groups=["input_manager"]]
 script = ExtResource("1_fvwoc")
 
 [node name="InputPlumber" type="Node" parent="."]

core/systems/launcher/launcher.gd

@@ -5,7 +5,7 @@ class_name Launcher
 @export var launch_manager := preload("res://core/global/launch_manager.tres") as LaunchManager
 
 @onready var overlay_display = OS.get_environment("DISPLAY")
-
+@onready var input_manager := get_tree().get_first_node_in_group("input_manager") as InputManager
 
 func _init() -> void:
 	launch_manager._load_persist_data()
@@ -18,3 +18,6 @@ func _ready() -> void:
 	timer.wait_time = 1
 	timer.timeout.connect(launch_manager.check_running)
 	add_child(timer)
+
+	# Give the launch manager access to the input manager
+	launch_manager.setup(input_manager)

core/ui/card_ui/card_ui.gd

@@ -33,6 +33,7 @@ var overlay_window_id := 0
 @onready var fade_texture := $%FadeTexture as TextureRect
 @onready var power_timer := $%PowerTimer as Timer
 @onready var settings_menu := $%SettingsMenu as Control
+@onready var input_manager := get_tree().get_first_node_in_group("input_manager") as InputManager
 
 var logger = Log.get_logger("Main", Log.LEVEL.INFO)
 

core/ui/card_ui/gamepad/gamepad_settings.gd

@@ -40,6 +40,7 @@ var logger := Log.get_logger("GamepadSettings", Log.LEVEL.INFO)
 @onready var delete_button := $%DeleteButton as CardIconButton
 @onready var profile_label := $%ProfileNameLabel as Label
 @onready var gamepad_type_dropdown := %GamepadTypeDropdown as Dropdown
+@onready var input_manager := get_tree().get_first_node_in_group("input_manager") as InputManager
 
 
 # Called when the node enters the scene tree for the first time.
@@ -149,7 +150,7 @@ func _on_state_entered(_from: State) -> void:
 	var profile_path: String
 	if not self.library_item:
 		self.profile_label.text = "Global"
-		profile_path = settings_manager.get_value("input", "gamepad_profile", InputPlumber.DEFAULT_GLOBAL_PROFILE) as String
+		profile_path = settings_manager.get_value("input", "gamepad_profile", input_manager.get_default_global_profile_path()) as String
 	else:
 		self.profile_label.text = self.library_item.name
 		profile_path = settings_manager.get_library_value(self.library_item, "gamepad_profile", "") as String
@@ -685,7 +686,7 @@ func _save_profile() -> void:
 func _load_profile(profile_path: String = "") -> InputPlumberProfile:
 	var loaded: InputPlumberProfile
 	if profile_path == "" or not profile_path.ends_with(".json") or not FileAccess.file_exists(profile_path):
-		loaded = InputPlumberProfile.load(InputPlumber.DEFAULT_GLOBAL_PROFILE)
+		loaded = InputPlumberProfile.load(input_manager.get_default_global_profile_path())
 		if not loaded:
 			loaded = InputPlumberProfile.new()
 		if library_item: