Refs #159, define path for default .Xauthority file, if env variable is not defined.

Author: tvrzna

src/session_xorg.go

@@ -5,10 +5,13 @@ import (
 	"net"
 	"os"
 	"os/exec"
+	"path/filepath"
 	"strconv"
 	"syscall"
 )
 
+const defaultXauthorityPath = ".Xauthority"
+
 // xorgSession defines structure for xorg
 type xorgSession struct {
 	*commonSession
@@ -69,7 +72,12 @@ func (x *xorgSession) startCarrier() {
 	}
 	logPrint("Started Xorg")
 
-	if xorgConn, err := openXDisplay(x.auth.usr().getenv(envDisplay), x.auth.usr().getenv(envXauthority)); err != nil {
+	xAuthorityPath := x.auth.usr().getenv(envXauthority)
+	if xAuthorityPath == "" {
+		xAuthorityPath = filepath.Join(x.auth.usr().homedir, defaultXauthorityPath)
+	}
+
+	if xorgConn, err := openXDisplay(x.auth.usr().getenv(envDisplay), xAuthorityPath); err != nil {
 		logPrintf("Could not open X Display: %v", err)
 		handleStrErr("Could not open X Display.")
 	} else {

src/x11.go

@@ -29,6 +29,7 @@ func openXDisplay(dispName, xauthorityPath string) (net.Conn, error) {
 	counter := 0
 	deadline := time.Now().Add(30 * time.Second)
 
+	time.Sleep(50 * time.Millisecond)
 	for time.Now().Before(deadline) {
 		conn, err := net.DialTimeout("unix", socketPath, 200*time.Millisecond)
 		if err == nil {
@@ -46,7 +47,7 @@ func openXDisplay(dispName, xauthorityPath string) (net.Conn, error) {
 		if wait > maxWaitToOpenX11Display {
 			wait = maxWaitToOpenX11Display
 		}
-		logPrintf("waiting for %s to try to open X11 display again", wait)
+		logPrintf("X11 display open waiting for %s to try to again", wait)
 		time.Sleep(wait)
 		counter++
 	}