X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fgtkmm2ext%2Fkeyboard.cc;h=9966972edba6d41a8ed00a3055e1f914359cf452;hb=0f47a171c9d757f6d9091df7da5f8bef11eaba74;hp=9a67aeaa765848fc5aa9a9f7127c804076052f8c;hpb=2304a51b85830753e68450bde1d62686358fff09;p=ardour.git diff --git a/libs/gtkmm2ext/keyboard.cc b/libs/gtkmm2ext/keyboard.cc index 9a67aeaa76..9966972edb 100644 --- a/libs/gtkmm2ext/keyboard.cc +++ b/libs/gtkmm2ext/keyboard.cc @@ -34,9 +34,11 @@ #include "pbd/file_utils.h" #include "pbd/search_path.h" #include "pbd/xml++.h" +#include "pbd/debug.h" #include "gtkmm2ext/keyboard.h" #include "gtkmm2ext/actions.h" +#include "gtkmm2ext/debug.h" #include "i18n.h" @@ -45,33 +47,30 @@ using namespace Gtk; using namespace Gtkmm2ext; using namespace std; -#define KBD_DEBUG 1 -bool debug_keyboard = false; - guint Keyboard::edit_but = 3; guint Keyboard::edit_mod = GDK_CONTROL_MASK; guint Keyboard::delete_but = 3; guint Keyboard::delete_mod = GDK_SHIFT_MASK; -guint Keyboard::insert_note_but = 3; +guint Keyboard::insert_note_but = 1; guint Keyboard::insert_note_mod = GDK_CONTROL_MASK; guint Keyboard::snap_mod = GDK_MOD3_MASK; #ifdef GTKOSX -guint Keyboard::PrimaryModifier = GDK_META_MASK; // Command -guint Keyboard::SecondaryModifier = GDK_MOD1_MASK; // Alt/Option +uint Keyboard::PrimaryModifier = GDK_MOD2_MASK; // Command +guint Keyboard::SecondaryModifier = GDK_CONTROL_MASK; // Control guint Keyboard::TertiaryModifier = GDK_SHIFT_MASK; // Shift -guint Keyboard::Level4Modifier = GDK_CONTROL_MASK; // Control -guint Keyboard::CopyModifier = GDK_MOD1_MASK; // Alt/Option +guint Keyboard::Level4Modifier = GDK_MOD1_MASK; // Alt/Option +guint Keyboard::CopyModifier = GDK_CONTROL_MASK; // Control guint Keyboard::RangeSelectModifier = GDK_SHIFT_MASK; guint Keyboard::button2_modifiers = Keyboard::SecondaryModifier|Keyboard::Level4Modifier; const char* Keyboard::primary_modifier_name() { return _("Command"); } -const char* Keyboard::secondary_modifier_name() { return _("Option"); } -const char* Keyboard::tertiary_modifier_name() { return _("Shift"); } -const char* Keyboard::level4_modifier_name() { return _("Control"); } -const char* Keyboard::copy_modifier_name() { return _("Mod1"; ); } -const char* Keyboard::rangeselect_modifier_name() { return _("Shift"); } +const char* Keyboard::secondary_modifier_name() { return _("Control"); } +const char* Keyboard::tertiary_modifier_name() { return S_("Key|Shift"); } +const char* Keyboard::level4_modifier_name() { return _("Option"); } +const char* Keyboard::copy_modifier_name() { return _("Control"); } +const char* Keyboard::rangeselect_modifier_name() { return S_("Key|Shift"); } #else @@ -85,13 +84,16 @@ guint Keyboard::button2_modifiers = 0; /* not used */ const char* Keyboard::primary_modifier_name() { return _("Control"); } const char* Keyboard::secondary_modifier_name() { return _("Alt"); } -const char* Keyboard::tertiary_modifier_name() { return _("Shift"); } +const char* Keyboard::tertiary_modifier_name() { return S_("Key|Shift"); } const char* Keyboard::level4_modifier_name() { return _("Meta"); } const char* Keyboard::copy_modifier_name() { return _("Control"); } -const char* Keyboard::rangeselect_modifier_name() { return _("Shift"); } +const char* Keyboard::rangeselect_modifier_name() { return S_("Key|Shift"); } #endif +guint Keyboard::GainFineScaleModifier = Keyboard::PrimaryModifier; +guint Keyboard::GainExtraFineScaleModifier = Keyboard::SecondaryModifier; + Keyboard* Keyboard::_the_keyboard = 0; Gtk::Window* Keyboard::current_window = 0; bool Keyboard::_some_magic_widget_has_focus = false; @@ -223,30 +225,32 @@ Keyboard::snooper (GtkWidget *widget, GdkEventKey *event) uint32_t keyval; bool ret = false; -#if 0 - cerr << "snoop widget " << widget << " key " << event->keyval << " type: " << event->type - << " state " << std::hex << event->state << std::dec - << " magic ? " << _some_magic_widget_has_focus - << endl; -#endif - -#if KBD_DEBUG - if (debug_keyboard) { - cerr << "snoop widget " << widget << " key " << event->keyval << " type: " << event->type - << endl; - } -#endif + 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 + ) + ); if (event->keyval == GDK_Shift_R) { keyval = GDK_Shift_L; - } else if (event->keyval == GDK_Control_R) { + } else if (event->keyval == GDK_Control_R) { keyval = GDK_Control_L; } else { keyval = event->keyval; } + if (keyval == GDK_Shift_L) { + /* 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) + */ + ShiftReleased (); /* EMIT SIGNAL */ + } + if (event->type == GDK_KEY_PRESS) { if (find (state.begin(), state.end(), keyval) == state.end()) { @@ -264,7 +268,7 @@ Keyboard::snooper (GtkWidget *widget, GdkEventKey *event) const AccelKey& ak (k->first); if (keyval == ak.get_key() && (Gdk::ModifierType)((event->state & Keyboard::RelevantModifierKeyMask) | Gdk::RELEASE_MASK) == ak.get_mod()) { - cerr << "Suppress auto repeat\n"; + DEBUG_TRACE (DEBUG::Keyboard, "Suppress auto repeat\n"); ret = true; break; } @@ -288,8 +292,9 @@ Keyboard::snooper (GtkWidget *widget, GdkEventKey *event) if (keyval == ak.get_key() && (Gdk::ModifierType)((event->state & Keyboard::RelevantModifierKeyMask) | Gdk::RELEASE_MASK) == ak.get_mod()) { Glib::RefPtr act = ActionManager::get_action (ts.first.c_str(), ts.second.c_str()); if (act) { + DEBUG_TRACE (DEBUG::Keyboard, string_compose ("Activate %1 %2\n", ts.first, ts.second)); act->activate(); - cerr << "use repeat, suppress other\n"; + DEBUG_TRACE (DEBUG::Keyboard, string_compose ("Use repeat, suppress other\n", ts.first, ts.second)); ret = true; } break; @@ -305,11 +310,8 @@ Keyboard::snooper (GtkWidget *widget, GdkEventKey *event) if (event->type == GDK_KEY_RELEASE && modifier_state_equals (event->state, PrimaryModifier)) { switch (event->keyval) { case GDK_w: - if (current_window) { - current_window->hide (); - current_window = 0; - ret = true; - } + close_current_dialog (); + ret = true; break; } } @@ -317,6 +319,15 @@ Keyboard::snooper (GtkWidget *widget, GdkEventKey *event) return ret; } +void +Keyboard::close_current_dialog () +{ + if (current_window) { + current_window->hide (); + current_window = 0; + } +} + bool Keyboard::key_is_down (uint32_t keyval) { @@ -336,22 +347,16 @@ Keyboard::leave_window (GdkEventCrossing *ev, Gtk::Window* /*win*/) if (ev) { switch (ev->detail) { case GDK_NOTIFY_INFERIOR: - if (debug_keyboard) { - cerr << "INFERIOR crossing ... out\n"; - } + DEBUG_TRACE (DEBUG::Keyboard, "INFERIOR crossing ... out\n"); break; case GDK_NOTIFY_VIRTUAL: - if (debug_keyboard) { - cerr << "VIRTUAL crossing ... out\n"; - } + DEBUG_TRACE (DEBUG::Keyboard, "VIRTUAL crossing ... out\n"); /* fallthru */ default: - if (debug_keyboard) { - cerr << "REAL CROSSING ... out\n"; - cerr << "clearing current target\n"; - } + DEBUG_TRACE (DEBUG::Keyboard, "REAL crossing ... out\n"); + DEBUG_TRACE (DEBUG::Keyboard, "Clearing current target\n"); state.clear (); current_window = 0; } @@ -526,7 +531,7 @@ Keyboard::load_keybindings (string path) } catch (...) { - error << string_compose (_("Ardour key bindings file not found at \"%1\" or contains errors."), path) + error << string_compose (_("key bindings file not found at \"%2\" or contains errors."), path) << endmsg; return false; } @@ -546,22 +551,17 @@ Keyboard::load_keybindings (string path) release_keys.clear (); - bool show_bindings = (getenv ("ARDOUR_SHOW_BINDINGS") != 0); - for (n = names.begin(), b = bindings.begin(), g = groups.begin(); n != names.end(); ++n, ++b, ++g) { + stringstream s; + s << "Action: " << *n << " Group: " << *g << " Binding: "; - if (show_bindings) { - - cerr << "Action: " << (*n) << " Group: " << (*g) << " binding = "; - - if ((*b).get_key() != GDK_VoidSymbol) { - cerr << (*b).get_key() << " w/mod = " << hex << (*b).get_mod() << dec << " = " << (*b).get_abbrev(); - } else { - cerr << "unbound"; - } - - cerr << endl; + if ((*b).get_key() != GDK_VoidSymbol) { + s << b->get_key() << " w/mod " << hex << b->get_mod() << dec << " = " << b->get_abbrev () << "\n"; + } else { + s << "unbound\n"; } + + DEBUG_TRACE (DEBUG::Bindings, s.str ()); } for (n = names.begin(), b = bindings.begin(), g = groups.begin(); n != names.end(); ++n, ++b, ++g) { @@ -573,4 +573,3 @@ Keyboard::load_keybindings (string path) return true; } -