feat(shortcut): migrate shortcut handling to dde-services

bin/dde-session-daemon/daemon.go

@@ -189,7 +189,6 @@ func (s *SessionDaemon) initModules() {
 		"power", // need screensaver and sessionwatcher
 		"service-trigger",
 		"clipboard",
-		"keybinding",
 		"inputdevices",
 		"gesture",
 		"housekeeping",

bin/dde-session-daemon/main.go

@@ -40,7 +40,7 @@ var logger = log.NewLogger("daemon/dde-session-daemon")
 var hasDDECookie bool
 var hasTreeLand bool
 
-var treeLandNotAllowModules = []string{"x-event-monitor", "keybinding", "gesture", "screensaver", "display", "xsettings", "power"}
+var treeLandNotAllowModules = []string{"x-event-monitor", "screensaver", "display", "xsettings", "power"}
 
 func isInShutdown() bool {
 	bus, err := dbus.SystemBus()

bin/dde-session-daemon/module.go

@@ -23,7 +23,6 @@ import (
 	_ "github.com/linuxdeepin/dde-daemon/gesture1"
 	_ "github.com/linuxdeepin/dde-daemon/housekeeping"
 	_ "github.com/linuxdeepin/dde-daemon/inputdevices1"
-	_ "github.com/linuxdeepin/dde-daemon/keybinding1"
 	_ "github.com/linuxdeepin/dde-daemon/lastore1"
 
 	_ "github.com/linuxdeepin/dde-daemon/grub_gfx"

bin/dde-session-daemon/module_test.go

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2018 - 2022 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2018 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -7,9 +7,14 @@ package main
 import (
 	"testing"
 
+	"github.com/linuxdeepin/dde-daemon/loader"
 	"github.com/stretchr/testify/assert"
 )
 
+func TestGestureModuleRegistered(t *testing.T) {
+	assert.NotNil(t, loader.GetModule("gesture"))
+}
+
 func Test_isStrInList(t *testing.T) {
 	type args struct {
 		item string

gesture1/daemon.go

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2018 - 2022 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2018 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -16,8 +16,6 @@ type Daemon struct {
 
 const (
 	dbusServiceName = "org.deepin.dde.Gesture1"
-	dbusServicePath = "/org/deepin/dde/Gesture1"
-	dbusServiceIFC  = dbusServiceName
 )
 
 var (
@@ -42,31 +40,13 @@ func (d *Daemon) Start() error {
 	if d.manager != nil {
 		return nil
 	}
-	service := loader.GetService()
 	var err error
-	d.manager, err = newManager(service)
+	d.manager, err = newManager()
 	if err != nil {
 		logger.Error("failed to initialize gesture manager:", err)
 		return err
 	}
 
-	err = service.Export(dbusServicePath, d.manager)
-	if err != nil {
-		logger.Error("failed to export gesture:", err)
-		return err
-	}
-
-	err = service.RequestName(dbusServiceName)
-	if err != nil {
-		logger.Error("failed to request gesture name:", err)
-		d.manager.destroy()
-		err1 := service.StopExport(d.manager)
-		if err1 != nil {
-			logger.Error("failed to StopExport:", err1)
-		}
-		return err
-	}
-
 	d.manager.init()
 
 	return nil

gesture1/daemon_test.go

@@ -0,0 +1,36 @@
+// SPDX-FileCopyrightText: 2026 UnionTech Software Technology Co., Ltd.
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package gesture1
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestNewDaemon(t *testing.T) {
+	daemon := NewDaemon()
+
+	assert.Equal(t, "gesture", daemon.Name())
+}
+
+func TestIsTouchRightButtonEvent(t *testing.T) {
+	tests := []struct {
+		name      string
+		direction string
+		want      bool
+	}{
+		{name: "touch right button", direction: "down", want: true},
+		{name: "touch right button", direction: "up", want: true},
+		{name: "touch right button", direction: "left", want: false},
+		{name: "swipe", direction: "up", want: false},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name+"/"+test.direction, func(t *testing.T) {
+			assert.Equal(t, test.want, isTouchRightButtonEvent(test.name, test.direction))
+		})
+	}
+}