hyprwm
/
Hyprland
mirror of https://github.com/hyprwm/Hyprland
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix issues with batch requests

This commit is contained in:
bazuin-32 2022-07-12 16:34:28 -06:00
parent ac9ff795cd
commit ab859ec9fc
2 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hyprctl/main.cpp
View File

@ -186,8 +186,8 @@ void hyprpaperRequest(int argc, char** argv) {
requestHyprpaper(rq);
}
void batchRequest(int argc, char** argv) {
std::string rq = "[[BATCH]]" + std::string(argv[2]);
void batchRequest(std::string arg) {
std::string rq = "[[BATCH]]" + arg.substr(arg.find_first_of(" ") + 1);
request(rq);
}
@ -200,13 +200,18 @@ int main(int argc, char** argv) {
return 1;
}
std::string fullRequest = argv[1];
std::string fullRequest = "";
for (int i = 1; i < argc; i++) {
fullRequest += std::string(argv[i]) + " ";
}
fullRequest.pop_back(); // remove trailing space
if (!fullRequest.contains("/")) {
if (!std::string(argv[1]).contains("/")) {
fullRequest = "/" + fullRequest;
}
if (fullRequest.contains("/monitors")) request(fullRequest);
if (fullRequest.contains("/--batch")) batchRequest(fullRequest);
else if (fullRequest.contains("/monitors")) request(fullRequest);
else if (fullRequest.contains("/clients")) request(fullRequest);
else if (fullRequest.contains("/workspaces")) request(fullRequest);
else if (fullRequest.contains("/activewindow")) request(fullRequest);
@ -219,7 +224,6 @@ int main(int argc, char** argv) {
else if (fullRequest.contains("/dispatch")) dispatchRequest(argc, argv);
else if (fullRequest.contains("/keyword")) keywordRequest(argc, argv);
else if (fullRequest.contains("/hyprpaper")) hyprpaperRequest(argc, argv);
else if (fullRequest.contains("/--batch")) batchRequest(argc, argv);
else if (fullRequest.contains("/--help")) printf("%s", USAGE.c_str());
else {
printf("%s\n", USAGE.c_str());

26
src/debug/HyprCtl.cpp
View File

@ -513,22 +513,24 @@ std::string dispatchBatch(std::string request) {
std::string getReply(std::string request) {
auto format = HyprCtl::FORMAT_NORMAL;
// process flags
int sepIndex = 0;
for (const auto& c : request) {
if (c == '/') { // stop at separator
break;
// process flags for non-batch requests
if (!(request.find("[[BATCH]]") == 0)) {
int sepIndex = 0;
for (const auto& c : request) {
if (c == '/') { // stop at separator
break;
}
sepIndex++;
if (c == 'j')
format = HyprCtl::FORMAT_JSON;
}
sepIndex++;
if (c == 'j')
format = HyprCtl::FORMAT_JSON;
if (sepIndex < request.size())
request = request.substr(sepIndex + 1); // remove flags and separator so we can compare the rest of the string
}
if (sepIndex < request.size())
request = request.substr(sepIndex + 1); // remove flags and separator so we can compare the rest of the string
if (request == "monitors")
return monitorsRequest(format);
else if (request == "workspaces")