Implement the hex editor widget for Cocoa and enable memory editor on macOS #1723
Conversation
…t. Squashed following commits: First try: cocoahexedit is view, source, and delegate. IDK if it compiles. No updates. I...think it compiles? I...think it compiles? trying to separate tableview out like in table_view.cpp Attempt to set document view to table view so table shows (still not working) IT DISPLAYS A BLANK TABLE NOW IT DISPLAYS THINGS! YAY changed to objectValueForTableColumn to show text. Separate columns (with all spacing removed so they fit) in prep for editing Somehow getting "CLIENT ERROR: TUINSRemoteViewController does not override -viewServiceDidTerminateWithError: and thus cannot react to catastrophic errors beyond logging them" on any kind of editing... Tried emptying function and removing delegate/target stuff so data source only. No dice. try simplest thing (always replace with 0) - not working. :( Corrected the typo (thanks yam). Editing works now. Reformat code Add some documentation tehe Make sure we don't read bytes past the length! oops.
Cathrach
force-pushed
the
cocoa-hex-edit
branch
from
15548e5 to
64a8a37
Compare
hiro/cocoa/widget/hex-edit.cpp
Outdated
| auto pHexEdit::destruct() -> void { | ||
| [cocoaView removeFromSuperview]; | ||
| - (NSInteger) numberOfRowsInTableView:(NSTableView *)tableView { | ||
| return hexEdit->rows(); |
There was a problem hiding this comment.
Hmm; it looks like in other hex-edit implementations, rows is being dynamically set based on the amount of memory being looked at (hexEdit->length()). For Cocoa here, we aren't currently doing that, so this value appears to always remain at 16. I think we need to derive the number of rows from hexEdit->length in this method, or else set hexEdit's rows somewhere else based on the total memory length.
There was a problem hiding this comment.
Thank you – I was misunderstanding the functionality. Newest commit fixes this so rows = length / columns and properly implements address goto!
| if (address < hexEdit->length()) { | ||
| u8 data = hexEdit->doRead(address++); | ||
| [output appendString:[NSString stringWithFormat:@"%c", | ||
| (data >= 0x20 && data <= 0x7e ? (char)data : '.')]]; |
There was a problem hiding this comment.
This is something of a nit/bikeshedding, since the terminology isn't exposed to the user currently, but "ANSI" is sort of a Windows-ism, which just sort of generically means "the system's default encoding". On macOS, that term isn't really used, since basically everything is UTF-8. It looks like when we're interpolating the char here, we're using the UTF-8 system-default interpolation of the character, but just constrained to the range 32-127 of printable characters that have only one codepoint. Not worth changing the names of everything (unless you feel like it), but if the column header is ever exposed to the user, worth keeping in mind.
I also personally would prefer a whitespace instead of a ., since the actual . character is within the 32-127 range, but others might have other opinions.
There was a problem hiding this comment.
Thanks – I changed to a "Plain text" header. The . is for consistency with the windows/gtk versions; also, I think whitespace is difficult to count.
hiro/cocoa/widget/hex-edit.cpp
Outdated
| NSTextFieldCell *cell = column.dataCell; | ||
|
|
||
| // Set the font for the data cell. | ||
| cell.font = [NSFont monospacedSystemFontOfSize:10 weight:NSFontWeightRegular]; |
There was a problem hiding this comment.
This is also only available on macOS 10.15 or above, so we should guard it with an availability check:
| cell.font = [NSFont monospacedSystemFontOfSize:10 weight:NSFontWeightRegular]; | |
| if (@available(macOS 10.15, *)) { | |
| cell.font = [NSFont monospacedSystemFontOfSize:10 weight:NSFontWeightRegular]; | |
| } |
I forget how onerous implementing other fonts for cells below macOS 10.15 is; if it's annoying, I wouldn't worry too much about it. You may, however, need to widen the hex columns if the monospace font isn't available.
|
One other thing; the memory editor is also current ifdef'd out in the menu bar's Tools menu; Should remove that in the header there as well as the implementation file. |
Co-authored-by: jcm <6864788+jcm93@users.noreply.github.com>
|
Looks good to me! If two-way editing is a part of the GTK/Windows version, I think it can be worried about later, this seems plenty good for a first iteration to me at least. |
This PR adds the hex editor widget to Cocoa hiro and enables the memory editor in Tools. The widget is a cell-based NSTableView with data source the core hex editor widget and supports editing of memory (but not of the encoded ANSI).