Skip to content

Commit

Permalink
display correct starting offset for "Cx ROM" pane
Browse files Browse the repository at this point in the history
  • Loading branch information
sh95014 committed Jun 12, 2023
1 parent 9d87880 commit 9e81d70
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
1 change: 1 addition & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@
[submodule "source/frontends/mariani/HexFiend"]
path = source/frontends/mariani/HexFiend
url = https://github.com/sh95014/HexFiend.git
branch = mariani
2 changes: 1 addition & 1 deletion source/frontends/mariani/HexFiend
Submodule HexFiend updated 34 files
+65 −8 HexFiend_2.xcodeproj/project.pbxproj
+1 −1 HexFiend_2.xcodeproj/xcshareddata/xcschemes/Debug + CodeSign.xcscheme
+1 −1 HexFiend_2.xcodeproj/xcshareddata/xcschemes/Debug + UnitTests.xcscheme
+1 −1 HexFiend_2.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme
+1 −1 HexFiend_2.xcodeproj/xcshareddata/xcschemes/Documentation Generation.xcscheme
+1 −1 HexFiend_2.xcodeproj/xcshareddata/xcschemes/Framework CI Tests.xcscheme
+1 −1 HexFiend_2.xcodeproj/xcshareddata/xcschemes/Framework Only (Debug).xcscheme
+1 −1 HexFiend_2.xcodeproj/xcshareddata/xcschemes/Framework Only (Release).xcscheme
+1 −1 HexFiend_2.xcodeproj/xcshareddata/xcschemes/HexFiend_Framework Tests.xcscheme
+1 −1 HexFiend_2.xcodeproj/xcshareddata/xcschemes/HexFiend_Framework_iOS.xcscheme
+1 −1 HexFiend_2.xcodeproj/xcshareddata/xcschemes/HexFiendling.xcscheme
+1 −1 HexFiend_2.xcodeproj/xcshareddata/xcschemes/Release + CodeSign.xcscheme
+1 −1 HexFiend_2.xcodeproj/xcshareddata/xcschemes/Release+MAS.xcscheme
+1 −1 HexFiend_2.xcodeproj/xcshareddata/xcschemes/Release.xcscheme
+1 −1 HexFiend_2.xcodeproj/xcshareddata/xcschemes/Test_BTree.xcscheme
+23 −20 License.txt
+36 −17 app/sources/BaseDataDocument.m
+1 −1 app/sources/CLIController.m
+9 −0 app/sources/HFBinaryTemplateController.m
+0 −2 framework/sources/HFByteRangeAttributeArray.m
+3 −1 framework/sources/HFController.h
+10 −2 framework/sources/HFController.m
+1 −0 framework/sources/HFLineCountingView.h
+11 −1 framework/sources/HFLineCountingView.m
+1 −1 framework/sources/HFPasteboardOwner.m
+0 −2 framework/sources/HFRepresenterTextView.m
+176 −0 templates/Apple/Applesauce WOZ.tcl
+14 −2 templates/Archives/GZIP.tcl
+2 −2 templates/Archives/ZIP.tcl
+2 −0 templates/Audio/WAV.tcl
+983 −0 templates/Crypto/BTCBlock-extended.tcl
+174 −0 templates/Crypto/BTCBlock.tcl
+11 −2 templates/Images/PSD.tcl
+1 −1 version.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#import "MemoryViewerWindowController.h"
#import "EmulatorViewController.h"
#import <HexFiend/HexFiend.h>
#import <HexFiend/HFLineCountingView.h>

#import "StdAfx.h"
#import "Debug.h"
Expand All @@ -33,6 +34,7 @@
@property (weak) IBOutlet NSView *hexViewContainerView;

@property (strong) HFController *hfController;
@property (weak) HFLineCountingView *lineCountingView;
@property (assign) BOOL inDebugMode;
@property (strong) NSMutableArray<MemoryTabConfiguration *> *memoryTabConfigurations;

Expand Down Expand Up @@ -121,6 +123,7 @@
HFLayoutRepresenter *layoutRep = [[HFLayoutRepresenter alloc] init];
HFLineCountingRepresenter *lcRep = [[HFLineCountingRepresenter alloc] init];
lcRep.lineNumberFormat = HFLineNumberFormatHexadecimal;
self.lineCountingView = (HFLineCountingView *)lcRep.view;
HFHexTextRepresenter *hexRep = [[HFHexTextRepresenter alloc] init];
HFStringEncodingTextRepresenter *asciiRep = [[HFStringEncodingTextRepresenter alloc] init];
HFVerticalScrollerRepresenter *scrollRep = [[HFVerticalScrollerRepresenter alloc] init];
Expand All @@ -132,7 +135,7 @@
[self.hfController addRepresenter:asciiRep];
[self.hfController addRepresenter:scrollRep];
[self.hfController addRepresenter:statusRep];

[layoutRep addRepresenter:lcRep];
[layoutRep addRepresenter:hexRep];
[layoutRep addRepresenter:asciiRep];
Expand All @@ -158,6 +161,8 @@
HFFullMemoryByteArray *byteArray = [[HFFullMemoryByteArray alloc] initWithByteSlice:byteSlice];
[self.hfController setByteArray:byteArray];

self.lineCountingView.startOffset = config.baseAddress;

if (!self.inDebugMode) {
[self performSelector:@selector(refresh) withObject:nil afterDelay:REFRESH_DELAY];
}
Expand Down

0 comments on commit 9e81d70

Please sign in to comment.