Add initial support for multi-display on osx

index.d.ts

@@ -29,5 +29,6 @@ export function scrollMouse(x: number, y: number) : void
 export function getMousePos(): { x: number, y: number }
 export function getPixelColor(x: number, y: number): string
 export function getScreenSize(): { width: number, height: number }
+export function getAllScreensSize(): { displayID: number; width: number; height: number; }[]
 
 export var screen: Screen

package.json

@@ -1,6 +1,6 @@
 {
   "name": "robotjs",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Node.js Desktop Automation.",
   "main": "index.js",
   "typings": "index.d.ts",

src/robotjs.cc

@@ -689,15 +689,22 @@ NAN_METHOD(getPixelColor)
 	MMBitmapRef bitmap;
 	MMRGBHex color;
 
-	size_t x = Nan::To<int32_t>(info[0]).FromJust();
-	size_t y = Nan::To<int32_t>(info[1]).FromJust();
+	float x = Nan::To<int32_t>(info[0]).FromJust();
+	float y = Nan::To<int32_t>(info[1]).FromJust();
 
-	if (!pointVisibleOnMainDisplay(MMPointMake(x, y)))
+	CGPoint mouse = CGPointMake(x, y);
+
+	uint32_t count = 0;
+	CGDirectDisplayID displayID;
+	if (CGGetDisplaysWithPoint(mouse, 1, &displayID, &count) != kCGErrorSuccess)
 	{
-		return Nan::ThrowError("Requested coordinates are outside the main screen's dimensions.");
+		return Nan::ThrowError("Could not find a display for the coordinates of the mosue.");
 	}
 
-	bitmap = copyMMBitmapFromDisplayInRect(MMRectMake(x, y, 1, 1));
+	CGRect displayPosition = CGDisplayBounds(displayID);
+	MMRect adjustedRect = MMRectMake(x - displayPosition.origin.x, y - displayPosition.origin.y, 1, 1);
+
+	bitmap = copyMMBitmapFromDisplayInRect(displayID, adjustedRect);
 
 	color = MMRGBHexAtPoint(bitmap, 0, 0);
 
@@ -724,6 +731,37 @@ NAN_METHOD(getScreenSize)
 	info.GetReturnValue().Set(obj);
 }
 
+NAN_METHOD(getAllScreensSize)
+{
+	//Get all active display sizes.
+	uint32_t numDisplays = 0;
+	MMDisplaySize displaySizes[10];
+
+	getAllDisplaySize(&numDisplays, displaySizes);
+
+	//Create our return object.
+	Local<Array> list = Nan::New<Array>(numDisplays);
+	for (uint32_t i = 0; i < numDisplays; i++)
+	{
+		Local<Object> obj = Nan::New<Object>();
+		Nan::Set(obj, Nan::New("displayID").ToLocalChecked(), Nan::New<Number>(displaySizes[i].displayID));
+		Nan::Set(obj, Nan::New("isMainDisplay").ToLocalChecked(), Nan::New<v8::Boolean>(displaySizes[i].isMainDisplay));
+
+		Nan::Set(obj, Nan::New("width").ToLocalChecked(), Nan::New<Number>(displaySizes[i].size.width));
+		Nan::Set(obj, Nan::New("height").ToLocalChecked(), Nan::New<Number>(displaySizes[i].size.height));
+
+		Nan::Set(obj, Nan::New("x").ToLocalChecked(), Nan::New<Number>(displaySizes[i].bounds.origin.x));
+		Nan::Set(obj, Nan::New("y").ToLocalChecked(), Nan::New<Number>(displaySizes[i].bounds.origin.y));
+		Nan::Set(obj, Nan::New("w").ToLocalChecked(), Nan::New<Number>(displaySizes[i].bounds.size.width));
+		Nan::Set(obj, Nan::New("h").ToLocalChecked(), Nan::New<Number>(displaySizes[i].bounds.size.height));
+
+		Nan::Set(list, i, obj);
+	}
+
+	//Return our list with many [{ width, height }, ...]
+	info.GetReturnValue().Set(list);
+}
+
 NAN_METHOD(getXDisplayName)
 {
 	#if defined(USE_X11)
@@ -775,7 +813,8 @@ NAN_METHOD(captureScreen)
 		h = displaySize.height;
 	}
 
-	MMBitmapRef bitmap = copyMMBitmapFromDisplayInRect(MMRectMake(x, y, w, h));
+	CGDirectDisplayID displayID = CGMainDisplayID();
+	MMBitmapRef bitmap = copyMMBitmapFromDisplayInRect(displayID, MMRectMake(x, y, w, h));
 
 	uint32_t bufferSize = bitmap->bytewidth * bitmap->height;
 	Local<Object> buffer = Nan::NewBuffer((char*)bitmap->imageBuffer, bufferSize, destroyMMBitmapBuffer, NULL).ToLocalChecked();
@@ -918,6 +957,9 @@ NAN_MODULE_INIT(InitAll)
 	Nan::Set(target, Nan::New("getScreenSize").ToLocalChecked(),
 		Nan::GetFunction(Nan::New<FunctionTemplate>(getScreenSize)).ToLocalChecked());
 
+	Nan::Set(target, Nan::New("getAllScreensSize").ToLocalChecked(),
+		Nan::GetFunction(Nan::New<FunctionTemplate>(getAllScreensSize)).ToLocalChecked());
+
 	Nan::Set(target, Nan::New("captureScreen").ToLocalChecked(),
 		Nan::GetFunction(Nan::New<FunctionTemplate>(captureScreen)).ToLocalChecked());
 

