From b2e78b23e1cd7a759470722ca20ae1a319ac9174 Mon Sep 17 00:00:00 2001
From: Bryan Roe <git.bryan.roe@techsavvydude.com>
Date: Sun, 16 May 2021 13:47:28 -0700
Subject: [PATCH] Added DisplayInfo for Windows

---
 meshcore/KVM/Windows/kvm.c | 42 +++++++++++++++++++++++++++++++++++---
 meshcore/meshdefines.h     |  1 +
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/meshcore/KVM/Windows/kvm.c b/meshcore/KVM/Windows/kvm.c
index 496761a..3cc3409 100644
--- a/meshcore/KVM/Windows/kvm.c
+++ b/meshcore/KVM/Windows/kvm.c
@@ -218,9 +218,45 @@ BOOL CALLBACK DisplayInfoEnumProc(HMONITOR hMonitor, HDC hdcMonitor, LPRECT lprc
     return TRUE;
 }
 
+BOOL CALLBACK DisplayInfoEnumProc_Info(HMONITOR hMonitor, HDC hdcMonitor, LPRECT lprcMonitor, LPARAM dwData)
+{
+	unsigned short* buffer = (unsigned short*)dwData;
+	MONITORINFOEX mi;
+	UNREFERENCED_PARAMETER(hdcMonitor);
+	UNREFERENCED_PARAMETER(lprcMonitor);
+
+	ZeroMemory(&mi, sizeof(mi));
+	mi.cbSize = sizeof(mi);
+
+	// Get the display information
+	if (!GetMonitorInfo(hMonitor, (LPMONITORINFO)&mi)) return TRUE;
+	int w = abs(mi.rcMonitor.left - mi.rcMonitor.right);
+	int h = abs(mi.rcMonitor.top - mi.rcMonitor.bottom);
+
+	int i = (int)(buffer[0]++);
+	int offset = (5 * i) + 4;
+
+	if ((((i + 1) * 10) + 4) > buffer[1]) { return(FALSE); }
+
+	buffer[offset] = (unsigned short)htons((unsigned short)(i+1));						// ID
+	buffer[offset+1] = (unsigned short)htons((unsigned short)(mi.rcMonitor.left));		// X
+	buffer[offset+2] = (unsigned short)htons((unsigned short)(mi.rcMonitor.top));		// Y
+	buffer[offset+3] = (unsigned short)htons((unsigned short)(w));						// WIDTH
+	buffer[offset+4] = (unsigned short)htons((unsigned short)(h));						// HEIGHT
+	return(TRUE);
+}
 void kvm_send_display_list(ILibKVM_WriteHandler writeHandler, void *reserved)
 {
 	int i;
+	char dwData[4096];
+	((unsigned short*)dwData)[0] = (unsigned short)0;
+	((unsigned short*)dwData)[1] = (unsigned short)sizeof(dwData);
+	((unsigned short*)dwData)[2] = (unsigned short)htons((unsigned short)MNG_KVM_DISPLAY_INFO);			// Write the type
+	if (EnumDisplayMonitors(NULL, NULL, DisplayInfoEnumProc_Info, (LPARAM)dwData))
+	{
+		((unsigned short*)dwData)[3] = (unsigned short)htons((((unsigned short*)dwData)[0]) * 10 + 4);	// Length
+		writeHandler(dwData+4, (((unsigned short*)dwData)[0]) * 10 + 4, reserved);
+	}
 
 	// Not looked at the number of screens yet
 	if (SCREEN_COUNT == -1) return;
@@ -231,9 +267,9 @@ void kvm_send_display_list(ILibKVM_WriteHandler writeHandler, void *reserved)
 	{
 		// Only one display, send empty
 		((unsigned short*)buffer)[0] = (unsigned short)htons((unsigned short)MNG_KVM_GET_DISPLAYS);		// Write the type
-		((unsigned short*)buffer)[1] = (unsigned short)htons((unsigned short)(8));					// Write the size
-		((unsigned short*)buffer)[2] = (unsigned short)htons((unsigned short)(0));							// Screen Count
-		((unsigned short*)buffer)[3] = (unsigned short)htons((unsigned short)(0));							// Selected Screen
+		((unsigned short*)buffer)[1] = (unsigned short)htons((unsigned short)(8));						// Write the size
+		((unsigned short*)buffer)[2] = (unsigned short)htons((unsigned short)(0));						// Screen Count
+		((unsigned short*)buffer)[3] = (unsigned short)htons((unsigned short)(0));						// Selected Screen
 
 		writeHandler(buffer, 8, reserved);
 	}
diff --git a/meshcore/meshdefines.h b/meshcore/meshdefines.h
index 77f5d67..50771fc 100644
--- a/meshcore/meshdefines.h
+++ b/meshcore/meshdefines.h
@@ -24,6 +24,7 @@ limitations under the License.
 typedef enum RemoteManagementCommands
 {
 	MNG_KVM_INPUT_LOCK = 87,
+	MNG_KVM_DISPLAY_INFO = 82,
 	MNG_KVM_NOP = 0,
 	MNG_KVM_KEY = 1,
 	MNG_KVM_KEY_UNICODE = 85,