Skip to content

Commit

Permalink
Reuse the same no output handling from wayland mode, remove the old one.
Browse files Browse the repository at this point in the history
  • Loading branch information
nphantasm authored and Almamu committed Sep 23, 2023
1 parent a853b50 commit 89612ea
Showing 1 changed file with 13 additions and 3 deletions.
16 changes: 13 additions & 3 deletions src/WallpaperEngine/Render/Drivers/Output/CX11Output.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -167,11 +167,21 @@ void CX11Output::loadScreenInfo ()

XRRFreeScreenResources (screenResources);

// Check if all screens from --screen-root are actually screens
if (this->m_viewports.size() != this->m_context.settings.general.screenBackgrounds.size()) {
sLog.exception("Some outputs could not be initialized, please check parameters and try again");
bool any = false;

for (auto& o : this->m_screens)
{
const auto cur = this->m_context.settings.general.screenBackgrounds.find (o->name);

if (cur == this->m_context.settings.general.screenBackgrounds.end ())
continue;

any = true;
}

if (!any)
sLog.exception("No outputs could be initialized, please check the parameters and try again");

// create pixmap so we can draw things in there
this->m_pixmap = XCreatePixmap (this->m_display, this->m_root, this->m_fullWidth, this->m_fullHeight, 24);
this->m_gc = XCreateGC (this->m_display, this->m_pixmap, 0, nullptr);
Expand Down

0 comments on commit 89612ea

Please sign in to comment.