Don't allow system keys when screensaver up

Author: andydotxyz

internal/x11/wm/events.go

@@ -170,6 +170,10 @@ func (x *x11WM) handleInitialHints(ev xproto.ClientMessageEvent, hint string) {
 }
 
 func (x *x11WM) handleKeyPress(ev xproto.KeyPressEvent) {
+	if screenSaverActive {
+		return
+	}
+
 	userMod := ev.State&xproto.ModMask4 != 0
 	if fynedesk.Instance().Settings().KeyboardModifier() == fyne.KeyModifierAlt {
 		userMod = ev.State&xproto.ModMask1 != 0
@@ -216,6 +220,10 @@ func (x *x11WM) handleKeyPress(ev xproto.KeyPressEvent) {
 }
 
 func (x *x11WM) handleKeyRelease(ev xproto.KeyReleaseEvent) {
+	if screenSaverActive {
+		return
+	}
+
 	userMod := keyCodeSuper
 	if fynedesk.Instance().Settings().KeyboardModifier() == fyne.KeyModifierAlt {
 		userMod = keyCodeAlt

internal/x11/wm/screensaver.go

@@ -13,7 +13,10 @@ import (
 
 func (x *x11WM) initScreensaver() {
 	err := screensaver.Init(x.x.Conn())
-	log.Println("ERR", err)
+	if err != nil {
+		log.Println("Failed to init screensaver extension")
+		return
+	}
 
 	//screensaver.SelectInput(conn.Conn(), xproto.Drawable(conn.Screen().Root),
 	//	screensaver.EventNotifyMask)
@@ -36,7 +39,7 @@ func (x *x11WM) watchScreensaver() {
 	}
 }
 
-var visible bool
+var screenSaverActive bool
 
 func (x *x11WM) ShowScreensaver(s *saver.ScreenSaver) {
 	if fynedesk.Instance().Settings().ScreenSaverType() == "XScreensaver" {
@@ -49,13 +52,13 @@ func (x *x11WM) ShowScreensaver(s *saver.ScreenSaver) {
 		return
 	}
 
-	if visible {
+	if screenSaverActive {
 		return
 	}
 
-	visible = true
+	screenSaverActive = true
 	s.OnUnlocked = func() {
-		visible = false
+		screenSaverActive = false
 	}
 
 	s.ShowWindow()