diff --git a/docs/configuration.md b/docs/configuration.md index ef248643..2b2eaf83 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -985,6 +985,27 @@ editing the `conf` file in a text editor. Use the examples as reference. +### isolated_virtual_display_option + + + + + + + + + + + + + + +
Description + Isolates the virtual display. + @note{Applies to Windows only.} +
Default@code{}disabled@endcode
enabledChange the position of the virtual display (and other displays if there is a hole)
+ + ### dd_configuration_option diff --git a/src/config.cpp b/src/config.cpp index 2f7d1d0d..42edfbfb 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -513,6 +513,7 @@ namespace config { 0, // max_bitrate "1920x1080x60", // fallback_mode + false, // isolated Display }; audio_t audio { @@ -1195,6 +1196,7 @@ namespace config { int_between_f(vars, "min_fps_factor", video.min_fps_factor, {1, 3}); int_f(vars, "max_bitrate", video.max_bitrate); string_f(vars, "fallback_mode", video.fallback_mode); + bool_f(vars, "isolated_virtual_display_option", video.isolated_virtual_display_option); path_f(vars, "pkey", nvhttp.pkey); path_f(vars, "cert", nvhttp.cert); diff --git a/src/config.h b/src/config.h index 9fd2577a..edb64f8f 100644 --- a/src/config.h +++ b/src/config.h @@ -147,6 +147,7 @@ namespace config { int max_bitrate; // Maximum bitrate, sets ceiling in kbps for bitrate requested from client std::string fallback_mode; + bool isolated_virtual_display_option; }; struct audio_t { diff --git a/src/platform/windows/virtual_display.cpp b/src/platform/windows/virtual_display.cpp index 452d2add..96d1168a 100644 --- a/src/platform/windows/virtual_display.cpp +++ b/src/platform/windows/virtual_display.cpp @@ -22,12 +22,46 @@ static const GUID DEFAULT_DISPLAY_GUID = { 0xdff7fd29, 0x5b75, 0x41d1, { 0x97, 0 HANDLE SUDOVDA_DRIVER_HANDLE = INVALID_HANDLE_VALUE; +// START ISOLATED DISPLAY DECLARATIONS +struct positionwidthheight; +struct coordinates; +struct coordinatesdifferences; +struct coordinates +{ + int x; + int y; +}; + +struct positionwidthheight +{ + struct coordinates position; + int width; + int height; + int modeindex; +}; + +struct coordinatesdifferences +{ + struct coordinates left; + struct coordinates right; + struct coordinates Difference; + struct coordinates AbsDifference; + +}; + +std::vector matchDisplay(std::wstring sMatch); +std::vector< struct positionwidthheight*>rearrangeVirtualDisplayForLowerRight(std::vector< struct positionwidthheight*> displays); +std::string printAllDisplays(std::vector< struct positionwidthheight*> displays); +std::vector < struct coordinates > moveToBeConnected(std::vector < struct coordinates > unknown, std::vector< struct coordinates> connected); + +// END ISOLATED DISPLAY DECLARATIONS + LONG getDeviceSettings(const wchar_t* deviceName, DEVMODEW& devMode) { devMode.dmSize = sizeof(DEVMODEW); return EnumDisplaySettingsW(deviceName, ENUM_CURRENT_SETTINGS, &devMode); } -LONG changeDisplaySettings2(const wchar_t* deviceName, int width, int height, int refresh_rate) { +LONG changeDisplaySettings2(const wchar_t* deviceName, int width, int height, int refresh_rate, bool bApplyIsolated) { UINT32 pathCount = 0; UINT32 modeCount = 0; if (GetDisplayConfigBufferSizes(QDC_ONLY_ACTIVE_PATHS, &pathCount, &modeCount)) { @@ -37,12 +71,136 @@ LONG changeDisplaySettings2(const wchar_t* deviceName, int width, int height, in std::vector pathArray(pathCount); std::vector modeArray(modeCount); + std::vector displayArray; + struct positionwidthheight *pCurrentElement; if (QueryDisplayConfig(QDC_ONLY_ACTIVE_PATHS, &pathCount, pathArray.data(), &modeCount, modeArray.data(), nullptr) != ERROR_SUCCESS) { wprintf(L"[SUDOVDA] Failed to query display configuration.\n"); return ERROR_INVALID_PARAMETER; } + bool bAtVirtualDisplay; + bool bVirtualDisplayAlreadyAdded = false; + std::string sDisplayOutput; + + if (bApplyIsolated == true) + { + for (UINT32 i = 0; i < pathCount; i++) { + DISPLAYCONFIG_SOURCE_DEVICE_NAME sourceName = {}; + sourceName.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME; + sourceName.header.size = sizeof(sourceName); + sourceName.header.adapterId = pathArray[i].sourceInfo.adapterId; + sourceName.header.id = pathArray[i].sourceInfo.id; + bAtVirtualDisplay = false; + + if (DisplayConfigGetDeviceInfo(&sourceName.header) != ERROR_SUCCESS) { + continue; + } + + auto* sourceInfo = &pathArray[i].sourceInfo; + auto* targetInfo = &pathArray[i].targetInfo; + + if (std::wstring_view(sourceName.viewGdiDeviceName) == std::wstring_view(deviceName)) + { + bAtVirtualDisplay = true; + } + + if ( true ) { + for (UINT32 j = 0; j < modeCount; j++) { + if ( + modeArray[j].infoType == DISPLAYCONFIG_MODE_INFO_TYPE_SOURCE && + modeArray[j].adapterId.HighPart == sourceInfo->adapterId.HighPart && + modeArray[j].adapterId.LowPart == sourceInfo->adapterId.LowPart && + modeArray[j].id == sourceInfo->id + ) { + auto* sourceMode = &modeArray[j].sourceMode; + + wprintf(L"[SUDOVDA] Current mode found: [%dx%dx%d]\n", sourceMode->width, sourceMode->height, targetInfo->refreshRate); + + pCurrentElement = new (struct positionwidthheight); + + pCurrentElement->position.x = modeArray[j].sourceMode.position.x; + pCurrentElement->position.y = modeArray[j].sourceMode.position.y; + pCurrentElement->height = modeArray[j].sourceMode.height; + pCurrentElement->width = modeArray[j].sourceMode.width; + pCurrentElement->modeindex = j; + + // This is the virtual display - insert at the front of the vector + if (bAtVirtualDisplay == true && bVirtualDisplayAlreadyAdded == false) + { + displayArray.insert( displayArray.begin()+0, pCurrentElement); + bVirtualDisplayAlreadyAdded = true; + } else { + displayArray.push_back(pCurrentElement); + } + } + } + } + } + + sDisplayOutput = ""; + sDisplayOutput += "Before: \n"; + sDisplayOutput += printAllDisplays(displayArray); + + displayArray = rearrangeVirtualDisplayForLowerRight(displayArray); + + sDisplayOutput += ""; + sDisplayOutput += "After: \n"; + sDisplayOutput += printAllDisplays(displayArray); + + int iIndex; + int xdifference, ydifference = 0; + for (iIndex = 0; iIndex < displayArray.size(); iIndex += 1) + { + + // Find the primary display and get the offset to apply to all of the displays to keep the same primary + if( modeArray[(displayArray[iIndex]->modeindex)].sourceMode.position.x == 0 && + modeArray[(displayArray[iIndex]->modeindex)].sourceMode.position.y == 0 ) + { + xdifference = (displayArray[iIndex]->position.x) * -1; + ydifference = (displayArray[iIndex]->position.y) * -1; + break; + } + } + + // Set all of the OS Displays to their new locations; Do not change the primary + // Update the real vector for the system call + for (iIndex = 0; iIndex < displayArray.size(); iIndex += 1) + { + modeArray[(displayArray[iIndex]->modeindex)].sourceMode.position.x = displayArray[iIndex]->position.x + xdifference; + modeArray[(displayArray[iIndex]->modeindex)].sourceMode.position.y = displayArray[iIndex]->position.y + ydifference; + modeArray[(displayArray[iIndex]->modeindex)].sourceMode.height = displayArray[iIndex]->height; + modeArray[(displayArray[iIndex]->modeindex)].sourceMode.width = displayArray[iIndex]->width; + } + + // Apply the changes only if the virtual display was found + if( bVirtualDisplayAlreadyAdded == true ) { + LONG status = SetDisplayConfig( + pathCount, + pathArray.data(), + modeCount, + modeArray.data(), + SDC_APPLY + | SDC_USE_SUPPLIED_DISPLAY_CONFIG + | SDC_SAVE_TO_DATABASE + ); + if (status != ERROR_SUCCESS) { + wprintf(L"[SUDOVDA] Failed to apply display settings.\n"); + } else { + wprintf(L"[SUDOVDA] Display settings updated successfully.\n"); + } + } + for (iIndex = 0; iIndex < displayArray.size(); iIndex += 1) + { + if (displayArray[iIndex] != nullptr) + { + delete displayArray[iIndex]; + } + displayArray.clear(); + } + } + + // After performing the isolated display movements, do the regular movements for (UINT32 i = 0; i < pathCount; i++) { DISPLAYCONFIG_SOURCE_DEVICE_NAME sourceName = {}; sourceName.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME; @@ -542,4 +700,499 @@ bool removeVirtualDisplay(const GUID& guid) { return false; } } + +// START ISOLATED DISPLAY METHODS +// Shows the coordinates/height/width for the displays in the vector structure +std::string printAllDisplays(std::vector< struct positionwidthheight*> displays) { + int iIndex; + std::string sOutput; + + for (iIndex = 0; iIndex < displays.size(); iIndex++) + { + sOutput += "Index: "; + sOutput += std::to_string(iIndex); + sOutput += ", X : "; + sOutput += std::to_string(displays[iIndex]->position.x); + sOutput += ", Y : "; + sOutput += std::to_string(displays[iIndex]->position.y); + sOutput += ", width : "; + sOutput += std::to_string(displays[iIndex]->width); + sOutput += ", height : "; + sOutput += std::to_string(displays[iIndex]->height); + sOutput += "\n"; + + } + return sOutput; +} + +// Helper method for the rearrangeVirtualDisplayForLowerRight() method to move the unknown unconnected display to be connected to the +// second display which is assumed to be already connected +// +// It will return the move that the unknown display would need to perform +std::vector < struct coordinates > moveToBeConnected(std::vector < struct coordinates > unknown, std::vector< struct coordinates> connected) { + // Figure out if the boxes are connected + // Assume that there are 4 points + int iIndex, iIndex2; + + std::vector< struct coordinatesdifferences > differences; + + std::vector< struct coordinatesdifferences > vertical; + std::vector< struct coordinatesdifferences > horizontal; + + std::vector < struct coordinates >moveResult; + + std::vector < struct coordinates > unknown2; + + struct coordinatesdifferences sTemp1; + struct coordinates sNoMove; + + sNoMove.x = 0; + sNoMove.y = 0; + + struct coordinates sDoMove; + sDoMove.x = 0; + sDoMove.y = 0; + + bool bCornerConnect = false; + bool bVerticalConnect = false; + bool bHorizontalConnect = false; + + int iCountLess; + int iCountGreater; + + // Subtract all of the points + for (iIndex = 0; iIndex < connected.size(); iIndex += 1) { + for (iIndex2 = 0; iIndex2 < unknown.size(); iIndex2 += 1) { + sTemp1.left.x = connected[iIndex].x; + sTemp1.left.y = connected[iIndex].y; + sTemp1.right.x = unknown[iIndex2].x; + sTemp1.right.y = unknown[iIndex2].y; + + sTemp1.Difference.x = sTemp1.left.x - sTemp1.right.x; + sTemp1.Difference.y = sTemp1.left.y - sTemp1.right.y; + + sTemp1.AbsDifference.x = abs(sTemp1.Difference.x); + sTemp1.AbsDifference.y = abs(sTemp1.Difference.y); + + differences.push_back(sTemp1); + } + } + + for (iIndex = 0; iIndex < differences.size(); iIndex += 1) { + + // See if they are any corner connects + sTemp1 = differences[iIndex]; + if (sTemp1.AbsDifference.x <= 1 && sTemp1.AbsDifference.y <= 1) { + bCornerConnect = true; + break; + } + + // See if there are any vertical connects + if (sTemp1.AbsDifference.x <= 1) { + vertical.push_back(sTemp1); + } + + // See if there are any horizontal connects + if (sTemp1.AbsDifference.y <= 1) { + horizontal.push_back(sTemp1); + } + } + + // Check the vertical connects + iCountLess = 0; + iCountGreater = 0; + for (iIndex = 0; iIndex < vertical.size(); iIndex += 1) { + if (vertical[iIndex].left.y <= vertical[iIndex].right.y) { + iCountLess += 1; + } + if (vertical[iIndex].left.y >= vertical[iIndex].right.y) { + iCountGreater += 1; + } + } + + // Check the sum off all of the counts + if (((iCountLess > 0) && (iCountGreater == 0)) || + ((iCountGreater > 0) && (iCountLess == 0)) || + (iCountLess == 0 && iCountGreater == 0)) { + // Boxes are on the same vertical but above or below each other + bVerticalConnect = false; + } else { + bVerticalConnect = true; + } + + // Check the horizontal connects + iCountLess = 0; + iCountGreater = 0; + for (iIndex = 0; iIndex < horizontal.size(); iIndex += 1) { + if (horizontal[iIndex].left.x <= horizontal[iIndex].right.x) { + iCountLess += 1; + } + if (horizontal[iIndex].left.x >= horizontal[iIndex].right.x) { + iCountGreater += 1; + } + } + // Check the sum off all of the counts + if (((iCountLess > 0) && (iCountGreater == 0)) || + ((iCountGreater > 0) && (iCountLess == 0)) || + (iCountLess == 0 && iCountGreater == 0)) { + // Boxes are on the same horizontal but to the left or right of each other + bHorizontalConnect = false; + } else { + bHorizontalConnect = true; + } + + // End the logic if there is no move required + if (bHorizontalConnect == true || + bVerticalConnect == true || + bCornerConnect == true) { + moveResult.push_back(sNoMove); + return moveResult; + } + + // Otherwise, show the move required + int iShortestX = INT_MAX; + int iShortestXIndex = -1; + + // Try the horizontal (x) move first + for (iIndex = 0; iIndex < differences.size(); iIndex += 1) { + if (differences[iIndex].AbsDifference.x < iShortestX) { + iShortestXIndex = iIndex; + iShortestX = differences[iIndex].AbsDifference.x; + } + } + + if (iShortestX <= 1) { + // X move is not required + } else { + // This is the X to move + sDoMove.x = differences[iShortestXIndex].Difference.x; + + // Perform the x move on the left so that we can check the y + unknown2 = unknown; + for (iIndex = 0; iIndex < unknown2.size(); iIndex += 1) { + unknown2[iIndex].x += sDoMove.x; + } + + // Call oneself recursively only once so that we can see if there is Y to do. + std::vector < struct coordinates >moveResult2; + moveResult2 = moveToBeConnected(unknown2, connected); + + // Format the answer for a return + sDoMove.y = moveResult2[0].y; + + moveResult.push_back(sDoMove); + return moveResult; + } + + // Figure out the y move required + // Otherwise, show the move required + int iShortestY = INT_MAX; + int iShortestYIndex = -1; + + // Try the horizontal (x) move first + for (iIndex = 0; iIndex < differences.size(); iIndex += 1) { + if (differences[iIndex].AbsDifference.y < iShortestY) { + iShortestYIndex = iIndex; + iShortestY = differences[iIndex].AbsDifference.y; + } + } + + if (iShortestY <= 1) { + // Y move is not required + } else { + // This is the Y to move + sDoMove.y = differences[iShortestYIndex].Difference.y; + moveResult.push_back(sDoMove); + return moveResult; + } + moveResult.push_back(sNoMove); + return moveResult; +} + +// Main method to rearrange the displays to have one isolated display in the lower right and +// move the other displays as necessary especially if there are holes +std::vector< struct positionwidthheight*>rearrangeVirtualDisplayForLowerRight(std::vector< struct positionwidthheight*> displays) { + + // Make a temporary connected List based on the current Displays + // Here connected means that the displays are "touching" by either the + // vertical axis or a horizontal axis or a corner. + int count = displays.size(); + std::vector< int > vConnected(count, 0); + + // Need the index of the virtual display to put into the lower right corner as primary + int changeIndex = 0; + + // Find the Maxx and Maxy for the current displays + int imaxx = INT_MIN; + int imaxy = INT_MIN; + int imaxindex = -1; + + int itempx; + int itempy; + int itempvalid = 0; + + // Figure out the maxx and maxy, and the index for that rectangle + for (int index = 0; index < count; index++) { + itempx = displays[index]->position.x + displays[index]->width; + itempy = displays[index]->position.y + displays[index]->height; + itempvalid = 1; + if (changeIndex == index) { + itempvalid = 0; + } + if (itempvalid > 0) { + if (imaxx < itempx) { + imaxx = itempx; + imaxy = itempy; + imaxindex = index; + } else if (imaxx == itempx) { + if (imaxy < itempy) { + imaxy = itempy; + imaxindex = index; + } + } + } + } + + + // Adjust all of the other windows based on the offset for the display that will be 0,0 in the lower right corner. + if (imaxindex > -1) { + // Adjusting other displays based on the offset for the display that will be 0,0 in the lower right corner + for (int index = 0; index < count; index++) { + itempvalid = 1; + if (changeIndex == index) { + itempvalid = 0; + } + if (itempvalid > 0) { + displays[index]->position.x -= imaxx; + displays[index]->position.y -= imaxy; + } + } + } + + // Get the location, width and height of the window that is moving + // Make sure the correct display is set to 0,0. + for (int index = 0; index < count; index++) { + if (index == changeIndex) { + displays[index]->position.x = 0; + displays[index]->position.y = 0; + vConnected[index] = 1; + } + } + + bool bAddedConnected; + int connectedboxx, connectedboxy, connectedboxwidth, connectedboxheight; + int secondboxx, secondboxy, secondboxwidth, secondboxheight, secondboxindex; + + bool bFirstTime = true; + int xmin; + int ymin; + int minindexconnected; + int minindexnonconnected; + + std::vector< struct coordinates> connectedboxpoints; + std::vector< struct coordinates> secondboxpoints; + struct coordinates sTempCoordinates; + + // MAIN LOOP to rearrange displays to be connected to each other. + // This is either corner to corner or vertical side or horizontal side + do { + xmin = INT_MAX; + ymin = INT_MAX; + minindexconnected = -1; + minindexnonconnected = -1; + + do { + bAddedConnected = false; + + for (int index = 0; index < count; index++) { + if (vConnected[index] == 1) { + // Skip the virtual window if this is not the first time because we do not want an displays connected to it + if (bFirstTime == false && index == changeIndex) { + continue; + } + + connectedboxx = displays[index]->position.x; + connectedboxy = displays[index]->position.y; + connectedboxwidth = displays[index]->width; + connectedboxheight = displays[index]->height; + + connectedboxpoints.clear(); + + sTempCoordinates.x = connectedboxx; + sTempCoordinates.y = connectedboxy; + connectedboxpoints.push_back(sTempCoordinates); + + sTempCoordinates.x = connectedboxx + connectedboxwidth; + sTempCoordinates.y = connectedboxy; + connectedboxpoints.push_back(sTempCoordinates); + + sTempCoordinates.x = connectedboxx; + sTempCoordinates.y = connectedboxy + connectedboxheight; + connectedboxpoints.push_back(sTempCoordinates); + + sTempCoordinates.x = connectedboxx + connectedboxwidth; + sTempCoordinates.y = connectedboxy + connectedboxheight; + connectedboxpoints.push_back(sTempCoordinates); + + // Go through all other boxes and see if there is a connected box to this one + for (int index2 = 0; index2 < count; index2++) { + if (index2 == index || vConnected[index2] == 1 || index2 == changeIndex) { + // Skip oneself and the skip boxes already connected and skip over changeIndex + continue; + } + secondboxx = displays[index2]->position.x; + secondboxy = displays[index2]->position.y; + secondboxwidth = displays[index2]->width; + secondboxheight = displays[index2]->height; + secondboxindex = index2; + + secondboxpoints.clear(); + + sTempCoordinates.x = secondboxx; + sTempCoordinates.y = secondboxy; + secondboxpoints.push_back(sTempCoordinates); + + sTempCoordinates.x = secondboxx + secondboxwidth; + sTempCoordinates.y = secondboxy; + secondboxpoints.push_back(sTempCoordinates); + + sTempCoordinates.x = secondboxx; + sTempCoordinates.y = secondboxy + secondboxheight; + secondboxpoints.push_back(sTempCoordinates); + + sTempCoordinates.x = secondboxx + secondboxwidth; + sTempCoordinates.y = secondboxy + secondboxheight; + secondboxpoints.push_back(sTempCoordinates); + + // What would it take to MOVE the display to be connected to another connected display + // The result of this may not be used as there may be a closer display when we go through the list + std::vector < struct coordinates > sToMove = moveToBeConnected(secondboxpoints, connectedboxpoints); + + // No movement necessary + if (sToMove[0].x == 0 && sToMove[0].y == 0) { + vConnected[secondboxindex] = 1; + + // NEWLY ADDED + bFirstTime = false; + + bAddedConnected = true; + xmin = INT_MAX; + ymin = INT_MAX; + + // Need to restart the whole loop sequence to not connect more than one at the same time. + break; + } else { + if (index != changeIndex) { + // Want to see if this display would be the closest one to move via the x coordinates + if (abs(sToMove[0].x) < xmin) { + xmin = abs(sToMove[0].x); + ymin = abs(sToMove[0].y); + minindexconnected = index; + minindexnonconnected = index2; + } + } + } + } + } + + // Need to restart the whole loop sequence to not connect more than one at the same time. + if (bAddedConnected == true) { + break; + } + } + } while (bAddedConnected == true); + + // We are finish adding the connected box during the initial pass throguh + // We should also have the minimal display to move + bFirstTime = false; + + if (xmin != INT_MAX || ymin != INT_MAX) { + connectedboxx = displays[minindexconnected]->position.x; + connectedboxy = displays[minindexconnected]->position.y; + connectedboxwidth = displays[minindexconnected]->width; + connectedboxheight = displays[minindexconnected]->height; + + connectedboxpoints.clear(); + + sTempCoordinates.x = connectedboxx; + sTempCoordinates.y = connectedboxy; + connectedboxpoints.push_back(sTempCoordinates); + + sTempCoordinates.x = connectedboxx + connectedboxwidth; + sTempCoordinates.y = connectedboxy; + connectedboxpoints.push_back(sTempCoordinates); + + sTempCoordinates.x = connectedboxx; + sTempCoordinates.y = connectedboxy + connectedboxheight; + connectedboxpoints.push_back(sTempCoordinates); + + sTempCoordinates.x = connectedboxx + connectedboxwidth; + sTempCoordinates.y = connectedboxy + connectedboxheight; + connectedboxpoints.push_back(sTempCoordinates); + + + + secondboxx = displays[minindexnonconnected]->position.x; + secondboxy = displays[minindexnonconnected]->position.y; + secondboxwidth = displays[minindexnonconnected]->width; + secondboxheight = displays[minindexnonconnected]->height; + secondboxindex = minindexnonconnected; + + secondboxpoints.clear(); + + sTempCoordinates.x = secondboxx; + sTempCoordinates.y = secondboxy; + secondboxpoints.push_back(sTempCoordinates); + + sTempCoordinates.x = secondboxx + secondboxwidth; + sTempCoordinates.y = secondboxy; + secondboxpoints.push_back(sTempCoordinates); + + sTempCoordinates.x = secondboxx; + sTempCoordinates.y = secondboxy + secondboxheight; + secondboxpoints.push_back(sTempCoordinates); + + sTempCoordinates.x = secondboxx + secondboxwidth; + sTempCoordinates.y = secondboxy + secondboxheight; + secondboxpoints.push_back(sTempCoordinates); + + // Perform the actual move + std::vector < struct coordinates > sToMove = moveToBeConnected(secondboxpoints, connectedboxpoints); + + // Apply the move to the array of displays + displays[minindexnonconnected]->position.x += sToMove[0].x; + displays[minindexnonconnected]->position.y += sToMove[0].y; + } + } while (xmin != INT_MAX); + + return displays; +} + +// Utility function to match the DeviceString to the Display Names +// Typical DeviceStrings are the driver names +// +// Example: matchDisplay(L"SudoMaker Virtual Display Adapter") +// Result: L"\\\\.\\Display2" + +std::vector matchDisplay(std::wstring sMatch) { + DISPLAY_DEVICEW displayDevice; + displayDevice.cb = sizeof(DISPLAY_DEVICE); + + std::wstring matchDeviceName; + + std::vector vMatches; + + int deviceIndex = 0; + while (EnumDisplayDevicesW(NULL, deviceIndex, &displayDevice, 0)) { + if (std::wstring(displayDevice.DeviceString) == sMatch && + displayDevice.StateFlags > 0) { + matchDeviceName = displayDevice.DeviceName; + vMatches.push_back(matchDeviceName); + } + deviceIndex++; + } + return vMatches; +} + +// END ISOLATED DISPLAY METHODS } \ No newline at end of file diff --git a/src/platform/windows/virtual_display.h b/src/platform/windows/virtual_display.h index 0d384428..4bb5a864 100644 --- a/src/platform/windows/virtual_display.h +++ b/src/platform/windows/virtual_display.h @@ -1,6 +1,7 @@ #pragma once #include +#include #ifndef FILE_DEVICE_UNKNOWN #define FILE_DEVICE_UNKNOWN 0x00000022 @@ -23,6 +24,7 @@ namespace VDISPLAY { LONG getDeviceSettings(const wchar_t* deviceName, DEVMODEW& devMode); LONG changeDisplaySettings(const wchar_t* deviceName, int width, int height, int refresh_rate); + LONG changeDisplaySettings2(const wchar_t* deviceName, int width, int height, int refresh_rate, bool bApplyIsolated=false); std::wstring getPrimaryDisplay(); bool setPrimaryDisplay(const wchar_t* primaryDeviceName); bool getDisplayHDRByName(const wchar_t* displayName); @@ -41,4 +43,6 @@ namespace VDISPLAY { const GUID& guid ); bool removeVirtualDisplay(const GUID& guid); + + std::vector matchDisplay(std::wstring sMatch); } diff --git a/src/process.cpp b/src/process.cpp index 7acac37e..32e83b05 100644 --- a/src/process.cpp +++ b/src/process.cpp @@ -304,6 +304,13 @@ namespace proc { // Apply display settings VDISPLAY::changeDisplaySettings(vdisplayName.c_str(), render_width, render_height, target_fps); } + + // Check the ISOLATED DISPLAY configuration setting and rearrange the displays + if (config::video.isolated_virtual_display_option == true) { + // Apply the isolated display settings + VDISPLAY::changeDisplaySettings2(vdisplayName.c_str(), render_width, render_height, target_fps, true); + } + // Set virtual_display to true when everything went fine this->virtual_display = true; this->display_name = platf::to_utf8(vdisplayName); diff --git a/src_assets/common/assets/web/config.html b/src_assets/common/assets/web/config.html index 1f2bde4f..8e6b7fa9 100644 --- a/src_assets/common/assets/web/config.html +++ b/src_assets/common/assets/web/config.html @@ -204,6 +204,7 @@ "dd_wa_hdr_toggle_delay": 0, "min_fps_factor": 1, "max_bitrate": 0, + "isolated_virtual_display_option": "disabled", }, }, { diff --git a/src_assets/common/assets/web/configs/tabs/AudioVideo.vue b/src_assets/common/assets/web/configs/tabs/AudioVideo.vue index f8d9576a..41eeab11 100644 --- a/src_assets/common/assets/web/configs/tabs/AudioVideo.vue +++ b/src_assets/common/assets/web/configs/tabs/AudioVideo.vue @@ -161,6 +161,15 @@ const validateFallbackMode = (event) => { v-if="platform === 'windows'" > + + +
SudoVDA Driver status: {{currentDriverStatus}} diff --git a/src_assets/common/assets/web/public/assets/locale/en.json b/src_assets/common/assets/web/public/assets/locale/en.json index 8877baf0..1446cdbc 100644 --- a/src_assets/common/assets/web/public/assets/locale/en.json +++ b/src_assets/common/assets/web/public/assets/locale/en.json @@ -287,6 +287,8 @@ "high_resolution_scrolling_desc": "When enabled, Apollo will pass through high resolution scroll events from Moonlight clients. This can be useful to disable for older applications that scroll too fast with high resolution scroll events.", "install_steam_audio_drivers": "Install Steam Audio Drivers", "install_steam_audio_drivers_desc": "If Steam is installed, this will automatically install the Steam Streaming Speakers driver to support 5.1/7.1 surround sound and muting host audio.", + "isolated_virtual_display_option": "Move the Virtual Display to the bottom right-most corner of the display layout", + "isolated_virtual_display_option_desc": "This makes the display isolated from all other display and contains mouse movements to the virtual screen. This reorganizes the displays such that the all other displays are to the left of the virtual display.", "keep_sink_default": "Keep virtual sink as default", "keep_sink_default_desc": "Whether to force selected virtual sink as default (effective when host audio output is disabled).", "key_repeat_delay": "Key Repeat Delay", diff --git a/src_assets/common/assets/web/public/assets/locale/en_GB.json b/src_assets/common/assets/web/public/assets/locale/en_GB.json index 419958a3..ab171458 100644 --- a/src_assets/common/assets/web/public/assets/locale/en_GB.json +++ b/src_assets/common/assets/web/public/assets/locale/en_GB.json @@ -226,6 +226,8 @@ "high_resolution_scrolling_desc": "When enabled, Apollo will pass through high resolution scroll events from Moonlight clients. This can be useful to disable for older applications that scroll too fast with high resolution scroll events.", "install_steam_audio_drivers": "Install Steam Audio Drivers", "install_steam_audio_drivers_desc": "If Steam is installed, this will automatically install the Steam Streaming Speakers driver to support 5.1/7.1 surround sound and muting host audio.", + "isolated_virtual_display_option": "Move the Virtual Display to the bottom right-most corner of the display layout", + "isolated_virtual_display_option_desc": "This makes the display isolated from all other display and contains mouse movements to the virtual screen. This reorganizes the displays such that the all other displays are to the left of the virtual display.", "key_repeat_delay": "Key Repeat Delay", "key_repeat_delay_desc": "Control how fast keys will repeat themselves. The initial delay in milliseconds before repeating keys.", "key_repeat_frequency": "Key Repeat Frequency", diff --git a/src_assets/common/assets/web/public/assets/locale/en_US.json b/src_assets/common/assets/web/public/assets/locale/en_US.json index d8078d46..7e6aaf2a 100644 --- a/src_assets/common/assets/web/public/assets/locale/en_US.json +++ b/src_assets/common/assets/web/public/assets/locale/en_US.json @@ -225,6 +225,8 @@ "high_resolution_scrolling_desc": "When enabled, Apollo will pass through high resolution scroll events from Moonlight clients. This can be useful to disable for older applications that scroll too fast with high resolution scroll events.", "install_steam_audio_drivers": "Install Steam Audio Drivers", "install_steam_audio_drivers_desc": "If Steam is installed, this will automatically install the Steam Streaming Speakers driver to support 5.1/7.1 surround sound and muting host audio.", + "isolated_virtual_display_option": "Move the Virtual Display to the bottom right-most corner of the display layout", + "isolated_virtual_display_option_desc": "This makes the display isolated from all other display and contains mouse movements to the virtual screen. This reorganizes the displays such that the all other displays are to the left of the virtual display.", "key_repeat_delay": "Key Repeat Delay", "key_repeat_delay_desc": "Control how fast keys will repeat themselves. The initial delay in milliseconds before repeating keys.", "key_repeat_frequency": "Key Repeat Frequency", diff --git a/src_assets/common/assets/web/public/assets/locale/zh.json b/src_assets/common/assets/web/public/assets/locale/zh.json index 8bb6b266..d40ce5fc 100644 --- a/src_assets/common/assets/web/public/assets/locale/zh.json +++ b/src_assets/common/assets/web/public/assets/locale/zh.json @@ -282,6 +282,8 @@ "high_resolution_scrolling_desc": "启用后，Apollo 将透传来自 Moonlight 客户端的高分辨率滚动事件。对于那些使用高分辨率滚动事件时滚动速度过快的旧版应用程序来说，禁用此功能非常有用。", "install_steam_audio_drivers": "安装 Steam 音频驱动程序", "install_steam_audio_drivers_desc": "如果安装了 Steam，则会自动安装 Steam Streaming Speakers 驱动程序，以支持 5.1/7.1 环绕声和主机音频静音。", + "isolated_virtual_display_option": "将虚拟显示器移动到显示布局的右下角", + "isolated_virtual_display_option_desc": "将使虚拟显示器与其他显示器隔离，并将鼠标限制在虚拟屏幕中。这将重新排列显示器，使所有其他显示器位于虚拟显示器的左侧。", "keep_sink_default": "保持虚拟音频输出设备为默认设备", "keep_sink_default_desc": "是否强制保持虚拟音频输出设备为默认设备（当客户端设置禁止在PC上播放声音时有效）", "key_repeat_delay": "按键重复延迟",