izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't skip disconnected X11 outputs (#1071)

Browse Source
This commit is contained in:
luk1337
2023-03-28 22:44:32 +02:00
committed by GitHub
parent 44f1984af0
commit 1ab1b7920e
3 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/platform/linux/x11grab.cpp
View File

@@ -427,7 +427,7 @@ namespace platf {
int monitor = 0;
for (int x = 0; x < output; ++x) {
output_info_t out_info { x11::rr::GetOutputInfo(xdisplay.get(), screenr.get(), screenr->outputs[x]) };
if (out_info && out_info->connection == RR_Connected) {
if (out_info) {
if (monitor++ == streamedMonitor) {
result = std::move(out_info);
break;
@@ -761,7 +761,7 @@ namespace platf {
return {};
}
BOOST_LOG(info) << "Detecting connected monitors"sv;
BOOST_LOG(info) << "Detecting monitors"sv;
x11::xdisplay_t xdisplay { x11::OpenDisplay(nullptr) };
if (!xdisplay) {
@@ -775,7 +775,8 @@ namespace platf {
int monitor = 0;
for (int x = 0; x < output; ++x) {
output_info_t out_info { x11::rr::GetOutputInfo(xdisplay.get(), screenr.get(), screenr->outputs[x]) };
if (out_info && out_info->connection == RR_Connected) {
if (out_info) {
BOOST_LOG(info) << "Detected monitor "sv << monitor << ": "sv << out_info->name << ", connected: "sv << (out_info->connection == RR_Connected);
++monitor;
}
}