feat: add tcp_port config entry

README.md

@@ -41,6 +41,7 @@ qwerty = "qwerty.ico"
 include_executables_from_system_path = false # default: true
 include_configs_from_default_locations = false # default: true
 launch_on_start = true # default: true
+tcp_port = 5829 # default: 5829
 ```
 
 Notes:

app/app.go

@@ -23,8 +23,10 @@ type SysTrayApp struct {
 	layerIcons     LayerIcons
 	selectedConfig int
 	selectedExec   int
-	cfgChangeCh    chan int
-	exeChangeCh    chan int
+	tcpPort        int
+
+	cfgChangeCh chan int
+	exeChangeCh chan int
 
 	// Menu items
 
@@ -40,8 +42,8 @@ type SysTrayApp struct {
 	mQuit    *systray.MenuItem
 }
 
-func NewSystrayApp(menuTemplate *MenuTemplate, layerIcons LayerIcons) *SysTrayApp {
-	t := &SysTrayApp{menuTemplate: menuTemplate, layerIcons: layerIcons, selectedConfig: -1, selectedExec: -1}
+func NewSystrayApp(menuTemplate *MenuTemplate, layerIcons LayerIcons, tcpPort int) *SysTrayApp {
+	t := &SysTrayApp{menuTemplate: menuTemplate, layerIcons: layerIcons, selectedConfig: -1, selectedExec: -1, tcpPort: tcpPort}
 
 	systray.SetIcon(icons.Default)
 	systray.SetTitle("kanata-tray")
@@ -141,7 +143,7 @@ func (t *SysTrayApp) runWithSelectedOptions(runner *runner.KanataRunner) {
 
 	execPath := t.menuTemplate.Executables[t.selectedExec].Value
 	configPath := t.menuTemplate.Configurations[t.selectedConfig].Value
-	err := runner.Run(execPath, configPath)
+	err := runner.Run(execPath, configPath, t.tcpPort)
 	if err != nil {
 		fmt.Printf("runner.Run failed with: %v\n", err)
 		t.runnerStatus = statusCrashed

config/config.go

@@ -19,6 +19,7 @@ type GeneralConfigOptions struct {
 	IncludeExecutablesFromSystemPath   bool `toml:"include_executables_from_system_path"`
 	IncludeConfigsFromDefaultLocations bool `toml:"include_configs_from_default_locations"`
 	LaunchOnStart                      bool `toml:"launch_on_start"`
+	TcpPort                            int  `toml:"tcp_port"`
 }
 
 func ReadConfigOrCreateIfNotExist(configFilePath string) (*Config, error) {
@@ -68,4 +69,5 @@ executables = [
 include_executables_from_system_path = true
 include_configs_from_default_locations = true
 launch_on_start = true
+tcp_port = 5829
 `

justfile

@@ -3,7 +3,7 @@ just:
     just -l
 
 run:
-    CGO_ENABLED=1 GO111MODULE=on go run . -ldflags "-H=windowsgui"
+    CGO_ENABLED=1 GO111MODULE=on go run .
 
 build_release_linux version="latest":
     GOOS=linux CGO_ENABLED=1 GO111MODULE=on go build -ldflags "-s -w -X 'main.buildVersion={{version}}' -X 'main.buildHash=$(git rev-parse HEAD)' -X 'main.buildDate=$(date -u)'" -trimpath -o dist/kanata-tray

main.go

@@ -70,7 +70,7 @@ func mainImpl() error {
 	runner := runner.NewKanataRunner()
 
 	onReady := func() {
-		app := app.NewSystrayApp(&menuTemplate, layerIcons)
+		app := app.NewSystrayApp(&menuTemplate, layerIcons, cfg.General.TcpPort)
 		go app.StartProcessingLoop(&runner, cfg.General.LaunchOnStart, configFolder)
 	}
 

runner/runner.go

@@ -66,14 +66,12 @@ func (r *KanataRunner) CleanupLogs() error {
 	return nil
 }
 
-func (r *KanataRunner) Run(kanataExecutablePath string, kanataConfigPath string) error {
+func (r *KanataRunner) Run(kanataExecutablePath string, kanataConfigPath string, tcpPort int) error {
 	err := r.Stop()
 	if err != nil {
 		return fmt.Errorf("failed to stop the previous process: %v", err)
 	}
 
-	const tcpPort = 5829 // arbitrary number, really
-
 	cmd := exec.CommandContext(r.ctx, kanataExecutablePath, "-c", kanataConfigPath, "--port", fmt.Sprint(tcpPort))
 	cmd.SysProcAttr = os_specific.ProcessAttr