Just pushing the latest copy of my development / staging DataFlex stuff into git...

[dataflex/df32func] / src / df32 / console.inc

diff --git a/src/df32/console.inc b/src/df32/console.inc
index 75c8c42eedd8a3539ae2c59605706d6dc82d6564..4174a0e12b846083725bba1ddb0584b515904e95 100644 (file)
--- a/src/df32/console.inc
+++ b/src/df32/console.inc
@@ -5,7 +5,7 @@
 //\r
 // This file is to be included in df32func.mk\r
 //\r
-// Copyright (c) 2006-2009, glyn@8kb.co.uk\r
+// Copyright (c) 2006-2015, glyn@8kb.co.uk\r
 // \r
 // df32func/console.inc\r
 //-------------------------------------------------------------------------\r
@@ -51,9 +51,9 @@ function screen_display global string argv returns integer
     move 0 to l_iTotalLines\r
     move 0 to l_iTotalWidth\r
 \r
-    direct_input channel default_file_channel argv   \r
+    direct_input channel DEFAULT_FILE_CHANNEL argv   \r
     while not (seqeof)\r
-        readln channel default_file_channel l_sBuf\r
+        readln channel DEFAULT_FILE_CHANNEL l_sBuf\r
         move (rtrim(l_sBuf)) to l_sbuf\r
         move (replaces("{YELLOW}",l_sBuf,"")) to l_sBuf\r
         move (replaces("{WHITE}",l_sBuf,"")) to l_sBuf\r
@@ -66,15 +66,15 @@ function screen_display global string argv returns integer
         if (length(l_sBuf) > l_iTotalWidth) move ((length(l_sBuf))+1) to l_iTotalWidth\r
         increment l_iTotalLines\r
     loop\r
-    close_input channel default_file_channel \r
+    close_input channel DEFAULT_FILE_CHANNEL \r
 \r
     while not (key.escape)\r
-        direct_input channel default_file_channel argv\r
+        direct_input channel DEFAULT_FILE_CHANNEL argv\r
             for l_i from 1 to l_iLineAt\r
-                readln channel default_file_channel \r
+                readln channel DEFAULT_FILE_CHANNEL \r
             loop\r
             for l_i from 1 to 22\r
-                readln channel default_file_channel l_sBuf\r
+                readln channel DEFAULT_FILE_CHANNEL l_sBuf\r
                 gotoxy (l_i-1) 0\r
 \r
                     if (uppercase(l_sBuf) contains "{YELLOW}") begin\r
@@ -113,7 +113,7 @@ function screen_display global string argv returns integer
                 show (pad(mid(l_sBuf,80,l_iWidthAt),80))\r
                 screenmode 1\r
             loop\r
-        close_input channel default_file_channel        \r
+        close_input channel DEFAULT_FILE_CHANNEL        \r
     \r
         move "lines " to l_sTmp\r
         append l_sTmp (l_iLineAt+1) "-" (l_iLineAt+22) " of " (l_iTotalLines)\r