#ifdef __APPLE__
-uint Keyboard::PrimaryModifier = GDK_META_MASK|GDK_MOD2_MASK; // Command
+guint Keyboard::PrimaryModifier = GDK_MOD2_MASK; // Command
guint Keyboard::SecondaryModifier = GDK_CONTROL_MASK; // Control
guint Keyboard::TertiaryModifier = GDK_SHIFT_MASK; // Shift
guint Keyboard::Level4Modifier = GDK_MOD1_MASK; // Alt/Option
guint Keyboard::PrimaryModifier = GDK_CONTROL_MASK; // Control
guint Keyboard::SecondaryModifier = GDK_MOD1_MASK; // Alt/Option
guint Keyboard::TertiaryModifier = GDK_SHIFT_MASK; // Shift
-guint Keyboard::Level4Modifier = GDK_MOD4_MASK; // Mod4/Windows
+guint Keyboard::Level4Modifier = GDK_MOD4_MASK|GDK_SUPER_MASK; // Mod4/Windows
guint Keyboard::CopyModifier = GDK_CONTROL_MASK;
guint Keyboard::RangeSelectModifier = GDK_SHIFT_MASK;
guint Keyboard::button2_modifiers = 0; /* not used */
/* set this to initially contain the modifiers we care about, then track changes in ::set_edit_modifier() etc. */
GdkModifierType Keyboard::RelevantModifierKeyMask;
+sigc::signal0<void> Keyboard::RelevantModifierKeysChanged;
void
Keyboard::magic_widget_grab_focus ()
_current_binding_name = _("Unknown");
}
- RelevantModifierKeyMask = (GdkModifierType) gtk_accelerator_get_default_mod_mask ();
-
- RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | PrimaryModifier);
- RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | SecondaryModifier);
- RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | TertiaryModifier);
- RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | Level4Modifier);
- RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | CopyModifier);
- RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | RangeSelectModifier);
-
- gtk_accelerator_set_default_mod_mask (RelevantModifierKeyMask);
-
-#ifdef __APPLE__
- /* Remove SUPER,HYPER,META.
- *
- * GTK on OS X adds META when Command is pressed for various indefensible reasons, since
- * it also uses MOD2 to indicate Command. Our code assumes that each
- * modifier (Primary, Secondary etc.) is represented by a single bit in
- * the modifier mask, but GTK's (STUPID) design uses two (MOD2 + META)
- * to represent the Command key. Some discussion about this is here:
- * https://bugzilla.gnome.org/show_bug.cgi?id=692597
- *
- * We cannot do this until AFTER we told GTK what the default modifier
- * was, because otherwise it will fail to recognize MOD2-META-<key> as
- * an accelerator.
- *
- * Note that in the tabbed branch, we no longer use GTK accelerators
- * for functional purposes, so this is as critical for that branch.
- */
-
- RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~GDK_SUPER_MASK);
- RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~GDK_HYPER_MASK);
- RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~GDK_META_MASK);
-#endif
+ reset_relevant_modifier_key_mask();
snooper_id = gtk_key_snooper_install (_snooper, (gpointer) this);
}
Keyboard::get_state (void)
{
XMLNode* node = new XMLNode ("Keyboard");
- char buf[32];
-
- snprintf (buf, sizeof (buf), "%d", CopyModifier);
- node->add_property ("copy-modifier", buf);
- snprintf (buf, sizeof (buf), "%d", edit_but);
- node->add_property ("edit-button", buf);
- snprintf (buf, sizeof (buf), "%d", edit_mod);
- node->add_property ("edit-modifier", buf);
- snprintf (buf, sizeof (buf), "%d", delete_but);
- node->add_property ("delete-button", buf);
- snprintf (buf, sizeof (buf), "%d", delete_mod);
- node->add_property ("delete-modifier", buf);
- snprintf (buf, sizeof (buf), "%d", snap_mod);
- node->add_property ("snap-modifier", buf);
- snprintf (buf, sizeof (buf), "%d", snap_delta_mod);
- node->add_property ("snap-delta-modifier", buf);
- snprintf (buf, sizeof (buf), "%d", insert_note_but);
- node->add_property ("insert-note-button", buf);
- snprintf (buf, sizeof (buf), "%d", insert_note_mod);
- node->add_property ("insert-note-modifier", buf);
+
+ node->set_property ("copy-modifier", CopyModifier);
+ node->set_property ("edit-button", edit_but);
+ node->set_property ("edit-modifier", edit_mod);
+ node->set_property ("delete-button", delete_but);
+ node->set_property ("delete-modifier", delete_mod);
+ node->set_property ("snap-modifier", snap_mod);
+ node->set_property ("snap-delta-modifier", snap_delta_mod);
+ node->set_property ("insert-note-button", insert_note_but);
+ node->set_property ("insert-note-modifier", insert_note_mod);
return *node;
}
int
Keyboard::set_state (const XMLNode& node, int /*version*/)
{
- XMLProperty const * prop;
-
- if ((prop = node.property ("copy-modifier")) != 0) {
- sscanf (prop->value().c_str(), "%d", &CopyModifier);
- }
-
- if ((prop = node.property ("edit-button")) != 0) {
- sscanf (prop->value().c_str(), "%d", &edit_but);
- }
-
- if ((prop = node.property ("edit-modifier")) != 0) {
- sscanf (prop->value().c_str(), "%d", &edit_mod);
- }
-
- if ((prop = node.property ("delete-button")) != 0) {
- sscanf (prop->value().c_str(), "%d", &delete_but);
- }
-
- if ((prop = node.property ("delete-modifier")) != 0) {
- sscanf (prop->value().c_str(), "%d", &delete_mod);
- }
-
- if ((prop = node.property ("snap-modifier")) != 0) {
- sscanf (prop->value().c_str(), "%d", &snap_mod);
- }
-
- if ((prop = node.property ("snap-delta-modifier")) != 0) {
- sscanf (prop->value().c_str(), "%d", &snap_delta_mod);
- }
-
- if ((prop = node.property ("insert-note-button")) != 0) {
- sscanf (prop->value().c_str(), "%d", &insert_note_but);
- }
-
- if ((prop = node.property ("insert-note-modifier")) != 0) {
- sscanf (prop->value().c_str(), "%d", &insert_note_mod);
- }
+ node.get_property ("copy-modifier", CopyModifier);
+ node.get_property ("edit-button", edit_but);
+ node.get_property ("edit-modifier", edit_mod);
+ node.get_property ("delete-button", delete_but);
+ node.get_property ("delete-modifier", delete_mod);
+ node.get_property ("snap-modifier", snap_mod);
+ node.get_property ("snap-delta-modifier", snap_delta_mod);
+ node.get_property ("insert-note-button", insert_note_but);
+ node.get_property ("insert-note-modifier", insert_note_mod);
return 0;
}
}
}
- /* Special keys that we want to handle in
- any dialog, no matter whether it uses
- the regular set of accelerators or not
- */
+ if (event->type == GDK_KEY_RELEASE) {
+
+ State::iterator k = find (state.begin(), state.end(), keyval);
+
+ if (k != state.end()) {
+ /* this cannot change the ordering, so need to sort */
+ state.erase (k);
+ if (state.empty()) {
+ DEBUG_TRACE (DEBUG::Keyboard, "no keys down\n");
+ } else {
+#ifndef NDEBUG
+ if (DEBUG_ENABLED(DEBUG::Keyboard)) {
+ DEBUG_STR_DECL(a);
+ DEBUG_STR_APPEND(a, "keyboard, keys still down: ");
+ for (State::iterator i = state.begin(); i != state.end(); ++i) {
+ DEBUG_STR_APPEND(a, gdk_keyval_name (*i));
+ DEBUG_STR_APPEND(a, ',');
+ }
+ DEBUG_STR_APPEND(a, '\n');
+ DEBUG_TRACE (DEBUG::Keyboard, DEBUG_STR(a).str());
+ }
+#endif /* NDEBUG */
+ }
+ }
+
+ if (modifier_state_equals (event->state, PrimaryModifier)) {
- if (event->type == GDK_KEY_RELEASE && modifier_state_equals (event->state, PrimaryModifier)) {
- switch (event->keyval) {
- case GDK_w:
- close_current_dialog ();
- ret = true;
- break;
+ /* Special keys that we want to handle in
+ any dialog, no matter whether it uses
+ the regular set of accelerators or not
+ */
+
+ switch (event->keyval) {
+ case GDK_w:
+ close_current_dialog ();
+ ret = true;
+ break;
+ }
}
}
return ret;
}
+void
+Keyboard::reset_relevant_modifier_key_mask ()
+{
+ RelevantModifierKeyMask = (GdkModifierType) gtk_accelerator_get_default_mod_mask ();
+
+ RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | PrimaryModifier);
+ RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | SecondaryModifier);
+ RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | TertiaryModifier);
+ RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | Level4Modifier);
+ RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | CopyModifier);
+ RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | RangeSelectModifier);
+
+ gtk_accelerator_set_default_mod_mask (RelevantModifierKeyMask);
+
+ RelevantModifierKeysChanged(); /* EMIT SIGNAL */
+}
+
void
Keyboard::close_current_dialog ()
{
void
Keyboard::set_edit_modifier (guint mod)
{
- RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~edit_mod);
edit_mod = mod;
- RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | edit_mod);
+ reset_relevant_modifier_key_mask();
}
void
void
Keyboard::set_delete_modifier (guint mod)
{
- RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~delete_mod);
delete_mod = mod;
- RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | delete_mod);
+ reset_relevant_modifier_key_mask();
}
void
void
Keyboard::set_insert_note_modifier (guint mod)
{
- RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~insert_note_mod);
insert_note_mod = mod;
- RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | insert_note_mod);
+ reset_relevant_modifier_key_mask();
}
void
Keyboard::set_modifier (uint32_t newval, uint32_t& var)
{
- RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~var);
var = newval;
- RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | var);
+ reset_relevant_modifier_key_mask();
}
void
Keyboard::set_snap_modifier (guint mod)
{
- RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~snap_mod);
snap_mod = mod;
- RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | snap_mod);
+ reset_relevant_modifier_key_mask();
}
void
Keyboard::set_snap_delta_modifier (guint mod)
{
- RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask & ~snap_delta_mod);
snap_delta_mod = mod;
- RelevantModifierKeyMask = GdkModifierType (RelevantModifierKeyMask | snap_delta_mod);
+ reset_relevant_modifier_key_mask();
}
bool
for (list<Bindings*>::const_iterator b = Bindings::bindings.begin(); b != Bindings::bindings.end(); ++b) {
bnode = new XMLNode (X_("Bindings"));
- bnode->add_property (X_("name"), (*b)->name());
+ bnode->set_property (X_("name"), (*b)->name());
(*b)->save (*bnode);
node->add_child_nocopy (*bnode);
}
{
PBD::Unwinder<bool> uw (can_save_keybindings, false);
+ Bindings::reset_bindings ();
setup_keybindings ();
Bindings::associate_all ();
}
projects / ardour.git / blobdiff