key and window size fixes

This commit is contained in:
April Ayres-Griffiths 2019-04-17 19:12:35 +10:00
parent adcbb98b99
commit 3953bb42fd
6 changed files with 202 additions and 176 deletions

View File

@ -1,13 +1,13 @@
object GUIForm: TGUIForm object GUIForm: TGUIForm
Left = 565 Left = 320
Height = 668 Height = 723
Top = 128 Top = 76
Width = 1014 Width = 1113
AlphaBlendValue = 128 AlphaBlendValue = 128
Caption = 'microM8 GUI' Caption = 'microM8 GUI'
ClientHeight = 643 ClientHeight = 698
ClientWidth = 1014 ClientWidth = 1113
Constraints.MinWidth = 1014 Constraints.MinWidth = 1078
DoubleBuffered = False DoubleBuffered = False
Menu = MainMenu1 Menu = MainMenu1
OnChangeBounds = FormChangeBounds OnChangeBounds = FormChangeBounds
@ -30,15 +30,15 @@ object GUIForm: TGUIForm
object StatusBar1: TStatusBar object StatusBar1: TStatusBar
Left = 0 Left = 0
Height = 19 Height = 19
Top = 624 Top = 679
Width = 1014 Width = 1113
Panels = <> Panels = <>
end end
object ToolBar1: TToolBar object ToolBar1: TToolBar
Left = 0 Left = 0
Height = 36 Height = 36
Top = 0 Top = 0
Width = 1014 Width = 1113
ButtonHeight = 32 ButtonHeight = 32
ButtonWidth = 32 ButtonWidth = 32
Caption = 'ToolBar1' Caption = 'ToolBar1'
@ -58,7 +58,7 @@ object GUIForm: TGUIForm
end end
object tbRMVoxels: TToolButton object tbRMVoxels: TToolButton
Tag = 1 Tag = 1
Left = 549 Left = 613
Hint = 'Voxel Render' Hint = 'Voxel Render'
Top = 2 Top = 2
Caption = 'Voxels' Caption = 'Voxels'
@ -72,7 +72,7 @@ object GUIForm: TGUIForm
Style = tbsCheck Style = tbsCheck
end end
object tbRMDots: TToolButton object tbRMDots: TToolButton
Left = 585 Left = 649
Hint = 'Dot Render' Hint = 'Dot Render'
Top = 2 Top = 2
Caption = 'Dots' Caption = 'Dots'
@ -85,7 +85,7 @@ object GUIForm: TGUIForm
end end
object tbRMRaster: TToolButton object tbRMRaster: TToolButton
Tag = 2 Tag = 2
Left = 621 Left = 685
Hint = 'Raster Render' Hint = 'Raster Render'
Top = 2 Top = 2
Caption = 'Raster' Caption = 'Raster'
@ -97,7 +97,7 @@ object GUIForm: TGUIForm
Style = tbsCheck Style = tbsCheck
end end
object tbRMColor: TToolButton object tbRMColor: TToolButton
Left = 657 Left = 721
Hint = 'Toggle Color/Mono' Hint = 'Toggle Color/Mono'
Top = 2 Top = 2
Caption = 'tbRMColor' Caption = 'tbRMColor'
@ -107,7 +107,7 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object tbRECState: TToolButton object tbRECState: TToolButton
Left = 725 Left = 789
Hint = 'Start Recording' Hint = 'Start Recording'
Top = 2 Top = 2
Caption = 'tbRECState' Caption = 'tbRECState'
@ -117,7 +117,7 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton5: TToolButton object ToolButton5: TToolButton
Left = 761 Left = 825
Hint = 'Rewind' Hint = 'Rewind'
Top = 2 Top = 2
Caption = 'ToolButton5' Caption = 'ToolButton5'
@ -127,7 +127,7 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton6: TToolButton object ToolButton6: TToolButton
Left = 797 Left = 861
Hint = 'Forwards' Hint = 'Forwards'
Top = 2 Top = 2
Caption = 'ToolButton6' Caption = 'ToolButton6'
@ -137,7 +137,7 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton7: TToolButton object ToolButton7: TToolButton
Left = 833 Left = 897
Hint = 'Resume' Hint = 'Resume'
Top = 2 Top = 2
Caption = 'ToolButton7' Caption = 'ToolButton7'
@ -147,7 +147,7 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton8: TToolButton object ToolButton8: TToolButton
Left = 869 Left = 933
Hint = 'Stop Recording' Hint = 'Stop Recording'
Top = 2 Top = 2
Caption = 'ToolButton8' Caption = 'ToolButton8'
@ -157,7 +157,7 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton9: TToolButton object ToolButton9: TToolButton
Left = 905 Left = 969
Hint = 'Pause' Hint = 'Pause'
Top = 2 Top = 2
Caption = 'ToolButton9' Caption = 'ToolButton9'
@ -167,7 +167,7 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton10: TToolButton object ToolButton10: TToolButton
Left = 693 Left = 757
Top = 2 Top = 2
Caption = 'ToolButton10' Caption = 'ToolButton10'
Enabled = False Enabled = False
@ -234,7 +234,7 @@ object GUIForm: TGUIForm
Left = 249 Left = 249
Height = 38 Height = 38
Top = 2 Top = 2
Width = 64 Width = 96
OnChange = tbMasterVolumeChange OnChange = tbMasterVolumeChange
Position = 0 Position = 0
ScalePos = trBottom ScalePos = trBottom
@ -249,7 +249,7 @@ object GUIForm: TGUIForm
TabOrder = 0 TabOrder = 0
end end
object tbVolUp: TToolButton object tbVolUp: TToolButton
Left = 313 Left = 345
Hint = 'Volume Up' Hint = 'Volume Up'
Top = 2 Top = 2
Caption = 'tbVolUp' Caption = 'tbVolUp'
@ -259,13 +259,13 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton3: TToolButton object ToolButton3: TToolButton
Left = 349 Left = 381
Top = 2 Top = 2
Caption = 'ToolButton3' Caption = 'ToolButton3'
Enabled = False Enabled = False
end end
object tbSpeedDown: TToolButton object tbSpeedDown: TToolButton
Left = 381 Left = 413
Hint = 'CPU Speed Down' Hint = 'CPU Speed Down'
Top = 2 Top = 2
Caption = 'tbSpeedDown' Caption = 'tbSpeedDown'
@ -275,10 +275,10 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object TrackBar2: TTrackBar object TrackBar2: TTrackBar
Left = 417 Left = 449
Height = 38 Height = 38
Top = 2 Top = 2
Width = 64 Width = 96
Max = 4 Max = 4
OnChange = TrackBar2Change OnChange = TrackBar2Change
Position = 0 Position = 0
@ -293,7 +293,7 @@ object GUIForm: TGUIForm
TabOrder = 1 TabOrder = 1
end end
object tbSpeedUp: TToolButton object tbSpeedUp: TToolButton
Left = 481 Left = 545
Hint = 'CPU Speed Up' Hint = 'CPU Speed Up'
Top = 2 Top = 2
Caption = 'tbSpeedUp' Caption = 'tbSpeedUp'
@ -303,19 +303,19 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton18: TToolButton object ToolButton18: TToolButton
Left = 517 Left = 581
Top = 2 Top = 2
Caption = 'ToolButton18' Caption = 'ToolButton18'
Enabled = False Enabled = False
end end
object ToolButton1: TToolButton object ToolButton1: TToolButton
Left = 941 Left = 1005
Top = 2 Top = 2
Caption = 'ToolButton1' Caption = 'ToolButton1'
Enabled = False Enabled = False
end end
object tbFullscreen: TToolButton object tbFullscreen: TToolButton
Left = 973 Left = 1037
Hint = 'Fullscreen' Hint = 'Fullscreen'
Top = 2 Top = 2
Caption = 'tbFullscreen' Caption = 'tbFullscreen'
@ -327,31 +327,31 @@ object GUIForm: TGUIForm
end end
object pnlContainer: TPanel object pnlContainer: TPanel
Left = 0 Left = 0
Height = 588 Height = 643
Top = 36 Top = 36
Width = 1014 Width = 1113
Align = alClient Align = alClient
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 588 ClientHeight = 643
ClientWidth = 1014 ClientWidth = 1113
ParentColor = False ParentColor = False
TabOrder = 2 TabOrder = 2
object sidecarPanel: TPanel object sidecarPanel: TPanel
Left = 844 Left = 943
Height = 551 Height = 606
Top = 0 Top = 0
Width = 170 Width = 170
Align = alRight Align = alRight
BevelOuter = bvNone BevelOuter = bvNone
Caption = 'sidecarPanel' Caption = 'sidecarPanel'
ClientHeight = 551 ClientHeight = 606
ClientWidth = 170 ClientWidth = 170
Color = clBlack Color = clBlack
ParentColor = False ParentColor = False
TabOrder = 0 TabOrder = 0
object Image1: TImage object Image1: TImage
Left = 0 Left = 0
Height = 551 Height = 606
Top = 0 Top = 0
Width = 170 Width = 170
Align = alClient Align = alClient
@ -5444,13 +5444,13 @@ object GUIForm: TGUIForm
end end
object embedPanel: TPanel object embedPanel: TPanel
Left = 0 Left = 0
Height = 551 Height = 606
Top = 0 Top = 0
Width = 844 Width = 943
Align = alClient Align = alClient
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 551 ClientHeight = 606
ClientWidth = 844 ClientWidth = 943
Color = clBlack Color = clBlack
Font.Color = clWhite Font.Color = clWhite
ParentColor = False ParentColor = False
@ -5461,9 +5461,9 @@ object GUIForm: TGUIForm
OnMouseUp = FormMouseUp OnMouseUp = FormMouseUp
object backdrop: TImage object backdrop: TImage
Left = 0 Left = 0
Height = 551 Height = 606
Top = 0 Top = 0
Width = 844 Width = 943
Align = alClient Align = alClient
OnClick = backdropClick OnClick = backdropClick
OnMouseDown = FormMouseDown OnMouseDown = FormMouseDown
@ -5474,11 +5474,11 @@ object GUIForm: TGUIForm
object pnlMemory: TPanel object pnlMemory: TPanel
Left = 0 Left = 0
Height = 37 Height = 37
Top = 551 Top = 606
Width = 1014 Width = 1113
Align = alBottom Align = alBottom
ClientHeight = 37 ClientHeight = 37
ClientWidth = 1014 ClientWidth = 1113
ParentColor = False ParentColor = False
TabOrder = 2 TabOrder = 2
Visible = False Visible = False
@ -5520,7 +5520,7 @@ object GUIForm: TGUIForm
Text = '$00' Text = '$00'
end end
object pnlMemButtons: TPanel object pnlMemButtons: TPanel
Left = 760 Left = 859
Height = 35 Height = 35
Top = 1 Top = 1
Width = 253 Width = 253

