Detect primary monitor on windows

redgecombe · redgecombe · commit 8b944e513783 · 2015-06-11T13:35:29.000-07:00
diff --git a/src/api/screen/desktop_capture_monitor.cc b/src/api/screen/desktop_capture_monitor.cc
@@ -36,6 +36,9 @@
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 
+#ifdef _WIN32
+#include <windows.h>
+#endif
 
 namespace nwapi {
 
@@ -47,6 +50,25 @@ DesktopCaptureMonitor::DesktopCaptureMonitor(int id,
 
 DesktopCaptureMonitor::~DesktopCaptureMonitor() {}
 
+int DesktopCaptureMonitor::GetPrimaryMonitorIndex(){
+#ifdef _WIN32	
+	int count=0;
+	for (int i = 0;; ++i) {
+		DISPLAY_DEVICE device;
+		device.cb = sizeof(device);
+		BOOL ret = EnumDisplayDevices(NULL, i, &device, 0);
+		if(!ret)
+			break;
+		if (device.StateFlags & DISPLAY_DEVICE_ACTIVE){
+			if (device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE){
+				return count;
+			}
+			count++;
+		}
+	}
+#endif
+	return -1;
+}
 
 void DesktopCaptureMonitor::CallSync(const std::string& method, const base::ListValue& arguments, base::ListValue* result){
 	if (method == "start") {
@@ -99,6 +121,9 @@ void DesktopCaptureMonitor::OnSourceAdded(int index){
 	param.AppendString(src.name);
 	param.AppendInteger(index);
 	param.AppendString(type);
+	if(src.id.type == content::DesktopMediaID::TYPE_SCREEN){
+		param.AppendBoolean(GetPrimaryMonitorIndex()==index);
+	}
 	this->dispatcher_host()->SendEvent(this, "__nw_desktop_capture_monitor_listner_added", param);
 }
 void DesktopCaptureMonitor::OnSourceRemoved(int index){
diff --git a/src/api/screen/desktop_capture_monitor.h b/src/api/screen/desktop_capture_monitor.h
@@ -40,6 +40,7 @@ namespace nwapi {
 		private:
 			DesktopCaptureMonitor();
 			DISALLOW_COPY_AND_ASSIGN(DesktopCaptureMonitor);
+			int GetPrimaryMonitorIndex();
 			void Start(bool screens, bool windows);
 			void Stop();
 			
diff --git a/src/api/screen/screen.js b/src/api/screen/screen.js
@@ -43,14 +43,14 @@ DesktopCaptureMonitor.prototype.stop = function () {
     return true;
 }
 
-DesktopCaptureMonitor.prototype.on('__nw_desktop_capture_monitor_listner_added', function (id, name, order, type) {
+DesktopCaptureMonitor.prototype.on('__nw_desktop_capture_monitor_listner_added', function (id, name, order, type, primaryindex) {
 	if(this.sources.indexOf(id)!=-1)
 	{
 		//TODO: Find out what this event comes twice on some platforms
 		return;
 	}
     this.sources.splice(order, 0, id);
-    this.emit("added", id, name, order, type);
+    this.emit("added", id, name, order, type, primaryindex);
     for (var i = order + 1; i <= this.sources.length - 1; i++) {
         this.emit("orderchanged", this.sources[i], i, i - 1);
     }

Original file line number	Diff line number	Diff line change
`@@ -43,14 +43,14 @@ DesktopCaptureMonitor.prototype.stop = function () {`
`43`	`43`	`return true;`
`44`	`44`	`}`
`45`	`45`
`46`		`-DesktopCaptureMonitor.prototype.on('__nw_desktop_capture_monitor_listner_added', function (id, name, order, type) {`
	`46`	`+DesktopCaptureMonitor.prototype.on('__nw_desktop_capture_monitor_listner_added', function (id, name, order, type, primaryindex) {`
`47`	`47`	`if(this.sources.indexOf(id)!=-1)`
`48`	`48`	`{`
`49`	`49`	`//TODO: Find out what this event comes twice on some platforms`
`50`	`50`	`return;`
`51`	`51`	`}`
`52`	`52`	`this.sources.splice(order, 0, id);`
`53`		`- this.emit("added", id, name, order, type);`
	`53`	`+ this.emit("added", id, name, order, type, primaryindex);`
`54`	`54`	`for (var i = order + 1; i <= this.sources.length - 1; i++) {`
`55`	`55`	`this.emit("orderchanged", this.sources[i], i, i - 1);`
`56`	`56`	`}`