Changeset 4502 for trunk/src/kernel32/conbuffer.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/conbuffer.cpp (modified) (5 diffs)

trunk/src/kernel32/conbuffer.cpp

@@ -1 @@
-/* $Id: conbuffer.cpp,v 1.12 2000-10-09 17:47:21 sandervl Exp $ */
+/* $Id: conbuffer.cpp,v 1.13 2000-10-20 11:46:44 sandervl Exp $ */
 
 /*
@@ -62 +62 @@
 #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>
@@ -73 +73 @@
 #include "HMDevice.h"
 #include "ConBuffer.H"
+#include "console.h"
 #include "Console2.h"
 #include <heapstring.h>
 
-#define DBG_LOCALLOG    DBG_conbuffer
+#define DBG_LOCALLOG    DBG_conbuffer
 #include "dbglocal.h"
 
@@ -256 +257 @@
                       /* check if we're called with non-existing line buffer */
   if (pConsoleBuffer->ppszLine == NULL) {
-        SetLastError(ERROR_OUTOFMEMORY_W);
-        return FALSE;
+    SetLastError(ERROR_OUTOFMEMORY_W);
+    return FALSE;
   }
   for (ulCounter = 0;
@@ -2266 +2267 @@
   pConsoleBuffer->coordBufferSize.X = coordSize.X;
   pConsoleBuffer->coordBufferSize.Y = coordSize.Y;
-  pConsoleBuffer->coordCursorPosition.X = 0;
-  pConsoleBuffer->coordCursorPosition.Y = 0;
+  if (flVioConsole) {
+        USHORT Row = 0;
+        USHORT Column = 0;
+        APIRET rc;
+
+        rc = VioGetCurPos(&Row, &Column, 0);
+        dprintf(("Current cursor position (%d,%d)", Column, Row));
+        pConsoleBuffer->coordCursorPosition.Y = Row;
+        pConsoleBuffer->coordCursorPosition.X = Column;
+  }
+  else {
+        pConsoleBuffer->coordCursorPosition.X = 0;
+        pConsoleBuffer->coordCursorPosition.Y = 0;
+  }
 
   /* @@@PH to be changed ! */