Changeset 3341

Timestamp:

Jul 24, 2009, 11:17:34 AM (15 years ago)

Author:

rgrieder

Message:

Dedicated input thread now ends without hitting enter on Unix

File:

• code/trunk/src/orxonox/gamestates/GSDedicated.cc (modified) (3 diffs)

code/trunk/src/orxonox/gamestates/GSDedicated.cc

@@ -98 +98 @@
         resetTerminalMode();
         delete this->originalTerminalSettings_;
-#endif
+#else
         COUT(0) << "Press enter to end the game..." << std::endl;
+#endif
         inputThread_->join();
         delete this->inputThread_;
@@ -121 +122 @@
         while(!closeThread_)
         {
-            c = getchar();
+            size_t count = read(STDIN_FILENO, &c, 1);
+            if (count == 1)
             {
 //                 boost::recursive_mutex::scoped_lock(this->inputLineMutex_);
@@ -251 +253 @@
         new_settings.c_lflag &= ~( ICANON | ECHO );
 //         new_settings.c_lflag |= ( ISIG | IEXTEN );
-        new_settings.c_cc[VTIME] = 0;
-        new_settings.c_cc[VMIN] = 1;
+        new_settings.c_cc[VTIME] = 1;
+        new_settings.c_cc[VMIN] = 0;
         tcsetattr(0,TCSANOW,&new_settings);
         COUT(0) << endl;