X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmisc.cpp;h=237ca8d7d8d9525c7a7dc301f44a2695015352ac;hp=c58c9df05ee692e6506c830b8205857ab7abad77;hb=34ca22486ac1b427b1dc8e197d5b7dfeb5cc083d;hpb=61f41a057dd84a38e5cc9c58b37a30bfa00e253a

diff --git a/src/misc.cpp b/src/misc.cpp
index c58c9df0..237ca8d7 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -6,12 +6,12 @@
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
-  
+
   Glaurung is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
-  
+
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
@@ -52,12 +52,12 @@ long dbg_cnt0 = 0;
 long dbg_cnt1 = 0;
 
 
-//// 
+////
 //// Functions
 ////
 
 void dbg_print_hit_rate() {
-    
+
   std::cout << "Total " << dbg_cnt0 << " Hit " << dbg_cnt1
             << " hit rate (%) " << (dbg_cnt1*100)/(dbg_cnt0 ? dbg_cnt0 : 1)
             << std::endl;
@@ -69,26 +69,21 @@ void dbg_print_hit_rate() {
 /// the constant EngineVersion (defined in misc.h) is empty.
 
 const std::string engine_name() {
-  if(EngineVersion == "") {
-    static const char monthNames[12][4] = {
-      "Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"
-    };
-    const char *dateString = __DATE__;
-    std::stringstream s;
-    int month = 0, day = 0;
-    
-    for(int i = 0; i < 12; i++)
-      if(strncmp(dateString, monthNames[i], 3) == 0)
-        month = i + 1;
-    day = atoi(dateString+4);
-    
-    s << "Glaurung " << (dateString+9) << std::setfill('0') << std::setw(2)
-      << month << std::setfill('0') << std::setw(2) << day;
-    
-    return s.str();
-  }
-  else
-    return "Glaurung " + EngineVersion;
+
+  if (EngineVersion.empty())
+  {
+      std::string date(__DATE__); // From compiler, format is "Sep 21 2008"
+      std::string months("Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec");
+
+      size_t mon = 1 + months.find(date.substr(0, 3)) / 4;
+
+      std::stringstream s;
+      s << "Glaurung clone " << date.substr(date.length() - 2) << std::setfill('0')
+        << std::setw(2) << mon << date.substr(4, 2);
+
+      return s.str();
+  } else
+      return "Glaurung clone " + EngineVersion;
 }
 
 
@@ -98,7 +93,7 @@ const std::string engine_name() {
 int get_system_time() {
   struct timeval t;
   gettimeofday(&t, NULL);
-  return t.tv_sec*1000 + t.tv_usec/1000; 
+  return t.tv_sec*1000 + t.tv_usec/1000;
 }
 
 
@@ -136,14 +131,14 @@ int Bioskey()
 {
   fd_set          readfds;
   struct timeval  timeout;
-  
+
   FD_ZERO(&readfds);
   FD_SET(fileno(stdin), &readfds);
   /* Set to timeout immediately */
   timeout.tv_sec = 0;
   timeout.tv_usec = 0;
   select(16, &readfds, 0, 0, &timeout);
-  
+
   return (FD_ISSET(fileno(stdin), &readfds));
 }
 
@@ -178,8 +173,24 @@ int Bioskey()
             return 1;
         return dw;
     } else {
+        // Count the number of unread input records, including keyboard,
+        // mouse, and window-resizing input records.
         GetNumberOfConsoleInputEvents(inh, &dw);
-        return dw <= 1 ? 0 : dw;
+        if (dw <= 0)
+            return 0;
+
+        // Read data from console without removing it from the buffer
+        INPUT_RECORD rec[256];
+        DWORD recCnt;
+        if (!PeekConsoleInput(inh, rec, Min(dw, 256), &recCnt))
+            return 0;
+
+        // Search for at least one keyboard event
+        for (DWORD i = 0; i < recCnt; i++)
+            if (rec[i].EventType == KEY_EVENT)
+                return 1;
+
+        return 0;
     }
 }
 #endif