From 4b5c542a16bcba977da25fd7703fbe6f02a17fe6 Mon Sep 17 00:00:00 2001 From: Melody Date: Sat, 20 Apr 2019 12:44:44 +1000 Subject: [PATCH] Alt-enter fix --- backup/main.lfm | 175 ++++++++++------------- backup/main.pas | 1 + backup/poc.lpi | 6 +- backup/poc.lps | 70 ++++----- main.lfm | 154 ++++++++++---------- main.pas | 1 + poc.lpi | 6 +- poc.lps | 372 ++++++++++++++++++++++++------------------------ poc.res | Bin 1453793 -> 1453833 bytes 9 files changed, 386 insertions(+), 399 deletions(-) diff --git a/backup/main.lfm b/backup/main.lfm index 35dc168..40d8c76 100644 --- a/backup/main.lfm +++ b/backup/main.lfm @@ -1,12 +1,12 @@ object GUIForm: TGUIForm - Left = 290 + Left = 420 Height = 650 - Top = 130 + Top = 127 Width = 1078 AllowDropFiles = True AlphaBlendValue = 128 Caption = 'microM8 GUI' - ClientHeight = 630 + ClientHeight = 650 ClientWidth = 1078 Constraints.MinWidth = 1078 DoubleBuffered = False @@ -28,11 +28,11 @@ object GUIForm: TGUIForm OnUTF8KeyPress = FormUTF8KeyPress OnWindowStateChange = FormWindowStateChange ParentDoubleBuffered = False - LCLVersion = '2.0.0.4' + LCLVersion = '2.1.0.0' object StatusBar1: TStatusBar Left = 0 - Height = 23 - Top = 607 + Height = 18 + Top = 632 Width = 1078 Panels = <> end @@ -60,7 +60,7 @@ object GUIForm: TGUIForm end object tbRMVoxels: TToolButton Tag = 1 - Left = 613 + Left = 585 Hint = 'Voxel Render' Top = 2 Caption = 'Voxels' @@ -74,7 +74,7 @@ object GUIForm: TGUIForm Style = tbsCheck end object tbRMDots: TToolButton - Left = 649 + Left = 621 Hint = 'Dot Render' Top = 2 Caption = 'Dots' @@ -87,7 +87,7 @@ object GUIForm: TGUIForm end object tbRMRaster: TToolButton Tag = 2 - Left = 685 + Left = 657 Hint = 'Raster Render' Top = 2 Caption = 'Raster' @@ -99,7 +99,7 @@ object GUIForm: TGUIForm Style = tbsCheck end object tbRMColor: TToolButton - Left = 721 + Left = 693 Hint = 'Toggle Color/Mono' Top = 2 Caption = 'tbRMColor' @@ -109,7 +109,7 @@ object GUIForm: TGUIForm ShowHint = True end object tbRECState: TToolButton - Left = 789 + Left = 761 Hint = 'Start Recording' Top = 2 Caption = 'tbRECState' @@ -119,7 +119,7 @@ object GUIForm: TGUIForm ShowHint = True end object ToolButton5: TToolButton - Left = 825 + Left = 797 Hint = 'Rewind' Top = 2 Caption = 'ToolButton5' @@ -129,7 +129,7 @@ object GUIForm: TGUIForm ShowHint = True end object ToolButton6: TToolButton - Left = 861 + Left = 833 Hint = 'Forwards' Top = 2 Caption = 'ToolButton6' @@ -139,7 +139,7 @@ object GUIForm: TGUIForm ShowHint = True end object ToolButton7: TToolButton - Left = 897 + Left = 869 Hint = 'Resume' Top = 2 Caption = 'ToolButton7' @@ -149,7 +149,7 @@ object GUIForm: TGUIForm ShowHint = True end object ToolButton8: TToolButton - Left = 933 + Left = 905 Hint = 'Stop Recording' Top = 2 Caption = 'ToolButton8' @@ -159,7 +159,7 @@ object GUIForm: TGUIForm ShowHint = True end object ToolButton9: TToolButton - Left = 969 + Left = 941 Hint = 'Pause' Top = 2 Caption = 'ToolButton9' @@ -169,7 +169,7 @@ object GUIForm: TGUIForm ShowHint = True end object ToolButton10: TToolButton - Left = 757 + Left = 729 Top = 2 Caption = 'ToolButton10' Enabled = False @@ -206,24 +206,14 @@ object GUIForm: TGUIForm ParentShowHint = False ShowHint = True end - object tbWebDebugger: TToolButton - Left = 145 - Hint = 'Web Debugger' - Top = 2 - Caption = 'tbWebDebugger' - ImageIndex = 28 - OnClick = miToolsWebDebuggerClick - ParentShowHint = False - ShowHint = True - end object ToolButton15: TToolButton - Left = 181 + Left = 145 Top = 2 Caption = 'ToolButton15' Enabled = False end object tbVolDown: TToolButton - Left = 213 + Left = 177 Hint = 'Volume Down' Top = 2 Caption = 'tbVolDown' @@ -233,16 +223,15 @@ object GUIForm: TGUIForm ShowHint = True end object tbMasterVolume: TTrackBar - Left = 249 + Left = 213 Height = 32 Top = 2 - Width = 96 + Width = 100 OnChange = tbMasterVolumeChange Position = 0 ScalePos = trBottom TabStop = False TickMarks = tmBoth - TickStyle = tsManual OnEnter = tbMasterVolumeEnter OnMouseDown = tbMasterVolumeMouseDown OnMouseUp = tbMasterVolumeMouseUp @@ -251,7 +240,7 @@ object GUIForm: TGUIForm TabOrder = 0 end object tbVolUp: TToolButton - Left = 345 + Left = 313 Hint = 'Volume Up' Top = 2 Caption = 'tbVolUp' @@ -261,13 +250,13 @@ object GUIForm: TGUIForm ShowHint = True end object ToolButton3: TToolButton - Left = 381 + Left = 349 Top = 2 Caption = 'ToolButton3' Enabled = False end object tbSpeedDown: TToolButton - Left = 413 + Left = 381 Hint = 'CPU Speed Down' Top = 2 Caption = 'tbSpeedDown' @@ -277,17 +266,16 @@ object GUIForm: TGUIForm ShowHint = True end object TrackBar2: TTrackBar - Left = 449 + Left = 417 Height = 32 Top = 2 - Width = 96 + Width = 100 Max = 4 OnChange = TrackBar2Change Position = 0 ScalePos = trBottom TabStop = False TickMarks = tmBoth - TickStyle = tsManual OnMouseDown = TrackBar2MouseDown OnMouseUp = TrackBar2MouseUp OnKeyDown = FormKeyDown @@ -295,7 +283,7 @@ object GUIForm: TGUIForm TabOrder = 1 end object tbSpeedUp: TToolButton - Left = 545 + Left = 517 Hint = 'CPU Speed Up' Top = 2 Caption = 'tbSpeedUp' @@ -305,19 +293,19 @@ object GUIForm: TGUIForm ShowHint = True end object ToolButton18: TToolButton - Left = 581 + Left = 553 Top = 2 Caption = 'ToolButton18' Enabled = False end object ToolButton1: TToolButton - Left = 1005 + Left = 977 Top = 2 Caption = 'ToolButton1' Enabled = False end object tbFullscreen: TToolButton - Left = 1037 + Left = 1009 Hint = 'Fullscreen' Top = 2 Caption = 'tbFullscreen' @@ -329,31 +317,31 @@ object GUIForm: TGUIForm end object pnlContainer: TPanel Left = 0 - Height = 571 + Height = 596 Top = 36 Width = 1078 Align = alClient BevelOuter = bvNone - ClientHeight = 571 + ClientHeight = 596 ClientWidth = 1078 ParentColor = False TabOrder = 2 object sidecarPanel: TPanel Left = 908 - Height = 534 + Height = 559 Top = 0 Width = 170 Align = alRight BevelOuter = bvNone Caption = 'sidecarPanel' - ClientHeight = 534 + ClientHeight = 559 ClientWidth = 170 Color = clBlack ParentColor = False TabOrder = 0 object Image1: TImage Left = 0 - Height = 534 + Height = 559 Top = 0 Width = 170 Align = alClient @@ -5447,12 +5435,12 @@ object GUIForm: TGUIForm end object embedPanel: TPanel Left = 0 - Height = 534 + Height = 559 Top = 0 Width = 908 Align = alClient BevelOuter = bvNone - ClientHeight = 534 + ClientHeight = 559 ClientWidth = 908 Color = clBlack Font.Color = clWhite @@ -5464,7 +5452,7 @@ object GUIForm: TGUIForm OnMouseUp = FormMouseUp object backdrop: TImage Left = 0 - Height = 534 + Height = 559 Top = 0 Width = 908 Align = alClient @@ -5477,7 +5465,7 @@ object GUIForm: TGUIForm object pnlMemory: TPanel Left = 0 Height = 37 - Top = 534 + Top = 559 Width = 1078 Align = alBottom ClientHeight = 37 @@ -5488,7 +5476,7 @@ object GUIForm: TGUIForm OnResize = pnlMemoryResize object txtAddress: TEdit Left = 136 - Height = 23 + Height = 21 Top = 8 Width = 80 OnKeyPress = txtAddressKeyPress @@ -5498,23 +5486,23 @@ object GUIForm: TGUIForm end object Label1: TLabel Left = 9 - Height = 15 + Height = 16 Top = 10 - Width = 122 + Width = 141 Caption = 'Memory Address (hex):' ParentColor = False end object Label2: TLabel Left = 240 - Height = 15 + Height = 16 Top = 10 - Width = 60 + Width = 72 Caption = 'Value (hex):' ParentColor = False end object txtValue: TEdit Left = 312 - Height = 23 + Height = 21 Top = 8 Width = 80 OnKeyPress = txtValueKeyPress @@ -5567,8 +5555,8 @@ object GUIForm: TGUIForm end object MainMenu1: TMainMenu Images = ToolbarIcons - left = 168 - top = 48 + Left = 168 + Top = 48 object MenuItem1: TMenuItem Caption = 'File' OnClick = MenuItem1Click @@ -6584,11 +6572,6 @@ object GUIForm: TGUIForm Caption = 'microTracker' OnClick = miToolsTrackerClick end - object miToolsWebDebugger: TMenuItem - Caption = 'Web Debugger' - ShortCut = 24642 - OnClick = miToolsWebDebuggerClick - end object miMemoryEdit: TMenuItem Caption = 'Read/Write Memory' OnClick = miMemoryEditClick @@ -6611,8 +6594,8 @@ object GUIForm: TGUIForm Height = 32 Scaled = True Width = 32 - left = 96 - top = 48 + Left = 96 + Top = 48 Bitmap = { 4C691E0000002000000020000000CA9BCA00B16DB100B16DB100B16DB100B16D B100B16DB100B16DB100B16DB100B16DB100B16DB100B16DB100AD72BB0E8C68 @@ -10460,8 +10443,8 @@ object GUIForm: TGUIForm object DiskMenu: TPopupMenu OnPopup = DiskMenuPopup OnClose = DiskMenuClose - left = 240 - top = 104 + Left = 240 + Top = 104 object MenuItem10: TMenuItem Caption = 'Insert Disk' OnClick = MenuItem10Click @@ -10484,26 +10467,26 @@ object GUIForm: TGUIForm Enabled = False Interval = 50 OnTimer = CheckTimerTimer - left = 168 - top = 104 + Left = 168 + Top = 104 end object odDiskImages: TOpenDialog Title = 'Open Disk Image' DefaultExt = '.*' Filter = 'All Floppy Images|*.dsk; *.do; *.po; *.woz; *.nib|All HDD Images|*.po; *.2mg; *.hdv|MicroPAK|*.pak|Disk Image|*.dsk|ProDOS Ordered Image|*.po|DOS Ordered Image|*.do|Nibble Image|*.nib|WOZ Image|*.woz|2MG Image|*.2mg|HDV Image|*.hdv' - left = 24 - top = 104 + Left = 24 + Top = 104 end object MouseTimer: TTimer Enabled = False Interval = 50 OnTimer = MouseTimerTimer - left = 96 - top = 104 + Left = 96 + Top = 104 end object TintMode: TPopupMenu - left = 24 - top = 48 + Left = 24 + Top = 48 object miTintOff: TMenuItem Caption = 'Off' ImageIndex = 0 @@ -10531,13 +10514,13 @@ object GUIForm: TGUIForm object ToolTimer: TTimer Enabled = False OnTimer = ToolTimerTimer - left = 24 - top = 160 + Left = 24 + Top = 160 end object SideImages: TImageList Scaled = True - left = 240 - top = 48 + Left = 240 + Top = 48 end object MicroM8Process: TAsyncProcess Active = False @@ -10558,32 +10541,32 @@ object GUIForm: TGUIForm WindowWidth = 0 FillAttribute = 0 OnTerminate = MicroM8ProcessTerminate - left = 240 - top = 160 + Left = 240 + Top = 160 end object odFreezeFiles: TOpenDialog DefaultExt = '.*.frz' Filter = 'MicroM8 Freeze|*.frz' - left = 96 - top = 160 + Left = 96 + Top = 160 end object FSTimer: TTimer OnTimer = FSTimerTimer - left = 168 - top = 160 + Left = 168 + Top = 160 end object sdFreezeFiles: TSaveDialog Title = 'Save state as' DefaultExt = '.*.frz' Filter = 'MicroM8 Freeze|*.frz' - left = 24 - top = 216 + Left = 24 + Top = 216 end object RecordingMenu: TPopupMenu Images = ToolbarIcons ImagesWidth = 32 - left = 96 - top = 216 + Left = 96 + Top = 216 object miStartDiskRec: TMenuItem Caption = 'Start Disk Recording' ImageIndex = 10 @@ -10598,8 +10581,8 @@ object GUIForm: TGUIForm end end object ProfileMenu: TPopupMenu - left = 168 - top = 216 + Left = 168 + Top = 216 object miPMApple2eEnh: TMenuItem Caption = 'Apple //e Enhanced' OnClick = miPRFIIeEnhancedClick @@ -10628,14 +10611,14 @@ object GUIForm: TGUIForm Enabled = False Interval = 50 OnTimer = WaitReposTimer - left = 238 - top = 223 + Left = 238 + Top = 223 end object SPMenu: TPopupMenu OnPopup = DiskMenuPopup OnClose = DiskMenuClose - left = 24 - top = 272 + Left = 24 + Top = 272 object miSPConnect: TMenuItem Caption = 'Connect Disk' OnClick = miSPFileClick diff --git a/backup/main.pas b/backup/main.pas index ed9148b..f7ae12f 100644 --- a/backup/main.pas +++ b/backup/main.pas @@ -3170,6 +3170,7 @@ begin code := MapKeyCode(Key,Shift,false); if code <> 0 then SendKey( code, 0, 1, MapShiftState(Key, Shift) ); + if not ssAlt in Shift then Key := 0; //StatusBar1.SimpleText := IntToStr(code) + ' ' + keydesc; end; diff --git a/backup/poc.lpi b/backup/poc.lpi index a7cca62..1134831 100644 --- a/backup/poc.lpi +++ b/backup/poc.lpi @@ -1,11 +1,13 @@ - + + + + - <Scaled Value="True"/> <ResourceType Value="res"/> diff --git a/backup/poc.lps b/backup/poc.lps index cf75b40..a96cb1f 100644 --- a/backup/poc.lps +++ b/backup/poc.lps @@ -2,7 +2,7 @@ <CONFIG> <ProjectSession> <PathDelim Value="\"/> - <Version Value="11"/> + <Version Value="12"/> <BuildModes Active="Default"/> <Units Count="5"> <Unit0> @@ -21,8 +21,8 @@ <HasResources Value="True"/> <ResourceBaseClass Value="Form"/> <IsVisibleTab Value="True"/> - <TopLine Value="1819"/> - <CursorPos X="56" Y="1825"/> + <TopLine Value="3152"/> + <CursorPos Y="3173"/> <UsageCount Value="323"/> <Loaded Value="True"/> <LoadedDesigner Value="True"/> @@ -43,7 +43,7 @@ <EditorIndex Value="-1"/> <TopLine Value="576"/> <CursorPos X="49" Y="591"/> - <UsageCount Value="94"/> + <UsageCount Value="93"/> </Unit3> <Unit4> <Filename Value="images\memory.pas"/> @@ -53,129 +53,129 @@ <EditorIndex Value="-1"/> <TopLine Value="40"/> <CursorPos X="17" Y="44"/> - <UsageCount Value="8"/> + <UsageCount Value="7"/> </Unit4> </Units> <JumpHistory Count="30" HistoryIndex="29"> <Position1> <Filename Value="main.pas"/> - <Caret Line="2502" Column="34" TopLine="2471"/> + <Caret Line="3046" Column="36" TopLine="3032"/> </Position1> <Position2> <Filename Value="main.pas"/> - <Caret Line="2521" Column="34" TopLine="2490"/> + <Caret Line="2882" Column="27" TopLine="2867"/> </Position2> <Position3> <Filename Value="main.pas"/> - <Caret Line="2561" Column="34" TopLine="2531"/> + <Caret Line="2888" Column="23" TopLine="2877"/> </Position3> <Position4> <Filename Value="main.pas"/> - <Caret Line="2577" Column="34" TopLine="2546"/> + <Caret Line="2752" Column="28" TopLine="2729"/> </Position4> <Position5> <Filename Value="main.pas"/> - <Caret Line="2636" Column="34" TopLine="2605"/> + <Caret Line="1788" Column="61" TopLine="1785"/> </Position5> <Position6> <Filename Value="main.pas"/> - <Caret Line="2654" Column="34" TopLine="2623"/> + <Caret Line="2341" Column="6" TopLine="2313"/> </Position6> <Position7> <Filename Value="main.pas"/> - <Caret Line="2662" Column="27" TopLine="2631"/> + <Caret Line="1801" Column="28" TopLine="1786"/> </Position7> <Position8> <Filename Value="main.pas"/> - <Caret Line="2669" Column="26" TopLine="2638"/> + <Caret Line="2900" Column="14" TopLine="2888"/> </Position8> <Position9> <Filename Value="main.pas"/> - <Caret Line="2803" Column="29" TopLine="2772"/> + <Caret Line="1897" Column="16" TopLine="1894"/> </Position9> <Position10> <Filename Value="main.pas"/> - <Caret Line="2808" Column="29" TopLine="2777"/> + <Caret Line="426" Column="15" TopLine="408"/> </Position10> <Position11> <Filename Value="main.pas"/> - <Caret Line="2868" Column="26" TopLine="2846"/> + <Caret Line="1183" TopLine="1178"/> </Position11> <Position12> <Filename Value="main.pas"/> - <Caret Line="2877" Column="26" TopLine="2846"/> + <Caret Line="1923" Column="42" TopLine="1895"/> </Position12> <Position13> <Filename Value="main.pas"/> - <Caret Line="3128" Column="38" TopLine="3098"/> + <Caret Line="2892" Column="43" TopLine="2879"/> </Position13> <Position14> <Filename Value="main.pas"/> - <Caret Line="3174" Column="26" TopLine="3143"/> + <Caret Line="2899" Column="43" TopLine="2886"/> </Position14> <Position15> <Filename Value="main.pas"/> - <Caret Line="3189" Column="26" TopLine="3158"/> + <Caret Line="1833" Column="87" TopLine="1829"/> </Position15> <Position16> <Filename Value="main.pas"/> - <Caret Line="3294" Column="26" TopLine="3263"/> + <Caret Line="1839" Column="38" TopLine="1820"/> </Position16> <Position17> <Filename Value="main.pas"/> - <Caret Line="3314" Column="26" TopLine="3283"/> + <Caret Line="1098" Column="15" TopLine="1092"/> </Position17> <Position18> <Filename Value="main.pas"/> - <Caret Line="694" Column="29" TopLine="675"/> + <Caret Line="1925" Column="3" TopLine="1923"/> </Position18> <Position19> <Filename Value="main.pas"/> - <Caret Line="773" Column="33" TopLine="742"/> + <Caret Line="3205" Column="13" TopLine="3198"/> </Position19> <Position20> <Filename Value="main.pas"/> - <Caret Line="1194" Column="26" TopLine="1163"/> + <Caret Line="3279" Column="24" TopLine="3223"/> </Position20> <Position21> <Filename Value="main.pas"/> - <Caret Line="1266" Column="26" TopLine="1235"/> + <Caret Line="581" Column="11" TopLine="563"/> </Position21> <Position22> <Filename Value="main.pas"/> - <Caret Line="1409" Column="29" TopLine="1378"/> + <Caret Line="2250" Column="17" TopLine="2231"/> </Position22> <Position23> <Filename Value="main.pas"/> - <Caret Line="1588" Column="26" TopLine="1557"/> + <Caret Line="2255" Column="14" TopLine="2231"/> </Position23> <Position24> <Filename Value="main.pas"/> - <Caret Line="1638" Column="26" TopLine="1607"/> + <Caret Line="2265" Column="21" TopLine="2234"/> </Position24> <Position25> <Filename Value="main.pas"/> - <Caret Line="1896" Column="36" TopLine="1873"/> + <Caret Line="3202" Column="9" TopLine="3174"/> </Position25> <Position26> <Filename Value="main.pas"/> - <Caret Line="2903" Column="30" TopLine="2872"/> + <Caret Line="893" Column="40" TopLine="871"/> </Position26> <Position27> <Filename Value="main.pas"/> - <Caret Line="1823" Column="30" TopLine="1821"/> + <Caret Line="348" Column="22" TopLine="330"/> </Position27> <Position28> <Filename Value="main.pas"/> - <Caret Line="1827" Column="56" TopLine="1821"/> + <Caret Line="349" Column="22" TopLine="330"/> </Position28> <Position29> <Filename Value="main.pas"/> - <Caret Line="1826" Column="56" TopLine="1820"/> + <Caret Line="350" Column="22" TopLine="330"/> </Position29> <Position30> <Filename Value="main.pas"/> - <Caret Line="1825" Column="56" TopLine="1819"/> + <Caret Line="3189" Column="12" TopLine="3152"/> </Position30> </JumpHistory> <RunParams> diff --git a/main.lfm b/main.lfm index 51b0bb3..40d8c76 100644 --- a/main.lfm +++ b/main.lfm @@ -1,12 +1,12 @@ object GUIForm: TGUIForm - Left = 290 + Left = 420 Height = 650 - Top = 130 + Top = 127 Width = 1078 AllowDropFiles = True AlphaBlendValue = 128 Caption = 'microM8 GUI' - ClientHeight = 630 + ClientHeight = 650 ClientWidth = 1078 Constraints.MinWidth = 1078 DoubleBuffered = False @@ -28,11 +28,11 @@ object GUIForm: TGUIForm OnUTF8KeyPress = FormUTF8KeyPress OnWindowStateChange = FormWindowStateChange ParentDoubleBuffered = False - LCLVersion = '2.0.0.4' + LCLVersion = '2.1.0.0' object StatusBar1: TStatusBar Left = 0 - Height = 23 - Top = 607 + Height = 18 + Top = 632 Width = 1078 Panels = <> end @@ -60,7 +60,7 @@ object GUIForm: TGUIForm end object tbRMVoxels: TToolButton Tag = 1 - Left = 577 + Left = 585 Hint = 'Voxel Render' Top = 2 Caption = 'Voxels' @@ -74,7 +74,7 @@ object GUIForm: TGUIForm Style = tbsCheck end object tbRMDots: TToolButton - Left = 613 + Left = 621 Hint = 'Dot Render' Top = 2 Caption = 'Dots' @@ -87,7 +87,7 @@ object GUIForm: TGUIForm end object tbRMRaster: TToolButton Tag = 2 - Left = 649 + Left = 657 Hint = 'Raster Render' Top = 2 Caption = 'Raster' @@ -99,7 +99,7 @@ object GUIForm: TGUIForm Style = tbsCheck end object tbRMColor: TToolButton - Left = 685 + Left = 693 Hint = 'Toggle Color/Mono' Top = 2 Caption = 'tbRMColor' @@ -109,7 +109,7 @@ object GUIForm: TGUIForm ShowHint = True end object tbRECState: TToolButton - Left = 753 + Left = 761 Hint = 'Start Recording' Top = 2 Caption = 'tbRECState' @@ -119,7 +119,7 @@ object GUIForm: TGUIForm ShowHint = True end object ToolButton5: TToolButton - Left = 789 + Left = 797 Hint = 'Rewind' Top = 2 Caption = 'ToolButton5' @@ -129,7 +129,7 @@ object GUIForm: TGUIForm ShowHint = True end object ToolButton6: TToolButton - Left = 825 + Left = 833 Hint = 'Forwards' Top = 2 Caption = 'ToolButton6' @@ -139,7 +139,7 @@ object GUIForm: TGUIForm ShowHint = True end object ToolButton7: TToolButton - Left = 861 + Left = 869 Hint = 'Resume' Top = 2 Caption = 'ToolButton7' @@ -149,7 +149,7 @@ object GUIForm: TGUIForm ShowHint = True end object ToolButton8: TToolButton - Left = 897 + Left = 905 Hint = 'Stop Recording' Top = 2 Caption = 'ToolButton8' @@ -159,7 +159,7 @@ object GUIForm: TGUIForm ShowHint = True end object ToolButton9: TToolButton - Left = 933 + Left = 941 Hint = 'Pause' Top = 2 Caption = 'ToolButton9' @@ -169,7 +169,7 @@ object GUIForm: TGUIForm ShowHint = True end object ToolButton10: TToolButton - Left = 721 + Left = 729 Top = 2 Caption = 'ToolButton10' Enabled = False @@ -226,13 +226,12 @@ object GUIForm: TGUIForm Left = 213 Height = 32 Top = 2 - Width = 96 + Width = 100 OnChange = tbMasterVolumeChange Position = 0 ScalePos = trBottom TabStop = False TickMarks = tmBoth - TickStyle = tsManual OnEnter = tbMasterVolumeEnter OnMouseDown = tbMasterVolumeMouseDown OnMouseUp = tbMasterVolumeMouseUp @@ -241,7 +240,7 @@ object GUIForm: TGUIForm TabOrder = 0 end object tbVolUp: TToolButton - Left = 309 + Left = 313 Hint = 'Volume Up' Top = 2 Caption = 'tbVolUp' @@ -251,13 +250,13 @@ object GUIForm: TGUIForm ShowHint = True end object ToolButton3: TToolButton - Left = 345 + Left = 349 Top = 2 Caption = 'ToolButton3' Enabled = False end object tbSpeedDown: TToolButton - Left = 377 + Left = 381 Hint = 'CPU Speed Down' Top = 2 Caption = 'tbSpeedDown' @@ -267,17 +266,16 @@ object GUIForm: TGUIForm ShowHint = True end object TrackBar2: TTrackBar - Left = 413 + Left = 417 Height = 32 Top = 2 - Width = 96 + Width = 100 Max = 4 OnChange = TrackBar2Change Position = 0 ScalePos = trBottom TabStop = False TickMarks = tmBoth - TickStyle = tsManual OnMouseDown = TrackBar2MouseDown OnMouseUp = TrackBar2MouseUp OnKeyDown = FormKeyDown @@ -285,7 +283,7 @@ object GUIForm: TGUIForm TabOrder = 1 end object tbSpeedUp: TToolButton - Left = 509 + Left = 517 Hint = 'CPU Speed Up' Top = 2 Caption = 'tbSpeedUp' @@ -295,19 +293,19 @@ object GUIForm: TGUIForm ShowHint = True end object ToolButton18: TToolButton - Left = 545 + Left = 553 Top = 2 Caption = 'ToolButton18' Enabled = False end object ToolButton1: TToolButton - Left = 969 + Left = 977 Top = 2 Caption = 'ToolButton1' Enabled = False end object tbFullscreen: TToolButton - Left = 1001 + Left = 1009 Hint = 'Fullscreen' Top = 2 Caption = 'tbFullscreen' @@ -319,31 +317,31 @@ object GUIForm: TGUIForm end object pnlContainer: TPanel Left = 0 - Height = 571 + Height = 596 Top = 36 Width = 1078 Align = alClient BevelOuter = bvNone - ClientHeight = 571 + ClientHeight = 596 ClientWidth = 1078 ParentColor = False TabOrder = 2 object sidecarPanel: TPanel Left = 908 - Height = 534 + Height = 559 Top = 0 Width = 170 Align = alRight BevelOuter = bvNone Caption = 'sidecarPanel' - ClientHeight = 534 + ClientHeight = 559 ClientWidth = 170 Color = clBlack ParentColor = False TabOrder = 0 object Image1: TImage Left = 0 - Height = 534 + Height = 559 Top = 0 Width = 170 Align = alClient @@ -5437,12 +5435,12 @@ object GUIForm: TGUIForm end object embedPanel: TPanel Left = 0 - Height = 534 + Height = 559 Top = 0 Width = 908 Align = alClient BevelOuter = bvNone - ClientHeight = 534 + ClientHeight = 559 ClientWidth = 908 Color = clBlack Font.Color = clWhite @@ -5454,7 +5452,7 @@ object GUIForm: TGUIForm OnMouseUp = FormMouseUp object backdrop: TImage Left = 0 - Height = 534 + Height = 559 Top = 0 Width = 908 Align = alClient @@ -5467,7 +5465,7 @@ object GUIForm: TGUIForm object pnlMemory: TPanel Left = 0 Height = 37 - Top = 534 + Top = 559 Width = 1078 Align = alBottom ClientHeight = 37 @@ -5478,7 +5476,7 @@ object GUIForm: TGUIForm OnResize = pnlMemoryResize object txtAddress: TEdit Left = 136 - Height = 23 + Height = 21 Top = 8 Width = 80 OnKeyPress = txtAddressKeyPress @@ -5488,23 +5486,23 @@ object GUIForm: TGUIForm end object Label1: TLabel Left = 9 - Height = 15 + Height = 16 Top = 10 - Width = 122 + Width = 141 Caption = 'Memory Address (hex):' ParentColor = False end object Label2: TLabel Left = 240 - Height = 15 + Height = 16 Top = 10 - Width = 60 + Width = 72 Caption = 'Value (hex):' ParentColor = False end object txtValue: TEdit Left = 312 - Height = 23 + Height = 21 Top = 8 Width = 80 OnKeyPress = txtValueKeyPress @@ -5557,8 +5555,8 @@ object GUIForm: TGUIForm end object MainMenu1: TMainMenu Images = ToolbarIcons - left = 168 - top = 48 + Left = 168 + Top = 48 object MenuItem1: TMenuItem Caption = 'File' OnClick = MenuItem1Click @@ -6596,8 +6594,8 @@ object GUIForm: TGUIForm Height = 32 Scaled = True Width = 32 - left = 96 - top = 48 + Left = 96 + Top = 48 Bitmap = { 4C691E0000002000000020000000CA9BCA00B16DB100B16DB100B16DB100B16D B100B16DB100B16DB100B16DB100B16DB100B16DB100B16DB100AD72BB0E8C68 @@ -10445,8 +10443,8 @@ object GUIForm: TGUIForm object DiskMenu: TPopupMenu OnPopup = DiskMenuPopup OnClose = DiskMenuClose - left = 240 - top = 104 + Left = 240 + Top = 104 object MenuItem10: TMenuItem Caption = 'Insert Disk' OnClick = MenuItem10Click @@ -10469,26 +10467,26 @@ object GUIForm: TGUIForm Enabled = False Interval = 50 OnTimer = CheckTimerTimer - left = 168 - top = 104 + Left = 168 + Top = 104 end object odDiskImages: TOpenDialog Title = 'Open Disk Image' DefaultExt = '.*' Filter = 'All Floppy Images|*.dsk; *.do; *.po; *.woz; *.nib|All HDD Images|*.po; *.2mg; *.hdv|MicroPAK|*.pak|Disk Image|*.dsk|ProDOS Ordered Image|*.po|DOS Ordered Image|*.do|Nibble Image|*.nib|WOZ Image|*.woz|2MG Image|*.2mg|HDV Image|*.hdv' - left = 24 - top = 104 + Left = 24 + Top = 104 end object MouseTimer: TTimer Enabled = False Interval = 50 OnTimer = MouseTimerTimer - left = 96 - top = 104 + Left = 96 + Top = 104 end object TintMode: TPopupMenu - left = 24 - top = 48 + Left = 24 + Top = 48 object miTintOff: TMenuItem Caption = 'Off' ImageIndex = 0 @@ -10516,13 +10514,13 @@ object GUIForm: TGUIForm object ToolTimer: TTimer Enabled = False OnTimer = ToolTimerTimer - left = 24 - top = 160 + Left = 24 + Top = 160 end object SideImages: TImageList Scaled = True - left = 240 - top = 48 + Left = 240 + Top = 48 end object MicroM8Process: TAsyncProcess Active = False @@ -10543,32 +10541,32 @@ object GUIForm: TGUIForm WindowWidth = 0 FillAttribute = 0 OnTerminate = MicroM8ProcessTerminate - left = 240 - top = 160 + Left = 240 + Top = 160 end object odFreezeFiles: TOpenDialog DefaultExt = '.*.frz' Filter = 'MicroM8 Freeze|*.frz' - left = 96 - top = 160 + Left = 96 + Top = 160 end object FSTimer: TTimer OnTimer = FSTimerTimer - left = 168 - top = 160 + Left = 168 + Top = 160 end object sdFreezeFiles: TSaveDialog Title = 'Save state as' DefaultExt = '.*.frz' Filter = 'MicroM8 Freeze|*.frz' - left = 24 - top = 216 + Left = 24 + Top = 216 end object RecordingMenu: TPopupMenu Images = ToolbarIcons ImagesWidth = 32 - left = 96 - top = 216 + Left = 96 + Top = 216 object miStartDiskRec: TMenuItem Caption = 'Start Disk Recording' ImageIndex = 10 @@ -10583,8 +10581,8 @@ object GUIForm: TGUIForm end end object ProfileMenu: TPopupMenu - left = 168 - top = 216 + Left = 168 + Top = 216 object miPMApple2eEnh: TMenuItem Caption = 'Apple //e Enhanced' OnClick = miPRFIIeEnhancedClick @@ -10613,14 +10611,14 @@ object GUIForm: TGUIForm Enabled = False Interval = 50 OnTimer = WaitReposTimer - left = 238 - top = 223 + Left = 238 + Top = 223 end object SPMenu: TPopupMenu OnPopup = DiskMenuPopup OnClose = DiskMenuClose - left = 24 - top = 272 + Left = 24 + Top = 272 object miSPConnect: TMenuItem Caption = 'Connect Disk' OnClick = miSPFileClick diff --git a/main.pas b/main.pas index ed9148b..2edf2cb 100644 --- a/main.pas +++ b/main.pas @@ -3170,6 +3170,7 @@ begin code := MapKeyCode(Key,Shift,false); if code <> 0 then SendKey( code, 0, 1, MapShiftState(Key, Shift) ); + if not (ssAlt in Shift) then Key := 0; //StatusBar1.SimpleText := IntToStr(code) + ' ' + keydesc; end; diff --git a/poc.lpi b/poc.lpi index a7cca62..1134831 100644 --- a/poc.lpi +++ b/poc.lpi @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <CONFIG> <ProjectOptions> - <Version Value="11"/> + <Version Value="12"/> <PathDelim Value="\"/> <General> + <Flags> + <CompatibilityMode Value="True"/> + </Flags> <SessionStorage Value="InProjectDir"/> - <MainUnit Value="0"/> <Title Value="microm8-gui"/> <Scaled Value="True"/> <ResourceType Value="res"/> diff --git a/poc.lps b/poc.lps index 9e351bd..c8fd3cf 100644 --- a/poc.lps +++ b/poc.lps @@ -1,186 +1,186 @@ -<?xml version="1.0" encoding="UTF-8"?> -<CONFIG> - <ProjectSession> - <PathDelim Value="\"/> - <Version Value="11"/> - <BuildModes Active="Default"/> - <Units Count="5"> - <Unit0> - <Filename Value="poc.lpr"/> - <IsPartOfProject Value="True"/> - <EditorIndex Value="-1"/> - <WindowIndex Value="-1"/> - <TopLine Value="-1"/> - <CursorPos X="-1" Y="-1"/> - <UsageCount Value="323"/> - </Unit0> - <Unit1> - <Filename Value="main.pas"/> - <IsPartOfProject Value="True"/> - <ComponentName Value="GUIForm"/> - <HasResources Value="True"/> - <ResourceBaseClass Value="Form"/> - <IsVisibleTab Value="True"/> - <TopLine Value="3152"/> - <CursorPos X="12" Y="3189"/> - <UsageCount Value="323"/> - <Loaded Value="True"/> - <LoadedDesigner Value="True"/> - </Unit1> - <Unit2> - <Filename Value="mixer.pas"/> - <IsPartOfProject Value="True"/> - <ComponentName Value="frmMixer"/> - <HasResources Value="True"/> - <ResourceBaseClass Value="Form"/> - <EditorIndex Value="-1"/> - <TopLine Value="3"/> - <CursorPos X="26" Y="25"/> - <UsageCount Value="206"/> - </Unit2> - <Unit3> - <Filename Value="C:\lazarus\lcl\include\picture.inc"/> - <EditorIndex Value="-1"/> - <TopLine Value="576"/> - <CursorPos X="49" Y="591"/> - <UsageCount Value="93"/> - </Unit3> - <Unit4> - <Filename Value="images\memory.pas"/> - <ComponentName Value="memform"/> - <HasResources Value="True"/> - <ResourceBaseClass Value="Form"/> - <EditorIndex Value="-1"/> - <TopLine Value="40"/> - <CursorPos X="17" Y="44"/> - <UsageCount Value="7"/> - </Unit4> - </Units> - <JumpHistory Count="30" HistoryIndex="29"> - <Position1> - <Filename Value="main.pas"/> - <Caret Line="3046" Column="36" TopLine="3032"/> - </Position1> - <Position2> - <Filename Value="main.pas"/> - <Caret Line="2882" Column="27" TopLine="2867"/> - </Position2> - <Position3> - <Filename Value="main.pas"/> - <Caret Line="2888" Column="23" TopLine="2877"/> - </Position3> - <Position4> - <Filename Value="main.pas"/> - <Caret Line="2752" Column="28" TopLine="2729"/> - </Position4> - <Position5> - <Filename Value="main.pas"/> - <Caret Line="1788" Column="61" TopLine="1785"/> - </Position5> - <Position6> - <Filename Value="main.pas"/> - <Caret Line="2341" Column="6" TopLine="2313"/> - </Position6> - <Position7> - <Filename Value="main.pas"/> - <Caret Line="1801" Column="28" TopLine="1786"/> - </Position7> - <Position8> - <Filename Value="main.pas"/> - <Caret Line="2900" Column="14" TopLine="2888"/> - </Position8> - <Position9> - <Filename Value="main.pas"/> - <Caret Line="1897" Column="16" TopLine="1894"/> - </Position9> - <Position10> - <Filename Value="main.pas"/> - <Caret Line="426" Column="15" TopLine="408"/> - </Position10> - <Position11> - <Filename Value="main.pas"/> - <Caret Line="1183" TopLine="1178"/> - </Position11> - <Position12> - <Filename Value="main.pas"/> - <Caret Line="1923" Column="42" TopLine="1895"/> - </Position12> - <Position13> - <Filename Value="main.pas"/> - <Caret Line="2892" Column="43" TopLine="2879"/> - </Position13> - <Position14> - <Filename Value="main.pas"/> - <Caret Line="2899" Column="43" TopLine="2886"/> - </Position14> - <Position15> - <Filename Value="main.pas"/> - <Caret Line="1833" Column="87" TopLine="1829"/> - </Position15> - <Position16> - <Filename Value="main.pas"/> - <Caret Line="1839" Column="38" TopLine="1820"/> - </Position16> - <Position17> - <Filename Value="main.pas"/> - <Caret Line="1098" Column="15" TopLine="1092"/> - </Position17> - <Position18> - <Filename Value="main.pas"/> - <Caret Line="1925" Column="3" TopLine="1923"/> - </Position18> - <Position19> - <Filename Value="main.pas"/> - <Caret Line="3205" Column="13" TopLine="3198"/> - </Position19> - <Position20> - <Filename Value="main.pas"/> - <Caret Line="3279" Column="24" TopLine="3223"/> - </Position20> - <Position21> - <Filename Value="main.pas"/> - <Caret Line="581" Column="11" TopLine="563"/> - </Position21> - <Position22> - <Filename Value="main.pas"/> - <Caret Line="2250" Column="17" TopLine="2231"/> - </Position22> - <Position23> - <Filename Value="main.pas"/> - <Caret Line="2255" Column="14" TopLine="2231"/> - </Position23> - <Position24> - <Filename Value="main.pas"/> - <Caret Line="2265" Column="21" TopLine="2234"/> - </Position24> - <Position25> - <Filename Value="main.pas"/> - <Caret Line="3202" Column="9" TopLine="3174"/> - </Position25> - <Position26> - <Filename Value="main.pas"/> - <Caret Line="893" Column="40" TopLine="871"/> - </Position26> - <Position27> - <Filename Value="main.pas"/> - <Caret Line="348" Column="22" TopLine="330"/> - </Position27> - <Position28> - <Filename Value="main.pas"/> - <Caret Line="349" Column="22" TopLine="330"/> - </Position28> - <Position29> - <Filename Value="main.pas"/> - <Caret Line="350" Column="22" TopLine="330"/> - </Position29> - <Position30> - <Filename Value="main.pas"/> - <Caret Line="3189" Column="12" TopLine="3152"/> - </Position30> - </JumpHistory> - <RunParams> - <FormatVersion Value="2"/> - <Modes Count="0" ActiveMode=""/> - </RunParams> - </ProjectSession> -</CONFIG> +<?xml version="1.0" encoding="UTF-8"?> +<CONFIG> + <ProjectSession> + <PathDelim Value="\"/> + <Version Value="12"/> + <BuildModes Active="Default"/> + <Units Count="5"> + <Unit0> + <Filename Value="poc.lpr"/> + <IsPartOfProject Value="True"/> + <EditorIndex Value="-1"/> + <WindowIndex Value="-1"/> + <TopLine Value="-1"/> + <CursorPos X="-1" Y="-1"/> + <UsageCount Value="323"/> + </Unit0> + <Unit1> + <Filename Value="main.pas"/> + <IsPartOfProject Value="True"/> + <ComponentName Value="GUIForm"/> + <HasResources Value="True"/> + <ResourceBaseClass Value="Form"/> + <IsVisibleTab Value="True"/> + <TopLine Value="3152"/> + <CursorPos X="10" Y="3173"/> + <UsageCount Value="323"/> + <Loaded Value="True"/> + <LoadedDesigner Value="True"/> + </Unit1> + <Unit2> + <Filename Value="mixer.pas"/> + <IsPartOfProject Value="True"/> + <ComponentName Value="frmMixer"/> + <HasResources Value="True"/> + <ResourceBaseClass Value="Form"/> + <EditorIndex Value="-1"/> + <TopLine Value="3"/> + <CursorPos X="26" Y="25"/> + <UsageCount Value="206"/> + </Unit2> + <Unit3> + <Filename Value="C:\lazarus\lcl\include\picture.inc"/> + <EditorIndex Value="-1"/> + <TopLine Value="576"/> + <CursorPos X="49" Y="591"/> + <UsageCount Value="93"/> + </Unit3> + <Unit4> + <Filename Value="images\memory.pas"/> + <ComponentName Value="memform"/> + <HasResources Value="True"/> + <ResourceBaseClass Value="Form"/> + <EditorIndex Value="-1"/> + <TopLine Value="40"/> + <CursorPos X="17" Y="44"/> + <UsageCount Value="7"/> + </Unit4> + </Units> + <JumpHistory Count="30" HistoryIndex="29"> + <Position1> + <Filename Value="main.pas"/> + <Caret Line="3046" Column="36" TopLine="3032"/> + </Position1> + <Position2> + <Filename Value="main.pas"/> + <Caret Line="2882" Column="27" TopLine="2867"/> + </Position2> + <Position3> + <Filename Value="main.pas"/> + <Caret Line="2888" Column="23" TopLine="2877"/> + </Position3> + <Position4> + <Filename Value="main.pas"/> + <Caret Line="2752" Column="28" TopLine="2729"/> + </Position4> + <Position5> + <Filename Value="main.pas"/> + <Caret Line="1788" Column="61" TopLine="1785"/> + </Position5> + <Position6> + <Filename Value="main.pas"/> + <Caret Line="2341" Column="6" TopLine="2313"/> + </Position6> + <Position7> + <Filename Value="main.pas"/> + <Caret Line="1801" Column="28" TopLine="1786"/> + </Position7> + <Position8> + <Filename Value="main.pas"/> + <Caret Line="2900" Column="14" TopLine="2888"/> + </Position8> + <Position9> + <Filename Value="main.pas"/> + <Caret Line="1897" Column="16" TopLine="1894"/> + </Position9> + <Position10> + <Filename Value="main.pas"/> + <Caret Line="426" Column="15" TopLine="408"/> + </Position10> + <Position11> + <Filename Value="main.pas"/> + <Caret Line="1183" TopLine="1178"/> + </Position11> + <Position12> + <Filename Value="main.pas"/> + <Caret Line="1923" Column="42" TopLine="1895"/> + </Position12> + <Position13> + <Filename Value="main.pas"/> + <Caret Line="2892" Column="43" TopLine="2879"/> + </Position13> + <Position14> + <Filename Value="main.pas"/> + <Caret Line="2899" Column="43" TopLine="2886"/> + </Position14> + <Position15> + <Filename Value="main.pas"/> + <Caret Line="1833" Column="87" TopLine="1829"/> + </Position15> + <Position16> + <Filename Value="main.pas"/> + <Caret Line="1839" Column="38" TopLine="1820"/> + </Position16> + <Position17> + <Filename Value="main.pas"/> + <Caret Line="1098" Column="15" TopLine="1092"/> + </Position17> + <Position18> + <Filename Value="main.pas"/> + <Caret Line="1925" Column="3" TopLine="1923"/> + </Position18> + <Position19> + <Filename Value="main.pas"/> + <Caret Line="3205" Column="13" TopLine="3198"/> + </Position19> + <Position20> + <Filename Value="main.pas"/> + <Caret Line="3279" Column="24" TopLine="3223"/> + </Position20> + <Position21> + <Filename Value="main.pas"/> + <Caret Line="581" Column="11" TopLine="563"/> + </Position21> + <Position22> + <Filename Value="main.pas"/> + <Caret Line="2250" Column="17" TopLine="2231"/> + </Position22> + <Position23> + <Filename Value="main.pas"/> + <Caret Line="2255" Column="14" TopLine="2231"/> + </Position23> + <Position24> + <Filename Value="main.pas"/> + <Caret Line="2265" Column="21" TopLine="2234"/> + </Position24> + <Position25> + <Filename Value="main.pas"/> + <Caret Line="3202" Column="9" TopLine="3174"/> + </Position25> + <Position26> + <Filename Value="main.pas"/> + <Caret Line="893" Column="40" TopLine="871"/> + </Position26> + <Position27> + <Filename Value="main.pas"/> + <Caret Line="348" Column="22" TopLine="330"/> + </Position27> + <Position28> + <Filename Value="main.pas"/> + <Caret Line="349" Column="22" TopLine="330"/> + </Position28> + <Position29> + <Filename Value="main.pas"/> + <Caret Line="350" Column="22" TopLine="330"/> + </Position29> + <Position30> + <Filename Value="main.pas"/> + <Caret Line="3189" Column="12" TopLine="3152"/> + </Position30> + </JumpHistory> + <RunParams> + <FormatVersion Value="2"/> + <Modes Count="0" ActiveMode=""/> + </RunParams> + </ProjectSession> +</CONFIG> diff --git a/poc.res b/poc.res index 2282d8e3da78e27216e9fd074e160e5b98aed506..d6a4a7f6dd2e0f184aaae71c776eccf85690b8cc 100644 GIT binary patch delta 147 zcmaEOH=^@i!~_M#+Zz?9vdJsh<mBh22PBqcIF=_CrP`$><`k#e=)(jj8?mWQzR0H3 z{DrOk3mYR4GXXI(5VHU=D-eUk*@2h?h&h3n3y8Uam<Nb?ftU}7`GHsfhy{UI2#AG& PSOkbgw|`+1d#err%xgKg delta 111 zcmWm3xe-7>06@`k?YeK0O^8&XkL^cbWM+&)NK}K-fEs+ki{5nU=hSm!>|48v<re** i<fx<p6BcYZ5cto92Oj}KM2L|fMTQ&&N>qoE_1k@Q=^4lX