[debugger] Add context menus to call stack and symbols windows

Author: drhelius

platforms/shared/desktop/gui_debug_disassembler.cpp

@@ -1635,6 +1635,25 @@ void gui_debug_window_call_stack(void)
             {
                 request_goto_address(entry.dest);
             }
+
+            ImGui::PopFont();
+            if (ImGui::BeginPopupContextItem())
+            {
+                if (ImGui::Selectable("Add Breakpoint"))
+                {
+                    if (!emu_get_core()->GetHuC6280()->IsBreakpoint(HuC6280::HuC6280_BREAKPOINT_TYPE_ROMRAM, entry.dest))
+                        emu_get_core()->GetHuC6280()->AddBreakpoint(entry.dest);
+                }
+
+                if (ImGui::Selectable("Add Watch"))
+                {
+                    gui_debug_memory_add_watch(0, entry.dest, symbol_text[0] ? symbol_text : NULL);
+                }
+
+                ImGui::EndPopup();
+            }
+            ImGui::PushFont(gui_default_font);
+
             ImGui::SameLine();
             ImGui::TextColored(cyan, "$%04X", entry.dest);
             ImGui::SameLine();
@@ -1810,6 +1829,25 @@ void gui_debug_window_symbols(void)
                 {
                     request_goto_address(symbol->address);
                 }
+
+                ImGui::PopFont();
+                if (ImGui::BeginPopupContextItem())
+                {
+                    if (ImGui::Selectable("Add Breakpoint"))
+                    {
+                        if (!emu_get_core()->GetHuC6280()->IsBreakpoint(HuC6280::HuC6280_BREAKPOINT_TYPE_ROMRAM, symbol->address))
+                            emu_get_core()->GetHuC6280()->AddBreakpoint(symbol->address);
+                    }
+
+                    if (ImGui::Selectable("Add Watch"))
+                    {
+                        gui_debug_memory_add_watch(0, symbol->address, symbol->text);
+                    }
+
+                    ImGui::EndPopup();
+                }
+                ImGui::PushFont(gui_default_font);
+
                 ImGui::SameLine();
                 ImGui::TextColored(cyan, "$%02X", b);
 

platforms/shared/desktop/gui_debug_memory.cpp

@@ -410,6 +410,7 @@ void gui_debug_memory_add_watch(int editor, int address, const char* notes)
     }
 
     watches->push_back(watch);
+    mem_edit[editor].OpenWatchWindow();
 }
 
 void gui_debug_memory_remove_watch(int editor, int address)

platforms/shared/desktop/gui_menus.cpp

@@ -1439,7 +1439,7 @@ static void menu_debug(void)
         ImGui::Separator();
         ImGui::MenuItem("Show HuC6280 Status", "", &config_debug.show_processor, config_debug.debug);
         ImGui::MenuItem("Show HuC6280 Call Stack", "", &config_debug.show_call_stack, config_debug.debug);
-        ImGui::MenuItem("Show Symbols", "", &config_debug.show_symbols, config_debug.debug);
+        ImGui::MenuItem("Show HuC6280 Symbols", "", &config_debug.show_symbols, config_debug.debug);
         ImGui::Separator();
         ImGui::MenuItem("Show HuC6260 Info", "", &config_debug.show_huc6260_info, config_debug.debug);
         ImGui::MenuItem("Show HuC6260 Palettes", "", &config_debug.show_huc6260_palettes, config_debug.debug);