X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fkeyboard.h;h=6a689567e54e67b4b6d8468052f682b91fce00ba;hb=18f465393b29c98904a2140132131950963c36b1;hp=fb22f2eca9d9bef1868ee893ba876f483948d489;hpb=f7f9d6fdc40248b190ec9c6e1a886261d55777ae;p=ardour.git

diff --git a/gtk2_ardour/keyboard.h b/gtk2_ardour/keyboard.h
index fb22f2eca9..6a689567e5 100644
--- a/gtk2_ardour/keyboard.h
+++ b/gtk2_ardour/keyboard.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2001 Paul Davis 
+    Copyright (C) 2001 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -20,97 +20,23 @@
 #ifndef __ardour_keyboard_h__
 #define __ardour_keyboard_h__
 
-#include <vector>
-#include <string>
-
-#include <sigc++/signal.h>
-#include <gtk/gtk.h>
-
-#include <ardour/types.h>
-#include <pbd/stateful.h>
+#include "ardour/types.h"
+#include "gtkmm2ext/keyboard.h"
 
 #include "selection.h"
 
-using std::vector;
-using std::string;
+class ARDOUR_UI;
 
-class Keyboard : public sigc::trackable, PBD::Stateful
+class ArdourKeyboard : public Gtkmm2ext::Keyboard
 {
   public:
-	Keyboard ();
-	~Keyboard ();
-
-	XMLNode& get_state (void);
-	int set_state (const XMLNode&);
-
-	typedef vector<uint32_t> State;
-	typedef uint32_t ModifierMask;
-
-	static uint32_t Control;
-	static uint32_t Shift;
-	static uint32_t Alt;
-	static uint32_t Meta;
-
-	bool key_is_down (uint32_t keyval);
+	ArdourKeyboard(ARDOUR_UI& ardour_ui) : ui(ardour_ui) {}
 
-	static GdkModifierType RelevantModifierKeyMask;
-
-	static bool no_modifier_keys_pressed(GdkEventButton* ev) {
-		return (ev->state & RelevantModifierKeyMask) == 0;
-	}
-
-	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);
+	void setup_keybindings ();
 
 	static Selection::Operation selection_type (guint state);
 
-	static bool no_modifiers_active (guint state);
-
-	static void set_meta_modifier (guint);
-
-	static void set_snap_modifier (guint);
-	static ModifierMask snap_modifier () { return ModifierMask (snap_mod); }
-
-	static guint edit_button() { return edit_but; }
-	static void set_edit_button (guint);
-	static guint edit_modifier() { return edit_mod; }
-	static void set_edit_modifier(guint);
-
-	static guint delete_button() { return delete_but; }
-	static void set_delete_button(guint);
-	static guint delete_modifier() { return delete_mod; }
-	static void set_delete_modifier(guint);
-
-	static bool is_edit_event (GdkEventButton*);
-	static bool is_delete_event (GdkEventButton*);
-	static bool is_context_menu_event (GdkEventButton*);
-
-	static Keyboard& the_keyboard() { return *_the_keyboard; }
-
-	static bool some_magic_widget_has_focus ();
-	static void magic_widget_grab_focus ();
-	static void magic_widget_drop_focus ();
-
-  private:
-	static Keyboard* _the_keyboard;
-
-	guint           snooper_id;
-	State           state;
-
-	static guint     edit_but;
-	static guint     edit_mod;
-	static guint     delete_but;
-	static guint     delete_mod;
-	static guint     snap_mod;
-	static Gtk::Window* current_window;
-
-	static gint _snooper (GtkWidget*, GdkEventKey*, gpointer);
-	gint snooper (GtkWidget*, GdkEventKey*);
-
-	static bool _some_magic_widget_has_focus;
+	ARDOUR_UI& ui;
 };
 
 #endif /* __ardour_keyboard_h__ */