mirror of https://github.com/hyprwm/Hyprland
hyprctl: Add 'layouts' command (#3895)
* Add hyprctl 'layouts' command formatting * Add getAllLayoutNames(), move m_vLayouts back to private Formatting * clang-format
This commit is contained in:
parent
572fd554b8
commit
4729265284
|
@ -52,6 +52,7 @@ commands:
|
|||
notify
|
||||
globalshortcuts
|
||||
instances
|
||||
layouts
|
||||
|
||||
flags:
|
||||
-j -> output in JSON
|
||||
|
@ -420,6 +421,8 @@ int main(int argc, char** argv) {
|
|||
request(fullRequest, 2);
|
||||
else if (fullRequest.contains("/hyprpaper"))
|
||||
requestHyprpaper(fullRequest);
|
||||
else if (fullRequest.contains("/layouts"))
|
||||
request(fullRequest);
|
||||
else if (fullRequest.contains("/--help"))
|
||||
printf("%s", USAGE.c_str());
|
||||
else {
|
||||
|
|
|
@ -423,6 +423,28 @@ std::string layersRequest(HyprCtl::eHyprCtlOutputFormat format) {
|
|||
return result;
|
||||
}
|
||||
|
||||
std::string layoutsRequest(HyprCtl::eHyprCtlOutputFormat format) {
|
||||
std::string result = "";
|
||||
if (format == HyprCtl::FORMAT_JSON) {
|
||||
result += "[";
|
||||
|
||||
for (auto& m : g_pLayoutManager->getAllLayoutNames()) {
|
||||
result += std::format(
|
||||
R"#(
|
||||
"{}",)#",
|
||||
m);
|
||||
}
|
||||
trimTrailingComma(result);
|
||||
|
||||
result += "\n]\n";
|
||||
} else {
|
||||
for (auto& m : g_pLayoutManager->getAllLayoutNames()) {
|
||||
result += std::format("{}\n", m);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
std::string devicesRequest(HyprCtl::eHyprCtlOutputFormat format) {
|
||||
std::string result = "";
|
||||
|
||||
|
@ -1377,6 +1399,8 @@ std::string getReply(std::string request) {
|
|||
return animationsRequest(format);
|
||||
else if (request == "rollinglog")
|
||||
return rollinglogRequest(format);
|
||||
else if (request == "layouts")
|
||||
return layoutsRequest(format);
|
||||
else if (request.starts_with("plugin"))
|
||||
return dispatchPlugin(request);
|
||||
else if (request.starts_with("notify"))
|
||||
|
|
|
@ -51,3 +51,10 @@ bool CLayoutManager::removeLayout(IHyprLayout* layout) {
|
|||
|
||||
return true;
|
||||
}
|
||||
|
||||
std::vector<std::string> CLayoutManager::getAllLayoutNames() {
|
||||
std::vector<std::string> results(m_vLayouts.size());
|
||||
for (size_t i = 0; i < m_vLayouts.size(); ++i)
|
||||
results[i] = m_vLayouts[i].first;
|
||||
return results;
|
||||
}
|
||||
|
|
|
@ -13,10 +13,10 @@ class CLayoutManager {
|
|||
|
||||
bool addLayout(const std::string& name, IHyprLayout* layout);
|
||||
bool removeLayout(IHyprLayout* layout);
|
||||
std::vector<std::string> getAllLayoutNames();
|
||||
|
||||
private:
|
||||
enum HYPRLAYOUTS
|
||||
{
|
||||
enum HYPRLAYOUTS {
|
||||
LAYOUT_DWINDLE = 0,
|
||||
LAYOUT_MASTER
|
||||
};
|
||||
|
@ -25,7 +25,6 @@ class CLayoutManager {
|
|||
|
||||
CHyprDwindleLayout m_cDwindleLayout;
|
||||
CHyprMasterLayout m_cMasterLayout;
|
||||
|
||||
std::vector<std::pair<std::string, IHyprLayout*>> m_vLayouts;
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue