Merge pull request #56 from aep/master

respect DISPLAY on linux
go-vgo · Dec 31, 2021 · b270210 · b270210
2 parents 25c764c + 47245e8
commit b270210
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/base/xdisplay_c.h b/base/xdisplay_c.h
@@ -4,7 +4,7 @@
 
 static Display *mainDisplay = NULL;
 static int registered = 0;
-static char *displayName = ":0.0";
+static char *displayName = NULL;
 static int hasDisplayNameChanged = 0;
 
 Display *XGetMainDisplay(void)
@@ -24,6 +24,11 @@ Display *XGetMainDisplay(void)
 			mainDisplay = XOpenDisplay(NULL);
 		}
 
+		/* Fall back to the most likely :0.0*/
+		if (mainDisplay == NULL) {
+			mainDisplay = XOpenDisplay(":0.0");
+		}
+
 		if (mainDisplay == NULL) {
 			fputs("Could not open main display\n", stderr);
 		} else if (!registered) {