X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fgtkmm2ext%2Fkeyboard.cc;h=17e41a4b85e3005fb6a147d51124c56bf4a5fca8;hb=ae0759ae88c2497c936b052936610a0e8c97a236;hp=9966972edba6d41a8ed00a3055e1f914359cf452;hpb=241a9edd3eecf7d5062818ca391a2352500f9a01;p=ardour.git diff --git a/libs/gtkmm2ext/keyboard.cc b/libs/gtkmm2ext/keyboard.cc index 9966972edb..17e41a4b85 100644 --- a/libs/gtkmm2ext/keyboard.cc +++ b/libs/gtkmm2ext/keyboard.cc @@ -23,18 +23,23 @@ #include #include +#include #include +#include + #include #include #include #include #include "pbd/error.h" +#include "pbd/convert.h" #include "pbd/file_utils.h" #include "pbd/search_path.h" #include "pbd/xml++.h" #include "pbd/debug.h" +#include "pbd/unwind.h" #include "gtkmm2ext/keyboard.h" #include "gtkmm2ext/actions.h" @@ -54,6 +59,7 @@ guint Keyboard::delete_mod = GDK_SHIFT_MASK; 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; #ifdef GTKOSX @@ -94,6 +100,18 @@ const char* Keyboard::rangeselect_modifier_name() { return S_("Key|Shift"); } guint Keyboard::GainFineScaleModifier = Keyboard::PrimaryModifier; guint Keyboard::GainExtraFineScaleModifier = Keyboard::SecondaryModifier; +guint Keyboard::ScrollZoomVerticalModifier = Keyboard::SecondaryModifier; +guint Keyboard::ScrollZoomHorizontalModifier = Keyboard::PrimaryModifier; +guint Keyboard::ScrollHorizontalModifier = Keyboard::TertiaryModifier; + +guint Keyboard::trim_contents_mod = Keyboard::PrimaryModifier; +guint Keyboard::trim_overlap_mod = Keyboard::TertiaryModifier; +guint Keyboard::trim_anchored_mod = Keyboard::TertiaryModifier; +guint Keyboard::trim_jump_mod = Keyboard::TertiaryModifier; +guint Keyboard::fine_adjust_mod = Keyboard::SecondaryModifier; +guint Keyboard::push_points_mod = Keyboard::PrimaryModifier; +guint Keyboard::note_size_relative_mod = Keyboard::PrimaryModifier; + Keyboard* Keyboard::_the_keyboard = 0; Gtk::Window* Keyboard::current_window = 0; bool Keyboard::_some_magic_widget_has_focus = false; @@ -169,6 +187,22 @@ Keyboard::get_state (void) node->add_property ("delete-modifier", buf); snprintf (buf, sizeof (buf), "%d", snap_mod); 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", trim_anchored_mod); + node->add_property ("trim-anchored-modifier", buf); + snprintf (buf, sizeof (buf), "%d", trim_jump_mod); + node->add_property ("trim-jump-modifier", buf); + snprintf (buf, sizeof (buf), "%d", fine_adjust_mod); + node->add_property ("fine-adjust-modifier", buf); + snprintf (buf, sizeof (buf), "%d", push_points_mod); + node->add_property ("push-points-modifier", buf); + snprintf (buf, sizeof (buf), "%d", note_size_relative_mod); + node->add_property ("note-size-relative-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); @@ -202,6 +236,38 @@ Keyboard::set_state (const XMLNode& node, int /*version*/) sscanf (prop->value().c_str(), "%d", &snap_mod); } + if ((prop = node.property ("snap-delta-modifier")) != 0) { + 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 ("trim-anchored-modifier")) != 0) { + sscanf (prop->value().c_str(), "%d", &trim_anchored_mod); + } + + if ((prop = node.property ("trim-jump-modifier")) != 0) { + sscanf (prop->value().c_str(), "%d", &trim_jump_mod); + } + + if ((prop = node.property ("fine-adjust-modifier")) != 0) { + sscanf (prop->value().c_str(), "%d", &fine_adjust_mod); + } + + if ((prop = node.property ("push-points-modifier")) != 0) { + sscanf (prop->value().c_str(), "%d", &push_points_mod); + } + + if ((prop = node.property ("note-size-relative-modifier")) != 0) { + sscanf (prop->value().c_str(), "%d", ¬e_size_relative_mod); + } + if ((prop = node.property ("insert-note-button")) != 0) { sscanf (prop->value().c_str(), "%d", &insert_note_but); } @@ -228,8 +294,9 @@ Keyboard::snooper (GtkWidget *widget, GdkEventKey *event) DEBUG_TRACE ( DEBUG::Keyboard, string_compose ( - "Snoop widget %1 key %2 type %3 state %4 magic %5\n", - widget, event->keyval, event->type, event->state, _some_magic_widget_has_focus + "Snoop widget %1 name: [%6] key %2 type %3 state %4 magic %5\n", + widget, event->keyval, event->type, event->state, _some_magic_widget_has_focus, + gtk_widget_get_name (widget) ) ); @@ -243,12 +310,15 @@ Keyboard::snooper (GtkWidget *widget, GdkEventKey *event) keyval = event->keyval; } - if (keyval == GDK_Shift_L) { + if (event->state & ScrollZoomVerticalModifier) { /* There is a special and rather hacky situation in Editor which makes - it useful to know when a shift key has been released, so emit a signal - here (see Editor::_stepping_axis_view) + it useful to know when the modifier key for vertical zoom has been + released, so emit a signal here (see Editor::_stepping_axis_view). + Note that the state bit for the modifier key is set for the key-up + event when the modifier is released, but not the key-down when it + is pressed, so we get here on key-up, which is what we want. */ - ShiftReleased (); /* EMIT SIGNAL */ + ZoomVerticalModifierReleased (); /* EMIT SIGNAL */ } if (event->type == GDK_KEY_PRESS) { @@ -316,6 +386,8 @@ Keyboard::snooper (GtkWidget *widget, GdkEventKey *event) } } + DEBUG_TRACE (DEBUG::Keyboard, string_compose ("snooper returns %1\n", ret)); + return ret; } @@ -338,6 +410,7 @@ bool Keyboard::enter_window (GdkEventCrossing *, Gtk::Window* win) { current_window = win; + DEBUG_TRACE (DEBUG::Keyboard, string_compose ("Entering window, title = %1\n", win->get_title())); return false; } @@ -367,6 +440,29 @@ Keyboard::leave_window (GdkEventCrossing *ev, Gtk::Window* /*win*/) return false; } +bool +Keyboard::focus_in_window (GdkEventFocus *, Gtk::Window* win) +{ + current_window = win; + DEBUG_TRACE (DEBUG::Keyboard, string_compose ("Focusing in window, title = %1\n", win->get_title())); + return false; +} + +bool +Keyboard::focus_out_window (GdkEventFocus * ev, Gtk::Window* win) +{ + if (ev) { + state.clear (); + current_window = 0; + } else { + current_window = 0; + } + + DEBUG_TRACE (DEBUG::Keyboard, string_compose ("Foucusing out window, title = %1\n", win->get_title())); + + return false; +} + void Keyboard::set_edit_button (guint but) { @@ -426,6 +522,70 @@ Keyboard::set_snap_modifier (guint mod) RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | snap_mod); } +void +Keyboard::set_snap_delta_modifier (guint mod) +{ + RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~snap_delta_mod); + snap_delta_mod = 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); +} + +void +Keyboard::set_trim_anchored_modifier (guint mod) +{ + RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~trim_anchored_mod); + trim_anchored_mod = mod; + RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | trim_anchored_mod); +} + +void +Keyboard::set_trim_jump_modifier (guint mod) +{ + RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~trim_jump_mod); + trim_jump_mod = mod; + RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | trim_jump_mod); +} + +void +Keyboard::set_fine_adjust_modifier (guint mod) +{ + RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~fine_adjust_mod); + fine_adjust_mod = mod; + RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | fine_adjust_mod); +} + +void +Keyboard::set_push_points_modifier (guint mod) +{ + RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~push_points_mod); + push_points_mod = mod; + RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | push_points_mod); +} + +void +Keyboard::set_note_size_relative_modifier (guint mod) +{ + RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~note_size_relative_mod); + note_size_relative_mod = mod; + RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | note_size_relative_mod); +} + bool Keyboard::is_edit_event (GdkEventButton *ev) { @@ -573,3 +733,24 @@ Keyboard::load_keybindings (string path) return true; } +int +Keyboard::reset_bindings () +{ + if (Glib::file_test (user_keybindings_path, Glib::FILE_TEST_EXISTS)) { + + string new_path = user_keybindings_path; + new_path += ".old"; + + if (::g_rename (user_keybindings_path.c_str(), new_path.c_str())) { + error << string_compose (_("Cannot rename your own keybinding file (%1)"), strerror (errno)) << endmsg; + return -1; + } + } + + { + PBD::Unwinder uw (can_save_keybindings, false); + setup_keybindings (); + } + + return 0; +}