internal/ui: use the cursor position to choose the initial monitor for Linux/UNIX

Updates #1918
Closes #1982

internal/ui/ui_glfw.go

@@ -169,38 +169,13 @@ func initialize() error {
 	glfw.WindowHint(glfw.Visible, glfw.False)
 	glfw.WindowHint(glfw.ClientAPI, glfw.NoAPI)
 
-	var m *glfw.Monitor
+	m, err := initialMonitorByOS()
-	if runtime.GOOS == "darwin" || runtime.GOOS == "windows" {
-		var err error
-		m, err = initialMonitorByOS()
 	if err != nil {
 		return err
 	}
 	if m == nil {
 		m = glfw.GetPrimaryMonitor()
 	}
-	} else {
-		// Create a window to set the initial monitor.
-		// TODO: Instead of a dummy window, get a mouse cursor position and get a monitor from it (#1982).
-		w, err := glfw.CreateWindow(16, 16, "", nil, nil)
-		if err != nil {
-			return err
-		}
-		if w == nil {
-			// This can happen on Windows Remote Desktop (#903).
-			panic("ui: glfw.CreateWindow must not return nil")
-		}
-		defer w.Destroy()
-		initializeWindowAfterCreation(w)
-		theUI.waitForFramebufferSizeCallback(w, nil)
-		m, err = initialMonitorByOS()
-		if err != nil {
-			return err
-		}
-		if m == nil {
-			m = currentMonitorImpl(w)
-		}
-	}
 
 	theUI.initMonitor = m
 	// GetVideoMode must be called from the main thread, then call this here and record

internal/ui/ui_glfw_unix.go

@@ -134,6 +134,28 @@ func (u *UserInterface) adjustWindowPosition(x, y int, monitor *glfw.Monitor) (i
 }
 
 func initialMonitorByOS() (*glfw.Monitor, error) {
+	xconn, err := xgb.NewConn()
+	if err != nil {
+		// Assume we're on pure Wayland then.
+		return nil, nil
+	}
+	defer xconn.Close()
+
+	root := xproto.Setup(xconn).DefaultScreen(xconn).Root
+	rep, err := xproto.QueryPointer(xconn, root).Reply()
+	if err != nil {
+		return nil, err
+	}
+	x, y := int(rep.RootX), int(rep.RootY)
+
+	// Find the monitor including the cursor.
+	for _, m := range ensureMonitors() {
+		w, h := m.vm.Width, m.vm.Height
+		if x >= m.x && x < m.x+w && y >= m.y && y < m.y+h {
+			return m.m, nil
+		}
+	}
+
 	return nil, nil
 }