From 069880e37467f5a81c1b549a896f5301ad575aae Mon Sep 17 00:00:00 2001 From: vaxerski Date: Mon, 1 Jan 2024 17:53:00 +0100 Subject: [PATCH] hyprctl: add systeminfo --- hyprctl/main.cpp | 3 +++ src/debug/HyprCtl.cpp | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/hyprctl/main.cpp b/hyprctl/main.cpp index 7285f5b8..281a74ac 100644 --- a/hyprctl/main.cpp +++ b/hyprctl/main.cpp @@ -51,6 +51,7 @@ commands: setprop splash switchxkblayout + systeminfo version workspacerules workspaces @@ -388,6 +389,8 @@ int main(int argc, char** argv) { request(fullRequest); else if (fullRequest.contains("/kill")) request(fullRequest); + else if (fullRequest.contains("/systeminfo")) + request(fullRequest); else if (fullRequest.contains("/splash")) request(fullRequest); else if (fullRequest.contains("/devices")) diff --git a/src/debug/HyprCtl.cpp b/src/debug/HyprCtl.cpp index 72d3f6b5..78d20903 100644 --- a/src/debug/HyprCtl.cpp +++ b/src/debug/HyprCtl.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -793,6 +794,39 @@ std::string versionRequest(HyprCtl::eHyprCtlOutputFormat format) { return ""; // make the compiler happy } +std::string systemInfoRequest() { + std::string result = versionRequest(HyprCtl::eHyprCtlOutputFormat::FORMAT_NORMAL); + + result += "\n\nSystem Information:\n"; + + struct utsname unameInfo; + + uname(&unameInfo); + + result += "System name: " + std::string{unameInfo.sysname} + "\n"; + result += "Node name: " + std::string{unameInfo.nodename} + "\n"; + result += "Release: " + std::string{unameInfo.release} + "\n"; + result += "Version: " + std::string{unameInfo.version} + "\n"; + + result += "\n\n"; + +#if defined(__DragonFly__) || defined(__FreeBSD__) + const std::string GPUINFO = execAndGet("pciconf -lv | fgrep -A4 vga"); +#else + const std::string GPUINFO = execAndGet("lspci -vnn | grep VGA"); +#endif + result += "GPU information: \n" + GPUINFO + "\n\n"; + + result += "os-release: " + execAndGet("cat /etc/os-release") + "\n\n"; + + result += "plugins:\n"; + for (auto& pl : g_pPluginSystem->getAllPlugins()) { + result += std::format(" {} by {} ver {}\n", pl->name, pl->author, pl->version); + } + + return result; +} + std::string dispatchRequest(std::string in) { // get rid of the dispatch keyword in = in.substr(in.find_first_of(' ') + 1); @@ -1415,6 +1449,8 @@ std::string getReply(std::string request) { return bindsRequest(format); else if (request == "globalshortcuts") return globalShortcutsRequest(format); + else if (request == "systeminfo") + return systemInfoRequest(); else if (request == "animations") return animationsRequest(format); else if (request == "rollinglog")