feat: 新增dconfig配置,用于厂商定制内容合并主线

新增dconfig配置,用于厂商定制内容合并主线

Log: 新增dconfig配置,用于厂商定制内容合并主线
Task: https://pms.uniontech.com/task-view-220857.html
Influence: 厂商适配
Change-Id: Ief73adcecf97643d8137bce6e758d6740581ef09

Author: lichangze

archlinux/PKGBUILD

@@ -33,6 +33,7 @@ prepare() {
   go get -v gopkg.in/yaml.v3
   go get -v github.com/davecgh/go-spew/spew
   go get -v github.com/stretchr/testify
+  go get -v github.com/jouyouyun/hardware
   sed -i 's/sbin/bin/' Makefile
 }
 

debian/control

@@ -14,6 +14,7 @@ Build-Depends:
  golang-go,
  golang-golang-x-xerrors-dev,
  golang-gopkg-check.v1-dev,
+ golang-github-jouyouyun-hardware-dev,
  jq,
  libsecret-1-dev,
  libxcursor-dev,

display/brightness.go

@@ -12,6 +12,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/linuxdeepin/go-lib/strv"
 	"github.com/linuxdeepin/startdde/display/brightness"
 )
 
@@ -158,8 +159,10 @@ func (m *Manager) isBuiltinMonitor(name string) bool {
 	case strings.HasPrefix(name, "vga"):
 		return false
 	case strings.HasPrefix(name, "hdmi"):
+		if strv.Strv(m.dsHDMIIsBuiltinConfig).Contains(m.dmiInfo.ProductName) {
+			return true
+		}
 		return false
-
 	case strings.HasPrefix(name, "dvi"):
 		return true
 	case strings.HasPrefix(name, "lvds"):

display/brightness/brightness.go

@@ -123,19 +123,6 @@ func Set(brightness float64, temperature int, setter string, isBuiltin bool, out
 //	return 1, nil
 //}
 
-func GetMaxBacklightBrightness() int {
-	if len(controllers) == 0 {
-		return 0
-	}
-	maxBrightness := controllers[0].MaxBrightness
-	for _, controller := range controllers {
-		if maxBrightness > controller.MaxBrightness {
-			maxBrightness = controller.MaxBrightness
-		}
-	}
-	return maxBrightness
-}
-
 func GetBacklightController(outputId uint32, conn *x.Conn) (*displayBl.Controller, error) {
 	// TODO
 	//output := randr.Output(outputId)
@@ -147,7 +134,7 @@ func supportBacklight() bool {
 	if helper == nil {
 		return false
 	}
-	return len(controllers) > 0
+	return len(Controllers) > 0
 }
 
 func setOutputCrtcGamma(setting gammaSetting, output randr.Output, conn *x.Conn) error {
@@ -210,18 +197,18 @@ func genGammaRamp(size uint16, brightness float64) (red, green, blue []uint16) {
 	return
 }
 
-var controllers displayBl.Controllers
+var Controllers displayBl.Controllers
 
 func init() {
 	var err error
-	controllers, err = displayBl.List()
+	Controllers, err = displayBl.List()
 	if err != nil {
 		fmt.Println("failed to list backlight controller:", err)
 	}
 }
 
 func setBacklight(value float64, output randr.Output, conn *x.Conn) error {
-	for _, controller := range controllers {
+	for _, controller := range Controllers {
 		err := _setBacklight(value, controller)
 		if err != nil {
 			fmt.Printf("WARN: failed to set backlight %s: %v", controller.Name, err)

display/display.go

@@ -117,7 +117,6 @@ func StartPart2() error {
 	m := _dpy
 	m.initSysDisplay()
 	m.initTouchscreens()
-
 	if !_greeterMode {
 		controlRedshift("disable")
 		m.applyColorTempConfig(m.DisplayMode)

display/manager.go

@@ -23,15 +23,19 @@ import (
 
 	"github.com/davecgh/go-spew/spew"
 	"github.com/godbus/dbus"
+	"github.com/jouyouyun/hardware/graphic"
 	sessiondisplay "github.com/linuxdeepin/go-dbus-factory/com.deepin.daemon.display"
 	sysdisplay "github.com/linuxdeepin/go-dbus-factory/com.deepin.system.display"
 	inputdevices "github.com/linuxdeepin/go-dbus-factory/com.deepin.system.inputdevices"
+	systeminfo "github.com/linuxdeepin/go-dbus-factory/com.deepin.system.systeminfo"
+	configManager "github.com/linuxdeepin/go-dbus-factory/org.desktopspec.ConfigManager"
 	ofdbus "github.com/linuxdeepin/go-dbus-factory/org.freedesktop.dbus"
 	login1 "github.com/linuxdeepin/go-dbus-factory/org.freedesktop.login1"
 	gio "github.com/linuxdeepin/go-gir/gio-2.0"
 	"github.com/linuxdeepin/go-lib/dbusutil"
 	"github.com/linuxdeepin/go-lib/gsettings"
 	"github.com/linuxdeepin/go-lib/log"
+	"github.com/linuxdeepin/go-lib/strv"
 	"github.com/linuxdeepin/go-lib/xdg/basedir"
 	x "github.com/linuxdeepin/go-x11-client"
 	"github.com/linuxdeepin/go-x11-client/ext/randr"
@@ -99,6 +103,13 @@ const (
 	priorityOther
 )
 
+const (
+	DSettingsAppID                                    = "org.deepin.startdde"
+	DSettingsDisplayName                              = "org.deepin.Display"
+	DSettingsKeyHDMIIsBuiltinConfig                   = "HDMI-is-builtin"
+	DSettingsKeyBackLightMaxBrightnessChooseBigConfig = "backLight-max-brightness-choose-big"
+)
+
 var (
 	_monitorTypePriority = map[string]int{
 		"edp":  priorityEDP,
@@ -219,6 +230,11 @@ type Manager struct {
 	unsupportGammaDrmList []string
 	drmSupportGamma       bool
 	initPrimary           bool
+
+	dsHDMIIsBuiltinConfig                   []string
+	dsBackLightMaxBrightnessChooseBigConfig []string
+	dmiInfo                                 systeminfo.DMIInfo
+	pciVendor                               []string
 }
 
 type monitorSizeInfo struct {
@@ -285,7 +301,7 @@ func newManager(service *dbusutil.Service) *Manager {
 
 	m.mm.setHooks(m)
 
-	m.setPropMaxBacklightBrightness(uint32(brightness.GetMaxBacklightBrightness()))
+	m.setPropMaxBacklightBrightness(uint32(m.GetMaxBacklightBrightness()))
 
 	sysSigLoop := dbusutil.NewSignalLoop(m.sysBus, 10)
 	m.sysSigLoop = sysSigLoop
@@ -1001,7 +1017,8 @@ func (m *Manager) init() {
 		// 没有内建屏,不监听内核信号
 		logger.Info("built-in screen does not exist")
 	}
-
+	m.initDSettings(m.sysBus)
+	m.initHardwareInfo(m.sysBus)
 	go func() {
 		// 每次设置过主屏和其rect区域后，都将此值同步到xsettings
 		bus, _ := dbus.SessionBus()
@@ -2941,3 +2958,97 @@ func (m *Manager) detectDrmSupportGamma() (bool, error) {
 	}
 	return vgaSupportGamma, nil
 }
+
+func (m *Manager) initDSettings(sysBus *dbus.Conn) {
+	ds := configManager.NewConfigManager(sysBus)
+
+	displayPath, err := ds.AcquireManager(0, DSettingsAppID, DSettingsDisplayName, "")
+	if err != nil {
+		logger.Warning(err)
+		return
+	}
+
+	dsDisplay, err := configManager.NewManager(sysBus, displayPath)
+	if err != nil {
+		logger.Warning(err)
+		return
+	}
+
+	getHDMIIsBuiltinConfig := func() {
+		v, err := dsDisplay.Value(0, DSettingsKeyHDMIIsBuiltinConfig)
+		if err != nil {
+			logger.Warning(err)
+			return
+		}
+		itemList := v.Value().([]dbus.Variant)
+		for _, i := range itemList {
+			m.dsHDMIIsBuiltinConfig = append(m.dsHDMIIsBuiltinConfig, i.Value().(string))
+		}
+	}
+	getBackLightMaxBrightnessChooseBigConfig := func() {
+		v, err := dsDisplay.Value(0, DSettingsKeyBackLightMaxBrightnessChooseBigConfig)
+		if err != nil {
+			logger.Warning(err)
+			return
+		}
+		itemList := v.Value().([]dbus.Variant)
+		for _, i := range itemList {
+			m.dsBackLightMaxBrightnessChooseBigConfig = append(m.dsBackLightMaxBrightnessChooseBigConfig, i.Value().(string))
+		}
+	}
+	getHDMIIsBuiltinConfig()
+	getBackLightMaxBrightnessChooseBigConfig()
+
+	dsDisplay.InitSignalExt(m.sysSigLoop, true)
+	_, err = dsDisplay.ConnectValueChanged(func(key string) {
+		switch key {
+		case DSettingsKeyHDMIIsBuiltinConfig:
+			getHDMIIsBuiltinConfig()
+		case DSettingsKeyBackLightMaxBrightnessChooseBigConfig:
+			getBackLightMaxBrightnessChooseBigConfig()
+		}
+	})
+	if err != nil {
+		logger.Warning(err)
+	}
+}
+
+func (m *Manager) initHardwareInfo(sysBus *dbus.Conn) {
+	info := systeminfo.NewSystemInfo(sysBus)
+	dmi, err := info.DMIInfo().Get(0)
+	if err != nil {
+		logger.Warning(err)
+		return
+	}
+	m.dmiInfo = dmi
+	graphicList, err := graphic.GetGraphicList()
+	if err != nil {
+		logger.Warning(err)
+		return
+	}
+	for _, graphicInfo := range graphicList {
+		m.pciVendor = append(m.pciVendor, graphicInfo.Vendor)
+	}
+}
+
+func (m *Manager) GetMaxBacklightBrightness() int {
+	controllers := brightness.Controllers
+	if len(controllers) == 0 {
+		return 0
+	}
+	maxBrightness := controllers[0].MaxBrightness
+	if strv.Strv(m.dsBackLightMaxBrightnessChooseBigConfig).Contains(m.dmiInfo.ProductName) {
+		for _, controller := range controllers {
+			if maxBrightness < controller.MaxBrightness {
+				maxBrightness = controller.MaxBrightness
+			}
+		}
+	} else {
+		for _, controller := range controllers {
+			if maxBrightness > controller.MaxBrightness {
+				maxBrightness = controller.MaxBrightness
+			}
+		}
+	}
+	return maxBrightness
+}

misc/dsettings/org.deepin.Display.json

@@ -0,0 +1,28 @@
+{
+  "magic": "dsg.config.meta",
+  "version": "1.0",
+  "contents": {
+    "HDMI-is-builtin": {
+      "value": ["PN100F3"],
+      "serial": 0,
+      "flags": [
+        "global"
+      ],
+      "name": "HDMI screen is builtin screen",
+      "description": "",
+      "permissions": "readwrite",
+      "visibility": "private"
+    },
+    "backLight-max-brightness-choose-big": {
+      "value": ["PN100F3"],
+      "serial": 0,
+      "flags": [
+        "global"
+      ],
+      "name": "backLight max brightness choose big",
+      "description": "",
+      "permissions": "readwrite",
+      "visibility": "private"
+    }
+  }
+}