refactor: simplify configuration and remove unused features

- General
  - Remove idle monitoring implementation from X11 and Wayland lockers

- Configuration
  - Remove unused configuration options
    - BackgroundColor (not used in rendering)
    - BlurBackground (incomplete functionality)
    - IdleTimeout (removed idle monitoring)
    - MediaPlayerCmd (hardcoded to mpv)
  - Added (disabled by default)
    - lock_pause_media (Pause any playing media via d-bus)
    - unlock_unpause_media (Unpause any playing media via d-bus)

- Media Control
  - Added the option to pause/unpause any playing media when locking/unlocking the screen.

- Simplify media control:
  - Hardcode mpv as the media player
  - Remove MediaPlayerCmd configuration option

This change makes the codebase more focused and maintainable by removing
unused features while preserving core functionality.

Author: Tuxx

README.md

@@ -47,16 +47,14 @@ mkdir -p ~/.config/fancylock
 cat > ~/.config/fancylock/config.json << 'EOF'
 {
   "media_dir": "$HOME/Videos",
-  "lock_screen": false,
   "supported_extensions": [".mp4", ".mkv", ".mov", ".avi", ".webm"],
   "pam_service": "fancylock",
   "include_images": true,
   "image_display_time": 30,
-  "background_color": "#000000",
-  "blur_background": false,
-  "media_player_cmd": "mpv",
   "pre_lock_command": "",
-  "post_lock_command": ""
+  "post_lock_command": "",
+  "lock_pause_media": false,
+  "unlock_unpause_media": false
 }
 EOF
 ```
@@ -182,33 +180,29 @@ fancylock -c /path/to/config.json
 ```json
 {
   "media_dir": "/home/user/Videos",
-  "lock_screen": false,
   "supported_extensions": [".mp4", ".mkv", ".mov", ".avi", ".webm"],
   "pam_service": "fancylock",
   "include_images": true,
   "image_display_time": 30,
-  "background_color": "#000000",
-  "blur_background": false,
-  "media_player_cmd": "mpv",
   "pre_lock_command": "pypr hide mywindow",
-  "post_lock_command": "pypr show mywindow"
+  "post_lock_command": "pypr show mywindow",
+  "lock_pause_media": false,
+  "unlock_unpause_media": false
 }
 ```
 </details>
 
 ### Configuration Options
 
 - `media_dir`: Directory containing videos/images to display while locked
-- `lock_screen`: Whether to lock the screen immediately on startup
 - `supported_extensions`: File extensions to look for in the media directory
 - `pam_service`: PAM service name for authentication
 - `include_images`: Whether to include images along with videos
 - `image_display_time`: How long to display each image in seconds
-- `media_player_cmd`: Command to use for playing media (default: mpv)
-- `pre_lock_command`: Execute this command before locking the screen.
-- `post_lock_command`: Execute this command after unlocking the screen.
-
-Note: The configuration also includes `background_color` and `blur_background` options, but these are not currently implemented.
+- `pre_lock_command`: Execute this command before locking the screen
+- `post_lock_command`: Execute this command after unlocking the screen
+- `lock_pause_media`: Whether to pause all media players when locking the screen
+- `unlock_unpause_media`: Whether to unpause all media players when unlocking the screen
 
 ## Current Status
 
@@ -222,25 +216,21 @@ Note: The configuration also includes `background_color` and `blur_background` o
 - ✅ Keyboard and pointer grabbing to prevent bypass
 - ✅ Failed password attempt limiting 
 - ✅ Embedded version metadata via `-v`
+- ✅ MPRIS media control (pause/unpause)
 
 ### What Needs Improvement
 
 - ⚠️ Error handling in some edge cases
-- ⚠️ Password entry UI could be more polished
 - ⚠️ Memory optimization for long-running sessions
 - ⚠️ Better handling of system sleep/wake events
 - ⚠️ Auto-creation of default config file (if none exists)
 
 ## Future Implementations
 
+- 🚧 Clock display in center of the screen
 - 🚧 Configurable UI theme and appearance
-- 🚧 Blurred background option
 - 🚧 More interactive lock screen elements
-- 🚧 Support for additional media players
-- 🚧 Screensaver mode with clock display
-- 🚧 Improved multi-head support (different videos per monitor)
 - 🚧 Systemd integration
-- 🚧 Implementation of background color and blur options
 - 🚧 Auto-generation of default config file
 
 ## Developer Setup

go.mod

@@ -4,6 +4,7 @@ go 1.24.0
 
 require (
 	github.com/BurntSushi/xgb v0.0.0-20210121224620-deaf085860bc
+	github.com/godbus/dbus/v5 v5.1.0
 	github.com/msteinert/pam v1.2.0
 	github.com/neurlang/wayland v0.2.1
 	github.com/tuxx/wayland-ext-session-lock-go v0.0.0-20250328013740-430eff7f7869

go.sum

@@ -1,5 +1,7 @@
 github.com/BurntSushi/xgb v0.0.0-20210121224620-deaf085860bc h1:7D+Bh06CRPCJO3gr2F7h1sriovOZ8BMhca2Rg85c2nk=
 github.com/BurntSushi/xgb v0.0.0-20210121224620-deaf085860bc/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
+github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/msteinert/pam v1.2.0 h1:mYfjlvN2KYs2Pb9G6nb/1f/nPfAttT/Jee5Sq9r3bGE=
 github.com/msteinert/pam v1.2.0/go.mod h1:d2n0DCUK8rGecChV3JzvmsDjOY4R7AYbsNxAT+ftQl0=
 github.com/neurlang/wayland v0.2.1 h1:/krK1Flt6VMCj/+KgEYhbm27fkYYEDGkiF1IzNlO43E=

internal/config.go

@@ -21,19 +21,17 @@ func DefaultConfig() Configuration {
 	}
 
 	return Configuration{
-		MediaDir:         filepath.Join(homeDir, "Videos"),
-		LockScreen:       false,
-		SupportedExt:     []string{".mov", ".mkv", ".mp4", ".avi", ".webm"},
-		IdleTimeout:      300, // 5 minutes
-		PamService:       PamService,
-		IncludeImages:    true,
-		ImageDisplayTime: 30,
-		BackgroundColor:  "#000000",
-		BlurBackground:   false,
-		MediaPlayerCmd:   "mpv",
-		DebugExit:        false, // Disabled by default for security
-		PreLockCommand:   "",    // No default pre-lock command
-		PostLockCommand:  "",    // No default post-lock command
+		MediaDir:           filepath.Join(homeDir, "Videos"),
+		LockScreen:         false,
+		SupportedExt:       []string{".mov", ".mkv", ".mp4", ".avi", ".webm"},
+		PamService:         PamService,
+		IncludeImages:      true,
+		ImageDisplayTime:   30,
+		DebugExit:          false, // Disabled by default for security
+		PreLockCommand:     "",    // No default pre-lock command
+		PostLockCommand:    "",    // No default post-lock command
+		LockPauseMedia:     false, // Disabled by default
+		UnlockUnpauseMedia: false, // Disabled by default
 	}
 }
 
@@ -102,11 +100,6 @@ func validateConfig(config *Configuration) error {
 		return fmt.Errorf("no supported media extensions specified")
 	}
 
-	// Ensure idle timeout is reasonable
-	if config.IdleTimeout < 0 {
-		return fmt.Errorf("idle timeout cannot be negative")
-	}
-
 	// Ensure image display time is reasonable
 	if config.ImageDisplayTime <= 0 {
 		return fmt.Errorf("image display time must be positive")

internal/lock.go

@@ -87,9 +87,11 @@ func (a *PamAuthenticator) Authenticate(password string) AuthResult {
 	}
 }
 
+// LockHelper handles screen locking operations
 type LockHelper struct {
 	authenticator *PamAuthenticator
 	config        Configuration
+	mediaCtrl     *MediaController
 }
 
 // NewLockHelper creates a new helper instance with the given configuration
@@ -99,9 +101,25 @@ func NewLockHelper(config Configuration) *LockHelper {
 		username:    os.Getenv("USER"),
 	}
 
+	var mediaCtrl *MediaController
+	if config.LockPauseMedia || config.UnlockUnpauseMedia {
+		Debug("Media control is enabled, initializing media controller")
+		var err error
+		mediaCtrl, err = NewMediaController()
+		if err != nil {
+			// Log error but continue without media control
+			Error("Failed to initialize media controller: %v", err)
+		} else {
+			Debug("Media controller initialized successfully")
+		}
+	} else {
+		Debug("Media control is disabled, skipping media controller initialization")
+	}
+
 	return &LockHelper{
 		authenticator: auth,
 		config:        config,
+		mediaCtrl:     mediaCtrl,
 	}
 }
 
@@ -167,18 +185,6 @@ func (h *LockHelper) DisableVTs() func() {
 	}
 }
 
-// BlurBackground blurs the screen contents if enabled in config
-func (h *LockHelper) BlurBackground() ([]byte, error) {
-	if !h.config.BlurBackground {
-		return nil, nil
-	}
-
-	// This would typically capture the screen and apply a blur
-	// Returns the blurred screenshot data
-
-	return nil, nil
-}
-
 // EnsureSingleInstance makes sure only one instance of the locker is running
 func (h *LockHelper) EnsureSingleInstance() error {
 	// Try to get an exclusive lock on a file
@@ -266,3 +272,42 @@ func (p *SecurePassword) Length() int {
 func runShellCommand(cmd string) error {
 	return exec.Command("sh", "-c", strings.TrimSpace(cmd)).Run()
 }
+
+// PauseMediaIfEnabled pauses all media if enabled in config
+func (h *LockHelper) PauseMediaIfEnabled() error {
+	if !h.config.LockPauseMedia {
+		Debug("LockPauseMedia is disabled in config, skipping media pause")
+		return nil
+	}
+
+	if h.mediaCtrl == nil {
+		Error("LockPauseMedia is enabled but media controller is not initialized")
+		return nil
+	}
+
+	Debug("Pausing all media players")
+	return h.mediaCtrl.PauseAllMedia()
+}
+
+// UnpauseMediaIfEnabled unpauses all media if enabled in config
+func (h *LockHelper) UnpauseMediaIfEnabled() error {
+	if !h.config.UnlockUnpauseMedia {
+		Debug("UnlockUnpauseMedia is disabled in config, skipping media unpause")
+		return nil
+	}
+
+	if h.mediaCtrl == nil {
+		Error("UnlockUnpauseMedia is enabled but media controller is not initialized")
+		return nil
+	}
+
+	Debug("Unpausing all media players")
+	return h.mediaCtrl.UnpauseAllMedia()
+}
+
+// Close cleans up resources
+func (h *LockHelper) Close() {
+	if h.mediaCtrl != nil {
+		h.mediaCtrl.Close()
+	}
+}

internal/media.go

@@ -179,17 +179,12 @@ func (mp *MediaPlayer) startPlaylistOnMonitor(monitor Monitor, monitorIdx int) e
 	geometry := fmt.Sprintf("%dx%d+%d+%d", monitor.Width, monitor.Height, monitor.X, monitor.Y)
 
 	// Create mpv command with playlist
-	playerCmd := mp.config.MediaPlayerCmd
-	if playerCmd == "" {
-		playerCmd = "mpv"
-	}
-
 	// Add a new option to get mpv to report the current file
 	// This will help us track what's playing on each monitor
 	ipcSocketPath := fmt.Sprintf("/tmp/fancylock-mpv-socket-%d", monitorIdx)
 	os.Remove(ipcSocketPath) // Remove any existing socket
 
-	cmd := exec.Command(playerCmd,
+	cmd := exec.Command("mpv",
 		"--no-input-default-bindings", // Disable default key bindings
 		"--really-quiet",              // No console output
 		"--no-stop-screensaver",       // Don't interfere with screensaver