Merge pull request #5 from project-vrcat/dev

Dev

Author: gizmo-ds

bind.go

@@ -12,21 +12,13 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
-	"runtime"
 	"strings"
 	"syscall"
 	"time"
 
 	"github.com/TheTitanrain/w32"
 )
 
-var windowTitle string
-
-// BindSetWindowTitle 设置当前窗口标题, 用于获取HWND
-func BindSetWindowTitle(title string) {
-	windowTitle = title
-}
-
 // BindVRChatPath 获取VRChat配置目录
 func BindVRChatPath() (_path string, err error) {
 	appdata := os.Getenv("AppData")
@@ -59,11 +51,12 @@ func BindWriteTextFile(filename, content string) error {
 
 // BindSelectDirectory 弹出目录选择框
 func BindSelectDirectory(title string) (string, error) {
-	_windowTitle, _ := syscall.UTF16PtrFromString(windowTitle)
+	pid := ui.Getpid()
+	owner := FindWindowByProcessId(pid)
 	_title, _ := syscall.UTF16PtrFromString(title)
 
 	res := w32.SHBrowseForFolder(&w32.BROWSEINFO{
-		Owner: w32.FindWindowW(nil, _windowTitle),
+		Owner: owner,
 		Flags: w32.BIF_RETURNONLYFSDIRS | w32.BIF_NEWDIALOGSTYLE,
 		Title: _title,
 	})
@@ -85,15 +78,7 @@ func BindAppVersion() string {
 
 // BindOpen 通过系统默认浏览器打开指定url
 func BindOpen(url string) error {
-	switch runtime.GOOS {
-	case "windows":
-		return exec.Command("cmd", "/c", "start", url).Start()
-	case "darwin":
-		return exec.Command("open", url).Start()
-	case "linux":
-		return exec.Command("xdg-open", url).Start()
-	}
-	return fmt.Errorf("don't know how to open things on %s platform", runtime.GOOS)
+	return exec.Command("cmd", "/c", "start", url).Start()
 }
 
 // BindCheckUpdate 检查是否存在新版本

go.mod

@@ -6,3 +6,5 @@ require (
 	github.com/TheTitanrain/w32 v0.0.0-20200114052255-2654d97dbd3d
 	github.com/zserge/lorca v0.1.10
 )
+
+replace github.com/zserge/lorca v0.1.10 => github.com/project-vrcat/lorca v0.1.11-0.20210603092944-66a39a5d8b01

go.sum

@@ -1,7 +1,7 @@
 github.com/TheTitanrain/w32 v0.0.0-20200114052255-2654d97dbd3d h1:2xp1BQbqcDDaikHnASWpVZRjibOxu7y9LhAv04whugI=
 github.com/TheTitanrain/w32 v0.0.0-20200114052255-2654d97dbd3d/go.mod h1:peYoMncQljjNS6tZwI9WVyQB3qZS6u79/N3mBOcnd3I=
-github.com/zserge/lorca v0.1.10 h1:f/xBJ3D3ipcVRCcvN8XqZnpoKcOXV8I4vwqlFyw7ruc=
-github.com/zserge/lorca v0.1.10/go.mod h1:bVmnIbIRlOcoV285KIRSe4bUABKi7R7384Ycuum6e4A=
+github.com/project-vrcat/lorca v0.1.11-0.20210603092944-66a39a5d8b01 h1:TtRBMvGOPxncsARmEkanHyX5I/pKPHW6PHYs89YJlgs=
+github.com/project-vrcat/lorca v0.1.11-0.20210603092944-66a39a5d8b01/go.mod h1:TUOtEogaMwy0b+p9e4NxZC1jbPRUaNaEw5DnjQF//F8=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/net v0.0.0-20200222125558-5a598a2470a0 h1:MsuvTghUPjX762sGLnGsxC3HM0B5r83wEtYcYR8/vRs=
 golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=

main.go

@@ -2,32 +2,30 @@
 package main
 
 import (
-	"embed"
 	"fmt"
-	"io/fs"
-	"net"
-	"net/http"
-	"net/url"
+	"log"
 
 	"github.com/TheTitanrain/w32"
 	"github.com/zserge/lorca"
 )
 
+var ui lorca.UI
+
 func main() {
+	log.SetFlags(log.Lshortfile)
 	port := server()
 	if lorca.ChromeExecutable() == "" {
 		PromptDownload()
 		return
 	}
-	loadingFile, _ := publicFiles.ReadFile("public/loading.html")
-	ui, err := lorca.New("data:text/html,"+url.PathEscape(string(loadingFile)), "", 800, 500)
+	var err error
+	ui, err = lorca.New("", "", 800, 500)
 	if err != nil {
 		w32.MessageBox(w32.HWND(0), err.Error(), "Error", w32.MB_OK|w32.MB_ICONERROR)
 		return
 	}
 	defer ui.Close()
 
-	_ = ui.Bind("setWindowTitle", BindSetWindowTitle)
 	_ = ui.Bind("vrchatPath", BindVRChatPath)
 	_ = ui.Bind("readTextFile", BindReadTextFile)
 	_ = ui.Bind("writeTextFile", BindWriteTextFile)
@@ -41,31 +39,3 @@ func main() {
 
 	<-ui.Done()
 }
-
-func server() int {
-	port := pickPort()
-	http.Handle("/", http.StripPrefix("/", http.FileServer(getFileSystem())))
-	go func() {
-		_ = http.ListenAndServe(fmt.Sprintf("127.0.0.1:%d", port), nil)
-	}()
-	return port
-}
-
-func pickPort() int {
-	listener, err := net.Listen("tcp4", "127.0.0.1:0")
-	if err != nil {
-		return -1
-	}
-	defer listener.Close()
-
-	addr := listener.Addr().(*net.TCPAddr)
-	return addr.Port
-}
-
-//go:embed public
-var publicFiles embed.FS
-
-func getFileSystem() http.FileSystem {
-	fSys, _ := fs.Sub(publicFiles, "public")
-	return http.FS(fSys)
-}

public/loading.html

@@ -19,9 +19,6 @@ new Vue({
         })
         appVersion().then(version => {
             document.title += " " + version
-            setWindowTitle(document.title)
-        }).catch(_ => {
-            setWindowTitle(document.title)
         })
         vrchatPath().then(dir => {
             this.vrchat_dir = dir

public/main.js

@@ -0,0 +1,37 @@
+package main
+
+import (
+	"embed"
+	"fmt"
+	"io/fs"
+	"net"
+	"net/http"
+)
+
+func server() int {
+	port := pickPort()
+	http.Handle("/", http.StripPrefix("/", http.FileServer(getFileSystem())))
+	go func() {
+		_ = http.ListenAndServe(fmt.Sprintf("127.0.0.1:%d", port), nil)
+	}()
+	return port
+}
+
+func pickPort() int {
+	listener, err := net.Listen("tcp4", "127.0.0.1:0")
+	if err != nil {
+		return -1
+	}
+	defer listener.Close()
+
+	addr := listener.Addr().(*net.TCPAddr)
+	return addr.Port
+}
+
+//go:embed public
+var publicFiles embed.FS
+
+func getFileSystem() http.FileSystem {
+	fSys, _ := fs.Sub(publicFiles, "public")
+	return http.FS(fSys)
+}

server.go

@@ -1,9 +1,16 @@
 package main
 
 import (
+	"syscall"
+
 	"github.com/TheTitanrain/w32"
 )
 
+var (
+	user32          = syscall.MustLoadDLL("user32.dll")
+	procEnumWindows = user32.MustFindProc("EnumWindows")
+)
+
 // IsChineseSimplified 当前操作系统语言是否为简体中文
 func IsChineseSimplified() bool {
 	switch w32.GetUserDefaultLCID() {
@@ -12,3 +19,31 @@ func IsChineseSimplified() bool {
 	}
 	return false
 }
+
+// FindWindowByProcessId 通过PID寻找窗口
+func FindWindowByProcessId(pid int) w32.HWND {
+	_hwnd := w32.HWND(0)
+	cb := syscall.NewCallback(func(hwnd syscall.Handle, lParam uintptr) uintptr {
+		_, _pid := w32.GetWindowThreadProcessId(w32.HWND(hwnd))
+		if _pid == pid && w32.IsWindowVisible(w32.HWND(hwnd)) {
+			_hwnd = w32.HWND(hwnd)
+			return 0
+		}
+		return 1
+	})
+	_ = EnumWindows(cb, 0)
+	return _hwnd
+}
+
+// EnumWindows 枚举窗口
+func EnumWindows(enumFunc uintptr, lParam uintptr) (err error) {
+	r1, _, e1 := syscall.Syscall(procEnumWindows.Addr(), 2, enumFunc, lParam, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = error(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}