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

keybinds: implement pushactivetobottom dispacher (#3217)

Browse source 
Co-authored-by: Leeman <lstrout@enlj.com>
This commit is contained in:
alaricljs 2023-09-21 17:18:26 -04:00 committed by GitHub
parent d41a91e050
commit e4ddfcfa0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 79 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/Compositor.cpp
View file

@ -1240,43 +1240,60 @@ bool CCompositor::isWindowActive(CWindow* pWindow) {
return PSURFACE == m_pLastFocus || pWindow == m_pLastWindow; return PSURFACE == m_pLastFocus || pWindow == m_pLastWindow;
} }
void CCompositor::moveWindowToTop(CWindow* pWindow) { void CCompositor::changeWindowZOrder(CWindow* pWindow, bool top) {
if (!windowValidMapped(pWindow)) if (!windowValidMapped(pWindow))
return; return;
auto moveToTop = [&](CWindow* pw) -> void { auto moveToZ = [&](CWindow* pw, bool top) -> void {
if (top) {
for (auto it = m_vWindows.begin(); it != m_vWindows.end(); ++it) { for (auto it = m_vWindows.begin(); it != m_vWindows.end(); ++it) {
if (it->get() == pw) { if (it->get() == pw) {
std::rotate(it, it + 1, m_vWindows.end()); std::rotate(it, it + 1, m_vWindows.end());
break; break;
} }
} }
} else {
for (auto it = m_vWindows.rbegin(); it != m_vWindows.rend(); ++it) {
if (it->get() == pw) {
std::rotate(it, it + 1, m_vWindows.rend());
break;
}
}
}
if (pw->m_bIsMapped) if (pw->m_bIsMapped)
g_pHyprRenderer->damageMonitor(getMonitorFromID(pw->m_iMonitorID)); g_pHyprRenderer->damageMonitor(getMonitorFromID(pw->m_iMonitorID));
}; };
moveToTop(pWindow); if (top)
pWindow->m_bCreatedOverFullscreen = true; pWindow->m_bCreatedOverFullscreen = true;
if (!pWindow->m_bIsX11) if (!pWindow->m_bIsX11) {
moveToZ(pWindow, top);
return; return;
} else {
// move all children // move X11 window stack
std::deque<CWindow*> toMove; std::deque<CWindow*> toMove;
auto x11Stack = [&](CWindow* pw, bool top, auto&& x11Stack) -> void {
if (top)
toMove.emplace_back(pw);
else
toMove.emplace_front(pw);
for (auto& w : m_vWindows) { for (auto& w : m_vWindows) {
if (w->m_bIsMapped && w->m_bMappedX11 && !w->isHidden() && w->m_bIsX11 && w->X11TransientFor() == pWindow) { if (w->m_bIsMapped && w->m_bMappedX11 && !w->isHidden() && w->m_bIsX11 && w->X11TransientFor() == pw) {
toMove.emplace_back(w.get()); x11Stack(w.get(), top, x11Stack);
} }
} }
};
for (auto& pw : toMove) { x11Stack(pWindow, top, x11Stack);
moveToTop(pw);
moveWindowToTop(pw); for (auto it : toMove) {
moveToZ(it, top);
}
} }
} }

5
src/Compositor.hpp
View file