View File

@ -2870,13 +2870,26 @@ begin
if isCaps then if isCaps then
keydesc := 'CapsLock'; keydesc := 'CapsLock';
if isAlt or isMeta then if isAlt then
begin begin
result := OPEN_APPLE; result := OPEN_APPLE;
//exit;
end;
if isMeta then
begin
result := 0;
exit; exit;
end; end;
case Key of case Key of
VK_BACK:
if isCtrl and isShift then
Result := 0;
13: begin
if isAlt or isShift or isCtrl then
Result := 0;
end;
VK_SHIFT: Result := 0; VK_SHIFT: Result := 0;
VK_CAPITAL: begin VK_CAPITAL: begin
if KeyUp then if KeyUp then
@ -3049,9 +3062,9 @@ procedure TGUIForm.FormKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState)
var var
code: integer; code: integer;
begin begin
code := MapKeyCode(Key,Shift,true); //code := MapKeyCode(Key,Shift,true);
if code <> 0 then //if code <> 0 then
SendKey( code, 0, 0, MapShiftState(Key, Shift) ); // SendKey( code, 0, 0, MapShiftState(Key, Shift) );
//StatusBar1.SimpleText := 'keycode ' + IntToStr(Key); //StatusBar1.SimpleText := 'keycode ' + IntToStr(Key);
end; end;

