X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkcontainer.c;h=1be4ab29264245fb35c91284dbcfbabe3e9dc75c;hb=72f9a7940fe222f4d6f9a6dca2a8c0083c461b7a;hp=b24dde9aa6dda81ed909dbf309dd752ed10771ab;hpb=13341d7cb99f5cc73ebee8a680c2df397d10a53d;p=~andy%2Fgtk diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c index b24dde9aa..1be4ab292 100644 --- a/gtk/gtkcontainer.c +++ b/gtk/gtkcontainer.c @@ -21,27 +21,250 @@ * 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/. + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ -#include +#include "config.h" + +#include "gtkcontainer.h" + #include #include #include -#include "gtkcontainer.h" #include "gtkbuildable.h" +#include "gtkbuilderprivate.h" #include "gtkprivate.h" #include "gtkmain.h" #include "gtkmarshalers.h" +#include "gtksizerequest.h" +#include "gtkwidgetprivate.h" #include "gtkwindow.h" #include "gtkintl.h" #include "gtktoolbar.h" #include #include -#include "gtkalias.h" +/** + * SECTION:gtkcontainer + * @Short_description: Base class for widgets which contain other widgets + * @Title: GtkContainer + * + * A GTK+ user interface is constructed by nesting widgets inside widgets. + * Container widgets are the inner nodes in the resulting tree of widgets: + * they contain other widgets. So, for example, you might have a #GtkWindow + * containing a #GtkFrame containing a #GtkLabel. If you wanted an image instead + * of a textual label inside the frame, you might replace the #GtkLabel widget + * with a #GtkImage widget. + * + * There are two major kinds of container widgets in GTK+. Both are subclasses + * of the abstract GtkContainer base class. + * + * The first type of container widget has a single child widget and derives + * from #GtkBin. These containers are decorators, which + * add some kind of functionality to the child. For example, a #GtkButton makes + * its child into a clickable button; a #GtkFrame draws a frame around its child + * and a #GtkWindow places its child widget inside a top-level window. + * + * The second type of container can have more than one child; its purpose is to + * manage layout. This means that these containers assign + * sizes and positions to their children. For example, a #GtkHBox arranges its + * children in a horizontal row, and a #GtkTable arranges the widgets it contains + * in a two-dimensional grid. + * + * + * Height for width geometry management + * + * GTK+ uses a height-for-width (and width-for-height) geometry management system. + * Height-for-width means that a widget can change how much vertical space it needs, + * depending on the amount of horizontal space that it is given (and similar for + * width-for-height). + * + * There are some things to keep in mind when implementing container widgets + * that make use of GTK+'s height for width geometry management system. First, + * it's important to note that a container must prioritize one of its + * dimensions, that is to say that a widget or container can only have a + * #GtkSizeRequestMode that is %GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH or + * %GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT. However, every widget and container + * must be able to respond to the APIs for both dimensions, i.e. even if a + * widget has a request mode that is height-for-width, it is possible that + * its parent will request its sizes using the width-for-height APIs. + * + * To ensure that everything works properly, here are some guidelines to follow + * when implementing height-for-width (or width-for-height) containers. + * + * Each request mode involves 2 virtual methods. Height-for-width apis run + * through gtk_widget_get_preferred_width() and then through gtk_widget_get_preferred_height_for_width(). + * When handling requests in the opposite #GtkSizeRequestMode it is important that + * every widget request at least enough space to display all of its content at all times. + * + * When gtk_widget_get_preferred_height() is called on a container that is height-for-width, + * the container must return the height for its minimum width. This is easily achieved by + * simply calling the reverse apis implemented for itself as follows: + * + * get_preferred_width (widget, &min_width, NULL); + * GTK_WIDGET_GET_CLASS (widget)->get_preferred_height_for_width (widget, min_width, + * min_height, nat_height); + * } + * else + * { + * ... many containers support both request modes, execute the real width-for-height + * request here by returning the collective heights of all widgets that are + * stacked vertically (or whatever is appropriate for this container) ... + * } + * } + * ]]> + * + * Similarly, when gtk_widget_get_preferred_width_for_height() is called for a container or widget + * that is height-for-width, it then only needs to return the base minimum width like so: + * + * get_preferred_width (widget, min_width, nat_width); + * } + * else + * { + * ... execute the real width-for-height request here based on the required width + * of the children collectively if the container were to be allocated the said height ... + * } + * } + * ]]> + * + * Furthermore, in order to ensure correct height-for-width requests it is important + * to check the input width against the real required minimum width. This can + * easily be achieved as follows: + * + * get_preferred_width (widget, &min_width, NULL); + * + * for_width = MAX (min_width, for_width); + * + * execute_real_height_for_width_request_code (widget, for_width, min_height, nat_height); + * } + * else + * { + * ... fall back on virtual results as mentioned in the previous example ... + * } + * } + * ]]> + * + * Height for width requests are generally implemented in terms of a virtual allocation + * of widgets in the input orientation. Assuming an height-for-width request mode, a container + * would implement the get_preferred_height_for_width() virtual function by first calling + * gtk_widget_get_preferred_width() for each of its children. + * + * For each potential group of children that are lined up horizontally, the values returned by + * gtk_widget_get_preferred_width() should be collected in an array of #GtkRequestedSize structures. + * Any child spacing should be removed from the input @for_width and then the collective size should be + * allocated using the gtk_distribute_natural_allocation() convenience function. + * + * The container will then move on to request the preferred height for each child by using + * gtk_widget_get_preferred_height_for_width() and using the sizes stored in the #GtkRequestedSize array. + * + * To allocate a height-for-width container, it's again important + * to consider that a container must prioritize one dimension over the other. So if + * a container is a height-for-width container it must first allocate all widgets horizontally + * using a #GtkRequestedSize array and gtk_distribute_natural_allocation() and then add any + * extra space (if and where appropriate) for the widget to expand. + * + * After adding all the expand space, the container assumes it was allocated sufficient + * height to fit all of its content. At this time, the container must use the total horizontal sizes + * of each widget to request the height-for-width of each of its children and store the requests in a + * #GtkRequestedSize array for any widgets that stack vertically (for tabular containers this can + * be generalized into the heights and widths of rows and columns). + * The vertical space must then again be distributed using gtk_distribute_natural_allocation() + * while this time considering the allocated height of the widget minus any vertical spacing + * that the container adds. Then vertical expand space should be added where appropriate and available + * and the container should go on to actually allocating the child widgets. + * + * See GtkWidget's geometry management section + * to learn more about implementing height-for-width geometry management for widgets. + * + * + * + * Child properties + * + * GtkContainer introduces child properties. + * These are object properties that are not specific + * to either the container or the contained widget, but rather to their relation. + * Typical examples of child properties are the position or pack-type of a widget + * which is contained in a #GtkBox. + * + * Use gtk_container_class_install_child_property() to install child properties + * for a container class and gtk_container_class_find_child_property() or + * gtk_container_class_list_child_properties() to get information about existing + * child properties. + * + * To set the value of a child property, use gtk_container_child_set_property(), + * gtk_container_child_set() or gtk_container_child_set_valist(). + * To obtain the value of a child property, use + * gtk_container_child_get_property(), gtk_container_child_get() or + * gtk_container_child_get_valist(). To emit notification about child property + * changes, use gtk_widget_child_notify(). + * + * + * + * GtkContainer as GtkBuildable + * + * The GtkContainer implementation of the GtkBuildable interface + * supports a <packing> element for children, which can + * contain multiple <property> elements that specify + * child properties for the child. + * + * Child properties in UI definitions + * + * + * + * + * start + * + * + * + * ]]> + * + * Since 2.16, child properties can also be marked as translatable using + * the same "translatable", "comments" and "context" attributes that are used + * for regular properties. + * + * + */ + + +struct _GtkContainerPrivate +{ + GtkWidget *focus_child; + + guint border_width : 16; + + guint has_focus_chain : 1; + guint need_resize : 1; + guint reallocate_redraws : 1; + guint resize_mode : 2; +}; + enum { ADD, REMOVE, @@ -66,7 +289,7 @@ static void gtk_container_base_class_init (GtkContainerClass *klass); static void gtk_container_base_class_finalize (GtkContainerClass *klass); static void gtk_container_class_init (GtkContainerClass *klass); static void gtk_container_init (GtkContainer *container); -static void gtk_container_destroy (GtkObject *object); +static void gtk_container_destroy (GtkWidget *widget); static void gtk_container_set_property (GObject *object, guint prop_id, const GValue *value, @@ -80,6 +303,9 @@ static void gtk_container_add_unimplemented (GtkContainer *container static void gtk_container_remove_unimplemented (GtkContainer *container, GtkWidget *widget); static void gtk_container_real_check_resize (GtkContainer *container); +static void gtk_container_compute_expand (GtkWidget *widget, + gboolean *hexpand_p, + gboolean *vexpand_p); static gboolean gtk_container_focus (GtkWidget *widget, GtkDirectionType direction); static void gtk_container_real_set_focus_child (GtkContainer *container, @@ -91,15 +317,26 @@ static gboolean gtk_container_focus_move (GtkContainer *container static void gtk_container_children_callback (GtkWidget *widget, gpointer client_data); static void gtk_container_show_all (GtkWidget *widget); -static void gtk_container_hide_all (GtkWidget *widget); -static gint gtk_container_expose (GtkWidget *widget, - GdkEventExpose *event); +static gint gtk_container_draw (GtkWidget *widget, + cairo_t *cr); static void gtk_container_map (GtkWidget *widget); static void gtk_container_unmap (GtkWidget *widget); +static void gtk_container_adjust_size_request (GtkWidget *widget, + GtkOrientation orientation, + gint *minimum_size, + gint *natural_size); +static void gtk_container_adjust_size_allocation (GtkWidget *widget, + GtkOrientation orientation, + gint *natural_size, + gint *allocated_pos, + gint *allocated_size); static gchar* gtk_container_child_default_composite_name (GtkContainer *container, GtkWidget *child); +static GtkWidgetPath * gtk_container_real_get_path_for_child (GtkContainer *container, + GtkWidget *child); + /* GtkBuildable */ static void gtk_container_buildable_init (GtkBuildableIface *iface); static void gtk_container_buildable_add_child (GtkBuildable *buildable, @@ -154,7 +391,7 @@ gtk_container_get_type (void) NULL, /* value_table */ }; - static const GInterfaceInfo buildable_info = + const GInterfaceInfo buildable_info = { (GInterfaceInitFunc) gtk_container_buildable_init, NULL, @@ -162,7 +399,7 @@ gtk_container_get_type (void) }; container_type = - g_type_register_static (GTK_TYPE_WIDGET, I_("GtkContainer"), + g_type_register_static (GTK_TYPE_WIDGET, I_("GtkContainer"), &container_info, G_TYPE_FLAG_ABSTRACT); g_type_add_interface_static (container_type, @@ -203,26 +440,27 @@ static void gtk_container_class_init (GtkContainerClass *class) { GObjectClass *gobject_class = G_OBJECT_CLASS (class); - GtkObjectClass *object_class = GTK_OBJECT_CLASS (class); GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class); parent_class = g_type_class_peek_parent (class); vadjustment_key_id = g_quark_from_static_string (vadjustment_key); hadjustment_key_id = g_quark_from_static_string (hadjustment_key); - + gobject_class->set_property = gtk_container_set_property; gobject_class->get_property = gtk_container_get_property; - object_class->destroy = gtk_container_destroy; - + widget_class->destroy = gtk_container_destroy; + widget_class->compute_expand = gtk_container_compute_expand; widget_class->show_all = gtk_container_show_all; - widget_class->hide_all = gtk_container_hide_all; - widget_class->expose_event = gtk_container_expose; + widget_class->draw = gtk_container_draw; widget_class->map = gtk_container_map; widget_class->unmap = gtk_container_unmap; widget_class->focus = gtk_container_focus; - + + widget_class->adjust_size_request = gtk_container_adjust_size_request; + widget_class->adjust_size_allocation = gtk_container_adjust_size_allocation; + class->add = gtk_container_add_unimplemented; class->remove = gtk_container_remove_unimplemented; class->check_resize = gtk_container_real_check_resize; @@ -230,6 +468,7 @@ gtk_container_class_init (GtkContainerClass *class) class->set_focus_child = gtk_container_real_set_focus_child; class->child_type = NULL; class->composite_name = gtk_container_child_default_composite_name; + class->get_path_for_child = gtk_container_real_get_path_for_child; g_object_class_install_property (gobject_class, PROP_RESIZE_MODE, @@ -245,7 +484,7 @@ gtk_container_class_init (GtkContainerClass *class) P_("Border width"), P_("The width of the empty border outside the containers children"), 0, - G_MAXINT, + 65535, 0, GTK_PARAM_READWRITE)); g_object_class_install_property (gobject_class, @@ -257,7 +496,7 @@ gtk_container_class_init (GtkContainerClass *class) GTK_PARAM_WRITABLE)); container_signals[ADD] = g_signal_new (I_("add"), - G_OBJECT_CLASS_TYPE (object_class), + G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkContainerClass, add), NULL, NULL, @@ -266,7 +505,7 @@ gtk_container_class_init (GtkContainerClass *class) GTK_TYPE_WIDGET); container_signals[REMOVE] = g_signal_new (I_("remove"), - G_OBJECT_CLASS_TYPE (object_class), + G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkContainerClass, remove), NULL, NULL, @@ -274,8 +513,8 @@ gtk_container_class_init (GtkContainerClass *class) G_TYPE_NONE, 1, GTK_TYPE_WIDGET); container_signals[CHECK_RESIZE] = - g_signal_new (I_("check_resize"), - G_OBJECT_CLASS_TYPE (object_class), + g_signal_new (I_("check-resize"), + G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkContainerClass, check_resize), NULL, NULL, @@ -283,13 +522,15 @@ gtk_container_class_init (GtkContainerClass *class) G_TYPE_NONE, 0); container_signals[SET_FOCUS_CHILD] = g_signal_new (I_("set-focus-child"), - G_OBJECT_CLASS_TYPE (object_class), + G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkContainerClass, set_focus_child), NULL, NULL, _gtk_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GTK_TYPE_WIDGET); + + g_type_class_add_private (class, sizeof (GtkContainerPrivate)); } static void @@ -307,9 +548,18 @@ gtk_container_buildable_add_child (GtkBuildable *buildable, GObject *child, const gchar *type) { - g_return_if_fail (GTK_IS_WIDGET (child)); - - gtk_container_add (GTK_CONTAINER (buildable), GTK_WIDGET (child)); + if (type) + { + GTK_BUILDER_WARN_INVALID_CHILD_TYPE (buildable, type); + } + else if (GTK_IS_WIDGET (child) && + gtk_widget_get_parent (GTK_WIDGET (child)) == NULL) + { + gtk_container_add (GTK_CONTAINER (buildable), GTK_WIDGET (child)); + } + else + g_warning ("Cannot add an object of type %s to a container of type %s", + g_type_name (G_OBJECT_TYPE (child)), g_type_name (G_OBJECT_TYPE (buildable))); } static void @@ -322,7 +572,7 @@ gtk_container_buildable_set_child_property (GtkContainer *container, GParamSpec *pspec; GValue gvalue = { 0, }; GError *error = NULL; - + pspec = gtk_container_class_find_child_property (G_OBJECT_GET_CLASS (container), name); if (!pspec) @@ -353,6 +603,8 @@ typedef struct { GtkContainer *container; GtkWidget *child; gchar *child_prop_name; + gchar *context; + gboolean translatable; } PackingPropertiesData; static void @@ -367,9 +619,25 @@ attributes_start_element (GMarkupParseContext *context, guint i; if (strcmp (element_name, "property") == 0) - for (i = 0; names[i]; i++) - if (strcmp (names[i], "name") == 0) - parser_data->child_prop_name = g_strdup (values[i]); + { + for (i = 0; names[i]; i++) + if (strcmp (names[i], "name") == 0) + parser_data->child_prop_name = g_strdup (values[i]); + else if (strcmp (names[i], "translatable") == 0) + { + if (!_gtk_builder_boolean_from_string (values[1], + &parser_data->translatable, + error)) + return; + } + else if (strcmp (names[i], "comments") == 0) + ; /* for translators */ + else if (strcmp (names[i], "context") == 0) + parser_data->context = g_strdup (values[1]); + else + g_warning ("Unsupported attribute for GtkContainer Child " + "property: %s\n", names[i]); + } else if (strcmp (element_name, "packing") == 0) return; else @@ -384,18 +652,37 @@ attributes_text_element (GMarkupParseContext *context, GError **error) { PackingPropertiesData *parser_data = (PackingPropertiesData*)user_data; + gchar* value; if (!parser_data->child_prop_name) return; + if (parser_data->translatable && text_len) + { + const gchar* domain; + domain = gtk_builder_get_translation_domain (parser_data->builder); + + value = _gtk_builder_parser_translate (domain, + parser_data->context, + text); + } + else + { + value = g_strdup (text); + } + gtk_container_buildable_set_child_property (parser_data->container, parser_data->builder, parser_data->child, parser_data->child_prop_name, - text); + value); g_free (parser_data->child_prop_name); + g_free (parser_data->context); + g_free (value); parser_data->child_prop_name = NULL; + parser_data->context = NULL; + parser_data->translatable = FALSE; } static const GMarkupParser attributes_parser = @@ -456,13 +743,13 @@ gtk_container_buildable_custom_tag_end (GtkBuildable *buildable, } /** - * gtk_container_child_type: + * gtk_container_child_type: * @container: a #GtkContainer * * Returns the type of the children supported by the container. * * Note that this may return %G_TYPE_NONE to indicate that no more - * children can be added, e.g. for a #GtkPaned which already has two + * children can be added, e.g. for a #GtkPaned which already has two * children. * * Return value: a #GType. @@ -492,7 +779,7 @@ container_get_child_property (GtkContainer *container, GValue *value) { GtkContainerClass *class = g_type_class_peek (pspec->owner_type); - + class->get_child_property (container, child, PARAM_SPEC_PARAM_ID (pspec), value, pspec); } @@ -537,9 +824,9 @@ container_set_child_property (GtkContainer *container, * @container: a #GtkContainer * @child: a widget which is a child of @container * @first_property_name: the name of the first property to get - * @var_args: return location for the first property, followed + * @var_args: return location for the first property, followed * optionally by more name/return location pairs, followed by %NULL - * + * * Gets the values of one or more child properties for @child and @container. **/ void @@ -552,7 +839,7 @@ gtk_container_child_get_valist (GtkContainer *container, g_return_if_fail (GTK_IS_CONTAINER (container)); g_return_if_fail (GTK_IS_WIDGET (child)); - g_return_if_fail (child->parent == GTK_WIDGET (container)); + g_return_if_fail (gtk_widget_get_parent (child) == GTK_WIDGET (container)); g_object_ref (container); g_object_ref (child); @@ -608,7 +895,7 @@ gtk_container_child_get_valist (GtkContainer *container, * @child: a widget which is a child of @container * @property_name: the name of the property to get * @value: a location to return the value - * + * * Gets the value of a child property for @child and @container. **/ void @@ -621,10 +908,10 @@ gtk_container_child_get_property (GtkContainer *container, g_return_if_fail (GTK_IS_CONTAINER (container)); g_return_if_fail (GTK_IS_WIDGET (child)); - g_return_if_fail (child->parent == GTK_WIDGET (container)); + g_return_if_fail (gtk_widget_get_parent (child) == GTK_WIDGET (container)); g_return_if_fail (property_name != NULL); g_return_if_fail (G_IS_VALUE (value)); - + g_object_ref (container); g_object_ref (child); pspec = g_param_spec_pool_lookup (_gtk_widget_child_property_pool, property_name, @@ -683,7 +970,7 @@ gtk_container_child_get_property (GtkContainer *container, * @first_property_name: the name of the first property to set * @var_args: a %NULL-terminated list of property names and values, starting * with @first_prop_name - * + * * Sets one or more child properties for @child and @container. **/ void @@ -697,7 +984,7 @@ gtk_container_child_set_valist (GtkContainer *container, g_return_if_fail (GTK_IS_CONTAINER (container)); g_return_if_fail (GTK_IS_WIDGET (child)); - g_return_if_fail (child->parent == GTK_WIDGET (container)); + g_return_if_fail (gtk_widget_get_parent (child) == GTK_WIDGET (container)); g_object_ref (container); g_object_ref (child); @@ -756,7 +1043,7 @@ gtk_container_child_set_valist (GtkContainer *container, * @child: a widget which is a child of @container * @property_name: the name of the property to set * @value: the value to set the property to - * + * * Sets a child property for @child and @container. **/ void @@ -770,10 +1057,10 @@ gtk_container_child_set_property (GtkContainer *container, g_return_if_fail (GTK_IS_CONTAINER (container)); g_return_if_fail (GTK_IS_WIDGET (child)); - g_return_if_fail (child->parent == GTK_WIDGET (container)); + g_return_if_fail (gtk_widget_get_parent (child) == GTK_WIDGET (container)); g_return_if_fail (property_name != NULL); g_return_if_fail (G_IS_VALUE (value)); - + g_object_ref (container); g_object_ref (child); @@ -801,12 +1088,12 @@ gtk_container_child_set_property (GtkContainer *container, /** * gtk_container_add_with_properties: - * @container: a #GtkContainer - * @widget: a widget to be placed inside @container - * @first_prop_name: the name of the first child property to set + * @container: a #GtkContainer + * @widget: a widget to be placed inside @container + * @first_prop_name: the name of the first child property to set * @Varargs: a %NULL-terminated list of property names and values, starting * with @first_prop_name - * + * * Adds @widget to @container, setting child properties at the same time. * See gtk_container_add() and gtk_container_child_set() for more details. **/ @@ -818,14 +1105,14 @@ gtk_container_add_with_properties (GtkContainer *container, { g_return_if_fail (GTK_IS_CONTAINER (container)); g_return_if_fail (GTK_IS_WIDGET (widget)); - g_return_if_fail (widget->parent == NULL); + g_return_if_fail (gtk_widget_get_parent (widget) == NULL); g_object_ref (container); g_object_ref (widget); gtk_widget_freeze_child_notify (widget); g_signal_emit (container, container_signals[ADD], 0, widget); - if (widget->parent) + if (gtk_widget_get_parent (widget)) { va_list var_args; @@ -846,7 +1133,7 @@ gtk_container_add_with_properties (GtkContainer *container, * @first_prop_name: the name of the first property to set * @Varargs: a %NULL-terminated list of property names and values, starting * with @first_prop_name - * + * * Sets one or more child properties for @child and @container. **/ void @@ -856,10 +1143,10 @@ gtk_container_child_set (GtkContainer *container, ...) { va_list var_args; - + g_return_if_fail (GTK_IS_CONTAINER (container)); g_return_if_fail (GTK_IS_WIDGET (child)); - g_return_if_fail (child->parent == GTK_WIDGET (container)); + g_return_if_fail (gtk_widget_get_parent (child) == GTK_WIDGET (container)); va_start (var_args, first_prop_name); gtk_container_child_set_valist (container, child, first_prop_name, var_args); @@ -871,9 +1158,9 @@ gtk_container_child_set (GtkContainer *container, * @container: a #GtkContainer * @child: a widget which is a child of @container * @first_prop_name: the name of the first property to get - * @Varargs: return location for the first property, followed + * @Varargs: return location for the first property, followed * optionally by more name/return location pairs, followed by %NULL - * + * * Gets the values of one or more child properties for @child and @container. **/ void @@ -883,10 +1170,10 @@ gtk_container_child_get (GtkContainer *container, ...) { va_list var_args; - + g_return_if_fail (GTK_IS_CONTAINER (container)); g_return_if_fail (GTK_IS_WIDGET (child)); - g_return_if_fail (child->parent == GTK_WIDGET (container)); + g_return_if_fail (gtk_widget_get_parent (child) == GTK_WIDGET (container)); va_start (var_args, first_prop_name); gtk_container_child_get_valist (container, child, first_prop_name, var_args); @@ -898,8 +1185,8 @@ gtk_container_child_get (GtkContainer *container, * @cclass: a #GtkContainerClass * @property_id: the id for the property * @pspec: the #GParamSpec for the property - * - * Installs a child property on a container class. + * + * Installs a child property on a container class. **/ void gtk_container_class_install_child_property (GtkContainerClass *cclass, @@ -934,7 +1221,7 @@ gtk_container_class_install_child_property (GtkContainerClass *cclass, * gtk_container_class_find_child_property: * @cclass: a #GtkContainerClass * @property_name: the name of the child property to find - * @returns: the #GParamSpec of the child property or %NULL if @class has no + * @returns: (allow-none): the #GParamSpec of the child property or %NULL if @class has no * child property with that name. * * Finds a child property of a container class by name. @@ -956,7 +1243,7 @@ gtk_container_class_find_child_property (GObjectClass *cclass, * gtk_container_class_list_child_properties: * @cclass: a #GtkContainerClass * @n_properties: location to return the number of child properties found - * @returns: a newly allocated %NULL-terminated array of #GParamSpec*. + * @returns: a newly allocated %NULL-terminated array of #GParamSpec*. * The array must be freed with g_free(). * * Returns all child properties of a container class. @@ -996,31 +1283,44 @@ gtk_container_remove_unimplemented (GtkContainer *container, static void gtk_container_init (GtkContainer *container) { - container->focus_child = NULL; - container->border_width = 0; - container->need_resize = FALSE; - container->resize_mode = GTK_RESIZE_PARENT; - container->reallocate_redraws = FALSE; + GtkContainerPrivate *priv; + + container->priv = G_TYPE_INSTANCE_GET_PRIVATE (container, + GTK_TYPE_CONTAINER, + GtkContainerPrivate); + priv = container->priv; + + priv->focus_child = NULL; + priv->border_width = 0; + priv->need_resize = FALSE; + priv->resize_mode = GTK_RESIZE_PARENT; + priv->reallocate_redraws = FALSE; } static void -gtk_container_destroy (GtkObject *object) +gtk_container_destroy (GtkWidget *widget) { - GtkContainer *container = GTK_CONTAINER (object); - - if (GTK_CONTAINER_RESIZE_PENDING (container)) + GtkContainer *container = GTK_CONTAINER (widget); + GtkContainerPrivate *priv = container->priv; + + if (_gtk_widget_get_resize_pending (GTK_WIDGET (container))) _gtk_container_dequeue_resize_handler (container); + if (priv->focus_child) + { + g_object_unref (priv->focus_child); + priv->focus_child = NULL; + } + /* do this before walking child widgets, to avoid * removing children from focus chain one by one. */ - if (container->has_focus_chain) + if (priv->has_focus_chain) gtk_container_unset_focus_chain (container); - + gtk_container_foreach (container, (GtkCallback) gtk_widget_destroy, NULL); - - if (GTK_OBJECT_CLASS (parent_class)->destroy) - (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); + + GTK_WIDGET_CLASS (parent_class)->destroy (widget); } static void @@ -1055,14 +1355,15 @@ gtk_container_get_property (GObject *object, GParamSpec *pspec) { GtkContainer *container = GTK_CONTAINER (object); - + GtkContainerPrivate *priv = container->priv; + switch (prop_id) { case PROP_BORDER_WIDTH: - g_value_set_uint (value, container->border_width); + g_value_set_uint (value, priv->border_width); break; case PROP_RESIZE_MODE: - g_value_set_enum (value, container->resize_mode); + g_value_set_enum (value, priv->resize_mode); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -1073,7 +1374,7 @@ gtk_container_get_property (GObject *object, /** * gtk_container_set_border_width: * @container: a #GtkContainer - * @border_width: amount of blank space to leave outside + * @border_width: amount of blank space to leave outside * the container. Valid values are in the range 0-65535 pixels. * * Sets the border width of the container. @@ -1091,14 +1392,18 @@ void gtk_container_set_border_width (GtkContainer *container, guint border_width) { + GtkContainerPrivate *priv; + g_return_if_fail (GTK_IS_CONTAINER (container)); - if (container->border_width != border_width) + priv = container->priv; + + if (priv->border_width != border_width) { - container->border_width = border_width; + priv->border_width = border_width; g_object_notify (G_OBJECT (container), "border-width"); - - if (GTK_WIDGET_REALIZED (container)) + + if (gtk_widget_get_realized (GTK_WIDGET (container))) gtk_widget_queue_resize (GTK_WIDGET (container)); } } @@ -1106,7 +1411,7 @@ gtk_container_set_border_width (GtkContainer *container, /** * gtk_container_get_border_width: * @container: a #GtkContainer - * + * * Retrieves the border width of the container. See * gtk_container_set_border_width(). * @@ -1117,14 +1422,14 @@ gtk_container_get_border_width (GtkContainer *container) { g_return_val_if_fail (GTK_IS_CONTAINER (container), 0); - return container->border_width; + return container->priv->border_width; } /** * gtk_container_add: * @container: a #GtkContainer * @widget: a widget to be placed inside @container - * + * * Adds @widget to @container. Typically used for simple containers * such as #GtkWindow, #GtkFrame, or #GtkButton; for more complicated * layout containers such as #GtkBox or #GtkTable, this function will @@ -1138,17 +1443,21 @@ void gtk_container_add (GtkContainer *container, GtkWidget *widget) { + GtkWidget *parent; + g_return_if_fail (GTK_IS_CONTAINER (container)); g_return_if_fail (GTK_IS_WIDGET (widget)); - if (widget->parent != NULL) + parent = gtk_widget_get_parent (widget); + + if (parent != NULL) { g_warning ("Attempting to add a widget with type %s to a container of " "type %s, but the widget is already inside a container of type %s, " - "the GTK+ FAQ at http://www.gtk.org/faq/ explains how to reparent a widget.", + "please use gtk_widget_reparent()" , g_type_name (G_OBJECT_TYPE (widget)), g_type_name (G_OBJECT_TYPE (container)), - g_type_name (G_OBJECT_TYPE (widget->parent))); + g_type_name (G_OBJECT_TYPE (parent))); return; } @@ -1159,7 +1468,7 @@ gtk_container_add (GtkContainer *container, * gtk_container_remove: * @container: a #GtkContainer * @widget: a current child of @container - * + * * Removes @widget from @container. @widget must be inside @container. * Note that @container will own a reference to @widget, and that this * may be the last reference held; so removing a widget from its @@ -1176,14 +1485,8 @@ gtk_container_remove (GtkContainer *container, { g_return_if_fail (GTK_IS_CONTAINER (container)); g_return_if_fail (GTK_IS_WIDGET (widget)); + g_return_if_fail (gtk_widget_get_parent (widget) == GTK_WIDGET (container)); - /* When using the deprecated API of the toolbar, it is possible - * to legitimately call this function with a widget that is not - * a direct child of the container. - */ - g_return_if_fail (GTK_IS_TOOLBAR (container) || - widget->parent == GTK_WIDGET (container)); - g_signal_emit (container, container_signals[REMOVE], 0, widget); } @@ -1191,20 +1494,20 @@ void _gtk_container_dequeue_resize_handler (GtkContainer *container) { g_return_if_fail (GTK_IS_CONTAINER (container)); - g_return_if_fail (GTK_CONTAINER_RESIZE_PENDING (container)); + g_return_if_fail (_gtk_widget_get_resize_pending (GTK_WIDGET (container))); container_resize_queue = g_slist_remove (container_resize_queue, container); - GTK_PRIVATE_UNSET_FLAG (container, GTK_RESIZE_PENDING); + _gtk_widget_set_resize_pending (GTK_WIDGET (container), FALSE); } /** * gtk_container_set_resize_mode: * @container: a #GtkContainer * @resize_mode: the new resize mode - * + * * Sets the resize mode for the container. * - * The resize mode of a container determines whether a resize request + * The resize mode of a container determines whether a resize request * will be passed to the container's parent, queued for later execution * or executed immediately. **/ @@ -1212,19 +1515,23 @@ void gtk_container_set_resize_mode (GtkContainer *container, GtkResizeMode resize_mode) { + GtkContainerPrivate *priv; + g_return_if_fail (GTK_IS_CONTAINER (container)); g_return_if_fail (resize_mode <= GTK_RESIZE_IMMEDIATE); - - if (GTK_WIDGET_TOPLEVEL (container) && + + priv = container->priv; + + if (gtk_widget_is_toplevel (GTK_WIDGET (container)) && resize_mode == GTK_RESIZE_PARENT) { resize_mode = GTK_RESIZE_QUEUE; } - - if (container->resize_mode != resize_mode) + + if (priv->resize_mode != resize_mode) { - container->resize_mode = resize_mode; - + priv->resize_mode = resize_mode; + gtk_widget_queue_resize (GTK_WIDGET (container)); g_object_notify (G_OBJECT (container), "resize-mode"); } @@ -1233,7 +1540,7 @@ gtk_container_set_resize_mode (GtkContainer *container, /** * gtk_container_get_resize_mode: * @container: a #GtkContainer - * + * * Returns the resize mode for the container. See * gtk_container_set_resize_mode (). * @@ -1244,7 +1551,7 @@ gtk_container_get_resize_mode (GtkContainer *container) { g_return_val_if_fail (GTK_IS_CONTAINER (container), GTK_RESIZE_PARENT); - return container->resize_mode; + return container->priv->resize_mode; } /** @@ -1253,29 +1560,30 @@ gtk_container_get_resize_mode (GtkContainer *container) * @needs_redraws: the new value for the container's @reallocate_redraws flag * * Sets the @reallocate_redraws flag of the container to the given value. - * + * * Containers requesting reallocation redraws get automatically - * redrawn if any of their children changed allocation. - **/ + * redrawn if any of their children changed allocation. + **/ void gtk_container_set_reallocate_redraws (GtkContainer *container, gboolean needs_redraws) { g_return_if_fail (GTK_IS_CONTAINER (container)); - container->reallocate_redraws = needs_redraws ? TRUE : FALSE; + container->priv->reallocate_redraws = needs_redraws ? TRUE : FALSE; } static GtkContainer* gtk_container_get_resize_container (GtkContainer *container) { + GtkWidget *parent; GtkWidget *widget = GTK_WIDGET (container); - while (widget->parent) + while ((parent = gtk_widget_get_parent (widget))) { - widget = widget->parent; + widget = parent; if (GTK_IS_RESIZE_CONTAINER (widget)) - break; + break; } return GTK_IS_RESIZE_CONTAINER (widget) ? (GtkContainer*) widget : NULL; @@ -1300,7 +1608,7 @@ gtk_container_idle_sizer (gpointer data) widget = slist->data; g_slist_free_1 (slist); - GTK_PRIVATE_UNSET_FLAG (widget, GTK_RESIZE_PENDING); + _gtk_widget_set_resize_pending (widget, FALSE); gtk_container_check_resize (GTK_CONTAINER (widget)); } @@ -1309,39 +1617,47 @@ gtk_container_idle_sizer (gpointer data) return FALSE; } -void -_gtk_container_queue_resize (GtkContainer *container) +static void +_gtk_container_queue_resize_internal (GtkContainer *container, + gboolean invalidate_only) { + GtkContainerPrivate *priv; GtkContainer *resize_container; + GtkWidget *parent; GtkWidget *widget; - + g_return_if_fail (GTK_IS_CONTAINER (container)); + priv = container->priv; widget = GTK_WIDGET (container); + resize_container = gtk_container_get_resize_container (container); - + while (TRUE) { - GTK_PRIVATE_SET_FLAG (widget, GTK_ALLOC_NEEDED); - GTK_PRIVATE_SET_FLAG (widget, GTK_REQUEST_NEEDED); + _gtk_widget_set_alloc_needed (widget, TRUE); + _gtk_widget_set_width_request_needed (widget, TRUE); + _gtk_widget_set_height_request_needed (widget, TRUE); + if ((resize_container && widget == GTK_WIDGET (resize_container)) || - !widget->parent) + !(parent = gtk_widget_get_parent (widget))) break; - - widget = widget->parent; + + widget = parent; } - - if (resize_container) + + if (resize_container && !invalidate_only) { - if (GTK_WIDGET_VISIBLE (resize_container) && - (GTK_WIDGET_TOPLEVEL (resize_container) || GTK_WIDGET_REALIZED (resize_container))) + if (gtk_widget_get_visible (GTK_WIDGET (resize_container)) && + (gtk_widget_is_toplevel (GTK_WIDGET (resize_container)) || + gtk_widget_get_realized (GTK_WIDGET (resize_container)))) { - switch (resize_container->resize_mode) + switch (resize_container->priv->resize_mode) { case GTK_RESIZE_QUEUE: - if (!GTK_CONTAINER_RESIZE_PENDING (resize_container)) + if (!_gtk_widget_get_resize_pending (GTK_WIDGET (resize_container))) { - GTK_PRIVATE_SET_FLAG (resize_container, GTK_RESIZE_PENDING); + _gtk_widget_set_resize_pending (GTK_WIDGET (resize_container), TRUE); if (container_resize_queue == NULL) gdk_threads_add_idle_full (GTK_PRIORITY_RESIZE, gtk_container_idle_sizer, @@ -1365,16 +1681,46 @@ _gtk_container_queue_resize (GtkContainer *container) * changed while they where hidden (currently only evaluated by * toplevels). */ - resize_container->need_resize = TRUE; + resize_container->priv->need_resize = TRUE; } } } +/** + * _gtk_container_queue_resize: + * @container: a #GtkContainer + * + * Determines the "resize container" in the hierarchy above this container + * (typically the toplevel, but other containers can be set as resize + * containers with gtk_container_set_resize_mode()), marks the container + * and all parents up to and including the resize container as needing + * to have sizes recompted, and if necessary adds the resize container + * to the queue of containers that will be resized out at idle. + */ +void +_gtk_container_queue_resize (GtkContainer *container) +{ + _gtk_container_queue_resize_internal (container, FALSE); +} + +/** + * _gtk_container_resize_invalidate: + * @container: a #GtkContainer + * + * Invalidates cached sizes like _gtk_container_queue_resize() but doesn't + * actually queue the resize container for resize. + */ +void +_gtk_container_resize_invalidate (GtkContainer *container) +{ + _gtk_container_queue_resize_internal (container, TRUE); +} + void gtk_container_check_resize (GtkContainer *container) { g_return_if_fail (GTK_IS_CONTAINER (container)); - + g_signal_emit (container, container_signals[CHECK_RESIZE], 0); } @@ -1382,16 +1728,21 @@ static void gtk_container_real_check_resize (GtkContainer *container) { GtkWidget *widget = GTK_WIDGET (container); + GtkAllocation allocation; GtkRequisition requisition; - - gtk_widget_size_request (widget, &requisition); - - if (requisition.width > widget->allocation.width || - requisition.height > widget->allocation.height) + + gtk_widget_get_preferred_size (widget, + &requisition, NULL); + gtk_widget_get_allocation (widget, &allocation); + + if (requisition.width > allocation.width || + requisition.height > allocation.height) { if (GTK_IS_RESIZE_CONTAINER (container)) - gtk_widget_size_allocate (GTK_WIDGET (container), - >K_WIDGET (container)->allocation); + { + gtk_widget_size_allocate (widget, &allocation); + gtk_widget_set_allocation (widget, &allocation); + } else gtk_widget_queue_resize (widget); } @@ -1406,13 +1757,14 @@ gtk_container_real_check_resize (GtkContainer *container) * is not sufficient for the requisition of some child. * We've already performed a size request at this point, * so we simply need to reallocate and let the allocation - * trickle down via GTK_WIDGET_ALLOC_NEEDED flags. + * trickle down via GTK_WIDGET_ALLOC_NEEDED flags. */ void gtk_container_resize_children (GtkContainer *container) { + GtkAllocation allocation; GtkWidget *widget; - + /* resizing invariants: * toplevels have *always* resize_mode != GTK_RESIZE_PARENT set. * containers that have an idle sizer pending must be flagged with @@ -1421,7 +1773,114 @@ gtk_container_resize_children (GtkContainer *container) g_return_if_fail (GTK_IS_CONTAINER (container)); widget = GTK_WIDGET (container); - gtk_widget_size_allocate (widget, &widget->allocation); + gtk_widget_get_allocation (widget, &allocation); + + gtk_widget_size_allocate (widget, &allocation); + gtk_widget_set_allocation (widget, &allocation); +} + +static void +gtk_container_adjust_size_request (GtkWidget *widget, + GtkOrientation orientation, + gint *minimum_size, + gint *natural_size) +{ + GtkContainer *container; + + container = GTK_CONTAINER (widget); + + if (GTK_CONTAINER_GET_CLASS (widget)->handle_border_width) + { + int border_width; + + border_width = container->priv->border_width; + + *minimum_size += border_width * 2; + *natural_size += border_width * 2; + } + + /* chain up last so gtk_widget_set_size_request() values + * will have a chance to overwrite our border width. + */ + parent_class->adjust_size_request (widget, orientation, + minimum_size, natural_size); +} + +static void +gtk_container_adjust_size_allocation (GtkWidget *widget, + GtkOrientation orientation, + gint *natural_size, + gint *allocated_pos, + gint *allocated_size) +{ + GtkContainer *container; + int border_width; + + container = GTK_CONTAINER (widget); + + if (!GTK_CONTAINER_GET_CLASS (widget)->handle_border_width) + { + parent_class->adjust_size_allocation (widget, orientation, + natural_size, allocated_pos, + allocated_size); + return; + } + + border_width = container->priv->border_width; + + *allocated_size -= border_width * 2; + + /* If we get a pathological too-small allocation to hold + * even the border width, leave all allocation to the actual + * widget, and leave x,y unchanged. (GtkWidget's min size is + * 1x1 if you're wondering why <1 and not <0) + * + * As long as we have space, set x,y properly. + */ + + if (*allocated_size < 1) + { + *allocated_size += border_width * 2; + } + else + { + *allocated_pos += border_width; + *natural_size -= border_width * 2; + } + + /* Chain up to GtkWidgetClass *after* removing our border width from + * the proposed allocation size. This is because it's possible that the + * widget was allocated more space than it needs in a said orientation, + * if GtkWidgetClass does any alignments and thus limits the size to the + * natural size... then we need that to be done *after* removing any margins + * and padding values. + */ + parent_class->adjust_size_allocation (widget, orientation, + natural_size, allocated_pos, + allocated_size); +} + +/** + * gtk_container_class_handle_border_width: + * @klass: the class struct of a #GtkContainer subclass + * + * Modifies a subclass of #GtkContainerClass to automatically add and + * remove the border-width setting on GtkContainer. This allows the + * subclass to ignore the border width in its size request and + * allocate methods. The intent is for a subclass to invoke this + * in its class_init function. + * + * gtk_container_class_handle_border_width() is necessary because it + * would break API too badly to make this behavior the default. So + * subclasses must "opt in" to the parent class handling border_width + * for them. + */ +void +gtk_container_class_handle_border_width (GtkContainerClass *klass) +{ + g_return_if_fail (GTK_IS_CONTAINER_CLASS (klass)); + + klass->handle_border_width = TRUE; } /** @@ -1429,7 +1888,7 @@ gtk_container_resize_children (GtkContainer *container) * @container: a #GtkContainer * @callback: a callback * @callback_data: callback user data - * + * * Invokes @callback on each child of @container, including children * that are considered "internal" (implementation details of the * container). "Internal" children generally weren't added by the user @@ -1456,9 +1915,9 @@ gtk_container_forall (GtkContainer *container, /** * gtk_container_foreach: * @container: a #GtkContainer - * @callback: a callback + * @callback: (scope call): a callback * @callback_data: callback user data - * + * * Invokes @callback on each non-internal child of @container. See * gtk_container_forall() for details on what constitutes an * "internal" child. Most applications should use @@ -1470,7 +1929,7 @@ gtk_container_foreach (GtkContainer *container, gpointer callback_data) { GtkContainerClass *class; - + g_return_if_fail (GTK_IS_CONTAINER (container)); g_return_if_fail (callback != NULL); @@ -1480,112 +1939,60 @@ gtk_container_foreach (GtkContainer *container, class->forall (container, FALSE, callback, callback_data); } -typedef struct _GtkForeachData GtkForeachData; -struct _GtkForeachData -{ - GtkObject *container; - GtkCallbackMarshal callback; - gpointer callback_data; -}; - -static void -gtk_container_foreach_unmarshal (GtkWidget *child, - gpointer data) -{ - GtkForeachData *fdata = (GtkForeachData*) data; - GtkArg args[2]; - - /* first argument */ - args[0].name = NULL; - args[0].type = G_TYPE_FROM_INSTANCE (child); - GTK_VALUE_OBJECT (args[0]) = GTK_OBJECT (child); - - /* location for return value */ - args[1].name = NULL; - args[1].type = G_TYPE_NONE; - - fdata->callback (fdata->container, fdata->callback_data, 1, args); -} - -void -gtk_container_foreach_full (GtkContainer *container, - GtkCallback callback, - GtkCallbackMarshal marshal, - gpointer callback_data, - GDestroyNotify notify) -{ - g_return_if_fail (GTK_IS_CONTAINER (container)); - - if (marshal) - { - GtkForeachData fdata; - - fdata.container = GTK_OBJECT (container); - fdata.callback = marshal; - fdata.callback_data = callback_data; - - gtk_container_foreach (container, gtk_container_foreach_unmarshal, &fdata); - } - else - { - g_return_if_fail (callback != NULL); - - gtk_container_foreach (container, callback, &callback_data); - } - - if (notify) - notify (callback_data); -} - /** * gtk_container_set_focus_child: * @container: a #GtkContainer - * @widget: a #GtkWidget, or %NULL + * @child: (allow-none): a #GtkWidget, or %NULL * - * Sets, or unsets if @widget is %NULL, the focused child of @container. + * Sets, or unsets if @child is %NULL, the focused child of @container. * * This function emits the GtkContainer::set_focus_child signal of * @container. Implementations of #GtkContainer can override the * default behaviour by overriding the class closure of this signal. + * + * This is function is mostly meant to be used by widgets. Applications can use + * gtk_widget_grab_focus() to manualy set the focus to a specific widget. */ void gtk_container_set_focus_child (GtkContainer *container, - GtkWidget *widget) + GtkWidget *child) { g_return_if_fail (GTK_IS_CONTAINER (container)); - if (widget) - g_return_if_fail (GTK_IS_WIDGET (widget)); + if (child) + g_return_if_fail (GTK_IS_WIDGET (child)); - g_signal_emit (container, container_signals[SET_FOCUS_CHILD], 0, widget); + g_signal_emit (container, container_signals[SET_FOCUS_CHILD], 0, child); } /** * gtk_container_get_focus_child: * @container: a #GtkContainer * - * Returns the current focus child widget inside @container. + * Returns the current focus child widget inside @container. This is not the + * currently focused widget. That can be obtained by calling + * gtk_window_get_focus(). * - * Returns: The child widget which has the focus - * inside @container, or %NULL if none is set. + * Returns: The child widget which will recieve the focus inside @container when + * the @conatiner is focussed, or %NULL if none is set. * - * Since: GSEAL-branch + * Since: 2.14 **/ GtkWidget * gtk_container_get_focus_child (GtkContainer *container) { g_return_val_if_fail (GTK_IS_CONTAINER (container), NULL); - return container->focus_child; + return container->priv->focus_child; } /** * gtk_container_get_children: * @container: a #GtkContainer - * + * * Returns the container's non-internal children. See - * gtk_container_forall() for details on what constitutes an "internal" child. + * gtk_container_forall() for details on what constitutes an "internal" child. * - * Return value: a newly-allocated list of the container's non-internal children. + * Return value: (element-type GtkWidget) (transfer container): a newly-allocated list of the container's non-internal children. **/ GList* gtk_container_get_children (GtkContainer *container) @@ -1632,7 +2039,7 @@ gtk_container_child_default_composite_name (GtkContainer *container, gtk_container_forall (container, gtk_container_child_position_callback, &data); - + name = g_strdup_printf ("%s-%u", g_type_name (G_TYPE_FROM_INSTANCE (child)), data.index); @@ -1644,11 +2051,14 @@ gchar* _gtk_container_child_composite_name (GtkContainer *container, GtkWidget *child) { + gboolean composite_child; + g_return_val_if_fail (GTK_IS_CONTAINER (container), NULL); g_return_val_if_fail (GTK_IS_WIDGET (child), NULL); - g_return_val_if_fail (child->parent == GTK_WIDGET (container), NULL); + g_return_val_if_fail (gtk_widget_get_parent (child) == GTK_WIDGET (container), NULL); - if (GTK_WIDGET_COMPOSITE_CHILD (child)) + g_object_get (child, "composite-child", &composite_child, NULL); + if (composite_child) { static GQuark quark_composite_name = 0; gchar *name; @@ -1670,59 +2080,113 @@ _gtk_container_child_composite_name (GtkContainer *container, return name; } - + return NULL; } +typedef struct { + gboolean hexpand; + gboolean vexpand; +} ComputeExpandData; + +static void +gtk_container_compute_expand_callback (GtkWidget *widget, + gpointer client_data) +{ + ComputeExpandData *data = client_data; + + /* note that we don't get_expand on the child if we already know we + * have to expand, so we only recurse into children until we find + * one that expands and then we basically don't do any more + * work. This means that we can leave some children in a + * need_compute_expand state, which is fine, as long as GtkWidget + * doesn't rely on an invariant that "if a child has + * need_compute_expand, its parents also do" + * + * gtk_widget_compute_expand() always returns FALSE if the + * child is !visible so that's taken care of. + */ + data->hexpand = data->hexpand || + gtk_widget_compute_expand (widget, GTK_ORIENTATION_HORIZONTAL); + + data->vexpand = data->vexpand || + gtk_widget_compute_expand (widget, GTK_ORIENTATION_VERTICAL); +} + +static void +gtk_container_compute_expand (GtkWidget *widget, + gboolean *hexpand_p, + gboolean *vexpand_p) +{ + ComputeExpandData data; + + data.hexpand = FALSE; + data.vexpand = FALSE; + + gtk_container_forall (GTK_CONTAINER (widget), + gtk_container_compute_expand_callback, + &data); + + *hexpand_p = data.hexpand; + *vexpand_p = data.vexpand; +} + static void gtk_container_real_set_focus_child (GtkContainer *container, GtkWidget *child) { + GtkContainerPrivate *priv; + g_return_if_fail (GTK_IS_CONTAINER (container)); g_return_if_fail (child == NULL || GTK_IS_WIDGET (child)); - if (child != container->focus_child) + priv = container->priv; + + if (child != priv->focus_child) { - if (container->focus_child) - g_object_unref (container->focus_child); - container->focus_child = child; - if (container->focus_child) - g_object_ref (container->focus_child); + if (priv->focus_child) + g_object_unref (priv->focus_child); + priv->focus_child = child; + if (priv->focus_child) + g_object_ref (priv->focus_child); } /* check for h/v adjustments */ - if (container->focus_child) + if (priv->focus_child) { GtkAdjustment *hadj; GtkAdjustment *vadj; + GtkAllocation allocation; GtkWidget *focus_child; gint x, y; - hadj = g_object_get_qdata (G_OBJECT (container), hadjustment_key_id); + hadj = g_object_get_qdata (G_OBJECT (container), hadjustment_key_id); vadj = g_object_get_qdata (G_OBJECT (container), vadjustment_key_id); - if (hadj || vadj) + if (hadj || vadj) { - focus_child = container->focus_child; - while (GTK_IS_CONTAINER (focus_child) && - GTK_CONTAINER (focus_child)->focus_child) + focus_child = priv->focus_child; + while (GTK_IS_CONTAINER (focus_child) && gtk_container_get_focus_child (GTK_CONTAINER (focus_child))) { - focus_child = GTK_CONTAINER (focus_child)->focus_child; + focus_child = gtk_container_get_focus_child (GTK_CONTAINER (focus_child)); } - - gtk_widget_translate_coordinates (focus_child, container->focus_child, + + gtk_widget_translate_coordinates (focus_child, priv->focus_child, 0, 0, &x, &y); - x += container->focus_child->allocation.x; - y += container->focus_child->allocation.y; - + gtk_widget_get_allocation (priv->focus_child, &allocation); + x += allocation.x; + y += allocation.y; + + gtk_widget_get_allocation (focus_child, &allocation); + if (vadj) - gtk_adjustment_clamp_page (vadj, y, y + focus_child->allocation.height); - + gtk_adjustment_clamp_page (vadj, y, y + allocation.height); + if (hadj) - gtk_adjustment_clamp_page (hadj, x, x + focus_child->allocation.width); + gtk_adjustment_clamp_page (hadj, x, x + allocation.width); } } } @@ -1747,6 +2211,13 @@ gtk_container_get_all_children (GtkContainer *container) return children; } +static GtkWidgetPath * +gtk_container_real_get_path_for_child (GtkContainer *container, + GtkWidget *child) +{ + return gtk_widget_path_copy (gtk_widget_get_path (GTK_WIDGET (container))); +} + static gboolean gtk_container_focus (GtkWidget *widget, GtkDirectionType direction) @@ -1755,18 +2226,20 @@ gtk_container_focus (GtkWidget *widget, GList *sorted_children; gint return_val; GtkContainer *container; + GtkContainerPrivate *priv; g_return_val_if_fail (GTK_IS_CONTAINER (widget), FALSE); container = GTK_CONTAINER (widget); + priv = container->priv; return_val = FALSE; - if (GTK_WIDGET_CAN_FOCUS (container)) + if (gtk_widget_get_can_focus (widget)) { - if (!GTK_WIDGET_HAS_FOCUS (container)) + if (!gtk_widget_has_focus (widget)) { - gtk_widget_grab_focus (GTK_WIDGET (container)); + gtk_widget_grab_focus (widget); return_val = TRUE; } } @@ -1775,23 +2248,23 @@ gtk_container_focus (GtkWidget *widget, /* Get a list of the containers children, allowing focus * chain to override. */ - if (container->has_focus_chain) + if (priv->has_focus_chain) children = g_list_copy (get_focus_chain (container)); else children = gtk_container_get_all_children (container); - if (container->has_focus_chain && + if (priv->has_focus_chain && (direction == GTK_DIR_TAB_FORWARD || direction == GTK_DIR_TAB_BACKWARD)) { sorted_children = g_list_copy (children); - + if (direction == GTK_DIR_TAB_BACKWARD) sorted_children = g_list_reverse (sorted_children); } else sorted_children = _gtk_container_focus_sort (container, children, direction, NULL); - + return_val = gtk_container_focus_move (container, sorted_children, direction); g_list_free (sorted_children); @@ -1806,19 +2279,24 @@ tab_compare (gconstpointer a, gconstpointer b, gpointer data) { + GtkAllocation child1_allocation, child2_allocation; const GtkWidget *child1 = a; const GtkWidget *child2 = b; GtkTextDirection text_direction = GPOINTER_TO_INT (data); + gint y1, y2; + + gtk_widget_get_allocation ((GtkWidget *) child1, &child1_allocation); + gtk_widget_get_allocation ((GtkWidget *) child2, &child2_allocation); - gint y1 = child1->allocation.y + child1->allocation.height / 2; - gint y2 = child2->allocation.y + child2->allocation.height / 2; + y1 = child1_allocation.y + child1_allocation.height / 2; + y2 = child2_allocation.y + child2_allocation.height / 2; if (y1 == y2) { - gint x1 = child1->allocation.x + child1->allocation.width / 2; - gint x2 = child2->allocation.x + child2->allocation.width / 2; - - if (text_direction == GTK_TEXT_DIR_RTL) + gint x1 = child1_allocation.x + child1_allocation.width / 2; + gint x2 = child2_allocation.x + child2_allocation.width / 2; + + if (text_direction == GTK_TEXT_DIR_RTL) return (x1 < x2) ? 1 : ((x1 == x2) ? 0 : -1); else return (x1 < x2) ? -1 : ((x1 == x2) ? 0 : 1); @@ -1853,7 +2331,7 @@ get_allocation_coords (GtkContainer *container, GtkWidget *widget, GdkRectangle *allocation) { - *allocation = widget->allocation; + gtk_widget_get_allocation (widget, allocation); return gtk_widget_translate_coordinates (widget, GTK_WIDGET (container), 0, 0, &allocation->x, &allocation->y); @@ -1875,8 +2353,11 @@ find_old_focus (GtkContainer *container, while (widget && widget != (GtkWidget *)container) { - GtkWidget *parent = widget->parent; - if (parent && ((GtkContainer *)parent)->focus_child != widget) + GtkWidget *parent; + + parent = gtk_widget_get_parent (widget); + + if (parent && (gtk_container_get_focus_child (GTK_CONTAINER (parent)) != widget)) goto next; widget = parent; @@ -1897,15 +2378,16 @@ old_focus_coords (GtkContainer *container, { GtkWidget *widget = GTK_WIDGET (container); GtkWidget *toplevel = gtk_widget_get_toplevel (widget); + GtkWidget *old_focus; - if (GTK_IS_WINDOW (toplevel) && GTK_WINDOW (toplevel)->focus_widget) + if (GTK_IS_WINDOW (toplevel)) { - GtkWidget *old_focus = GTK_WINDOW (toplevel)->focus_widget; - - return get_allocation_coords (container, old_focus, old_focus_rect); + old_focus = gtk_window_get_focus (GTK_WINDOW (toplevel)); + if (old_focus) + return get_allocation_coords (container, old_focus, old_focus_rect); } - else - return FALSE; + + return FALSE; } typedef struct _CompareInfo CompareInfo; @@ -1963,7 +2445,7 @@ gtk_container_focus_sort_up_down (GtkContainer *container, if (!old_focus) old_focus = find_old_focus (container, children); - + if (old_focus && get_allocation_coords (container, old_focus, &old_allocation)) { gint compare_x1; @@ -1979,7 +2461,7 @@ gtk_container_focus_sort_up_down (GtkContainer *container, compare_y = old_allocation.y; else compare_y = old_allocation.y + old_allocation.height; - + tmp_list = children; while (tmp_list) { @@ -1987,14 +2469,14 @@ gtk_container_focus_sort_up_down (GtkContainer *container, GList *next = tmp_list->next; gint child_x1, child_x2; GdkRectangle child_allocation; - + if (child != old_focus) { if (get_allocation_coords (container, child, &child_allocation)) { child_x1 = child_allocation.x; child_x2 = child_allocation.x + child_allocation.width; - + if ((child_x2 <= compare_x1 || child_x1 >= compare_x2) /* No horizontal overlap */ || (direction == GTK_DIR_DOWN && child_allocation.y + child_allocation.height < compare_y) || /* Not below */ (direction == GTK_DIR_UP && child_allocation.y > compare_y)) /* Not above */ @@ -2005,7 +2487,7 @@ gtk_container_focus_sort_up_down (GtkContainer *container, else children = g_list_delete_link (children, tmp_list); } - + tmp_list = next; } @@ -2016,25 +2498,28 @@ gtk_container_focus_sort_up_down (GtkContainer *container, { /* No old focus widget, need to figure out starting x,y some other way */ + GtkAllocation allocation; GtkWidget *widget = GTK_WIDGET (container); GdkRectangle old_focus_rect; + gtk_widget_get_allocation (widget, &allocation); + if (old_focus_coords (container, &old_focus_rect)) { compare.x = old_focus_rect.x + old_focus_rect.width / 2; } else { - if (GTK_WIDGET_NO_WINDOW (widget)) - compare.x = widget->allocation.x + widget->allocation.width / 2; + if (!gtk_widget_get_has_window (widget)) + compare.x = allocation.x + allocation.width / 2; else - compare.x = widget->allocation.width / 2; + compare.x = allocation.width / 2; } - - if (GTK_WIDGET_NO_WINDOW (widget)) - compare.y = (direction == GTK_DIR_DOWN) ? widget->allocation.y : widget->allocation.y + widget->allocation.height; + + if (!gtk_widget_get_has_window (widget)) + compare.y = (direction == GTK_DIR_DOWN) ? allocation.y : allocation.y + allocation.height; else - compare.y = (direction == GTK_DIR_DOWN) ? 0 : + widget->allocation.height; + compare.y = (direction == GTK_DIR_DOWN) ? 0 : + allocation.height; } children = g_list_sort_with_data (children, up_down_compare, &compare); @@ -2090,13 +2575,13 @@ gtk_container_focus_sort_left_right (GtkContainer *container, if (!old_focus) old_focus = find_old_focus (container, children); - + if (old_focus && get_allocation_coords (container, old_focus, &old_allocation)) { gint compare_y1; gint compare_y2; gint compare_x; - + /* Delete widgets from list that don't match minimum criteria */ compare_y1 = old_allocation.y; @@ -2106,7 +2591,7 @@ gtk_container_focus_sort_left_right (GtkContainer *container, compare_x = old_allocation.x; else compare_x = old_allocation.x + old_allocation.width; - + tmp_list = children; while (tmp_list) { @@ -2114,14 +2599,14 @@ gtk_container_focus_sort_left_right (GtkContainer *container, GList *next = tmp_list->next; gint child_y1, child_y2; GdkRectangle child_allocation; - + if (child != old_focus) { if (get_allocation_coords (container, child, &child_allocation)) { child_y1 = child_allocation.y; child_y2 = child_allocation.y + child_allocation.height; - + if ((child_y2 <= compare_y1 || child_y1 >= compare_y2) /* No vertical overlap */ || (direction == GTK_DIR_RIGHT && child_allocation.x + child_allocation.width < compare_x) || /* Not to left */ (direction == GTK_DIR_LEFT && child_allocation.x > compare_x)) /* Not to right */ @@ -2132,7 +2617,7 @@ gtk_container_focus_sort_left_right (GtkContainer *container, else children = g_list_delete_link (children, tmp_list); } - + tmp_list = next; } @@ -2143,25 +2628,28 @@ gtk_container_focus_sort_left_right (GtkContainer *container, { /* No old focus widget, need to figure out starting x,y some other way */ + GtkAllocation allocation; GtkWidget *widget = GTK_WIDGET (container); GdkRectangle old_focus_rect; + gtk_widget_get_allocation (widget, &allocation); + if (old_focus_coords (container, &old_focus_rect)) { compare.y = old_focus_rect.y + old_focus_rect.height / 2; } else { - if (GTK_WIDGET_NO_WINDOW (widget)) - compare.y = widget->allocation.y + widget->allocation.height / 2; + if (!gtk_widget_get_has_window (widget)) + compare.y = allocation.y + allocation.height / 2; else - compare.y = widget->allocation.height / 2; + compare.y = allocation.height / 2; } - - if (GTK_WIDGET_NO_WINDOW (widget)) - compare.x = (direction == GTK_DIR_RIGHT) ? widget->allocation.x : widget->allocation.x + widget->allocation.width; + + if (!gtk_widget_get_has_window (widget)) + compare.x = (direction == GTK_DIR_RIGHT) ? allocation.x : allocation.x + allocation.width; else - compare.x = (direction == GTK_DIR_RIGHT) ? 0 : widget->allocation.width; + compare.x = (direction == GTK_DIR_RIGHT) ? 0 : allocation.width; } children = g_list_sort_with_data (children, left_right_compare, &compare); @@ -2178,15 +2666,15 @@ gtk_container_focus_sort_left_right (GtkContainer *container, * @children: a list of descendents of @container (they don't * have to be direct children) * @direction: focus direction - * @old_focus: widget to use for the starting position, or %NULL + * @old_focus: (allow-none): widget to use for the starting position, or %NULL * to determine this automatically. * (Note, this argument isn't used for GTK_DIR_TAB_*, * which is the only @direction we use currently, * so perhaps this argument should be removed) - * + * * Sorts @children in the correct order for focusing with * direction type @direction. - * + * * Return value: a copy of @children, sorted in correct focusing order, * with children that aren't suitable for focusing in this direction * removed. @@ -2201,11 +2689,11 @@ _gtk_container_focus_sort (GtkContainer *container, while (children) { - if (GTK_WIDGET_REALIZED (children->data)) + if (gtk_widget_get_realized (children->data)) visible_children = g_list_prepend (visible_children, children->data); children = children->next; } - + switch (direction) { case GTK_DIR_TAB_FORWARD: @@ -2229,10 +2717,11 @@ gtk_container_focus_move (GtkContainer *container, GList *children, GtkDirectionType direction) { + GtkContainerPrivate *priv = container->priv; GtkWidget *focus_child; GtkWidget *child; - focus_child = container->focus_child; + focus_child = priv->focus_child; while (children) { @@ -2241,7 +2730,7 @@ gtk_container_focus_move (GtkContainer *container, if (!child) continue; - + if (focus_child) { if (focus_child == child) @@ -2252,7 +2741,7 @@ gtk_container_focus_move (GtkContainer *container, return TRUE; } } - else if (GTK_WIDGET_DRAWABLE (child) && + else if (gtk_widget_is_drawable (child) && gtk_widget_is_ancestor (child, GTK_WIDGET (container))) { if (gtk_widget_child_focus (child, direction)) @@ -2280,7 +2769,7 @@ chain_widget_destroyed (GtkWidget *widget, { GtkContainer *container; GList *chain; - + container = GTK_CONTAINER (user_data); chain = g_object_get_data (G_OBJECT (container), @@ -2291,23 +2780,24 @@ chain_widget_destroyed (GtkWidget *widget, g_signal_handlers_disconnect_by_func (widget, chain_widget_destroyed, user_data); - + g_object_set_data (G_OBJECT (container), I_("gtk-container-focus-chain"), - chain); + chain); } /** - * gtk_container_set_focus_chain: + * gtk_container_set_focus_chain: * @container: a #GtkContainer - * @focusable_widgets: the new focus chain + * @focusable_widgets: (transfer none) (element-type GtkWidget): + * the new focus chain * * Sets a focus chain, overriding the one computed automatically by GTK+. - * - * In principle each widget in the chain should be a descendant of the - * container, but this is not enforced by this method, since it's allowed - * to set the focus chain before you pack the widgets, or have a widget - * in the chain that isn't always packed. The necessary checks are done + * + * In principle each widget in the chain should be a descendant of the + * container, but this is not enforced by this method, since it's allowed + * to set the focus chain before you pack the widgets, or have a widget + * in the chain that isn't always packed. The necessary checks are done * when the focus chain is actually traversed. **/ void @@ -2316,20 +2806,23 @@ gtk_container_set_focus_chain (GtkContainer *container, { GList *chain; GList *tmp_list; - + GtkContainerPrivate *priv; + g_return_if_fail (GTK_IS_CONTAINER (container)); - - if (container->has_focus_chain) + + priv = container->priv; + + if (priv->has_focus_chain) gtk_container_unset_focus_chain (container); - container->has_focus_chain = TRUE; - + priv->has_focus_chain = TRUE; + chain = NULL; tmp_list = focusable_widgets; while (tmp_list != NULL) { g_return_if_fail (GTK_IS_WIDGET (tmp_list->data)); - + /* In principle each widget in the chain should be a descendant * of the container, but we don't want to check that here, it's * expensive and also it's allowed to set the focus chain before @@ -2343,12 +2836,12 @@ gtk_container_set_focus_chain (GtkContainer *container, "destroy", G_CALLBACK (chain_widget_destroyed), container); - + tmp_list = g_list_next (tmp_list); } chain = g_list_reverse (chain); - + g_object_set_data (G_OBJECT (container), I_("gtk-container-focus-chain"), chain); @@ -2357,59 +2850,68 @@ gtk_container_set_focus_chain (GtkContainer *container, /** * gtk_container_get_focus_chain: * @container: a #GtkContainer - * @focusable_widgets: location to store the focus chain of the + * @focusable_widgets: (element-type GtkWidget) (out) (transfer container): location + * to store the focus chain of the * container, or %NULL. You should free this list * using g_list_free() when you are done with it, however * no additional reference count is added to the * individual widgets in the focus chain. - * + * * Retrieves the focus chain of the container, if one has been * set explicitly. If no focus chain has been explicitly * set, GTK+ computes the focus chain based on the positions * of the children. In that case, GTK+ stores %NULL in * @focusable_widgets and returns %FALSE. * - * Return value: %TRUE if the focus chain of the container + * Return value: %TRUE if the focus chain of the container * has been set explicitly. **/ gboolean gtk_container_get_focus_chain (GtkContainer *container, GList **focus_chain) { + GtkContainerPrivate *priv; + g_return_val_if_fail (GTK_IS_CONTAINER (container), FALSE); + priv = container->priv; + if (focus_chain) { - if (container->has_focus_chain) + if (priv->has_focus_chain) *focus_chain = g_list_copy (get_focus_chain (container)); else *focus_chain = NULL; } - return container->has_focus_chain; + return priv->has_focus_chain; } /** * gtk_container_unset_focus_chain: * @container: a #GtkContainer - * + * * Removes a focus chain explicitly set with gtk_container_set_focus_chain(). **/ void gtk_container_unset_focus_chain (GtkContainer *container) -{ +{ + GtkContainerPrivate *priv; + g_return_if_fail (GTK_IS_CONTAINER (container)); - if (container->has_focus_chain) + priv = container->priv; + + if (priv->has_focus_chain) { GList *chain; GList *tmp_list; - + chain = get_focus_chain (container); - - container->has_focus_chain = FALSE; - - g_object_set_data (G_OBJECT (container), + + priv->has_focus_chain = FALSE; + + g_object_set_data (G_OBJECT (container), I_("gtk-container-focus-chain"), NULL); @@ -2419,7 +2921,7 @@ gtk_container_unset_focus_chain (GtkContainer *container) g_signal_handlers_disconnect_by_func (tmp_list->data, chain_widget_destroyed, container); - + tmp_list = g_list_next (tmp_list); } @@ -2430,18 +2932,18 @@ gtk_container_unset_focus_chain (GtkContainer *container) /** * gtk_container_set_focus_vadjustment: * @container: a #GtkContainer - * @adjustment: an adjustment which should be adjusted when the focus + * @adjustment: an adjustment which should be adjusted when the focus * is moved among the descendents of @container - * - * Hooks up an adjustment to focus handling in a container, so when a - * child of the container is focused, the adjustment is scrolled to - * show that widget. This function sets the vertical alignment. See - * gtk_scrolled_window_get_vadjustment() for a typical way of obtaining + * + * Hooks up an adjustment to focus handling in a container, so when a + * child of the container is focused, the adjustment is scrolled to + * show that widget. This function sets the vertical alignment. See + * gtk_scrolled_window_get_vadjustment() for a typical way of obtaining * the adjustment and gtk_container_set_focus_hadjustment() for setting * the horizontal adjustment. * - * The adjustments have to be in pixel units and in the same coordinate - * system as the allocation for immediate children of the container. + * The adjustments have to be in pixel units and in the same coordinate + * system as the allocation for immediate children of the container. */ void gtk_container_set_focus_vadjustment (GtkContainer *container, @@ -2467,14 +2969,14 @@ gtk_container_set_focus_vadjustment (GtkContainer *container, * Retrieves the vertical focus adjustment for the container. See * gtk_container_set_focus_vadjustment(). * - * Return value: the vertical focus adjustment, or %NULL if + * Return value: (transfer none): the vertical focus adjustment, or %NULL if * none has been set. **/ GtkAdjustment * gtk_container_get_focus_vadjustment (GtkContainer *container) { GtkAdjustment *vadjustment; - + g_return_val_if_fail (GTK_IS_CONTAINER (container), NULL); vadjustment = g_object_get_qdata (G_OBJECT (container), vadjustment_key_id); @@ -2485,18 +2987,18 @@ gtk_container_get_focus_vadjustment (GtkContainer *container) /** * gtk_container_set_focus_hadjustment: * @container: a #GtkContainer - * @adjustment: an adjustment which should be adjusted when the focus is + * @adjustment: an adjustment which should be adjusted when the focus is * moved among the descendents of @container - * - * Hooks up an adjustment to focus handling in a container, so when a child - * of the container is focused, the adjustment is scrolled to show that - * widget. This function sets the horizontal alignment. - * See gtk_scrolled_window_get_hadjustment() for a typical way of obtaining + * + * Hooks up an adjustment to focus handling in a container, so when a child + * of the container is focused, the adjustment is scrolled to show that + * widget. This function sets the horizontal alignment. + * See gtk_scrolled_window_get_hadjustment() for a typical way of obtaining * the adjustment and gtk_container_set_focus_vadjustment() for setting * the vertical adjustment. * - * The adjustments have to be in pixel units and in the same coordinate - * system as the allocation for immediate children of the container. + * The adjustments have to be in pixel units and in the same coordinate + * system as the allocation for immediate children of the container. */ void gtk_container_set_focus_hadjustment (GtkContainer *container, @@ -2522,7 +3024,7 @@ gtk_container_set_focus_hadjustment (GtkContainer *container, * Retrieves the horizontal focus adjustment for the container. See * gtk_container_set_focus_hadjustment (). * - * Return value: the horizontal focus adjustment, or %NULL if + * Return value: (transfer none): the horizontal focus adjustment, or %NULL if * none has been set. **/ GtkAdjustment * @@ -2550,54 +3052,35 @@ gtk_container_show_all (GtkWidget *widget) } static void -gtk_container_hide_all (GtkWidget *widget) -{ - g_return_if_fail (GTK_IS_CONTAINER (widget)); - - gtk_widget_hide (widget); - gtk_container_foreach (GTK_CONTAINER (widget), - (GtkCallback) gtk_widget_hide_all, - NULL); -} - - -static void -gtk_container_expose_child (GtkWidget *child, - gpointer client_data) +gtk_container_draw_child (GtkWidget *child, + gpointer client_data) { struct { GtkWidget *container; - GdkEventExpose *event; + cairo_t *cr; } *data = client_data; - - gtk_container_propagate_expose (GTK_CONTAINER (data->container), - child, - data->event); + + gtk_container_propagate_draw (GTK_CONTAINER (data->container), + child, + data->cr); } -static gint -gtk_container_expose (GtkWidget *widget, - GdkEventExpose *event) +static gint +gtk_container_draw (GtkWidget *widget, + cairo_t *cr) { struct { GtkWidget *container; - GdkEventExpose *event; + cairo_t *cr; } data; - g_return_val_if_fail (GTK_IS_CONTAINER (widget), FALSE); - g_return_val_if_fail (event != NULL, FALSE); + data.container = widget; + data.cr = cr; + + gtk_container_forall (GTK_CONTAINER (widget), + gtk_container_draw_child, + &data); - - if (GTK_WIDGET_DRAWABLE (widget)) - { - data.container = widget; - data.event = event; - - gtk_container_forall (GTK_CONTAINER (widget), - gtk_container_expose_child, - &data); - } - return FALSE; } @@ -2605,32 +3088,32 @@ static void gtk_container_map_child (GtkWidget *child, gpointer client_data) { - if (GTK_WIDGET_VISIBLE (child) && - GTK_WIDGET_CHILD_VISIBLE (child) && - !GTK_WIDGET_MAPPED (child)) + if (gtk_widget_get_visible (child) && + gtk_widget_get_child_visible (child) && + !gtk_widget_get_mapped (child)) gtk_widget_map (child); } static void gtk_container_map (GtkWidget *widget) { - GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED); + gtk_widget_set_mapped (widget, TRUE); gtk_container_forall (GTK_CONTAINER (widget), gtk_container_map_child, NULL); - if (!GTK_WIDGET_NO_WINDOW (widget)) - gdk_window_show (widget->window); + if (gtk_widget_get_has_window (widget)) + gdk_window_show (gtk_widget_get_window (widget)); } static void gtk_container_unmap (GtkWidget *widget) { - GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED); + gtk_widget_set_mapped (widget, FALSE); - if (!GTK_WIDGET_NO_WINDOW (widget)) - gdk_window_hide (widget->window); + if (gtk_widget_get_has_window (widget)) + gdk_window_hide (gtk_widget_get_window (widget)); else gtk_container_forall (GTK_CONTAINER (widget), (GtkCallback)gtk_widget_unmap, @@ -2638,55 +3121,134 @@ gtk_container_unmap (GtkWidget *widget) } /** - * gtk_container_propagate_expose: + * gtk_container_propagate_draw: * @container: a #GtkContainer * @child: a child of @container - * @event: a expose event sent to container - * - * When a container receives an expose event, it must send synthetic - * expose events to all children that don't have their own #GdkWindows. - * This function provides a convenient way of doing this. A container, - * when it receives an expose event, calls gtk_container_propagate_expose() - * once for each child, passing in the event the container received. - * - * gtk_container_propagate_expose() takes care of deciding whether - * an expose event needs to be sent to the child, intersecting - * the event's area with the child area, and sending the event. - * - * In most cases, a container can simply either simply inherit the - * #GtkWidget::expose implementation from #GtkContainer, or, do some drawing - * and then chain to the ::expose implementation from #GtkContainer. + * @cr: Cairo context as passed to the container. If you want to use @cr + * in container's draw function, consider using cairo_save() and + * cairo_restore() before calling this function. + * + * When a container receives a call to the draw function, it must send + * synthetic #GtkWidget::draw calls to all children that don't have their + * own #GdkWindows. This function provides a convenient way of doing this. + * A container, when it receives a call to its #GtkWidget::draw function, + * calls gtk_container_propagate_draw() once for each child, passing in + * the @cr the container received. + * + * gtk_container_propagate_draw() takes care of translating the origin of @cr, + * and deciding whether the draw needs to be sent to the child. It is a + * convenient and optimized way of getting the same effect as calling + * gtk_widget_draw() on the child directly. + * + * In most cases, a container can simply either inherit the + * #GtkWidget::draw implementation from #GtkContainer, or do some drawing + * and then chain to the ::draw implementation from #GtkContainer. **/ void -gtk_container_propagate_expose (GtkContainer *container, - GtkWidget *child, - GdkEventExpose *event) +gtk_container_propagate_draw (GtkContainer *container, + GtkWidget *child, + cairo_t *cr) { - GdkEvent *child_event; + GdkEventExpose *event; + GtkAllocation allocation; + GdkWindow *window, *w; + int x, y; g_return_if_fail (GTK_IS_CONTAINER (container)); g_return_if_fail (GTK_IS_WIDGET (child)); - g_return_if_fail (event != NULL); + g_return_if_fail (cr != NULL); + + g_assert (gtk_widget_get_parent (child) == GTK_WIDGET (container)); - g_assert (child->parent == GTK_WIDGET (container)); - - if (GTK_WIDGET_DRAWABLE (child) && - GTK_WIDGET_NO_WINDOW (child) && - (child->window == event->window)) + event = _gtk_cairo_get_event (cr); + if (event) { - child_event = gdk_event_new (GDK_EXPOSE); - child_event->expose = *event; - g_object_ref (child_event->expose.window); + if (gtk_widget_get_has_window (child) || + gtk_widget_get_window (child) != event->window) + return; + } - child_event->expose.region = gtk_widget_region_intersect (child, event->region); - if (!gdk_region_empty (child_event->expose.region)) - { - gdk_region_get_clipbox (child_event->expose.region, &child_event->expose.area); - gtk_widget_send_expose (child, child_event); - } - gdk_event_free (child_event); + cairo_save (cr); + + /* translate coordinates. Ugly business, that. */ + if (!gtk_widget_get_has_window (GTK_WIDGET (container))) + { + gtk_widget_get_allocation (GTK_WIDGET (container), &allocation); + x = -allocation.x; + y = -allocation.y; + } + else + { + x = 0; + y = 0; + } + + window = gtk_widget_get_window (GTK_WIDGET (container)); + + for (w = gtk_widget_get_window (child); w && w != window; w = gdk_window_get_parent (w)) + { + int wx, wy; + gdk_window_get_position (w, &wx, &wy); + x += wx; + y += wy; + } + + if (w == NULL) + { + x = 0; + y = 0; } + + if (!gtk_widget_get_has_window (child)) + { + gtk_widget_get_allocation (child, &allocation); + x += allocation.x; + y += allocation.y; + } + + cairo_translate (cr, x, y); + + _gtk_widget_draw_internal (child, cr, TRUE); + + cairo_restore (cr); +} + +gboolean +_gtk_container_get_need_resize (GtkContainer *container) +{ + return container->priv->need_resize; +} + +void +_gtk_container_set_need_resize (GtkContainer *container, + gboolean need_resize) +{ + container->priv->need_resize = need_resize; +} + +gboolean +_gtk_container_get_reallocate_redraws (GtkContainer *container) +{ + return container->priv->reallocate_redraws; } -#define __GTK_CONTAINER_C__ -#include "gtkaliasdef.c" +/** + * gtk_container_get_path_for_child: + * @container: a #GtkContainer + * @child: a child of @container + * + * Returns a newly created widget path representing all the widget hierarchy + * from the toplevel down to @child (this one not being included). + * + * Returns: A newly created #GtkWidgetPath + **/ +GtkWidgetPath * +gtk_container_get_path_for_child (GtkContainer *container, + GtkWidget *child) +{ + g_return_val_if_fail (GTK_IS_CONTAINER (container), NULL); + g_return_val_if_fail (GTK_IS_WIDGET (child), NULL); + g_return_val_if_fail (container == (GtkContainer *) gtk_widget_get_parent (child), NULL); + + return GTK_CONTAINER_GET_CLASS (container)->get_path_for_child (container, child); +}