@ -28,8 +28,7 @@
#include "hyprerror/HyprError.hpp" #include "hyprerror/HyprError.hpp"
#include "plugins/PluginSystem.hpp" #include "plugins/PluginSystem.hpp"
enum eManagersInitStage enum eManagersInitStage {
{
STAGE_PRIORITY = 0, STAGE_PRIORITY = 0,
STAGE_LATE STAGE_LATE
}; };
@ -160,7 +159,7 @@ class CCompositor {
CWindow* getFullscreenWindowOnWorkspace(const int&); CWindow* getFullscreenWindowOnWorkspace(const int&);
bool doesSeatAcceptInput(wlr_surface*); bool doesSeatAcceptInput(wlr_surface*);
bool isWindowActive(CWindow*); bool isWindowActive(CWindow*);
void moveWindowToTop(CWindow*); void changeWindowZOrder(CWindow*, bool);
void cleanupFadingOut(const int& monid); void cleanupFadingOut(const int& monid);
CWindow* getWindowInDirection(CWindow*, char); CWindow* getWindowInDirection(CWindow*, char);
CWindow* getNextWindowOnWorkspace(CWindow*, bool focusableOnly = false); CWindow* getNextWindowOnWorkspace(CWindow*, bool focusableOnly = false);

10
src/events/Windows.cpp
View file

@ -406,7 +406,7 @@ void Events::listener_mapWindow(void* owner, void* data) {
// because the windows are animated on RealSize // because the windows are animated on RealSize
PWINDOW->m_vPseudoSize = PWINDOW->m_vRealSize.goalv(); PWINDOW->m_vPseudoSize = PWINDOW->m_vRealSize.goalv();
g_pCompositor->moveWindowToTop(PWINDOW); g_pCompositor->changeWindowZOrder(PWINDOW, true);
} else { } else {
g_pLayoutManager->getCurrentLayout()->onWindowCreated(PWINDOW); g_pLayoutManager->getCurrentLayout()->onWindowCreated(PWINDOW);
@ -903,7 +903,7 @@ void Events::listener_activateXDG(wl_listener* listener, void* data) {
return; return;
if (PWINDOW->m_bIsFloating) if (PWINDOW->m_bIsFloating)
g_pCompositor->moveWindowToTop(PWINDOW); g_pCompositor->changeWindowZOrder(PWINDOW, true);
g_pCompositor->focusWindow(PWINDOW); g_pCompositor->focusWindow(PWINDOW);
g_pCompositor->warpCursorTo(PWINDOW->middle()); g_pCompositor->warpCursorTo(PWINDOW->middle());
@ -937,7 +937,7 @@ void Events::listener_activateX11(void* owner, void* data) {
return; return;
if (PWINDOW->m_bIsFloating) if (PWINDOW->m_bIsFloating)
g_pCompositor->moveWindowToTop(PWINDOW); g_pCompositor->changeWindowZOrder(PWINDOW, true);
g_pCompositor->focusWindow(PWINDOW); g_pCompositor->focusWindow(PWINDOW);
g_pCompositor->warpCursorTo(PWINDOW->middle()); g_pCompositor->warpCursorTo(PWINDOW->middle());
@ -985,7 +985,7 @@ void Events::listener_configureX11(void* owner, void* data) {
PWINDOW->m_iWorkspaceID = g_pCompositor->getMonitorFromVector(PWINDOW->m_vRealPosition.vec() + PWINDOW->m_vRealSize.vec() / 2.f)->activeWorkspace; PWINDOW->m_iWorkspaceID = g_pCompositor->getMonitorFromVector(PWINDOW->m_vRealPosition.vec() + PWINDOW->m_vRealSize.vec() / 2.f)->activeWorkspace;
g_pCompositor->moveWindowToTop(PWINDOW); g_pCompositor->changeWindowZOrder(PWINDOW, true);
PWINDOW->m_bCreatedOverFullscreen = true; PWINDOW->m_bCreatedOverFullscreen = true;
@ -1042,7 +1042,7 @@ void Events::listener_unmanagedSetGeometry(void* owner, void* data) {
PWINDOW->m_iWorkspaceID = g_pCompositor->getMonitorFromVector(PWINDOW->m_vRealPosition.vec() + PWINDOW->m_vRealSize.vec() / 2.f)->activeWorkspace; PWINDOW->m_iWorkspaceID = g_pCompositor->getMonitorFromVector(PWINDOW->m_vRealPosition.vec() + PWINDOW->m_vRealSize.vec() / 2.f)->activeWorkspace;
g_pCompositor->moveWindowToTop(PWINDOW); g_pCompositor->changeWindowZOrder(PWINDOW, true);
PWINDOW->updateWindowDecos(); PWINDOW->updateWindowDecos();
g_pHyprRenderer->damageWindow(PWINDOW); g_pHyprRenderer->damageWindow(PWINDOW);
} }

2
src/layout/DwindleLayout.cpp
View file

@ -851,7 +851,7 @@ void CHyprDwindleLayout::fullscreenRequestForWindow(CWindow* pWindow, eFullscree
g_pXWaylandManager->setWindowSize(pWindow, pWindow->m_vRealSize.goalv()); g_pXWaylandManager->setWindowSize(pWindow, pWindow->m_vRealSize.goalv());
g_pCompositor->moveWindowToTop(pWindow); g_pCompositor->changeWindowZOrder(pWindow, true);
recalculateMonitor(PMONITOR->ID); recalculateMonitor(PMONITOR->ID);
} }

6
src/layout/IHyprLayout.cpp
View file

@ -161,7 +161,7 @@ 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->moveWindowToTop(pWindow); g_pCompositor->changeWindowZOrder(pWindow, true);
} }
} }
@ -237,7 +237,7 @@ void IHyprLayout::onBeginDragWindow() {
g_pKeybindManager->shadowKeybinds(); g_pKeybindManager->shadowKeybinds();
g_pCompositor->focusWindow(DRAGGINGWINDOW); g_pCompositor->focusWindow(DRAGGINGWINDOW);
g_pCompositor->moveWindowToTop(DRAGGINGWINDOW); g_pCompositor->changeWindowZOrder(DRAGGINGWINDOW, true);
} }
void IHyprLayout::onEndDragWindow() { void IHyprLayout::onEndDragWindow() {
@ -436,7 +436,7 @@ void IHyprLayout::changeWindowFloatingMode(CWindow* pWindow) {
} else { } else {
onWindowRemovedTiling(pWindow); onWindowRemovedTiling(pWindow);
g_pCompositor->moveWindowToTop(pWindow); g_pCompositor->changeWindowZOrder(pWindow, true);
if (DELTALESSTHAN(pWindow->m_vRealSize.vec().x, pWindow->m_vLastFloatingSize.x, 10) && DELTALESSTHAN(pWindow->m_vRealSize.vec().y, pWindow->m_vLastFloatingSize.y, 10)) { if (DELTALESSTHAN(pWindow->m_vRealSize.vec().x, pWindow->m_vLastFloatingSize.x, 10) && DELTALESSTHAN(pWindow->m_vRealSize.vec().y, pWindow->m_vLastFloatingSize.y, 10)) {
pWindow->m_vRealPosition = pWindow->m_vRealPosition.goalv() + (pWindow->m_vRealSize.goalv() - pWindow->m_vLastFloatingSize) / 2.f + Vector2D{10, 10}; pWindow->m_vRealPosition = pWindow->m_vRealPosition.goalv() + (pWindow->m_vRealSize.goalv() - pWindow->m_vLastFloatingSize) / 2.f + Vector2D{10, 10};

2
src/layout/MasterLayout.cpp
View file

@ -868,7 +868,7 @@ void CHyprMasterLayout::fullscreenRequestForWindow(CWindow* pWindow, eFullscreen
g_pXWaylandManager->setWindowSize(pWindow, pWindow->m_vRealSize.goalv()); g_pXWaylandManager->setWindowSize(pWindow, pWindow->m_vRealSize.goalv());
g_pCompositor->moveWindowToTop(pWindow); g_pCompositor->changeWindowZOrder(pWindow, true);
recalculateMonitor(PMONITOR->ID); recalculateMonitor(PMONITOR->ID);
} }

28
src/managers/KeybindManager.cpp
View file

@ -63,6 +63,7 @@ CKeybindManager::CKeybindManager() {
m_mDispatchers["pin"] = pinActive; m_mDispatchers["pin"] = pinActive;
m_mDispatchers["mouse"] = mouse; m_mDispatchers["mouse"] = mouse;
m_mDispatchers["bringactivetotop"] = bringActiveToTop; m_mDispatchers["bringactivetotop"] = bringActiveToTop;
m_mDispatchers["alterzorder"] = alterZOrder;
m_mDispatchers["focusurgentorlast"] = focusUrgentOrLast; m_mDispatchers["focusurgentorlast"] = focusUrgentOrLast;
m_mDispatchers["focuscurrentorlast"] = focusCurrentOrLast; m_mDispatchers["focuscurrentorlast"] = focusCurrentOrLast;
m_mDispatchers["lockgroups"] = lockGroups; m_mDispatchers["lockgroups"] = lockGroups;
@ -1910,7 +1911,32 @@ void CKeybindManager::mouse(std::string args) {
void CKeybindManager::bringActiveToTop(std::string args) { void CKeybindManager::bringActiveToTop(std::string args) {
if (g_pCompositor->m_pLastWindow && g_pCompositor->m_pLastWindow->m_bIsFloating) if (g_pCompositor->m_pLastWindow && g_pCompositor->m_pLastWindow->m_bIsFloating)
g_pCompositor->moveWindowToTop(g_pCompositor->m_pLastWindow); g_pCompositor->changeWindowZOrder(g_pCompositor->m_pLastWindow, true);
}
void CKeybindManager::alterZOrder(std::string args) {
const auto WINDOWREGEX = args.substr(args.find_first_of(',') + 1);
const auto POSITION = args.substr(0, args.find_first_of(','));
auto PWINDOW = g_pCompositor->getWindowByRegex(WINDOWREGEX);
if (!PWINDOW && g_pCompositor->m_pLastWindow && g_pCompositor->m_pLastWindow->m_bIsFloating)
PWINDOW = g_pCompositor->m_pLastWindow;
if (!PWINDOW) {
Debug::log(ERR, "alterZOrder: no window");
return;
}
if (POSITION == "top")
g_pCompositor->changeWindowZOrder(PWINDOW, 1);
else if (POSITION == "bottom")
g_pCompositor->changeWindowZOrder(PWINDOW, 0);
else {
Debug::log(ERR, "alterZOrder: bad position: %s", POSITION);
return;
}
g_pInputManager->simulateMouseMovement();
} }
void CKeybindManager::fakeFullscreenActive(std::string args) { void CKeybindManager::fakeFullscreenActive(std::string args) {

1
src/managers/KeybindManager.hpp
View file

@ -143,6 +143,7 @@ class CKeybindManager {
static void pinActive(std::string); static void pinActive(std::string);
static void mouse(std::string); static void mouse(std::string);
static void bringActiveToTop(std::string); static void bringActiveToTop(std::string);
static void alterZOrder(std::string);
static void lockGroups(std::string); static void lockGroups(std::string);
static void lockActiveGroup(std::string); static void lockActiveGroup(std::string);
static void moveIntoGroup(std::string); static void moveIntoGroup(std::string);

2
src/managers/input/InputManager.cpp
View file

@ -600,7 +600,7 @@ void CInputManager::processMouseDownNormal(wlr_pointer_button_event* e) {
// if clicked on a floating window make it top // if clicked on a floating window make it top
if (g_pCompositor->m_pLastWindow && g_pCompositor->m_pLastWindow->m_bIsFloating) if (g_pCompositor->m_pLastWindow && g_pCompositor->m_pLastWindow->m_bIsFloating)
g_pCompositor->moveWindowToTop(g_pCompositor->m_pLastWindow); g_pCompositor->changeWindowZOrder(g_pCompositor->m_pLastWindow, true);
break; break;
case WLR_BUTTON_RELEASED: break; case WLR_BUTTON_RELEASED: break;