diff options
Diffstat (limited to 'src/osd/modules/debugger/osx/disassemblyview.mm')
-rw-r--r-- | src/osd/modules/debugger/osx/disassemblyview.mm | 55 |
1 files changed, 29 insertions, 26 deletions
diff --git a/src/osd/modules/debugger/osx/disassemblyview.mm b/src/osd/modules/debugger/osx/disassemblyview.mm index 99bdc485147..c501d17230a 100644 --- a/src/osd/modules/debugger/osx/disassemblyview.mm +++ b/src/osd/modules/debugger/osx/disassemblyview.mm @@ -46,7 +46,7 @@ - (NSSize)maximumFrameSize { debug_view_xy max(0, 0); debug_view_source const *source = view->source(); - for (debug_view_source const *source = view->first_source(); source != nullptr; source = source->next()) + for (auto &source : view->source_list()) { view->set_source(*source); debug_view_xy const current = view->total_size(); @@ -75,7 +75,7 @@ item = [menu addItemWithTitle:@"Disable Breakpoint" action:@selector(debugToggleBreakpointEnable:) keyEquivalent:[NSString stringWithFormat:@"%C", (short)NSF9FunctionKey]]; - [item setKeyEquivalentModifierMask:NSShiftKeyMask]; + [item setKeyEquivalentModifierMask:NSEventModifierFlagShift]; [menu addItem:[NSMenuItem separatorItem]]; @@ -118,18 +118,23 @@ - (int)selectedSubviewIndex { const debug_view_source *source = view->source(); if (source != nullptr) - return view->source_list().indexof(*source); + return view->source_index(*source); else return -1; } - (void)selectSubviewAtIndex:(int)index { - const int selected = view->source_list().indexof(*view->source()); - if (selected != index) { - view->set_source(*view->source_list().find(index)); - if ([[self window] firstResponder] != self) - view->set_cursor_visible(false); + const int selected = [self selectedSubviewIndex]; + if (selected != index) + { + const debug_view_source *source = view->source(index); + if (source != nullptr) + { + view->set_source(*source); + if ([[self window] firstResponder] != self) + view->set_cursor_visible(false); + } } } @@ -155,23 +160,21 @@ - (BOOL)selectSubviewForSpace:(address_space *)space { if (space == nullptr) return NO; - debug_view_disasm_source const *source = downcast<debug_view_disasm_source const *>(view->first_source()); - while ((source != nullptr) && (&source->space() != space)) - source = downcast<debug_view_disasm_source *>(source->next()); - if (source != nullptr) + for (auto &ptr : view->source_list()) { - if (view->source() != source) + debug_view_disasm_source const *const source = downcast<debug_view_disasm_source const *>(ptr.get()); + if (&source->space() == space) { - view->set_source(*source); - if ([[self window] firstResponder] != self) - view->set_cursor_visible(false); + if (view->source() != source) + { + view->set_source(*source); + if ([[self window] firstResponder] != self) + view->set_cursor_visible(false); + } + return YES; } - return YES; - } - else - { - return NO; } + return NO; } @@ -211,7 +214,7 @@ action:@selector(debugToggleBreakpointEnable:) keyEquivalent:[NSString stringWithFormat:@"%C", (short)NSF9FunctionKey] atIndex:index++]; - [disableItem setKeyEquivalentModifierMask:NSShiftKeyMask]; + [disableItem setKeyEquivalentModifierMask:NSEventModifierFlagShift]; NSMenu *runMenu = [[menu itemWithTitle:@"Run"] submenu]; NSMenuItem *runItem; @@ -256,12 +259,12 @@ - (void)insertSubviewItemsInMenu:(NSMenu *)menu atIndex:(NSInteger)index { - for (const debug_view_source *source = view->source_list().first(); source != nullptr; source = source->next()) + for (auto &source : view->source_list()) { [[menu insertItemWithTitle:[NSString stringWithUTF8String:source->name()] action:NULL keyEquivalent:@"" - atIndex:index++] setTag:view->source_list().indexof(*source)]; + atIndex:index++] setTag:view->source_index(*source)]; } if (index < [menu numberOfItems]) [menu insertItem:[NSMenuItem separatorItem] atIndex:index++]; @@ -271,14 +274,14 @@ - (void)saveConfigurationToNode:(util::xml::data_node *)node { [super saveConfigurationToNode:node]; debug_view_disasm *const dasmView = downcast<debug_view_disasm *>(view); - node->set_attribute_int("rightbar", dasmView->right_column()); + node->set_attribute_int(osd::debugger::ATTR_WINDOW_DISASSEMBLY_RIGHT_COLUMN, dasmView->right_column()); } - (void)restoreConfigurationFromNode:(util::xml::data_node const *)node { [super restoreConfigurationFromNode:node]; debug_view_disasm *const dasmView = downcast<debug_view_disasm *>(view); - dasmView->set_right_column((disasm_right_column)node->get_attribute_int("rightbar", dasmView->right_column())); + dasmView->set_right_column((disasm_right_column)node->get_attribute_int(osd::debugger::ATTR_WINDOW_DISASSEMBLY_RIGHT_COLUMN, dasmView->right_column())); } @end |