mirror of
https://github.com/hyprwm/Hyprland
synced 2024-11-26 02:45:59 +01:00
remove unused fixXWaylandWindowsOnWorkspace
This commit is contained in:
parent
c982312c07
commit
d47bfe6af1
6 changed files with 0 additions and 46 deletions
|
@ -848,31 +848,6 @@ CWindow* CCompositor::getFirstWindowOnWorkspace(const int& id) {
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CCompositor::fixXWaylandWindowsOnWorkspace(const int& id) {
|
|
||||||
// not needed anymore
|
|
||||||
return;
|
|
||||||
|
|
||||||
const auto ISVISIBLE = isWorkspaceVisible(id);
|
|
||||||
|
|
||||||
const auto PWORKSPACE = g_pCompositor->getWorkspaceByID(id);
|
|
||||||
|
|
||||||
if (!PWORKSPACE)
|
|
||||||
return;
|
|
||||||
|
|
||||||
for (auto& w : m_vWindows) {
|
|
||||||
if (w->m_iWorkspaceID == id) {
|
|
||||||
|
|
||||||
// moveXWaylandWindow only moves XWayland windows
|
|
||||||
// so there is no need to check here
|
|
||||||
// if the window is XWayland or not.
|
|
||||||
if (ISVISIBLE && (!PWORKSPACE->m_bHasFullscreenWindow || w->m_bIsFullscreen))
|
|
||||||
g_pXWaylandManager->moveXWaylandWindow(w.get(), w->m_vRealPosition.vec());
|
|
||||||
else
|
|
||||||
g_pXWaylandManager->moveXWaylandWindow(w.get(), Vector2D(42069,42069));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
bool CCompositor::doesSeatAcceptInput(wlr_surface* surface) {
|
bool CCompositor::doesSeatAcceptInput(wlr_surface* surface) {
|
||||||
return !m_sSeat.exclusiveClient || (surface && m_sSeat.exclusiveClient == wl_resource_get_client(surface->resource));
|
return !m_sSeat.exclusiveClient || (surface && m_sSeat.exclusiveClient == wl_resource_get_client(surface->resource));
|
||||||
}
|
}
|
||||||
|
|
|
@ -128,7 +128,6 @@ public:
|
||||||
void updateWorkspaceWindowDecos(const int&);
|
void updateWorkspaceWindowDecos(const int&);
|
||||||
int getWindowsOnWorkspace(const int&);
|
int getWindowsOnWorkspace(const int&);
|
||||||
CWindow* getFirstWindowOnWorkspace(const int&);
|
CWindow* getFirstWindowOnWorkspace(const int&);
|
||||||
void fixXWaylandWindowsOnWorkspace(const int&);
|
|
||||||
CWindow* getFullscreenWindowOnWorkspace(const int&);
|
CWindow* getFullscreenWindowOnWorkspace(const int&);
|
||||||
bool doesSeatAcceptInput(wlr_surface*);
|
bool doesSeatAcceptInput(wlr_surface*);
|
||||||
bool isWindowActive(CWindow*);
|
bool isWindowActive(CWindow*);
|
||||||
|
|
|
@ -697,10 +697,6 @@ void CHyprDwindleLayout::fullscreenRequestForWindow(CWindow* pWindow, eFullscree
|
||||||
|
|
||||||
g_pCompositor->moveWindowToTop(pWindow);
|
g_pCompositor->moveWindowToTop(pWindow);
|
||||||
|
|
||||||
// we need to fix XWayland windows by sending them to NARNIA
|
|
||||||
// because otherwise they'd still be recieving mouse events
|
|
||||||
g_pCompositor->fixXWaylandWindowsOnWorkspace(PMONITOR->activeWorkspace);
|
|
||||||
|
|
||||||
recalculateMonitor(PMONITOR->ID);
|
recalculateMonitor(PMONITOR->ID);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -87,7 +87,6 @@ void IHyprLayout::onWindowCreatedFloating(CWindow* pWindow) {
|
||||||
|
|
||||||
if (pWindow->m_iX11Type != 2) {
|
if (pWindow->m_iX11Type != 2) {
|
||||||
g_pXWaylandManager->setWindowSize(pWindow, pWindow->m_vRealSize.goalv());
|
g_pXWaylandManager->setWindowSize(pWindow, pWindow->m_vRealSize.goalv());
|
||||||
g_pCompositor->fixXWaylandWindowsOnWorkspace(PMONITOR->activeWorkspace);
|
|
||||||
|
|
||||||
g_pCompositor->moveWindowToTop(pWindow);
|
g_pCompositor->moveWindowToTop(pWindow);
|
||||||
}
|
}
|
||||||
|
|
|
@ -389,10 +389,6 @@ void CHyprMasterLayout::fullscreenRequestForWindow(CWindow* pWindow, eFullscreen
|
||||||
|
|
||||||
g_pCompositor->moveWindowToTop(pWindow);
|
g_pCompositor->moveWindowToTop(pWindow);
|
||||||
|
|
||||||
// we need to fix XWayland windows by sending them to NARNIA
|
|
||||||
// because otherwise they'd still be recieving mouse events
|
|
||||||
g_pCompositor->fixXWaylandWindowsOnWorkspace(PMONITOR->activeWorkspace);
|
|
||||||
|
|
||||||
recalculateMonitor(PMONITOR->ID);
|
recalculateMonitor(PMONITOR->ID);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -488,13 +488,6 @@ void CKeybindManager::changeworkspace(std::string args) {
|
||||||
else
|
else
|
||||||
PMONITOR->specialWorkspaceOpen = true;
|
PMONITOR->specialWorkspaceOpen = true;
|
||||||
|
|
||||||
// we need to move XWayland windows to narnia or otherwise they will still process our cursor and shit
|
|
||||||
// and that'd be annoying as hell
|
|
||||||
g_pCompositor->fixXWaylandWindowsOnWorkspace(OLDWORKSPACEID);
|
|
||||||
|
|
||||||
// and fix on the new workspace
|
|
||||||
g_pCompositor->fixXWaylandWindowsOnWorkspace(PMONITOR->activeWorkspace);
|
|
||||||
|
|
||||||
// here and only here begin anim. we don't want to anim visible workspaces on other monitors.
|
// here and only here begin anim. we don't want to anim visible workspaces on other monitors.
|
||||||
// check if anim left or right
|
// check if anim left or right
|
||||||
const auto ANIMTOLEFT = workspaceToChangeTo > OLDWORKSPACEID;
|
const auto ANIMTOLEFT = workspaceToChangeTo > OLDWORKSPACEID;
|
||||||
|
@ -563,10 +556,6 @@ void CKeybindManager::changeworkspace(std::string args) {
|
||||||
else
|
else
|
||||||
PMONITOR->specialWorkspaceOpen = true;
|
PMONITOR->specialWorkspaceOpen = true;
|
||||||
|
|
||||||
// we need to move XWayland windows to narnia or otherwise they will still process our cursor and shit
|
|
||||||
// and that'd be annoying as hell
|
|
||||||
g_pCompositor->fixXWaylandWindowsOnWorkspace(OLDWORKSPACE);
|
|
||||||
|
|
||||||
// set active and deactivate all other
|
// set active and deactivate all other
|
||||||
g_pCompositor->deactivateAllWLRWorkspaces(PWORKSPACE->m_pWlrHandle);
|
g_pCompositor->deactivateAllWLRWorkspaces(PWORKSPACE->m_pWlrHandle);
|
||||||
PWORKSPACE->setActive(true);
|
PWORKSPACE->setActive(true);
|
||||||
|
|
Loading…
Reference in a new issue