Make exact beat calculation of tempi a bit less cumbersome. Move tempi on an audio...

[ardour.git] / libs / gtkmm2ext / keyboard.cc

diff --git a/libs/gtkmm2ext/keyboard.cc b/libs/gtkmm2ext/keyboard.cc
index 1b3f661e60e6aaaf731bf1fe2fefaa65765978c6..08b0393d49aab0b6c9103aee7d3dba27687beb15 100644 (file)
--- a/libs/gtkmm2ext/keyboard.cc
+++ b/libs/gtkmm2ext/keyboard.cc
@@ -57,9 +57,9 @@ 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
+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
@@ -111,8 +111,8 @@ bool Keyboard::can_save_keybindings = false;
 bool Keyboard::bindings_changed_after_save_became_legal = false;
 map<string,string> Keyboard::binding_files;
 string Keyboard::_current_binding_name;
+string Keyboard::binding_filename_suffix = X_(".keys");
 Gtk::Window* Keyboard::pre_dialog_active_window = 0;
-PBD::Signal0<void> Keyboard::BindingsChanged;
 
 /* set this to initially contain the modifiers we care about, then track changes in ::set_edit_modifier() etc. */
 GdkModifierType Keyboard::RelevantModifierKeyMask;
@@ -215,7 +215,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);
@@ -372,7 +372,7 @@ Keyboard::snooper (GtkWidget *widget, GdkEventKey *event)
 #if 0
                        /* August 2015: we don't have any release bindings
                         */
-                       
+
                        for (map<AccelKey,two_strings,AccelKeyLess>::iterator k = release_keys.begin(); k != release_keys.end(); ++k) {
 
                                const AccelKey& ak (k->first);
@@ -477,6 +477,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;
        }
 
@@ -498,7 +499,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()));
@@ -592,7 +595,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));
@@ -643,7 +646,6 @@ Keyboard::keybindings_changed ()
        }
 
        Keyboard::save_keybindings ();
-       BindingsChanged (); /* EMIT SIGNAL */
 }
 
 void
@@ -669,7 +671,7 @@ Keyboard::load_keybindings (string const & path)
 
                /* Call to specific implementation to load bindings from path */
                read_keybindings (path);
-               
+
                _current_binding_name = _("Unknown");
 
                for (map<string,string>::iterator x = binding_files.begin(); x != binding_files.end(); ++x) {
@@ -699,22 +701,23 @@ Keyboard::read_keybindings (string const & path)
        }
 
        /* toplevel node is "BindingSet; children are "Bindings" */
-       
+
        XMLNodeList const& children = tree.root()->children();
 
        for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) {
-               if ((*i)->name() == X_("Bindings")) {
-                       XMLProperty const* name = (*i)->property (X_("name"));
+               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;
                        }
-                       
+
                        Bindings* b = new Bindings (name->value());
                        b->load (**i);
                }
         }
-       
+
        return 0;
 }
 
@@ -739,7 +742,7 @@ Keyboard::store_keybindings (string const & path)
                error << string_compose (_("Cannot save key bindings to %1"), path) << endmsg;
                ret = -1;
        }
-       
+
        return ret;
 }