From 8b0cf81e85477cd84bd375508d816121bb06ce83 Mon Sep 17 00:00:00 2001 From: NeilClack Date: Fri, 13 Mar 2026 19:07:34 -0500 Subject: [PATCH] Add input logging --- internal/application/application.go | 10 ++++++++++ internal/page/emailAddressPage.go | 25 +++++++++++++++++++++++-- internal/page/licenseKeyPage.go | 24 ++++++++++++++++++++++-- internal/page/wifiSetupPage.go | 27 ++++++++++++++++++++++++++- 4 files changed, 81 insertions(+), 5 deletions(-) diff --git a/internal/application/application.go b/internal/application/application.go index edb6023..a834d72 100644 --- a/internal/application/application.go +++ b/internal/application/application.go @@ -378,7 +378,17 @@ func (app *Application) handleEvents() { app.running = false return + case *sdl.TextInputEvent: + logger.Info("[EVENT] TextInputEvent: text=%q, IsTextInputActive=%v", e.GetText(), sdl.IsTextInputActive()) + case *sdl.KeyboardEvent: + eventType := "KEYDOWN" + if e.Type == sdl.KEYUP { + eventType = "KEYUP" + } + logger.Info("[EVENT] KeyboardEvent: type=%s, sym=%d (%s), scancode=%d, mod=0x%04x, IsTextInputActive=%v", + eventType, e.Keysym.Sym, sdl.GetKeyName(e.Keysym.Sym), e.Keysym.Scancode, e.Keysym.Mod, sdl.IsTextInputActive()) + if e.Type == sdl.KEYDOWN && e.Repeat == 0 { isCtrlPressed := (e.Keysym.Mod&sdl.KMOD_CTRL) != 0 || (e.Keysym.Mod&sdl.KMOD_GUI) != 0 if e.Keysym.Sym == sdl.K_c && isCtrlPressed { diff --git a/internal/page/emailAddressPage.go b/internal/page/emailAddressPage.go index f46d50a..2e8015a 100644 --- a/internal/page/emailAddressPage.go +++ b/internal/page/emailAddressPage.go @@ -11,6 +11,7 @@ import ( "rhemawavetech.com/rhemawave/internal/colors" "rhemawavetech.com/rhemawave/internal/db" "rhemawavetech.com/rhemawave/internal/fontManager" + "rhemawavetech.com/rhemawave/internal/logger" "rhemawavetech.com/rhemawave/internal/shaderManager" ) @@ -111,7 +112,9 @@ func (p *EmailAddressPage) Init(app ApplicationInterface) error { p.isFirstTimeSetup = true } + logger.Info("[EmailAddressPage.Init] Calling sdl.StartTextInput(), isFirstTimeSetup=%v", p.isFirstTimeSetup) sdl.StartTextInput() + logger.Info("[EmailAddressPage.Init] After StartTextInput: IsTextInputActive=%v", sdl.IsTextInputActive()) return nil } @@ -119,19 +122,34 @@ func (p *EmailAddressPage) Init(app ApplicationInterface) error { // HandleEvent processes SDL events and handles them appropriately for the EmailAddressPage. func (p *EmailAddressPage) HandleEvent(event *sdl.Event) error { actualEvent := *event - if !sdl.IsTextInputActive() { + logger.Info("[EmailAddressPage.HandleEvent] Event type: %T", actualEvent) + + isActive := sdl.IsTextInputActive() + if !isActive { + logger.Info("[EmailAddressPage.HandleEvent] TextInput not active, calling StartTextInput()") sdl.StartTextInput() + logger.Info("[EmailAddressPage.HandleEvent] After StartTextInput: IsTextInputActive=%v", sdl.IsTextInputActive()) } switch e := actualEvent.(type) { case *sdl.TextInputEvent: - p.inputText += e.GetText() + text := e.GetText() + p.inputText += text + logger.Info("[EmailAddressPage.HandleEvent] TextInputEvent: received=%q, inputText=%q", text, p.inputText) // Clear error when user starts typing p.errorMessage = "" case *sdl.KeyboardEvent: + eventType := "KEYDOWN" + if e.Type == sdl.KEYUP { + eventType = "KEYUP" + } + logger.Info("[EmailAddressPage.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 { switch e.Keysym.Sym { case sdl.K_ESCAPE: + logger.Info("[EmailAddressPage.HandleEvent] ESCAPE pressed, isFirstTimeSetup=%v", p.isFirstTimeSetup) // Block escape during first-time setup if p.isFirstTimeSetup { return nil @@ -140,6 +158,7 @@ func (p *EmailAddressPage) HandleEvent(event *sdl.Event) error { sdl.StopTextInput() p.App.UnwindToPage(&Settings{}) case sdl.K_RETURN: + logger.Info("[EmailAddressPage.HandleEvent] RETURN pressed, inputText=%q", p.inputText) // Validate email - check empty first, then format if p.inputText == "" { p.errorMessage = "Email address cannot be empty" @@ -167,6 +186,7 @@ func (p *EmailAddressPage) HandleEvent(event *sdl.Event) error { case sdl.K_BACKSPACE: if len(p.inputText) > 0 { p.inputText = p.inputText[:len(p.inputText)-1] + logger.Info("[EmailAddressPage.HandleEvent] BACKSPACE: inputText=%q", p.inputText) // Clear error when user edits input p.errorMessage = "" } @@ -390,6 +410,7 @@ func (p *EmailAddressPage) Destroy() error { p.errorTextureID = 0 } + logger.Info("[EmailAddressPage.Destroy] Calling sdl.StopTextInput()") sdl.StopTextInput() return p.Base.Destroy() } diff --git a/internal/page/licenseKeyPage.go b/internal/page/licenseKeyPage.go index d5f1e69..87d124e 100644 --- a/internal/page/licenseKeyPage.go +++ b/internal/page/licenseKeyPage.go @@ -120,7 +120,9 @@ func (p *LicenseKeyPage) Init(app ApplicationInterface) error { p.isFirstTimeSetup = true } + logger.Info("[LicenseKeyPage.Init] Calling sdl.StartTextInput(), isFirstTimeSetup=%v", p.isFirstTimeSetup) sdl.StartTextInput() + logger.Info("[LicenseKeyPage.Init] After StartTextInput: IsTextInputActive=%v", sdl.IsTextInputActive()) return nil } @@ -156,21 +158,36 @@ func formatLicenseKey(input string) string { // HandleEvent processes SDL events and handles them appropriately for the LicenseKeyPage. func (p *LicenseKeyPage) HandleEvent(event *sdl.Event) error { actualEvent := *event - if !sdl.IsTextInputActive() { + logger.Info("[LicenseKeyPage.HandleEvent] Event type: %T", actualEvent) + + isActive := sdl.IsTextInputActive() + if !isActive { + logger.Info("[LicenseKeyPage.HandleEvent] TextInput not active, calling StartTextInput()") sdl.StartTextInput() + logger.Info("[LicenseKeyPage.HandleEvent] After StartTextInput: IsTextInputActive=%v", sdl.IsTextInputActive()) } switch e := actualEvent.(type) { case *sdl.TextInputEvent: + text := e.GetText() // Add the new character and reformat - p.inputText += e.GetText() + p.inputText += text p.inputText = formatLicenseKey(p.inputText) + logger.Info("[LicenseKeyPage.HandleEvent] TextInputEvent: received=%q, inputText=%q", text, p.inputText) // Clear error when user starts typing p.errorMessage = "" case *sdl.KeyboardEvent: + eventType := "KEYDOWN" + if e.Type == sdl.KEYUP { + eventType = "KEYUP" + } + logger.Info("[LicenseKeyPage.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 { switch e.Keysym.Sym { case sdl.K_ESCAPE: + logger.Info("[LicenseKeyPage.HandleEvent] ESCAPE pressed, isFirstTimeSetup=%v", p.isFirstTimeSetup) // Block escape during first-time setup if p.isFirstTimeSetup { return nil @@ -179,6 +196,7 @@ func (p *LicenseKeyPage) HandleEvent(event *sdl.Event) error { sdl.StopTextInput() p.App.UnwindToPage(&Settings{}) case sdl.K_RETURN: + logger.Info("[LicenseKeyPage.HandleEvent] RETURN pressed, inputText=%q", p.inputText) // Validate license key - check empty first, then length, then characters cleaned := strings.ReplaceAll(p.inputText, "-", "") if cleaned == "" { @@ -228,6 +246,7 @@ func (p *LicenseKeyPage) HandleEvent(event *sdl.Event) error { cleaned = cleaned[:len(cleaned)-1] } p.inputText = formatLicenseKey(cleaned) + logger.Info("[LicenseKeyPage.HandleEvent] BACKSPACE: inputText=%q", p.inputText) // Clear error when user edits input p.errorMessage = "" } @@ -453,6 +472,7 @@ func (p *LicenseKeyPage) Destroy() error { p.errorTextureID = 0 } + logger.Info("[LicenseKeyPage.Destroy] Calling sdl.StopTextInput()") sdl.StopTextInput() return p.Base.Destroy() } diff --git a/internal/page/wifiSetupPage.go b/internal/page/wifiSetupPage.go index daf4a75..8b675c7 100644 --- a/internal/page/wifiSetupPage.go +++ b/internal/page/wifiSetupPage.go @@ -14,6 +14,7 @@ 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" ) @@ -165,24 +166,37 @@ 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 += e.GetText() + p.passwordInput += text + logger.Info("[WiFiSetupPage.HandleEvent] TextInputEvent: text=%q, passwordInput length=%d", text, len(p.passwordInput)) 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 } @@ -197,8 +211,11 @@ 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 @@ -214,9 +231,11 @@ 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 = "" @@ -228,7 +247,10 @@ 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") } } } @@ -236,12 +258,15 @@ 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() }