Fix Windows compilation

Signed-off-by: Lucia Echevarria <[email protected]>

Author: LuciaEchevarria99

cpp_utils/src/cpp/event/StdinEventHandler.cpp

@@ -12,9 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <termios.h>
 #include <thread>
-#include <unistd.h>
+
+#if defined(_WIN32) || defined(_WIN64)
+    #define NOMINMAX
+    #include <windows.h>
+#else
+    #include <termios.h>
+    #include <unistd.h>
+#endif
 
 #include <cpp_utils/event/StdinEventHandler.hpp>
 #include <cpp_utils/exception/InitializationException.hpp>
@@ -48,10 +54,35 @@ void StdinEventHandler::read_one_more_line()
 
 void StdinEventHandler::set_terminal_mode_(bool enable) noexcept
 {
+#if defined(_WIN32) || defined(_WIN64)
+    static DWORD old_mode;
+    static HANDLE hStdin = GetStdHandle(STD_INPUT_HANDLE);
+
+    if (enable)
+    {
+        // Save actual configuration in 'old_mode'
+        GetConsoleMode(hStdin, &old_mode);
+
+        // Modify line mode flags
+        // - ENABLE_ECHO_INPUT: Desactivate echo (does not print what the user writes on terminal)
+        // - ENABLE_LINE_INPUT: Desactivate line mode (process each character)
+        DWORD new_mode = old_mode;
+        new_mode &= ~(ENABLE_ECHO_INPUT | ENABLE_LINE_INPUT);
+        SetConsoleMode(hStdin, new_mode);
+        std::cout << "New console mode set" << std::endl;
+    }
+    else
+    {
+        // Restore original terminal configuration
+        SetConsoleMode(hStdin, old_mode);
+    }
+
+#else
+
     static struct termios oldt, newt;
     if (enable)
     {
-        // Save actial configuration in 'oldt'
+        // Save actual configuration in 'oldt'
         tcgetattr(STDIN_FILENO, &oldt);
 
         // Copy actual configuration in 'newt'
@@ -70,6 +101,7 @@ void StdinEventHandler::set_terminal_mode_(bool enable) noexcept
         // Restore original terminal configuration
         tcsetattr(STDIN_FILENO, TCSANOW, &oldt);
     }
+#endif
 }
 
 void StdinEventHandler::stdin_listener_thread_routine_() noexcept
