paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-20 08:50:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ introduced the CurrentLegacy2EnhancedKeyEventTranslationCodePage private

Browse Source 
variable in the keyboard unit. It is used for translating AsciiChar to
  UnicodeChar in non-enhanced (i.e. non-unicode) consoles. It can be initialized
  in SysInitKeyboard in non-unicode consoles, so they can return unicode
  characters as well.
This commit is contained in:
Nikolay Nikolov 2022-03-12 23:51:55 +02:00
parent b1a72a86e5
commit 91ccf4e9c6
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
packages/rtl-console/src/inc/keyboard.inc
View File

@ -13,6 +13,7 @@
var
PendingKeyEvent : TKeyEvent;
CurrentLegacy2EnhancedKeyEventTranslationCodePage: TSystemCodePage;
procedure PutKeyEvent(KeyEvent: TKeyEvent);
begin
@ -64,6 +65,7 @@ procedure InitKeyboard;
begin
If Not KeyboardInitialized then
begin
CurrentLegacy2EnhancedKeyEventTranslationCodePage := 437;
If Assigned(CurrentKeyBoardDriver.InitDriver) Then
CurrentKeyBoardDriver.InitDriver();
KeyboardInitialized:=True;
@ -224,6 +226,8 @@ function ConvertToEnhancedKeyEvent(KeyEvent: TKeyEvent): TEnhancedKeyEvent;
var
TranslatedKeyEvent: TKeyEvent;
ShiftState: Byte;
tmpS: RawByteString;
tmpUS: UnicodeString;
begin
ConvertToEnhancedKeyEvent:=NilEnhancedKeyEvent;
if KeyEvent=0 then
@ -264,12 +268,21 @@ begin
ConvertToEnhancedKeyEvent.VirtualScanCode:=TranslatedKeyEvent and $ffff;
end;
{ todo: set ConvertToEnhancedKeyEvent.Flags }
if (ConvertToEnhancedKeyEvent.UnicodeChar=WideChar(0)) and
(ConvertToEnhancedKeyEvent.AsciiChar>=#0) and
(ConvertToEnhancedKeyEvent.AsciiChar<=#127) then
ConvertToEnhancedKeyEvent.UnicodeChar:=WideChar(ConvertToEnhancedKeyEvent.AsciiChar);
{ todo: maybe also convert extended ASCII (>=#128) codes to Unicode as well
(according to the console code page) }
if (ConvertToEnhancedKeyEvent.UnicodeChar=WideChar(0)) then
begin
if (ConvertToEnhancedKeyEvent.AsciiChar>=#0) and
(ConvertToEnhancedKeyEvent.AsciiChar<=#127) then
ConvertToEnhancedKeyEvent.UnicodeChar:=WideChar(ConvertToEnhancedKeyEvent.AsciiChar)
else
begin
SetLength(tmpS, 1);
tmpS[1]:=ConvertToEnhancedKeyEvent.AsciiChar;
System.SetCodePage(tmpS,CurrentLegacy2EnhancedKeyEventTranslationCodePage,False);
tmpUS:=tmpS;
if Length(tmpUS) = 1 then
ConvertToEnhancedKeyEvent.UnicodeChar := tmpUS[1];
end;
end;
end;
function DefaultGetEnhancedKeyEvent: TEnhancedKeyEvent;