X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fgtkmm2ext%2Fkeyboard.cc;h=135e1fdc5650bf0f94e65e885c02aafcf088608f;hb=b9cab93fb116b60f3864bc3e33c9cb6eaf087e97;hp=c6a534d2760d395b3d0966c0103b34bc0606a8a8;hpb=2397429e99d4b79ae874392665db2627674daaa0;p=ardour.git diff --git a/libs/gtkmm2ext/keyboard.cc b/libs/gtkmm2ext/keyboard.cc index c6a534d276..135e1fdc56 100644 --- a/libs/gtkmm2ext/keyboard.cc +++ b/libs/gtkmm2ext/keyboard.cc @@ -38,11 +38,13 @@ #include "pbd/debug.h" #include "pbd/unwind.h" -#include "gtkmm2ext/keyboard.h" #include "gtkmm2ext/actions.h" +#include "gtkmm2ext/bindings.h" +#include "gtkmm2ext/keyboard.h" #include "gtkmm2ext/debug.h" +#include "gtkmm2ext/utils.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace PBD; using namespace Gtk; @@ -56,7 +58,7 @@ guint Keyboard::delete_mod = GDK_SHIFT_MASK; guint Keyboard::insert_note_but = 1; guint Keyboard::insert_note_mod = GDK_CONTROL_MASK; -#ifdef GTKOSX +#ifdef __APPLE__ uint Keyboard::PrimaryModifier = GDK_MOD2_MASK; // Command guint Keyboard::SecondaryModifier = GDK_CONTROL_MASK; // Control @@ -70,8 +72,11 @@ const char* Keyboard::primary_modifier_name() { return _("Command"); } 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"); } + +const char* Keyboard::primary_modifier_short_name() { return _("Cmd"); } +const char* Keyboard::secondary_modifier_short_name() { return _("Ctrl"); } +const char* Keyboard::tertiary_modifier_short_name() { return S_("Key|Shift"); } +const char* Keyboard::level4_modifier_short_name() { return _("Opt"); } guint Keyboard::snap_mod = Keyboard::Level4Modifier|Keyboard::TertiaryModifier; // XXX this is probably completely wrong guint Keyboard::snap_delta_mod = Keyboard::Level4Modifier; @@ -89,9 +94,12 @@ 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 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 S_("Key|Shift"); } +const char* Keyboard::level4_modifier_name() { return _("Windows"); } + +const char* Keyboard::primary_modifier_short_name() { return _("Ctrl"); } +const char* Keyboard::secondary_modifier_short_name() { return _("Alt"); } +const char* Keyboard::tertiary_modifier_short_name() { return S_("Key|Shift"); } +const char* Keyboard::level4_modifier_short_name() { return _("Win"); } guint Keyboard::snap_mod = Keyboard::SecondaryModifier; guint Keyboard::snap_delta_mod = Keyboard::SecondaryModifier|Keyboard::Level4Modifier; @@ -114,10 +122,10 @@ bool Keyboard::can_save_keybindings = false; bool Keyboard::bindings_changed_after_save_became_legal = false; map Keyboard::binding_files; string Keyboard::_current_binding_name; -map,Keyboard::AccelKeyLess> Keyboard::release_keys; +string Keyboard::binding_filename_suffix = X_(".keys"); +Gtk::Window* Keyboard::pre_dialog_active_window = 0; /* set this to initially contain the modifiers we care about, then track changes in ::set_edit_modifier() etc. */ - GdkModifierType Keyboard::RelevantModifierKeyMask; void @@ -156,6 +164,29 @@ Keyboard::Keyboard () gtk_accelerator_set_default_mod_mask (RelevantModifierKeyMask); +#ifdef __APPLE__ + /* Remove SUPER,HYPER,META. + * + * GTK on OS X adds META when Command is pressed for various indefensible reasons, since + * it also uses MOD2 to indicate Command. Our code assumes that each + * modifier (Primary, Secondary etc.) is represented by a single bit in + * the modifier mask, but GTK's (STUPID) design uses two (MOD2 + META) + * to represent the Command key. Some discussion about this is here: + * https://bugzilla.gnome.org/show_bug.cgi?id=692597 + * + * We cannot do this until AFTER we told GTK what the default modifier + * was, because otherwise it will fail to recognize MOD2-META- as + * an accelerator. + * + * Note that in the tabbed branch, we no longer use GTK accelerators + * for functional purposes, so this is as critical for that branch. + */ + + RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~GDK_SUPER_MASK); + RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~GDK_HYPER_MASK); + RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~GDK_META_MASK); +#endif + snooper_id = gtk_key_snooper_install (_snooper, (gpointer) this); } @@ -195,7 +226,7 @@ Keyboard::get_state (void) int Keyboard::set_state (const XMLNode& node, int /*version*/) { - const XMLProperty* prop; + XMLProperty const * prop; if ((prop = node.property ("copy-modifier")) != 0) { sscanf (prop->value().c_str(), "%d", &CopyModifier); @@ -242,6 +273,7 @@ Keyboard::_snooper (GtkWidget *widget, GdkEventKey *event, gpointer data) return ((Keyboard *) data)->snooper (widget, event); } + gint Keyboard::snooper (GtkWidget *widget, GdkEventKey *event) { @@ -251,9 +283,9 @@ Keyboard::snooper (GtkWidget *widget, GdkEventKey *event) DEBUG_TRACE ( DEBUG::Keyboard, string_compose ( - "Snoop widget %1 name: [%6] key %2 type %3 state %4 magic %5\n", + "Snoop widget %1 name: [%6] key %2 [%8] type %3 state %4 [%7] magic %5\n", widget, event->keyval, event->type, event->state, _some_magic_widget_has_focus, - gtk_widget_get_name (widget) + gtk_widget_get_name (widget), show_gdk_event_state (event->state), gdk_keyval_name (event->keyval) ) ); @@ -290,6 +322,10 @@ Keyboard::snooper (GtkWidget *widget, GdkEventKey *event) prevent auto-repeat events. */ +#if 0 + /* August 2015: we don't have any release bindings + */ + for (map::iterator k = release_keys.begin(); k != release_keys.end(); ++k) { const AccelKey& ak (k->first); @@ -300,32 +336,7 @@ Keyboard::snooper (GtkWidget *widget, GdkEventKey *event) break; } } - } - - } else if (event->type == GDK_KEY_RELEASE) { - - State::iterator i; - - if ((i = find (state.begin(), state.end(), keyval)) != state.end()) { - state.erase (i); - sort (state.begin(), state.end()); - } - - for (map::iterator k = release_keys.begin(); k != release_keys.end(); ++k) { - - const AccelKey& ak (k->first); - two_strings ts (k->second); - - 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(); - DEBUG_TRACE (DEBUG::Keyboard, string_compose ("Use repeat, suppress other\n", ts.first, ts.second)); - ret = true; - } - break; - } +#endif } } @@ -354,9 +365,37 @@ Keyboard::close_current_dialog () if (current_window) { current_window->hide (); current_window = 0; + + if (pre_dialog_active_window) { + pre_dialog_active_window->present (); + pre_dialog_active_window = 0; + } } } +bool +Keyboard::catch_user_event_for_pre_dialog_focus (GdkEvent* ev, Gtk::Window* w) +{ + switch (ev->type) { + case GDK_BUTTON_PRESS: + case GDK_BUTTON_RELEASE: + case GDK_KEY_PRESS: + case GDK_KEY_RELEASE: + pre_dialog_active_window = w; + break; + + case GDK_FOCUS_CHANGE: + if (ev->focus_change.in) { + pre_dialog_active_window = w; + } + break; + + default: + break; + } + return false; +} + bool Keyboard::key_is_down (uint32_t keyval) { @@ -391,6 +430,7 @@ Keyboard::leave_window (GdkEventCrossing *ev, Gtk::Window* /*win*/) current_window = 0; } } else { + DEBUG_TRACE (DEBUG::Keyboard, "LEAVE window without event\n"); current_window = 0; } @@ -412,7 +452,9 @@ Keyboard::focus_out_window (GdkEventFocus * ev, Gtk::Window* win) state.clear (); current_window = 0; } else { - current_window = 0; + if (win == current_window) { + current_window = 0; + } } DEBUG_TRACE (DEBUG::Keyboard, string_compose ("Foucusing out window, title = %1\n", win->get_title())); @@ -506,7 +548,7 @@ Keyboard::is_insert_note_event (GdkEventButton *ev) bool Keyboard::is_button2_event (GdkEventButton* ev) { -#ifdef GTKOSX +#ifdef __APPLE__ return (ev->button == 2) || ((ev->button == 1) && ((ev->state & Keyboard::button2_modifiers) == Keyboard::button2_modifiers)); @@ -569,17 +611,19 @@ void Keyboard::save_keybindings () { if (can_save_keybindings && bindings_changed_after_save_became_legal) { - Gtk::AccelMap::save (user_keybindings_path); + /* Call to specific implementation to save bindings to path */ + store_keybindings (user_keybindings_path); } } bool -Keyboard::load_keybindings (string path) +Keyboard::load_keybindings (string const & path) { try { info << "Loading bindings from " << path << endl; - Gtk::AccelMap::load (path); + /* Call to specific implementation to load bindings from path */ + read_keybindings (path); _current_binding_name = _("Unknown"); @@ -597,41 +641,62 @@ Keyboard::load_keybindings (string path) return false; } - /* now find all release-driven bindings */ + return true; +} - vector groups; - vector names; - vector tooltips; - vector bindings; +int +Keyboard::read_keybindings (string const & path) +{ + XMLTree tree; - ActionManager::get_all_actions (groups, names, tooltips, bindings); + if (!tree.read (path.c_str())) { + return -1; + } - vector::iterator g; - vector::iterator b; - vector::iterator n; + /* toplevel node is "BindingSet; children are "Bindings" */ - release_keys.clear (); + XMLNodeList const& children = tree.root()->children(); - for (n = names.begin(), b = bindings.begin(), g = groups.begin(); n != names.end(); ++n, ++b, ++g) { - stringstream s; - s << "Action: " << *n << " Group: " << *g << " Binding: "; + for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) { + XMLNode const * child = *i; + if (child->name() == X_("Bindings")) { + XMLProperty const* name = child->property (X_("name")); + if (!name) { + warning << _("Keyboard binding found without a name") << endmsg; + continue; + } - 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"; - } + Bindings* b = new Bindings (name->value()); + b->load (**i); + } + } + + return 0; +} + +int +Keyboard::store_keybindings (string const & path) +{ + XMLNode* node = new XMLNode (X_("BindingSet")); + XMLNode* bnode; + int ret = 0; - DEBUG_TRACE (DEBUG::Bindings, s.str ()); + for (list::const_iterator b = Bindings::bindings.begin(); b != Bindings::bindings.end(); ++b) { + bnode = new XMLNode (X_("Bindings")); + bnode->add_property (X_("name"), (*b)->name()); + (*b)->save (*bnode); + node->add_child_nocopy (*bnode); } - for (n = names.begin(), b = bindings.begin(), g = groups.begin(); n != names.end(); ++n, ++b, ++g) { - if ((*b).get_mod() & Gdk::RELEASE_MASK) { - release_keys.insert (pair (*b, two_strings (*g, *n))); - } + XMLTree tree; + tree.set_root (node); /* tree now owns root and will delete it */ + + if (!tree.write (path)) { + error << string_compose (_("Cannot save key bindings to %1"), path) << endmsg; + ret = -1; } - return true; + return ret; } int @@ -651,6 +716,7 @@ Keyboard::reset_bindings () { PBD::Unwinder uw (can_save_keybindings, false); setup_keybindings (); + Bindings::associate_all (); } return 0;