Fixed #119, added auto_selection config option to autoselect first …

…desktop, if only one is available.

README.md

@@ -111,6 +111,9 @@ Path to directory, where Wayland sessions' desktop files are stored. Default val
 `SELECT_LAST_USER`
 Enables funtionality of saving last successfully logged in user for next login. Possible values are "false", "per-tty" or "global". Default value is false.
 
+`AUTO_SELECTION`
+If set to "true" and only one desktop is available, it automatically select that desktop. Possible values are "true" or "false". Default value is false.
+
 #### Dynamic MOTD
 If `DYNAMIC_MOTD` is set to `true`, this file exists and is executable for its owner, the result is printed as your own MOTD. Be very careful with this script!
 

res/emptty.1

@@ -1,4 +1,4 @@
-.TH EMPTTY 1 "June 2024" "emptty 0.12.1" emptty
+.TH EMPTTY 1 "July 2024" "emptty 0.12.1" emptty
 
 .SH NAME
 emptty \- Dead simple CLI Display Manager on TTY
@@ -175,6 +175,9 @@ Path to directory, where Wayland sessions' desktop files are stored. Default val
 .IP SELECT_LAST_USER
 Enables funtionality of saving last successfully logged in user for next login. Possible values are "false", "per-tty" or "global". Default value is false.
 
+.IP AUTO_SELECTION
+If set to "true" and only one desktop is available, it automatically select that desktop. Possible values are "true" or "false". Default value is false.
+
 .SH DYNAMIC MOTD
 Optional file stored by default as /etc/emptty/motd-gen.sh. Could be overridden.
 

res/testing/conf

@@ -33,4 +33,5 @@ HIDE_ENTER_LOGIN=true
 ALWAYS_DBUS_LAUNCH=true
 XORG_SESSIONS_PATH=/dev/null
 WAYLAND_SESSIONS_PATH=/dev/zero
-SELECT_LAST_USER=per-tty
+SELECT_LAST_USER=per-tty
+AUTO_SELECTION=true

src/config.go

@@ -30,6 +30,7 @@ type config struct {
 	IdentifyEnvs        bool             `config:"IDENTIFY_ENVS" parser:"ParseBool" default:"false"`
 	HideEnterLogin      bool             `config:"HIDE_ENTER_LOGIN" parser:"ParseBool" default:"false"`
 	HideEnterPassword   bool             `config:"HIDE_ENTER_PASSWORD" parser:"ParseBool" default:"false"`
+	AutoSelection       bool             `config:"AUTO_SELECTION" parser:"ParseBool" default:"false"`
 	DefaultSessionEnv   enEnvironment    `config:"DEFAULT_SESSION_ENV" parser:"ParseEnv" default:""`
 	AutologinSessionEnv enEnvironment    `config:"AUTOLOGIN_SESSION_ENV" parser:"ParseEnv" default:""`
 	Logging             enLogging        `config:"LOGGING" parser:"ParseLogging" default:"rotate"`

src/config_test.go

@@ -160,6 +160,10 @@ func TestLoadConfig(t *testing.T) {
 	if conf.SelectLastUser != PerTty {
 		t.Error("TestLoadConfig: SELECT_LAST_USER value is not correct")
 	}
+
+	if !conf.AutoSelection {
+		t.Error("TestLoadConfig: AUTO_SELECTION value is not correct")
+	}
 }
 
 func TestLangLoadConfig(t *testing.T) {

src/desktop.go

@@ -147,8 +147,8 @@ func selectDesktop(usr *sysuser, conf *config, d *desktop) (*desktop, *desktop)
 		}
 	}
 
-	// If there is just one desktop and selection is set to Auto, select first desktop
-	if len(desktops) == 1 && d != nil && d.selection == SelectionAuto {
+	// If there is just one desktop and AutoSelection is set or selection is set to Auto, select first desktop
+	if len(desktops) == 1 && (conf.AutoSelection || (d != nil && d.selection == SelectionAuto)) {
 		return desktops[0], desktops[lastDesktop]
 	}