View File

@ -21,8 +21,8 @@
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<IsVisibleTab Value="True"/> <IsVisibleTab Value="True"/>
<TopLine Value="2446"/> <TopLine Value="2868"/>
<CursorPos X="20" Y="2459"/> <CursorPos X="10" Y="2886"/>
<UsageCount Value="323"/> <UsageCount Value="323"/>
<Loaded Value="True"/> <Loaded Value="True"/>
<LoadedDesigner Value="True"/> <LoadedDesigner Value="True"/>
@ -43,7 +43,7 @@
<EditorIndex Value="-1"/> <EditorIndex Value="-1"/>
<TopLine Value="576"/> <TopLine Value="576"/>
<CursorPos X="49" Y="591"/> <CursorPos X="49" Y="591"/>
<UsageCount Value="106"/> <UsageCount Value="100"/>
</Unit3> </Unit3>
<Unit4> <Unit4>
<Filename Value="C:\lazarus\components\lazutils\utf8process.pp"/> <Filename Value="C:\lazarus\components\lazutils\utf8process.pp"/>
@ -51,7 +51,7 @@
<EditorIndex Value="-1"/> <EditorIndex Value="-1"/>
<TopLine Value="636"/> <TopLine Value="636"/>
<CursorPos Y="654"/> <CursorPos Y="654"/>
<UsageCount Value="1"/> <UsageCount Value="5"/>
</Unit4> </Unit4>
<Unit5> <Unit5>
<Filename Value="images\memory.pas"/> <Filename Value="images\memory.pas"/>
@ -61,129 +61,129 @@
<EditorIndex Value="-1"/> <EditorIndex Value="-1"/>
<TopLine Value="40"/> <TopLine Value="40"/>
<CursorPos X="17" Y="44"/> <CursorPos X="17" Y="44"/>
<UsageCount Value="20"/> <UsageCount Value="14"/>
</Unit5> </Unit5>
</Units> </Units>
<JumpHistory Count="30" HistoryIndex="29"> <JumpHistory Count="30" HistoryIndex="29">
<Position1> <Position1>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2088" Column="42" TopLine="2060"/> <Caret Line="822" Column="15" TopLine="810"/>
</Position1> </Position1>
<Position2> <Position2>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2089" Column="43" TopLine="2061"/> <Caret Line="2816" Column="17" TopLine="2765"/>
</Position2> </Position2>
<Position3> <Position3>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2106" Column="41" TopLine="2078"/> <Caret Line="2969" Column="14" TopLine="2949"/>
</Position3> </Position3>
<Position4> <Position4>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2407" Column="33" TopLine="2378"/> <Caret Line="2978" Column="4" TopLine="2959"/>
</Position4> </Position4>
<Position5> <Position5>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2393" Column="13" TopLine="2391"/> <Caret Line="2814" Column="31" TopLine="2799"/>
</Position5> </Position5>
<Position6> <Position6>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2409" Column="37" TopLine="2393"/> <Caret Line="2788" Column="19" TopLine="2762"/>
</Position6> </Position6>
<Position7> <Position7>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2410" Column="36" TopLine="2393"/> <Caret Line="2855" Column="25" TopLine="2799"/>
</Position7> </Position7>
<Position8> <Position8>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="571" Column="32" TopLine="548"/> <Caret Line="740" Column="6" TopLine="745"/>
</Position8> </Position8>
<Position9> <Position9>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="1893" Column="4" TopLine="1890"/> <Caret Line="3151" Column="3" TopLine="3134"/>
</Position9> </Position9>
<Position10> <Position10>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="1913" Column="20" TopLine="1892"/> <Caret Line="998" Column="10" TopLine="978"/>
</Position10> </Position10>
<Position11> <Position11>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="1907" Column="19" TopLine="1892"/> <Caret Line="3151" Column="3" TopLine="3134"/>
</Position11> </Position11>
<Position12> <Position12>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2098" Column="43" TopLine="2093"/> <Caret Line="999" Column="10" TopLine="997"/>
</Position12> </Position12>
<Position13> <Position13>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2103" Column="11" TopLine="2088"/> <Caret Line="1110" Column="45" TopLine="1103"/>
</Position13> </Position13>
<Position14> <Position14>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2163" Column="20" TopLine="2160"/> <Caret Line="1109" Column="20" TopLine="1098"/>
</Position14> </Position14>
<Position15> <Position15>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2169" Column="21" TopLine="2160"/> <Caret Line="396" Column="15" TopLine="385"/>
</Position15> </Position15>
<Position16> <Position16>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2160" Column="20" TopLine="2149"/> <Caret Line="1109" Column="20" TopLine="1104"/>
</Position16> </Position16>
<Position17> <Position17>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2468" Column="27" TopLine="2446"/> <Caret Line="396" Column="29" TopLine="385"/>
</Position17> </Position17>
<Position18> <Position18>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2514" Column="35" TopLine="2492"/> <Caret Line="978" Column="38" TopLine="961"/>
</Position18> </Position18>
<Position19> <Position19>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2505" Column="43" TopLine="2484"/> <Caret Line="2868" Column="26" TopLine="2848"/>
</Position19> </Position19>
<Position20> <Position20>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="970" Column="48" TopLine="953"/> <Caret Line="593" Column="38" TopLine="572"/>
</Position20> </Position20>
<Position21> <Position21>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="1830" Column="44" TopLine="1802"/> <Caret Line="2987" Column="48" TopLine="2978"/>
</Position21> </Position21>
<Position22> <Position22>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2123" Column="46" TopLine="2116"/> <Caret Line="582" Column="20" TopLine="572"/>
</Position22> </Position22>
<Position23> <Position23>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2160" Column="47" TopLine="2129"/> <Caret Line="2809" Column="66" TopLine="2788"/>
</Position23> </Position23>
<Position24> <Position24>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2161" Column="47" TopLine="2133"/> <Caret Line="2998" Column="6" TopLine="2978"/>
</Position24> </Position24>
<Position25> <Position25>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2162" Column="47" TopLine="2134"/> <Caret Line="3039" Column="26" TopLine="3026"/>
</Position25> </Position25>
<Position26> <Position26>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2163" Column="47" TopLine="2135"/> <Caret Line="3035" Column="34" TopLine="3024"/>
</Position26> </Position26>
<Position27> <Position27>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2164" Column="47" TopLine="2136"/> <Caret Line="335" Column="59" TopLine="318"/>
</Position27> </Position27>
<Position28> <Position28>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2460" Column="43" TopLine="2432"/> <Caret Line="3046" Column="36" TopLine="3032"/>
</Position28> </Position28>
<Position29> <Position29>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2515" Column="18" TopLine="2496"/> <Caret Line="2882" Column="27" TopLine="2867"/>
</Position29> </Position29>
<Position30> <Position30>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2510" Column="24" TopLine="2495"/> <Caret Line="2888" Column="23" TopLine="2877"/>
</Position30> </Position30>
</JumpHistory> </JumpHistory>
<RunParams> <RunParams>

