diff options
Diffstat (limited to 'src/Compositor.cpp')
| -rw-r--r-- | src/Compositor.cpp | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/src/Compositor.cpp b/src/Compositor.cpp index 1f755be0..73ed8439 100644 --- a/src/Compositor.cpp +++ b/src/Compositor.cpp @@ -200,8 +200,6 @@ void CCompositor::initServer() { m_sWLRInhibitMgr = wlr_input_inhibit_manager_create(m_sWLDisplay); m_sWLRKbShInhibitMgr = wlr_keyboard_shortcuts_inhibit_v1_create(m_sWLDisplay); - m_sWLREXTWorkspaceMgr = wlr_ext_workspace_manager_v1_create(m_sWLDisplay); - m_sWLRPointerConstraints = wlr_pointer_constraints_v1_create(m_sWLDisplay); m_sWLRRelPointerMgr = wlr_relative_pointer_manager_v1_create(m_sWLDisplay); @@ -909,16 +907,8 @@ void CCompositor::focusWindow(CWindow* pWindow, wlr_surface* pSurface) { updateWindowAnimatedDecorationValues(pWindow); - // Handle urgency hint on the workspace - if (pWindow->m_bIsUrgent) { + if (pWindow->m_bIsUrgent) pWindow->m_bIsUrgent = false; - if (!hasUrgentWindowOnWorkspace(pWindow->m_iWorkspaceID)) { - const auto PWORKSPACE = getWorkspaceByID(pWindow->m_iWorkspaceID); - if (PWORKSPACE->m_pWlrHandle) { - wlr_ext_workspace_handle_v1_set_urgent(PWORKSPACE->m_pWlrHandle, 0); - } - } - } // Send an event g_pEventManager->postEvent(SHyprIPCEvent{"activewindow", g_pXWaylandManager->getAppIDClass(pWindow) + "," + pWindow->m_szTitle}); @@ -1480,13 +1470,6 @@ CWindow* CCompositor::getWindowInDirection(CWindow* pWindow, char dir) { return nullptr; } -void CCompositor::deactivateAllWLRWorkspaces(wlr_ext_workspace_handle_v1* exclude) { - for (auto& w : m_vWorkspaces) { - if (w->m_pWlrHandle && w->m_pWlrHandle != exclude) - w->setActive(false); - } -} - CWindow* CCompositor::getNextWindowOnWorkspace(CWindow* pWindow, bool focusableOnly) { bool gotToWindow = false; for (auto& w : m_vWindows) { @@ -1565,15 +1548,6 @@ CWorkspace* CCompositor::getWorkspaceByString(const std::string& str) { return nullptr; } -CWorkspace* CCompositor::getWorkspaceByWorkspaceHandle(const wlr_ext_workspace_handle_v1* handle) { - for (auto& ws : m_vWorkspaces) { - if (ws->m_pWlrHandle == handle) - return ws.get(); - } - - return nullptr; -} - bool CCompositor::isPointOnAnyMonitor(const Vector2D& point) { for (auto& m : m_vMonitors) { if (VECINRECT(point, m->vecPosition.x, m->vecPosition.y, m->vecSize.x + m->vecPosition.x, m->vecSize.y + m->vecPosition.y)) @@ -2368,10 +2342,6 @@ CWorkspace* CCompositor::createNewWorkspace(const int& id, const int& monid, con const auto PWORKSPACE = m_vWorkspaces.emplace_back(std::make_unique<CWorkspace>(monID, NAME, SPECIAL)).get(); - // We are required to set the name here immediately - if (!SPECIAL) - wlr_ext_workspace_handle_v1_set_name(PWORKSPACE->m_pWlrHandle, NAME.c_str()); - PWORKSPACE->m_iID = id; PWORKSPACE->m_iMonitorID = monID; @@ -2388,7 +2358,6 @@ void CCompositor::renameWorkspace(const int& id, const std::string& name) { return; Debug::log(LOG, "renameWorkspace: Renaming workspace %d to '%s'", id, name.c_str()); - wlr_ext_workspace_handle_v1_set_name(PWORKSPACE->m_pWlrHandle, name.c_str()); PWORKSPACE->m_szName = name; } |
