move assignments out of assert() in editor_drag (thanks lincoln); change mouse mode...

[ardour.git] / gtk2_ardour / keyboard.cc

diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc
index cd9d51c164deec5bfdbeb5c777cde6a2e68cfa2b..f3542054aafad01d36673719dc2a8439e1259988 100644 (file)
--- a/gtk2_ardour/keyboard.cc
+++ b/gtk2_ardour/keyboard.cc
@@ -295,14 +295,14 @@ Keyboard::key_is_down (uint32_t keyval)
 }
 
 bool
-Keyboard::enter_window (GdkEventCrossing *ev, Gtk::Window* win)
+Keyboard::enter_window (GdkEventCrossing *, Gtk::Window* win)
 {
        current_window = win;
        return false;
 }
 
 bool
-Keyboard::leave_window (GdkEventCrossing *ev, Gtk::Window* win)
+Keyboard::leave_window (GdkEventCrossing *ev, Gtk::Window* /*win*/)
 {
        if (ev) {
                switch (ev->detail) {
@@ -447,11 +447,11 @@ Keyboard::selection_type (guint state)
 
 
 static void 
-accel_map_changed (GtkAccelMap* map,
-                  gchar* path,
-                  guint  key,
-                  GdkModifierType mod,
-                  gpointer arg)
+accel_map_changed (GtkAccelMap* /*map*/,
+                  gchar* /*path*/,
+                  guint /*key*/,
+                  GdkModifierType /*mod*/,
+                  gpointer /*arg*/)
 {
        Keyboard::keybindings_changed ();
 }
@@ -617,7 +617,7 @@ bool
 Keyboard::load_keybindings (string path)
 {
        try {
-               cerr << "loading bindings from " << path << endl;
+               cerr << "Loading bindings from " << path << endl;
 
                Gtk::AccelMap::load (path);
 
@@ -651,6 +651,24 @@ 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) {
+               
+               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;
+               }
+       }
+
        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<AccelKey,two_strings> (*b, two_strings (*g, *n)));