feat: integrate keyboard management with dsg configuration

Added functionality to manage keyboard settings through the dsg configuration system. This includes initializing the configuration manager, updating keyboard states based on user settings, and handling device changes effectively. The keyboardEnabled key is now part of the configuration, allowing for user-level control over keyboard activation.

Log: integrate keyboard management with dsg configuration
pms: BUG-315763

Author: fly602

inputdevices1/keyboard.go

@@ -18,6 +18,7 @@ import (
 	"github.com/godbus/dbus/v5"
 	"github.com/linuxdeepin/dde-api/dxinput"
 	ddbus "github.com/linuxdeepin/dde-daemon/dbus"
+	configManager "github.com/linuxdeepin/go-dbus-factory/org.desktopspec.ConfigManager"
 	accounts "github.com/linuxdeepin/go-dbus-factory/system/org.deepin.dde.accounts1"
 	"github.com/linuxdeepin/go-gir/gio-2.0"
 	"github.com/linuxdeepin/go-lib/dbusutil"
@@ -52,6 +53,8 @@ const (
 	qtDefaultConfig = ".config/Trolltech.conf"
 
 	cmdSetKbd = "/usr/bin/setxkbmap"
+
+	dsettingsKeyboardEnabledKey = "keyboardEnabled"
 )
 
 type Keyboard struct {
@@ -82,7 +85,9 @@ type Keyboard struct {
 	user      accounts.User
 	layoutMap layoutMap
 
-	devNumber int
+	devNumber      int
+	devInfos       Keyboards
+	dsgInputConfig configManager.Manager
 }
 
 func newKeyboard(service *dbusutil.Service) *Keyboard {
@@ -158,6 +163,8 @@ func newKeyboard(service *dbusutil.Service) *Keyboard {
 	kbd.listenSettingsChanged()
 	kbd.listenRootWindowXEvent()
 	kbd.startXEventLoop()
+	kbd.initDsgConfig()
+	kbd.updateDXKeyboards()
 	return kbd
 }
 
@@ -275,6 +282,8 @@ func (kbd *Keyboard) handleDeviceChanged() {
 		kbd.applySettings()
 	}
 	kbd.devNumber = num
+
+	kbd.updateDXKeyboards()
 }
 
 func (kbd *Keyboard) applyLayout() {
@@ -742,3 +751,59 @@ func (kbd *Keyboard) toggleNextLayout() {
 		}
 	}
 }
+
+func (kbd *Keyboard) updateDXKeyboards() {
+	logger.Debug("updateDXKeyboards")
+	kbd.devInfos = Keyboards{}
+	for _, info := range getKeyboardInfos(false) {
+		tmp := kbd.devInfos.get(info.Id)
+		if tmp != nil {
+			continue
+		}
+		kbd.devInfos = append(kbd.devInfos, info)
+	}
+
+	value, err := kbd.dsgInputConfig.Value(0, dsettingsKeyboardEnabledKey)
+	if err != nil {
+		logger.Warningf("getDsgData key : %s. err : %s", dsettingsKeyboardEnabledKey, err)
+		return
+	}
+
+	if enableKeyboard, ok := value.Value().(bool); ok {
+		for _, dev := range kbd.devInfos {
+			dev.Enable(enableKeyboard)
+		}
+	}
+}
+
+func (kbd *Keyboard) initDsgConfig() error {
+	logger.Debug("initDsgConfig")
+	systemBus, err := dbus.SystemBus()
+	if err != nil {
+		logger.Warning(err)
+		return nil
+	}
+	// 加载dsg配置
+	dsg := configManager.NewConfigManager(systemBus)
+
+	inputDevicesPath, err := dsg.AcquireManager(0, dsettingsAppID, dsettingsInputdevices, "")
+	if err != nil {
+		logger.Warning(err)
+		return err
+	}
+
+	kbd.dsgInputConfig, err = configManager.NewManager(systemBus, inputDevicesPath)
+	if err != nil {
+		logger.Warning(err)
+		return err
+	}
+
+	kbd.dsgInputConfig.InitSignalExt(kbd.sysSigLoop, true)
+	kbd.dsgInputConfig.ConnectValueChanged(func(key string) {
+		logger.Infof("key: %v", key)
+		if key == dsettingsKeyboardEnabledKey {
+			kbd.updateDXKeyboards()
+		}
+	})
+	return nil
+}

inputdevices1/kwayland.go

@@ -129,6 +129,19 @@ func doHandleKWinDeviceAdded(sysName string) {
 			}
 		}
 		_manager.tpad.handleDeviceChanged()
