hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-12-23 03:49:51 +01:00
Code Issues Projects Releases Packages Wiki Activity

handle json for hyprctl version

Browse source
This commit is contained in:
Vaxry 2022-08-11 21:28:37 +02:00
parent 9102471610
commit ae175fdda5
1 changed files with 41 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/debug/HyprCtl.cpp
View file

@ -407,8 +407,10 @@ R"#( {
return result; return result;
} }
std::string versionRequest() { std::string versionRequest(HyprCtl::eHyprCtlOutputFormat format) {
std::string result = "Hyprland, built from branch " + std::string(GIT_BRANCH) + " at commit " + GIT_COMMIT_HASH + GIT_DIRTY + " (" + GIT_COMMIT_MESSAGE + ").\nflags: (if any)\n";
if (format == HyprCtl::eHyprCtlOutputFormat::FORMAT_NORMAL) {
std::string result = "Hyprland, built from branch " + std::string(GIT_BRANCH) + " at commit " + GIT_COMMIT_HASH + GIT_DIRTY + " (" + removeBeginEndSpacesTabs(GIT_COMMIT_MESSAGE).c_str() + ").\nflags: (if any)\n";
#ifdef LEGACY_RENDERER #ifdef LEGACY_RENDERER
result += "legacyrenderer\n"; result += "legacyrenderer\n";
@ -424,6 +426,37 @@ std::string versionRequest() {
#endif #endif
return result; return result;
} else {
std::string result = getFormat(
R"#({
"branch": "%s",
"commit": "%s",
"dirty": %s
"commit_message": "%s",
"flags" = [)#", GIT_BRANCH, GIT_COMMIT_HASH, (strcmp(GIT_DIRTY, "dirty") == 0 ? "true" : "false"), removeBeginEndSpacesTabs(GIT_COMMIT_MESSAGE).c_str());
#ifdef LEGACY_RENDERER
result += "\"legacyrenderer\",";
#endif
#ifndef NDEBUG
result += "\"debug\",";
#endif
#ifdef HYPRLAND_DEBUG
result += "\"debug\",";
#endif
#ifdef NO_XWAYLAND
result += "\"no xwayland\",";
#endif
if (result[result.length() - 1] == ',')
result.pop_back();
result += "]\n}";
return result;
}
return ""; // make the compiler happy
} }
std::string dispatchRequest(std::string in) { std::string dispatchRequest(std::string in) {
@ -647,7 +680,7 @@ std::string getReply(std::string request) {
else if (request == "layers") else if (request == "layers")
return layersRequest(format); return layersRequest(format);
else if (request == "version") else if (request == "version")
return versionRequest(); return versionRequest(format);
else if (request == "reload") else if (request == "reload")
return reloadRequest(); return reloadRequest();
else if (request == "devices") else if (request == "devices")