summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gtk2_ardour/editor_drag.cc4
-rw-r--r--gtk2_ardour/rc_option_editor.cc206
-rw-r--r--libs/gtkmm2ext/gtkmm2ext/keyboard.h14
-rw-r--r--libs/gtkmm2ext/keyboard.cc30
4 files changed, 222 insertions, 32 deletions
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index 0e75c48cdb..ca45cbc755 100644
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -2614,7 +2614,7 @@ TrimDrag::start_grab (GdkEvent* event, Gdk::Cursor*)
framepos_t const pf = adjusted_current_frame (event);
setup_snap_delta (region_start);
- if (Keyboard::modifier_state_equals (event->button.state, Keyboard::SecondaryModifier)) {
+ if (Keyboard::modifier_state_equals (event->button.state, Keyboard::trim_contents_modifier ())) {
/* Move the contents of the region around without changing the region bounds */
_operation = ContentsTrim;
Drag::start_grab (event, _editor->cursors()->trimmer);
@@ -2720,7 +2720,7 @@ TrimDrag::motion (GdkEvent* event, bool first_move)
bool non_overlap_trim = false;
- if (event && Keyboard::modifier_state_equals (event->button.state, Keyboard::ModifierMask (Keyboard::PrimaryModifier | Keyboard::TertiaryModifier))) {
+ if (event && Keyboard::modifier_state_equals (event->button.state, Keyboard::trim_overlap_modifier ())) {
non_overlap_trim = true;
}
diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index 9c5a603fd7..4df3ff2c2b 100644
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -319,25 +319,57 @@ public:
}
}
- Table* t = manage (new Table (4, 5));
+ Table* t = manage (new Table (5, 11));
t->set_spacings (4);
- Label* l = manage (left_aligned_label (_("Edit using:")));
+ int row = 0;
+ int col = 0;
+
+ Label* l = manage (left_aligned_label (_("Select Keyboard layout:")));
+ l->set_name ("OptionsLabel");
+
+ vector<string> strs;
+
+ for (map<string,string>::iterator bf = Keyboard::binding_files.begin(); bf != Keyboard::binding_files.end(); ++bf) {
+ strs.push_back (bf->first);
+ }
+
+ set_popdown_strings (_keyboard_layout_selector, strs);
+ _keyboard_layout_selector.set_active_text (Keyboard::current_binding_name());
+ _keyboard_layout_selector.signal_changed().connect (sigc::mem_fun (*this, &KeyboardOptions::bindings_changed));
+
+ t->attach (*l, col, col + 1, row, row + 1, FILL | EXPAND, FILL);
+ t->attach (_keyboard_layout_selector, col + 1, col + 2, row, row + 1, FILL | EXPAND, FILL);
+
+ ++row;
+ col = 0;
+
+ l = manage (left_aligned_label (_("When Clicking:")));
+ l->set_name ("OptionEditorHeading");
+ t->attach (*l, col, col + 1, row, row + 1, FILL | EXPAND, FILL);
+
+ ++row;
+ col = 1;
+
+ l = manage (left_aligned_label (_("Edit using:")));
l->set_name ("OptionsLabel");
- t->attach (*l, 0, 1, 0, 1, FILL | EXPAND, FILL);
- t->attach (_edit_modifier_combo, 1, 2, 0, 1, FILL | EXPAND, FILL);
+ t->attach (*l, col, col + 1, row, row + 1, FILL | EXPAND, FILL);
+ t->attach (_edit_modifier_combo, col + 1, col + 2, row, row + 1, FILL | EXPAND, FILL);
l = manage (new Label (_("+ button")));
l->set_name ("OptionsLabel");
- t->attach (*l, 3, 4, 0, 1, FILL | EXPAND, FILL);
- t->attach (_edit_button_spin, 4, 5, 0, 1, FILL | EXPAND, FILL);
+ t->attach (*l, col + 3, col + 4, row, row + 1, FILL | EXPAND, FILL);
+ t->attach (_edit_button_spin, col + 4, col + 5, row, row + 1, FILL | EXPAND, FILL);
_edit_button_spin.set_name ("OptionsEntry");
_edit_button_adjustment.set_value (Keyboard::edit_button());
_edit_button_adjustment.signal_value_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::edit_button_changed));
+ ++row;
+ col = 1;
+
set_popdown_strings (_delete_modifier_combo, dumb);
_delete_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::delete_modifier_chosen));
@@ -351,19 +383,21 @@ public:
l = manage (left_aligned_label (_("Delete using:")));
l->set_name ("OptionsLabel");
- t->attach (*l, 0, 1, 1, 2, FILL | EXPAND, FILL);
- t->attach (_delete_modifier_combo, 1, 2, 1, 2, FILL | EXPAND, FILL);
+ t->attach (*l, col, col + 1, row, row + 1, FILL | EXPAND, FILL);
+ t->attach (_delete_modifier_combo, col + 1, col + 2, row, row + 1, FILL | EXPAND, FILL);
l = manage (new Label (_("+ button")));
l->set_name ("OptionsLabel");
- t->attach (*l, 3, 4, 1, 2, FILL | EXPAND, FILL);
- t->attach (_delete_button_spin, 4, 5, 1, 2, FILL | EXPAND, FILL);
+ t->attach (*l, col + 3, col + 4, row, row + 1, FILL | EXPAND, FILL);
+ t->attach (_delete_button_spin, col + 4, col + 5, row, row + 1, FILL | EXPAND, FILL);
_delete_button_spin.set_name ("OptionsEntry");
_delete_button_adjustment.set_value (Keyboard::delete_button());
_delete_button_adjustment.signal_value_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::delete_button_changed));
+ ++row;
+ col = 1;
set_popdown_strings (_insert_note_modifier_combo, dumb);
_insert_note_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::insert_note_modifier_chosen));
@@ -378,19 +412,80 @@ public:
l = manage (left_aligned_label (_("Insert note using:")));
l->set_name ("OptionsLabel");
- t->attach (*l, 0, 1, 2, 3, FILL | EXPAND, FILL);
- t->attach (_insert_note_modifier_combo, 1, 2, 2, 3, FILL | EXPAND, FILL);
+ t->attach (*l, col, col + 1, row, row + 1, FILL | EXPAND, FILL);
+ t->attach (_insert_note_modifier_combo, col + 1, col + 2, row, row + 1, FILL | EXPAND, FILL);
l = manage (new Label (_("+ button")));
l->set_name ("OptionsLabel");
- t->attach (*l, 3, 4, 2, 3, FILL | EXPAND, FILL);
- t->attach (_insert_note_button_spin, 4, 5, 2, 3, FILL | EXPAND, FILL);
+ t->attach (*l, col + 3, col + 4, row, row + 1, FILL | EXPAND, FILL);
+ t->attach (_insert_note_button_spin, col + 4, col + 5, row, row + 1, FILL | EXPAND, FILL);
_insert_note_button_spin.set_name ("OptionsEntry");
_insert_note_button_adjustment.set_value (Keyboard::insert_note_button());
_insert_note_button_adjustment.signal_value_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::insert_note_button_changed));
+ ++row;
+
+ l = manage (left_aligned_label (_("When Beginning a Drag:")));
+ l->set_name ("OptionEditorHeading");
+ t->attach (*l, 0, 1, row, row + 1, FILL | EXPAND, FILL);
+
+ ++row;
+ col = 1;
+
+ /* copy modifier */
+ set_popdown_strings (_copy_modifier_combo, dumb);
+ _copy_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::copy_modifier_chosen));
+
+ for (int x = 0; modifiers[x].name; ++x) {
+ if (modifiers[x].modifier == (guint) Keyboard::CopyModifier) {
+ _copy_modifier_combo.set_active_text (S_(modifiers[x].name));
+ break;
+ }
+ }
+
+ l = manage (left_aligned_label (_("Copy items using:")));
+ l->set_name ("OptionsLabel");
+
+ t->attach (*l, col, col + 1, row, row + 1, FILL | EXPAND, FILL);
+ t->attach (_copy_modifier_combo, col + 1, col + 2, row, row + 1, FILL | EXPAND, FILL);
+
+ ++row;
+
+ l = manage (left_aligned_label (_("When Beginning a Trim:")));
+ l->set_name ("OptionEditorHeading");
+ t->attach (*l, 0, 1, row, row + 1, FILL | EXPAND, FILL);
+
+ ++row;
+ col = 1;
+
+ /* trim_contents */
+ set_popdown_strings (_trim_contents_combo, dumb);
+ _trim_contents_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::trim_contents_modifier_chosen));
+
+ for (int x = 0; modifiers[x].name; ++x) {
+ if (modifiers[x].modifier == (guint) Keyboard::trim_contents_modifier ()) {
+ _trim_contents_combo.set_active_text (S_(modifiers[x].name));
+ break;
+ }
+ }
+
+ l = manage (left_aligned_label (_("Trim contents using:")));
+ l->set_name ("OptionsLabel");
+
+ t->attach (*l, col, col + 1, row, row + 1, FILL | EXPAND, FILL);
+ t->attach (_trim_contents_combo, col + 1, col + 2, row, row + 1, FILL | EXPAND, FILL);
+
+ ++row;
+
+ l = manage (left_aligned_label (_("While Dragging:")));
+ l->set_name ("OptionEditorHeading");
+ t->attach (*l, 0, 1, row, row + 1, FILL | EXPAND, FILL);
+
+ ++row;
+ col = 1;
+
/* ignore snap */
set_popdown_strings (_snap_modifier_combo, dumb);
_snap_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::snap_modifier_chosen));
@@ -405,8 +500,11 @@ public:
l = manage (left_aligned_label (_("Ignore snap using:")));
l->set_name ("OptionsLabel");
- t->attach (*l, 0, 1, 3, 4, FILL | EXPAND, FILL);
- t->attach (_snap_modifier_combo, 1, 2, 3, 4, FILL | EXPAND, FILL);
+ t->attach (*l, col, col + 1, row, row + 1, FILL | EXPAND, FILL);
+ t->attach (_snap_modifier_combo, col + 1, col + 2, row, row + 1, FILL | EXPAND, FILL);
+
+ ++row;
+ col = 1;
/* snap delta */
set_popdown_strings (_snap_delta_combo, dumb);
@@ -422,24 +520,37 @@ public:
l = manage (left_aligned_label (_("Snap to absolute using:")));
l->set_name ("OptionsLabel");
- t->attach (*l, 0, 1, 4, 5, FILL | EXPAND, FILL);
- t->attach (_snap_delta_combo, 1, 2, 4, 5, FILL | EXPAND, FILL);
+ t->attach (*l, col, col + 1, row, row + 1, FILL | EXPAND, FILL);
+ t->attach (_snap_delta_combo, col + 1, col + 2, row, row + 1, FILL | EXPAND, FILL);
- vector<string> strs;
+ ++row;
- for (map<string,string>::iterator bf = Keyboard::binding_files.begin(); bf != Keyboard::binding_files.end(); ++bf) {
- strs.push_back (bf->first);
- }
+ l = manage (left_aligned_label (_("While Trimming:")));
+ l->set_name ("OptionEditorHeading");
+ t->attach (*l, 0, 1, row, row + 1, FILL | EXPAND, FILL);
- set_popdown_strings (_keyboard_layout_selector, strs);
- _keyboard_layout_selector.set_active_text (Keyboard::current_binding_name());
- _keyboard_layout_selector.signal_changed().connect (sigc::mem_fun (*this, &KeyboardOptions::bindings_changed));
+ ++row;
+ col = 1;
+
+ /* trim_overlap */
+ set_popdown_strings (_trim_overlap_combo, dumb);
+ _trim_overlap_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::trim_overlap_modifier_chosen));
+
+ for (int x = 0; modifiers[x].name; ++x) {
+ if (modifiers[x].modifier == (guint) Keyboard::trim_overlap_modifier ()) {
+ _trim_overlap_combo.set_active_text (S_(modifiers[x].name));
+ break;
+ }
+ }
- l = manage (left_aligned_label (_("Keyboard layout:")));
+ l = manage (left_aligned_label (_("Resize overlaped regions using:")));
l->set_name ("OptionsLabel");
- t->attach (*l, 0, 1, 5, 6, FILL | EXPAND, FILL);
- t->attach (_keyboard_layout_selector, 1, 2, 5, 6, FILL | EXPAND, FILL);
+ t->attach (*l, col, col + 1, row, row + 1, FILL | EXPAND, FILL);
+ t->attach (_trim_overlap_combo, col + 1, col + 2, row, row + 1, FILL | EXPAND, FILL);
+
+ ++row;
+ ++row;
_box->pack_start (*t, false, false);
}
@@ -495,6 +606,18 @@ private:
}
}
+ void copy_modifier_chosen ()
+ {
+ string const txt = _copy_modifier_combo.get_active_text();
+
+ for (int i = 0; modifiers[i].name; ++i) {
+ if (txt == _(modifiers[i].name)) {
+ Keyboard::set_copy_modifier (modifiers[i].modifier);
+ break;
+ }
+ }
+ }
+
void insert_note_modifier_chosen ()
{
string const txt = _insert_note_modifier_combo.get_active_text();
@@ -531,6 +654,30 @@ private:
}
}
+ void trim_contents_modifier_chosen ()
+ {
+ string const txt = _trim_contents_combo.get_active_text();
+
+ for (int i = 0; modifiers[i].name; ++i) {
+ if (txt == _(modifiers[i].name)) {
+ Keyboard::set_trim_contents_modifier (modifiers[i].modifier);
+ break;
+ }
+ }
+ }
+
+ void trim_overlap_modifier_chosen ()
+ {
+ string const txt = _trim_overlap_combo.get_active_text();
+
+ for (int i = 0; modifiers[i].name; ++i) {
+ if (txt == _(modifiers[i].name)) {
+ Keyboard::set_trim_overlap_modifier (modifiers[i].modifier);
+ break;
+ }
+ }
+ }
+
void delete_button_changed ()
{
Keyboard::set_delete_button (_delete_button_spin.get_value_as_int());
@@ -549,9 +696,12 @@ private:
ComboBoxText _keyboard_layout_selector;
ComboBoxText _edit_modifier_combo;
ComboBoxText _delete_modifier_combo;
+ ComboBoxText _copy_modifier_combo;
ComboBoxText _insert_note_modifier_combo;
ComboBoxText _snap_modifier_combo;
ComboBoxText _snap_delta_combo;
+ ComboBoxText _trim_contents_combo;
+ ComboBoxText _trim_overlap_combo;
Adjustment _delete_button_adjustment;
SpinButton _delete_button_spin;
Adjustment _edit_button_adjustment;
diff --git a/libs/gtkmm2ext/gtkmm2ext/keyboard.h b/libs/gtkmm2ext/gtkmm2ext/keyboard.h
index 6cccca762b..5be93fe4f6 100644
--- a/libs/gtkmm2ext/gtkmm2ext/keyboard.h
+++ b/libs/gtkmm2ext/gtkmm2ext/keyboard.h
@@ -115,7 +115,6 @@ class LIBGTKMM2EXT_API Keyboard : public sigc::trackable, PBD::Stateful
static bool no_modifiers_active (guint state);
static void set_snap_modifier (guint);
-
/** @return Modifier mask to temporarily toggle grid setting; with this modifier
* - magnetic or normal grid should become no grid and
* - no grid should become normal grid
@@ -123,11 +122,20 @@ class LIBGTKMM2EXT_API Keyboard : public sigc::trackable, PBD::Stateful
static ModifierMask snap_modifier () { return ModifierMask (snap_mod); }
static void set_snap_delta_modifier (guint);
-
/** @return Modifier mask to temporarily toggle between relative and absolute grid setting;
*/
static ModifierMask snap_delta_modifier () { return ModifierMask (snap_delta_mod); }
+ static void set_trim_contents_modifier (guint);
+ /** @return Modifier mask to move contents rather than region bounds during trim;
+ */
+ static ModifierMask trim_contents_modifier () { return ModifierMask (trim_contents_mod); }
+
+ static void set_trim_overlap_modifier (guint);
+ /** @return Modifier mask to remove region overlaps after trim;
+ */
+ static ModifierMask trim_overlap_modifier () { return ModifierMask (trim_overlap_mod); }
+
static guint edit_button() { return edit_but; }
static void set_edit_button (guint);
static guint edit_modifier() { return edit_mod; }
@@ -193,6 +201,8 @@ class LIBGTKMM2EXT_API Keyboard : public sigc::trackable, PBD::Stateful
static guint insert_note_mod;
static guint snap_mod;
static guint snap_delta_mod;
+ static guint trim_contents_mod;
+ static guint trim_overlap_mod;
static guint button2_modifiers;
static Gtk::Window* current_window;
static std::string user_keybindings_path;
diff --git a/libs/gtkmm2ext/keyboard.cc b/libs/gtkmm2ext/keyboard.cc
index 4e35b3b80a..f60b91cb4d 100644
--- a/libs/gtkmm2ext/keyboard.cc
+++ b/libs/gtkmm2ext/keyboard.cc
@@ -60,6 +60,8 @@ guint Keyboard::insert_note_but = 1;
guint Keyboard::insert_note_mod = GDK_CONTROL_MASK;
guint Keyboard::snap_mod = GDK_MOD3_MASK;
guint Keyboard::snap_delta_mod = 0;
+guint Keyboard::trim_contents_mod = 0;
+guint Keyboard::trim_overlap_mod = 0;
#ifdef GTKOSX
@@ -182,6 +184,10 @@ Keyboard::get_state (void)
node->add_property ("snap-modifier", buf);
snprintf (buf, sizeof (buf), "%d", snap_delta_mod);
node->add_property ("snap-delta-modifier", buf);
+ snprintf (buf, sizeof (buf), "%d", trim_contents_mod);
+ node->add_property ("trim-contents-modifier", buf);
+ snprintf (buf, sizeof (buf), "%d", trim_overlap_mod);
+ node->add_property ("trim-overlap-modifier", buf);
snprintf (buf, sizeof (buf), "%d", insert_note_but);
node->add_property ("insert-note-button", buf);
snprintf (buf, sizeof (buf), "%d", insert_note_mod);
@@ -219,6 +225,14 @@ Keyboard::set_state (const XMLNode& node, int /*version*/)
sscanf (prop->value().c_str(), "%d", &snap_delta_mod);
}
+ if ((prop = node.property ("trim-contents-modifier")) != 0) {
+ sscanf (prop->value().c_str(), "%d", &trim_contents_mod);
+ }
+
+ if ((prop = node.property ("trim-overlap-modifier")) != 0) {
+ sscanf (prop->value().c_str(), "%d", &trim_overlap_mod);
+ }
+
if ((prop = node.property ("insert-note-button")) != 0) {
sscanf (prop->value().c_str(), "%d", &insert_note_but);
}
@@ -481,6 +495,22 @@ Keyboard::set_snap_delta_modifier (guint mod)
RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | snap_delta_mod);
}
+void
+Keyboard::set_trim_contents_modifier (guint mod)
+{
+ RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~trim_contents_mod);
+ trim_contents_mod = mod;
+ RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | trim_contents_mod);
+}
+
+void
+Keyboard::set_trim_overlap_modifier (guint mod)
+{
+ RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~trim_overlap_mod);
+ trim_overlap_mod = mod;
+ RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | trim_overlap_mod);
+}
+
bool
Keyboard::is_edit_event (GdkEventButton *ev)
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-27 19:50:48 +0000