Embed a nice screensaver so we don't depend on XScreensaver

.github/workflows/platform_tests.yml

@@ -21,7 +21,7 @@ jobs:
         go-version: ${{ matrix.go-version }}
 
     - name: Get dependencies
-      run: sudo apt-get update && sudo apt-get install gcc libgl1-mesa-dev libegl1-mesa-dev libgles2-mesa-dev libx11-dev xorg-dev bc
+      run: sudo apt-get update && sudo apt-get install gcc libgl1-mesa-dev libegl1-mesa-dev libgles2-mesa-dev libx11-dev xorg-dev bc libpam-dev
       if: ${{ runner.os == 'Linux' }}
 
     - name: Tests

.github/workflows/static_analysis.yml

@@ -16,7 +16,7 @@ jobs:
 
     - name: Get dependencies
       run: |
-        sudo apt-get update && sudo apt-get install gcc libgl1-mesa-dev libegl1-mesa-dev libgles2-mesa-dev libx11-dev xorg-dev
+        sudo apt-get update && sudo apt-get install gcc libgl1-mesa-dev libegl1-mesa-dev libgles2-mesa-dev libx11-dev xorg-dev libpam-dev
         go install golang.org/x/tools/cmd/goimports@latest
         go install github.com/fzipp/gocyclo/cmd/gocyclo@latest
         go install golang.org/x/lint/golint@latest

desk.go

@@ -25,6 +25,9 @@ type Desktop interface {
 
 	Desktop() int
 	SetDesktop(int)
+
+	DelayScreenSaver()
+	TriggerScreenSaver()
 }
 
 var instance Desktop

go.mod

