X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fgtkmm2ext%2Fkeyboard.cc;h=569db5e1a8bd066774c1ea913498c8a04c00595b;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=5087f61a237480f3359f0213fddb92f8ec13096e;hpb=1da655c2eb41816f6bf13134fc950dee9dd99aaa;p=ardour.git diff --git a/libs/gtkmm2ext/keyboard.cc b/libs/gtkmm2ext/keyboard.cc index 5087f61a23..569db5e1a8 100644 --- a/libs/gtkmm2ext/keyboard.cc +++ b/libs/gtkmm2ext/keyboard.cc @@ -20,27 +20,30 @@ #include #include -#include -#include - +#include #include +#include "pbd/gstdio_compat.h" + #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" +#include "gtkmm2ext/bindings.h" +#include "gtkmm2ext/keyboard.h" #include "gtkmm2ext/debug.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace PBD; using namespace Gtk; @@ -53,11 +56,10 @@ guint Keyboard::delete_but = 3; 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; -#ifdef GTKOSX +#ifdef __APPLE__ -uint Keyboard::PrimaryModifier = GDK_MOD2_MASK; // Command +uint Keyboard::PrimaryModifier = GDK_META_MASK|GDK_MOD2_MASK; // Command guint Keyboard::SecondaryModifier = GDK_CONTROL_MASK; // Control guint Keyboard::TertiaryModifier = GDK_SHIFT_MASK; // Shift guint Keyboard::Level4Modifier = GDK_MOD1_MASK; // Alt/Option @@ -69,8 +71,14 @@ 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; #else @@ -85,9 +93,15 @@ 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; #endif @@ -98,7 +112,6 @@ guint Keyboard::ScrollZoomVerticalModifier = Keyboard::SecondaryModifier; guint Keyboard::ScrollZoomHorizontalModifier = Keyboard::PrimaryModifier; guint Keyboard::ScrollHorizontalModifier = Keyboard::TertiaryModifier; - Keyboard* Keyboard::_the_keyboard = 0; Gtk::Window* Keyboard::current_window = 0; bool Keyboard::_some_magic_widget_has_focus = false; @@ -108,10 +121,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 @@ -150,6 +163,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); } @@ -164,6 +200,8 @@ Keyboard::get_state (void) XMLNode* node = new XMLNode ("Keyboard"); char buf[32]; + snprintf (buf, sizeof (buf), "%d", CopyModifier); + node->add_property ("copy-modifier", buf); snprintf (buf, sizeof (buf), "%d", edit_but); node->add_property ("edit-button", buf); snprintf (buf, sizeof (buf), "%d", edit_mod); @@ -174,6 +212,8 @@ 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", insert_note_but); node->add_property ("insert-note-button", buf); snprintf (buf, sizeof (buf), "%d", insert_note_mod); @@ -185,7 +225,11 @@ 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); + } if ((prop = node.property ("edit-button")) != 0) { sscanf (prop->value().c_str(), "%d", &edit_but); @@ -207,6 +251,10 @@ 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 ("insert-note-button")) != 0) { sscanf (prop->value().c_str(), "%d", &insert_note_but); } @@ -224,6 +272,65 @@ Keyboard::_snooper (GtkWidget *widget, GdkEventKey *event, gpointer data) return ((Keyboard *) data)->snooper (widget, event); } +static string +show_gdk_event_state (int state) +{ + string s; + if (state & GDK_SHIFT_MASK) { + s += "+SHIFT"; + } + if (state & GDK_LOCK_MASK) { + s += "+LOCK"; + } + if (state & GDK_CONTROL_MASK) { + s += "+CONTROL"; + } + if (state & GDK_MOD1_MASK) { + s += "+MOD1"; + } + if (state & GDK_MOD2_MASK) { + s += "+MOD2"; + } + if (state & GDK_MOD3_MASK) { + s += "+MOD3"; + } + if (state & GDK_MOD4_MASK) { + s += "+MOD4"; + } + if (state & GDK_MOD5_MASK) { + s += "+MOD5"; + } + if (state & GDK_BUTTON1_MASK) { + s += "+BUTTON1"; + } + if (state & GDK_BUTTON2_MASK) { + s += "+BUTTON2"; + } + if (state & GDK_BUTTON3_MASK) { + s += "+BUTTON3"; + } + if (state & GDK_BUTTON4_MASK) { + s += "+BUTTON4"; + } + if (state & GDK_BUTTON5_MASK) { + s += "+BUTTON5"; + } + if (state & GDK_SUPER_MASK) { + s += "+SUPER"; + } + if (state & GDK_HYPER_MASK) { + s += "+HYPER"; + } + if (state & GDK_META_MASK) { + s += "+META"; + } + if (state & GDK_RELEASE_MASK) { + s += "+RELEASE"; + } + + return s; +} + gint Keyboard::snooper (GtkWidget *widget, GdkEventKey *event) { @@ -233,8 +340,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 [%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), show_gdk_event_state (event->state), gdk_keyval_name (event->keyval) ) ); @@ -271,6 +379,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); @@ -281,32 +393,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 } } @@ -324,6 +411,8 @@ Keyboard::snooper (GtkWidget *widget, GdkEventKey *event) } } + DEBUG_TRACE (DEBUG::Keyboard, string_compose ("snooper returns %1\n", ret)); + return ret; } @@ -333,9 +422,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) { @@ -346,6 +463,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; } @@ -369,9 +487,35 @@ Keyboard::leave_window (GdkEventCrossing *ev, Gtk::Window* /*win*/) current_window = 0; } } else { + DEBUG_TRACE (DEBUG::Keyboard, "LEAVE window without event\n"); + current_window = 0; + } + + 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 { + if (win == current_window) { + current_window = 0; + } } + DEBUG_TRACE (DEBUG::Keyboard, string_compose ("Foucusing out window, title = %1\n", win->get_title())); + return false; } @@ -434,6 +578,14 @@ 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); +} + bool Keyboard::is_edit_event (GdkEventButton *ev) { @@ -453,7 +605,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)); @@ -516,17 +668,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"); @@ -544,40 +698,83 @@ 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; +} - DEBUG_TRACE (DEBUG::Bindings, s.str ()); +int +Keyboard::store_keybindings (string const & path) +{ + XMLNode* node = new XMLNode (X_("BindingSet")); + XMLNode* bnode; + int ret = 0; + + 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 +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 (); + Bindings::associate_all (); + } + + return 0; +}