View File

@ -1,13 +1,13 @@
object GUIForm: TGUIForm object GUIForm: TGUIForm
Left = 565 Left = 371
Height = 668 Height = 683
Top = 128 Top = 112
Width = 1014 Width = 1078
AlphaBlendValue = 128 AlphaBlendValue = 128
Caption = 'microM8 GUI' Caption = 'microM8 GUI'
ClientHeight = 643 ClientHeight = 658
ClientWidth = 1014 ClientWidth = 1078
Constraints.MinWidth = 1014 Constraints.MinWidth = 1078
DoubleBuffered = False DoubleBuffered = False
Menu = MainMenu1 Menu = MainMenu1
OnChangeBounds = FormChangeBounds OnChangeBounds = FormChangeBounds
@ -30,15 +30,15 @@ object GUIForm: TGUIForm
object StatusBar1: TStatusBar object StatusBar1: TStatusBar
Left = 0 Left = 0
Height = 19 Height = 19
Top = 624 Top = 639
Width = 1014 Width = 1078
Panels = <> Panels = <>
end end
object ToolBar1: TToolBar object ToolBar1: TToolBar
Left = 0 Left = 0
Height = 36 Height = 36
Top = 0 Top = 0
Width = 1014 Width = 1078
ButtonHeight = 32 ButtonHeight = 32
ButtonWidth = 32 ButtonWidth = 32
Caption = 'ToolBar1' Caption = 'ToolBar1'
@ -58,7 +58,7 @@ object GUIForm: TGUIForm
end end
object tbRMVoxels: TToolButton object tbRMVoxels: TToolButton
Tag = 1 Tag = 1
Left = 549 Left = 613
Hint = 'Voxel Render' Hint = 'Voxel Render'
Top = 2 Top = 2
Caption = 'Voxels' Caption = 'Voxels'
@ -72,7 +72,7 @@ object GUIForm: TGUIForm
Style = tbsCheck Style = tbsCheck
end end
object tbRMDots: TToolButton object tbRMDots: TToolButton
Left = 585 Left = 649
Hint = 'Dot Render' Hint = 'Dot Render'
Top = 2 Top = 2
Caption = 'Dots' Caption = 'Dots'
@ -85,7 +85,7 @@ object GUIForm: TGUIForm
end end
object tbRMRaster: TToolButton object tbRMRaster: TToolButton
Tag = 2 Tag = 2
Left = 621 Left = 685
Hint = 'Raster Render' Hint = 'Raster Render'
Top = 2 Top = 2
Caption = 'Raster' Caption = 'Raster'
@ -97,7 +97,7 @@ object GUIForm: TGUIForm
Style = tbsCheck Style = tbsCheck
end end
object tbRMColor: TToolButton object tbRMColor: TToolButton
Left = 657 Left = 721
Hint = 'Toggle Color/Mono' Hint = 'Toggle Color/Mono'
Top = 2 Top = 2
Caption = 'tbRMColor' Caption = 'tbRMColor'
@ -107,7 +107,7 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object tbRECState: TToolButton object tbRECState: TToolButton
Left = 725 Left = 789
Hint = 'Start Recording' Hint = 'Start Recording'
Top = 2 Top = 2
Caption = 'tbRECState' Caption = 'tbRECState'
@ -117,7 +117,7 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton5: TToolButton object ToolButton5: TToolButton
Left = 761 Left = 825
Hint = 'Rewind' Hint = 'Rewind'
Top = 2 Top = 2
Caption = 'ToolButton5' Caption = 'ToolButton5'
@ -127,7 +127,7 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton6: TToolButton object ToolButton6: TToolButton
Left = 797 Left = 861
Hint = 'Forwards' Hint = 'Forwards'
Top = 2 Top = 2
Caption = 'ToolButton6' Caption = 'ToolButton6'
@ -137,7 +137,7 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton7: TToolButton object ToolButton7: TToolButton
Left = 833 Left = 897
Hint = 'Resume' Hint = 'Resume'
Top = 2 Top = 2
Caption = 'ToolButton7' Caption = 'ToolButton7'
@ -147,7 +147,7 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton8: TToolButton object ToolButton8: TToolButton
Left = 869 Left = 933
Hint = 'Stop Recording' Hint = 'Stop Recording'
Top = 2 Top = 2
Caption = 'ToolButton8' Caption = 'ToolButton8'
@ -157,7 +157,7 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton9: TToolButton object ToolButton9: TToolButton
Left = 905 Left = 969
Hint = 'Pause' Hint = 'Pause'
Top = 2 Top = 2
Caption = 'ToolButton9' Caption = 'ToolButton9'
@ -167,7 +167,7 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton10: TToolButton object ToolButton10: TToolButton
Left = 693 Left = 757
Top = 2 Top = 2
Caption = 'ToolButton10' Caption = 'ToolButton10'
Enabled = False Enabled = False
@ -234,7 +234,7 @@ object GUIForm: TGUIForm
Left = 249 Left = 249
Height = 38 Height = 38
Top = 2 Top = 2
Width = 64 Width = 96
OnChange = tbMasterVolumeChange OnChange = tbMasterVolumeChange
Position = 0 Position = 0
ScalePos = trBottom ScalePos = trBottom
@ -249,7 +249,7 @@ object GUIForm: TGUIForm
TabOrder = 0 TabOrder = 0
end end
object tbVolUp: TToolButton object tbVolUp: TToolButton
Left = 313 Left = 345
Hint = 'Volume Up' Hint = 'Volume Up'
Top = 2 Top = 2
Caption = 'tbVolUp' Caption = 'tbVolUp'
@ -259,13 +259,13 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton3: TToolButton object ToolButton3: TToolButton
Left = 349 Left = 381
Top = 2 Top = 2
Caption = 'ToolButton3' Caption = 'ToolButton3'
Enabled = False Enabled = False
end end
object tbSpeedDown: TToolButton object tbSpeedDown: TToolButton
Left = 381 Left = 413
Hint = 'CPU Speed Down' Hint = 'CPU Speed Down'
Top = 2 Top = 2
Caption = 'tbSpeedDown' Caption = 'tbSpeedDown'
@ -275,10 +275,10 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object TrackBar2: TTrackBar object TrackBar2: TTrackBar
Left = 417 Left = 449
Height = 38 Height = 38
Top = 2 Top = 2
Width = 64 Width = 96
Max = 4 Max = 4
OnChange = TrackBar2Change OnChange = TrackBar2Change
Position = 0 Position = 0
@ -293,7 +293,7 @@ object GUIForm: TGUIForm
TabOrder = 1 TabOrder = 1
end end
object tbSpeedUp: TToolButton object tbSpeedUp: TToolButton
Left = 481 Left = 545
Hint = 'CPU Speed Up' Hint = 'CPU Speed Up'
Top = 2 Top = 2
Caption = 'tbSpeedUp' Caption = 'tbSpeedUp'
@ -303,19 +303,19 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton18: TToolButton object ToolButton18: TToolButton
Left = 517 Left = 581
Top = 2 Top = 2
Caption = 'ToolButton18' Caption = 'ToolButton18'
Enabled = False Enabled = False
end end
object ToolButton1: TToolButton object ToolButton1: TToolButton
Left = 941 Left = 1005
Top = 2 Top = 2
Caption = 'ToolButton1' Caption = 'ToolButton1'
Enabled = False Enabled = False
end end
object tbFullscreen: TToolButton object tbFullscreen: TToolButton
Left = 973 Left = 1037
Hint = 'Fullscreen' Hint = 'Fullscreen'
Top = 2 Top = 2
Caption = 'tbFullscreen' Caption = 'tbFullscreen'
@ -327,31 +327,31 @@ object GUIForm: TGUIForm
end end
object pnlContainer: TPanel object pnlContainer: TPanel
Left = 0 Left = 0
Height = 588 Height = 603
Top = 36 Top = 36
Width = 1014 Width = 1078
Align = alClient Align = alClient
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 588 ClientHeight = 603
ClientWidth = 1014 ClientWidth = 1078
ParentColor = False ParentColor = False
TabOrder = 2 TabOrder = 2
object sidecarPanel: TPanel object sidecarPanel: TPanel
Left = 844 Left = 908
Height = 551 Height = 566
Top = 0 Top = 0
Width = 170 Width = 170
Align = alRight Align = alRight
BevelOuter = bvNone BevelOuter = bvNone
Caption = 'sidecarPanel' Caption = 'sidecarPanel'
ClientHeight = 551 ClientHeight = 566
ClientWidth = 170 ClientWidth = 170
Color = clBlack Color = clBlack
ParentColor = False ParentColor = False
TabOrder = 0 TabOrder = 0
object Image1: TImage object Image1: TImage
Left = 0 Left = 0
Height = 551 Height = 566
Top = 0 Top = 0
Width = 170 Width = 170
Align = alClient Align = alClient
@ -5444,13 +5444,13 @@ object GUIForm: TGUIForm
end end
object embedPanel: TPanel object embedPanel: TPanel
Left = 0 Left = 0
Height = 551 Height = 566
Top = 0 Top = 0
Width = 844 Width = 908
Align = alClient Align = alClient
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 551 ClientHeight = 566
ClientWidth = 844 ClientWidth = 908
Color = clBlack Color = clBlack
Font.Color = clWhite Font.Color = clWhite
ParentColor = False ParentColor = False
@ -5461,9 +5461,9 @@ object GUIForm: TGUIForm
OnMouseUp = FormMouseUp OnMouseUp = FormMouseUp
object backdrop: TImage object backdrop: TImage
Left = 0 Left = 0
Height = 551 Height = 566
Top = 0 Top = 0
Width = 844 Width = 908
Align = alClient Align = alClient
OnClick = backdropClick OnClick = backdropClick
OnMouseDown = FormMouseDown OnMouseDown = FormMouseDown
@ -5474,11 +5474,11 @@ object GUIForm: TGUIForm
object pnlMemory: TPanel object pnlMemory: TPanel
Left = 0 Left = 0
Height = 37 Height = 37
Top = 551 Top = 566
Width = 1014 Width = 1078
Align = alBottom Align = alBottom
ClientHeight = 37 ClientHeight = 37
ClientWidth = 1014 ClientWidth = 1078
ParentColor = False ParentColor = False
TabOrder = 2 TabOrder = 2
Visible = False Visible = False
@ -5520,7 +5520,7 @@ object GUIForm: TGUIForm
Text = '$00' Text = '$00'
end end
object pnlMemButtons: TPanel object pnlMemButtons: TPanel
Left = 760 Left = 824
Height = 35 Height = 35
Top = 1 Top = 1
Width = 253 Width = 253

