From 96d51ec2573910f35b732b51c91f1f3cbc562103 Mon Sep 17 00:00:00 2001 From: michael Date: Fri, 21 Sep 2001 21:17:37 +0000 Subject: [PATCH] + Removed need for keybutil unit by incorporating it in the keyboard unit --- docs/kbdex/Makefile | 2 +- docs/kbdex/README | 2 - docs/kbdex/ex1.pp | 2 +- docs/kbdex/ex2.pp | 2 +- docs/kbdex/ex3.pp | 2 +- docs/kbdex/ex4.pp | 2 +- docs/kbdex/ex5.pp | 2 +- docs/kbdex/ex6.pp | 2 +- docs/kbdex/ex7.pp | 2 +- docs/kbdex/keybutil.pp | 106 ----------------------------------------- 10 files changed, 8 insertions(+), 116 deletions(-) delete mode 100644 docs/kbdex/keybutil.pp diff --git a/docs/kbdex/Makefile b/docs/kbdex/Makefile index e58fe241d7..7403f356d5 100644 --- a/docs/kbdex/Makefile +++ b/docs/kbdex/Makefile @@ -46,7 +46,7 @@ onetex : tex $(MAKETEX) $(TEXOBJECTS) clean : - rm -f *.o *.s $(OBJECTS) $(TEXOBJECTS) keybutil.ppu + rm -f *.o *.s $(OBJECTS) $(TEXOBJECTS) $(OBJECTS): %: %.pp $(PP) $(PPOPTS) $* diff --git a/docs/kbdex/README b/docs/kbdex/README index 816c4f1331..64961a3b0b 100644 --- a/docs/kbdex/README +++ b/docs/kbdex/README @@ -1,7 +1,5 @@ This directory contains the examples for the Keyboard unit -keybutil.pp contains some routines to convert keyevents to readable strings. - ex1.pp contains an example of the GetKeyEvent function. ex2.pp contains an example of the GetKeyEventCode function. ex3.pp contains an example of the GetKeyEventShiftState function. diff --git a/docs/kbdex/ex1.pp b/docs/kbdex/ex1.pp index ac637120fe..f219ea44af 100644 --- a/docs/kbdex/ex1.pp +++ b/docs/kbdex/ex1.pp @@ -2,7 +2,7 @@ program example1; { This program demonstrates the GetKeyEvent function } -uses keyboard, keybutil; +uses keyboard; Var K : TKeyEvent; diff --git a/docs/kbdex/ex2.pp b/docs/kbdex/ex2.pp index 0f37c760b6..01cd53f29e 100644 --- a/docs/kbdex/ex2.pp +++ b/docs/kbdex/ex2.pp @@ -2,7 +2,7 @@ Program Example2; { Program to demonstrate the GetKeyEventCode function. } -Uses keyboard,KeybUtil; +Uses keyboard; Var K : TKeyEvent; diff --git a/docs/kbdex/ex3.pp b/docs/kbdex/ex3.pp index 2c40c9e28b..bcd390707e 100644 --- a/docs/kbdex/ex3.pp +++ b/docs/kbdex/ex3.pp @@ -2,7 +2,7 @@ Program Example3; { Program to demonstrate the GetKeyEventShiftState function. } -Uses keyboard,KeybUtil; +Uses keyboard; Var K : TKeyEvent; diff --git a/docs/kbdex/ex4.pp b/docs/kbdex/ex4.pp index 2ce481c84a..a5c6054fb4 100644 --- a/docs/kbdex/ex4.pp +++ b/docs/kbdex/ex4.pp @@ -2,7 +2,7 @@ program example4; { This program demonstrates the PollKeyEvent function } -uses keyboard, keybutil; +uses keyboard; Var K : TKeyEvent; diff --git a/docs/kbdex/ex5.pp b/docs/kbdex/ex5.pp index 87362a9a93..9d97faf6c0 100644 --- a/docs/kbdex/ex5.pp +++ b/docs/kbdex/ex5.pp @@ -2,7 +2,7 @@ program example5; { This program demonstrates the PutKeyEvent function } -uses keyboard, keybutil; +uses keyboard; Var K,k2 : TKeyEvent; diff --git a/docs/kbdex/ex6.pp b/docs/kbdex/ex6.pp index 7d5a2a4f0d..a75ca1582d 100644 --- a/docs/kbdex/ex6.pp +++ b/docs/kbdex/ex6.pp @@ -2,7 +2,7 @@ program example6; { This program demonstrates the PollShiftStateEvent function } -uses keyboard, keybutil; +uses keyboard; Var K : TKeyEvent; diff --git a/docs/kbdex/ex7.pp b/docs/kbdex/ex7.pp index 3785dbdf5b..53314e7f7e 100644 --- a/docs/kbdex/ex7.pp +++ b/docs/kbdex/ex7.pp @@ -2,7 +2,7 @@ program example1; { This program demonstrates the GetKeyEvent function } -uses keyboard, keybutil; +uses keyboard; Var K : TKeyEvent; diff --git a/docs/kbdex/keybutil.pp b/docs/kbdex/keybutil.pp deleted file mode 100644 index bf3bbdacfa..0000000000 --- a/docs/kbdex/keybutil.pp +++ /dev/null @@ -1,106 +0,0 @@ -unit keybutil; - -Interface - -Uses keyboard; - -Type - TKeyRecord = packed record - KeyCode : Word; - ShiftState, Flags : Byte; - end; - -Const - // Only use these strings. Should be used to localize key names. - SShift : Array [1..3] of string[5] = ('SHIFT','CTRL','ALT'); - SLeftRight : Array [1..2] of string[5] = ('LEFT','RIGHT'); - SUnicodeChar : String = 'Unicode character '; - SScanCode : String = 'Key with scancode '; - SUnknownFunctionKey : String = 'Unknown function key : '; - SAnd : String = 'AND'; - SKeyPad : Array [0..($FF2F-kbdHome)] of string[6] = - ('Home','Up','PgUp','Left', - 'Middle','Right','End','Down', - 'PgDn','Insert','Delete','', - '','','',''); - -Function ShiftStateToString(KeyEvent : TKeyEvent; UseLeftRight : Boolean) : String; -Function FunctionKeyName (KeyCode : Word) : String; -Function KeyEventToString(KeyEvent : TKeyEvent) : String; - - -Implementation - -Procedure AddToString (Var S : String; Const A : String); - -begin - If Length(S)=0 then - S:=A - else - S:=S+' '+A; -end; - -Function IntToStr(Int : Longint) : String; - -begin - Str(Int,IntToStr); -end; - -Function ShiftStateToString(KeyEvent : TKeyEvent; UseLeftRight : Boolean) : String; - -Var - S : Integer; - T : String; - -begin - S:=GetKeyEventShiftState(KeyEvent); - T:=''; - If (S and kbShift)<>0 then - begin - if UseLeftRight then - case (S and kbShift) of - kbShift : AddToString(T,SLeftRight[1]+' '+SAnd+' '+SLeftRight[2]); - kbLeftShift : AddToString(T,SLeftRight[1]); - kbRightShift : AddToString(T,SLeftRight[2]); - end; - AddToString(T,SShift[1]); - end; - If (S and kbCtrl)<>0 Then - AddToString(T,SShift[2]); - If (S and kbAlt)<>0 Then - AddToString(T,SShift[3]); - ShiftStateToString:=T; -end; - -Function FunctionKeyName (KeyCode : Word) : String; - -begin - If ((KeyCode-KbdF1)<$1F) Then - FunctionKeyName:='F'+IntToStr((KeyCode-KbdF1+1)) - else - begin - If (KeyCode-kbdHome)<($2F-$1F) then - FunctionKeyName:=SKeyPad[(KeyCode-kbdHome)] - else - FunctionKeyName:=SUnknownFunctionKey + IntToStr(KeyCode); - end; -end; - -Function KeyEventToString(KeyEvent : TKeyEvent) : String; - -Var - T : String; - -begin - T:=ShiftStateToString(KeyEvent,False); - Case GetKeyEventFlags(KeyEvent) of - kbASCII : AddToString(T,GetKeyEventChar(KeyEvent)); - kbUniCode : AddToString(T,SUniCodeChar+IntToStr(GetKeyEventUniCode(Keyevent))); - kbFnKey : AddToString(T,FunctionKeyName(GetKeyEventCode(KeyEvent))); - // Not good, we need a GetKeyEventScanCode function !! - kbPhys : AddToString(T,SScanCode+IntToStr(KeyEvent and $ffff)); - end; - KeyEventToString:=T; -end; - -end.