Trensa-Organization/hy3
1
0
Fork 0
mirror of https://github.com/Trensa-Organization/hy3.git synced 2025-03-15 18:53:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into tabs

Browse source
This commit is contained in:
outfoxxed 2023-05-26 23:55:02 -07:00
commit 88b0c3a68c
No known key found for this signature in database
GPG key ID: 4C88A185FB89301E
5 changed files with 54 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
README.md
View file

@ -31,6 +31,16 @@ In your hyprland config replace the following dispatchers:
You can use `hy3:makegroup` to create a new split.
### Config fields
```conf
plugin {
hy3 {
# disable gaps when only one window is onscreen
no_gaps_when_only = <bool>
}
}
```
### Dispatcher list
- `hy3:makegroup, <h | v | opposite>` - make a vertical or horizontal split
- `hy3:movefocus, <l | u | d | r | left | down | up | right>` - move the focus left, up, down, or right

6
flake.lock generated
View file

@ -8,11 +8,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1684167111,
"narHash": "sha256-0JKyr8WOpcXJP5XaLnUSI7e1d7N5Rcpyf72+N4ZEtjo=",
"lastModified": 1685105343,
"narHash": "sha256-ypXKGzTQWJqbHHrPnSHLo4b2vNtfOFyh6sDdNPi7/WQ=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "5b84b0fb445bc4485510bba516c84141aaeafd04",
"rev": "5f4659afef5856c509d53957e62b7f6c38d39f41",
"type": "github"
},
"original": {

63
src/Hy3Layout.cpp
View file

@ -5,6 +5,8 @@
#include <hyprland/src/Compositor.hpp>
#include <hyprland/src/plugins/PluginAPI.hpp>
#include <sstream>
void errorNotif() {
HyprlandAPI::addNotificationV2(PHANDLE, {
{"text", "Something has gone very wrong. Check the log for details."},
@ -192,7 +194,7 @@ void Hy3Node::recalcSizePosRecursive(bool force) {
child->size.y = this->size.y - tab_height_offset;
child->position.x = this->position.x;
child->size.x = this->size.x;
//child->setHidden(group->lastFocusedChild != child);
//child->setHidden(group->focused_child != child);
break;
}
@ -244,10 +246,10 @@ std::string Hy3Node::getTitle() {
break;
}
if (this->data.as_group.lastFocusedChild == nullptr) {
if (this->data.as_group.focused_child == nullptr) {
title += "Group";
} else {
title += this->data.as_group.lastFocusedChild->getTitle();
title += this->data.as_group.focused_child->getTitle();
}
return title;
@ -266,11 +268,13 @@ void Hy3Node::markFocused() {
// update focus
if (this->data.type == Hy3NodeData::Group) {
this->data.as_group.lastFocusedChild = nullptr;
this->data.as_group.group_focused = true;
this->data.as_group.focused_child = nullptr;
}
while (node->parent != nullptr) {
node->parent->data.as_group.lastFocusedChild = node;
node->parent->data.as_group.focused_child = node;
node->parent->data.as_group.group_focused = false;
node = node->parent;
}
@ -311,10 +315,10 @@ Hy3Node* Hy3Node::getFocusedNode() {
case Hy3NodeData::Window:
return this;
case Hy3NodeData::Group:
if (this->data.as_group.lastFocusedChild == nullptr) {
if (this->data.as_group.focused_child == nullptr || this->data.as_group.group_focused) {
return this;
} else {
return this->data.as_group.lastFocusedChild->getFocusedNode();
return this->data.as_group.focused_child->getFocusedNode();
}
}
}
@ -362,10 +366,11 @@ Hy3Node* Hy3Node::removeFromParentRecursive() {
if (group.children.size() > 2) {
auto iter = std::find(group.children.begin(), group.children.end(), child);
group.group_focused = false;
if (iter == group.children.begin()) {
group.lastFocusedChild = *std::next(iter);
group.focused_child = *std::next(iter);
} else {
group.lastFocusedChild = *std::prev(iter);
group.focused_child = *std::prev(iter);
}
}
@ -375,8 +380,9 @@ Hy3Node* Hy3Node::removeFromParentRecursive() {
return nullptr;
}
group.group_focused = false;
if (group.children.size() == 1) {
group.lastFocusedChild = group.children.front();
group.focused_child = group.children.front();
}
auto child_size_ratio = child->size_ratio;
@ -418,7 +424,8 @@ Hy3Node* Hy3Node::intoGroup(Hy3GroupLayout layout) {
this->data = layout;
this->data.as_group.children.push_back(node);
this->data.as_group.lastFocusedChild = node;
this->data.as_group.group_focused = false;
this->data.as_group.focused_child = node;
this->recalcSizePosRecursive();
return node;
@ -533,10 +540,10 @@ void Hy3Layout::applyNodeDataToWindow(Hy3Node* node, bool force) {
const bool display_top = STICKS(node->position.y, monitor->vecPosition.y + monitor->vecReservedTopLeft.y);
const bool display_bottom = STICKS(node->position.y + node->size.y, monitor->vecPosition.y + monitor->vecSize.y - monitor->vecReservedBottomRight.y);
const auto* border_size = &g_pConfigManager->getConfigValuePtr("general:border_size")->intValue;
const auto* gaps_in = &g_pConfigManager->getConfigValuePtr("general:gaps_in")->intValue;
const auto* gaps_out = &g_pConfigManager->getConfigValuePtr("general:gaps_out")->intValue;
static auto* const single_window_no_gaps = &HyprlandAPI::getConfigValue(PHANDLE, "plugin:hy3:no_gaps_when_only")->intValue;
static const auto* border_size = &HyprlandAPI::getConfigValue(PHANDLE, "general:border_size")->intValue;
static const auto* gaps_in = &HyprlandAPI::getConfigValue(PHANDLE, "general:gaps_in")->intValue;
static const auto* gaps_out = &HyprlandAPI::getConfigValue(PHANDLE, "general:gaps_out")->intValue;
static const auto* single_window_no_gaps = &HyprlandAPI::getConfigValue(PHANDLE, "plugin:hy3:no_gaps_when_only")->intValue;
if (!g_pCompositor->windowExists(window) || !window->m_bIsMapped) {
Debug::log(ERR, "Node %p holding invalid window %p!!", node, window);
@ -551,14 +558,15 @@ void Hy3Layout::applyNodeDataToWindow(Hy3Node* node, bool force) {
auto calcPos = window->m_vPosition + Vector2D(*border_size, *border_size);
auto calcSize = window->m_vSize - Vector2D(2 * *border_size, 2 * *border_size);
const auto workspace_node_count = this->getWorkspaceNodeCount(window->m_iWorkspaceID);
auto root_node = this->getWorkspaceRootGroup(window->m_iWorkspaceID);
auto only_node = root_node->data.as_group.children.size() == 1
&& root_node->data.as_group.children.front()->data.type == Hy3NodeData::Window;
if (*single_window_no_gaps
&& !g_pCompositor->isWorkspaceSpecial(window->m_iWorkspaceID)
&& (workspace_node_count == 1
|| (window->m_bIsFullscreen
&& g_pCompositor->getWorkspaceByID(window->m_iWorkspaceID)->m_efFullscreenMode == FULLSCREEN_MAXIMIZED)))
{
if (!g_pCompositor->isWorkspaceSpecial(window->m_iWorkspaceID)
&& ((*single_window_no_gaps && only_node)
|| (window->m_bIsFullscreen
&& g_pCompositor->getWorkspaceByID(window->m_iWorkspaceID)->m_efFullscreenMode == FULLSCREEN_FULL))
) {
window->m_vRealPosition = window->m_vPosition;
window->m_vRealSize = window->m_vSize;
@ -1282,7 +1290,8 @@ Hy3Node* Hy3Layout::shiftOrGetFocus(Hy3Node& node, ShiftDirection direction, boo
auto* newChild = &this->nodes.back();
Hy3Node::swapData(*break_parent, *newChild);
break_parent->data.as_group.children.push_back(newChild);
break_parent->data.as_group.lastFocusedChild = newChild;
break_parent->data.as_group.group_focused = false;
break_parent->data.as_group.focused_child = newChild;
break_origin = newChild;
}
@ -1339,8 +1348,8 @@ Hy3Node* Hy3Layout::shiftOrGetFocus(Hy3Node& node, ShiftDirection direction, boo
shift_after = true;
}
} else {
if (group_data.lastFocusedChild != nullptr) {
iter = std::find(group_data.children.begin(), group_data.children.end(), group_data.lastFocusedChild);
if (group_data.focused_child != nullptr) {
iter = std::find(group_data.children.begin(), group_data.children.end(), group_data.focused_child);
shift_after = true;
} else {
iter = group_data.children.begin();
@ -1413,7 +1422,7 @@ void Hy3Layout::raiseFocus(int workspace) {
bool Hy3Layout::shouldRenderSelected(CWindow* window) {
if (window == nullptr) return false;
auto* root = this->getWorkspaceRootGroup(window->m_iWorkspaceID);
if (root == nullptr || root->data.as_group.lastFocusedChild == nullptr) return false;
if (root == nullptr || root->data.as_group.focused_child == nullptr) return false;
auto* focused = root->getFocusedNode();
if (focused == nullptr) return false;
@ -1498,7 +1507,7 @@ void renderTabsRecursive(Hy3Node& node) {
if (node.data.type == Hy3NodeData::Group) {
for (auto* child: node.data.as_group.children) {
if (node.data.as_group.layout != Hy3GroupLayout::Tabbed
|| node.data.as_group.lastFocusedChild == child)
|| node.data.as_group.focused_child == child)
{
renderTabsRecursive(*child);
}

3
src/Hy3Layout.hpp
View file

@ -25,7 +25,8 @@ enum class ShiftDirection {
struct Hy3GroupData {
Hy3GroupLayout layout = Hy3GroupLayout::SplitH;
std::list<Hy3Node*> children;
Hy3Node* lastFocusedChild = nullptr;
bool group_focused = true;
Hy3Node* focused_child = nullptr;
std::unique_ptr<Hy3TabGroup> tab_bar;
bool hasChild(Hy3Node* child);

6
src/TabGroup.cpp
View file

@ -84,7 +84,7 @@ void Hy3TabBar::updateNodeList(std::list<Hy3Node*>& nodes) {
this->entries.splice(std::next(entry), removed_entries, moved);
entry = moved;
} else {
entry = this->entries.insert(std::next(entry), Hy3TabBarEntry(*this, **node));
entry = this->entries.emplace(std::next(entry), *this, **node);
}
}
@ -222,8 +222,8 @@ void Hy3TabGroup::updateWithGroup(Hy3Node& node) {
this->bar.updateNodeList(node.data.as_group.children);
if (node.data.as_group.lastFocusedChild != nullptr) {
this->updateStencilWindows(*node.data.as_group.lastFocusedChild);
if (node.data.as_group.focused_child != nullptr) {
this->updateStencilWindows(*node.data.as_group.focused_child);
}
}