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

Merge pull request #2 from MightyPlaza/maxsize

Browse source 
fix groups and swallowing
This commit is contained in:
LamprosPitsillos 2023-09-04 22:05:52 +03:00 committed by GitHub
commit e21be1e977
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 44 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Compositor.cpp
View file

@ -1164,6 +1164,16 @@ int CCompositor::getWindowsOnWorkspace(const int& id) {
return no;
}
int CCompositor::getVisibleWindowsOnWorkspace(const int& id) {
int no = 0;
for (auto& w : m_vWindows) {
if (w->m_iWorkspaceID == id && w->m_bIsMapped && !w->isHidden())
no++;
}
return no;
}
CWindow* CCompositor::getUrgentWindow() {
for (auto& w : m_vWindows) {
if (w->m_bIsMapped && w->m_bIsUrgent)

1
src/Compositor.hpp
View file

@ -153,6 +153,7 @@ class CCompositor {
void sanityCheckWorkspaces();
void updateWorkspaceWindowDecos(const int&);
int getWindowsOnWorkspace(const int&);
int getVisibleWindowsOnWorkspace(const int&);
CWindow* getUrgentWindow();
bool hasUrgentWindowOnWorkspace(const int&);
CWindow* getFirstWindowOnWorkspace(const int&);

8
src/Window.cpp
View file

@ -417,8 +417,6 @@ void CWindow::onUnmap() {
void CWindow::onMap() {
static auto* const PISOLATESPECIAL = &g_pConfigManager->getConfigValuePtr("misc:isolate_special")->intValue;
m_pWLSurface.assign(g_pXWaylandManager->getWindowSurface(this));
// JIC, reset the callbacks. If any are set, we'll make sure they are cleared so we don't accidentally unset them. (In case a window got remapped)
@ -449,12 +447,6 @@ void CWindow::onMap() {
hyprListener_unmapWindow.initCallback(m_bIsX11 ? &m_uSurface.xwayland->surface->events.unmap : &m_uSurface.xdg->surface->events.unmap, &Events::listener_unmapWindow, this,
"CWindow");
if (*PISOLATESPECIAL && g_pCompositor->getWindowsOnWorkspace(m_iWorkspaceID) > *PISOLATESPECIAL && g_pCompositor->isWorkspaceSpecial(m_iWorkspaceID)) {
const auto PMONITOR = g_pCompositor->getMonitorFromID(m_iMonitorID);
this->moveToWorkspace(PMONITOR->activeWorkspace);
}
}
void CWindow::onBorderAngleAnimEnd(void* ptr) {

3
src/config/ConfigManager.cpp
View file

@ -114,7 +114,6 @@ void CConfigManager::setDefaultVars() {
configValues["misc:groupbar_titles_font_size"].intValue = 8;
configValues["misc:groupbar_gradients"].intValue = 1;
configValues["misc:close_special_on_empty"].intValue = 1;
configValues["misc:isolate_special"].intValue = 0;
configValues["misc:groupbar_text_color"].intValue = 0xffffffff;
configValues["misc:background_color"].intValue = 0xff111111;
@ -1159,6 +1158,8 @@ void CConfigManager::handleWorkspaceRules(const std::string& command, const std:
wsRule.monitor = rule.substr(delim + 8);
else if ((delim = rule.find("default:")) != std::string::npos)
wsRule.isDefault = configStringToInt(rule.substr(delim + 8));
else if ((delim = rule.find("maxsize:")) != std::string::npos)
wsRule.maxSize = configStringToInt(rule.substr(delim + 8));
};
size_t pos = 0;

1
src/config/ConfigManager.hpp
View file

@ -42,6 +42,7 @@ struct SWorkspaceRule {
std::string workspaceName = "";
int workspaceId = -1;
bool isDefault = false;
int maxSize = 0;
std::optional<int64_t> gapsIn;
std::optional<int64_t> gapsOut;
std::optional<int64_t> borderSize;

32
src/events/Windows.cpp
View file

@ -229,13 +229,15 @@ void Events::listener_mapWindow(void* owner, void* data) {
if (PWINDOW->m_bPinned && !PWINDOW->m_bIsFloating)
PWINDOW->m_bPinned = false;
const CVarList WORKSPACEARGS = CVarList(requestedWorkspace, 2, ' ');
bool isWorkspaceSet = false;
const CVarList WORKSPACEARGS = CVarList(requestedWorkspace, 2, ' ');
if (!WORKSPACEARGS[0].empty()) {
std::string requestedWorkspaceName;
const int REQUESTEDWORKSPACEID = getWorkspaceIDFromString(WORKSPACEARGS[0], requestedWorkspaceName);
if (REQUESTEDWORKSPACEID != INT_MAX) {
isWorkspaceSet = true;
if (WORKSPACEARGS[1].find("silent") == 0)
workspaceSilent = true;
@ -255,7 +257,7 @@ void Events::listener_mapWindow(void* owner, void* data) {
if (pWorkspace->m_bIsSpecialWorkspace)
g_pCompositor->getMonitorFromID(pWorkspace->m_iMonitorID)->setSpecialWorkspace(pWorkspace);
else
g_pKeybindManager->m_mDispatchers["workspace"](requestedWorkspaceName);
g_pKeybindManager->m_mDispatchers["workspace"](pWorkspace->m_szName);
PMONITOR = g_pCompositor->m_pLastMonitor;
}
@ -570,6 +572,32 @@ void Events::listener_mapWindow(void* owner, void* data) {
}
}
if (!isWorkspaceSet) {
auto pWorkspace = g_pCompositor->getWorkspaceByID(PWINDOW->m_iWorkspaceID);
auto workspaceRule = pWorkspace ? g_pConfigManager->getWorkspaceRuleFor(pWorkspace) : SWorkspaceRule{};
const auto PMONITOR = g_pCompositor->getMonitorFromID(PWINDOW->m_iMonitorID);
int maxSize = workspaceRule.maxSize;
if (maxSize != 0 && maxSize < g_pCompositor->getVisibleWindowsOnWorkspace(pWorkspace->m_iID)) {
if (pWorkspace->m_bIsSpecialWorkspace) {
g_pCompositor->moveWindowToWorkspaceSafe(PWINDOW, g_pCompositor->getWorkspaceByID(PMONITOR->activeWorkspace));
PMONITOR->setSpecialWorkspace(nullptr);
}
pWorkspace = g_pCompositor->getWorkspaceByID(PMONITOR->activeWorkspace);
workspaceRule = pWorkspace ? g_pConfigManager->getWorkspaceRuleFor(pWorkspace) : SWorkspaceRule{};
maxSize = workspaceRule.maxSize;
if (maxSize != 0 && maxSize < g_pCompositor->getVisibleWindowsOnWorkspace(pWorkspace->m_iID)) {
std::string requestedWorkspaceName;
const int REQUESTEDWORKSPACEID = getWorkspaceIDFromString("empty", requestedWorkspaceName);
// doesn't exist since it's empty
pWorkspace = g_pCompositor->createNewWorkspace(REQUESTEDWORKSPACEID, PWINDOW->m_iMonitorID, requestedWorkspaceName);
g_pCompositor->moveWindowToWorkspaceSafe(PWINDOW, pWorkspace);
g_pKeybindManager->m_mDispatchers["workspace"](pWorkspace->m_szName);
}
}
}
PWINDOW->m_bFirstMap = false;
Debug::log(LOG, "Map request dispatched, monitor %s, xywh: %f %f %f %f", PMONITOR->szName.c_str(), PWINDOW->m_vRealPosition.goalv().x, PWINDOW->m_vRealPosition.goalv().y,