feat: ignore window change in the same app to reduce change event

Author: icyleaf

Makefile

@@ -55,7 +55,7 @@ test:
 @go test ./...
 
 # Run with development config
-run-dev: build
+run-dev: clean build
 @echo "Running with development config..."
 @./$(BUILD_DIR)/$(BINARY_NAME) --config=./$(CONFIG_DIR)/default.yaml --log-level=debug
 

internal/app/app.go

@@ -2,15 +2,10 @@ package app
 
 import (
 "context"
-"encoding/json"
 "fmt"
 "os"
-"os/exec"
 "os/signal"
-"regexp"
-"strings"
 "syscall"
-"time"
 
 "hypr-input-switcher/internal/config"
 "hypr-input-switcher/internal/inputmethod"
@@ -22,8 +17,6 @@ import (
 type Application struct {
 config *config.Config
 configManager *config.Manager
-currentClient string
-currentIM string
 switcher *inputmethod.Switcher
 notifier *notification.Notifier
 watchConfig bool
@@ -54,6 +47,9 @@ func (app *Application) Run(configPath string, watchConfig bool) error {
 app.switcher = inputmethod.NewSwitcher(cfg)
 app.notifier = notification.NewNotifier(cfg)
 
+// Set notifier for switcher
+app.switcher.SetNotifier(app.notifier)
+
 // Register config change callback
 app.configManager.AddCallback(app.onConfigChanged)
 
@@ -91,8 +87,8 @@ func (app *Application) Run(configPath string, watchConfig bool) error {
 cancel()
 }()
 
-// Start monitoring
-return app.monitorAndSwitch(ctx)
+// Use switcher's monitoring loop instead of our own
+return app.switcher.MonitorAndSwitch(ctx)
 }
 
 // onConfigChanged handles configuration changes
@@ -108,124 +104,8 @@ func (app *Application) onConfigChanged(newConfig *config.Config) {
 // Recreate notifier with new config
 app.notifier = notification.NewNotifier(newConfig)
 
-// Reset current client to force re-evaluation
-app.currentClient = ""
+// Set notifier for switcher
+app.switcher.SetNotifier(app.notifier)
 
 logger.Info("Configuration applied successfully")
 }
-
-// getCurrentClient gets current active window information
-func (app *Application) getCurrentClient() (*config.WindowInfo, error) {
-cmd := exec.Command("hyprctl", "activewindow", "-j")
-output, err := cmd.Output()
-if err != nil {
-return nil, fmt.Errorf("failed to get active window: %w", err)
-}
-
-var windowInfo config.WindowInfo
-if err := json.Unmarshal(output, &windowInfo); err != nil {
-return nil, fmt.Errorf("failed to parse window info: %w", err)
-}
-
-return &windowInfo, nil
-}
-
-// getTargetInputMethod determines target input method based on client information
-func (app *Application) getTargetInputMethod(clientInfo *config.WindowInfo) string {
-// Get current config (thread-safe)
-currentConfig := app.configManager.GetConfig()
-
-if clientInfo == nil {
-return currentConfig.DefaultInputMethod
-}
-
-className := clientInfo.Class
-title := clientInfo.Title
-
-// Check client rules
-for _, rule := range currentConfig.ClientRules {
-// Match class (required)
-if rule.Class == "" || !app.matchPattern(rule.Class, className) {
-continue
-}
-
-// If title is empty or not specified, class match is enough
-if rule.Title == "" {
-return rule.InputMethod
-}
-
-// If title is specified, both class and title must match
-if app.matchPattern(rule.Title, title) {
-return rule.InputMethod
-}
-}
-
-return currentConfig.DefaultInputMethod
-}
-
-// matchPattern matches pattern, supporting regex and string matching
-func (app *Application) matchPattern(pattern, text string) bool {
-if pattern == "" || text == "" {
-return false
-}
-
-// Try as regex first
-if matched, err := regexp.MatchString(pattern, text); err == nil {
-return matched
-}
-
-// Fallback to string contains matching
-return strings.Contains(strings.ToLower(text), strings.ToLower(pattern))
-}
-
-// monitorAndSwitch main monitoring loop
-func (app *Application) monitorAndSwitch(ctx context.Context) error {
-ticker := time.NewTicker(200 * time.Millisecond)
-defer ticker.Stop()
-
-for {
-select {
-case <-ctx.Done():
-return nil
-
-case <-ticker.C:
-// Get current active window
-clientInfo, err := app.getCurrentClient()
-if err != nil {
-logger.Debugf("Failed to get current client: %v", err)
-continue
-}
-
-currentClient := fmt.Sprintf("%s:%s", clientInfo.Class, clientInfo.Title)
-
-// If window changed
-if currentClient != app.currentClient {
-app.currentClient = currentClient
-
-// Get current input method status
-currentIM := app.switcher.GetCurrent()
-
-// Determine target input method
-targetIM := app.getTargetInputMethod(clientInfo)
-
-logger.Infof("Window changed: %s - %s", clientInfo.Class, clientInfo.Title)
-logger.Infof("Current IM: %s -> Target IM: %s", currentIM, targetIM)
-
-// If input method needs to be switched
-if currentIM != targetIM && currentIM != "unknown" {
-if err := app.switcher.Switch(targetIM); err != nil {
-logger.Errorf("Failed to switch input method to %s: %v", targetIM, err)
-} else {
-logger.Infof("Switched input method to: %s", targetIM)
-
-// Show notification (use current config)
-currentConfig := app.configManager.GetConfig()
-if currentConfig.Notifications.ShowOnSwitch {
-app.notifier.ShowInputMethodSwitch(targetIM, clientInfo)
-}
-}
-}
-}
-}
-}
-}

internal/inputmethod/switcher.go

@@ -14,21 +14,25 @@ import (
 )
 
 type Switcher struct {
-currentClient string
+currentClient *ClientInfo
 currentIM string
 config *config.Config
 fcitx5 *Fcitx5
 rime *Rime
+notifier interface {
+ShowInputMethodSwitch(inputMethod string, clientInfo *config.WindowInfo)
+} // Add notifier interface
 }
 
 type ClientInfo struct {
-Class string `json:"class"`
-Title string `json:"title"`
+Address string `json:"address"`
+Class string `json:"class"`
+Title string `json:"title"`
 }
 
 func NewSwitcher(cfg *config.Config) *Switcher {
 switcher := &Switcher{
-currentClient: "",
+currentClient: &ClientInfo{},
 currentIM: "",
 config: cfg,
 }
@@ -42,6 +46,13 @@ func NewSwitcher(cfg *config.Config) *Switcher {
 return switcher
 }
 
+// SetNotifier sets the notifier for the switcher
+func (s *Switcher) SetNotifier(notifier interface {
+ShowInputMethodSwitch(inputMethod string, clientInfo *config.WindowInfo)
+}) {
+s.notifier = notifier
+}
+
 func (s *Switcher) MonitorAndSwitch(ctx context.Context) error {
 logger.Info("Starting Hyprland input method switcher...")
 
@@ -68,19 +79,17 @@ func (s *Switcher) processCurrentWindow() error {
 return fmt.Errorf("failed to get current client: %w", err)
 }
 
-currentClient := fmt.Sprintf("%s:%s", clientInfo.Class, clientInfo.Title)
-
-// If window changed
-if currentClient != s.currentClient {
-s.currentClient = currentClient
+// If window changed (different address means different window)
+if clientInfo.Address != s.currentClient.Address {
+s.currentClient = clientInfo
 
 // Get current input method status
 currentIM := s.GetCurrent()
 
 // Determine target input method
 targetIM := s.getTargetInputMethod(clientInfo)
 
-logger.Infof("Window changed: %s - %s", clientInfo.Class, clientInfo.Title)
+logger.Infof("Window changed: %s - %s (address: %s)", clientInfo.Class, clientInfo.Title, clientInfo.Address)
 logger.Infof("Current IM: %s -> Target IM: %s", currentIM, targetIM)
 
 // If input method needs to be switched
@@ -91,6 +100,16 @@ func (s *Switcher) processCurrentWindow() error {
 
 logger.Infof("Switched input method to: %s", targetIM)
 s.currentIM = targetIM
+
+// Show notification if notifier is available and enabled
+if s.notifier != nil && s.config.Notifications.ShowOnSwitch {
+// Convert ClientInfo to config.WindowInfo
+windowInfo := &config.WindowInfo{
+Class: clientInfo.Class,
+Title: clientInfo.Title,
+}
+s.notifier.ShowInputMethodSwitch(targetIM, windowInfo)
+}
 }
 }
 
@@ -228,7 +247,7 @@ func (s *Switcher) IsReady() bool {
 // GetStatus returns current status information
 func (s *Switcher) GetStatus() map[string]interface{} {
 status := map[string]interface{}{
-"current_client": s.currentClient,
+"current_client": s.currentClient, // Now contains the window address
 "current_im": s.currentIM,
 "fcitx5_enabled": s.config.Fcitx5.Enabled,
 "ready": s.IsReady(),