+	case common.DevTypeKeyboard:
+		v, _ := dxinput.NewKeyboardDevInfo(info)
+		if len(_keyboardnfos) == 0 {
+			_keyboardnfos = append(_keyboardnfos, v)
+		} else {
+			for _, tmp := range _keyboardnfos {
+				if tmp.Id == v.Id {
+					continue
+				}
+				_keyboardnfos = append(_keyboardnfos, v)
+			}
+		}
+		_manager.kbd.handleDeviceChanged()
 	}
 }
 

inputdevices1/manager.go

@@ -23,6 +23,9 @@ const (
 	gsSchemaInputDevices = "com.deepin.dde.inputdevices"
 	gsKeyWheelSpeed      = "wheel-speed"
 	imWheelBin           = "imwheel"
+
+	dsettingsAppID        = "org.deepin.dde.daemon"
+	dsettingsInputdevices = "org.deepin.dde.daemon.inputdevices"
 )
 
 type devicePathInfo struct {

inputdevices1/touchpad.go

@@ -43,9 +43,7 @@ const (
 	tpadKeyPalmMinWidth       = "palm-min-width"
 	tpadKeyPalmMinZ           = "palm-min-pressure"
 
-	dsettingsAppID        = "org.deepin.dde.daemon"
-	dsettingsInputdevices = "org.deepin.dde.daemon.inputdevices"
-	dsettingsData         = "ps2MouseAsTouchPadEnabled"
+	dsettingsData = "ps2MouseAsTouchPadEnabled"
 )
 
 const (

inputdevices1/wrapper.go

@@ -39,13 +39,15 @@ type touchpadInfo struct {
 type Mouses []*mouseInfo
 type Touchpads []*touchpadInfo
 type dxWacoms []*dxinput.Wacom
+type Keyboards []*dxinput.Keyboard
 
 var (
-	_devInfos    common.DeviceInfos
-	_mouseInfos  Mouses
-	_tpadInfos   Touchpads
-	_wacomInfos  dxWacoms
-	_gudevClient = gudev.NewClient([]string{"input"})
+	_devInfos     common.DeviceInfos
+	_mouseInfos   Mouses
+	_tpadInfos    Touchpads
+	_wacomInfos   dxWacoms
+	_keyboardnfos Keyboards
+	_gudevClient  = gudev.NewClient([]string{"input"})
 )
 
 func startDeviceListener() {
@@ -69,6 +71,8 @@ func handleDeviceChanged() {
 	getMouseInfos(false)
 	_wacomInfos = dxWacoms{}
 	getWacomInfos(false)
+	_keyboardnfos = Keyboards{}
+	getKeyboardInfos(false)
 
 	if _manager == nil {
 		logger.Warning("_manager is nil")
@@ -310,3 +314,28 @@ func (info mouseInfo) isVirtual() bool {
 func (info touchpadInfo) isVirtual() bool {
 	return strings.Contains(info.sysfsPath, "virtual")
 }
+
+func getKeyboardInfos(force bool) Keyboards {
+	if !force && len(_keyboardnfos) != 0 {
+		return _keyboardnfos
+	}
+
+	_keyboardnfos = Keyboards{}
+	for _, info := range getDeviceInfos(false) {
+		if info.Type == common.DevTypeKeyboard {
+			tmp, _ := dxinput.NewKeyboardDevInfo(info)
+			_keyboardnfos = append(_keyboardnfos, tmp)
+		}
+	}
+
+	return _keyboardnfos
+}
+
+func (infos Keyboards) get(id int32) *dxinput.Keyboard {
+	for _, info := range infos {
+		if info.Id == id {
+			return info
+		}
+	}
+	return nil
+}

misc/dsg-configs/org.deepin.dde.daemon.inputdevices.json

@@ -34,6 +34,17 @@
         "description": "",
         "permissions": "readwrite",
         "visibility": "private"
+      },
+      "keyboardEnabled": {
+        "value": true,
+        "serial": 0,
+        "flags": [],
+        "name": "keyboard_Enabled",
+        "name[zh_CN]": "键盘启用状态",
+        "description[zh_CN]": "用户级别键盘开关",
+        "description": "",
+        "permissions": "readwrite",
+        "visibility": "public"
       }
   }
 }