idk richtext stuff

addons/controller_icons/ControllerIcons.gd

@@ -86,7 +86,7 @@ func _enter_tree():
 		_parse_input_actions()
 
 func _exit_tree():
-	Mapper.queue_free()
+	Mapper = null
 
 func _parse_input_actions():
 	_custom_input_actions.clear()
@@ -189,10 +189,13 @@ func refresh():
 func get_joypad_type(controller: int = _last_controller) -> ControllerSettings.Devices:
 	return Mapper._get_joypad_type(controller, _settings.joypad_fallback)
 
-func parse_path(path: String, input_type = _last_input_type, last_controller = _last_controller) -> Texture:
+func get_last_input_type() -> InputType:
+	return _last_input_type
+
+func parse_path(path: String, input_type = _last_input_type, last_controller = _last_controller, forced_controller_icon_style = ControllerSettings.Devices.NONE) -> Texture:
 	if typeof(input_type) == TYPE_NIL:
 		return null
-	var root_paths := _expand_path(path, input_type, last_controller)
+	var root_paths := _expand_path(path, input_type, last_controller, forced_controller_icon_style)
 	for root_path in root_paths:
 		if _load_icon(root_path):
 			continue
@@ -228,6 +231,7 @@ func parse_event_modifiers(event: InputEvent) -> Array[Texture]:
 		for icon_path in _expand_path(modifier, InputType.KEYBOARD_MOUSE, -1):
 			if _load_icon(icon_path) == OK:
 				icons.push_back(_cached_icons[icon_path])
+				break
 
 	return icons
 
