From 385af59e9f180c599cdb03da0b662be05a2a2dc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Resul=20=C3=96v=C3=BCr?= <92828257+ovurrsl@users.noreply.github.com> Date: Tue, 20 Oct 2026 23:53:22 +0300 Subject: [PATCH] fix: Steam Touch labels no longer corrupt the controller config (#1017) --- .../launcher/input/SteamTouchBindings.kt | 7 +++++-- .../launcher/input/SteamTouchIconPicker.kt | 4 ++-- .../launcher/input/SteamTouchBindingsTest.kt | 16 ++++++++++++++++ 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/input/SteamTouchBindings.kt b/app/src/main/java/com/droiddeck/launcher/input/SteamTouchBindings.kt index 4d19cb87d6..697b768aa8 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/SteamTouchBindings.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/SteamTouchBindings.kt @@ -16,10 +16,13 @@ object SteamTouchBindings { const val DEFAULT_FOREGROUND = "#232323" const val DEFAULT_BACKGROUND = "#E4E4E4" + fun cleanLabel(raw: String): String = + raw.replace(Regex("""["\\,\p{Cntrl}]"""), " ").replace(Regex("""\s+"""), " ").trim().let { it.take(it.offsetByCodePoints(0, minOf(32, it.codePointCount(0, it.length)))) } + data class Binding(val action: String, val label: String, val icon: String, val foreground: String, val background: String) { fun compose(): String = - if (icon.isEmpty() && foreground.isEmpty() && background.isEmpty()) "$action, $label, " - else "$action, $label, $icon, ${listOf(foreground, background).filter { it.isNotEmpty() }.joinToString(" ")}" + if (icon.isEmpty() && foreground.isEmpty() && background.isEmpty()) "$action, ${cleanLabel(label)}, " + else "$action, ${cleanLabel(label)}, $icon, ${listOf(foreground, background).filter { it.isNotEmpty() }.joinToString(" ")}" val hasIcon get() = icon.isNotEmpty() } diff --git a/app/src/main/java/com/droiddeck/launcher/input/SteamTouchIconPicker.kt b/app/src/main/java/com/droiddeck/launcher/input/SteamTouchIconPicker.kt index 17d665f503..da74416bf0 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/SteamTouchIconPicker.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/SteamTouchIconPicker.kt @@ -84,11 +84,11 @@ class SteamTouchIconPicker( updatePreview(preview) showPanel(host, title, root, listOf( context.getString(R.string.touch_no_icon) to { - onPicked(current.copy(label = label.text.toString().replace(",", " ").trim(), icon = "", foreground = "", background = "")) + onPicked(current.copy(label = SteamTouchBindings.cleanLabel(label.text.toString()), icon = "", foreground = "", background = "")) }, context.getString(R.string.common_cancel) to {}, context.getString(R.string.common_use) to { - onPicked(current.copy(label = label.text.toString().replace(",", " ").trim(), icon = icon, + onPicked(current.copy(label = SteamTouchBindings.cleanLabel(label.text.toString()), icon = icon, foreground = if (icon.isEmpty()) "" else foreground, background = if (icon.isEmpty()) "" else background)) }, )) { loader.shutdown() } diff --git a/app/src/test/java/com/droiddeck/launcher/input/SteamTouchBindingsTest.kt b/app/src/test/java/com/droiddeck/launcher/input/SteamTouchBindingsTest.kt index 0ad76cb700..5ce1de6328 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/SteamTouchBindingsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/SteamTouchBindingsTest.kt @@ -115,4 +115,20 @@ class SteamTouchBindingsTest { assertEquals("Jump", SteamTouchBindings.bindingAt(reparsed, ref)!!.label) assertNull(SteamTouchBindings.rewrite(config, SteamTouchBindings.Ref("5", "button_a")) { it }) } + + @Test + fun labelsDropQuotesBackslashesCommasAndControls() { + assertEquals("a b c d e", SteamTouchBindings.cleanLabel("a\"b\\c,d\n e")) + assertEquals(32, SteamTouchBindings.cleanLabel("x".repeat(40)).length) + val b = SteamTouchBindings.Binding("key_press SPACE", "Ju\"mp", "", "", "") + assertEquals("Ju mp", SteamTouchBindings.parse(b.compose()).label) + val comma = SteamTouchBindings.Binding("key_press SPACE", "Jump,Run", "icon", "#FFFFFF", "") + assertEquals(SteamTouchBindings.Binding("key_press SPACE", "Jump Run", "icon", "#FFFFFF", ""), SteamTouchBindings.parse(comma.compose())) + } + + @Test + fun labelsAreCutAtACharacterBoundary() { + val label = SteamTouchBindings.cleanLabel("a".repeat(31) + "🎮" + "b") + assertEquals("a".repeat(31) + "🎮", label) + } }