Update UI to gotk4

.github/workflows/release.yaml

@@ -3,7 +3,7 @@ run-name: ${{ github.actor }} is triggering on GitHub Actions 🚀
 on: [push]
 jobs:
   Build-test-freebsd:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     name: Build and Test in FreeBSD
     steps:
       - uses: actions/checkout@master
@@ -16,12 +16,12 @@ jobs:
           release: "15.0"
           usesh: true
           prepare: |
-            pkg install -y go pkgconf libX11 libXtst gtk3
+            pkg install -y go pkgconf libX11 libXtst gtk4
           run: |
             make test && make build
 
   Build-test-nix-flake:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
     - uses: cachix/install-nix-action@v27
@@ -31,12 +31,12 @@ jobs:
       run: nix develop
 
   Releaser:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@master
         with:
           fetch-depth: 1
-      - run: sudo apt-get update && sudo apt-get install -y make libibus-1.0-dev libx11-dev libxtst-dev libgtk-3-dev osc
+      - run: sudo apt-get update && sudo apt-get install -y make pkgconf libibus-1.0-dev libx11-dev libxtst-dev osc libgtk-4-dev libglib2.0-dev gobject-introspection
       - run: make test && make build
       - shell: bash
         env:

config/config.go

@@ -15,6 +15,7 @@ const (
 	configFile       = "%s/ibus-%s.config.json"
 	mactabFile       = "%s/ibus-%s.macro.text"
 	sampleMactabFile = "data/macro.tpl.txt"
+	APP_ID           = "ibus-bamboo.ui-shortcut-options"
 )
 
 type Config struct {

engine.go

@@ -22,13 +22,16 @@ package main
 import (
 	"fmt"
 	"log"
+	"os"
 	"os/exec"
 	"reflect"
 	"strconv"
 	"sync"
 
 	"github.com/BambooEngine/bamboo-core"
 	ibus "github.com/BambooEngine/goibus"
+	"github.com/diamondburned/gotk4/pkg/gio/v2"
+	"github.com/diamondburned/gotk4/pkg/gtk/v4"
 	"github.com/godbus/dbus/v5"
 
 	"ibus-bamboo/config"
@@ -62,15 +65,26 @@ type IBusBambooEngine struct {
 	shouldRestoreKeyStrokes bool
 	// enqueue key strokes to process later
 	shouldEnqueuKeyStrokes bool
+	// UI shortcut options
+	appShortcutOptions     *gtk.Application
+	windowShortcutOptions  *gtk.ApplicationWindow
 }
 
 func NewIbusBambooEngine(name string, cfg *config.Config, base IEngine, preeditor bamboo.IEngine) *IBusBambooEngine {
-	return &IBusBambooEngine{
+	engine := &IBusBambooEngine{
 		engineName: name,
 		IEngine:    base,
 		preeditor:  preeditor,
 		config:     cfg,
 	}
+	engine.appShortcutOptions = gtk.NewApplication(config.APP_ID, gio.ApplicationDefaultFlags)
+
+	engine.appShortcutOptions.ConnectActivate(func() {
+		engine.activateUIOptions()
+	})
+	_ = engine.appShortcutOptions.Run(os.Args)
+
+	return engine
 }
 
 /*
@@ -267,17 +281,20 @@ func (e *IBusBambooEngine) PropertyActivate(propName string, propState uint32) *
 		return nil
 	}
 	if propName == PropKeyConfiguration {
-		ui.OpenGUI(e.engineName)
+		//ui.OpenGUI(e.engineName)
+		e.ShowUIOptions()
 		e.config = config.LoadConfig(e.engineName)
 		return nil
 	}
 	if propName == PropKeyInputModeLookupTableShortcut {
-		ui.OpenGUI(e.engineName)
+		//ui.OpenGUI(e.engineName)
+		e.ShowUIOptions()
 		e.config = config.LoadConfig(e.engineName)
 		return nil
 	}
 	if propName == PropKeyMacroTable {
-		ui.OpenGUI(e.engineName)
+		//ui.OpenGUI(e.engineName)
+		e.ShowUIOptions()
 		e.config = config.LoadConfig(e.engineName)
 		return nil
 	}
@@ -399,3 +416,37 @@ func (e *IBusBambooEngine) PropertyActivate(propName string, propState uint32) *
 	e.RegisterProperties(e.propList)
 	return nil
 }
+
+/* UI Shortcut Options */
+func (e *IBusBambooEngine) activateUIOptions() {
+	// Main app
+	e.windowShortcutOptions = gtk.NewApplicationWindow(e.appShortcutOptions)
+	e.windowShortcutOptions.SetTitle("ibus-bamboo shortcut options")
+	e.windowShortcutOptions.SetDecorated(true)
+	e.windowShortcutOptions.SetDefaultSize(600, 300)
+
+	// Tabs Notebook
+	notebook := gtk.NewNotebook()
+	notebook.AppendPage(ui.RenderShortcut(e.windowShortcutOptions), gtk.NewLabel("Phím tắt"))
+	notebook.AppendPage(ui.RenderInputTextView(), gtk.NewLabel("Gõ tắt"))
+	notebook.AppendPage(ui.RenderInputTextView(), gtk.NewLabel("Tự định nghĩa kiểu gõ"))
+	notebook.AppendPage(ui.RenderOther(e.windowShortcutOptions), gtk.NewLabel("Khác"))
+	e.windowShortcutOptions.SetChild(notebook)
+
+	e.windowShortcutOptions.ConnectCloseRequest(func() bool {
+		e.windowShortcutOptions.SetVisible(false)
+		return true
+	})
+}
+
+func (e *IBusBambooEngine) ShowUIOptions() {
+	if e.windowShortcutOptions != nil {
+		e.windowShortcutOptions.SetVisible(true)
+	}
+}
+
+func (e *IBusBambooEngine) HideUIOptions() {
+	if e.windowShortcutOptions != nil {
+		e.windowShortcutOptions.SetVisible(false)
+	}
+}

engine_utils.go

@@ -22,7 +22,7 @@ package main
 import (
 	"fmt"
 	"ibus-bamboo/config"
-	"ibus-bamboo/ui"
+	_ "ibus-bamboo/ui"
 	"io/ioutil"
 	"os"
 	"strconv"
@@ -57,7 +57,8 @@ func GetIBusEngineCreator() func(*dbus.Conn, string) dbus.ObjectPath {
 		engine.shouldEnqueuKeyStrokes = true
 		ibus.PublishEngine(conn, objectPath, engine)
 		if *gui {
-			ui.OpenGUI(engine.engineName)
+			//ui.OpenGUI(engine.engineName)
+			engine.ShowUIOptions()
 			os.Exit(0)
 		}
 		go engine.init()

flake.nix

@@ -29,12 +29,19 @@
 
             nativeBuildInputs = [
               pkgs.pkg-config
-              pkgs.wrapGAppsHook3
-              pkgs.go
+              pkgs.wrapGAppsHook
+              pkgs.git
             ];
 
             buildInputs = [
+              pkgs.go
               pkgs.xorg.libXtst
+		          pkgs.gtk4
+		          pkgs.glib
+		          pkgs.librsvg
+		          pkgs.gdk-pixbuf
+		          pkgs.gobject-introspection
+		          pkgs.hicolor-icon-theme
             ];
 
             preConfigure = ''
@@ -63,10 +70,15 @@
               pkgs.pkg-config
               pkgs.wrapGAppsHook3
               pkgs.go
+              pkgs.gopls
             ];
 
             buildInputs = [
               pkgs.xorg.libXtst
+              pkgs.gtk4
+              pkgs.graphene
+              pkgs.glib
+              pkgs.gobject-introspection
             ];
           };
         }

go.mod

@@ -1,11 +1,20 @@
 module ibus-bamboo
 
-go 1.13
+go 1.23.0
+
+toolchain go1.23.4
 
 require (
 	github.com/BambooEngine/bamboo-core v0.0.0-20240916131919-b2e49a2b48c7
 	github.com/BambooEngine/goibus v0.0.0-20240724150421-cfe61b2f8f77
+	github.com/diamondburned/gotk4/pkg v0.3.1
 	github.com/dkolbly/wl v0.0.0-20180220001605-b06f57e7e2e6
 	github.com/godbus/dbus/v5 v5.1.0
 	golang.org/x/net v0.36.0
 )
+
+require (
+	github.com/KarpelesLab/weak v0.1.1 // indirect
+	go4.org/unsafe/assume-no-moving-gc v0.0.0-20231121144256-b99613f794b6 // indirect
+	golang.org/x/sync v0.1.0 // indirect
+)

go.sum

@@ -2,73 +2,17 @@ github.com/BambooEngine/bamboo-core v0.0.0-20240916131919-b2e49a2b48c7 h1:sXj2Uz
 github.com/BambooEngine/bamboo-core v0.0.0-20240916131919-b2e49a2b48c7/go.mod h1:OxsVN3QJM/OrAVsnsSrSTC2SOudVOrb0vTw1dJrcOK4=
 github.com/BambooEngine/goibus v0.0.0-20240724150421-cfe61b2f8f77 h1:gCwm/sU1uaaUJe3E93CNigsKaX9dneiNhx+ElKrD0fM=
 github.com/BambooEngine/goibus v0.0.0-20240724150421-cfe61b2f8f77/go.mod h1:6VXFP/0WXorUWDU7y9Ejyg6GGCflBuNvWPBmfI3k2s4=
+github.com/KarpelesLab/weak v0.1.1 h1:fNnlPo3aypS9tBzoEQluY13XyUfd/eWaSE/vMvo9s4g=
+github.com/KarpelesLab/weak v0.1.1/go.mod h1:pzXsWs5f2bf+fpgHayTlBE1qJpO3MpJKo5sRaLu1XNw=
+github.com/diamondburned/gotk4/pkg v0.3.1 h1:uhkXSUPUsCyz3yujdvl7DSN8jiLS2BgNTQE95hk6ygg=
+github.com/diamondburned/gotk4/pkg v0.3.1/go.mod h1:DqeOW+MxSZFg9OO+esk4JgQk0TiUJJUBfMltKhG+ub4=
 github.com/dkolbly/wl v0.0.0-20180220001605-b06f57e7e2e6 h1:boaySJl2jhPwf+lSBRugRERVEZ0ovAwppOBx73P6zoM=
 github.com/dkolbly/wl v0.0.0-20180220001605-b06f57e7e2e6/go.mod h1:fUuzU55URBTyjoKP2pYoAoeZd1SvdjJP4IkYoT21xZg=
 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.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
-golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
-golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
-golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
-golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
-golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
+go4.org/unsafe/assume-no-moving-gc v0.0.0-20231121144256-b99613f794b6 h1:lGdhQUN/cnWdSH3291CUuxSEqc+AsGTiDxPP3r2J0l4=
+go4.org/unsafe/assume-no-moving-gc v0.0.0-20231121144256-b99613f794b6/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
 golang.org/x/net v0.36.0 h1:vWF2fRbw4qslQsQzgFqZff+BItCvGFQqKzKIzx1rmoA=
 golang.org/x/net v0.36.0/go.mod h1:bFmbeoIPfrw4sMHNhb4J9f6+tPziuGjq7Jk/38fxi1I=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
-golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
-golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
-golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
-golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
-golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=