From 62f8899c1b13c58ab3d318c55c607ccefab9b811 Mon Sep 17 00:00:00 2001
From: nickysn <nickysn@gmail.com>
Date: Mon, 8 Mar 2021 17:56:06 +0000
Subject: [PATCH] * hide the (currently broken, to be fixed) unix
 internal/external code page   stuff to the implementation part of the unit

git-svn-id: branches/unicodekvm@48916 -
---
 packages/fv/src/views.inc              |  5 +----
 packages/rtl-console/src/unix/video.pp | 17 ++++++++---------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/packages/fv/src/views.inc b/packages/fv/src/views.inc
index a55e634617..4d5af5dfd3 100644
--- a/packages/fv/src/views.inc
+++ b/packages/fv/src/views.inc
@@ -2826,11 +2826,8 @@ begin
 {$else FV_UNICODE}
   ColorMask:=Color shl 8;
   p:=framechars_437;
-  {$ifdef unix}
-  {Codepage variables are currently Unix only.}
-  if internal_codepage<>cp437 then
+  if GetActiveCodePage<>437 then
     p:=framechars_850;
-  {$endif}
   for i:=0 to Size.X-1 do
     TVideoBuf(FrameBuf)[i]:=ord(p[FrameMask[i]]) or ColorMask;
 {$endif FV_UNICODE}
diff --git a/packages/rtl-console/src/unix/video.pp b/packages/rtl-console/src/unix/video.pp
index f0860734d1..7c9394f4da 100644
--- a/packages/rtl-console/src/unix/video.pp
+++ b/packages/rtl-console/src/unix/video.pp
@@ -24,6 +24,14 @@ unit video;
 
 {$i videoh.inc}
 
+{*****************************************************************************}
+                                implementation
+{*****************************************************************************}
+
+uses  baseunix,termio,strings,unixkvmbase,graphemebreakproperty,eastasianwidth
+     ,charset
+     {$ifdef linux},linuxvcs{$endif};
+
 type  Tencoding=(cp437,         {Codepage 437}
                  cp850,         {Codepage 850}
                  cp852,         {Codepage 852}
@@ -53,15 +61,6 @@ const  {Contains all code pages that can be considered a normal vga font.
 
 var internal_codepage,external_codepage:Tencoding;
 
-
-{*****************************************************************************}
-                                implementation
-{*****************************************************************************}
-
-uses  baseunix,termio,strings,unixkvmbase,graphemebreakproperty,eastasianwidth
-     ,charset
-     {$ifdef linux},linuxvcs{$endif};
-
 {$i video.inc}
 {$i convert.inc}