callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a gtkbindingsprivate.h header

Browse Source
This commit is contained in:
Matthias Clasen 2011-01-30 21:50:54 -05:00
parent 8bb0d552f1
commit dcf3430e17
4 changed files with 109 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gtk/Makefile.am
View File

@ -380,6 +380,7 @@ gtk_private_h_sources = \
gtkappchooserprivate.h \ gtkappchooserprivate.h \
gtkappchoosermodule.h \ gtkappchoosermodule.h \
gtkappchooseronline.h \ gtkappchooseronline.h \
gtkbindingsprivate.h \
gtkbuilderprivate.h \ gtkbuilderprivate.h \
gtkbuttonprivate.h \ gtkbuttonprivate.h \
gtkcellareaboxcontextprivate.h \ gtkcellareaboxcontextprivate.h \

6
gtk/gtkbindings.c
View File

@ -24,14 +24,14 @@
* Modified by the GTK+ Team and others 1997-2000. 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 * file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with * files for a list of changes. These files are distributed with
* GTK+ at ftp://ftp.gtk.org/pub/gtk/. * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/ */
#include "config.h" #include "config.h"
#include <string.h> #include <string.h>
#include <stdarg.h> #include <stdarg.h>
#include "gtkbindings.h" #include "gtkbindingsprivate.h"
#include "gtkkeyhash.h" #include "gtkkeyhash.h"
#include "gtkwidget.h" #include "gtkwidget.h"
#include "gtkrc.h" #include "gtkrc.h"
@ -241,7 +241,7 @@ binding_entry_new (GtkBindingSet *binding_set,
GtkKeyHash *key_hash = tmp_list->data; GtkKeyHash *key_hash = tmp_list->data;
binding_key_hash_insert_entry (key_hash, entry); binding_key_hash_insert_entry (key_hash, entry);
} }
return entry; return entry;
} }

152
gtk/gtkbindings.h
View File

@ -11,7 +11,7 @@
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
@ -40,113 +40,97 @@
G_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _GtkBindingSet GtkBindingSet;
/* Binding sets typedef struct _GtkBindingEntry GtkBindingEntry;
*/ typedef struct _GtkBindingSignal GtkBindingSignal;
typedef struct _GtkBindingArg GtkBindingArg;
typedef struct _GtkBindingSet GtkBindingSet;
typedef struct _GtkBindingEntry GtkBindingEntry;
typedef struct _GtkBindingSignal GtkBindingSignal;
typedef struct _GtkBindingArg GtkBindingArg;
struct _GtkBindingSet struct _GtkBindingSet
{ {
gchar *set_name; gchar *set_name;
gint priority; gint priority;
GSList *widget_path_pspecs; GSList *widget_path_pspecs;
GSList *widget_class_pspecs; GSList *widget_class_pspecs;
GSList *class_branch_pspecs; GSList *class_branch_pspecs;
GtkBindingEntry *entries; GtkBindingEntry *entries;
GtkBindingEntry *current; GtkBindingEntry *current;
guint parsed : 1; /* From RC content */ guint parsed : 1;
}; };
struct _GtkBindingEntry struct _GtkBindingEntry
{ {
/* key portion /* key portion */
*/ guint keyval;
guint keyval; GdkModifierType modifiers;
GdkModifierType modifiers;
GtkBindingSet *binding_set;
GtkBindingSet *binding_set; guint destroyed : 1;
guint destroyed : 1; guint in_emission : 1;
guint in_emission : 1; guint marks_unbound : 1;
guint marks_unbound : 1; GtkBindingEntry *set_next;
GtkBindingEntry *set_next; GtkBindingEntry *hash_next;
GtkBindingEntry *hash_next; GtkBindingSignal *signals;
GtkBindingSignal *signals;
}; };
struct _GtkBindingArg struct _GtkBindingArg
{ {
GType arg_type; GType arg_type;
union { union {
glong long_data; glong long_data;
gdouble double_data; gdouble double_data;
gchar *string_data; gchar *string_data;
} d; } d;
}; };
struct _GtkBindingSignal struct _GtkBindingSignal
{ {
GtkBindingSignal *next; GtkBindingSignal *next;
gchar *signal_name; gchar *signal_name;
guint n_args; guint n_args;
GtkBindingArg *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);
GtkBindingSet* gtk_binding_set_new (const gchar *set_name); gboolean gtk_bindings_activate (GObject *object,
GtkBindingSet* gtk_binding_set_by_class(gpointer object_class); guint keyval,
GtkBindingSet* gtk_binding_set_find (const gchar *set_name); GdkModifierType modifiers);
gboolean gtk_bindings_activate (GObject *object, gboolean gtk_bindings_activate_event (GObject *object,
guint keyval, GdkEventKey *event);
GdkModifierType modifiers); gboolean gtk_binding_set_activate (GtkBindingSet *binding_set,
gboolean gtk_bindings_activate_event (GObject *object, guint keyval,
GdkEventKey *event); GdkModifierType modifiers,
gboolean gtk_binding_set_activate (GtkBindingSet *binding_set, GObject *object);
guint keyval,
GdkModifierType modifiers,
GObject *object);
void gtk_binding_entry_skip (GtkBindingSet *binding_set, void gtk_binding_entry_skip (GtkBindingSet *binding_set,
guint keyval, guint keyval,
GdkModifierType modifiers); GdkModifierType modifiers);
void gtk_binding_entry_add_signal (GtkBindingSet *binding_set, void gtk_binding_entry_add_signal (GtkBindingSet *binding_set,
guint keyval, guint keyval,
GdkModifierType modifiers, GdkModifierType modifiers,
const gchar *signal_name, const gchar *signal_name,
guint n_args, guint n_args,
...); ...);
void gtk_binding_entry_add_signall (GtkBindingSet *binding_set, void gtk_binding_entry_add_signall (GtkBindingSet *binding_set,
guint keyval, guint keyval,
GdkModifierType modifiers, GdkModifierType modifiers,
const gchar *signal_name, const gchar *signal_name,
GSList *binding_args); GSList *binding_args);
GTokenType gtk_binding_entry_add_signal_from_string (GtkBindingSet *binding_set, GTokenType gtk_binding_entry_add_signal_from_string
const gchar *signal_desc); (GtkBindingSet *binding_set,
const gchar *signal_desc);
void gtk_binding_entry_remove (GtkBindingSet *binding_set, void gtk_binding_entry_remove (GtkBindingSet *binding_set,
guint keyval, guint keyval,
GdkModifierType modifiers); GdkModifierType modifiers);
void gtk_binding_set_add_path (GtkBindingSet *binding_set, void gtk_binding_set_add_path (GtkBindingSet *binding_set,
GtkPathType path_type, GtkPathType path_type,
const gchar *path_pattern, const gchar *path_pattern,
GtkPathPriorityType priority); 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);
G_END_DECLS G_END_DECLS

37
gtk/gtkbindingsprivate.h Normal file
View File

@ -0,0 +1,37 @@
/* GTK - The GIMP Toolkit
* Copyright (C) 2011 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* 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
* Lesser General Public License for more details.
*
* 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.
*/
#ifndef __GTK_BINDINGS_PRIVATE_H__
#define __GTK_BINDINGS_PRIVATE_H__
#include "gtkbindings.h"
G_BEGIN_DECLS
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);
G_END_DECLS
#endif /* __GTK_BINDINGS_PRIVATE_H__ */