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

Revert "xwayland: push invisible windows outside layout"

Browse source 
This reverts commit accb3d8d0b.

Bad idea
This commit is contained in:
Vaxry 2023-12-13 17:25:19 +00:00
parent b2e5a80e2f
commit 01e5c59d75
3 changed files with 3 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/helpers/Monitor.cpp
View file

@ -565,15 +565,6 @@ void CMonitor::changeWorkspace(CWorkspace* const pWorkspace, bool internal, bool
g_pCompositor->updateFullscreenFadeOnWorkspace(pWorkspace);
g_pConfigManager->ensureVRR(this);
for (auto& w : g_pCompositor->m_vWindows) {
if (w->m_iWorkspaceID != POLDWORKSPACE->m_iID || !w->m_bMappedX11 || !w->m_bIsX11 || w->isHidden() || w->m_iMonitorID != ID)
continue;
g_pXWaylandManager->moveXWaylandWindow(w.get(), {30000, 30000});
}
g_pCompositor->forceReportSizesToWindowsOnWorkspace(pWorkspace->m_iID);
}
void CMonitor::changeWorkspace(const int& id, bool internal) {
@ -585,9 +576,7 @@ void CMonitor::setSpecialWorkspace(CWorkspace* const pWorkspace) {
if (!pWorkspace) {
// remove special if exists
const auto EXISTINGSPECIAL = g_pCompositor->getWorkspaceByID(specialWorkspaceID);
if (EXISTINGSPECIAL) {
if (const auto EXISTINGSPECIAL = g_pCompositor->getWorkspaceByID(specialWorkspaceID); EXISTINGSPECIAL) {
EXISTINGSPECIAL->startAnim(false, false);
g_pEventManager->postEvent(SHyprIPCEvent{"activespecial", "," + szName});
}
@ -601,18 +590,6 @@ void CMonitor::setSpecialWorkspace(CWorkspace* const pWorkspace) {
else
g_pInputManager->refocus();
// for xwayland: yeet all the windows to narnia to avoid some focus fuckery. I hate xwayland.
// I'll avoid setting XCB_ICCCM_WM_STATE_ICONIC (aka minimized) so that the apps don't do stupid shit.
if (EXISTINGSPECIAL) {
for (auto& w : g_pCompositor->m_vWindows) {
if (w->m_iWorkspaceID != EXISTINGSPECIAL->m_iID || !w->m_bMappedX11 || !w->m_bIsX11 || w->isHidden() || w->m_iMonitorID != ID)
continue;
g_pXWaylandManager->moveXWaylandWindow(w.get(), {30000, 30000});
}
}
return;
}
@ -654,8 +631,6 @@ void CMonitor::setSpecialWorkspace(CWorkspace* const pWorkspace) {
g_pEventManager->postEvent(SHyprIPCEvent{"activespecial", pWorkspace->m_szName + "," + szName});
g_pHyprRenderer->damageMonitor(this);
g_pCompositor->forceReportSizesToWindowsOnWorkspace(specialWorkspaceID);
}
void CMonitor::setSpecialWorkspace(const int& id) {

4
src/managers/XWaylandManager.cpp
View file

@ -262,9 +262,7 @@ void CHyprXWaylandManager::moveXWaylandWindow(CWindow* pWindow, const Vector2D&
if (!pWindow->m_bIsX11)
return;
Vector2D size = pWindow->m_vRealSize.goalv() * pWindow->m_fX11SurfaceScaledBy;
wlr_xwayland_surface_configure(pWindow->m_uSurface.xwayland, pos.x, pos.y, size.x, size.y);
wlr_xwayland_surface_configure(pWindow->m_uSurface.xwayland, pos.x, pos.y, pWindow->m_vRealSize.vec().x, pWindow->m_vRealSize.vec().y);
}
void CHyprXWaylandManager::checkBorders(CWindow* pWindow) {