From 399fe0301e89a073e7aa73ca5f8d575e3aaaa79a Mon Sep 17 00:00:00 2001 From: pasichDev Date: Fri, 8 May 2026 20:31:45 +0300 Subject: [PATCH] fix: small fix add win version --- .claude/settings.local.json | 9 +- .gitignore | 2 + LinqoraHost/cmd/linqora_gui.go | 39 ++- LinqoraHost/go.mod | 6 +- LinqoraHost/go.sum | 7 + LinqoraHost/internal/collectors/metrics.go | 3 + LinqoraHost/internal/metrics/cpu.go | 87 +----- .../internal/metrics/cpu_temp_others.go | 45 +++ .../internal/metrics/cpu_temp_windows.go | 35 +++ LinqoraHost/internal/metrics/exec_others.go | 16 + LinqoraHost/internal/metrics/exec_windows.go | 23 ++ LinqoraHost/internal/metrics/gpu.go | 104 +++++-- LinqoraHost/internal/startup/startup.go | 13 + .../internal/startup/startup_others.go | 12 + .../internal/startup/startup_windows.go | 36 +++ linqoraremote/.metadata | 25 +- .../controllers/monitoring_controller.dart | 21 ++ .../controllers/settings_controller.dart | 6 + .../presentation/widgets/monitoring_view.dart | 67 ++-- .../lib/services/background_service.dart | 7 + .../lib/services/permissions_service.dart | 7 + linqoraremote/pubspec.yaml | 3 +- linqoraremote/test/widget_test.dart | 30 ++ linqoraremote/windows/.gitignore | 17 ++ linqoraremote/windows/CMakeLists.txt | 108 +++++++ linqoraremote/windows/flutter/CMakeLists.txt | 109 +++++++ .../flutter/generated_plugin_registrant.cc | 26 ++ .../flutter/generated_plugin_registrant.h | 15 + .../windows/flutter/generated_plugins.cmake | 30 ++ linqoraremote/windows/runner/CMakeLists.txt | 40 +++ linqoraremote/windows/runner/Runner.rc | 121 ++++++++ .../windows/runner/flutter_window.cpp | 71 +++++ linqoraremote/windows/runner/flutter_window.h | 33 ++ linqoraremote/windows/runner/main.cpp | 43 +++ linqoraremote/windows/runner/resource.h | 16 + .../windows/runner/resources/app_icon.ico | Bin 0 -> 33772 bytes .../windows/runner/runner.exe.manifest | 14 + linqoraremote/windows/runner/utils.cpp | 65 ++++ linqoraremote/windows/runner/utils.h | 19 ++ linqoraremote/windows/runner/win32_window.cpp | 288 ++++++++++++++++++ linqoraremote/windows/runner/win32_window.h | 102 +++++++ 41 files changed, 1577 insertions(+), 143 deletions(-) create mode 100644 LinqoraHost/internal/metrics/cpu_temp_others.go create mode 100644 LinqoraHost/internal/metrics/cpu_temp_windows.go create mode 100644 LinqoraHost/internal/metrics/exec_others.go create mode 100644 LinqoraHost/internal/metrics/exec_windows.go create mode 100644 LinqoraHost/internal/startup/startup.go create mode 100644 LinqoraHost/internal/startup/startup_others.go create mode 100644 LinqoraHost/internal/startup/startup_windows.go create mode 100644 linqoraremote/test/widget_test.dart create mode 100644 linqoraremote/windows/.gitignore create mode 100644 linqoraremote/windows/CMakeLists.txt create mode 100644 linqoraremote/windows/flutter/CMakeLists.txt create mode 100644 linqoraremote/windows/flutter/generated_plugin_registrant.cc create mode 100644 linqoraremote/windows/flutter/generated_plugin_registrant.h create mode 100644 linqoraremote/windows/flutter/generated_plugins.cmake create mode 100644 linqoraremote/windows/runner/CMakeLists.txt create mode 100644 linqoraremote/windows/runner/Runner.rc create mode 100644 linqoraremote/windows/runner/flutter_window.cpp create mode 100644 linqoraremote/windows/runner/flutter_window.h create mode 100644 linqoraremote/windows/runner/main.cpp create mode 100644 linqoraremote/windows/runner/resource.h create mode 100644 linqoraremote/windows/runner/resources/app_icon.ico create mode 100644 linqoraremote/windows/runner/runner.exe.manifest create mode 100644 linqoraremote/windows/runner/utils.cpp create mode 100644 linqoraremote/windows/runner/utils.h create mode 100644 linqoraremote/windows/runner/win32_window.cpp create mode 100644 linqoraremote/windows/runner/win32_window.h diff --git a/.claude/settings.local.json b/.claude/settings.local.json index 6c434be..1500cb5 100644 --- a/.claude/settings.local.json +++ b/.claude/settings.local.json @@ -25,7 +25,14 @@ "Bash(echo \"BUILD_EXIT:$?\")", "Bash(python -c \"import yaml; yaml.safe_load\\(open\\('.github/workflows/ci.yml'\\)\\)\")", "Bash(Get-ChildItem -Recurse \"C:\\\\Users\\\\pasichdev\\\\AndroidStudioProjects\\\\linqora\\\\design_handoff_linqora\")", - "Bash(Select-Object FullName, Length)" + "Bash(Select-Object FullName, Length)", + "Bash(go env *)", + "PowerShell(go build *)", + "Bash(flutter analyze *)", + "Bash(flutter create *)", + "Bash(flutter build *)", + "PowerShell(ls \"C:\\\\Users\\\\pasichdev\\\\AndroidStudioProjects\\\\linqora\\\\LinqoraHost\\\\linqorahost.exe\"; \\(Get-Item \"C:\\\\Users\\\\pasichdev\\\\AndroidStudioProjects\\\\linqora\\\\LinqoraHost\\\\linqorahost.exe\"\\).LastWriteTime)", + "Bash(Select-Object Name, Length, LastWriteTime)" ] } } diff --git a/.gitignore b/.gitignore index 8b13789..b85c805 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ + +.claude \ No newline at end of file diff --git a/LinqoraHost/cmd/linqora_gui.go b/LinqoraHost/cmd/linqora_gui.go index e8e0865..aba36ac 100644 --- a/LinqoraHost/cmd/linqora_gui.go +++ b/LinqoraHost/cmd/linqora_gui.go @@ -5,6 +5,7 @@ import ( "fmt" "image/color" "log/slog" + "os" "sync" "fyne.io/fyne/v2" @@ -18,6 +19,7 @@ import ( "LinqoraHost/internal/config" "LinqoraHost/internal/deviceinfo" + "LinqoraHost/internal/startup" ) // ─────────────────────── log writer ─────────────────────── @@ -256,6 +258,26 @@ func buildSettingsTab() fyne.CanvasObject { widget.NewFormItem("", e2eeCheck), ) + // Auto-start on Windows login (registry HKCU Run key). + if startup.IsSupported() { + enabled, _ := startup.IsEnabled() + autoStartCheck := widget.NewCheck("Run at Windows startup (starts minimised to tray)", nil) + autoStartCheck.SetChecked(enabled) + autoStartCheck.OnChanged = func(v bool) { + var err error + if v { + err = startup.Enable() + } else { + err = startup.Disable() + } + if err != nil { + statusLbl.SetText("⚠ Startup: " + err.Error()) + autoStartCheck.SetChecked(!v) // revert + } + } + form.Append("", autoStartCheck) + } + saveBtn := widget.NewButtonWithIcon("Save Settings", theme.DocumentSaveIcon(), func() { var p int if _, err := fmt.Sscanf(portEntry.Text, "%d", &p); err != nil || p < 1 || p > 65535 { @@ -305,6 +327,15 @@ func buildLogTab() (fyne.CanvasObject, *guiLogWriter) { func RunGUI() { hideConsole() // detach from terminal — no black console window + // --minimized: launched at Windows startup → hide to tray immediately. + minimized := false + for _, arg := range os.Args[1:] { + if arg == "--minimized" { + minimized = true + break + } + } + var err error cfg, err = config.LoadConfig() if err != nil { @@ -348,5 +379,11 @@ func RunGUI() { } w.SetCloseIntercept(func() { w.Hide() }) - w.ShowAndRun() + + if minimized { + // Started at Windows login: stay hidden in tray, don't show the window. + a.Run() + } else { + w.ShowAndRun() + } } diff --git a/LinqoraHost/go.mod b/LinqoraHost/go.mod index 1eb199d..0fd7d60 100644 --- a/LinqoraHost/go.mod +++ b/LinqoraHost/go.mod @@ -1,6 +1,6 @@ module LinqoraHost -go 1.24 +go 1.25.0 require ( fyne.io/fyne/v2 v2.7.3 @@ -32,10 +32,12 @@ require ( github.com/jeandeaual/go-locale v0.0.0-20250612000132-0ef82f21eade // indirect github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 // indirect github.com/kr/text v0.2.0 // indirect + github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect github.com/miekg/dns v1.1.72 // indirect github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect github.com/nicksnyder/go-i18n/v2 v2.5.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect github.com/rymdport/portal v0.4.2 // indirect github.com/spf13/pflag v1.0.10 // indirect github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c // indirect @@ -58,6 +60,6 @@ require ( github.com/go-ole/go-ole v1.3.0 // indirect github.com/shirou/gopsutil/v4 v4.26.4 github.com/spf13/cobra v1.10.2 - github.com/yusufpapurcu/wmi v1.2.4 // indirect + github.com/yusufpapurcu/wmi v1.2.4 golang.org/x/sys v0.43.0 ) diff --git a/LinqoraHost/go.sum b/LinqoraHost/go.sum index c11654b..d99ca95 100644 --- a/LinqoraHost/go.sum +++ b/LinqoraHost/go.sum @@ -43,6 +43,7 @@ github.com/go-text/typesetting-utils v0.0.0-20250618110550-c820a94c77b8 h1:4KCsc github.com/go-text/typesetting-utils v0.0.0-20250618110550-c820a94c77b8/go.mod h1:3/62I4La/HBRX9TcTpBj4eipLiwzf+vhI+7whTc9V7o= github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/pprof v0.0.0-20211214055906-6f57359322fd h1:1FjCyPC+syAzJ5/2S8fqdZK1R22vvA0J7JZKcuOIQ7Y= @@ -63,6 +64,8 @@ github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 h1:YLvr1eE6cdCqjOe9 github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25/go.mod h1:kLgvv7o6UM+0QSf0QjAse3wReFDsb9qbZJdfexWlrQw= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4= +github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= github.com/miekg/dns v1.1.27/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= github.com/miekg/dns v1.1.72 h1:vhmr+TF2A3tuoGNkLDFK9zi36F2LS+hKTRW0Uf8kbzI= github.com/miekg/dns v1.1.72/go.mod h1:+EuEPhdHOsfk6Wk5TT2CzssZdqkmFhf8r+aVyDEToIs= @@ -78,6 +81,8 @@ github.com/pkg/profile v1.7.0 h1:hnbDkaNWPCLMO9wGLdBFTIZvzDrDfBM2072E1S9gJkA= github.com/pkg/profile v1.7.0/go.mod h1:8Uer0jas47ZQMJ7VD+OHknK4YDY07LPUC6dEvqDjvNo= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt9k/+g42oCprj/FisM4qX9L3sZB3upGN2ZU= +github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/rymdport/portal v0.4.2 h1:7jKRSemwlTyVHHrTGgQg7gmNPJs88xkbKcIL3NlcmSU= github.com/rymdport/portal v0.4.2/go.mod h1:kFF4jslnJ8pD5uCi17brj/ODlfIidOxlgUDTO5ncnC4= @@ -125,6 +130,7 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI= golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= @@ -135,6 +141,7 @@ golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.44.0 h1:UP4ajHPIcuMjT1GqzDWRlalUEoY+uzoZKnhOjbIPD2c= golang.org/x/tools v0.44.0/go.mod h1:KA0AfVErSdxRZIsOVipbv3rQhVXTnlU6UhKxHd1seDI= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/LinqoraHost/internal/collectors/metrics.go b/LinqoraHost/internal/collectors/metrics.go index dd65dba..cd2c648 100644 --- a/LinqoraHost/internal/collectors/metrics.go +++ b/LinqoraHost/internal/collectors/metrics.go @@ -14,6 +14,7 @@ type SystemMetrics struct { CPUUMetrics metrics.CPUMetrics `json:"cpuMetrics"` RamMetrics metrics.RamMetrics `json:"ramMetrics"` GpuLoadPercent int `json:"gpuLoadPercent"` + GpuTemperature int `json:"gpuTemperature"` Timestamp int64 `json:"timestamp"` } @@ -127,11 +128,13 @@ func (mc *MetricsCollector) collectMetrics() (*SystemMetrics, error) { } gpuLoad := metrics.GetGPULoadPercent() + gpuTemp := metrics.GetGPUTemperature() result := &SystemMetrics{ CPUUMetrics: cpuMetrics, RamMetrics: ramMetrics, GpuLoadPercent: gpuLoad, + GpuTemperature: gpuTemp, Timestamp: time.Now().Unix(), } diff --git a/LinqoraHost/internal/metrics/cpu.go b/LinqoraHost/internal/metrics/cpu.go index 0849a0c..a3ef89b 100644 --- a/LinqoraHost/internal/metrics/cpu.go +++ b/LinqoraHost/internal/metrics/cpu.go @@ -1,14 +1,11 @@ package metrics import ( - "fmt" "math" - "strings" "time" "github.com/shirou/gopsutil/cpu" "github.com/shirou/gopsutil/process" - "github.com/shirou/gopsutil/v4/sensors" ) type CPUMetrics struct { @@ -26,67 +23,54 @@ type CPUInfo struct { } func GetCPUInfo() (CPUInfo, error) { - info := CPUInfo{ - Model: "Unknown", - LogicalCores: 0, - PhysicalCores: 0, - Frequency: 0.0, - } + info := CPUInfo{Model: "Unknown"} logicalCores, logErr := cpu.Counts(true) physicalCores, psyhErr := cpu.Counts(false) - if logErr == nil && psyhErr == nil { info.LogicalCores = logicalCores info.PhysicalCores = physicalCores } cpuArray, cpuError := cpu.Info() - if cpuError == nil { - if len(cpuArray) > 0 { - c := cpuArray[0] - info.Model = c.ModelName - info.Frequency = math.Round(c.Mhz*100) / 100 - } + if cpuError == nil && len(cpuArray) > 0 { + c := cpuArray[0] + info.Model = c.ModelName + info.Frequency = math.Round(c.Mhz*100) / 100 } return info, nil } func GetCPUMetrics() (CPUMetrics, error) { - cpu := CPUMetrics{} + m := CPUMetrics{} load, loadErr := GetCPULoad() - temp, tempErr := GetCPUTemperature() + temp, tempErr := GetCPUTemperature() // cpu_temp_windows.go / cpu_temp_others.go proc, thrd, prcThErr := GetProcessesAndThreads() if loadErr == nil { - cpu.LoadPercent = load + m.LoadPercent = load } if tempErr == nil { - cpu.Temperature = temp + m.Temperature = temp } if prcThErr == nil { - cpu.Processes = float64(proc) - cpu.Threads = float64(thrd) + m.Processes = float64(proc) + m.Threads = float64(thrd) } - return cpu, nil + return m, nil } -// InitCPUBaseline seeds the gopsutil CPU counter so that the first call to +// InitCPUBaseline seeds the gopsutil CPU counter so the first call to // GetCPULoad() returns a meaningful value instead of 0. -// Call once when the metrics collector starts. func InitCPUBaseline() { - cpu.Percent(0, false) //nolint:errcheck — baseline seed, result discarded - // Small sleep so the OS has time to record a non-zero interval + cpu.Percent(0, false) //nolint:errcheck time.Sleep(200 * time.Millisecond) cpu.Percent(0, false) //nolint:errcheck } -// GetCPULoad returns overall CPU usage percent. -// Uses interval=0 which measures since the previous call — non-blocking. -// InitCPUBaseline must be called once before the first call to this function. func GetCPULoad() (float64, error) { percentages, err := cpu.Percent(0, false) if err != nil { @@ -98,62 +82,19 @@ func GetCPULoad() (float64, error) { return 0, nil } -// GetCPUTemperature finds the most relevant CPU temperature sensor. -func GetCPUTemperature() (float64, error) { - temps, err := sensors.SensorsTemperatures() - if err != nil { - return 0, err - } - - var cpuTemp float64 - var found bool - - for _, t := range temps { - key := strings.ToLower(t.SensorKey) - - if strings.Contains(key, "tctl") || - strings.Contains(key, "package") || - strings.Contains(key, "core") || - strings.Contains(key, "cpu") { - - if strings.Contains(key, "acpitz") { - continue - } - - cpuTemp = math.Round(t.Temperature) - found = true - break - } - } - - if !found { - return 0, fmt.Errorf("CPU temperature not found") - } - - return cpuTemp, nil -} - -// GetProcessesAndThreads returns the total number of processes and threads. -// A process that exits between the snapshot and the NumThreads call is skipped -// rather than aborting the whole collection. func GetProcessesAndThreads() (int, int, error) { procs, err := process.Processes() if err != nil { return 0, 0, err } - numProcesses := len(procs) totalThreads := 0 - for _, p := range procs { threads, err := p.NumThreads() if err != nil { - // The process likely exited between Processes() and NumThreads(). - // Skip it instead of failing the entire collection. continue } totalThreads += int(threads) } - return numProcesses, totalThreads, nil } diff --git a/LinqoraHost/internal/metrics/cpu_temp_others.go b/LinqoraHost/internal/metrics/cpu_temp_others.go new file mode 100644 index 0000000..a153702 --- /dev/null +++ b/LinqoraHost/internal/metrics/cpu_temp_others.go @@ -0,0 +1,45 @@ +//go:build !windows + +package metrics + +import ( + "fmt" + "math" + "strings" + + "github.com/shirou/gopsutil/v4/sensors" +) + +// GetCPUTemperature finds the most relevant CPU temperature sensor via gopsutil. +func GetCPUTemperature() (float64, error) { + temps, err := sensors.SensorsTemperatures() + if err != nil { + return 0, err + } + + var cpuTemp float64 + var found bool + + for _, t := range temps { + key := strings.ToLower(t.SensorKey) + + if strings.Contains(key, "tctl") || + strings.Contains(key, "package") || + strings.Contains(key, "core") || + strings.Contains(key, "cpu") { + + if strings.Contains(key, "acpitz") { + continue + } + + cpuTemp = math.Round(t.Temperature) + found = true + break + } + } + + if !found { + return 0, fmt.Errorf("CPU temperature sensor not found") + } + return cpuTemp, nil +} diff --git a/LinqoraHost/internal/metrics/cpu_temp_windows.go b/LinqoraHost/internal/metrics/cpu_temp_windows.go new file mode 100644 index 0000000..53173c4 --- /dev/null +++ b/LinqoraHost/internal/metrics/cpu_temp_windows.go @@ -0,0 +1,35 @@ +//go:build windows + +package metrics + +import ( + "fmt" + "math" + + "github.com/yusufpapurcu/wmi" +) + +// wmiThermalZone maps MSAcpi_ThermalZoneTemperature in root\wmi. +// CurrentTemperature is in tenths of Kelvin (e.g. 3231 = 50.0 °C). +type wmiThermalZone struct { + CurrentTemperature uint32 +} + +// GetCPUTemperature reads CPU temperature via the WMI Go package. +// No PowerShell process is spawned — no console window flashing. +func GetCPUTemperature() (float64, error) { + var zones []wmiThermalZone + if err := wmi.QueryNamespace( + "SELECT CurrentTemperature FROM MSAcpi_ThermalZoneTemperature", + &zones, + `root\wmi`, + ); err != nil || len(zones) == 0 { + return 0, fmt.Errorf("WMI thermal zone unavailable: %v", err) + } + + celsius := float64(zones[0].CurrentTemperature)/10.0 - 273.15 + if celsius < -20 || celsius > 150 { + return 0, fmt.Errorf("temperature %.1f°C outside plausible range", celsius) + } + return math.Round(celsius), nil +} diff --git a/LinqoraHost/internal/metrics/exec_others.go b/LinqoraHost/internal/metrics/exec_others.go new file mode 100644 index 0000000..96bdb6d --- /dev/null +++ b/LinqoraHost/internal/metrics/exec_others.go @@ -0,0 +1,16 @@ +//go:build !windows + +package metrics + +import ( + "context" + "os/exec" +) + +func hiddenCmd(name string, args ...string) *exec.Cmd { + return exec.Command(name, args...) +} + +func hiddenCmdCtx(ctx context.Context, name string, args ...string) *exec.Cmd { + return exec.CommandContext(ctx, name, args...) +} diff --git a/LinqoraHost/internal/metrics/exec_windows.go b/LinqoraHost/internal/metrics/exec_windows.go new file mode 100644 index 0000000..3fe2fdb --- /dev/null +++ b/LinqoraHost/internal/metrics/exec_windows.go @@ -0,0 +1,23 @@ +//go:build windows + +package metrics + +import ( + "context" + "os/exec" + "syscall" +) + +// hiddenCmd runs a command without spawning a visible console window on Windows. +func hiddenCmd(name string, args ...string) *exec.Cmd { + c := exec.Command(name, args...) + c.SysProcAttr = &syscall.SysProcAttr{HideWindow: true} + return c +} + +// hiddenCmdCtx is the context-aware variant of hiddenCmd. +func hiddenCmdCtx(ctx context.Context, name string, args ...string) *exec.Cmd { + c := exec.CommandContext(ctx, name, args...) + c.SysProcAttr = &syscall.SysProcAttr{HideWindow: true} + return c +} diff --git a/LinqoraHost/internal/metrics/gpu.go b/LinqoraHost/internal/metrics/gpu.go index e13d911..bab3433 100644 --- a/LinqoraHost/internal/metrics/gpu.go +++ b/LinqoraHost/internal/metrics/gpu.go @@ -1,11 +1,12 @@ package metrics import ( + "context" "os" - "os/exec" "runtime" "strconv" "strings" + "time" ) // GPUInfo holds basic GPU identification and memory data. @@ -31,17 +32,13 @@ func GetGPUInfo() (GPUInfo, error) { // ── Linux ──────────────────────────────────────────────────────────────────── func getLinuxGPUInfo() (GPUInfo, error) { - // NVIDIA: fastest path. if info, ok := nvidiaGPUInfo(); ok { return info, nil } - - // AMD / Intel: parse lspci. - out, err := exec.Command("lspci", "-v").Output() + out, err := hiddenCmd("lspci", "-v").Output() if err != nil { return GPUInfo{Model: "Unknown"}, nil } - for _, line := range strings.Split(string(out), "\n") { if !strings.Contains(line, "VGA") && !strings.Contains(line, "3D controller") { continue @@ -53,12 +50,11 @@ func getLinuxGPUInfo() (GPUInfo, error) { } return info, nil } - return GPUInfo{Model: "Unknown"}, nil } func nvidiaGPUInfo() (GPUInfo, bool) { - out, err := exec.Command( + out, err := hiddenCmd( "nvidia-smi", "--query-gpu=name,memory.total", "--format=csv,noheader", @@ -93,9 +89,7 @@ func cleanAMDModel(line string) string { m = strings.TrimPrefix(m, "Advanced Micro Devices, Inc. [AMD/ATI] ") m = strings.TrimPrefix(m, "Advanced Micro Devices [AMD/ATI] ") m = strings.TrimPrefix(m, "AMD ") - - // Prefer glxinfo device name when available. - if out, err := exec.Command("glxinfo", "-B").Output(); err == nil { + if out, err := hiddenCmd("glxinfo", "-B").Output(); err == nil { for _, l := range strings.Split(string(out), "\n") { if strings.HasPrefix(l, "Device: ") { if name := strings.TrimPrefix(l, "Device: "); name != "" { @@ -110,17 +104,15 @@ func cleanAMDModel(line string) string { // ── Windows ────────────────────────────────────────────────────────────────── func getWindowsGPUInfo() (GPUInfo, error) { - out, err := exec.Command( + out, err := hiddenCmd( "powershell", "-NoProfile", "-Command", "Get-WmiObject Win32_VideoController | Select-Object Name, AdapterRAM | Format-List", ).Output() if err != nil { return GPUInfo{Model: "Unknown"}, nil } - info := GPUInfo{Model: "Unknown"} s := string(out) - if parts := strings.SplitN(s, "Name : ", 2); len(parts) == 2 { info.Model = strings.TrimSpace(strings.SplitN(parts[1], "\n", 2)[0]) } @@ -136,13 +128,12 @@ func getWindowsGPUInfo() (GPUInfo, error) { // ── macOS ──────────────────────────────────────────────────────────────────── func getMacOSGPUInfo() (GPUInfo, error) { - out, err := exec.Command( + out, err := hiddenCmd( "system_profiler", "SPDisplaysDataType", "-detailLevel", "mini", ).Output() if err != nil { return GPUInfo{Model: "Unknown"}, nil } - info := GPUInfo{Model: "Unknown"} for _, line := range strings.Split(string(out), "\n") { line = strings.TrimSpace(line) @@ -167,27 +158,90 @@ func getMacOSGPUInfo() (GPUInfo, error) { // ── GPU load ───────────────────────────────────────────────────────────────── -// GetGPULoadPercent returns the current GPU utilisation as an integer percentage -// (0-100). It tries nvidia-smi first; if that is unavailable or fails it -// returns 0 without an error so callers can treat missing data gracefully. +// GetGPULoadPercent returns GPU utilisation (0-100). +// Tries NVIDIA first, then platform-specific fallbacks for AMD/Intel. func GetGPULoadPercent() int { - out, err := exec.Command( + if val, ok := nvidiaGPULoad(); ok { + return val + } + switch runtime.GOOS { + case "linux": + for _, card := range []string{"card0", "card1", "card2", "card3"} { + data, err := os.ReadFile("/sys/class/drm/" + card + "/device/gpu_busy_percent") + if err == nil { + if val, err := strconv.Atoi(strings.TrimSpace(string(data))); err == nil { + return val + } + } + } + case "windows": + ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second) + defer cancel() + out, err := hiddenCmdCtx(ctx, "powershell", "-NoProfile", "-NonInteractive", "-Command", + `try { [int][math]::Round(((Get-Counter '\GPU Engine(*engtype_3D*)\Utilization Percentage' -ErrorAction Stop).CounterSamples | Measure-Object -Property CookedValue -Average).Average) } catch { 0 }`).Output() + if err == nil { + if val, err := strconv.Atoi(strings.TrimSpace(string(out))); err == nil { + return val + } + } + } + return 0 +} + +// GetGPUTemperature returns GPU temperature in Celsius. +// Supports NVIDIA via nvidia-smi; AMD Linux via hwmon sysfs. +func GetGPUTemperature() int { + // NVIDIA — cross-platform. + out, err := hiddenCmd( + "nvidia-smi", + "--query-gpu=temperature.gpu", + "--format=csv,noheader,nounits", + ).Output() + if err == nil && len(out) > 0 { + if val, err := strconv.Atoi(strings.TrimSpace(string(out))); err == nil { + return val + } + } + + // AMD on Linux — hwmon sysfs (temp1_input is in millidegrees Celsius). + if runtime.GOOS == "linux" { + for _, card := range []string{"card0", "card1", "card2", "card3"} { + base := "/sys/class/drm/" + card + "/device/hwmon/" + entries, err := os.ReadDir(base) + if err != nil { + continue + } + for _, e := range entries { + data, err := os.ReadFile(base + e.Name() + "/temp1_input") + if err != nil { + continue + } + if milli, err := strconv.Atoi(strings.TrimSpace(string(data))); err == nil { + return milli / 1000 + } + } + } + } + + return 0 +} + +func nvidiaGPULoad() (int, bool) { + out, err := hiddenCmd( "nvidia-smi", "--query-gpu=utilization.gpu", "--format=csv,noheader,nounits", ).Output() if err != nil || len(out) == 0 { - return 0 + return 0, false } val, err := strconv.Atoi(strings.TrimSpace(string(out))) if err != nil { - return 0 + return 0, false } - return val + return val, true } -// ── helpers ────────────────────────────────────────────────────────────────── - func extractGPUModel(line string) string { parts := strings.SplitN(line, ": ", 2) if len(parts) < 2 { diff --git a/LinqoraHost/internal/startup/startup.go b/LinqoraHost/internal/startup/startup.go new file mode 100644 index 0000000..ea76a8e --- /dev/null +++ b/LinqoraHost/internal/startup/startup.go @@ -0,0 +1,13 @@ +package startup + +// IsSupported reports whether startup management is available on this platform. +func IsSupported() bool { return isSupported() } + +// IsEnabled reports whether the app is registered for auto-start on login. +func IsEnabled() (bool, error) { return isEnabled() } + +// Enable registers the app to launch automatically on user login. +func Enable() error { return enable() } + +// Disable removes the app from auto-start on login. +func Disable() error { return disable() } diff --git a/LinqoraHost/internal/startup/startup_others.go b/LinqoraHost/internal/startup/startup_others.go new file mode 100644 index 0000000..9e6ba3e --- /dev/null +++ b/LinqoraHost/internal/startup/startup_others.go @@ -0,0 +1,12 @@ +//go:build !windows + +package startup + +import "errors" + +var errNotSupported = errors.New("startup management is not supported on this platform") + +func isSupported() bool { return false } +func isEnabled() (bool, error) { return false, errNotSupported } +func enable() error { return errNotSupported } +func disable() error { return errNotSupported } diff --git a/LinqoraHost/internal/startup/startup_windows.go b/LinqoraHost/internal/startup/startup_windows.go new file mode 100644 index 0000000..17e4a8d --- /dev/null +++ b/LinqoraHost/internal/startup/startup_windows.go @@ -0,0 +1,36 @@ +//go:build windows + +package startup + +import ( + "os" + "os/exec" +) + +const ( + regPath = `HKCU\Software\Microsoft\Windows\CurrentVersion\Run` + appName = "LinqoraHost" +) + +func isSupported() bool { return true } + +func isEnabled() (bool, error) { + err := exec.Command("reg", "query", regPath, "/v", appName).Run() + return err == nil, nil +} + +func enable() error { + exe, err := os.Executable() + if err != nil { + return err + } + // --minimized so the window starts hidden in the system tray. + value := `"` + exe + `" --minimized` + return exec.Command("reg", "add", regPath, "/v", appName, "/t", "REG_SZ", "/d", value, "/f").Run() +} + +func disable() error { + // reg delete exits with code 1 when the value doesn't exist — treat as success. + exec.Command("reg", "delete", regPath, "/v", appName, "/f").Run() //nolint:errcheck + return nil +} diff --git a/linqoraremote/.metadata b/linqoraremote/.metadata index e8f7bf9..8e68ce7 100644 --- a/linqoraremote/.metadata +++ b/linqoraremote/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled and should not be manually edited. version: - revision: "ea121f8859e4b13e47a8f845e4586164519588bc" + revision: "582a0e7c5581dc0ca5f7bfd8662bb8db6f59d536" channel: "stable" project_type: app @@ -13,26 +13,11 @@ project_type: app migration: platforms: - platform: root - create_revision: ea121f8859e4b13e47a8f845e4586164519588bc - base_revision: ea121f8859e4b13e47a8f845e4586164519588bc - - platform: android - create_revision: ea121f8859e4b13e47a8f845e4586164519588bc - base_revision: ea121f8859e4b13e47a8f845e4586164519588bc - - platform: ios - create_revision: ea121f8859e4b13e47a8f845e4586164519588bc - base_revision: ea121f8859e4b13e47a8f845e4586164519588bc - - platform: linux - create_revision: ea121f8859e4b13e47a8f845e4586164519588bc - base_revision: ea121f8859e4b13e47a8f845e4586164519588bc - - platform: macos - create_revision: ea121f8859e4b13e47a8f845e4586164519588bc - base_revision: ea121f8859e4b13e47a8f845e4586164519588bc - - platform: web - create_revision: ea121f8859e4b13e47a8f845e4586164519588bc - base_revision: ea121f8859e4b13e47a8f845e4586164519588bc + create_revision: 582a0e7c5581dc0ca5f7bfd8662bb8db6f59d536 + base_revision: 582a0e7c5581dc0ca5f7bfd8662bb8db6f59d536 - platform: windows - create_revision: ea121f8859e4b13e47a8f845e4586164519588bc - base_revision: ea121f8859e4b13e47a8f845e4586164519588bc + create_revision: 582a0e7c5581dc0ca5f7bfd8662bb8db6f59d536 + base_revision: 582a0e7c5581dc0ca5f7bfd8662bb8db6f59d536 # User provided section diff --git a/linqoraremote/lib/presentation/controllers/monitoring_controller.dart b/linqoraremote/lib/presentation/controllers/monitoring_controller.dart index b7a7f52..c891d2f 100644 --- a/linqoraremote/lib/presentation/controllers/monitoring_controller.dart +++ b/linqoraremote/lib/presentation/controllers/monitoring_controller.dart @@ -52,14 +52,18 @@ class MonitoringController extends GetxController { final temperatures = [].obs; final cpuLoads = [].obs; final ramUsagesPercent = [].obs; + final gpuLoads = [].obs; final currentCPUMetrics = Rx(null); final currentRAMMetrics = Rx(null); + final currentGPULoadPercent = Rx(null); + final currentGPUTemperature = Rx(null); // Internal circular buffers — O(1) writes. final _tempBuf = _CircularBuffer(maxMetricsCount); final _cpuBuf = _CircularBuffer(maxMetricsCount); final _ramBuf = _CircularBuffer(maxMetricsCount); + final _gpuBuf = _CircularBuffer(maxMetricsCount); List getTemperatures() => temperatures.toList(); List getCPULoads() => cpuLoads.toList(); @@ -142,6 +146,19 @@ class MonitoringController extends GetxController { ramJson as Map, ); + final gpuLoad = rawData['gpuLoadPercent']; + if (gpuLoad != null) { + currentGPULoadPercent.value = (gpuLoad as num).toInt(); + _gpuBuf.add(currentGPULoadPercent.value!); + gpuLoads.value = _gpuBuf.toList(); + } + + final gpuTemp = rawData['gpuTemperature']; + if (gpuTemp != null) { + final t = (gpuTemp as num).toInt(); + if (t > 0) currentGPUTemperature.value = t; + } + _updateMetricsArrays( currentCPUMetrics.value!.temperature, currentCPUMetrics.value!.loadPercent, @@ -158,13 +175,17 @@ class MonitoringController extends GetxController { void _resetMetrics() { currentCPUMetrics.value = null; currentRAMMetrics.value = null; + currentGPULoadPercent.value = null; + currentGPUTemperature.value = null; _metricsBuffer.clear(); _tempBuf.clear(); _cpuBuf.clear(); _ramBuf.clear(); + _gpuBuf.clear(); temperatures.clear(); cpuLoads.clear(); ramUsagesPercent.clear(); + gpuLoads.clear(); } /// Appends new samples to the circular buffers, then batch-updates the diff --git a/linqoraremote/lib/presentation/controllers/settings_controller.dart b/linqoraremote/lib/presentation/controllers/settings_controller.dart index e623855..4ebcc3a 100644 --- a/linqoraremote/lib/presentation/controllers/settings_controller.dart +++ b/linqoraremote/lib/presentation/controllers/settings_controller.dart @@ -1,3 +1,5 @@ +import 'dart:io'; + import 'package:flutter/material.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart'; import 'package:get/get.dart'; @@ -103,6 +105,10 @@ class SettingsController extends GetxController { /// Request notification permission Future requestNotificationPermission() async { + if (Platform.isWindows || Platform.isLinux || Platform.isMacOS) { + notificationPermissionGranted.value = true; + return true; + } final status = await Permission.notification.request(); notificationPermissionGranted.value = status.isGranted; return status.isGranted; diff --git a/linqoraremote/lib/presentation/widgets/monitoring_view.dart b/linqoraremote/lib/presentation/widgets/monitoring_view.dart index 1ae71b0..6b8e740 100644 --- a/linqoraremote/lib/presentation/widgets/monitoring_view.dart +++ b/linqoraremote/lib/presentation/widgets/monitoring_view.dart @@ -70,7 +70,7 @@ class _MonitoringViewState extends State _header(), _heroCpuCard(cpu), const SizedBox(height: 10), - _ramGpuRow(ram), + _ramGpuRow(ram, _c.currentGPULoadPercent.value, _c.currentGPUTemperature.value), const SizedBox(height: 10), _perCoreCard(cpu), const SizedBox(height: 10), @@ -179,10 +179,12 @@ class _MonitoringViewState extends State // RAM + GPU side-by-side // --------------------------------------------------------------------------- - Widget _ramGpuRow(RAMMetrics? ram) { + Widget _ramGpuRow(RAMMetrics? ram, int? gpuLoad, int? gpuTemp) { final host = Get.find().hostInfo.value; final totalRam = host?.ram.total ?? 0.0; final usedRam = ram?.usage ?? 0.0; + final gpuModel = host?.gpu.model ?? ''; + final gpuMemory = host?.gpu.memory ?? 0; return Row( children: [ @@ -243,7 +245,7 @@ class _MonitoringViewState extends State ), ), const SizedBox(width: 10), - // GPU card (placeholder — no real GPU stream) + // GPU card Expanded( child: LxGlass( padding: const EdgeInsets.all(14), @@ -252,8 +254,8 @@ class _MonitoringViewState extends State children: [ Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: const [ - Text( + children: [ + const Text( 'GPU', style: TextStyle( fontSize: 11, @@ -262,36 +264,61 @@ class _MonitoringViewState extends State fontWeight: FontWeight.w500, ), ), - Text( - '—', - style: TextStyle(fontSize: 10, color: lxTextFaint), - ), + if (gpuMemory > 0) + Text( + '${(gpuMemory / 1024).toStringAsFixed(0)} GB', + style: const TextStyle(fontSize: 10, color: lxTextFaint), + ) + else if (gpuModel.isNotEmpty && gpuModel != 'Unknown') + Flexible( + child: Text( + gpuModel, + style: const TextStyle(fontSize: 9, color: lxTextFaint), + overflow: TextOverflow.ellipsis, + ), + ), ], ), const SizedBox(height: 4), RichText( - text: const TextSpan( + text: TextSpan( children: [ TextSpan( - text: '—', - style: TextStyle( + text: gpuLoad != null ? '$gpuLoad' : '—', + style: const TextStyle( fontSize: 28, fontWeight: FontWeight.w600, letterSpacing: -0.8, color: lxText, ), ), + if (gpuLoad != null) + const TextSpan( + text: '%', + style: TextStyle(fontSize: 14, color: lxTextDim), + ), ], ), ), const SizedBox(height: 6), - Container( - height: 32, - decoration: BoxDecoration( - color: lxGlass2, - borderRadius: BorderRadius.circular(4), - ), - ), + gpuLoad != null + ? LxSparkline( + data: _c.gpuLoads, + width: 130, + height: 32, + color: const Color(0xFF9C7CFF), + ) + : Container( + height: 32, + decoration: BoxDecoration( + color: lxGlass2, + borderRadius: BorderRadius.circular(4), + ), + ), + if (gpuTemp != null && gpuTemp > 0) ...[ + const SizedBox(height: 6), + _mini('GPU TEMP', '${gpuTemp}°C'), + ], ], ), ), @@ -436,7 +463,7 @@ class _MonitoringViewState extends State ), ), Text( - cpu != null ? '${cpu.temperature}°C' : '--', + (cpu != null && cpu.temperature > 0) ? '${cpu.temperature}°C' : '--', style: const TextStyle( fontSize: 16, fontWeight: FontWeight.w600, diff --git a/linqoraremote/lib/services/background_service.dart b/linqoraremote/lib/services/background_service.dart index d92facb..1249eab 100644 --- a/linqoraremote/lib/services/background_service.dart +++ b/linqoraremote/lib/services/background_service.dart @@ -1,4 +1,5 @@ import 'dart:async'; +import 'dart:io'; import 'dart:isolate'; import 'dart:ui'; @@ -47,6 +48,7 @@ class BackgroundConnectionService { /// Sends a message to the background service static void reportConnectionState(bool isConnected, {int? latency}) { + if (Platform.isWindows || Platform.isLinux || Platform.isMacOS) return; if (_service == null) return; try { @@ -71,6 +73,7 @@ class BackgroundConnectionService { /// Initializes the background service and sets up the notification channel. /// Gets called when the app starts. static Future initializeService() async { + if (Platform.isWindows || Platform.isLinux || Platform.isMacOS) return; final service = FlutterBackgroundService(); _service = service; bool isRunning = await _service!.isRunning(); @@ -127,6 +130,7 @@ class BackgroundConnectionService { bool isConnected, bool notificationsEnabled, ) async { + if (Platform.isWindows || Platform.isLinux || Platform.isMacOS) return; if (_service == null || !(await _service!.isRunning())) return; _service!.invoke('updateDeviceInfo', { @@ -143,6 +147,7 @@ class BackgroundConnectionService { String deviceAddress, bool isConnected, ) async { + if (Platform.isWindows || Platform.isLinux || Platform.isMacOS) return true; if (_service == null) { await initializeService(); } @@ -183,6 +188,7 @@ class BackgroundConnectionService { /// If `isPause` is true, timers inside the service are stopped but the service continues to run. /// If `isPause` is false, the service is completely stopped. static Future stopService({bool isPause = false}) async { + if (Platform.isWindows || Platform.isLinux || Platform.isMacOS) return; try { AppLogger.release( isPause @@ -228,6 +234,7 @@ class BackgroundConnectionService { /// Checks if the background service is running. static Future isRunning() async { + if (Platform.isWindows || Platform.isLinux || Platform.isMacOS) return false; if (_service == null) { return false; } diff --git a/linqoraremote/lib/services/permissions_service.dart b/linqoraremote/lib/services/permissions_service.dart index cfa17dd..e7eed59 100644 --- a/linqoraremote/lib/services/permissions_service.dart +++ b/linqoraremote/lib/services/permissions_service.dart @@ -1,9 +1,15 @@ +import 'dart:io'; + import 'package:flutter/foundation.dart'; import 'package:permission_handler/permission_handler.dart'; class PermissionsService { + static bool get _isDesktop => + Platform.isWindows || Platform.isLinux || Platform.isMacOS; + /// Checks if the app has permission to access notifications static Future checkNotificationPermission() async { + if (_isDesktop) return true; try { final status = await Permission.notification.status; return status.isGranted; @@ -17,6 +23,7 @@ class PermissionsService { /// Requests permission to access notifications static Future requestNotificationPermission() async { + if (_isDesktop) return true; try { final status = await Permission.notification.request(); return status.isGranted; diff --git a/linqoraremote/pubspec.yaml b/linqoraremote/pubspec.yaml index b1092e0..3b7eee2 100644 --- a/linqoraremote/pubspec.yaml +++ b/linqoraremote/pubspec.yaml @@ -51,4 +51,5 @@ flutter: - assets/images/ platforms: android: - ios: \ No newline at end of file + ios: + windows: \ No newline at end of file diff --git a/linqoraremote/test/widget_test.dart b/linqoraremote/test/widget_test.dart new file mode 100644 index 0000000..94e4e29 --- /dev/null +++ b/linqoraremote/test/widget_test.dart @@ -0,0 +1,30 @@ +// This is a basic Flutter widget test. +// +// To perform an interaction with a widget in your test, use the WidgetTester +// utility in the flutter_test package. For example, you can send tap and scroll +// gestures. You can also use WidgetTester to find child widgets in the widget +// tree, read text, and verify that the values of widget properties are correct. + +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; + +import 'package:linqoraremote/main.dart'; + +void main() { + testWidgets('Counter increments smoke test', (WidgetTester tester) async { + // Build our app and trigger a frame. + await tester.pumpWidget(const MyApp()); + + // Verify that our counter starts at 0. + expect(find.text('0'), findsOneWidget); + expect(find.text('1'), findsNothing); + + // Tap the '+' icon and trigger a frame. + await tester.tap(find.byIcon(Icons.add)); + await tester.pump(); + + // Verify that our counter has incremented. + expect(find.text('0'), findsNothing); + expect(find.text('1'), findsOneWidget); + }); +} diff --git a/linqoraremote/windows/.gitignore b/linqoraremote/windows/.gitignore new file mode 100644 index 0000000..d492d0d --- /dev/null +++ b/linqoraremote/windows/.gitignore @@ -0,0 +1,17 @@ +flutter/ephemeral/ + +# Visual Studio user-specific files. +*.suo +*.user +*.userosscache +*.sln.docstates + +# Visual Studio build-related files. +x64/ +x86/ + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ diff --git a/linqoraremote/windows/CMakeLists.txt b/linqoraremote/windows/CMakeLists.txt new file mode 100644 index 0000000..bf2588e --- /dev/null +++ b/linqoraremote/windows/CMakeLists.txt @@ -0,0 +1,108 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.14) +project(linqoraremote LANGUAGES CXX) + +# The name of the executable created for the application. Change this to change +# the on-disk name of your application. +set(BINARY_NAME "linqoraremote") + +# Explicitly opt in to modern CMake behaviors to avoid warnings with recent +# versions of CMake. +cmake_policy(VERSION 3.14...3.25) + +# Define build configuration option. +get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) +if(IS_MULTICONFIG) + set(CMAKE_CONFIGURATION_TYPES "Debug;Profile;Release" + CACHE STRING "" FORCE) +else() + if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE "Debug" CACHE + STRING "Flutter build mode" FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Profile" "Release") + endif() +endif() +# Define settings for the Profile build mode. +set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}") +set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}") +set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE}") +set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE}") + +# Use Unicode for all projects. +add_definitions(-DUNICODE -D_UNICODE) + +# Compilation settings that should be applied to most targets. +# +# Be cautious about adding new options here, as plugins use this function by +# default. In most cases, you should add new options to specific targets instead +# of modifying this function. +function(APPLY_STANDARD_SETTINGS TARGET) + target_compile_features(${TARGET} PUBLIC cxx_std_17) + target_compile_options(${TARGET} PRIVATE /W4 /WX /wd"4100") + target_compile_options(${TARGET} PRIVATE /EHsc) + target_compile_definitions(${TARGET} PRIVATE "_HAS_EXCEPTIONS=0") + target_compile_definitions(${TARGET} PRIVATE "$<$:_DEBUG>") +endfunction() + +# Flutter library and tool build rules. +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# Application build; see runner/CMakeLists.txt. +add_subdirectory("runner") + + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# Support files are copied into place next to the executable, so that it can +# run in place. This is done instead of making a separate bundle (as on Linux) +# so that building and running from within Visual Studio will work. +set(BUILD_BUNDLE_DIR "$") +# Make the "install" step default, as it's required to run. +set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1) +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}") + +install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +if(PLUGIN_BUNDLED_LIBRARIES) + install(FILES "${PLUGIN_BUNDLED_LIBRARIES}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() + +# Copy the native assets provided by the build.dart from all packages. +set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/windows/") +install(DIRECTORY "${NATIVE_ASSETS_DIR}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +# Fully re-copy the assets directory on each build to avoid having stale files +# from a previous install. +set(FLUTTER_ASSET_DIR_NAME "flutter_assets") +install(CODE " + file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") + " COMPONENT Runtime) +install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" + DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) + +# Install the AOT library on non-Debug builds only. +install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + CONFIGURATIONS Profile;Release + COMPONENT Runtime) diff --git a/linqoraremote/windows/flutter/CMakeLists.txt b/linqoraremote/windows/flutter/CMakeLists.txt new file mode 100644 index 0000000..903f489 --- /dev/null +++ b/linqoraremote/windows/flutter/CMakeLists.txt @@ -0,0 +1,109 @@ +# This file controls Flutter-level build steps. It should not be edited. +cmake_minimum_required(VERSION 3.14) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. +set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper") + +# Set fallback configurations for older versions of the flutter tool. +if (NOT DEFINED FLUTTER_TARGET_PLATFORM) + set(FLUTTER_TARGET_PLATFORM "windows-x64") +endif() + +# === Flutter Library === +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/windows/app.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "flutter_export.h" + "flutter_windows.h" + "flutter_messenger.h" + "flutter_plugin_registrar.h" + "flutter_texture_registrar.h" +) +list(TRANSFORM FLUTTER_LIBRARY_HEADERS PREPEND "${EPHEMERAL_DIR}/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}.lib") +add_dependencies(flutter flutter_assemble) + +# === Wrapper === +list(APPEND CPP_WRAPPER_SOURCES_CORE + "core_implementations.cc" + "standard_codec.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_CORE PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_PLUGIN + "plugin_registrar.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_PLUGIN PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_APP + "flutter_engine.cc" + "flutter_view_controller.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_APP PREPEND "${WRAPPER_ROOT}/") + +# Wrapper sources needed for a plugin. +add_library(flutter_wrapper_plugin STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} +) +apply_standard_settings(flutter_wrapper_plugin) +set_target_properties(flutter_wrapper_plugin PROPERTIES + POSITION_INDEPENDENT_CODE ON) +set_target_properties(flutter_wrapper_plugin PROPERTIES + CXX_VISIBILITY_PRESET hidden) +target_link_libraries(flutter_wrapper_plugin PUBLIC flutter) +target_include_directories(flutter_wrapper_plugin PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_plugin flutter_assemble) + +# Wrapper sources needed for the runner. +add_library(flutter_wrapper_app STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_APP} +) +apply_standard_settings(flutter_wrapper_app) +target_link_libraries(flutter_wrapper_app PUBLIC flutter) +target_include_directories(flutter_wrapper_app PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_app flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +set(PHONY_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/_phony_") +set_source_files_properties("${PHONY_OUTPUT}" PROPERTIES SYMBOLIC TRUE) +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} + ${PHONY_OUTPUT} + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" + ${FLUTTER_TARGET_PLATFORM} $ + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} +) diff --git a/linqoraremote/windows/flutter/generated_plugin_registrant.cc b/linqoraremote/windows/flutter/generated_plugin_registrant.cc new file mode 100644 index 0000000..ccbc18d --- /dev/null +++ b/linqoraremote/windows/flutter/generated_plugin_registrant.cc @@ -0,0 +1,26 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + +#include +#include +#include +#include +#include + +void RegisterPlugins(flutter::PluginRegistry* registry) { + ConnectivityPlusWindowsPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("ConnectivityPlusWindowsPlugin")); + FlutterSecureStorageWindowsPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("FlutterSecureStorageWindowsPlugin")); + PermissionHandlerWindowsPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("PermissionHandlerWindowsPlugin")); + SharePlusWindowsPluginCApiRegisterWithRegistrar( + registry->GetRegistrarForPlugin("SharePlusWindowsPluginCApi")); + UrlLauncherWindowsRegisterWithRegistrar( + registry->GetRegistrarForPlugin("UrlLauncherWindows")); +} diff --git a/linqoraremote/windows/flutter/generated_plugin_registrant.h b/linqoraremote/windows/flutter/generated_plugin_registrant.h new file mode 100644 index 0000000..dc139d8 --- /dev/null +++ b/linqoraremote/windows/flutter/generated_plugin_registrant.h @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void RegisterPlugins(flutter::PluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/linqoraremote/windows/flutter/generated_plugins.cmake b/linqoraremote/windows/flutter/generated_plugins.cmake new file mode 100644 index 0000000..9cdeff1 --- /dev/null +++ b/linqoraremote/windows/flutter/generated_plugins.cmake @@ -0,0 +1,30 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST + connectivity_plus + flutter_secure_storage_windows + permission_handler_windows + share_plus + url_launcher_windows +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST + flutter_local_notifications_windows + jni +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/linqoraremote/windows/runner/CMakeLists.txt b/linqoraremote/windows/runner/CMakeLists.txt new file mode 100644 index 0000000..394917c --- /dev/null +++ b/linqoraremote/windows/runner/CMakeLists.txt @@ -0,0 +1,40 @@ +cmake_minimum_required(VERSION 3.14) +project(runner LANGUAGES CXX) + +# Define the application target. To change its name, change BINARY_NAME in the +# top-level CMakeLists.txt, not the value here, or `flutter run` will no longer +# work. +# +# Any new source files that you add to the application should be added here. +add_executable(${BINARY_NAME} WIN32 + "flutter_window.cpp" + "main.cpp" + "utils.cpp" + "win32_window.cpp" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" + "Runner.rc" + "runner.exe.manifest" +) + +# Apply the standard set of build settings. This can be removed for applications +# that need different build settings. +apply_standard_settings(${BINARY_NAME}) + +# Add preprocessor definitions for the build version. +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}") + +# Disable Windows macros that collide with C++ standard library functions. +target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX") + +# Add dependency libraries and include directories. Add any application-specific +# dependencies here. +target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app) +target_link_libraries(${BINARY_NAME} PRIVATE "dwmapi.lib") +target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}") + +# Run the Flutter tool portions of the build. This must not be removed. +add_dependencies(${BINARY_NAME} flutter_assemble) diff --git a/linqoraremote/windows/runner/Runner.rc b/linqoraremote/windows/runner/Runner.rc new file mode 100644 index 0000000..83372f4 --- /dev/null +++ b/linqoraremote/windows/runner/Runner.rc @@ -0,0 +1,121 @@ +// Microsoft Visual C++ generated resource script. +// +#pragma code_page(65001) +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_APP_ICON ICON "resources\\app_icon.ico" + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD) +#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD +#else +#define VERSION_AS_NUMBER 1,0,0,0 +#endif + +#if defined(FLUTTER_VERSION) +#define VERSION_AS_STRING FLUTTER_VERSION +#else +#define VERSION_AS_STRING "1.0.0" +#endif + +VS_VERSION_INFO VERSIONINFO + FILEVERSION VERSION_AS_NUMBER + PRODUCTVERSION VERSION_AS_NUMBER + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904e4" + BEGIN + VALUE "CompanyName", "com.pasichDev" "\0" + VALUE "FileDescription", "linqoraremote" "\0" + VALUE "FileVersion", VERSION_AS_STRING "\0" + VALUE "InternalName", "linqoraremote" "\0" + VALUE "LegalCopyright", "Copyright (C) 2026 com.pasichDev. All rights reserved." "\0" + VALUE "OriginalFilename", "linqoraremote.exe" "\0" + VALUE "ProductName", "linqoraremote" "\0" + VALUE "ProductVersion", VERSION_AS_STRING "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END + +#endif // English (United States) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED diff --git a/linqoraremote/windows/runner/flutter_window.cpp b/linqoraremote/windows/runner/flutter_window.cpp new file mode 100644 index 0000000..955ee30 --- /dev/null +++ b/linqoraremote/windows/runner/flutter_window.cpp @@ -0,0 +1,71 @@ +#include "flutter_window.h" + +#include + +#include "flutter/generated_plugin_registrant.h" + +FlutterWindow::FlutterWindow(const flutter::DartProject& project) + : project_(project) {} + +FlutterWindow::~FlutterWindow() {} + +bool FlutterWindow::OnCreate() { + if (!Win32Window::OnCreate()) { + return false; + } + + RECT frame = GetClientArea(); + + // The size here must match the window dimensions to avoid unnecessary surface + // creation / destruction in the startup path. + flutter_controller_ = std::make_unique( + frame.right - frame.left, frame.bottom - frame.top, project_); + // Ensure that basic setup of the controller was successful. + if (!flutter_controller_->engine() || !flutter_controller_->view()) { + return false; + } + RegisterPlugins(flutter_controller_->engine()); + SetChildContent(flutter_controller_->view()->GetNativeWindow()); + + flutter_controller_->engine()->SetNextFrameCallback([&]() { + this->Show(); + }); + + // Flutter can complete the first frame before the "show window" callback is + // registered. The following call ensures a frame is pending to ensure the + // window is shown. It is a no-op if the first frame hasn't completed yet. + flutter_controller_->ForceRedraw(); + + return true; +} + +void FlutterWindow::OnDestroy() { + if (flutter_controller_) { + flutter_controller_ = nullptr; + } + + Win32Window::OnDestroy(); +} + +LRESULT +FlutterWindow::MessageHandler(HWND hwnd, UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + // Give Flutter, including plugins, an opportunity to handle window messages. + if (flutter_controller_) { + std::optional result = + flutter_controller_->HandleTopLevelWindowProc(hwnd, message, wparam, + lparam); + if (result) { + return *result; + } + } + + switch (message) { + case WM_FONTCHANGE: + flutter_controller_->engine()->ReloadSystemFonts(); + break; + } + + return Win32Window::MessageHandler(hwnd, message, wparam, lparam); +} diff --git a/linqoraremote/windows/runner/flutter_window.h b/linqoraremote/windows/runner/flutter_window.h new file mode 100644 index 0000000..6da0652 --- /dev/null +++ b/linqoraremote/windows/runner/flutter_window.h @@ -0,0 +1,33 @@ +#ifndef RUNNER_FLUTTER_WINDOW_H_ +#define RUNNER_FLUTTER_WINDOW_H_ + +#include +#include + +#include + +#include "win32_window.h" + +// A window that does nothing but host a Flutter view. +class FlutterWindow : public Win32Window { + public: + // Creates a new FlutterWindow hosting a Flutter view running |project|. + explicit FlutterWindow(const flutter::DartProject& project); + virtual ~FlutterWindow(); + + protected: + // Win32Window: + bool OnCreate() override; + void OnDestroy() override; + LRESULT MessageHandler(HWND window, UINT const message, WPARAM const wparam, + LPARAM const lparam) noexcept override; + + private: + // The project to run. + flutter::DartProject project_; + + // The Flutter instance hosted by this window. + std::unique_ptr flutter_controller_; +}; + +#endif // RUNNER_FLUTTER_WINDOW_H_ diff --git a/linqoraremote/windows/runner/main.cpp b/linqoraremote/windows/runner/main.cpp new file mode 100644 index 0000000..bf153e3 --- /dev/null +++ b/linqoraremote/windows/runner/main.cpp @@ -0,0 +1,43 @@ +#include +#include +#include + +#include "flutter_window.h" +#include "utils.h" + +int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, + _In_ wchar_t *command_line, _In_ int show_command) { + // Attach to console when present (e.g., 'flutter run') or create a + // new console when running with a debugger. + if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) { + CreateAndAttachConsole(); + } + + // Initialize COM, so that it is available for use in the library and/or + // plugins. + ::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); + + flutter::DartProject project(L"data"); + + std::vector command_line_arguments = + GetCommandLineArguments(); + + project.set_dart_entrypoint_arguments(std::move(command_line_arguments)); + + FlutterWindow window(project); + Win32Window::Point origin(10, 10); + Win32Window::Size size(1280, 800); + if (!window.Create(L"Linqora Remote", origin, size)) { + return EXIT_FAILURE; + } + window.SetQuitOnClose(true); + + ::MSG msg; + while (::GetMessage(&msg, nullptr, 0, 0)) { + ::TranslateMessage(&msg); + ::DispatchMessage(&msg); + } + + ::CoUninitialize(); + return EXIT_SUCCESS; +} diff --git a/linqoraremote/windows/runner/resource.h b/linqoraremote/windows/runner/resource.h new file mode 100644 index 0000000..66a65d1 --- /dev/null +++ b/linqoraremote/windows/runner/resource.h @@ -0,0 +1,16 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by Runner.rc +// +#define IDI_APP_ICON 101 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/linqoraremote/windows/runner/resources/app_icon.ico b/linqoraremote/windows/runner/resources/app_icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..c04e20caf6370ebb9253ad831cc31de4a9c965f6 GIT binary patch literal 33772 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 literal 0 HcmV?d00001 diff --git a/linqoraremote/windows/runner/runner.exe.manifest b/linqoraremote/windows/runner/runner.exe.manifest new file mode 100644 index 0000000..153653e --- /dev/null +++ b/linqoraremote/windows/runner/runner.exe.manifest @@ -0,0 +1,14 @@ + + + + + PerMonitorV2 + + + + + + + + + diff --git a/linqoraremote/windows/runner/utils.cpp b/linqoraremote/windows/runner/utils.cpp new file mode 100644 index 0000000..3a0b465 --- /dev/null +++ b/linqoraremote/windows/runner/utils.cpp @@ -0,0 +1,65 @@ +#include "utils.h" + +#include +#include +#include +#include + +#include + +void CreateAndAttachConsole() { + if (::AllocConsole()) { + FILE *unused; + if (freopen_s(&unused, "CONOUT$", "w", stdout)) { + _dup2(_fileno(stdout), 1); + } + if (freopen_s(&unused, "CONOUT$", "w", stderr)) { + _dup2(_fileno(stdout), 2); + } + std::ios::sync_with_stdio(); + FlutterDesktopResyncOutputStreams(); + } +} + +std::vector GetCommandLineArguments() { + // Convert the UTF-16 command line arguments to UTF-8 for the Engine to use. + int argc; + wchar_t** argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc); + if (argv == nullptr) { + return std::vector(); + } + + std::vector command_line_arguments; + + // Skip the first argument as it's the binary name. + for (int i = 1; i < argc; i++) { + command_line_arguments.push_back(Utf8FromUtf16(argv[i])); + } + + ::LocalFree(argv); + + return command_line_arguments; +} + +std::string Utf8FromUtf16(const wchar_t* utf16_string) { + if (utf16_string == nullptr) { + return std::string(); + } + unsigned int target_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + -1, nullptr, 0, nullptr, nullptr) + -1; // remove the trailing null character + int input_length = (int)wcslen(utf16_string); + std::string utf8_string; + if (target_length == 0 || target_length > utf8_string.max_size()) { + return utf8_string; + } + utf8_string.resize(target_length); + int converted_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + input_length, utf8_string.data(), target_length, nullptr, nullptr); + if (converted_length == 0) { + return std::string(); + } + return utf8_string; +} diff --git a/linqoraremote/windows/runner/utils.h b/linqoraremote/windows/runner/utils.h new file mode 100644 index 0000000..3879d54 --- /dev/null +++ b/linqoraremote/windows/runner/utils.h @@ -0,0 +1,19 @@ +#ifndef RUNNER_UTILS_H_ +#define RUNNER_UTILS_H_ + +#include +#include + +// Creates a console for the process, and redirects stdout and stderr to +// it for both the runner and the Flutter library. +void CreateAndAttachConsole(); + +// Takes a null-terminated wchar_t* encoded in UTF-16 and returns a std::string +// encoded in UTF-8. Returns an empty std::string on failure. +std::string Utf8FromUtf16(const wchar_t* utf16_string); + +// Gets the command line arguments passed in as a std::vector, +// encoded in UTF-8. Returns an empty std::vector on failure. +std::vector GetCommandLineArguments(); + +#endif // RUNNER_UTILS_H_ diff --git a/linqoraremote/windows/runner/win32_window.cpp b/linqoraremote/windows/runner/win32_window.cpp new file mode 100644 index 0000000..60608d0 --- /dev/null +++ b/linqoraremote/windows/runner/win32_window.cpp @@ -0,0 +1,288 @@ +#include "win32_window.h" + +#include +#include + +#include "resource.h" + +namespace { + +/// Window attribute that enables dark mode window decorations. +/// +/// Redefined in case the developer's machine has a Windows SDK older than +/// version 10.0.22000.0. +/// See: https://docs.microsoft.com/windows/win32/api/dwmapi/ne-dwmapi-dwmwindowattribute +#ifndef DWMWA_USE_IMMERSIVE_DARK_MODE +#define DWMWA_USE_IMMERSIVE_DARK_MODE 20 +#endif + +constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW"; + +/// Registry key for app theme preference. +/// +/// A value of 0 indicates apps should use dark mode. A non-zero or missing +/// value indicates apps should use light mode. +constexpr const wchar_t kGetPreferredBrightnessRegKey[] = + L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize"; +constexpr const wchar_t kGetPreferredBrightnessRegValue[] = L"AppsUseLightTheme"; + +// The number of Win32Window objects that currently exist. +static int g_active_window_count = 0; + +using EnableNonClientDpiScaling = BOOL __stdcall(HWND hwnd); + +// Scale helper to convert logical scaler values to physical using passed in +// scale factor +int Scale(int source, double scale_factor) { + return static_cast(source * scale_factor); +} + +// Dynamically loads the |EnableNonClientDpiScaling| from the User32 module. +// This API is only needed for PerMonitor V1 awareness mode. +void EnableFullDpiSupportIfAvailable(HWND hwnd) { + HMODULE user32_module = LoadLibraryA("User32.dll"); + if (!user32_module) { + return; + } + auto enable_non_client_dpi_scaling = + reinterpret_cast( + GetProcAddress(user32_module, "EnableNonClientDpiScaling")); + if (enable_non_client_dpi_scaling != nullptr) { + enable_non_client_dpi_scaling(hwnd); + } + FreeLibrary(user32_module); +} + +} // namespace + +// Manages the Win32Window's window class registration. +class WindowClassRegistrar { + public: + ~WindowClassRegistrar() = default; + + // Returns the singleton registrar instance. + static WindowClassRegistrar* GetInstance() { + if (!instance_) { + instance_ = new WindowClassRegistrar(); + } + return instance_; + } + + // Returns the name of the window class, registering the class if it hasn't + // previously been registered. + const wchar_t* GetWindowClass(); + + // Unregisters the window class. Should only be called if there are no + // instances of the window. + void UnregisterWindowClass(); + + private: + WindowClassRegistrar() = default; + + static WindowClassRegistrar* instance_; + + bool class_registered_ = false; +}; + +WindowClassRegistrar* WindowClassRegistrar::instance_ = nullptr; + +const wchar_t* WindowClassRegistrar::GetWindowClass() { + if (!class_registered_) { + WNDCLASS window_class{}; + window_class.hCursor = LoadCursor(nullptr, IDC_ARROW); + window_class.lpszClassName = kWindowClassName; + window_class.style = CS_HREDRAW | CS_VREDRAW; + window_class.cbClsExtra = 0; + window_class.cbWndExtra = 0; + window_class.hInstance = GetModuleHandle(nullptr); + window_class.hIcon = + LoadIcon(window_class.hInstance, MAKEINTRESOURCE(IDI_APP_ICON)); + window_class.hbrBackground = 0; + window_class.lpszMenuName = nullptr; + window_class.lpfnWndProc = Win32Window::WndProc; + RegisterClass(&window_class); + class_registered_ = true; + } + return kWindowClassName; +} + +void WindowClassRegistrar::UnregisterWindowClass() { + UnregisterClass(kWindowClassName, nullptr); + class_registered_ = false; +} + +Win32Window::Win32Window() { + ++g_active_window_count; +} + +Win32Window::~Win32Window() { + --g_active_window_count; + Destroy(); +} + +bool Win32Window::Create(const std::wstring& title, + const Point& origin, + const Size& size) { + Destroy(); + + const wchar_t* window_class = + WindowClassRegistrar::GetInstance()->GetWindowClass(); + + const POINT target_point = {static_cast(origin.x), + static_cast(origin.y)}; + HMONITOR monitor = MonitorFromPoint(target_point, MONITOR_DEFAULTTONEAREST); + UINT dpi = FlutterDesktopGetDpiForMonitor(monitor); + double scale_factor = dpi / 96.0; + + HWND window = CreateWindow( + window_class, title.c_str(), WS_OVERLAPPEDWINDOW, + Scale(origin.x, scale_factor), Scale(origin.y, scale_factor), + Scale(size.width, scale_factor), Scale(size.height, scale_factor), + nullptr, nullptr, GetModuleHandle(nullptr), this); + + if (!window) { + return false; + } + + UpdateTheme(window); + + return OnCreate(); +} + +bool Win32Window::Show() { + return ShowWindow(window_handle_, SW_SHOWNORMAL); +} + +// static +LRESULT CALLBACK Win32Window::WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + if (message == WM_NCCREATE) { + auto window_struct = reinterpret_cast(lparam); + SetWindowLongPtr(window, GWLP_USERDATA, + reinterpret_cast(window_struct->lpCreateParams)); + + auto that = static_cast(window_struct->lpCreateParams); + EnableFullDpiSupportIfAvailable(window); + that->window_handle_ = window; + } else if (Win32Window* that = GetThisFromHandle(window)) { + return that->MessageHandler(window, message, wparam, lparam); + } + + return DefWindowProc(window, message, wparam, lparam); +} + +LRESULT +Win32Window::MessageHandler(HWND hwnd, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + switch (message) { + case WM_DESTROY: + window_handle_ = nullptr; + Destroy(); + if (quit_on_close_) { + PostQuitMessage(0); + } + return 0; + + case WM_DPICHANGED: { + auto newRectSize = reinterpret_cast(lparam); + LONG newWidth = newRectSize->right - newRectSize->left; + LONG newHeight = newRectSize->bottom - newRectSize->top; + + SetWindowPos(hwnd, nullptr, newRectSize->left, newRectSize->top, newWidth, + newHeight, SWP_NOZORDER | SWP_NOACTIVATE); + + return 0; + } + case WM_SIZE: { + RECT rect = GetClientArea(); + if (child_content_ != nullptr) { + // Size and position the child window. + MoveWindow(child_content_, rect.left, rect.top, rect.right - rect.left, + rect.bottom - rect.top, TRUE); + } + return 0; + } + + case WM_ACTIVATE: + if (child_content_ != nullptr) { + SetFocus(child_content_); + } + return 0; + + case WM_DWMCOLORIZATIONCOLORCHANGED: + UpdateTheme(hwnd); + return 0; + } + + return DefWindowProc(window_handle_, message, wparam, lparam); +} + +void Win32Window::Destroy() { + OnDestroy(); + + if (window_handle_) { + DestroyWindow(window_handle_); + window_handle_ = nullptr; + } + if (g_active_window_count == 0) { + WindowClassRegistrar::GetInstance()->UnregisterWindowClass(); + } +} + +Win32Window* Win32Window::GetThisFromHandle(HWND const window) noexcept { + return reinterpret_cast( + GetWindowLongPtr(window, GWLP_USERDATA)); +} + +void Win32Window::SetChildContent(HWND content) { + child_content_ = content; + SetParent(content, window_handle_); + RECT frame = GetClientArea(); + + MoveWindow(content, frame.left, frame.top, frame.right - frame.left, + frame.bottom - frame.top, true); + + SetFocus(child_content_); +} + +RECT Win32Window::GetClientArea() { + RECT frame; + GetClientRect(window_handle_, &frame); + return frame; +} + +HWND Win32Window::GetHandle() { + return window_handle_; +} + +void Win32Window::SetQuitOnClose(bool quit_on_close) { + quit_on_close_ = quit_on_close; +} + +bool Win32Window::OnCreate() { + // No-op; provided for subclasses. + return true; +} + +void Win32Window::OnDestroy() { + // No-op; provided for subclasses. +} + +void Win32Window::UpdateTheme(HWND const window) { + DWORD light_mode; + DWORD light_mode_size = sizeof(light_mode); + LSTATUS result = RegGetValue(HKEY_CURRENT_USER, kGetPreferredBrightnessRegKey, + kGetPreferredBrightnessRegValue, + RRF_RT_REG_DWORD, nullptr, &light_mode, + &light_mode_size); + + if (result == ERROR_SUCCESS) { + BOOL enable_dark_mode = light_mode == 0; + DwmSetWindowAttribute(window, DWMWA_USE_IMMERSIVE_DARK_MODE, + &enable_dark_mode, sizeof(enable_dark_mode)); + } +} diff --git a/linqoraremote/windows/runner/win32_window.h b/linqoraremote/windows/runner/win32_window.h new file mode 100644 index 0000000..e901dde --- /dev/null +++ b/linqoraremote/windows/runner/win32_window.h @@ -0,0 +1,102 @@ +#ifndef RUNNER_WIN32_WINDOW_H_ +#define RUNNER_WIN32_WINDOW_H_ + +#include + +#include +#include +#include + +// A class abstraction for a high DPI-aware Win32 Window. Intended to be +// inherited from by classes that wish to specialize with custom +// rendering and input handling +class Win32Window { + public: + struct Point { + unsigned int x; + unsigned int y; + Point(unsigned int x, unsigned int y) : x(x), y(y) {} + }; + + struct Size { + unsigned int width; + unsigned int height; + Size(unsigned int width, unsigned int height) + : width(width), height(height) {} + }; + + Win32Window(); + virtual ~Win32Window(); + + // Creates a win32 window with |title| that is positioned and sized using + // |origin| and |size|. New windows are created on the default monitor. Window + // sizes are specified to the OS in physical pixels, hence to ensure a + // consistent size this function will scale the inputted width and height as + // as appropriate for the default monitor. The window is invisible until + // |Show| is called. Returns true if the window was created successfully. + bool Create(const std::wstring& title, const Point& origin, const Size& size); + + // Show the current window. Returns true if the window was successfully shown. + bool Show(); + + // Release OS resources associated with window. + void Destroy(); + + // Inserts |content| into the window tree. + void SetChildContent(HWND content); + + // Returns the backing Window handle to enable clients to set icon and other + // window properties. Returns nullptr if the window has been destroyed. + HWND GetHandle(); + + // If true, closing this window will quit the application. + void SetQuitOnClose(bool quit_on_close); + + // Return a RECT representing the bounds of the current client area. + RECT GetClientArea(); + + protected: + // Processes and route salient window messages for mouse handling, + // size change and DPI. Delegates handling of these to member overloads that + // inheriting classes can handle. + virtual LRESULT MessageHandler(HWND window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Called when CreateAndShow is called, allowing subclass window-related + // setup. Subclasses should return false if setup fails. + virtual bool OnCreate(); + + // Called when Destroy is called. + virtual void OnDestroy(); + + private: + friend class WindowClassRegistrar; + + // OS callback called by message pump. Handles the WM_NCCREATE message which + // is passed when the non-client area is being created and enables automatic + // non-client DPI scaling so that the non-client area automatically + // responds to changes in DPI. All other messages are handled by + // MessageHandler. + static LRESULT CALLBACK WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Retrieves a class instance pointer for |window| + static Win32Window* GetThisFromHandle(HWND const window) noexcept; + + // Update the window frame's theme to match the system theme. + static void UpdateTheme(HWND const window); + + bool quit_on_close_ = false; + + // window handle for top level window. + HWND window_handle_ = nullptr; + + // window handle for hosted content. + HWND child_content_ = nullptr; +}; + +#endif // RUNNER_WIN32_WINDOW_H_