src/screen.c

@@ -8,6 +8,29 @@
 	#include "xdisplay.h"
 #endif
 
+void getAllDisplaySize(uint32_t *_Nullable numDisplays, MMDisplaySize *_Nullable displaySizes)
+{
+#if defined(IS_MACOSX)
+
+	CGDirectDisplayID displays[10];
+	CGDirectDisplayID mainDisplayID = CGMainDisplayID();
+
+	CGGetOnlineDisplayList(10, displays, numDisplays);
+	for (uint32_t i = 0; i < *numDisplays; i++)
+	{
+		CGRect bounds = CGDisplayBounds(displays[i]);
+		displaySizes[i] = MMDisplaySizeMake(
+			displays[i],
+			mainDisplayID == displays[i],
+			CGDisplayPixelsWide(displays[i]),
+			CGDisplayPixelsHigh(displays[i]),
+			MMRectMake(bounds.origin.x, bounds.origin.y, bounds.size.width, bounds.size.height)
+		);
+	}
+
+#endif
+}
+
 MMSize getMainDisplaySize(void)
 {
 #if defined(IS_MACOSX)

src/screen.h

@@ -18,6 +18,9 @@ extern "C"
 /* Returns the size of the main display. */
 MMSize getMainDisplaySize(void);
 
+/* Returns a list of displayID, with their sizes. */
+void getAllDisplaySize(uint32_t *_Nullable numDisplays, MMDisplaySize *_Nullable displaySizes);
+
 /* Convenience function that returns whether the given point is in the bounds
  * of the main screen. */
 bool pointVisibleOnMainDisplay(MMPoint point);

src/screengrab.c

@@ -15,16 +15,14 @@
 	#include <string.h>
 #endif
 
-MMBitmapRef copyMMBitmapFromDisplayInRect(MMRect rect)
+MMBitmapRef copyMMBitmapFromDisplayInRect(int32_t displayID, MMRect rect)
 {
 #if defined(IS_MACOSX)
 
 	MMBitmapRef bitmap = NULL;
 	uint8_t *buffer = NULL;
 	size_t bufferSize = 0;
 
-	CGDirectDisplayID displayID = CGMainDisplayID();
-
 	CGImageRef image = CGDisplayCreateImageForRect(displayID,
 		CGRectMake(rect.origin.x,
 			rect.origin.y,

src/screengrab.h

@@ -12,7 +12,7 @@ extern "C"
 
 /* Returns a raw bitmap of screengrab of the display (to be destroyed()'d by
  * caller), or NULL on error. */
-MMBitmapRef copyMMBitmapFromDisplayInRect(MMRect rect);
+MMBitmapRef copyMMBitmapFromDisplayInRect(int32_t displayID, MMRect rect);
 
 #ifdef __cplusplus
 }

src/types.h

@@ -32,12 +32,22 @@ struct _MMSize {
 typedef struct _MMSize MMSize;
 
 struct _MMRect {
-	MMPoint origin;
+	MMSignedPoint origin;
 	MMSize size;
 };
 
 typedef struct _MMRect MMRect;
 
+struct _MMDisplaySize
+{
+	int32_t displayID;
+	int isMainDisplay;
+	MMSize size;
+	MMRect bounds;
+};
+
+typedef struct _MMDisplaySize MMDisplaySize;
+
 H_INLINE MMPoint MMPointMake(size_t x, size_t y)
 {
 	MMPoint point;
@@ -54,6 +64,20 @@ H_INLINE MMSignedPoint MMSignedPointMake(int32_t x, int32_t y)
 	return point;
 }
 
+H_INLINE MMDisplaySize MMDisplaySizeMake(int32_t displayID, int isMainDisplay, size_t width, size_t height, MMRect bounds)
+{
+	MMDisplaySize diplaySize;
+	diplaySize.displayID = displayID;
+	diplaySize.isMainDisplay = isMainDisplay;
+	diplaySize.size.width = width;
+	diplaySize.size.height = height;
+	diplaySize.bounds.origin.x = bounds.origin.x;
+	diplaySize.bounds.origin.y = bounds.origin.y;
+	diplaySize.bounds.size.width = bounds.size.width;
+	diplaySize.bounds.size.height = bounds.size.height;
+	return diplaySize;
+}
+
 H_INLINE MMSize MMSizeMake(size_t width, size_t height)
 {
 	MMSize size;
@@ -62,10 +86,10 @@ H_INLINE MMSize MMSizeMake(size_t width, size_t height)
 	return size;
 }
 
-H_INLINE MMRect MMRectMake(size_t x, size_t y, size_t width, size_t height)
+H_INLINE MMRect MMRectMake(int32_t x, int32_t y, size_t width, size_t height)
 {
 	MMRect rect;
-	rect.origin = MMPointMake(x, y);
+	rect.origin = MMSignedPointMake(x, y);
 	rect.size = MMSizeMake(width, height);
 	return rect;
 }

test/screen.js

@@ -36,4 +36,10 @@ describe('Screen', () => {
     expect(screenSize.width !== undefined).toBeTruthy();
     expect(screenSize.height !== undefined).toBeTruthy();
   });
+  it("Get all screens size.", function () {
+    expect((screenSize = robot.getAllScreensSize())).toBeTruthy();
+    expect(screenSize.length).toBeGreaterThan(0);
+    expect(screenSize[0].width !== undefined).toBeTruthy();
+    expect(screenSize[0].height !== undefined).toBeTruthy();
+  });
 });