RadiantWaveTech/radiantwave-legacy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix text input on kiosk: add keycodeToChar fallback for email/license pages

Browse Source 
The kiosk lacks an input method framework, so SDL2 never generates
TextInputEvent. The WiFi password page already had a keycodeToChar
fallback but email and license key pages did not — characters were
never appended to inputText. Also removes excessive debug logging
from the previous commit.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
NeilClack
2026-03-13 19:27:28 -05:00
co-authored by Claude Opus 4.6
parent 8b0cf81e85
commit df5e64d38a
4 changed files with 52 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/page/wifiSetupPage.go
+1 -26
View File
@@ -14,7 +14,6 @@ import (
"rhemawavetech.com/rhemawave/internal/db"
"rhemawavetech.com/rhemawave/internal/fontManager"
"rhemawavetech.com/rhemawave/internal/keybinds"
"rhemawavetech.com/rhemawave/internal/logger"
"rhemawavetech.com/rhemawave/internal/network"
"rhemawavetech.com/rhemawave/internal/shaderManager"
)
@@ -166,37 +165,24 @@ func (p *WiFiSetupPage) startScan() {
// HandleEvent processes user input.
func (p *WiFiSetupPage) HandleEvent(event *sdl.Event) error {
logger.Info("[WiFiSetupPage.HandleEvent] Event type: %T, isEnteringPassword=%v", (*event), p.isEnteringPassword)
if p.isEnteringPassword && !sdl.IsTextInputActive() {
logger.Info("[WiFiSetupPage.HandleEvent] TextInput not active during password entry, calling enterPasswordMode()")
p.enterPasswordMode()
}
switch e := (*event).(type) {
case *sdl.TextInputEvent:
if p.isEnteringPassword {
text := e.GetText()
if !p.textInputSupported {
// First TextInputEvent: the keyboard fallback already
// handled this character, so just record that text input
// is supported and skip the duplicate append.
logger.Info("[WiFiSetupPage.HandleEvent] TextInputEvent: text=%q, first event — marking textInputSupported=true, skipping duplicate", text)
p.textInputSupported = true
} else {
p.passwordInput += text
logger.Info("[WiFiSetupPage.HandleEvent] TextInputEvent: text=%q, passwordInput length=%d", text, len(p.passwordInput))
p.passwordInput += e.GetText()
p.updatePasswordTexture()
}
}
case *sdl.KeyboardEvent:
eventType := "KEYDOWN"
if e.Type == sdl.KEYUP {
eventType = "KEYUP"
}
logger.Info("[WiFiSetupPage.HandleEvent] KeyboardEvent: type=%s, sym=%d (%s), scancode=%d, mod=0x%04x",
eventType, e.Keysym.Sym, sdl.GetKeyName(e.Keysym.Sym), e.Keysym.Scancode, e.Keysym.Mod)
if e.Type != sdl.KEYDOWN {
return nil
}
@@ -211,11 +197,8 @@ func (p *WiFiSetupPage) HandleEvent(event *sdl.Event) error {
// handlePasswordInput manages keyboard events during password entry.
func (p *WiFiSetupPage) handlePasswordInput(sym sdl.Keycode, mod uint16) {
logger.Info("[WiFiSetupPage.handlePasswordInput] sym=%d (%s), mod=0x%04x, textInputSupported=%v", sym, sdl.GetKeyName(sym), mod, p.textInputSupported)
switch sym {
case sdl.K_RETURN:
logger.Info("[WiFiSetupPage.handlePasswordInput] RETURN pressed, submitting password (length=%d)", len(p.passwordInput))
p.exitPasswordMode()
p.pendingSSID = p.selectedAP.SSID
p.isConnecting = true
@@ -231,11 +214,9 @@ func (p *WiFiSetupPage) handlePasswordInput(sym sdl.Keycode, mod uint16) {
case sdl.K_BACKSPACE:
if len(p.passwordInput) > 0 {
p.passwordInput = p.passwordInput[:len(p.passwordInput)-1]
logger.Info("[WiFiSetupPage.handlePasswordInput] BACKSPACE: passwordInput length=%d", len(p.passwordInput))
p.updatePasswordTexture()
}
case sdl.K_ESCAPE:
logger.Info("[WiFiSetupPage.handlePasswordInput] ESCAPE pressed, cancelling password entry")
p.isEnteringPassword = false
p.pendingSSID = ""
p.connectionError = ""
@@ -247,10 +228,7 @@ func (p *WiFiSetupPage) handlePasswordInput(sym sdl.Keycode, mod uint16) {
if !p.textInputSupported {
if ch := keycodeToChar(sym, mod); ch != 0 {
p.passwordInput += string(ch)
logger.Info("[WiFiSetupPage.handlePasswordInput] keycodeToChar fallback: char=%q, passwordInput length=%d", string(ch), len(p.passwordInput))
p.updatePasswordTexture()
} else {
logger.Info("[WiFiSetupPage.handlePasswordInput] keycodeToChar fallback: non-printable key, ignored")
}
}
}
@@ -258,15 +236,12 @@ func (p *WiFiSetupPage) handlePasswordInput(sym sdl.Keycode, mod uint16) {
// enterPasswordMode disables global keybinds and starts SDL text input.
func (p *WiFiSetupPage) enterPasswordMode() {
logger.Info("[WiFiSetupPage.enterPasswordMode] Calling StartTextInput(), disabling keybinds")
keybinds.Enabled = false
sdl.StartTextInput()
logger.Info("[WiFiSetupPage.enterPasswordMode] After StartTextInput: IsTextInputActive=%v", sdl.IsTextInputActive())
}
// exitPasswordMode re-enables global keybinds and stops SDL text input.
func (p *WiFiSetupPage) exitPasswordMode() {
logger.Info("[WiFiSetupPage.exitPasswordMode] Calling StopTextInput(), re-enabling keybinds")
keybinds.Enabled = true
sdl.StopTextInput()
}