@@ -6,8 +6,9 @@ require (
 	fyne.io/fyne/v2 v2.6.0-rc2
 	github.com/BurntSushi/xgb v0.0.0-20201008132610-5f9e7b3c49cd
 	github.com/BurntSushi/xgbutil v0.0.0-20160919175755-f7c97cef3b4e
-	github.com/FyshOS/appie v0.0.0-20250103211310-00f097d8e19d
+	github.com/FyshOS/appie v0.0.0-20250210200903-09e0fadae9b2
 	github.com/FyshOS/backgrounds v0.0.0-20230616202904-0a8b6ebaa184
+	github.com/FyshOS/saver v0.0.0-20250210195851-194e0eaf4d56
 	github.com/Knetic/govaluate v3.0.0+incompatible
 	github.com/disintegration/imaging v1.6.2
 	github.com/fyne-io/image v0.1.1
@@ -41,7 +42,7 @@ require (
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/fyne-io/gl-js v0.1.0 // indirect
 	github.com/fyne-io/glfw-js v0.2.0 // indirect
-	github.com/fyne-io/terminal v0.0.0-20240728203942-56c3b98b9208
+	github.com/fyne-io/terminal v0.0.0-20250302210544-1a7f9ea2f681
 	github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71 // indirect
 	github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a // indirect
 	github.com/go-text/render v0.2.0 // indirect

go.sum

@@ -14,10 +14,12 @@ github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0
 github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
 github.com/BurntSushi/xgb v0.0.0-20201008132610-5f9e7b3c49cd h1:u7K2oMFMd8APDV3fM1j2rO3U/XJf1g1qC3DDTKou8iM=
 github.com/BurntSushi/xgb v0.0.0-20201008132610-5f9e7b3c49cd/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/FyshOS/appie v0.0.0-20250103211310-00f097d8e19d h1:bkIQPpxGMalOufoLbLDXQ/vrVwGUbtw1jbVZE8Y6nZI=
-github.com/FyshOS/appie v0.0.0-20250103211310-00f097d8e19d/go.mod h1:Gtvb1fKDXbE9HjMtoYdB2MPSSGy6PdtMl0TC9dSF8q0=
+github.com/FyshOS/appie v0.0.0-20250210200903-09e0fadae9b2 h1:Ex95hOld+SfPXlkCus1UYJmejIyj4I68Vmf1gyweqDk=
+github.com/FyshOS/appie v0.0.0-20250210200903-09e0fadae9b2/go.mod h1:Gtvb1fKDXbE9HjMtoYdB2MPSSGy6PdtMl0TC9dSF8q0=
 github.com/FyshOS/backgrounds v0.0.0-20230616202904-0a8b6ebaa184 h1:Za0NHFsT0CCXf/X4hEaywjvEECccrM/xVVL8BzAy6JI=
 github.com/FyshOS/backgrounds v0.0.0-20230616202904-0a8b6ebaa184/go.mod h1:cOUmJ3HUVmH3W3u9Gj5hM73ZgrDxGNHKMr5T/sBKqLU=
+github.com/FyshOS/saver v0.0.0-20250210195851-194e0eaf4d56 h1:8dYR5LoiKtMPvvl75plKGBViCHn9obus5iKwHqNf4TQ=
+github.com/FyshOS/saver v0.0.0-20250210195851-194e0eaf4d56/go.mod h1:Wt7jZKpGxGT8pqUUdyvCwsA/NsyDfWz3avRrcU5DXls=
 github.com/Knetic/govaluate v3.0.0+incompatible h1:7o6+MAPhYTCF0+fdvoz1xDedhRb4f6s9Tn1Tt7/WTEg=
 github.com/Knetic/govaluate v3.0.0+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
 github.com/creack/pty v1.1.21 h1:1/QdRyBaHHJP61QkWMXlOIBfsgdDeeKfK8SYVUWJKf0=
@@ -39,8 +41,8 @@ github.com/fyne-io/image v0.1.1 h1:WH0z4H7qfvNUw5l4p3bC1q70sa5+YWVt6HCj7y4VNyA=
 github.com/fyne-io/image v0.1.1/go.mod h1:xrfYBh6yspc+KjkgdZU/ifUC9sPA5Iv7WYUBzQKK7JM=
 github.com/fyne-io/oksvg v0.1.0 h1:7EUKk3HV3Y2E+qypp3nWqMXD7mum0hCw2KEGhI1fnBw=
 github.com/fyne-io/oksvg v0.1.0/go.mod h1:dJ9oEkPiWhnTFNCmRgEze+YNprJF7YRbpjgpWS4kzoI=
-github.com/fyne-io/terminal v0.0.0-20240728203942-56c3b98b9208 h1:ZMTEq3IAv6EQv6XuMpF6KSBT+c0/ou/O9uxoQvPyA2c=
-github.com/fyne-io/terminal v0.0.0-20240728203942-56c3b98b9208/go.mod h1:uTxDe2dNdJWfmUAgWwG+leivgNxSfCY50t+AiNdPmiM=
+github.com/fyne-io/terminal v0.0.0-20250302210544-1a7f9ea2f681 h1:OThqPVULAuWylUx5m2v3BNTIDJZ2rqGQn1kuuwTXqgY=
+github.com/fyne-io/terminal v0.0.0-20250302210544-1a7f9ea2f681/go.mod h1:KiQFSJttY9GjCibmQsDxNknyl9cYmYsqi3ws+3tQfKU=
 github.com/fyne-io/xgbutil v0.0.0-20191220152344-7d838166824d h1:8+poQtDqiRfAZmeyYRlInuaIBsQEflmxtpJeZklvNuE=
 github.com/fyne-io/xgbutil v0.0.0-20191220152344-7d838166824d/go.mod h1:vPqYMuTmTyrLNDQWQXy9lqdnV+WRQn6jhaSon8TppBs=
 github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71 h1:5BVwOaUSBTlVZowGO6VZGw2H/zl9nrd3eCZfYV+NfQA=
@@ -66,7 +68,7 @@ github.com/jeandeaual/go-locale v0.0.0-20241217141322-fcc2cadd6f08/go.mod h1:ZDX
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 h1:YLvr1eE6cdCqjOe972w/cYF+FjW34v27+9Vo5106B4M=
 github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25/go.mod h1:kLgvv7o6UM+0QSf0QjAse3wReFDsb9qbZJdfexWlrQw=
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/mafik/pulseaudio v0.0.0-20200511091429-8449222912dd h1:gn6oLpDCn3wY+1WfbbP0OwxXL+2eHi3mxF/DsNyPHUM=
 github.com/mafik/pulseaudio v0.0.0-20200511091429-8449222912dd/go.mod h1:dlpd1fnLAhI6g9tM/aCobgN/Yka1/SkHrBTfAgDdb9Q=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=

internal/ui/dbus/ScreenSaver.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/ScreenSaver">
+<interface name="org.freedesktop.ScreenSaver">
+    <method name="Inhibit">
+        <arg direction="in" type="s" name="application_name"/>
+        <arg direction="in" type="s" name="reason_for_inhibit"/>
+        <arg direction="out" type="u" name="cookie"/>
+    </method>
+    <method name="UnInhibit">
+        <arg direction="in" type="u" name="cookie"/>
+    </method>
+</interface>
+</node>

internal/ui/desk.go

@@ -115,7 +115,12 @@ func (l *desktop) ShowMenuAt(menu *fyne.Menu, pos fyne.Position) {
 }
 
 func (l *desktop) updateBackgrounds(path string) {
-	l.root.Content().(*fyne.Container).Objects[0].(*background).updateBackground(path)
+	root := l.root.Content().(*fyne.Container).Objects[0]
+	if back, ok := root.(*background); ok {
+		back.updateBackground(path)
+	} else { // embed mode has another container
+		root.(*fyne.Container).Objects[0].(*background).updateBackground(path)
+	}
 }
 
 func (l *desktop) createPrimaryContent() fyne.CanvasObject {
@@ -150,6 +155,7 @@ func (l *desktop) RecentApps() []appie.AppData {
 
 func (l *desktop) Run() {
 	go l.wm.Run()
+	go l.watchScreenActivity()
 	l.run() // use the configured run method
 }
 
@@ -343,19 +349,9 @@ func (l *desktop) registerShortcuts() {
 	l.AddShortcut(fynedesk.NewShortcut("Calculator", fynedesk.KeyCalculator, 0),
 		l.calculator)
 	l.AddShortcut(fynedesk.NewShortcut("Lock screen", fyne.KeyL, fynedesk.UserModifier),
-		l.lockScreen)
-}
-
-func (l *desktop) startXscreensaver() {
-	_, err := exec.LookPath("xscreensaver")
-	if err != nil {
-		fyne.LogError("xscreensaver command not found", err)
-		return
-	}
-	err = exec.Command("xscreensaver", "-no-splash").Start()
-	if err != nil {
-		fyne.LogError("Failed to lock screen", err)
-	}
+		func() {
+			l.TriggerScreenSaver()
+		})
 }
 
 // Screens returns the screens provider of the current desktop environment for access to screen functionality.
@@ -374,7 +370,9 @@ func NewDesktop(app fyne.App, mgr fynedesk.WindowManager, icons appie.Provider,
 
 	desk.setupRoot()
 	wm.StartAuthAgent()
-	go desk.startXscreensaver()
+	if desk.Settings().ScreenSaverType() == "XScreensaver" {
+		go desk.startXscreensaver()
+	}
 	return desk
 }
 
@@ -383,12 +381,14 @@ func NewDesktop(app fyne.App, mgr fynedesk.WindowManager, icons appie.Provider,
 // If run during CI for testing it will return an in-memory window using the
 // fyne/test package.
 func NewEmbeddedDesktop(app fyne.App, icons appie.Provider) fynedesk.Desktop {
-	desk := newDesktop(app, &embededWM{}, icons)
+	wm := &embededWM{}
+	desk := newDesktop(app, wm, icons)
 	desk.run = desk.runEmbed
 	desk.showMenu = desk.showMenuEmbed
 
 	desk.root = desk.newDesktopWindowEmbed()
-	desk.root.SetContent(desk.createPrimaryContent())
+	over := wm.setWindow(desk.root)
+	desk.root.SetContent(container.NewStack(desk.createPrimaryContent(), over))
 	return desk
 }
 
@@ -411,16 +411,17 @@ func (l *desktop) calculator() {
 	}
 }
 
-func (l *desktop) lockScreen() {
-	_, err := exec.LookPath("xscreensaver-command")
-	if err != nil {
-		fyne.LogError("xscreensaver-command not found", err)
-		l.WindowManager().Blank()
-		return
-	}
-	err = exec.Command("xscreensaver-command", "-lock").Start()
-	if err != nil {
-		fyne.LogError("Failed to lock screen", err)
-		l.WindowManager().Blank()
-	}
-}
+//func (l *desktop) runCommand() {
+//	w := l.app.NewWindow("Run Command")
+//	input := widget.NewEntry()
+//	// TODO add history etc...
+//	run := widget.NewButton("Run", func() {
+//
+//	})
+//	run.Importance = widget.HighImportance
+//
+//	w.SetContent(container.NewVBox(widget.NewLabel("Enter command to run:"),
+//		container.NewBorder(nil, nil, nil, run, input)))
+//	w.Resize(fyne.NewSize(250, 40))
+//	w.Show()
+//}

internal/ui/desk_test.go

@@ -66,7 +66,7 @@ func TestBackgroundChange(t *testing.T) {
 	l.settings = wmTest.NewSettings()
 	l.setupRoot()
 
-	bg := l.root.Content().(*fyne.Container).Objects[0].(*background)
+	bg := l.root.Content().(*fyne.Container).Objects[0].(*fyne.Container).Objects[0].(*background)
 
 	workingDir, err := os.Getwd()
 	if err != nil {

internal/ui/embed_wm.go

@@ -2,14 +2,21 @@ package ui
 
 import (
 	"image"
-
-	"fyne.io/fyne/v2"
+	"image/color"
 
 	"fyshos.com/fynedesk"
+	"github.com/FyshOS/saver"
+
+	"fyne.io/fyne/v2"
+	"fyne.io/fyne/v2/canvas"
+	"fyne.io/fyne/v2/container"
+	deskDriver "fyne.io/fyne/v2/driver/desktop"
+	"fyne.io/fyne/v2/widget"
 )
 
 type embededWM struct {
 	windows []fynedesk.Window
+	root    fyne.Window
 }
 
 func (e *embededWM) AddWindow(win fynedesk.Window) {
@@ -79,3 +86,55 @@ func (e *embededWM) Close() {
 		windows[0].Close() // ensure our root is asked to close as well
 	}
 }
+
+var visible bool
+
+func (e *embededWM) ShowScreensaver(s *saver.ScreenSaver) {
+	if visible {
+		return
+	}
+
+	visible = true
+	over := container.NewStack(canvas.NewRectangle(color.Black))
+
+	s.OnUnlocked = func() {
+		visible = false
+		e.root.Canvas().Overlays().Remove(over)
+	}
+
+	over.Add(s.MakeUI(e.root))
+	over.Resize(e.root.Canvas().Size())
+	e.root.Canvas().Overlays().Add(over)
+}
+
+func (e *embededWM) setWindow(win fyne.Window) fyne.CanvasObject {
+	e.root = win
+
+	return newSaverMonitor(fynedesk.Instance().DelayScreenSaver)
+}
+
+type saverMonitor struct {
+	widget.BaseWidget
+
+	cb func()
+}
+
+func newSaverMonitor(cb func()) fyne.CanvasObject {
+	s := &saverMonitor{cb: cb}
+	s.ExtendBaseWidget(s)
+	return s
+}
+
+func (s *saverMonitor) CreateRenderer() fyne.WidgetRenderer {
+	return widget.NewSimpleRenderer(canvas.NewRectangle(color.Transparent))
+}
+
+func (s *saverMonitor) MouseIn(*deskDriver.MouseEvent) {
+}
+
+func (s *saverMonitor) MouseMoved(*deskDriver.MouseEvent) {
+	s.cb()
+}
+
+func (s *saverMonitor) MouseOut() {
+}