YangWX/crossdesk
1
0
Fork 0
mirror of https://github.com/kunkundi/crossdesk.git synced 2025-12-17 04:26:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

[fix] clean display names by removing non-alphanumeric characters

Browse Source
This commit is contained in:
dijunkun
2025-11-18 17:05:51 +08:00
parent 4ba4f17a6b
commit 4dd3c3e073
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/screen_capturer/linux/screen_capturer_x11.cpp
View File

@@ -36,9 +36,21 @@ int ScreenCapturerX11::Init(const int fps, cb_desktop_data cb) {
XRRCrtcInfo* crtc_info = XRRCrtcInfo* crtc_info =
XRRGetCrtcInfo(display_, screen_res_, output_info->crtc); XRRGetCrtcInfo(display_, screen_res_, output_info->crtc);
display_info_list_.push_back( std::string name(output_info->name);
DisplayInfo((void*)display_, output_info->name, true, crtc_info->x,
crtc_info->y, crtc_info->width, crtc_info->height)); if (name.empty()) {
name = "Display" + std::to_string(i + 1);
}
// clean display name, remove non-alphanumeric characters
name.erase(
std::remove_if(name.begin(), name.end(),
[](unsigned char c) { return !std::isalnum(c); }),
name.end());
display_info_list_.push_back(DisplayInfo(
(void*)display_, name, true, crtc_info->x, crtc_info->y,
crtc_info->x + crtc_info->width, crtc_info->y + crtc_info->height));
XRRFreeCrtcInfo(crtc_info); XRRFreeCrtcInfo(crtc_info);
} }

8
src/screen_capturer/macosx/screen_capturer_sck_impl.mm
View File

@@ -226,13 +226,17 @@ int ScreenCapturerSckImpl::Init(const int fps, cb_desktop_data cb) {
CGRect bounds = CGDisplayBounds(display_id); CGRect bounds = CGDisplayBounds(display_id);
bool is_primary = CGDisplayIsMain(display_id); bool is_primary = CGDisplayIsMain(display_id);
std::string name; std::string name = GetDisplayName(display_id);
name = GetDisplayName(display_id);
if (name.empty()) { if (name.empty()) {
name = "Display" + std::to_string(unnamed_count++); name = "Display" + std::to_string(unnamed_count++);
} }
// clean display name, remove non-alphanumeric characters
name.erase(
std::remove_if(name.begin(), name.end(), [](unsigned char c) { return !std::isalnum(c); }),
name.end());
DisplayInfo info((void *)(uintptr_t)display_id, name, is_primary, DisplayInfo info((void *)(uintptr_t)display_id, name, is_primary,
static_cast<int>(bounds.origin.x), static_cast<int>(bounds.origin.y), static_cast<int>(bounds.origin.x), static_cast<int>(bounds.origin.y),
static_cast<int>(bounds.origin.x + bounds.size.width), static_cast<int>(bounds.origin.x + bounds.size.width),