args: exit --loop-ms with 'q' and increase from 50 to 200 ms

Author: Toni500github

src/core-modules/linux/os.cc

@@ -37,8 +37,7 @@ static std::string read_value(const std::string_view name)
 
         char* end = strrchr(start, '"'); /* Get last occurence of " */
         if (!end)
-            end = line + strlen(line) - 1; /* Set to the end of the string -- no newline. (I heard Windows has a
-                                              different newline sequence.. *sigh*) */
+            end = line + strlen(line) - 1; /* Set to the end of the string -- no newline. */
 
         result.assign(start, end - start);
         break;
@@ -117,7 +116,7 @@ MODFUNC(os_initsys_version)
     std::ifstream f(path, std::ios::in);
     std::string   line;
 
-    const std::string& name = str_tolower(os_initsys_name(callbackInfo));
+    const std::string& name = str_tolower(os_initsys_name(nullptr));
     switch (fnv1a16::hash(name))
     {
         case "systemd"_fnv1a16:

src/main.cpp

@@ -26,6 +26,8 @@
 #include <dlfcn.h>
 #include <getopt.h>
 #include <unistd.h>
+#include <termios.h>
+#include <stdlib.h>
 
 #include <algorithm>
 #include <cerrno>
@@ -66,6 +68,32 @@ using namespace std::string_view_literals;
 bool display_modules    = false;
 bool display_list_logos = false;
 
+struct termios orig_termios;
+
+static void disable_raw_mode()
+{
+    tcsetattr(STDIN_FILENO, TCSAFLUSH, &orig_termios);
+}
+
+static void enable_raw_mode()
+{
+    tcgetattr(STDIN_FILENO, &orig_termios);
+    atexit(disable_raw_mode);
+
+    struct termios raw = orig_termios;
+    raw.c_lflag &= ~(ECHO | ICANON);  // Disable echo and canonical mode
+    tcsetattr(STDIN_FILENO, TCSAFLUSH, &raw);
+}
+
+static int kbhit()
+{
+    struct timeval tv = {0L, 0L};
+    fd_set fds;
+    FD_ZERO(&fds);
+    FD_SET(STDIN_FILENO, &fds);
+    return select(STDIN_FILENO + 1, &fds, NULL, NULL, &tv) > 0;
+}
+
 // Print the version and some other infos, then exit successfully
 static void version()
 {
@@ -158,7 +186,7 @@ GUI/TERMINAL OPTIONS:
 
 LIVE MODE:
     --loop-ms <NUM>             Run in live mode, updating every <NUM> milliseconds (min: 50).
-                                Use inferior <NUM> than 50 to disable (default).
+                                Use inferior <NUM> than 200 to disable. Press 'q' to exit.
 
 EXAMPLES:
     1. Minimal output with default logo:
@@ -657,7 +685,7 @@ int main(int argc, char* argv[])
         moduleMap.emplace(module.name, module);
     }
 
-    is_live_mode = (config.loop_ms > 50);
+    is_live_mode = (config.loop_ms >= 200);
 
     if (config.source_path.empty() || config.source_path == "off")
         config.args_disable_source = true;
@@ -700,7 +728,6 @@ int main(int argc, char* argv[])
     if (!config.wrap_lines)
     {
         // https://en.cppreference.com/w/c/program/exit
-        // if something goes wrong like a segfault, then re-enable the cursor again
         std::atexit(enable_cursor);
 
         // hide cursor and disable line wrapping
@@ -709,10 +736,23 @@ int main(int argc, char* argv[])
 
     if (is_live_mode)
     {
+        enable_raw_mode();
         const std::chrono::milliseconds sleep_ms{ config.loop_ms };
 
         while (true)
         {
+            if (kbhit())
+            {
+                char c;
+                read(STDIN_FILENO, &c, 1);
+                if (c == 'q' || c == 'Q')
+                {
+                    info("exiting...\n");
+                    disable_raw_mode();
+                    break;
+                }
+            }
+
             // clear screen and go to position 0, 0
             write(STDOUT_FILENO, "\33[H\33[2J", 7);
             fmt::print("\033[0;0H");