Feature: Add native region, window and monitor capture to get_screenshot
New Windows clients advertise CLIENT_CAP_SCREEN_REGION and accept a 24-byte ScreenPreviewReqEx appended to the existing 8-byte preview request, so get_screenshot can capture a region, a window or a single monitor at 1:1 resolution instead of only the scaled virtual desktop. Successful v2 responses append an optional ScreenCaptureMeta block reporting the source rect and scale, letting callers map coordinates back for remote input. Old clients and old servers keep the v1 byte stream unchanged. The 8192 px per-side bound only applies to native (1:1) capture, where it guards bitmap memory; scaled captures are unaffected so ultra-wide virtual desktops (for example triple 4K) still produce thumbnails and previews. max_width is clamped to [64,1920] as before instead of rejected, matching the documented schema. Co-Authored-By: deepseek-flash
This commit is contained in:
1 parent
b2c0d81396
commit
235a8a622c
11 files changed
+668
-97
No files matched your search
+167
-58
@@ -46,24 +46,98 @@ int GetJpegEncoderClsid(CLSID& clsid)
|
||||
return -1;
|
||||
}
|
||||
|
||||
// 抓整个虚拟桌面到 24bpp Bitmap,目标尺寸已等比换算。
|
||||
// 虚拟桌面原点不一定是 (0,0):主屏左侧/上方存在显示器时 SM_X/YVIRTUALSCREEN 为负,
|
||||
// 必须作为 StretchBlt 的源点,否则抓到的只是主屏那一块(与注入坐标系不一致)。
|
||||
bool GetVirtualDesktopRect(RECT& rc)
|
||||
{
|
||||
rc.left = GetSystemMetrics(SM_XVIRTUALSCREEN);
|
||||
rc.top = GetSystemMetrics(SM_YVIRTUALSCREEN);
|
||||
rc.right = rc.left + GetSystemMetrics(SM_CXVIRTUALSCREEN);
|
||||
rc.bottom = rc.top + GetSystemMetrics(SM_CYVIRTUALSCREEN);
|
||||
return rc.right > rc.left && rc.bottom > rc.top;
|
||||
}
|
||||
|
||||
BOOL CALLBACK CollectMonitorProc(HMONITOR, HDC, LPRECT rc, LPARAM lp)
|
||||
{
|
||||
reinterpret_cast<std::vector<RECT>*>(lp)->push_back(*rc);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
// 把请求目标解析成虚拟桌面坐标系里的源矩形。失败返回 false
|
||||
// (区域裁剪为空 / 窗口不存在或已最小化 / 显示器序号越界)。
|
||||
bool ResolveTargetRect(const CaptureTarget& t, RECT& src)
|
||||
{
|
||||
switch (t.mode) {
|
||||
case SCREEN_CAPTURE_VDESKTOP:
|
||||
return GetVirtualDesktopRect(src);
|
||||
|
||||
case SCREEN_CAPTURE_REGION: {
|
||||
if (t.w <= 0 || t.h <= 0) return false;
|
||||
RECT vd = {};
|
||||
if (!GetVirtualDesktopRect(vd)) return false;
|
||||
RECT want = { t.x, t.y, t.x + t.w, t.y + t.h };
|
||||
RECT clipped = {};
|
||||
if (!IntersectRect(&clipped, &want, &vd)) return false;
|
||||
src = clipped;
|
||||
return true;
|
||||
}
|
||||
|
||||
case SCREEN_CAPTURE_WINDOW: {
|
||||
HWND h = reinterpret_cast<HWND>((uintptr_t)t.hwnd);
|
||||
// 最小化窗口没有可抓的像素(GetWindowRect 给的是还原位置),直接报目标无效,
|
||||
// 避免返回一张桌面背景图让调用方误判。
|
||||
if (!h || !::IsWindow(h) || ::IsIconic(h)) return false;
|
||||
RECT wr = {};
|
||||
if (!::GetWindowRect(h, &wr)) return false;
|
||||
RECT vd = {};
|
||||
if (GetVirtualDesktopRect(vd)) {
|
||||
RECT clipped = {};
|
||||
if (!IntersectRect(&clipped, &wr, &vd)) return false;
|
||||
wr = clipped;
|
||||
}
|
||||
if (wr.right <= wr.left || wr.bottom <= wr.top) return false;
|
||||
src = wr;
|
||||
return true;
|
||||
}
|
||||
|
||||
case SCREEN_CAPTURE_MONITOR: {
|
||||
std::vector<RECT> mons;
|
||||
::EnumDisplayMonitors(NULL, NULL, CollectMonitorProc, (LPARAM)&mons);
|
||||
if (mons.empty()) return false;
|
||||
|
||||
// 0 = 主显示器;1..N 按 EnumDisplayMonitors 顺序跳过主显示器编号。
|
||||
POINT origin = { 0, 0 };
|
||||
HMONITOR ph = ::MonitorFromPoint(origin, MONITOR_DEFAULTTOPRIMARY);
|
||||
MONITORINFO mi = { sizeof(mi) };
|
||||
if (!ph || !::GetMonitorInfo(ph, &mi)) return false;
|
||||
const RECT primary = mi.rcMonitor;
|
||||
if (t.monitor == 0) {
|
||||
src = primary;
|
||||
return true;
|
||||
}
|
||||
int idx = 1;
|
||||
for (const RECT& r : mons) {
|
||||
if (::EqualRect(&r, &primary)) continue;
|
||||
if (idx++ == t.monitor) {
|
||||
src = r;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
// 抓源矩形到 24bpp Bitmap,目标尺寸已换算。
|
||||
// 虚拟桌面原点不一定是 (0,0):主屏左侧/上方存在显示器时为负,直接作为 StretchBlt
|
||||
// 的源点,否则抓到的只是主屏那一块(与注入坐标系不一致)。
|
||||
// 返回新分配的 Bitmap*,失败返回 nullptr。调用者负责 delete。
|
||||
Bitmap* GrabDesktopScaled(int targetW, int targetH)
|
||||
Bitmap* GrabScreenScaled(const RECT& src, int targetW, int targetH)
|
||||
{
|
||||
HDC hScreen = GetDC(NULL);
|
||||
if (!hScreen) return nullptr;
|
||||
|
||||
int srcX = GetSystemMetrics(SM_XVIRTUALSCREEN);
|
||||
int srcY = GetSystemMetrics(SM_YVIRTUALSCREEN);
|
||||
int srcW = GetSystemMetrics(SM_CXVIRTUALSCREEN);
|
||||
int srcH = GetSystemMetrics(SM_CYVIRTUALSCREEN);
|
||||
if (srcW <= 0 || srcH <= 0) {
|
||||
ReleaseDC(NULL, hScreen);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
HDC hMem = CreateCompatibleDC(hScreen);
|
||||
HBITMAP hBmp = CreateCompatibleBitmap(hScreen, targetW, targetH);
|
||||
if (!hMem || !hBmp) {
|
||||
@@ -75,11 +149,13 @@ Bitmap* GrabDesktopScaled(int targetW, int targetH)
|
||||
|
||||
HGDIOBJ oldBmp = SelectObject(hMem, hBmp);
|
||||
|
||||
// 高质量缩放:HALFTONE 内插
|
||||
// 高质量缩放:HALFTONE 内插;1:1 时无影响
|
||||
SetStretchBltMode(hMem, HALFTONE);
|
||||
SetBrushOrgEx(hMem, 0, 0, NULL);
|
||||
BOOL bb = StretchBlt(hMem, 0, 0, targetW, targetH,
|
||||
hScreen, srcX, srcY, srcW, srcH, SRCCOPY | CAPTUREBLT);
|
||||
hScreen, src.left, src.top,
|
||||
src.right - src.left, src.bottom - src.top,
|
||||
SRCCOPY | CAPTUREBLT);
|
||||
|
||||
SelectObject(hMem, oldBmp);
|
||||
|
||||
@@ -102,43 +178,10 @@ Bitmap* GrabDesktopScaled(int targetW, int targetH)
|
||||
return out;
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
int CaptureAndEncodePreview(int maxWidth, int quality,
|
||||
std::vector<unsigned char>& out,
|
||||
int& outWidth, int& outHeight)
|
||||
int EncodeJpeg(Bitmap* bmp, int quality, std::vector<unsigned char>& out)
|
||||
{
|
||||
out.clear();
|
||||
outWidth = outHeight = 0;
|
||||
|
||||
if (!g_boot.ok) return SCREEN_PREVIEW_NOT_SUPPORTED;
|
||||
if (maxWidth < 64) maxWidth = 64;
|
||||
if (maxWidth > 1920) maxWidth = 1920;
|
||||
if (quality < 1) quality = 1;
|
||||
if (quality > 100) quality = 100;
|
||||
|
||||
int srcW = GetSystemMetrics(SM_CXVIRTUALSCREEN);
|
||||
int srcH = GetSystemMetrics(SM_CYVIRTUALSCREEN);
|
||||
if (srcW <= 0 || srcH <= 0) return SCREEN_PREVIEW_CAPTURE_FAILED;
|
||||
|
||||
// 等比缩放,禁止放大
|
||||
int targetW = (srcW <= maxWidth) ? srcW : maxWidth;
|
||||
int targetH = (int)((double)srcH * targetW / srcW + 0.5);
|
||||
if (targetH <= 0) targetH = 1;
|
||||
// 偶数对齐,JPEG 编码更高效
|
||||
targetW &= ~1;
|
||||
targetH &= ~1;
|
||||
if (targetW < 2) targetW = 2;
|
||||
if (targetH < 2) targetH = 2;
|
||||
|
||||
Bitmap* bmp = GrabDesktopScaled(targetW, targetH);
|
||||
if (!bmp) return SCREEN_PREVIEW_CAPTURE_FAILED;
|
||||
|
||||
CLSID clsid;
|
||||
if (GetJpegEncoderClsid(clsid) != 0) {
|
||||
delete bmp;
|
||||
return SCREEN_PREVIEW_ENCODE_FAILED;
|
||||
}
|
||||
if (GetJpegEncoderClsid(clsid) != 0) return SCREEN_PREVIEW_ENCODE_FAILED;
|
||||
|
||||
EncoderParameters params;
|
||||
params.Count = 1;
|
||||
@@ -149,14 +192,10 @@ int CaptureAndEncodePreview(int maxWidth, int quality,
|
||||
params.Parameter[0].Value = &q;
|
||||
|
||||
IStream* stream = nullptr;
|
||||
if (FAILED(CreateStreamOnHGlobal(NULL, TRUE, &stream))) {
|
||||
delete bmp;
|
||||
if (FAILED(CreateStreamOnHGlobal(NULL, TRUE, &stream)))
|
||||
return SCREEN_PREVIEW_ENCODE_FAILED;
|
||||
}
|
||||
|
||||
Status st = bmp->Save(stream, &clsid, ¶ms);
|
||||
delete bmp;
|
||||
|
||||
if (st != Ok) {
|
||||
stream->Release();
|
||||
return SCREEN_PREVIEW_ENCODE_FAILED;
|
||||
@@ -181,8 +220,78 @@ int CaptureAndEncodePreview(int maxWidth, int quality,
|
||||
out.assign((unsigned char*)p, (unsigned char*)p + sz);
|
||||
GlobalUnlock(hMem);
|
||||
stream->Release();
|
||||
|
||||
outWidth = targetW;
|
||||
outHeight = targetH;
|
||||
return SCREEN_PREVIEW_OK;
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
int CaptureAndEncodeScreenshot(const CaptureTarget& target, int quality,
|
||||
std::vector<unsigned char>& out, CaptureResult& result)
|
||||
{
|
||||
out.clear();
|
||||
result = CaptureResult();
|
||||
|
||||
if (!g_boot.ok) return SCREEN_PREVIEW_NOT_SUPPORTED;
|
||||
if (quality < 1) quality = 1;
|
||||
if (quality > 100) quality = 100;
|
||||
|
||||
RECT src = {};
|
||||
if (!ResolveTargetRect(target, src)) return SCREEN_PREVIEW_BAD_TARGET;
|
||||
const int srcW = src.right - src.left;
|
||||
const int srcH = src.bottom - src.top;
|
||||
if (srcW <= 0 || srcH <= 0) return SCREEN_PREVIEW_BAD_TARGET;
|
||||
|
||||
int targetW = 0, targetH = 0;
|
||||
if (target.native) {
|
||||
// 单边 8192 足够覆盖 8K 显示器,同时拦住异常区域把内存打爆。
|
||||
// 只约束 1:1 抓取;缩放路径目标宽 ≤1920,再大的虚拟桌面(如三屏 4K)也安全。
|
||||
if (srcW > 8192 || srcH > 8192) return SCREEN_PREVIEW_BAD_TARGET;
|
||||
targetW = srcW;
|
||||
targetH = srcH;
|
||||
} else {
|
||||
int maxWidth = target.maxWidth;
|
||||
if (maxWidth < 64) maxWidth = 64;
|
||||
if (maxWidth > 1920) maxWidth = 1920;
|
||||
// 等比缩放,禁止放大
|
||||
targetW = (srcW <= maxWidth) ? srcW : maxWidth;
|
||||
targetH = (int)((double)srcH * targetW / srcW + 0.5);
|
||||
if (targetH <= 0) targetH = 1;
|
||||
// 偶数对齐,JPEG 编码更高效
|
||||
targetW &= ~1;
|
||||
targetH &= ~1;
|
||||
if (targetW < 2) targetW = 2;
|
||||
if (targetH < 2) targetH = 2;
|
||||
}
|
||||
|
||||
Bitmap* bmp = GrabScreenScaled(src, targetW, targetH);
|
||||
if (!bmp) return SCREEN_PREVIEW_CAPTURE_FAILED;
|
||||
|
||||
int st = EncodeJpeg(bmp, quality, out);
|
||||
delete bmp;
|
||||
if (st != SCREEN_PREVIEW_OK) return st;
|
||||
|
||||
result.x = src.left;
|
||||
result.y = src.top;
|
||||
result.w = srcW;
|
||||
result.h = srcH;
|
||||
result.scale = (int)((long long)targetW * 100 / srcW);
|
||||
result.outWidth = targetW;
|
||||
result.outHeight = targetH;
|
||||
return SCREEN_PREVIEW_OK;
|
||||
}
|
||||
|
||||
int CaptureAndEncodePreview(int maxWidth, int quality,
|
||||
std::vector<unsigned char>& out,
|
||||
int& outWidth, int& outHeight)
|
||||
{
|
||||
CaptureTarget target;
|
||||
target.mode = SCREEN_CAPTURE_VDESKTOP;
|
||||
target.native = false;
|
||||
target.maxWidth = maxWidth;
|
||||
|
||||
CaptureResult result;
|
||||
int st = CaptureAndEncodeScreenshot(target, quality, out, result);
|
||||
outWidth = result.outWidth;
|
||||
outHeight = result.outHeight;
|
||||
return st;
|
||||
}
|
||||
Reference in new issue
Block a user