Remove Xorg code, embed assets in the binaries

Author: Labfox

bar.go

@@ -20,13 +20,11 @@
 package main
 
 import (
+	_ "embed"
 	"fmt"
-	"log"
 	"strconv"
 	"time"
 
-	"github.com/BurntSushi/xgb/xproto"
-	"github.com/BurntSushi/xgbutil"
 	"github.com/MiracleOS-Team/desktoplib/batteryHandler"
 	"github.com/MiracleOS-Team/desktoplib/foreignToplevel"
 	"github.com/MiracleOS-Team/desktoplib/networkManagerHandler"
@@ -38,6 +36,9 @@ import (
 	"github.com/gotk3/gotk3/gtk"
 )
 
+//go:embed images/pp.png
+var ppData []byte
+
 func getDateInfo() (string, string) {
 	hours, minutes, _ := time.Now().Clock()
 	curTimeInString := fmt.Sprintf("%d:%02d", hours, minutes)
@@ -259,7 +260,10 @@ func createMainIcons() *gtk.Box {
 
 	desktopImage, _ := gtk.ImageNewFromIconName("preferences-system-windows-symbolic", gtk.ICON_SIZE_LARGE_TOOLBAR)
 	searchImage, _ := gtk.ImageNewFromIconName("system-search-symbolic", gtk.ICON_SIZE_LARGE_TOOLBAR)
-	customIcon, _ := gtk.ImageNewFromFile("images/pp.png")
+
+	ppPbuff, _ := gdk.PixbufNewFromBytesOnly(ppData)
+
+	customIcon, _ := gtk.ImageNewFromPixbuf(ppPbuff)
 	customButton, _ := gtk.ButtonNew()
 	customButton.Add(customIcon)
 
@@ -337,27 +341,6 @@ func createBar(nDaemon *notificationDaemon.Daemon) *gtk.Window {
 		return true
 	})
 
-	glib.TimeoutAdd(100, func() bool {
-		gdkwin, _ := win.GetWindow()
-		if gdkwin == nil {
-			return true
-		}
-		_, height := win.GetSize()
-		xid := uint32(gdkwin.GetXID())
-
-		// Setup X connection
-		X, err := xgbutil.NewConn()
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		screen, _ := gdk.ScreenGetDefault()
-		rw, _ := screen.GetRootWindow()
-		setStrutPartial(X, xproto.Window(xid), uint(height), uint(rw.WindowGetWidth()))
-		win.Move((sc_width-width)/2, sc_height-height)
-		return false
-	})
-
 	win.Add(box)
 	return win
 }

go.mod

@@ -3,51 +3,22 @@ module github.com/MiracleOS-Team/desktop
 go 1.24.0
 
 require (
-	github.com/BurntSushi/xgb v0.0.0-20210121224620-deaf085860bc
-	github.com/BurntSushi/xgbutil v0.0.0-20190907113008-ad855c713046
-	github.com/MiracleOS-Team/desktoplib v0.0.0-20250415145054-8dbe3c9c607b
-	github.com/MiracleOS-Team/libxdg-go v0.0.0-20250525172408-a1deb8978aaf
+	github.com/MiracleOS-Team/desktoplib v0.0.0-20250825133335-a752d18a2ba1
+	github.com/MiracleOS-Team/libxdg-go v0.0.0-20250612171904-bbe9fb77c7a2
 	github.com/dlasky/gotk3-layershell v0.0.0-20240515133811-5c5115f0d774
-	github.com/go-git/go-git/v5 v5.16.0
 	github.com/gotk3/gotk3 v0.6.5-0.20240618185848-ff349ae13f56
-	golang.org/x/text v0.25.0
+	golang.org/x/text v0.28.0
 )
 
 require (
-	dario.cat/mergo v1.0.2 // indirect
-	github.com/BurntSushi/freetype-go v0.0.0-20160129220410-b763ddbfe298 // indirect
-	github.com/BurntSushi/graphics-go v0.0.0-20160129215708-b43f31a4a966 // indirect
-	github.com/Microsoft/go-winio v0.6.2 // indirect
-	github.com/ProtonMail/go-crypto v1.3.0 // indirect
-	github.com/cli/safeexec v1.0.1 // indirect
-	github.com/cloudflare/circl v1.6.1 // indirect
-	github.com/cyphar/filepath-securejoin v0.4.1 // indirect
 	github.com/distatus/battery v0.11.0 // indirect
-	github.com/emirpasic/gods v1.18.1 // indirect
-	github.com/gdamore/encoding v1.0.0 // indirect
-	github.com/gdamore/tcell v1.4.0 // indirect
-	github.com/gek64/displayController v1.0.2 // indirect
-	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
-	github.com/go-git/go-billy/v5 v5.6.2 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/godbus/dbus/v5 v5.1.0 // indirect
-	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
 	github.com/itchyny/volume-go v0.2.2 // indirect
-	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/jfreymuth/pulse v0.1.1 // indirect
-	github.com/kevinburke/ssh_config v1.2.0 // indirect
-	github.com/lucasb-eyer/go-colorful v1.0.3 // indirect
-	github.com/mattn/go-runewidth v0.0.7 // indirect
 	github.com/moutend/go-wca v0.3.0 // indirect
-	github.com/pjbgf/sha1cd v0.3.2 // indirect
-	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
-	github.com/skeema/knownhosts v1.3.1 // indirect
-	github.com/xanzy/ssh-agent v0.3.3 // indirect
-	golang.org/x/crypto v0.38.0 // indirect
-	golang.org/x/net v0.40.0 // indirect
-	golang.org/x/sys v0.33.0 // indirect
-	google.golang.org/protobuf v1.36.4 // indirect
+	github.com/stretchr/testify v1.10.0 // indirect
+	golang.org/x/sys v0.35.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
-	gopkg.in/warnings.v0 v0.1.2 // indirect
 	howett.net/plist v1.0.1 // indirect
 )