Feature: Capture the virtual desktop for multi-monitor remote control
The MCP Observe/Act loop requires screenshots and mouse injection to share one coordinate space. Previously the client sent only the primary monitor while injection used virtual-desktop coordinates, so multi-monitor hosts were rejected outright. - Client: COMMAND_SCREEN_SPY param buffer[11] (wire index 12) now forces whole-virtual-desktop GDI capture; preview JPEGs also cover the virtual desktop including negative origins. - Server: advertise CLIENT_CAP_VIRTUAL_DESKTOP, gate multi-monitor remote control on that capability, and pass the flag when starting the session. Linux stays exempt (X root capture/injection are already consistent).
This commit was merged in pull request #7.
This commit is contained in:
1 parent
5bb24d714a
commit
5eb44307ee
11 files changed
+93
-48
No files matched your search
@@ -508,6 +508,7 @@ void CScreenManager::InitScreenSpy()
|
||||
BYTE algo = ALGORITHM_DIFF;
|
||||
BYTE* user = (BYTE*)m_ptrUser;
|
||||
BOOL all = FALSE;
|
||||
BOOL forceVirtual = FALSE;
|
||||
RECT rect = m_ROI;
|
||||
// 「切换显示器」是一次性请求:取用即清除。之后的自适应重启(质量档、分辨率、
|
||||
// ROI、换窗口)一律 switchScreen=false,沿用当前屏。不清除的话,工作线程里
|
||||
@@ -521,6 +522,9 @@ void CScreenManager::InitScreenSpy()
|
||||
DXGI = param->buffer[0];
|
||||
algo = param->length > 1 ? param->buffer[1] : algo;
|
||||
all = param->length > 2 ? param->buffer[2] : all;
|
||||
// buffer[11](wire 索引 12,HWND 占 buffer[3..10]):
|
||||
// 强制抓取整个虚拟桌面(远程控制会话用,多显示器下截图/注入同坐标系)
|
||||
forceVirtual = param->length > 11 ? (param->buffer[11] != 0) : FALSE;
|
||||
// buffer[3..10]: HWND(uint64_t),启动时直接指定窗口捕获;
|
||||
// 值为 (uint64_t)-1 时进入动态前景模式,每帧自动跟踪当前前景窗口
|
||||
if (param->length >= 3 + (int)sizeof(uint64_t) && !m_hTargetWnd && !m_bDynamicForeground) {
|
||||
@@ -539,6 +543,13 @@ void CScreenManager::InitScreenSpy()
|
||||
} else {
|
||||
DXGI = (int)user;
|
||||
}
|
||||
// 强制整虚拟桌面(远程控制):DXGI 桌面复制按输出抓取,拿不到跨屏整桌面,
|
||||
// 只能走 GDI;all=true 让基类进入虚拟桌面几何分支(原点可能为负)。
|
||||
if (forceVirtual) {
|
||||
all = TRUE;
|
||||
DXGI = USING_GDI;
|
||||
Mprintf("CScreenManager: force virtual desktop capture (GDI)\n");
|
||||
}
|
||||
// 如果已设置质量等级,使用对应的算法(优先于启动参数)
|
||||
int level = m_ScreenSettings.QualityLevel;
|
||||
if (level >= 0 && level < QUALITY_COUNT) {
|
||||
@@ -615,12 +626,12 @@ void CScreenManager::InitScreenSpy()
|
||||
} else {
|
||||
SAFE_DELETE(s);
|
||||
m_isGDI = TRUE;
|
||||
m_ScreenSpyObject = new CScreenSpy(32, algo, FALSE, DEFAULT_GOP, all, m_ScreenSettings.EncodeLevel, rect, switchScreen, m_hTargetWnd, m_bDynamicForeground);
|
||||
m_ScreenSpyObject = new CScreenSpy(32, algo, FALSE, DEFAULT_GOP, all, m_ScreenSettings.EncodeLevel, rect, switchScreen, m_hTargetWnd, m_bDynamicForeground, forceVirtual);
|
||||
Mprintf("CScreenManager: DXGI SPY init failed!!! Using GDI instead.\n");
|
||||
}
|
||||
} else {
|
||||
m_isGDI = TRUE;
|
||||
m_ScreenSpyObject = new CScreenSpy(32, algo, DXGI == USING_VIRTUAL, DEFAULT_GOP, all, m_ScreenSettings.EncodeLevel, rect, switchScreen, m_hTargetWnd, m_bDynamicForeground);
|
||||
m_ScreenSpyObject = new CScreenSpy(32, algo, DXGI == USING_VIRTUAL, DEFAULT_GOP, all, m_ScreenSettings.EncodeLevel, rect, switchScreen, m_hTargetWnd, m_bDynamicForeground, forceVirtual);
|
||||
}
|
||||
// 用已保存的质量配置初始化码率,避免 CMD_QUALITY_LEVEL 到达时 0→3000 触发不必要重启
|
||||
if (m_ScreenSpyObject && level >= 0 && level < QUALITY_COUNT) {
|
||||
|
||||
Reference in new issue
Block a user