From 31f45a488afae978c67fc126d44853674c8e91b6 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Wed, 13 Sep 2023 20:44:07 +0200
Subject: [PATCH] Add menu items to set/cycle marker click behavior

---
 gtk2_ardour/ardour.menus.in   | 6 ++++++
 gtk2_ardour/editor.cc         | 1 +
 gtk2_ardour/editor_actions.cc | 1 +
 3 files changed, 8 insertions(+)

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index c42ffe6b73..9548667914 100644
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -280,6 +280,12 @@
         <menuitem action='cycle-edit-point'/>
         <menuitem action='cycle-edit-point-with-marker'/>
       </menu>
+      <menu action="MarkerClickBehavior">
+        <menuitem action='cycle-marker-click-behavior'/>
+        <menuitem action='marker-click-select-only'/>
+        <menuitem action='marker-click-locate'/>
+        <menuitem action='marker-click-locate-when-stopped'/>
+      </menu>
       <menuitem action='cycle-snap-mode'/>
       <menu name='GridChoice' action='GridChoice'>
         <menuitem action='prev-grid-choice'/>
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 7c6150f43a..ca6e0316c2 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -4346,6 +4346,7 @@ Editor::set_marker_click_behavior (MarkerClickBehavior m)
 {
 	if (marker_click_behavior != m) {
 		marker_click_behavior = m;
+		marker_click_behavior_selection_done (marker_click_behavior);
 		instant_save ();
 	}
 }
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index 4d227da24f..c2a3b6e073 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -133,6 +133,7 @@ Editor::register_actions ()
 	ActionManager::register_action (editor_menu_actions, X_("EditSelectRangeOptions"), _("Select Range Operations"));
 	ActionManager::register_action (editor_menu_actions, X_("EditSelectRegionOptions"), _("Select Regions"));
 	ActionManager::register_action (editor_menu_actions, X_("EditPointMenu"), _("Edit Point"));
+	ActionManager::register_action (editor_menu_actions, X_("MarkerClickBehavior"), _("Marker Interaction"));
 	ActionManager::register_action (editor_menu_actions, X_("FadeMenu"), _("Fade"));
 	ActionManager::register_action (editor_menu_actions, X_("LatchMenu"), _("Latch"));
 	ActionManager::register_action (editor_menu_actions, X_("RegionMenu"), _("Region"));