View File

@ -2870,13 +2870,26 @@ begin
if isCaps then if isCaps then
keydesc := 'CapsLock'; keydesc := 'CapsLock';
if isAlt or isMeta then if isAlt then
begin begin
result := OPEN_APPLE; result := OPEN_APPLE;
//exit; //exit;
end; end;
if isMeta then
begin
result := 0;
exit;
end;
case Key of case Key of
VK_BACK:
if isCtrl and isShift then
Result := 0;
13: begin
if isAlt or isShift or isCtrl then
Result := 0;
end;
VK_SHIFT: Result := 0; VK_SHIFT: Result := 0;
VK_CAPITAL: begin VK_CAPITAL: begin
if KeyUp then if KeyUp then
@ -3049,9 +3062,9 @@ procedure TGUIForm.FormKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState)
var var
code: integer; code: integer;
begin begin
code := MapKeyCode(Key,Shift,true); //code := MapKeyCode(Key,Shift,true);
if code <> 0 then //if code <> 0 then
SendKey( code, 0, 0, MapShiftState(Key, Shift) ); // SendKey( code, 0, 0, MapShiftState(Key, Shift) );
//StatusBar1.SimpleText := 'keycode ' + IntToStr(Key); //StatusBar1.SimpleText := 'keycode ' + IntToStr(Key);
end; end;

