merge from 2.0-ongoing @ 3581

[ardour.git] / gtk2_ardour / keyboard.h

diff --git a/gtk2_ardour/keyboard.h b/gtk2_ardour/keyboard.h
index de2a0929ed4c50dcb74600cdcde7b526fed9d37c..e6d5065e86e758a5744cdb9938720f22c951fa95 100644 (file)
--- a/gtk2_ardour/keyboard.h
+++ b/gtk2_ardour/keyboard.h
@@ -20,18 +20,19 @@
 #ifndef __ardour_keyboard_h__
 #define __ardour_keyboard_h__
 
+#include <map>
 #include <vector>
 #include <string>
 
 #include <sigc++/signal.h>
 #include <gtk/gtk.h>
+#include <gtkmm/accelkey.h>
 
 #include <ardour/types.h>
 #include <pbd/stateful.h>
 
 #include "selection.h"
 
-using std::vector;
 using std::string;
 
 class Keyboard : public sigc::trackable, PBD::Stateful
@@ -43,7 +44,7 @@ class Keyboard : public sigc::trackable, PBD::Stateful
        XMLNode& get_state (void);
        int set_state (const XMLNode&);
 
-       typedef vector<uint32_t> State;
+       typedef std::vector<uint32_t> State;
        typedef uint32_t ModifierMask;
 
        static uint32_t PrimaryModifier;
@@ -114,12 +115,23 @@ class Keyboard : public sigc::trackable, PBD::Stateful
        static void magic_widget_drop_focus ();
 
        static void setup_keybindings ();
+       static void keybindings_changed ();
        static void save_keybindings ();
        static bool load_keybindings (std::string path);
        static void set_can_save_keybindings (bool yn);
        static std::string current_binding_name () { return _current_binding_name; }
        static std::map<std::string,std::string> binding_files;
 
+       struct AccelKeyLess {
+           bool operator() (const Gtk::AccelKey a, const Gtk::AccelKey b) const {
+                   if (a.get_key() != b.get_key()) {
+                           return a.get_key() < b.get_key();
+                   } else {
+                           return a.get_mod() < b.get_mod();
+                   }
+           }
+       };
+
   private:
        static Keyboard* _the_keyboard;
 
@@ -134,8 +146,13 @@ class Keyboard : public sigc::trackable, PBD::Stateful
        static Gtk::Window* current_window;
        static std::string user_keybindings_path;
        static bool can_save_keybindings;
+       static bool bindings_changed_after_save_became_legal;
        static std::string _current_binding_name;
 
+       typedef std::pair<std::string,std::string> two_strings;
+
+       static std::map<Gtk::AccelKey,two_strings,AccelKeyLess> release_keys;
+
        static gint _snooper (GtkWidget*, GdkEventKey*, gpointer);
        gint snooper (GtkWidget*, GdkEventKey*);