From 033ff077ef4d4405be97c6d652f42270c829ce90 Mon Sep 17 00:00:00 2001 From: yuanyuanxiang <962914132@qq.com> Date: Wed, 9 Sep 2026 17:13:17 +0200 Subject: [PATCH] Feature: Add configurable remote-desktop quality levels menu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add an "高级 (Advanced)" menu after "其他 (Other)" whose "远程桌面质量等级 (Remote Desktop Quality Levels)" item opens a dialog to edit the six preset QualityProfile levels (max FPS, max width, codec algorithm, bitrate). The dialog edits a working copy in a full grid with per-field validation and a restore-defaults button; on OK it persists the values to the [quality] INI section. The server stays authoritative: LoadQualityProfilesFromCfg loads the saved levels at startup (falling back to GetQualityProfile defaults), and ScreenSpyDlg now sends CMD_QUALITY_PROFILES from GetQualityProfileCfg so new remote-desktop sessions transmit with the configured parameters. Added en_US/de_DE/zh_TW translations for the menu and dialog strings. Co-Authored-By: deepseek-v4-pro --- server/2015Remote/2015Remote.rc | Bin 162108 -> 167748 bytes server/2015Remote/2015RemoteDlg.cpp | 63 +++++++++++ server/2015Remote/2015RemoteDlg.h | 10 ++ server/2015Remote/QualityLevelsDlg.h | 156 +++++++++++++++++++++++++++ server/2015Remote/ScreenSpyDlg.cpp | 8 +- server/2015Remote/lang/de_DE.ini | 17 +++ server/2015Remote/lang/en_US.ini | 19 +++- server/2015Remote/lang/zh_TW.ini | 17 +++ server/2015Remote/resource.h | 7 ++ 9 files changed, 294 insertions(+), 3 deletions(-) create mode 100644 server/2015Remote/QualityLevelsDlg.h diff --git a/server/2015Remote/2015Remote.rc b/server/2015Remote/2015Remote.rc index 9b2da0f6ea535d169b39cd8091f7983eb0b78f33..dd14c0467d3d03cf36f5dfb443020fa04eda5c07 100644 GIT binary patch delta 1699 zcmaKsYe-XJ7{{MCrg)oEWSMAfu8Rr--P}2Af#LEFb2=}@$h=ivNHblLCh4*d1|cek zdLc*&qT7ck2>Mb`5K#nOJ_LRc3jE@yqM)zY^Sp1z<8;M1XWKdd^M8Kt|9#H$>}T?; zg_Lb;zoSoBaOL`Umc;F^S$gu)jk^V!+Uq9x}gM|U_GbKDfdZ%63n3atRt?QSPw0)9|^6}3D{810fv$#N6FXVy} z;bCE;RO%FT!x@OkVwp}TMH)k_3Tb9548U0!fi7I)rQS$`0q+J?z~>h+s}>!xXVcRj z@Zv>@?Z$sjP`JN<6=)wH?9qZlb}NY#EJcf#>?q@lWvqdJbug0_t<2jgH9pk1g^Iq( z3i)vbKf=Bi{d=vA2^pMOREbgUAg*=aj+i6|Jy|TcSvAuh_d-?ku_Y6p-E@UVgKT zg<`uyMPh?m8pWliWOQnj32Jiyb3Tu}muJ5nGkATX$F}fNJd)QZipKK(?Pm%{=S5lE zoT=yaoTXJPu~@o_wG3h(w*^?lT8{~z#$yoQ!U4*;Hz?mjvm7EW(XUT{$qe*!(V> z*mQ4pI+D9qi9@&=KgG}lHE>9jR8Y5VE~%xw?aPtSWZGIS#z!FX>gr5rQf!_@hEOUh zd!R&PN|u)Ha+Gy4J eVVi2vlUct}&O({ALRnY8>@Q}vr=2To`Pv_-E?w*Z delta 29 lcmX>yk895-&PJxKOpJbyryp3vC^lVynTczA*-yrEQvtSq3*Z0% diff --git a/server/2015Remote/2015RemoteDlg.cpp b/server/2015Remote/2015RemoteDlg.cpp index 176fe4b..aa97c4e 100644 --- a/server/2015Remote/2015RemoteDlg.cpp +++ b/server/2015Remote/2015RemoteDlg.cpp @@ -43,6 +43,7 @@ #include #include "common/skCrypter.h" #include "common/commands.h" +#include "QualityLevelsDlg.h" #include "McpServer.h" #include "McpSettingsDlg.h" #include "common/md5.h" @@ -1013,6 +1014,7 @@ BEGIN_MESSAGE_MAP(CMy2015RemoteDlg, CDialogEx) ON_COMMAND(ID_TOOL_IMPORT_LICENSE, &CMy2015RemoteDlg::OnToolImportLicense) ON_COMMAND(ID_TOOL_V2_PRIVATEKEY, &CMy2015RemoteDlg::OnToolV2PrivateKey) ON_COMMAND(ID_MENU_NOTIFY_SETTINGS, &CMy2015RemoteDlg::OnMenuNotifySettings) + ON_COMMAND(ID_TOOL_QUALITY_LEVELS, &CMy2015RemoteDlg::OnQualityLevels) ON_COMMAND(ID_EXECUTE_TESTRUN, &CMy2015RemoteDlg::OnExecuteTestrun) ON_COMMAND(ID_EXECUTE_GHOST, &CMy2015RemoteDlg::OnExecuteGhost) ON_COMMAND(ID_MASTER_TRAIL, &CMy2015RemoteDlg::OnMasterTrail) @@ -2406,6 +2408,7 @@ BOOL CMy2015RemoteDlg::OnInitDialog() // 这里读完 INI 后再 Apply 一次纠正过来。 LoadThumbnailSettingsFromCfg(); ApplyThumbnailSettings(); + LoadQualityProfilesFromCfg(); m_runNormal = THIS_CFG.GetInt("settings", "RunNormal", 0); CMenu* SubMenu = m_MainMenu.GetSubMenu(2); @@ -9142,6 +9145,66 @@ void CMy2015RemoteDlg::SaveThumbnailSettingsToCfg() const THIS_CFG.SetInt("thumbnail", "JpegQuality", m_ThumbnailCfg.JpegQuality); } +// ===== 远程桌面质量等级配置（[quality] 节） ===== +// 6 档 QualityProfile 的读写与下发入口。缺省值回落到 common/commands.h 的 +// GetQualityProfile()，与客户端默认表一致；用户改过的档位单独落盘到 INI。 + +void CMy2015RemoteDlg::LoadQualityProfilesFromCfg() +{ + // 先整体回落到内置默认，再逐字段覆盖，避免 INI 缺项时读到 0 + for (int i = 0; i < QUALITY_COUNT; i++) { + m_QualityProfiles[i] = GetQualityProfile(i); + } + + for (int i = 0; i < QUALITY_COUNT; i++) { + std::string sec = "profile" + std::to_string(i); + QualityProfile& p = m_QualityProfiles[i]; + + p.maxFPS = THIS_CFG.GetInt("quality", sec + "_maxFPS", p.maxFPS); + p.maxWidth = THIS_CFG.GetInt("quality", sec + "_maxWidth", p.maxWidth); + p.algorithm = THIS_CFG.GetInt("quality", sec + "_algorithm", p.algorithm); + p.bitRate = THIS_CFG.GetInt("quality", sec + "_bitRate", p.bitRate); + + // Clamp 到安全范围（防 INI 被手工编错） + if (p.maxFPS < 1) p.maxFPS = 1; + if (p.maxFPS > 60) p.maxFPS = 60; + if (p.maxWidth < 0) p.maxWidth = 0; + if (p.maxWidth > 8192) p.maxWidth = 8192; + if (p.algorithm < ALGORITHM_GRAY || p.algorithm > ALGORITHM_RGB565) + p.algorithm = ALGORITHM_H264; + if (p.bitRate < 0) p.bitRate = 0; + if (p.bitRate > 50000) p.bitRate = 50000; + } +} + +void CMy2015RemoteDlg::SaveQualityProfilesToCfg() const +{ + for (int i = 0; i < QUALITY_COUNT; i++) { + std::string sec = "profile" + std::to_string(i); + const QualityProfile& p = m_QualityProfiles[i]; + THIS_CFG.SetInt("quality", sec + "_maxFPS", p.maxFPS); + THIS_CFG.SetInt("quality", sec + "_maxWidth", p.maxWidth); + THIS_CFG.SetInt("quality", sec + "_algorithm", p.algorithm); + THIS_CFG.SetInt("quality", sec + "_bitRate", p.bitRate); + } +} + +const QualityProfile& CMy2015RemoteDlg::GetQualityProfileCfg(int level) const +{ + if (level < 0 || level >= QUALITY_COUNT) + return GetQualityProfile(level); // 越界：与 common 默认表同源兜底 + return m_QualityProfiles[level]; +} + +void CMy2015RemoteDlg::OnQualityLevels() +{ + CQualityLevelsDlg dlg(m_QualityProfiles, this); + if (dlg.DoModal() == IDOK) { + SaveQualityProfilesToCfg(); + MessageBoxL("质量等级已保存，下次打开远程桌面时生效。", "提示", MB_ICONINFORMATION); + } +} + void CMy2015RemoteDlg::ApplyThumbnailSettings() { // 任何已缓存的 HBITMAP 都是按"旧 ThumbWidth"渲染的，尺寸不再可信 —— 一律清空。 diff --git a/server/2015Remote/2015RemoteDlg.h b/server/2015Remote/2015RemoteDlg.h index c091fb5..08fe15d 100644 --- a/server/2015Remote/2015RemoteDlg.h +++ b/server/2015Remote/2015RemoteDlg.h @@ -6,6 +6,7 @@ #include "TrueColorToolBar.h" #include "IOCPServer.h" #include +#include "common/commands.h" #include #include #include @@ -328,6 +329,15 @@ public: void LoadThumbnailSettingsFromCfg(); // 从 THIS_CFG 读到 m_ThumbnailCfg void SaveThumbnailSettingsToCfg() const; // m_ThumbnailCfg 落盘到 THIS_CFG void TickThumbnailRefresh(); // TIMER_THUMBNAIL_REFRESH 主循环 + + // ===== 远程桌面质量等级配置（6 档 QualityProfile） ===== + // 主控端 UI 偏好，持久化走 THIS_CFG [quality] 节。服务端权威，经 CMD_QUALITY_PROFILES + // 下发给客户端。仅 UI 线程访问；修改后需重开远程桌面会话才对新连接生效。 + QualityProfile m_QualityProfiles[QUALITY_COUNT]; + void LoadQualityProfilesFromCfg(); // 从 THIS_CFG 读到 m_QualityProfiles（缺省回落 GetQualityProfile） + void SaveQualityProfilesToCfg() const; // m_QualityProfiles 落盘到 THIS_CFG + const QualityProfile& GetQualityProfileCfg(int level) const; // 供 ScreenSpyDlg 下发用 + void OnQualityLevels(); // 高级→远程桌面质量等级 void SendThumbnailRequest(class context* ctx);// 发一次缩略图请求 void CacheThumbnail(uint64_t clientID, const BYTE* jpeg, size_t bytes); void ClearThumbnailCacheEntry(uint64_t clientID); diff --git a/server/2015Remote/QualityLevelsDlg.h b/server/2015Remote/QualityLevelsDlg.h new file mode 100644 index 0000000..0b13d71 --- /dev/null +++ b/server/2015Remote/QualityLevelsDlg.h @@ -0,0 +1,156 @@ +// QualityLevelsDlg.h +// 远程桌面质量等级配置对话框：编辑 6 档 QualityProfile（帧率/宽度/算法/码率）。 +// 纯主控端 UI 偏好，持久化由 CMy2015RemoteDlg::SaveQualityProfilesToCfg() 负责。 +// 仅在 2015RemoteDlg.cpp 中 include 一次（头文件内联实现，勿多处包含）。 +#pragma once + +#include "LangManager.h" + +class CQualityLevelsDlg : public CDialog +{ +public: + enum { IDD = IDD_QUALITY_LEVELS }; + + // profiles: 指向 6 元素 QualityProfile 数组，确认后写回 + CQualityLevelsDlg(QualityProfile* profiles, CWnd* pParent = NULL) + : CDialog(CQualityLevelsDlg::IDD, pParent), m_profiles(profiles) + { + } + +protected: + QualityProfile* m_profiles; + QualityProfile m_working[QUALITY_COUNT]; + + static const char* AlgorithmName(int algo) + { + switch (algo) { + case ALGORITHM_GRAY: return "GRAY"; + case ALGORITHM_DIFF: return "DIFF"; + case ALGORITHM_H264: return "H264"; + case ALGORITHM_RGB565: return "RGB565"; + default: return "?"; + } + } + + static const char* LevelName(int i) + { + static const char* names[QUALITY_COUNT] = { + "Ultra", "High", "Good", "Medium", "Low", "Minimal" + }; + return (i >= 0 && i < QUALITY_COUNT) ? names[i] : "?"; + } + + void FillAlgoCombo(int i) + { + CComboBox* cb = (CComboBox*)GetDlgItem(IDC_QLEVEL_ALGO + i); + if (!cb) return; + for (int a = 0; a < 4; a++) { + cb->AddString(CString(AlgorithmName(a))); + } + cb->SetCurSel(m_working[i].algorithm); + } + + void LoadToControls() + { + CString s; + for (int i = 0; i < QUALITY_COUNT; i++) { + s.Format(_T("%d"), m_working[i].maxFPS); + SetDlgItemText(IDC_QLEVEL_FPS + i, s); + s.Format(_T("%d"), m_working[i].maxWidth); + SetDlgItemText(IDC_QLEVEL_WIDTH + i, s); + s.Format(_T("%d"), m_working[i].bitRate); + SetDlgItemText(IDC_QLEVEL_BITRATE + i, s); + FillAlgoCombo(i); + } + } + + bool ReadInt(int id, int& out) + { + CString s; + GetDlgItemText(id, s); + s.Trim(); + if (s.IsEmpty()) return false; + + int v = 0; + for (int k = 0; k < s.GetLength(); k++) { + TCHAR ch = s[k]; + if (ch < _T('0') || ch > _T('9')) return false; + v = v * 10 + (ch - _T('0')); + } + out = v; + return true; + } + + bool ReadFromControls(CString& err) + { + for (int i = 0; i < QUALITY_COUNT; i++) { + int fps, w, br; + if (!ReadInt(IDC_QLEVEL_FPS + i, fps)) + { err.Format(_T("等级 %s 的帧率不是有效数字"), LevelName(i)); return false; } + if (!ReadInt(IDC_QLEVEL_WIDTH + i, w)) + { err.Format(_T("等级 %s 的最大宽度不是有效数字"), LevelName(i)); return false; } + if (!ReadInt(IDC_QLEVEL_BITRATE + i, br)) + { err.Format(_T("等级 %s 的码率不是有效数字"), LevelName(i)); return false; } + + if (fps < 1 || fps > 60) + { err.Format(_T("等级 %s 的帧率需在 1~60 之间"), LevelName(i)); return false; } + if (w < 0 || w > 8192) + { err.Format(_T("等级 %s 的最大宽度需在 0~8192 之间（0=原始分辨率）"), LevelName(i)); return false; } + if (br < 0 || br > 50000) + { err.Format(_T("等级 %s 的码率需在 0~50000 之间"), LevelName(i)); return false; } + + CComboBox* cb = (CComboBox*)GetDlgItem(IDC_QLEVEL_ALGO + i); + int algo = cb ? cb->GetCurSel() : -1; + if (algo < 0 || algo > 3) + { err.Format(_T("等级 %s 的编码算法未选择"), LevelName(i)); return false; } + + m_working[i].maxFPS = fps; + m_working[i].maxWidth = w; + m_working[i].bitRate = br; + m_working[i].algorithm = algo; + } + return true; + } + + void ResetToDefaults() + { + for (int i = 0; i < QUALITY_COUNT; i++) { + m_working[i] = GetQualityProfile(i); + } + LoadToControls(); + } + + virtual BOOL OnInitDialog() override + { + CDialog::OnInitDialog(); + + for (int i = 0; i < QUALITY_COUNT; i++) { + m_working[i] = m_profiles[i]; + } + LoadToControls(); + TranslateDialog(this); + return TRUE; + } + + virtual void OnOK() override + { + CString err; + if (!ReadFromControls(err)) { + MessageBox(err, _TR("提示"), MB_ICONWARNING); + return; + } + for (int i = 0; i < QUALITY_COUNT; i++) { + m_profiles[i] = m_working[i]; + } + CDialog::OnOK(); + } + + virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam) override + { + if (LOWORD(wParam) == IDC_QLEVEL_RESET && HIWORD(wParam) == BN_CLICKED) { + ResetToDefaults(); + return TRUE; + } + return CDialog::OnCommand(wParam, lParam); + } +}; diff --git a/server/2015Remote/ScreenSpyDlg.cpp b/server/2015Remote/ScreenSpyDlg.cpp index 2f44803..3084e45 100644 --- a/server/2015Remote/ScreenSpyDlg.cpp +++ b/server/2015Remote/ScreenSpyDlg.cpp @@ -889,13 +889,17 @@ BOOL CScreenSpyDlg::OnInitDialog() // 启动传输速率更新定时器 (1秒) SetTimer(4, 1000, NULL); - // 下发质量配置表（让客户端可以持久化保存） + // 下发质量配置表（让客户端可以持久化保存）。 + // 优先使用主控端在「高级 → 远程桌面质量等级」里自定义的档位；无主控端时回落内置默认表。 { BYTE profileCmd[1 + sizeof(QualityProfile) * QUALITY_COUNT]; profileCmd[0] = CMD_QUALITY_PROFILES; for (int i = 0; i < QUALITY_COUNT; i++) { + const QualityProfile& prof = (m_pParent != nullptr) + ? m_pParent->GetQualityProfileCfg(i) + : GetQualityProfile(i); memcpy(profileCmd + 1 + i * sizeof(QualityProfile), - &GetQualityProfile(i), sizeof(QualityProfile)); + &prof, sizeof(QualityProfile)); } m_ContextObject->Send2Client(profileCmd, sizeof(profileCmd)); } diff --git a/server/2015Remote/lang/de_DE.ini b/server/2015Remote/lang/de_DE.ini index 5151b1d..071c8f1 100644 --- a/server/2015Remote/lang/de_DE.ini +++ b/server/2015Remote/lang/de_DE.ini @@ -2025,3 +2025,20 @@ Token=Token ļʧ...=Datei konnte nicht geoeffnet werden... Ҫʱ Windows ·ִмƻIJ(ɨ)=Diese Aufgabe startet bei Bedarf den Windows-Update-Dienst zum Ausfuehren geplanter Vorgaenge (z.B. Scannen) ļ·=Lokaler Dateipfad +߼(&A)=&Erweitert +Զȼ(&Q)=Remote Desktop &Qualitaetsstufen +Զȼ=Remote Desktop Qualitaetsstufen +ȼ=Stufe +֡(FPS)=FPS +=Max. Breite +㷨=Codec +(kbps)=Bitrate (kbps) +Ultra =Ultra +High =Hoch +Good =Gut +Medium һ=Mittel +Low ϲ=Niedrig +Minimal =Minimal + 0 ʾԭʼֱʣDIFF/RGB565 ʺϾH264 ʺϿ=Max. Breite 0 = Originalaufloesung; DIFF/RGB565 fuer LAN, H264 fuer WAN +ָĬ=Standard +ȼѱ棬´δԶʱЧ=Qualitaetsstufen gespeichert. Wirksam beim naechsten Oeffnen des Remote Desktops. diff --git a/server/2015Remote/lang/en_US.ini b/server/2015Remote/lang/en_US.ini index 3000cde..2b16b1e 100644 --- a/server/2015Remote/lang/en_US.ini +++ b/server/2015Remote/lang/en_US.ini @@ -1353,7 +1353,7 @@ FUCK!!! ༭ע=Edit remarks Լ:=Self: Ƶļ(*.avi)|*.avi|=Video(*.avi)|*.avi| -= +=Unlock Remote Input Ѿû SYSTEM Ȩޡ\r\n޷ԶƣǷ?=Computer locked, no SYSTEM.\r\nRemote may fail, continue? ɿ!=Generate password first! 뽫EXE\=Put EXE in \ @@ -2025,3 +2025,20 @@ Token=Token ļʧ...=Failed to open file... Ҫʱ Windows ·ִмƻIJ(ɨ)=This task starts the Windows Update service when needed to run scheduled operations (e.g. scanning) ļ·=Local file path +߼(&A)=&Advanced +Զȼ(&Q)=Remote Desktop &Quality Levels +Զȼ=Remote Desktop Quality Levels +ȼ=Level +֡(FPS)=FPS +=Max Width +㷨=Codec +(kbps)=Bitrate (kbps) +Ultra =Ultra +High =High +Good =Good +Medium һ=Medium +Low ϲ=Low +Minimal =Minimal + 0 ʾԭʼֱʣDIFF/RGB565 ʺϾH264 ʺϿ=Max Width 0 = native resolution; DIFF/RGB565 for LAN, H264 for WAN +ָĬ=Restore Defaults +ȼѱ棬´δԶʱЧ=Quality levels saved. They take effect the next time you open Remote Desktop. diff --git a/server/2015Remote/lang/zh_TW.ini b/server/2015Remote/lang/zh_TW.ini index 30ef272..4d07aea 100644 --- a/server/2015Remote/lang/zh_TW.ini +++ b/server/2015Remote/lang/zh_TW.ini @@ -2016,3 +2016,20 @@ Token=Token ļʧ...=_nʧ... Ҫʱ Windows ·ִмƻIJ(ɨ)=˹Ҫr Windows ·Ԉų̵IJ() ļ·=Cn· +߼(&A)=MA(&A) +Զȼ(&Q)=hƷ|ȼ(&Q) +Զȼ=hƷ|ȼ +ȼ=ȼ +֡(FPS)=(FPS) +=󌒶 +㷨=a㷨 +(kbps)=a(kbps) +Ultra =Ultra O +High =High +Good =Good +Medium һ=Medium һ +Low ϲ=Low ^ +Minimal =Minimal + 0 ʾԭʼֱʣDIFF/RGB565 ʺϾH264 ʺϿ=󌒶 0 = ԭʼȣDIFF/RGB565 mυ^W·H264 mϿW +ָĬ=֏AO +ȼѱ棬´δԶʱЧ=Ʒ|ȼу棬´_hrЧ diff --git a/server/2015Remote/resource.h b/server/2015Remote/resource.h index 6360ab1..0e7e21f 100644 --- a/server/2015Remote/resource.h +++ b/server/2015Remote/resource.h @@ -353,6 +353,7 @@ #define IDI_SYSTEM 2035 #define IDC_DOT 2036 #define IDD_AUDIO 2038 +#define IDD_QUALITY_LEVELS 3000 #define IDI_AUDIO 2039 #define IDC_LIST_REMOTE 2040 #define IDC_LIST_LOCAL 2041 @@ -1036,6 +1037,12 @@ #define ID_ONLINE_FORBIDDEN 33076 #define ID_ONLINE_HISTORY_ACTIVITY 33082 #define ID_EXIT_FULLSCREEN 40001 +#define ID_TOOL_QUALITY_LEVELS 33083 +#define IDC_QLEVEL_FPS 2547 +#define IDC_QLEVEL_WIDTH 2553 +#define IDC_QLEVEL_ALGO 2559 +#define IDC_QLEVEL_BITRATE 2565 +#define IDC_QLEVEL_RESET 2571 // Next default values for new objects //