diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2005-11-23 04:13:32 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2005-11-23 04:13:32 +0000 |
commit | fb45ffea71d345ced0cfbb12b9dcd89ecb1e8dbf (patch) | |
tree | b82e8a70ce8e88212d63e4a5a4827c5363d3d299 /gtk2_ardour/keyboard.h | |
parent | bac3c6bc0f36623e200fe30fc8cc4137ab96fba7 (diff) |
strip keyboard.cc of noxious focus handling stuff, and cleanup
git-svn-id: svn://localhost/trunk/ardour2@106 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/keyboard.h')
-rw-r--r-- | gtk2_ardour/keyboard.h | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/gtk2_ardour/keyboard.h b/gtk2_ardour/keyboard.h index 1b81f710f8..8e1c0f1b93 100644 --- a/gtk2_ardour/keyboard.h +++ b/gtk2_ardour/keyboard.h @@ -33,9 +33,6 @@ using std::vector; using std::string; -class KeyboardTarget; -class ArdourDialog; - class Keyboard : public sigc::trackable, Stateful { public: @@ -47,24 +44,12 @@ class Keyboard : public sigc::trackable, Stateful typedef vector<uint32_t> State; - void set_target (KeyboardTarget *); - void set_default_target (KeyboardTarget *); - void allow_focus (bool); - - gint focus_in_handler (GdkEventFocus*); - gint focus_out_handler (GdkEventFocus*); - 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); - void register_target (KeyboardTarget *); - - void set_current_dialog (ArdourDialog*); - void close_current_dialog (); - typedef uint32_t ModifierMask; static uint32_t Control; @@ -80,6 +65,9 @@ class Keyboard : public sigc::trackable, Stateful return (ev->state & RelevantModifierKeyMask) == 0; } + bool leave_window (GdkEventCrossing *ev); + bool enter_window (GdkEventCrossing *ev); + static bool modifier_state_contains (guint state, ModifierMask); static bool modifier_state_equals (guint state, ModifierMask); @@ -111,21 +99,15 @@ class Keyboard : public sigc::trackable, Stateful bool _queue_events; bool _flush_queue; - guint32 playback_ignore_count; guint snooper_id; State state; - KeyboardTarget* target; - KeyboardTarget* default_target; - bool focus_allowed; bool collecting_prefix; string current_prefix; int* modifier_masks; int modifier_mask; int min_keycode; int max_keycode; - ArdourDialog* current_dialog; - std::vector<ArdourDialog*> known_dialogs; static guint edit_but; static guint edit_mod; @@ -136,16 +118,10 @@ class Keyboard : public sigc::trackable, Stateful static gint _snooper (GtkWidget*, GdkEventKey*, gpointer); gint snooper (GtkWidget*, GdkEventKey*); - void maybe_unset_target (KeyboardTarget *); void queue_event (GdkEventKey*); - void playback_queue (); - void clear_queue (); void get_modifier_masks (); void check_modifier_state (); void clear_modifier_state (); - gint enter_window (GdkEventCrossing*, KeyboardTarget*); - gint leave_window (GdkEventCrossing*); - gint current_dialog_vanished (GdkEventAny*); void check_meta_numlock (char keycode, guint mod, string modname); }; |