Merge branch 'master' into cairocanvas

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

diff --git a/libs/gtkmm2ext/gtkmm2ext/keyboard.h b/libs/gtkmm2ext/gtkmm2ext/keyboard.h
index db5f9ef3de579c060f07666c7caa4e7de417e192..2c6b026a424f73a6d79a32bf851efef009adcc3c 100644 (file)
--- a/libs/gtkmm2ext/gtkmm2ext/keyboard.h
+++ b/libs/gtkmm2ext/gtkmm2ext/keyboard.h
@@ -56,6 +56,13 @@ class Keyboard : public sigc::trackable, PBD::Stateful
        static uint32_t Level4Modifier;
        static uint32_t CopyModifier;
        static uint32_t RangeSelectModifier;
+       static uint32_t GainFineScaleModifier;
+       static uint32_t GainExtraFineScaleModifier;
+
+       // Modifiers for scroll wheel
+       static uint32_t ScrollZoomVerticalModifier;
+       static uint32_t ScrollZoomHorizontalModifier;
+       static uint32_t ScrollHorizontalModifier;
 
        static const char* primary_modifier_name ();
        static const char* secondary_modifier_name ();
@@ -91,6 +98,10 @@ class Keyboard : public sigc::trackable, PBD::Stateful
                return (ev->state & RelevantModifierKeyMask) == 0;
        }
 
+       static bool no_modifier_keys_pressed(GdkEventKey* ev) {
+               return (ev->state & RelevantModifierKeyMask) == 0;
+       }
+
        bool leave_window (GdkEventCrossing *ev, Gtk::Window*);
        bool enter_window (GdkEventCrossing *ev, Gtk::Window*);
 
@@ -134,6 +145,8 @@ class Keyboard : public sigc::trackable, PBD::Stateful
        static void magic_widget_grab_focus ();
        static void magic_widget_drop_focus ();
 
+       static void close_current_dialog ();
+
        static void keybindings_changed ();
        static void save_keybindings ();
        static bool load_keybindings (std::string path);
@@ -151,6 +164,8 @@ class Keyboard : public sigc::trackable, PBD::Stateful
            }
        };
 
+       sigc::signal0<void> ZoomVerticalModifierReleased;
+
   protected:
        static Keyboard* _the_keyboard;