From 73affdeb6a997f488f4285d09ef545ec2e7ee63a Mon Sep 17 00:00:00 2001 From: April Ayres-Griffiths Date: Fri, 19 Apr 2019 10:04:22 +1000 Subject: [PATCH] suppress VK_SHIFT to prevent issue with proterm --- backup/main.lfm | 40 ++--- backup/main.pas | 2 +- backup/poc.lps | 70 ++++----- main.lfm | 40 ++--- main.pas | 2 +- poc.lps | 384 ++++++++++++++++++++++++------------------------ 6 files changed, 267 insertions(+), 271 deletions(-) diff --git a/backup/main.lfm b/backup/main.lfm index 35dc168..564b9c5 100644 --- a/backup/main.lfm +++ b/backup/main.lfm @@ -6,7 +6,7 @@ object GUIForm: TGUIForm AllowDropFiles = True AlphaBlendValue = 128 Caption = 'microM8 GUI' - ClientHeight = 630 + ClientHeight = 625 ClientWidth = 1078 Constraints.MinWidth = 1078 DoubleBuffered = False @@ -31,8 +31,8 @@ object GUIForm: TGUIForm LCLVersion = '2.0.0.4' object StatusBar1: TStatusBar Left = 0 - Height = 23 - Top = 607 + Height = 19 + Top = 606 Width = 1078 Panels = <> end @@ -234,7 +234,7 @@ object GUIForm: TGUIForm end object tbMasterVolume: TTrackBar Left = 249 - Height = 32 + Height = 38 Top = 2 Width = 96 OnChange = tbMasterVolumeChange @@ -278,7 +278,7 @@ object GUIForm: TGUIForm end object TrackBar2: TTrackBar Left = 449 - Height = 32 + Height = 38 Top = 2 Width = 96 Max = 4 @@ -329,31 +329,31 @@ object GUIForm: TGUIForm end object pnlContainer: TPanel Left = 0 - Height = 571 + Height = 570 Top = 36 Width = 1078 Align = alClient BevelOuter = bvNone - ClientHeight = 571 + ClientHeight = 570 ClientWidth = 1078 ParentColor = False TabOrder = 2 object sidecarPanel: TPanel Left = 908 - Height = 534 + Height = 533 Top = 0 Width = 170 Align = alRight BevelOuter = bvNone Caption = 'sidecarPanel' - ClientHeight = 534 + ClientHeight = 533 ClientWidth = 170 Color = clBlack ParentColor = False TabOrder = 0 object Image1: TImage Left = 0 - Height = 534 + Height = 533 Top = 0 Width = 170 Align = alClient @@ -5447,12 +5447,12 @@ object GUIForm: TGUIForm end object embedPanel: TPanel Left = 0 - Height = 534 + Height = 533 Top = 0 Width = 908 Align = alClient BevelOuter = bvNone - ClientHeight = 534 + ClientHeight = 533 ClientWidth = 908 Color = clBlack Font.Color = clWhite @@ -5464,7 +5464,7 @@ object GUIForm: TGUIForm OnMouseUp = FormMouseUp object backdrop: TImage Left = 0 - Height = 534 + Height = 533 Top = 0 Width = 908 Align = alClient @@ -5477,7 +5477,7 @@ object GUIForm: TGUIForm object pnlMemory: TPanel Left = 0 Height = 37 - Top = 534 + Top = 533 Width = 1078 Align = alBottom ClientHeight = 37 @@ -5488,7 +5488,7 @@ object GUIForm: TGUIForm OnResize = pnlMemoryResize object txtAddress: TEdit Left = 136 - Height = 23 + Height = 29 Top = 8 Width = 80 OnKeyPress = txtAddressKeyPress @@ -5498,23 +5498,23 @@ object GUIForm: TGUIForm end object Label1: TLabel Left = 9 - Height = 15 + Height = 17 Top = 10 - Width = 122 + Width = 130 Caption = 'Memory Address (hex):' ParentColor = False end object Label2: TLabel Left = 240 - Height = 15 + Height = 17 Top = 10 - Width = 60 + Width = 65 Caption = 'Value (hex):' ParentColor = False end object txtValue: TEdit Left = 312 - Height = 23 + Height = 29 Top = 8 Width = 80 OnKeyPress = txtValueKeyPress diff --git a/backup/main.pas b/backup/main.pas index edc07fa..35efb2b 100644 --- a/backup/main.pas +++ b/backup/main.pas @@ -3171,7 +3171,7 @@ begin code := MapKeyCode(Key,Shift,false); if code <> 0 then SendKey( code, 0, 1, MapShiftState(Key, Shift) ); - StatusBar1.SimpleText := IntToStr(code) + ' ' + keydesc; + //StatusBar1.SimpleText := IntToStr(code) + ' ' + keydesc; end; procedure TGUIForm.FormKeyPress(Sender: TObject; var Key: char); diff --git a/backup/poc.lps b/backup/poc.lps index 1c96fab..99f2a1a 100644 --- a/backup/poc.lps +++ b/backup/poc.lps @@ -21,8 +21,8 @@ - - + + @@ -43,7 +43,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -61,129 +61,129 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/main.lfm b/main.lfm index 35dc168..564b9c5 100644 --- a/main.lfm +++ b/main.lfm @@ -6,7 +6,7 @@ object GUIForm: TGUIForm AllowDropFiles = True AlphaBlendValue = 128 Caption = 'microM8 GUI' - ClientHeight = 630 + ClientHeight = 625 ClientWidth = 1078 Constraints.MinWidth = 1078 DoubleBuffered = False @@ -31,8 +31,8 @@ object GUIForm: TGUIForm LCLVersion = '2.0.0.4' object StatusBar1: TStatusBar Left = 0 - Height = 23 - Top = 607 + Height = 19 + Top = 606 Width = 1078 Panels = <> end @@ -234,7 +234,7 @@ object GUIForm: TGUIForm end object tbMasterVolume: TTrackBar Left = 249 - Height = 32 + Height = 38 Top = 2 Width = 96 OnChange = tbMasterVolumeChange @@ -278,7 +278,7 @@ object GUIForm: TGUIForm end object TrackBar2: TTrackBar Left = 449 - Height = 32 + Height = 38 Top = 2 Width = 96 Max = 4 @@ -329,31 +329,31 @@ object GUIForm: TGUIForm end object pnlContainer: TPanel Left = 0 - Height = 571 + Height = 570 Top = 36 Width = 1078 Align = alClient BevelOuter = bvNone - ClientHeight = 571 + ClientHeight = 570 ClientWidth = 1078 ParentColor = False TabOrder = 2 object sidecarPanel: TPanel Left = 908 - Height = 534 + Height = 533 Top = 0 Width = 170 Align = alRight BevelOuter = bvNone Caption = 'sidecarPanel' - ClientHeight = 534 + ClientHeight = 533 ClientWidth = 170 Color = clBlack ParentColor = False TabOrder = 0 object Image1: TImage Left = 0 - Height = 534 + Height = 533 Top = 0 Width = 170 Align = alClient @@ -5447,12 +5447,12 @@ object GUIForm: TGUIForm end object embedPanel: TPanel Left = 0 - Height = 534 + Height = 533 Top = 0 Width = 908 Align = alClient BevelOuter = bvNone - ClientHeight = 534 + ClientHeight = 533 ClientWidth = 908 Color = clBlack Font.Color = clWhite @@ -5464,7 +5464,7 @@ object GUIForm: TGUIForm OnMouseUp = FormMouseUp object backdrop: TImage Left = 0 - Height = 534 + Height = 533 Top = 0 Width = 908 Align = alClient @@ -5477,7 +5477,7 @@ object GUIForm: TGUIForm object pnlMemory: TPanel Left = 0 Height = 37 - Top = 534 + Top = 533 Width = 1078 Align = alBottom ClientHeight = 37 @@ -5488,7 +5488,7 @@ object GUIForm: TGUIForm OnResize = pnlMemoryResize object txtAddress: TEdit Left = 136 - Height = 23 + Height = 29 Top = 8 Width = 80 OnKeyPress = txtAddressKeyPress @@ -5498,23 +5498,23 @@ object GUIForm: TGUIForm end object Label1: TLabel Left = 9 - Height = 15 + Height = 17 Top = 10 - Width = 122 + Width = 130 Caption = 'Memory Address (hex):' ParentColor = False end object Label2: TLabel Left = 240 - Height = 15 + Height = 17 Top = 10 - Width = 60 + Width = 65 Caption = 'Value (hex):' ParentColor = False end object txtValue: TEdit Left = 312 - Height = 23 + Height = 29 Top = 8 Width = 80 OnKeyPress = txtValueKeyPress diff --git a/main.pas b/main.pas index 35efb2b..fa5e101 100644 --- a/main.pas +++ b/main.pas @@ -3000,7 +3000,7 @@ begin else Result := 0; end; - //VK_SHIFT: Result := 0; + VK_SHIFT: Result := 0; VK_CAPITAL: begin {$IFDEF DARWIN} Caps := (not KeyUp); diff --git a/poc.lps b/poc.lps index 99f2a1a..72b9023 100644 --- a/poc.lps +++ b/poc.lps @@ -1,194 +1,190 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +