Changeset 4502 for trunk/src/kernel32/conin.cpp

Timestamp:

Oct 20, 2000, 1:46:48 PM (25 years ago)

Author:

sandervl

Message:

basic support for VIO console command line apps added + FormatMessage addition

File:

• trunk/src/kernel32/conin.cpp (modified) (14 diffs)

trunk/src/kernel32/conin.cpp

@@ -1 @@
-/* $Id: conin.cpp,v 1.12 2000-10-03 17:28:28 sandervl Exp $ */
+/* $Id: conin.cpp,v 1.13 2000-10-20 11:46:45 sandervl Exp $ */
 
 /*
@@ -32 +32 @@
 #define  INCL_VIO
 #define  INCL_AVIO
-#include <os2wrap.h>    //Odin32 OS/2 api wrappers
+#include <os2wrap.h>    //Odin32 OS/2 api wrappers
 
 #include <win32api.h>
@@ -45 +45 @@
 #include <heapstring.h>
 
-#define DBG_LOCALLOG    DBG_conin
+#define DBG_LOCALLOG    DBG_conin
 #include "dbglocal.h"
 
@@ -128 +128 @@
   for (;fLoop;)                       /* until we got some characters */
   {
-    if (iConsoleInputQueryEvents() == 0)      /* if queue is currently empty */
-    {
-      rc = DosWaitEventSem(pConsoleInput->hevInputQueue,    /* wait for input */
-                           SEM_INDEFINITE_WAIT);
-      DosResetEventSem(pConsoleInput->hevInputQueue,       /* reset semaphore */
-                       &ulPostCounter);            /* post counter - ignored */
-    }
+    iConsoleInputQueryEvents(pConsoleInput, QUERY_EVENT_WAIT);      /* if queue is currently empty */
 
     do
@@ -158 +152 @@
             // @@@PH 2000/08/10 changed behaviour to return ALL input events
             // recorded in the console.
-            fLoop = (iConsoleInputQueryEvents() != 0);
+            fLoop = (iConsoleInputQueryEvents(pConsoleInput, QUERY_EVENT_PEEK) != 0);
 
           // record key stroke
@@ -170 +164 @@
                 // key events, etc.
                 break;
-              
+
               case 0x03: // ctrl-c is filtered!
                 // @@@PH we're supposed to call a ctrl-c break handler here!
                 break;
-              
+
               case 0x0d: // CR
                 // CR is automatically expanded to CRLF if in line input mode!
@@ -188 +182 @@
                     ulCounter++;
                   }
-                  
+
                   if (pConsoleInput->dwConsoleMode & ENABLE_ECHO_INPUT)
                     HMWriteFile(pConsoleGlobals->hConsoleBuffer,
@@ -195 +189 @@
                         &ulPostCounter,                      /* dummy result */
                         NULL);
-                  
+
                 }
-              
+
                 break;
 
@@ -443 +437 @@
 #endif
 
+  //get all pending events
+  iConsoleInputQueryEvents(pConsoleInput, QUERY_EVENT_PEEK);
+
   pConsoleInput->ulIndexFree  = 0;
   pConsoleInput->ulIndexEvent = 0;
@@ -507 +504 @@
 #endif
 
-  *lpNumberOfEvents = pConsoleInput->ulEvents;     /* return number of events */
+  //get all pending events and return number of events
+  *lpNumberOfEvents = iConsoleInputQueryEvents(pConsoleInput, QUERY_EVENT_PEEK);
 
   return (TRUE);
@@ -548 +546 @@
 #endif
 
-  if (iConsoleInputQueryEvents() == 0)        /* if queue is currently empty */
+  if (iConsoleInputQueryEvents(pConsoleInput, QUERY_EVENT_PEEK) == 0)        /* if queue is currently empty */
   {
     *lpcRead = 0;                               /* no events read from queue */
@@ -620 +618 @@
 #endif
 
-  if (iConsoleInputQueryEvents() == 0)        /* if queue is currently empty */
+  if (iConsoleInputQueryEvents(pConsoleInput, QUERY_EVENT_PEEK) == 0)        /* if queue is currently empty */
   {
     *lpcRead = 0;                               /* no events read from queue */
@@ -786 +784 @@
 #endif
 
-  if (iConsoleInputQueryEvents() == 0)        /* if queue is currently empty */
-  {
-    rc = DosWaitEventSem(pConsoleInput->hevInputQueue,     /* wait for input */
-                         SEM_INDEFINITE_WAIT);
-    DosResetEventSem(pConsoleInput->hevInputQueue,        /* reset semaphore */
-                     &ulPostCounter);              /* post counter - ignored */
-  }
-
+  iConsoleInputQueryEvents(pConsoleInput, QUERY_EVENT_WAIT);
 
   /* now read events into target buffer */
@@ -842 +833 @@
 #endif
 
-  if (iConsoleInputQueryEvents() == 0)        /* if queue is currently empty */
-  {
-    rc = DosWaitEventSem(pConsoleInput->hevInputQueue,      /* wait for input */
-                         SEM_INDEFINITE_WAIT);
-    DosResetEventSem(pConsoleInput->hevInputQueue,         /* reset semaphore */
-                     &ulPostCounter);              /* post counter - ignored */
-  }
-
+  iConsoleInputQueryEvents(pConsoleInput, QUERY_EVENT_WAIT);
 
   /* now read events into target buffer */