another redirect dialog fix

[ardour.git] / gtk2_ardour / keyboard.h

diff --git a/gtk2_ardour/keyboard.h b/gtk2_ardour/keyboard.h
index 8e1c0f1b939ff3cfe21d40445d23f497c39cbc83..ec55dc54db7e4ddd111fb3a983c7d1fc031211be 100644 (file)
--- a/gtk2_ardour/keyboard.h
+++ b/gtk2_ardour/keyboard.h
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __ardour_keyboard_h__
@@ -28,7 +27,9 @@
 #include <gtk/gtk.h>
 
 #include <ardour/types.h>
-#include <ardour/stateful.h>
+#include <pbd/stateful.h>
+
+#include "selection.h"
 
 using std::vector;
 using std::string;
@@ -43,13 +44,6 @@ class Keyboard : public sigc::trackable, Stateful
        int set_state (const XMLNode&);
 
        typedef vector<uint32_t> State;
-       
-       int  get_prefix(float&, bool& was_floating);
-       void start_prefix ();
-
-       static State  translate_key_name (const string&);
-       static string get_real_keyname (const string& name);
-
        typedef uint32_t ModifierMask;
 
        static uint32_t Control;
@@ -65,12 +59,14 @@ class Keyboard : public sigc::trackable, Stateful
                return (ev->state & RelevantModifierKeyMask) == 0;
        }
 
-       bool leave_window (GdkEventCrossing *ev);
-       bool enter_window (GdkEventCrossing *ev);
+       bool leave_window (GdkEventCrossing *ev, Gtk::Window*);
+       bool enter_window (GdkEventCrossing *ev, Gtk::Window*);
 
        static bool modifier_state_contains (guint state, ModifierMask);
        static bool modifier_state_equals   (guint state, ModifierMask);
 
+       static Selection::Operation selection_type (guint state);
+
        static bool no_modifiers_active (guint state);
 
        static void set_meta_modifier (guint);
@@ -97,17 +93,8 @@ class Keyboard : public sigc::trackable, Stateful
   private:
        static Keyboard* _the_keyboard;
 
-       bool   _queue_events;
-       bool   _flush_queue;
-
        guint           snooper_id;
        State           state;
-       bool            collecting_prefix;
-       string          current_prefix;
-       int*            modifier_masks;
-       int             modifier_mask;
-       int             min_keycode;
-       int             max_keycode;
 
        static guint     edit_but;
        static guint     edit_mod;
@@ -117,13 +104,6 @@ class Keyboard : public sigc::trackable, Stateful
 
        static gint _snooper (GtkWidget*, GdkEventKey*, gpointer);
        gint snooper (GtkWidget*, GdkEventKey*);
-       
-       void queue_event (GdkEventKey*);
-       void get_modifier_masks ();
-       void check_modifier_state ();
-       void clear_modifier_state ();
-
-       void check_meta_numlock (char keycode, guint mod, string modname);
 };
 
 #endif /* __ardour_keyboard_h__ */