]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkbindings.h
Remove GtkItemFactory completely
[~andy/gtk] / gtk / gtkbindings.h
index d9ed4033d8c47b4800d7395245a1df1b7b3b6d8a..2d1cca9a7c41faac2514543b16f91c26386b5496 100644 (file)
@@ -5,71 +5,46 @@
  * Copyright (C) 1998 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-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/.
+ */
+
+#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #ifndef __GTK_BINDINGS_H__
 #define __GTK_BINDINGS_H__
 
 
 #include <gdk/gdk.h>
 #include <gtk/gtkobject.h>
-#include <gtk/gtkenums.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
 
 
-/* Pattern matching
- */
-typedef struct _GtkPatternSpec GtkPatternSpec;
-
-struct _GtkPatternSpec
-{
-  GtkMatchType  match_type;
-  guint                 pattern_length;
-  gchar                *pattern;
-  gchar                *pattern_reversed;
-  gpointer      user_data;
-  guint                 seq_id;
-};
-
-void    gtk_pattern_spec_init      (GtkPatternSpec      *pspec,
-                                    const gchar         *pattern);
-void    gtk_pattern_spec_free_segs (GtkPatternSpec      *pspec);
-gboolean gtk_pattern_match         (GtkPatternSpec      *pspec,
-                                    guint                string_length,
-                                    const gchar         *string,
-                                    const gchar         *string_reversed);
-gboolean gtk_pattern_match_string   (GtkPatternSpec     *pspec,
-                                    const gchar         *string);
-gboolean gtk_pattern_match_simple   (const gchar        *pattern,
-                                    const gchar         *string);
+G_BEGIN_DECLS
 
 
 /* Binding sets
  */
 
-#define        GTK_BINDING_ARG_INT     (GTK_TYPE_INT)
-#define        GTK_BINDING_ARG_LONG    (GTK_TYPE_LONG)
-#define        GTK_BINDING_ARG_FLOAT   (GTK_TYPE_FLOAT)
-#define        GTK_BINDING_ARG_DOUBLE  (GTK_TYPE_DOUBLE)
-#define        GTK_BINDING_ARG_STRING  (GTK_TYPE_STRING)
-
 typedef struct _GtkBindingSet          GtkBindingSet;
 typedef struct _GtkBindingEntry                GtkBindingEntry;
 typedef struct _GtkBindingSignal       GtkBindingSignal;
@@ -84,6 +59,7 @@ struct _GtkBindingSet
   GSList               *class_branch_pspecs;
   GtkBindingEntry      *entries;
   GtkBindingEntry      *current;
+  guint                  parsed : 1; /* From RC content */
 };
 
 struct _GtkBindingEntry
@@ -91,27 +67,20 @@ struct _GtkBindingEntry
   /* key portion
    */
   guint                         keyval;
-  guint                         modifiers;
+  GdkModifierType       modifiers;
   
   GtkBindingSet                *binding_set;
   guint                        destroyed : 1;
   guint                        in_emission : 1;
+  guint                 marks_unbound : 1;
   GtkBindingEntry      *set_next;
   GtkBindingEntry      *hash_next;
   GtkBindingSignal     *signals;
 };
 
-struct _GtkBindingSignal
-{
-  GtkBindingSignal     *next;
-  gchar                        *signal_name;
-  guint                         n_args;
-  GtkBindingArg                *args;
-};
-
 struct _GtkBindingArg
 {
-  GtkType      arg_type;
+  GType                 arg_type;
   union {
     glong       long_data;
     gdouble     double_data;
@@ -119,48 +88,63 @@ struct _GtkBindingArg
   } d;
 };
 
-/* Binding sets
- */
+struct _GtkBindingSignal
+{
+  GtkBindingSignal     *next;
+  gchar                *signal_name;
+  guint                         n_args;
+  GtkBindingArg                *args;
+};
+
+/* Application-level methods */
+
 GtkBindingSet* gtk_binding_set_new     (const gchar    *set_name);
 GtkBindingSet* gtk_binding_set_by_class(gpointer        object_class);
 GtkBindingSet* gtk_binding_set_find    (const gchar    *set_name);
 gboolean gtk_bindings_activate         (GtkObject      *object,
                                         guint           keyval,
-                                        guint           modifiers);
+                                        GdkModifierType modifiers);
+gboolean gtk_bindings_activate_event    (GtkObject      *object,
+                                        GdkEventKey    *event);
 gboolean gtk_binding_set_activate      (GtkBindingSet  *binding_set,
                                         guint           keyval,
-                                        guint           modifiers,
+                                        GdkModifierType modifiers,
                                         GtkObject      *object);
-#define         gtk_binding_entry_add          gtk_binding_entry_clear
-void    gtk_binding_entry_clear        (GtkBindingSet  *binding_set,
-                                        guint           keyval,
-                                        guint           modifiers);
-void    gtk_binding_entry_remove       (GtkBindingSet  *binding_set,
-                                        guint           keyval,
-                                        guint           modifiers);
-void    gtk_binding_entry_add_signal   (GtkBindingSet  *binding_set,
-                                        guint           keyval,
-                                        guint           modifiers,
-                                        const gchar    *signal_name,
-                                        guint           n_args,
-                                        ...);
+
+void    gtk_binding_entry_skip         (GtkBindingSet  *binding_set,
+                                         guint           keyval,
+                                         GdkModifierType modifiers);
+void    gtk_binding_entry_add_signal   (GtkBindingSet  *binding_set,
+                                         guint           keyval,
+                                         GdkModifierType modifiers,
+                                         const gchar    *signal_name,
+                                         guint           n_args,
+                                         ...);
 void    gtk_binding_entry_add_signall  (GtkBindingSet  *binding_set,
                                         guint           keyval,
-                                        guint           modifiers,
+                                        GdkModifierType modifiers,
                                         const gchar    *signal_name,
                                         GSList         *binding_args);
+void    gtk_binding_entry_remove       (GtkBindingSet  *binding_set,
+                                        guint           keyval,
+                                        GdkModifierType modifiers);
+
 void    gtk_binding_set_add_path       (GtkBindingSet  *binding_set,
                                         GtkPathType     path_type,
                                         const gchar    *path_pattern,
                                         GtkPathPriorityType priority);
 
 
+/* Non-public methods */
 
+guint   _gtk_binding_parse_binding     (GScanner       *scanner);
+void     _gtk_binding_reset_parsed      (void);
+void    _gtk_binding_entry_add_signall (GtkBindingSet  *binding_set,
+                                        guint           keyval,
+                                        GdkModifierType modifiers,
+                                        const gchar    *signal_name,
+                                        GSList         *binding_args);
 
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_BINDINGS_H__ */