feat(cursor-helper): set com.deepin.wm cursorTheme

Author: electricface

cursor-helper/main.go

@@ -21,7 +21,6 @@ package main
 
 // #cgo pkg-config: x11 xcursor xfixes gtk+-3.0
 // #include <stdlib.h>
-// #include "cursor.h"
 import "C"
 
 import (
@@ -30,7 +29,6 @@ import (
 	"strings"
 	"sync"
 	"time"
-	"unsafe"
 
 	"pkg.deepin.io/dde/api/themes"
 	"pkg.deepin.io/lib/dbus1"
@@ -98,11 +96,6 @@ func main() {
 		name = os.Args[1]
 	}
 
-	if C.init_gtk() == -1 {
-		logger.Warning("Init gtk or x11 thread environment failed")
-		return
-	}
-
 	if name != "" {
 		setTheme(name)
 		return
@@ -147,17 +140,8 @@ func setTheme(name string) {
 		return
 	}
 
-	doSetTheme(name)
-}
-
-func doSetTheme(name string) {
 	err := themes.SetCursorTheme(name)
 	if err != nil {
 		logger.Warning("Set failed:", err)
 	}
-
-	cName := C.CString(name)
-	defer C.free(unsafe.Pointer(cName))
-	C.set_gtk_cursor(cName)
-	C.set_qt_cursor(cName)
 }

cursor-helper/cursor.c themes/cursor.ccursor-helper/cursor.c renamed to themes/cursor.c

@@ -0,0 +1,22 @@
+package themes
+
+// #cgo pkg-config: x11 xcursor xfixes gtk+-3.0
+// #include <stdlib.h>
+// #include "cursor.h"
+import "C"
+import (
+	"unsafe"
+)
+
+func setGtkCursor(name string) {
+	C.init_gtk()
+	cName := C.CString(name)
+	defer C.free(unsafe.Pointer(cName))
+	C.set_gtk_cursor(cName)
+}
+
+func setQtCursor(name string) {
+	cName := C.CString(name)
+	defer C.free(unsafe.Pointer(cName))
+	C.set_qt_cursor(cName)
+}

themes/cursor.go

@@ -22,10 +22,13 @@ package themes
 
 import (
 	"fmt"
-	"pkg.deepin.io/gir/glib-2.0"
 	"os"
 	"path"
+
+	"github.com/linuxdeepin/go-dbus-factory/com.deepin.wm"
 	"pkg.deepin.io/dde/api/themes/scanner"
+	"pkg.deepin.io/gir/glib-2.0"
+	"pkg.deepin.io/lib/dbus1"
 	dutils "pkg.deepin.io/lib/utils"
 )
 
@@ -93,24 +96,32 @@ func SetIconTheme(name string) error {
 
 func SetCursorTheme(name string) error {
 	if !scanner.IsCursorTheme(getThemePath(name, scanner.ThemeTypeCursor, "icons")) {
-		return fmt.Errorf("Invalid theme '%s'", name)
+		return fmt.Errorf("invalid theme '%s'", name)
 	}
 
-	setGtk2Cursor(name)
-	setGtk3Cursor(name)
+	err := setGtk2Cursor(name)
+	if err != nil {
+		_, _ = fmt.Fprintln(os.Stderr, err)
+	}
+	err = setGtk3Cursor(name)
+	if err != nil {
+		_, _ = fmt.Fprintln(os.Stderr, err)
+	}
 	setDefaultCursor(name)
-	setWMCursor(name)
 
 	old := getXSettingsValue(xsKeyCursorName)
 	if old == name {
 		return nil
 	}
 
 	if !setXSettingsKey(xsKeyCursorName, name) {
-		return fmt.Errorf("Set theme to '%s' by xsettings failed",
+		return fmt.Errorf("set theme to '%s' by xsettings failed",
 			name)
 	}
 
+	setQtCursor(name)
+	setGtkCursor(name)
+	setWMCursor(name)
 	return nil
 }
 
@@ -121,6 +132,18 @@ func setWMCursor(name string) {
 		defer ifc.Unref()
 		ifc.SetString("cursor-theme", name)
 	}
+
+	sessionBus, err := dbus.SessionBus()
+	if err != nil {
+		_, _ = fmt.Fprintln(os.Stderr, "failed to get session bus:", err)
+		return
+	}
+
+	wmObj := wm.NewWm(sessionBus)
+	err = wmObj.CursorTheme().Set(0, name)
+	if err != nil {
+		_, _ = fmt.Fprintln(os.Stderr, "failed to set wm cursorTheme:", err)
+	}
 }
 
 func GetCursorTheme() string {