Use enum for specifying hyprctl output format and change the way flags

are passed for json output
This commit is contained in:
bazuin-32
2022-07-12 14:59:36 -06:00
parent 036f431206
commit 2402f2e364
4 changed files with 61 additions and 43 deletions

View File

@@ -195,28 +195,29 @@ int main(int argc, char** argv) {
return 1;
}
std::string args(argv[1]);
std::string ourRequest = argv[1];
if (argc > 2) {
args += " ";
args += argv[2];
if (!ourRequest.contains("/")) {
ourRequest = "/" + ourRequest;
}
if (!strcmp(argv[1], "monitors")) request(args);
else if (!strcmp(argv[1], "clients")) request(args);
else if (!strcmp(argv[1], "workspaces")) request(args);
else if (!strcmp(argv[1], "activewindow")) request(args);
else if (!strcmp(argv[1], "layers")) request(args);
else if (!strcmp(argv[1], "version")) request(args);
else if (!strcmp(argv[1], "kill")) request(args);
else if (!strcmp(argv[1], "splash")) request(args);
else if (!strcmp(argv[1], "devices")) request(args);
else if (!strcmp(argv[1], "reload")) request(args);
else if (!strcmp(argv[1], "dispatch")) dispatchRequest(argc, argv);
else if (!strcmp(argv[1], "keyword")) keywordRequest(argc, argv);
else if (!strcmp(argv[1], "hyprpaper")) hyprpaperRequest(argc, argv);
else if (!strcmp(argv[1], "--batch")) batchRequest(argc, argv);
else if (!strcmp(argv[1], "--help")) printf("%s", USAGE.c_str());
ourRequest.contains("/");
if (ourRequest.contains("/monitors")) request(ourRequest);
else if (ourRequest.contains("/clients")) request(ourRequest);
else if (ourRequest.contains("/workspaces")) request(ourRequest);
else if (ourRequest.contains("/activewindow")) request(ourRequest);
else if (ourRequest.contains("/layers")) request(ourRequest);
else if (ourRequest.contains("/version")) request(ourRequest);
else if (ourRequest.contains("/kill")) request(ourRequest);
else if (ourRequest.contains("/splash")) request(ourRequest);
else if (ourRequest.contains("/devices")) request(ourRequest);
else if (ourRequest.contains("/reload")) request(ourRequest);
else if (ourRequest.contains("/dispatch")) dispatchRequest(argc, argv);
else if (ourRequest.contains("/keyword")) keywordRequest(argc, argv);
else if (ourRequest.contains("/hyprpaper")) hyprpaperRequest(argc, argv);
else if (ourRequest.contains("/--batch")) batchRequest(argc, argv);
else if (ourRequest.contains("/--help")) printf("%s", USAGE.c_str());
else {
printf("%s\n", USAGE.c_str());
return 1;