70
poc.lps
View File

@ -21,8 +21,8 @@
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<IsVisibleTab Value="True"/> <IsVisibleTab Value="True"/>
<TopLine Value="2762"/> <TopLine Value="2868"/>
<CursorPos X="19" Y="2788"/> <CursorPos X="10" Y="2886"/>
<UsageCount Value="323"/> <UsageCount Value="323"/>
<Loaded Value="True"/> <Loaded Value="True"/>
<LoadedDesigner Value="True"/> <LoadedDesigner Value="True"/>
@ -43,7 +43,7 @@
<EditorIndex Value="-1"/> <EditorIndex Value="-1"/>
<TopLine Value="576"/> <TopLine Value="576"/>
<CursorPos X="49" Y="591"/> <CursorPos X="49" Y="591"/>
<UsageCount Value="105"/> <UsageCount Value="100"/>
</Unit3> </Unit3>
<Unit4> <Unit4>
<Filename Value="C:\lazarus\components\lazutils\utf8process.pp"/> <Filename Value="C:\lazarus\components\lazutils\utf8process.pp"/>
@ -51,7 +51,7 @@
<EditorIndex Value="-1"/> <EditorIndex Value="-1"/>
<TopLine Value="636"/> <TopLine Value="636"/>
<CursorPos Y="654"/> <CursorPos Y="654"/>
<UsageCount Value="0"/> <UsageCount Value="5"/>
</Unit4> </Unit4>
<Unit5> <Unit5>
<Filename Value="images\memory.pas"/> <Filename Value="images\memory.pas"/>
@ -61,129 +61,129 @@
<EditorIndex Value="-1"/> <EditorIndex Value="-1"/>
<TopLine Value="40"/> <TopLine Value="40"/>
<CursorPos X="17" Y="44"/> <CursorPos X="17" Y="44"/>
<UsageCount Value="19"/> <UsageCount Value="14"/>
</Unit5> </Unit5>
</Units> </Units>
<JumpHistory Count="30" HistoryIndex="29"> <JumpHistory Count="30" HistoryIndex="29">
<Position1> <Position1>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2103" Column="11" TopLine="2088"/> <Caret Line="822" Column="15" TopLine="810"/>
</Position1> </Position1>
<Position2> <Position2>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2163" Column="20" TopLine="2160"/> <Caret Line="2816" Column="17" TopLine="2765"/>
</Position2> </Position2>
<Position3> <Position3>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2169" Column="21" TopLine="2160"/> <Caret Line="2969" Column="14" TopLine="2949"/>
</Position3> </Position3>
<Position4> <Position4>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2160" Column="20" TopLine="2149"/> <Caret Line="2978" Column="4" TopLine="2959"/>
</Position4> </Position4>
<Position5> <Position5>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2468" Column="27" TopLine="2446"/> <Caret Line="2814" Column="31" TopLine="2799"/>
</Position5> </Position5>
<Position6> <Position6>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2514" Column="35" TopLine="2492"/> <Caret Line="2788" Column="19" TopLine="2762"/>
</Position6> </Position6>
<Position7> <Position7>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2505" Column="43" TopLine="2484"/> <Caret Line="2855" Column="25" TopLine="2799"/>
</Position7> </Position7>
<Position8> <Position8>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="970" Column="48" TopLine="953"/> <Caret Line="740" Column="6" TopLine="745"/>
</Position8> </Position8>
<Position9> <Position9>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="1830" Column="44" TopLine="1802"/> <Caret Line="3151" Column="3" TopLine="3134"/>
</Position9> </Position9>
<Position10> <Position10>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2123" Column="46" TopLine="2116"/> <Caret Line="998" Column="10" TopLine="978"/>
</Position10> </Position10>
<Position11> <Position11>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2160" Column="47" TopLine="2129"/> <Caret Line="3151" Column="3" TopLine="3134"/>
</Position11> </Position11>
<Position12> <Position12>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2161" Column="47" TopLine="2133"/> <Caret Line="999" Column="10" TopLine="997"/>
</Position12> </Position12>
<Position13> <Position13>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2162" Column="47" TopLine="2134"/> <Caret Line="1110" Column="45" TopLine="1103"/>
</Position13> </Position13>
<Position14> <Position14>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2163" Column="47" TopLine="2135"/> <Caret Line="1109" Column="20" TopLine="1098"/>
</Position14> </Position14>
<Position15> <Position15>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2164" Column="47" TopLine="2136"/> <Caret Line="396" Column="15" TopLine="385"/>
</Position15> </Position15>
<Position16> <Position16>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2460" Column="43" TopLine="2432"/> <Caret Line="1109" Column="20" TopLine="1104"/>
</Position16> </Position16>
<Position17> <Position17>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2515" Column="18" TopLine="2496"/> <Caret Line="396" Column="29" TopLine="385"/>
</Position17> </Position17>
<Position18> <Position18>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2510" Column="24" TopLine="2495"/> <Caret Line="978" Column="38" TopLine="961"/>
</Position18> </Position18>
<Position19> <Position19>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2516" Column="42" TopLine="2484"/> <Caret Line="2868" Column="26" TopLine="2848"/>
</Position19> </Position19>
<Position20> <Position20>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2925" Column="39" TopLine="2907"/> <Caret Line="593" Column="38" TopLine="572"/>
</Position20> </Position20>
<Position21> <Position21>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2948" Column="64" TopLine="2929"/> <Caret Line="2987" Column="48" TopLine="2978"/>
</Position21> </Position21>
<Position22> <Position22>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2941" Column="33" TopLine="2931"/> <Caret Line="582" Column="20" TopLine="572"/>
</Position22> </Position22>
<Position23> <Position23>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2946" Column="17" TopLine="2931"/> <Caret Line="2809" Column="66" TopLine="2788"/>
</Position23> </Position23>
<Position24> <Position24>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2961" Column="17" TopLine="2933"/> <Caret Line="2998" Column="6" TopLine="2978"/>
</Position24> </Position24>
<Position25> <Position25>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2803" Column="35" TopLine="2803"/> <Caret Line="3039" Column="26" TopLine="3026"/>
</Position25> </Position25>
<Position26> <Position26>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="822" Column="15" TopLine="810"/> <Caret Line="3035" Column="34" TopLine="3024"/>
</Position26> </Position26>
<Position27> <Position27>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2816" Column="17" TopLine="2765"/> <Caret Line="335" Column="59" TopLine="318"/>
</Position27> </Position27>
<Position28> <Position28>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2969" Column="14" TopLine="2949"/> <Caret Line="3046" Column="36" TopLine="3032"/>
</Position28> </Position28>
<Position29> <Position29>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2978" Column="4" TopLine="2959"/> <Caret Line="2882" Column="27" TopLine="2867"/>
</Position29> </Position29>
<Position30> <Position30>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2814" Column="31" TopLine="2799"/> <Caret Line="2888" Column="23" TopLine="2877"/>
</Position30> </Position30>
</JumpHistory> </JumpHistory>
<RunParams> <RunParams>