/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * GtkAccelGroup: Accelerator manager for GtkObjects.
- * Copyright (C) 1998 Tim Janik
+ * Copyright (C) 1998, 2001 Tim Janik
*
* This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
+ * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
/*
- * Modified by the GTK+ Team and others 1997-1999. See the AUTHORS
+ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-
-#include <ctype.h>
-#include <string.h>
#include "gtkaccelgroup.h"
+#include "gtkaccelmap.h"
#include "gdk/gdkkeysyms.h"
+#include "gtkmarshalers.h"
#include "gtksignal.h"
-#include "gtkwidget.h"
-
-
-/* --- signals --- */
-typedef void (*GtkSignalAddAccelerator) (GtkObject *object,
- guint accel_signal_id,
- GtkAccelGroup *accel_group,
- guint accel_key,
- GdkModifierType accel_mods,
- GtkAccelFlags accel_flags,
- gpointer func_data);
-typedef void (*GtkSignalRemoveAccelerator) (GtkObject *object,
- GtkAccelGroup *accel_group,
- guint accel_key,
- GdkModifierType accel_mods,
- gpointer func_data);
+
+#include <string.h>
+#include <stdlib.h>
+
+
+/* --- prototypes --- */
+static void gtk_accel_group_class_init (GtkAccelGroupClass *class);
+static void gtk_accel_group_init (GtkAccelGroup *accel_group);
+static void gtk_accel_group_finalize (GObject *object);
+
/* --- variables --- */
-static GtkAccelGroup *default_accel_group = NULL;
+static GObjectClass *parent_class = NULL;
+static guint signal_accel_activate = 0;
+static guint signal_accel_changed = 0;
+static guint quark_acceleratable_groups = 0;
static guint default_accel_mod_mask = (GDK_SHIFT_MASK |
GDK_CONTROL_MASK |
GDK_MOD1_MASK);
-static const gchar *accel_groups_key = "gtk-accel-groups";
-static guint accel_groups_key_id = 0;
-static const gchar *accel_entries_key = "gtk-accel-entries";
-static guint accel_entries_key_id = 0;
-static GHashTable *accel_entry_hash_table = NULL;
-static GMemChunk *accel_tables_mem_chunk = NULL;
-static GMemChunk *accel_entries_mem_chunk = NULL;
/* --- functions --- */
-static gint
-gtk_accel_entries_equal (gconstpointer a,
- gconstpointer b)
+/**
+ * gtk_accel_group_get_type:
+ * @returns: the type ID for accelerator groups.
+ */
+GType
+gtk_accel_group_get_type (void)
{
- const GtkAccelEntry *e1;
- const GtkAccelEntry *e2;
-
- e1 = a;
- e2 = b;
-
- return ((e1->accel_group == e2->accel_group) &&
- (e1->accelerator_key == e2->accelerator_key) &&
- (e1->accelerator_mods == e2->accelerator_mods));
+ static GType object_type = 0;
+
+ if (!object_type)
+ {
+ static const GTypeInfo object_info = {
+ sizeof (GtkAccelGroupClass),
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+ (GClassInitFunc) gtk_accel_group_class_init,
+ NULL, /* clas_finalize */
+ NULL, /* class_data */
+ sizeof (GtkAccelGroup),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) gtk_accel_group_init,
+ };
+
+ object_type = g_type_register_static (G_TYPE_OBJECT,
+ "GtkAccelGroup",
+ &object_info, 0);
+ }
+
+ return object_type;
}
-static guint
-gtk_accel_entries_hash (gconstpointer a)
+static gboolean
+accel_activate_accumulator (GSignalInvocationHint *ihint,
+ GValue *return_accu,
+ const GValue *handler_return,
+ gpointer data)
{
- const GtkAccelEntry *e;
- guint h;
-
- e = a;
-
- h = (gulong) e->accel_group;
- h ^= e->accelerator_key << 16;
- h ^= e->accelerator_key >> 16;
- h ^= e->accelerator_mods;
-
- return h;
+ gboolean continue_emission;
+ gboolean handler_val;
+
+ /* handler returns whether the accelerator was handled */
+ handler_val = g_value_get_boolean (handler_return);
+
+ /* record that as result for this emission */
+ g_value_set_boolean (return_accu, handler_val);
+
+ /* don't continue if accelerator was handled */
+ continue_emission = !handler_val;
+
+ return continue_emission;
}
-GtkAccelGroup*
-gtk_accel_group_new (void)
+static void
+gtk_accel_group_class_init (GtkAccelGroupClass *class)
{
- GtkAccelGroup *accel_group;
-
- if (!accel_groups_key_id)
- {
- accel_groups_key_id = g_quark_from_static_string (accel_groups_key);
- accel_entries_key_id = g_quark_from_static_string (accel_entries_key);
-
- accel_entry_hash_table = g_hash_table_new (gtk_accel_entries_hash,
- gtk_accel_entries_equal);
-
- accel_tables_mem_chunk = g_mem_chunk_create (GtkAccelGroup, 8, G_ALLOC_AND_FREE);
- accel_entries_mem_chunk = g_mem_chunk_create (GtkAccelEntry, 64, G_ALLOC_AND_FREE);
- }
-
- accel_group = g_chunk_new (GtkAccelGroup, accel_tables_mem_chunk);
-
- accel_group->ref_count = 1;
- accel_group->lock_count = 0;
- accel_group->modifier_mask = gtk_accelerator_get_default_mod_mask ();
- accel_group->attach_objects = NULL;
-
- return accel_group;
+ GObjectClass *object_class = G_OBJECT_CLASS (class);
+
+ parent_class = g_type_class_peek_parent (class);
+
+ quark_acceleratable_groups = g_quark_from_static_string ("gtk-acceleratable-accel-groups");
+
+ object_class->finalize = gtk_accel_group_finalize;
+
+ class->accel_changed = NULL;
+ signal_accel_activate = g_signal_new ("accel_activate",
+ G_OBJECT_CLASS_TYPE (class),
+ G_SIGNAL_DETAILED,
+ 0,
+ accel_activate_accumulator, NULL,
+ _gtk_marshal_BOOLEAN__OBJECT_UINT_UINT,
+ G_TYPE_BOOLEAN, 3, G_TYPE_OBJECT, G_TYPE_UINT, G_TYPE_UINT);
+ signal_accel_changed = g_signal_new ("accel_changed",
+ G_OBJECT_CLASS_TYPE (class),
+ G_SIGNAL_RUN_FIRST | G_SIGNAL_DETAILED,
+ G_STRUCT_OFFSET (GtkAccelGroupClass, accel_changed),
+ NULL, NULL,
+ _gtk_marshal_VOID__UINT_UINT_BOXED,
+ G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_CLOSURE);
}
-GtkAccelGroup*
-gtk_accel_group_get_default (void)
+static void
+gtk_accel_group_finalize (GObject *object)
{
- if (!default_accel_group)
- default_accel_group = gtk_accel_group_new ();
+ GtkAccelGroup *accel_group = GTK_ACCEL_GROUP (object);
+ guint i;
- return default_accel_group;
+ for (i = 0; i < accel_group->n_accels; i++)
+ {
+ GtkAccelGroupEntry *entry = &accel_group->priv_accels[i];
+
+ if (entry->accel_path_quark)
+ {
+ const gchar *accel_path = g_quark_to_string (entry[i].accel_path_quark);
+
+ _gtk_accel_map_remove_group (accel_path, accel_group);
+ }
+ }
+
+ g_free (accel_group->priv_accels);
+
+ G_OBJECT_CLASS (parent_class)->finalize (object);
}
-GtkAccelGroup*
-gtk_accel_group_ref (GtkAccelGroup *accel_group)
+static void
+gtk_accel_group_init (GtkAccelGroup *accel_group)
{
- g_return_val_if_fail (accel_group != NULL, NULL);
-
- accel_group->ref_count += 1;
-
- return accel_group;
+ accel_group->lock_count = 0;
+ accel_group->modifier_mask = gtk_accelerator_get_default_mod_mask ();
+ accel_group->acceleratables = NULL;
+ accel_group->n_accels = 0;
+ accel_group->priv_accels = NULL;
}
-void
-gtk_accel_group_unref (GtkAccelGroup *accel_group)
+/**
+ * gtk_accel_group_new:
+ * @returns: a new #GtkAccelGroup object
+ *
+ * Creates a new #GtkAccelGroup.
+ */
+GtkAccelGroup*
+gtk_accel_group_new (void)
{
- g_return_if_fail (accel_group != NULL);
- g_return_if_fail (accel_group->ref_count > 0);
-
- accel_group->ref_count -= 1;
- if (accel_group->ref_count == 0)
- {
- g_return_if_fail (accel_group != default_accel_group);
- g_return_if_fail (accel_group->attach_objects == NULL);
-
- g_chunk_free (accel_group, accel_tables_mem_chunk);
- }
+ return g_object_new (GTK_TYPE_ACCEL_GROUP, NULL);
}
static void
-gtk_accel_group_object_destroy (GtkObject *object)
+accel_group_weak_ref_detach (GSList *free_list,
+ GObject *stale_object)
{
- GSList *free_list, *slist;
-
- free_list = gtk_object_get_data_by_id (object, accel_groups_key_id);
- gtk_object_set_data_by_id (object, accel_groups_key_id, NULL);
+ GSList *slist;
for (slist = free_list; slist; slist = slist->next)
{
GtkAccelGroup *accel_group;
accel_group = slist->data;
- accel_group->attach_objects = g_slist_remove (accel_group->attach_objects, object);
- gtk_accel_group_unref (accel_group);
+ accel_group->acceleratables = g_slist_remove (accel_group->acceleratables, stale_object);
+ g_object_unref (accel_group);
}
g_slist_free (free_list);
}
void
-gtk_accel_group_attach (GtkAccelGroup *accel_group,
- GtkObject *object)
+_gtk_accel_group_attach (GtkAccelGroup *accel_group,
+ GObject *object)
{
GSList *slist;
- g_return_if_fail (accel_group != NULL);
- g_return_if_fail (object != NULL);
- g_return_if_fail (GTK_IS_OBJECT (object));
- g_return_if_fail (g_slist_find (accel_group->attach_objects, object) == NULL);
+ g_return_if_fail (GTK_IS_ACCEL_GROUP (accel_group));
+ g_return_if_fail (G_IS_OBJECT (object));
+ g_return_if_fail (g_slist_find (accel_group->acceleratables, object) == NULL);
- accel_group->attach_objects = g_slist_prepend (accel_group->attach_objects, object);
- gtk_accel_group_ref (accel_group);
- slist = gtk_object_get_data_by_id (object, accel_groups_key_id);
- if (!slist)
- gtk_signal_connect (object,
- "destroy",
- GTK_SIGNAL_FUNC (gtk_accel_group_object_destroy),
- NULL);
+ g_object_ref (accel_group);
+ accel_group->acceleratables = g_slist_prepend (accel_group->acceleratables, object);
+ slist = g_object_get_qdata (object, quark_acceleratable_groups);
+ if (slist)
+ g_object_weak_unref (object,
+ (GWeakNotify) accel_group_weak_ref_detach,
+ slist);
slist = g_slist_prepend (slist, accel_group);
- gtk_object_set_data_by_id (object, accel_groups_key_id, slist);
+ g_object_set_qdata (object, quark_acceleratable_groups, slist);
+ g_object_weak_ref (object,
+ (GWeakNotify) accel_group_weak_ref_detach,
+ slist);
}
void
-gtk_accel_group_detach (GtkAccelGroup *accel_group,
- GtkObject *object)
+_gtk_accel_group_detach (GtkAccelGroup *accel_group,
+ GObject *object)
{
GSList *slist;
- g_return_if_fail (accel_group != NULL);
- g_return_if_fail (object != NULL);
- g_return_if_fail (GTK_IS_OBJECT (object));
- g_return_if_fail (g_slist_find (accel_group->attach_objects, object) != NULL);
+ g_return_if_fail (GTK_IS_ACCEL_GROUP (accel_group));
+ g_return_if_fail (G_IS_OBJECT (object));
+ g_return_if_fail (g_slist_find (accel_group->acceleratables, object) != NULL);
- accel_group->attach_objects = g_slist_remove (accel_group->attach_objects, object);
- gtk_accel_group_unref (accel_group);
- slist = gtk_object_get_data_by_id (object, accel_groups_key_id);
+ accel_group->acceleratables = g_slist_remove (accel_group->acceleratables, object);
+ slist = g_object_get_qdata (object, quark_acceleratable_groups);
+ g_object_weak_unref (object,
+ (GWeakNotify) accel_group_weak_ref_detach,
+ slist);
slist = g_slist_remove (slist, accel_group);
- if (!slist)
- gtk_signal_disconnect_by_func (object,
- GTK_SIGNAL_FUNC (gtk_accel_group_object_destroy),
- NULL);
- gtk_object_set_data_by_id (object, accel_groups_key_id, slist);
+ g_object_set_qdata (object, quark_acceleratable_groups, slist);
+ if (slist)
+ g_object_weak_ref (object,
+ (GWeakNotify) accel_group_weak_ref_detach,
+ slist);
+ g_object_unref (accel_group);
}
-void
-gtk_accel_group_lock (GtkAccelGroup *accel_group)
+/**
+ * gtk_accel_groups_from_object:
+ * @object: a #GObject, usually a #GtkWindow
+ * @returns: a list of all accel groups which are attached to @object
+ *
+ * Gets a list of all accel groups which are attached to @object.
+ */
+GSList*
+gtk_accel_groups_from_object (GObject *object)
{
- g_return_if_fail (accel_group != NULL);
+ g_return_val_if_fail (G_IS_OBJECT (object), NULL);
- accel_group->lock_count += 1;
+ return g_object_get_qdata (object, quark_acceleratable_groups);
}
-void
-gtk_accel_group_unlock (GtkAccelGroup *accel_group)
+/**
+ * gtk_accel_group_find:
+ * @accel_group: a #GtkAccelGroup
+ * @find_func: a function to filter the entries of @accel_group with
+ * @data: data to pass to @find_func
+ * @returns: the key of the first entry passing @find_func. The key is
+ * owned by GTK+ and must not be freed.
+ *
+ * Finds the first entry in an accelerator group for which
+ * @find_func returns %TRUE and returns its #GtkAccelKey.
+ *
+ */
+GtkAccelKey*
+gtk_accel_group_find (GtkAccelGroup *accel_group,
+ gboolean (*find_func) (GtkAccelKey *key,
+ GClosure *closure,
+ gpointer data),
+ gpointer data)
{
- g_return_if_fail (accel_group != NULL);
-
- if (accel_group->lock_count)
- accel_group->lock_count -= 1;
-}
+ GtkAccelKey *key = NULL;
+ guint i;
-static GtkAccelEntry*
-gtk_accel_group_lookup (GtkAccelGroup *accel_group,
- guint accel_key,
- GdkModifierType accel_mods)
-{
- GtkAccelEntry key_entry = { 0 };
-
- key_entry.accel_group = accel_group;
- key_entry.accelerator_key = gdk_keyval_to_lower (accel_key);
- key_entry.accelerator_mods = accel_mods & accel_group->modifier_mask;
-
- return g_hash_table_lookup (accel_entry_hash_table, &key_entry);
-}
+ g_return_val_if_fail (GTK_IS_ACCEL_GROUP (accel_group), NULL);
+ g_return_val_if_fail (find_func != NULL, NULL);
-gboolean
-gtk_accel_group_activate (GtkAccelGroup *accel_group,
- guint accel_key,
- GdkModifierType accel_mods)
-{
- GtkAccelEntry *entry;
-
- g_return_val_if_fail (accel_group != NULL, FALSE);
-
- entry = gtk_accel_group_lookup (accel_group, accel_key, accel_mods);
- if (entry && entry->signal_id &&
- (!GTK_IS_WIDGET (entry->object) || GTK_WIDGET_IS_SENSITIVE (entry->object)))
- {
- gtk_signal_emit (entry->object, entry->signal_id);
- return TRUE;
- }
- return FALSE;
+ g_object_ref (accel_group);
+ for (i = 0; i < accel_group->n_accels; i++)
+ if (find_func (&accel_group->priv_accels[i].key,
+ accel_group->priv_accels[i].closure,
+ data))
+ {
+ key = &accel_group->priv_accels[i].key;
+ break;
+ }
+ g_object_unref (accel_group);
+
+ return key;
}
-gboolean
-gtk_accel_groups_activate (GtkObject *object,
- guint accel_key,
- GdkModifierType accel_mods)
+/**
+ * gtk_accel_group_lock:
+ * @accel_group: a #GtkAccelGroup
+ *
+ * Locks the given accelerator group.
+ *
+ * Locking an acelerator group prevents the accelerators contained
+ * within it to be changed during runtime. Refer to
+ * gtk_accel_map_change_entry() about runtime accelerator changes.
+ *
+ * If called more than once, @accel_group remains locked until
+ * gtk_accel_group_unlock() has been called an equivalent number
+ * of times.
+ */
+void
+gtk_accel_group_lock (GtkAccelGroup *accel_group)
{
- g_return_val_if_fail (object != NULL, FALSE);
- g_return_val_if_fail (GTK_IS_OBJECT (object), FALSE);
-
- if (gtk_accelerator_valid (accel_key, accel_mods))
- {
- GSList *slist;
-
- for (slist = gtk_accel_groups_from_object (object); slist; slist = slist->next)
- if (gtk_accel_group_activate (slist->data, accel_key, accel_mods))
- return TRUE;
- return gtk_accel_group_activate (gtk_accel_group_get_default (), accel_key, accel_mods);
- }
+ g_return_if_fail (GTK_IS_ACCEL_GROUP (accel_group));
- return FALSE;
+ accel_group->lock_count += 1;
}
+/**
+ * gtk_accel_group_unlock:
+ * @accel_group: a #GtkAccelGroup
+ *
+ * Undoes the last call to gtk_accel_group_lock() on this @accel_group.
+ */
void
-gtk_accel_group_lock_entry (GtkAccelGroup *accel_group,
- guint accel_key,
- GdkModifierType accel_mods)
+gtk_accel_group_unlock (GtkAccelGroup *accel_group)
{
- GtkAccelEntry *entry;
-
- g_return_if_fail (accel_group != NULL);
-
- entry = gtk_accel_group_lookup (accel_group, accel_key, accel_mods);
- if (entry)
- entry->accel_flags |= GTK_ACCEL_LOCKED;
+ g_return_if_fail (GTK_IS_ACCEL_GROUP (accel_group));
+ g_return_if_fail (accel_group->lock_count > 0);
+
+ accel_group->lock_count -= 1;
}
-void
-gtk_accel_group_unlock_entry (GtkAccelGroup *accel_group,
- guint accel_key,
- GdkModifierType accel_mods)
+static void
+accel_closure_invalidate (gpointer data,
+ GClosure *closure)
{
- GtkAccelEntry *entry;
-
- g_return_if_fail (accel_group != NULL);
-
- entry = gtk_accel_group_lookup (accel_group, accel_key, accel_mods);
- if (entry)
- entry->accel_flags &= ~GTK_ACCEL_LOCKED;
+ GtkAccelGroup *accel_group = GTK_ACCEL_GROUP (data);
+
+ gtk_accel_group_disconnect (accel_group, closure);
}
-GtkAccelEntry*
-gtk_accel_group_get_entry (GtkAccelGroup *accel_group,
- guint accel_key,
- GdkModifierType accel_mods)
+static int
+bsearch_compare_accels (const void *d1,
+ const void *d2)
{
- g_return_val_if_fail (accel_group != NULL, 0);
-
- return gtk_accel_group_lookup (accel_group, accel_key, accel_mods);
+ const GtkAccelGroupEntry *entry1 = d1;
+ const GtkAccelGroupEntry *entry2 = d2;
+
+ if (entry1->key.accel_key == entry2->key.accel_key)
+ return entry1->key.accel_mods < entry2->key.accel_mods ? -1 : entry1->key.accel_mods > entry2->key.accel_mods;
+ else
+ return entry1->key.accel_key < entry2->key.accel_key ? -1 : 1;
}
-void
-gtk_accel_group_add (GtkAccelGroup *accel_group,
- guint accel_key,
- GdkModifierType accel_mods,
- GtkAccelFlags accel_flags,
- GtkObject *object,
- const gchar *accel_signal)
+static void
+quick_accel_add (GtkAccelGroup *accel_group,
+ guint accel_key,
+ GdkModifierType accel_mods,
+ GtkAccelFlags accel_flags,
+ GClosure *closure,
+ GQuark path_quark)
{
- guint accel_signal_id = 0;
- guint add_accelerator_signal_id = 0;
- guint remove_accelerator_signal_id = 0;
- gchar *signal;
- GtkSignalQuery *query;
- GSList *slist;
- GSList *groups;
- GSList *attach_objects;
- GtkAccelEntry *entry;
-
- g_return_if_fail (accel_group != NULL);
- g_return_if_fail (object != NULL);
- g_return_if_fail (GTK_IS_OBJECT (object));
- g_return_if_fail (accel_signal != NULL);
-
- /* check for required signals in the objects branch
- */
- signal = (gchar*) accel_signal;
- accel_signal_id = gtk_signal_lookup (signal, GTK_OBJECT_TYPE (object));
- if (accel_signal_id)
- {
- signal = "add-accelerator";
- add_accelerator_signal_id = gtk_signal_lookup (signal, GTK_OBJECT_TYPE (object));
- }
- if (add_accelerator_signal_id)
- {
- signal = "remove-accelerator";
- remove_accelerator_signal_id = gtk_signal_lookup (signal, GTK_OBJECT_TYPE (object));
- }
- if (!accel_signal_id ||
- !add_accelerator_signal_id ||
- !remove_accelerator_signal_id)
- {
- g_warning ("gtk_accel_group_add(): could not find signal \"%s\""
- "in the `%s' class ancestry",
- signal,
- gtk_type_name (GTK_OBJECT_TYPE (object)));
- return;
- }
- query = gtk_signal_query (accel_signal_id);
- if (!query ||
- query->nparams > 0)
- {
- g_warning ("gtk_accel_group_add(): signal \"%s\" in the `%s' class ancestry"
- "cannot be used as accelerator signal",
- accel_signal,
- gtk_type_name (GTK_OBJECT_TYPE (object)));
- if (query)
- g_free (query);
-
- return;
- }
- g_free (query);
+ guint pos, i = accel_group->n_accels++;
+ GtkAccelGroupEntry key;
- /* prematurely abort if the group/entry is already locked
- */
- if (accel_group->lock_count > 0)
- return;
- entry = gtk_accel_group_lookup (accel_group, accel_key, accel_mods);
- if (entry && entry->accel_flags & GTK_ACCEL_LOCKED)
- return;
-
- /* make sure our structures stay alive
- */
- gtk_accel_group_ref (accel_group);
- gtk_object_ref (object);
-
- /* remove an existing entry
- */
- if (entry)
- gtk_signal_emit (entry->object, remove_accelerator_signal_id,
- accel_group,
- gdk_keyval_to_lower (accel_key),
- accel_mods & accel_group->modifier_mask);
+ /* find position */
+ key.key.accel_key = accel_key;
+ key.key.accel_mods = accel_mods;
+ for (pos = 0; pos < i; pos++)
+ if (bsearch_compare_accels (&key, accel_group->priv_accels + pos) < 0)
+ break;
+
+ /* insert at position, ref closure */
+ accel_group->priv_accels = g_renew (GtkAccelGroupEntry, accel_group->priv_accels, accel_group->n_accels);
+ g_memmove (accel_group->priv_accels + pos + 1, accel_group->priv_accels + pos,
+ (i - pos) * sizeof (accel_group->priv_accels[0]));
+ accel_group->priv_accels[pos].key.accel_key = accel_key;
+ accel_group->priv_accels[pos].key.accel_mods = accel_mods;
+ accel_group->priv_accels[pos].key.accel_flags = accel_flags;
+ accel_group->priv_accels[pos].closure = g_closure_ref (closure);
+ accel_group->priv_accels[pos].accel_path_quark = path_quark;
+ g_closure_sink (closure);
- /* abort if the entry still exists
- */
- entry = gtk_accel_group_lookup (accel_group, accel_key, accel_mods);
- if (entry)
+ /* handle closure invalidation and reverse lookups */
+ g_closure_add_invalidate_notifier (closure, accel_group, accel_closure_invalidate);
+
+ /* get accel path notification */
+ if (path_quark)
+ _gtk_accel_map_add_group (g_quark_to_string (path_quark), accel_group);
+
+ /* connect and notify changed */
+ if (accel_key)
{
- gtk_accel_group_unref (accel_group);
- gtk_object_unref (object);
+ gchar *accel_name = gtk_accelerator_name (accel_key, accel_mods);
+ GQuark accel_quark = g_quark_from_string (accel_name);
+
+ g_free (accel_name);
- return;
- }
-
- /* collect accel groups and remove existing entries
- */
- attach_objects = accel_group->attach_objects;
- groups = NULL;
- for (attach_objects = accel_group->attach_objects; attach_objects; attach_objects = attach_objects->next)
- {
- GSList *tmp_groups;
+ /* setup handler */
+ g_signal_connect_closure_by_id (accel_group, signal_accel_activate, accel_quark, closure, FALSE);
- tmp_groups = gtk_object_get_data_by_id (attach_objects->data, accel_groups_key_id);
- while (tmp_groups)
- {
- groups = g_slist_prepend (groups, tmp_groups->data);
- gtk_accel_group_ref (tmp_groups->data);
- tmp_groups = tmp_groups->next;
- }
+ /* and notify */
+ g_signal_emit (accel_group, signal_accel_changed, accel_quark, accel_key, accel_mods, closure);
}
- for (slist = groups; slist; slist = slist->next)
+}
+
+static void
+quick_accel_remove (GtkAccelGroup *accel_group,
+ GtkAccelGroupEntry *entry)
+{
+ guint pos = entry - accel_group->priv_accels;
+ GQuark accel_quark = 0;
+ guint accel_key = entry->key.accel_key;
+ GdkModifierType accel_mods = entry->key.accel_mods;
+ GClosure *closure = entry->closure;
+
+ /* quark for notification */
+ if (accel_key)
{
- GtkAccelGroup *tmp_group;
-
- tmp_group = slist->data;
-
- /* we only remove the accelerator if neccessary
- */
- if (tmp_group->lock_count == 0)
- {
- entry = gtk_accel_group_lookup (tmp_group, accel_key, accel_mods);
- if (entry && !(entry->accel_flags & GTK_ACCEL_LOCKED))
- gtk_signal_emit (entry->object, remove_accelerator_signal_id,
- tmp_group,
- gdk_keyval_to_lower (accel_key),
- accel_mods & tmp_group->modifier_mask);
- }
- gtk_accel_group_unref (tmp_group);
+ gchar *accel_name = gtk_accelerator_name (accel_key, accel_mods);
+
+ accel_quark = g_quark_from_string (accel_name);
+ g_free (accel_name);
}
- g_slist_free (groups);
+
+ /* clean up closure invalidate notification and disconnect */
+ g_closure_remove_invalidate_notifier (entry->closure, accel_group, accel_closure_invalidate);
+ if (accel_quark)
+ g_signal_handlers_disconnect_matched (accel_group,
+ G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DETAIL | G_SIGNAL_MATCH_CLOSURE,
+ signal_accel_activate, accel_quark,
+ closure, NULL, NULL);
+ /* clean up accel path notification */
+ if (entry->accel_path_quark)
+ _gtk_accel_map_remove_group (g_quark_to_string (entry->accel_path_quark), accel_group);
+
+ /* physically remove */
+ accel_group->n_accels -= 1;
+ g_memmove (entry, entry + 1,
+ (accel_group->n_accels - pos) * sizeof (accel_group->priv_accels[0]));
+
+ /* and notify */
+ if (accel_quark)
+ g_signal_emit (accel_group, signal_accel_changed, accel_quark, accel_key, accel_mods, closure);
+
+ /* remove quick_accel_add() refcount */
+ g_closure_unref (closure);
+}
+
+static GtkAccelGroupEntry*
+quick_accel_find (GtkAccelGroup *accel_group,
+ guint accel_key,
+ GdkModifierType accel_mods,
+ guint *count_p)
+{
+ GtkAccelGroupEntry *entry;
+ GtkAccelGroupEntry key;
+
+ if (!accel_group->n_accels)
+ return NULL;
+
+ key.key.accel_key = accel_key;
+ key.key.accel_mods = accel_mods;
+ entry = bsearch (&key, accel_group->priv_accels, accel_group->n_accels,
+ sizeof (accel_group->priv_accels[0]), bsearch_compare_accels);
- /* now install the new accelerator
- */
- entry = gtk_accel_group_lookup (accel_group, accel_key, accel_mods);
if (!entry)
- gtk_signal_emit (object, add_accelerator_signal_id,
- accel_signal_id,
- accel_group,
- gdk_keyval_to_lower (accel_key),
- accel_mods & accel_group->modifier_mask,
- accel_flags & GTK_ACCEL_MASK);
-
- /* and release the structures again
- */
- gtk_accel_group_unref (accel_group);
- gtk_object_unref (object);
+ return NULL;
+
+ /* step back to the first member */
+ for (; entry > accel_group->priv_accels; entry--)
+ if (entry[-1].key.accel_key != accel_key ||
+ entry[-1].key.accel_mods != accel_mods)
+ break;
+ /* count equal members */
+ for (*count_p = 0; entry + *count_p < accel_group->priv_accels + accel_group->n_accels; (*count_p)++)
+ if (entry[*count_p].key.accel_key != accel_key ||
+ entry[*count_p].key.accel_mods != accel_mods)
+ break;
+ return entry;
}
-static void
-gtk_accel_group_delete_entries (GtkObject *object)
+/**
+ * gtk_accel_group_connect:
+ * @accel_group: the accelerator group to install an accelerator in
+ * @accel_key: key value of the accelerator
+ * @accel_mods: modifier combination of the accelerator
+ * @accel_flags: a flag mask to configure this accelerator
+ * @closure: closure to be executed upon accelerator activation
+ *
+ * Installs an accelerator in this group. When @accel_group is being activated
+ * in response to a call to gtk_accel_groups_activate(), @closure will be
+ * invoked if the @accel_key and @accel_mods from gtk_accel_groups_activate()
+ * match those of this connection.
+ *
+ * The signature used for the @closure is that of #GtkAccelGroupActivate.
+ *
+ * Note that, due to implementation details, a single closure can only be
+ * connected to one accelerator group.
+ */
+void
+gtk_accel_group_connect (GtkAccelGroup *accel_group,
+ guint accel_key,
+ GdkModifierType accel_mods,
+ GtkAccelFlags accel_flags,
+ GClosure *closure)
{
- GSList *free_slist, *slist;
-
- gtk_signal_disconnect_by_func (object,
- GTK_SIGNAL_FUNC (gtk_accel_group_delete_entries),
- NULL);
+ g_return_if_fail (GTK_IS_ACCEL_GROUP (accel_group));
+ g_return_if_fail (closure != NULL);
+ g_return_if_fail (accel_key > 0);
+ g_return_if_fail (gtk_accel_group_from_accel_closure (closure) == NULL);
- /* we remove all entries of this object the hard
- * way (i.e. without signal emission).
- */
- free_slist = gtk_object_get_data_by_id (object, accel_entries_key_id);
- gtk_object_set_data_by_id (object, accel_entries_key_id, NULL);
- for (slist = free_slist; slist; slist = slist->next)
- {
- GtkAccelEntry *entry;
-
- entry = slist->data;
-
- g_hash_table_remove (accel_entry_hash_table, entry);
- gtk_accel_group_unref (entry->accel_group);
- g_chunk_free (entry, accel_entries_mem_chunk);
- }
- g_slist_free (free_slist);
+ g_object_ref (accel_group);
+ if (!closure->is_invalid)
+ quick_accel_add (accel_group,
+ gdk_keyval_to_lower (accel_key),
+ accel_mods, accel_flags, closure, 0);
+ g_object_unref (accel_group);
}
+/**
+ * gtk_accel_group_connect_by_path:
+ * @accel_group: the accelerator group to install an accelerator in
+ * @accel_path: path used for determining key and modifiers.
+ * @closure: closure to be executed upon accelerator activation
+ *
+ * Installs an accelerator in this group, using an accelerator path to look
+ * up the appropriate key and modifiers (see gtk_accel_map_add_entry()).
+ * When @accel_group is being activated in response to a call to
+ * gtk_accel_groups_activate(), @closure will be invoked if the @accel_key and
+ * @accel_mods from gtk_accel_groups_activate() match the key and modifiers
+ * for the path.
+ *
+ * The signature used for the @closure is that of #GtkAccelGroupActivate.
+ */
void
-gtk_accel_group_handle_add (GtkObject *object,
- guint accel_signal_id,
- GtkAccelGroup *accel_group,
- guint accel_key,
- GdkModifierType accel_mods,
- GtkAccelFlags accel_flags)
+gtk_accel_group_connect_by_path (GtkAccelGroup *accel_group,
+ const gchar *accel_path,
+ GClosure *closure)
{
- GtkAccelEntry *entry;
-
- g_return_if_fail (object != NULL);
- g_return_if_fail (GTK_IS_OBJECT (object));
- g_return_if_fail (accel_group != NULL);
- g_return_if_fail (accel_signal_id > 0);
+ guint accel_key = 0;
+ GdkModifierType accel_mods = 0;
+ GtkAccelKey key;
+
+ g_return_if_fail (GTK_IS_ACCEL_GROUP (accel_group));
+ g_return_if_fail (closure != NULL);
+ g_return_if_fail (_gtk_accel_path_is_valid (accel_path));
- if (!gtk_accelerator_valid (accel_key, accel_mods))
+ if (closure->is_invalid)
return;
-
- entry = gtk_accel_group_lookup (accel_group, accel_key, accel_mods);
- if (!entry)
+
+ g_object_ref (accel_group);
+
+ if (gtk_accel_map_lookup_entry (accel_path, &key))
{
- GSList *slist;
-
- gtk_accel_group_ref (accel_group);
-
- entry = g_chunk_new (GtkAccelEntry, accel_entries_mem_chunk);
- entry->accel_group = accel_group;
- entry->accelerator_key = gdk_keyval_to_lower (accel_key);
- entry->accelerator_mods = accel_mods & accel_group->modifier_mask;
- entry->accel_flags = accel_flags & GTK_ACCEL_MASK;
- entry->object = object;
- entry->signal_id = accel_signal_id;
-
- g_hash_table_insert (accel_entry_hash_table, entry, entry);
-
- slist = gtk_object_get_data_by_id (object, accel_entries_key_id);
- if (!slist)
- gtk_signal_connect (object,
- "destroy",
- GTK_SIGNAL_FUNC (gtk_accel_group_delete_entries),
- NULL);
- slist = g_slist_prepend (slist, entry);
- gtk_object_set_data_by_id (object, accel_entries_key_id, slist);
+ accel_key = gdk_keyval_to_lower (key.accel_key);
+ accel_mods = key.accel_mods;
}
+
+ quick_accel_add (accel_group, accel_key, accel_mods, GTK_ACCEL_VISIBLE, closure,
+ g_quark_from_string (accel_path));
+
+ g_object_unref (accel_group);
}
-void
-gtk_accel_group_remove (GtkAccelGroup *accel_group,
- guint accel_key,
- GdkModifierType accel_mods,
- GtkObject *object)
+/**
+ * gtk_accel_group_disconnect:
+ * @accel_group: the accelerator group to remove an accelerator from
+ * @closure: the closure to remove from this accelerator group
+ * @returns: %TRUE if the closure was found and got disconnected
+ *
+ * Removes an accelerator previously installed through
+ * gtk_accel_group_connect().
+ */
+gboolean
+gtk_accel_group_disconnect (GtkAccelGroup *accel_group,
+ GClosure *closure)
{
- GtkAccelEntry *entry;
- guint remove_accelerator_signal_id = 0;
-
- g_return_if_fail (accel_group != NULL);
- g_return_if_fail (object != NULL);
- g_return_if_fail (GTK_IS_OBJECT (object));
+ guint i;
+
+ g_return_val_if_fail (GTK_IS_ACCEL_GROUP (accel_group), FALSE);
+
+ for (i = 0; i < accel_group->n_accels; i++)
+ if (accel_group->priv_accels[i].closure == closure)
+ {
+ g_object_ref (accel_group);
+ quick_accel_remove (accel_group, accel_group->priv_accels + i);
+ g_object_unref (accel_group);
+ return TRUE;
+ }
+ return FALSE;
+}
+
+/**
+ * gtk_accel_group_disconnect_key:
+ * @accel_group: the accelerator group to install an accelerator in
+ * @accel_key: key value of the accelerator
+ * @accel_mods: modifier combination of the accelerator
+ * @returns: %TRUE if there was an accelerator which could be
+ * removed, %FALSE otherwise
+ *
+ * Removes an accelerator previously installed through
+ * gtk_accel_group_connect().
+ */
+gboolean
+gtk_accel_group_disconnect_key (GtkAccelGroup *accel_group,
+ guint accel_key,
+ GdkModifierType accel_mods)
+{
+ GtkAccelGroupEntry *entries;
+ GSList *slist, *clist = NULL;
+ gboolean removed_one = FALSE;
+ guint n;
+
+ g_return_val_if_fail (GTK_IS_ACCEL_GROUP (accel_group), FALSE);
+
+ g_object_ref (accel_group);
- /* check for required signals in the objects branch
- */
- remove_accelerator_signal_id = gtk_signal_lookup ("remove-accelerator", GTK_OBJECT_TYPE (object));
- if (!remove_accelerator_signal_id)
+ accel_key = gdk_keyval_to_lower (accel_key);
+ entries = quick_accel_find (accel_group, accel_key, accel_mods, &n);
+ while (n--)
{
- g_warning ("gtk_accel_group_remove(): could not find signal \"%s\""
- "in the `%s' class ancestry",
- "remove-accelerator",
- gtk_type_name (GTK_OBJECT_TYPE (object)));
- return;
+ GClosure *closure = g_closure_ref (entries[n].closure);
+
+ clist = g_slist_prepend (clist, closure);
}
-
- /* prematurely abort if the entry is locked
- */
- if (accel_group->lock_count > 0)
- return;
- entry = gtk_accel_group_lookup (accel_group, accel_key, accel_mods);
- if (!entry ||
- entry->accel_flags & GTK_ACCEL_LOCKED)
- return;
- if (entry->object != object)
+
+ for (slist = clist; slist; slist = slist->next)
{
- g_warning ("gtk_accel_group_remove(): invalid object reference for accel-group entry");
- return;
+ GClosure *closure = slist->data;
+
+ removed_one |= gtk_accel_group_disconnect (accel_group, closure);
+ g_closure_unref (closure);
}
-
- /* make sure our structures stay alive
- */
- gtk_accel_group_ref (accel_group);
- gtk_object_ref (object);
-
- /* remove the entry
- */
- gtk_signal_emit (entry->object, remove_accelerator_signal_id,
- accel_group,
- gdk_keyval_to_lower (accel_key),
- accel_mods & accel_group->modifier_mask);
-
- /* and release the structures again
- */
- gtk_accel_group_unref (accel_group);
- gtk_object_unref (object);
+ g_slist_free (clist);
+
+ g_object_unref (accel_group);
+
+ return removed_one;
}
void
-gtk_accel_group_handle_remove (GtkObject *object,
- GtkAccelGroup *accel_group,
- guint accel_key,
- GdkModifierType accel_mods)
+_gtk_accel_group_reconnect (GtkAccelGroup *accel_group,
+ GQuark accel_path_quark)
{
- GtkAccelEntry *entry;
-
- g_return_if_fail (object != NULL);
- g_return_if_fail (GTK_IS_OBJECT (object));
- g_return_if_fail (accel_group != NULL);
-
- entry = gtk_accel_group_lookup (accel_group, accel_key, accel_mods);
- if (entry)
+ GSList *slist, *clist = NULL;
+ guint i;
+
+ g_return_if_fail (GTK_IS_ACCEL_GROUP (accel_group));
+
+ g_object_ref (accel_group);
+
+ for (i = 0; i < accel_group->n_accels; i++)
+ if (accel_group->priv_accels[i].accel_path_quark == accel_path_quark)
+ {
+ GClosure *closure = g_closure_ref (accel_group->priv_accels[i].closure);
+
+ clist = g_slist_prepend (clist, closure);
+ }
+
+ for (slist = clist; slist; slist = slist->next)
{
- if (entry->object == object)
- {
- GSList *slist;
-
- g_hash_table_remove (accel_entry_hash_table, entry);
-
- slist = gtk_object_get_data_by_id (object, accel_entries_key_id);
- if (slist)
- {
- slist = g_slist_remove (slist, entry);
- if (!slist)
- gtk_signal_disconnect_by_func (object,
- GTK_SIGNAL_FUNC (gtk_accel_group_delete_entries),
- NULL);
- gtk_object_set_data_by_id (object, accel_entries_key_id, slist);
-
- gtk_accel_group_unref (accel_group);
-
- g_chunk_free (entry, accel_entries_mem_chunk);
- }
- }
- else
- g_warning ("gtk_accel_group_handle_remove(): invalid object reference for accel-group entry");
+ GClosure *closure = slist->data;
+
+ gtk_accel_group_disconnect (accel_group, closure);
+ gtk_accel_group_connect_by_path (accel_group, g_quark_to_string (accel_path_quark), closure);
+ g_closure_unref (closure);
}
- else
- g_warning ("gtk_accel_group_handle_remove(): attempt to remove unexisting accel-group entry");
+ g_slist_free (clist);
+
+ g_object_unref (accel_group);
}
-guint
-gtk_accel_group_create_add (GtkType class_type,
- GtkSignalRunType signal_flags,
- guint handler_offset)
+/**
+ * gtk_accel_group_query:
+ * @accel_group: the accelerator group to query
+ * @accel_key: key value of the accelerator
+ * @accel_mods: modifier combination of the accelerator
+ * @n_entries: location to return the number of entries found, or %NULL
+ * @returns: an array of @n_entries #GtkAccelGroupEntry elements, or %NULL. The array is owned by GTK+ and must not be freed.
+ *
+ * Queries an accelerator group for all entries matching @accel_key and
+ * @accel_mods.
+ */
+GtkAccelGroupEntry*
+gtk_accel_group_query (GtkAccelGroup *accel_group,
+ guint accel_key,
+ GdkModifierType accel_mods,
+ guint *n_entries)
{
- g_return_val_if_fail (GTK_TYPE_IS_OBJECT (class_type), 0);
-
- return gtk_signal_new ("add-accelerator",
- signal_flags,
- class_type,
- handler_offset,
- gtk_marshal_NONE__UINT_POINTER_UINT_UINT_ENUM,
- GTK_TYPE_NONE, 5,
- GTK_TYPE_UINT,
- GTK_TYPE_ACCEL_GROUP,
- GTK_TYPE_UINT,
- GTK_TYPE_GDK_MODIFIER_TYPE,
- GTK_TYPE_ACCEL_FLAGS);
+ GtkAccelGroupEntry *entries;
+ guint n;
+
+ g_return_val_if_fail (GTK_IS_ACCEL_GROUP (accel_group), NULL);
+
+ entries = quick_accel_find (accel_group, accel_key, accel_mods, &n);
+
+ if (n_entries)
+ *n_entries = entries ? n : 0;
+
+ return entries;
}
-guint
-gtk_accel_group_create_remove (GtkType class_type,
- GtkSignalRunType signal_flags,
- guint handler_offset)
+/**
+ * gtk_accel_group_from_accel_closure:
+ * @closure: a #GClosure
+ * @returns: the #GtkAccelGroup to which @closure is connected, or %NULL.
+ *
+ * Finds the #GtkAccelGroup to which @closure is connected;
+ * see gtk_accel_group_connect().
+ */
+GtkAccelGroup*
+gtk_accel_group_from_accel_closure (GClosure *closure)
{
- g_return_val_if_fail (GTK_TYPE_IS_OBJECT (class_type), 0);
-
- return gtk_signal_new ("remove-accelerator",
- signal_flags,
- class_type,
- handler_offset,
- gtk_marshal_NONE__POINTER_UINT_UINT,
- GTK_TYPE_NONE, 3,
- GTK_TYPE_ACCEL_GROUP,
- GTK_TYPE_UINT,
- GTK_TYPE_GDK_MODIFIER_TYPE);
+ guint i;
+
+ g_return_val_if_fail (closure != NULL, NULL);
+
+ /* a few remarks on what we do here. in general, we need a way to reverse lookup
+ * accel_groups from closures that are being used in accel groups. this could
+ * be done e.g via a hashtable. it is however cheaper (memory wise) to just
+ * use the invalidation notifier on the closure itself (which we need to install
+ * anyway), that contains the accel group as data which, besides needing to peek
+ * a bit at closure internals, works just as good.
+ */
+ for (i = 0; i < G_CLOSURE_N_NOTIFIERS (closure); i++)
+ if (closure->notifiers[i].notify == accel_closure_invalidate)
+ return closure->notifiers[i].data;
+
+ return NULL;
}
-GSList*
-gtk_accel_groups_from_object (GtkObject *object)
+gboolean
+_gtk_accel_group_activate (GtkAccelGroup *accel_group,
+ GQuark accel_quark,
+ GObject *acceleratable,
+ guint accel_key,
+ GdkModifierType accel_mods)
{
- g_return_val_if_fail (object != NULL, NULL);
- g_return_val_if_fail (GTK_IS_OBJECT (object), NULL);
-
- return gtk_object_get_data_by_id (object, accel_groups_key_id);
+ gboolean was_handled;
+
+ g_return_val_if_fail (GTK_IS_ACCEL_GROUP (accel_group), FALSE);
+
+ was_handled = FALSE;
+ g_signal_emit (accel_group, signal_accel_activate, accel_quark,
+ acceleratable, accel_key, accel_mods, &was_handled);
+
+ return was_handled;
}
-GSList*
-gtk_accel_group_entries_from_object (GtkObject *object)
+/**
+ * gtk_accel_groups_activate:
+ * @object: the #GObject, usually a #GtkWindow, on which
+ * to activate the accelerator.
+ * @accel_key: accelerator keyval from a key event
+ * @accel_mods: keyboard state mask from a key event
+ * @returns: %TRUE if the accelerator was handled, %FALSE otherwise
+ *
+ * Finds the first accelerator in any #GtkAccelGroup attached
+ * to @object that matches @accel_key and @accel_mods, and
+ * activates that accelerator.
+ * If an accelerator was activated and handled this keypress, %TRUE
+ * is returned.
+ */
+gboolean
+gtk_accel_groups_activate (GObject *object,
+ guint accel_key,
+ GdkModifierType accel_mods)
{
- g_return_val_if_fail (object != NULL, NULL);
- g_return_val_if_fail (GTK_IS_OBJECT (object), NULL);
+ g_return_val_if_fail (G_IS_OBJECT (object), FALSE);
+
+ if (gtk_accelerator_valid (accel_key, accel_mods))
+ {
+ gchar *accel_name;
+ GQuark accel_quark;
+ GSList *slist;
+
+ accel_name = gtk_accelerator_name (accel_key, (accel_mods & gtk_accelerator_get_default_mod_mask ()));
+ accel_quark = g_quark_from_string (accel_name);
+ g_free (accel_name);
+
+ for (slist = gtk_accel_groups_from_object (object); slist; slist = slist->next)
+ if (_gtk_accel_group_activate (slist->data, accel_quark, object, accel_key, accel_mods))
+ return TRUE;
+ }
- return gtk_object_get_data_by_id (object, accel_entries_key_id);
+ return FALSE;
}
+/**
+ * gtk_accelerator_valid:
+ * @keyval: a GDK keyval
+ * @modifiers: modifier mask
+ * @returns: %TRUE if the accelerator is valid
+ *
+ * Determines whether a given keyval and modifier mask constitute
+ * a valid keyboard accelerator. For example, the #GDK_a keyval
+ * plus #GDK_CONTROL_MASK is valid - this is a "Ctrl+a" accelerator.
+ * But by default (see gtk_accelerator_set_default_mod_mask()) you
+ * cannot use the NumLock key as an accelerator modifier.
+ */
gboolean
gtk_accelerator_valid (guint keyval,
GdkModifierType modifiers)
{
static const guint invalid_accelerator_vals[] = {
- GDK_BackSpace, GDK_Delete, GDK_KP_Delete,
GDK_Shift_L, GDK_Shift_R, GDK_Shift_Lock, GDK_Caps_Lock, GDK_ISO_Lock,
GDK_Control_L, GDK_Control_R, GDK_Meta_L, GDK_Meta_R,
GDK_Alt_L, GDK_Alt_R, GDK_Super_L, GDK_Super_R, GDK_Hyper_L, GDK_Hyper_R,
+ GDK_ISO_Level3_Shift, GDK_ISO_Next_Group, GDK_ISO_Prev_Group,
+ GDK_ISO_First_Group, GDK_ISO_Last_Group,
GDK_Mode_switch, GDK_Num_Lock, GDK_Multi_key,
GDK_Scroll_Lock, GDK_Sys_Req,
GDK_Up, GDK_Down, GDK_Left, GDK_Right, GDK_Tab, GDK_ISO_Left_Tab,
(string[8] == '>'));
}
+/**
+ * gtk_accelerator_parse:
+ * @accelerator: string representing an accelerator
+ * @accelerator_key: return location for accelerator keyval
+ * @accelerator_mods: return location for accelerator modifier mask
+ *
+ * Parses a string representing an accelerator. The
+ * format looks like "<Control>a" or "<Shift><Alt>F1" or
+ * "<Release>z" (the last one is for key release).
+ * The parser is fairly liberal and allows lower or upper case,
+ * and also abbreviations such as "<Ctl>" and "<Ctrl>".
+ *
+ * If the parse fails, @accelerator_key and @accelerator_mods will
+ * be set to 0 (zero).
+ */
void
-gtk_accelerator_parse (const gchar *accelerator,
- guint *accelerator_key,
- GdkModifierType*accelerator_mods)
+gtk_accelerator_parse (const gchar *accelerator,
+ guint *accelerator_key,
+ GdkModifierType *accelerator_mods)
{
guint keyval;
GdkModifierType mods;
*accelerator_mods = mods;
}
+/**
+ * gtk_accelerator_name:
+ * @accelerator_key: accelerator keyval
+ * @accelerator_mods: accelerator modifier mask
+ * @returns: a newly-allocated accelerator name
+ *
+ * Converts an accelerator keyval and modifier mask
+ * into a string parseable by gtk_accelerator_parse().
+ * For example, if you pass in #GDK_q and #GDK_CONTROL_MASK,
+ * this function returns "<Control>q".
+ *
+ * The caller of this function must free the returned string.
+ */
gchar*
gtk_accelerator_name (guint accelerator_key,
GdkModifierType accelerator_mods)
return accelerator;
}
+/**
+ * gtk_accelerator_set_default_mod_mask:
+ * @default_mod_mask: accelerator modifier mask
+ *
+ * Sets the modifiers that will be considered significant for keyboard
+ * accelerators. The default mod mask is #GDK_CONTROL_MASK |
+ * #GDK_SHIFT_MASK | #GDK_MOD1_MASK, that is, Control, Shift, and Alt.
+ * Other modifiers will by default be ignored by #GtkAccelGroup.
+ * You must include at least the three default modifiers in any
+ * value you pass to this function.
+ *
+ * The default mod mask should be changed on application startup,
+ * before using any accelerator groups.
+ */
void
gtk_accelerator_set_default_mod_mask (GdkModifierType default_mod_mask)
{
- default_accel_mod_mask = default_mod_mask & GDK_MODIFIER_MASK;
+ default_accel_mod_mask = (default_mod_mask & GDK_MODIFIER_MASK) |
+ (GDK_CONTROL_MASK | GDK_SHIFT_MASK | GDK_MOD1_MASK);
}
+/**
+ * gtk_accelerator_get_default_mod_mask:
+ * @returns: the default accelerator modifier mask
+ *
+ * Gets the value set by gtk_accelerator_set_default_mod_mask().
+ */
guint
gtk_accelerator_get_default_mod_mask (void)
{
projects / ~andy / gtk / blobdiff