@@ -85,12 +117,22 @@ void StdinEventHandler::stdin_listener_thread_routine_() noexcept
         while (true)
         {
             c = getchar(); // Read first character
+
+#if defined(_WIN32) || defined(_WIN64)
+            if (c == 0 || c == 224)  // Special key prefix for arrow keys on Windows
+            {
+                c = getchar(); // Get next character to determine arrow key
+                switch (c)
+                {
+                    case 72:  // Arrow up
+#else
             if (c == '\033')
             {
                 getchar(); // Ignore next character '['
                 switch (getchar())
                 {
                     case 'A':
+#endif
                     {
                         std::string prev_command = history_handler_.get_previous_command();
                         if (!prev_command.empty())
@@ -103,7 +145,11 @@ void StdinEventHandler::stdin_listener_thread_routine_() noexcept
                         break;
                     }
 
-                    case 'B':
+#if defined(_WIN32) || defined(_WIN64)
+                    case 80:  // Arrow down
+#else
+                    case 'B':  // Arrow down
+#endif
                     {
                         std::string next_command = history_handler_.get_next_command();
                         if (!next_command.empty())
@@ -123,7 +169,7 @@ void StdinEventHandler::stdin_listener_thread_routine_() noexcept
                     }
                 }
             }
-            else if (c == '\n')
+            else if (c == '\n' || c == '\r')
             {
                 std::cout << std::endl;
                 event_occurred_(read_str);

cpp_utils/test/unittest/event/stdin_event/StdinEventHandlerTest.cpp

@@ -14,7 +14,12 @@
 
 #include <iostream>
 #include <queue>
-#include <unistd.h>
+#if defined(_WIN32) || defined(_WIN64)
+    #define NOMINMAX
+    #include <windows.h>
+#else
+    #include <unistd.h>
+#endif
 
 #include <cpp_utils/testing/gtest_aux.hpp>
 #include <gtest/gtest.h>
@@ -31,34 +36,6 @@ using namespace eprosima::utils::event;
  */
 TEST(StdinEventHandlerTest, trivial_create_handler)
 {
-
-    // Create a pipe to simulate input
-    int pipe_fds[2];
-    if (pipe(pipe_fds) == -1) {
-        std::cerr << "Pipe failed!" << std::endl;
-    }
-
-    // Write simulated input to the pipe (write to pipe_fds[1])
-    const char* simulated_input = "Hello\n";
-    write(pipe_fds[1], simulated_input, 6);  // Write "Hello\n" to the pipe
-    close(pipe_fds[1]);  // Close the writing end of the pipe
-
-    // Redirect stdin to read from the pipe (read from pipe_fds[0])
-    dup2(pipe_fds[0], STDIN_FILENO);
-    close(pipe_fds[0]);  // Close the reading end of the pipe after redirecting
-
-    // Test getchar() which now reads from the pipe instead of stdin
-    char c;
-    std::string result;
-    while ((c = getchar()) != EOF) {
-        result += c;
-    }
-
-    // Ensure the input was correctly simulated
-    ASSERT_EQ(result, "Hello\n");
-
-    std::cout << "Test Passed: " << result << std::endl;
-
     StdinEventHandler handler(
         [](std::string)
         {
@@ -71,10 +48,40 @@ TEST(StdinEventHandlerTest, trivial_create_handler)
 void simulate_stdin(
         const std::queue<std::string>& input_queue)
 {
-    // Create a pipe to simulate input
+#if defined(_WIN32) || defined(_WIN64)
+    // Handles for the pipe
+    HANDLE pipe_read, pipe_write;
+
+    // Create a pipe
+    if (!CreatePipe(&pipe_read, &pipe_write, nullptr, 0)) {
+        std::cerr << "Pipe creation failed!" << std::endl;
+        return;
+    }
+
+    // Write simulated input to the pipe
+    for (auto input = input_queue; !input.empty(); input.pop())
+    {
+        const std::string& str = input.front();
+        DWORD written;
+
+        // Write the string to the pipe
+        WriteFile(pipe_write, str.c_str(), str.length(), &written, nullptr);
+
+        // Write a newline character to simulate pressing enter
+        WriteFile(pipe_write, "\n", 1, &written, nullptr);
+    }
+
+    // Close the writing end of the pipe
+    CloseHandle(pipe_write);
+
+    // Redirect stdin to read from the pipe
+    SetStdHandle(STD_INPUT_HANDLE, pipe_read);
+
+#else
     int pipe_fds[2];
     if (pipe(pipe_fds) == -1) {
         std::cerr << "Pipe failed!" << std::endl;
+        return;
     }
 
     // Write simulated input to the pipe (write to pipe_fds[1])
@@ -85,14 +92,17 @@ void simulate_stdin(
 
         write(pipe_fds[1], simulated_input, str.length());
 
+        // Write newline character to simulate pressing enter
         write(pipe_fds[1], "\n", 1);
     }
 
-    close(pipe_fds[1]);  // Close the writing end of the pipe
+    // Close the writing end of the pipe
+    close(pipe_fds[1]);
 
-    // Redirect stdin to read from the pipe (read from pipe_fds[0])
+    // Redirect stdin to read from the pipe
     dup2(pipe_fds[0], STDIN_FILENO);
     close(pipe_fds[0]);  // Close the reading end of the pipe after redirecting
+#endif
 }
 
 /**

cpp_utils/test/unittest/user_interface/CommandReaderTest.cpp

@@ -14,7 +14,13 @@
 
 #include <iostream>
 #include <queue>
-#include <unistd.h>
+
+#if defined(_WIN32) || defined(_WIN64)
+    #define NOMINMAX
+    #include <windows.h>
+#else
+    #include <unistd.h>
+#endif
 
 #include <cpp_utils/testing/gtest_aux.hpp>
 #include <gtest/gtest.h>
@@ -61,15 +67,43 @@ eProsima_ENUMERATION_BUILDER(
     }
     );
 
-namespace stdin {
-
 void simulate_stdin(
         const std::queue<std::string>& input_queue)
 {
-    // Create a pipe to simulate input
+#ifdef _WIN32
+    // Handles for the pipe
+    HANDLE pipe_read, pipe_write;
+
+    // Create a pipe
+    if (!CreatePipe(&pipe_read, &pipe_write, nullptr, 0)) {
+        std::cerr << "Pipe creation failed!" << std::endl;
+        return;
+    }
+
+    // Write simulated input to the pipe
+    for (auto input = input_queue; !input.empty(); input.pop())
+    {
+        const std::string& str = input.front();
+        DWORD written;
+
+        // Write the string to the pipe
+        WriteFile(pipe_write, str.c_str(), str.length(), &written, nullptr);
+
+        // Write a newline character to simulate pressing enter
+        WriteFile(pipe_write, "\n", 1, &written, nullptr);
+    }
+
+    // Close the writing end of the pipe
+    CloseHandle(pipe_write);
+
+    // Redirect stdin to read from the pipe
+    SetStdHandle(STD_INPUT_HANDLE, pipe_read);
+
+#else
     int pipe_fds[2];
     if (pipe(pipe_fds) == -1) {
         std::cerr << "Pipe failed!" << std::endl;
+        return;
     }
 
     // Write simulated input to the pipe (write to pipe_fds[1])
@@ -80,17 +114,19 @@ void simulate_stdin(
 
         write(pipe_fds[1], simulated_input, str.length());
 
+        // Write newline character to simulate pressing enter
         write(pipe_fds[1], "\n", 1);
     }
 
-    close(pipe_fds[1]);  // Close the writing end of the pipe
+    // Close the writing end of the pipe
+    close(pipe_fds[1]);
 
-    // Redirect stdin to read from the pipe (read from pipe_fds[0])
+    // Redirect stdin to read from the pipe
     dup2(pipe_fds[0], STDIN_FILENO);
     close(pipe_fds[0]);  // Close the reading end of the pipe after redirecting
+#endif
 }
 
-} /* namespace stdin */
 } /* namespace test */
 
 using namespace eprosima::utils;
@@ -114,7 +150,7 @@ TEST(CommandReaderTest, read_lines_enum_1)
     expected_result.push("value_1 arg");
     expected_result.push("value_2 more than 1 arg");
 
-    test::stdin::simulate_stdin(expected_result);
+    test::simulate_stdin(expected_result);
 
     auto builder = test::create_builder();
     CommandReader<test::Enum1> reader(
@@ -158,7 +194,7 @@ TEST(CommandReaderTest, read_lines_enum_1_negative)
     std::queue<std::string> expected_result;
     expected_result.push("value_3");
 
-    test::stdin::simulate_stdin(expected_result);
+    test::simulate_stdin(expected_result);
 
     auto builder = test::create_builder();
     CommandReader<test::Enum1> reader(
@@ -179,7 +215,7 @@ TEST(CommandReaderTest, read_lines_enum_2_singleton)
     expected_result.push("andtheend");
     expected_result.push("1 args");
 
-    test::stdin::simulate_stdin(expected_result);
+    test::simulate_stdin(expected_result);
 
     CommandReader<test::Enum2> reader(
         *test::Enum2_Builder::get_shared_instance());