hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-26 10:05:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

fixed multimon render again

Browse source
This commit is contained in:
vaxerski 2022-03-20 18:49:40 +01:00
parent 1f639f2aba
commit 0b2bf23d69
1 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/render/Renderer.cpp
View file

@ -32,6 +32,29 @@ void renderSurface(struct wlr_surface* surface, int x, int y, void* data) {
wlr_presentation_surface_sampled_on_output(g_pCompositor->m_sWLRPresentation, surface, RDATA->output); wlr_presentation_surface_sampled_on_output(g_pCompositor->m_sWLRPresentation, surface, RDATA->output);
} }
bool shouldRenderWindow(CWindow* pWindow, SMonitor* pMonitor) {
wlr_box geometry = {pWindow->m_vRealPosition.x, pWindow->m_vRealPosition.y, pWindow->m_vRealSize.x, pWindow->m_vRealSize.y};
if (!wlr_output_layout_intersects(g_pCompositor->m_sWLROutputLayout, pMonitor->output, &geometry))
return false;
// now check if it has the same workspace
if (pWindow->m_iWorkspaceID == pMonitor->activeWorkspace)
return true;
// if not, check if it maybe is active on a different monitor.
for (auto& m : g_pCompositor->m_lMonitors) {
if (&m == pMonitor)
continue;
if (m.activeWorkspace == pWindow->m_iWorkspaceID)
return true;
}
return false;
}
void CHyprRenderer::renderAllClientsForMonitor(const int& ID, timespec* time) { void CHyprRenderer::renderAllClientsForMonitor(const int& ID, timespec* time) {
const auto PMONITOR = g_pCompositor->getMonitorFromID(ID); const auto PMONITOR = g_pCompositor->getMonitorFromID(ID);
@ -50,12 +73,10 @@ void CHyprRenderer::renderAllClientsForMonitor(const int& ID, timespec* time) {
for (auto& w : g_pCompositor->m_lWindows) { for (auto& w : g_pCompositor->m_lWindows) {
if (w.m_bIsX11 || w.m_iWorkspaceID != PMONITOR->activeWorkspace) if (w.m_bIsX11)
continue; continue;
wlr_box geometry = { w.m_vRealPosition.x, w.m_vRealPosition.y, w.m_vRealSize.x, w.m_vRealSize.y }; if (!shouldRenderWindow(&w, PMONITOR))
if (!wlr_output_layout_intersects(g_pCompositor->m_sWLROutputLayout, PMONITOR->output, &geometry))
continue; continue;
// render the bad boy // render the bad boy
@ -71,15 +92,13 @@ void CHyprRenderer::renderAllClientsForMonitor(const int& ID, timespec* time) {
for (auto& w : g_pCompositor->m_lWindows) { for (auto& w : g_pCompositor->m_lWindows) {
if (!w.m_bIsX11 || w.m_iWorkspaceID != PMONITOR->activeWorkspace) if (!w.m_bIsX11)
continue; continue;
if (!g_pCompositor->windowValidMapped(&w)) if (!g_pCompositor->windowValidMapped(&w))
continue; continue;
wlr_box geometry = {w.m_vRealPosition.x, w.m_vRealPosition.y, w.m_vRealSize.x, w.m_vRealSize.y}; if (!shouldRenderWindow(&w, PMONITOR))
if (!wlr_output_layout_intersects(g_pCompositor->m_sWLROutputLayout, PMONITOR->output, &geometry))
continue; continue;
// render the bad boy // render the bad boy