Merge pull request #206 from illegalprime/x11-display-spec

add a way to specify the X11 display in Linux.
octalmage · Jun 19, 2016 · 772764b · 772764b
2 parents a4d8295 + 3f3dc7b
commit 772764b
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 1 deletion.
diff --git a/src/robotjs.cc b/src/robotjs.cc
@@ -10,6 +10,9 @@
 #include "MMBitmap.h"
 #include "snprintf.h"
 #include "microsleep.h"
+#if defined(USE_X11)
+	#include "xdisplay.h"
+#endif
 
 using namespace v8;
 
@@ -690,6 +693,27 @@ NAN_METHOD(getScreenSize)
 	info.GetReturnValue().Set(obj);
 }
 
+NAN_METHOD(getXDisplayName)
+{
+	#if defined(USE_X11)
+	const char* display = getXDisplay();
+	info.GetReturnValue().Set(Nan::New<String>(display).ToLocalChecked());
+	#else
+	Nan::ThrowError("getXDisplayName is only supported on Linux");
+	#endif
+}
+
+NAN_METHOD(setXDisplayName)
+{
+	#if defined(USE_X11)
+	Nan::Utf8String string(info[0]);
+	setXDisplay(*string);
+	info.GetReturnValue().Set(Nan::New(1));
+	#else
+	Nan::ThrowError("setXDisplayName is only supported on Linux");
+	#endif
+}
+
 NAN_METHOD(captureScreen) 
 {
 	size_t x;
@@ -862,6 +886,12 @@ NAN_MODULE_INIT(InitAll)
 
 	Nan::Set(target, Nan::New("getColor").ToLocalChecked(),
 		Nan::GetFunction(Nan::New<FunctionTemplate>(getColor)).ToLocalChecked());
+
+	Nan::Set(target, Nan::New("getXDisplayName").ToLocalChecked(),
+		Nan::GetFunction(Nan::New<FunctionTemplate>(getXDisplayName)).ToLocalChecked());
+
+	Nan::Set(target, Nan::New("setXDisplayName").ToLocalChecked(),
+		Nan::GetFunction(Nan::New<FunctionTemplate>(setXDisplayName)).ToLocalChecked());
 }
 
 NODE_MODULE(robotjs, InitAll)
diff --git a/src/xdisplay.c b/src/xdisplay.c
@@ -4,11 +4,25 @@
 
 static Display *mainDisplay = NULL;
 static int registered = 0;
+static char *displayName = ":0.0";
+static int hasDisplayNameChanged = 0;
 
 Display *XGetMainDisplay(void)
 {
+	/* Close the display if displayName has changed */
+	if (hasDisplayNameChanged) {
+		XCloseMainDisplay();
+		hasDisplayNameChanged = 0;
+	}
+
 	if (mainDisplay == NULL) {
-		mainDisplay = XOpenDisplay(NULL);
+		/* First try the user set displayName */
+		mainDisplay = XOpenDisplay(displayName);
+
+		/* Then try using environment variable DISPLAY */
+		if (mainDisplay == NULL) {
+			mainDisplay = XOpenDisplay(NULL);
+		}
 
 		if (mainDisplay == NULL) {
 			fputs("Could not open main display\n", stderr);
@@ -28,3 +42,14 @@ void XCloseMainDisplay(void)
 		mainDisplay = NULL;
 	}
 }
+
+char *getXDisplay(void)
+{
+	return displayName;
+}
+
+void setXDisplay(char *name)
+{
+	displayName = strdup(name);
+	hasDisplayNameChanged = 1;
+}
diff --git a/src/xdisplay.h b/src/xdisplay.h
@@ -14,4 +14,16 @@ Display *XGetMainDisplay(void);
 /* Closes the main display if it is open, or does nothing if not. */
 void XCloseMainDisplay(void);
 
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+char *getXDisplay(void);
+void setXDisplay(char *name);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* XDISPLAY_H */