hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-15 11:25:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

allow setting rollinglog delay

Browse source
This commit is contained in:
Richard Bainesly 2024-06-19 15:24:34 -04:00
parent b6680d7391
commit ad00f7f03a
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
hyprctl/main.cpp
View file

@ -107,7 +107,7 @@ void intHandler(int sig) {
std::cout << "[hyprctl] SIGINT received, closing connection" << std::endl; std::cout << "[hyprctl] SIGINT received, closing connection" << std::endl;
} }
int rollingRead(const int socket) { int rollingRead(const int socket, int delay) {
sigintReceived = false; sigintReceived = false;
signal(SIGINT, intHandler); signal(SIGINT, intHandler);
@ -132,13 +132,13 @@ int rollingRead(const int socket) {
buffer.fill('\0'); buffer.fill('\0');
} }
usleep(1000); usleep(delay * 1000);
} }
close(socket); close(socket);
return 0; return 0;
} }
int request(std::string arg, int minArgs = 0, bool needRoll = false) { int request(std::string arg, int minArgs = 0, bool needRoll = false, int rollDelay = 50) {
const auto SERVERSOCKET = socket(AF_UNIX, SOCK_STREAM, 0); const auto SERVERSOCKET = socket(AF_UNIX, SOCK_STREAM, 0);
auto t = timeval{.tv_sec = 0, .tv_usec = 100000}; auto t = timeval{.tv_sec = 0, .tv_usec = 100000};
@ -183,7 +183,7 @@ int request(std::string arg, int minArgs = 0, bool needRoll = false) {
} }
if (needRoll) if (needRoll)
return rollingRead(SERVERSOCKET); return rollingRead(SERVERSOCKET, rollDelay);
std::string reply = ""; std::string reply = "";
char buffer[8192] = {0}; char buffer[8192] = {0};
@ -329,6 +329,7 @@ int main(int argc, char** argv) {
const auto ARGS = splitArgs(argc, argv); const auto ARGS = splitArgs(argc, argv);
bool json = false; bool json = false;
bool needRoll = false; bool needRoll = false;
int rollDelay = 50;
std::string overrideInstance = ""; std::string overrideInstance = "";
for (std::size_t i = 0; i < ARGS.size(); ++i) { for (std::size_t i = 0; i < ARGS.size(); ++i) {
@ -351,6 +352,8 @@ int main(int argc, char** argv) {
} else if ((ARGS[i] == "-f" || ARGS[i] == "--follow") && !fullArgs.contains("f")) { } else if ((ARGS[i] == "-f" || ARGS[i] == "--follow") && !fullArgs.contains("f")) {
fullArgs += "f"; fullArgs += "f";
needRoll = true; needRoll = true;
if (ARGS.size() >= 3)
rollDelay = std::stoi(ARGS[2]);
} else if (ARGS[i] == "--batch") { } else if (ARGS[i] == "--batch") {
fullRequest = "--batch "; fullRequest = "--batch ";
} else if (ARGS[i] == "--instance" || ARGS[i] == "-i") { } else if (ARGS[i] == "--instance" || ARGS[i] == "-i") {
@ -475,7 +478,7 @@ int main(int argc, char** argv) {
else if (fullRequest.contains("/--help")) else if (fullRequest.contains("/--help"))
std::cout << USAGE << std::endl; std::cout << USAGE << std::endl;
else if (fullRequest.contains("/rollinglog") && needRoll) else if (fullRequest.contains("/rollinglog") && needRoll)
exitStatus = request(fullRequest, 0, true); exitStatus = request(fullRequest, 0, true, rollDelay);
else { else {
exitStatus = request(fullRequest); exitStatus = request(fullRequest);
} }

2
src/debug/HyprCtl.cpp
View file

@ -1677,6 +1677,8 @@ std::string CHyprCtl::getReply(std::string request) {
std::string result = ""; std::string result = "";
request = request.substr(0, request.find(" "));
// parse exact cmds first, then non-exact. // parse exact cmds first, then non-exact.
for (auto& cmd : m_vCommands) { for (auto& cmd : m_vCommands) {
if (!cmd->exact) if (!cmd->exact)