@@ -270,7 +274,7 @@ func get_matching_event(path: String, input_type: InputType = _last_input_type,
 	else:
 		events = InputMap.action_get_events(path)
 
-	var fallback = null
+	var fallbacks = []
 	for event in events:
 		if not is_instance_valid(event): continue
 
@@ -283,13 +287,15 @@ func get_matching_event(path: String, input_type: InputType = _last_input_type,
 					# Use the first device specific mapping if there is one.
 					if event.device == controller:
 						return event
-					# Otherwise use the first "all devices" mapping.
-					elif fallback == null and event.device < 0:
-						fallback = event
+					# Otherwise, we create a fallback prioritizing events with 'ALL_DEVICE' 
+					if event.device < 0: # All-device event
+						fallbacks.push_front(event)
+					else:
+						fallbacks.push_back(event)
 
-	return fallback
+	return fallbacks[0] if not fallbacks.is_empty() else null
 
-func _expand_path(path: String, input_type: int, controller: int) -> Array:
+func _expand_path(path: String, input_type: int, controller: int, forced_controller_icon_style = ControllerSettings.Devices.NONE) -> Array:
 	var paths := []
 	var base_paths := [
 		_settings.custom_asset_dir + "/",
@@ -298,20 +304,20 @@ func _expand_path(path: String, input_type: int, controller: int) -> Array:
 	for base_path in base_paths:
 		if base_path.is_empty():
 			continue
-		base_path += _convert_path_to_asset_file(path, input_type, controller)
+		base_path += _convert_path_to_asset_file(path, input_type, controller, forced_controller_icon_style)
 
 		paths.push_back(base_path + "." + _base_extension)
 	return paths
 
-func _convert_path_to_asset_file(path: String, input_type: int, controller: int) -> String:
+func _convert_path_to_asset_file(path: String, input_type: int, controller: int, forced_controller_icon_style = ControllerSettings.Devices.NONE) -> String:
 	match get_path_type(path):
 		PathType.INPUT_ACTION:
 			var event := get_matching_event(path, input_type, controller)
 			if event:
-				return _convert_event_to_path(event)
+				return _convert_event_to_path(event, controller, forced_controller_icon_style)
 			return path
 		PathType.JOYPAD_PATH:
-			return Mapper._convert_joypad_path(path, controller, _settings.joypad_fallback)
+			return Mapper._convert_joypad_path(path, controller, _settings.joypad_fallback, forced_controller_icon_style)
 		PathType.SPECIFIC_PATH, _:
 			return path
 
@@ -372,7 +378,7 @@ func _convert_asset_file_to_tts(path: String) -> String:
 		_:
 			return path
 
-func _convert_event_to_path(event: InputEvent):
+func _convert_event_to_path(event: InputEvent, controller: int = _last_controller, forced_controller_icon_style = ControllerSettings.Devices.NONE):
 	if event is InputEventKey:
 		# If this is a physical key, convert to localized scancode
 		if event.keycode == 0:
@@ -381,9 +387,9 @@ func _convert_event_to_path(event: InputEvent):
 	elif event is InputEventMouseButton:
 		return _convert_mouse_button_to_path(event.button_index)
 	elif event is InputEventJoypadButton:
-		return _convert_joypad_button_to_path(event.button_index, event.device)
+		return _convert_joypad_button_to_path(event.button_index, controller, forced_controller_icon_style)
 	elif event is InputEventJoypadMotion:
-		return _convert_joypad_motion_to_path(event.axis, event.device)
+		return _convert_joypad_motion_to_path(event.axis, controller, forced_controller_icon_style)
 
 func _convert_key_to_path(scancode: int):
 	match scancode:
@@ -615,7 +621,7 @@ func _convert_mouse_button_to_path(button_index: int):
 		_:
 			return "mouse/sample"
 
-func _convert_joypad_button_to_path(button_index: int, controller: int):
+func _convert_joypad_button_to_path(button_index: int, controller: int, forced_controller_icon_style = ControllerSettings.Devices.NONE):
 	var path
 	match button_index:
 		JOY_BUTTON_A:
@@ -652,9 +658,9 @@ func _convert_joypad_button_to_path(button_index: int, controller: int):
 			path = "joypad/share"
 		_:
 			return ""
-	return Mapper._convert_joypad_path(path, controller, _settings.joypad_fallback)
+	return Mapper._convert_joypad_path(path, controller, _settings.joypad_fallback, forced_controller_icon_style)
 
-func _convert_joypad_motion_to_path(axis: int, controller: int):
+func _convert_joypad_motion_to_path(axis: int, controller: int, forced_controller_icon_style = ControllerSettings.Devices.NONE):
 	var path : String
 	match axis:
 		JOY_AXIS_LEFT_X, JOY_AXIS_LEFT_Y:
@@ -667,7 +673,7 @@ func _convert_joypad_motion_to_path(axis: int, controller: int):
 			path = "joypad/rt"
 		_:
 			return ""
-	return Mapper._convert_joypad_path(path, controller, _settings.joypad_fallback)
+	return Mapper._convert_joypad_path(path, controller, _settings.joypad_fallback, forced_controller_icon_style)
 
 func _load_icon(path: String) -> int:
 	if _cached_icons.has(path): return OK

addons/controller_icons/ControllerIcons.gd.uid

@@ -1 +1 @@
-uid://cxxl7e1hu587n
+uid://b06g4dpg627b5

addons/controller_icons/ControllerSettings.gd

@@ -3,6 +3,7 @@ extends Resource
 class_name ControllerSettings
 
 enum Devices {
+	NONE = -1,
 	LUNA,
 	OUYA,
 	PS3,

addons/controller_icons/ControllerSettings.gd.uid

@@ -0,0 +1 @@
+uid://bih8ls5msy63l

addons/controller_icons/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 Ricardo Subtil
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

addons/controller_icons/Mapper.gd

@@ -1,8 +1,8 @@
-extends Node
+extends RefCounted
 class_name ControllerMapper
 
-func _convert_joypad_path(path: String, device: int, fallback: ControllerSettings.Devices) -> String:
-	match _get_joypad_type(device, fallback):
+func _convert_joypad_path(path: String, device: int, fallback: ControllerSettings.Devices, force_controller_icon_style = ControllerSettings.Devices.NONE) -> String:
+	match _get_joypad_type(device, fallback, force_controller_icon_style):
 		ControllerSettings.Devices.LUNA:
 			return _convert_joypad_to_luna(path)
 		ControllerSettings.Devices.PS3:
@@ -32,7 +32,9 @@ func _convert_joypad_path(path: String, device: int, fallback: ControllerSetting
 		_:
 			return ""
 
-func _get_joypad_type(device, fallback):
+func _get_joypad_type(device, fallback, force_controller_icon_style):
+	if force_controller_icon_style != ControllerSettings.Devices.NONE:
+		return force_controller_icon_style
 	var available = Input.get_connected_joypads()
 	if available.is_empty():
 		return fallback
@@ -264,7 +266,7 @@ func _convert_joypad_to_steamdeck(path: String):
 		"rt":
 			return path.replace("/rt", "/r2")
 		"select":
-			return path.replace("/select", "/square")
+			return path.replace("/select", "/inventory")
 		"start":
 			return path.replace("/start", "/menu")
 		"home":

addons/controller_icons/Mapper.gd.uid

@@ -1 +1 @@
-uid://dtgqdoflwmo0b
+uid://5wx82aghglqr

addons/controller_icons/Settings.gd.uid

@@ -1 +0,0 @@
-uid://dygveqy02jjgx

addons/controller_icons/assets/steamdeck/inventory.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://ds5yo8kn81uem"
+path="res://.godot/imported/inventory.png-2e96b194d1562d723597b2d307313c1b.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://addons/controller_icons/assets/steamdeck/inventory.png"
+dest_files=["res://.godot/imported/inventory.png-2e96b194d1562d723597b2d307313c1b.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

addons/controller_icons/objects/Button.gd.uid

@@ -1 +1 @@
-uid://lm0qpml4w2mx
+uid://jcpjcl10iatx

addons/controller_icons/objects/ControllerIconEditorInspector.gd.uid

@@ -1 +1 @@
-uid://dkn6l8tlu56d8
+uid://xp37xj8kduow

addons/controller_icons/objects/ControllerIconPathEditorProperty.gd.uid

@@ -1 +1 @@
-uid://sg5ntoaywgfd
+uid://r1qngdbv7gh4

addons/controller_icons/objects/ControllerIconPathSelector.gd.uid

@@ -1 +1 @@
-uid://125nay2twqlr
+uid://bsynmd02318ph

addons/controller_icons/objects/ControllerIconPathSelectorPopup.gd.uid

@@ -1 +1 @@
-uid://d1hrxvtfr4t5w
+uid://da3havxu352nb

addons/controller_icons/objects/ControllerIconTexture.gd

@@ -50,7 +50,7 @@ class_name ControllerIconTexture
 ## # res://addons/controller_icons/assets/steam/gyro.png
 ## path = "steam/gyro"
 ## [/codeblock]
-@export var path : String = "":
+@export var path: String = "":
 	set(_path):
 		path = _path
 		_load_texture_path()
@@ -63,15 +63,29 @@ enum ShowMode {
 
 ## Show the icon only if a specific input method is being used. When hidden, 
 ## the icon will not occupy have any space (no width and height).
-@export var show_mode : ShowMode = ShowMode.ANY:
+@export var show_mode: ShowMode = ShowMode.ANY:
 	set(_show_mode):
 		show_mode = _show_mode
 		_load_texture_path()
 
+
+## Forces the icon to show a specific controller style, regardless of the
+## currently used controller type.
+##[br][br]
+## This will override force_device if set to a value other than NONE.
+##[br][br]
+## This is only relevant for paths using input actions, and has no effect on
+## other scenarios.
+
+@export var force_controller_icon_style: ControllerSettings.Devices = ControllerSettings.Devices.NONE:
+	set(_force_controller_icon_style):
+		force_controller_icon_style = _force_controller_icon_style
+		_load_texture_path()
+
 enum ForceType {
 	NONE, ## Icon will swap according to the used input method.
 	KEYBOARD_MOUSE, ## Icon will always show the keyboard/mouse action.
-	CONTROLLER, ## Icon will always show the controller action. 
+	CONTROLLER, ## Icon will always show the controller action.
 }
 
 ## Forces the icon to show either the keyboard/mouse or controller icon,
@@ -79,14 +93,42 @@ enum ForceType {
 ##[br][br]
 ## This is only relevant for paths using input actions, and has no effect on
 ## other scenarios.
-@export var force_type : ForceType = ForceType.NONE:
+@export var force_type: ForceType = ForceType.NONE:
 	set(_force_type):
 		force_type = _force_type
 		_load_texture_path()
 
+enum ForceDevice {
+	DEVICE_0,
+	DEVICE_1,
+	DEVICE_2,
+	DEVICE_3,
+	DEVICE_4,
+	DEVICE_5,
+	DEVICE_6,
+	DEVICE_7,
+	DEVICE_8,
+	DEVICE_9,
+	DEVICE_10,
+	DEVICE_11,
+	DEVICE_12,
+	DEVICE_13,
+	DEVICE_14,
+	DEVICE_15,
+	ANY # No device will be forced
+}
+
+## Forces the icon to use the textures for the device connected at the specified index.
+## For example, if a PlayStation 5 controller is connected at device_index 0,
+## the icon will always show PlayStation 5 textures.
+@export var force_device: ForceDevice = ForceDevice.ANY:
+	set(_force_device):
+		force_device = _force_device
+		_load_texture_path()
+
 @export_subgroup("Text Rendering")
 ## Custom LabelSettings. If set, overrides the addon's global label settings.
-@export var custom_label_settings : LabelSettings:
+@export var custom_label_settings: LabelSettings:
 	set(_custom_label_settings):
 		custom_label_settings = _custom_label_settings
 		_load_texture_path()
@@ -117,7 +159,7 @@ func _can_be_shown():
 		0, _:
 			return true
 
-var _textures : Array[Texture2D]:
+var _textures: Array[Texture2D]:
 	set(__textures):
 		# UPGRADE: In Godot 4.2, for-loop variables can be
 		# statically typed:
@@ -147,9 +189,9 @@ var _textures : Array[Texture2D]:
 			if tex:
 				tex.connect("changed", _reload_resource)
 
-var _font : Font
-var _label_settings : LabelSettings
-var _text_size : Vector2
+var _font: Font
+var _label_settings: LabelSettings
+var _text_size: Vector2
 
 func _on_label_settings_changed():
 	_font = ThemeDB.fallback_font if not _label_settings.font else _label_settings.font
@@ -161,13 +203,14 @@ func _reload_resource():
 	emit_changed()
 
 func _load_texture_path_impl():
-	var textures : Array[Texture2D] = []
+	var textures: Array[Texture2D] = []
 	if ControllerIcons.is_node_ready() and _can_be_shown():
 		var input_type = ControllerIcons._last_input_type if force_type == ForceType.NONE else force_type - 1
 		if ControllerIcons.get_path_type(path) == ControllerIcons.PathType.INPUT_ACTION:
 			var event := ControllerIcons.get_matching_event(path, input_type)
 			textures.append_array(ControllerIcons.parse_event_modifiers(event))
-		var tex := ControllerIcons.parse_path(path, input_type)
+		var target_device = force_device if force_device != ForceDevice.ANY else ControllerIcons._last_controller
+		var tex := ControllerIcons.parse_path(path, input_type, target_device, force_controller_icon_style)
 		if tex:
 			textures.append(tex)
 	_textures = textures
@@ -200,7 +243,7 @@ func _get_width() -> int:
 			return accum
 		, 0)
 		if _label_settings:
-			ret += max(0, _textures.size()-1) * _text_size.x
+			ret += max(0, _textures.size() - 1) * _text_size.x
 		# If ret is 0, return a size of 2 to prevent triggering engine checks
 		# for null sizes. The correct size will be set at a later frame.
 		return ret if ret > 0 else _NULL_SIZE
@@ -235,7 +278,7 @@ func _draw(to_canvas_item: RID, pos: Vector2, modulate: Color, transpose: bool):
 	var position := pos
 
 	for i in range(_textures.size()):
-		var tex:Texture2D = _textures[i]
+		var tex: Texture2D = _textures[i]
 		if !tex: continue
 
 		if i != 0:
@@ -256,7 +299,7 @@ func _draw_rect(to_canvas_item: RID, rect: Rect2, tile: bool, modulate: Color, t
 	var height_ratio := rect.size.y / _get_height()
 
 	for i in range(_textures.size()):
-		var tex:Texture2D = _textures[i]
+		var tex: Texture2D = _textures[i]
 		if !tex: continue
 
 		if i != 0:
@@ -278,7 +321,7 @@ func _draw_rect_region(to_canvas_item: RID, rect: Rect2, src_rect: Rect2, modula
 	var height_ratio := rect.size.y / _get_height()
 
 	for i in range(_textures.size()):
-		var tex:Texture2D = _textures[i]
+		var tex: Texture2D = _textures[i]
 		if !tex: continue
 
 		if i != 0:
@@ -314,15 +357,15 @@ func _draw_text(to_canvas_item: RID, font_position: Vector2, text: String):
 			_font.draw_string_outline(to_canvas_item, font_position, text, HORIZONTAL_ALIGNMENT_LEFT, -1, _label_settings.font_size, _label_settings.outline_size, _label_settings.outline_color)
 	_font.draw_string(to_canvas_item, font_position, text, HORIZONTAL_ALIGNMENT_CENTER, -1, _label_settings.font_size, _label_settings.font_color)
 
-var _helper_viewport : Viewport
-var _is_stitching_texture : bool = false
+var _helper_viewport: Viewport
+var _is_stitching_texture: bool = false
 func _stitch_texture():
 	if _textures.is_empty():
 		return
 
 	_is_stitching_texture = true
 
-	var font_image : Image
+	var font_image: Image
 	if _textures.size() > 1:
 		# Generate a viewport to draw the text
 		_helper_viewport = SubViewport.new()
@@ -345,7 +388,7 @@ func _stitch_texture():
 		_helper_viewport.free()
 
 	var position := Vector2i(0, 0)
-	var img : Image
+	var img: Image
 	for i in range(_textures.size()):
 		if !_textures[i]: continue
 
@@ -375,7 +418,7 @@ func _stitch_texture():
 # This is necessary for 3D sprites, as the texture is assigned to a material, and not drawn directly.
 # For multi prompts, we need to generate a texture
 var _dirty := true
-var _texture_3d : Texture
+var _texture_3d: Texture
 func _get_rid():
 	if _dirty:
 		if not _is_stitching_texture:

addons/controller_icons/objects/ControllerIconTexture.gd.uid

@@ -1 +1 @@
-uid://ddxpo5u73ssi2
+uid://cxab4gf8nejc2

addons/controller_icons/objects/Sprite.gd.uid

@@ -1 +1 @@
-uid://k2tud3diool
+uid://dlwwg6hbxcg6r

addons/controller_icons/objects/Sprite3D.gd.uid

@@ -1 +1 @@
-uid://bpos4yaigyeqr
+uid://dns2c4458ekvc

addons/controller_icons/objects/TextureRect.gd.uid

@@ -1 +1 @@
-uid://dmp4w4ojx7klt
+uid://cispm18xp24wt

addons/controller_icons/objects/path_selection/InputActionSelector.gd.uid

@@ -1 +1 @@
-uid://bu8t48xqekc8o
+uid://c6lqhrewwbp61

addons/controller_icons/objects/path_selection/JoypadPathSelector.gd.uid

@@ -1 +1 @@
-uid://da1ors8v36hv3
+uid://texv8inbqrdh

addons/controller_icons/objects/path_selection/SpecificPathSelector.gd.uid

@@ -1 +1 @@
-uid://dt82cmmp3uy7l
+uid://wnl1k7337x2u

addons/controller_icons/plugin.cfg

@@ -3,5 +3,5 @@
 name="Controller Icons"
 description="Provides icons for all major controllers and keyboard, with automatic icon remapping."
 author="rsubtil"
-version="3.1.4"
+version="3.1.5"
 script="plugin.gd"

addons/controller_icons/plugin.gd.uid

@@ -1 +1 @@
-uid://cajvrhetudhyg
+uid://xvjobdx0h3gi

addons/controller_icons/settings.tres

@@ -1,6 +1,6 @@
 [gd_resource type="Resource" script_class="ControllerSettings" load_steps=2 format=3 uid="uid://dolsrvh5w47et"]
 
-[ext_resource type="Script" path="res://addons/controller_icons/Settings.gd" id="1"]
+[ext_resource type="Script" path="res://addons/controller_icons/ControllerSettings.gd" id="1"]
 
 [resource]
 script = ExtResource("1")