Skip to content

Commit b761dfe

Browse files
committed
fix: reorder module dependencies in session daemon and update imports
- Added "display" module back to the session daemon's initialization. - Updated dependencies for the display and xsettings modules to reflect changes in their interdependencies. - Cleaned up unused imports in the xsettings scale file. Log: This ensures proper module loading and resolves potential dependency issues. pms: BUG-321001
1 parent c7d775b commit b761dfe

6 files changed

Lines changed: 17 additions & 54 deletions

File tree

bin/dde-session-daemon/daemon.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,8 @@ func (s *SessionDaemon) register(service *dbusutil.Service) error {
177177

178178
func (s *SessionDaemon) initModules() {
179179
part1ModuleNames := []string{
180-
"display",
181180
"xsettings",
181+
"display",
182182
"trayicon",
183183
"x-event-monitor",
184184
}

display1/main.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,16 @@
55
package display1
66

77
import (
8+
"os"
9+
"os/exec"
10+
"time"
11+
812
"github.com/godbus/dbus/v5"
913
"github.com/linuxdeepin/dde-daemon/loader"
1014
"github.com/linuxdeepin/go-lib/dbusutil"
1115
"github.com/linuxdeepin/go-lib/gsettings"
1216
"github.com/linuxdeepin/go-lib/log"
1317
x "github.com/linuxdeepin/go-x11-client"
14-
"os"
15-
"os/exec"
16-
"time"
1718
)
1819

1920
var logger = log.NewLogger("daemon/display")
@@ -34,7 +35,7 @@ func NewModule(logger *log.Logger) *daemon {
3435
}
3536

3637
func (*daemon) GetDependencies() []string {
37-
return []string{}
38+
return []string{"xsettings"}
3839
}
3940

4041
var _mainBeginTime time.Time

misc/dsg-configs/org.deepin.XSettings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@
228228
"visibility": "private"
229229
},
230230
"scale-factor": {
231-
"value": 1,
231+
"value": 0,
232232
"serial": 0,
233233
"flags": [],
234234
"name": "Text Scale Factor",

xsettings1/daemon.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
package xsettings
66

77
import (
8+
"os"
9+
810
"github.com/linuxdeepin/dde-daemon/common/scale"
911
"github.com/linuxdeepin/dde-daemon/loader"
1012
"github.com/linuxdeepin/go-lib/log"
1113
x "github.com/linuxdeepin/go-x11-client"
12-
"os"
1314
)
1415

1516
var logger = log.NewLogger("xsettings")
@@ -29,7 +30,7 @@ func NewModule(logger *log.Logger) *daemon {
2930
}
3031

3132
func (*daemon) GetDependencies() []string {
32-
return []string{"display"}
33+
return []string{}
3334
}
3435

3536
func (d *daemon) Start() error {

xsettings1/scale.go

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ import (
2020
gio "github.com/linuxdeepin/go-gir/gio-2.0"
2121
"github.com/linuxdeepin/go-lib/keyfile"
2222
"github.com/linuxdeepin/go-lib/xdg/basedir"
23-
x "github.com/linuxdeepin/go-x11-client"
24-
"github.com/linuxdeepin/go-x11-client/ext/randr"
2523
)
2624

2725
const (
@@ -181,48 +179,10 @@ func getMapFirstValueSF(m map[string]float64) float64 {
181179
return 0
182180
}
183181

184-
func getPrimaryScreenName(xConn *x.Conn) (string, error) {
185-
rootWin := xConn.GetDefaultScreen().Root
186-
getPrimaryReply, err := randr.GetOutputPrimary(xConn, rootWin).Reply(xConn)
187-
if err != nil {
188-
logger.Debug("Failed to get output primary:", err)
189-
return getPrimaryScreenFromBus()
190-
}
191-
outputInfo, err := randr.GetOutputInfo(xConn, getPrimaryReply.Output,
192-
x.CurrentTime).Reply(xConn)
193-
if err != nil {
194-
logger.Debug("Failed to get output info:", err)
195-
return getPrimaryScreenFromBus()
196-
}
197-
return outputInfo.Name, nil
198-
}
199-
200182
var (
201183
_sessionConn *dbus.Conn
202184
)
203185

204-
func getPrimaryScreenFromBus() (string, error) {
205-
if _sessionConn == nil {
206-
conn, err := dbus.SessionBus()
207-
if err != nil {
208-
return "", err
209-
}
210-
_sessionConn = conn
211-
}
212-
213-
variant, err := _sessionConn.Object("org.deepin.dde.Display1",
214-
"/org/deepin/dde/Display1").GetProperty("org.deepin.dde.Display1.Primary")
215-
if err != nil {
216-
return "", err
217-
}
218-
219-
primary, ok := (variant.Value()).(string)
220-
if !ok {
221-
return "", fmt.Errorf("invalid primary signature: %s", variant.String())
222-
}
223-
return primary, nil
224-
}
225-
226186
// 不发送通知版本, 设置流程会转到 setScreenScaleFactors
227187
func (m *XSManager) setScaleFactorWithoutNotify(scale float64) error {
228188
err := m.setScreenScaleFactors(singleToMapSF(scale), false)

xsettings1/xsettings.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,7 @@ func (m *XSManager) getScaleFactor() float64 {
137137
func (m *XSManager) adjustScaleFactor(recommendedScaleFactor float64) {
138138
logger.Debug("recommended scale factor:", recommendedScaleFactor)
139139
var err error
140-
if m.cfgHelper.GetDouble(gsKeyScaleFactor) <= 0 &&
141-
recommendedScaleFactor != defaultScaleFactor {
140+
if m.cfgHelper.GetDouble(gsKeyScaleFactor) <= 0 {
142141
err = m.setScaleFactorWithoutNotify(recommendedScaleFactor)
143142
if err != nil {
144143
logger.Warning("failed to set scale factor:", err)
@@ -149,9 +148,11 @@ func (m *XSManager) adjustScaleFactor(recommendedScaleFactor float64) {
149148
// migrate old configuration
150149
if os.Getenv("STARTDDE_MIGRATE_SCALE_FACTOR") != "" {
151150
scaleFactor := m.getScaleFactor()
152-
err = m.setScreenScaleFactorsForQt(map[string]float64{"": scaleFactor})
153-
if err != nil {
154-
logger.Warning("failed to set scale factor for qt:", err)
151+
if scaleFactor > 0 {
152+
err = m.setScreenScaleFactorsForQt(map[string]float64{"": scaleFactor})
153+
if err != nil {
154+
logger.Warning("failed to set scale factor for qt:", err)
155+
}
155156
}
156157

157158
err = cleanUpDdeEnv()
@@ -166,7 +167,7 @@ func (m *XSManager) adjustScaleFactor(recommendedScaleFactor float64) {
166167
if os.IsNotExist(err) {
167168
// lightdm-deepin-greeter does not have the qt-theme.ini file yet.
168169
scaleFactor := m.getScaleFactor()
169-
if scaleFactor != defaultScaleFactor {
170+
if scaleFactor > 0 {
170171
err = m.setScreenScaleFactorsForQt(map[string]float64{"": scaleFactor})
171172
if err != nil {
172173
logger.Warning("failed to set scale factor for qt:", err)

0 commit comments

Comments
 (0)