cry/Hyprland
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

algo/master: fix orientation cycling (#13372)

Browse source
This commit is contained in:
Vaxry 2026-02-25 23:54:13 +00:00 • committed by GitHub
parent 623185170b
commit 1e06ab464f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 88 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

50
hyprtester/src/tests/main/master.cpp
View file

@ -3,7 +3,53 @@
#include "../../hyprctlCompat.hpp" #include "../../hyprctlCompat.hpp"
#include "tests.hpp" #include "tests.hpp"
static int ret = 0; static int ret = 0;
// reqs 1 master 3 slaves
static void testOrientations() {
OK(getFromSocket("/keyword master:orientation top"));
// top
{
auto str = getFromSocket("/activewindow");
EXPECT_CONTAINS(str, "at: 22,22");
EXPECT_CONTAINS(str, "size: 1876");
}
// cycle = top, right, bottom, center, left
// right
OK(getFromSocket("/dispatch layoutmsg orientationnext"));
{
auto str = getFromSocket("/activewindow");
EXPECT_CONTAINS(str, "at: 873,22");
EXPECT_CONTAINS(str, "size: 1025,1036");
}
// bottom
OK(getFromSocket("/dispatch layoutmsg orientationnext"));
{
auto str = getFromSocket("/activewindow");
EXPECT_CONTAINS(str, "at: 22,495");
EXPECT_CONTAINS(str, "size: 1876");
}
// center
OK(getFromSocket("/dispatch layoutmsg orientationnext"));
{
auto str = getFromSocket("/activewindow");
EXPECT_CONTAINS(str, "at: 450,22");
EXPECT_CONTAINS(str, "size: 1020,1036");
}
// left
OK(getFromSocket("/dispatch layoutmsg orientationnext"));
{
auto str = getFromSocket("/activewindow");
EXPECT_CONTAINS(str, "at: 22,22");
EXPECT_CONTAINS(str, "size: 1025,1036");
}
}
static void focusMasterPrevious() { static void focusMasterPrevious() {
// setup // setup
@ -44,6 +90,8 @@ static void focusMasterPrevious() {
OK(getFromSocket("/dispatch layoutmsg focusmaster previous")); OK(getFromSocket("/dispatch layoutmsg focusmaster previous"));
EXPECT_CONTAINS(getFromSocket("/activewindow"), "class: master"); EXPECT_CONTAINS(getFromSocket("/activewindow"), "class: master");
testOrientations();
// clean up // clean up
NLog::log("{}Killing all windows", Colors::YELLOW); NLog::log("{}Killing all windows", Colors::YELLOW);
Tests::killAllWindows(); Tests::killAllWindows();

68
src/layout/algorithm/tiled/master/MasterAlgorithm.cpp
View file

@ -668,15 +668,15 @@ std::expected<void, std::string> CMasterAlgorithm::layoutMsg(const std::string_v
g_pCompositor->setWindowFullscreenInternal(PWINDOW, FSMODE_NONE); g_pCompositor->setWindowFullscreenInternal(PWINDOW, FSMODE_NONE);
if (command == "orientationleft") if (command == "orientationleft")
m_workspaceData.orientation = ORIENTATION_LEFT; m_workspaceData.explicitOrientation = ORIENTATION_LEFT;
else if (command == "orientationright") else if (command == "orientationright")
m_workspaceData.orientation = ORIENTATION_RIGHT; m_workspaceData.explicitOrientation = ORIENTATION_RIGHT;
else if (command == "orientationtop") else if (command == "orientationtop")
m_workspaceData.orientation = ORIENTATION_TOP; m_workspaceData.explicitOrientation = ORIENTATION_TOP;
else if (command == "orientationbottom") else if (command == "orientationbottom")
m_workspaceData.orientation = ORIENTATION_BOTTOM; m_workspaceData.explicitOrientation = ORIENTATION_BOTTOM;
else if (command == "orientationcenter") else if (command == "orientationcenter")
m_workspaceData.orientation = ORIENTATION_CENTER; m_workspaceData.explicitOrientation = ORIENTATION_CENTER;
calculateWorkspace(); calculateWorkspace();
} else if (command == "orientationnext") { } else if (command == "orientationnext") {
@ -837,6 +837,34 @@ void CMasterAlgorithm::buildOrientationCycleVectorFromEOperation(std::vector<eOr
} }
} }
eOrientation CMasterAlgorithm::defaultOrientation() {
static auto PORIENT = CConfigValue<std::string>("master:orientation");
const auto WORKSPACERULE = g_pConfigManager->getWorkspaceRuleFor(m_parent->space()->workspace());
std::string orientationString;
if (WORKSPACERULE.layoutopts.contains("orientation"))
orientationString = WORKSPACERULE.layoutopts.at("orientation");
else
orientationString = *PORIENT;
eOrientation orientation = ORIENTATION_LEFT;
// override if workspace rule is set
if (!orientationString.empty()) {
if (orientationString == "top")
orientation = ORIENTATION_TOP;
else if (orientationString == "right")
orientation = ORIENTATION_RIGHT;
else if (orientationString == "bottom")
orientation = ORIENTATION_BOTTOM;
else if (orientationString == "center")
orientation = ORIENTATION_CENTER;
else
orientation = ORIENTATION_LEFT;
}
return orientation;
}
void CMasterAlgorithm::runOrientationCycle(Hyprutils::String::CVarList2* vars, int next) { void CMasterAlgorithm::runOrientationCycle(Hyprutils::String::CVarList2* vars, int next) {
std::vector<eOrientation> cycle; std::vector<eOrientation> cycle;
if (vars != nullptr) if (vars != nullptr)
@ -854,7 +882,7 @@ void CMasterAlgorithm::runOrientationCycle(Hyprutils::String::CVarList2* vars, i
int nextOrPrev = 0; int nextOrPrev = 0;
for (size_t i = 0; i < cycle.size(); ++i) { for (size_t i = 0; i < cycle.size(); ++i) {
if (m_workspaceData.orientation == cycle[i]) { if (m_workspaceData.explicitOrientation.value_or(defaultOrientation()) == cycle[i]) {
nextOrPrev = i + next; nextOrPrev = i + next;
break; break;
} }
@ -865,36 +893,12 @@ void CMasterAlgorithm::runOrientationCycle(Hyprutils::String::CVarList2* vars, i
else if (nextOrPrev < 0) else if (nextOrPrev < 0)
nextOrPrev = cycle.size() + (nextOrPrev % sc<int>(cycle.size())); nextOrPrev = cycle.size() + (nextOrPrev % sc<int>(cycle.size()));
m_workspaceData.orientation = cycle.at(nextOrPrev); m_workspaceData.explicitOrientation = cycle.at(nextOrPrev);
calculateWorkspace(); calculateWorkspace();
} }
eOrientation CMasterAlgorithm::getDynamicOrientation() { eOrientation CMasterAlgorithm::getDynamicOrientation() {
static auto PORIENT = CConfigValue<std::string>("master:orientation"); return m_workspaceData.explicitOrientation.value_or(defaultOrientation());
const auto WORKSPACERULE = g_pConfigManager->getWorkspaceRuleFor(m_parent->space()->workspace());
std::string orientationString;
if (WORKSPACERULE.layoutopts.contains("orientation"))
orientationString = WORKSPACERULE.layoutopts.at("orientation");
else
orientationString = *PORIENT;
eOrientation orientation = m_workspaceData.orientation;
// override if workspace rule is set
if (!orientationString.empty()) {
if (orientationString == "top")
orientation = ORIENTATION_TOP;
else if (orientationString == "right")
orientation = ORIENTATION_RIGHT;
else if (orientationString == "bottom")
orientation = ORIENTATION_BOTTOM;
else if (orientationString == "center")
orientation = ORIENTATION_CENTER;
else
orientation = ORIENTATION_LEFT;
}
return orientation;
} }
int CMasterAlgorithm::getNodesNo() { int CMasterAlgorithm::getNodesNo() {

5
src/layout/algorithm/tiled/master/MasterAlgorithm.hpp
View file

@ -19,8 +19,8 @@ namespace Layout::Tiled {
}; };
struct SMasterWorkspaceData { struct SMasterWorkspaceData {
WORKSPACEID workspaceID = WORKSPACE_INVALID; WORKSPACEID workspaceID = WORKSPACE_INVALID;
eOrientation orientation = ORIENTATION_LEFT; std::optional<eOrientation> explicitOrientation;
// Previously focused non-master window when `focusmaster previous` command was issued // Previously focused non-master window when `focusmaster previous` command was issued
WP<ITarget> focusMasterPrev; WP<ITarget> focusMasterPrev;
@ -71,5 +71,6 @@ namespace Layout::Tiled {
SP<ITarget> getNextTarget(SP<ITarget>, bool, bool); SP<ITarget> getNextTarget(SP<ITarget>, bool, bool);
int getMastersNo(); int getMastersNo();
bool isWindowTiled(PHLWINDOW); bool isWindowTiled(PHLWINDOW);
eOrientation defaultOrientation();
}; };
}; };