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

don't add existing and invalid monitors

Browse source
This commit is contained in:
vaxerski 2022-05-29 20:15:34 +02:00
parent f5645805d8
commit b76b32b458
3 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Compositor.cpp
View file

@ -255,6 +255,16 @@ SMonitor* CCompositor::getMonitorFromID(const int& id) {
return nullptr; return nullptr;
} }
SMonitor* CCompositor::getMonitorFromName(const std::string& name) {
for (auto& m : m_lMonitors) {
if (m.szName == name) {
return &m;
}
}
return nullptr;
}
SMonitor* CCompositor::getMonitorFromCursor() { SMonitor* CCompositor::getMonitorFromCursor() {
const auto COORDS = Vector2D(m_sWLRCursor->x, m_sWLRCursor->y); const auto COORDS = Vector2D(m_sWLRCursor->x, m_sWLRCursor->y);

1
src/Compositor.hpp
View file

@ -86,6 +86,7 @@ public:
// ------------------------------------------------- // // ------------------------------------------------- //
SMonitor* getMonitorFromID(const int&); SMonitor* getMonitorFromID(const int&);
SMonitor* getMonitorFromName(const std::string&);
SMonitor* getMonitorFromCursor(); SMonitor* getMonitorFromCursor();
SMonitor* getMonitorFromVector(const Vector2D&); SMonitor* getMonitorFromVector(const Vector2D&);
void removeWindowFromVectorSafe(CWindow*); void removeWindowFromVectorSafe(CWindow*);

10
src/events/Monitors.cpp
View file

@ -48,6 +48,16 @@ void Events::listener_newOutput(wl_listener* listener, void* data) {
// new monitor added, let's accomodate for that. // new monitor added, let's accomodate for that.
const auto OUTPUT = (wlr_output*)data; const auto OUTPUT = (wlr_output*)data;
if (!OUTPUT->name) {
Debug::log(ERR, "New monitor has no name?? Ignoring");
return;
}
if (g_pCompositor->getMonitorFromName(std::string(OUTPUT->name))) {
Debug::log(WARN, "Monitor with name %s already exists, not adding as new!", OUTPUT->name);
return;
}
// get monitor rule that matches // get monitor rule that matches
SMonitorRule monitorRule = g_pConfigManager->getMonitorRuleFor(OUTPUT->name); SMonitorRule monitorRule = g_pConfigManager->getMonitorRuleFor(OUTPUT->name);